anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More MoreOpts fixes

Browse Source
This commit is contained in:
Juergen Spitzmueller 2019-07-13 15:33:20 +02:00
parent 04c2594c82
commit e0578e4d61
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BufferParams.cpp
View File

@ -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(

3
src/LaTeXFonts.cpp
View File

@ -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;