Fix widemargins a4 convertion.

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

diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index b9595f7eb00e2ded86975f620414ee2507fb5ef5..29045479157fc2cb5ab88bcee8a1ef3aa9978d38 100644 (file)
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-29  José Matos  <jamatos@lyx.org>
+
+       * lyx_1_4.py: Fix widemarginsa4 convertion.
+
 2005-07-29  José Matos  <jamatos@lyx.org>
 
        * lyx_1_4.py: \end_header was added in 222, not 223

diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index 74ed056561384c07de4c553a9c98db1e18de09bc..2eab75fbfa77d1a370b1de6aed2b33080a5531ed 100644 (file)
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -1526,9 +1526,9 @@ def convert_paperpackage(file):
     packages = {'default':'none','a4':'none', 'a4wide':'a4', 'widemarginsa4':'a4wide'}
     if len(split(file.header[i])) > 1:
         paperpackage = split(file.header[i])[1]
+        file.header[i] = replace(file.header[i], paperpackage, packages[paperpackage])
     else:
-        paperpackage = "default"
-    file.header[i] = replace(file.header[i], paperpackage, packages[paperpackage])
+        file.header[i] = file.header[i] + ' widemarginsa4'
 
 
 def revert_paperpackage(file):