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

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-03-17 03:00:04 +01:00
parent da13eea415 d2e7b1b5b1
commit ed3f1288cb
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ox-ascii.el
View File

@ -1386,12 +1386,9 @@ INFO is a plist holding contextual information."
(let ((ref (org-element-property :path link)))
(format (org-export-get-coderef-format ref desc)
(org-export-resolve-coderef ref info))))
;; Do not apply a special syntax on radio links. Though, use
;; transcoded target's contents as output.
;; Do not apply a special syntax on radio links.
((string= type "radio")
(let ((destination (org-export-resolve-radio-link link info)))
(when destination
(org-export-data (org-element-contents destination) info))))
(org-element-property :path link))
;; Do not apply a special syntax on fuzzy links pointing to
;; targets.
((string= type "fuzzy")

4
lisp/ox-beamer.el
View File

@ -689,8 +689,8 @@ used as a communication channel."
(when destination
(format "\\hyperlink%s{%s}{%s}"
(or (org-beamer--element-has-overlay-p link) "")
(org-export-solidify-link-text path)
(org-export-data (org-element-contents destination) info)))))
(org-export-data (org-element-contents destination) info)
(org-export-solidify-link-text path)))))
((and (member type '("custom-id" "fuzzy" "id"))
(let ((destination (if (string= type "fuzzy")
(org-export-resolve-fuzzy-link link info)

4
lisp/ox-html.el
View File

@ -2775,9 +2775,9 @@ INFO is a plist holding contextual information. See
(let ((destination (org-export-resolve-radio-link link info)))
(when destination
(format "<a href=\"#%s\"%s>%s</a>"
(org-export-solidify-link-text path)
(org-export-data (org-element-contents destination) info)
attributes
(org-export-data (org-element-contents destination) info)))))
(org-export-solidify-link-text path)))))
;; Links pointing to a headline: Find destination and build
;; appropriate referencing command.
((member type '("custom-id" "fuzzy" "id"))

4
lisp/ox-latex.el
View File

@ -1889,8 +1889,8 @@ INFO is a plist holding contextual information. See
(let ((destination (org-export-resolve-radio-link link info)))
(when destination
(format "\\hyperref[%s]{%s}"
(org-export-solidify-link-text path)
(org-export-data (org-element-contents destination) info)))))
(org-export-data (org-element-contents destination) info)
(org-export-solidify-link-text path)))))
;; Links pointing to a headline: Find destination and build
;; appropriate referencing command.
((member type '("custom-id" "fuzzy" "id"))