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

tex2lyx: slight font handling simplification

Browse Source 
We do not have to add the general packages to known sf and tt, just to
exclude them later by exception.
This commit is contained in:
Juergen Spitzmueller 2019-07-19 07:49:12 +02:00
parent f45a1ea5e8
commit 36399e88d3
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/tex2lyx/Preamble.cpp
View File

@ -149,12 +149,12 @@ const char * const known_roman_font_packages[] = { "ae", "beraserif", "bookman",
const char * const known_sans_font_packages[] = { "avant", "berasans", "biolinum", const char * const known_sans_font_packages[] = { "avant", "berasans", "biolinum",
"biolinum-type1", "cantarell", "Chivo", "cmbr", "cmss", "DejaVuSans", "DejaVuSansCondensed", "FiraSans", "helvet", "iwona", "biolinum-type1", "cantarell", "Chivo", "cmbr", "cmss", "DejaVuSans", "DejaVuSansCondensed", "FiraSans", "helvet", "iwona",
"iwonac", "iwonal", "iwonalc", "kurier", "kurierc", "kurierl", "kurierlc", "lmss", "noto", "noto-sans", "PTSans", "iwonac", "iwonal", "iwonalc", "kurier", "kurierc", "kurierl", "kurierlc", "lmss", "noto-sans", "PTSans",
"tgadventor", "tgheros", "uop", 0 }; "tgadventor", "tgheros", "uop", 0 };
const char * const known_typewriter_font_packages[] = { "beramono", "cmtl", "cmtt", "courier", "DejaVuSansMono", const char * const known_typewriter_font_packages[] = { "beramono", "cmtl", "cmtt", "courier", "DejaVuSansMono",
"FiraMono", "lmtt", "luximono", "fourier", "libertineMono", "libertineMono-type1", "lmodern", "FiraMono", "lmtt", "luximono", "libertineMono", "libertineMono-type1", "lmodern",
"mathpazo", "mathptmx", "newcent", "noto", "noto-mono", "PTMono", "tgcursor", "txtt", 0 }; "mathpazo", "mathptmx", "newcent", "noto-mono", "PTMono", "tgcursor", "txtt", 0 };
const char * const known_math_font_packages[] = { "eulervm", "newtxmath", 0}; const char * const known_math_font_packages[] = { "eulervm", "newtxmath", 0};
@ -756,8 +756,7 @@ void Preamble::handle_package(Parser &p, string const & name,
// By default, we use the package name as LyX font name, // By default, we use the package name as LyX font name,
// so this only needs to be reset if these names differ // so this only needs to be reset if these names differ
// Exception: noto if (is_known(name, known_roman_font_packages))
if (is_known(name, known_roman_font_packages) && name != "noto")
h_font_roman[0] = name; h_font_roman[0] = name;
if (name == "ccfonts") { if (name == "ccfonts") {
@ -1171,8 +1170,7 @@ void Preamble::handle_package(Parser &p, string const & name,
// By default, we use the package name as LyX font name, // By default, we use the package name as LyX font name,
// so this only needs to be reset if these names differ. // so this only needs to be reset if these names differ.
// Also, we handle the scaling option here generally. // Also, we handle the scaling option here generally.
// Exception: noto if (is_known(name, known_sans_font_packages)) {
if (is_known(name, known_sans_font_packages) && name != "noto") {
h_font_sans[0] = name; h_font_sans[0] = name;
if (contains(opts, "scale")) { if (contains(opts, "scale")) {
vector<string>::const_iterator it = allopts.begin(); vector<string>::const_iterator it = allopts.begin();
@ -1380,8 +1378,7 @@ void Preamble::handle_package(Parser &p, string const & name,
// By default, we use the package name as LyX font name, // By default, we use the package name as LyX font name,
// so this only needs to be reset if these names differ. // so this only needs to be reset if these names differ.
// Also, we handle the scaling option here generally. // Also, we handle the scaling option here generally.
// Exceptions: fourier, noto if (is_known(name, known_typewriter_font_packages)) {
if (is_known(name, known_typewriter_font_packages) && name != "fourier" && name != "noto") {
h_font_typewriter[0] = name; h_font_typewriter[0] = name;
if (contains(opts, "scale")) { if (contains(opts, "scale")) {
vector<string>::const_iterator it = allopts.begin(); vector<string>::const_iterator it = allopts.begin();