texlive[62349] Master/texmf-dist: crefthe (2mar22)

[commits+karl at tug.org]

Revision: 62349
          http://tug.org/svn/texlive?view=revision&revision=62349
Author:   karl
Date:     2022-03-02 22:36:49 +0100 (Wed, 02 Mar 2022)
Log Message:
-----------
crefthe (2mar22)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/crefthe/crefthe-doc.pdf
    trunk/Master/texmf-dist/doc/latex/crefthe/crefthe-doc.tex
    trunk/Master/texmf-dist/tex/latex/crefthe/crefthe.sty

Modified: trunk/Master/texmf-dist/doc/latex/crefthe/crefthe-doc.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/crefthe/crefthe-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/crefthe/crefthe-doc.tex	2022-03-02 21:36:29 UTC (rev 62348)
+++ trunk/Master/texmf-dist/doc/latex/crefthe/crefthe-doc.tex	2022-03-02 21:36:49 UTC (rev 62349)
@@ -93,8 +93,8 @@
 
 \title{\crefthepackage{}\\\smallskip\itshape Cross referencing with proper definite articles}
 \author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\crefthepackage{} 2022/02/27}}
-\date{February 2022, in Paris}
+\thanks{Corresponding to: \texttt{\crefthepackage{} 2022/03/01}}
+\date{March 2022, in Paris}
 
 \maketitle
 
@@ -237,6 +237,7 @@
 
 With the package option \packageoption{overwrite}, user commands in \textsf{cleveref} will be replaced by those offered here, thus you can simply write \lstinline|\cref| for \lstinline|\crefthe| -- and similarly with \lstinline|\Cref|, \lstinline|\crefname| and \lstinline|\Crefname|.
 
+\clearpage
 
 \section{Known issues}
 \begin{itemize}

Modified: trunk/Master/texmf-dist/tex/latex/crefthe/crefthe.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/crefthe/crefthe.sty	2022-03-02 21:36:29 UTC (rev 62348)
+++ trunk/Master/texmf-dist/tex/latex/crefthe/crefthe.sty	2022-03-02 21:36:49 UTC (rev 62349)
@@ -13,7 +13,7 @@
 \RequirePackage{l3keys2e}
 \ProvidesExplPackage
   {crefthe}
-  {2022/02/27} {}
+  {2022/03/01} {}
   {Cross referencing with proper definite articles}
 
 \keys_define:nn { crefthe }
@@ -126,33 +126,32 @@
     \use:c { crefthe_#6refname_original:w } { #1 } { #2 #3 } { #4 #5 }
     \hook_gput_code:nnn { begindocument } { crefthe }
       {
-        \crefthe_patch_format:nnnnn { 2 } { #6ref@#1 at format } { #6ref@#1 at name } { #2 } { #3 }
-        \crefthe_patch_format:nnnnn { 2 } { #6ref@#1 at format@first } { #6ref@#1 at name@plural } { #4 } { #5 }
-        \crefthe_patch_format:nnnnn { 3 } { #6refrange@#1 at format } { #6ref@#1 at name@plural } { #4 } { #5 }
-        \crefthe_patch_format:nnnnn { 3 } { #6refrange@#1 at format@first } { #6ref@#1 at name@plural } { #4 } { #5 }
+        \crefthe_patch_format:nnnn { #6ref@#1 at format } { #6ref@#1 at name } { #2 } { #3 }
+        \crefthe_patch_format:nnnn { #6ref@#1 at format@first } { #6ref@#1 at name@plural } { #4 } { #5 }
+        \crefthe_patch_format:nnnn { #6refrange@#1 at format } { #6ref@#1 at name@plural } { #4 } { #5 }
+        \crefthe_patch_format:nnnn { #6refrange@#1 at format@first } { #6ref@#1 at name@plural } { #4 } { #5 }
       }
   }
 
 \seq_new:N \g__crefthe_already_patched_seq
 
-\cs_new_protected:Nn \crefthe_patch_format:nnnnn
-  % #1 = the # number for the beginning mark of hyperlink
-  % #2 = name of the format command
-  % #3 = name of the command after hyperlink mark
-  % #4 = new content before the mark
-  % #5 = new content after the mark
+\cs_new_protected:Nn \crefthe_patch_format:nnnn
+  % #1 = name of the format command
+  % #2 = name of the command after the hyperlink beginning mark
+  % #3 = new content before the mark
+  % #4 = new content after the mark
   {
-    \seq_if_in:NnF \g__crefthe_already_patched_seq { #2 - #3 }
+    \seq_if_in:NnF \g__crefthe_already_patched_seq { #1 - #2 }
       {
         \makeatletter
-        \tl_set:Nn \l_tmpa_tl { #4 }
-        \tl_set:Nn \l_tmpb_tl { #5 }
-        \exp_args:Nc \regexpatchcmd { #2 }
-          { \cP. #1 \c{ #3 } }
-          { \u{l_tmpa_tl} \cP\# #1 \u{l_tmpb_tl} }
+        \tl_set:No \l_tmpa_tl { #3 }
+        \tl_set:No \l_tmpb_tl { #4 }
+        \exp_args:Nc \regexpatchcmd { #1 }
+          { (\cP\# .) \c{ #2 } }
+          { \u{l_tmpa_tl} \1 \u{l_tmpb_tl} }
           { } { \PatchFailed }
         \makeatother
-        \seq_gput_right:Nn \g__crefthe_already_patched_seq { #2 - #3 }
+        \seq_gput_right:Nn \g__crefthe_already_patched_seq { #1 - #2 }
       }
   }