From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jambunathan K Subject: [PATCH] Make org-xhtml and org-odt usable Date: Fri, 01 Jul 2011 17:34:23 +0530 Message-ID: <81tyb6xl4o.fsf@gmail.com> References: <87mxgyxry8.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([140.186.70.92]:33614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QccSR-0006Od-PP for emacs-orgmode@gnu.org; Fri, 01 Jul 2011 08:04:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QccSP-0003Rs-Kh for emacs-orgmode@gnu.org; Fri, 01 Jul 2011 08:04:27 -0400 Received: from mail-pv0-f169.google.com ([74.125.83.169]:62080) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QccSP-0003Rc-41 for emacs-orgmode@gnu.org; Fri, 01 Jul 2011 08:04:25 -0400 Received: by pvc12 with SMTP id 12so3298092pvc.0 for ; Fri, 01 Jul 2011 05:04:23 -0700 (PDT) In-Reply-To: <87mxgyxry8.fsf@gnu.org> (Bastien's message of "Fri, 01 Jul 2011 11:37:03 +0200") 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: Bastien Cc: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain Bastien > Dear all, > > I'm please to announce that Jambunathan's ODT exporter is now in the > contrib/ directory (in latest git repo) -- the files are here: > > contrib/odt/ > contrib/lisp/org-odt.el > contrib/lisp/org-lparse.el > contrib/lisp/org-xhtml.el > Thanks for accepting my contribution. I am happy to see my files land in the master repo. I am confident that these files will provide a good and stable framework for external exporters to plug in. > Jambunathan and I are still actively tuning this major addition, please > bare with us while we are making sure everything works as expected. The attached patch will make sure that the xhtml and odt exporter don't crash when invoked. Could you please apply this patch? --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Make-org-xhtml-and-org-odt-usable.patch >From d96a8f9e167abebe74cb23e5810f3556ed7a87e1 Mon Sep 17 00:00:00 2001 From: Jambunathan K Date: Fri, 1 Jul 2011 17:11:45 +0530 Subject: [PATCH] Make org-xhtml and org-odt usable * contrib/lisp/org-odt.el (org-odt-data-dir): Update to reflect new directory layout. * contrib/lisp/org-xhtml.el (org-export-xhtml-special-string-regexps): Define it. --- contrib/lisp/org-odt.el | 2 +- contrib/lisp/org-xhtml.el | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/contrib/lisp/org-odt.el b/contrib/lisp/org-odt.el index ad53204..c0b6491 100644 --- a/contrib/lisp/org-odt.el +++ b/contrib/lisp/org-odt.el @@ -70,7 +70,7 @@ (defconst org-odt-lib-dir (file-name-directory load-file-name)) (defconst org-odt-data-dir - (let ((dir1 (expand-file-name ".." org-odt-lib-dir)) ; git + (let ((dir1 (expand-file-name "../odt" org-odt-lib-dir)) ; git (dir2 (expand-file-name "./contrib/odt" org-odt-lib-dir))) ; elpa (cond ((file-directory-p dir1) dir1) diff --git a/contrib/lisp/org-xhtml.el b/contrib/lisp/org-xhtml.el index 7cdb936..fcc782c 100644 --- a/contrib/lisp/org-xhtml.el +++ b/contrib/lisp/org-xhtml.el @@ -44,6 +44,13 @@ :tag "Org Export HTML" :group 'org-export) +(defconst org-export-xhtml-special-string-regexps + '(("\\\\-" . "­") + ("---\\([^-]\\)" . "—\\1") + ("--\\([^-]\\)" . "–\\1") + ("\\.\\.\\." . "…")) + "Regular expressions for special string conversion.") + (defcustom org-export-xhtml-footnotes-section "

%s:

-- 1.7.2.3 --=-=-= Content-Type: text/plain Jambunathan K. -- --=-=-=--