X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFonts.cpp;h=862e47451646798447ccf1fd8784f939705373ed;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=4cc1b82315bd157e0788be8494d90927bb78340d;hpb=9cbba74a62bce39c5128800474edcb45028a6df2;p=lyx.git

diff --git a/src/LaTeXFonts.cpp b/src/LaTeXFonts.cpp
index 4cc1b82315..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"
@@ -110,6 +111,19 @@ bool LaTeXFont::providesSC(bool ot1, bool complete, bool nomath)
 }
 
 
+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);
@@ -163,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]);
@@ -175,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,7 +304,7 @@ string const LaTeXFont::getLaTeXCode(bool dryrun, bool ot1, bool complete, bool
 		os << altFont(osffont_).getLaTeXCode(dryrun, ot1, complete, sc, osf, nomath, scale);
 
 	if (!preamble_.empty())
-		os << preamble_;
+		os << to_utf8(preamble_);
 
 	return os.str();
 }
@@ -392,7 +420,7 @@ bool LaTeXFont::readFont(Lexer & lex)
 			lex >> packageoption_;
 			break;
 		case LF_PREAMBLE:
-			preamble_ = lex.getLongString("EndPreamble");
+			preamble_ = lex.getLongString(from_ascii("EndPreamble"));
 			break;
 		case LF_PROVIDES: {
 			lex.eatLine();