diff options
author | Karl Berry <karl@freefriends.org> | 2017-08-10 21:21:54 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-08-10 21:21:54 +0000 |
commit | 75203398cd63828ec3ddd066e69ac01ac3c03262 (patch) | |
tree | cfb5cab1d45377e4a284eb03065a0ae98004621c /Master/texmf-dist/source | |
parent | 7632db03e7814976aa5e919276513ae0b4e442b8 (diff) |
glossaries (10aug17)
git-svn-id: svn://tug.org/texlive/trunk@45010 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/latex/glossaries/glossaries.dtx | 89 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/glossaries/glossaries.ins | 2 |
2 files changed, 51 insertions, 40 deletions
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx index 73ace503d2d..7ac7d934d34 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx @@ -1,19 +1,7 @@ %\iffalse -% glossaries.dtx generated using makedtx version 1.1 (c) Nicola Talbot +% glossaries.dtx generated using makedtx version 1.2 (c) Nicola Talbot % Command line args: -% -setambles ".*\.perl=>\nopreamble\nopostamble" -% -setambles ".*\.tex=>\nopreamble\nopostamble" -% -setambles ".*\.xdy=>\nopreamble\nopostamble" % -codetitle "Main Package Code" -% -section "chapter" -% -macrocode ".*\.perl" -% -macrocode ".*\.tex" -% -macrocode ".*\.xdy" -% -author "Nicola Talbot" -% -doc "glossaries-manual.tex" -% -comment ".*\.perl" -% -comment ".*\.tex" -% -comment ".*\.xdy" % -src "glossaries\.sty\Z=>glossaries.sty" % -src "glossaries-prefix.sty\Z=>glossaries-prefix.sty" % -src "(glossary-.+)\.(sty)\Z=>\1.\2" @@ -30,8 +18,20 @@ % -src "(samplexdy-mc.*\.xdy)\Z=>\1" % -src "(database.*\.tex)\Z=>\1" % -src "(.*\.perl)\Z=>\1" +% -macrocode ".*\.perl" +% -macrocode ".*\.tex" +% -macrocode ".*\.xdy" +% -section "chapter" +% -author "Nicola Talbot" +% -doc "glossaries-manual.tex" +% -comment ".*\.perl" +% -comment ".*\.tex" +% -comment ".*\.xdy" +% -setambles ".*\.perl=>\nopreamble\nopostamble" +% -setambles ".*\.tex=>\nopreamble\nopostamble" +% -setambles ".*\.xdy=>\nopreamble\nopostamble" % glossaries -% Created on 2017/6/11 13:36 +% Created on 2017/8/10 16:07 %\fi %\iffalse %<*package> @@ -145,7 +145,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \setcounter{IndexColumns}{2} -\CheckSum{19312} +\CheckSum{19317} \newcommand*{\ifirstuse}{\iterm{first use}} \newcommand*{\firstuse}{\gls{firstuse}} @@ -172,12 +172,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of %\fi %\MakeShortVerb{"} % -% \title{Documented Code For glossaries v4.30} +% \title{Documented Code For glossaries v4.31} % \author{Nicola L.C. Talbot\\[10pt] %Dickimaw Books\\ %\url{http://www.dickimaw-books.com/}} % -% \date{2017-06-11} +% \date{2017-08-10} % \maketitle % %This is the documented code for the \styfmt{glossaries} package. @@ -193,7 +193,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of %glossaries package}. % %\item[\url{glossaries-user.pdf}] -%For the main user guide, read \qt{glossaries.sty v4.30: +%For the main user guide, read \qt{glossaries.sty v4.31: %\LaTeX2e\ Package to Assist Generating Glossaries}. % %\item[\url{mfirstuc-manual.pdf}] @@ -248,7 +248,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of % This package requires \LaTeXe. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossaries}[2017/08/10 v4.31 (NLCT)] % \end{macrocode} %\changes{4.18}{2015-09-09}{split mfirstuc into separate bundle} % Required packages: @@ -517,9 +517,12 @@ false,nolabel,autolabel,nameref}[nolabel]{% % set a style that is defined in another package. This package comes % with some predefined styles that are defined in % \autoref{sec:code:styles}. +%\changes{4.31}{2017-09-10}{changed \cs{renewcommand} to \cs{def}} +%This now uses \cs{def} instead of \cs{renewcommand} as +% \cs{@glossary@default@style} may have been set to \cs{relax}. % \begin{macrocode} \define@key{glossaries.sty}{style}{% - \renewcommand*{\@glossary@default@style}{#1}% + \def\@glossary@default@style{#1}% } % \end{macrocode} %\end{option} @@ -640,9 +643,17 @@ false,nolabel,autolabel,nameref}[nolabel]{% % This option prevents \isty{glossary-list} from being loaded % (to reduce overheads if required). Naturally, the styles defined % in \isty{glossary-list} will not be available if this option -% is used. -% \begin{macrocode} -\@gls@declareoption{nolist}{\renewcommand*{\@gls@loadlist}{}} +% is used. If the style is still set to \glostyle{list}, the default +% must be set to \cs{relax}. +%\changes{4.31}{2017-08-10}{added check for \qt{list} style} +% \begin{macrocode} +\@gls@declareoption{nolist}{% + \renewcommand*{\@gls@loadlist}{% + \ifdefstring{\@glossary@default@style}{list}% + {\let\@glossary@default@style\relax}% + {}% + }% +} % \end{macrocode} %\end{option} % @@ -18558,7 +18569,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \cs{gls}\marg{label}} on subsequent use. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-prefix}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossaries-prefix}[2017/08/10 v4.31 (NLCT)] % \end{macrocode} % Pass all options to \sty{glossaries}: % \begin{macrocode} @@ -18973,7 +18984,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% %\label{sec:code:hypernav} % Package Definition: % \begin{macrocode} -\ProvidesPackage{glossary-hypernav}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossary-hypernav}[2017/08/10 v4.31 (NLCT)] % \end{macrocode} % % The commands defined in this package are provided to @@ -19153,7 +19164,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % This defines an in-line style where the entries are % comma-separated with just the name and description displayed. % \begin{macrocode} -\ProvidesPackage{glossary-inline}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossary-inline}[2017/08/10 v4.31 (NLCT)] % \end{macrocode} % %\begin{style}{inline} @@ -19344,7 +19355,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \ics{item} command, it will appear in a bold font by % default. % \begin{macrocode} -\ProvidesPackage{glossary-list}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossary-list}[2017/08/10 v4.31 (NLCT)] % \end{macrocode} %\begin{macro}{\indexspace} %\changes{4.13}{2015-02-03}{new} @@ -19626,7 +19637,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % The glossary styles defined in the \isty{glossary-long} package % used the \env{longtable} environment in the glossary. % \begin{macrocode} -\ProvidesPackage{glossary-long}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossary-long}[2017/08/10 v4.31 (NLCT)] % \end{macrocode} % Requires the \isty{longtable} package: % \begin{macrocode} @@ -20123,7 +20134,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \url{http://tex.stackexchange.com/a/56890} % % \begin{macrocode} -\ProvidesPackage{glossary-longbooktabs}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossary-longbooktabs}[2017/08/10 v4.31 (NLCT)] % \end{macrocode} % Requires \sty{booktabs} package: % \begin{macrocode} @@ -20464,7 +20475,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % used the \env{longtable} environment in the glossary and use % ragged right formatting for the multiline columns. % \begin{macrocode} -\ProvidesPackage{glossary-longragged}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossary-longragged}[2017/08/10 v4.31 (NLCT)] % \end{macrocode} % Requires the \isty{array} package: % \begin{macrocode} @@ -20897,7 +20908,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% %use the \sty{multicol} package. These use the tree-like glossary %styles in a multicol environment. % \begin{macrocode} -\ProvidesPackage{glossary-mcols}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossary-mcols}[2017/08/10 v4.31 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -21333,7 +21344,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % The glossary styles defined in the \isty{glossary-super} package % use the \env{supertabular} environment. % \begin{macrocode} -\ProvidesPackage{glossary-super}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossary-super}[2017/08/10 v4.31 (NLCT)] % \end{macrocode} % Requires the \isty{supertabular} package: % \begin{macrocode} @@ -21865,7 +21876,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % are like those provided by the \isty{glossary-super} package, % except that the multiline columns have ragged right justification. % \begin{macrocode} -\ProvidesPackage{glossary-superragged}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossary-superragged}[2017/08/10 v4.31 (NLCT)] % \end{macrocode} % Requires the \isty{array} package: % \begin{macrocode} @@ -22305,7 +22316,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % that have a tree-like structure. These are designed for % hierarchical glossaries. % \begin{macrocode} -\ProvidesPackage{glossary-tree}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossary-tree}[2017/08/10 v4.31 (NLCT)] % \end{macrocode} % %\begin{macro}{\indexspace} @@ -23026,7 +23037,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % hyperlinks may not work properly. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-207}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossaries-compatible-207}[2017/08/10 v4.31 (NLCT)] % \end{macrocode} %\begin{macro}{\GlsAddXdyAttribute} % Adds an attribute in old format. @@ -23387,7 +23398,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% %\section{glossaries-compatible-307} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-307}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossaries-compatible-307}[2017/08/10 v4.31 (NLCT)] % \end{macrocode} % % Compatibility macros for predefined glossary styles: @@ -24195,7 +24206,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \end{macrocode} % Package version number now in line with main glossaries package number. % \begin{macrocode} -\ProvidesPackage{glossaries-accsupp}[2017/06/11 v4.30 (NLCT) +\ProvidesPackage{glossaries-accsupp}[2017/08/10 v4.31 (NLCT) Experimental glossaries accessibility] % \end{macrocode} % Pass all options to \sty{glossaries}: @@ -26634,7 +26645,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % modules. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-babel}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossaries-babel}[2017/08/10 v4.31 (NLCT)] % \end{macrocode} % Load \sty{tracklang} to obtain language settings. % \begin{macrocode} @@ -26678,7 +26689,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % modules. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-polyglossia}[2017/06/11 v4.30 (NLCT)] +\ProvidesPackage{glossaries-polyglossia}[2017/08/10 v4.31 (NLCT)] % \end{macrocode} % Load \sty{tracklang} to obtain language settings. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins index 0baa886fc4c..fdfcb893648 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.ins +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.ins @@ -1,4 +1,4 @@ -% glossaries.ins generated using makedtx version 1.1 2017/6/11 13:36 +% glossaries.ins generated using makedtx version 1.2 2017/8/10 16:07 \input docstrip \preamble |