HTML export: moved functions to separate file.

Makefile

@@ -77,6 +77,7 @@ LISPF      = 	org.el			\
 		org-faces.el		\
 		org-footnote.el		\
 		org-gnus.el		\
+		org-html.el		\
 		org-icalendar.el	\
 		org-id.el		\
 		org-info.el		\
@@ -334,6 +335,7 @@ lisp/org-docbook.elc:      lisp/org.el lisp/org-exp.el
 lisp/org-faces.elc:        lisp/org-macs.el lisp/org-compat.el
 lisp/org-footnotes.elc:    lisp/org-macs.el lisp/org-compat.el
 lisp/org-gnus.elc:         lisp/org.el
+lisp/org-html.elc:         lisp/org-exp.el
 lisp/org-icalendar.elc:    lisp/org-exp.el
 lisp/org-id.elc:           lisp/org.el
 lisp/org-info.elc:         lisp/org.el

lisp/ChangeLog

@@ -1,5 +1,7 @@
 2009-04-07  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-html.el: New file, split out from org-exp.el.
+
 	* org-icalendar.el: New file, split out from org-exp.el.
 
 	* org-xoxo.el: New file, split out from org-exp.el.

lisp/org-ascii.el

@@ -394,7 +394,6 @@ underlined headlines.  The default is 3."
 	(setq line (replace-match "" nil nil line))))
   line)
 
-
 (defun org-export-ascii-wrap (line where)
   "Wrap LINE at or before WHERE."
   (let ((ind (org-get-indentation line))

lisp/org-docbook.el

@@ -76,6 +76,7 @@
 (require 'footnote)
 (require 'org)
 (require 'org-exp)
+(require 'org-html)
 
 ;;; Variables:
 

lisp/org-jsinfo.el

@@ -41,6 +41,7 @@
 ;;; Code:
 
 (require 'org-exp)
+(require 'org-html)
 
 (add-to-list 'org-export-inbuffer-options-extra '("INFOJS_OPT" :infojs-opt))
 (add-hook 'org-export-options-filters 'org-infojs-handle-options)

lisp/org-macs.el

@@ -233,6 +233,24 @@ This is in contrast to merely setting it to 0."
       (setq plist (cddr plist)))
     p))
 
+(defun org-create-multibrace-regexp (left right n)
+  "Create a regular expression which will match a balanced sexp.
+Opening delimiter is LEFT, and closing delimiter is RIGHT, both given
+as single character strings.
+The regexp returned will match the entire expression including the
+delimiters.  It will also define a single group which contains the
+match except for the outermost delimiters.  The maximum depth of
+stacked delimiters is N.  Escaping delimiters is not possible."
+  (let* ((nothing (concat "[^" left right "]*?"))
+	 (or "\\|")
+	 (re nothing)
+	 (next (concat "\\(?:" nothing left nothing right "\\)+" nothing)))
+    (while (> n 1)
+      (setq n (1- n)
+	    re (concat re or next)
+	    next (concat "\\(?:" nothing left next right "\\)+" nothing)))
+    (concat left "\\(" re "\\)" right)))
+
 (provide 'org-macs)
 
 ;; arch-tag: 7e6a73ce-aac9-4fc0-9b30-ce6f89dc6668

lisp/org.el

@@ -2919,22 +2919,19 @@ If TABLE-TYPE is non-nil, also check for table.el-type tables."
 (eval-and-compile
   (org-autoload "org-exp"
 		'(org-export org-export-visible
-   org-insert-export-options-template org-export-as-html-and-open
-   org-export-as-html-batch org-export-as-html-to-buffer
-   org-replace-region-by-html org-export-region-as-html
-   org-export-as-html 
-   org-table-clean-before-export
-   )))
-
-(eval-and-compile
+			     org-insert-export-options-template  
+			     org-table-clean-before-export))
   (org-autoload "org-ascii"
-		'(org-export-as-ascii org-export-ascii-preprocess)))
-(eval-and-compile
+		'(org-export-as-ascii org-export-ascii-preprocess))
+  (org-autoload "org-html"
+		'(org-export-as-html-and-open
+		  org-export-as-html-batch org-export-as-html-to-buffer
+		  org-replace-region-by-html org-export-region-as-html
+		  org-export-as-html))
   (org-autoload "org-icalendar"
 		'(org-export-icalendar-this-file
 		  org-export-icalendar-all-agenda-files
-		  org-export-icalendar-combine-agenda-files)))
-(eval-and-compile
+		  org-export-icalendar-combine-agenda-files))
   (org-autoload "org-xoxo" '(org-export-as-xoxo)))
 
 ;; Declare and autoload functions from org-agenda.el
@@ -14733,7 +14730,7 @@ With optional NODE, go directly to that node."
   (interactive)
   (mapc 'require
 	'(org-agenda org-archive org-ascii org-attach org-clock org-colview
-		     org-docbook org-exp org-export-latex org-icalendar
+		     org-docbook org-exp org-export-latex org-html org-icalendar
 		     org-id org-publish org-remember org-table
 		     org-timer org-xoxo)))