From: Richard Heck <rgheck@comcast.net>
Date: Sat, 12 Jan 2008 06:43:44 +0000 (+0000)
Subject: Fix bugs.
X-Git-Tag: 1.6.10~6647
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=df4634968a2f6d01a348c56db72f88e4c228ecd0;p=features.git

Fix bugs.

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

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 8b3e069a5a..f0a032e331 100644
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -404,7 +404,7 @@ class LyX_base:
         return
       j = find_token(self.header, "\\end_modules", i)
       if j == -1:
-        self.warning("Malformed LyX document: No \\end_modules.")
+        self.warning("(add_module)Malformed LyX document: No \\end_modules.")
         return
       k = find_token(self.header, module, i)
       if k != -1 and k < j:
@@ -422,15 +422,19 @@ class LyX_base:
 
     def set_module_list(self, mlist):
       modbegin = find_token(self.header, "\\begin_modules", 0)
+      newmodlist = ['\\begin_modules'] + mlist + ['\\end_modules']
       if (modbegin == -1):
         #No modules yet included
-        modbegin = find_token(self.header, "\\textclass", 0)
-        if modbegin == -1:
+        tclass = find_token(self.header, "\\textclass", 0)
+        if tclass == -1:
           self.warning("Malformed LyX document: No \\textclass!!")
           return
+        modbegin = tclass + 1
+        self.header[modbegin:modbegin] = newmodlist
+        return
       modend = find_token(self.header, "\\end_modules", modbegin)
       if modend == -1:
-        self.warning("Malformed LyX document: No \\end_modules.")
+        self.warning("(set_module_list)Malformed LyX document: No \\end_modules.")
         return
       newmodlist = ['\\begin_modules'] + mlist + ['\\end_modules']
       self.header[modbegin:modend + 1] = newmodlist
diff --git a/lib/lyx2lyx/lyx_1_6.py b/lib/lyx2lyx/lyx_1_6.py
index a3bf1a788a..cc93e90fdc 100644
--- a/lib/lyx2lyx/lyx_1_6.py
+++ b/lib/lyx2lyx/lyx_1_6.py
@@ -929,6 +929,8 @@ def convert_module_names(document):
     'Theorems (Order By Chapter)' : 'theorems-chap', 'Theorems (Order By Section)' : 'theorems-sec', \
     'Theorems (Starred)' : 'theorems-starred', 'Theorems' : 'theorems-std' }
   modlist = document.get_module_list()
+  if len(modlist) == 0:
+    return
   newmodlist = []
   for mod in modlist:
     if modulemap.has_key(mod):
@@ -946,6 +948,8 @@ def revert_module_names(document):
     'theorems-chap' : 'Theorems (Order By Chapter)', 'theorems-sec' : 'Theorems (Order By Section)', \
     'theorems-starred' : 'Theorems (Starred)', 'theorems-std' : 'Theorems'}
   modlist = document.get_module_list()
+  if len(modlist) == 0:
+    return
   newmodlist = []
   for mod in modlist:
     if modulemap.has_key(mod):