0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 22:07:49 +00:00

org-latex: allow `org-export-latex-href-format' to have only one "%s"

This is useful when you want to use \url{link} instead of the default
\href{link}{path}.

Thanks to Henri-Paul Indiogine for bringing this up.

* org-latex.el (org-export-latex-href-format): docstring fix
to reflect the fact that you can use only one "%s".
(org-export-latex-links): allow `org-export-latex-href-format'
to have only one "%s".
This commit is contained in:
Bastien Guerry 2011-07-26 13:22:38 +02:00
parent 30dccb04bf
commit f0e4deb077

View file

@ -304,8 +304,10 @@ markup defined, the first one in the association list will be used."
(defcustom org-export-latex-href-format "\\href{%s}{%s}" (defcustom org-export-latex-href-format "\\href{%s}{%s}"
"A printf format string to be applied to href links. "A printf format string to be applied to href links.
The format must contain two %s instances. The first will be filled with The format must contain either two %s instances or just one.
the link, the second with the link description." If it contains two %s instances, the first will be filled with
the link, the second with the link description. If it contains
only one, the %s will be filled with the link."
:group 'org-export-latex :group 'org-export-latex
:type 'string) :type 'string)
@ -2201,7 +2203,10 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
;; a LaTeX issue, but we here implement a work-around anyway. ;; a LaTeX issue, but we here implement a work-around anyway.
(setq path (org-export-latex-protect-amp path) (setq path (org-export-latex-protect-amp path)
desc (org-export-latex-protect-amp desc))) desc (org-export-latex-protect-amp desc)))
(insert (format org-export-latex-href-format path desc))) (insert
(if (string-match "%s.*%s" org-export-latex-href-format)
(format org-export-latex-href-format path desc)
(format org-export-latex-href-format path))))
((functionp (setq fnc (nth 2 (assoc type org-link-protocols)))) ((functionp (setq fnc (nth 2 (assoc type org-link-protocols))))
;; The link protocol has a function for formatting the link ;; The link protocol has a function for formatting the link