zref-clever (15mar24)

git-svn-id: svn://tug.org/texlive/trunk@70654 c570f23f-e606-0410-a88d-b1316a301751

15 files changed, 47 insertions, 70 deletions

diff --git a/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md b/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md
index c770811b3fc..89c3c1414c6 100644
--- a/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 
-## [Unreleased](https://github.com/gusbrs/zref-clever/compare/v0.4.3...HEAD)
+## [Unreleased](https://github.com/gusbrs/zref-clever/compare/v0.4.4...HEAD)
+
+## [v0.4.4](https://github.com/gusbrs/zref-clever/compare/v0.4.3...v0.4.4) (2024-03-14)
+
+### Changed
+- Use `\noeqref` instead of `mathtools`' internals to support `showonlyrefs`
+  option in `mathtools` compatibility module.
 
 ## [v0.4.3](https://github.com/gusbrs/zref-clever/compare/v0.4.2...v0.4.3) (2023-11-14)
 
diff --git a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf
index 41da795ac74..4dd6a24efcc 100644
--- a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf
+++ b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf
diff --git a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.tex b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.tex
index 5e5b84dd11f..8aebe70d6f0 100644
--- a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.tex
+++ b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.tex
@@ -4,7 +4,7 @@
 %
 % This file is part of the LaTeX package "zref-clever".
 %
-% Copyright (C) 2021-2023  gusbrs
+% Copyright (C) 2021-2024  gusbrs
 %
 % It may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf
index c0ea22459a7..9973f6d5465 100644
--- a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf
+++ b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex
index ca2baa37093..744732ade0a 100644
--- a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex
+++ b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex
@@ -2562,7 +2562,7 @@ of support for other packages were a valuable reference.  Hence, the
 accumulated experience of \pkg{cleveref} allowed for \pkg{zref-clever} to
 start on a more solid foundation than would otherwise be the case.
 
-The long term efforts of the \LaTeX3 \cs{Team} around \pkg{expl3} and
+The long term efforts of the \LaTeX{} Project Team around \pkg{expl3} and
 \pkg{xparse} have also left their marks in this package.  By implementing
 powerful tools and smoothing several regular programming tasks, they have
 certainly reduced my entry barrier to \LaTeX{} programming and enabled me to
@@ -2640,6 +2640,7 @@ were generously provided by (in chronological order):
   % 2023-02-18: https://github.com/gusbrs/zref-clever/pull/15
   % 2023-05-11: https://github.com/T-F-S/tcolorbox/issues/230
   % 2023-11-09: https://github.com/gusbrs/zref-clever/issues/20
+  % 2024-01-20: https://github.com/gusbrs/zref-clever/pull/25
   and Lars Madsen.
   % 2023-07-24: https://chat.stackexchange.com/transcript/message/64039717#64039717
   %             and following discussion.
diff --git a/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx b/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx
index 1a6e2ea44f3..5767e6ab4fe 100644
--- a/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx
+++ b/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx
@@ -4,7 +4,7 @@
 %
 % This file is part of the LaTeX package "zref-clever".
 %
-% Copyright (C) 2021-2023  gusbrs
+% Copyright (C) 2021-2024  gusbrs
 %
 % It may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -166,7 +166,7 @@
 %
 % Identify the package.
 %    \begin{macrocode}
-\ProvidesExplPackage {zref-clever} {2023-11-14} {0.4.3}
+\ProvidesExplPackage {zref-clever} {2024-03-14} {0.4.4}
   {Clever LaTeX cross-references based on zref}
 %    \end{macrocode}
 %
@@ -5231,7 +5231,7 @@
 %    \end{macrocode}
 % Integration with \pkg{mathtools}.
 %    \begin{macrocode}
