From fec6440a49100a024f2b25897a091e96f8ce377c Mon Sep 17 00:00:00 2001 From: Jambunathan K Date: Sun, 28 Aug 2011 02:01:40 +0530 Subject: [PATCH] Fix some issues with org-xhtml export * contrib/lisp/org-xhtml.el: require html (temporarily). This makes sure that variables such as org-export-html-extension etc referenced in org-exp.el and made available through opt-plist are properly inited. Can be removed once the org-export-xhtml namespace is annihilated. * contrib/lisp/org-lparse.el (org-lparse-format-table): Export of table.el tables were broken. Fix it. Can be removed once the xhtml backend is annihilated. --- contrib/lisp/org-lparse.el | 4 +++- contrib/lisp/org-xhtml.el | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/lisp/org-lparse.el b/contrib/lisp/org-lparse.el index bf3f1f8ea..fd0488b31 100755 --- a/contrib/lisp/org-lparse.el +++ b/contrib/lisp/org-lparse.el @@ -1291,7 +1291,9 @@ version." (org-lparse-format-org-table lines nil) ;; Table made by table.el (or (org-lparse-format-table-table-using-table-generate-source - org-lparse-backend olines + ;; FIXME: Need to take care of this during merge + (if (eq org-lparse-backend 'xhtml) 'html org-lparse-backend) + olines (not org-export-prefer-native-exporter-for-tables)) ;; We are here only when table.el table has NO col or row ;; spanning and the user prefers using org's own converter for diff --git a/contrib/lisp/org-xhtml.el b/contrib/lisp/org-xhtml.el index 3466b6264..1a1f5cb57 100644 --- a/contrib/lisp/org-xhtml.el +++ b/contrib/lisp/org-xhtml.el @@ -29,10 +29,9 @@ ;;; Code: (require 'org-exp) +(require 'org-html) ; FIXME; remove during merge (require 'format-spec) - (require 'org-lparse) - (eval-when-compile (require 'cl) (require 'table) (require 'browse-url)) (declare-function org-id-find-id-file "org-id" (id))