From 967a83e95b9d1863160e12ad17f06800e6fc34f0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 15 Nov 2022 20:52:32 +0000 Subject: projlib (15nov22) git-svn-id: svn://tug.org/texlive/trunk@65023 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/projlib/README.md | 2 +- Master/texmf-dist/source/latex/projlib/ProjLib.dtx | 98 +++++++++++++++------- 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 | 35 ++++---- .../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 | 2 +- .../texmf-dist/tex/latex/projlib/projlib-paper.sty | 2 +- .../texmf-dist/tex/latex/projlib/projlib-text.sty | 6 +- .../tex/latex/projlib/projlib-theorem.sty | 10 ++- .../tex/latex/projlib/projlib-titlepage.sty | 31 ++++++- 14 files changed, 133 insertions(+), 65 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/projlib/README.md b/Master/texmf-dist/doc/latex/projlib/README.md index e7e0ac1346e..2e85b88afa8 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/08/05. Please note that the documentations are not yet up-to-date.** +> **This bundle is dated 2022/11/15. 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 3ab56e9868d..9d9f00ec589 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/08/05} {} + {2022/11/15} {} {Collective interface of the ProjLib toolkit} % % %<*projlib-author> \ProvidesExplPackage {projlib-author} - {2022/08/05} {} + {2022/11/15} {} {Enhanced author information block} % % %<*projlib-datetime> \ProvidesExplPackage {projlib-datetime} - {2022/08/05} {} + {2022/11/15} {} {Convert numeric date-time string to natural language} % % %<*projlib-draft> \ProvidesExplPackage {projlib-draft} - {2022/08/05} {} + {2022/11/15} {} {Useful commands during draft stage} % % %<*projlib-font> \ProvidesExplPackage {projlib-font} - {2022/08/05} {} + {2022/11/15} {} {Font selection and configuration} % % %<*projlib-language> \ProvidesExplPackage {projlib-language} - {2022/08/05} {} + {2022/11/15} {} {Multi-language configuration} % % %<*projlib-logo> \ProvidesExplPackage {projlib-logo} - {2022/08/05} {} + {2022/11/15} {} {The ProjLib logo} % % %<*projlib-math> \ProvidesExplPackage {projlib-math} - {2022/08/05} {} + {2022/11/15} {} {Efficient math setup} % % %<*projlib-paper> \ProvidesExplPackage {projlib-paper} - {2022/08/05} {} + {2022/11/15} {} {Configuration of the paper style} % % %<*projlib-text> \ProvidesExplPackage {projlib-text} - {2022/08/05} {} + {2022/11/15} {} {Text-related commands} % % %<*projlib-theorem> \ProvidesExplPackage {projlib-theorem} - {2022/08/05} {} + {2022/11/15} {} {Configuration of theorem-like environments} % % %<*projlib-titlepage> \ProvidesExplPackage {projlib-titlepage} - {2022/08/05} {} + {2022/11/15} {} {Commands for rendering the title page} % @@ -2262,9 +2262,9 @@ \raisebox{\baselineskip}{ \cs_if_exist:cT { hypertarget } { - \hypertarget { DNF. \arabic { projlib_draft_DNF_counter } } {} + \hypertarget { DNF. \jobname. \arabic { projlib_draft_DNF_counter } } {} } - \label { DNF. \arabic { projlib_draft_DNF_counter } } + \label { DNF. \jobname. \arabic { projlib_draft_DNF_counter } } } \nobreak \projlib_draft_plain_box:nn { projlib_draft_DNF_color } @@ -2297,10 +2297,10 @@ { \cs_if_exist:cTF { hyperlink } { - \exp_not:N \hyperlink { DNF. \int_value:w \theprojlib_draft_DNF_counter } { \exp_not:N \pageref* { DNF. \int_value:w \theprojlib_draft_DNF_counter } } + \exp_not:N \hyperlink { DNF. \jobname. \int_value:w \theprojlib_draft_DNF_counter } { \exp_not:N \pageref* { DNF. \jobname. \int_value:w \theprojlib_draft_DNF_counter } } } { - \exp_not:N \pageref* { DNF. \int_value:w \theprojlib_draft_DNF_counter } + \exp_not:N \pageref* { DNF. \jobname. \int_value:w \theprojlib_draft_DNF_counter } } } \tl_gput_right:Nn \g__projlib_draft_DNF_report_tl @@ -2317,19 +2317,22 @@ \bool_if:NF \l__projlib_draft_no_report_page_bool { - \hook_gput_code:nnn { enddocument } { projlib-draft } + \hook_gput_code:nnn { begindocument/before } { projlib-draft } { - \tl_if_blank:VF \g__projlib_draft_DNF_report_tl + \hook_gput_code:nnn { enddocument } { projlib-draft } { - \clearpage - \addtocounter{page}{-1} - \pagestyle { empty } - \color { projlib_draft_DNF_color } - \noindent - \projlib_draft_DNF_font - \projlib_draft_DNF_report_text - \par \bigskip - \g__projlib_draft_DNF_report_tl + \tl_if_blank:VF \g__projlib_draft_DNF_report_tl + { + \clearpage + \addtocounter{page}{-1} + \pagestyle { empty } + \color { projlib_draft_DNF_color } + \noindent + \projlib_draft_DNF_font + \projlib_draft_DNF_report_text + \par \bigskip + \g__projlib_draft_DNF_report_tl + } } } } @@ -3702,13 +3705,13 @@ % i.e. \ProvideDocumentCommand { \ie } { } { - \projlib_text_abbreviation_generic:nn { \textit{i. \nobreak \hskip.2ex \nobreak e.} } { \skip_horizontal:n { -.25ex } } + \projlib_text_abbreviation_generic:nn { \textit{i. \nobreak \hskip.2ex \nobreak e.} } { \skip_horizontal:n { -.15ex ~plus -.15\tex_fontdimen:D 3 \tex_font:D~minus -.15\tex_fontdimen:D 4 \tex_font:D } } } % e.g. \ProvideDocumentCommand { \eg } { } { - \projlib_text_abbreviation_generic:nn { \textit{e. \nobreak \hskip.2ex \nobreak g.} } { \skip_horizontal:n { -.25ex } } + \projlib_text_abbreviation_generic:nn { \textit{e. \nobreak \hskip.2ex \nobreak g.} } { \skip_horizontal:n { -.15ex ~plus -.15\tex_fontdimen:D 3 \tex_font:D~minus -.15\tex_fontdimen:D 4 \tex_font:D } } } % cf. @@ -3858,8 +3861,12 @@ \RequirePackage { amsthm } \RequirePackage { create-theorem } -\RenewCommandCopy \cref \crefthe -\RenewCommandCopy \Cref \Crefthe +\RenewCommandCopy \cref \crefthe +\RenewCommandCopy \Cref \Crefthe +\RenewCommandCopy \namecref \namecrefthe +\RenewCommandCopy \nameCref \nameCrefthe +\RenewCommandCopy \namecrefs \namecrefsthe +\RenewCommandCopy \nameCrefs \nameCrefsthe \bool_if:NF \l__projlib_theorem_no_theorems_bool { @@ -5236,10 +5243,17 @@ \usetikzlibrary { calc } \ExplSyntaxOn +\tl_new:N \l_projlib_titlepage_title_page_name_tl +\tl_new:N \l_projlib_titlepage_license_page_name_tl +\tl_set:Nn \l_projlib_titlepage_title_page_name_tl { Cover } +\tl_set:Nn \l_projlib_titlepage_license_page_name_tl { License } + \tl_new:N \l_projlib_titlepage_logo_tl \tl_new:N \l_projlib_titlepage_title_tl \tl_new:N \l_projlib_titlepage_subtitle_tl \tl_new:N \l_projlib_titlepage_author_tl +\tl_new:N \l_projlib_titlepage_info_tl +\tl_new:N \l_projlib_titlepage_license_tl \tl_new:N \l_projlib_titlepage_date_tl \tl_new:N \l_projlib_titlepage_style_tl @@ -5266,6 +5280,16 @@ , 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 } } } + , title-page-name .code:n = { \tl_set:Nn \l_projlib_titlepage_title_page_name_tl { \tl_trim_spaces:n { #1 } } } + , title~page~name .code:n = { \tl_set:Nn \l_projlib_titlepage_title_page_name_tl { \tl_trim_spaces:n { #1 } } } + , title page name .code:n = { \tl_set:Nn \l_projlib_titlepage_title_page_name_tl { \tl_trim_spaces:n { #1 } } } + , license-page-name .code:n = { \tl_set:Nn \l_projlib_titlepage_license_page_name_tl { \tl_trim_spaces:n { #1 } } } + , license~page~name .code:n = { \tl_set:Nn \l_projlib_titlepage_license_page_name_tl { \tl_trim_spaces:n { #1 } } } + , license page name .code:n = { \tl_set:Nn \l_projlib_titlepage_license_page_name_tl { \tl_trim_spaces:n { #1 } } } + , info .code:n = { \tl_set:Nn \l_projlib_titlepage_info_tl { \tl_trim_spaces:n { #1 } } } + , info .initial:n = { } + , license .code:n = { \tl_set:Nn \l_projlib_titlepage_license_tl { \tl_trim_spaces:n { #1 } } } + , license .initial:n = { } , style .tl_set:N = \l_projlib_titlepage_style_tl , style .initial:n = { default } , color .code:n = { @@ -5283,10 +5307,20 @@ \cs_new_protected:Nn \projlib_titlepage_render:n { \keys_set:nn { projlib-titlepage-config } { #1 } + \tl_set_eq:NN \thepage \l_projlib_titlepage_title_page_name_tl \begin { titlepage } \cs_if_exist_use:c { projlib_titlepage_render_with_style_ \l_projlib_titlepage_style_tl : } \end { titlepage } - \setcounter { page } { 0 } + \tl_set_eq:NN \thepage \l_projlib_titlepage_license_page_name_tl + \thispagestyle{empty} + \null\vfill + \begin{flushleft} + \tl_use:N \l_projlib_titlepage_info_tl + \end{flushleft} + \tl_use:N \l_projlib_titlepage_license_tl + \cleardoublepage + \setcounter{page}{0} + \pagenumbering{roman} } \cs_new_protected:Nn \projlib_titlepage_render_with_style_default: diff --git a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty index 92b77c4db70..1f609d3a235 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/05} {} + {2022/11/15} {} {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 ea2592edecd..677a51bf983 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/05} {} + {2022/11/15} {} {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 6617cbb8614..d5ac08c620f 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/05} {} + {2022/11/15} {} {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 0a5d6e78fd9..1f2cfe4eaca 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/05} {} + {2022/11/15} {} {Useful commands during draft stage} \keys_define:nn { projlib-draft } @@ -147,9 +147,9 @@ \raisebox{\baselineskip}{ \cs_if_exist:cT { hypertarget } { - \hypertarget { DNF. \arabic { projlib_draft_DNF_counter } } {} + \hypertarget { DNF. \jobname. \arabic { projlib_draft_DNF_counter } } {} } - \label { DNF. \arabic { projlib_draft_DNF_counter } } + \label { DNF. \jobname. \arabic { projlib_draft_DNF_counter } } } \nobreak \projlib_draft_plain_box:nn { projlib_draft_DNF_color } @@ -182,10 +182,10 @@ { \cs_if_exist:cTF { hyperlink } { - \exp_not:N \hyperlink { DNF. \int_value:w \theprojlib_draft_DNF_counter } { \exp_not:N \pageref* { DNF. \int_value:w \theprojlib_draft_DNF_counter } } + \exp_not:N \hyperlink { DNF. \jobname. \int_value:w \theprojlib_draft_DNF_counter } { \exp_not:N \pageref* { DNF. \jobname. \int_value:w \theprojlib_draft_DNF_counter } } } { - \exp_not:N \pageref* { DNF. \int_value:w \theprojlib_draft_DNF_counter } + \exp_not:N \pageref* { DNF. \jobname. \int_value:w \theprojlib_draft_DNF_counter } } } \tl_gput_right:Nn \g__projlib_draft_DNF_report_tl @@ -202,19 +202,22 @@ \bool_if:NF \l__projlib_draft_no_report_page_bool { - \hook_gput_code:nnn { enddocument } { projlib-draft } + \hook_gput_code:nnn { begindocument/before } { projlib-draft } { - \tl_if_blank:VF \g__projlib_draft_DNF_report_tl + \hook_gput_code:nnn { enddocument } { projlib-draft } { - \clearpage - \addtocounter{page}{-1} - \pagestyle { empty } - \color { projlib_draft_DNF_color } - \noindent - \projlib_draft_DNF_font - \projlib_draft_DNF_report_text - \par \bigskip - \g__projlib_draft_DNF_report_tl + \tl_if_blank:VF \g__projlib_draft_DNF_report_tl + { + \clearpage + \addtocounter{page}{-1} + \pagestyle { empty } + \color { projlib_draft_DNF_color } + \noindent + \projlib_draft_DNF_font + \projlib_draft_DNF_report_text + \par \bigskip + \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 9ae86454f8c..76b3a7f5f43 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/05} {} + {2022/11/15} {} {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 58d7ed1a945..8bcd70bb03c 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/05} {} + {2022/11/15} {} {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 98c0bb68b2e..f510a9d31f4 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/05} {} + {2022/11/15} {} {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 c8b3603a8c8..ba5898b2a50 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/05} {} + {2022/11/15} {} {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 17d883bc185..6b97235941d 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/05} {} + {2022/11/15} {} {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 e1172552953..86e1e4f35d9 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/05} {} + {2022/11/15} {} {Text-related commands} \keys_define:nn { projlib-text } @@ -58,13 +58,13 @@ % i.e. \ProvideDocumentCommand { \ie } { } { - \projlib_text_abbreviation_generic:nn { \textit{i. \nobreak \hskip.2ex \nobreak e.} } { \skip_horizontal:n { -.25ex } } + \projlib_text_abbreviation_generic:nn { \textit{i. \nobreak \hskip.2ex \nobreak e.} } { \skip_horizontal:n { -.15ex ~plus -.15\tex_fontdimen:D 3 \tex_font:D~minus -.15\tex_fontdimen:D 4 \tex_font:D } } } % e.g. \ProvideDocumentCommand { \eg } { } { - \projlib_text_abbreviation_generic:nn { \textit{e. \nobreak \hskip.2ex \nobreak g.} } { \skip_horizontal:n { -.25ex } } + \projlib_text_abbreviation_generic:nn { \textit{e. \nobreak \hskip.2ex \nobreak g.} } { \skip_horizontal:n { -.15ex ~plus -.15\tex_fontdimen:D 3 \tex_font:D~minus -.15\tex_fontdimen:D 4 \tex_font:D } } } % cf. diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty b/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty index e39f6da2c64..c5837abe18c 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/05} {} + {2022/11/15} {} {Configuration of theorem-like environments} \keys_define:nn { projlib-theorem } @@ -148,8 +148,12 @@ \RequirePackage { amsthm } \RequirePackage { create-theorem } -\RenewCommandCopy \cref \crefthe -\RenewCommandCopy \Cref \Crefthe +\RenewCommandCopy \cref \crefthe +\RenewCommandCopy \Cref \Crefthe +\RenewCommandCopy \namecref \namecrefthe +\RenewCommandCopy \nameCref \nameCrefthe +\RenewCommandCopy \namecrefs \namecrefsthe +\RenewCommandCopy \nameCrefs \nameCrefsthe \bool_if:NF \l__projlib_theorem_no_theorems_bool { diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty b/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty index 108f343f642..6465fe321a2 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/05} {} + {2022/11/15} {} {Commands for rendering the title page} \keys_define:nn { projlib-titlepage } @@ -35,10 +35,17 @@ \usetikzlibrary { calc } \ExplSyntaxOn +\tl_new:N \l_projlib_titlepage_title_page_name_tl +\tl_new:N \l_projlib_titlepage_license_page_name_tl +\tl_set:Nn \l_projlib_titlepage_title_page_name_tl { Cover } +\tl_set:Nn \l_projlib_titlepage_license_page_name_tl { License } + \tl_new:N \l_projlib_titlepage_logo_tl \tl_new:N \l_projlib_titlepage_title_tl \tl_new:N \l_projlib_titlepage_subtitle_tl \tl_new:N \l_projlib_titlepage_author_tl +\tl_new:N \l_projlib_titlepage_info_tl +\tl_new:N \l_projlib_titlepage_license_tl \tl_new:N \l_projlib_titlepage_date_tl \tl_new:N \l_projlib_titlepage_style_tl @@ -65,6 +72,16 @@ , 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 } } } + , title-page-name .code:n = { \tl_set:Nn \l_projlib_titlepage_title_page_name_tl { \tl_trim_spaces:n { #1 } } } + , title~page~name .code:n = { \tl_set:Nn \l_projlib_titlepage_title_page_name_tl { \tl_trim_spaces:n { #1 } } } + , title page name .code:n = { \tl_set:Nn \l_projlib_titlepage_title_page_name_tl { \tl_trim_spaces:n { #1 } } } + , license-page-name .code:n = { \tl_set:Nn \l_projlib_titlepage_license_page_name_tl { \tl_trim_spaces:n { #1 } } } + , license~page~name .code:n = { \tl_set:Nn \l_projlib_titlepage_license_page_name_tl { \tl_trim_spaces:n { #1 } } } + , license page name .code:n = { \tl_set:Nn \l_projlib_titlepage_license_page_name_tl { \tl_trim_spaces:n { #1 } } } + , info .code:n = { \tl_set:Nn \l_projlib_titlepage_info_tl { \tl_trim_spaces:n { #1 } } } + , info .initial:n = { } + , license .code:n = { \tl_set:Nn \l_projlib_titlepage_license_tl { \tl_trim_spaces:n { #1 } } } + , license .initial:n = { } , style .tl_set:N = \l_projlib_titlepage_style_tl , style .initial:n = { default } , color .code:n = { @@ -82,10 +99,20 @@ \cs_new_protected:Nn \projlib_titlepage_render:n { \keys_set:nn { projlib-titlepage-config } { #1 } + \tl_set_eq:NN \thepage \l_projlib_titlepage_title_page_name_tl \begin { titlepage } \cs_if_exist_use:c { projlib_titlepage_render_with_style_ \l_projlib_titlepage_style_tl : } \end { titlepage } - \setcounter { page } { 0 } + \tl_set_eq:NN \thepage \l_projlib_titlepage_license_page_name_tl + \thispagestyle{empty} + \null\vfill + \begin{flushleft} + \tl_use:N \l_projlib_titlepage_info_tl + \end{flushleft} + \tl_use:N \l_projlib_titlepage_license_tl + \cleardoublepage + \setcounter{page}{0} + \pagenumbering{roman} } \cs_new_protected:Nn \projlib_titlepage_render_with_style_default: -- cgit v1.2.3