From 2e856ecc8cc7a9bf86e4d6965a39a23cacbeed53 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 20 Feb 2022 21:16:41 +0000 Subject: crefthe (20feb22) git-svn-id: svn://tug.org/texlive/trunk@62103 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/crefthe/crefthe-doc.pdf | Bin 111955 -> 112174 bytes .../texmf-dist/doc/latex/crefthe/crefthe-doc.tex | 6 +++--- Master/texmf-dist/tex/latex/crefthe/crefthe.sty | 17 +++++++---------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Master/texmf-dist/doc/latex/crefthe/crefthe-doc.pdf b/Master/texmf-dist/doc/latex/crefthe/crefthe-doc.pdf index 5cf5715d5c1..4e1a55b9d58 100644 Binary files a/Master/texmf-dist/doc/latex/crefthe/crefthe-doc.pdf and b/Master/texmf-dist/doc/latex/crefthe/crefthe-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/crefthe/crefthe-doc.tex b/Master/texmf-dist/doc/latex/crefthe/crefthe-doc.tex index 718672f8968..04051d0f60a 100644 --- a/Master/texmf-dist/doc/latex/crefthe/crefthe-doc.tex +++ b/Master/texmf-dist/doc/latex/crefthe/crefthe-doc.tex @@ -89,7 +89,7 @@ \title{\crefthepackage{} - cross referencing with proper definite articles} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\crefthepackage{} 2022/02/10}} +\thanks{Corresponding to: \texttt{\crefthepackage{} 2022/02/20}} \date{February 2022, in Paris} \maketitle @@ -237,8 +237,8 @@ With the option \texttt{overwrite}, user commands in \textsf{cleveref} will be r \section{Known issues} \begin{itemize} \item \crefthepackage{} currently works for French, Italian, Portuguese (European and Brazilian) and Spanish, certainly more would be added to this list. - \item The current mechanism does not work for German. The author plans to adopt a more refined approach in later versions in order to support the various situations in German. Meanwhile, you may consider the package \textsf{zref-clever}, which has a much more powerful and sophisticated interface for configure cross referencing. - \item The names of theorem-like environments are not provided --- for the moment you need to define them all by yourself. However, users are encouraged to use the \ProjLib{} toolkit, which already handles everything for you. + \item The current mechanism does not work for German. The author plans to adopt a more refined approach in later versions in order to support the various situations in German. Meanwhile, you may consider the package \textsf{zref-clever}, which has a much more powerful and sophisticated interface for configuring cross referencing. + \item The names of theorem-like environments are not provided here, you need to define them by yourself. However, users are encouraged to use the \ProjLib{} toolkit (more specifically, the internal package \textsf{create-theorem}), which already handles everything for you. \end{itemize} diff --git a/Master/texmf-dist/tex/latex/crefthe/crefthe.sty b/Master/texmf-dist/tex/latex/crefthe/crefthe.sty index 27fbe01122a..7edf7e1788d 100644 --- a/Master/texmf-dist/tex/latex/crefthe/crefthe.sty +++ b/Master/texmf-dist/tex/latex/crefthe/crefthe.sty @@ -13,7 +13,7 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {crefthe} - {2022/02/10} {} + {2022/02/20} {} {Cross referencing with proper definite articles} \keys_define:nn { crefthe } @@ -92,26 +92,23 @@ \NewDocumentCommand \crefthename { m O{} m O{} m } { - \__crefthe_name_general:nnnnnNN { #1 } { #2 } { #3 } { #4 } { #5 } - c \crefthe_crefname_original:w + \__crefthe_name_general:nnnnnn { #1 } { #2 } { #3 } { #4 } { #5 } { c } } \NewDocumentCommand \Crefthename { m O{} m O{} m } { - \__crefthe_name_general:nnnnnNN { #1 } { #2 } { #3 } { #4 } { #5 } - C \crefthe_Crefname_original:w + \__crefthe_name_general:nnnnnn { #1 } { #2 } { #3 } { #4 } { #5 } { C } } -\cs_new_protected:Npn \__crefthe_name_general:nnnnnNN #1 #2 #3 #4 #5 #6 #7 +\cs_new_protected:Npn \__crefthe_name_general:nnnnnn #1 #2 #3 #4 #5 #6 { % #6 is c or C - % #7 is \crefthe_crefname_original:w or \crefthe_Crefname_original:w \tl_if_blank:nTF { #2 } { - #7 { #1 } { #3 } { #5 } + \cs:w crefthe_#6refname_original:w \cs_end: { #1 } { #3 } { #5 } \cs_set:cn { #6ref_#1_format:nnn } { ##2 #3 ~ ##1 ##3 } \cs_set:cn { #6ref_#1_format_first:nnn } { ##2 #5 ~ ##1 ##3 } } { - #7 { #1 } { \crefthemark { #2 } #3 } { \crefthemark { #4 } #5 } + \cs:w crefthe_#6refname_original:w \cs_end: { #1 } { \crefthemark { #2 } #3 } { \crefthemark { #4 } #5 } \cs_set:cn { #6ref_#1_format:nnn } { \crefthemark { #2 } ##2 #3 ~ ##1 ##3 } \cs_set:cn { #6ref_#1_format_first:nnn } { \crefthemark { #4 } ##2 #5 ~ ##1 ##3 } } @@ -134,7 +131,7 @@ \bool_set_false:N \l__crefthe_uppercase_bool } -\prg_generate_conditional_variant:Nnn \str_case_e:nn { nv } { p, T, F, TF } +\prg_generate_conditional_variant:Nnn \str_case_e:nn { nv } { T, F, TF } \cs_new:Npn \crefthe_contraction:nn #1#2 { \exp_args:Ne \__crefthe_contraction:nnn -- cgit v1.2.3