fix convertion of line and page breaks.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9915 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index 708609d036c7096ab8edb7b961287a3c1bfbfe51..724013af4706fb7292cdadd718cad5122cbe95ca 100644 (file)
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-06  José Matos  <jamatos@lyx.org>
+
+       * lyx_1_4.py (convert_breaks): put all paragraph parameters into a single line.
+
 2005-05-04  José Matos  <jamatos@lyx.org>
 
        * LyX.py: fix allowed parameters for paragraphs.

diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index 7491dcad53d32010c1813450a1260b115f22f4b0..eb0c91edba3915dc868f961b96f480af49003289 100644 (file)
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -524,6 +524,12 @@ def convert_breaks(file):
         if i == -1:
             return
         i = i + 1
+
+        # Merge all paragraph parameters into a single line
+        while file.body[i + 1][:1] == '\\':
+            file.body[i] = file.body[i + 1] + ' ' + file.body[i]
+            del file.body[i+1]
+
         line_top   = find(file.body[i],"\\line_top")
         line_bot   = find(file.body[i],"\\line_bottom")
         pb_top     = find(file.body[i],"\\pagebreak_top")