fix lyx2lyx conversion of page breaks

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

diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index 7d541da23d6155d5ba3828ff5a39b23711ad5aa2..55ba52efc5097ad4d732cf56f60be9eafdb507db 100644 (file)
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-26  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * lyx_1_4.py (convert_breaks): fix copy-and-paste error
+
 2005-02-20  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * lyx_1_4.py (lyx_support_escape): new

diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index f459ef43ff0ebb1f75d6a416fa694ccb74f9cfa6..125086ee275355f8bd16f2d005fbc4749c211d56 100644 (file)
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -558,7 +558,7 @@ def convert_breaks(file):
 
         #  Create an empty paragraph for line and page break that belong
         # above the paragraph
-        if pb_top !=-1 or line_top != -1 or vspace_bot != -1:
+        if pb_top !=-1 or line_top != -1 or vspace_top != -1:
 
             paragraph_above = ['','\\begin_layout Standard','','']
 
@@ -583,7 +583,7 @@ def convert_breaks(file):
         if k == -1:
             return
 
-        if pb_top !=-1 or line_top != -1 or vspace_bot != -1:
+        if pb_bot !=-1 or line_bot != -1 or vspace_bot != -1:
 
             paragraph_bellow = ['','\\begin_layout Standard','','']