diff options
author | Carsten Dominik <carsten.dominik@gmail.com> | 2009-05-04 16:19:44 +0200 |
---|---|---|
committer | Carsten Dominik <carsten.dominik@gmail.com> | 2009-05-04 16:21:59 +0200 |
commit | 2207baf34c4dff385f950f3e2a765ef74d20322d (patch) | |
tree | 5c38b3f2eb47caeff0bd655e7c56fd461b9981b6 | |
parent | 12ec4f4b67435c173e9190d64c582c7ae80002c4 (diff) | |
download | org-mode-2207baf34c4dff385f950f3e2a765ef74d20322d.tar.gz |
HTML export: Fix col and colgroup tags
Patch by Sebastian Rose
-rw-r--r-- | lisp/org-html.el | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/lisp/org-html.el b/lisp/org-html.el index 5608b50..4252d04 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -87,7 +87,7 @@ not be modified." if(elem.cacheClassTarget) target.className = elem.cacheClassTarget; } -/*]]>*///--> +/*]]>*/--> </script>" "Basic javascript that is needed by HTML files produced by Org-mode.") @@ -123,7 +123,7 @@ not be modified." white-space:nowrap; } .org-info-js_search-highlight {background-color:#ffff00; color:#000000; font-weight:bold; } - /*]]>*///--> + /*]]>*/--> </style>" "The default style specification for exported HTML files. Please use the variables `org-export-html-style' and @@ -1492,23 +1492,18 @@ lang=\"%s\" xml:lang=\"%s\"> (setq html (nreverse html)) (unless splice ;; Put in col tags with the alignment (unfortunately often ignored...) - (push (mapconcat - (lambda (x) - (setq gr (pop org-table-colgroup-info)) - (format "%s<col align=\"%s\"></col>%s" - (if (memq gr '(:start :startend)) - (prog1 - (if colgropen "</colgroup>\n<colgroup>" "<colgroup>") - (setq colgropen t)) - "") - (if (> (/ (float x) nlines) org-table-number-fraction) - "right" "left") - (if (memq gr '(:end :startend)) - (progn (setq colgropen nil) "</colgroup>") - ""))) - fnum "") + (push (concat + "<colgroup>" + (mapconcat + (lambda (x) + (setq gr (pop org-table-colgroup-info)) + (format "<col align=\"%s\" />" + (if (> (/ (float x) nlines) org-table-number-fraction) + "right" "left"))) + fnum "") + "</colgroup>") html) - (if colgropen (setq html (cons (car html) (cons "</colgroup>" (cdr html))))) + ;; Since the output of HTML table formatter can also be used in ;; DocBook document, we want to always include the caption to make ;; DocBook XML file valid. @@ -1516,7 +1511,6 @@ lang=\"%s\" xml:lang=\"%s\"> (push html-table-tag html)) (concat (mapconcat 'identity html "\n") "\n"))) - (defun org-export-splice-attributes (tag attributes) "Read attributes in string ATTRIBUTES, add and replace in HTML tag TAG." (if (not attributes) |