From 0137a9b3eb2462cef4f27f51c766b201a02ff29c Mon Sep 17 00:00:00 2001
From: Michael Olson <mwolson@gnu.org>
Date: Wed, 1 Mar 2006 17:05:25 +0000
Subject: [PATCH] Pass all current definition list test cases.

* lisp/muse-publish.el (muse-publish-surround-dl): Move correctly to next
  line if definition is not on the same line as the term.
  (muse-forward-list-item): Fix publishing incorrectness that occurred
  when a non-dl list follows a definition list.  Always move to the right
  place so as to prevent extra empty dd elements from being published.
git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-29
---
 ChangeLog.2006       | 17 +++++++++++++++++
 lisp/muse-publish.el | 17 ++++++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/ChangeLog.2006 b/ChangeLog.2006
index 6cda8e2..df06d8d 100644
--- a/ChangeLog.2006
+++ b/ChangeLog.2006
@@ -2,6 +2,23 @@
 # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2006/muse--main--1.0
 #
 
+2006-03-01 17:05:25 GMT	Michael Olson <mwolson@gnu.org>	patch-29
+
+    Summary:
+      Pass all current definition list test cases.
+    Revision:
+      muse--main--1.0--patch-29
+
+    * lisp/muse-publish.el (muse-publish-surround-dl): Move correctly to next
+      line if definition is not on the same line as the term.
+      (muse-forward-list-item): Fix publishing incorrectness that occurred
+      when a non-dl list follows a definition list.  Always move to the right
+      place so as to prevent extra empty dd elements from being published.
+
+    modified files:
+     ChangeLog.2006 lisp/muse-publish.el
+
+
 2006-03-01 15:08:45 GMT	Michael Olson <mwolson@gnu.org>	patch-28
 
     Summary:
diff --git a/lisp/muse-publish.el b/lisp/muse-publish.el
index 099236d..9969333 100644
--- a/lisp/muse-publish.el
+++ b/lisp/muse-publish.el
@@ -956,7 +956,8 @@ The following contexts exist in Muse.
         (goto-char (match-end 1))
         (delete-region (point) (match-end 0))
         (muse-insert-markup end-ddt)
-        (unless (eq (char-after) ?\n)
+        (if (eq (char-after) ?\n)
+            (forward-char)
           (insert ?\n))
         (save-excursion
           (goto-char beg)
@@ -1056,13 +1057,15 @@ terms."
                  t)
              nil))
           ((eq type 'dl)
-           (if (match-beginning 2)
-               (if (string= (buffer-substring (match-beginning 1)
-                                              (match-beginning 2))
-                            indent)
-                   t
+           (if (match-string 2)
+               (progn
                  (goto-char (match-beginning 1))
-                 (eq 'dl (muse-list-item-type (match-string 2))))
+                 (if (and (eq 'dl (muse-list-item-type (match-string 2)))
+                          (string= (buffer-substring (match-beginning 1)
+                                                     (match-beginning 2))
+                                   indent))
+                     t
+                   nil))
              nil))
           ((and (match-string 2)
                 (eq type (muse-list-item-type (match-string 2))))
-- 
2.11.4.GIT