ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ox-koma-letter: Small refactoring 

* contrib/lisp/ox-koma-letter.el (org-koma-letter-template): Add
  comments.
(org-koma-letter--build-settings): Rename internal bindings and
reorder insertion.
This commit is contained in:
Nicolas Goaziou 2014-01-17 10:39:05 +01:00
parent c174bf2a5c
commit aa1019cd9a
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
contrib/lisp/ox-koma-letter.el
View File

@ -558,9 +558,11 @@ holding export options."
(concat (org-element-normalize-string (plist-get info :latex-header)) (concat (org-element-normalize-string (plist-get info :latex-header))
(plist-get info :latex-header-extra))))) (plist-get info :latex-header-extra)))))
info))) info)))
;; Settings. They can come from three locations: global variables, ;; Settings. They can come from three locations, in increasing
;; LCO files and in-buffer settings. We prioritize them in that ;; order of precedence: global variables, LCO files and in-buffer
;; order. ;; settings. Thus, we first insert settings coming from global
;; variables, then we insert LCO files, and, eventually, we insert
;; settings coming from buffer keywords.
(org-koma-letter--build-settings 'global info) (org-koma-letter--build-settings 'global info)
(mapconcat #'(lambda (file) (format "\\LoadLetterOption{%s}\n" file)) (mapconcat #'(lambda (file) (format "\\LoadLetterOption{%s}\n" file))
(org-split-string (or (plist-get info :lco) "") " ") (org-split-string (or (plist-get info :lco) "") " ")
@ -602,52 +604,56 @@ holding export options."
;; Document end. ;; Document end.
"\n\\end{document}")) "\n\\end{document}"))
(defun org-koma-letter--build-settings (type info) (defun org-koma-letter--build-settings (scope info)
"Build settings string according to type. "Build settings string according to type.
Type is either `global' or `buffer'. INFO is a plist used as SCOPE is either `global' or `buffer'. INFO is a plist used as
a communication channel." a communication channel."
(let ((check-validity (let ((check-scope
(function (function
;; Non-nil value when SETTING is a valid TYPE setting. ;; Non-nil value when SETTING was defined in SCOPE.
(lambda (setting) (lambda (setting)
(let ((property (intern (format ":inbuffer-%s" setting)))) (let ((property (intern (format ":inbuffer-%s" setting))))
(if (eq type 'global) (if (eq scope 'global)
(eq (plist-get info property) 'koma-letter:empty) (eq (plist-get info property) 'koma-letter:empty)
(not (eq (plist-get info property) 'koma-letter:empty)))))))) (not (eq (plist-get info property) 'koma-letter:empty))))))))
(concat (concat
;; Variables. ;; Name.
(let ((author (plist-get info :author))) (let ((author (plist-get info :author)))
(and author (and author
(funcall check-validity 'author) (funcall check-scope 'author)
(format "\\setkomavar{fromname}{%s}\n" (format "\\setkomavar{fromname}{%s}\n"
(org-export-data author info)))) (org-export-data author info))))
;; Email.
(let ((email (plist-get info :email))) (let ((email (plist-get info :email)))
(and email (and email
(funcall check-validity 'email) (funcall check-scope 'email)
(format "\\setkomavar{fromemail}{%s}\n" email))) (format "\\setkomavar{fromemail}{%s}\n" email)))
(let ((phone-number (plist-get info :phone-number))) (and (funcall check-scope 'with-email)
(and (org-string-nw-p phone-number)
(funcall check-validity 'phone-number)
(format "\\setkomavar{fromphone}{%s}\n" phone-number)))
(let ((signature (plist-get info :signature)))
(and (org-string-nw-p signature)
(funcall check-validity 'signature)
(format "\\setkomavar{signature}{%s}\n" signature)))
;; Options.
(and (funcall check-validity 'with-backaddress)
(format "\\KOMAoption{backaddress}{%s}\n"
(if (plist-get info :with-backaddress) "true" "false")))
(and (funcall check-validity 'with-email)
(format "\\KOMAoption{fromemail}{%s}\n" (format "\\KOMAoption{fromemail}{%s}\n"
(if (plist-get info :with-email) "true" "false"))) (if (plist-get info :with-email) "true" "false")))
(and (funcall check-validity 'with-phone) ;; Phone number.
(let ((phone-number (plist-get info :phone-number)))
(and (org-string-nw-p phone-number)
(funcall check-scope 'phone-number)
(format "\\setkomavar{fromphone}{%s}\n" phone-number)))
(and (funcall check-scope 'with-phone)
(format "\\KOMAoption{fromphone}{%s}\n" (format "\\KOMAoption{fromphone}{%s}\n"
(if (plist-get info :with-phone) "true" "false"))) (if (plist-get info :with-phone) "true" "false")))
;; Special cases: place and foldmarks. ;; Signature.
(and (funcall check-validity 'place) (let ((signature (plist-get info :signature)))
(and (org-string-nw-p signature)
(funcall check-scope 'signature)
(format "\\setkomavar{signature}{%s}\n" signature)))
;; Back address.
(and (funcall check-scope 'with-backaddress)
(format "\\KOMAoption{backaddress}{%s}\n"
(if (plist-get info :with-backaddress) "true" "false")))
;; Place.
(and (funcall check-scope 'place)
(format "\\setkomavar{place}{%s}\n" (format "\\setkomavar{place}{%s}\n"
(if (plist-get info :with-place) (plist-get info :place) ""))) (if (plist-get info :with-place) (plist-get info :place) "")))
(and (funcall check-validity 'with-foldmarks) ;; Folding marks.
(and (funcall check-scope 'with-foldmarks)
(let ((foldmarks (plist-get info :with-foldmarks))) (let ((foldmarks (plist-get info :with-foldmarks)))
(cond (cond
((symbolp foldmarks) ((symbolp foldmarks)