UserGuide.lyx: describe new document class option handling and typographic fixes

[lyx.git] / lib / configure.py

diff --git a/lib/configure.py b/lib/configure.py
index 6a59df0bda57c06ac0c5b44cb6346d5b07e41289..3e648819e3ce8d4fe78fa0964c13bf9684ccc786 100644 (file)
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -627,10 +627,10 @@ def processLayoutFile(file, bool_docbook):
             if opt == None:
                 opt = classname
             return '"%s" "%s" "%s" "%s"\n' % (classname, opt, desc, avai)
-    print "Layout file without \DeclareXXClass line. "
-    sys.exit(2)
+    print "Layout file " + file + " has no \DeclareXXClass line. "
+    return ""
+
 
-    
 def checkLatexConfig(check_config, bool_docbook):
     ''' Explore the LaTeX configuration 
         Return None (will be passed to sys.exit()) for success.
@@ -670,7 +670,9 @@ def checkLatexConfig(check_config, bool_docbook):
             # make sure the same class is not considered twice
             if foundClasses.count(cleanclass) == 0: # not found before
                 foundClasses.append(cleanclass)
-                tx.write(processLayoutFile(file, bool_docbook))
+                retval = processLayoutFile(file, bool_docbook)
+                if retval != "":
+                    tx.write(retval)
         tx.close()
         print '\tdone'
     if not check_config:
@@ -762,7 +764,9 @@ def checkModulesConfig():
       print file
       if not os.path.isfile(file): 
           continue
-      tx.write(processModuleFile(file, bool_docbook))
+      retval = processModuleFile(file, bool_docbook)
+      if retval != "":
+          tx.write(retval)
   tx.close()
   print '\tdone'
 
@@ -830,7 +834,7 @@ def processModuleFile(file, bool_docbook):
     if modname != "":
         return '"%s" "%s" "%s" "%s" "%s" "%s"\n' % (modname, filename, desc, pkgs, req, excl)
     print "Module file without \DeclareLyXModule line. "
-    sys.exit(2)
+    return ""
 
 
 def checkTeXAllowSpaces():