Handle truncated files.

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

diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index 31b4b75a385d62083f74107ddbd262456ca261d2..c88aa435b1b57bc464942e529c82267abec6391d 100644 (file)
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-06  José Matos  <jamatos@lyx.org>
+
+       * LyX.py (warning): Prefix warnings with label "Warning: ".
+       * lyx_1_4.lyx (add_end_layout): Handle truncated files.
+
 2005-07-06  José Matos  <jamatos@lyx.org>
 
        * lyx_1_4.lyx (convert_paperpackage): older tex2lyx generated files

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 33edd48f0cdaa3d00b88fe34ca9e8953bb99d47a..f34b070f4eb16d37dd82d4871109efbb1c2af318 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -118,7 +118,7 @@ class LyX_Base:
     def warning(self, message, debug_level= default_debug_level):
         " Emits warning to self.error, if the debug_level is less than the self.debug."
         if debug_level <= self.debug:
-            self.err.write(message + "\n")
+            self.err.write("Warning: " + message + "\n")
 
 
     def error(self, message):

diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index 07b3cd21810b448cf067b1afb6d5abb50d9d1a6c..2baae63b03ce78691c12ce9b7115dcbf902eedd0 100644 (file)
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -304,7 +304,13 @@ def add_end_layout(file):
         i = find_tokens(file.body, ["\\begin_inset", "\\end_inset", "\\layout",
                                 "\\begin_deeper", "\\end_deeper", "\\the_end"], i)
 
-        token = split(file.body[i])[0]
+        if i != -1:
+            token = split(file.body[i])[0]
+        else:
+            file.warning("Truncated file.")
+            i = len(file.body)
+            file.body.insert(i, '\\the_end')
+            token = ""
 
         if token == "\\begin_inset":
             struct_stack.append(token)