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

tex2lyx: support for URW Classico, MinionPro and the new Libertine fonts.

Browse Source 
(cherry picked from commit a3836d9909)
This commit is contained in:
Juergen Spitzmueller 2018-03-11 11:12:42 +01:00
parent 5fc0dafac3
commit f183686505
3 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/tex2lyx/Preamble.cpp
View File

@ -126,17 +126,18 @@ char const * const known_fontsizes[] = { "10pt", "11pt", "12pt", 0 };
const char * const known_roman_fonts[] = { "ae", "beraserif", "bookman", const char * const known_roman_fonts[] = { "ae", "beraserif", "bookman",
"ccfonts", "chancery", "charter", "cmr", "cochineal", "crimson", "fourier", "ccfonts", "chancery", "charter", "cmr", "cochineal", "crimson", "fourier",
"garamondx", "libertine", "libertine-type1", "lmodern", "mathdesign", "mathpazo", "garamondx", "libertine", "libertineRoman", "libertine-type1", "lmodern", "mathdesign",
"mathptmx", "newcent", "NotoSerif-TLF", "tgbonum", "tgchorus", "tgpagella", "tgschola", "mathpazo", "mathptmx", "MinionPro", "newcent", "NotoSerif-TLF", "tgbonum", "tgchorus",
"tgtermes", "utopia", 0}; "tgpagella", "tgschola", "tgtermes", "utopia", 0 };
const char * const known_sans_fonts[] = { "avant", "berasans", "biolinum-type1", const char * const known_sans_fonts[] = { "avant", "berasans", "biolinum",
"cmbr", "cmss", "helvet", "iwona", "iwonac", "iwonal", "iwonalc", "kurier", "biolinum-type1", "cmbr", "cmss", "helvet", "iwona", "iwonac", "iwonal", "iwonalc",
"kurierc", "kurierl", "kurierlc", "lmss", "NotoSans-TLF", "tgadventor", "tgheros", 0}; "kurier", "kurierc", "kurierl", "kurierlc", "lmss", "NotoSans-TLF",
"tgadventor", "tgheros", "uop", 0 };
const char * const known_typewriter_fonts[] = { "beramono", "cmtl", "cmtt", const char * const known_typewriter_fonts[] = { "beramono", "cmtl", "cmtt",
"courier", "lmtt", "luximono", "fourier", "libertineMono-type1", "lmodern", "courier", "lmtt", "luximono", "fourier", "libertineMono", "libertineMono-type1", "lmodern",
"mathpazo", "mathptmx", "newcent", "NotoMono-TLF", "tgcursor", "txtt", 0}; "mathpazo", "mathptmx", "newcent", "NotoMono-TLF", "tgcursor", "txtt", 0 };
const char * const known_math_fonts[] = { "eulervm", "newtxmath", 0}; const char * const known_math_fonts[] = { "eulervm", "newtxmath", 0};
@ -733,22 +734,37 @@ void Preamble::handle_package(Parser &p, string const & name,
h_font_roman[0] = "libertine"; h_font_roman[0] = "libertine";
// this automatically invokes biolinum // this automatically invokes biolinum
h_font_sans[0] = "biolinum"; h_font_sans[0] = "biolinum";
// as well as libertineMono
h_font_typewriter[0] = "libertine-mono";
if (opts == "osf") if (opts == "osf")
h_font_osf = "true"; h_font_osf = "true";
else if (opts == "lining") else if (opts == "lining")
h_font_osf = "false"; h_font_osf = "false";
} }
if (name == "libertine-type1") { if (name == "libertineRoman" || name == "libertine-type1") {
h_font_roman[0] = "libertine"; h_font_roman[0] = "libertine";
// NOTE: contrary to libertine.sty, libertine-type1 // NOTE: contrary to libertine.sty, libertineRoman
// does not automatically invoke biolinum // and libertine-type1 do not automatically invoke
// biolinum and libertineMono
if (opts == "lining") if (opts == "lining")
h_font_osf = "false"; h_font_osf = "false";
else if (opts == "osf") else if (opts == "osf")
h_font_osf = "true"; h_font_osf = "true";
} }
if (name == "MinionPro") {
h_font_roman[0] = "minionpro";
if (opts.find("lf") != string::npos)
h_font_osf = "false";
else
h_font_osf = "true";
if (opts.find("onlytext") != string::npos)
h_font_math[0] = "default";
else
h_font_math[0] = "auto";
}
if (name == "mathdesign") { if (name == "mathdesign") {
if (opts.find("charter") != string::npos) if (opts.find("charter") != string::npos)
h_font_roman[0] = "md-charter"; h_font_roman[0] = "md-charter";
@ -807,7 +823,7 @@ void Preamble::handle_package(Parser &p, string const & name,
} }
} }
if (name == "biolinum-type1") { if (name == "biolinum" || name == "biolinum-type1") {
h_font_sans[0] = "biolinum"; h_font_sans[0] = "biolinum";
// biolinum can have several options, e.g. [osf,scaled=0.97] // biolinum can have several options, e.g. [osf,scaled=0.97]
string::size_type pos = opts.find("osf"); string::size_type pos = opts.find("osf");
@ -828,9 +844,8 @@ void Preamble::handle_package(Parser &p, string const & name,
} }
} }
if (name == "libertineMono-type1") { if (name == "libertineMono" || name == "libertineMono-type1")
h_font_typewriter[0] = "libertine-mono"; h_font_typewriter[0] = "libertine-mono";
}
// font uses old-style figure // font uses old-style figure
if (name == "eco") if (name == "eco")

4
src/tex2lyx/TODO.txt
View File

@ -51,11 +51,7 @@ Format LaTeX feature LyX feature
411 support for polyglossia \language_package (the cases of no package, of babel and of custom package is supported) 411 support for polyglossia \language_package (the cases of no package, of babel and of custom package is supported)
415 automatic undertilde loading \use_package undertilde 415 automatic undertilde loading \use_package undertilde
438 \t*{ } InsetTIPA 438 \t*{ } InsetTIPA
439 MinionPro.sty \font_roman, \font_osf
440 MinionPro.sty, \font_math
443 unicode-math.sty InsetMath* 443 unicode-math.sty InsetMath*
445 URW Classico LaTeX font \font_sans uop
\renewcommand{\sffamily}{uop}
448 448
451 beamer overlay arguments InsetArgument 451 beamer overlay arguments InsetArgument
\command<arg>, \begin{env}<arg> \command<arg>, \begin{env}<arg>

2
status.23x
View File

@ -27,6 +27,8 @@ What's new
- Add support for \includeonly. - Add support for \includeonly.
- Add support for URW Classico, MinionPro and the new Libertine fonts.
* USER INTERFACE * USER INTERFACE