X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FLaTeXFonts.cpp;h=862e47451646798447ccf1fd8784f939705373ed;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=2798bb021f8a0ed69a1d42718945a7288d39d394;hpb=8f9898994d93d8f215f041bf42df0e06d028bbee;p=lyx.git

diff --git a/src/LaTeXFonts.cpp b/src/LaTeXFonts.cpp
index 2798bb021f..862e474516 100644
--- a/src/LaTeXFonts.cpp
+++ b/src/LaTeXFonts.cpp
@@ -19,6 +19,7 @@
 
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
@@ -52,7 +53,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 +89,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,13 +104,26 @@ 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());
 }
 
 
+bool LaTeXFont::hasMonolithicExpertSet(bool ot1, bool complete, bool nomath)
+{
+	docstring const usedfont = getUsedFont(ot1, complete, nomath);
+
+	if (usedfont.empty())
+		return false;
+	else if (usedfont != name_)
+		return altFont(usedfont).hasMonolithicExpertSet(ot1, complete, nomath);
+	return (!osfoption_.empty() && !scoption_.empty() && osfoption_ == scoption_)
+		|| (osfoption_.empty() && scoption_.empty() && !osfscoption_.empty());
+}
+
+
 bool LaTeXFont::providesScale(bool ot1, bool complete, bool nomath)
 {
 	docstring const usedfont = getUsedFont(ot1, complete, nomath);
@@ -118,9 +132,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());
 }
 
@@ -164,6 +177,11 @@ docstring const LaTeXFont::getUsedFont(bool ot1, bool complete, bool nomath)
 	else if (!package_.empty()
 		&& LaTeXFeatures::isAvailable(to_ascii(package_)))
 			return name_;
+	else if (!preamble_.empty() && package_.empty()
+		 && requires_.empty() && !switchdefault_
+		 && altfonts_.empty()) {
+			return name_;
+	}
 	else if (!altfonts_.empty()) {
 		for (size_t i = 0; i < altfonts_.size(); ++i) {
 			LaTeXFont altf = altFont(altfonts_[i]);
@@ -176,6 +194,15 @@ docstring const LaTeXFont::getUsedFont(bool ot1, bool complete, bool nomath)
 }
 
 
+docstring const LaTeXFont::getUsedPackage(bool ot1, bool complete, bool nomath)
+{
+	docstring const usedfont = getUsedFont(ot1, complete, nomath);
+	if (usedfont.empty())
+		return docstring();
+	return theLaTeXFonts().getLaTeXFont(usedfont).package();
+}
+
+
 string const LaTeXFont::getAvailablePackage(bool dryrun)
 {
 	if (package_.empty())
@@ -276,6 +303,9 @@ string const LaTeXFont::getLaTeXCode(bool dryrun, bool ot1, bool complete, bool
 	if (osf && providesOSF(ot1, complete, nomath) && !osffont_.empty())
 		os << altFont(osffont_).getLaTeXCode(dryrun, ot1, complete, sc, osf, nomath, scale);
 
+	if (!preamble_.empty())
+		os << to_utf8(preamble_);
+
 	return os.str();
 }
 
@@ -296,6 +326,7 @@ bool LaTeXFont::readFont(Lexer & lex)
 		LF_OT1_FONT,
 		LF_PACKAGE,
 		LF_PACKAGEOPTION,
+		LF_PREAMBLE,
 		LF_PROVIDES,
 		LF_REQUIRES,
 		LF_SCALEOPTION,
@@ -318,6 +349,7 @@ bool LaTeXFont::readFont(Lexer & lex)
 		{ "ot1font",              LF_OT1_FONT },
 		{ "package",              LF_PACKAGE },
 		{ "packageoption",        LF_PACKAGEOPTION },
+		{ "preamble",             LF_PREAMBLE },
 		{ "provides",             LF_PROVIDES },
 		{ "requires",             LF_REQUIRES },
 		{ "scaleoption",          LF_SCALEOPTION },
@@ -387,6 +419,9 @@ bool LaTeXFont::readFont(Lexer & lex)
 		case LF_PACKAGEOPTION:
 			lex >> packageoption_;
 			break;
+		case LF_PREAMBLE:
+			preamble_ = lex.getLongString(from_ascii("EndPreamble"));
+			break;
 		case LF_PROVIDES: {
 			lex.eatLine();
 			string features = lex.getString();