ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-12-13 09:07:44 +01:00
parent 9fb2e047d2 f747ee43bd
commit 591ca3a0f3
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lisp/ox-beamer.el
View File

@ -721,13 +721,14 @@ channel."
CONTENTS is the description part of the link. INFO is a plist CONTENTS is the description part of the link. INFO is a plist
used as a communication channel." used as a communication channel."
(or (org-export-custom-protocol-maybe link contents 'beamer) (or (org-export-custom-protocol-maybe link contents 'beamer)
;; Fall-back to LaTeX export. However, if link is becomes ;; Fall-back to LaTeX export. However, prefer "\hyperlink" over
;; a "\hyperlink" macro, try to sneak in Beamer overlay ;; "\hyperref" since the former handles overlay specifications.
;; specification, if any. (let ((latex-link (org-export-with-backend 'latex link contents info)))
(let ((latex-link (org-export-with-backend 'latex link contents info)) (if (string-match "\\`\\\\hyperref\\[\\(.*?\\)\\]" latex-link)
(overlay (org-beamer--element-has-overlay-p link))) (replace-match
(if (and overlay (string-match "\\`\\\\hyperlink" latex-link)) (format "\\\\hyperlink%s{\\1}"
(replace-match (concat "\\&" overlay) nil nil latex-link) (or (org-beamer--element-has-overlay-p link) ""))
nil nil latex-link)
latex-link)))) latex-link))))