From 16fb143868bcf7876073114e733f9333c7cf7ddc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 5 Aug 2022 21:33:03 +0000 Subject: projlib (5aug22) git-svn-id: svn://tug.org/texlive/trunk@64056 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/projlib/ProjLib.sty | 2 +- .../tex/latex/projlib/projlib-author.sty | 2 +- .../tex/latex/projlib/projlib-datetime.sty | 2 +- .../texmf-dist/tex/latex/projlib/projlib-draft.sty | 2 +- .../texmf-dist/tex/latex/projlib/projlib-font.sty | 2 +- .../tex/latex/projlib/projlib-language.sty | 2 +- .../texmf-dist/tex/latex/projlib/projlib-logo.sty | 2 +- .../texmf-dist/tex/latex/projlib/projlib-math.sty | 105 +++++++++++++-------- .../texmf-dist/tex/latex/projlib/projlib-paper.sty | 2 +- .../texmf-dist/tex/latex/projlib/projlib-text.sty | 2 +- .../tex/latex/projlib/projlib-theorem.sty | 2 +- .../tex/latex/projlib/projlib-titlepage.sty | 12 +-- 12 files changed, 80 insertions(+), 57 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty index 40ed0984cb6..92b77c4db70 100644 --- a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty +++ b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {ProjLib} - {2022/08/01} {} + {2022/08/05} {} {Collective interface of the ProjLib toolkit} \keys_define:nn { ProjLib } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-author.sty b/Master/texmf-dist/tex/latex/projlib/projlib-author.sty index 503c3be96bf..ea2592edecd 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-author.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-author.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-author} - {2022/08/01} {} + {2022/08/05} {} {Enhanced author information block} \keys_define:nn { projlib-author } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty b/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty index 0aed664b0c4..6617cbb8614 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-datetime} - {2022/08/01} {} + {2022/08/05} {} {Convert numeric date-time string to natural language} \tl_new:N \g__projlib_datetime_input_format_tl diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty b/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty index 21341e939a0..0a5d6e78fd9 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-draft} - {2022/08/01} {} + {2022/08/05} {} {Useful commands during draft stage} \keys_define:nn { projlib-draft } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-font.sty b/Master/texmf-dist/tex/latex/projlib/projlib-font.sty index 154a284e48a..9ae86454f8c 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-font.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-font.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-font} - {2022/08/01} {} + {2022/08/05} {} {Font selection and configuration} \keys_define:nn { projlib-font } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-language.sty b/Master/texmf-dist/tex/latex/projlib/projlib-language.sty index faddeb8fa0f..58d7ed1a945 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-language.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-language.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-language} - {2022/08/01} {} + {2022/08/05} {} {Multi-language configuration} \clist_const:Nn \c__projlib_language_supported_clist diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty b/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty index 11c82738765..98c0bb68b2e 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-logo} - {2022/08/01} {} + {2022/08/05} {} {The ProjLib logo} \keys_define:nn { projlib-logo } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-math.sty b/Master/texmf-dist/tex/latex/projlib/projlib-math.sty index 58d73dd34a8..c8b3603a8c8 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-math.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-math.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-math} - {2022/08/01} {} + {2022/08/05} {} {Efficient math setup} \keys_define:nn { projlib-math } @@ -27,6 +27,11 @@ } \ProcessKeyOptions [ projlib-math ] +\providecommand* \ProvideCommandCopy + { + \declare@commandcopy{\@firstofone}{\@firstoftwo{}} + } + \RequirePackage { mathtools } \RequirePackage { mathrsfs } \PassOptionsToPackage { warnings-off = { mathtools-colon, mathtools-overbracket } } { unicode-math } @@ -91,7 +96,7 @@ } \cs_generate_variant:Nn \__projlib_math_define_operator:nnn { nee } -\NewDocumentCommand \DefineMathOperator { s O{} m O{} } +\NewDocumentCommand \ProjLibDefineMathOperator { s O{} m O{} } { \tl_if_blank:nTF { #2 } { @@ -101,49 +106,51 @@ \projlib_math_define_operator:nnn { #1 } { #3 } { #2 } } } -\NewCommandCopy \DefineOperator \DefineMathOperator + +\ProvideCommandCopy \DefineMathOperator \ProjLibDefineMathOperator +\ProvideCommandCopy \DefineOperator \ProjLibDefineMathOperator \msg_new:nnn { projlib-math } - { shortcut-not-define } + { symbol-not-define } { The~symbol~/~shortcut~"\iow_char:N \\#1"~cannot~be~defined,~a~command~with~the~same~name~has~already~existed. } \msg_new:nnn { projlib-math } - { shortcut-type-not-define } + { symbol-type-not-define } { The~symbol~/~shortcut~type~"#1"~is~not~available,~a~command~with~the~same~name~has~already~existed. } -\keys_define:nn { projlib-math-shortcut } +\keys_define:nn { projlib-math-symbol } { - , prefix .clist_set:N = \l__projlib_math_shortcut_prefix_clist - , type .tl_set:N = \l__projlib_math_shortcut_type_tl - , style .tl_set:N = \l__projlib_math_shortcut_style_tl + , prefix .clist_set:N = \l__projlib_math_symbol_prefix_clist + , type .tl_set:N = \l__projlib_math_symbol_type_tl + , style .tl_set:N = \l__projlib_math_symbol_style_tl , unknown .code:n = {} } -\cs_new_protected:Nn \projlib_math_define_shortcut:nnn +\cs_new_protected:Nn \projlib_math_define_symbol:nnn % #1 = bool for star or empty % (currently the starred version is the same as normal version) - % #2 = list of shortcuts + % #2 = list of symbols % #3 = the option { - \clist_clear:N \l__projlib_math_shortcut_prefix_clist - \tl_clear:N \l__projlib_math_shortcut_type_tl - \tl_set:Nn \l__projlib_math_shortcut_style_tl { \mathrm } - \keys_set:nn { projlib-math-shortcut } { #3 } - \tl_if_empty:NF \l__projlib_math_shortcut_type_tl + \clist_clear:N \l__projlib_math_symbol_prefix_clist + \tl_clear:N \l__projlib_math_symbol_type_tl + \tl_set:Nn \l__projlib_math_symbol_style_tl { \mathrm } + \keys_set:nn { projlib-math-symbol } { #3 } + \tl_if_empty:NF \l__projlib_math_symbol_type_tl { - \cs_if_exist:cTF { \l__projlib_math_shortcut_type_tl } + \cs_if_exist:cTF { \l__projlib_math_symbol_type_tl } { \exp_args:Nne \use:n - { \msg_warning:nnn { projlib-math } { shortcut-type-not-define } } - { \l__projlib_math_shortcut_type_tl } + { \msg_warning:nnn { projlib-math } { symbol-type-not-define } } + { \l__projlib_math_symbol_type_tl } } { \exp_args:Nno \use:n { - \exp_args:Nc \NewDocumentCommand { \l__projlib_math_shortcut_type_tl } { m } + \exp_args:Nc \NewDocumentCommand { \l__projlib_math_symbol_type_tl } { m } } { - \l__projlib_math_shortcut_style_tl { ##1 } + \l__projlib_math_symbol_style_tl { ##1 } } } } @@ -152,59 +159,78 @@ \str_if_in:nnTF { ##1 } { = } { \seq_set_split:Nnn \l_tmpa_seq { = } { ##1 } - \clist_if_empty:NTF \l__projlib_math_shortcut_prefix_clist + \clist_if_empty:NTF \l__projlib_math_symbol_prefix_clist { - \__projlib_math_define_shortcut:ee { \seq_item:Nn \l_tmpa_seq { 1 } } { \seq_item:Nn \l_tmpa_seq { 2 } } + \__projlib_math_define_symbol:ee { \seq_item:Nn \l_tmpa_seq { 1 } } { \seq_item:Nn \l_tmpa_seq { 2 } } } { - \clist_map_inline:Nn \l__projlib_math_shortcut_prefix_clist + \clist_map_inline:Nn \l__projlib_math_symbol_prefix_clist { - \__projlib_math_define_shortcut:ee { ####1 \seq_item:Nn \l_tmpa_seq { 1 } } { \seq_item:Nn \l_tmpa_seq { 2 } } + \__projlib_math_define_symbol:ee { ####1 \seq_item:Nn \l_tmpa_seq { 1 } } { \seq_item:Nn \l_tmpa_seq { 2 } } } } } { - \clist_if_empty:NTF \l__projlib_math_shortcut_prefix_clist + \clist_if_empty:NTF \l__projlib_math_symbol_prefix_clist { - \__projlib_math_define_shortcut:ee { ##1 } { ##1 } + \__projlib_math_define_symbol:ee { ##1 } { ##1 } } { - \clist_map_inline:Nn \l__projlib_math_shortcut_prefix_clist + \clist_map_inline:Nn \l__projlib_math_symbol_prefix_clist { - \__projlib_math_define_shortcut:ee { ####1 ##1 } { ##1 } + \__projlib_math_define_symbol:ee { ####1 ##1 } { ##1 } } } } } } -\cs_new_protected:Nn \__projlib_math_define_shortcut:nn +\cs_new_protected:Nn \__projlib_math_define_symbol:nn % #1 = command name % #2 = the content { \cs_if_exist:cTF { #1 } { - \msg_warning:nnn { projlib-math } { shortcut-not-define } { #1 } + \msg_warning:nnn { projlib-math } { symbol-not-define } { #1 } } { \exp_args:Nno \use:n { \exp_args:Nc \NewDocumentCommand { #1 } {} } - { \l__projlib_math_shortcut_style_tl { #2 } } + { \l__projlib_math_symbol_style_tl { #2 } } } } -\cs_generate_variant:Nn \__projlib_math_define_shortcut:nn { ee } +\cs_generate_variant:Nn \__projlib_math_define_symbol:nn { ee } -\NewDocumentCommand \DefineMathSymbol { s O{} m O{} } +\NewDocumentCommand \ProjLibDefineMathSymbol { s O{} m O{} } { \tl_if_blank:nTF { #2 } { - \projlib_math_define_shortcut:nnn { #1 } { #3 } { #4 } + \projlib_math_define_symbol:nnn { #1 } { #3 } { #4 } } { - \projlib_math_define_shortcut:nnn { #1 } { #3 } { #2 } + \projlib_math_define_symbol:nnn { #1 } { #3 } { #2 } + } + } +\ProvideCommandCopy \DefineMathSymbol \ProjLibDefineMathSymbol +\ProvideCommandCopy \DefineShortcut \ProjLibDefineMathSymbol + +\cs_new:Nn \projlib_math_redefine_in_math_mode:Nn + { + \exp_args:Nc \NewCommandCopy { projlib_math_original_ \cs_to_str:N #1 : } #1 + \RenewDocumentCommand #1 { } + { + \mode_if_math:TF + { #2 } + { \use:c { projlib_math_original_ \cs_to_str:N #1 : } } } } -\NewCommandCopy \DefineShortcut \DefineMathSymbol + +\NewDocumentCommand \ProjLibRedefineInMathMode { m m } + { + \projlib_math_redefine_in_math_mode:Nn #1 { #2 } + } + +\ProvideCommandCopy \RedefineInMathMode \ProjLibRedefineInMathMode \cs_new:Nn \__projlib_math_list_of_symbols_entry:nnnn % #1 = column one width @@ -236,10 +262,7 @@ \projlib_math_list_of_symbols:nnn { #1 } { #2 } { #3 } } -\ProvideDocumentCommand \ListOfSymbols { O{0.17\textwidth} O{0.75\textwidth} m } - { - \projlib_math_list_of_symbols:nnn { #1 } { #2 } { #3 } - } +\ProvideCommandCopy \ListOfSymbols \ProjLibListOfSymbols \endinput %% diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty b/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty index 9e89d70bc71..17d883bc185 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-paper} - {2022/08/01} {} + {2022/08/05} {} {Configuration of the paper style} \keys_define:nn { projlib-paper } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-text.sty b/Master/texmf-dist/tex/latex/projlib/projlib-text.sty index 65d05259188..e1172552953 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-text.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-text.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-text} - {2022/08/01} {} + {2022/08/05} {} {Text-related commands} \keys_define:nn { projlib-text } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty b/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty index 3d8c391d5b1..e39f6da2c64 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-theorem} - {2022/08/01} {} + {2022/08/05} {} {Configuration of theorem-like environments} \keys_define:nn { projlib-theorem } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty b/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty index 71534b394f4..108f343f642 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-titlepage} - {2022/08/01} {} + {2022/08/05} {} {Commands for rendering the title page} \keys_define:nn { projlib-titlepage } @@ -77,7 +77,7 @@ } \colorlet { titlepage-main } { blue!50!cyan!50!black } -\colorlet { titlepage-back } { blue!50!cyan!10!yellow!30 } +\colorlet { titlepage-back } { blue!50!cyan!15!yellow!25 } \cs_new_protected:Nn \projlib_titlepage_render:n { @@ -110,8 +110,8 @@ \fontsize{18pt}{27pt}\selectfont \l_projlib_titlepage_subtitle_tl }; - \node[text~width=.3\paperwidth, text~height=.3\paperheight, align=flush~left] - at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) + \node[text~width=.5\paperwidth, text~height=.4\paperheight, align=flush~left] + at ($(current~page.south)+(.135\paperwidth,.35\paperheight)$) { \color{titlepage-back} \begin{flushright} @@ -144,8 +144,8 @@ \fontsize{18pt}{27pt}\selectfont \l_projlib_titlepage_subtitle_tl }; - \node[text~width=.3\paperwidth, text~height=.3\paperheight, align=flush~left] - at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) + \node[text~width=.5\paperwidth, text~height=.4\paperheight, align=flush~left] + at ($(current~page.south)+(.135\paperwidth,.35\paperheight)$) { \color{white} \begin{flushright} -- cgit v1.2.3