From 881cfe2741538bb4665405bc46fbe0ff6af21520 Mon Sep 17 00:00:00 2001
From: Michael Olson <mwolson@gnu.org>
Date: Sun, 10 Jul 2005 21:35:49 +0000
Subject: [PATCH] Apply muse-docbook patch from Dale P. Smith.

* lisp/muse-docbook.el (muse-docbook-markup-strings): Apply patch from
  Dale P. Smith to make the markup much better.
git-archimport-id: mwolson@gnu.org--2005/muse--main--1.0--patch-121
---
 AUTHORS              |  3 +++
 ChangeLog            | 14 ++++++++++++++
 lisp/muse-docbook.el | 27 +++++++++++++++------------
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index fe7c344..37fa39c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -22,6 +22,9 @@ Yann Hodique: Contributor
 
 Andrea Riciputi: Idea taken from code, but re-implemented
 
+Dale P. Smith: Contributor
+               (discaimed changes to Emacs)
+
 John Sullivan: Contributor -- documentation (employed by FSF)
 
 Gary Vaughan: Original author of emacs-wiki-blosxom.el, which was the
diff --git a/ChangeLog b/ChangeLog
index b7e990b..bc1b033 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0
 #
 
+2005-07-10 21:35:49 GMT	Michael Olson <mwolson@gnu.org>	patch-121
+
+    Summary:
+      Apply muse-docbook patch from Dale P. Smith.
+    Revision:
+      muse--main--1.0--patch-121
+
+    * lisp/muse-docbook.el (muse-docbook-markup-strings): Apply patch from
+      Dale P. Smith to make the markup much better.
+
+    modified files:
+     AUTHORS ChangeLog lisp/muse-docbook.el
+
+
 2005-07-10 00:27:13 GMT	Michael Olson <mwolson@gnu.org>	patch-120
 
     Summary:
diff --git a/lisp/muse-docbook.el b/lisp/muse-docbook.el
index 544ebeb..84c1a97 100644
--- a/lisp/muse-docbook.el
+++ b/lisp/muse-docbook.el
@@ -23,6 +23,9 @@
 
 ;;; Contributors:
 
+;; Dale P. Smith (dpsm AT en DOT com) improved the markup
+;; significantly and made many valuable suggestions.
+
 ;;; Code:
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -109,8 +112,8 @@ For more on the structure of this list, see
     (subsection-end  . "</title>")
     (subsubsection   . "<section><title>")
     (subsubsection-end . "</title>")
-    (footnote        . "<footnote>")
-    (footnote-end    . "</footnote>")
+    (footnote        . "<footnote><para>")
+    (footnote-end    . "</para></footnote>")
     (begin-underline . "")
     (end-underline   . "")
     (begin-literal   . "<filename>")
@@ -120,23 +123,23 @@ For more on the structure of this list, see
     (begin-more-emph . "<emphasis role=\"strong\">")
     (end-more-emph   . "</emphasis>")
     (begin-most-emph . "<emphasis role=\"strong\"><emphasis>")
-    (end-most-emph   . "</emphasis>></emphasis role=\"strong\">")
+    (end-most-emph   . "</emphasis></emphasis>")
     (begin-verse     . "<literallayout>\n")
     (verse-space     . "  ")
     (end-verse       . "</literallayout>")
-    (begin-example   . "<example>")
-    (end-example     . "</example>")
+    (begin-example   . "<programlisting>")
+    (end-example     . "</programlisting>")
     (begin-center    . "<center>\n")
     (end-center      . "\n</center>")
     (begin-quote     . "<blockquote>\n")
     (end-quote       . "\n</blockquote>")
-    (begin-uli       . "<itemizedlist mark=\"bullet\">\n<listitem>")
-    (end-uli         . "</listitem>\n</itemizedlist>")
-    (begin-oli       . "<orderedlist>\n<listitem>")
-    (end-oli         . "</listitem>\n</orderedlist>")
-    (begin-ddt       . "<dl>\n<dt>")
-    (start-dde       . "</dt>\n  <dd>")
-    (end-ddt         . "</dd>\n</dl>"))
+    (begin-uli       . "<itemizedlist mark=\"bullet\">\n<listitem><para>")
+    (end-uli         . "</para></listitem>\n</itemizedlist>")
+    (begin-oli       . "<orderedlist>\n<listitem><para>")
+    (end-oli         . "</para></listitem>\n</orderedlist>")
+    (begin-ddt       . "<variablelist>\n<varlistentry>\n<term>")
+    (start-dde       . "</term>\n<listitem><para>")
+    (end-ddt         . "</para></listitem>\n</varlistentry>\n</variablelist>"))
   "Strings used for marking up text.
 These cover the most basic kinds of markup, the handling of which
 differs little between the various styles."
-- 
2.11.4.GIT