anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

prioretize-user-font-options

Browse Source
This commit is contained in:
Udi Fogiel 2023-07-07 00:47:20 +03:00 committed by Juergen Spitzmueller
parent 02ba1a1327
commit 9f29fb33d1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/BufferParams.cpp
View File

@ -3527,11 +3527,11 @@ string const BufferParams::loadFonts(LaTeXFeatures & features) const
os << "\\babelfont{rm}[";
else
os << "\\setmainfont[";
if (!font_roman_opts.empty())
os << font_roman_opts << ',';
os << texmapping;
if (fonts_roman_osf)
os << ",Numbers=OldStyle";
if (!font_roman_opts.empty())
os << ',' << font_roman_opts;
os << "]{" << parseFontName(fontsRoman()) << "}\n";
}
if (fontsSans() != "default") {
@ -3545,10 +3545,10 @@ string const BufferParams::loadFonts(LaTeXFeatures & features) const
<< float(fontsSansScale()) / 100 << ',';
if (fonts_sans_osf)
os << "Numbers=OldStyle,";
os << texmapping;
if (!font_sans_opts.empty())
os << font_sans_opts << ',';
os << texmapping << "]{"
<< sans << "}\n";
os << ',' << font_sans_opts;
os << "]{" << sans << "}\n";
} else {
if (babelfonts)
os << "\\babelfont{sf}[";
@ -3556,10 +3556,10 @@ string const BufferParams::loadFonts(LaTeXFeatures & features) const
os << "\\setsansfont[";
if (fonts_sans_osf)
os << "Numbers=OldStyle,";
os << texmapping;
if (!font_sans_opts.empty())
os << font_sans_opts << ',';
os << texmapping << "]{"
<< sans << "}\n";
os << ',' << font_sans_opts;
os << "]{" << sans << "}\n";
}
}
if (fontsTypewriter() != "default") {