From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Goaziou Subject: Re: [patch] two bugs: one with comments and with exporting inline tasks Date: Thu, 04 Nov 2010 09:01:26 +0100 Message-ID: <87k4ktcyax.wl%n.goaziou@gmail.com> References: <87iq0gknpg.fsf@pinto.chemeng.ucl.ac.uk> <87pqunv83v.wl%n.goaziou@gmail.com> <87iq0fla93.fsf@ucl.ac.uk> <8739rjl3s6.fsf@ucl.ac.uk> <87mxppcz8r.wl%n.goaziou@gmail.com> <87lj59cyrz.wl%n.goaziou@gmail.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: multipart/mixed; boundary="Multipart_Thu_Nov__4_09:01:26_2010-1" Return-path: Received: from [140.186.70.92] (port=35796 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDulF-0003JB-Va for emacs-orgmode@gnu.org; Thu, 04 Nov 2010 04:01:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDulE-0007er-Rk for emacs-orgmode@gnu.org; Thu, 04 Nov 2010 04:01:29 -0400 Received: from mail-ww0-f41.google.com ([74.125.82.41]:35010) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDulE-0007ek-Kx for emacs-orgmode@gnu.org; Thu, 04 Nov 2010 04:01:28 -0400 Received: by wwi18 with SMTP id 18so78092wwi.0 for ; Thu, 04 Nov 2010 01:01:27 -0700 (PDT) In-Reply-To: <87lj59cyrz.wl%n.goaziou@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: Nicolas Goaziou Cc: Eric S Fraga , Emacs Org mode mailing list --Multipart_Thu_Nov__4_09:01:26_2010-1 Content-Type: text/plain; charset=US-ASCII Oh my... Here is the third (and hopefully final) version of the patch. Sorry for the noise. -- Nicolas --Multipart_Thu_Nov__4_09:01:26_2010-1 Content-Type: text/plain; type=patch; charset=US-ASCII Content-Disposition: attachment; filename="0001-inlinetasks-fix-latex-export-wrt-conversion-to-lists.patch" Content-Transfer-Encoding: 7bit >From a51b8a7919b935559a8716aa959851e7960d7ec4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Nov 2010 08:03:48 +0100 Subject: [PATCH] inlinetasks: fix latex export wrt conversion to lists * org-inlinetask.el (org-inlinetask-export-handler): Remove protection from @ so it can be removed during LaTeX export. --- lisp/org-inlinetask.el | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el index c000999..f3fcee9 100644 --- a/lisp/org-inlinetask.el +++ b/lisp/org-inlinetask.el @@ -183,15 +183,13 @@ Either remove headline and meta data, or do special formatting." (setq headline (concat (if (match-end 2) (concat - (org-add-props - (format - "@ %s@" - (if (member (match-string 2 headline) - org-done-keywords) - "done" "todo") - (match-string 2 headline) - (match-string 2 headline)) - nil 'org-protected t) + (format + "@ %s@" + (if (member (match-string 2 headline) + org-done-keywords) + "done" "todo") + (match-string 2 headline) + (match-string 2 headline)) " ") "") (match-string 4 headline))) (when content @@ -200,11 +198,11 @@ Either remove headline and meta data, or do special formatting." (if (string-match "[ \t\n]+\\'" content) (setq content (substring content 0 (match-beginning 0)))) (setq content (org-remove-indentation content)) - (if latexp (setq content (concat "\\quad \\\\\n" content))))) + (if latexp (setq content (concat "\\nbsp\\\\ \\quad " content))))) (insert (make-string (org-inlinetask-get-current-indentation) ?\ ) - "- ") + "- ") (setq indent (make-string (current-column) ?\ )) - (insert headline " ::") + (insert headline " :: ") (if content (insert (if htmlp " " (concat "\n" indent)) (mapconcat 'identity (org-split-string content "\n") -- 1.7.3.2 --Multipart_Thu_Nov__4_09:01:26_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_Thu_Nov__4_09:01:26_2010-1--