From: Dekel Tsur <dekelts@tau.ac.il>
Date: Wed, 28 Aug 2002 13:07:50 +0000 (+0000)
Subject: - No placement in floats
X-Git-Tag: 1.6.10~18432
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=88836a4a7406403b95bf67f54e08f793f9ec98d5;p=features.git

- 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 5a6a6be8c2..f95c6e86f0 100644
--- 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 6de80903da..c90e047ff4 100644
--- 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"]
 }