diff --git a/contrib/lisp/org-koma-letter.el b/contrib/lisp/org-koma-letter.el index 58714d2..3094171 100644 --- a/contrib/lisp/org-koma-letter.el +++ b/contrib/lisp/org-koma-letter.el @@ -36,7 +36,9 @@ ;; `org-koma-letter-class-option-file'), "OPENING" (see ;; `org-koma-letter-opening'), "PHONE_NUMBER" (see ;; `org-koma-letter-phone-number'), "SIGNATURE" (see -;; `org-koma-letter-signature') and "TO_ADDRESS". +;; `org-koma-letter-signature'), "SUBJECT_TITLE" (see +;; `org-koma-letter-subject-title'), "PLACE" (see +;; `org-koma-letter-place'), and "TO_ADDRESS". ;; ;; You will need to add an appropriate association in ;; `org-e-latex-classes' in order to use the KOMA Scrlttr2 class. For @@ -106,6 +108,16 @@ :group 'org-export-koma-letter :type 'string) +(defcustom org-koma-letter-subject-title "Subject\\usekomavar{subjectseparator}" + "String used as the title for the subject." + :group 'org-export-koma-letter + :type 'string) + +(defcustom org-koma-letter-place nil + "Sender's location, as a string." + :group 'org-export-koma-letter + :type 'string) + ;;; Define Back-End @@ -116,7 +128,9 @@ (:lco "LCO" nil org-koma-letter-class-option-file) (:opening "OPENING" nil org-koma-letter-opening) (:phone-number "PHONE_NUMBER" nil org-koma-letter-phone-number) - (:signature "SIGNATURE" nil nil newline) + (:signature "SIGNATURE" nil org-koma-letter-signature newline) + (:subject-title "SUBJECT_TITLE" nil org-koma-letter-subject-title) + (:place "PLACE" nil org-koma-letter-place) (:to-address "TO_ADDRESS" nil nil newline)) :translate-alist ((export-block . org-koma-letter-export-block) (export-snippet . org-koma-letter-export-snippet) @@ -205,14 +219,18 @@ holding export options." (format "\\setkomavar{fromemail}{%s}\n" (org-export-data (plist-get info :email) info)) (format "\\setkomavar{fromphone}{%s}\n" (plist-get info :phone-number)) - ;; Date. + ;; Place + (let ((place (plist-get info :place))) + (when place + (format "\\setkomavar{place}{%s}\n" place))) + ;; Date (format "\\date{%s}\n" (org-export-data (plist-get info :date) info)) ;; Letter Class Option File (format "\\LoadLetterOption{%s}\n" (plist-get info :lco)) ;; Letter start. "\\begin{document}\n\n" - (format "\\setkomavar{subject}{%s}\n\n" - (org-export-data (plist-get info :title) info)) + (format "\\setkomavar{subject}[%s]{%s}\n\n" + (plist-get info :subject-title) (org-export-data (plist-get info :title) info)) (format "\\begin{letter}{%%\n%s}\n\n" (or (plist-get info :to-address) "no address given")) ;; Opening. (format "\\opening{%s}\n\n" (plist-get info :opening))