From: John Levon <levon@movementarian.org>
Date: Wed, 18 Dec 2002 03:07:13 +0000 (+0000)
Subject: small tweak
X-Git-Tag: 1.6.10~17779
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0694c27764001562f3a6e3d667b252620d6b5a54;p=features.git

small tweak


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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 377ec1c0f8..f14c0de178 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-18  John Levon  <levon@movementarian.org>
+
+	* qfont_loader.C: symbol should not match "Standard Symbols 1"
+
 2002-12-18  John Levon  <levon@movementarian.org>
 
 	* qfont_loader.C: rewrite for proper maths symbols
diff --git a/src/frontends/qt2/qfont_loader.C b/src/frontends/qt2/qfont_loader.C
index 22cd6dee26..e173367087 100644
--- a/src/frontends/qt2/qfont_loader.C
+++ b/src/frontends/qt2/qfont_loader.C
@@ -176,7 +176,7 @@ bool isAvailable(LyXFont const & f)
 	QString const family(toqstr(tmp));
 
 	lyxerr[Debug::FONT] << "Family " << tmp
-	       << " isAvailable ?" << endl;
+	       << " isAvailable ?";
 
 	QFontDatabase db;
 	// pass false for match-locale: LaTeX fonts
@@ -185,16 +185,15 @@ bool isAvailable(LyXFont const & f)
 	QStringList sl(db.families(false));
 
 	for (QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) {
-
 		// Case-insensitive for Cmmi10 vs. cmmi10
-		if ((*it).contains(family, false)) {
+		if ((*it).lower().startsWith(family.lower())) {
 			lyxerr[Debug::FONT]
 				<< "found family "
 				<< fromqstr(*it) << endl;
 			return true;
 		}
 	}
-
+	lyxerr[Debug::FONT] << " no." << endl;
 	return false;
 }
 
@@ -357,8 +356,5 @@ bool qfont_loader::available(LyXFont const & f)
 	if (!lyxrc.use_gui)
 		return false;
 
-	bool const is_available(isAvailable(f));
-	lyxerr[Debug::FONT] << "font_loader::available returning "
-		<< is_available << endl;
-	return is_available;
+	return isAvailable(f);
 }