From 749ea962f0005e12003077646db8cdd787684820 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 11 Apr 2020 22:58:44 +0000 Subject: glossaries-extra (1apr20) git-svn-id: svn://tug.org/texlive/trunk@54688 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/glossaries-extra/glossaries-extra.dtx | 57 ++++++++++++++-------- .../latex/glossaries-extra/glossaries-extra.ins | 2 +- 2 files changed, 38 insertions(+), 21 deletions(-) (limited to 'Master/texmf-dist/source/latex/glossaries-extra') 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 c2dcfe0ecb8..b9f90f6ca85 100644 --- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx +++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx @@ -1,6 +1,12 @@ %\iffalse % glossaries-extra.dtx generated using makedtx version 1.2 (c) Nicola Talbot % Command line args: +% -setambles ".*\.bib=>\nopreamble\nopostamble" +% -section "chapter" +% -doc "glossaries-extra-codedoc.tex" +% -author "Nicola Talbot" +% -macrocode ".*\.tex" +% -macrocode ".*\.bib" % -src "glossaries-extra.sty\Z=>glossaries-extra.sty" % -src "glossaries-extra-bib2gls.sty\Z=>glossaries-extra-bib2gls.sty" % -src "glossaries-extra-stylemods.sty\Z=>glossaries-extra-stylemods.sty" @@ -9,17 +15,11 @@ % -src "glossary-topic.sty\Z=>glossary-topic.sty" % -src "(example-glossaries-.+\.tex)\Z=>\1" % -src "(example-glossaries-.+\.bib)\Z=>\1" -% -doc "glossaries-extra-codedoc.tex" -% -section "chapter" -% -setambles ".*\.bib=>\nopreamble\nopostamble" % -comment ".*\.tex" % -comment ".*\.bib" % -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})" -% -author "Nicola Talbot" -% -macrocode ".*\.tex" -% -macrocode ".*\.bib" % glossaries-extra -% Created on 2020/3/23 20:29 +% Created on 2020/4/1 13:56 %\fi %\iffalse %<*package> @@ -142,7 +142,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \setcounter{IndexColumns}{2} -\CheckSum{27175} +\CheckSum{27181} \newcommand*{\ifirstuse}{\iterm{first use}} \newcommand*{\firstuse}{\gls{firstuse}} @@ -182,13 +182,13 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \raggedright } -\title{glossaries-extra.sty v1.44: +\title{glossaries-extra.sty v1.45: documented code} \author{Nicola L.C. Talbot\\[10pt] Dickimaw Books\\ \url{http://www.dickimaw-books.com/}} -\date{2020-03-23} +\date{2020-04-01} \begin{document} \DocInput{glossaries-extra.dtx} @@ -233,7 +233,7 @@ Dickimaw Books\\ %\section{Package Initialisation and Options} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossaries-extra}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} % Requires \sty{xkeyval} to define package options. % \begin{macrocode} @@ -25645,7 +25645,7 @@ defined}{}% %automatically loaded by the record option. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-bib2gls}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossaries-extra-bib2gls}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} %Provide convenient shortcut commands for predefined glossary types. %\begin{macro}{\printunsrtacronyms} @@ -28730,7 +28730,7 @@ defined}{}% % First identify package: % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-stylemods}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossaries-extra-stylemods}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} % Provide package options to automatically load required predefined % styles. The simplest method is to just test for the existence of @@ -29800,6 +29800,14 @@ defined}{}% }% % \end{macrocode} %\end{macro} +%\begin{macro}{\glstreenonameDescLoc} +%\changes{1.45}{2020-04-01}{new} +% \begin{macrocode} + \newcommand{\glstreenonameDescLoc}[2]{% + \glstreenonamedesc{#1}\glstreeprelocation#2% + } +% \end{macrocode} +%\end{macro} %\begin{macro}{\glstreenonamechilddesc} %\changes{1.31}{2018-05-09}{new} %The child entry doesn't have the pre-description separator as the @@ -29810,6 +29818,14 @@ defined}{}% }% % \end{macrocode} %\end{macro} +%\begin{macro}{\glstreenonameChildDescLoc} +%\changes{1.45}{2020-04-01}{new} +% \begin{macrocode} + \newcommand{\glstreenonameChildDescLoc}[2]{% + \glstreenonamechilddesc{#1}\glstreechildprelocation#2% + } +% \end{macrocode} +%\end{macro} % \begin{macrocode} \renewglossarystyle{treenoname}{% \renewenvironment{theglossary}% @@ -29823,8 +29839,10 @@ defined}{}% \parindent0pt\relax \glsentryitem{##1}\glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}% \glstreenonamesymbol{##1}% - \glstreenonamedesc{##1}% - \glstreeDescLoc{##1}{##2}\par +% \end{macrocode} +%\changes{1.45}{2020-04-01}{removed duplicate description} +% \begin{macrocode} + \glstreenonameDescLoc{##1}{##2}\par }% \renewcommand{\subglossentry}[3]{% \hangindent##1\glstreeindent\relax @@ -29833,8 +29851,7 @@ defined}{}% \glssubentryitem{##2}% \fi \glstarget{##2}{\strut}% - \glstreenonamechilddesc{##2}% - \glstreechildprelocation##3\par + \glstreenonameChildDescLoc{##2}{##3}\par }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\glstreegroupskip\fi}% } @@ -31036,7 +31053,7 @@ defined}{}% %\section{Package Initialisation and Options} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-bookindex}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossary-bookindex}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} %Load required packages. % \begin{macrocode} @@ -31532,7 +31549,7 @@ defined}{}% %Provides additional long styles. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-longextra}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossary-longextra}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} %Load required packages. % \begin{macrocode} @@ -32961,7 +32978,7 @@ defined}{}% %topic. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-topic}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossary-topic}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} %Load required package. % \begin{macrocode} 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 f1a3cb82b09..cc2f94010cb 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 2020/3/23 20:29 +% glossaries-extra.ins generated using makedtx version 1.2 2020/4/1 13:56 \input docstrip \preamble -- cgit v1.2.3