fix lyx2lyx bugs

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 9709d0e1fc321a62e518c0a355ee2f50fcf40590..8c61fce7843e2735124988902a141accf2c1e9d4 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-05  John Levon  <levon@movementarian.org>
+
+       * lyx2lyx/lyxconvert_215.py: handle \lyxrcsid, \lyxvcid, \cursor
+
 2003-01-04  Dekel Tsur  <dekelts@tau.ac.il>
 
        * lyx2lyx/lyxconvert_220.py: Fix alignment of fixed width columns.

diff --git a/lib/lyx2lyx/lyxconvert_215.py b/lib/lyx2lyx/lyxconvert_215.py
index 9f26a1ea628c6825db4a92418767edb8e7711728..1dbc589bd26e44955dd0a0261926ec0d26303b94 100644 (file)
--- a/lib/lyx2lyx/lyxconvert_215.py
+++ b/lib/lyx2lyx/lyxconvert_215.py
@@ -94,7 +94,22 @@ def update_toc(lines):
         lines[i] = lines[i] + '{}'
         i = i + 1
 
+def remove_cursor(lines):
+    i = find_token(lines, '\\cursor', 0)
+    if i != -1:
+        del lines[i]
+
+def remove_vcid(lines):
+    i = find_token(lines, '\\lyxvcid', 0)
+    if i != -1:
+        del lines[i]
+    i = find_token(lines, '\\lyxrcsid', 0)
+    if i != -1:
+        del lines[i]
+
 def convert(header,body):
+    remove_vcid(header)
+    remove_cursor(body)
     update_toc(body)
     replace_protected_separator(body)
     merge_formula_inset(body)