minimal effort implementation of:

[lyx.git] / src / lyxtextclasslist.C

diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index d0be70ff77546d8ab12b068dd67189481526bfa3..11e08c08831c316848d8782a691cb155c6cc49c1 100644 (file)
--- a/src/lyxtextclasslist.C
+++ b/src/lyxtextclasslist.C
@@ -186,9 +186,9 @@ LyXTextClassList::addTextClass(std::string const & textclass, std::string const
                //
                // This is a C++ version of function processLayoutFile in configure.py,
                // which uses the following regex
-               //     \Declare(LaTeX|DocBook|LinuxDoc)Class\s*(\[([^,]*)(,.*)*\])*\s*{(.*)}
+               //     \Declare(LaTeX|DocBook)Class\s*(\[([^,]*)(,.*)*\])*\s*{(.*)}
                ifstream ifs(layout_file.c_str());
-               static regex const reg("^#\\s*\\\\Declare(LaTeX|DocBook|LinuxDoc)Class\\s*"
+               static regex const reg("^#\\s*\\\\Declare(LaTeX|DocBook)Class\\s*"
                        "(?:\\[([^,]*)(?:,.*)*\\])*\\s*\\{(.*)\\}\\s*");
                string line;
                while (getline(ifs, line)) {
@@ -217,15 +217,16 @@ LyXTextClassList textclasslist;
 
 
 // Reads the style files
-void LyXSetStyle()
+bool LyXSetStyle()
 {
        lyxerr[Debug::TCLASS] << "LyXSetStyle: parsing configuration..." << endl;
 
        if (!textclasslist.read()) {
                lyxerr[Debug::TCLASS] << "LyXSetStyle: an error occured "
                        "during parsing.\n             Exiting." << endl;
-               exit(1);
+               return false;
        }
 
        lyxerr[Debug::TCLASS] << "LyXSetStyle: configuration parsed." << endl;
+       return true;
 }