CTAN sync 202411290302

14 files changed, 144 insertions, 101 deletions

diff --git a/macros/latex/contrib/postnotes/CHANGELOG.md b/macros/latex/contrib/postnotes/CHANGELOG.md
index 50939a8571..8f49811b20 100644
--- a/macros/latex/contrib/postnotes/CHANGELOG.md
+++ b/macros/latex/contrib/postnotes/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 
-## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.4.1...HEAD)
+## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.4.2...HEAD)
+
+## [v0.4.2](https://github.com/gusbrs/postnotes/compare/v0.4.1...v0.4.2) (2024-11-27)
+
+### Fixed
+- Be more careful in expanding content.
 
 ## [v0.4.1](https://github.com/gusbrs/postnotes/compare/v0.4.0...v0.4.1) (2024-11-14)
 
diff --git a/macros/latex/contrib/postnotes/postnotes-code.pdf b/macros/latex/contrib/postnotes/postnotes-code.pdf
index 26dea12800..452b6d9ca9 100644
--- a/macros/latex/contrib/postnotes/postnotes-code.pdf
+++ b/macros/latex/contrib/postnotes/postnotes-code.pdf
diff --git a/macros/latex/contrib/postnotes/postnotes-doc.pdf b/macros/latex/contrib/postnotes/postnotes-doc.pdf
index 7dccd503c1..10e85495fd 100644
--- a/macros/latex/contrib/postnotes/postnotes-doc.pdf
+++ b/macros/latex/contrib/postnotes/postnotes-doc.pdf
diff --git a/macros/latex/contrib/postnotes/postnotes-doc.tex b/macros/latex/contrib/postnotes/postnotes-doc.tex
index fda2323dcf..90269d0edc 100644
--- a/macros/latex/contrib/postnotes/postnotes-doc.tex
+++ b/macros/latex/contrib/postnotes/postnotes-doc.tex
@@ -573,8 +573,8 @@ is typeset.  For details on how to use these variables, see
 \DescribeOption{exp} %
 By default, \cs{postnotesection} stores its \meta{text} argument with ``no
 manipulation''.  The \opt{exp} option allows one to fully expand
-(\texttt{e}-type expansion) \meta{text} in place before storing it.  It is a
-boolean option, and the option given with no value is equivalent to
+(\cs{protected@edef} expansion) \meta{text} in place before storing it.  It is
+a boolean option, and the option given with no value is equivalent to
 \texttt{exp=true}.
 
 
@@ -1356,6 +1356,7 @@ provided by (in chronological order):
   % 2024-10-22: https://github.com/gusbrs/postnotes/issues/8#issuecomment-2429501962
   % 2024-10-25: https://chat.stackexchange.com/transcript/message/66510334#66510334 (discussion)
   % 2024-11-03: https://chat.stackexchange.com/transcript/message/66554870#66554870 (discussion)
+  % 2024-11-27: https://chat.stackexchange.com/transcript/message/66696438#66696438 (discussion)
   David Carlisle,
   % 2022-03-28: https://chat.stackexchange.com/transcript/message/60754383#60754383
   % 2022-04-08: https://tex.stackexchange.com/a/640035 (comments)
@@ -1364,6 +1365,7 @@ provided by (in chronological order):
   % 2023-12-12: https://chat.stackexchange.com/transcript/message/64848034#64848034 (and discussion)
   % 2024-01-28: https://chat.stackexchange.com/transcript/message/65071091#65071091 (discussion)
   % 2024-10-15: https://chat.stackexchange.com/transcript/message/66444011#66444011 (discussion)
+  % 2024-11-27: https://chat.stackexchange.com/transcript/message/66696438#66696438 (discussion)
   Moritz Wemheuer,
   % 2022-04-05: https://tex.stackexchange.com/q/597359#comment1594585_597389
   Joseph Wright,
diff --git a/macros/latex/contrib/postnotes/postnotes.dtx b/macros/latex/contrib/postnotes/postnotes.dtx
index ed80d0e1cd..b65bc3b062 100644
--- a/macros/latex/contrib/postnotes/postnotes.dtx
+++ b/macros/latex/contrib/postnotes/postnotes.dtx
@@ -153,7 +153,7 @@
 %
 %
 %    \begin{macrocode}
