Header/footer docfix; ChangeLog correction.

* {arch}/.../patch-log/patch-144: Correct previous ChangeLog entry.
  Thanks to drkm for pointing out my error.

Use better documentation and customize interface for headers and footers.
Thanks to Chris McMahan.
git-archimport-id: mwolson@gnu.org--2005/muse--main--1.0--patch-152

ChangeLog

@@ -2,6 +2,27 @@
 # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0
 #
 
+2005-07-18 02:33:12 GMT	Michael Olson <mwolson@gnu.org>	patch-152
+
+    Summary:
+      Header/footer docfix; ChangeLog correction.
+    Revision:
+      muse--main--1.0--patch-152
+
+    * {arch}/.../patch-log/patch-144: Correct previous ChangeLog entry.
+      Thanks to drkm for pointing out my error.
+
+    Use better documentation and customize interface for headers and footers.
+    Thanks to Chris McMahan.
+
+    modified files:
+     ChangeLog lisp/muse-blosxom.el lisp/muse-book.el
+     lisp/muse-docbook.el lisp/muse-html.el lisp/muse-journal.el
+     lisp/muse-latex.el lisp/muse-poem.el lisp/muse-texinfo.el
+     muse.texi
+     {arch}/muse/muse--main/muse--main--1.0/mwolson@gnu.org--2005/patch-log/patch-144
+
+
 2005-07-18 00:53:34 GMT	Michael Olson <mwolson@gnu.org>	patch-151
 
     Summary:
@@ -195,10 +216,10 @@
     Revision:
       muse--main--1.0--patch-144
 
