texlive[61845] Master/texmf-dist: zref-vario (1feb22)
commits+karl at tug.org
commits+karl at tug.org
Tue Feb 1 23:10:41 CET 2022
Revision: 61845
http://tug.org/svn/texlive?view=revision&revision=61845
Author: karl
Date: 2022-02-01 23:10:41 +0100 (Tue, 01 Feb 2022)
Log Message:
-----------
zref-vario (1feb22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/zref-vario/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/zref-vario/zref-vario-code.pdf
trunk/Master/texmf-dist/doc/latex/zref-vario/zref-vario.pdf
trunk/Master/texmf-dist/doc/latex/zref-vario/zref-vario.tex
trunk/Master/texmf-dist/source/latex/zref-vario/zref-vario.dtx
trunk/Master/texmf-dist/tex/latex/zref-vario/zref-vario.sty
Modified: trunk/Master/texmf-dist/doc/latex/zref-vario/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/zref-vario/CHANGELOG.md 2022-02-01 22:10:26 UTC (rev 61844)
+++ trunk/Master/texmf-dist/doc/latex/zref-vario/CHANGELOG.md 2022-02-01 22:10:41 UTC (rev 61845)
@@ -1,7 +1,12 @@
# Changelog
-## [Unreleased]
+## [Unreleased](https://github.com/gusbrs/zref-vario/compare/v0.1.1-alpha...HEAD)
+## [v0.1.1-alpha](https://github.com/gusbrs/zref-vario/compare/v0.1.0-alpha...v0.1.1-alpha) (2022-02-01)
+
+### Changed
+- Improved loading setup of required packages.
+
## [v0.1.0-alpha](https://github.com/gusbrs/zref-vario/releases/tag/v0.1.0-alpha) (2022-01-31)
### Added
Modified: trunk/Master/texmf-dist/doc/latex/zref-vario/zref-vario-code.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/zref-vario/zref-vario.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/zref-vario/zref-vario.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/zref-vario/zref-vario.tex 2022-02-01 22:10:26 UTC (rev 61844)
+++ trunk/Master/texmf-dist/doc/latex/zref-vario/zref-vario.tex 2022-02-01 22:10:41 UTC (rev 61845)
@@ -111,10 +111,10 @@
\begin{quotation}
\pkg{zref-vario} offers a compatibility layer for \pkg{varioref} to be used
- alongside \pkg{zref-clever}. It provides ``\texttt{\cs{z}}\dots{}''
- counterparts to \pkg{varioref}'s main reference commands, each of which
- essentially does some (scoped) setup for \pkg{varioref}, then calls the
- original one.
+ alongside \pkg{zref-clever}. It provides
+ ``\texttt{\textbackslash{}z}\dots{}'' counterparts to \pkg{varioref}'s main
+ reference commands, each of which essentially does some (scoped) setup for
+ \pkg{varioref}, then calls the original one.
\end{quotation}
\bigskip{}
@@ -135,7 +135,13 @@
\usepackage{zref-vario}
\end{zvexample}
+\pkg{zref-vario} will load \pkg{varioref} and \pkg{zref-clever} at
+\texttt{begindocument/before}, if they have not already been loaded. However,
+considering \pkg{varioref} has known load order interaction with other
+packages, prominently with \pkg{hyperref}, you may wish to load it explicitly
+to ensure its load order requirements are met.
+
\section{Dependencies}
\pkg{zref-vario} requires \pkg{varioref} and \pkg{zref-clever}.
@@ -210,7 +216,6 @@
\section{Customization}
-
\begin{function}{\zvLanguageSetup}
\begin{syntax}
\cs{zvLanguageSetup}\marg{language}\marg{options}
@@ -235,7 +240,15 @@
But, if you need to adjust them, the default values can be overridden by
setting the corresponding options in \cs{zvLanguageSetup}.
+As far as \pkg{zref-vario} is concerned, \pkg{varioref}'s options are (mostly)
+not taken into account: the language options are disregarded (settings made
+with \cs{zvLanguageSetup} are used instead), the \opt{nospace} option is
+hard-coded (locally) for the ``\texttt{\textbackslash{}z}\dots{}'' commands,
+and \opt{draft} and \opt{final} are typically given to \cs{documentclass},
+though they do affect \pkg{zref-vario}'s commands, just as they do with
+\pkg{varioref}'s.
+
% \section{Acknowledgments}
%
% A number of people have contributed to \pkg{zref-vario}. Suggestions,
Modified: trunk/Master/texmf-dist/source/latex/zref-vario/zref-vario.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/zref-vario/zref-vario.dtx 2022-02-01 22:10:26 UTC (rev 61844)
+++ trunk/Master/texmf-dist/source/latex/zref-vario/zref-vario.dtx 2022-02-01 22:10:41 UTC (rev 61845)
@@ -128,7 +128,7 @@
%
% Identify the package.
% \begin{macrocode}
-\ProvidesExplPackage {zref-vario} {2022-01-31} {0.1.0-alpha}
+\ProvidesExplPackage {zref-vario} {2022-02-01} {0.1.1-alpha}
{Extended LaTeX page cross-references with varioref and zref-clever}
% \end{macrocode}
%
@@ -136,8 +136,11 @@
% Required packages.
%
% \begin{macrocode}
-\RequirePackage { varioref }
-\RequirePackage { zref-clever } [ 2022-01-28 ] % v0.2.0-alpha
+\AddToHook { begindocument/before }
+ {
+ \RequirePackage { varioref }
+ \RequirePackage { zref-clever } [ 2022-01-28 ] % v0.2.0-alpha
+ }
% \end{macrocode}
%
%
@@ -314,16 +317,19 @@
\seq_new:N \g_@@_setup_languages_seq
\NewDocumentCommand \zvLanguageSetup { m m }
{
- \group_begin:
- \zrefclever_language_if_declared:nTF {#1}
+ \AddToHook { begindocument/before }
{
- \tl_set:Nn \l_@@_setup_language_tl {#1}
- \keys_set:nn { zref-vario/langsetup } {#2}
- \seq_gput_right:Nx \g_@@_setup_languages_seq
- { \@@_base_lang:n {#1} }
+ \group_begin:
+ \zrefclever_language_if_declared:nTF {#1}
+ {
+ \tl_set:Nn \l_@@_setup_language_tl {#1}
+ \keys_set:nn { zref-vario/langsetup } {#2}
+ \seq_gput_right:Nx \g_@@_setup_languages_seq
+ { \@@_base_lang:n {#1} }
+ }
+ { \msg_warning:nnn { zref-vario } { unknown-language-setup } {#1} }
+ \group_end:
}
- { \msg_warning:nnn { zref-vario } { unknown-language-setup } {#1} }
- \group_end:
}
\msg_new:nnn { zref-vario } { unknown-language-setup }
{
@@ -498,56 +504,59 @@
% \begin{macrocode}
\group_begin:
\tl_set:Nn \l_@@_setup_language_tl { zv_unknown_language }
-\keys_set:nn { zref-vario/langsetup }
+\AddToHook { begindocument/before }
{
- reftextfaceafter =
+ \keys_set:nn { zref-vario/langsetup }
{
- \msg_warning:nnxx { zref-vario } { missing-string }
- { reftextfaceafter } { \l_@@_ref_language_tl }
- \zref at default
- } ,
- reftextfacebefore =
- {
- \msg_warning:nnxx { zref-vario } { missing-string }
- { reftextfacebefore } { \l_@@_ref_language_tl }
- \zref at default
- } ,
- reftextafter =
- {
- \msg_warning:nnxx { zref-vario } { missing-string }
- { reftextafter } { \l_@@_ref_language_tl }
- \zref at default
- } ,
- reftextbefore =
- {
- \msg_warning:nnxx { zref-vario } { missing-string }
- { reftextbefore } { \l_@@_ref_language_tl }
- \zref at default
- } ,
- reftextcurrent =
- {
- \msg_warning:nnxx { zref-vario } { missing-string }
- { reftextcurrent } { \l_@@_ref_language_tl }
- \zref at default
- } ,
- reftextfaraway =
- {
- \msg_warning:nnxx { zref-vario } { missing-string }
- { reftextfaraway } { \l_@@_ref_language_tl }
- \zref at default
- } ,
- reftextpagerange =
- {
- \msg_warning:nnxx { zref-vario } { missing-string }
- { reftextpagerange } { \l_@@_ref_language_tl }
- \zref at default
- } ,
- reftextlabelrange =
- {
- \msg_warning:nnxx { zref-vario } { missing-string }
- { reftextlabelrange } { \l_@@_ref_language_tl }
- \zref at default
- } ,
+ reftextfaceafter =
+ {
+ \msg_warning:nnxx { zref-vario } { missing-string }
+ { reftextfaceafter } { \l_@@_ref_language_tl }
+ \zref at default
+ } ,
+ reftextfacebefore =
+ {
+ \msg_warning:nnxx { zref-vario } { missing-string }
+ { reftextfacebefore } { \l_@@_ref_language_tl }
+ \zref at default
+ } ,
+ reftextafter =
+ {
+ \msg_warning:nnxx { zref-vario } { missing-string }
+ { reftextafter } { \l_@@_ref_language_tl }
+ \zref at default
+ } ,
+ reftextbefore =
+ {
+ \msg_warning:nnxx { zref-vario } { missing-string }
+ { reftextbefore } { \l_@@_ref_language_tl }
+ \zref at default
+ } ,
+ reftextcurrent =
+ {
+ \msg_warning:nnxx { zref-vario } { missing-string }
+ { reftextcurrent } { \l_@@_ref_language_tl }
+ \zref at default
+ } ,
+ reftextfaraway =
+ {
+ \msg_warning:nnxx { zref-vario } { missing-string }
+ { reftextfaraway } { \l_@@_ref_language_tl }
+ \zref at default
+ } ,
+ reftextpagerange =
+ {
+ \msg_warning:nnxx { zref-vario } { missing-string }
+ { reftextpagerange } { \l_@@_ref_language_tl }
+ \zref at default
+ } ,
+ reftextlabelrange =
+ {
+ \msg_warning:nnxx { zref-vario } { missing-string }
+ { reftextlabelrange } { \l_@@_ref_language_tl }
+ \zref at default
+ } ,
+ }
}
\group_end:
\msg_new:nnn { zref-vario } { missing-string }
@@ -558,13 +567,16 @@
% A general initial warning in case the language is altogether not set up.
%
% \begin{macrocode}
-\AddToHook { begindocument }
+\AddToHook { begindocument/before }
{
- \seq_if_in:NxF \g_@@_setup_languages_seq
- { \@@_base_lang:e { \l_@@_ref_language_tl } }
+ \AddToHook { begindocument }
{
- \msg_warning:nnx { zref-vario } { language-not-setup }
- { \l_@@_ref_language_tl }
+ \seq_if_in:NxF \g_@@_setup_languages_seq
+ { \@@_base_lang:e { \l_@@_ref_language_tl } }
+ {
+ \msg_warning:nnx { zref-vario } { language-not-setup }
+ { \l_@@_ref_language_tl }
+ }
}
}
\msg_new:nnn { zref-vario } { language-not-setup }
Modified: trunk/Master/texmf-dist/tex/latex/zref-vario/zref-vario.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/zref-vario/zref-vario.sty 2022-02-01 22:10:26 UTC (rev 61844)
+++ trunk/Master/texmf-dist/tex/latex/zref-vario/zref-vario.sty 2022-02-01 22:10:41 UTC (rev 61845)
@@ -42,10 +42,13 @@
%%
%% -----------------------------------------------------------------------
%%
-\ProvidesExplPackage {zref-vario} {2022-01-31} {0.1.0-alpha}
+\ProvidesExplPackage {zref-vario} {2022-02-01} {0.1.1-alpha}
{Extended LaTeX page cross-references with varioref and zref-clever}
-\RequirePackage { varioref }
-\RequirePackage { zref-clever } [ 2022-01-28 ] % v0.2.0-alpha
+\AddToHook { begindocument/before }
+ {
+ \RequirePackage { varioref }
+ \RequirePackage { zref-clever } [ 2022-01-28 ] % v0.2.0-alpha
+ }
\cs_new:Npn \__zrefvario_ref_opt_default_cs:nn #1#2
{ __zrefvario_ref_opt_default_ #1 : #2 }
\cs_new:Npn \__zrefvario_base_lang:n #1
@@ -133,16 +136,19 @@
\seq_new:N \g__zrefvario_setup_languages_seq
\NewDocumentCommand \zvLanguageSetup { m m }
{
- \group_begin:
- \zrefclever_language_if_declared:nTF {#1}
+ \AddToHook { begindocument/before }
{
- \tl_set:Nn \l__zrefvario_setup_language_tl {#1}
- \keys_set:nn { zref-vario/langsetup } {#2}
- \seq_gput_right:Nx \g__zrefvario_setup_languages_seq
- { \__zrefvario_base_lang:n {#1} }
+ \group_begin:
+ \zrefclever_language_if_declared:nTF {#1}
+ {
+ \tl_set:Nn \l__zrefvario_setup_language_tl {#1}
+ \keys_set:nn { zref-vario/langsetup } {#2}
+ \seq_gput_right:Nx \g__zrefvario_setup_languages_seq
+ { \__zrefvario_base_lang:n {#1} }
+ }
+ { \msg_warning:nnn { zref-vario } { unknown-language-setup } {#1} }
+ \group_end:
}
- { \msg_warning:nnn { zref-vario } { unknown-language-setup } {#1} }
- \group_end:
}
\msg_new:nnn { zref-vario } { unknown-language-setup }
{
@@ -296,67 +302,73 @@
}
\group_begin:
\tl_set:Nn \l__zrefvario_setup_language_tl { zv_unknown_language }
-\keys_set:nn { zref-vario/langsetup }
+\AddToHook { begindocument/before }
{
- reftextfaceafter =
+ \keys_set:nn { zref-vario/langsetup }
{
- \msg_warning:nnxx { zref-vario } { missing-string }
- { reftextfaceafter } { \l__zrefvario_ref_language_tl }
- \zref at default
- } ,
- reftextfacebefore =
- {
- \msg_warning:nnxx { zref-vario } { missing-string }
- { reftextfacebefore } { \l__zrefvario_ref_language_tl }
- \zref at default
- } ,
- reftextafter =
- {
- \msg_warning:nnxx { zref-vario } { missing-string }
- { reftextafter } { \l__zrefvario_ref_language_tl }
- \zref at default
- } ,
- reftextbefore =
- {
- \msg_warning:nnxx { zref-vario } { missing-string }
- { reftextbefore } { \l__zrefvario_ref_language_tl }
- \zref at default
- } ,
- reftextcurrent =
- {
- \msg_warning:nnxx { zref-vario } { missing-string }
- { reftextcurrent } { \l__zrefvario_ref_language_tl }
- \zref at default
- } ,
- reftextfaraway =
- {
- \msg_warning:nnxx { zref-vario } { missing-string }
- { reftextfaraway } { \l__zrefvario_ref_language_tl }
- \zref at default
- } ,
- reftextpagerange =
- {
- \msg_warning:nnxx { zref-vario } { missing-string }
- { reftextpagerange } { \l__zrefvario_ref_language_tl }
- \zref at default
- } ,
- reftextlabelrange =
- {
- \msg_warning:nnxx { zref-vario } { missing-string }
- { reftextlabelrange } { \l__zrefvario_ref_language_tl }
- \zref at default
- } ,
+ reftextfaceafter =
+ {
+ \msg_warning:nnxx { zref-vario } { missing-string }
+ { reftextfaceafter } { \l__zrefvario_ref_language_tl }
+ \zref at default
+ } ,
+ reftextfacebefore =
+ {
+ \msg_warning:nnxx { zref-vario } { missing-string }
+ { reftextfacebefore } { \l__zrefvario_ref_language_tl }
+ \zref at default
+ } ,
+ reftextafter =
+ {
+ \msg_warning:nnxx { zref-vario } { missing-string }
+ { reftextafter } { \l__zrefvario_ref_language_tl }
+ \zref at default
+ } ,
+ reftextbefore =
+ {
+ \msg_warning:nnxx { zref-vario } { missing-string }
+ { reftextbefore } { \l__zrefvario_ref_language_tl }
+ \zref at default
+ } ,
+ reftextcurrent =
+ {
+ \msg_warning:nnxx { zref-vario } { missing-string }
+ { reftextcurrent } { \l__zrefvario_ref_language_tl }
+ \zref at default
+ } ,
+ reftextfaraway =
+ {
+ \msg_warning:nnxx { zref-vario } { missing-string }
+ { reftextfaraway } { \l__zrefvario_ref_language_tl }
+ \zref at default
+ } ,
+ reftextpagerange =
+ {
+ \msg_warning:nnxx { zref-vario } { missing-string }
+ { reftextpagerange } { \l__zrefvario_ref_language_tl }
+ \zref at default
+ } ,
+ reftextlabelrange =
+ {
+ \msg_warning:nnxx { zref-vario } { missing-string }
+ { reftextlabelrange } { \l__zrefvario_ref_language_tl }
+ \zref at default
+ } ,
+ }
}
\group_end:
\msg_new:nnn { zref-vario } { missing-string }
{ Missing~'#1'~string~for~language~'#2'~\msg_line_context:. }
-\AddToHook { begindocument }
+\AddToHook { begindocument/before }
{
- \seq_if_in:NxF \g__zrefvario_setup_languages_seq
- { \__zrefvario_base_lang:e { \l__zrefvario_ref_language_tl } }
+ \AddToHook { begindocument }
{
- \msg_warning:nnx { zref-vario } { language-not-setup }
- { \l__zrefvario_ref_language_tl }
+ \seq_if_in:NxF \g__zrefvario_setup_languages_seq
+ { \__zrefvario_base_lang:e { \l__zrefvario_ref_language_tl } }
+ {
+ \msg_warning:nnx { zref-vario } { language-not-setup }
+ { \l__zrefvario_ref_language_tl }
+ }
}
}
\msg_new:nnn { zref-vario } { language-not-setup }
More information about the tex-live-commits
mailing list.