changeset 565:c95125eee0e1

gui converter: fixed joining of comment lines with text below imported from: moin--main--1.5--patch-569
author Thomas Waldmann <tw@waldmann-edv.de>
date Sat, 15 Apr 2006 15:09:09 +0000
parents a7f8bfd10322
children f52e03acf42a
files ChangeLog MoinMoin/parser/wiki.py docs/CHANGES
diffstat 3 files changed, 20 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Apr 15 14:16:33 2006 +0000
+++ b/ChangeLog	Sat Apr 15 15:09:09 2006 +0000
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--arch@arch.thinkmo.de--2003-archives/moin--main--1.5
 #
 
+2006-04-15 16:09:09 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-569
+
+    Summary:
+      gui converter: fixed joining of comment lines with text below
+    Revision:
+      moin--main--1.5--patch-569
+
+    gui converter: fixed joining of comment lines with text below
+    
+
+    modified files:
+     ChangeLog MoinMoin/parser/wiki.py docs/CHANGES
+
+
 2006-04-15 15:16:33 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-568
 
     Summary:
--- a/MoinMoin/parser/wiki.py	Sat Apr 15 14:16:33 2006 +0000
+++ b/MoinMoin/parser/wiki.py	Sat Apr 15 15:09:09 2006 +0000
@@ -821,6 +821,11 @@
 
 
     def _comment_repl(self, word):
+        # if we are in a paragraph, we must close it so that normal text following
+        # in the line below the comment will reopen a new paragraph.
+        if self.formatter.in_p:
+            self.formatter.paragraph(0)
+        self.line_is_empty = 1 # markup following comment lines treats them as if they were empty
         return self.formatter.comment(word)
 
     def _closeP(self):
--- a/docs/CHANGES	Sat Apr 15 14:16:33 2006 +0000
+++ b/docs/CHANGES	Sat Apr 15 15:09:09 2006 +0000
@@ -40,6 +40,7 @@
       * Fixed handling of subpages.
       * Fixed processing of complex list elements (thanks to Craig Markwardt).
       * Fixed processing of html \n (thanks to Craig Markwardt).
+      * Fixed joining of comment lines with text below them.
     * Fixed sslclientcert auth.
     * Added some missing files to i18n processing, translatable strings more
       complete now.