From 5d66b745f10a2f0bfd2c977c8996474805dbc3b2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 23 Apr 2022 21:11:35 +0000 Subject: zref-clever (23apr22) git-svn-id: svn://tug.org/texlive/trunk@63114 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/zref-clever/CHANGELOG.md | 23 +- .../texmf-dist/doc/latex/zref-clever/MANIFEST.md | 522 --------------------- .../doc/latex/zref-clever/zref-clever-code.pdf | Bin 1255128 -> 1255628 bytes .../doc/latex/zref-clever/zref-clever-code.tex | 7 +- .../doc/latex/zref-clever/zref-clever.pdf | Bin 312995 -> 311667 bytes .../doc/latex/zref-clever/zref-clever.tex | 95 ++-- .../source/latex/zref-clever/zref-clever.dtx | 135 +++--- .../source/latex/zref-clever/zref-clever.ins | 4 +- .../tex/latex/zref-clever/zref-clever-dutch.lang | 2 +- .../tex/latex/zref-clever/zref-clever-english.lang | 2 +- .../tex/latex/zref-clever/zref-clever-french.lang | 2 +- .../tex/latex/zref-clever/zref-clever-german.lang | 2 +- .../latex/zref-clever/zref-clever-portuguese.lang | 2 +- .../tex/latex/zref-clever/zref-clever-spanish.lang | 2 +- .../tex/latex/zref-clever/zref-clever.sty | 83 ++-- 15 files changed, 185 insertions(+), 696 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/zref-clever/MANIFEST.md diff --git a/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md b/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md index 5023b04b7ae..2a3f9bdbc4a 100644 --- a/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md @@ -1,6 +1,27 @@ # Changelog -## [Unreleased](https://github.com/gusbrs/zref-clever/compare/v0.2.2-alpha...HEAD) +## [Unreleased](https://github.com/gusbrs/zref-clever/compare/v0.3.0...HEAD) + +## [v0.3.0](https://github.com/gusbrs/zref-clever/compare/v0.2.2-alpha...v0.3.0) (2022-04-22) + +### Changed +- `zref-clever` no longer accepts package options to be set a load-time, + `\zcsetup` must be used instead. The use of load-time options now results + in "Unknown option" LaTeX error. This change requires that users adjust + their documents, and a suitable package warning has been provided so that + affected users know of the change directly and how to adjust. +- Option `check` has been made no-op in the preamble. To load the + corresponding package, just use the standard `\usepackage`. +- (Internal) Use public hyperref's commands for building links instead of the + internal `\hyper@@link`. + +### Deprecated +- Options `titleref` and `vario` have been deprecated. To load the + corresponding packages, just use the standard `\usepackage`. + +### Fixed +- Bug which affected the typesetting with compression in case two ranges for + the same reference type occurred. ## [v0.2.2-alpha](https://github.com/gusbrs/zref-clever/compare/v0.2.1-alpha...v0.2.2-alpha) (2022-02-11) diff --git a/Master/texmf-dist/doc/latex/zref-clever/MANIFEST.md b/Master/texmf-dist/doc/latex/zref-clever/MANIFEST.md deleted file mode 100644 index 50b246d870a..00000000000 --- a/Master/texmf-dist/doc/latex/zref-clever/MANIFEST.md +++ /dev/null @@ -1,522 +0,0 @@ -# Manifest for zref-clever - -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-clever.dtx ‡ -* zref-clever.ins ‡ - -### Typeset documentation source files - -These files are typeset using LaTeX to produce the PDF documentation for the package. - -* zref-clever-code.tex ‡ -* zref-clever.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-clever.sty † -* zref-clever-dutch.lang † -* zref-clever-english.lang † -* zref-clever-french.lang † -* zref-clever-german.lang † -* zref-clever-portuguese.lang † -* zref-clever-spanish.lang † - -### Typeset documents - -The output files (PDF, essentially) from typesetting the various source, demo, -etc., package files. - -* zref-clever-code.pdf ‡ -* zref-clever.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-LanguageSetup01.lvt -* zc-LanguageSetup02.lvt -* zc-LanguageSetup03.lvt -* zc-RefTypeSetup01.lvt -* zc-RefTypeSetup02.lvt -* zc-RefTypeSetup03.lvt -* zc-class-article01.lvt -* zc-class-book01.lvt -* zc-class-memoir01.lvt -* zc-class-report01.lvt -* zc-class-scrartcl01.lvt -* zc-class-scrbook01.lvt -* zc-class-scrreprt01.lvt -* zc-compat-amsmath01.lvt -* zc-compat-appendices01.lvt -* zc-compat-appendix01.lvt -* zc-compat-breqn01.lvt -* zc-compat-enumitem01.lvt -* zc-compat-koma-script01.lvt -* zc-compat-listings01.lvt -* zc-compat-memoir01.lvt -* zc-compat-subcaption01.lvt -* zc-compat-subfig01.lvt -* zc-fallback01.lvt -* zc-howto-amsmath01.lvt -* zc-howto-enumitem01.lvt -* zc-howto-listings01.lvt -* zc-howto-newfloat01.lvt -* zc-howto-newfloat02.lvt -* zc-howto-newfloat03.lvt -* zc-howto-newfloat04.lvt -* zc-howto-newfloat05.lvt -* zc-howto-newtheorem01.lvt -* zc-howto-newtheorem02.lvt -* zc-howto-newtheorem03.lvt -* zc-howto-newtheorem04.lvt -* zc-howto-zref-vario01.lvt -* zc-howto-zref-xr01.lvt -* zc-label-options01.lvt -* zc-langfile-dutch01.lvt -* zc-langfile-english01.lvt -* zc-langfile-french01.lvt -* zc-langfile-german01.lvt -* zc-langfile-portuguese01.lvt -* zc-langfile-spanish01.lvt -* zc-languages01.lvt -* zc-opt-check01.lvt -* zc-opt-d01.lvt -* zc-opt-g01.lvt -* zc-opt-hyperref01.lvt -* zc-opt-hyperref02.lvt -* zc-opt-hyperref03.lvt -* zc-opt-hyperref04.lvt -* zc-opt-hyperref05.lvt -* zc-opt-lang01.lvt -* zc-opt-lang02.lvt -* zc-opt-lang03.lvt -* zc-opt-lang04.lvt -* zc-opt-lang05.lvt -* zc-opt-lang06.lvt -* zc-opt-nocompat01.lvt -* zc-opt-nocompat02.lvt -* zc-opt-nocompat03.lvt -* zc-opt-ref01.lvt -* zc-opt-ref02.lvt -* zc-opt-titleref01.lvt -* zc-opt-vario01.lvt -* zc-precedence-rules01.lvt -* zc-sort01.lvt -* zc-typeset01.lvt -* zc-workaround-breqn01.lvt -* zc-zcref-options01.lvt -* zc-zcref-options02.lvt -* zc-zcref-options03.lvt -* zc-LanguageSetup01.luatex.tlg -* zc-LanguageSetup01.luatexdev.tlg -* zc-LanguageSetup01.tlg -* zc-LanguageSetup01.xetex.tlg -* zc-LanguageSetup01.xetexdev.tlg -* zc-LanguageSetup02.luatex.tlg -* zc-LanguageSetup02.luatexdev.tlg -* zc-LanguageSetup02.tlg -* zc-LanguageSetup02.xetex.tlg -* zc-LanguageSetup02.xetexdev.tlg -* zc-LanguageSetup03.luatex.tlg -* zc-LanguageSetup03.luatexdev.tlg -* zc-LanguageSetup03.tlg -* zc-LanguageSetup03.xetex.tlg -* zc-LanguageSetup03.xetexdev.tlg -* zc-RefTypeSetup01.luatex.tlg -* zc-RefTypeSetup01.luatexdev.tlg -* zc-RefTypeSetup01.tlg -* zc-RefTypeSetup01.xetex.tlg -* zc-RefTypeSetup01.xetexdev.tlg -* zc-RefTypeSetup02.luatex.tlg -* zc-RefTypeSetup02.luatexdev.tlg -* zc-RefTypeSetup02.tlg -* zc-RefTypeSetup02.xetex.tlg -* zc-RefTypeSetup02.xetexdev.tlg -* zc-RefTypeSetup03.luatex.tlg -* zc-RefTypeSetup03.luatexdev.tlg -* zc-RefTypeSetup03.tlg -* zc-RefTypeSetup03.xetex.tlg -* zc-RefTypeSetup03.xetexdev.tlg -* zc-class-article01.luatex.tlg -* zc-class-article01.luatexdev.tlg -* zc-class-article01.tlg -* zc-class-article01.xetex.tlg -* zc-class-article01.xetexdev.tlg -* zc-class-book01.luatex.tlg -* zc-class-book01.luatexdev.tlg -* zc-class-book01.tlg -* zc-class-book01.xetex.tlg -* zc-class-book01.xetexdev.tlg -* zc-class-memoir01.luatex.tlg -* zc-class-memoir01.luatexdev.tlg -* zc-class-memoir01.tlg -* zc-class-memoir01.xetex.tlg -* zc-class-memoir01.xetexdev.tlg -* zc-class-report01.luatex.tlg -* zc-class-report01.luatexdev.tlg -* zc-class-report01.tlg -* zc-class-report01.xetex.tlg -* zc-class-report01.xetexdev.tlg -* zc-class-scrartcl01.luatex.tlg -* zc-class-scrartcl01.luatexdev.tlg -* zc-class-scrartcl01.tlg -* zc-class-scrartcl01.xetex.tlg -* zc-class-scrartcl01.xetexdev.tlg -* zc-class-scrbook01.luatex.tlg -* zc-class-scrbook01.luatexdev.tlg -* zc-class-scrbook01.tlg -* zc-class-scrbook01.xetex.tlg -* zc-class-scrbook01.xetexdev.tlg -* zc-class-scrreprt01.luatex.tlg -* zc-class-scrreprt01.luatexdev.tlg -* zc-class-scrreprt01.tlg -* zc-class-scrreprt01.xetex.tlg -* zc-class-scrreprt01.xetexdev.tlg -* zc-compat-amsmath01.luatex.tlg -* zc-compat-amsmath01.luatexdev.tlg -* zc-compat-amsmath01.tlg -* zc-compat-amsmath01.xetex.tlg -* zc-compat-amsmath01.xetexdev.tlg -* zc-compat-appendices01.luatex.tlg -* zc-compat-appendices01.luatexdev.tlg -* zc-compat-appendices01.tlg -* zc-compat-appendices01.xetex.tlg -* zc-compat-appendices01.xetexdev.tlg -* zc-compat-appendix01.luatex.tlg -* zc-compat-appendix01.luatexdev.tlg -* zc-compat-appendix01.tlg -* zc-compat-appendix01.xetex.tlg -* zc-compat-appendix01.xetexdev.tlg -* zc-compat-breqn01.luatex.tlg -* zc-compat-breqn01.luatexdev.tlg -* zc-compat-breqn01.tlg -* zc-compat-breqn01.xetex.tlg -* zc-compat-breqn01.xetexdev.tlg -* zc-compat-enumitem01.luatex.tlg -* zc-compat-enumitem01.luatexdev.tlg -* zc-compat-enumitem01.tlg -* zc-compat-enumitem01.xetex.tlg -* zc-compat-enumitem01.xetexdev.tlg -* zc-compat-koma-script01.luatex.tlg -* zc-compat-koma-script01.luatexdev.tlg -* zc-compat-koma-script01.tlg -* zc-compat-koma-script01.xetex.tlg -* zc-compat-koma-script01.xetexdev.tlg -* zc-compat-listings01.luatex.tlg -* zc-compat-listings01.luatexdev.tlg -* zc-compat-listings01.tlg -* zc-compat-listings01.xetex.tlg -* zc-compat-listings01.xetexdev.tlg -* zc-compat-memoir01.luatex.tlg -* zc-compat-memoir01.luatexdev.tlg -* zc-compat-memoir01.tlg -* zc-compat-memoir01.xetex.tlg -* zc-compat-memoir01.xetexdev.tlg -* zc-compat-subcaption01.luatex.tlg -* zc-compat-subcaption01.luatexdev.tlg -* zc-compat-subcaption01.tlg -* zc-compat-subcaption01.xetex.tlg -* zc-compat-subcaption01.xetexdev.tlg -* zc-compat-subfig01.luatex.tlg -* zc-compat-subfig01.luatexdev.tlg -* zc-compat-subfig01.tlg -* zc-compat-subfig01.xetex.tlg -* zc-compat-subfig01.xetexdev.tlg -* zc-fallback01.luatex.tlg -* zc-fallback01.luatexdev.tlg -* zc-fallback01.tlg -* zc-fallback01.xetex.tlg -* zc-fallback01.xetexdev.tlg -* zc-howto-amsmath01.luatex.tlg -* zc-howto-amsmath01.luatexdev.tlg -* zc-howto-amsmath01.tlg -* zc-howto-amsmath01.xetex.tlg -* zc-howto-amsmath01.xetexdev.tlg -* zc-howto-enumitem01.luatex.tlg -* zc-howto-enumitem01.luatexdev.tlg -* zc-howto-enumitem01.tlg -* zc-howto-enumitem01.xetex.tlg -* zc-howto-enumitem01.xetexdev.tlg -* zc-howto-listings01.luatex.tlg -* zc-howto-listings01.luatexdev.tlg -* zc-howto-listings01.tlg -* zc-howto-listings01.xetex.tlg -* zc-howto-listings01.xetexdev.tlg -* zc-howto-newfloat01.luatex.tlg -* zc-howto-newfloat01.luatexdev.tlg -* zc-howto-newfloat01.tlg -* zc-howto-newfloat01.xetex.tlg -* zc-howto-newfloat01.xetexdev.tlg -* zc-howto-newfloat02.luatex.tlg -* zc-howto-newfloat02.luatexdev.tlg -* zc-howto-newfloat02.tlg -* zc-howto-newfloat02.xetex.tlg -* zc-howto-newfloat02.xetexdev.tlg -* zc-howto-newfloat03.luatex.tlg -* zc-howto-newfloat03.luatexdev.tlg -* zc-howto-newfloat03.tlg -* zc-howto-newfloat03.xetex.tlg -* zc-howto-newfloat03.xetexdev.tlg -* zc-howto-newfloat04.luatex.tlg -* zc-howto-newfloat04.luatexdev.tlg -* zc-howto-newfloat04.tlg -* zc-howto-newfloat04.xetex.tlg -* zc-howto-newfloat04.xetexdev.tlg -* zc-howto-newfloat05.luatex.tlg -* zc-howto-newfloat05.luatexdev.tlg -* zc-howto-newfloat05.tlg -* zc-howto-newfloat05.xetex.tlg -* zc-howto-newfloat05.xetexdev.tlg -* zc-howto-newtheorem01.luatex.tlg -* zc-howto-newtheorem01.luatexdev.tlg -* zc-howto-newtheorem01.tlg -* zc-howto-newtheorem01.xetex.tlg -* zc-howto-newtheorem01.xetexdev.tlg -* zc-howto-newtheorem02.luatex.tlg -* zc-howto-newtheorem02.luatexdev.tlg -* zc-howto-newtheorem02.tlg -* zc-howto-newtheorem02.xetex.tlg -* zc-howto-newtheorem02.xetexdev.tlg -* zc-howto-newtheorem03.luatex.tlg -* zc-howto-newtheorem03.luatexdev.tlg -* zc-howto-newtheorem03.tlg -* zc-howto-newtheorem03.xetex.tlg -* zc-howto-newtheorem03.xetexdev.tlg -* zc-howto-newtheorem04.luatex.tlg -* zc-howto-newtheorem04.luatexdev.tlg -* zc-howto-newtheorem04.tlg -* zc-howto-newtheorem04.xetex.tlg -* zc-howto-newtheorem04.xetexdev.tlg -* zc-howto-zref-vario01.luatex.tlg -* zc-howto-zref-vario01.luatexdev.tlg -* zc-howto-zref-vario01.tlg -* zc-howto-zref-vario01.xetex.tlg -* zc-howto-zref-vario01.xetexdev.tlg -* zc-howto-zref-xr01.luatex.tlg -* zc-howto-zref-xr01.luatexdev.tlg -* zc-howto-zref-xr01.tlg -* zc-howto-zref-xr01.xetex.tlg -* zc-howto-zref-xr01.xetexdev.tlg -* zc-label-options01.luatex.tlg -* zc-label-options01.luatexdev.tlg -* zc-label-options01.tlg -* zc-langfile-dutch01.tlg -* zc-langfile-english01.tlg -* zc-langfile-french01.tlg -* zc-langfile-german01.tlg -* zc-langfile-portuguese01.luatex.tlg -* zc-langfile-portuguese01.luatexdev.tlg -* zc-langfile-portuguese01.tlg -* zc-langfile-portuguese01.xetex.tlg -* zc-langfile-portuguese01.xetexdev.tlg -* zc-langfile-spanish01.tlg -* zc-languages01.tlg -* zc-opt-check01.luatex.tlg -* zc-opt-check01.luatexdev.tlg -* zc-opt-check01.tlg -* zc-opt-d01.tlg -* zc-opt-g01.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-lang01.luatex.tlg -* zc-opt-lang01.luatexdev.tlg -* zc-opt-lang01.tlg -* zc-opt-lang01.xetex.tlg -* zc-opt-lang01.xetexdev.tlg -* zc-opt-lang02.luatex.tlg -* zc-opt-lang02.luatexdev.tlg -* zc-opt-lang02.tlg -* zc-opt-lang02.xetex.tlg -* zc-opt-lang02.xetexdev.tlg -* zc-opt-lang03.luatex.tlg -* zc-opt-lang03.luatexdev.tlg -* zc-opt-lang03.tlg -* zc-opt-lang03.xetex.tlg -* zc-opt-lang03.xetexdev.tlg -* zc-opt-lang04.luatex.tlg -* zc-opt-lang04.luatexdev.tlg -* zc-opt-lang04.tlg -* zc-opt-lang04.xetex.tlg -* zc-opt-lang04.xetexdev.tlg -* zc-opt-lang05.luatex.tlg -* zc-opt-lang05.luatexdev.tlg -* zc-opt-lang05.tlg -* zc-opt-lang05.xetex.tlg -* zc-opt-lang05.xetexdev.tlg -* zc-opt-lang06.luatex.tlg -* zc-opt-lang06.luatexdev.tlg -* zc-opt-lang06.tlg -* zc-opt-lang06.xetex.tlg -* zc-opt-lang06.xetexdev.tlg -* zc-opt-nocompat01.luatex.tlg -* zc-opt-nocompat01.luatexdev.tlg -* zc-opt-nocompat01.tlg -* zc-opt-nocompat01.xetex.tlg -* zc-opt-nocompat01.xetexdev.tlg -* zc-opt-nocompat02.luatex.tlg -* zc-opt-nocompat02.luatexdev.tlg -* zc-opt-nocompat02.tlg -* zc-opt-nocompat02.xetex.tlg -* zc-opt-nocompat02.xetexdev.tlg -* zc-opt-nocompat03.luatex.tlg -* zc-opt-nocompat03.luatexdev.tlg -* zc-opt-nocompat03.tlg -* zc-opt-nocompat03.xetex.tlg -* zc-opt-nocompat03.xetexdev.tlg -* zc-opt-ref01.tlg -* zc-opt-ref02.luatex.tlg -* zc-opt-ref02.luatexdev.tlg -* zc-opt-ref02.tlg -* zc-opt-ref02.xetex.tlg -* zc-opt-ref02.xetexdev.tlg -* zc-opt-titleref01.luatex.tlg -* zc-opt-titleref01.luatexdev.tlg -* zc-opt-titleref01.tlg -* zc-opt-titleref01.xetex.tlg -* zc-opt-titleref01.xetexdev.tlg -* zc-opt-vario01.luatex.tlg -* zc-opt-vario01.luatexdev.tlg -* zc-opt-vario01.tlg -* zc-opt-vario01.xetex.tlg -* zc-opt-vario01.xetexdev.tlg -* zc-precedence-rules01.luatex.tlg -* zc-precedence-rules01.luatexdev.tlg -* zc-precedence-rules01.tlg -* zc-precedence-rules01.xetex.tlg -* zc-precedence-rules01.xetexdev.tlg -* zc-sort01.tlg -* zc-typeset01.luatex.tlg -* zc-typeset01.luatexdev.tlg -* zc-typeset01.tlg -* zc-typeset01.xetex.tlg -* zc-typeset01.xetexdev.tlg -* zc-workaround-breqn01.luatex.tlg -* zc-workaround-breqn01.luatexdev.tlg -* zc-workaround-breqn01.tlg -* zc-workaround-breqn01.xetex.tlg -* zc-workaround-breqn01.xetexdev.tlg -* zc-zcref-options01.luatex.tlg -* zc-zcref-options01.luatexdev.tlg -* zc-zcref-options01.tlg -* zc-zcref-options01.xetex.tlg -* zc-zcref-options01.xetexdev.tlg -* zc-zcref-options02.luatex.tlg -* zc-zcref-options02.luatexdev.tlg -* zc-zcref-options02.tlg -* zc-zcref-options02.xetex.tlg -* zc-zcref-options02.xetexdev.tlg -* zc-zcref-options03.luatex.tlg -* zc-zcref-options03.luatexdev.tlg -* zc-zcref-options03.tlg -* zc-zcref-options03.xetex.tlg -* zc-zcref-options03.xetexdev.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-clever/source` directory. - -* zref-clever.dtx -* zref-clever.ins - -### TeX files (TDS) - -All files included in the `zref-clever/tex` directory. - -* zref-clever-dutch.lang -* zref-clever-english.lang -* zref-clever-french.lang -* zref-clever-german.lang -* zref-clever-portuguese.lang -* zref-clever-spanish.lang -* zref-clever.sty - -### Doc files (TDS) - -All files included in the `zref-clever/doc` directory. - -* CHANGELOG.md -* DEPENDS.txt -* MANIFEST.md -* README.md -* zref-clever-code.pdf -* zref-clever-code.tex -* zref-clever.pdf -* zref-clever.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-clever-code.pdf -* zref-clever-code.tex -* zref-clever.dtx -* zref-clever.ins -* zref-clever.pdf -* zref-clever.tex 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 c77a6ef340c..de4ac178cff 100644 Binary files a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf and b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf differ 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 edc439e5c31..e1bc9d02899 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 @@ -24,7 +24,7 @@ % zref-clever.ins, % zref-clever.tex, % zref-clever-code.tex, -% and the files listed in MANIFEST.md. +% and the files generated from them. % % The released version of this package is available from CTAN. % @@ -44,7 +44,10 @@ % Have \GetFileInfo pick up date and version data and used in the % documentation. -\usepackage[cap,nameinlink=false,check,titleref]{zref-clever} +\usepackage{zref-clever} +\zcsetup{cap,nameinlink=false} +\usepackage{zref-check} +\usepackage{zref-titleref} \begin{document} diff --git a/Master/texmf-dist/doc/latex/zref-clever/zref-clever.pdf b/Master/texmf-dist/doc/latex/zref-clever/zref-clever.pdf index 2b439d1d54c..213e51bf6b6 100644 Binary files a/Master/texmf-dist/doc/latex/zref-clever/zref-clever.pdf and b/Master/texmf-dist/doc/latex/zref-clever/zref-clever.pdf differ diff --git a/Master/texmf-dist/doc/latex/zref-clever/zref-clever.tex b/Master/texmf-dist/doc/latex/zref-clever/zref-clever.tex index e26992005d6..ee00821c16a 100644 --- a/Master/texmf-dist/doc/latex/zref-clever/zref-clever.tex +++ b/Master/texmf-dist/doc/latex/zref-clever/zref-clever.tex @@ -24,7 +24,7 @@ % zref-clever.ins, % zref-clever.tex, % zref-clever-code.tex, -% and the files listed in MANIFEST.md. +% and the files generated from them. % % The released version of this package is available from CTAN. % @@ -44,7 +44,10 @@ % The package itself *must* be loaded so that \GetFileInfo can pick up date % and version data. Naturally, we also use it. -\usepackage[cap,check,titleref]{zref-clever} +\usepackage{zref-clever} +\zcsetup{cap} +\usepackage{zref-check} +\usepackage{zref-titleref} \usepackage[T1]{fontenc} @@ -300,21 +303,22 @@ you should be ready to accommodate to eventual upstream changes. \section{Loading the package} \zlabel{sec:loading-package} -As usual: +\pkg{zref-clever} can be loaded with the usual: -\begin{zcexample}[escapeinside=`'] -\usepackage`\oarg{options}'{zref-clever} +\begin{zcexample} +\usepackage{zref-clever} \end{zcexample} +The package does not accept load-time options, package options must be set +using \cs{zcsetup} (see \zcref{sec:user-interface}). \section{Dependencies} \pkg{zref-clever} requires \pkg{zref}, and \LaTeX{} kernel 2021-11-15, or -newer. It also needs \pkg{l3keys2e} and \pkg{ifdraft}. Some packages are -leveraged by \pkg{zref-clever} if they are present, but are not loaded by -default or required by it, namely: \pkg{hyperref}, \pkg{zref-check}, and -\pkg{zref}'s \pkg{zref-titleref}, \pkg{zref-hyperref}, and \pkg{zref-xr} -modules. +newer. It also needs \pkg{ifdraft}. Some packages are leveraged by +\pkg{zref-clever} if they are present, but are not loaded by default or +required by it, namely: \pkg{hyperref}, \pkg{zref-check}, and \pkg{zref}'s +\pkg{zref-titleref}, \pkg{zref-hyperref}, and \pkg{zref-xr} modules. \section{User interface} @@ -402,14 +406,13 @@ as a whole; and ``reference format options'', which control the detail of reference formatting, including type-specific and language-specific settings. This section covers the first group (for the second one, see -\zcref{sec:reference-format}). General options can be set globally either as -package options at load-time (see \zcref{sec:loading-package}) or by means of -\cs{zcsetup} in the preamble (see \zcref{sec:user-interface}). They can also -be set locally with \cs{zcsetup} along the document or through the optional -argument of \cs{zcref} (see \zcref{sec:user-interface}). Most general options -can be used in any of these contexts, but that is not necessarily true for all -cases, some restrictions may apply, as described in each option's -documentation. +\zcref{sec:reference-format}). General options can be set globally by means +of \cs{zcsetup} in the preamble (see \zcref{sec:user-interface}). They can +also be set locally with \cs{zcsetup} along the document or through the +optional argument of \cs{zcref} (see \zcref{sec:user-interface}). Most +general options can be used in any of these contexts, but that is not +necessarily true for all cases, some restrictions may apply, as described in +each option's documentation. \bigskip{} @@ -708,16 +711,6 @@ are handled by \LaTeX{}, the fact that this option receives commands as value means this option \emph{can't} be set at load time, as a package option. If you want to set it globally, use \cs{zcsetup} instead. -\DescribeOption{titleref} % -\DescribeOption{vario} % -The \opt{titleref} option receives no value and, when given, loads -\pkg{zref}'s \pkg{zref-titleref} module. Similarly, the \opt{vario} option -loads the \pkg{zref-vario} package. These are a preamble only options. Note -that \pkg{zref-vario} loads \pkg{varioref}, which has known load order -interaction with other packages, prominently with \pkg{hyperref}. Hence, -depending on your document, you may wish to load \pkg{zref-vario} separately, -instead of through the option. - \DescribeOption{note} % The \opt{note} option receives as value some text to be typeset at the end of the whole reference list. It is separated from it by \opt{notesep} (see @@ -725,15 +718,14 @@ the whole reference list. It is separated from it by \opt{notesep} (see \DescribeOption{check} % Provides integration of \pkg{zref-clever} with the \pkg{zref-check} package. -In the preamble, the \opt{check} option receives no value and, when given, -loads \pkg{zref-check}. In the document body, \opt{check} requires a value, -which works exactly like the optional argument of \cs{zcheck}, and can receive -both checks and \cs{zcheck}'s options. And the checks are performed for each -label in \marg{labels} received as argument by \cs{zcref}. See the User -manual of \pkg{zref-check} for details. The checks done by the \opt{check} -option in \cs{zcref} comprise the complete reference, including the \opt{note} -(see \zcref{sec:reference-format}). If \pkg{zref-check} was not loaded in the -preamble, at begin document the option is made no-op and issues a warning. +The option is only functional in the document body and if \pkg{zref-check} has +been loaded. \opt{check} requires a value, which works exactly like the +optional argument of \cs{zcheck}, and can receive both checks and +\cs{zcheck}'s options. And the checks are performed for each label in +\marg{labels} received as argument by \cs{zcref}. See the User manual of +\pkg{zref-check} for details. The checks done by the \opt{check} option in +\cs{zcref} comprise the complete reference, including the \opt{note} (see +\zcref{sec:reference-format}). \DescribeOption{countertype} % The \opt{countertype} option allows to specify the ``reference type'' of each @@ -934,14 +926,8 @@ formatting at low precedence levels, and the users can easily and conveniently override them as desired. ``General'' options (i) can be given by the user in the optional argument of -\cs{zcref}, but also set through \cs{zcsetup} or even, depending on the case, -as package options at load-time (see \zcref{sec:options}).\footnote{The use of - \cs{zcsetup} for global reference format settings is recommended though. - Whether you can use load-time options or not depends on the values of the - options: due to how \LaTeX{} handles package options, if the values of the - options you are setting include \emph{commands} you can't set them at - load-time, and rather \emph{must} use \cs{zcsetup}.} ``Type'' specific -options (ii) are handled by \cs{zcRefTypeSetup} (see +\cs{zcref}, but also set through \cs{zcsetup} (see \zcref{sec:options}). +``Type'' specific options (ii) are handled by \cs{zcRefTypeSetup} (see \zcref{sec:user-interface}). ``Language'' options, whether ``type'' specific (iii) or ``default'' (iv) have their user interface in \cs{zcLanguageSetup}, and have their values populated by the package's built-in language files (see @@ -1547,14 +1533,14 @@ set around a cross-reference ``task'' we'd like to perform with position between the reference and the label being referred to using \pkg{varioref}.} -\pkg{zref-vario}, which can be enabled with package option \opt{vario}, offers -a layer of compatibility with \pkg{varioref} and provides -\texttt{\textbackslash{}z}\dots{} counterparts for the latter's main reference -commands. +The \pkg{zref-vario} package offers a layer of compatibility with +\pkg{varioref} and provides \texttt{\textbackslash{}z}\dots{} counterparts for +the latter's main reference commands. \begin{zchowto}[caption={\pkg{zref-vario}}] \documentclass{article} -\usepackage[vario]{zref-clever} +\usepackage{zref-clever} +\usepackage{zref-vario} \begin{document} \section{Section 1} \zlabel{sec:section-1} @@ -2298,6 +2284,7 @@ were generously provided by (in chronological order): % 2021-09-06: https://github.com/ho-tex/zref/issues/13 % 2021-10-26: https://github.com/latex3/latex2e/issues/687 % 2022-01-12: https://chat.stackexchange.com/transcript/message/60129233#60129233 + % 2022-04-09: https://github.com/latex3/hyperref/issues/229#issuecomment-1093870142 Phelype Oleinik, % 2021-08-20: https://tex.stackexchange.com/q/611370 (comments) % 2021-09-09: https://tex.stackexchange.com/a/614704 @@ -2356,8 +2343,10 @@ Thank you all very much! A change log with relevant changes for each version, eventual upgrade instructions, and upcoming changes, is maintained in the package's repository, -at \url{https://github.com/gusbrs/zref-clever/blob/main/CHANGELOG.md}. An -archive of historical versions of the package is also kept at -\url{https://github.com/gusbrs/zref-clever/releases}. +at \url{https://github.com/gusbrs/zref-clever/blob/main/CHANGELOG.md}. The +change log is also distributed with the package's documentation through CTAN +upon release so, most likely, \texttt{texdoc zref-clever/changelog} should +provide easy local access to it. An archive of historical versions of the +package is also kept at \url{https://github.com/gusbrs/zref-clever/releases}. \end{document} 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 5464fb5575f..79eb3dd2852 100644 --- a/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx +++ b/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx @@ -24,7 +24,7 @@ % zref-clever.ins, % zref-clever.tex, % zref-clever-code.tex, -% and the files listed in MANIFEST.md. +% and the files generated from them. % % The released version of this package is available from CTAN. % @@ -46,7 +46,10 @@ % Have \GetFileInfo pick up date and version data and used in the % documentation. -\usepackage[cap,nameinlink=false,check,titleref]{zref-clever} +\usepackage{zref-clever} +\zcsetup{cap,nameinlink=false} +\usepackage{zref-check} +\usepackage{zref-titleref} \begin{document} @@ -162,7 +165,7 @@ % % Identify the package. % \begin{macrocode} -\ProvidesExplPackage {zref-clever} {2022-02-11} {0.2.2-alpha} +\ProvidesExplPackage {zref-clever} {2022-04-22} {0.3.0} {Clever LaTeX cross-references based on zref} % \end{macrocode} % @@ -176,7 +179,6 @@ \RequirePackage { zref-base } \RequirePackage { zref-user } \RequirePackage { zref-abspage } -\RequirePackage { l3keys2e } \RequirePackage { ifdraft } % \end{macrocode} % @@ -453,20 +455,18 @@ % luckily however, we have \texttt{abspage} which solves this problem. But we % can decide whether two labels can be compressed into a range or not based on % this format: if they are identical, we can compress them, otherwise, we -% can't. To do so, we locally redefine \cs{c@page} to return ``1'', thus -% avoiding any global spillovers of this trick. Since this operation is not -% expandable we cannot run it directly from the property definition. Hence, -% we use a shipout hook, and set \cs{g_@@_page_format_tl}, which can then be -% retrieved by the starred definition of -% \texttt{\cs{zref@newprop}*\{zc@pgfmt\}}. +% can't. To do so, we locally set \cs{c@page} to ``1'', thus avoiding any +% global spillovers of this trick. Since this operation is not expandable we +% cannot run it directly from the property definition. Hence, we use a +% shipout hook, and set \cs{g_@@_page_format_tl}, which can then be retrieved +% by the starred definition of \texttt{\cs{zref@newprop}*\{zc@pgfmt\}}. % % \begin{macrocode} \tl_new:N \g_@@_page_format_tl -\cs_new_protected:Npx \@@_page_format_aux: { \int_eval:n { 1 } } \AddToHook { shipout / before } { \group_begin: - \cs_set_eq:NN \c@page \@@_page_format_aux: + \int_set:Nn \c@page { 1 } \tl_gset:Nx \g_@@_page_format_tl { \thepage } \group_end: } @@ -620,11 +620,6 @@ } \msg_new:nnn { zref-clever } { missing-hyperref } { Missing~'hyperref'~package.~Setting~'hyperref=false'. } -\msg_new:nnn { zref-clever } { titleref-preamble-only } - { - Option~'titleref'~only~available~in~the~preamble~\msg_line_context:.~ - Did~you~mean~'ref=title'?. - } \msg_new:nnn { zref-clever } { option-preamble-only } { Option~'#1'~only~available~in~the~preamble~\msg_line_context:. } \msg_new:nnn { zref-clever } { unknown-compat-module } @@ -665,6 +660,11 @@ Option~'#1'~has~been~deprecated~\msg_line_context:.\iow_newline: Use~'#2'~instead. } +\msg_new:nnn { zref-clever } { load-time-options } + { + 'zref-clever'~does~not~accept~load-time~options.~ + To~configure~package~options,~use~'\iow_char:N\\zcsetup'. + } % \end{macrocode} % % @@ -3626,17 +3626,8 @@ % \end{macrocode} % % -% % \subsubsection*{\opt{font} option} % -% \opt{font} \emph{can't be used as a package option}, since the options get -% expanded by \LaTeX{} before being passed to the package (see -% \url{https://tex.stackexchange.com/a/489570}). It can be set in \cs{zcref} -% and, for global settings, with \cs{zcsetup}. Note that, technically, the -% ``raw'' options are already available as \cs{@raw@opt@\meta{package}.sty} -% (helpful comment by \contributor{David Carlisle} at -% \url{https://tex.stackexchange.com/a/618439}). -% % \begin{macrocode} \tl_new:N \l_@@_ref_typeset_font_tl \keys_define:nn { zref-clever/reference } @@ -3644,22 +3635,17 @@ % \end{macrocode} % % -% % \subsubsection*{\opt{titleref} option} % % \begin{macrocode} \keys_define:nn { zref-clever/reference } { - titleref .code:n = { \RequirePackage { zref-titleref } } , - titleref .value_forbidden:n = true , - } -\AddToHook { begindocument } - { - \keys_define:nn { zref-clever/reference } + titleref .code:n = { - titleref .code:n = - { \msg_warning:nn { zref-clever } { titleref-preamble-only } } - } + % NOTE Option deprecated in 2022-04-22 for 0.3.0. + \msg_warning:nnxx { zref-clever }{ option-deprecated } { titleref } + { \iow_char:N\\usepackage\iow_char:N\{zref-titleref\iow_char:N\} } + } , } % \end{macrocode} % @@ -3669,19 +3655,12 @@ % \begin{macrocode} \keys_define:nn { zref-clever/reference } { - vario .code:n = { \RequirePackage { zref-vario } } , - vario .value_forbidden:n = true , - } -\AddToHook { begindocument } - { - \keys_define:nn { zref-clever/reference } + vario .code:n = { - vario .code:n = - { - \msg_warning:nnn { zref-clever } - { option-preamble-only } { vario } - } - } + % NOTE Option deprecated in 2022-04-22 for 0.3.0. + \msg_warning:nnxx { zref-clever }{ option-deprecated } { vario } + { \iow_char:N\\usepackage\iow_char:N\{zref-vario\iow_char:N\} } + } , } % \end{macrocode} % @@ -3707,8 +3686,8 @@ \bool_new:N \l_@@_zcref_with_check_bool \keys_define:nn { zref-clever/reference } { - check .code:n = { \RequirePackage { zref-check } } , - check .value_forbidden:n = true , + check .code:n = + { \msg_warning:nnn { zref-clever } { option-document-only } { check } } , } \AddToHook { begindocument } { @@ -4116,8 +4095,8 @@ % potentially apply them selectively to different contexts: \texttt{label} and % \texttt{reference}. Currently, the only use of this selection is the % ability to exclude label related options from \cs{zcref}'s options. Anyway, -% for load-time package options and for \cs{zcsetup} we want the whole set, so -% we aggregate the two into \texttt{zref-clever/zcsetup}, and use that here. +% for package options (\cs{zcsetup}) we want the whole set, so we aggregate +% the two into \texttt{zref-clever/zcsetup}, and use that here. % % \begin{macrocode} \keys_define:nn { } @@ -4131,14 +4110,20 @@ % \end{macrocode} % % -% Process load-time package options -% (\url{https://tex.stackexchange.com/a/15840}). +% \pkg{zref-clever} does not accept load-time options. Despite the tradition +% of so doing, Joseph Wright has a point in recommending otherwise at +% \url{https://chat.stackexchange.com/transcript/message/60360822#60360822}: +% separating ``loading the package'' from ``configuring the package'' grants +% less trouble with ``option clashes'' and with expansion of options at +% load-time. % \begin{macrocode} -\ProcessKeysOptions { zref-clever/zcsetup } +\bool_lazy_and:nnT + { \tl_if_exist_p:c { opt@ zref-clever.sty } } + { ! \tl_if_empty_p:c { opt@ zref-clever.sty } } + { \msg_warning:nn { zref-clever } { load-time-options } } % \end{macrocode} % % -% % \section{Configuration} % % \subsection{\cs{zcsetup}} @@ -6461,8 +6446,7 @@ { \exp_not:N \group_begin: \exp_not:V \l_@@_namefont_tl - % It's two `@s', but escaped for DocStrip. - \exp_not:N \hyper@@@@link + \@@_hyperlink:nnn { \@@_extract_url_unexp:V \l_@@_type_first_label_tl @@ -6800,6 +6784,10 @@ } } } + % We just closed a range, reset `range_beg_is_first' in case a + % second range for the same type occurs, in which case its + % `range_beg' will no longer be `first'. + \bool_set_false:N \l_@@_range_beg_is_first_bool % Reset counters. \int_zero:N \l_@@_range_count_int \int_zero:N \l_@@_range_same_count_int @@ -6877,8 +6865,7 @@ \exp_not:N \group_begin: \exp_not:V \l_@@_reffont_tl \seq_item:Nn #2 { 1 } - % It's two `@s', but escaped for DocStrip. - \exp_not:N \hyper@@@@link + \@@_hyperlink:nnn { \@@_extract_url_unexp:n {#1} } { \@@_extract_unexp:nnn {#1} { anchor } { } } { @@ -6927,8 +6914,7 @@ \exp_not:N \group_begin: \exp_not:V \l_@@_reffont_tl \seq_item:Nn #3 { 1 } - % It's two `@s', but escaped for DocStrip. - \exp_not:N \hyper@@@@link + \@@_hyperlink:nnn { \@@_extract_url_unexp:n {#1} } { \@@_extract_unexp:nnn {#1} { anchor } { } } { @@ -6978,8 +6964,7 @@ { \l_@@_ref_property_tl } { \exp_not:N \group_begin: - % It's two `@s', but escaped for DocStrip. - \exp_not:N \hyper@@@@link + \@@_hyperlink:nnn { \@@_extract_url_unexp:V \l_@@_type_first_label_tl @@ -7045,8 +7030,7 @@ \exp_not:V \l_@@_reffont_tl \seq_item:Nn \l_@@_type_first_refbounds_seq { 1 } - % It's two `@s', but escaped for DocStrip. - \exp_not:N \hyper@@@@link + \@@_hyperlink:nnn { \@@_extract_url_unexp:V \l_@@_type_first_label_tl @@ -7341,6 +7325,25 @@ % \end{macro} % % +% \begin{macro}{\@@_hyperlink:nnn} +% This avoids using the internal \cs[replace=false]{hyper@@link}, using only +% public \pkg{hyperref} commands (see +% \url{https://github.com/latex3/hyperref/issues/229#issuecomment-1093870142}, +% thanks \contributor{Ulrike Fisher}). +% \begin{syntax} +% \cs{@@_hyperlink:nnn} \Arg{url/file} \Arg{anchor} \Arg{text} +% \end{syntax} +% \begin{macrocode} +\cs_new_protected:Npn \@@_hyperlink:nnn #1#2#3 + { + \tl_if_empty:nTF {#1} + { \hyperlink {#2} {#3} } + { \hyper@linkfile {#3} {#1} {#2} } + } +% \end{macrocode} +% \end{macro} +% +% % \begin{macro}{\@@_extract_url_unexp:n} % A convenience auxiliary function for extraction of the \texttt{url} / % \texttt{urluse} property, provided by the \pkg{zref-xr} module. Ensure 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 69c052679e4..bcad3db50ab 100644 --- a/Master/texmf-dist/source/latex/zref-clever/zref-clever.ins +++ b/Master/texmf-dist/source/latex/zref-clever/zref-clever.ins @@ -24,7 +24,7 @@ % zref-clever.ins, % zref-clever.tex, % zref-clever-code.tex, -% and the files listed in MANIFEST.md. +% and the files generated from them. % % The released version of this package is available from CTAN. % @@ -70,7 +70,7 @@ This work consists of the files zref-clever.dtx, zref-clever.ins, zref-clever.tex, zref-clever-code.tex, - and the files listed in MANIFEST.md. + and the files generated from them. The released version of this package is available from CTAN. 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 cb619f5f24f..dbe26ed4214 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 @@ -28,7 +28,7 @@ %% zref-clever.ins, %% zref-clever.tex, %% zref-clever-code.tex, -%% and the files listed in MANIFEST.md. +%% and the files generated from them. %% %% The released version of this package is available from CTAN. %% 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 d5aee7b1912..03d3e2c6b7a 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 @@ -28,7 +28,7 @@ %% zref-clever.ins, %% zref-clever.tex, %% zref-clever-code.tex, -%% and the files listed in MANIFEST.md. +%% and the files generated from them. %% %% The released version of this package is available from CTAN. %% 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 22930160de0..6de79d0d030 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 @@ -28,7 +28,7 @@ %% zref-clever.ins, %% zref-clever.tex, %% zref-clever-code.tex, -%% and the files listed in MANIFEST.md. +%% and the files generated from them. %% %% The released version of this package is available from CTAN. %% 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 ff39f2e8773..ad3a6977714 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 @@ -28,7 +28,7 @@ %% zref-clever.ins, %% zref-clever.tex, %% zref-clever-code.tex, -%% and the files listed in MANIFEST.md. +%% and the files generated from them. %% %% The released version of this package is available from CTAN. %% 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 6b4baabf0c6..038a08513d1 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 @@ -28,7 +28,7 @@ %% zref-clever.ins, %% zref-clever.tex, %% zref-clever-code.tex, -%% and the files listed in MANIFEST.md. +%% and the files generated from them. %% %% The released version of this package is available from CTAN. %% 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 1fb85b235a3..e57a4635948 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 @@ -28,7 +28,7 @@ %% zref-clever.ins, %% zref-clever.tex, %% zref-clever-code.tex, -%% and the files listed in MANIFEST.md. +%% and the files generated from them. %% %% The released version of this package is available from CTAN. %% 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 e858e351280..8bc23d4330c 100644 --- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty +++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty @@ -28,7 +28,7 @@ %% zref-clever.ins, %% zref-clever.tex, %% zref-clever-code.tex, -%% and the files listed in MANIFEST.md. +%% and the files generated from them. %% %% The released version of this package is available from CTAN. %% @@ -53,12 +53,11 @@ }% \endinput }% -\ProvidesExplPackage {zref-clever} {2022-02-11} {0.2.2-alpha} +\ProvidesExplPackage {zref-clever} {2022-04-22} {0.3.0} {Clever LaTeX cross-references based on zref} \RequirePackage { zref-base } \RequirePackage { zref-user } \RequirePackage { zref-abspage } -\RequirePackage { l3keys2e } \RequirePackage { ifdraft } \zref@newprop { zc@counter } { \l__zrefclever_current_counter_tl } \zref@addprop \ZREF@mainlist { zc@counter } @@ -138,11 +137,10 @@ } \zref@addprop \ZREF@mainlist { zc@enclval } \tl_new:N \g__zrefclever_page_format_tl -\cs_new_protected:Npx \__zrefclever_page_format_aux: { \int_eval:n { 1 } } \AddToHook { shipout / before } { \group_begin: - \cs_set_eq:NN \c@page \__zrefclever_page_format_aux: + \int_set:Nn \c@page { 1 } \tl_gset:Nx \g__zrefclever_page_format_tl { \thepage } \group_end: } @@ -262,11 +260,6 @@ } \msg_new:nnn { zref-clever } { missing-hyperref } { Missing~'hyperref'~package.~Setting~'hyperref=false'. } -\msg_new:nnn { zref-clever } { titleref-preamble-only } - { - Option~'titleref'~only~available~in~the~preamble~\msg_line_context:.~ - Did~you~mean~'ref=title'?. - } \msg_new:nnn { zref-clever } { option-preamble-only } { Option~'#1'~only~available~in~the~preamble~\msg_line_context:. } \msg_new:nnn { zref-clever } { unknown-compat-module } @@ -307,6 +300,11 @@ Option~'#1'~has~been~deprecated~\msg_line_context:.\iow_newline: Use~'#2'~instead. } +\msg_new:nnn { zref-clever } { load-time-options } + { + 'zref-clever'~does~not~accept~load-time~options.~ + To~configure~package~options,~use~'\iow_char:N\\zcsetup'. + } \cs_new_protected:Npn \__zrefclever_extract_default:Nnnn #1#2#3#4 { \exp_args:NNNo \exp_args:NNo \tl_set:Nn #1 @@ -2285,32 +2283,21 @@ { font .tl_set:N = \l__zrefclever_ref_typeset_font_tl } \keys_define:nn { zref-clever/reference } { - titleref .code:n = { \RequirePackage { zref-titleref } } , - titleref .value_forbidden:n = true , - } -\AddToHook { begindocument } - { - \keys_define:nn { zref-clever/reference } + titleref .code:n = { - titleref .code:n = - { \msg_warning:nn { zref-clever } { titleref-preamble-only } } - } + % NOTE Option deprecated in 2022-04-22 for 0.3.0. + \msg_warning:nnxx { zref-clever }{ option-deprecated } { titleref } + { \iow_char:N\\usepackage\iow_char:N\{zref-titleref\iow_char:N\} } + } , } \keys_define:nn { zref-clever/reference } { - vario .code:n = { \RequirePackage { zref-vario } } , - vario .value_forbidden:n = true , - } -\AddToHook { begindocument } - { - \keys_define:nn { zref-clever/reference } + vario .code:n = { - vario .code:n = - { - \msg_warning:nnn { zref-clever } - { option-preamble-only } { vario } - } - } + % NOTE Option deprecated in 2022-04-22 for 0.3.0. + \msg_warning:nnxx { zref-clever }{ option-deprecated } { vario } + { \iow_char:N\\usepackage\iow_char:N\{zref-vario\iow_char:N\} } + } , } \tl_new:N \l__zrefclever_zcref_note_tl \keys_define:nn { zref-clever/reference } @@ -2322,8 +2309,8 @@ \bool_new:N \l__zrefclever_zcref_with_check_bool \keys_define:nn { zref-clever/reference } { - check .code:n = { \RequirePackage { zref-check } } , - check .value_forbidden:n = true , + check .code:n = + { \msg_warning:nnn { zref-clever } { option-document-only } { check } } , } \AddToHook { begindocument } { @@ -2613,7 +2600,10 @@ zref-clever/reference , } } -\ProcessKeysOptions { zref-clever/zcsetup } +\bool_lazy_and:nnT + { \tl_if_exist_p:c { opt@ zref-clever.sty } } + { ! \tl_if_empty_p:c { opt@ zref-clever.sty } } + { \msg_warning:nn { zref-clever } { load-time-options } } \NewDocumentCommand \zcsetup { m } { \__zrefclever_zcsetup:n {#1} } \cs_new_protected:Npn \__zrefclever_zcsetup:n #1 @@ -4383,8 +4373,7 @@ { \exp_not:N \group_begin: \exp_not:V \l__zrefclever_namefont_tl - % It's two `@s', but escaped for DocStrip. - \exp_not:N \hyper@@link + \__zrefclever_hyperlink:nnn { \__zrefclever_extract_url_unexp:V \l__zrefclever_type_first_label_tl @@ -4715,6 +4704,10 @@ } } } + % We just closed a range, reset `range_beg_is_first' in case a + % second range for the same type occurs, in which case its + % `range_beg' will no longer be `first'. + \bool_set_false:N \l__zrefclever_range_beg_is_first_bool % Reset counters. \int_zero:N \l__zrefclever_range_count_int \int_zero:N \l__zrefclever_range_same_count_int @@ -4740,8 +4733,7 @@ \exp_not:N \group_begin: \exp_not:V \l__zrefclever_reffont_tl \seq_item:Nn #2 { 1 } - % It's two `@s', but escaped for DocStrip. - \exp_not:N \hyper@@link + \__zrefclever_hyperlink:nnn { \__zrefclever_extract_url_unexp:n {#1} } { \__zrefclever_extract_unexp:nnn {#1} { anchor } { } } { @@ -4782,8 +4774,7 @@ \exp_not:N \group_begin: \exp_not:V \l__zrefclever_reffont_tl \seq_item:Nn #3 { 1 } - % It's two `@s', but escaped for DocStrip. - \exp_not:N \hyper@@link + \__zrefclever_hyperlink:nnn { \__zrefclever_extract_url_unexp:n {#1} } { \__zrefclever_extract_unexp:nnn {#1} { anchor } { } } { @@ -4819,8 +4810,7 @@ { \l__zrefclever_ref_property_tl } { \exp_not:N \group_begin: - % It's two `@s', but escaped for DocStrip. - \exp_not:N \hyper@@link + \__zrefclever_hyperlink:nnn { \__zrefclever_extract_url_unexp:V \l__zrefclever_type_first_label_tl @@ -4886,8 +4876,7 @@ \exp_not:V \l__zrefclever_reffont_tl \seq_item:Nn \l__zrefclever_type_first_refbounds_seq { 1 } - % It's two `@s', but escaped for DocStrip. - \exp_not:N \hyper@@link + \__zrefclever_hyperlink:nnn { \__zrefclever_extract_url_unexp:V \l__zrefclever_type_first_label_tl @@ -5161,6 +5150,12 @@ { \bool_set_false:N \l__zrefclever_name_in_link_bool } } } +\cs_new_protected:Npn \__zrefclever_hyperlink:nnn #1#2#3 + { + \tl_if_empty:nTF {#1} + { \hyperlink {#2} {#3} } + { \hyper@linkfile {#3} {#1} {#2} } + } \cs_new:Npn \__zrefclever_extract_url_unexp:n #1 { \zref@ifpropundefined { urluse } -- cgit v1.2.3