From 2e79bd8119a0c8ec1141873706b04aa6fe3d932f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 23 Mar 2014 18:04:22 +0100 Subject: [PATCH] export back-ends: Update radio target export * contrib/lisp/ox-groff.el (org-groff-link): * lisp/ox-ascii.el (org-ascii-link): * lisp/ox-beamer.el (org-beamer-link): * lisp/ox-html.el (org-html-link): * lisp/ox-latex.el (org-latex-link): * lisp/ox-md.el (org-md-link): * lisp/ox-odt.el (org-odt-link): Update radio target export according to recent changes. See bug report at http://permalink.gmane.org/gmane.emacs.orgmode/82923 --- contrib/lisp/ox-groff.el | 3 ++- lisp/ox-ascii.el | 5 +---- lisp/ox-beamer.el | 5 +++-- lisp/ox-html.el | 6 +++--- lisp/ox-latex.el | 5 +++-- lisp/ox-md.el | 4 +--- lisp/ox-odt.el | 10 +++++----- 7 files changed, 18 insertions(+), 20 deletions(-) diff --git a/contrib/lisp/ox-groff.el b/contrib/lisp/ox-groff.el index 114129248..1990f878f 100644 --- a/contrib/lisp/ox-groff.el +++ b/contrib/lisp/ox-groff.el @@ -1274,7 +1274,8 @@ INFO is a plist holding contextual information. See (let ((destination (org-export-resolve-radio-link link info))) (when destination (format "\\fI [%s] \\fP" - (org-export-solidify-link-text path))))) + (org-export-solidify-link-text + (org-element-property :value destination)))))) ;; Links pointing to a headline: find destination and build ;; appropriate referencing command. diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el index e8f1b1f41..11ce0c36a 100644 --- a/lisp/ox-ascii.el +++ b/lisp/ox-ascii.el @@ -1387,10 +1387,7 @@ INFO is a plist holding contextual information." (org-export-resolve-coderef ref info)))) ;; Do not apply a special syntax on radio links. Though, use ;; transcoded target's contents as output. - ((string= type "radio") - (let ((destination (org-export-resolve-radio-link link info))) - (when destination - (org-export-data (org-element-contents destination) info)))) + ((string= type "radio") desc) ;; Do not apply a special syntax on fuzzy links pointing to ;; targets. ((string= type "fuzzy") diff --git a/lisp/ox-beamer.el b/lisp/ox-beamer.el index 1d26ac44a..f3a79d7c8 100644 --- a/lisp/ox-beamer.el +++ b/lisp/ox-beamer.el @@ -690,8 +690,9 @@ 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-solidify-link-text + (org-element-property :value destination)) + contents)))) ((and (member type '("custom-id" "fuzzy" "id")) (let ((destination (if (string= type "fuzzy") (org-export-resolve-fuzzy-link link info) diff --git a/lisp/ox-html.el b/lisp/ox-html.el index cabf2b684..c590d86c4 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -2721,9 +2721,9 @@ INFO is a plist holding contextual information. See (let ((destination (org-export-resolve-radio-link link info))) (when destination (format "%s" - (org-export-solidify-link-text path) - attributes - (org-export-data (org-element-contents destination) info))))) + (org-export-solidify-link-text + (org-element-property :value destination)) + attributes desc)))) ;; Links pointing to a headline: Find destination and build ;; appropriate referencing command. ((member type '("custom-id" "fuzzy" "id")) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 230e3fc99..59e6e8361 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -1813,8 +1813,9 @@ 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-solidify-link-text + (org-element-property :value destination)) + desc)))) ;; Links pointing to a headline: Find destination and build ;; appropriate referencing command. ((member type '("custom-id" "fuzzy" "id")) diff --git a/lisp/ox-md.el b/lisp/ox-md.el index 39843d5d7..84e075d38 100644 --- a/lisp/ox-md.el +++ b/lisp/ox-md.el @@ -307,9 +307,7 @@ a communication channel." (let ((ref (org-element-property :path link))) (format (org-export-get-coderef-format ref contents) (org-export-resolve-coderef ref info)))) - ((equal type "radio") - (let ((destination (org-export-resolve-radio-link link info))) - (org-export-data (org-element-contents destination) info))) + ((equal type "radio") contents) ((equal type "fuzzy") (let ((destination (org-export-resolve-fuzzy-link link info))) (if (org-string-nw-p contents) contents diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el index 1e966fe10..da2ca3f8d 100644 --- a/lisp/ox-odt.el +++ b/lisp/ox-odt.el @@ -2735,11 +2735,11 @@ INFO is a plist holding contextual information. See ((string= type "radio") (let ((destination (org-export-resolve-radio-link link info))) (when destination - (let ((desc (org-export-data (org-element-contents destination) info)) - (href (org-export-solidify-link-text path))) - (format - "%s" - href desc))))) + (format + "%s" + (org-export-solidify-link-text + (org-element-property :value destination)) + desc)))) ;; Links pointing to a headline: Find destination and build ;; appropriate referencing command. ((member type '("custom-id" "fuzzy" "id")) -- 2.11.4.GIT