- No placement in floats

- Don't use .extend()

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

diff --git a/lib/lyx2lyx/lyxconvert_216.py b/lib/lyx2lyx/lyxconvert_216.py
index 5a6a6be8c2ebc4031e6c9b80cb56ea291adcf7e6..f95c6e86f0145ba24d391de30f47a65a33e5adca 100644 (file)
--- a/lib/lyx2lyx/lyxconvert_216.py
+++ b/lib/lyx2lyx/lyxconvert_216.py
@@ -150,14 +150,14 @@ def update_tabular(lines):
                     paragraph = []
                     if cell_info[m][4] == '1':
                         l = j
-                        paragraph.extend(cell_content[j][k])
+                        paragraph = paragraph + cell_content[j][k]
                         while cell_info[m][4] == '1':
                             m = m + columns
                             l = l + 1
-                            paragraph.extend(cell_content[l][k])
+                            paragraph = paragraph + cell_content[l][k]
                     else:
                         paragraph = cell_content[j][k]
-                    tmp.extend(set_paragraph_properties(paragraph, prop_dict))
+                    tmp = tmp + set_paragraph_properties(paragraph, prop_dict)
                 
                 tmp.append('\\end_inset ')
                 tmp.append('</Cell>')
@@ -169,10 +169,7 @@ def update_tabular(lines):
         tmp.append('\\end_inset ')
         tmp.append('')
         tmp.append('')
-        tail = lines[i:]
-        lines[i:] = []
-        lines.extend(tmp)
-        lines.extend(tail)
+        lines[i:i] = tmp
 
         i = i + len(tmp)
 

diff --git a/lib/lyx2lyx/lyxconvert_218.py b/lib/lyx2lyx/lyxconvert_218.py
index 6de80903da7b1bbd01a19eb3a74df2f1d2f186f6..c90e047ff418e58b16b86250a1e7ab9e2c7509a2 100644 (file)
--- a/lib/lyx2lyx/lyxconvert_218.py
+++ b/lib/lyx2lyx/lyxconvert_218.py
@@ -25,23 +25,18 @@ floats = {
     "margin":   ["\\begin_inset Marginal",
                 "collapsed true"],
     "fig":      ["\\begin_inset Float figure",
-                "placement htbp",
                 "wide false",
                 "collapsed false"],
     "tab":      ["\\begin_inset Float table",
-                "placement htbp",
                 "wide false",
                 "collapsed false"],
     "alg":      ["\\begin_inset Float algorithm",
-                "placement htbp",
                 "wide false",
                 "collapsed false"],
     "wide-fig": ["\\begin_inset Float figure",
-                "placement htbp",
                 "wide true",
                 "collapsed false"],
     "wide-tab": ["\\begin_inset Float table",
-                "placement htbp",
                 "wide true",
                 "collapsed false"]
 }