emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* Rework org-export-html-preamble/postamble (again)
@ 2011-03-09 16:17 Bastien
  2011-03-09 20:21 ` Jason Dunsmore
  0 siblings, 1 reply; 10+ messages in thread
From: Bastien @ 2011-03-09 16:17 UTC (permalink / raw)
  To: emacs-orgmode

[-- Attachment #1: Type: text/plain, Size: 768 bytes --]

Hopefully this patch will solve a few issues that have just been raised
about the new behavior of org-export-html-preamble/postamble.

`org-export-html-preamble' defaults back to `t', to reproduce the
previous default behavior.

`org-export-html-postamble' default to 'auto -- which mean that
org-export-email/author/creator-info will be honored by default.
When this is set to `t', the postamble will be inserted from the
formatting string in `org-export-html-postamble-format'.  When 
set to a string, this formatting string will be replaced by this
string.

Both variables also support functions, as org-export-html-preamble 
and org-export-html-postamble used to (but that wasn't documented).

Please test carefully and tell me if this is okay to apply.

Thanks!


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Rework-org-export-html-preamble-postamble-again.patch --]
[-- Type: text/x-patch, Size: 8674 bytes --]

From 990063c31f1f365667017b4780a347ff9dbdeb1c Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Wed, 9 Mar 2011 17:13:40 +0100
Subject: [PATCH] Rework org-export-html-preamble/postamble (again).

* org-html.el (org-export-html-insert-plist-item): Remove.
(org-export-html-preamble): Default to `t'.  Accept functions.
(org-export-html-postamble): Default to `auto'.  Accept
functions and distinguish between 'auto (no formatting string)
and `t' (default formatting string).
(org-export-as-html): Handle org-export-html-preamble and
org-export-html-postamble new defaults/allowed values.
---
 lisp/org-html.el |  158 ++++++++++++++++++++++++++++++++----------------------
 1 files changed, 93 insertions(+), 65 deletions(-)

diff --git a/lisp/org-html.el b/lisp/org-html.el
index c60c90d..d5ea1a3 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -343,13 +343,22 @@ CSS classes, then this prefix can be very useful."
   :group 'org-export-html
   :type 'string)
 
