From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Goaziou Subject: Re: [PATCH] Unwanted #+ATTR_Backend and #+Backend stuff (v.2) Date: Wed, 30 Jun 2010 15:18:30 +0200 Message-ID: <87oceshd5l.wl%n.goaziou@gmail.com> References: <87ljaa997e.wl%n.goaziou@gmail.com> <87tyosqzfv.wl%dmaus@ictsoc.de> <87ocf0ck7z.fsf@gmx.de> <87631280by.fsf@gmx.de> <87tyokhku9.wl%n.goaziou@gmail.com> <87tyok67h7.fsf@gmx.de> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: multipart/mixed; boundary="Multipart_Wed_Jun_30_15:18:14_2010-1" Return-path: Received: from [140.186.70.92] (port=48068 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OTxBb-0005xs-PA for emacs-orgmode@gnu.org; Wed, 30 Jun 2010 09:18:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OTxBZ-0002cn-Lg for emacs-orgmode@gnu.org; Wed, 30 Jun 2010 09:18:43 -0400 Received: from mail-wy0-f169.google.com ([74.125.82.169]:38850) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OTxBZ-0002cd-D2 for emacs-orgmode@gnu.org; Wed, 30 Jun 2010 09:18:41 -0400 Received: by wyb39 with SMTP id 39so944211wyb.0 for ; Wed, 30 Jun 2010 06:18:40 -0700 (PDT) In-Reply-To: <87tyok67h7.fsf@gmx.de> 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: Sebastian Rose Cc: Org Mode List --Multipart_Wed_Jun_30_15:18:14_2010-1 Content-Type: text/plain; charset=US-ASCII >>>>> Sebastian Rose writes: > Ahhh - it nearly does! > But look at this: > --8<---------------cut here---------------start------------->8-- > *Tempolauf* > #+ATTR_HTML: style="margin-left:auto;margin-right:auto;text-align:center;" > | Z | Station | Meter | Etappe | Zeit | Rnd. | Pace Rnd. | Pace | > |----+------------------+-------+--------+-------+-------+-----------+------| > --8<---------------cut here---------------end--------------->8-- > Becomes: > --8<---------------cut here---------------start------------->8-- > Tempolauf > style="margin-left:auto;margin-right:auto;text-align:center;" >

> --8<---------------cut here---------------end--------------->8-- > The `style...' part must be trimmed and go inside the `
' tag. Yes, my patch was a bit aggressive. See my next try. > Also, in this test: > [...] > the second last `#+CAPTION: removed' is NOT removed. That, my first patch about captions should have taken care of it. Here is another try on this one. Please tell me if it is working. It contains both fixes (captions and attr) so there shouldn't be the need of a previous patch. Regards, -- Nicolas --Multipart_Wed_Jun_30_15:18:14_2010-1 Content-Type: text/plain; type=patch; charset=US-ASCII Content-Disposition: attachment; filename="0001-Remove-unwanted-ATTR_Backend-and-Backend-during-expo.patch" Content-Transfer-Encoding: 7bit >From 76840002404838757a6a31bbfb1e2bdc2564045a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 30 Jun 2010 12:28:32 +0200 Subject: [PATCH] Remove unwanted #+ATTR_Backend and #+Backend during export. * lisp/org-exp.el: (org-export-select-backend-specific-text) Properly get rid of #+Backend and #+ATTR_Backend specifics to backends not matching the one we're exporting to. --- lisp/org-exp.el | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 54afdac..d7a9e19 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -1526,15 +1526,25 @@ from the buffer." (while formatters (setq fmt (pop formatters)) - (when (eq (car fmt) backend) - ;; This is selected code, put it into the file for real - (goto-char (point-min)) - (while (re-search-forward (concat "^\\([ \t]*\\)#\\+" (cadr fmt) - ":[ \t]*\\(.*\\)") nil t) + ;; Handle #+Backend: stuff + (goto-char (point-min)) + (while (re-search-forward (concat "^\\([ \t]*\\)#\\+" (cadr fmt) + ":[ \t]*\\(.*\\)") nil t) + (if (not (eq (car fmt) backend)) + (delete-region (point-at-bol) (min (1+ (point-at-eol)) (point-max))) (replace-match "\\1\\2" t) (add-text-properties (point-at-bol) (min (1+ (point-at-eol)) (point-max)) '(org-protected t)))) + ;; Delete #+attr_Backend: stuff of another backend. Those + ;; matching the current backend will be taken care of by + ;; `org-export-attach-captions-and-attributes' + (goto-char (point-min)) + (while (re-search-forward (concat "^\\([ \t]*\\)#\\+attr_" (cadr fmt) + ":[ \t]*\\(.*\\)") nil t) + (when (not (eq (car fmt) backend)) + (delete-region (point-at-bol) (min (1+ (point-at-eol)) (point-max))))) + ;; Handle #+begin_Backend and #+end_Backend stuff (goto-char (point-min)) (while (re-search-forward (concat "^[ \t]*#\\+" (caddr fmt) "\\>.*\n?") nil t) @@ -1598,11 +1608,17 @@ table line. If it is a link, add it to the line containing the link." (while (re-search-forward re nil t) (cond ((match-end 1) - (setq cap (concat cap (if cap " " "") (org-trim (match-string 1))))) + (progn + (setq cap (concat cap (if cap " " "") (org-trim (match-string 1)))) + (delete-region (point-at-bol) (min (1+ (point-at-eol)) (point-max))))) ((match-end 2) - (setq attr (concat attr (if attr " " "") (org-trim (match-string 2))))) + (progn + (setq attr (concat attr (if attr " " "") (org-trim (match-string 2)))) + (delete-region (point-at-bol) (min (1+ (point-at-eol)) (point-max))))) ((match-end 3) - (setq label (org-trim (match-string 3)))) + (progn + (setq label (org-trim (match-string 3))) + (delete-region (point-at-bol) (min (1+ (point-at-eol)) (point-max))))) (t (setq end (if (match-end 4) (let ((ee (org-table-end))) -- 1.7.1.1 --Multipart_Wed_Jun_30_15:18:14_2010-1 Content-Type: text/plain; charset=US-ASCII --Multipart_Wed_Jun_30_15:18:14_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_Wed_Jun_30_15:18:14_2010-1--