ox-koma-letter: Allow to disable place locally

* contrib/lisp/ox-koma-letter.el (koma-letter):
(org-koma-letter--build-settings): Allow to disable place locally.

Whenever OPTION keyword contains a "place" item or PLACE keyword is used
in the buffer, set KOMA option place after LCO inclusion.

Reported-by: Alan Schmitt <alan.schmitt@polytechnique.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/101010>
This commit is contained in:
Nicolas Goaziou 2015-09-10 14:21:49 +02:00
parent 0b71022c8c
commit bde1ebc20a
1 changed files with 9 additions and 4 deletions

View File

@ -435,7 +435,8 @@ e.g. \"title-subject:t\"."
(:inbuffer-with-backaddress nil "backaddress" 'koma-letter:empty) (:inbuffer-with-backaddress nil "backaddress" 'koma-letter:empty)
(:inbuffer-with-email nil "email" 'koma-letter:empty) (:inbuffer-with-email nil "email" 'koma-letter:empty)
(:inbuffer-with-foldmarks nil "foldmarks" 'koma-letter:empty) (:inbuffer-with-foldmarks nil "foldmarks" 'koma-letter:empty)
(:inbuffer-with-phone nil "phone" 'koma-letter:empty)) (:inbuffer-with-phone nil "phone" 'koma-letter:empty)
(:inbuffer-with-place nil "place" 'koma-letter:empty))
:translate-alist '((export-block . org-koma-letter-export-block) :translate-alist '((export-block . org-koma-letter-export-block)
(export-snippet . org-koma-letter-export-snippet) (export-snippet . org-koma-letter-export-snippet)
(headline . org-koma-letter-headline) (headline . org-koma-letter-headline)
@ -734,9 +735,13 @@ a communication channel."
(format "\\KOMAoption{backaddress}{%s}\n" (format "\\KOMAoption{backaddress}{%s}\n"
(if (plist-get info :with-backaddress) "true" "false"))) (if (plist-get info :with-backaddress) "true" "false")))
;; Place. ;; Place.
(and (funcall check-scope 'place) (let ((with-place-set (funcall check-scope 'with-place))
(format "\\setkomavar{place}{%s}\n" (place-set (funcall check-scope 'place)))
(if (plist-get info :with-place) (plist-get info :place) ""))) (and (or (and with-place-set place-set)
(and (eq scope 'buffer) (or with-place-set place-set)))
(format "\\setkomavar{place}{%s}\n"
(if (plist-get info :with-place) (plist-get info :place)
""))))
;; Folding marks. ;; Folding marks.
(and (funcall check-scope 'with-foldmarks) (and (funcall check-scope 'with-foldmarks)
(let ((foldmarks (plist-get info :with-foldmarks))) (let ((foldmarks (plist-get info :with-foldmarks)))