diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
7 files changed, 45 insertions, 50 deletions
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 } |