[LyX/master] More MoreOpts fixes

[Juergen Spitzmueller]

commit e0578e4d61128c14f5fa039a0b9d8fb27ce468da
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Sat Jul 13 15:33:20 2019 +0200

    More MoreOpts fixes
---
 src/BufferParams.cpp |    4 ++--
 src/LaTeXFonts.cpp   |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index e65e6e4..426bf8c 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 c2e9345..29d454d 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;