diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 871b9ba38..44e9d58f6 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,7 @@ * org-exp.el (org-get-file-contents) (org-get-and-remove-property): New functions. (org-export-handle-include-files): Handle the new prefix options. + (org-export-as-html): Fix the verse environment. 2008-07-01 Carsten Dominik diff --git a/lisp/org-exp.el b/lisp/org-exp.el index cca3202ae..e14fac78b 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -482,6 +482,7 @@ Org-mode file." .target { } .timestamp { color: grey } .timestamp-kwd { color: CadetBlue } + p.verse { margin-left: 3% } pre { border: 1pt solid #AEBDCC; background-color: #F3F5F7; @@ -2721,6 +2722,7 @@ PUB-DIR is set, use this as the publishing directory." (quote-re (concat "^\\(\\*+\\)\\([ \t]+" org-quote-string "\\>\\)")) (inquote nil) (infixed nil) + (inverse nil) (in-local-list nil) (local-list-type nil) (local-list-indent nil) @@ -2971,11 +2973,20 @@ lang=\"%s\" xml:lang=\"%s\"> (insert "

\n\n") (throw 'nextline nil)) (when (equal "ORG-VERSE-START" line) - (insert "\n

\n") + (insert "\n

\n") + (setq inverse t) (throw 'nextline nil)) (when (equal "ORG-VERSE-END" line) - (insert "

\n
\n") + (insert "

\n") + (setq inverse nil) (throw 'nextline nil)) + (when inverse + (setq i (org-get-string-indentation line)) + (if (> i 0) + (setq line (concat (mapconcat 'identity + (make-list (* 2 i) "\\nbsp") "") + " " (org-trim line)))) + (setq line (concat line " \\\\"))) ;; make targets to anchors (while (string-match "<<]*\\)>>>?\\((INVISIBLE)\\)?[ \t]*\n?" line) diff --git a/lisp/org.el b/lisp/org.el index e16426310..f6140419c 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -8603,7 +8603,7 @@ Returns the new TODO keyword, or nil if no state change should occur." nil))) (defun org-get-repeat () - "Check if tere is a deadline/schedule with repeater in this entry." + "Check if there is a deadline/schedule with repeater in this entry." (save-match-data (save-excursion (org-back-to-heading t)