From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rasmus Subject: Re: [patch, koma-letter] Change of subject behavior Date: Wed, 18 Mar 2015 13:39:41 +0100 Message-ID: <878ueuv5rm.fsf@gmx.us> References: <87d247h6eo.fsf@gmx.us> <87wq2f1gqz.fsf@nicolasgoaziou.fr> <87mw3bdyv4.fsf@gmx.us> <87bnjr1au0.fsf@nicolasgoaziou.fr> <877fufdwf0.fsf@gmx.us> <877fue1qjm.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYDGH-00026S-40 for emacs-orgmode@gnu.org; Wed, 18 Mar 2015 08:39:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYDGD-0003nJ-O7 for emacs-orgmode@gnu.org; Wed, 18 Mar 2015 08:39:49 -0400 Received: from mout.gmx.net ([212.227.17.21]:55835) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYDGD-0003n8-EA for emacs-orgmode@gnu.org; Wed, 18 Mar 2015 08:39:45 -0400 Received: from x200s ([84.89.157.39]) by mail.gmx.com (mrgmx102) with ESMTPSA (Nemesis) id 0Lz0aC-1ZcE7M0TdA-014Chu for ; Wed, 18 Mar 2015 13:39:44 +0100 In-Reply-To: <877fue1qjm.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Wed, 18 Mar 2015 12:41:17 +0100") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Nicolas Goaziou writes: >> I have only tested the patch briefly as I need to actually produce a >> letter. But for the letter I'm writing export works fine. > > You sent a wrong patch. Ups. Let's try again. In the second patch I fix the no interpretation of #+SUBJECT. =E2=80=94Rasmus --=20 Lasciate ogni speranza, voi che leggete questo. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-ox-koma-letter-Interpret-SUBJECT.patch >From 0d8e0f21f3c120afef3e08628962f7fa99337aef Mon Sep 17 00:00:00 2001 From: Rasmus Date: Wed, 18 Mar 2015 13:33:42 +0100 Subject: [PATCH 2/2] ox-koma-letter: Interpret #+SUBJECT. * ox-koma-letter.el (org-koma-letter-template): Interpret #+SUBJECT. --- contrib/lisp/ox-koma-letter.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/lisp/ox-koma-letter.el b/contrib/lisp/ox-koma-letter.el index d7572b5..e7be56a 100644 --- a/contrib/lisp/ox-koma-letter.el +++ b/contrib/lisp/ox-koma-letter.el @@ -626,7 +626,11 @@ 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 (plist-get info :subject) info))) + (org-export-data + (org-element-parse-secondary-string + (plist-get info :subject) + (org-element-restriction 'keyword)) + info))) (title* (and (plist-get info :with-title) (org-string-nw-p (org-export-data (plist-get info :title) info)))) -- 2.3.3 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-ox-koma-letter-Stricter-subject-inference.patch >From a7289286b0b02310b4e3f714fc7047f7af7a027c Mon Sep 17 00:00:00 2001 From: Rasmus Date: Tue, 17 Mar 2015 18:32:26 +0100 Subject: [PATCH 1/2] ox-koma-letter: Stricter subject inference * ox-koma-letter.el (org-koma-letter--special-headline): New function. (org-koma-letter--get-tagged-contents): Refactor (org-koma-letter-headline): Use org-koma-letter--special-headline and do not guess opening. (org-koma-letter-template): Directly infer subject from first non-special headline. --- contrib/lisp/ox-koma-letter.el | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/contrib/lisp/ox-koma-letter.el b/contrib/lisp/ox-koma-letter.el index 1b5dd17..d7572b5 100644 --- a/contrib/lisp/ox-koma-letter.el +++ b/contrib/lisp/ox-koma-letter.el @@ -412,6 +412,7 @@ was not present." (:with-place nil "place" org-koma-letter-use-place) (:with-subject nil "subject" org-koma-letter-subject-format) (:with-title-as-subject nil "title-subject" org-koma-letter-prefer-subject) + (:with-headline-opening nil nil org-koma-letter-headline-is-opening-maybe) ;; Special properties non-nil when a setting happened in buffer. ;; They are used to prioritize in-buffer settings over "lco" ;; files. See `org-koma-letter-template'. @@ -453,8 +454,8 @@ was not present." (defun org-koma-letter--get-tagged-contents (key) "Get contents from a headline tagged with KEY. The contents is stored in `org-koma-letter-special-contents'." - (cdr (assoc (org-koma-letter--get-value key) - org-koma-letter-special-contents))) + (cdr (assoc-string (org-koma-letter--get-value key) + org-koma-letter-special-contents))) (defun org-koma-letter--get-value (value) "Turn value into a string whenever possible. @@ -553,19 +554,17 @@ Note that if a headline is tagged with a tag from `org-koma-letter-special-tags' it will not be exported, but stored in `org-koma-letter-special-contents' and included at the appropriate place." - (unless (let ((tag (car (org-export-get-tags headline info)))) - (and tag - (member-ignore-case - tag (mapcar #'symbol-name (plist-get info :special-tags))) - ;; Store association for later use and bail out. - (push (cons tag contents) org-koma-letter-special-contents))) - ;; Opening is not defined yet: use headline's title. - (when (and org-koma-letter-headline-is-opening-maybe - (not (org-string-nw-p (plist-get info :opening)))) - (plist-put info :opening - (org-export-data (org-element-property :title headline) info))) - ;; In any case, insert contents in letter's body. - contents)) + (let ((special-tag (car (org-koma-letter--special-headline headline info)))) + (if special-tag + (progn (push (cons special-tag contents) org-koma-letter-special-contents) + "") + contents))) + +(defun org-koma-letter--special-headline (headline info) + "Nonnil if HEADLINE is a special headline." + (let ((special-tags (plist-get info :special-tags))) + (mapcar (lambda (tag) (assoc-string tag special-tags)) + (org-export-get-tags headline info)))) ;;;; Template @@ -641,7 +640,17 @@ holding export options." (format "\\begin{letter}{%%\n%s}\n\n" (org-koma-letter--determine-to-and-from info 'to)) ;; Opening. - (format "\\opening{%s}\n\n" (plist-get info :opening)) + (format "\\opening{%s}\n\n" + (org-export-data + (or (org-string-nw-p (plist-get info :opening)) + (when (plist-get info :with-headline-opening) + (org-element-map (org-element-parse-buffer) 'headline + (lambda (head) + (unless (org-koma-letter--special-headline head info) + (org-element-property :title head))) + info t)) + "") + info)) ;; Letter body. contents ;; Closing. -- 2.3.3 --=-=-=--