small fix for TOC file generation in LyX.py

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

diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index 031a3535e34166eb67977cba57ff3c7371216bef..b8de1ca1ec9279e8b92616bf42759ba6946188b3 100644 (file)
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-18  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * LyX.py (LyX_Base): fix paragraph parameter check
+       * LyX.py (NewFile): remove paperpackage from header
+
 2005-09-09  José Matos  <jamatos@lyx.org>
 
        * lyx_1_1_6fix3.py (update_tabular): fix vertical alignment convertion.

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 9b6b8b1c5d31adb90c618b0b2ad17ae75dee6d84..e71822c4ddff9ac6a36675f24664437ca0be1aa5 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -420,7 +420,7 @@ class LyX_Base:
 
             k = i + 1
             # skip paragraph parameters
-            while not string.strip(self.body[k]) and string.split(self.body[k])[0] in allowed_parameters:
+            while not string.strip(self.body[k]) or string.split(self.body[k])[0] in allowed_parameters:
                 k = k +1
 
             while k < j:
@@ -471,7 +471,6 @@ class NewFile(LyX_Base):
             "\\graphics default",
             "\\paperfontsize default",
             "\\papersize default",
-            "\\paperpackage none",
             "\\use_geometry false",
             "\\use_amsmath 1",
             "\\cite_engine basic",