changeset 559:77e2149d7eab

fix gui converter html \n processing imported from: moin--main--1.5--patch-563
author Thomas Waldmann <tw@waldmann-edv.de>
date Fri, 14 Apr 2006 09:44:16 +0000
parents 5d7784095004
children b4eedd2147ff
files ChangeLog MoinMoin/converter/text_html_text_x_moin.py
diffstat 2 files changed, 18 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Apr 14 09:41:35 2006 +0000
+++ b/ChangeLog	Fri Apr 14 09:44:16 2006 +0000
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--arch@arch.thinkmo.de--2003-archives/moin--main--1.5
 #
 
+2006-04-14 10:44:16 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-563
+
+    Summary:
+      fix gui converter html \n processing
+    Revision:
+      moin--main--1.5--patch-563
+
+    fix gui converter html \n processing
+    
+
+    modified files:
+     ChangeLog MoinMoin/converter/text_html_text_x_moin.py
+
+
 2006-04-14 10:41:35 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-562
 
     Summary:
--- a/MoinMoin/converter/text_html_text_x_moin.py	Fri Apr 14 09:41:35 2006 +0000
+++ b/MoinMoin/converter/text_html_text_x_moin.py	Fri Apr 14 09:44:16 2006 +0000
@@ -707,7 +707,7 @@
 
     def process_inline(self, node):
         if node.nodeType == Node.TEXT_NODE:
-            self.text.append(node.data.strip('\n'))
+            self.text.append(node.data.strip('\n').replace('\n',' '))
             return
 
         name = node.localName # can be None for DOM Comment nodes
@@ -754,7 +754,7 @@
             if i.nodeType == Node.ELEMENT_NODE:
                 self.process_inline(i)
             elif i.nodeType == Node.TEXT_NODE:
-                self.text.append(i.data.strip('\n'))
+                self.text.append(i.data.strip('\n').replace('\n',' '))
         if command_close:
             command = command_close
         self.text.append(command)
@@ -796,7 +796,7 @@
             if i.nodeType == Node.ELEMENT_NODE:
                 self.process_inline(i)
             elif i.nodeType == Node.TEXT_NODE:
-                self.text.append(i.data.strip('\n'))
+                self.text.append(i.data.strip('\n').replace('\n', ' '))
 
     def process_pre(self, node):
         self.process_preformatted_item(node)
@@ -1013,7 +1013,7 @@
                     self.process_inline(i)
                     found = True
                 elif i.nodeType == Node.TEXT_NODE:
-                    data = i.data.strip('\n')
+                    data = i.data.strip('\n').replace('\n',' ')
                     if data:
                         found = True
                         self.text.append(data)