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

org-e-latex: Consistently change label names

Browse source 
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string,
  org-e-latex--wrap-label, org-e-latex-latex-environment):
  Consistently call `org-export-solidify-link-text' so references can
  match labels.
This commit is contained in:
Nicolas Goaziou 2012-09-16 09:24:32 +02:00
parent a5756f5e1d
commit a99402facf
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
contrib/lisp/org-e-latex.el
View file

@ -848,12 +848,14 @@ caption nor label, return the empty string.
For non-floats, see `org-e-latex--wrap-label'."
(let* ((label (org-element-property :name element))
(label-str (if label (format "\\label{%s}" label) ""))
(label-str (if (not (org-string-nw-p label)) ""
(format "\\label{%s}"
(org-export-solidify-link-text label))))
(main (org-export-get-caption element))
(short (org-export-get-caption element t)))
(cond
((and (not main) (not label)) "")
((not main) (format "\\label{%s}\n" label))
((and (not main) (equal label-str "")) "")
((not main) (concat label-str "\n"))
;; Option caption format with short name.
(short (format "\\caption[%s]{%s%s}\n"
(org-export-data short info)
@ -944,9 +946,9 @@ is a plist used as a communication channel."
This function shouldn't be used for floats. See
`org-e-latex--caption/label-string'."
(let ((label (org-element-property :name element)))
(if (or (not output) (not label) (string= output "") (string= label ""))
output
(concat (format "\\label{%s}\n" label) output))))
(if (not (and (org-string-nw-p output) (org-string-nw-p label))) output
(concat (format "\\label{%s}\n" (org-export-solidify-link-text label))
output))))
(defun org-e-latex--text-markup (text markup)
"Format TEXT depending on MARKUP text markup.
@ -1685,7 +1687,7 @@ CONTENTS is nil. INFO is a plist holding contextual information."
(insert value)
(goto-char (point-min))
(forward-line)
(insert (format "\\label{%s}\n" label))
(insert (format "\\label{%s}\n" (org-export-solidify-link-text label)))
(buffer-string)))))