ox-latex: Allow hyperref and footnotemark in items description tags

* lisp/ox-latex.el (org-latex-item): Allow hyperref and footnotemark
  in items description tags.  Also remove a unnecessary hack allowing
  footnotemark with an optional argument in the tag.

Initial patch from Rick Frankel.
This commit is contained in:
Nicolas Goaziou 2013-06-18 22:44:26 +02:00
parent 60899b1a2f
commit 7b8a79326f

View file

@ -1325,20 +1325,6 @@ CONTENTS is nil. INFO is a plist holding contextual information."
(when (eq (org-element-type prev) 'footnote-reference)
org-latex-footnote-separator))
(cond
;; Use \footnotemark if reference is within an item's tag.
((eq (org-element-type (org-export-get-parent-element footnote-reference))
'item)
(if (org-export-footnote-first-reference-p footnote-reference info)
"\\footnotemark"
;; Since we can't specify footnote number as an optional
;; argument within an item tag, some extra work has to be done
;; when the footnote has already been referenced. In that
;; case, set footnote counter to the desired number, use the
;; footnotemark, then set counter back to its original value.
(format
"\\setcounter{footnote}{%s}\\footnotemark\\setcounter{footnote}{%s}"
(1- (org-export-get-footnote-number footnote-reference info))
(org-latex--get-footnote-counter footnote-reference info))))
;; Use \footnotemark if the footnote has already been defined.
((not (org-export-footnote-first-reference-p footnote-reference info))
(format "\\footnotemark[%s]{}"
@ -1612,7 +1598,7 @@ contextual information."
(trans "$\\boxminus$ ")))
(tag (let ((tag (org-element-property :tag item)))
;; Check-boxes must belong to the tag.
(and tag (format "[%s] "
(and tag (format "[{%s}] "
(concat checkbox
(org-export-data tag info)))))))
(concat counter "\\item" (or tag (concat " " checkbox))