diff options
Diffstat (limited to 'Master')
12 files changed, 286 insertions, 182 deletions
diff --git a/Master/texmf-dist/doc/latex/projlib/README.md b/Master/texmf-dist/doc/latex/projlib/README.md index 3c25a992a8c..cfac379f40a 100644 --- a/Master/texmf-dist/doc/latex/projlib/README.md +++ b/Master/texmf-dist/doc/latex/projlib/README.md @@ -1,14 +1,14 @@ <!-- Copyright (C) 2021-2022 by Jinwen XU --> -# ProjLib Toolkit + -The bundle is dated 2022/03/19 +# The `ProjLib` Toolkit - +The bundle is dated 2022/03/21 ## **Important note** -The whole project is being rewritten with `expl3`. The new modules are basically finished but are **not yet documented**. They have filenames with the prefix "projlib-", and they are in many ways better and more powerful than their predecessors. +The whole project is being rewritten with `expl3`. The new modules are basically finished but are **not yet documented**. They have filenames with the prefix `projlib-`, and they are in many ways better and more powerful than their predecessors. The new modules are: - projlib-author diff --git a/Master/texmf-dist/source/latex/projlib/ProjLib.dtx b/Master/texmf-dist/source/latex/projlib/ProjLib.dtx index db18403a5c8..32903be29bf 100644 --- a/Master/texmf-dist/source/latex/projlib/ProjLib.dtx +++ b/Master/texmf-dist/source/latex/projlib/ProjLib.dtx @@ -20,70 +20,70 @@ %<*ProjLib> \ProvidesExplPackage {ProjLib} - {2022/03/19} {} + {2022/03/21} {} {Collective interface of the ProjLib toolkit} %</ProjLib> % %<*projlib-author> \ProvidesExplPackage {projlib-author} - {2022/03/19} {} + {2022/03/21} {} {Enhanced author information block} %</projlib-author> % %<*projlib-datetime> \ProvidesExplPackage {projlib-datetime} - {2022/03/19} {} + {2022/03/21} {} {Convert numeric date-time string to natural language} %</projlib-datetime> % %<*projlib-draft> \ProvidesExplPackage {projlib-draft} - {2022/03/19} {} + {2022/03/21} {} {Useful commands during draft stage} %</projlib-draft> % %<*projlib-font> \ProvidesExplPackage {projlib-font} - {2022/03/19} {} + {2022/03/21} {} {Font selection and configuration} %</projlib-font> % %<*projlib-language> \ProvidesExplPackage {projlib-language} - {2022/03/19} {} + {2022/03/21} {} {Multi-language configuration} %</projlib-language> % %<*projlib-logo> \ProvidesExplPackage {projlib-logo} - {2022/03/19} {} + {2022/03/21} {} {The ProjLib logo} %</projlib-logo> % %<*projlib-math> \ProvidesExplPackage {projlib-math} - {2022/03/19} {} + {2022/03/21} {} {Efficient math setup} %</projlib-math> % %<*projlib-paper> \ProvidesExplPackage {projlib-paper} - {2022/03/19} {} + {2022/03/21} {} {Configuration of the paper style} %</projlib-paper> % %<*projlib-theorem> \ProvidesExplPackage {projlib-theorem} - {2022/03/19} {} + {2022/03/21} {} {Configuration of theorem-like environments} %</projlib-theorem> @@ -2091,42 +2091,76 @@ %<*projlib-draft> \keys_define:nn { projlib-draft } { - , draft .bool_set:N = \l__projlib_draft_fast_bool - , draft .initial:n = { false } - , fast .bool_set:N = \l__projlib_draft_fast_bool - , unknown .code:n = {} + , draft .bool_set:N = \l__projlib_draft_fast_bool + , draft .initial:n = { false } + , fast .bool_set:N = \l__projlib_draft_fast_bool + , no-report-page .bool_set:N = \l__projlib_draft_no_report_page_bool + , no-report-page .initial:n = { false } + , no~report~page .bool_set:N = \l__projlib_draft_no_report_page_bool + , no report page .bool_set:N = \l__projlib_draft_no_report_page_bool + , unknown .code:n = {} } \ProcessKeysOptions { projlib-draft } \RequirePackage { projlib-language } \RequirePackage { xcolor } +\RequirePackage { ulem } -\bool_if:NTF \l__projlib_draft_fast_bool +\cs_new_protected:Nn \projlib_draft_plain_box_lines:n { - \NewDocumentCommand \projlib_draft_plain_box { O{-paper} m } - { - \group_begin: - \color { #1 } - \dim_set:Nn \fboxsep { 1.5pt } - \dim_set:Nn \fboxrule { 1.5pt } - \fbox { #2 } - \group_end: - } + \bgroup\markoverwith{ + \rule[-0.6ex]{1pt}{1.25pt} + \skip_horizontal:n { -1pt } + \rule[1.8ex]{1pt}{1.25pt} + \skip_horizontal:n { -.1pt } + }\ULon { #1 } + } + + \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 { $]$ } } { - \PassOptionsToPackage { many } { tcolorbox } - \RequirePackage { tcolorbox } - \NewTCBox \projlib_draft_plain_box { O{-paper} } + \RequirePackage { tikz } + \tl_const:Nn \l_projlib_draft_plain_box_begin_tl + { + \tikz[line~width=1.25pt,baseline=-.625pt] + \draw (1ex,-.6ex) -- (.5ex,-.6ex) + (0,-.1ex) arc [start~angle=180, end~angle=270, radius=.5ex] + (0,-.1ex) -- (0,1.3ex) + (0,1.3ex) arc [start~angle=180, end~angle=90, radius=.5ex] + (0.5ex,1.8ex) -- (1ex,1.8ex); + } + \tl_const:Nn \l_projlib_draft_plain_box_after_tl { - enhanced~jigsaw, breakable, - on~line, arc = 1.2pt, outer~arc = 1pt, - colframe = #1, colupper = #1, opacityback = 0, - boxsep = 1pt, boxrule = 1.2pt, - left = 1pt, right = 1pt, top = 0pt, bottom = 0pt, + \tikz[line~width=1.25pt,baseline=-.625pt] + \draw (-1ex,-.6ex) -- (-.5ex,-.6ex) + (0,-.1ex) arc [start~angle=0, end~angle=-90, radius=.5ex] + (0,-.1ex) -- (0,1.3ex) + (0,1.3ex) arc [start~angle=0, end~angle=90, radius=.5ex] + (-0.5ex,1.8ex) -- (-1ex,1.8ex); } } -\projlib_langauge_define_multilingual_text:Nn \__projlib_draft_dnf_text +\cs_new_protected:Nn \projlib_draft_plain_box:nn + { + \group_begin: + \color{ #1 } + \l_projlib_draft_plain_box_begin_tl + \nobreak + \hspace{-.5ex} + \nobreak + \projlib_draft_plain_box_lines:n { #2 } + \nobreak + \hspace{-.5ex} + \nobreak + \l_projlib_draft_plain_box_after_tl + \group_end: + } + + +\projlib_langauge_define_multilingual_text:Nn \projlib_draft_dnf_text { EN = To\ be\ finished , FR = Pas\ encore\ fini , @@ -2141,7 +2175,7 @@ RU = Не\ закончен , } -\projlib_langauge_define_multilingual_text:Nn \__projlib_draft_dnf_report_text +\projlib_langauge_define_multilingual_text:Nn \projlib_draft_dnf_report_text { EN = { Below\ is\ a\ list\ of\ outstanding\ items, \ followed\ by\ the\ corresponding\ page\ numbers. } , @@ -2164,65 +2198,71 @@ \ с\ соответствующими\ номерами\ страниц\ в\ скобках. } , } -\tl_new:c { __projlib_draft_dnf_font } -\tl_gset:cn { __projlib_draft_dnf_font } { \normalfont \ttfamily \bfseries \small } +\tl_new:c { projlib_draft_dnf_font } +\tl_gset:cn { projlib_draft_dnf_font } { \normalfont \ttfamily \bfseries \small } -\definecolor { __projlib_draft_dnf_color } { RGB } { 21, 122, 20 } +\definecolor { projlib_draft_dnf_color } { RGB } { 21, 122, 20 } -\newcounter { __projlib_draft_dnf_counter } +\newcounter { projlib_draft_dnf_counter } \tl_new:N \g__projlib_draft_dnf_report_tl -\NewDocumentCommand \dnf { d<> } +\NewDocumentCommand \dnf { D<>{} } { \noindent - \projlib_draft_plain_box [ __projlib_draft_dnf_color ] + \group_begin: + \projlib_draft_dnf_font + \stepcounter { projlib_draft_dnf_counter } + \projlib_draft_plain_box:nn { projlib_draft_dnf_color } { - \stepcounter { __projlib_draft_dnf_counter } - \__projlib_draft_dnf_font - \__projlib_draft_dnf_text - \c_space_tl - \# \the__projlib_draft_dnf_counter - \IfNoValueF { #1 } { \, : ~ #1 } - \tl_gput_right:Nx \g__projlib_draft_dnf_report_tl + \projlib_draft_dnf_text + \nobreakspace + \# \theprojlib_draft_dnf_counter + \tl_if_blank:nF { #1 } { \, : ~ } + #1 + } + \group_end: + \tl_gput_right:Nx \g__projlib_draft_dnf_report_tl + { + \# \, + \int_value:w \theprojlib_draft_dnf_counter + \c_space_tl \c_space_tl + $\langle$ + \skip_horizontal:n { 0.1em } + \cs_if_exist:cTF { hyperlink } { - \# \, - \int_value:w \the__projlib_draft_dnf_counter - \c_space_tl \c_space_tl - $\langle$ - \skip_horizontal:n { 0.1em } - \cs_if_exist:cTF { hyperlink } - { - \exp_not:N \hyperlink { page.\thepage } { \thepage } - } - { - \thepage - } - \skip_horizontal:n { 0.1em } - $\rangle$ - \c_space_tl - \IfNoValueF { #1 } { : ~ #1 } - \\ + \exp_not:N \hyperlink { page.\thepage } { \thepage } + } + { + \thepage } + \skip_horizontal:n { 0.1em } + $\rangle$ + \nobreakspace + \IfNoValueF { #1 } { : ~ } + #1 \\ } } -\hook_gput_code:nnn { enddocument } { projlib-draft } +\bool_if:NF \l__projlib_draft_no_report_page_bool { - \tl_if_blank:VF \g__projlib_draft_dnf_report_tl + \hook_gput_code:nnn { enddocument } { projlib-draft } { - \clearpage - \pagestyle{empty} - \noindent - \color { __projlib_draft_dnf_color } - \__projlib_draft_dnf_font - \__projlib_draft_dnf_report_text \\[0.75\baselineskip] - \g__projlib_draft_dnf_report_tl + \tl_if_blank:VF \g__projlib_draft_dnf_report_tl + { + \clearpage + \pagestyle{empty} + \noindent + \color { projlib_draft_dnf_color } + \projlib_draft_dnf_font + \projlib_draft_dnf_report_text \\[0.75\baselineskip] + \g__projlib_draft_dnf_report_tl + } } } -\projlib_langauge_define_multilingual_text:Nn \__projlib_draft_blind_text_tl +\projlib_langauge_define_multilingual_text:Nn \projlib_draft_blind_text_tl { , EN = { Hello,~here~is~some~text~without~a~meaning.~This~text~should~show~what~a~printed~text~will~look~like~at~this~place.~If~you~read~this~text,~you~will~get~no~information.~Really?~Is~there~no~information?~Is~there~a~difference~between~this~text~and~some~nonsense~like~``Huardest~gefburn''?~Not~at~all!~A~blind~text~like~this~gives~you~information~about~the~selected~font,~how~the~letters~are~written~and~an~impression~of~the~look.~This~text~should~contain~all~letters~of~the~alphabet~and~it~should~be~written~in~of~the~original~language.~There~is~no~need~for~special~content,~but~the~length~of~words~should~match~the~language. @@ -2264,7 +2304,7 @@ \int_set:Nn \l_tmpa_int { #1 } \int_do_until:nNnn { \l_tmpa_int } = { 0 } { - \__projlib_draft_blind_text_tl + \projlib_draft_blind_text_tl \c_space_tl \int_add:Nn \l_tmpa_int { -1 } } @@ -2276,7 +2316,7 @@ { \tl_if_blank:nTF { #1 } { - \__projlib_draft_blind_text_tl + \projlib_draft_blind_text_tl } { \projlib_draft_blind_text:n { #1 } @@ -3002,7 +3042,13 @@ \DeclareRobustCommand * \ProjLib { \group_begin: - \normalfont ProjLib + \normalfont\sffamily ProjLib + \group_end: + } + \DeclareRobustCommand * \ProjLibText + { + \group_begin: + \normalfont\sffamily ProjLib \group_end: } \endinput @@ -3083,45 +3129,52 @@ \RequirePackage { tikz } -\cs_new_protected:Nn \projlib_logo_generic: +\cs_new_protected:Nn \projlib_logo_generic:nn { + \colorlet{projlib-logo-saved-color}{.} \skip_horizontal:n { .2em } \begin{tikzpicture}[line~width=.1em, baseline=0] - \begin{scope}[color=blue!50!cyan!30!black] + \begin{scope}[color=#1!30!projlib-logo-saved-color] \draw (0.22em,.5em) circle (.22em); \draw (0em,0em) -- (0em,.5em); \end{scope} - \begin{scope}[color=blue!50!cyan!40!black, xshift=.65em] + \begin{scope}[color=#1!40!projlib-logo-saved-color, 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] + \begin{scope}[color=#1!45!projlib-logo-saved-color, xshift=1.0em] \draw (0.2em,.24em) circle (.2em); \end{scope} - \begin{scope}[color=blue!50!cyan!50!black, xshift=1.65em] + \begin{scope}[color=#1!50!projlib-logo-saved-color, 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); + % \draw[line~width=.032em, color=#2, 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); + \draw[line~width=.06em, color=#2] (0,0) circle (.13em); \end{scope} \end{scope} - \begin{scope}[color=blue!50!cyan!67!black, xshift=2.0em] + \begin{scope}[color=#1!67!projlib-logo-saved-color, xshift=2.0em] \draw (0em,0em) -- (0em,.75em); \end{scope} - \begin{scope}[color=blue!50!cyan!75!black, xshift=2.35em] + \begin{scope}[color=#1!75!projlib-logo-saved-color, xshift=2.35em] \draw (0em,0em) -- (0em,.5em); \end{scope} - \begin{scope}[color=blue!50!cyan!90!black, xshift=2.63em] + \begin{scope}[color=#1!90!projlib-logo-saved-color, xshift=2.63em] \draw (0.2em,.24em) circle (.2em); \draw (0em,0.24em) -- (0em,.75em); \end{scope} \end{tikzpicture} - \skip_horizontal:n { .2em } + \skip_horizontal:n { .1em } } \DeclareRobustCommand * \ProjLib { - \projlib_logo_generic: + \projlib_logo_generic:nn { blue!50!cyan } { orange!60!yellow } + } + + +\DeclareRobustCommand * \ProjLibText + { + \projlib_logo_generic:nn { projlib-logo-saved-color } { projlib-logo-saved-color } } %</projlib-logo> % diff --git a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty index 4bd5e78f97c..9a1a36e9675 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/19} {} + {2022/03/21} {} {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 258950e6914..306195f589c 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/19} {} + {2022/03/21} {} {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 3e85712d460..d441d65e7ad 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/19} {} + {2022/03/21} {} {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 3b6326e46fa..bdfb2e9702a 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty @@ -19,47 +19,80 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {projlib-draft} - {2022/03/19} {} + {2022/03/21} {} {Useful commands during draft stage} \keys_define:nn { projlib-draft } { - , draft .bool_set:N = \l__projlib_draft_fast_bool - , draft .initial:n = { false } - , fast .bool_set:N = \l__projlib_draft_fast_bool - , unknown .code:n = {} + , draft .bool_set:N = \l__projlib_draft_fast_bool + , draft .initial:n = { false } + , fast .bool_set:N = \l__projlib_draft_fast_bool + , no-report-page .bool_set:N = \l__projlib_draft_no_report_page_bool + , no-report-page .initial:n = { false } + , no~report~page .bool_set:N = \l__projlib_draft_no_report_page_bool + , no report page .bool_set:N = \l__projlib_draft_no_report_page_bool + , unknown .code:n = {} } \ProcessKeysOptions { projlib-draft } \RequirePackage { projlib-language } \RequirePackage { xcolor } +\RequirePackage { ulem } -\bool_if:NTF \l__projlib_draft_fast_bool +\cs_new_protected:Nn \projlib_draft_plain_box_lines:n { - \NewDocumentCommand \projlib_draft_plain_box { O{-paper} m } - { - \group_begin: - \color { #1 } - \dim_set:Nn \fboxsep { 1.5pt } - \dim_set:Nn \fboxrule { 1.5pt } - \fbox { #2 } - \group_end: - } + \bgroup\markoverwith{ + \rule[-0.6ex]{1pt}{1.25pt} + \skip_horizontal:n { -1pt } + \rule[1.8ex]{1pt}{1.25pt} + \skip_horizontal:n { -.1pt } + }\ULon { #1 } + } + + \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 { $]$ } } { - \PassOptionsToPackage { many } { tcolorbox } - \RequirePackage { tcolorbox } - \NewTCBox \projlib_draft_plain_box { O{-paper} } + \RequirePackage { tikz } + \tl_const:Nn \l_projlib_draft_plain_box_begin_tl { - enhanced~jigsaw, breakable, - on~line, arc = 1.2pt, outer~arc = 1pt, - colframe = #1, colupper = #1, opacityback = 0, - boxsep = 1pt, boxrule = 1.2pt, - left = 1pt, right = 1pt, top = 0pt, bottom = 0pt, + \tikz[line~width=1.25pt,baseline=-.625pt] + \draw (1ex,-.6ex) -- (.5ex,-.6ex) + (0,-.1ex) arc [start~angle=180, end~angle=270, radius=.5ex] + (0,-.1ex) -- (0,1.3ex) + (0,1.3ex) arc [start~angle=180, end~angle=90, radius=.5ex] + (0.5ex,1.8ex) -- (1ex,1.8ex); + } + \tl_const:Nn \l_projlib_draft_plain_box_after_tl + { + \tikz[line~width=1.25pt,baseline=-.625pt] + \draw (-1ex,-.6ex) -- (-.5ex,-.6ex) + (0,-.1ex) arc [start~angle=0, end~angle=-90, radius=.5ex] + (0,-.1ex) -- (0,1.3ex) + (0,1.3ex) arc [start~angle=0, end~angle=90, radius=.5ex] + (-0.5ex,1.8ex) -- (-1ex,1.8ex); } } -\projlib_langauge_define_multilingual_text:Nn \__projlib_draft_dnf_text +\cs_new_protected:Nn \projlib_draft_plain_box:nn + { + \group_begin: + \color{ #1 } + \l_projlib_draft_plain_box_begin_tl + \nobreak + \hspace{-.5ex} + \nobreak + \projlib_draft_plain_box_lines:n { #2 } + \nobreak + \hspace{-.5ex} + \nobreak + \l_projlib_draft_plain_box_after_tl + \group_end: + } + +\projlib_langauge_define_multilingual_text:Nn \projlib_draft_dnf_text { EN = To\ be\ finished , FR = Pas\ encore\ fini , @@ -74,7 +107,7 @@ RU = Не\ закончен , } -\projlib_langauge_define_multilingual_text:Nn \__projlib_draft_dnf_report_text +\projlib_langauge_define_multilingual_text:Nn \projlib_draft_dnf_report_text { EN = { Below\ is\ a\ list\ of\ outstanding\ items, \ followed\ by\ the\ corresponding\ page\ numbers. } , @@ -97,64 +130,70 @@ \ с\ соответствующими\ номерами\ страниц\ в\ скобках. } , } -\tl_new:c { __projlib_draft_dnf_font } -\tl_gset:cn { __projlib_draft_dnf_font } { \normalfont \ttfamily \bfseries \small } +\tl_new:c { projlib_draft_dnf_font } +\tl_gset:cn { projlib_draft_dnf_font } { \normalfont \ttfamily \bfseries \small } -\definecolor { __projlib_draft_dnf_color } { RGB } { 21, 122, 20 } +\definecolor { projlib_draft_dnf_color } { RGB } { 21, 122, 20 } -\newcounter { __projlib_draft_dnf_counter } +\newcounter { projlib_draft_dnf_counter } \tl_new:N \g__projlib_draft_dnf_report_tl -\NewDocumentCommand \dnf { d<> } +\NewDocumentCommand \dnf { D<>{} } { \noindent - \projlib_draft_plain_box [ __projlib_draft_dnf_color ] + \group_begin: + \projlib_draft_dnf_font + \stepcounter { projlib_draft_dnf_counter } + \projlib_draft_plain_box:nn { projlib_draft_dnf_color } { - \stepcounter { __projlib_draft_dnf_counter } - \__projlib_draft_dnf_font - \__projlib_draft_dnf_text - \c_space_tl - \# \the__projlib_draft_dnf_counter - \IfNoValueF { #1 } { \, : ~ #1 } - \tl_gput_right:Nx \g__projlib_draft_dnf_report_tl + \projlib_draft_dnf_text + \nobreakspace + \# \theprojlib_draft_dnf_counter + \tl_if_blank:nF { #1 } { \, : ~ } + #1 + } + \group_end: + \tl_gput_right:Nx \g__projlib_draft_dnf_report_tl + { + \# \, + \int_value:w \theprojlib_draft_dnf_counter + \c_space_tl \c_space_tl + $\langle$ + \skip_horizontal:n { 0.1em } + \cs_if_exist:cTF { hyperlink } { - \# \, - \int_value:w \the__projlib_draft_dnf_counter - \c_space_tl \c_space_tl - $\langle$ - \skip_horizontal:n { 0.1em } - \cs_if_exist:cTF { hyperlink } - { - \exp_not:N \hyperlink { page.\thepage } { \thepage } - } - { - \thepage - } - \skip_horizontal:n { 0.1em } - $\rangle$ - \c_space_tl - \IfNoValueF { #1 } { : ~ #1 } - \\ + \exp_not:N \hyperlink { page.\thepage } { \thepage } } + { + \thepage + } + \skip_horizontal:n { 0.1em } + $\rangle$ + \nobreakspace + \IfNoValueF { #1 } { : ~ } + #1 \\ } } -\hook_gput_code:nnn { enddocument } { projlib-draft } +\bool_if:NF \l__projlib_draft_no_report_page_bool { - \tl_if_blank:VF \g__projlib_draft_dnf_report_tl + \hook_gput_code:nnn { enddocument } { projlib-draft } { - \clearpage - \pagestyle{empty} - \noindent - \color { __projlib_draft_dnf_color } - \__projlib_draft_dnf_font - \__projlib_draft_dnf_report_text \\[0.75\baselineskip] - \g__projlib_draft_dnf_report_tl + \tl_if_blank:VF \g__projlib_draft_dnf_report_tl + { + \clearpage + \pagestyle{empty} + \noindent + \color { projlib_draft_dnf_color } + \projlib_draft_dnf_font + \projlib_draft_dnf_report_text \\[0.75\baselineskip] + \g__projlib_draft_dnf_report_tl + } } } -\projlib_langauge_define_multilingual_text:Nn \__projlib_draft_blind_text_tl +\projlib_langauge_define_multilingual_text:Nn \projlib_draft_blind_text_tl { , EN = { Hello,~here~is~some~text~without~a~meaning.~This~text~should~show~what~a~printed~text~will~look~like~at~this~place.~If~you~read~this~text,~you~will~get~no~information.~Really?~Is~there~no~information?~Is~there~a~difference~between~this~text~and~some~nonsense~like~``Huardest~gefburn''?~Not~at~all!~A~blind~text~like~this~gives~you~information~about~the~selected~font,~how~the~letters~are~written~and~an~impression~of~the~look.~This~text~should~contain~all~letters~of~the~alphabet~and~it~should~be~written~in~of~the~original~language.~There~is~no~need~for~special~content,~but~the~length~of~words~should~match~the~language. @@ -196,7 +235,7 @@ \int_set:Nn \l_tmpa_int { #1 } \int_do_until:nNnn { \l_tmpa_int } = { 0 } { - \__projlib_draft_blind_text_tl + \projlib_draft_blind_text_tl \c_space_tl \int_add:Nn \l_tmpa_int { -1 } } @@ -208,7 +247,7 @@ { \tl_if_blank:nTF { #1 } { - \__projlib_draft_blind_text_tl + \projlib_draft_blind_text_tl } { \projlib_draft_blind_text:n { #1 } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-font.sty b/Master/texmf-dist/tex/latex/projlib/projlib-font.sty index 56484fc9958..a0b27c36adc 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/19} {} + {2022/03/21} {} {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 9f6240b06ab..8d9494ff7fb 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/19} {} + {2022/03/21} {} {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 b6d568e82fb..55013b0b575 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/19} {} + {2022/03/21} {} {The ProjLib logo} \keys_define:nn { projlib-logo } @@ -36,7 +36,13 @@ \DeclareRobustCommand * \ProjLib { \group_begin: - \normalfont ProjLib + \normalfont\sffamily ProjLib + \group_end: + } + \DeclareRobustCommand * \ProjLibText + { + \group_begin: + \normalfont\sffamily ProjLib \group_end: } \endinput @@ -45,45 +51,51 @@ \RequirePackage { tikz } -\cs_new_protected:Nn \projlib_logo_generic: +\cs_new_protected:Nn \projlib_logo_generic:nn { + \colorlet{projlib-logo-saved-color}{.} \skip_horizontal:n { .2em } \begin{tikzpicture}[line~width=.1em, baseline=0] - \begin{scope}[color=blue!50!cyan!30!black] + \begin{scope}[color=#1!30!projlib-logo-saved-color] \draw (0.22em,.5em) circle (.22em); \draw (0em,0em) -- (0em,.5em); \end{scope} - \begin{scope}[color=blue!50!cyan!40!black, xshift=.65em] + \begin{scope}[color=#1!40!projlib-logo-saved-color, 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] + \begin{scope}[color=#1!45!projlib-logo-saved-color, xshift=1.0em] \draw (0.2em,.24em) circle (.2em); \end{scope} - \begin{scope}[color=blue!50!cyan!50!black, xshift=1.65em] + \begin{scope}[color=#1!50!projlib-logo-saved-color, 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); + % \draw[line~width=.032em, color=#2, 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); + \draw[line~width=.06em, color=#2] (0,0) circle (.13em); \end{scope} \end{scope} - \begin{scope}[color=blue!50!cyan!67!black, xshift=2.0em] + \begin{scope}[color=#1!67!projlib-logo-saved-color, xshift=2.0em] \draw (0em,0em) -- (0em,.75em); \end{scope} - \begin{scope}[color=blue!50!cyan!75!black, xshift=2.35em] + \begin{scope}[color=#1!75!projlib-logo-saved-color, xshift=2.35em] \draw (0em,0em) -- (0em,.5em); \end{scope} - \begin{scope}[color=blue!50!cyan!90!black, xshift=2.63em] + \begin{scope}[color=#1!90!projlib-logo-saved-color, xshift=2.63em] \draw (0.2em,.24em) circle (.2em); \draw (0em,0.24em) -- (0em,.75em); \end{scope} \end{tikzpicture} - \skip_horizontal:n { .2em } + \skip_horizontal:n { .1em } } \DeclareRobustCommand * \ProjLib { - \projlib_logo_generic: + \projlib_logo_generic:nn { blue!50!cyan } { orange!60!yellow } + } + +\DeclareRobustCommand * \ProjLibText + { + \projlib_logo_generic:nn { projlib-logo-saved-color } { projlib-logo-saved-color } } \endinput diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-math.sty b/Master/texmf-dist/tex/latex/projlib/projlib-math.sty index f7fa7b81deb..9aee1800333 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/19} {} + {2022/03/21} {} {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 7824b07c5b0..0f204a7fe4c 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/19} {} + {2022/03/21} {} {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 ebcfe1108a5..05b5f21400f 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/19} {} + {2022/03/21} {} {Configuration of theorem-like environments} \keys_define:nn { projlib-theorem } |