Fix reading of symbols file

[features.git] / src / mathed / math_hash.C

diff --git a/src/mathed/math_hash.C b/src/mathed/math_hash.C
index 304cc12db70e5fe9cf600977a08ef4745b7dc568..c8f221d4457ce299ae527d59dad6f6f3939b95e7 100644 (file)
--- a/src/mathed/math_hash.C
+++ b/src/mathed/math_hash.C
@@ -154,16 +154,6 @@ bool initialized = false;
 
 void ReadSymbols(string const & filename)
 {
-       for (latexkeys_a * p = wordlist_array; !string(p->name).empty(); ++p) {
-               latexkeys tmp;
-               tmp.name   = p->name;
-               tmp.token  = p->token;
-               tmp.id     = p->id;
-               tmp.type   = LMB_NONE;
-               tmp.latex_font_id = 0;
-               wordlist.push_back(tmp);
-       }
-
        LyXLex lex(0, 0);
        lex.setFile(filename);
        while (lex.isOK()) {
@@ -209,6 +199,27 @@ void ReadSymbols(string const & filename)
 
                wordlist.push_back(tmp);
        }
+}
+
+
+void InitSymbols()
+{
+       for (latexkeys_a * p = wordlist_array; !string(p->name).empty(); ++p) {
+               latexkeys tmp;
+               tmp.name   = p->name;
+               tmp.token  = p->token;
+               tmp.id     = p->id;
+               tmp.type   = LMB_NONE;
+               tmp.latex_font_id = 0;
+               wordlist.push_back(tmp);
+       }
+
+       lyxerr[Debug::MATHED] << "Reading symbols file\n";
+       string const file = LibFileSearch(string(), "symbols");
+       if (file.empty())
+               lyxerr << "Could not find symbols file" << endl;
+       else
+               ReadSymbols(file);
 
        std::sort(wordlist.begin(), wordlist.end());
 }
@@ -217,12 +228,7 @@ void ReadSymbols(string const & filename)
 latexkeys const * in_word_set(string const & str)
 {
        if (!initialized) {
-               lyxerr[Debug::MATHED] << "Reading symbols file\n";
-               string const file = LibFileSearch(string(), "symbols");
-               if (file.empty())
-                       lyxerr << "Could not find symbols file" << endl;
-               else
-                       ReadSymbols(file);
+               InitSymbols();
                initialized = true;
        }