tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

ox-latex, ox-koma-letter: Use new `parse' syntax

Browse source 
* contrib/lisp/ox-koma-letter.el (koma-letter): Set "SUBJECT" as
  parsed.
(org-koma-letter-template): Apply.
* lisp/ox-latex.el (latex): Set "DESCRIPTION" and "KEYWORDS" as
  parsed.
(org-latex--format-spec): Apply.
This commit is contained in:
Nicolas Goaziou 2015-04-05 14:06:59 +02:00
parent fa70778a20
commit c466a4deee
2 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
contrib/lisp/ox-koma-letter.el
View file

@ -391,7 +391,7 @@ was not present."
(:email "EMAIL" nil (org-koma-letter--get-value org-koma-letter-email) t)
(:to-address "TO_ADDRESS" nil nil newline)
(:place "PLACE" nil org-koma-letter-place)
(:subject "SUBJECT" nil nil space)
(:subject "SUBJECT" nil nil parse)
(:opening "OPENING" nil org-koma-letter-opening)
(:closing "CLOSING" nil org-koma-letter-closing)
(:signature "SIGNATURE" nil org-koma-letter-signature newline)
@ -628,11 +628,7 @@ holding export options."
(mapconcat #'symbol-name with-subject ","))))
(let* ((title-as-subject (plist-get info :with-title-as-subject))
(subject* (org-string-nw-p
(org-export-data
(org-element-parse-secondary-string
(plist-get info :subject)
(org-element-restriction 'keyword))
info)))
(org-export-data (plist-get info :subject) info)))
(title* (and (plist-get info :with-title)
(org-string-nw-p
(org-export-data (plist-get info :title) info))))

21
lisp/ox-latex.el
View file

@ -108,8 +108,8 @@
(:latex-class-options "LATEX_CLASS_OPTIONS" nil nil t)
(:latex-header "LATEX_HEADER" nil nil newline)
(:latex-header-extra "LATEX_HEADER_EXTRA" nil nil newline)
(:description "DESCRIPTION" nil nil newline)
(:keywords "KEYWORDS" nil nil space)
(:description "DESCRIPTION" nil nil parse)
(:keywords "KEYWORDS" nil nil parse)
;; Other variables.
(:latex-active-timestamp-format nil nil org-latex-active-timestamp-format)
(:latex-caption-above nil nil org-latex-caption-above)
@ -1220,25 +1220,16 @@ INFO is a plist used as a communication channel."
(defun org-latex--format-spec (info)
"Create a format-spec for document meta-data.
INFO is a plist used as a communication channel."
(let ((objects '(bold code entity export-snippet inline-babel-call
inline-src-block italic latex-fragment
latex-math-block link macro strike-through
subscript superscript timestamp underline
verbatim))
(language (let ((lang (plist-get info :language)))
(let ((language (let ((lang (plist-get info :language)))
(or (cdr (assoc lang org-latex-babel-language-alist))
lang))))
`((?a . ,(org-export-data (plist-get info :author) info))
(?t . ,(org-export-data (plist-get info :title) info))
(?t . ,(org-export-data (plist-get info :title) info))
(?k . ,(org-export-data (org-latex--wrap-latex-math-block
(org-element-parse-secondary-string
(plist-get info :keywords) objects)
info)
(plist-get info :keywords) info)
info))
(?d . ,(org-export-data (org-latex--wrap-latex-math-block
(org-element-parse-secondary-string
(plist-get info :description) objects)
info)
(plist-get info :description) info)
info))
(?c . ,(plist-get info :creator))
(?l . ,language)