ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Jambunathan K 2011-08-28 02:01:40 +05:30
parent 2adfdac23b
commit fec6440a49
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/lisp/org-lparse.el
View File

@ -1291,7 +1291,9 @@ version."
(org-lparse-format-org-table lines nil) (org-lparse-format-org-table lines nil)
;; Table made by table.el ;; Table made by table.el
(or (org-lparse-format-table-table-using-table-generate-source (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)) (not org-export-prefer-native-exporter-for-tables))
;; We are here only when table.el table has NO col or row ;; We are here only when table.el table has NO col or row
;; spanning and the user prefers using org's own converter for ;; spanning and the user prefers using org's own converter for

3
contrib/lisp/org-xhtml.el
View File

@ -29,10 +29,9 @@
;;; Code: ;;; Code:
(require 'org-exp) (require 'org-exp)
(require 'org-html) ; FIXME; remove during merge
(require 'format-spec) (require 'format-spec)
(require 'org-lparse) (require 'org-lparse)
(eval-when-compile (require 'cl) (require 'table) (require 'browse-url)) (eval-when-compile (require 'cl) (require 'table) (require 'browse-url))
(declare-function org-id-find-id-file "org-id" (id)) (declare-function org-id-find-id-file "org-id" (id))