diff options
Diffstat (limited to 'lisp/org/ox-odt.el')
| -rw-r--r-- | lisp/org/ox-odt.el | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el index 1e966fe108c..772017cdd0c 100644 --- a/lisp/org/ox-odt.el +++ b/lisp/org/ox-odt.el @@ -1502,7 +1502,7 @@ original parsed data. INFO is a plist holding export options." (email (and (plist-get info :with-email) email))) (concat ;; Title. - (when title + (when (org-string-nw-p title) (concat (format "\n<text:p text:style-name=\"%s\">%s</text:p>" "OrgTitle" (format "\n<text:title>%s</text:title>" title)) @@ -2713,10 +2713,8 @@ INFO is a plist holding contextual information. See (path (cond ((member type '("http" "https" "ftp" "mailto")) (concat type ":" raw-path)) - ((string= type "file") - (if (file-name-absolute-p raw-path) - (concat "file://" (expand-file-name raw-path)) - (concat "file://" raw-path))) + ((and (string= type "file") (file-name-absolute-p raw-path)) + (concat "file:" raw-path)) (t raw-path))) ;; Convert & to & for correct XML representation (path (replace-regexp-in-string "&" "&" path)) @@ -2735,11 +2733,11 @@ INFO is a plist holding contextual information. See ((string= type "radio") (let ((destination (org-export-resolve-radio-link link info))) (when destination - (let ((desc (org-export-data (org-element-contents destination) info)) - (href (org-export-solidify-link-text path))) - (format - "<text:bookmark-ref text:reference-format=\"text\" text:ref-name=\"OrgXref.%s\">%s</text:bookmark-ref>" - href desc))))) + (format + "<text:bookmark-ref text:reference-format=\"text\" text:ref-name=\"OrgXref.%s\">%s</text:bookmark-ref>" + (org-export-solidify-link-text + (org-element-property :value destination)) + desc)))) ;; Links pointing to a headline: Find destination and build ;; appropriate referencing command. ((member type '("custom-id" "fuzzy" "id")) |