Move initMath() from startup to math_hullinset. LyX should now start significantly...

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

diff --git a/src/ChangeLog b/src/ChangeLog
index e8edb55f5c91afebe91bf0efc4b2aa8d66620dfc..3c341f2d058f1ffd2fe287eab887841495d13b2a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-15  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+       * lyx_main.C (priv_exec): don't initialize Math on startup 
+       (initMath() has been moved to math_hullinset).
+
 2005-12-12  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * lyxrc.C: set default_papersize to PAPER_DEFAULT;

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 4729678c0cbf294510b722f2ad761c2aa5ed9648..50fcd9e096dda4c348e86febc20de8555ad2014e 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -230,8 +230,6 @@ void LyX::priv_exec(int & argc, char * argv[])
        if (want_gui)
                lyx_gui::parse_lyxrc();
 
-       initMath();
-
        vector<string> files;
 
        for (int argi = argc - 1; argi >= 1; --argi)

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 0f338007acba403ece6428978022dfbcc6653b0a..b0d7820af8068b322ea64da46c461f23f5582dab 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-15  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+       * math_hullinset.C: initialize Math (symbol fonts and parser) if not
+       aleady done. 
+
 2005-12-02  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * math_nestinset.C (script): always ensure that the cell we want to go

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index 43f31366fba7c487cf09068487b00ca7d216f457..c13b2753b360ab431cd875b5990cd06e20cd3fdf 100644 (file)
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -143,6 +143,7 @@ MathHullInset::MathHullInset()
        //lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << endl;
        //lyxerr << "sizeof MathCharInset: " << sizeof(MathCharInset) << endl;
        //lyxerr << "sizeof LyXFont: " << sizeof(LyXFont) << endl;
+       initMath();
        setDefaults();
 }
 
@@ -151,6 +152,7 @@ MathHullInset::MathHullInset(string const & type)
        : MathGridInset(getCols(type), 1), type_(type), nonum_(1), label_(1),
          preview_(new RenderPreview(this))
 {
+       initMath();
        setDefaults();
 }