Angus Leeming wrote:

> Note now "} \backslash" has become "\backslash }"

A fix is attached. It is a bit clumsy, but unless Jos� finds something
better I'll commit that.


Georg


PS: The web and cvs servers seem to be down.
diff -ruNx CVS lyx-1.4-clean/lib/lyx2lyx/ChangeLog lyx-1.4-cvs/lib/lyx2lyx/ChangeLog
--- lyx-1.4-clean/lib/lyx2lyx/ChangeLog	2005-05-09 19:24:29.000000000 +0200
+++ lyx-1.4-cvs/lib/lyx2lyx/ChangeLog	2005-05-18 09:41:21.738349138 +0200
@@ -1,3 +1,8 @@
+2005-05-18  Georg Baum  <[EMAIL PROTECTED]>
+
+	* lyx_1_4.py (convert_breaks): Don't treat every token that starts
+	with '\\' as paragraph parameter
+
 2005-05-06  Jos� Matos  <[EMAIL PROTECTED]>
 
 	* lyx_1_4.py (convert_breaks): put all paragraph parameters into a single line.
diff -ruNx CVS lyx-1.4-clean/lib/lyx2lyx/lyx_1_4.py lyx-1.4-cvs/lib/lyx2lyx/lyx_1_4.py
--- lyx-1.4-clean/lib/lyx2lyx/lyx_1_4.py	2005-05-09 19:24:30.000000000 +0200
+++ lyx-1.4-cvs/lib/lyx2lyx/lyx_1_4.py	2005-05-18 09:35:06.605410560 +0200
@@ -526,7 +526,14 @@
         i = i + 1
 
         # Merge all paragraph parameters into a single line
-        while file.body[i + 1][:1] == '\\':
+        # We cannot check for '\\' only because paragraphs may start e.g.
+        # with '\\backslash'
+        while (file.body[i + 1][:9]  == '\\line_top' or
+               file.body[i + 1][:12] == '\\line_bottom' or
+               file.body[i + 1][:14] == '\\pagebreak_top' or
+               file.body[i + 1][:17] == '\\pagebreak_bottom' or
+               file.body[i + 1][:16] == '\\added_space_top' or
+               file.body[i + 1][:19] == '\\added_space_bottom'):
             file.body[i] = file.body[i + 1] + ' ' + file.body[i]
             del file.body[i+1]
 

Reply via email to