Fix handling of older tex2lyx files.

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

diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index ee07c0f5edaadde4609246ed1f69c2a24b0cda9c..31b4b75a385d62083f74107ddbd262456ca261d2 100644 (file)
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-06  José Matos  <jamatos@lyx.org>
+
+       * lyx_1_4.lyx (convert_paperpackage): older tex2lyx generated files
+       had \paperpackage with 'default' instead of 'none'.
+       
 2005-07-05  José Matos  <jamatos@lyx.org>
 
        * LyX.py (LyX_Base):

diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index da3480161229fc1e342da1a01251d905e06d95ce..07b3cd21810b448cf067b1afb6d5abb50d9d1a6c 100644 (file)
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -1515,7 +1515,7 @@ def convert_paperpackage(file):
         file.warning("Malformed lyx file: Missing '\\paperpackage'.")
         return
 
-    packages = {'a4':'none', 'a4wide':'a4', 'widemarginsa4':'a4wide'}
+    packages = {'default':'none','a4':'none', 'a4wide':'a4', 'widemarginsa4':'a4wide'}
     paperpackage = split(file.header[i])[1]
     file.header[i] = replace(file.header[i], paperpackage, packages[paperpackage])