don't assume symbol font is available, ok'd by Andre

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

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index dc61341945ced2d952feceacd05f298e88f71da4..ac4f78058e66cf3e1397a6683824f9b1e1317034 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-18  John Levon  <levon@movementarian.org>
+
+       * math_factory.C: do not assume symbol font is present
+
 2002-12-17  Dekel Tsur  <dekelts@tau.ac.il>
 
        * math_parser.C (tokenize): Fix macro reading.

diff --git a/src/mathed/math_factory.C b/src/mathed/math_factory.C
index 1a124d08844214c014388c597d5e96b5fa6b04e0..083ed374ef3c4fc9781d56b7347271770f0ea28b 100644 (file)
--- a/src/mathed/math_factory.C
+++ b/src/mathed/math_factory.C
@@ -146,13 +146,17 @@ void initSymbols()
                if (isFontName(tmp.inset)) {
                        // tmp.inset _is_ the fontname here.
                        // create fallbacks if necessary
+
+                       // symbol font is not available sometimes
+                       string symbol_font = "lyxsymbol";
+
                        if (tmp.extra == "func" || tmp.extra == "funclim" || tmp.extra == "special") {
                                lyxerr[Debug::MATHED] << "symbol abuse for " << tmp.name << endl;
                                tmp.draw = tmp.name;
                        } else if (math_font_available(tmp.inset)) {
                                lyxerr[Debug::MATHED] << "symbol available for " << tmp.name << endl;
                                tmp.draw += char(charid);
-                       } else if (fallbackid) {
+                       } else if (fallbackid && math_font_available(symbol_font)) {
                                if (tmp.inset == "cmex")
                                        tmp.inset  = "lyxsymbol";
                                else