revert earlier undocumented change (useful comment, isn't it?)

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

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index d18ab9634a0a23496d4bb44ea2758c8f17ef1172..427264cf5b3d77deefaba28718e190d68141e776 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-18  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * FontInfo.C (query): revert earlier undocumented change.
+
 2005-07-17  Michael Schmitt  <michael.schmitt@teststep.org>
 
        * ColorHandler.C: fix bformat message

diff --git a/src/frontends/xforms/xfont_loader.C b/src/frontends/xforms/xfont_loader.C
index 3893ba9d998cc9bad87dd0a9846b18aa7b0af02f..c9c09d8257db67d6b1fad17f62992fd291a26419 100644 (file)
--- a/src/frontends/xforms/xfont_loader.C
+++ b/src/frontends/xforms/xfont_loader.C
@@ -301,20 +301,6 @@ XFontStruct * xfont_loader::doLoad(LyXFont::FONT_FAMILY family,
 
        getFontinfo(family, series, shape);
 
-       LyXFont f;
-       f.setFamily(family);
-       f.setSeries(series);
-       f.setShape(shape);
-       f.setSize(size);
-       // The rest of the attributes are not interesting
-       f.setEmph(LyXFont::INHERIT);
-       f.setUnderbar(LyXFont::INHERIT);
-       f.setNoun(LyXFont::INHERIT);
-       f.setColor(LColor::inherit);
-
-       if (f.isSymbolFont() && !fontinfo[family][series][shape]->exist())
-               return 0;
-
        // FIXME! CHECK! Should we use 72.0 or 72.27? (Lgb)
        int fsize = int((convert<double>(lyxrc.font_sizes[size]) * lyxrc.dpi *
                          (lyxrc.zoom/100.0)) / 72.27 + 0.5);
@@ -341,6 +327,16 @@ XFontStruct * xfont_loader::doLoad(LyXFont::FONT_FAMILY family,
                }
        } else if (lyxerr.debugging(Debug::FONT)) {
                // Tell user the font matching
+               LyXFont f;
+               f.setFamily(family);
+               f.setSeries(series);
+               f.setShape(shape);
+               f.setSize(size);
+               // The rest of the attributes are not interesting
+               f.setEmph(LyXFont::INHERIT);
+               f.setUnderbar(LyXFont::INHERIT);
+               f.setNoun(LyXFont::INHERIT);
+               f.setColor(LColor::inherit);
                lyxerr << "Font '" << f.stateText(0)
                       << "' matched by\n" << font << endl;
        }