-    \bool_if:NT \l_@@_mathtools_showonlyrefs_bool
+    \bool_if:NT \l_@@_mathtools_loaded_bool
       {
         \@@_mathtools_showonlyrefs:n
           { \l_@@_zcref_labels_seq }
@@ -8037,40 +8037,25 @@
 % it's worth it.
 %
 %    \begin{macrocode}
-\bool_new:N \l_@@_mathtools_showonlyrefs_bool
+\bool_new:N \l_@@_mathtools_loaded_bool
 \@@_compat_module:nn { mathtools }
   {
     \@@_if_package_loaded:nT { mathtools }
       {
-        \MH_if_boolean:nT { show_only_refs }
+        \bool_set_true:N \l_@@_mathtools_loaded_bool
+        \cs_new_protected:Npn \@@_mathtools_showonlyrefs:n #1
           {
-            \bool_set_true:N \l_@@_mathtools_showonlyrefs_bool
-            \cs_new_protected:Npn \@@_mathtools_showonlyrefs:n #1
+            \seq_map_inline:Nn #1
               {
-                \@bsphack
-                \seq_map_inline:Nn #1
-                  {
-                    \exp_args:Ne \tl_if_eq:nnTF
-                      { \@@_extract_unexp:nnn {##1} { zc@type } { } }
-                      { equation }
-                      {
-                        \protected@write \@auxout { }
-                          { \string \MT@newlabel {##1} }
-                      }
-                      {
-                        \exp_args:Ne \tl_if_eq:nnT
-                          { \@@_extract_unexp:nnn {##1} { zc@type } { } }
-                          { parentequation }
-                          {
-                            \protected@write \@auxout { }
-                              { \string \MT@newlabel {##1} }
-                          }
-                      }
-                  }
-                \@esphack
+                \tl_set:Ne \l_@@_tmpa_tl
+                  { \@@_extract_unexp:nnn {##1} { zc@type } { } }
+                \bool_lazy_or:nnT
+                  { \str_if_eq_p:Vn \l_@@_tmpa_tl { equation } }
+                  { \str_if_eq_p:Vn \l_@@_tmpa_tl { parentequation } }
+                  { \noeqref {##1} }
               }
-            \msg_info:nnn { zref-clever } { compat-package } { mathtools }
           }
+        \msg_info:nnn { zref-clever } { compat-package } { mathtools }
       }
   }
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/zref-clever/zref-clever.ins b/Master/texmf-dist/source/latex/zref-clever/zref-clever.ins
index cb81bd0cbff..17e4599190b 100644
--- a/Master/texmf-dist/source/latex/zref-clever/zref-clever.ins
+++ b/Master/texmf-dist/source/latex/zref-clever/zref-clever.ins
@@ -4,7 +4,7 @@
 %
 % This file is part of the LaTeX package "zref-clever".
 %
-% Copyright (C) 2021-2023  gusbrs
+% Copyright (C) 2021-2024  gusbrs
 %
 % It may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -49,7 +49,7 @@
 
 This file was generated from file(s) of the LaTeX package "zref-clever".
 
-Copyright (C) 2021-2023  gusbrs
+Copyright (C) 2021-2024  gusbrs
 
 It may be distributed and/or modified under the conditions of the
 LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-dutch.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-dutch.lang
index 3a119ee8bec..0a4f8513ed5 100644
--- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-dutch.lang
+++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-dutch.lang
@@ -8,7 +8,7 @@
 %% 
 %% This file was generated from file(s) of the LaTeX package "zref-clever".
 %% 
-%% Copyright (C) 2021-2023  gusbrs
+%% Copyright (C) 2021-2024  gusbrs
 %% 
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-english.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-english.lang
index f2c27039bb3..ae0c9d156cf 100644
--- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-english.lang
+++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-english.lang
@@ -8,7 +8,7 @@
 %% 
 %% This file was generated from file(s) of the LaTeX package "zref-clever".
 %% 
-%% Copyright (C) 2021-2023  gusbrs
+%% Copyright (C) 2021-2024  gusbrs
 %% 
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-french.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-french.lang
index 5b2bc08099e..4d03978756f 100644
--- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-french.lang
+++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-french.lang
@@ -8,7 +8,7 @@
 %% 
 %% This file was generated from file(s) of the LaTeX package "zref-clever".
 %% 
-%% Copyright (C) 2021-2023  gusbrs
+%% Copyright (C) 2021-2024  gusbrs
 %% 
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-german.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-german.lang
index e4f9581208b..c42c05da3d9 100644
--- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-german.lang
+++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-german.lang
@@ -8,7 +8,7 @@
 %% 
 %% This file was generated from file(s) of the LaTeX package "zref-clever".
 %% 
-%% Copyright (C) 2021-2023  gusbrs
+%% Copyright (C) 2021-2024  gusbrs
 %% 
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-italian.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-italian.lang
index 41bbf07feb3..a47eec0ed27 100644
--- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-italian.lang
+++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-italian.lang
@@ -8,7 +8,7 @@
 %% 
 %% This file was generated from file(s) of the LaTeX package "zref-clever".
 %% 
-%% Copyright (C) 2021-2023  gusbrs
+%% Copyright (C) 2021-2024  gusbrs
 %% 
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-portuguese.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-portuguese.lang
index dcc8724befb..96d5f856353 100644
--- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-portuguese.lang
+++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-portuguese.lang
@@ -8,7 +8,7 @@
 %% 
 %% This file was generated from file(s) of the LaTeX package "zref-clever".
 %% 
-%% Copyright (C) 2021-2023  gusbrs
+%% Copyright (C) 2021-2024  gusbrs
 %% 
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-spanish.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-spanish.lang
index 0c2d6462480..2c4c9304b96 100644
--- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-spanish.lang
+++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-spanish.lang
@@ -8,7 +8,7 @@
 %% 
 %% This file was generated from file(s) of the LaTeX package "zref-clever".
 %% 
-%% Copyright (C) 2021-2023  gusbrs
+%% Copyright (C) 2021-2024  gusbrs
 %% 
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty b/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty
index c0cc00db188..1e2c1619919 100644
--- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty
+++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty
@@ -8,7 +8,7 @@
 %% 
 %% This file was generated from file(s) of the LaTeX package "zref-clever".
 %% 
-%% Copyright (C) 2021-2023  gusbrs
+%% Copyright (C) 2021-2024  gusbrs
 %% 
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -52,7 +52,7 @@
         'zref-clever' requires a LaTeX kernel \zrefclever@required@kernel\space or newer.%
       }%
   }%
-\ProvidesExplPackage {zref-clever} {2023-11-14} {0.4.3}
+\ProvidesExplPackage {zref-clever} {2024-03-14} {0.4.4}
   {Clever LaTeX cross-references based on zref}
 \RequirePackage { zref-base }
 \RequirePackage { zref-user }
@@ -3506,7 +3506,7 @@
           \zrefcheck_zcref_run_checks_on_labels:n
             { \l__zrefclever_zcref_labels_seq }
         }
-    \bool_if:NT \l__zrefclever_mathtools_showonlyrefs_bool
+    \bool_if:NT \l__zrefclever_mathtools_loaded_bool
       {
         \__zrefclever_mathtools_showonlyrefs:n
           { \l__zrefclever_zcref_labels_seq }
@@ -5548,40 +5548,25 @@
         \msg_info:nnn { zref-clever } { compat-package } { amsmath }
       }
   }
-\bool_new:N \l__zrefclever_mathtools_showonlyrefs_bool
+\bool_new:N \l__zrefclever_mathtools_loaded_bool
 \__zrefclever_compat_module:nn { mathtools }
   {
     \__zrefclever_if_package_loaded:nT { mathtools }
       {
-        \MH_if_boolean:nT { show_only_refs }
+        \bool_set_true:N \l__zrefclever_mathtools_loaded_bool
+        \cs_new_protected:Npn \__zrefclever_mathtools_showonlyrefs:n #1
           {
-            \bool_set_true:N \l__zrefclever_mathtools_showonlyrefs_bool
-            \cs_new_protected:Npn \__zrefclever_mathtools_showonlyrefs:n #1
+            \seq_map_inline:Nn #1
               {
-                \@bsphack
-                \seq_map_inline:Nn #1
-                  {
-                    \exp_args:Ne \tl_if_eq:nnTF
-                      { \__zrefclever_extract_unexp:nnn {##1} { zc@type } { } }
-                      { equation }
-                      {
-                        \protected@write \@auxout { }
-                          { \string \MT@newlabel {##1} }
-                      }
-                      {
-                        \exp_args:Ne \tl_if_eq:nnT
-                          { \__zrefclever_extract_unexp:nnn {##1} { zc@type } { } }
-                          { parentequation }
-                          {
-                            \protected@write \@auxout { }
-                              { \string \MT@newlabel {##1} }
-                          }
-                      }
-                  }
-                \@esphack
+                \tl_set:Ne \l__zrefclever_tmpa_tl
+                  { \__zrefclever_extract_unexp:nnn {##1} { zc@type } { } }
+                \bool_lazy_or:nnT
+                  { \str_if_eq_p:Vn \l__zrefclever_tmpa_tl { equation } }
+                  { \str_if_eq_p:Vn \l__zrefclever_tmpa_tl { parentequation } }
+                  { \noeqref {##1} }
               }
-            \msg_info:nnn { zref-clever } { compat-package } { mathtools }
           }
+        \msg_info:nnn { zref-clever } { compat-package } { mathtools }
       }
   }
 \__zrefclever_compat_module:nn { breqn }