From d53ffb157430428a59011124cd54d7f8bd64006a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 30 Sep 2023 20:11:20 +0000 Subject: glossaries-extra (30sep23) git-svn-id: svn://tug.org/texlive/trunk@68409 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/glossaries-extra/glossaries-extra.dtx | 435 ++++++++++++++++++--- .../latex/glossaries-extra/glossaries-extra.ins | 5 +- 2 files changed, 381 insertions(+), 59 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx index e35313a6dd3..43295fe47ba 100644 --- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx +++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx @@ -1,14 +1,15 @@ %\iffalse % glossaries-extra.dtx generated using makedtx version 1.2 (c) Nicola Talbot % Command line args: -% -codetitle "Main Package Code (glossaries-extra.sty)" % -doc "glossaries-extra-codedoc.tex" -% -author "Nicola Talbot" % -comment ".*\.tex" % -comment ".*\.bib" % -macrocode ".*\.tex" % -macrocode ".*\.bib" +% -section "section" +% -codetitle "Main Package Code (glossaries-extra.sty)" % -setambles ".*\.bib=>\nopreamble\nopostamble" +% -author "Nicola Talbot" % -src "glossaries-extra.sty\Z=>glossaries-extra.sty" % -src "(.+)\.def\Z=>\1.def" % -src "glossaries-extra-bib2gls.sty\Z=>glossaries-extra-bib2gls.sty" @@ -20,9 +21,8 @@ % -src "(example-glossaries-.+\.tex)\Z=>\1" % -src "(example-glossaries-.+\.bib)\Z=>\1" % -src "(glossar.+-2021-11-22.sty)\Z=>\1" -% -section "section" % glossaries-extra -% Created on 2023/6/28 12:44 +% Created on 2023/9/30 18:44 %\fi %\iffalse %<*package> @@ -57,7 +57,7 @@ glossaries-extra.dtx \documentclass{article} \usepackage{doc} -\CheckSum{71181} +\CheckSum{71195} \RecordChanges \PageIndex @@ -116,13 +116,13 @@ glossaries-extra.dtx \providecommand\oarg[1]{% \allowbreak{\ttfamily[}\meta{#1}{\ttfamily]}} -\title{glossaries-extra.sty v1.52: +\title{glossaries-extra.sty v1.53: documented code} \author{Nicola L.C. Talbot\\[10pt] Dickimaw Books\\ \url{http://www.dickimaw-books.com/}} -\date{2023-06-28} +\date{2023-09-29} \begin{document} \DocInput{glossaries-extra.dtx} @@ -153,11 +153,11 @@ Dickimaw Books\\ % Rollback releases: % \begin{macrocode} \DeclareRelease{v1.48}{2021-11-22}{glossaries-extra-2021-11-22.sty} -\DeclareCurrentRelease{v1.52}{2023-06-28} +\DeclareCurrentRelease{v1.53}{2023-09-29} % \end{macrocode} % Declare package: % \begin{macrocode} -\ProvidesPackage{glossaries-extra}[2023/06/28 v1.52 (NLCT)] +\ProvidesPackage{glossaries-extra}[2023/09/29 v1.53 (NLCT)] % \end{macrocode} % Requires \sty{xkeyval} to define package options. % \begin{macrocode} @@ -10227,21 +10227,48 @@ Dickimaw Books\\ % \begin{macrocode} }% % \end{macrocode} +%NB \sty{glossary-hypernav} v4.53 switched to \LaTeX3 sequences, so +%check for the existence of \cs{glsnavhypergroupdotarget}: +% \begin{macrocode} +\ifdef\glsnavhypergroupdotarget +{ +% \end{macrocode} +%\begin{macro}{\glsnavhypergroupdotarget} +%\changes{1.53}{2023-09-29}{added} +% \begin{macrocode} + \renewcommand\glsnavhypergroupdotarget[3]{% + \@glsxtr@do@org@target{\glsnavhyperlinkname{#1}{#2}}{#3}% + } +% \end{macrocode} +%\end{macro} +% \begin{macrocode} +} +{ +% \end{macrocode} % %\begin{macro}{\@glsnavhypertarget} -%Similarly for \cs{@glsnavhypertarget} +%Similarly for \cs{@glsnavhypertarget}. (NB this patch should not be +%used with \sty{glossaries} v4.53+) %\changes{1.48}{2021-11-22}{added patch} % \begin{macrocode} -\ifdef\@glsnavhypertarget -{% - \renewcommand*{\@glsnavhypertarget}[3]{% - \protected@write\@auxout{}{\string\@gls@hypergroup{#1}{#2}}% - \@glsxtr@do@org@target{\glsnavhyperlinkname{#1}{#2}}{#3}% - \ifcsdef{@gls@hypergrouplist@#1}% - {% - \letcs\@gls@list{@gls@hypergrouplist@#1}% - \protected@edef\@gls@thishypernavlabel{#2}% - \expandafter\DTLifinlist\expandafter{\@gls@thishypernavlabel}\@gls@list{}% + \ifdef\@glsnavhypertarget + {% + \renewcommand*{\@glsnavhypertarget}[3]{% + \protected@write\@auxout{}{\string\@gls@hypergroup{#1}{#2}}% + \@glsxtr@do@org@target{\glsnavhyperlinkname{#1}{#2}}{#3}% + \ifcsdef{@gls@hypergrouplist@#1}% + {% + \letcs\@gls@list{@gls@hypergrouplist@#1}% + \protected@edef\@gls@thishypernavlabel{#2}% + \expandafter\DTLifinlist\expandafter{\@gls@thishypernavlabel}\@gls@list{}% + {% + \GlossariesWarningNoLine{Navigation panel + for glossary type `#1'^^Jmissing group `#2'}% + \gdef\gls@hypergrouprerun{% + \GlossariesWarningNoLine{Navigation panel + has changed. Rerun LaTeX}}% + }% + }% {% \GlossariesWarningNoLine{Navigation panel for glossary type `#1'^^Jmissing group `#2'}% @@ -10250,16 +10277,9 @@ Dickimaw Books\\ has changed. Rerun LaTeX}}% }% }% - {% - \GlossariesWarningNoLine{Navigation panel - for glossary type `#1'^^Jmissing group `#2'}% - \gdef\gls@hypergrouprerun{% - \GlossariesWarningNoLine{Navigation panel - has changed. Rerun LaTeX}}% - }% - }% + } + {} } -{} % \end{macrocode} %\end{macro} % @@ -13480,26 +13500,45 @@ Dickimaw Books\\ % \end{macrocode} %\end{macro} % +% \begin{macrocode} +\ifdef\glsnavigationitem +{ +% \end{macrocode} +%\begin{macro}{\glsnavigationitem} +%\changes{1.52}{2023-09-23}{added} +% \begin{macrocode} + \renewcommand\glsnavigationitem[1]{% + \glsxtrgetgrouptitle{#1}{\@gls@grptitle}% + \glsnavhyperlink{#1}{\@gls@grptitle}% + } +% \end{macrocode} +%\end{macro} +% \begin{macrocode} +} +{ +% \end{macrocode} %\begin{macro}{\glsnavigation} %\changes{1.14}{2017-04-18}{new} -%Redefine to use new user-level command. +%Redefine to use new user-level command. This patch should not be +%used with \sty{glossaries} v4.53+. % \begin{macrocode} -\renewcommand*{\glsnavigation}{% - \def\@gls@between{}% - \ifcsundef{@gls@hypergrouplist@\@glo@type}% - {% - \def\@gls@list{}% - }% - {% - \expandafter\let\expandafter\@gls@list - \csname @gls@hypergrouplist@\@glo@type\endcsname - }% - \@for\@gls@tmp:=\@gls@list\do{% - \@gls@between - \glsxtrgetgrouptitle{\@gls@tmp}{\@gls@grptitle}% - \glsnavhyperlink{\@gls@tmp}{\@gls@grptitle}% - \let\@gls@between\glshypernavsep - }% + \renewcommand*{\glsnavigation}{% + \def\@gls@between{}% + \ifcsundef{@gls@hypergrouplist@\@glo@type}% + {% + \def\@gls@list{}% + }% + {% + \expandafter\let\expandafter\@gls@list + \csname @gls@hypergrouplist@\@glo@type\endcsname + }% + \@for\@gls@tmp:=\@gls@list\do{% + \@gls@between + \glsxtrgetgrouptitle{\@gls@tmp}{\@gls@grptitle}% + \glsnavhyperlink{\@gls@tmp}{\@gls@grptitle}% + \let\@gls@between\glshypernavsep + }% + } } % \end{macrocode} %\end{macro} @@ -39869,11 +39908,11 @@ defined}{}% % Rollback releases: % \begin{macrocode} \DeclareRelease{v1.48}{2021-11-22}{glossaries-extra-bib2gls-2021-11-22.sty} -\DeclareCurrentRelease{v1.52}{2023-06-28} +\DeclareCurrentRelease{v1.53}{2023-09-29} % \end{macrocode} % Declare package: % \begin{macrocode} -\ProvidesPackage{glossaries-extra-bib2gls}[2023/06/28 v1.52 (NLCT)] +\ProvidesPackage{glossaries-extra-bib2gls}[2023/09/29 v1.53 (NLCT)] % \end{macrocode} %Provide convenient shortcut commands for predefined glossary types. %\begin{macro}{\printunsrtacronyms} @@ -44148,11 +44187,11 @@ defined}{}% % Rollback releases: % \begin{macrocode} \DeclareRelease{v1.48}{2021-11-22}{glossaries-extra-stylemods-2021-11-22.sty} -\DeclareCurrentRelease{v1.52}{2023-06-28} +\DeclareCurrentRelease{v1.53}{2023-09-29} % \end{macrocode} % Declare package: % \begin{macrocode} -\ProvidesPackage{glossaries-extra-stylemods}[2023/06/28 v1.52 (NLCT)] +\ProvidesPackage{glossaries-extra-stylemods}[2023/09/29 v1.53 (NLCT)] % \end{macrocode} % Provide package options to automatically load required predefined % styles. The simplest method is to just test for the existence of @@ -47155,11 +47194,11 @@ defined}{}% % Rollback releases: % \begin{macrocode} \DeclareRelease{v1.48}{2021-11-22}{glossary-bookindex-2021-11-22.sty} -\DeclareCurrentRelease{v1.52}{2023-06-28} +\DeclareCurrentRelease{v1.53}{2023-09-29} % \end{macrocode} % Declare package: % \begin{macrocode} -\ProvidesPackage{glossary-bookindex}[2023/06/28 v1.52 (NLCT)] +\ProvidesPackage{glossary-bookindex}[2023/09/29 v1.53 (NLCT)] % \end{macrocode} %Load required packages. % \begin{macrocode} @@ -47771,11 +47810,11 @@ defined}{}% % Rollback releases: % \begin{macrocode} \DeclareRelease{v1.48}{2021-11-22}{glossary-longextra-2021-11-22.sty} -\DeclareCurrentRelease{v1.52}{2023-06-28} +\DeclareCurrentRelease{v1.53}{2023-09-29} % \end{macrocode} % Declare package: % \begin{macrocode} -\ProvidesPackage{glossary-longextra}[2023/06/28 v1.52 (NLCT)] +\ProvidesPackage{glossary-longextra}[2023/09/29 v1.53 (NLCT)] % \end{macrocode} %Load required packages. % \begin{macrocode} @@ -51090,11 +51129,11 @@ defined}{}% % Rollback releases: % \begin{macrocode} \DeclareRelease{v1.48}{2021-11-22}{glossary-topic-2021-11-22.sty} -\DeclareCurrentRelease{v1.52}{2023-06-28} +\DeclareCurrentRelease{v1.53}{2023-09-29} % \end{macrocode} % Declare package: % \begin{macrocode} -\ProvidesPackage{glossary-topic}[2023/06/28 v1.52 (NLCT)] +\ProvidesPackage{glossary-topic}[2023/09/29 v1.53 (NLCT)] % \end{macrocode} %Load required package. % \begin{macrocode} @@ -51522,7 +51561,7 @@ defined}{}% % \end{macrocode} % Declare package: % \begin{macrocode} -\ProvidesPackage{glossary-table}[2023/06/28 v1.52 (NLCT)] +\ProvidesPackage{glossary-table}[2023/09/29 v1.53 (NLCT)] % \end{macrocode} %Load required packages. % \begin{macrocode} @@ -58220,6 +58259,288 @@ amet, libero} %\fi %\iffalse % \begin{macrocode} +%<*example-glossaries-utf8.bib> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%< +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} %<*example-glossaries-xr.bib> % \end{macrocode} %\fi diff --git a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins index d5f89fad474..026a7d2de56 100644 --- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins +++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins @@ -1,4 +1,4 @@ -% glossaries-extra.ins generated using makedtx version 1.2 2023/6/28 12:44 +% glossaries-extra.ins generated using makedtx version 1.2 2023/9/30 18:44 \input docstrip \preamble @@ -18,7 +18,7 @@ The Current Maintainer of this work is Nicola Talbot. - This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-abbrstyles.def, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.sty, glossary-topic.sty, glossary-table.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childmultipar.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-longchild.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-user.bib, example-glossaries-xr.bib, glossaries-extra-2021-11-22.sty, glossaries-extra-bib2gls-2021-11-22.sty, glossaries-extra-stylemods-2021-11-22.sty, glossary-bookindex-2021-11-22.sty, glossary-longextra-2021-11-22.sty, glossary-topic-2021-11-22.sty. + This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-abbrstyles.def, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.sty, glossary-topic.sty, glossary-table.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childmultipar.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-longchild.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-user.bib, example-glossaries-utf8.bib, example-glossaries-xr.bib, glossaries-extra-2021-11-22.sty, glossaries-extra-bib2gls-2021-11-22.sty, glossaries-extra-stylemods-2021-11-22.sty, glossary-bookindex-2021-11-22.sty, glossary-longextra-2021-11-22.sty, glossary-topic-2021-11-22.sty. \endpreamble @@ -58,6 +58,7 @@ \file{example-glossaries-symbols.bib}{\nopreamble\nopostamble\from{glossaries-extra.dtx}{example-glossaries-symbols.bib}} \file{example-glossaries-url.bib}{\nopreamble\nopostamble\from{glossaries-extra.dtx}{example-glossaries-url.bib}} \file{example-glossaries-user.bib}{\nopreamble\nopostamble\from{glossaries-extra.dtx}{example-glossaries-user.bib}} +\file{example-glossaries-utf8.bib}{\nopreamble\nopostamble\from{glossaries-extra.dtx}{example-glossaries-utf8.bib}} \file{example-glossaries-xr.bib}{\nopreamble\nopostamble\from{glossaries-extra.dtx}{example-glossaries-xr.bib}} \file{glossaries-extra-2021-11-22.sty}{\usepreamble\defaultpreamble \usepostamble\defaultpostamble\from{glossaries-extra.dtx}{glossaries-extra-2021-11-22.sty,package}} -- cgit v1.2.3