From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sat, 13 Jul 2019 13:33:20 +0000 (+0200)
Subject: More MoreOpts fixes
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d63791e1dccd3bdbc9e484ada566a6a06fd279b8;p=features.git

More MoreOpts fixes
---

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index e65e6e4a12..426bf8c042 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -3474,12 +3474,12 @@ string const BufferParams::loadFonts(LaTeXFeatures & features) const
 	// SANS SERIF
 	os << theLaTeXFonts().getLaTeXFont(from_ascii(fontsSans())).getLaTeXCode(
 		dryrun, ot1, complete, fonts_expert_sc, fonts_old_figures,
-		nomath, font_roman_opts, fontsSansScale());
+		nomath, font_sans_opts, fontsSansScale());
 
 	// MONOSPACED/TYPEWRITER
 	os << theLaTeXFonts().getLaTeXFont(from_ascii(fontsTypewriter())).getLaTeXCode(
 		dryrun, ot1, complete, fonts_expert_sc, fonts_old_figures,
-		nomath, font_roman_opts, fontsTypewriterScale());
+		nomath, font_typewriter_opts, fontsTypewriterScale());
 
 	// MATH
 	os << theLaTeXFonts().getLaTeXFont(from_ascii(fontsMath())).getLaTeXCode(
diff --git a/src/LaTeXFonts.cpp b/src/LaTeXFonts.cpp
index c2e934539d..29d454dfb3 100644
--- a/src/LaTeXFonts.cpp
+++ b/src/LaTeXFonts.cpp
@@ -249,6 +249,7 @@ string const LaTeXFont::getPackageOptions(bool ot1, bool complete, bool sc, bool
 	bool const needosfopt = (osf != osfdefault_);
 	bool const has_osf = providesOSF(ot1, complete, nomath);
 	bool const has_sc = providesSC(ot1, complete, nomath);
+	bool const moreopts = providesMoreOptions(ot1, complete, nomath);
 
 	if (!packageoption_.empty())
 		os << to_ascii(packageoption_);
@@ -279,7 +280,7 @@ string const LaTeXFont::getPackageOptions(bool ot1, bool complete, bool sc, bool
 			    convert<std::string>(float(scale) / 100));
 	}
 
-	if (moreopts_ && !extraopts.empty()) {
+	if (moreopts && !extraopts.empty()) {
 		if (!os.str().empty())
 			os << ',';
 		os << extraopts;