small fixes to minipages convertions and retroversions.

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

diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index 6aab341a5f3494ce3bf72090804418bc3425062f..7a53b38f6b71409609849575ff2cb4e84d6ea584 100644 (file)
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-18  José Matos  <jamatos@lyx.org>
+
+       * lyx_1_4.py (convert_minipage, convert_frameless_box): small
+       fixes to minipages convertions and retroversions.
+
 2005-07-18  José Matos  <jamatos@lyx.org>
 
        * lyx_1_4.py (convert_french): fix two typos (Thanks to Georg Baum).

diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index 9b4803a62333036f0c7a4ee77341769e07ce0429..9701dbbbeba7e45d21d884e9c7c1e72485e98b65 100644 (file)
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -855,7 +855,7 @@ def convert_minipage(file):
         if file.body[i][:6] == "height":
             height = file.body[i][6:]
             # test for default value of 221 and convert it accordingly
-            if height == ' "0pt"':
+            if height == ' "0pt"' or height == ' "0"':
                 height = ' "1pt"'
             del file.body[i]
         else:
@@ -1112,7 +1112,6 @@ def convert_frameless_box(file):
        if (params['use_parbox'] != '0' or
            params['has_inner_box'] != '1' or
            params['special'] != 'none' or
-           inner_pos[params['inner_pos']] != pos[params['position']] or
            params['height_special'] != 'totalheight' or
            len2value(params['height']) != 1.0):