diff options
Diffstat (limited to 'macros/latex/contrib/projlib/ProjLib.dtx')
-rw-r--r-- | macros/latex/contrib/projlib/ProjLib.dtx | 120 |
1 files changed, 89 insertions, 31 deletions
diff --git a/macros/latex/contrib/projlib/ProjLib.dtx b/macros/latex/contrib/projlib/ProjLib.dtx index 1f4cceb73e..fbe6d2acd2 100644 --- a/macros/latex/contrib/projlib/ProjLib.dtx +++ b/macros/latex/contrib/projlib/ProjLib.dtx @@ -19,84 +19,84 @@ %<*ProjLib> \ProvidesExplPackage {ProjLib} - {2024/02/20} {} + {2024/02/22} {} {Collective interface of the ProjLib toolkit} %</ProjLib> % %<*projlib-author> \ProvidesExplPackage {projlib-author} - {2024/02/20} {} + {2024/02/22} {} {Enhanced author information block} %</projlib-author> % %<*projlib-datetime> \ProvidesExplPackage {projlib-datetime} - {2024/02/20} {} + {2024/02/22} {} {Convert numeric date-time string to natural language} %</projlib-datetime> % %<*projlib-draft> \ProvidesExplPackage {projlib-draft} - {2024/02/20} {} + {2024/02/22} {} {Useful commands during draft stage} %</projlib-draft> % %<*projlib-font> \ProvidesExplPackage {projlib-font} - {2024/02/20} {} + {2024/02/22} {} {Font selection and configuration} %</projlib-font> % %<*projlib-language> \ProvidesExplPackage {projlib-language} - {2024/02/20} {} + {2024/02/22} {} {Multi-language configuration} %</projlib-language> % %<*projlib-logo> \ProvidesExplPackage {projlib-logo} - {2024/02/20} {} + {2024/02/22} {} {The ProjLib logo} %</projlib-logo> % %<*projlib-math> \ProvidesExplPackage {projlib-math} - {2024/02/20} {} + {2024/02/22} {} {Efficient math setup} %</projlib-math> % %<*projlib-paper> \ProvidesExplPackage {projlib-paper} - {2024/02/20} {} + {2024/02/22} {} {Configuration of the paper style} %</projlib-paper> % %<*projlib-text> \ProvidesExplPackage {projlib-text} - {2024/02/20} {} + {2024/02/22} {} {Text-related commands} %</projlib-text> % %<*projlib-theorem> \ProvidesExplPackage {projlib-theorem} - {2024/02/20} {} + {2024/02/22} {} {Configuration of theorem-like environments} %</projlib-theorem> % %<*projlib-titlepage> \ProvidesExplPackage {projlib-titlepage} - {2024/02/20} {} + {2024/02/22} {} {Interface for title page rendering} %</projlib-titlepage> @@ -355,11 +355,13 @@ \cs_new_nopar:Nn \projlib_author_pre_thanks:n { + \tl_set:Nn \footnotemark {} \projlib_author_backup_thanks:w { \skip_horizontal:n { - \c__projlib_author_width_of_asterisk_dim } #1 } + \RenewCommandCopy \footnotemark \projlib_author_backup_footnotemark: } \NewDocumentCommand \thanks { m } @@ -368,9 +370,7 @@ { \hook_gput_code:nnn { cmd/@title/after } { projlib-author } { - \tl_set:Nn \footnotemark {} \projlib_author_pre_thanks:n { #1 } - \RenewCommandCopy \footnotemark \projlib_author_backup_footnotemark: } } } @@ -483,7 +483,6 @@ { Unknown~edition~(#1)~of~Mathematics~Subject~Classification;~using~'2020' } \NewDocumentCommand \subjclass { O{2020} m } { - \tl_set:Nn \footnotemark {} \tl_set:Nn \l_projlib_author_subjclass_tl { #2 } \tl_if_exist:cTF { subjclassname_#1 } { @@ -499,7 +498,6 @@ \enspace \l_projlib_author_subjclass_tl . } - \RenewCommandCopy \footnotemark \projlib_author_backup_footnotemark: } \tl_const:cn { subjclassname_1991 } { \textup{1991}~Mathematics~Subject~Classification } \tl_const:cn { subjclassname_2000 } { \textup{2000}~Mathematics~Subject~Classification } @@ -2445,11 +2443,20 @@ %<*projlib-font> \keys_define:nn { projlib-font } { - , useosf .bool_set:N = \l__projlib_font_useosf_bool + , use-osf .bool_set:N = \l__projlib_font_useosf_bool , useosf .initial:n = { false } + , use~osf .bool_set:N = \l__projlib_font_useosf_bool + , use osf .bool_set:N = \l__projlib_font_useosf_bool , old-style-figures .bool_set:N = \l__projlib_font_useosf_bool , old~style~figures .bool_set:N = \l__projlib_font_useosf_bool + , old-style~figures .bool_set:N = \l__projlib_font_useosf_bool + , old style~figures .bool_set:N = \l__projlib_font_useosf_bool , old style figures .bool_set:N = \l__projlib_font_useosf_bool + , old-style-figure .bool_set:N = \l__projlib_font_useosf_bool + , old~style~figure .bool_set:N = \l__projlib_font_useosf_bool + , old-style~figure .bool_set:N = \l__projlib_font_useosf_bool + , old style~figure .bool_set:N = \l__projlib_font_useosf_bool + , old style figure .bool_set:N = \l__projlib_font_useosf_bool , new-computer-modern .bool_set:N = \l__projlib_font_newcomputermodern_bool , new-computer-modern .initial:n = { false } , new~computer~modern .bool_set:N = \l__projlib_font_newcomputermodern_bool @@ -2470,10 +2477,15 @@ , times .initial:n = { false } , garamond .bool_set:N = \l__projlib_font_garamond_bool , garamond .initial:n = { false } - , noto .bool_set:N = \l__projlib_font_noto_bool - , noto .initial:n = { false } + , bembo .bool_set:N = \l__projlib_font_bembo_bool + , bembo .initial:n = { false } , biolinum .bool_set:N = \l__projlib_font_biolinum_bool , biolinum .initial:n = { false } + , noto .bool_set:N = \l__projlib_font_noto_bool + , noto .initial:n = { false } + , use-font .meta:n = { #1 } + , use~font .meta:n = { #1 } + , use font .meta:n = { #1 } , unknown .code:n = {} } \ProcessKeyOptions [ projlib-font ] @@ -2497,14 +2509,14 @@ \bool_if:NT \l__projlib_font_newcomputermodern_bool { - \usepackage[default]{fontsetup} + \RequirePackage [default] { fontsetup } \projlib_font_set_linespacing_latin:n { \setstretch { 1.00 } } \bool_gset_true:N \g_projlib_font_already_set_bool } \bool_if:NT \l__projlib_font_computermodern_bool { - \usepackage[olddefault]{fontsetup} + \RequirePackage [olddefault] { fontsetup } \projlib_font_set_linespacing_latin:n { \setstretch { 1.00 } } \bool_gset_true:N \g_projlib_font_already_set_bool } @@ -2553,18 +2565,29 @@ \bool_if:NT \l__projlib_font_times_bool { - \PassOptionsToPackage { defaultsups } { newtxtext } \PassOptionsToPackage { no-math } { fontspec } \hook_gput_code:nnn { begindocument/before } { projlib-font } { - \bool_if:NT \l__projlib_font_useosf_bool + \sys_if_engine_pdftex:TF { - \PassOptionsToPackage { osf } { newtxtext } + \bool_if:NT \l__projlib_font_useosf_bool + { + \PassOptionsToPackage { osf } { newtxtext } + } + \PassOptionsToPackage { defaultsups } { newtxtext } + \RequirePackage { newtxtext } + \RequirePackage { newtxmath } } - \RequirePackage { newtxtext } - \RequirePackage { newtxmath } - \sys_if_engine_pdftex:F { + \RequirePackage { fontspec } + \setmainfont { texgyretermes } + [ + Scale = MatchUppercase , + UprightFont = *-regular , + BoldFont = *-bold , + ItalicFont = *-italic , + BoldItalicFont = *-bolditalic , + ] \setsansfont { texgyreheros } [ Scale = MatchUppercase , @@ -2573,6 +2596,17 @@ ItalicFont = *-italic , BoldItalicFont = *-bolditalic , ] + \setmonofont { texgyrecursor } + [ + Scale = MatchUppercase , + UprightFont = *-regular , + BoldFont = *-bold , + ItalicFont = *-italic , + BoldItalicFont = *-bolditalic , + ] + \setmonofont{inconsolata}[Scale=MatchLowercase] + \RequirePackage { unicode-math } + \setmathfont { texgyretermes-math } } } \projlib_font_set_linespacing_latin:n { \setstretch { 1.00 } } @@ -2623,14 +2657,24 @@ \bool_gset_true:N \g_projlib_font_already_set_bool } -\bool_if:NT \l__projlib_font_noto_bool +\bool_if:NT \l__projlib_font_bembo_bool { \bool_if:NT \l__projlib_font_useosf_bool { - \PassOptionsToPackage { oldstyle } { notomath } + \PassOptionsToPackage { osf } { fbb } } - \RequirePackage { anyfontsize } - \RequirePackage { notomath } + \sys_if_engine_pdftex:F + { + \RequirePackage { fontspec } + } + \RequirePackage [full] { textcomp } % to get the right copyright, etc. + \RequirePackage [p] { fbb } + \RequirePackage [scaled=.95,type1] { cabin } % sans serif in style of Gill Sans + \RequirePackage [varqu,varl] { zi4 }% inconsolata typewriter + \RequirePackage [T1] { fontenc } + \RequirePackage [libertine] { newtxmath } + \RequirePackage [cal=boondoxo,bb=boondox,frak=boondox] { mathalfa } + \cs_undefine:c { openbox } \cs_undefine:c { Bbbk } \projlib_font_set_linespacing_latin:n { \setstretch { 1.00 } } \bool_gset_true:N \g_projlib_font_already_set_bool @@ -2675,6 +2719,20 @@ \bool_gset_true:N \g_projlib_font_already_set_bool } +\bool_if:NT \l__projlib_font_noto_bool + { + \bool_if:NT \l__projlib_font_useosf_bool + { + \PassOptionsToPackage { oldstyle } { notomath } + } + \RequirePackage { anyfontsize } + \RequirePackage { notomath } + \cs_undefine:c { openbox } + \cs_undefine:c { Bbbk } + \projlib_font_set_linespacing_latin:n { \setstretch { 1.00 } } + \bool_gset_true:N \g_projlib_font_already_set_bool + } + % \bool_if:NF \l__projlib_font_lmodern_bool % { % \hook_gput_code:nnn { package/tikz-cd/after } { projlib-font } |