diff options
author | Karl Berry <karl@freefriends.org> | 2017-08-24 22:00:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-08-24 22:00:23 +0000 |
commit | b34cea2bffdcb4300b3f4abec56cd287cab3eb2b (patch) | |
tree | ee171e4b5582a9873ab9797134624cdb143a3262 /Master/texmf-dist/source/latex/glossaries | |
parent | a21323486fc7b9e14cc562606e7e130d03fbba8e (diff) |
glossaries (24aug17)
git-svn-id: svn://tug.org/texlive/trunk@45114 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/glossaries')
-rw-r--r-- | Master/texmf-dist/source/latex/glossaries/glossaries.dtx | 110 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/glossaries/glossaries.ins | 2 |
2 files changed, 79 insertions, 33 deletions
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx index 7ac7d934d34..edf6d6a795c 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx @@ -1,6 +1,7 @@ %\iffalse % glossaries.dtx generated using makedtx version 1.2 (c) Nicola Talbot % Command line args: +% -section "chapter" % -codetitle "Main Package Code" % -src "glossaries\.sty\Z=>glossaries.sty" % -src "glossaries-prefix.sty\Z=>glossaries-prefix.sty" @@ -18,20 +19,19 @@ % -src "(samplexdy-mc.*\.xdy)\Z=>\1" % -src "(database.*\.tex)\Z=>\1" % -src "(.*\.perl)\Z=>\1" +% -setambles ".*\.perl=>\nopreamble\nopostamble" +% -setambles ".*\.tex=>\nopreamble\nopostamble" +% -setambles ".*\.xdy=>\nopreamble\nopostamble" % -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" +% -doc "glossaries-manual.tex" % glossaries -% Created on 2017/8/10 16:07 +% Created on 2017/8/24 11:10 %\fi %\iffalse %<*package> @@ -145,7 +145,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \setcounter{IndexColumns}{2} -\CheckSum{19317} +\CheckSum{19355} \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.31} +% \title{Documented Code For glossaries v4.32} % \author{Nicola L.C. Talbot\\[10pt] %Dickimaw Books\\ %\url{http://www.dickimaw-books.com/}} % -% \date{2017-08-10} +% \date{2017-08-24} % \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.31: +%For the main user guide, read \qt{glossaries.sty v4.32: %\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/08/10 v4.31 (NLCT)] +\ProvidesPackage{glossaries}[2017/08/24 v4.32 (NLCT)] % \end{macrocode} %\changes{4.18}{2015-09-09}{split mfirstuc into separate bundle} % Required packages: @@ -346,23 +346,54 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of %\begin{option}{debug} %\changes{4.24}{2016-05-27}{new} % Switch on debug mode. This will also cancel the \pkgopt{nowarn} -% option. +% option. This is now a choice key. % \begin{macrocode} -\define@boolkey{glossaries.sty}[@gls@]{debug}[true]{% - \if@gls@debug +\newif\if@gls@debug +\define@choicekey{glossaries.sty}{debug}[\val\nr]{true,false,showtargets}[true]{% + \ifcase\nr\relax + \@gls@debugtrue \renewcommand*{\GlossariesWarning}[1]{% \PackageWarning{glossaries}{##1}% }% \renewcommand*{\GlossariesWarningNoLine}[1]{% \PackageWarningNoLine{glossaries}{##1}% }% + \let\@glsshowtarget\@gobble \PackageInfo{glossaries}{debug mode ON (nowarn option disabled)}% - \else + \or + \@gls@debugfalse + \let\@glsshowtarget\@gobble \PackageInfo{glossaries}{debug mode OFF}% + \or + \@gls@debugtrue + \renewcommand*{\GlossariesWarning}[1]{% + \PackageWarning{glossaries}{##1}% + }% + \renewcommand*{\GlossariesWarningNoLine}[1]{% + \PackageWarningNoLine{glossaries}{##1}% + }% + \PackageInfo{glossaries}{debug mode ON (nowarn option disabled)}% + \renewcommand{\@glsshowtarget}{\glsshowtarget}% \fi } % \end{macrocode} %\end{option} +%\begin{macro}{\glsshowtarget} +%\changes{4.32}{2017-08-24}{new} +%If \pkgopt[showtargets]{debug}, show the hyperlink target name in the +%margin. +% \begin{macrocode} +\newcommand*{\glsshowtarget}[1]{\marginpar{\texttt{\small #1}}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@glsshowtarget} +%\changes{4.32}{2017-08-24}{new} +%\pkgopt[showtargets]{debug} will redefine this. +% \begin{macrocode} +\newcommand*{\@glsshowtarget}[1]{} +% \end{macrocode} +%\end{macro} +% %Determine what to do if the \gloskey{see} key is used before %\cs{makeglossaries}. The default is to produce an error. %\begin{macro}{\@gls@see@noindex} @@ -8517,12 +8548,13 @@ false,nolabel,autolabel,nameref}[nolabel]{% \def@gls@xdycheckbackslash % \end{macrocode} %\end{macro} -% + %\begin{macro}{\glsdohypertarget} %\changes{4.08}{2014-07-30}{new} % \begin{macrocode} \newlength\gls@tmplen \newcommand*{\glsdohypertarget}[2]{% + \@glsshowtarget{#1}% \settoheight{\gls@tmplen}{#2}% \raisebox{\gls@tmplen}{\hypertarget{#1}{}}#2% } @@ -8532,6 +8564,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% %\changes{4.08}{2014-07-30}{new} % \begin{macrocode} \newcommand*{\glsdohyperlink}[2]{% + \@glsshowtarget{#1}% \hyperlink{#1}{#2}% } % \end{macrocode} @@ -18984,7 +19017,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% %\label{sec:code:hypernav} % Package Definition: % \begin{macrocode} -\ProvidesPackage{glossary-hypernav}[2017/08/10 v4.31 (NLCT)] +\ProvidesPackage{glossary-hypernav}[2017/08/24 v4.32 (NLCT)] % \end{macrocode} % % The commands defined in this package are provided to @@ -19031,6 +19064,17 @@ false,nolabel,autolabel,nameref}[nolabel]{% %\cs{@glstarget}} % \begin{macrocode} \newcommand*{\glsnavhypertarget}[3][\@glo@type]{% + \@glsnavhypertarget{#1}{#2}{#3}% +} +% \end{macrocode} +%\end{macro} +%The actual code is now in an internal command that doesn't have an +%optional argument, which makes it easier to save and restore the +%original behaviour. +%\begin{macro}{\@glsnavhypertarget} +%\changes{4.32}{2017-08-24}{new} +% \begin{macrocode} +\newcommand*{\@glsnavhypertarget}[3]{% % \end{macrocode} % Add this group to the aux file for re-run check. % \begin{macrocode} @@ -19099,10 +19143,12 @@ false,nolabel,autolabel,nameref}[nolabel]{% % The \cs{glsnavigation} command displays a simple glossary % group navigation. % The symbol and number elements are defined separately, -% so that they can be suppressed if need be. Note that this +% so that they can be suppressed if need be. (In earlier verions this % command will produce a link to all 28 groups, but some groups % may not be defined if there are groups that do not contain any % terms, in which case you will get an undefined hyperlink warning. +% Version 1.14 changed this to only use labels for groups that are +% present.) % Now for the whole navigation bit: %\begin{macro}{\glsnavigation} % \changes{1.14}{2008-06-17}{changed to only use labels for @@ -19164,7 +19210,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/08/10 v4.31 (NLCT)] +\ProvidesPackage{glossary-inline}[2017/08/24 v4.32 (NLCT)] % \end{macrocode} % %\begin{style}{inline} @@ -19355,7 +19401,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \ics{item} command, it will appear in a bold font by % default. % \begin{macrocode} -\ProvidesPackage{glossary-list}[2017/08/10 v4.31 (NLCT)] +\ProvidesPackage{glossary-list}[2017/08/24 v4.32 (NLCT)] % \end{macrocode} %\begin{macro}{\indexspace} %\changes{4.13}{2015-02-03}{new} @@ -19637,7 +19683,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/08/10 v4.31 (NLCT)] +\ProvidesPackage{glossary-long}[2017/08/24 v4.32 (NLCT)] % \end{macrocode} % Requires the \isty{longtable} package: % \begin{macrocode} @@ -20134,7 +20180,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \url{http://tex.stackexchange.com/a/56890} % % \begin{macrocode} -\ProvidesPackage{glossary-longbooktabs}[2017/08/10 v4.31 (NLCT)] +\ProvidesPackage{glossary-longbooktabs}[2017/08/24 v4.32 (NLCT)] % \end{macrocode} % Requires \sty{booktabs} package: % \begin{macrocode} @@ -20475,7 +20521,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/08/10 v4.31 (NLCT)] +\ProvidesPackage{glossary-longragged}[2017/08/24 v4.32 (NLCT)] % \end{macrocode} % Requires the \isty{array} package: % \begin{macrocode} @@ -20908,7 +20954,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/08/10 v4.31 (NLCT)] +\ProvidesPackage{glossary-mcols}[2017/08/24 v4.32 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -21344,7 +21390,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/08/10 v4.31 (NLCT)] +\ProvidesPackage{glossary-super}[2017/08/24 v4.32 (NLCT)] % \end{macrocode} % Requires the \isty{supertabular} package: % \begin{macrocode} @@ -21876,7 +21922,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/08/10 v4.31 (NLCT)] +\ProvidesPackage{glossary-superragged}[2017/08/24 v4.32 (NLCT)] % \end{macrocode} % Requires the \isty{array} package: % \begin{macrocode} @@ -22316,7 +22362,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % that have a tree-like structure. These are designed for % hierarchical glossaries. % \begin{macrocode} -\ProvidesPackage{glossary-tree}[2017/08/10 v4.31 (NLCT)] +\ProvidesPackage{glossary-tree}[2017/08/24 v4.32 (NLCT)] % \end{macrocode} % %\begin{macro}{\indexspace} @@ -23037,7 +23083,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % hyperlinks may not work properly. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-207}[2017/08/10 v4.31 (NLCT)] +\ProvidesPackage{glossaries-compatible-207}[2017/08/24 v4.32 (NLCT)] % \end{macrocode} %\begin{macro}{\GlsAddXdyAttribute} % Adds an attribute in old format. @@ -23398,7 +23444,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% %\section{glossaries-compatible-307} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-307}[2017/08/10 v4.31 (NLCT)] +\ProvidesPackage{glossaries-compatible-307}[2017/08/24 v4.32 (NLCT)] % \end{macrocode} % % Compatibility macros for predefined glossary styles: @@ -24206,7 +24252,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/08/10 v4.31 (NLCT) +\ProvidesPackage{glossaries-accsupp}[2017/08/24 v4.32 (NLCT) Experimental glossaries accessibility] % \end{macrocode} % Pass all options to \sty{glossaries}: @@ -26645,7 +26691,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % modules. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-babel}[2017/08/10 v4.31 (NLCT)] +\ProvidesPackage{glossaries-babel}[2017/08/24 v4.32 (NLCT)] % \end{macrocode} % Load \sty{tracklang} to obtain language settings. % \begin{macrocode} @@ -26689,7 +26735,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % modules. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-polyglossia}[2017/08/10 v4.31 (NLCT)] +\ProvidesPackage{glossaries-polyglossia}[2017/08/24 v4.32 (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 fdfcb893648..d2e8cd8f533 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.2 2017/8/10 16:07 +% glossaries.ins generated using makedtx version 1.2 2017/8/24 11:10 \input docstrip \preamble |