From 5e8e53b2bacdcff45386e7b106065cad6300e962 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 7 Dec 2021 21:25:45 +0000 Subject: zref-check (7dec21) git-svn-id: svn://tug.org/texlive/trunk@61245 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/zref-check/CHANGELOG.md | 11 +- Master/texmf-dist/doc/latex/zref-check/MANIFEST.md | 286 +++++++++++++++++++++ .../doc/latex/zref-check/zref-check-code.pdf | Bin 739197 -> 739711 bytes .../doc/latex/zref-check/zref-check-code.tex | 6 +- .../texmf-dist/doc/latex/zref-check/zref-check.pdf | Bin 457730 -> 456786 bytes .../texmf-dist/doc/latex/zref-check/zref-check.tex | 6 +- .../source/latex/zref-check/zref-check.dtx | 119 +++++---- .../source/latex/zref-check/zref-check.ins | 8 +- .../texmf-dist/tex/latex/zref-check/zref-check.sty | 52 +++- 9 files changed, 417 insertions(+), 71 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/zref-check/MANIFEST.md (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/zref-check/CHANGELOG.md b/Master/texmf-dist/doc/latex/zref-check/CHANGELOG.md index 7ce9594a633..ba18c24d599 100644 --- a/Master/texmf-dist/doc/latex/zref-check/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/zref-check/CHANGELOG.md @@ -1,6 +1,15 @@ # Changelog -## [Unreleased](https://github.com/gusbrs/zref-check/compare/v0.2.1...HEAD) +## [Unreleased](https://github.com/gusbrs/zref-check/compare/v0.2.2...HEAD) + +## [v0.2.2](https://github.com/gusbrs/zref-check/compare/v0.2.1...v0.2.2) (2021-12-07) + +### Changed +- Option values `msglevel=obeydraft`, `msglevel=obeyfinal`, + `onpage=obeydraft`, and `onpage=obeyfinal` have been respectively renamed to + `msglevel=infoifdraft`, `msglevel=warniffinal`, `onpage=labelseqifdraft`, + and `onpage=msgiffinal`. Previous values have been deprecated. +- Spare setting end label for `\zctarget` with empty text argument. ## [v0.2.1](https://github.com/gusbrs/zref-check/compare/v0.2.0...v0.2.1) (2021-09-16) diff --git a/Master/texmf-dist/doc/latex/zref-check/MANIFEST.md b/Master/texmf-dist/doc/latex/zref-check/MANIFEST.md new file mode 100644 index 00000000000..3da3e909109 --- /dev/null +++ b/Master/texmf-dist/doc/latex/zref-check/MANIFEST.md @@ -0,0 +1,286 @@ +# Manifest for zref-check + +This file is a listing of all files considered to be part of this package. +It is automatically generated with `l3build manifest`. + + +## Repository manifest + +The following groups list the files included in the development repository of the package. +Files listed with a ‘†’ marker are included in the TDS but not CTAN files, and files listed +with ‘‡’ are included in both. + +### Source files + +These are source files for a number of purposes, including the `unpack` process which +generates the installation files of the package. Additional files included here will also +be installed for processing such as testing. + +* zref-check.dtx ‡ +* zref-check.ins ‡ + +### Typeset documentation source files + +These files are typeset using LaTeX to produce the PDF documentation for the package. + +* zref-check-code.tex ‡ +* zref-check.tex ‡ + +### Text files + +Plain text files included as documentation or metadata. + +* CHANGELOG.md ‡ +* MANIFEST.md ‡ +* README.md ‡ +* readme-ctan.md +* DEPENDS.txt ‡ + +### Derived files + +The files created by ‘unpacking’ the package sources. This typically includes +`.sty` and `.cls` files created from DocStrip `.dtx` files. + +* zref-check.sty † + +### Typeset documents + +The output files (PDF, essentially) from typesetting the various source, demo, +etc., package files. + +* zref-check-code.pdf ‡ +* zref-check.pdf ‡ + +### Test files + +These files form the test suite for the package. `.lvt` or `.lte` files are the individual +unit tests, and `.tlg` are the stored output for ensuring changes to the package produce +the same output. These output files are sometimes shared and sometime specific for +different engines (pdfTeX, XeTeX, LuaTeX, etc.). + +* zc-babel01.lvt +* zc-babel02.lvt +* zc-babel03.lvt +* zc-babel04.lvt +* zc-check-above01.lvt +* zc-check-after01.lvt +* zc-check-before01.lvt +* zc-check-below01.lvt +* zc-check-chapsafter01.lvt +* zc-check-chapsbefore01.lvt +* zc-check-close01.lvt +* zc-check-facing01.lvt +* zc-check-facing02.lvt +* zc-check-facing03.lvt +* zc-check-far01.lvt +* zc-check-multi01.lvt +* zc-check-nextchap01.lvt +* zc-check-nextpage01.lvt +* zc-check-nextpage02.lvt +* zc-check-nextsec01.lvt +* zc-check-pagegap01.lvt +* zc-check-pagesafter01.lvt +* zc-check-pagesafter02.lvt +* zc-check-pagesbefore01.lvt +* zc-check-pagesbefore02.lvt +* zc-check-ppafter01.lvt +* zc-check-ppafter02.lvt +* zc-check-ppbefore01.lvt +* zc-check-ppbefore02.lvt +* zc-check-prevchap01.lvt +* zc-check-prevpage01.lvt +* zc-check-prevpage02.lvt +* zc-check-prevsec01.lvt +* zc-check-secsafter01.lvt +* zc-check-secsbefore01.lvt +* zc-check-thischap01.lvt +* zc-check-thispage01.lvt +* zc-check-thispage02.lvt +* zc-check-thissec01.lvt +* zc-opt-closerange01.lvt +* zc-opt-closerange02.lvt +* zc-opt-hyperref01.lvt +* zc-opt-hyperref02.lvt +* zc-opt-hyperref03.lvt +* zc-opt-hyperref04.lvt +* zc-opt-hyperref05.lvt +* zc-opt-ignore01.lvt +* zc-opt-ignore02.lvt +* zc-opt-labelcmd01.lvt +* zc-opt-labelcmd02.lvt +* zc-opt-labelcmd03.lvt +* zc-opt-msglevel01.lvt +* zc-opt-msglevel02.lvt +* zc-opt-msglevel03.lvt +* zc-opt-msglevel04.lvt +* zc-opt-msglevel05.lvt +* zc-opt-msglevel06.lvt +* zc-opt-msglevel07.lvt +* zc-opt-msglevel08.lvt +* zc-opt-msglevel09.lvt +* zc-opt-msglevel10.lvt +* zc-opt-onpage01.lvt +* zc-opt-onpage02.lvt +* zc-opt-onpage03.lvt +* zc-opt-onpage04.lvt +* zc-opt-onpage05.lvt +* zc-opt-onpage06.lvt +* zc-opt-onpage07.lvt +* zc-opt-onpage08.lvt +* zc-opt-onpage09.lvt +* zc-babel01.luatex.tlg +* zc-babel01.luatexdev.tlg +* zc-babel01.tlg +* zc-babel01.xetex.tlg +* zc-babel01.xetexdev.tlg +* zc-babel02.luatex.tlg +* zc-babel02.luatexdev.tlg +* zc-babel02.tlg +* zc-babel02.xetex.tlg +* zc-babel02.xetexdev.tlg +* zc-babel03.luatex.tlg +* zc-babel03.luatexdev.tlg +* zc-babel03.tlg +* zc-babel03.xetex.tlg +* zc-babel03.xetexdev.tlg +* zc-babel04.luatex.tlg +* zc-babel04.luatexdev.tlg +* zc-babel04.tlg +* zc-babel04.xetex.tlg +* zc-babel04.xetexdev.tlg +* zc-check-above01.tlg +* zc-check-after01.tlg +* zc-check-before01.tlg +* zc-check-below01.tlg +* zc-check-chapsafter01.tlg +* zc-check-chapsbefore01.tlg +* zc-check-close01.tlg +* zc-check-facing01.tlg +* zc-check-facing02.tlg +* zc-check-facing03.tlg +* zc-check-far01.tlg +* zc-check-multi01.tlg +* zc-check-nextchap01.tlg +* zc-check-nextpage01.tlg +* zc-check-nextpage02.tlg +* zc-check-nextsec01.tlg +* zc-check-pagegap01.tlg +* zc-check-pagesafter01.tlg +* zc-check-pagesafter02.tlg +* zc-check-pagesbefore01.tlg +* zc-check-pagesbefore02.tlg +* zc-check-ppafter01.tlg +* zc-check-ppafter02.tlg +* zc-check-ppbefore01.tlg +* zc-check-ppbefore02.tlg +* zc-check-prevchap01.tlg +* zc-check-prevpage01.tlg +* zc-check-prevpage02.tlg +* zc-check-prevsec01.tlg +* zc-check-secsafter01.tlg +* zc-check-secsbefore01.tlg +* zc-check-thischap01.tlg +* zc-check-thispage01.tlg +* zc-check-thispage02.tlg +* zc-check-thissec01.tlg +* zc-opt-closerange01.tlg +* zc-opt-closerange02.tlg +* zc-opt-hyperref01.luatex.tlg +* zc-opt-hyperref01.luatexdev.tlg +* zc-opt-hyperref01.tlg +* zc-opt-hyperref01.xetex.tlg +* zc-opt-hyperref01.xetexdev.tlg +* zc-opt-hyperref02.luatex.tlg +* zc-opt-hyperref02.luatexdev.tlg +* zc-opt-hyperref02.tlg +* zc-opt-hyperref02.xetex.tlg +* zc-opt-hyperref02.xetexdev.tlg +* zc-opt-hyperref03.luatex.tlg +* zc-opt-hyperref03.luatexdev.tlg +* zc-opt-hyperref03.tlg +* zc-opt-hyperref03.xetex.tlg +* zc-opt-hyperref03.xetexdev.tlg +* zc-opt-hyperref04.luatex.tlg +* zc-opt-hyperref04.luatexdev.tlg +* zc-opt-hyperref04.tlg +* zc-opt-hyperref04.xetex.tlg +* zc-opt-hyperref04.xetexdev.tlg +* zc-opt-hyperref05.luatex.tlg +* zc-opt-hyperref05.luatexdev.tlg +* zc-opt-hyperref05.tlg +* zc-opt-hyperref05.xetex.tlg +* zc-opt-hyperref05.xetexdev.tlg +* zc-opt-ignore01.tlg +* zc-opt-ignore02.tlg +* zc-opt-labelcmd01.tlg +* zc-opt-labelcmd02.tlg +* zc-opt-labelcmd03.tlg +* zc-opt-msglevel01.tlg +* zc-opt-msglevel02.tlg +* zc-opt-msglevel03.tlg +* zc-opt-msglevel04.tlg +* zc-opt-msglevel05.tlg +* zc-opt-msglevel06.tlg +* zc-opt-msglevel07.tlg +* zc-opt-msglevel08.tlg +* zc-opt-msglevel09.tlg +* zc-opt-msglevel10.tlg +* zc-opt-onpage01.tlg +* zc-opt-onpage02.tlg +* zc-opt-onpage03.tlg +* zc-opt-onpage04.tlg +* zc-opt-onpage05.tlg +* zc-opt-onpage06.tlg +* zc-opt-onpage07.tlg +* zc-opt-onpage08.tlg +* zc-opt-onpage09.tlg + + +## TDS manifest + +The following groups list the files included in the TeX Directory Structure used to install +the package into a TeX distribution. + +### Source files (TDS) + +All files included in the `zref-check/source` directory. + +* zref-check.dtx +* zref-check.ins + +### TeX files (TDS) + +All files included in the `zref-check/tex` directory. + +* zref-check.sty + +### Doc files (TDS) + +All files included in the `zref-check/doc` directory. + +* CHANGELOG.md +* DEPENDS.txt +* MANIFEST.md +* README.md +* zref-check-code.pdf +* zref-check-code.tex +* zref-check.pdf +* zref-check.tex + + +## CTAN manifest + +The following group lists the files included in the CTAN package. + +### CTAN files + +* CHANGELOG.md +* DEPENDS.txt +* MANIFEST.md +* README.md +* zref-check-code.pdf +* zref-check-code.tex +* zref-check.dtx +* zref-check.ins +* zref-check.pdf +* zref-check.tex diff --git a/Master/texmf-dist/doc/latex/zref-check/zref-check-code.pdf b/Master/texmf-dist/doc/latex/zref-check/zref-check-code.pdf index f2af1c0794f..684e53eabfb 100644 Binary files a/Master/texmf-dist/doc/latex/zref-check/zref-check-code.pdf and b/Master/texmf-dist/doc/latex/zref-check/zref-check-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/zref-check/zref-check-code.tex b/Master/texmf-dist/doc/latex/zref-check/zref-check-code.tex index d9ee1c58d0a..eb649833cd9 100644 --- a/Master/texmf-dist/doc/latex/zref-check/zref-check-code.tex +++ b/Master/texmf-dist/doc/latex/zref-check/zref-check-code.tex @@ -24,9 +24,7 @@ % zref-check.ins, % zref-check.tex, % zref-check-code.tex, -% and the derived files zref-check.sty and -% zref-check.pdf, -% zref-check-code.pdf. +% and the files listed in MANIFEST.md. % % The released version of this package is available from CTAN. % @@ -66,7 +64,7 @@ \title{% The \pkg{zref-check} package implementation% - \thanks{This file describes \fileversion, last revised \filedate.}% + \thanks{This file describes \fileversion, released \filedate.}% } \author{% diff --git a/Master/texmf-dist/doc/latex/zref-check/zref-check.pdf b/Master/texmf-dist/doc/latex/zref-check/zref-check.pdf index 2197eda8162..f475161f4c9 100644 Binary files a/Master/texmf-dist/doc/latex/zref-check/zref-check.pdf and b/Master/texmf-dist/doc/latex/zref-check/zref-check.pdf differ diff --git a/Master/texmf-dist/doc/latex/zref-check/zref-check.tex b/Master/texmf-dist/doc/latex/zref-check/zref-check.tex index 0edf9557f85..6f223187823 100644 --- a/Master/texmf-dist/doc/latex/zref-check/zref-check.tex +++ b/Master/texmf-dist/doc/latex/zref-check/zref-check.tex @@ -24,9 +24,7 @@ % zref-check.ins, % zref-check.tex, % zref-check-code.tex, -% and the derived files zref-check.sty and -% zref-check.pdf, -% zref-check-code.pdf. +% and the files listed in MANIFEST.md. % % The released version of this package is available from CTAN. % @@ -55,7 +53,7 @@ \title{% The \pkg{zref-check} package% - \thanks{This file describes \fileversion, last revised \filedate.}% + \thanks{This file describes \fileversion, released \filedate.}% } \author{% diff --git a/Master/texmf-dist/source/latex/zref-check/zref-check.dtx b/Master/texmf-dist/source/latex/zref-check/zref-check.dtx index 584cf1b316d..fb4e93c8577 100644 --- a/Master/texmf-dist/source/latex/zref-check/zref-check.dtx +++ b/Master/texmf-dist/source/latex/zref-check/zref-check.dtx @@ -24,9 +24,7 @@ % zref-check.ins, % zref-check.tex, % zref-check-code.tex, -% and the derived files zref-check.sty and -% zref-check.pdf, -% zref-check-code.pdf. +% and the files listed in MANIFEST.md. % % The released version of this package is available from CTAN. % @@ -306,7 +304,7 @@ % Section~\ref{sec:user-interface}) in the preamble. Most options can also be % used with local effects, through the optional argument of \cs{zcheck}. % -% \DescribeOption{hyperref} +% \DescribeOption{hyperref} % % Controls the use of \pkg{hyperref} by \pkg{zref-check} and takes values % \opt{auto}, \opt{true}, \opt{false}. The default value, \opt{auto}, makes % \pkg{zref-check} use \pkg{hyperref} if it is loaded, meaning \cs{zcheck} can @@ -319,47 +317,47 @@ % hyperlinking by means of its starred version. % % -% \DescribeOption{msglevel} +% \DescribeOption{msglevel} % % Sets the level of messages issued by \cs{zcheck} failed checks and takes -% values \opt{warn}, \opt{info}, \opt{none}, \opt{obeydraft}, \opt{obeyfinal}. -% The default value, \opt{warn}, issues messages both to the terminal and to -% the log file, \opt{info} issues messages to the log file only, \opt{none} -% suppresses all messages. \opt{obeydraft} corresponds to \opt{info} if -% option \opt{draft} is passed to \cs{documentclass}, and to \opt{warn} -% otherwise. \opt{obeyfinal} corresponds to \opt{warn} if option \opt{final} -% is (explicitly) passed to \cs{documentclass} and \opt{info} otherwise. -% \opt{ignore} is provided as convenience alias for \opt{msglevel=none} for -% local use only. This option only affects the messages issued by the checks -% in \cs{zcheck}, not other messages or warnings of the package. In -% particular, it does not affect warnings issued for undefined labels, which -% just use \cs{zref@refused} and thus are the same as standard \LaTeX{} ones -% for this purpose. -% -% -% \DescribeOption{onpage} +% values \opt{warn}, \opt{info}, \opt{none}, \opt{infoifdraft}, +% \opt{warniffinal}. The default value, \opt{warn}, issues messages both to +% the terminal and to the log file, \opt{info} issues messages to the log file +% only, \opt{none} suppresses all messages. \opt{infoifdraft} corresponds to +% \opt{info} if option \opt{draft} is passed to \cs{documentclass}, and to +% \opt{warn} otherwise. \opt{warniffinal} corresponds to \opt{warn} if option +% \opt{final} is (explicitly) passed to \cs{documentclass} and \opt{info} +% otherwise. \opt{ignore} is provided as convenience alias for +% \opt{msglevel=none} for local use only. This option only affects the +% messages issued by the checks in \cs{zcheck}, not other messages or warnings +% of the package. In particular, it does not affect warnings issued for +% undefined labels, which just use \cs{zref@refused} and thus are the same as +% standard \LaTeX{} ones for this purpose. +% +% +% \DescribeOption{onpage} % % Allows to control the messaging style for ``within page checks'', and takes -% values \opt{labelseq}, \opt{msg}, \opt{obeydraft}, \opt{obeyfinal}. The -% default, \opt{labelseq}, uses the labels' shipout sequence, as retrieved +% values \opt{labelseq}, \opt{msg}, \opt{labelseqifdraft}, \opt{msgiffinal}. +% The default, \opt{labelseq}, uses the labels' shipout sequence, as retrieved % from the \file{.aux} file, to infer relative position within the page. % \opt{msg} also uses the same method for checking relative position, but % issues a (different) message \emph{even if the check passes}, to provide a % simple workflow for robust checking of ``false negatives'', considering the % label sequence is not fool proof (for details and workflow recommendations, % see Section~\ref{sec:within-page-checks}). \opt{msg} also issues its -% messages at the same level defined in \opt{msglevel}. \opt{obeydraft} +% messages at the same level defined in \opt{msglevel}. \opt{labelseqifdraft} % corresponds to \opt{labelseq} if option \opt{draft} is passed to -% \cs{documentclass} and to \opt{msg} otherwise. \opt{obeyfinal} corresponds +% \cs{documentclass} and to \opt{msg} otherwise. \opt{msgiffinal} corresponds % to \opt{msg} if option \opt{final} is (explicitly) passed to % \cs{documentclass}, and to \opt{labelseq} otherwise. % % -% \DescribeOption{closerange} +% \DescribeOption{closerange} % % Defines the width of the range of pages, relative to the reference, that are % considered ``close'' by the \opt{close} check. Takes a positive integer as % value, with default 5. % % -% \DescribeOption{labelcmd} +% \DescribeOption{labelcmd} % % Defines the command used to set the user labels in \cs{zctarget} and % \texttt{zcregion}. Takes a control sequence \emph{name} as value, and the % default sets labels with the minimal required properties, those of the @@ -486,12 +484,12 @@ % false positives (getting a warning when it was not due), but with false % negatives (not getting a warning when it was due). Hence, setting % \opt{onpage} to \opt{msg} at a final typesetting stage (or just set it to -% \opt{obeydraft} or \opt{obeyfinal} if that's part of your workflow) provides -% a way to easily identify all cases of such checks (failing or passing), and -% double-check them. In case the test is passing though, the message is -% different from that of a failing check, to quickly convey why you are -% getting the message. This option can also be set at the local level, if the -% page in question is known to be problematic, or just atypical. +% \opt{labelseqifdraft} or \opt{msgiffinal} if that's part of your workflow) +% provides a way to easily identify all cases of such checks (failing or +% passing), and double-check them. In case the test is passing though, the +% message is different from that of a failing check, to quickly convey why you +% are getting the message. This option can also be set at the local level, if +% the page in question is known to be problematic, or just atypical. % % % \subsection{Sectioning checks} @@ -563,7 +561,7 @@ % % Identify the package. % \begin{macrocode} -\ProvidesExplPackage {zref-check} {2021-09-16} {0.2.1} +\ProvidesExplPackage {zref-check} {2021-12-07} {0.2.2} {Flexible cross-references with contextual checks based on zref} % \end{macrocode} % @@ -582,10 +580,9 @@ % Provide absolute counters for section and chapter, and respective % \pkg{zref} properties, so that we can make checks about relation of % chapters/sections regardless of internal counters, since we don't get -% those for the unnumbered (starred) ones. About the proper place to make -% the hooks for this purpose, see -% \url{https://tex.stackexchange.com/q/605533/105447} (thanks Ulrike -% Fischer). +% those for the unnumbered (starred) ones. Thanks Ulrike Fischer for +% suggestions at TeX.SX about the proper place to make the hooks for this +% purpose. % \begin{macrocode} \int_new:N \g_@@_abschap_int \int_new:N \g_@@_abssec_int @@ -681,7 +678,7 @@ \msg_new:nnn { zref-check } { hyperref-preamble-only } { Option~'hyperref'~only~available~in~the~preamble. \iow_newline: - Use~the~starred~version~of~'\noexpand\zcheck'~instead. + Use~the~starred~version~of~'\iow_char:N\\zcheck'~instead. } \msg_new:nnn { zref-check } { missing-hyperref } { Missing~'hyperref'~package. \iow_newline: Setting~'hyperref=false'. } @@ -702,6 +699,11 @@ Control~sequence~named~'#1'~used~in~option~'labelcmd'~is~not~defined.~ Using~default~value. } +\msg_new:nnn { zref-check } { option-deprecated } + { + Option~'#1'~has~been~deprecated.\iow_newline: + Use~'#2'~as~a~replacement. + } % \end{macrocode} % % @@ -829,18 +831,30 @@ { \tl_set:Nn \l_@@_msglevel_tl { info } } , msglevel / none .code:n = { \tl_set:Nn \l_@@_msglevel_tl { none } } , - msglevel / obeydraft .code:n = + msglevel / infoifdraft .code:n = { \ifdraft { \tl_set:Nn \l_@@_msglevel_tl { info } } { \tl_set:Nn \l_@@_msglevel_tl { warning } } } , - msglevel / obeyfinal .code:n = + msglevel / warniffinal .code:n = { \ifoptionfinal { \tl_set:Nn \l_@@_msglevel_tl { warning } } { \tl_set:Nn \l_@@_msglevel_tl { info } } } , + msglevel / obeydraft .code:n = + { + % NOTE Option value deprecated in 2021-12-07 for v0.2.2. + \msg_warning:nnnn { zref-check }{ option-deprecated } + { msglevel=obeydraft } { msglevel=infoifdraft } + } , + msglevel / obeyfinal .code:n = + { + % NOTE Option value deprecated in 2021-12-07 for v0.2.2. + \msg_warning:nnnn { zref-check }{ option-deprecated } + { msglevel=obeyfinal } { msglevel=warniffinal } + } , msglevel .value_required:n = true , msglevel .initial:n = warn , % \end{macrocode} @@ -879,18 +893,30 @@ { \bool_set_true:N \l_@@_msgonpage_bool } , - onpage / obeydraft .code:n = + onpage / labelseqifdraft .code:n = { \ifdraft { \bool_set_false:N \l_@@_msgonpage_bool } { \bool_set_true:N \l_@@_msgonpage_bool } } , - onpage / obeyfinal .code:n = + onpage / msgiffinal .code:n = { \ifoptionfinal { \bool_set_true:N \l_@@_msgonpage_bool } { \bool_set_false:N \l_@@_msgonpage_bool } } , + onpage / obeydraft .code:n = + { + % NOTE Option value deprecated in 2021-12-07 for v0.2.2. + \msg_warning:nnnn { zref-check }{ option-deprecated } + { onpage=obeydraft } { onpage=labelseqifdraft } + } , + onpage / obeyfinal .code:n = + { + % NOTE Option value deprecated in 2021-12-07 for v0.2.2. + \msg_warning:nnnn { zref-check }{ option-deprecated } + { onpage=obeyfinal } { onpage=msgiffinal } + } , onpage .value_required:n = true , onpage .initial:n = labelseq } @@ -1500,8 +1526,11 @@ \refstepcounter { zrefcheck } \zref@wrapper@babel \@@_target_label:n {#1} #2 - \zref@wrapper@babel - \zref@labelbylist { \@@_end_lblfmt:n {#1} } { zrefcheck-end } + \tl_if_empty:nF {#2} + { + \zref@wrapper@babel + \zref@labelbylist { \@@_end_lblfmt:n {#1} } { zrefcheck-end } + } \group_end: } % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/zref-check/zref-check.ins b/Master/texmf-dist/source/latex/zref-check/zref-check.ins index 4a18782a2d1..6d3a14b1ccd 100644 --- a/Master/texmf-dist/source/latex/zref-check/zref-check.ins +++ b/Master/texmf-dist/source/latex/zref-check/zref-check.ins @@ -24,9 +24,7 @@ % zref-check.ins, % zref-check.tex, % zref-check-code.tex, -% and the derived files zref-check.sty and -% zref-check.pdf, -% zref-check-code.pdf. +% and the files listed in MANIFEST.md. % % The released version of this package is available from CTAN. % @@ -72,9 +70,7 @@ This work consists of the files zref-check.dtx, zref-check.ins, zref-check.tex, zref-check-code.tex, - and the derived files zref-check.sty and - zref-check.pdf, - zref-check-code.pdf. + and the files listed in MANIFEST.md. The released version of this package is available from CTAN. diff --git a/Master/texmf-dist/tex/latex/zref-check/zref-check.sty b/Master/texmf-dist/tex/latex/zref-check/zref-check.sty index bd1e9ccb2d0..326b04617be 100644 --- a/Master/texmf-dist/tex/latex/zref-check/zref-check.sty +++ b/Master/texmf-dist/tex/latex/zref-check/zref-check.sty @@ -28,9 +28,7 @@ %% zref-check.ins, %% zref-check.tex, %% zref-check-code.tex, -%% and the derived files zref-check.sty and -%% zref-check.pdf, -%% zref-check-code.pdf. +%% and the files listed in MANIFEST.md. %% %% The released version of this package is available from CTAN. %% @@ -55,7 +53,7 @@ }% \endinput }% -\ProvidesExplPackage {zref-check} {2021-09-16} {0.2.1} +\ProvidesExplPackage {zref-check} {2021-12-07} {0.2.2} {Flexible cross-references with contextual checks based on zref} \RequirePackage { zref-user } \RequirePackage { zref-abspage } @@ -117,7 +115,7 @@ \msg_new:nnn { zref-check } { hyperref-preamble-only } { Option~'hyperref'~only~available~in~the~preamble. \iow_newline: - Use~the~starred~version~of~'\noexpand\zcheck'~instead. + Use~the~starred~version~of~'\iow_char:N\\zcheck'~instead. } \msg_new:nnn { zref-check } { missing-hyperref } { Missing~'hyperref'~package. \iow_newline: Setting~'hyperref=false'. } @@ -138,6 +136,11 @@ Control~sequence~named~'#1'~used~in~option~'labelcmd'~is~not~defined.~ Using~default~value. } +\msg_new:nnn { zref-check } { option-deprecated } + { + Option~'#1'~has~been~deprecated.\iow_newline: + Use~'#2'~as~a~replacement. + } \cs_new_eq:NN \__zrefcheck_int_to_roman:w \__int_to_roman:w \prg_new_conditional:Npnn \__zrefcheck_is_integer:n #1 { p, T , F , TF } { @@ -209,18 +212,30 @@ { \tl_set:Nn \l__zrefcheck_msglevel_tl { info } } , msglevel / none .code:n = { \tl_set:Nn \l__zrefcheck_msglevel_tl { none } } , - msglevel / obeydraft .code:n = + msglevel / infoifdraft .code:n = { \ifdraft { \tl_set:Nn \l__zrefcheck_msglevel_tl { info } } { \tl_set:Nn \l__zrefcheck_msglevel_tl { warning } } } , - msglevel / obeyfinal .code:n = + msglevel / warniffinal .code:n = { \ifoptionfinal { \tl_set:Nn \l__zrefcheck_msglevel_tl { warning } } { \tl_set:Nn \l__zrefcheck_msglevel_tl { info } } } , + msglevel / obeydraft .code:n = + { + % NOTE Option value deprecated in 2021-12-07 for v0.2.2. + \msg_warning:nnnn { zref-check }{ option-deprecated } + { msglevel=obeydraft } { msglevel=infoifdraft } + } , + msglevel / obeyfinal .code:n = + { + % NOTE Option value deprecated in 2021-12-07 for v0.2.2. + \msg_warning:nnnn { zref-check }{ option-deprecated } + { msglevel=obeyfinal } { msglevel=warniffinal } + } , msglevel .value_required:n = true , msglevel .initial:n = warn , ignore .code:n = @@ -244,18 +259,30 @@ { \bool_set_true:N \l__zrefcheck_msgonpage_bool } , - onpage / obeydraft .code:n = + onpage / labelseqifdraft .code:n = { \ifdraft { \bool_set_false:N \l__zrefcheck_msgonpage_bool } { \bool_set_true:N \l__zrefcheck_msgonpage_bool } } , - onpage / obeyfinal .code:n = + onpage / msgiffinal .code:n = { \ifoptionfinal { \bool_set_true:N \l__zrefcheck_msgonpage_bool } { \bool_set_false:N \l__zrefcheck_msgonpage_bool } } , + onpage / obeydraft .code:n = + { + % NOTE Option value deprecated in 2021-12-07 for v0.2.2. + \msg_warning:nnnn { zref-check }{ option-deprecated } + { onpage=obeydraft } { onpage=labelseqifdraft } + } , + onpage / obeyfinal .code:n = + { + % NOTE Option value deprecated in 2021-12-07 for v0.2.2. + \msg_warning:nnnn { zref-check }{ option-deprecated } + { onpage=obeyfinal } { onpage=msgiffinal } + } , onpage .value_required:n = true , onpage .initial:n = labelseq } @@ -464,8 +491,11 @@ \refstepcounter { zrefcheck } \zref@wrapper@babel \__zrefcheck_target_label:n {#1} #2 - \zref@wrapper@babel - \zref@labelbylist { \__zrefcheck_end_lblfmt:n {#1} } { zrefcheck-end } + \tl_if_empty:nF {#2} + { + \zref@wrapper@babel + \zref@labelbylist { \__zrefcheck_end_lblfmt:n {#1} } { zrefcheck-end } + } \group_end: } \NewDocumentEnvironment {zcregion} { m } -- cgit v1.2.3