X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFonts.cpp;h=c837815fc659f2d0c31db2a961c54a61cc9b5b4c;hb=1a48d5a96712c72879487542e3f1a7e61ce3f78c;hp=2798bb021f8a0ed69a1d42718945a7288d39d394;hpb=8f9898994d93d8f215f041bf42df0e06d028bbee;p=lyx.git

diff --git a/src/LaTeXFonts.cpp b/src/LaTeXFonts.cpp
index 2798bb021f..c837815fc6 100644
--- a/src/LaTeXFonts.cpp
+++ b/src/LaTeXFonts.cpp
@@ -52,7 +52,7 @@ bool LaTeXFont::available(bool ot1, bool nomath)
 	else if (!requires_.empty()
 		&& LaTeXFeatures::isAvailable(to_ascii(requires_)))
 		return true;
-	else if (!package_.empty()
+	else if (requires_.empty() && !package_.empty()
 		&& LaTeXFeatures::isAvailable(to_ascii(package_)))
 		return true;
 	else if (!altfonts_.empty()) {
@@ -88,7 +88,7 @@ bool LaTeXFont::providesOSF(bool ot1, bool complete, bool nomath)
 		return altFont(usedfont).providesOSF(ot1, complete, nomath);
 	else if (!osffont_.empty())
 		return altFont(osffont_).available(ot1, nomath);
-	else if (!package_.empty() && !LaTeXFeatures::isAvailable(to_ascii(package_)))
+	else if (!available(ot1, nomath))
 		return false;
 
 	return (!osfoption_.empty() || !osfscoption_.empty());
@@ -103,7 +103,7 @@ bool LaTeXFont::providesSC(bool ot1, bool complete, bool nomath)
 		return false;
 	else if (usedfont != name_)
 		return altFont(usedfont).providesSC(ot1, complete, nomath);
-	else if (!package_.empty() && !LaTeXFeatures::isAvailable(to_ascii(package_)))
+	else if (!available(ot1, nomath))
 		return false;
 
 	return (!scoption_.empty() || !osfscoption_.empty());
@@ -118,9 +118,8 @@ bool LaTeXFont::providesScale(bool ot1, bool complete, bool nomath)
 		return false;
 	else if (usedfont != name_)
 		return altFont(usedfont).providesScale(ot1, complete, nomath);
-	else if (!package_.empty() && !LaTeXFeatures::isAvailable(to_ascii(package_)))
+	else if (!available(ot1, nomath))
 		return false;
-
 	return (!scaleoption_.empty());
 }