From 0f9b73b01a01a362d8915f8d176823c09d7bcfe0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 20 Mar 2022 21:13:02 +0000 Subject: jxu (20mar22) git-svn-id: svn://tug.org/texlive/trunk@62833 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/projlib/ProjLib.sty | 2 +- .../tex/latex/projlib/projlib-author.sty | 54 +++++++------- .../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 | 50 ++++++------- .../texmf-dist/tex/latex/projlib/projlib-logo.sty | 83 ++++++++++------------ .../texmf-dist/tex/latex/projlib/projlib-math.sty | 2 +- .../texmf-dist/tex/latex/projlib/projlib-paper.sty | 2 +- .../tex/latex/projlib/projlib-theorem.sty | 20 +++++- 10 files changed, 114 insertions(+), 105 deletions(-) (limited to 'Master/texmf-dist/tex/latex/projlib') diff --git a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty index 80741f79a12..4bd5e78f97c 100644 --- a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty +++ b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {ProjLib} - {2022/03/17} {} + {2022/03/19} {} {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 b8f389a9270..258950e6914 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-author.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-author.sty @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-author} - {2022/03/17} {} + {2022/03/19} {} {Enhanced author information block} \keys_define:nn { projlib-author } @@ -75,7 +75,7 @@ { \hook_gput_code:nnn { cmd/@author/after } { projlib-author } { - \phantom {A} \\[-.85\baselineskip] + \phantom {A} \\[-.9\baselineskip] \bool_if:NF \g__projlib_author_affil_already_exist_bool { \skip_vertical:n { \g__projlib_author_length_innersep_dim } @@ -135,6 +135,8 @@ { \RequirePackage{ projlib-language } + \tl_const:Nn \c_projlib_author_dot_tl { . } + \tl_new:N \g_projlib_author_keywordsname_style_tl \tl_gset:Nn \g_projlib_author_keywordsname_style_tl { \itshape } @@ -165,38 +167,38 @@ \tl_gset:Nn \g__projlib_author_dedicatory_tl { #1 } } - \hook_gput_code:nnn { begindocument/before } { projlib-author } - { - \NewCommandCopy \projlib_author_backup_footnotemark: \footnotemark - \tl_gset:Nn \footnotemark {} + \NewCommandCopy \projlib_author_backup_footnotemark: \footnotemark + \tl_gset:Nn \footnotemark {} - \NewCommandCopy \projlib_author_backup_thanks:w \thanks - \cs_undefine:N \thanks + \NewCommandCopy \projlib_author_backup_thanks:w \thanks + \cs_undefine:N \thanks - % measure the width of "*" - \hbox_set:Nn \l_tmpa_box { * } - \dim_const:Nn \c__projlib_author_length_width_of_asterisk_dim { \box_wd:N \l_tmpa_box } + % measure the width of "*" + \hbox_set:Nn \l_tmpa_box { * } + \dim_const:Nn \c__projlib_author_length_width_of_asterisk_dim { \box_wd:N \l_tmpa_box } - \cs_new_nopar:Nn \projlib_author_pre_thanks:n + \cs_new_nopar:Nn \projlib_author_pre_thanks:n + { + \projlib_author_backup_thanks:w { - \projlib_author_backup_thanks:w - { - \skip_horizontal:n { - \c__projlib_author_length_width_of_asterisk_dim } - #1 - } + \skip_horizontal:n { - \c__projlib_author_length_width_of_asterisk_dim } + #1 } + } - \NewDocumentCommand \thanks { m } + \NewDocumentCommand \thanks { m } + { + \tl_if_blank:nF { #1 } { - \tl_if_blank:nF { #1 } + \hook_gput_code:nnn { cmd/@title/after } { projlib-author } { - \hook_gput_code:nnn { cmd/@title/after } { projlib-author } - { - \projlib_author_pre_thanks:n { #1 } - } + \projlib_author_pre_thanks:n { #1 } } } + } + \hook_gput_code:nnn { begindocument/before } { projlib-author } + { \NewCommandCopy \projlib_author_backup_my_author:w \author \RenewDocumentCommand \author { m } { @@ -205,7 +207,7 @@ \RenewCommandCopy \footnotemark \projlib_author_backup_footnotemark: \RenewCommandCopy \thanks \projlib_author_backup_thanks:w #1 - \cs_undefine:N \footnotemark + \tl_gset:Nn \footnotemark {} } } } @@ -269,7 +271,7 @@ { \group_begin: \g_projlib_author_keywordsname_style_tl - \keywordsname . + \keywordsname \c_projlib_author_dot_tl \group_end: \c_space_tl \g__projlib_author_keywords_tl @@ -315,7 +317,7 @@ } \projlib_author_pre_thanks:n { - \textit{ \l_projlib_author_subjclassname_tl . } + \textit{ \l_projlib_author_subjclassname_tl \c_projlib_author_dot_tl } \enspace \l_projlib_author_subjclass_tl . } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty b/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty index 64ba9baf2a0..3e85712d460 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-datetime} - {2022/03/17} {} + {2022/03/19} {} {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 02a2d884046..3b6326e46fa 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-draft} - {2022/03/17} {} + {2022/03/19} {} {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 136873b0462..56484fc9958 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-font.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-font.sty @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-font} - {2022/03/17} {} + {2022/03/19} {} {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 37b73af2598..9f6240b06ab 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-language.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-language.sty @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-language} - {2022/03/17} {} + {2022/03/19} {} {Multi-language configuration} \clist_const:Nn \c__projlib_language_supported_clist @@ -282,35 +282,35 @@ \tl_gput_right:Nn \g_projlib_language_settings_schinese_tl { \g_projlib_language_settings_common_tl - \tl_gset:Nn \languagename { schinese } - \tl_gset:cn { abstractname } { 摘要 } - \tl_gset:cn { proofname } { 证明 } - \tl_gset:cn { contentsname } { 目录 } - \tl_gset:cn { listfigurename } { 插图 } - \tl_gset:cn { listtablename } { 表格 } - \tl_gset:cn { figurename } { 图 } - \tl_gset:cn { tablename } { 表 } - \tl_gset:cn { indexname } { 索引 } - \tl_gset:cn { appendixname } { 附录 } - \tl_gset:cn { refname } { 参考文献 } - \tl_gset:cn { bibname } { 参考文献 } + \tl_set:Nn \languagename { schinese } + \tl_set:cn { abstractname } { 摘要 } + \tl_set:cn { proofname } { 证明 } + \tl_set:cn { contentsname } { 目录 } + \tl_set:cn { listfigurename } { 插图 } + \tl_set:cn { listtablename } { 表格 } + \tl_set:cn { figurename } { 图 } + \tl_set:cn { tablename } { 表 } + \tl_set:cn { indexname } { 索引 } + \tl_set:cn { appendixname } { 附录 } + \tl_set:cn { refname } { 参考文献 } + \tl_set:cn { bibname } { 参考文献 } } \tl_gput_right:Nn \g_projlib_language_settings_tchinese_tl { \g_projlib_language_settings_common_tl - \tl_gset:Nn \languagename { tchinese } - \tl_gset:cn { abstractname } { 摘要 } - \tl_gset:cn { proofname } { 證明 } - \tl_gset:cn { contentsname } { 目錄 } - \tl_gset:cn { listfigurename } { 插圖 } - \tl_gset:cn { listtablename } { 表格 } - \tl_gset:cn { figurename } { 圖 } - \tl_gset:cn { tablename } { 表 } - \tl_gset:cn { indexname } { 索引 } - \tl_gset:cn { appendixname } { 附錄 } - \tl_gset:cn { refname } { 參考文獻 } - \tl_gset:cn { bibname } { 參考文獻 } + \tl_set:Nn \languagename { tchinese } + \tl_set:cn { abstractname } { 摘要 } + \tl_set:cn { proofname } { 證明 } + \tl_set:cn { contentsname } { 目錄 } + \tl_set:cn { listfigurename } { 插圖 } + \tl_set:cn { listtablename } { 表格 } + \tl_set:cn { figurename } { 圖 } + \tl_set:cn { tablename } { 表 } + \tl_set:cn { indexname } { 索引 } + \tl_set:cn { appendixname } { 附錄 } + \tl_set:cn { refname } { 參考文獻 } + \tl_set:cn { bibname } { 參考文獻 } } \tl_gput_right:Nn \g_projlib_language_settings_japanese_tl diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty b/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty index 2aec50e7db3..b6d568e82fb 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-logo} - {2022/03/17} {} + {2022/03/19} {} {The ProjLib logo} \keys_define:nn { projlib-logo } @@ -42,59 +42,48 @@ \endinput } -\cs_if_exist:cTF { fontspec } - { - \newfontface \__projlib_logo_font: { LinBiolinum_R.otf } - } - { - \RequirePackage [T1] { fontenc } - \cs_gset:Nn \__projlib_logo_font: - { \fontfamily { LinuxBiolinumT-TLF } \selectfont } - } -\tl_new:N \g__projlib_logo_sigma_j_tl -\tl_gset:Nn \g__projlib_logo_sigma_j_tl - { - \vbox:n - { - \offinterlineskip - \hbox_overlap_center:n - { - \skip_horizontal:n { 0.75ex } - \hbox_set:Nn \l_tmpa_box { \usefont{U}{zeur}{b}{n} \symbol{"06} } - \box_rotate:Nn \l_tmpa_box { -10 } - \box_scale:Nnn \l_tmpa_box {.4} {.4} - \box_use:N \l_tmpa_box - } - \skip_vertical:n { 0.15ex } - \hbox:n { \j } - } - } +\RequirePackage { tikz } -\cs_new_protected:Nn \projlib_logo_generic:n +\cs_new_protected:Nn \projlib_logo_generic: { - \group_begin: - \normalfont - \__projlib_logo_font: - \color_group_begin: - \color_select:n { blue!60!cyan } { P } - \color_select:n { blue!45!cyan } { r } - \color_select:n { blue!30!cyan } { o } - \color_select:n { green!70!black!70 } { #1 } - \color_select:n { red!20!yellow } { L } - \color_select:n { red!40!yellow } { i } - \color_select:n { red!60!yellow } { b } - \color_group_end: - \group_end: + \skip_horizontal:n { .2em } + \begin{tikzpicture}[line~width=.1em, baseline=0] + \begin{scope}[color=blue!50!cyan!30!black] + \draw (0.22em,.5em) circle (.22em); + \draw (0em,0em) -- (0em,.5em); + \end{scope} + \begin{scope}[color=blue!50!cyan!40!black, xshift=.65em] + \draw (0em,0em) -- (0em,.25em) arc [start~angle=180, end~angle=90, radius=.2em]; + \end{scope} + \begin{scope}[color=blue!50!cyan!45!black, xshift=1.0em] + \draw (0.2em,.24em) circle (.2em); + \end{scope} + \begin{scope}[color=blue!50!cyan!50!black, xshift=1.65em] + \draw (0em,-.25em) -- (0em,.5em); + \begin{scope}[yshift=.75em] + % \draw[line~width=.032em, color=orange!60!yellow, xshift=.01em, yshift=-.003em] (0,0) circle (.13em); + % \node[rotate=-15,scale=0.45, xshift=.033em] { \usefont{U}{zeur}{b}{n} \symbol{"02} }; + \draw[line~width=.06em, color=orange!60!yellow] (0,0) circle (.13em); + \end{scope} + \end{scope} + \begin{scope}[color=blue!50!cyan!67!black, xshift=2.0em] + \draw (0em,0em) -- (0em,.75em); + \end{scope} + \begin{scope}[color=blue!50!cyan!75!black, xshift=2.35em] + \draw (0em,0em) -- (0em,.5em); + \end{scope} + \begin{scope}[color=blue!50!cyan!90!black, xshift=2.63em] + \draw (0.2em,.24em) circle (.2em); + \draw (0em,0.24em) -- (0em,.75em); + \end{scope} + \end{tikzpicture} + \skip_horizontal:n { .2em } } \DeclareRobustCommand * \ProjLib { - \projlib_logo_generic:n { \g__projlib_logo_sigma_j_tl } - } -\DeclareRobustCommand * \ProjLibText - { - \projlib_logo_generic:n { j } + \projlib_logo_generic: } \endinput diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-math.sty b/Master/texmf-dist/tex/latex/projlib/projlib-math.sty index b3b333c0cac..f7fa7b81deb 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-math.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-math.sty @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-math} - {2022/03/17} {} + {2022/03/19} {} {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 240426477b0..7824b07c5b0 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-paper} - {2022/03/17} {} + {2022/03/19} {} {Configuration of the paper style} \keys_define:nn { projlib-paper } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty b/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty index 8ef33efffcd..ebcfe1108a5 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty @@ -19,7 +19,7 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-theorem} - {2022/03/17} {} + {2022/03/19} {} {Configuration of theorem-like environments} \keys_define:nn { projlib-theorem } @@ -42,6 +42,13 @@ , theorem numbering .default:n = { * } , thmnum .tl_set:N = \l__projlib_theorem_theorem_numbering_tl , thmnum .default:n = { * } + , theorem-style .tl_set:N = \l__projlib_theorem_theorem_style_tl + , theorem-style .initial:n = { } + , theorem-style .value_required:n = true + , theorem~style .tl_set:N = \l__projlib_theorem_theorem_style_tl + , theorem~style .value_required:n = true + , theorem style .tl_set:N = \l__projlib_theorem_theorem_style_tl + , theorem style .value_required:n = true , complex-name .bool_set:N = \l__projlib_theorem_complexname_bool , complex-name .initial:n = { true } , complex~name .bool_set:N = \l__projlib_theorem_complexname_bool @@ -105,6 +112,17 @@ \RequirePackage { projlib-language } +\cs_new_protected:Nn \projlib_theorem_preset_theorem_style:nn + { + \tl_const:cn { c_crthm_theorem_style_preset_ #1 _tl } { #2 } + } + +\cs_generate_variant:Nn \keyval_parse:nnn { nno } +\keyval_parse:nno + { } + { \projlib_theorem_preset_theorem_style:nn } + { \l__projlib_theorem_theorem_style_tl } + \RequirePackage { amsthm } \RequirePackage { create-theorem } -- cgit v1.2.3