mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-27 07:37:25 +00:00
Code

ox-odt: Fix bug links without labels.

Browse Source 
* ox-odt.el (org-odt-format-label): Determine label more carefully.

Reported-by: Vicente Vera <vicentemvp@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/97090>
This commit is contained in:
Rasmus 2015-04-23 12:35:43 +02:00
parent 2bdc661fde
commit aad7dd2486
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/ox-odt.el
View File

@ -2152,13 +2152,15 @@ Return value is a string if OP is set to `reference' or a cons
cell like CAPTION . SHORT-CAPTION) where CAPTION and
SHORT-CAPTION are strings."
(assert (memq (org-element-type element) '(link table src-block paragraph)))
(let* ((caption-from
(let* ((element-or-parent
(case (org-element-type element)
(link (org-export-get-parent-element element))
(t element)))
;; Get label and caption.
(label (org-export-get-reference element info))
(caption (let ((c (org-export-get-caption caption-from)))
(label (and (or (org-element-property :name element)
(org-element-property :name element-or-parent))
(org-export-get-reference element-or-parent info)))
(caption (let ((c (org-export-get-caption element-or-parent)))
(and c (org-export-data c info))))
;; FIXME: We don't use short-caption for now
(short-caption nil))