diff options
author | Sébastien Delafond <sdelafond@gmail.com> | 2014-07-13 13:35:32 +0200 |
---|---|---|
committer | Sébastien Delafond <sdelafond@gmail.com> | 2014-07-13 13:35:32 +0200 |
commit | efc77ab6f5e8883fc38d8c6f75b6db54a0965c15 (patch) | |
tree | a34b12897145816f4ab7fbeb2fe6db437651e98e /lisp/ox-odt.el | |
parent | 52fbfeb04b10aa78f24f339a352fe1161c0b37e4 (diff) |
Imported Upstream version 8.2.5h
Diffstat (limited to 'lisp/ox-odt.el')
-rw-r--r-- | lisp/ox-odt.el | 46 |
1 files changed, 6 insertions, 40 deletions
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el index 975dbdb..1e966fe 100644 --- a/lisp/ox-odt.el +++ b/lisp/ox-odt.el @@ -1,6 +1,6 @@ ;;; ox-odt.el --- OpenDocument Text Exporter for Org Mode -;; Copyright (C) 2010-2013 Free Software Foundation, Inc. +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Author: Jambunathan K <kjambunathan at gmail dot com> ;; Keywords: outlines, hypermedia, calendar, wp @@ -998,7 +998,9 @@ See `org-odt--build-date-styles' for implementation details." (if width (format " svg:width=\"%0.2fcm\"" width) "") (if height (format " svg:height=\"%0.2fcm\"" height) "") extra - (format " text:anchor-type=\"%s\"" (or anchor-type "paragraph"))))) + (format " text:anchor-type=\"%s\"" (or anchor-type "paragraph")) + (format " draw:name=\"%s\"" + (car (org-odt-add-automatic-style "Frame")))))) (format "\n<draw:frame draw:style-name=\"%s\"%s>\n%s\n</draw:frame>" style frame-attrs @@ -2120,45 +2122,9 @@ SHORT-CAPTION are strings." ;; Get label and caption. (label (org-element-property :name caption-from)) (caption (org-export-get-caption caption-from)) - (short-caption (org-export-get-caption caption-from t)) - ;; Transcode captions. (caption (and caption (org-export-data caption info))) - ;; Currently short caption are sneaked in as object names. - ;; - ;; The advantages are: - ;; - ;; - Table Of Contents: Currently, there is no support for - ;; building TOC for figures, listings and tables. See - ;; `org-odt-keyword'. User instead has to rely on - ;; external application for building such indices. Within - ;; LibreOffice, building an "Illustration Index" or "Index - ;; of Tables" will create a table with long captions (only) - ;; and building a table with "Object names" will create a - ;; table with short captions. - ;; - ;; - Easy navigation: In LibreOffice, object names are - ;; offered via the navigation bar. This way one can - ;; quickly locate and jump to object of his choice in the - ;; exported document. - ;; - ;; The main disadvantage is that there cannot be any markups - ;; within object names i.e., one cannot embolden, italicize - ;; or underline text within short caption. So suppress - ;; generation of <text:span >...</text:span> and other - ;; markups by overriding the default translators. We - ;; probably shouldn't be suppressing translators for all - ;; elements in `org-element-all-objects', but for now this - ;; will do. - (short-caption - (let ((short-caption (or short-caption caption)) - (backend (org-export-create-backend - :parent (org-export-backend-name - (plist-get info :back-end)) - :transcoders - (mapcar (lambda (type) (cons type (lambda (o c i) c))) - org-element-all-objects)))) - (when short-caption - (org-export-data-with-backend short-caption backend info))))) + ;; FIXME: We don't use short-caption for now + (short-caption nil)) (when (or label caption) (let* ((default-category (case (org-element-type element) |