tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

ox-odt.el: Fix annotation insertion.

Browse source 
* ox-odt.el (org-odt-special-block): Don't wrap annotations
into <text:p>...</text:p> at all.
(org-odt--fix-annotations): New defun.
(org-odt--export-wrap): Use the new defun to fix annotations
insertion in content.xml.

Please don't insult me because of the uglyness of this fix.
Send me a proper fix instead!
This commit is contained in:
Bastien Guerry 2013-03-25 18:05:06 +01:00
parent e7cfb4d13c
commit 9eb384fe4f
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lisp/ox-odt.el
View file

@ -3066,15 +3066,14 @@ holding contextual information."
(date (or (plist-get attributes :date)
;; FIXME: Is `car' right thing to do below?
(car (plist-get info :date)))))
(format "\n<text:p>%s</text:p>"
(format "<office:annotation>\n%s\n</office:annotation>"
(concat
(and author
(format "<dc:creator>%s</dc:creator>" author))
(and date
(format "<dc:date>%s</dc:date>"
(org-odt--format-timestamp date nil 'iso-date)))
contents)))))
(format "<office:annotation>\n%s\n</office:annotation>"
(concat
(and author
(format "<dc:creator>%s</dc:creator>" author))
(and date
(format "<dc:date>%s</dc:date>"
(org-odt--format-timestamp date nil 'iso-date)))
contents))))
;; Textbox.
((string= type "textbox")
(let ((width (plist-get attributes :width))
@ -3087,6 +3086,17 @@ holding contextual information."
style extra anchor))))
(t contents))))
(defun org-odt--fix-annotations ()
"Fix annotations in the XML buffer."
(save-excursion
(goto-char (point-min))
(while (search-forward "<office:annotation>" nil t)
(and (re-search-backward "</text:p>" nil t)
(replace-match "" t t))
(and (search-forward "</office:annotation>" nil t)
(re-search-forward "<text:p[^>]*>" nil t)
(replace-match "" t t)))))
;;;; Src Block
@ -4025,7 +4035,7 @@ contextual information."
`(let* ((--out-file ,out-file)
(out-file-type (file-name-extension --out-file))
(org-odt-xml-files '("META-INF/manifest.xml" "content.xml"
"meta.xml" "styles.xml"))
"meta.xml" "styles.xml"))
;; Initialize temporary workarea. All files that end up in
;; the exported document get parked/created here.
(org-odt-zip-dir (file-name-as-directory
@ -4074,6 +4084,9 @@ contextual information."
(when buf
(with-current-buffer buf
;; Prettify output if needed.
(if (equal (file-name-nondirectory (buffer-file-name buf))
"content.xml")
(org-odt--fix-annotations))
(when org-odt-prettify-xml
(indent-region (point-min) (point-max)))
(save-buffer 0)))))