org-e-latex: Apply signature modification of functions

* EXPERIMENTAL/org-e-latex.el (org-e-latex-example-block,
  org-e-latex-src-block): Apply changes to `org-export-handle-code'.
(org-e-latex-link): Use new function `org-export-resolve-coderef'.
This commit is contained in:
Nicolas Goaziou 2012-01-11 14:44:28 +01:00
parent b73a8d6d82
commit cbc5aafe19
1 changed files with 3 additions and 7 deletions

View File

@ -893,8 +893,7 @@ contextual information."
"Transcode a EXAMPLE-BLOCK element from Org to LaTeX. "Transcode a EXAMPLE-BLOCK element from Org to LaTeX.
CONTENTS is nil. INFO is a plist holding contextual information." CONTENTS is nil. INFO is a plist holding contextual information."
(let* ((options (or (org-element-get-property :options example-block) "")) (let* ((options (or (org-element-get-property :options example-block) ""))
(value (org-export-handle-code (value (org-export-handle-code example-block info)))
(org-element-get-property :value example-block) options info)))
(org-e-latex--wrap-label (org-e-latex--wrap-label
example-block (format "\\begin{verbatim}\n%s\\end{verbatim}" value)))) example-block (format "\\begin{verbatim}\n%s\\end{verbatim}" value))))
@ -1371,7 +1370,7 @@ INFO is a plist holding contextual information. See
;; equivalent line number. ;; equivalent line number.
((string= type "coderef") ((string= type "coderef")
(format (org-export-get-coderef-format path (or desc "")) (format (org-export-get-coderef-format path (or desc ""))
(cdr (assoc path (plist-get info :code-refs))))) (org-export-resolve-coderef path info)))
;; Link type is handled by a special function. ;; Link type is handled by a special function.
((functionp (setq protocol (nth 2 (assoc type org-link-protocols)))) ((functionp (setq protocol (nth 2 (assoc type org-link-protocols))))
(funcall protocol (org-link-unescape path) desc 'latex)) (funcall protocol (org-link-unescape path) desc 'latex))
@ -1553,10 +1552,7 @@ holding contextual information."
CONTENTS holds the contents of the item. INFO is a plist holding CONTENTS holds the contents of the item. INFO is a plist holding
contextual information." contextual information."
(let* ((lang (org-element-get-property :language src-block)) (let* ((lang (org-element-get-property :language src-block))
(code (org-export-handle-code (code (org-export-handle-code src-block info))
(org-element-get-property :value src-block)
(org-element-get-property :switches src-block)
info lang))
(caption (org-element-get-property :caption src-block)) (caption (org-element-get-property :caption src-block))
(label (org-element-get-property :name src-block)) (label (org-element-get-property :name src-block))
(custom-env (and lang (custom-env (and lang