summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/projlib/projlib-font.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/projlib/projlib-font.sty')
-rw-r--r--Master/texmf-dist/tex/latex/projlib/projlib-font.sty117
1 files changed, 46 insertions, 71 deletions
diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-font.sty b/Master/texmf-dist/tex/latex/projlib/projlib-font.sty
index 6d6fed9fa2a..cfa1d6bb5e5 100644
--- a/Master/texmf-dist/tex/latex/projlib/projlib-font.sty
+++ b/Master/texmf-dist/tex/latex/projlib/projlib-font.sty
@@ -15,11 +15,11 @@
%% and version 1.3c or later is part of all distributions of LaTeX version
%% 2005/12/01 or later.
%%
-\NeedsTeXFormat{LaTeX2e}[2020-10-01]
+\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-font}
- {2022/04/24} {}
+ {2022/06/15} {}
{Font selection and configuration}
\keys_define:nn { projlib-font }
@@ -51,6 +51,7 @@
\bool_new:N \g_projlib_font_already_set_bool
\bool_gset_false:N \g_projlib_font_already_set_bool
+\RequirePackage { anyfontsize }
\RequirePackage { setspace }
\cs_new:Nn \projlib_font_set_linespacing_latin:n
@@ -80,73 +81,43 @@
\bool_if:NT \l__projlib_font_palatino_bool
{
- \sys_if_engine_pdftex:TF
- {
- \RequirePackage { mathpazo }
- \PassOptionsToPackage { defaultsups } { newpxtext }
- \RequirePackage { newpxtext }
- \cs_undefine:c { openbox }
- \bool_if:NT \l__projlib_font_useosf_bool { \useosf }
- }
- {
- \PassOptionsToPackage { warnings-off = { mathtools-colon, mathtools-overbracket } } { unicode-math }
- \RequirePackage { unicode-math }
- \defaultfontfeatures{ Scale=MatchLowercase, Ligatures=TeX }
- \bool_if:NTF \l__projlib_font_useosf_bool
- {
- \setmainfont { TeXGyrePagellaX-Regular.otf }
- [
- BoldFont = TeXGyrePagellaX-Bold.otf ,
- ItalicFont = TeXGyrePagellaX-Italic.otf ,
- BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf,
- Numbers = OldStyle ]
- }
- {
- \setmainfont { TeXGyrePagellaX-Regular.otf }
- [
- BoldFont = TeXGyrePagellaX-Bold.otf ,
- ItalicFont = TeXGyrePagellaX-Italic.otf ,
- BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf,
- ]
- }
- \setmathfont { texgyrepagella-math.otf }
- }
+ \RequirePackage { mathpazo }
+ \PassOptionsToPackage { defaultsups } { newpxtext }
+ \RequirePackage { newpxtext }
+ \cs_undefine:c { openbox }
+ \bool_if:NT \l__projlib_font_useosf_bool { \useosf }
+ \sys_if_engine_pdftex:F
+ {
+ \setsansfont { texgyreheros }
+ [
+ Scale = MatchUppercase ,
+ UprightFont = *-regular ,
+ BoldFont = *-bold ,
+ ItalicFont = *-italic ,
+ BoldItalicFont = *-bolditalic ,
+ ]
+ }
\projlib_font_set_linespacing_latin:n { \setstretch { 1.07 } }
\bool_gset_true:N \g_projlib_font_already_set_bool
}
\bool_if:NT \l__projlib_font_times_bool
{
- \sys_if_engine_pdftex:TF
- {
- \PassOptionsToPackage { defaultsups } { newtxtext }
- \RequirePackage { newtxtext }
- \RequirePackage { newtxmath }
- \cs_undefine:c { openbox }
- \bool_if:NT \l__projlib_font_useosf_bool { \useosf }
- }
+ \PassOptionsToPackage { defaultsups } { newtxtext }
+ \RequirePackage { newtxtext }
+ \RequirePackage { newtxmath }
+ \cs_undefine:c { openbox }
+ \bool_if:NT \l__projlib_font_useosf_bool { \useosf }
+ \sys_if_engine_pdftex:F
{
- \PassOptionsToPackage { warnings-off = { mathtools-colon, mathtools-overbracket } } { unicode-math }
- \RequirePackage { unicode-math }
- \defaultfontfeatures{ Scale=MatchLowercase, Ligatures=TeX }
- \bool_if:NTF \l__projlib_font_useosf_bool
- {
- \setmainfont { TeXGyreTermesX-Regular.otf }
- [
- BoldFont = TeXGyreTermesX-Bold.otf ,
- ItalicFont = TeXGyreTermesX-Italic.otf ,
- BoldItalicFont = TeXGyreTermesX-BoldItalic.otf,
- Numbers = OldStyle ]
- }
- {
- \setmainfont { TeXGyreTermesX-Regular.otf }
- [
- BoldFont = TeXGyreTermesX-Bold.otf ,
- ItalicFont = TeXGyreTermesX-Italic.otf ,
- BoldItalicFont = TeXGyreTermesX-BoldItalic.otf,
- ]
- }
- \setmathfont { texgyretermes-math.otf }
+ \setsansfont { texgyreheros }
+ [
+ Scale = MatchUppercase ,
+ UprightFont = *-regular ,
+ BoldFont = *-bold ,
+ ItalicFont = *-italic ,
+ BoldItalicFont = *-bolditalic ,
+ ]
}
\projlib_font_set_linespacing_latin:n { \setstretch { 1.00 } }
\bool_gset_true:N \g_projlib_font_already_set_bool
@@ -197,17 +168,21 @@
\RequirePackage { fontspec }
\bool_if:NTF \l__projlib_font_useosf_bool
{
- \setmainfont { LinBiolinum_R.otf } [
- BoldFont = LinBiolinum_RB.otf ,
- ItalicFont = LinBiolinum_RI.otf ,
- BoldItalicFont = LinBiolinum_RBO.otf ,
- Numbers = OldStyle , ]
+ \setmainfont { LinBiolinum_R.otf }
+ [
+ BoldFont = LinBiolinum_RB.otf ,
+ ItalicFont = LinBiolinum_RI.otf ,
+ BoldItalicFont = LinBiolinum_RBO.otf ,
+ Numbers = OldStyle ,
+ ]
}
{
- \setmainfont { LinBiolinum_R.otf } [
- BoldFont = LinBiolinum_RB.otf ,
- ItalicFont = LinBiolinum_RI.otf ,
- BoldItalicFont = LinBiolinum_RBO.otf , ]
+ \setmainfont { LinBiolinum_R.otf }
+ [
+ BoldFont = LinBiolinum_RB.otf ,
+ ItalicFont = LinBiolinum_RI.otf ,
+ BoldItalicFont = LinBiolinum_RBO.otf ,
+ ]
}
}
\projlib_font_set_linespacing_latin:n { \setstretch { 1.05 } }