From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rasmus Subject: Re: [patch, koma-letter] Change of subject behavior Date: Thu, 19 Mar 2015 12:35:58 +0100 Message-ID: <87twxh9q3l.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> <878ueuv5rm.fsf@gmx.us> <873852125y.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYYkS-00027D-02 for emacs-orgmode@gnu.org; Thu, 19 Mar 2015 07:36:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYYkN-00076B-M5 for emacs-orgmode@gnu.org; Thu, 19 Mar 2015 07:36:23 -0400 Received: from plane.gmane.org ([80.91.229.3]:54478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYYkM-00075w-He for emacs-orgmode@gnu.org; Thu, 19 Mar 2015 07:36:19 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YYYkI-0003x9-Nz for emacs-orgmode@gnu.org; Thu, 19 Mar 2015 12:36:14 +0100 Received: from 46.166.186.234 ([46.166.186.234]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 19 Mar 2015 12:36:14 +0100 Received: from rasmus by 46.166.186.234 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 19 Mar 2015 12:36:14 +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: 8bit Hi Nicolas, Excellent comments. Thanks a lot! Nicolas Goaziou writes: > In this case, I suggest to change `org-koma-letter--special-headline' > into `org-koma-letter--special-tag' I agree. > Eventually, since you're only interested in the first special tag > encountered, it may be cleaner to exit early, e.g., Good idea. I did it slightly differently with a funcall, but perhaps it's slower (I have no idea). >> + (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 > ^^^^^^^^^^^^^^^^^^^^^^^^^ > (plist-get info :parse-tree) Thanks. I *knew* it was fishy. —Rasmus -- Hooray! --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0003-ox-koma-letter-Interpret-SUBJECT.patch >From 5f6832704d011b4b966b52c0dc1f6076f7af6ea7 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Wed, 18 Mar 2015 13:33:42 +0100 Subject: [PATCH 3/3] 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 33c8a1b..796b917 100644 --- a/contrib/lisp/ox-koma-letter.el +++ b/contrib/lisp/ox-koma-letter.el @@ -630,7 +630,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=0002-ox-koma-letter-Stricter-subject-inference.patch >From 6f042fd397e7f3f5b4844921800a68b3ba91c403 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Thu, 19 Mar 2015 12:10:30 +0100 Subject: [PATCH 2/3] ox-koma-letter: Stricter subject inference * ox-koma-letter.el (org-koma-letter--special-tag): New function. (org-koma-letter-headline): Use org-koma-letter--special-tag 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, 27 insertions(+), 14 deletions(-) diff --git a/contrib/lisp/ox-koma-letter.el b/contrib/lisp/ox-koma-letter.el index 23da930..33c8a1b 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'. @@ -553,19 +554,21 @@ 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 (org-koma-letter--special-tag headline info))) + (if (not special-tag) + contents + (push (cons special-tag contents) org-koma-letter-special-contents) + ""))) + +(defun org-koma-letter--special-tag (headline info) + "Non-nil if HEADLINE is a special headline. +INFO is a plist holding contextual information. Returns first +special tag headline." + (let ((special-tags (plist-get info :special-tags))) + (catch 'exit + (dolist (tag (org-export-get-tags headline info)) + (funcall (lambda (tag) (when tag (throw 'exit tag))) + (assoc-string tag special-tags)))))) ;;;; Template @@ -641,7 +644,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 (plist-get info :parse-tree) 'headline + (lambda (head) + (unless (org-koma-letter--special-tag head info) + (org-element-property :title head))) + info t)) + "") + info)) ;; Letter body. contents ;; Closing. -- 2.3.3 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-ox-koma-letter-Tiny-refactor.patch >From 1b74dac088535fc123005242236ea82417604b34 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Thu, 19 Mar 2015 12:10:08 +0100 Subject: [PATCH 1/3] ox-koma-letter: Tiny refactor ox-koma-letter.el (org-koma-letter--get-tagged-contents): Use assoc-string. --- contrib/lisp/ox-koma-letter.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/lisp/ox-koma-letter.el b/contrib/lisp/ox-koma-letter.el index 1b5dd17..23da930 100644 --- a/contrib/lisp/ox-koma-letter.el +++ b/contrib/lisp/ox-koma-letter.el @@ -453,8 +453,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. -- 2.3.3 --=-=-=--