John's Layout Tabular UI improvements and Martins fixes to clearing the

[lyx.git] / src / FontLoader.C

diff --git a/src/FontLoader.C b/src/FontLoader.C
index aeaf96c805c42932955184a634b1f464567b7b6d..38d20f7775d1292fd7c741853bc7e6f700a93e11 100644 (file)
--- a/src/FontLoader.C
+++ b/src/FontLoader.C
@@ -108,7 +108,7 @@ void FontLoader::getFontinfo(LyXFont::FONT_FAMILY family,
        {
                case LyXFont::SYMBOL_FAMILY:
                        fontinfo[family][series][shape] =
-                               new FontInfo("-*-symbol-*-*-*-*-*-*-*-*-*-*-*-*");
+                               new FontInfo("-*-symbol-*-*-*-*-*-*-*-*-*-*-adobe-fontspecific");
                        return;
 
                case LyXFont::CMR_FAMILY:
@@ -141,6 +141,11 @@ void FontLoader::getFontinfo(LyXFont::FONT_FAMILY family,
                                new FontInfo("-*-msbm-*-*-*-*-*-*-*-*-*-*-*-*");
                        return;
 
+               case LyXFont::EUFRAK_FAMILY:
+                       fontinfo[family][series][shape] = 
+                               new FontInfo("-*-eufrak-medium-*-*-*-*-*-*-*-*-*-*-*");
+                       return;
+
                default:
                        break;
        }
@@ -325,7 +330,9 @@ bool FontLoader::available(LyXFont const & f)
 {
        if (!lyxrc.use_gui)
                return false;
-       load(f.family(), f.series(), f.realShape(), f.size());
+
+       if (!fontinfo[f.family()][f.series()][f.realShape()])
+               getFontinfo(f.family(), f.series(), f.realShape());
        return fontinfo[f.family()][f.series()][f.realShape()]
                ->getFontname(f.size()).size();
 }