Small fix

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index ba8537a19662d840799774a877db5a754f2c4abb..0c84fd64fcf8e43321be326320df2c60c4cd5f57 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-05  Dekel Tsur  <dekelts@tau.ac.il>
+
+       * lyx2lyx/lyxconvert_218.py (fix_oldfloatinset): Search for 
+       "\begin_inset Float " to avoid matching "\begin_inset FloatList". 
+
 2002-10-01  Dekel Tsur  <dekelts@tau.ac.il>
 
        * lyx2lyx/lyxconvert_218.py: Handle end_deeper "inside" ERT.

diff --git a/lib/lyx2lyx/lyxconvert_217.py b/lib/lyx2lyx/lyxconvert_217.py
index 3b27d54c93415a612a0547641e30e3f770365ef0..2d52ef581581bada714405991db31778255d55da 100644 (file)
--- a/lib/lyx2lyx/lyxconvert_217.py
+++ b/lib/lyx2lyx/lyxconvert_217.py
@@ -86,6 +86,7 @@ def table_update(lines):
         res = row_re.match(lines[i])
         if res:
             val = res.groups()
+            sys.stderr.write("%s, %s, %s %s\n" %(val[0],val[1],val[2],lines[i]))
             lines[i] = '<row topline="%s" bottomline="%s" newpage="%s">' % (bool_table[val[0]], bool_table[val[1]], bool_table[val[2]])
 
         i = i + 1

diff --git a/lib/lyx2lyx/lyxconvert_218.py b/lib/lyx2lyx/lyxconvert_218.py
index 8602ca49046b6ff84861bc04f123ebfb149bb106..d915f2e3b75d96c69869d0f51ff90d7ab328314d 100644 (file)
--- a/lib/lyx2lyx/lyxconvert_218.py
+++ b/lib/lyx2lyx/lyxconvert_218.py
@@ -441,12 +441,13 @@ def update_tabular(lines):
 def fix_oldfloatinset(lines):
     i = 0
     while 1:
-       i = find_token(lines, "\\begin_inset Float", i)
+       i = find_token(lines, "\\begin_inset Float ", i)
        if i == -1:
            break
         j = find_token(lines, "collapsed", i)
         if j != -1:
             lines[j:j] = ["wide false"]
+            sys.stderr.write("i,j=%d,%d\n" % (i,j))
         i = i+1
 
 def change_listof(lines):