forked from mirrors/org-mode
ox-koma-letter: Fix variable and function names wrt to merge
* contrib/lisp/ox-koma-letter.el (org-koma-letter-template, org-koma-letter-export-to-pdf): Fix variables and functions names wrt to merge.
This commit is contained in:
parent
1c096ea16f
commit
c5ce9f15f5
|
@ -30,16 +30,16 @@
|
||||||
;; `org-koma-letter-export-to-pdf' ("pdf" file).
|
;; `org-koma-letter-export-to-pdf' ("pdf" file).
|
||||||
;;
|
;;
|
||||||
;; On top of buffer keywords supported by `latex' back-end (see
|
;; On top of buffer keywords supported by `latex' back-end (see
|
||||||
;; `org-e-latex-options-alist'), this back-end introduces the
|
;; `org-latex-options-alist'), this back-end introduces the following
|
||||||
;; following keywords: "CLOSING" (see `org-koma-letter-closing'),
|
;; keywords: "CLOSING" (see `org-koma-letter-closing'), "FROM_ADDRESS"
|
||||||
;; "FROM_ADDRESS" (see `org-koma-letter-from-address'), "LCO" (see
|
;; (see `org-koma-letter-from-address'), "LCO" (see
|
||||||
;; `org-koma-letter-class-option-file'), "OPENING" (see
|
;; `org-koma-letter-class-option-file'), "OPENING" (see
|
||||||
;; `org-koma-letter-opening'), "PHONE_NUMBER" (see
|
;; `org-koma-letter-opening'), "PHONE_NUMBER" (see
|
||||||
;; `org-koma-letter-phone-number'), "SIGNATURE" (see
|
;; `org-koma-letter-phone-number'), "SIGNATURE" (see
|
||||||
;; `org-koma-letter-signature') and "TO_ADDRESS".
|
;; `org-koma-letter-signature') and "TO_ADDRESS".
|
||||||
;;
|
;;
|
||||||
;; You will need to add an appropriate association in
|
;; You will need to add an appropriate association in
|
||||||
;; `org-e-latex-classes' in order to use the KOMA Scrlttr2 class. For
|
;; `org-latex-classes' in order to use the KOMA Scrlttr2 class. For
|
||||||
;; example, you can use the following code:
|
;; example, you can use the following code:
|
||||||
;;
|
;;
|
||||||
;; (add-to-list 'org-latex-classes
|
;; (add-to-list 'org-latex-classes
|
||||||
|
@ -180,7 +180,7 @@ holding export options."
|
||||||
(let ((class (plist-get info :latex-class))
|
(let ((class (plist-get info :latex-class))
|
||||||
(class-options (plist-get info :latex-class-options)))
|
(class-options (plist-get info :latex-class-options)))
|
||||||
(org-element-normalize-string
|
(org-element-normalize-string
|
||||||
(let* ((header (nth 1 (assoc class org-e-latex-classes)))
|
(let* ((header (nth 1 (assoc class org-latex-classes)))
|
||||||
(document-class-string
|
(document-class-string
|
||||||
(and (stringp header)
|
(and (stringp header)
|
||||||
(if class-options
|
(if class-options
|
||||||
|
@ -188,13 +188,14 @@ holding export options."
|
||||||
"^[ \t]*\\\\documentclass\\(\\[.*?\\]\\)"
|
"^[ \t]*\\\\documentclass\\(\\[.*?\\]\\)"
|
||||||
class-options header t nil 1)
|
class-options header t nil 1)
|
||||||
header))))
|
header))))
|
||||||
(when document-class-string
|
(if (not document-class-string)
|
||||||
(org-e-latex--guess-babel-language
|
(user-error "Unknown LaTeX class `%s'")
|
||||||
(org-e-latex--guess-inputenc
|
(org-latex-guess-babel-language
|
||||||
|
(org-latex-guess-inputenc
|
||||||
(org-splice-latex-header
|
(org-splice-latex-header
|
||||||
document-class-string
|
document-class-string
|
||||||
org-latex-default-packages-alist ; defined in org.el
|
org-latex-default-packages-alist ; defined in org.el
|
||||||
org-latex-packages-alist nil ; defined in org.el
|
org-latex-packages-alist nil ; defined in org.el
|
||||||
(plist-get info :latex-header-extra)))
|
(plist-get info :latex-header-extra)))
|
||||||
info)))))
|
info)))))
|
||||||
;; Define "From" data.
|
;; Define "From" data.
|
||||||
|
@ -357,11 +358,11 @@ Return PDF file's name."
|
||||||
(org-export-async-start
|
(org-export-async-start
|
||||||
(lambda (f) (org-export-add-to-stack f 'koma-letter))
|
(lambda (f) (org-export-add-to-stack f 'koma-letter))
|
||||||
`(expand-file-name
|
`(expand-file-name
|
||||||
(org-e-latex-compile
|
(org-latex-compile
|
||||||
(org-export-to-file
|
(org-export-to-file
|
||||||
'koma-letter ,outfile ,subtreep ,visible-only ,body-only
|
'koma-letter ,outfile ,subtreep ,visible-only ,body-only
|
||||||
',ext-plist)))))
|
',ext-plist)))))
|
||||||
(org-e-latex-compile
|
(org-latex-compile
|
||||||
(org-koma-letter-export-to-latex
|
(org-koma-letter-export-to-latex
|
||||||
nil subtreep visible-only body-only ext-plist))))
|
nil subtreep visible-only body-only ext-plist))))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue