zref-vario (12feb22)

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

5 files changed, 39 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/zref-vario/CHANGELOG.md b/Master/texmf-dist/doc/latex/zref-vario/CHANGELOG.md
index 256cf2d24ab..512c7e6c4ea 100644
--- a/Master/texmf-dist/doc/latex/zref-vario/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/zref-vario/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 
-## [Unreleased](https://github.com/gusbrs/zref-vario/compare/v0.1.2-alpha...HEAD)
+## [Unreleased](https://github.com/gusbrs/zref-vario/compare/v0.1.3-alpha...HEAD)
+
+## [v0.1.3-alpha](https://github.com/gusbrs/zref-vario/compare/v0.1.2-alpha...v0.1.3-alpha) (2022-02-11)
+
+### Changed
+- (Internal) Option variables setting was reviewed, ensuring proper scope is
+  in use and that they are always properly declared.  `expl3` debugging
+  enabled in regression tests.
 
 ## [v0.1.2-alpha](https://github.com/gusbrs/zref-vario/compare/v0.1.1-alpha...v0.1.2-alpha) (2022-02-08)
 
diff --git a/Master/texmf-dist/doc/latex/zref-vario/zref-vario-code.pdf b/Master/texmf-dist/doc/latex/zref-vario/zref-vario-code.pdf
index 64dcae01659..fe8c46ac958 100644
--- a/Master/texmf-dist/doc/latex/zref-vario/zref-vario-code.pdf
+++ b/Master/texmf-dist/doc/latex/zref-vario/zref-vario-code.pdf
diff --git a/Master/texmf-dist/doc/latex/zref-vario/zref-vario.pdf b/Master/texmf-dist/doc/latex/zref-vario/zref-vario.pdf
index df3d54ed309..c0f262ac852 100644
--- a/Master/texmf-dist/doc/latex/zref-vario/zref-vario.pdf
+++ b/Master/texmf-dist/doc/latex/zref-vario/zref-vario.pdf
diff --git a/Master/texmf-dist/source/latex/zref-vario/zref-vario.dtx b/Master/texmf-dist/source/latex/zref-vario/zref-vario.dtx
index 17c01eed424..2c0aa781926 100644
--- a/Master/texmf-dist/source/latex/zref-vario/zref-vario.dtx
+++ b/Master/texmf-dist/source/latex/zref-vario/zref-vario.dtx
@@ -128,7 +128,7 @@
 %
 % Identify the package.
 %    \begin{macrocode}
-\ProvidesExplPackage {zref-vario} {2022-02-08} {0.1.2-alpha}
+\ProvidesExplPackage {zref-vario} {2022-02-11} {0.1.3-alpha}
   {Extended LaTeX page cross-references with varioref and zref-clever}
 %    \end{macrocode}
 %
@@ -342,11 +342,21 @@
 %
 %
 %    \begin{macrocode}
+\cs_new_protected:Npn \@@_opt_tl_gset:Nn #1#2
+  {
+    \tl_if_exist:NF #1
+      { \tl_new:N #1 }
+    \tl_gset:Nn #1 {#2}
+  }
+\cs_generate_variant:Nn \@@_opt_tl_gset:Nn { cn }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \keys_define:nn { zref-vario/langsetup }
   {
     reftextfaceafter .code:n =
       {
-        \tl_gset:cn
+        \@@_opt_tl_gset:cn
           {
             \@@_ref_opt_name_lang_tl:en
               { \l_@@_setup_language_tl }
@@ -355,7 +365,7 @@
       } ,
     reftextfacebefore .code:n =
       {
-        \tl_gset:cn
+        \@@_opt_tl_gset:cn
           {
             \@@_ref_opt_name_lang_tl:en
               { \l_@@_setup_language_tl }
@@ -364,7 +374,7 @@
       } ,
     reftextafter .code:n =
       {
-        \tl_gset:cn
+        \@@_opt_tl_gset:cn
           {
             \@@_ref_opt_name_lang_tl:en
               { \l_@@_setup_language_tl }
@@ -373,7 +383,7 @@
       } ,
     reftextbefore .code:n =
       {
-        \tl_gset:cn
+        \@@_opt_tl_gset:cn
           {
             \@@_ref_opt_name_lang_tl:en
               { \l_@@_setup_language_tl }
@@ -382,7 +392,7 @@
       } ,
     reftextcurrent .code:n =
       {
-        \tl_gset:cn
+        \@@_opt_tl_gset:cn
           {
             \@@_ref_opt_name_lang_tl:en
               { \l_@@_setup_language_tl }
@@ -603,7 +613,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_vref_pagenum:Nn #1#2
   {
-    \exp_args:NNNo \exp_args:NNo \tl_set:Nn #1
+    \exp_args:NNNo \exp_args:NNo \def #1
       { \zref@extractdefault {#2} { page } { ?? } }
   }
 \cs_new_protected:Npn \@@_vrefpagenum:Nn #1#2
diff --git a/Master/texmf-dist/tex/latex/zref-vario/zref-vario.sty b/Master/texmf-dist/tex/latex/zref-vario/zref-vario.sty
index 65aa65d4cf7..c389ffd9c65 100644
--- a/Master/texmf-dist/tex/latex/zref-vario/zref-vario.sty
+++ b/Master/texmf-dist/tex/latex/zref-vario/zref-vario.sty
@@ -42,7 +42,7 @@
 %% 
 %% -----------------------------------------------------------------------
 %% 
-\ProvidesExplPackage {zref-vario} {2022-02-08} {0.1.2-alpha}
+\ProvidesExplPackage {zref-vario} {2022-02-11} {0.1.3-alpha}
   {Extended LaTeX page cross-references with varioref and zref-clever}
 \AddToHook { begindocument/before }
   {
@@ -156,11 +156,18 @@
     The~language~must~be~declared~for~'zref-clever',~see~its~documentation.
   }
 \@onlypreamble \zvLanguageSetup
+\cs_new_protected:Npn \__zrefvario_opt_tl_gset:Nn #1#2
+  {
+    \tl_if_exist:NF #1
+      { \tl_new:N #1 }
+    \tl_gset:Nn #1 {#2}
+  }
+\cs_generate_variant:Nn \__zrefvario_opt_tl_gset:Nn { cn }
 \keys_define:nn { zref-vario/langsetup }
   {
     reftextfaceafter .code:n =
       {
-        \tl_gset:cn
+        \__zrefvario_opt_tl_gset:cn
           {
             \__zrefvario_ref_opt_name_lang_tl:en
               { \l__zrefvario_setup_language_tl }
@@ -169,7 +176,7 @@
       } ,
     reftextfacebefore .code:n =
       {
-        \tl_gset:cn
+        \__zrefvario_opt_tl_gset:cn
           {
             \__zrefvario_ref_opt_name_lang_tl:en
               { \l__zrefvario_setup_language_tl }
@@ -178,7 +185,7 @@
       } ,
     reftextafter .code:n =
       {
-        \tl_gset:cn
+        \__zrefvario_opt_tl_gset:cn
           {
             \__zrefvario_ref_opt_name_lang_tl:en
               { \l__zrefvario_setup_language_tl }
@@ -187,7 +194,7 @@
       } ,
     reftextbefore .code:n =
       {
-        \tl_gset:cn
+        \__zrefvario_opt_tl_gset:cn
           {
             \__zrefvario_ref_opt_name_lang_tl:en
               { \l__zrefvario_setup_language_tl }
@@ -196,7 +203,7 @@
       } ,
     reftextcurrent .code:n =
       {
-        \tl_gset:cn
+        \__zrefvario_opt_tl_gset:cn
           {
             \__zrefvario_ref_opt_name_lang_tl:en
               { \l__zrefvario_setup_language_tl }
@@ -378,7 +385,7 @@
   }
 \cs_new_protected:Npn \__zrefvario_vref_pagenum:Nn #1#2
   {
-    \exp_args:NNNo \exp_args:NNo \tl_set:Nn #1
+    \exp_args:NNNo \exp_args:NNo \def #1
       { \zref@extractdefault {#2} { page } { ?? } }
   }
 \cs_new_protected:Npn \__zrefvario_vrefpagenum:Nn #1#2