texlive[73000] Master: zref-clever (29nov24)
commits+karl at tug.org
commits+karl at tug.org
Fri Nov 29 21:59:59 CET 2024
Revision: 73000
https://tug.org/svn/texlive?view=revision&revision=73000
Author: karl
Date: 2024-11-29 21:59:58 +0100 (Fri, 29 Nov 2024)
Log Message:
-----------
zref-clever (29nov24)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/zref-clever/DEPENDS.txt
trunk/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf
trunk/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf
trunk/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx
trunk/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty
trunk/Master/tlpkg/tlpsrc/zref-clever.tlpsrc
Modified: trunk/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md 2024-11-29 20:59:05 UTC (rev 72999)
+++ trunk/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md 2024-11-29 20:59:58 UTC (rev 73000)
@@ -1,7 +1,13 @@
# Changelog
-## [Unreleased](https://github.com/gusbrs/zref-clever/compare/v0.5.0...HEAD)
+## [Unreleased](https://github.com/gusbrs/zref-clever/compare/v0.5.1...HEAD)
+## [v0.5.1](https://github.com/gusbrs/zref-clever/compare/v0.5.0...v0.5.1) (2024-11-28)
+
+### Fixed
+- Use `\protected at edef` to expand references' content at `endrange` processing
+ functions.
+
## [v0.5.0](https://github.com/gusbrs/zref-clever/compare/v0.4.9...v0.5.0) (2024-11-25)
### Added
Modified: trunk/Master/texmf-dist/doc/latex/zref-clever/DEPENDS.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/zref-clever/DEPENDS.txt 2024-11-29 20:59:05 UTC (rev 72999)
+++ trunk/Master/texmf-dist/doc/latex/zref-clever/DEPENDS.txt 2024-11-29 20:59:58 UTC (rev 73000)
@@ -1,5 +1,4 @@
hard zref
-hard l3packages
hard oberdiek
soft hyperref
soft zref-check
Modified: trunk/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx 2024-11-29 20:59:05 UTC (rev 72999)
+++ trunk/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx 2024-11-29 20:59:58 UTC (rev 73000)
@@ -172,7 +172,7 @@
%
% Identify the package.
% \begin{macrocode}
-\ProvidesExplPackage {zref-clever} {2024-11-25} {0.5.0}
+\ProvidesExplPackage {zref-clever} {2024-11-28} {0.5.1}
{Clever LaTeX cross-references based on zref}
% \end{macrocode}
%
@@ -1021,7 +1021,7 @@
{
\tl_if_exist:NT #1
{
- \tl_clear:N #1 % ?
+ \tl_clear:N #1
\bool_if_exist:cTF { \@@_opt_var_set_bool:n {#1} }
{ \bool_set_false:c { \@@_opt_var_set_bool:n {#1} } }
{ \bool_new:c { \@@_opt_var_set_bool:n {#1} } }
@@ -1161,7 +1161,7 @@
{
\seq_if_exist:NT #1
{
- \seq_clear:N #1 % ?
+ \seq_clear:N #1
\bool_if_exist:cTF { \@@_opt_var_set_bool:n {#1} }
{ \bool_set_false:c { \@@_opt_var_set_bool:n {#1} } }
{ \bool_new:c { \@@_opt_var_set_bool:n {#1} } }
@@ -1229,7 +1229,7 @@
{
\bool_if_exist:NT #1
{
- % \bool_set_false:N #1 % ?
+ % \bool_set_false:N #1
\bool_if_exist:cTF { \@@_opt_var_set_bool:n {#1} }
{ \bool_set_false:c { \@@_opt_var_set_bool:n {#1} } }
{ \bool_new:c { \@@_opt_var_set_bool:n {#1} } }
@@ -3132,12 +3132,12 @@
{
\group_begin:
\UseHook { zref-clever/endrange-setup }
- \tl_set:Ne \l_@@_tmpa_tl
+ \protected at edef \l_@@_tmpa_tl
{
\@@_extract:nnn
{#1} { \l_@@_ref_property_tl } { }
}
- \tl_set:Ne \l_@@_tmpb_tl
+ \protected at edef \l_@@_tmpb_tl
{
\@@_extract:nnn
{#2} { \l_@@_ref_property_tl } { }
@@ -3192,12 +3192,12 @@
{
\group_begin:
\UseHook { zref-clever/endrange-setup }
- \tl_set:Ne \l_@@_tmpa_tl
+ \protected at edef \l_@@_tmpa_tl
{
\@@_extract:nnn
{#1} { \l_@@_ref_property_tl } { }
}
- \tl_set:Ne \l_@@_tmpb_tl
+ \protected at edef \l_@@_tmpb_tl
{
\@@_extract:nnn
{#2} { \l_@@_ref_property_tl } { }
@@ -3241,12 +3241,12 @@
{
\group_begin:
\UseHook { zref-clever/endrange-setup }
- \tl_set:Ne \l_@@_tmpa_tl
+ \protected at edef \l_@@_tmpa_tl
{
\@@_extract:nnn
{#1} { \l_@@_ref_property_tl } { }
}
- \tl_set:Ne \l_@@_tmpb_tl
+ \protected at edef \l_@@_tmpb_tl
{
\@@_extract:nnn
{#2} { \l_@@_ref_property_tl } { }
@@ -5584,7 +5584,7 @@
{
\bool_set_true:N \l_@@_sort_decided_bool
\int_compare:nNnTF
- { \@@_extract:nnn {#1} { zc at cntval } { } }
+ { \@@_extract:nnn {#1} { zc at cntval } { -1 } }
>
{ \tl_head:N \l_@@_label_enclval_b_tl }
{ \sort_return_swapped: }
@@ -5601,7 +5601,7 @@
\int_compare:nNnTF
{ \tl_head:N \l_@@_label_enclval_a_tl }
<
- { \@@_extract:nnn {#2} { zc at cntval } { } }
+ { \@@_extract:nnn {#2} { zc at cntval } { -1 } }
{ \sort_return_same: }
{ \sort_return_swapped: }
}
@@ -8270,8 +8270,11 @@
% \cs{@currentlabel} to \cs{thelstnumber} is a signal that the work of
% \cs{refstepcounter} is being restrained somehow.
% \begin{macrocode}
- \lst at AddToHook { Init }
- { \@@_zcsetup:n { currentcounter = lstnumber } }
+ \cs_if_exist:NT \lst at AddToHook
+ {
+ \lst at AddToHook { Init }
+ { \@@_zcsetup:n { currentcounter = lstnumber } }
+ }
\msg_info:nnn { zref-clever } { compat-package } { listings }
}
}
@@ -8356,8 +8359,11 @@
% \begin{macrocode}
\zref at newprop { subref }
{ \cs_if_exist_use:c { thesub \@captype } }
- \tl_put_right:Nn \caption at subtypehook
- { \zref at localaddprop \ZREF at mainlist { subref } }
+ \tl_if_exist:NT \caption at subtypehook
+ {
+ \tl_put_right:Nn \caption at subtypehook
+ { \zref at localaddprop \ZREF at mainlist { subref } }
+ }
}
}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty 2024-11-29 20:59:05 UTC (rev 72999)
+++ trunk/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty 2024-11-29 20:59:58 UTC (rev 73000)
@@ -52,7 +52,7 @@
'zref-clever' requires a LaTeX kernel \zrefclever at required@kernel\space or newer.%
}%
}%
-\ProvidesExplPackage {zref-clever} {2024-11-25} {0.5.0}
+\ProvidesExplPackage {zref-clever} {2024-11-28} {0.5.1}
{Clever LaTeX cross-references based on zref}
\RequirePackage { zref-base }
\RequirePackage { zref-user }
@@ -428,7 +428,7 @@
{
\tl_if_exist:NT #1
{
- \tl_clear:N #1 % ?
+ \tl_clear:N #1
\bool_if_exist:cTF { \__zrefclever_opt_var_set_bool:n {#1} }
{ \bool_set_false:c { \__zrefclever_opt_var_set_bool:n {#1} } }
{ \bool_new:c { \__zrefclever_opt_var_set_bool:n {#1} } }
@@ -505,7 +505,7 @@
{
\seq_if_exist:NT #1
{
- \seq_clear:N #1 % ?
+ \seq_clear:N #1
\bool_if_exist:cTF { \__zrefclever_opt_var_set_bool:n {#1} }
{ \bool_set_false:c { \__zrefclever_opt_var_set_bool:n {#1} } }
{ \bool_new:c { \__zrefclever_opt_var_set_bool:n {#1} } }
@@ -543,7 +543,7 @@
{
\bool_if_exist:NT #1
{
- % \bool_set_false:N #1 % ?
+ % \bool_set_false:N #1
\bool_if_exist:cTF { \__zrefclever_opt_var_set_bool:n {#1} }
{ \bool_set_false:c { \__zrefclever_opt_var_set_bool:n {#1} } }
{ \bool_new:c { \__zrefclever_opt_var_set_bool:n {#1} } }
@@ -1900,12 +1900,12 @@
{
\group_begin:
\UseHook { zref-clever/endrange-setup }
- \tl_set:Ne \l__zrefclever_tmpa_tl
+ \protected at edef \l__zrefclever_tmpa_tl
{
\__zrefclever_extract:nnn
{#1} { \l__zrefclever_ref_property_tl } { }
}
- \tl_set:Ne \l__zrefclever_tmpb_tl
+ \protected at edef \l__zrefclever_tmpb_tl
{
\__zrefclever_extract:nnn
{#2} { \l__zrefclever_ref_property_tl } { }
@@ -1948,12 +1948,12 @@
{
\group_begin:
\UseHook { zref-clever/endrange-setup }
- \tl_set:Ne \l__zrefclever_tmpa_tl
+ \protected at edef \l__zrefclever_tmpa_tl
{
\__zrefclever_extract:nnn
{#1} { \l__zrefclever_ref_property_tl } { }
}
- \tl_set:Ne \l__zrefclever_tmpb_tl
+ \protected at edef \l__zrefclever_tmpb_tl
{
\__zrefclever_extract:nnn
{#2} { \l__zrefclever_ref_property_tl } { }
@@ -1993,12 +1993,12 @@
{
\group_begin:
\UseHook { zref-clever/endrange-setup }
- \tl_set:Ne \l__zrefclever_tmpa_tl
+ \protected at edef \l__zrefclever_tmpa_tl
{
\__zrefclever_extract:nnn
{#1} { \l__zrefclever_ref_property_tl } { }
}
- \tl_set:Ne \l__zrefclever_tmpb_tl
+ \protected at edef \l__zrefclever_tmpb_tl
{
\__zrefclever_extract:nnn
{#2} { \l__zrefclever_ref_property_tl } { }
@@ -3665,7 +3665,7 @@
{
\bool_set_true:N \l__zrefclever_sort_decided_bool
\int_compare:nNnTF
- { \__zrefclever_extract:nnn {#1} { zc at cntval } { } }
+ { \__zrefclever_extract:nnn {#1} { zc at cntval } { -1 } }
>
{ \tl_head:N \l__zrefclever_label_enclval_b_tl }
{ \sort_return_swapped: }
@@ -3682,7 +3682,7 @@
\int_compare:nNnTF
{ \tl_head:N \l__zrefclever_label_enclval_a_tl }
<
- { \__zrefclever_extract:nnn {#2} { zc at cntval } { } }
+ { \__zrefclever_extract:nnn {#2} { zc at cntval } { -1 } }
{ \sort_return_same: }
{ \sort_return_swapped: }
}
@@ -5635,8 +5635,11 @@
} ,
counterresetby = { lstnumber = lstlisting } ,
}
- \lst at AddToHook { Init }
- { \__zrefclever_zcsetup:n { currentcounter = lstnumber } }
+ \cs_if_exist:NT \lst at AddToHook
+ {
+ \lst at AddToHook { Init }
+ { \__zrefclever_zcsetup:n { currentcounter = lstnumber } }
+ }
\msg_info:nnn { zref-clever } { compat-package } { listings }
}
}
@@ -5686,8 +5689,11 @@
}
\zref at newprop { subref }
{ \cs_if_exist_use:c { thesub \@captype } }
- \tl_put_right:Nn \caption at subtypehook
- { \zref at localaddprop \ZREF at mainlist { subref } }
+ \tl_if_exist:NT \caption at subtypehook
+ {
+ \tl_put_right:Nn \caption at subtypehook
+ { \zref at localaddprop \ZREF at mainlist { subref } }
+ }
}
}
\__zrefclever_compat_module:nn { subfig }
Modified: trunk/Master/tlpkg/tlpsrc/zref-clever.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/zref-clever.tlpsrc 2024-11-29 20:59:05 UTC (rev 72999)
+++ trunk/Master/tlpkg/tlpsrc/zref-clever.tlpsrc 2024-11-29 20:59:58 UTC (rev 73000)
@@ -0,0 +1,4 @@
+depend zref
+depend oberdiek
+#soft hyperref
+#soft zref-check
More information about the tex-live-commits
mailing list.