mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

Fix major bug in the Org>ODT exporter.

Browse Source
This commit is contained in:
Bastien Guerry 2012-05-25 23:09:08 +02:00
parent 2a88ee23db
commit 9893229fd6
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lisp/org/ChangeLog
View File

@ -1,3 +1,20 @@
2012-05-25 Mark Shoulson <mark@kli.org> (tiny change)
* org.el (org-fontify-entities): Fix bug: The entities \sup[123]
and \there4 were not "prettified" when org-pretty-entities was
enabled.
2012-05-235 Nicolas Goaziou <n.goaziou@gmail.com>
* org.el (org-font-lock-add-priority-faces): Restrict priorities
fontification to headlines and inlinetasks.
2012-05-25 Jambunathan K <kjambunathan@gmail.com>
* org-odt.el (org-odt-init-outfile): Fix previous commit. Make
sure that nxml-mode is loaded before let-binding
`nxml-auto-insert-xml-declaration-flag'.
2012-05-25 Jambunathan K <kjambunathan@gmail.com>
* org-odt.el (org-odt-init-outfile)

6
lisp/org/org-odt.el
View File

@ -2211,9 +2211,9 @@ captions on export.")
(content-file (expand-file-name "content.xml" outdir)))
;; init conten.xml
(with-current-buffer
(let ((nxml-auto-insert-xml-declaration-flag nil))
(find-file-noselect content-file t)))
(require 'nxml-mode)
(let ((nxml-auto-insert-xml-declaration-flag nil))
(find-file-noselect content-file t))
;; reset variables
(setq org-odt-manifest-file-entries nil

19
lisp/org/org.el
View File

@ -5917,7 +5917,7 @@ needs to be inserted at a specific position in the font-lock sequence.")
(when org-pretty-entities
(catch 'match
(while (re-search-forward
"\\\\\\(frac[13][24]\\|[a-zA-Z]+\\)\\($\\|{}\\|[^[:alpha:]\n]\\)"
"\\\\\\(there4\\|sup[123]\\|frac[13][24]\\|[a-zA-Z]+\\)\\($\\|{}\\|[^[:alpha:]\n]\\)"
limit t)
(if (and (not (org-in-indented-comment-line))
(setq ee (org-entity-get (match-string 1)))
@ -5990,14 +5990,15 @@ When FACE-OR-COLOR is not a string, just return it."
(defun org-font-lock-add-priority-faces (limit)
"Add the special priority faces."
(while (re-search-forward "\\[#\\([A-Z0-9]\\)\\]" limit t)
(add-text-properties
(match-beginning 0) (match-end 0)
(list 'face (or (org-face-from-face-or-color
'priority 'org-special-keyword
(cdr (assoc (char-after (match-beginning 1))
org-priority-faces)))
'org-special-keyword)
'font-lock-fontified t))))
(when (save-match-data (org-at-heading-p))
(add-text-properties
(match-beginning 0) (match-end 0)
(list 'face (or (org-face-from-face-or-color
'priority 'org-special-keyword
(cdr (assoc (char-after (match-beginning 1))
org-priority-faces)))
'org-special-keyword)
'font-lock-fontified t)))))
(defun org-get-tag-face (kwd)
"Get the right face for a TODO keyword KWD.