-(defcustom org-export-html-preamble nil
+(defcustom org-export-html-preamble t
   "Non-nil means insert a preamble in HTML export.
-If this is a string, use it as a formatting string it instead of
-`org-export-html-preamble-format'.  Setting :html-preamble in
-publishing projects will override this."
+When `t', insert a string as defined by
+`org-export-html-preamble-format'.  When set to a string, this
+string overrides `org-export-html-preamble-format'.  When set to
+a function, apply this function and insert the returned string.
+The function takes the property list of export options as its
+only argument.
+
+Setting :html-preamble in publishing projects will take
+precedence over this variable."
   :group 'org-export-html
-  :type 'boolean)
+  :type '(choice (const :tag "No preamble" nil)
+		 (const :tag "Default preamble" t)
+		 (string :tag "Custom formatting string")
+		 (function :tag "Function (must return a string)")))
 
 (defcustom org-export-html-preamble-format
   '(("en" "<h1 class=\"title\">%t</h1>"))
@@ -362,13 +371,26 @@ like that: \"%%\"."
   :group 'org-export-html
   :type 'string)
 
-(defcustom org-export-html-postamble nil
+(defcustom org-export-html-postamble 'auto
   "Non-nil means insert a postamble in HTML export.
-If this is a string, use it as a formatting string it instead of
-`org-export-html-postamble-format'.  Setting :html-postamble in
-publishing projects will override this."
+
+When `t', insert a string as defined by
+`org-export-html-postamble-format'.  When set to a string, this
+string overrides `org-export-html-postamble-format'.  When set to
+'auto, discard `org-export-html-postamble-format' and honor
+`org-export-author/email/creator-info' variables.  When set to a
+function, apply this function and insert the returned string.
+The function takes the property list of export options as its
+only argument.
+
+Setting :html-postamble in publishing projects will take
+precedence over this variable."
   :group 'org-export-html
-  :type 'boolean)
+  :type '(choice (const :tag "No postamble" nil)
+		 (const :tag "Auto preamble" 'auto)
+		 (const :tag "Default formatting string" t)
+		 (string :tag "Custom formatting string")
+		 (function :tag "Function (must return a string)")))
 
 (defcustom org-export-html-postamble-format
   '(("en" "<p class=\"author\">Author: %a (%e)</p>
@@ -1277,19 +1299,23 @@ lang=\"%s\" xml:lang=\"%s\">
 		   "")))
 
 	;; insert html preamble
-	(if (plist-get opt-plist :html-preamble)
-	    (let* ((html-preamble (plist-get opt-plist :html-preamble))
-		   (html-preamble-format
-		    (if (stringp html-preamble)
-			html-preamble
-		      (cadr (or (assoc (nth 0 lang-words)
-				       org-export-html-preamble-format)
-				(assoc "en" org-export-html-preamble-format))))))
-	      (insert (format-spec html-preamble-format
-				   `((?t . ,title)
-				     (?a . ,author) (?d . ,date) (?e . ,email)))))
-	  (insert  "<h1 class=\"title\">" title "</h1>")))
-      
+	(when (plist-get opt-plist :html-preamble)
+	  (let ((html-pre (plist-get opt-plist :html-preamble)))
+	    (cond ((stringp html-pre)
+		   (insert
+		    (format-spec html-pre `((?t . ,title) (?a . ,author) 
+					    (?d . ,date) (?e . ,email)))))
+		  ((functionp html-pre)
+		   (funcall html-pre opt-plist))
+		  (t
+		   (insert 
+		    (format-spec
+		     (or (cadr (assoc (nth 0 lang-words)
+				      org-export-html-preamble-format))
+			 (cadr (assoc "en" org-export-html-preamble-format)))
+		     `((?t . ,title) (?a . ,author)
+		       (?d . ,date) (?e . ,email)))))))))
+
       (if (and org-export-with-toc (not body-only))
 	  (progn
 	    (push (format "<h%d>%s</h%d>\n"
@@ -1676,42 +1702,51 @@ lang=\"%s\" xml:lang=\"%s\">
 	(when bib
 	  (insert "\n" bib "\n")))
 
-      ;; export html postamble
+      ;; Export html postamble
       (unless body-only
-	(if (plist-get opt-plist :html-postamble)
-	    (let* ((html-postamble (plist-get opt-plist :html-postamble))
-		   (html-postamble-format
-		    (if (stringp html-postamble)
-			html-postamble
-		      (or (cadr (assoc (nth 0 lang-words)
-				       org-export-html-postamble-format))
-			  (cadr (assoc "en" org-export-html-postamble-format)))))
-		   (email
-		    (mapconcat (lambda(e)
-				 (format "<a href=\"mailto:%s\">%s</a>" e e))
-			       (split-string email ",+ *")
-			       ", "))
-		   (creator-info
-		    (concat "Org version " org-version " with Emacs version "
-			    (number-to-string emacs-major-version))))
-	      (insert "<div id=\"postamble\">\n")
-	      (insert (format-spec html-postamble-format
-				   `((?a . ,author) (?e . ,email)
-				     (?d . ,date)   (?c . ,creator-info)
-				     (?v . ,html-validation-link))))
-	      (insert "</div>"))
-	  ;; fall back on default postamble
-	  (insert "<div id=\"postamble\">\n")
-	  (when (and (plist-get opt-plist :author-info) author)
-	    (insert "<p class=\"author\">" (nth 1 lang-words) ": " author "</p>\n"))
-	  (when (and (plist-get opt-plist :email-info) email)
-	    (insert "<p class=\"mailto:" email "\">&lt;" email "&gt;</p>\n"))
-	  (when (plist-get opt-plist :creator-info)
-	    (insert "<p class=\"creator\">"
-		    (concat "Org version " org-version " with Emacs version "
-			    (number-to-string emacs-major-version) "</p>\n")))
-	  (insert html-validation-link "\n</div>")))
-
+	(let ((html-post (plist-get opt-plist :html-postamble)))
+	  (when (plist-get opt-plist :html-postamble)
+	    (cond ((stringp html-post)
+		   (insert "<div id=\"postamble\">\n")
+		   (insert (format-spec html-post
+					`((?a . ,author) (?e . ,email)
+					  (?d . ,date)   (?c . ,creator-info)
+					  (?v . ,html-validation-link))))
+		   (insert "</div>"))
+		  ((functionp html-post)
+		   (funcall html-post opt-plist))
+		  ((eq html-post 'auto)
+		   ;; fall back on default postamble
+		   (let 
+		       ((email
+			 (mapconcat (lambda(e)
+				      (format "<a href=\"mailto:%s\">%s</a>" e e))
+				    (split-string email ",+ *")
+				    ", "))
+			(creator-info
+			 (concat "Org version " org-version " with Emacs version "
+				 (number-to-string emacs-major-version))))
+		     (insert "<div id=\"postamble\">\n")
+		     (when (and (plist-get opt-plist :author-info) author)
+		       (insert "<p class=\"author\">" (nth 1 lang-words) ": " author "</p>\n"))
+		     (when (and (plist-get opt-plist :email-info) email)
+		       (insert "<p class=\"mailto:" email "\">&lt;" email "&gt;</p>\n"))
+		     (when (plist-get opt-plist :creator-info)
+		       (insert "<p class=\"creator\">"
+			       (concat "Org version " org-version " with Emacs version "
+				       (number-to-string emacs-major-version) "</p>\n")))
+		     (insert html-validation-link "\n</div>")))
+		  (t 
+		   (insert "<div id=\"postamble\">\n")
+		   (insert (format-spec
+			    (or (cadr (assoc (nth 0 lang-words)
+					     org-export-html-postamble-format))
+				(cadr (assoc "en" org-export-html-postamble-format)))
+			    `((?a . ,author) (?e . ,email)
+			      (?d . ,date)   (?c . ,creator-info)
+			      (?v . ,html-validation-link))))
+		   (insert "</div>"))))))
+      
       (if org-export-html-with-timestamp
 	  (insert org-export-html-html-helper-timestamp))
 
@@ -1773,13 +1808,6 @@ lang=\"%s\" xml:lang=\"%s\">
 	    (kill-buffer (current-buffer)))
 	(current-buffer)))))
 
-(defun org-export-html-insert-plist-item (plist key &rest args)
-  (let ((item (plist-get plist key)))
-    (cond ((functionp item)
-           (apply item args))
-          (item
-           (insert item)))))
-
 (defun org-export-html-format-href (s)
   "Make sure the S is valid as a href reference in an XHTML document."
   (save-match-data
-- 
1.7.4.1


[-- Attachment #3: Type: text/plain, Size: 14 bytes --]


-- 
 Bastien

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: Rework org-export-html-preamble/postamble (again)
  2011-03-09 16:17 Rework org-export-html-preamble/postamble (again) Bastien
@ 2011-03-09 20:21 ` Jason Dunsmore
  2011-03-10  9:27   ` Bastien
  0 siblings, 1 reply; 10+ messages in thread
From: Jason Dunsmore @ 2011-03-09 20:21 UTC (permalink / raw)
  To: Bastien; +Cc: emacs-orgmode

Bastien <bzg@altern.org> writes:

> Hopefully this patch will solve a few issues that have just been raised
> about the new behavior of org-export-html-preamble/postamble.

With this patch, I get the following error when exporting to HTML:

list: Symbol's value as variable is void: creator-info

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: Rework org-export-html-preamble/postamble (again)
  2011-03-09 20:21 ` Jason Dunsmore
@ 2011-03-10  9:27   ` Bastien
  2011-03-10 14:46     ` Jason Dunsmore
  0 siblings, 1 reply; 10+ messages in thread
From: Bastien @ 2011-03-10  9:27 UTC (permalink / raw)
  To: Jason Dunsmore; +Cc: emacs-orgmode

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

Hi Jason,

Jason Dunsmore <emacs-orgmode@dunsmor.com> writes:

> Bastien <bzg@altern.org> writes:
>
>> Hopefully this patch will solve a few issues that have just been raised
>> about the new behavior of org-export-html-preamble/postamble.
>
> With this patch, I get the following error when exporting to HTML:
>
> list: Symbol's value as variable is void: creator-info

Applying the attached patch above the previous one should do.

Let me know, thanks!


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-org-html.el-Bugfix-define-email-and-creator-info-bef.patch --]
[-- Type: text/x-patch, Size: 2891 bytes --]

From 368ff7ba090a663e77cb90af2d89206af9201644 Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Thu, 10 Mar 2011 10:26:37 +0100
Subject: [PATCH 2/2] * org-html.el: Bugfix: define email and creator-info before using them.

* org-html.el (org-export-as-html): Bugfix: define email and
creator-info before using them.

Thanks to Jason Dunsmore for catching this.
---
 lisp/org-html.el |   37 ++++++++++++++++++-------------------
 1 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/lisp/org-html.el b/lisp/org-html.el
index d5ea1a3..1661085 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -1704,7 +1704,15 @@ lang=\"%s\" xml:lang=\"%s\">
 
       ;; Export html postamble
       (unless body-only
-	(let ((html-post (plist-get opt-plist :html-postamble)))
+	(let ((html-post (plist-get opt-plist :html-postamble))
+	      ((email
+		(mapconcat (lambda(e)
+			     (format "<a href=\"mailto:%s\">%s</a>" e e))
+			   (split-string email ",+ *")
+			   ", "))
+	       (creator-info
+		(concat "Org version " org-version " with Emacs version "
+			(number-to-string emacs-major-version)))))
 	  (when (plist-get opt-plist :html-postamble)
 	    (cond ((stringp html-post)
 		   (insert "<div id=\"postamble\">\n")
@@ -1717,25 +1725,16 @@ lang=\"%s\" xml:lang=\"%s\">
 		   (funcall html-post opt-plist))
 		  ((eq html-post 'auto)
 		   ;; fall back on default postamble
-		   (let 
-		       ((email
-			 (mapconcat (lambda(e)
-				      (format "<a href=\"mailto:%s\">%s</a>" e e))
-				    (split-string email ",+ *")
-				    ", "))
-			(creator-info
-			 (concat "Org version " org-version " with Emacs version "
-				 (number-to-string emacs-major-version))))
-		     (insert "<div id=\"postamble\">\n")
-		     (when (and (plist-get opt-plist :author-info) author)
+		   (insert "<div id=\"postamble\">\n")
+		   (when (and (plist-get opt-plist :author-info) author)
 		       (insert "<p class=\"author\">" (nth 1 lang-words) ": " author "</p>\n"))
-		     (when (and (plist-get opt-plist :email-info) email)
-		       (insert "<p class=\"mailto:" email "\">&lt;" email "&gt;</p>\n"))
-		     (when (plist-get opt-plist :creator-info)
-		       (insert "<p class=\"creator\">"
-			       (concat "Org version " org-version " with Emacs version "
-				       (number-to-string emacs-major-version) "</p>\n")))
-		     (insert html-validation-link "\n</div>")))
+		   (when (and (plist-get opt-plist :email-info) email)
+		     (insert "<p class=\"mailto:" email "\">&lt;" email "&gt;</p>\n"))
+		   (when (plist-get opt-plist :creator-info)
+		     (insert "<p class=\"creator\">"
+			     (concat "Org version " org-version " with Emacs version "
+				     (number-to-string emacs-major-version) "</p>\n")))
+		   (insert html-validation-link "\n</div>"))
 		  (t 
 		   (insert "<div id=\"postamble\">\n")
 		   (insert (format-spec
-- 
1.7.4.1


[-- Attachment #3: Type: text/plain, Size: 14 bytes --]


-- 
 Bastien

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: Rework org-export-html-preamble/postamble (again)
  2011-03-10  9:27   ` Bastien
@ 2011-03-10 14:46     ` Jason Dunsmore
  2011-03-10 18:29       ` Bastien
  2011-03-15 15:25       ` Bastien
  0 siblings, 2 replies; 10+ messages in thread
From: Jason Dunsmore @ 2011-03-10 14:46 UTC (permalink / raw)
  To: Bastien; +Cc: Jason Dunsmore, emacs-orgmode

Bastien <bzg@altern.org> writes:

> Hi Jason,
>
> Jason Dunsmore <emacs-orgmode@dunsmor.com> writes:
>
>> Bastien <bzg@altern.org> writes:
>>
>>> Hopefully this patch will solve a few issues that have just been raised
>>> about the new behavior of org-export-html-preamble/postamble.
>>
>> With this patch, I get the following error when exporting to HTML:
>>
>> list: Symbol's value as variable is void: creator-info
>
> Applying the attached patch above the previous one should do.
>
> Let me know, thanks!

This patch fixed that export error, but I'm still seeing the problems
with exporting #+TITLE: in an <h1> heading described at:

http://article.gmane.org/gmane.emacs.orgmode/39100

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: Rework org-export-html-preamble/postamble (again)
  2011-03-10 14:46     ` Jason Dunsmore
@ 2011-03-10 18:29       ` Bastien
  2011-03-15 15:55         ` Jason Dunsmore
  2011-03-15 15:25       ` Bastien
  1 sibling, 1 reply; 10+ messages in thread
From: Bastien @ 2011-03-10 18:29 UTC (permalink / raw)
  To: Jason Dunsmore; +Cc: emacs-orgmode

Hi Jason,

Jason Dunsmore <emacs-orgmode@dunsmor.com> writes:

> This patch fixed that export error, but I'm still seeing the problems
> with exporting #+TITLE: in an <h1> heading described at:
>
> http://article.gmane.org/gmane.emacs.orgmode/39100

You mean that, without any :html-preamble and with
̀org-export-html-preamble' set to `t' (as it is by default in these
patches), you don't see any <h1>title</h1> ?

If so there is problem but I cannot reproduce it.

Otherwise, I'm not sure I completely understand.

Best,

-- 
 Bastien

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: Rework org-export-html-preamble/postamble (again)
  2011-03-10 14:46     ` Jason Dunsmore
  2011-03-10 18:29       ` Bastien
@ 2011-03-15 15:25       ` Bastien
  1 sibling, 0 replies; 10+ messages in thread
From: Bastien @ 2011-03-15 15:25 UTC (permalink / raw)
  To: Jason Dunsmore; +Cc: emacs-orgmode

Jason Dunsmore <emacs-orgmode@dunsmor.com> writes:

>> Applying the attached patch above the previous one should do.
>>
>> Let me know, thanks!
>
> This patch fixed that export error, 

FYI, I applied the two patches I sent.  

Best,

-- 
 Bastien

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: Rework org-export-html-preamble/postamble (again)
  2011-03-10 18:29       ` Bastien
@ 2011-03-15 15:55         ` Jason Dunsmore
  2011-03-15 18:11           ` Bastien
  0 siblings, 1 reply; 10+ messages in thread
From: Jason Dunsmore @ 2011-03-15 15:55 UTC (permalink / raw)
  To: Bastien; +Cc: Jason Dunsmore, emacs-orgmode

Bastien <bzg@altern.org> writes:

> Hi Jason,
>
> Jason Dunsmore <emacs-orgmode@dunsmor.com> writes:
>
>> This patch fixed that export error, but I'm still seeing the problems
>> with exporting #+TITLE: in an <h1> heading described at:
>>
>> http://article.gmane.org/gmane.emacs.orgmode/39100
>
> You mean that, without any :html-preamble and with
> ̀org-export-html-preamble' set to `t' (as it is by default in these
> patches), you don't see any <h1>title</h1> ?

If :html-preamble isn't set, I see an <h1>title</h1>.  If it is set, but
without explicitly defining "<h1 class=\"title\">%t</h1>" in
the :html-preamble string, there is no <h1>title</h1>.  This is not how
it worked before the recent changes to html exporting (ie. previously it
wasn't necessary to explicitly define <h1>%t</h1> in the :html-preamble
string).  The previous behavior seems more consistent.

This is with the latest git version (commit b6b7057467b6b).

`org-export-html-preamble' is set to `t' in all my testing.

Regards,
Jason

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: Rework org-export-html-preamble/postamble (again)
  2011-03-15 15:55         ` Jason Dunsmore
@ 2011-03-15 18:11           ` Bastien
  2011-03-15 20:26             ` Jason Dunsmore
  0 siblings, 1 reply; 10+ messages in thread
From: Bastien @ 2011-03-15 18:11 UTC (permalink / raw)
  To: Jason Dunsmore; +Cc: emacs-orgmode

Hi Jason,

Jason Dunsmore <emacs-orgmode@dunsmor.com> writes:

>> You mean that, without any :html-preamble and with
>> ̀org-export-html-preamble' set to `t' (as it is by default in these
>> patches), you don't see any <h1>title</h1> ?
>
> If :html-preamble isn't set, I see an <h1>title</h1>.  

When :html-preamble in a publishing project, it falls back on
org-export-html-preamble, which defaults to `t'.

You need to set :html-preamble to nil so that the HTML export
doesn't insert <h1>title</h1>.

> If it is set, 

(to what?)

> but without explicitly defining "<h1 class=\"title\">%t</h1>" in the
> :html-preamble string, there is no <h1>title</h1>.

When :html-preamble is set to `t' in a publishing project, and
org-export-html-preamble-format hasn't been modified, it should
insert <h1 class=\"title\">%t</h1> -- it does here.  Can you give
an example I can test?

> This is not how
> it worked before the recent changes to html exporting (ie. previously it
> wasn't necessary to explicitly define <h1>%t</h1> in the :html-preamble
> string).  

It is not -- just check that org-export-html-preamble is `t' and that
should be all right.  In th recent changes, I tried to make sure that 
the defaults produce the same HTML output than defaults in 7.4.

> The previous behavior seems more consistent.
>
> This is with the latest git version (commit b6b7057467b6b).
>
> `org-export-html-preamble' is set to `t' in all my testing.

Thanks for this report again...

-- 
 Bastien

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: Rework org-export-html-preamble/postamble (again)
  2011-03-15 18:11           ` Bastien
@ 2011-03-15 20:26             ` Jason Dunsmore
  2011-03-17  7:08               ` Bastien
  0 siblings, 1 reply; 10+ messages in thread
From: Jason Dunsmore @ 2011-03-15 20:26 UTC (permalink / raw)
  To: Bastien; +Cc: emacs-orgmode

Bastien <bzg@altern.org> writes:

> Hi Jason,
>
> Jason Dunsmore <emacs-orgmode@dunsmor.com> writes:
>
>>> You mean that, without any :html-preamble and with
>>> ̀org-export-html-preamble' set to `t' (as it is by default in these
>>> patches), you don't see any <h1>title</h1> ?
>>
>> If :html-preamble isn't set, I see an <h1>title</h1>.  
>
> When :html-preamble in a publishing project, it falls back on
> org-export-html-preamble, which defaults to `t'.
>
> You need to set :html-preamble to nil so that the HTML export
> doesn't insert <h1>title</h1>.
>
>> If it is set, 
>
> (to what?)
>
>> but without explicitly defining "<h1 class=\"title\">%t</h1>" in the
>> :html-preamble string, there is no <h1>title</h1>.
>
> When :html-preamble is set to `t' in a publishing project, and
> org-export-html-preamble-format hasn't been modified, it should
> insert <h1 class=\"title\">%t</h1> -- it does here.

Yes, the same happens for me.  The case I'm referring to is
when :html-preamble is set to a string.

> Can you give an example I can test?

Set :html-preamble to:

--8<---------------cut here---------------start------------->8---
"<div class=\"menu\"> \
<a href=\"index.html\">index</a> :: \
<a href=\"changelog.html\">changelog</a> :: \
<a href=\"sitemap.html\">sitemap</a> \
</div>"
--8<---------------cut here---------------end--------------->8---

When I export as HTML with this config, I don't see an <h1>title</h1>.
Do you?

Previously, :html-preamble could be set to a format string without
"<h1>%t</h1>" and "<h1>title</h1>" would still be exported.

Regards,
Jason

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: Rework org-export-html-preamble/postamble (again)
  2011-03-15 20:26             ` Jason Dunsmore
@ 2011-03-17  7:08               ` Bastien
  0 siblings, 0 replies; 10+ messages in thread
From: Bastien @ 2011-03-17  7:08 UTC (permalink / raw)
  To: Jason Dunsmore; +Cc: emacs-orgmode

Hi Jason,

Jason Dunsmore <emacs-orgmode@dunsmor.com> writes:

> Set :html-preamble to:
>
> "<div class=\"menu\"> \
> <a href=\"index.html\">index</a> :: \
> <a href=\"changelog.html\">changelog</a> :: \
> <a href=\"sitemap.html\">sitemap</a> \
> </div>"
>
> When I export as HTML with this config, I don't see an <h1>title</h1>.
> Do you?

I don't -- and this is on purpose.  

> Previously, :html-preamble could be set to a format string without
> "<h1>%t</h1>" and "<h1>title</h1>" would still be exported.

Previously, we had two variables controlling preamble(s): 

`org-export-html-preamble'
`org-export-html-auto-preamble'

the first one defaulted to nil, the last one to "<h1>title</h1>".

So setting `org-export-html-preamble' in any fashing would add a
preamble to the default one (controlled by :auto-preamble in a
publishing project).

You need to set :html-preamble to this:

,----
| "<h1 class=\"title\">%t</h1>
| 
| <div class=\"menu\"> \
| <a href=\"index.html\">index</a> :: \
| <a href=\"changelog.html\">changelog</a> :: \
| <a href=\"sitemap.html\">sitemap</a> \
| </div>"
`----

HTH,

-- 
 Bastien

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2011-03-17  8:25 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-09 16:17 Rework org-export-html-preamble/postamble (again) Bastien
2011-03-09 20:21 ` Jason Dunsmore
2011-03-10  9:27   ` Bastien
2011-03-10 14:46     ` Jason Dunsmore
2011-03-10 18:29       ` Bastien
2011-03-15 15:55         ` Jason Dunsmore
2011-03-15 18:11           ` Bastien
2011-03-15 20:26             ` Jason Dunsmore
2011-03-17  7:08               ` Bastien
2011-03-15 15:25       ` Bastien

Code repositories for project(s) associated with this inbox:

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).