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

Merge branch 'maint'

Browse source
This commit is contained in:
Nicolas Goaziou 2017-01-12 15:28:33 +01:00
parent 343417bcdb 1749dfe091
commit 400d46e547
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lisp/ox-odt.el
View file

@ -2883,15 +2883,10 @@ contextual information."
(defun org-odt--encode-tabs-and-spaces (line) (defun org-odt--encode-tabs-and-spaces (line)
(replace-regexp-in-string (replace-regexp-in-string
"\\([\t]\\|\\([ ]+\\)\\)" "\\(\t\\| \\{2,\\}\\)"
(lambda (s) (lambda (s)
(cond (if (string= s "\t") "<text:tab/>"
((string= s "\t") "<text:tab/>") (format " <text:s text:c=\"%d\"/>" (1- (length s)))))
(t (let ((n (length s)))
(cond
((= n 1) " ")
((> n 1) (concat " " (format "<text:s text:c=\"%d\"/>" (1- n))))
(t ""))))))
line)) line))
(defun org-odt--encode-plain-text (text &optional no-whitespace-filling) (defun org-odt--encode-plain-text (text &optional no-whitespace-filling)
@ -3674,15 +3669,13 @@ channel."
"Transcode a VERSE-BLOCK element from Org to ODT. "Transcode a VERSE-BLOCK element from Org to ODT.
CONTENTS is verse block contents. INFO is a plist holding CONTENTS is verse block contents. INFO is a plist holding
contextual information." contextual information."
;; Add line breaks to each line of verse. (format "\n<text:p text:style-name=\"OrgVerse\">%s</text:p>"
(setq contents (replace-regexp-in-string (replace-regexp-in-string
"\\(<text:line-break/>\\)?[ \t]*\n" ;; Replace leading tabs and spaces.
"<text:line-break/>" contents)) "^[ \t]+" #'org-odt--encode-tabs-and-spaces
;; Replace tabs and spaces. ;; Add line breaks to each line of verse.
(setq contents (org-odt--encode-tabs-and-spaces contents)) (replace-regexp-in-string
;; Surround it in a verse environment. "\\(<text:line-break/>\\)?[ \t]*$" "<text:line-break/>" contents))))
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
"OrgVerse" contents))