From 0fd5c3787c3e7ede67a9252cd0c705c97d661974 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 11 Jan 2024 21:30:37 +0000 Subject: pgfkeysearch (11jan24) git-svn-id: svn://tug.org/texlive/trunk@69385 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/pgfkeysearch/README.md | 6 ++++- .../doc/latex/pgfkeysearch/pgfkeysearch.pdf | Bin 164138 -> 167464 bytes .../doc/latex/pgfkeysearch/pgfkeysearch.tex | 15 +++++++---- .../tex/latex/pgfkeysearch/pgfkeysearch.sty | 28 ++++++++------------- Master/tlpkg/bin/tlpkg-ctan-check | 3 ++- 5 files changed, 28 insertions(+), 24 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/pgfkeysearch/README.md b/Master/texmf-dist/doc/latex/pgfkeysearch/README.md index 71ff4b251d7..4e5a4d42f33 100644 --- a/Master/texmf-dist/doc/latex/pgfkeysearch/README.md +++ b/Master/texmf-dist/doc/latex/pgfkeysearch/README.md @@ -52,7 +52,11 @@ The Current Maintainer of this work is Alceu Frigeri ## Changelog -* Version 1.1 (this) +* Version 1.2 (this) + - More typos. + - added two command aliases, see documentation. + +* Version 1.1 - More typos. - renamed some internal variables to better follow the expl3 recommendations. - exposing the Expl3 commands. diff --git a/Master/texmf-dist/doc/latex/pgfkeysearch/pgfkeysearch.pdf b/Master/texmf-dist/doc/latex/pgfkeysearch/pgfkeysearch.pdf index 70d2abe1505..2aa19408a77 100644 Binary files a/Master/texmf-dist/doc/latex/pgfkeysearch/pgfkeysearch.pdf and b/Master/texmf-dist/doc/latex/pgfkeysearch/pgfkeysearch.pdf differ diff --git a/Master/texmf-dist/doc/latex/pgfkeysearch/pgfkeysearch.tex b/Master/texmf-dist/doc/latex/pgfkeysearch/pgfkeysearch.tex index 8e29e2a3ab5..2cad988fe95 100644 --- a/Master/texmf-dist/doc/latex/pgfkeysearch/pgfkeysearch.tex +++ b/Master/texmf-dist/doc/latex/pgfkeysearch/pgfkeysearch.tex @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {1.5} {2023/12/29} +%% This is version {1.2} {2024/01/11} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/pgfkeysearch @@ -32,7 +32,7 @@ \tstitle{ author={Alceu Frigeri\footnote{\tsverb{https://github.com/alceu-frigeri/pgfkeysearch}}}, date={\tsdate}, - title={A Search Extension for pgfkeys\break Version \PkgInfo{pgfkeysearch}{version}} + title={The pgfkeysearch Package\break A Search Extension for pgfkeys\break Version \PkgInfo{pgfkeysearch}{version}} } \begin{typesetabstract} @@ -43,10 +43,12 @@ That's exactly the aim of this, by having a way to find a key in a given path (o \section{Searching for a key} -\begin{codedescribe}{\pgfkeysearchvalueof,\pgfkeysearchvalueofTF} +\begin{codedescribe}[code,update=2024/01/11]{\pgfkeysearchvalueof,\pgfkeysearch,\pgfkeysearchvalueofTF,\pgfkeysearchTF} \begin{codesyntax}% \tsmacro{\pgfkeysearchvalueof}{path-list,key,macro} +\tsmacro{\pgfkeysearch}{path-list,key,macro} \tsmacro{\pgfkeysearchvalueofTF}{path-list,key,macro,if-found,if-not} +\tsmacro{\pgfkeysearchTF}{path-list,key,macro,if-found,if-not} \end{codesyntax} \tsobj[marg]{path-list} is a comma separated list (clist) of paths (can be a single one). \tsobj[marg]{key} is the desired key and \tsobj[marg]{macro} is the macro/command that will receive (store) the key value (if one was found). @@ -56,7 +58,10 @@ The branch version will also execute either \tsobj[marg,sep={or}]{if-found,if-no \end{codedescribe} \begin{tsremark} - Those commands aren't expandable, that's the reason to have them storing the key value in a macro and not just 'placing the value in the input stream'. + \tsobj{\pgfkeysearch,\pgfkeysearchvalueof} are aliases to each other. Same with \tsobj{\pgfkeysearchvalueofTF,\pgfkeysearchTF}. +\end{tsremark} +\begin{tsremark} + These commands aren't expandable, that's the reason to have them storing the key value in a macro and not just placing the found value in the input stream. \end{tsremark} \begin{codestore}[keyval.demo] @@ -86,6 +91,6 @@ The branch version will also execute either \tsobj[marg,sep={or}]{if-found,if-no \tsmacro{\pgfkeysearch_multipath_keysearch:nnnTF}{path-list,key,macro,if-found,if-not} \tsmacro{\pgfkeysearch_keysearch:nnnTF}{single-path,key,macro,if-found,if-not} \end{codesyntax} -These are the \tsobj[pkg]{Expl3} version of it (for package writers). In fact, the \tsobj{\pgfkeysearchvalueof} is just a wrapper to \tsobj{\pgfkeysearch_multipath_keysearch:nnnTF}. The \tsobj{\pgfkeysearch_keysearch:nnnTF} is the single path version. +These are the \tsobj[pkg]{Expl3} version of it, for package writers. In fact, \tsobj{\pgfkeysearchvalueof,\pgfkeysearch,\pgfkeysearchvalueofTF,\pgfkeysearchTF} are just wrappers to \tsobj{\pgfkeysearch_multipath_keysearch:nnnTF}. The \tsobj{\pgfkeysearch_keysearch:nnnTF} is the single path version and it's slightly faster than the more generic multi-path version (for a single path search, of course), given that \tsobj{\pgfkeysearch_multipath_keysearch:nnnTF} calls \tsobj{\pgfkeysearch_keysearch:nnnTF} for each path in \tsobj[marg]{path-list}. \end{codedescribe} \end{document} \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/pgfkeysearch/pgfkeysearch.sty b/Master/texmf-dist/tex/latex/pgfkeysearch/pgfkeysearch.sty index 1b2144cfe16..598237a6ab7 100644 --- a/Master/texmf-dist/tex/latex/pgfkeysearch/pgfkeysearch.sty +++ b/Master/texmf-dist/tex/latex/pgfkeysearch/pgfkeysearch.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {1.1} {2023/12/29} +%% This is version {1.2} {2024/01/11} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/pgfkeysearch @@ -23,8 +23,8 @@ \ProvidesExplPackage {pgfkeysearch} - {2023/12/29} - {1.1} + {2024/01/11} + {1.2} {pgfkeys Search Extension} \ExplSyntaxOn @@ -38,23 +38,15 @@ { name .code:n = {pgfkeysearch} , prefix .code:n = {pgfkeysearch} , - date .code:n = {2023/12/29}, - version .code:n = {1.1} , - description .code:n = {pgfkeys Search Extension} + date .code:n = {2024/01/11}, + version .code:n = {1.2} , + description .code:n = {pgfkeys~ search~ extension} } -\cs_if_exist:NF \__codedesc_pkg_info:nn +\cs_if_exist:NF \PkgInfo { - \cs_new_protected:Npn \__codedesc_pkg_info:nn #1#2 - { \keys_set:nn {#1 / pkg info}{#2} } - } -\cs_if_exist:NF \PkgInfo - { \NewDocumentCommand \PkgInfo {mm} { \keys_set:nn {#1 / pkg info}{#2} } } -\cs_if_exist:NF \PkgDescription - { + \NewDocumentCommand \PkgInfo {mm} { \keys_set:nn {#1 / pkg info}{#2} } \NewDocumentCommand \PkgDescription {m} - { - \noindent Package~ \textbf{\PkgInfo{#1}{name}}~Version:~\PkgInfo{#1}{version}~ -~ \PkgInfo{#1}{date}\par \emph{\PkgInfo{#1}{description}}~\par - } + { \noindent Package~ \textbf{\PkgInfo{#1}{name}}~Version:~\PkgInfo{#1}{version}~ -~ \PkgInfo{#1}{date}\par \emph{\PkgInfo{#1}{description}}~\par } } %%%%%%% %%% End of cut-n-paste @@ -154,6 +146,7 @@ \pgfkeysearch_multipath_keysearch:nnnF {#1}{#2}{#3} { \tl_set:Nn #3 {} } } +\let\pgfkeysearch\pgfkeysearchvalueof \NewDocumentCommand{\pgfkeysearchvalueofTF}{mmmmm} { @@ -164,3 +157,4 @@ #5 } } +\let\pgfkeysearchTF\pgfkeysearchvalueofTF diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index a34ecdaa7bb..5355946b0d9 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -550,7 +550,8 @@ my @TLP_working = qw( mathsemantics mathspec mathtools matlab-prettifier mathspic maths-symbols matrix-skeleton mattens maybemath maze mcaption mceinleger mcexam mcf2graph mcite mciteplus mcmthesis - mdframed mdputu mdsymbol mdwtools mecaso media4svg media9 medstarbeamer + mdframed mdputu mdsymbol mdwtools + mecaso media4svg media9 medmath medstarbeamer meetingmins membranecomputing memdesign memexsupp memoir memoirchapterstyles memoize memory memorygraphs mendex-doc mentis mensa-tex menu menucard menukeys mercatormap merriweather -- cgit v1.2.3