diff options
Diffstat (limited to 'macros/latex')
67 files changed, 193 insertions, 955 deletions
diff --git a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf Binary files differindex 52e0ee69b9..a2c8ba5bb6 100644 --- a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf +++ b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf Binary files differindex 0e13a6a783..6718d07e1c 100644 --- a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf Binary files differindex 0ca6fbf7b4..372a14dcd5 100644 --- a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf Binary files differindex dacdb815cc..4b412e8c94 100644 --- a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf Binary files differindex 24f9234d3a..7481913d9e 100644 --- a/macros/latex/contrib/reledmac/examples/1-tabular.pdf +++ b/macros/latex/contrib/reledmac/examples/1-tabular.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf Binary files differindex 0dbfd26819..bf23212e5f 100644 --- a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf +++ b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf Binary files differindex 4714d36aaa..d92d74d5e3 100644 --- a/macros/latex/contrib/reledmac/examples/1-verses.pdf +++ b/macros/latex/contrib/reledmac/examples/1-verses.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf Binary files differindex b2f7d9dbd1..101950acdd 100644 --- a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf +++ b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf Binary files differindex f7fe778829..73961b2311 100644 --- a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf Binary files differindex a8b2878c6a..3132c5d3aa 100644 --- a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf Binary files differindex 4d774ab937..04ed547699 100644 --- a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf +++ b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf Binary files differindex e6c2e394ad..0c0fbad885 100644 --- a/macros/latex/contrib/reledmac/examples/2-indexing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-indexing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf Binary files differindex 8910032e30..5d1594698e 100644 --- a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf +++ b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf Binary files differindex 71b8ef74fa..44c9ca68ae 100644 --- a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf +++ b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf Binary files differindex 4e3bb139ff..ce1e005316 100644 --- a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf Binary files differindex a1cae283ac..c3f10d9bab 100644 --- a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf +++ b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf Binary files differindex 9c6aac015c..2d2ddd6780 100644 --- a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf +++ b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf Binary files differindex de9737c957..fc5afbfa26 100644 --- a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf +++ b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf Binary files differindex 5e5f81f926..48a9b6289d 100644 --- a/macros/latex/contrib/reledmac/examples/2-performances.pdf +++ b/macros/latex/contrib/reledmac/examples/2-performances.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf Binary files differindex 0c5923f736..dd00c33a60 100644 --- a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf +++ b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf Binary files differindex 6a5768b2c3..3963fa9cf0 100644 --- a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf +++ b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf Binary files differindex 890775aa8f..b1cce47306 100644 --- a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf Binary files differindex 4888687cb7..8fb7815549 100644 --- a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf Binary files differindex 77e54cad8e..cd60587a70 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf Binary files differindex aeff29034d..bd7d288890 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf Binary files differindex 9b784e226f..a036d76974 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf Binary files differindex 37a5e0cbfd..526eab6028 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf Binary files differindex 8b011435c7..2ea055f0e6 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf Binary files differindex 004d0254ba..84fa9f70ee 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf Binary files differindex 562dcc24e5..9074228adc 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf Binary files differindex c00cfc3dc3..47e23321e1 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf Binary files differindex 093826dca2..9615eca582 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf Binary files differindex 0cc644e116..c45fd43eda 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf Binary files differindex 3bcff728d7..4ee71747c2 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf Binary files differindex 5c93f1889e..d11ecdce7c 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf Binary files differindex 9567cce5d6..07b85c0036 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf Binary files differindex 6c1a1367f4..eb9a8e2aa3 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf Binary files differindex 0a591cbfa6..ea0ed3234b 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf Binary files differindex 360c29f86c..5a3661bc4e 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf Binary files differindex 29e9d5d4f9..f4978b8e85 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf Binary files differindex 646f208859..edda5a1570 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf Binary files differindex 5c849ca877..0a5a91ac26 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf Binary files differindex 6d2d332fec..0b67d713d5 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf Binary files differindex a8082e7469..20724af5b3 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf Binary files differindex d9a17ed624..8fb2a74cb2 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf Binary files differindex f3cd521397..972199e49d 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf Binary files differindex ea2f620516..7bb32f83fa 100644 --- a/macros/latex/contrib/reledmac/migration.pdf +++ b/macros/latex/contrib/reledmac/migration.pdf diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx index 33fe898c87..a5b00a144a 100644 --- a/macros/latex/contrib/reledmac/reledmac.dtx +++ b/macros/latex/contrib/reledmac/reledmac.dtx @@ -14320,7 +14320,7 @@ {% \global\skip\csuse{footins#1}=\csuse{beforenotesX@\firstseriesX@}% \global\advance\skip\csname footins#1\endcsname by\csuse{afterruleX@#1}% - \gdef\firstXseries@{#1}% + \gdef\firstseriesX@{#1}% }% {}% }% diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf Binary files differindex 39b184defb..4bf3db4261 100644 --- a/macros/latex/contrib/reledmac/reledmac.pdf +++ b/macros/latex/contrib/reledmac/reledmac.pdf diff --git a/macros/latex/contrib/reledmac/reledpar.dtx b/macros/latex/contrib/reledmac/reledpar.dtx index 55d7ea094b..b2f8fb7d88 100644 --- a/macros/latex/contrib/reledmac/reledpar.dtx +++ b/macros/latex/contrib/reledmac/reledpar.dtx @@ -349,7 +349,8 @@ % \changes{v2.24.3}{2020/11/08}{Fix bug with hanging verse in parallel typesetting.} % \changes{v2.25.0}{2020/11/29}{Add compatibility with \protect\cs{linenumannotationothersidetrue} of \protect\macpackage.}. % \changes{v2.25.1}{2021/01/21}{\protect\cs{ifsublines@R} migrated to \protect\macpackage} -% \changes{v2.25.2}{2021/09/27}{Fix incompatibility with \protect\package{babel} v.3.61} +% \changes{v2.25.2}{2021/09/27}{Fix incompatibility with \protect\package{babel} v3.61} +% \changes{v2.25.3}{2022/04/22}{Fix incompatibility with \protect\package{polyglossia} v1.55} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1406,7 +1407,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2021/09/27 v2.25.2 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2022/04/22 v2.25.3 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -1586,7 +1587,7 @@ % \begin{macrocode} \newcommand{\led@err@polyglossiaTooOld}{% \reledpar@error{You use the polyglosia package.% - \MessageBreak However, reledpar requires version 2020/04/08 v1.49 or later of the polyglossia package.% + \MessageBreak However, reledpar requires version 2022/04/10 v1.55 or later of the polyglossia package.% \MessageBreak Please update your polyglossia version}{\@ehc}% }% % \end{macrocode} @@ -5638,24 +5639,25 @@ % \changes{v2.23.0}{2020/03/08}{Restore compatibility with versions of polyglossia prior to v1.45.} % \begin{macrocode} {% - \@ifpackagelater{polyglossia}{2020/04/08}{}{\led@err@polyglossiaTooOld}% + \@ifpackagelater{polyglossia}{2022/04/10}{}{\led@err@polyglossiaTooOld}% \let\old@otherlanguage\otherlanguage% \renewcommand{\otherlanguage}[2][]{% - \xpg@set@group@aux% \selectlanguage[#1]{#2}% + \xpg@set@language@only@aux[#1]{#2}% \ifledRcol \gdef\theledlanguageR{#2}% \else \gdef\theledlanguageL{#2}% \fi}% \renewcommand{\l@duselanguage}[1]{% \csuse{no\languagename @numbers}% - \@select@language{#1}% + \expandafter\@select@language\expandafter{#1}% }% - \gdef\theledlanguageL{\xpg@main@language}% - \gdef\theledlanguageR{\xpg@main@language}% + \xdef\theledlanguageL{\xpg@main@language}% + \xdef\theledlanguageR{\xpg@main@language}% % \end{macrocode} % That is it. % \begin{macrocode} -}} + }% +}% % \end{macrocode} % \end{macro} % \end{macro} diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf Binary files differindex 46cfe195bf..5749dd6b44 100644 --- a/macros/latex/contrib/reledmac/reledpar.pdf +++ b/macros/latex/contrib/reledmac/reledpar.pdf diff --git a/macros/latex/contrib/zref-check/CHANGELOG.md b/macros/latex/contrib/zref-check/CHANGELOG.md index 76f4d6b20b..d74dbe3dad 100644 --- a/macros/latex/contrib/zref-check/CHANGELOG.md +++ b/macros/latex/contrib/zref-check/CHANGELOG.md @@ -1,6 +1,15 @@ # Changelog -## [Unreleased](https://github.com/gusbrs/zref-check/compare/v0.2.5...HEAD) +## [Unreleased](https://github.com/gusbrs/zref-check/compare/v0.3.0...HEAD) + +## [v0.3.0](https://github.com/gusbrs/zref-check/compare/v0.2.5...v0.3.0) (2022-04-22) + +### Changed +- `zref-check` no longer accepts package options to be set a load-time, + `\zrefchecksetup` 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. ## [v0.2.5](https://github.com/gusbrs/zref-check/compare/v0.2.4...v0.2.5) (2022-02-11) diff --git a/macros/latex/contrib/zref-check/MANIFEST.md b/macros/latex/contrib/zref-check/MANIFEST.md deleted file mode 100644 index 7a204e9782..0000000000 --- a/macros/latex/contrib/zref-check/MANIFEST.md +++ /dev/null @@ -1,284 +0,0 @@ -# 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-otherpage01.lvt -* zc-check-otherpage02.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-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-otherpage01.tlg -* zc-check-otherpage02.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-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/macros/latex/contrib/zref-check/zref-check-code.pdf b/macros/latex/contrib/zref-check/zref-check-code.pdf Binary files differindex 71e442e631..a1a9a62ba0 100644 --- a/macros/latex/contrib/zref-check/zref-check-code.pdf +++ b/macros/latex/contrib/zref-check/zref-check-code.pdf diff --git a/macros/latex/contrib/zref-check/zref-check-code.tex b/macros/latex/contrib/zref-check/zref-check-code.tex index 81efd7f4ec..5645430295 100644 --- a/macros/latex/contrib/zref-check/zref-check-code.tex +++ b/macros/latex/contrib/zref-check/zref-check-code.tex @@ -24,7 +24,7 @@ % zref-check.ins, % zref-check.tex, % zref-check-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/macros/latex/contrib/zref-check/zref-check.dtx b/macros/latex/contrib/zref-check/zref-check.dtx index 186173b35c..9647be95fe 100644 --- a/macros/latex/contrib/zref-check/zref-check.dtx +++ b/macros/latex/contrib/zref-check/zref-check.dtx @@ -24,7 +24,7 @@ % zref-check.ins, % zref-check.tex, % zref-check-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. % @@ -124,12 +124,14 @@ % \section{Loading the package} % \label{sec:loading-package} % -% As usual: +% \pkg{zref-check} can be loaded with the usual: % % \begin{syntax} -% \cs{usepackage}\oarg{options}|{zref-check}| +% \cs{usepackage}|{zref-check}| % \end{syntax} % +% The package does not accept load-time options, package options must be set +% using \cs{zrefchecksetup} (see Section~\ref{sec:user-interface}). % % % \section{Dependencies} @@ -469,7 +471,11 @@ % 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-check/blob/main/CHANGELOG.md}. +% \url{https://github.com/gusbrs/zref-check/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-check/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-check/releases}. % % % @@ -510,7 +516,7 @@ % % Identify the package. % \begin{macrocode} -\ProvidesExplPackage {zref-check} {2022-02-11} {0.2.5} +\ProvidesExplPackage {zref-check} {2022-04-22} {0.3.0} {Flexible cross-references with contextual checks based on zref} % \end{macrocode} % @@ -660,6 +666,11 @@ } \msg_new:nnn { zref-check } { option-deprecated } { Option~'#1'~has~been~deprecated~\msg_line_context:. } +\msg_new:nnn { zref-check } { load-time-options } + { + 'zref-check'~does~not~accept~load-time~options.~ + To~configure~package~options,~use~'\iow_char:N\\zrefchecksetup'. + } % \end{macrocode} % % @@ -918,11 +929,17 @@ % % \subsubsection*{Package options} % -% Process load-time package options -% (\url{https://tex.stackexchange.com/a/15840}). -% \begin{macrocode} -\RequirePackage { l3keys2e } -\ProcessKeysOptions { zref-check } +% \pkg{zref-check} 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} +\bool_lazy_and:nnT + { \tl_if_exist_p:c { opt@ zref-check.sty } } + { ! \tl_if_empty_p:c { opt@ zref-check.sty } } + { \msg_warning:nn { zref-check } { load-time-options } } % \end{macrocode} % % diff --git a/macros/latex/contrib/zref-check/zref-check.ins b/macros/latex/contrib/zref-check/zref-check.ins index 312a34c124..fe58b39e69 100644 --- a/macros/latex/contrib/zref-check/zref-check.ins +++ b/macros/latex/contrib/zref-check/zref-check.ins @@ -24,7 +24,7 @@ % zref-check.ins, % zref-check.tex, % zref-check-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-check.dtx, zref-check.ins, zref-check.tex, zref-check-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/macros/latex/contrib/zref-check/zref-check.pdf b/macros/latex/contrib/zref-check/zref-check.pdf Binary files differindex ecfd8ee3fa..fb0e239f4a 100644 --- a/macros/latex/contrib/zref-check/zref-check.pdf +++ b/macros/latex/contrib/zref-check/zref-check.pdf diff --git a/macros/latex/contrib/zref-check/zref-check.tex b/macros/latex/contrib/zref-check/zref-check.tex index 140d22bfd4..bed532befc 100644 --- a/macros/latex/contrib/zref-check/zref-check.tex +++ b/macros/latex/contrib/zref-check/zref-check.tex @@ -24,7 +24,7 @@ % zref-check.ins, % zref-check.tex, % zref-check-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/macros/latex/contrib/zref-clever/CHANGELOG.md b/macros/latex/contrib/zref-clever/CHANGELOG.md index 5023b04b7a..2a3f9bdbc4 100644 --- a/macros/latex/contrib/zref-clever/CHANGELOG.md +++ b/macros/latex/contrib/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/macros/latex/contrib/zref-clever/MANIFEST.md b/macros/latex/contrib/zref-clever/MANIFEST.md deleted file mode 100644 index 50b246d870..0000000000 --- a/macros/latex/contrib/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/macros/latex/contrib/zref-clever/zref-clever-code.pdf b/macros/latex/contrib/zref-clever/zref-clever-code.pdf Binary files differindex c77a6ef340..de4ac178cf 100644 --- a/macros/latex/contrib/zref-clever/zref-clever-code.pdf +++ b/macros/latex/contrib/zref-clever/zref-clever-code.pdf diff --git a/macros/latex/contrib/zref-clever/zref-clever-code.tex b/macros/latex/contrib/zref-clever/zref-clever-code.tex index edc439e5c3..e1bc9d0289 100644 --- a/macros/latex/contrib/zref-clever/zref-clever-code.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/zref-clever/zref-clever.dtx b/macros/latex/contrib/zref-clever/zref-clever.dtx index 5464fb5575..79eb3dd285 100644 --- a/macros/latex/contrib/zref-clever/zref-clever.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/zref-clever/zref-clever.ins b/macros/latex/contrib/zref-clever/zref-clever.ins index 69c052679e..bcad3db50a 100644 --- a/macros/latex/contrib/zref-clever/zref-clever.ins +++ b/macros/latex/contrib/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/macros/latex/contrib/zref-clever/zref-clever.pdf b/macros/latex/contrib/zref-clever/zref-clever.pdf Binary files differindex 2b439d1d54..213e51bf6b 100644 --- a/macros/latex/contrib/zref-clever/zref-clever.pdf +++ b/macros/latex/contrib/zref-clever/zref-clever.pdf diff --git a/macros/latex/contrib/zref-clever/zref-clever.tex b/macros/latex/contrib/zref-clever/zref-clever.tex index e26992005d..ee00821c16 100644 --- a/macros/latex/contrib/zref-clever/zref-clever.tex +++ b/macros/latex/contrib/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} |