-    * lisp/muse-publish.el (muse-publish-file): Omit third argument to
-      `insert-file-contents'.  This should further help with the temp buffer
-      problem.  Thanks to Peter K. Lee and drkm for the research into this
-      problem.
+    * lisp/muse-publish.el (muse-publish-file): Omit second argument to
+      `insert-file-contents'.  This should further help with the temp
+      buffer problem.  Thanks to Peter K. Lee and drkm for the research
+      into this problem.
 
     * lisp/muse.el (muse-with-temp-buffer): Renamed from
       `muse-with-temp-buffer-no-prompt'.  Report any errors that occur, but

lisp/muse-blosxom.el

@@ -129,13 +129,13 @@ See `muse-blosxom' for more information."
 
 (defcustom muse-blosxom-header
   "<lisp>(muse-publishing-directive \"title\")</lisp>\n"
-  "Header used for publishing Blosxom files."
-  :type '(choice string file)
+  "Header used for publishing Blosxom files.  This may be text or a filename."
+  :type 'string
   :group 'muse-blosxom)
 
 (defcustom muse-blosxom-footer ""
-  "Footer used for publishing Blosxom files."
-  :type '(choice string file)
+  "Footer used for publishing Blosxom files.  This may be text or a filename."
+  :type 'string
   :group 'muse-blosxom)
 
 (defcustom muse-blosxom-base-directory "~/Blog"

lisp/muse-book.el

@@ -68,13 +68,13 @@ together as if one giant chapter."
 \\maketitle
 
 \\tableofcontents\n"
-  "Header used for publishing books to LaTeX."
-  :type '(choice string file)
+  "Header used for publishing books to LaTeX.  This may be text or a filename."
+  :type 'string
   :group 'muse-book)
 
 (defcustom muse-book-latex-footer "\n\\end{document}"
-  "Footer used for publishing books to LaTeX."
-  :type '(choice string file)
+  "Footer used for publishing books to LaTeX.  This may be text or a filename."
+  :type 'string
   :group 'muse-book)
 
 (defun muse-book-publish-chapter (title entry style &optional nochapters)

lisp/muse-docbook.el

@@ -60,15 +60,17 @@ See `muse-docbook' for more information."
     <pubdate><lisp>(muse-publishing-directive \"date\")</lisp></pubdate>
   </articleinfo>
   <!-- Page published by Emacs Muse begins here -->\n"
-  "Header used for publishing DocBook XML files."
-  :type '(choice string file)
+  "Header used for publishing DocBook XML files.
+This may be text or a filename."
+  :type 'string
   :group 'muse-docbook)
 
 (defcustom muse-docbook-footer "
   <!-- Page published by Emacs Muse ends here -->
 </article>\n"
-  "Footer used for publishing DocBook XML files."
-  :type '(choice string file)
+  "Footer used for publishing DocBook XML files.
+This may be text or a filename."
+  :type 'string
   :group 'muse-docbook)
 
 (defcustom muse-docbook-markup-regexps

lisp/muse-html.el

@@ -109,16 +109,16 @@ shown in the following example.
             (if (not (string= author (user-full-name)))
                 (concat \" (by \" author \")\"))))</lisp></h1>
     <!-- Page published by Emacs Muse begins here -->\n"
-  "Header used for publishing HTML files."
-  :type '(choice string file)
+  "Header used for publishing HTML files.  This may be text or a filename."
+  :type 'string
   :group 'muse-html)
 
 (defcustom muse-html-footer "
 <!-- Page published by Emacs Muse ends here -->
   </body>
 </html>\n"
-  "Footer used for publishing HTML files."
-  :type '(choice string file)
+  "Footer used for publishing HTML files.  This may be text or a filename."
+  :type 'string
   :group 'muse-html)
 
 (defcustom muse-xhtml-header
@@ -150,16 +150,16 @@ shown in the following example.
             (if (not (string= author (user-full-name)))
                 (concat \" (by \" author \")\"))))</lisp></h1>
     <!-- Page published by Emacs Muse begins here -->\n"
-  "Header used for publishing XHTML files."
-  :type '(choice string file)
+  "Header used for publishing XHTML files.  This may be text or a filename."
+  :type 'string
   :group 'muse-html)
 
 (defcustom muse-xhtml-footer "
 <!-- Page published by Emacs Muse ends here -->
   </body>
 </html>\n"
-  "Footer used for publishing XHTML files."
-  :type '(choice string file)
+  "Footer used for publishing XHTML files.  This may be text or a filename."
+  :type 'string
   :group 'muse-html)
 
 (defcustom muse-html-anchor-on-word nil

lisp/muse-journal.el

@@ -197,14 +197,16 @@ See `muse-publish-markup-tags' for more info."
       </rdf:Seq>
     </items>
   </channel>\n"
-  "Header used for publishing RDF (RSS 1.0) files."
-  :type '(choice string file)
+  "Header used for publishing RDF (RSS 1.0) files.
+This may be text or a filename."
+  :type 'string
   :group 'muse-journal)
 
 (defcustom muse-journal-rdf-footer
   "</rdf:RDF>\n"
-  "Footer used for publishing RDF (RSS 1.0) files."
-  :type '(choice string file)
+  "Footer used for publishing RDF (RSS 1.0) files.
+This may be text or a filename."
+  :type 'string
   :group 'muse-journal)
 
 (defcustom muse-journal-rdf-date-format
@@ -254,15 +256,15 @@ See `muse-publish-markup-tags' for more info."
     <description><lisp>(muse-publishing-directive \"desc\")</lisp></description>
     <language>en-us</language>
     <generator>Emacs Muse</generator>"
-  "Header used for publishing RSS 2.0 files."
-  :type '(choice string file)
+  "Header used for publishing RSS 2.0 files.  This may be text or a filename."
+  :type 'string
   :group 'muse-journal)
 
 (defcustom muse-journal-rss-footer
   "  </channel>
 </rss>\n"
-  "Footer used for publishing RSS 2.0 files."
-  :type '(choice string file)
+  "Footer used for publishing RSS 2.0 files.  This may be text or a filename."
+  :type 'string
   :group 'muse-journal)
 
 (defcustom muse-journal-rss-date-format

lisp/muse-latex.el

@@ -68,13 +68,13 @@
 
 <lisp>(and muse-publish-generate-contents
            \"\\\\tableofcontents\n\\\\newpage\")</lisp>\n\n"
-  "Header used for publishing LaTeX files."
-  :type '(choice string file)
+  "Header used for publishing LaTeX files.  This may be text or a filename."
+  :type 'string
   :group 'muse-latex)
 
 (defcustom muse-latex-footer "\n\\end{document}"
-  "Footer used for publishing LaTeX files."
-  :type '(choice string file)
+  "Footer used for publishing LaTeX files.  This may be text or a filename."
+  :type 'string
   :group 'muse-latex)
 
 (defcustom muse-latexcjk-header
@@ -96,15 +96,17 @@
 
 <lisp>(and muse-publish-generate-contents
            \"\\\\tableofcontents\n\\\\newpage\")</lisp>\n\n"
-  "Header used for publishing LaTeX files (CJK)."
-  :type '(choice string file)
+  "Header used for publishing LaTeX files (CJK).  This may be text or a
+filename."
+  :type 'string
   :group 'muse-latex)
 
 (defcustom muse-latexcjk-footer
   "\n\\end{CJK*}
 \\end{document}"
-  "Footer used for publishing LaTeX files (CJK)."
-  :type '(choice string file)
+  "Footer used for publishing LaTeX files (CJK).  This may be text or a
+filename."
+  :type 'string
   :group 'muse-latex)
 
 (defcustom muse-latex-markup-regexps

lisp/muse-poem.el

@@ -92,16 +92,16 @@
 \\poemtitle{<lisp>(muse-publishing-directive \"title\")</lisp>}
 
 \\settowidth{\\versewidth}{<lisp>muse-poem-longest-line</lisp>}\n\n"
-  "Header used for publishing LaTeX poems."
-  :type '(choice string file)
+  "Header used for publishing LaTeX poems.  This may be text or a filename."
+  :type 'string
   :group 'muse-poem)
 
 (defcustom muse-poem-latex-footer "\n\\vfill
 \\mbox{}
 
 \\end{document}"
-  "Footer used for publishing LaTeX files."
-  :type '(choice string file)
+  "Footer used for publishing LaTeX files.  This may be text or a filename."
+  :type 'string
   :group 'muse-poem)
 
 (defcustom muse-poem-markup-strings
@@ -134,13 +134,15 @@ differs little between the various styles."
 
 \\renewcommand{\\poemtoc}{section}
 \\settocdepth{section}\n"
-  "Header used for publishing a book of poems in LaTeX form."
-  :type '(choice string file)
+  "Header used for publishing a book of poems in LaTeX form.
+This may be text or a filename."
+  :type 'string
   :group 'muse-poem)
 
 (defcustom muse-chapbook-latex-footer "\n\\end{document}"
-  "Footer used for publishing a book of poems in LaTeX form."
-  :type '(choice string file)
+  "Footer used for publishing a book of poems in LaTeX form.
+This may be text or a filename."
+  :type 'string
   :group 'muse-poem)
 
 (defvar muse-poem-longest-line "")

lisp/muse-texinfo.el

@@ -81,7 +81,8 @@
 @top Overview
 @c Page published by Emacs Muse begins here\n\n"
   "Text to prepend to a Muse page being published as Texinfo.
-This text may contain <lisp> markup tags."
+This may be text or a filename.
+It may contain <lisp> markup tags."
   :type 'string
   :group 'muse-texinfo)
 
@@ -90,7 +91,8 @@ This text may contain <lisp> markup tags."
 <lisp>(and muse-publish-generate-contents \"@contents\")</lisp>
 @bye\n"
   "Text to append to a Muse page being published as Texinfo.
-This text may contain <lisp> markup tags."
+This may be text or a filename.
+It may contain <lisp> markup tags."
   :type 'string
   :group 'muse-texinfo)