enable the scrlttr 2 class for serial letters:

[lyx.git] / lib / lyx2lyx / LyX.py

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 8b3e069a5a7c7ba871351fa866b2de2442471856..586410da9e0f850a5b671eb8f264efdefe8ef585 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -80,7 +80,7 @@ format_relation = [("0_06",    [200], minor_versions("0.6" , 4)),
                    ("1_3",     [221], minor_versions("1.3" , 7)),
                    ("1_4", range(222,246), minor_versions("1.4" , 5)),
                    ("1_5", range(246,277), minor_versions("1.5" , 2)),
-                   ("1_6", range(277,314), minor_versions("1.6" , 0))] # Richard Heck: conversion of module representations
+                   ("1_6", range(277,315), minor_versions("1.6" , 0))] # Uwe Stöhr: scrlttr2 for serial letters
 
 
 def formats_list():
@@ -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