From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Goaziou Subject: [PATCH] comments exporting Date: Mon, 14 Jun 2010 22:07:35 +0200 Message-ID: <87iq5ltm2g.wl%n.goaziou@gmail.com> References: <87ljaitszr.wl%n.goaziou@gmail.com> <87d3vtwmdg.fsf@gmail.com> <87mxuxiixc.fsf@gmail.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: multipart/mixed; boundary="Multipart_Mon_Jun_14_22:07:35_2010-1" Return-path: Received: from [140.186.70.92] (port=36628 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOFwa-0008AP-T1 for emacs-orgmode@gnu.org; Mon, 14 Jun 2010 16:07:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OOFwZ-0000HU-M3 for emacs-orgmode@gnu.org; Mon, 14 Jun 2010 16:07:40 -0400 Received: from mail-wy0-f169.google.com ([74.125.82.169]:34663) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OOFwZ-0000HG-HO for emacs-orgmode@gnu.org; Mon, 14 Jun 2010 16:07:39 -0400 Received: by wyf28 with SMTP id 28so4588253wyf.0 for ; Mon, 14 Jun 2010 13:07:38 -0700 (PDT) In-Reply-To: <87mxuxiixc.fsf@gmail.com> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Eric Schulte Cc: emacs-orgmode@gnu.org --Multipart_Mon_Jun_14_22:07:35_2010-1 Content-Type: text/plain; charset=US-ASCII >>>>> Eric Schulte writes: > A potentially related issue, > The following org-mode snippet doesn't export correctly to latex, > presumably because of protection issues similar to those addressed in > your patch. Any ideas? > --8<---------------cut here---------------start------------->8--- > ** comments not commented > # $some stuff > # some more stuff$ -- I should be a comment line > --8<---------------cut here---------------end--------------->8--- Yes. Actually, the latex stuff is processed before taking care of comments (one of the last actions in every exporter). So the $...$ snippet is matched by org-latex and protected. This patch removes protection check from comment deletion : something in comment must not be exported anyway. I don't see any corner case right now. >> This patch looks great. Since it's >10 lines long, I must ask if you've >> signed the FSF papers for contributions to Emacs? If not is that >> something you're willing to do? I have sent the signed papers last Wednesday (I had to since my patch for org-babel-asymptote). I'm now waiting for their mail. Regards, -- Nicolas --Multipart_Mon_Jun_14_22:07:35_2010-1 Content-Type: application/octet-stream; type=patch Content-Disposition: attachment; filename="0001-Fix-comments-export-in-latex.patch" Content-Transfer-Encoding: 7bit >From 39ba2f56b2e865c3c73352184aa9b7e891e09a5c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 14 Jun 2010 21:54:08 +0200 Subject: [PATCH] Fix comments export in latex. * lisp/org-exp.el: comment regexp now matches documentation. No more protection check when deleting comments before export. --- lisp/org-exp.el | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 915e1f5..25ec663 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -1637,7 +1637,7 @@ table line. If it is a link, add it to the line containing the link." "Remove comments, or convert to backend-specific format. COMMENTSP can be a format string for publishing comments. When it is nil, all comments will be removed." - (let ((re "^\\(#\\|[ \t]*#\\+\\)\\(.*\n?\\)") + (let ((re "^\\(#\\|[ \t]*#\\+ \\)\\(.*\n?\\)") pos) (goto-char (point-min)) (while (or (looking-at re) @@ -1649,9 +1649,8 @@ When it is nil, all comments will be removed." (match-beginning 0) (match-end 0) '(org-protected t)) (replace-match (format commentsp (match-string 2)) t t)) (goto-char (1+ pos)) - (org-if-unprotected - (replace-match "") - (goto-char (max (point-min) (1- pos)))))))) + (replace-match "") + (goto-char (max (point-min) (1- pos))))))) (defun org-export-mark-radio-links () "Find all matches for radio targets and turn them into internal links." -- 1.7.1 --Multipart_Mon_Jun_14_22:07:35_2010-1 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode --Multipart_Mon_Jun_14_22:07:35_2010-1--