diff options
author | Karl Berry <karl@freefriends.org> | 2022-07-03 20:59:22 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-07-03 20:59:22 +0000 |
commit | 217c1e16d9b316f60167942777fd1aff14dea424 (patch) | |
tree | 3a897602d5068fc8575662d9bb84ec73b1820b2e /Master/texmf-dist/tex/latex/projlib | |
parent | 9e69ea0bcee4511423b695a3c95a531512ad1247 (diff) |
projlib (3jul22)
git-svn-id: svn://tug.org/texlive/trunk@63803 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/projlib')
12 files changed, 144 insertions, 64 deletions
diff --git a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty index d2a7ad69144..d488e3ea503 100644 --- a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty +++ b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty @@ -1,7 +1,7 @@ %% %% This is file `ProjLib.sty', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the ProjLib Toolkit. @@ -16,10 +16,9 @@ %% 2005/12/01 or later. %% \NeedsTeXFormat{LaTeX2e}[2022-06-01] -\RequirePackage{l3keys2e} \ProvidesExplPackage {ProjLib} - {2022/06/15} {} + {2022/07/03} {} {Collective interface of the ProjLib toolkit} \keys_define:nn { ProjLib } @@ -38,18 +37,20 @@ , title~page .bool_set:N = \l__projlib_main_titlepage_bool , title page .bool_set:N = \l__projlib_main_titlepage_bool , unknown .code:n = { - \PassOptionsToPackage { \CurrentOption } { projlib-language } \PassOptionsToPackage { \CurrentOption } { projlib-author } \PassOptionsToPackage { \CurrentOption } { projlib-datetime } \PassOptionsToPackage { \CurrentOption } { projlib-draft } \PassOptionsToPackage { \CurrentOption } { projlib-font } + \PassOptionsToPackage { \CurrentOption } { projlib-language } \PassOptionsToPackage { \CurrentOption } { projlib-logo } \PassOptionsToPackage { \CurrentOption } { projlib-math } \PassOptionsToPackage { \CurrentOption } { projlib-paper } + \PassOptionsToPackage { \CurrentOption } { projlib-text } \PassOptionsToPackage { \CurrentOption } { projlib-theorem } + \PassOptionsToPackage { \CurrentOption } { projlib-titlepage } } } -\ProcessKeysOptions { ProjLib } +\ProcessKeyOptions [ ProjLib ] \bool_if:NT \l__projlib_main_amsfashion_bool { @@ -69,6 +70,7 @@ \RequirePackage { projlib-logo } \RequirePackage { projlib-math } \RequirePackage { projlib-paper } +\RequirePackage { projlib-text } \bool_if:NT \l__projlib_main_titlepage_bool { diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-author.sty b/Master/texmf-dist/tex/latex/projlib/projlib-author.sty index a081ba1d925..86d5291c5dc 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-author.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-author.sty @@ -1,7 +1,7 @@ %% %% This is file `projlib-author.sty', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the ProjLib Toolkit. @@ -16,10 +16,9 @@ %% 2005/12/01 or later. %% \NeedsTeXFormat{LaTeX2e}[2022-06-01] -\RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-author} - {2022/06/15} {} + {2022/07/03} {} {Enhanced author information block} \keys_define:nn { projlib-author } @@ -30,7 +29,7 @@ , ams fashion .bool_set:N = \l__projlib_author_amsfashion_bool , unknown .code:n = {} } -\ProcessKeysOptions { projlib-author } +\ProcessKeyOptions [ projlib-author ] \cs_if_exist:NT \subjclass { \endinput } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty b/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty index fc052ec20b8..ac0bc629edb 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty @@ -1,7 +1,7 @@ %% %% This is file `projlib-datetime.sty', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the ProjLib Toolkit. @@ -16,10 +16,9 @@ %% 2005/12/01 or later. %% \NeedsTeXFormat{LaTeX2e}[2022-06-01] -\RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-datetime} - {2022/06/15} {} + {2022/07/03} {} {Convert numeric date-time string to natural language} \tl_new:N \g__projlib_datetime_input_format_tl @@ -38,7 +37,7 @@ , day-month .code:n = { \tl_gset:Nn \g__projlib_datetime_input_format_tl { day-month-year } } , unknown .code:n = {} } -\ProcessKeysOptions { projlib-datetime } +\ProcessKeyOptions [ projlib-datetime ] \RequirePackage { relsize } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty b/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty index 30a0013d084..2c11df948ec 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty @@ -1,7 +1,7 @@ %% %% This is file `projlib-draft.sty', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the ProjLib Toolkit. @@ -16,10 +16,9 @@ %% 2005/12/01 or later. %% \NeedsTeXFormat{LaTeX2e}[2022-06-01] -\RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-draft} - {2022/06/15} {} + {2022/07/03} {} {Useful commands during draft stage} \keys_define:nn { projlib-draft } @@ -33,7 +32,7 @@ , no report page .bool_set:N = \l__projlib_draft_no_report_page_bool , unknown .code:n = {} } -\ProcessKeysOptions { projlib-draft } +\ProcessKeyOptions [ projlib-draft ] \RequirePackage { projlib-language } \RequirePackage { xcolor } @@ -52,8 +51,8 @@ \bool_if:NTF \l__projlib_draft_fast_bool { - \tl_const:Nn \l_projlib_draft_plain_box_begin_tl { $[$ } - \tl_const:Nn \l_projlib_draft_plain_box_after_tl { $]$ } + \tl_const:Nn \l_projlib_draft_plain_box_begin_tl { [ } + \tl_const:Nn \l_projlib_draft_plain_box_after_tl { ] } } { \RequirePackage { tikz } @@ -143,23 +142,23 @@ \NewDocumentCommand \DNF { s D<>{} } { \noindent - \group_begin: - \projlib_draft_DNF_font - \stepcounter { projlib_draft_DNF_counter } - \raisebox{\baselineskip}{ - \hypertarget { DNF. \arabic { projlib_draft_DNF_counter } } {} - \label { DNF. \arabic { projlib_draft_DNF_counter } } - } - \nobreak - \projlib_draft_plain_box:nn { projlib_draft_DNF_color } - { - \IfBooleanF { #1 } { \projlib_draft_DNF_text \nobreakspace } - \group_begin: \ttfamily - \# \theprojlib_draft_DNF_counter - \group_end: - \tl_if_blank:nF { #2 } { : \nobreakspace } - \tl_trim_spaces:n { #2 } + \group_begin: \projlib_draft_DNF_font + \stepcounter { projlib_draft_DNF_counter } + \raisebox{\baselineskip}{ + \cs_if_exist:cT { hypertarget } + { + \hypertarget { DNF. \arabic { projlib_draft_DNF_counter } } {} + } + \label { DNF. \arabic { projlib_draft_DNF_counter } } } + \nobreak + \projlib_draft_plain_box:nn { projlib_draft_DNF_color } + { + \IfBooleanF { #1 } { \projlib_draft_DNF_text \nobreakspace } + \texttt { \# \theprojlib_draft_DNF_counter } + \tl_if_blank:nF { #2 } { : \nobreakspace } + \tl_trim_spaces:n { #2 } + } \group_end: \tl_gput_right:Nn \g__projlib_draft_DNF_report_tl { diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-font.sty b/Master/texmf-dist/tex/latex/projlib/projlib-font.sty index cfa1d6bb5e5..fdc257e8d20 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-font.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-font.sty @@ -1,7 +1,7 @@ %% %% This is file `projlib-font.sty', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the ProjLib Toolkit. @@ -16,10 +16,9 @@ %% 2005/12/01 or later. %% \NeedsTeXFormat{LaTeX2e}[2022-06-01] -\RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-font} - {2022/06/15} {} + {2022/07/03} {} {Font selection and configuration} \keys_define:nn { projlib-font } @@ -46,7 +45,7 @@ , biolinum .initial:n = { false } , unknown .code:n = {} } -\ProcessKeysOptions { projlib-font } +\ProcessKeyOptions [ projlib-font ] \bool_new:N \g_projlib_font_already_set_bool \bool_gset_false:N \g_projlib_font_already_set_bool diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-language.sty b/Master/texmf-dist/tex/latex/projlib/projlib-language.sty index 8fb7702aeea..122581ebde6 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-language.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-language.sty @@ -1,7 +1,7 @@ %% %% This is file `projlib-language.sty', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the ProjLib Toolkit. @@ -16,10 +16,9 @@ %% 2005/12/01 or later. %% \NeedsTeXFormat{LaTeX2e}[2022-06-01] -\RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-language} - {2022/06/15} {} + {2022/07/03} {} {Multi-language configuration} \clist_const:Nn \c__projlib_language_supported_clist @@ -118,7 +117,7 @@ , Russian .meta:n = { russian } , unknown .code:n = {} } -\ProcessKeysOptions { projlib-language } +\ProcessKeyOptions [ projlib-language ] \cs_new_protected:Nn \projlib_language_clear_global_option:n { diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty b/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty index fc2407cefe5..644c43b7a17 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty @@ -1,7 +1,7 @@ %% %% This is file `projlib-logo.sty', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the ProjLib Toolkit. @@ -16,10 +16,9 @@ %% 2005/12/01 or later. %% \NeedsTeXFormat{LaTeX2e}[2022-06-01] -\RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-logo} - {2022/06/15} {} + {2022/07/03} {} {The ProjLib logo} \keys_define:nn { projlib-logo } @@ -29,7 +28,7 @@ , fast .bool_set:N = \l__projlib_logo_fast_bool , unknown .code:n = {} } -\ProcessKeysOptions { projlib-logo } +\ProcessKeyOptions [ projlib-logo ] \bool_if:NT \l__projlib_logo_fast_bool { @@ -48,7 +47,6 @@ \endinput } - \RequirePackage { tikz } \cs_new_protected:Nn \projlib_logo_generic:nn diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-math.sty b/Master/texmf-dist/tex/latex/projlib/projlib-math.sty index 2b2d8c975b3..6855645669f 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-math.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-math.sty @@ -1,7 +1,7 @@ %% %% This is file `projlib-math.sty', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the ProjLib Toolkit. @@ -16,17 +16,16 @@ %% 2005/12/01 or later. %% \NeedsTeXFormat{LaTeX2e}[2022-06-01] -\RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-math} - {2022/06/15} {} + {2022/07/03} {} {Efficient math setup} \keys_define:nn { projlib-math } { , unknown .code:n = {} } -\ProcessKeysOptions { projlib-math } +\ProcessKeyOptions [ projlib-math ] \RequirePackage { mathtools } \RequirePackage { mathrsfs } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty b/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty index 09129a2ae6f..8d28af0ae43 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty @@ -1,7 +1,7 @@ %% %% This is file `projlib-paper.sty', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the ProjLib Toolkit. @@ -16,10 +16,9 @@ %% 2005/12/01 or later. %% \NeedsTeXFormat{LaTeX2e}[2022-06-01] -\RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-paper} - {2022/06/15} {} + {2022/07/03} {} {Configuration of the paper style} \keys_define:nn { projlib-paper } @@ -56,7 +55,7 @@ , dark paper .meta:n = { paperstyle = dark } , unknown .code:n = {} } -\ProcessKeysOptions { projlib-paper } +\ProcessKeyOptions [ projlib-paper ] \cs_new:Nn \projlib_paper_preview_disable: { diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-text.sty b/Master/texmf-dist/tex/latex/projlib/projlib-text.sty new file mode 100644 index 00000000000..179ed1d1568 --- /dev/null +++ b/Master/texmf-dist/tex/latex/projlib/projlib-text.sty @@ -0,0 +1,85 @@ +%% +%% This is file `projlib-text.sty', +%% generated with the docstrip utility. +%% +%% Copyright (C) 2021-2022 by Jinwen XU +%% +%% This is part of the ProjLib Toolkit. +%% +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3c of this license or (at +%% your option) any later version. The latest version of this license is in +%% +%% http://www.latex-project.org/lppl.txt +%% +%% and version 1.3c or later is part of all distributions of LaTeX version +%% 2005/12/01 or later. +%% +\NeedsTeXFormat{LaTeX2e}[2022-06-01] +\ProvidesExplPackage + {projlib-text} + {2022/07/03} {} + {Text-related commands} + +\keys_define:nn { projlib-text } + { + , unknown .code:n = {} + } +\ProcessKeyOptions [ projlib-text ] + +\RequirePackage { projlib-paper } + +\ProvideDocumentCommand \ItemDescription { m } + { + \textcolor { main-text!50!paper } { $($ #1 $)$ } + \nobreakspace + \ignorespaces + } + +\cs_new_protected:Nn \projlib_text_abbreviation_generic:nn + % #1 is the text + % #2 is usually some spacing adjustment + { + #1 + % if followed by a dot, then remove that dot and adjust the spacing + \peek_meaning_ignore_spaces:NTF . + { #2 \use_none:n } + { + % if followed by a comma, then act like nothing happens + % otherwise adjust the spacing + \peek_meaning_ignore_spaces:NTF , + { \prg_do_nothing: } + { #2 } + } + } + +\hook_gput_code:nnn { begindocument/before } { projlib-text } + { + % i.e. + \ProvideDocumentCommand { \ie } { } + { + \projlib_text_abbreviation_generic:nn { \textit{i. \nobreak \hskip.2ex \nobreak e.} } { \skip_horizontal:n { -.25ex } } + } + + % e.g. + \ProvideDocumentCommand { \eg } { } + { + \projlib_text_abbreviation_generic:nn { \textit{e. \nobreak \hskip.2ex \nobreak g.} } { \skip_horizontal:n { -.25ex } } + } + + % cf. + \ProvideDocumentCommand { \cf } { } + { + \projlib_text_abbreviation_generic:nn { \textit{cf.} } { } + } + + % etc. + \ProvideDocumentCommand { \etc } { } + { + \projlib_text_abbreviation_generic:nn { etc. } { } + } + } + +\endinput +%% +%% End of file `projlib-text.sty'. diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty b/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty index 45fed9d1393..60f3514dc73 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty @@ -1,7 +1,7 @@ %% %% This is file `projlib-theorem.sty', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the ProjLib Toolkit. @@ -16,10 +16,9 @@ %% 2005/12/01 or later. %% \NeedsTeXFormat{LaTeX2e}[2022-06-01] -\RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-theorem} - {2022/06/15} {} + {2022/07/03} {} {Configuration of theorem-like environments} \keys_define:nn { projlib-theorem } @@ -62,7 +61,7 @@ , no preset names .bool_set_inverse:N = \l__projlib_theorem_presetname_bool , unknown .code:n = { \PassOptionsToPackage { \CurrentOption } { create-theorem } } } -\ProcessKeysOptions { projlib-theorem } +\ProcessKeyOptions [ projlib-theorem ] \clist_const:Nn \c_projlib_theorem_supported_clist { @@ -92,8 +91,10 @@ recall , remark , theorem , + definition-corollary , definition-proposition , definition-theorem , + corollary-definition , proposition-definition , theorem-definition , } @@ -1488,9 +1489,11 @@ } } +\NameTheorem { definition-corollary } { combined = { definition ; corollary } } \NameTheorem { definition-proposition } { combined = { definition ; proposition } } \NameTheorem { definition-theorem } { combined = { definition ; theorem } } +\NameTheorem { corollary-definition } { combined = { corollary ; definition } } \NameTheorem { proposition-definition } { combined = { proposition ; definition } } \NameTheorem { theorem-definition } { combined = { theorem ; definition } } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty b/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty index a79e5ff329a..5b84bbc6838 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty @@ -1,7 +1,7 @@ %% %% This is file `projlib-titlepage.sty', %% generated with the docstrip utility. - +%% %% Copyright (C) 2021-2022 by Jinwen XU %% %% This is part of the ProjLib Toolkit. @@ -16,17 +16,16 @@ %% 2005/12/01 or later. %% \NeedsTeXFormat{LaTeX2e}[2022-06-01] -\RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-titlepage} - {2022/06/15} {} + {2022/07/03} {} {Commands for rendering the title page} \keys_define:nn { projlib-titlepage } { , unknown .code:n = {} } -\ProcessKeysOptions { projlib-titlepage } +\ProcessKeyOptions [ projlib-titlepage ] \RequirePackage { projlib-paper } |