From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: Re: [BUG] nested blocks aren't protected on export Date: Mon, 28 Jun 2010 08:37:33 +0200 Message-ID: References: <876316cz9g.fsf@gmail.com> <8739w7ane7.fsf@gmail.com> Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from [140.186.70.92] (port=40073 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OT8bO-0003db-LC for emacs-orgmode@gnu.org; Mon, 28 Jun 2010 03:18:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OT8bN-0005FL-Cc for emacs-orgmode@gnu.org; Mon, 28 Jun 2010 03:17:58 -0400 Received: from mail-ww0-f41.google.com ([74.125.82.41]:50235) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OT8bN-0005Er-6P for emacs-orgmode@gnu.org; Mon, 28 Jun 2010 03:17:57 -0400 Received: by mail-ww0-f41.google.com with SMTP id 26so2652887wwf.0 for ; Mon, 28 Jun 2010 00:17:56 -0700 (PDT) In-Reply-To: <8739w7ane7.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: Org Mode Hi Eric, On Jun 28, 2010, at 4:42 AM, Eric Schulte wrote: > I've put together two patches which fix the problems I mention below. > > I'd like to apply these patches, but I fear that they may cause > unanticipated export problems. I'd be much more comfortable if > someone > who knows a little more about the exporters could take a look at > these. > > Thanks -- Eric > > From 47fcfd522294560dbe01f00b640631964e063cf0 Mon Sep 17 00:00:00 2001 > From: Eric Schulte > Date: Sun, 27 Jun 2010 19:35:34 -0700 > Subject: [PATCH 1/2] org-exp: check for protection before removing > comments > > * lisp/org-exp.el (org-export-handle-comments): check for protection > before removing comments > --- > lisp/org-exp.el | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/lisp/org-exp.el b/lisp/org-exp.el > index 704c0b7..411557a 100644 > --- a/lisp/org-exp.el > +++ b/lisp/org-exp.el > @@ -1650,8 +1650,10 @@ 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)) > - (replace-match "") > - (goto-char (max (point-min) (1- pos))))))) > + (org-if-unprotected > + (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.0.4 The above patch looks definitely right to me. In fact, I think the org-if-unprotected should be around the entire content of the while loop - with an additional fix to make sure search is resumed not from the beginning of location of a match that has not been processed, that would create in infinite loop. > > From d422f564163e37c51d0727e2992b24b85caf54ea Mon Sep 17 00:00:00 2001 > From: Eric Schulte > Date: Sun, 27 Jun 2010 19:36:14 -0700 > Subject: [PATCH 2/2] org-latex: check for protection before wrapping > ": " lines as verbatim > > * lisp/org-latex.el (org-export-latex-fixed-width): check for > protection before wrapping ": " lines as verbatim > --- > lisp/org-latex.el | 28 ++++++++++++++-------------- > 1 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/lisp/org-latex.el b/lisp/org-latex.el > index 01a4b05..94f04e6 100644 > --- a/lisp/org-latex.el > +++ b/lisp/org-latex.el > @@ -1537,20 +1537,20 @@ The conversion is made depending of STRING- > BEFORE and STRING-AFTER." > "When OPT is non-nil convert fixed-width sections to LaTeX." > (goto-char (point-min)) > (while (re-search-forward "^[ \t]*:\\([ \t]\\|$\\)" nil t) > - (if opt > - (progn (goto-char (match-beginning 0)) > - (insert "\\begin{verbatim}\n") > - (while (looking-at "^\\([ \t]*\\):\\(\\([ \t]\\|$\\).*\\)$") > - (replace-match (concat (match-string 1) > - (match-string 2)) t t) > - (forward-line)) > - (insert "\\end{verbatim}\n\n")) > - (progn (goto-char (match-beginning 0)) > - (while (looking-at "^\\([ \t]*\\):\\(\\([ \t]\\|$\\).*\\)$") > - (replace-match (concat "%" (match-string 1) > - (match-string 2)) t t) > - (forward-line)))))) > - > + (org-if-unprotected > + (if opt > + (progn (goto-char (match-beginning 0)) > + (insert "\\begin{verbatim}\n") > + (while (looking-at "^\\([ \t]*\\):\\(\\([ \t]\\|$\\).*\\)$") > + (replace-match (concat (match-string 1) > + (match-string 2)) t t) > + (forward-line)) > + (insert "\\end{verbatim}\n\n")) > + (progn (goto-char (match-beginning 0)) > + (while (looking-at "^\\([ \t]*\\):\\(\\([ \t]\\|$\\).*\\)$") > + (replace-match (concat "%" (match-string 1) > + (match-string 2)) t t) > + (forward-line))))))) > > (defvar org-table-last-alignment) ; defined in org-table.el > (defvar org-table-last-column-widths) ; defined in org-table.el > -- > 1.7.0.4 I am not quite certain why this second patch is needed? - Carsten