ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-08-19 11:15:52 +02:00
parent c9872990ed 1abc4887a2
commit c5cbc6936e
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org.el
View File

@ -15724,9 +15724,11 @@ strings."
(push (cons "TODO" (org-match-string-no-properties 2)) props)))
(when specific (throw 'exit props)))
(when (or (not specific) (string= specific "PRIORITY"))
(when (looking-at org-priority-regexp)
(push (cons "PRIORITY" (org-match-string-no-properties 2))
props))
(push (cons "PRIORITY"
(if (looking-at org-priority-regexp)
(org-match-string-no-properties 2)
(char-to-string org-default-priority)))
props)
(when specific (throw 'exit props)))
(when (or (not specific) (string= specific "FILE"))
(push (cons "FILE" (buffer-file-name (buffer-base-buffer)))

12
lisp/ox-html.el
View File

@ -1473,7 +1473,9 @@ CSS classes, then this prefix can be very useful."
(let ((dt (downcase (plist-get info :html-doctype))))
(member dt '("html5" "xhtml5" "<!doctype html>"))))
(defun org-html-html5-fancy-p (info)
(defun org-html--html5-fancy-p (info)
"Non-nil when exporting to HTML5 with fancy elements.
INFO is the current state of the export process, as a plist."
(and (plist-get info :html-html5-fancy)
(org-html-html5-p info)))
@ -1507,7 +1509,7 @@ attributes with a nil value will be omitted from the result."
INFO is a plist used as a communication channel. When optional
arguments CAPTION and LABEL are given, use them for caption and
\"id\" attribute."
(let ((html5-fancy (org-html-html5-fancy-p info)))
(let ((html5-fancy (org-html--html5-fancy-p info)))
(format (if html5-fancy "\n<figure%s>%s%s\n</figure>"
"\n<div%s class=\"figure\">%s%s\n</div>")
;; ID.
@ -1933,7 +1935,7 @@ holding export options."
(when (plist-get info :with-title)
(let ((title (plist-get info :title))
(subtitle (plist-get info :subtitle))
(html5-fancy (org-html-html5-fancy-p info)))
(html5-fancy (org-html--html5-fancy-p info)))
(when title
(format
(if html5-fancy
@ -2137,7 +2139,7 @@ of contents as a string, or nil if it is empty."
(org-html--toc-text toc-entries)
"</div>\n")))
(if scope toc
(let ((outer-tag (if (org-html-html5-fancy-p info)
(let ((outer-tag (if (org-html--html5-fancy-p info)
"nav"
"div")))
(concat (format "<%s id=\"table-of-contents\">\n" outer-tag)
@ -3184,7 +3186,7 @@ CONTENTS holds the contents of the block. INFO is a plist
holding contextual information."
(let* ((block-type (org-element-property :type special-block))
(contents (or contents ""))
(html5-fancy (and (org-html-html5-fancy-p info)
(html5-fancy (and (org-html--html5-fancy-p info)
(member block-type org-html-html5-elements)))
(attributes (org-export-read-attribute :attr_html special-block)))
(unless html5-fancy

7
testing/lisp/test-org.el
View File

@ -3356,9 +3356,10 @@ Paragraph<point>"
(equal "A"
(org-test-with-temp-text "* [#A] H"
(cdr (assoc "PRIORITY" (org-entry-properties))))))
(should-not
(org-test-with-temp-text "* H"
(assoc "PRIORITY" (org-entry-properties nil "PRIORITY"))))
(should
(equal (char-to-string org-default-priority)
(org-test-with-temp-text "* H"
(cdr (assoc "PRIORITY" (org-entry-properties nil "PRIORITY"))))))
;; Get "FILE" property.
(should
(org-test-with-temp-text-in-file "* H\nParagraph"