From 384d55e6ac12b2961215299be36b537221941043 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 24 Jul 2022 20:11:17 +0000 Subject: projlib (24jul22) git-svn-id: svn://tug.org/texlive/trunk@63970 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/projlib/README.md | 2 +- Master/texmf-dist/source/latex/projlib/ProjLib.dtx | 213 ++++++++++++++------- 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 | 9 +- .../texmf-dist/tex/latex/projlib/projlib-logo.sty | 2 +- .../texmf-dist/tex/latex/projlib/projlib-math.sty | 2 +- .../texmf-dist/tex/latex/projlib/projlib-paper.sty | 104 +++++----- .../texmf-dist/tex/latex/projlib/projlib-text.sty | 2 +- .../tex/latex/projlib/projlib-theorem.sty | 13 +- .../tex/latex/projlib/projlib-titlepage.sty | 71 +++++-- 14 files changed, 287 insertions(+), 141 deletions(-) diff --git a/Master/texmf-dist/doc/latex/projlib/README.md b/Master/texmf-dist/doc/latex/projlib/README.md index ee8924ccc6e..3285bbd4104 100644 --- a/Master/texmf-dist/doc/latex/projlib/README.md +++ b/Master/texmf-dist/doc/latex/projlib/README.md @@ -6,7 +6,7 @@ > **ProjLib** can be interpreted as "***Proj**ect **Lib**rary*" (in English), or as "***Proj**et **Lib**re*" (in French, meaning "*Free Project*"). -> **This bundle is dated 2022/07/03. Please note that the documentations are not yet up-to-date.** +> **This bundle is dated 2022/07/23. Please note that the documentations are not yet up-to-date.** ## Introduction diff --git a/Master/texmf-dist/source/latex/projlib/ProjLib.dtx b/Master/texmf-dist/source/latex/projlib/ProjLib.dtx index 1b1be1cf735..c6615ebcd9f 100644 --- a/Master/texmf-dist/source/latex/projlib/ProjLib.dtx +++ b/Master/texmf-dist/source/latex/projlib/ProjLib.dtx @@ -19,84 +19,84 @@ %<*ProjLib> \ProvidesExplPackage {ProjLib} - {2022/07/03} {} + {2022/07/23} {} {Collective interface of the ProjLib toolkit} % % %<*projlib-author> \ProvidesExplPackage {projlib-author} - {2022/07/03} {} + {2022/07/23} {} {Enhanced author information block} % % %<*projlib-datetime> \ProvidesExplPackage {projlib-datetime} - {2022/07/03} {} + {2022/07/23} {} {Convert numeric date-time string to natural language} % % %<*projlib-draft> \ProvidesExplPackage {projlib-draft} - {2022/07/03} {} + {2022/07/23} {} {Useful commands during draft stage} % % %<*projlib-font> \ProvidesExplPackage {projlib-font} - {2022/07/03} {} + {2022/07/23} {} {Font selection and configuration} % % %<*projlib-language> \ProvidesExplPackage {projlib-language} - {2022/07/03} {} + {2022/07/23} {} {Multi-language configuration} % % %<*projlib-logo> \ProvidesExplPackage {projlib-logo} - {2022/07/03} {} + {2022/07/23} {} {The ProjLib logo} % % %<*projlib-math> \ProvidesExplPackage {projlib-math} - {2022/07/03} {} + {2022/07/23} {} {Efficient math setup} % % %<*projlib-paper> \ProvidesExplPackage {projlib-paper} - {2022/07/03} {} + {2022/07/23} {} {Configuration of the paper style} % % %<*projlib-text> \ProvidesExplPackage {projlib-text} - {2022/07/03} {} + {2022/07/23} {} {Text-related commands} % % %<*projlib-theorem> \ProvidesExplPackage {projlib-theorem} - {2022/07/03} {} + {2022/07/23} {} {Configuration of theorem-like environments} % % %<*projlib-titlepage> \ProvidesExplPackage {projlib-titlepage} - {2022/07/03} {} + {2022/07/23} {} {Commands for rendering the title page} % @@ -2641,6 +2641,7 @@ \projlib_language_set_option:n { spanish } } , Spanish .meta:n = { spanish } , CN .meta:n = { schinese } + , SC .meta:n = { schinese } , chinese .meta:n = { schinese } , schinese .code:n = { \projlib_language_set_option_no_babel:n { schinese } } , simplified-chinese .meta:n = { schinese } @@ -2701,6 +2702,7 @@ { all } { common } { common } { common } { cn } { schinese } + { sc } { schinese } { chinese } { schinese } { schinese } { schinese } { simplifiedchinese } { schinese } @@ -2737,6 +2739,7 @@ \str_case_e:nnF { \exp_args:Ne \str_foldcase:n { \tl_trim_spaces:n { #1 } } } { { cn } { cjk } + { sc } { cjk } { chinese } { cjk } { schinese } { cjk } { simplifiedchinese } { cjk } @@ -2838,7 +2841,7 @@ \tl_gput_right:Nn \g_projlib_language_settings_schinese_tl { - \tl_set:Nn \languagename { schinese } + \tl_set:Nn \languagename { schinese } \tl_set:cn { abstractname } { 摘要 } \tl_set:cn { proofname } { 证明 } \tl_set:cn { contentsname } { 目录 } @@ -2867,7 +2870,7 @@ \tl_gput_right:Nn \g_projlib_language_settings_tchinese_tl { - \tl_set:Nn \languagename { tchinese } + \tl_set:Nn \languagename { tchinese } \tl_set:cn { abstractname } { 摘要 } \tl_set:cn { proofname } { 證明 } \tl_set:cn { contentsname } { 目錄 } @@ -3509,37 +3512,42 @@ %<*projlib-paper> \keys_define:nn { projlib-paper } { - , preview-mode .bool_set:N = \l__projlib_paper_preview_bool - , preview-mode .initial:n = { false } - , paper-style .tl_set:N = \l__projlib_paper_paperstyle_tl - , paper-style .initial:n = { normal } - , paper-style .value_required:n = true - , paper~style .tl_set:N = \l__projlib_paper_paperstyle_tl - , paper style .tl_set:N = \l__projlib_paper_paperstyle_tl - , yellow-paper .meta:n = { paperstyle = yellow } - , yellow~paper .meta:n = { paperstyle = yellow } - , yellow paper .meta:n = { paperstyle = yellow } - , parchment-paper .meta:n = { paperstyle = parchment } - , parchment~paper .meta:n = { paperstyle = parchment } - , parchment paper .meta:n = { paperstyle = parchment } - , green-paper .meta:n = { paperstyle = green } - , green~paper .meta:n = { paperstyle = green } - , green paper .meta:n = { paperstyle = green } - , light-gray-paper .meta:n = { paperstyle = lightgray } - , light~gray~paper .meta:n = { paperstyle = lightgray } - , light gray-paper .meta:n = { paperstyle = lightgray } - , light gray~paper .meta:n = { paperstyle = lightgray } - , light gray paper .meta:n = { paperstyle = lightgray } - , gray-paper .meta:n = { paperstyle = gray } - , gray~paper .meta:n = { paperstyle = gray } - , gray paper .meta:n = { paperstyle = gray } - , nord-paper .meta:n = { paperstyle = nord } - , nord~paper .meta:n = { paperstyle = nord } - , nord paper .meta:n = { paperstyle = nord } - , dark-paper .meta:n = { paperstyle = dark } - , dark~paper .meta:n = { paperstyle = dark } - , dark paper .meta:n = { paperstyle = dark } - , unknown .code:n = {} + , preview-mode .bool_set:N = \l__projlib_paper_preview_bool + , preview-mode .initial:n = { false } + , paper-style .tl_set:N = \l__projlib_paper_paperstyle_tl + , paper-style .initial:n = { normal } + , paper-style .value_required:n = true + , paper~style .tl_set:N = \l__projlib_paper_paperstyle_tl + , paper style .tl_set:N = \l__projlib_paper_paperstyle_tl + , light-yellow-paper .meta:n = { paperstyle = lightyellow } + , light~yellow~paper .meta:n = { paperstyle = lightyellow } + , light yellow-paper .meta:n = { paperstyle = lightyellow } + , light yellow~paper .meta:n = { paperstyle = lightyellow } + , light yellow paper .meta:n = { paperstyle = lightyellow } + , yellow-paper .meta:n = { paperstyle = yellow } + , yellow~paper .meta:n = { paperstyle = yellow } + , yellow paper .meta:n = { paperstyle = yellow } + , parchment-paper .meta:n = { paperstyle = parchment } + , parchment~paper .meta:n = { paperstyle = parchment } + , parchment paper .meta:n = { paperstyle = parchment } + , green-paper .meta:n = { paperstyle = green } + , green~paper .meta:n = { paperstyle = green } + , green paper .meta:n = { paperstyle = green } + , light-gray-paper .meta:n = { paperstyle = lightgray } + , light~gray~paper .meta:n = { paperstyle = lightgray } + , light gray-paper .meta:n = { paperstyle = lightgray } + , light gray~paper .meta:n = { paperstyle = lightgray } + , light gray paper .meta:n = { paperstyle = lightgray } + , gray-paper .meta:n = { paperstyle = gray } + , gray~paper .meta:n = { paperstyle = gray } + , gray paper .meta:n = { paperstyle = gray } + , nord-paper .meta:n = { paperstyle = nord } + , nord~paper .meta:n = { paperstyle = nord } + , nord paper .meta:n = { paperstyle = nord } + , dark-paper .meta:n = { paperstyle = dark } + , dark~paper .meta:n = { paperstyle = dark } + , dark paper .meta:n = { paperstyle = dark } + , unknown .code:n = {} } \ProcessKeyOptions [ projlib-paper ] @@ -3582,19 +3590,28 @@ \str_case_e:nn { \l__projlib_paper_paperstyle_tl } { - { yellow } { \definecolor { paper } { RGB } { 247, 246, 233 } } - { parchment } { \definecolor { paper } { RGB } { 224, 204, 160 } } - { green } { \definecolor { paper } { RGB } { 207, 231, 207 } } - { lightgray } { \definecolor { paper } { RGB } { 236, 239, 244 } - \definecolor { main-text } { RGB } { 37, 41, 46 } } - { light-gray } { \definecolor { paper } { RGB } { 236, 239, 244 } - \definecolor { main-text } { RGB } { 37, 41, 46 } } - { gray } { \definecolor { paper } { RGB } { 127, 130, 136 } - \definecolor { main-text } { RGB } { 236, 239, 244 } } - { nord } { \definecolor { paper } { RGB } { 46, 52, 64 } - \definecolor { main-text } { RGB } { 214, 220, 230 } } - { dark } { \definecolor { paper } { RGB } { 28, 29, 33 } - \definecolor { main-text } { RGB } { 210, 213, 217 } } + { light yellow } { \definecolor { paper } { RGB } { 255, 254, 245 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { light-yellow } { \definecolor { paper } { RGB } { 255, 254, 245 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { light~yellow } { \definecolor { paper } { RGB } { 255, 254, 245 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { yellow } { \definecolor { paper } { RGB } { 247, 246, 233 } } + { parchment } { \definecolor { paper } { RGB } { 232, 225, 204 } + \definecolor { main-text } { RGB } { 94, 78, 62 } } + { green } { \definecolor { paper } { RGB } { 207, 231, 207 } } + { light gray } { \definecolor { paper } { RGB } { 236, 239, 244 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { light-gray } { \definecolor { paper } { RGB } { 236, 239, 244 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { light~gray } { \definecolor { paper } { RGB } { 236, 239, 244 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { gray } { \definecolor { paper } { RGB } { 127, 130, 136 } + \definecolor { main-text } { RGB } { 236, 239, 244 } } + { nord } { \definecolor { paper } { RGB } { 46, 52, 64 } + \definecolor { main-text } { RGB } { 214, 220, 230 } } + { dark } { \definecolor { paper } { RGB } { 28, 29, 33 } + \definecolor { main-text } { RGB } { 210, 213, 217 } } } \cs_new:Nn \projlib_paper_set_page_color:n @@ -3854,7 +3871,16 @@ % \crthm_counter_alias:nn { proof } { theorem } \tl_new:N \l_projlib_theorem_name_of_theorem_with_name_tl -\CreateTheorem { theorem-with-name_inner } { name = { heading = { \l_projlib_theorem_name_of_theorem_with_name_tl } }, create-starred-version, shared-counter=theorem-with-name } +\CreateTheorem { theorem-with-name_inner } + { + , name = { + , heading = { \l_projlib_theorem_name_of_theorem_with_name_tl } + , crefname = {}{} + , Crefname = {}{} + } + , create-starred-version + , shared-counter = theorem-with-name + } \NewDocumentEnvironment { theorem-with-name } { m O{} } { @@ -5175,6 +5201,7 @@ } \ProcessKeyOptions [ projlib-titlepage ] +\RequirePackage { projlib-logo } \RequirePackage { projlib-paper } \RequirePackage { tikz } @@ -5206,12 +5233,12 @@ \keys_define:nn { projlib-titlepage-config } { - , logo .tl_set:N = \l_projlib_titlepage_logo_tl + , logo .code:n = { \tl_set:Nn \l_projlib_titlepage_logo_tl { \tl_trim_spaces:n { #1 } } } , logo .initial:n = { \scalebox { 2 } { \ProjLib } } - , title .tl_set:N = \l_projlib_titlepage_title_tl - , subtitle .tl_set:N = \l_projlib_titlepage_subtitle_tl - , author .tl_set:N = \l_projlib_titlepage_author_tl - , date .tl_set:N = \l_projlib_titlepage_date_tl + , title .code:n = { \tl_set:Nn \l_projlib_titlepage_title_tl { \tl_trim_spaces:n { #1 } } } + , subtitle .code:n = { \tl_set:Nn \l_projlib_titlepage_subtitle_tl { \tl_trim_spaces:n { #1 } } } + , author .code:n = { \tl_set:Nn \l_projlib_titlepage_author_tl { \tl_trim_spaces:n { #1 } } } + , date .code:n = { \tl_set:Nn \l_projlib_titlepage_date_tl { \tl_trim_spaces:n { #1 } } } , style .tl_set:N = \l_projlib_titlepage_style_tl , style .initial:n = { default } , color .code:n = { @@ -5242,9 +5269,32 @@ \fill [color=titlepage-back] ($(current~page.south~west)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$); \fill [color=titlepage-main] ($(current~page.north~west)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$); \fill [color=titlepage-back] ($(current~page.north~east)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$); - \node[text~width=.3\paperwidth,text~height=.2\paperheight] at ($(current~page.north~west)+(.32\paperwidth,-.17\paperheight)$) { \l_projlib_titlepage_logo_tl }; - \node[text~width=.8\paperwidth,text~height=.4\paperheight] at ($(current~page.north~west)+(.57\paperwidth,-.33\paperheight)$) {\textcolor{titlepage-back}{\fontsize{24pt}{28pt}\selectfont\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[1.5em]\fontsize{18pt}{22pt}\selectfont{ \l_projlib_titlepage_subtitle_tl }}}; - \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{titlepage-back}\begin{flushright}\fontsize{16pt}{18pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{14pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} }; + \node[text~width=.3\paperwidth, text~height=.2\paperheight, align=flush~left] + at ($(current~page.north~west)+(.32\paperwidth,-.17\paperheight)$) + { + \l_projlib_titlepage_logo_tl + }; + \node[text~width=.8\paperwidth, text~height=.5\paperheight, align=flush~left] + at ($(current~page.north~west)+(.52\paperwidth,-.28\paperheight)$) + { + \color{titlepage-back} + \sffamily + \fontsize{24pt}{36pt}\selectfont + \textsc{ \l_projlib_titlepage_title_tl }\\[1.5em] + \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)$) + { + \color{titlepage-back} + \begin{flushright} + \fontsize{16pt}{24pt}\selectfont + \textsc{ \l_projlib_titlepage_author_tl }\\[1em] + \fontsize{12pt}{18pt}\selectfont + \l_projlib_titlepage_date_tl + \end{flushright} + }; \end{tikzpicture} } @@ -5253,9 +5303,32 @@ \begin{tikzpicture}[overlay,remember~picture] \fill[color=white] ($(current~page.south~west)$) rectangle ($(current~page.north~east)$); \fill[color=titlepage-main] ($(current~page.south~west)$) rectangle ($(current~page.north~east)+(0,-.3\paperheight)$); - \node[text~width=.3\paperwidth,text~height=.2\paperheight] at ($(current~page.north~west)+(.27\paperwidth,-.15\paperheight)$) { \l_projlib_titlepage_logo_tl }; - \node[text~width=.8\paperwidth,text~height=.4\paperheight] at ($(current~page.north~west)+(.52\paperwidth,-.33\paperheight)$) {\textcolor{white}{\fontsize{24pt}{28pt}\selectfont\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[1.5em]\fontsize{18pt}{22pt}\selectfont{ \l_projlib_titlepage_subtitle_tl }}}; - \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{white}\begin{flushright}\fontsize{16pt}{18pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{14pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} }; + \node[text~width=.3\paperwidth, text~height=.2\paperheight, align=flush~left] + at ($(current~page.north~west)+(.27\paperwidth,-.15\paperheight)$) + { + \l_projlib_titlepage_logo_tl + }; + \node[text~width=.8\paperwidth, text~height=.5\paperheight, align=flush~left] + at ($(current~page.north~west)+(.52\paperwidth,-.28\paperheight)$) + { + \color{white} + \sffamily + \fontsize{24pt}{36pt}\selectfont + \textsc{ \l_projlib_titlepage_title_tl }\\[1.5em] + \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)$) + { + \color{white} + \begin{flushright} + \fontsize{16pt}{24pt}\selectfont + \textsc{ \l_projlib_titlepage_author_tl }\\[1em] + \fontsize{12pt}{18pt}\selectfont + \l_projlib_titlepage_date_tl + \end{flushright} + }; \end{tikzpicture} } % diff --git a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty index d488e3ea503..775bae98588 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/07/03} {} + {2022/07/23} {} {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 86d5291c5dc..815969aa36e 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/07/03} {} + {2022/07/23} {} {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 ac0bc629edb..467fce04f75 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/07/03} {} + {2022/07/23} {} {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 2c11df948ec..68636016415 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/07/03} {} + {2022/07/23} {} {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 fdc257e8d20..5fa0b8d019f 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/07/03} {} + {2022/07/23} {} {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 122581ebde6..501af7dc100 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/07/03} {} + {2022/07/23} {} {Multi-language configuration} \clist_const:Nn \c__projlib_language_supported_clist @@ -90,6 +90,7 @@ \projlib_language_set_option:n { spanish } } , Spanish .meta:n = { spanish } , CN .meta:n = { schinese } + , SC .meta:n = { schinese } , chinese .meta:n = { schinese } , schinese .code:n = { \projlib_language_set_option_no_babel:n { schinese } } , simplified-chinese .meta:n = { schinese } @@ -149,6 +150,7 @@ { all } { common } { common } { common } { cn } { schinese } + { sc } { schinese } { chinese } { schinese } { schinese } { schinese } { simplifiedchinese } { schinese } @@ -185,6 +187,7 @@ \str_case_e:nnF { \exp_args:Ne \str_foldcase:n { \tl_trim_spaces:n { #1 } } } { { cn } { cjk } + { sc } { cjk } { chinese } { cjk } { schinese } { cjk } { simplifiedchinese } { cjk } @@ -284,7 +287,7 @@ \tl_gput_right:Nn \g_projlib_language_settings_schinese_tl { - \tl_set:Nn \languagename { schinese } + \tl_set:Nn \languagename { schinese } \tl_set:cn { abstractname } { 摘要 } \tl_set:cn { proofname } { 证明 } \tl_set:cn { contentsname } { 目录 } @@ -313,7 +316,7 @@ \tl_gput_right:Nn \g_projlib_language_settings_tchinese_tl { - \tl_set:Nn \languagename { tchinese } + \tl_set:Nn \languagename { tchinese } \tl_set:cn { abstractname } { 摘要 } \tl_set:cn { proofname } { 證明 } \tl_set:cn { contentsname } { 目錄 } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty b/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty index 644c43b7a17..c5d09c2178b 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/07/03} {} + {2022/07/23} {} {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 6855645669f..7927ce8dd67 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/07/03} {} + {2022/07/23} {} {Efficient math setup} \keys_define:nn { projlib-math } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty b/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty index 8d28af0ae43..3ba1da9654b 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty @@ -18,42 +18,47 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-paper} - {2022/07/03} {} + {2022/07/23} {} {Configuration of the paper style} \keys_define:nn { projlib-paper } { - , preview-mode .bool_set:N = \l__projlib_paper_preview_bool - , preview-mode .initial:n = { false } - , paper-style .tl_set:N = \l__projlib_paper_paperstyle_tl - , paper-style .initial:n = { normal } - , paper-style .value_required:n = true - , paper~style .tl_set:N = \l__projlib_paper_paperstyle_tl - , paper style .tl_set:N = \l__projlib_paper_paperstyle_tl - , yellow-paper .meta:n = { paperstyle = yellow } - , yellow~paper .meta:n = { paperstyle = yellow } - , yellow paper .meta:n = { paperstyle = yellow } - , parchment-paper .meta:n = { paperstyle = parchment } - , parchment~paper .meta:n = { paperstyle = parchment } - , parchment paper .meta:n = { paperstyle = parchment } - , green-paper .meta:n = { paperstyle = green } - , green~paper .meta:n = { paperstyle = green } - , green paper .meta:n = { paperstyle = green } - , light-gray-paper .meta:n = { paperstyle = lightgray } - , light~gray~paper .meta:n = { paperstyle = lightgray } - , light gray-paper .meta:n = { paperstyle = lightgray } - , light gray~paper .meta:n = { paperstyle = lightgray } - , light gray paper .meta:n = { paperstyle = lightgray } - , gray-paper .meta:n = { paperstyle = gray } - , gray~paper .meta:n = { paperstyle = gray } - , gray paper .meta:n = { paperstyle = gray } - , nord-paper .meta:n = { paperstyle = nord } - , nord~paper .meta:n = { paperstyle = nord } - , nord paper .meta:n = { paperstyle = nord } - , dark-paper .meta:n = { paperstyle = dark } - , dark~paper .meta:n = { paperstyle = dark } - , dark paper .meta:n = { paperstyle = dark } - , unknown .code:n = {} + , preview-mode .bool_set:N = \l__projlib_paper_preview_bool + , preview-mode .initial:n = { false } + , paper-style .tl_set:N = \l__projlib_paper_paperstyle_tl + , paper-style .initial:n = { normal } + , paper-style .value_required:n = true + , paper~style .tl_set:N = \l__projlib_paper_paperstyle_tl + , paper style .tl_set:N = \l__projlib_paper_paperstyle_tl + , light-yellow-paper .meta:n = { paperstyle = lightyellow } + , light~yellow~paper .meta:n = { paperstyle = lightyellow } + , light yellow-paper .meta:n = { paperstyle = lightyellow } + , light yellow~paper .meta:n = { paperstyle = lightyellow } + , light yellow paper .meta:n = { paperstyle = lightyellow } + , yellow-paper .meta:n = { paperstyle = yellow } + , yellow~paper .meta:n = { paperstyle = yellow } + , yellow paper .meta:n = { paperstyle = yellow } + , parchment-paper .meta:n = { paperstyle = parchment } + , parchment~paper .meta:n = { paperstyle = parchment } + , parchment paper .meta:n = { paperstyle = parchment } + , green-paper .meta:n = { paperstyle = green } + , green~paper .meta:n = { paperstyle = green } + , green paper .meta:n = { paperstyle = green } + , light-gray-paper .meta:n = { paperstyle = lightgray } + , light~gray~paper .meta:n = { paperstyle = lightgray } + , light gray-paper .meta:n = { paperstyle = lightgray } + , light gray~paper .meta:n = { paperstyle = lightgray } + , light gray paper .meta:n = { paperstyle = lightgray } + , gray-paper .meta:n = { paperstyle = gray } + , gray~paper .meta:n = { paperstyle = gray } + , gray paper .meta:n = { paperstyle = gray } + , nord-paper .meta:n = { paperstyle = nord } + , nord~paper .meta:n = { paperstyle = nord } + , nord paper .meta:n = { paperstyle = nord } + , dark-paper .meta:n = { paperstyle = dark } + , dark~paper .meta:n = { paperstyle = dark } + , dark paper .meta:n = { paperstyle = dark } + , unknown .code:n = {} } \ProcessKeyOptions [ projlib-paper ] @@ -96,19 +101,28 @@ \str_case_e:nn { \l__projlib_paper_paperstyle_tl } { - { yellow } { \definecolor { paper } { RGB } { 247, 246, 233 } } - { parchment } { \definecolor { paper } { RGB } { 224, 204, 160 } } - { green } { \definecolor { paper } { RGB } { 207, 231, 207 } } - { lightgray } { \definecolor { paper } { RGB } { 236, 239, 244 } - \definecolor { main-text } { RGB } { 37, 41, 46 } } - { light-gray } { \definecolor { paper } { RGB } { 236, 239, 244 } - \definecolor { main-text } { RGB } { 37, 41, 46 } } - { gray } { \definecolor { paper } { RGB } { 127, 130, 136 } - \definecolor { main-text } { RGB } { 236, 239, 244 } } - { nord } { \definecolor { paper } { RGB } { 46, 52, 64 } - \definecolor { main-text } { RGB } { 214, 220, 230 } } - { dark } { \definecolor { paper } { RGB } { 28, 29, 33 } - \definecolor { main-text } { RGB } { 210, 213, 217 } } + { light yellow } { \definecolor { paper } { RGB } { 255, 254, 245 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { light-yellow } { \definecolor { paper } { RGB } { 255, 254, 245 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { light~yellow } { \definecolor { paper } { RGB } { 255, 254, 245 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { yellow } { \definecolor { paper } { RGB } { 247, 246, 233 } } + { parchment } { \definecolor { paper } { RGB } { 232, 225, 204 } + \definecolor { main-text } { RGB } { 94, 78, 62 } } + { green } { \definecolor { paper } { RGB } { 207, 231, 207 } } + { light gray } { \definecolor { paper } { RGB } { 236, 239, 244 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { light-gray } { \definecolor { paper } { RGB } { 236, 239, 244 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { light~gray } { \definecolor { paper } { RGB } { 236, 239, 244 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { gray } { \definecolor { paper } { RGB } { 127, 130, 136 } + \definecolor { main-text } { RGB } { 236, 239, 244 } } + { nord } { \definecolor { paper } { RGB } { 46, 52, 64 } + \definecolor { main-text } { RGB } { 214, 220, 230 } } + { dark } { \definecolor { paper } { RGB } { 28, 29, 33 } + \definecolor { main-text } { RGB } { 210, 213, 217 } } } \cs_new:Nn \projlib_paper_set_page_color:n diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-text.sty b/Master/texmf-dist/tex/latex/projlib/projlib-text.sty index 179ed1d1568..590863e1b79 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/07/03} {} + {2022/07/23} {} {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 60f3514dc73..fc17c582a4b 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/07/03} {} + {2022/07/23} {} {Configuration of theorem-like environments} \keys_define:nn { projlib-theorem } @@ -187,7 +187,16 @@ \crthm_counter_alias:nn { theorem-with-name } { theorem } \tl_new:N \l_projlib_theorem_name_of_theorem_with_name_tl -\CreateTheorem { theorem-with-name_inner } { name = { heading = { \l_projlib_theorem_name_of_theorem_with_name_tl } }, create-starred-version, shared-counter=theorem-with-name } +\CreateTheorem { theorem-with-name_inner } + { + , name = { + , heading = { \l_projlib_theorem_name_of_theorem_with_name_tl } + , crefname = {}{} + , Crefname = {}{} + } + , create-starred-version + , shared-counter = theorem-with-name + } \NewDocumentEnvironment { theorem-with-name } { m O{} } { diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty b/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty index 5b84bbc6838..8117ee835e9 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/07/03} {} + {2022/07/23} {} {Commands for rendering the title page} \keys_define:nn { projlib-titlepage } @@ -27,6 +27,7 @@ } \ProcessKeyOptions [ projlib-titlepage ] +\RequirePackage { projlib-logo } \RequirePackage { projlib-paper } \RequirePackage { tikz } @@ -58,12 +59,12 @@ \keys_define:nn { projlib-titlepage-config } { - , logo .tl_set:N = \l_projlib_titlepage_logo_tl + , logo .code:n = { \tl_set:Nn \l_projlib_titlepage_logo_tl { \tl_trim_spaces:n { #1 } } } , logo .initial:n = { \scalebox { 2 } { \ProjLib } } - , title .tl_set:N = \l_projlib_titlepage_title_tl - , subtitle .tl_set:N = \l_projlib_titlepage_subtitle_tl - , author .tl_set:N = \l_projlib_titlepage_author_tl - , date .tl_set:N = \l_projlib_titlepage_date_tl + , title .code:n = { \tl_set:Nn \l_projlib_titlepage_title_tl { \tl_trim_spaces:n { #1 } } } + , subtitle .code:n = { \tl_set:Nn \l_projlib_titlepage_subtitle_tl { \tl_trim_spaces:n { #1 } } } + , author .code:n = { \tl_set:Nn \l_projlib_titlepage_author_tl { \tl_trim_spaces:n { #1 } } } + , date .code:n = { \tl_set:Nn \l_projlib_titlepage_date_tl { \tl_trim_spaces:n { #1 } } } , style .tl_set:N = \l_projlib_titlepage_style_tl , style .initial:n = { default } , color .code:n = { @@ -94,9 +95,32 @@ \fill [color=titlepage-back] ($(current~page.south~west)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$); \fill [color=titlepage-main] ($(current~page.north~west)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$); \fill [color=titlepage-back] ($(current~page.north~east)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$); - \node[text~width=.3\paperwidth,text~height=.2\paperheight] at ($(current~page.north~west)+(.32\paperwidth,-.17\paperheight)$) { \l_projlib_titlepage_logo_tl }; - \node[text~width=.8\paperwidth,text~height=.4\paperheight] at ($(current~page.north~west)+(.57\paperwidth,-.33\paperheight)$) {\textcolor{titlepage-back}{\fontsize{24pt}{28pt}\selectfont\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[1.5em]\fontsize{18pt}{22pt}\selectfont{ \l_projlib_titlepage_subtitle_tl }}}; - \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{titlepage-back}\begin{flushright}\fontsize{16pt}{18pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{14pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} }; + \node[text~width=.3\paperwidth, text~height=.2\paperheight, align=flush~left] + at ($(current~page.north~west)+(.32\paperwidth,-.17\paperheight)$) + { + \l_projlib_titlepage_logo_tl + }; + \node[text~width=.8\paperwidth, text~height=.5\paperheight, align=flush~left] + at ($(current~page.north~west)+(.52\paperwidth,-.28\paperheight)$) + { + \color{titlepage-back} + \sffamily + \fontsize{24pt}{36pt}\selectfont + \textsc{ \l_projlib_titlepage_title_tl }\\[1.5em] + \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)$) + { + \color{titlepage-back} + \begin{flushright} + \fontsize{16pt}{24pt}\selectfont + \textsc{ \l_projlib_titlepage_author_tl }\\[1em] + \fontsize{12pt}{18pt}\selectfont + \l_projlib_titlepage_date_tl + \end{flushright} + }; \end{tikzpicture} } @@ -105,9 +129,32 @@ \begin{tikzpicture}[overlay,remember~picture] \fill[color=white] ($(current~page.south~west)$) rectangle ($(current~page.north~east)$); \fill[color=titlepage-main] ($(current~page.south~west)$) rectangle ($(current~page.north~east)+(0,-.3\paperheight)$); - \node[text~width=.3\paperwidth,text~height=.2\paperheight] at ($(current~page.north~west)+(.27\paperwidth,-.15\paperheight)$) { \l_projlib_titlepage_logo_tl }; - \node[text~width=.8\paperwidth,text~height=.4\paperheight] at ($(current~page.north~west)+(.52\paperwidth,-.33\paperheight)$) {\textcolor{white}{\fontsize{24pt}{28pt}\selectfont\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[1.5em]\fontsize{18pt}{22pt}\selectfont{ \l_projlib_titlepage_subtitle_tl }}}; - \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{white}\begin{flushright}\fontsize{16pt}{18pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{14pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} }; + \node[text~width=.3\paperwidth, text~height=.2\paperheight, align=flush~left] + at ($(current~page.north~west)+(.27\paperwidth,-.15\paperheight)$) + { + \l_projlib_titlepage_logo_tl + }; + \node[text~width=.8\paperwidth, text~height=.5\paperheight, align=flush~left] + at ($(current~page.north~west)+(.52\paperwidth,-.28\paperheight)$) + { + \color{white} + \sffamily + \fontsize{24pt}{36pt}\selectfont + \textsc{ \l_projlib_titlepage_title_tl }\\[1.5em] + \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)$) + { + \color{white} + \begin{flushright} + \fontsize{16pt}{24pt}\selectfont + \textsc{ \l_projlib_titlepage_author_tl }\\[1em] + \fontsize{12pt}{18pt}\selectfont + \l_projlib_titlepage_date_tl + \end{flushright} + }; \end{tikzpicture} } -- cgit v1.2.3