From: Georg Baum <Georg.Baum@post.rwth-aachen.de>
Date: Mon, 19 Sep 2005 11:31:26 +0000 (+0000)
Subject: small fix for TOC file generation in LyX.py
X-Git-Tag: 1.6.10~13907
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3d9554fd6228b265c175b94666d935868405c61e;p=lyx.git

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 031a3535e3..b8de1ca1ec 100644
--- 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 9b6b8b1c5d..e71822c4dd 100644
--- 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",