-\ProvidesExplPackage {postnotes} {2024-11-14} {0.4.1}
+\ProvidesExplPackage {postnotes} {2024-11-27} {0.4.2}
   {Endnotes for LaTeX}
 %    \end{macrocode}
 %
@@ -215,8 +215,8 @@
   {
     \prop_new:c { \@@_data_name:e {#1} }
     \prop_gput:cnn { \@@_data_name:e {#1} } { type } { note }
-    \prop_gput:cne { \@@_data_name:e {#1} } { mark }
-      { \l_@@_mark_tl }
+    \prop_gput:cnV { \@@_data_name:e {#1} } { mark }
+      \l_@@_mark_tl
     \prop_gput:cne { \@@_data_name:e {#1} } { counter }
       { \int_use:N \c@postnote }
     \prop_gput:cne { \@@_data_name:e {#1} } { sortnum }
@@ -227,18 +227,21 @@
       }
     \cs_if_exist:cT { chapter }
       {
-        \prop_gput:cne { \@@_data_name:e {#1} }
-          { thechapter } { \thechapter }
+        \protected@edef \l_@@_tmpa_tl { \thechapter }
+        \prop_gput:cnV { \@@_data_name:e {#1} }
+          { thechapter } \l_@@_tmpa_tl
       }
-    \prop_gput:cne { \@@_data_name:e {#1} } { thesection }
-      { \thesection }
-    \prop_gput:cne { \@@_data_name:e {#1} } { pnsectname }
-      { \g_@@_section_name_tl }
+    \protected@edef \l_@@_tmpa_tl { \thesection }
+    \prop_gput:cnV { \@@_data_name:e {#1} } { thesection }
+      \l_@@_tmpa_tl
+    \prop_gput:cnV { \@@_data_name:e {#1} } { pnsectname }
+      \g_@@_section_name_tl
     \prop_gput:cne { \@@_data_name:e {#1} } { pnsectid }
       { \int_use:N \g_@@_sectid_int }
     \prop_gput:cne { \@@_data_name:e {#1} } { multibool }
       { \bool_to_str:N \l_@@_maybe_multi_bool }
     \prop_gput:cnn { \@@_data_name:e {#1} } { content } {#2}
+    \tl_clear:N \l_@@_tmpa_tl
     \UseHook { postnotes/note/store }
   }
 %    \end{macrocode}
@@ -258,14 +261,17 @@
     \prop_gput:cnn { \@@_data_name:e {#1} } { type } { section }
     \cs_if_exist:cT { chapter }
       {
-        \prop_gput:cne { \@@_data_name:e {#1} }
-          { thechapter } { \thechapter }
+        \protected@edef \l_@@_tmpa_tl { \thechapter }
+        \prop_gput:cnV { \@@_data_name:e {#1} }
+          { thechapter } \l_@@_tmpa_tl
       }
-    \prop_gput:cne { \@@_data_name:e {#1} } { thesection }
-      { \thesection }
+    \protected@edef \l_@@_tmpa_tl { \thesection }
+    \prop_gput:cnV { \@@_data_name:e {#1} } { thesection }
+      \l_@@_tmpa_tl
     \prop_gput:cnn { \@@_data_name:e {#1} } { content } {#2}
+    \tl_clear:N \l_@@_tmpa_tl
   }
-\cs_generate_variant:Nn \@@_store_section:nn { ne }
+\cs_generate_variant:Nn \@@_store_section:nn { nV }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -416,6 +422,7 @@
 %     \@@_set_text_page_label:n ,
 %     \@@_set_print_page_label:n ,
 %     \@@_set_pre_print_label:n ,
+%     \c_@@_page_counter_tl ,
 %   }
 %   Label setting functions for each pertinent context.  They must use
 %   \cs{iow_shipout_e:Nn}, since the main information we are interested in is
@@ -434,10 +441,12 @@
   {
     \legacy_if:nT { @filesw }
       {
-        \iow_shipout_e:Nn \@auxout
+        \protected@write \@auxout
+          { \cs_set_eq:NN \c_@@_page_counter_tl \scan_stop: }
           { \token_to_str:N \post@note { #1 } { #2 } { #3 } { #4 } }
       }
   }
+\tl_const:Nn \c_@@_page_counter_tl { \int_use:N \c@page }
 \cs_new_protected:Npn \@@_set_mark_page_label:nn #1#2
   { \@@_set_label:nnnn { mark } { #1 } { \thepage } { #2 } }
 \cs_generate_variant:Nn \@@_set_mark_page_label:nn { ee }
@@ -445,10 +454,10 @@
   { \@@_set_label:nnnn { section } { #1 } { \thepage } { } }
 \cs_generate_variant:Nn \@@_set_section_page_label:n { e }
 \cs_new_protected:Npn \@@_set_text_page_label:n #1
-  { \@@_set_label:nnnn { text } { #1 } { \int_use:N \c@page } { } }
+  { \@@_set_label:nnnn { text } { #1 } { \c_@@_page_counter_tl } { } }
 \cs_generate_variant:Nn \@@_set_text_page_label:n { e }
 \cs_new_protected:Npn \@@_set_print_page_label:n #1
-  { \@@_set_label:nnnn { print } { #1 } { \int_use:N \c@page } { } }
+  { \@@_set_label:nnnn { print } { #1 } { \c_@@_page_counter_tl } { } }
 \cs_generate_variant:Nn \@@_set_print_page_label:n { e }
 \cs_new_protected:Npn \@@_set_pre_print_label:n #1
   { \@@_set_label:nnnn { preprint } { #1 } { } { } }
@@ -974,7 +983,7 @@
     \@bsphack
     \legacy_if:nT { @filesw }
       {
-        \iow_shipout_e:Nn \@auxout
+        \protected@write \@auxout { }
           { \token_to_str:N \postnote@setcounteraux { #1 } }
       }
     \@esphack
@@ -984,7 +993,7 @@
     \@bsphack
     \legacy_if:nT { @filesw }
       {
-        \iow_shipout_e:Nn \@auxout
+        \protected@write \@auxout { }
           { \token_to_str:N \postnote@addtocounteraux { #1 } }
       }
     \@esphack
@@ -1239,15 +1248,15 @@
                     { \int_set:Nn \c@postnote { \l_@@_tmpa_tl } }
                   \tl_clear:N \l_@@_tmpa_tl
                 }
-              \tl_set:Ne \l_@@_mark_tl { \thepostnote }
+              \protected@edef \l_@@_mark_tl { \thepostnote }
             }
             { \int_set:Nn \l_@@_counteraux_step_int { 0 } }
           \UseHook { postnotes/note/begin }
           \seq_gput_right:Ne \g_@@_queue_seq
             { \l_postnotes_note_id_tl }
-          \cs_set:Npn \@currentcounter { postnote }
-          \cs_set:Npe \@currentlabel { \p@postnote \l_@@_mark_tl }
-          \cs_gset:Npe \@currentHref
+          \tl_set:Nn \@currentcounter { postnote }
+          \protected@edef \@currentlabel { \p@postnote \l_@@_mark_tl }
+          \tl_gset:Ne \@currentHref
             { postnote. \l_postnotes_note_id_tl .mark }
           \@@_store:nn { \l_postnotes_note_id_tl } {#2}
           \tl_set_eq:NN \l_@@_mark_typeset_tl \l_@@_mark_tl
@@ -1373,14 +1382,15 @@
             \bool_if:NTF \l_@@_print_plain_mark_stepcounter_bool
               {
                 \stepcounter { postnote }
-                \tl_set:Ne \l_@@_mark_typeset_tl { \thepostnote }
+                \protected@edef \l_@@_mark_typeset_tl { \thepostnote }
               }
               {
                 \group_begin:
                   \int_incr:N \c@postnote
-                  \exp_args:NNNe
+                  \protected@edef \l_@@_tmpa_tl { \thepostnote }
+                  \exp_args:NNNV
                     \group_end:
-                    \tl_set:Nn \l_@@_mark_typeset_tl { \thepostnote }
+                    \tl_set:Nn \l_@@_mark_typeset_tl \l_@@_tmpa_tl
               }
 %    \end{macrocode}
 % If the note has a \opt{label}, use a cross-reference to that as the mark
@@ -1446,7 +1456,7 @@
           { postnotes@ \l_@@_note_label_str }
           { postnotes/mark }
           {
-            \tl_set:Ne #1
+            \protected@edef #1
               {
                 \property_ref:ee
                   { __postnotes_ \l_@@_note_label_str } { postnotes/mark }
@@ -1551,11 +1561,11 @@
 %     \cs{@@_note_ref:nn} \Arg{star bool} \Arg{label}
 %   \end{syntax}
 %    \begin{macrocode}
-\tl_new:N \l_@@_note_ref_label_tl
+\str_new:N \l_@@_note_ref_label_str
 \cs_new_protected:Npn \@@_note_ref:nn #1#2
   {
     \group_begin:
-      \tl_set:Nn \l_@@_note_ref_label_tl {#2}
+      \str_set:Nn \l_@@_note_ref_label_str {#2}
       \@@_typeset_mark_wrapper:nnn
         {
           \bool_lazy_and:nnTF
@@ -1609,7 +1619,11 @@
       \keys_set:nn { postnotes/section } {#1}
       \@@_set_section_page_label:e { \l_postnotes_note_id_tl }
       \bool_if:NTF \l_@@_section_exp_bool
-        { \@@_store_section:ne { \l_postnotes_note_id_tl } {#2} }
+        {
+          \protected@edef \l_@@_tmpa_tl {#2}
+          \@@_store_section:nV { \l_postnotes_note_id_tl }
+            \l_@@_tmpa_tl
+        }
         { \@@_store_section:nn { \l_postnotes_note_id_tl } {#2} }
     \group_end:
   }
@@ -1904,10 +1918,10 @@
                     \@@_prop_get:nnN
                       { \l_postnotes_print_note_id_tl }
                       { content } \l_@@_print_content_tl
-                    \cs_set:Npn \@currentcounter { postnotetext }
+                    \tl_set:Nn \@currentcounter { postnotetext }
                     \int_set:Nn \c@postnotetext
                       { \l_@@_print_counter_tl }
-                    \cs_set:Npe \@currentlabel
+                    \protected@edef \@currentlabel
                       { \p@postnote \l_@@_print_mark_tl }
                     \tl_set:Nn \l_@@_print_typeset_mark_tl
                       {
@@ -2540,35 +2554,41 @@
 %    \begin{macrocode}
                       \tl_if_empty:NF \l_@@_prev_text_page_tl
                         {
-                          \prop_gput:Nee \g_@@_header_page_last_prop
-                            { \l_@@_prev_text_page_tl }
-                            { \l_@@_prev_mark_page_tl }
-                          \prop_gput:Nee \g_@@_header_chap_last_prop
-                            { \l_@@_prev_text_page_tl }
-                            { \l_@@_prev_mark_chap_tl }
-                          \prop_gput:Nee \g_@@_header_sect_last_prop
-                            { \l_@@_prev_text_page_tl }
-                            { \l_@@_prev_mark_sect_tl }
-                          \prop_gput:Nee \g_@@_header_name_last_prop
-                            { \l_@@_prev_text_page_tl }
-                            { \l_@@_prev_mark_name_tl }
+                          \prop_gput:NVV \g_@@_header_page_last_prop
+                            \l_@@_prev_text_page_tl
+                            \l_@@_prev_mark_page_tl
+                          \prop_gput:NVV \g_@@_header_chap_last_prop
+                            \l_@@_prev_text_page_tl
+                            \l_@@_prev_mark_chap_tl
+                          \prop_gput:NVV \g_@@_header_sect_last_prop
+                            \l_@@_prev_text_page_tl
+                            \l_@@_prev_mark_sect_tl
+                          \prop_gput:NVV \g_@@_header_name_last_prop
+                            \l_@@_prev_text_page_tl
+                            \l_@@_prev_mark_name_tl
                         }
 %    \end{macrocode}
 %
 % Set `first' values for current page, based on the current note ID.
 %    \begin{macrocode}
-                      \prop_gput:Nee \g_@@_header_page_first_prop
-                        { \l_@@_curr_text_page_tl }
+                      \prop_gput:NVe \g_@@_header_page_first_prop
+                        \l_@@_curr_text_page_tl
                         { \@@_extract_pageref:n { mark@ ##1 } }
-                      \prop_gput:Nee \g_@@_header_chap_first_prop
-                        { \l_@@_curr_text_page_tl }
-                        { \@@_prop_item:nn {##1} { thechapter } }
-                      \prop_gput:Nee \g_@@_header_sect_first_prop
-                        { \l_@@_curr_text_page_tl }
-                        { \@@_prop_item:nn {##1} { thesection } }
-                      \prop_gput:Nee \g_@@_header_name_first_prop
-                        { \l_@@_curr_text_page_tl }
-                        { \@@_prop_item:nn {##1} { pnsectname } }
+                      \@@_prop_get:nnN {##1} { thechapter }
+                        \l_@@_tmpa_tl
+                      \prop_gput:NVV \g_@@_header_chap_first_prop
+                        \l_@@_curr_text_page_tl
+                        \l_@@_tmpa_tl
+                      \@@_prop_get:nnN {##1} { thesection }
+                        \l_@@_tmpa_tl
+                      \prop_gput:NVV \g_@@_header_sect_first_prop
+                        \l_@@_curr_text_page_tl
+                        \l_@@_tmpa_tl
+                      \@@_prop_get:nnN {##1} { pnsectname }
+                        \l_@@_tmpa_tl
+                      \prop_gput:NVV \g_@@_header_name_first_prop
+                        \l_@@_curr_text_page_tl
+                        \l_@@_tmpa_tl
 %    \end{macrocode}
 %
 % Store \texttt{prev_mark} data for the first note on the page.
@@ -2601,18 +2621,18 @@
 %    \begin{macrocode}
       \tl_if_empty:NF \l_@@_prev_text_page_tl
         {
-          \prop_gput:Nee \g_@@_header_page_last_prop
-            { \l_@@_prev_text_page_tl }
-            { \l_@@_prev_mark_page_tl }
-          \prop_gput:Nee \g_@@_header_chap_last_prop
-            { \l_@@_prev_text_page_tl }
-            { \l_@@_prev_mark_chap_tl }
-          \prop_gput:Nee \g_@@_header_sect_last_prop
-            { \l_@@_prev_text_page_tl }
-            { \l_@@_prev_mark_sect_tl }
-          \prop_gput:Nee \g_@@_header_name_last_prop
-            { \l_@@_prev_text_page_tl }
-            { \l_@@_prev_mark_name_tl }
+          \prop_gput:NVV \g_@@_header_page_last_prop
+            \l_@@_prev_text_page_tl
+            \l_@@_prev_mark_page_tl
+          \prop_gput:NVV \g_@@_header_chap_last_prop
+            \l_@@_prev_text_page_tl
+            \l_@@_prev_mark_chap_tl
+          \prop_gput:NVV \g_@@_header_sect_last_prop
+            \l_@@_prev_text_page_tl
+            \l_@@_prev_mark_sect_tl
+          \prop_gput:NVV \g_@@_header_name_last_prop
+            \l_@@_prev_text_page_tl
+            \l_@@_prev_mark_name_tl
         }
     \group_end:
   }
@@ -3066,11 +3086,11 @@
 %     \cs{@@_note_zref:nn} \Arg{star bool} \Arg{label}
 %   \end{syntax}
 %    \begin{macrocode}
-    \tl_new:N \l_@@_note_zref_zlabel_tl
+    \str_new:N \l_@@_note_zref_zlabel_str
     \cs_new_protected:Npn \@@_note_zref:nn #1#2
       {
         \group_begin:
-          \tl_set:Nn \l_@@_note_zref_zlabel_tl {#2}
+          \str_set:Nn \l_@@_note_zref_zlabel_str {#2}
           \@@_typeset_mark_wrapper:nnn
             {
               \bool_lazy_all:nTF
@@ -3830,7 +3850,7 @@
       {
         \tag_mc_end_push:
         \property_if_recorded:eeTF
-          { postnote@label@innote. \l_@@_note_ref_label_tl }
+          { postnote@label@innote. \l_@@_note_ref_label_str }
           { postnotes/tagsup@noteid }
           {
 %    \end{macrocode}
@@ -3839,7 +3859,7 @@
             \tl_set:Ne \l_@@_tmpa_tl
               {
                 \property_ref:ee
-                  { postnote@label@innote. \l_@@_note_ref_label_tl }
+                  { postnote@label@innote. \l_@@_note_ref_label_str }
                   { postnotes/tagsup@noteid }
               }
             \tag_struct_begin:n
@@ -3852,7 +3872,7 @@
           }
           {
             \property_if_recorded:eeTF
-              { postnote@label@option. \l_@@_note_ref_label_tl }
+              { postnote@label@option. \l_@@_note_ref_label_str }
               { postnotes/tagsup@noteid }
               {
 %    \end{macrocode}
@@ -3861,7 +3881,7 @@
                 \tl_set:Ne \l_@@_tmpa_tl
                   {
                     \property_ref:ee
-                      { postnote@label@option. \l_@@_note_ref_label_tl }
+                      { postnote@label@option. \l_@@_note_ref_label_str }
                       { postnotes/tagsup@noteid }
                   }
                 \tag_struct_begin:n
@@ -3892,7 +3912,7 @@
         \socket_new_plug:nnn { tagsupport/postnotes/postnotezref/begin } { default }
           {
             \tag_mc_end_push:
-            \zref@ifrefcontainsprop { \l_@@_note_zref_zlabel_tl }
+            \zref@ifrefcontainsprop { \l_@@_note_zref_zlabel_str }
               { postnotes@tagsup@noteid }
               {
 %    \end{macrocode}
@@ -3900,7 +3920,7 @@
 %    \begin{macrocode}
                 \tl_set:Ne \l_@@_tmpa_tl
                   {
-                    \zref@extract { \l_@@_note_zref_zlabel_tl }
+                    \zref@extract { \l_@@_note_zref_zlabel_str }
                       { postnotes@tagsup@noteid }
                   }
                 \tag_struct_begin:n
@@ -3913,7 +3933,7 @@
               }
               {
                 \property_if_recorded:eeTF
-                  { postnote@zlabel@option. \l_@@_note_zref_zlabel_tl }
+                  { postnote@zlabel@option. \l_@@_note_zref_zlabel_str }
                   { postnotes/tagsup@noteid }
                   {
 %    \end{macrocode}
@@ -3924,7 +3944,7 @@
                         \property_ref:ee
                           {
                             postnote@zlabel@option.
-                            \l_@@_note_zref_zlabel_tl
+                            \l_@@_note_zref_zlabel_str
                           }
                           { postnotes/tagsup@noteid }
                       }
diff --git a/macros/latex/contrib/zref-check/CHANGELOG.md b/macros/latex/contrib/zref-check/CHANGELOG.md
index 7bd621f7d2..ad71eee9d9 100644
--- a/macros/latex/contrib/zref-check/CHANGELOG.md
+++ b/macros/latex/contrib/zref-check/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 
-## [Unreleased](https://github.com/gusbrs/zref-check/compare/v0.3.6...HEAD)
+## [Unreleased](https://github.com/gusbrs/zref-check/compare/v0.3.7...HEAD)
+
+## [v0.3.7](https://github.com/gusbrs/zref-check/compare/v0.3.6...v0.3.7) (2024-11-28)
+
+### Fixed
+- Control expansion when extracting property at `\zrefcheck_get_astl:nnn`.
 
 ## [v0.3.6](https://github.com/gusbrs/zref-check/compare/v0.3.5...v0.3.6) (2024-11-07)
 
diff --git a/macros/latex/contrib/zref-check/zref-check-code.pdf b/macros/latex/contrib/zref-check/zref-check-code.pdf
index c6967810ed..1c91561004 100644
--- a/macros/latex/contrib/zref-check/zref-check-code.pdf
+++ b/macros/latex/contrib/zref-check/zref-check-code.pdf
diff --git a/macros/latex/contrib/zref-check/zref-check-doc.pdf b/macros/latex/contrib/zref-check/zref-check-doc.pdf
index f73c635212..7650ad91c6 100644
--- a/macros/latex/contrib/zref-check/zref-check-doc.pdf
+++ b/macros/latex/contrib/zref-check/zref-check-doc.pdf
diff --git a/macros/latex/contrib/zref-check/zref-check.dtx b/macros/latex/contrib/zref-check/zref-check.dtx
index fa9e098b82..78fe4c089e 100644
--- a/macros/latex/contrib/zref-check/zref-check.dtx
+++ b/macros/latex/contrib/zref-check/zref-check.dtx
@@ -88,7 +88,7 @@
 %
 % Identify the package.
 %    \begin{macrocode}
-\ProvidesExplPackage {zref-check} {2024-11-07} {0.3.6}
+\ProvidesExplPackage {zref-check} {2024-11-28} {0.3.7}
   {Flexible cross-references with contextual checks based on zref}
 %    \end{macrocode}
 %
@@ -803,7 +803,7 @@
               {
                 \zref@ifrefcontainsprop {#1} {#2}
                   {
-                    \tl_set:Ne #3
+                    \exp_args:NNNo \exp_args:NNo \tl_set:Nn #3
                       { \zref@extractdefault {#1} {#2} { \c_empty_tl } }
                   }
                   {
diff --git a/macros/latex/contrib/zref-clever/CHANGELOG.md b/macros/latex/contrib/zref-clever/CHANGELOG.md
index 189a3d7052..b31bbef4e3 100644
--- a/macros/latex/contrib/zref-clever/CHANGELOG.md
+++ b/macros/latex/contrib/zref-clever/CHANGELOG.md
@@ -1,6 +1,12 @@
 # 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@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)
 
diff --git a/macros/latex/contrib/zref-clever/DEPENDS.txt b/macros/latex/contrib/zref-clever/DEPENDS.txt
index 4b47b74955..f8f890cf6d 100644
--- a/macros/latex/contrib/zref-clever/DEPENDS.txt
+++ b/macros/latex/contrib/zref-clever/DEPENDS.txt
@@ -1,5 +1,4 @@
 hard zref
-hard l3packages
 hard oberdiek
 soft hyperref
 soft zref-check
diff --git a/macros/latex/contrib/zref-clever/zref-clever-code.pdf b/macros/latex/contrib/zref-clever/zref-clever-code.pdf
index bbadec4b54..b5590dc666 100644
--- a/macros/latex/contrib/zref-clever/zref-clever-code.pdf
+++ b/macros/latex/contrib/zref-clever/zref-clever-code.pdf
diff --git a/macros/latex/contrib/zref-clever/zref-clever-doc.pdf b/macros/latex/contrib/zref-clever/zref-clever-doc.pdf
index 0d690197ac..f99551f71d 100644
--- a/macros/latex/contrib/zref-clever/zref-clever-doc.pdf
+++ b/macros/latex/contrib/zref-clever/zref-clever-doc.pdf
diff --git a/macros/latex/contrib/zref-clever/zref-clever.dtx b/macros/latex/contrib/zref-clever/zref-clever.dtx
index 48969fe7ec..7badddc675 100644
--- a/macros/latex/contrib/zref-clever/zref-clever.dtx
+++ b/macros/latex/contrib/zref-clever/zref-clever.dtx
@@ -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@edef \l_@@_tmpa_tl
             {
               \@@_extract:nnn
                 {#1} { \l_@@_ref_property_tl } { }
             }
-          \tl_set:Ne \l_@@_tmpb_tl
+          \protected@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@edef \l_@@_tmpa_tl
             {
               \@@_extract:nnn
                 {#1} { \l_@@_ref_property_tl } { }
             }
-          \tl_set:Ne \l_@@_tmpb_tl
+          \protected@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@edef \l_@@_tmpa_tl
             {
               \@@_extract:nnn
                 {#1} { \l_@@_ref_property_tl } { }
             }
-          \tl_set:Ne \l_@@_tmpb_tl
+          \protected@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@cntval } { } }
+                  { \@@_extract:nnn {#1} { zc@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@cntval } { } }
+                      { \@@_extract:nnn {#2} { zc@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@AddToHook { Init }
-          { \@@_zcsetup:n { currentcounter = lstnumber } }
+        \cs_if_exist:NT \lst@AddToHook
+          {
+            \lst@AddToHook { Init }
+              { \@@_zcsetup:n { currentcounter = lstnumber } }
+          }
         \msg_info:nnn { zref-clever } { compat-package } { listings }
       }
   }
@@ -8356,8 +8359,11 @@
 %    \begin{macrocode}
         \zref@newprop { subref }
           { \cs_if_exist_use:c { thesub \@captype } }
-        \tl_put_right:Nn \caption@subtypehook
-          { \zref@localaddprop \ZREF@mainlist { subref } }
+        \tl_if_exist:NT \caption@subtypehook
+          {
+            \tl_put_right:Nn \caption@subtypehook
+              { \zref@localaddprop \ZREF@mainlist { subref } }
+          }
       }
   }
 %    \end{macrocode}