From a2108d8fb8bcdf43db03cb2bd3a7d9ebde44e634 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 18 Jun 2016 22:00:18 +0000 Subject: glossaries-extra (18jun16) git-svn-id: svn://tug.org/texlive/trunk@41486 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/glossaries-extra/glossaries-extra.dtx | 307 +++++++++++++++------ .../latex/glossaries-extra/glossaries-extra.ins | 2 +- 2 files changed, 223 insertions(+), 86 deletions(-) (limited to 'Master/texmf-dist/source/latex') 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 e7e4ba96a2a..0bab2f3672e 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,14 @@ %\iffalse % glossaries-extra.dtx generated using makedtx version 1.1 (c) Nicola Talbot % Command line args: -% -author "Nicola Talbot" +% -src "glossaries-extra.sty\Z=>glossaries-extra.sty" +% -src "glossaries-extra-stylemods.sty\Z=>glossaries-extra-stylemods.sty" % -section "chapter" +% -author "Nicola Talbot" % -doc "glossaries-extra-codedoc.tex" % -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})" -% -src "glossaries-extra.sty\Z=>glossaries-extra.sty" -% -src "glossaries-extra-stylemods.sty\Z=>glossaries-extra-stylemods.sty" % glossaries-extra -% Created on 2016/6/10 17:48 +% Created on 2016/6/18 16:35 %\fi %\iffalse %<*package> @@ -118,7 +118,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \setcounter{IndexColumns}{2} -\CheckSum{9358} +\CheckSum{9433} \newcommand*{\ifirstuse}{\iterm{first use}} \newcommand*{\firstuse}{\gls{firstuse}} @@ -154,13 +154,13 @@ styles (glossaries):>#1={\protect\ttfamily#1}|main}} \raggedright } -\title{glossaries-extra.sty v1.05: +\title{glossaries-extra.sty v1.06: documented code} \author{Nicola L.C. Talbot\\[10pt] Dickimaw Books\\ \url{http://www.dickimaw-books.com/}} -\date{2016-06-10} +\date{2016-06-18} \begin{document} \DocInput{glossaries-extra.dtx} @@ -205,7 +205,7 @@ Dickimaw Books\\ %\section{Package Initialisation and Options} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra}[2016/06/10 v1.05 (NLCT)] +\ProvidesPackage{glossaries-extra}[2016/06/18 v1.06 (NLCT)] % \end{macrocode} % Requires \sty{xkeyval} to define package options. % \begin{macrocode} @@ -215,21 +215,21 @@ Dickimaw Books\\ % \begin{macrocode} \RequirePackage{etoolbox} % \end{macrocode} -% Has \sty{glossaries} already been loaded? +% Has \styfmt{glossaries} already been loaded? % \begin{macrocode} \@ifpackageloaded{glossaries} {% % \end{macrocode} % Already loaded so pass any options to \cs{setupglossaries}. % This means that the options that can only be set when -% \sty{glossaries} is loaded can't be used. +% \styfmt{glossaries} is loaded can't be used. % \begin{macrocode} \newcommand{\glsxtr@dooption}[1]{\setupglossaries{#1}}% \let\@glsxtr@declareoption\@gls@declareoption } {% % \end{macrocode} -% Not already loaded, so pass options to \sty{glossaries}. +% Not already loaded, so pass options to \styfmt{glossaries}. % \begin{macrocode} \newcommand{\glsxtr@dooption}[1]{% \PassOptionsToPackage{#1}{glossaries}% @@ -265,7 +265,7 @@ Dickimaw Books\\ % \end{macrocode} %\end{macro} %\begin{macro}{\glsxtr@warnonexistsordo} -% If user wants \pkgopt[warn]{undefaction}, then \sty{glossaries} +% If user wants \pkgopt[warn]{undefaction}, then \styfmt{glossaries} % v4.19 is required. % \begin{macrocode} \newcommand*{\glsxtr@warnonexistsordo}[1]{} @@ -305,13 +305,70 @@ Dickimaw Books\\ } % \end{macrocode} % +%\changes{1.06}{2016-06-18}{docdef option changed to choice} +%Version 1.06 changes the \pkgopt{docdef} option to a choice rather +%than boolean setting. The available values are: false, true or +%restricted. The restricted option permits document definitions as +%long as they occur before the first glossary is displayed. +% +%\begin{macro}{\@glsxtr@docdefval} +%\changes{1.06}{2016-06-18}{new} +%The \pkgopt{docdef} value is stored as an integer: 0 (false), 1 +%(true) and 2 (restricted). +% \begin{macrocode} +\newcount\@glsxtr@docdefval +% \end{macrocode} +%\end{macro} +% +%Need to provide conditional commands that are backward compatible: +%\begin{macro}{\if@glsxtrdocdef} +% \begin{macrocode} +\newcommand*{\if@glsxtrdocdef}{\ifnum\@glsxtr@docdefval>0 } +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@glsxtrdocdeftrue} +% \begin{macrocode} +\newcommand*{\@glsxtrdocdeftrue}{\@glsxtr@docdefval=1 } +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@glsxtrdocdeffalse} +% \begin{macrocode} +\newcommand*{\@glsxtrdocdeffalse}{\@glsxtr@docdefval=0 } +% \end{macrocode} +%\end{macro} +% +% % By default don't allow entries to be defined in the document to % encourage the user to define them in the preamble, but if the user % is really determined to define them in the document allow them to % request this. % \begin{macrocode} -\define@boolkey{glossaries-extra.sty}[@glsxtr]{docdef}[true]{} +\define@choicekey{glossaries-extra.sty}{docdef}[\val\nr]% + {false,true,restricted}[true]% +{% + \@glsxtr@docdefval=\nr\relax + \ifnum\@glsxtr@docdefval=2\relax + \renewcommand*{\@glsdoifexistsorwarn}{\glsdoifexists}% + \fi +} +% \end{macrocode} +%\begin{macro}{\if@glsxtrdocdefrestricted} +%\changes{1.06}{2016-06-18}{new} +% \begin{macrocode} +\newcommand*{\if@glsxtrdocdefrestricted}{\ifnum\@glsxtr@docdefval=2 } +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@glsdoifexistsorwarn} +%\changes{1.06}{2016-06-18}{new} +%Need an error to notify user if an undefined entry is being referenced in the +%glossary for the \pkgopt[restricted]{docdef} option. This is used +%by \cs{glossentryname} (but not by \cs{glossentrydesc} etc as one error +%per entry is sufficient). +% \begin{macrocode} +\newcommand*{\@glsdoifexistsorwarn}{\glsdoifexistsorwarn} % \end{macrocode} +%\end{macro} % %\begin{option}{indexcrossrefs} % Automatically index cross references at the end of the document @@ -411,7 +468,7 @@ Dickimaw Books\\ % %\begin{macro}{\GlsXtrDefineAbbreviationShortcuts} % Enable shortcut commands for the abbreviations. Unlike the analogous -% command provided by \sty{glossaries}, this uses \cs{newcommand} +% command provided by \styfmt{glossaries}, this uses \cs{newcommand} % instead of \cs{let} as a safety feature. % \begin{macrocode} \newcommand*{\GlsXtrDefineAbbreviationShortcuts}{% @@ -478,7 +535,7 @@ Dickimaw Books\\ % \end{macrocode} %\end{macro} % -%Provide \pkgopt{shortcuts} option. Unlike the \sty{glossaries} +%Provide \pkgopt{shortcuts} option. Unlike the \styfmt{glossaries} %version, this is a choice rather than a boolean key but it also provides %\pkgopt[true]{shortcuts} and \pkgopt[false]{shortcuts}, which are %equivalent to \pkgopt[all]{shortcuts} and @@ -642,7 +699,7 @@ Dickimaw Books\\ % \end{macrocode} %\end{option} % -% Pass all other options to \sty{glossaries}. +% Pass all other options to \styfmt{glossaries}. % \begin{macrocode} \DeclareOptionX*{% \expandafter\glsxtr@dooption\expandafter{\CurrentOption}} @@ -651,7 +708,7 @@ Dickimaw Books\\ % \begin{macrocode} \ProcessOptionsX % \end{macrocode} -% Load \sty{glossaries} if not already loaded. +% Load \styfmt{glossaries} if not already loaded. % \begin{macrocode} \RequirePackage{glossaries} % \end{macrocode} @@ -691,9 +748,11 @@ Dickimaw Books\\ % % Disable preamble-only options and switch on the undefined tag at % the start of the document. +%\changes{1.06}{2016-06-18}{disabled docdef key at the start of the +%document} % \begin{macrocode} \AtBeginDocument{% - \disable@keys{glossaries-extra.sty}{abbreviations}% + \disable@keys{glossaries-extra.sty}{abbreviations,docdef}% \def\@glsxtrundeftag{\glsxtrundeftag}% } % \end{macrocode} @@ -724,8 +783,8 @@ Dickimaw Books\\ % \end{macrocode} %\end{macro} % -%\section{Modifications to Commands Provided by \sty{glossaries}} -% Some of the commands provided by \sty{glossaries} are modified +%\section{Modifications to Commands Provided by \styfmt{glossaries}} +% Some of the commands provided by \styfmt{glossaries} are modified % to take into account new options or to change default behaviour. % %\subsection{Existence Checks} @@ -759,7 +818,7 @@ Dickimaw Books\\ %\begin{macro}{\glsdoifexistsordo} % Modify \cs{glsdoifexistsordo} to take account of the % \pkgopt{undefaction} setting. This command was introduced in -% \sty{glossaries} version 4.19, so check if it has been defined first. +% \styfmt{glossaries} version 4.19, so check if it has been defined first. % \begin{macrocode} \ifdef\glsdoifexistsordo {% @@ -835,6 +894,54 @@ Dickimaw Books\\ % \end{macrocode} %\end{macro} % +%\begin{macro}{\glsxtrusesee} +%\changes{1.06}{2016-06-18}{new} +%Apply \cs{glsseeformat} to the \gloskey{see} key if not empty. +% \begin{macrocode} +\newcommand*{\glsxtrusesee}[1]{% + \glsdoifexists{#1}% + {% + \letcs{\@glo@see}{glo@\glsdetoklabel{#1}@see}% + \ifdefempty\@glo@see + {}% + {% + \expandafter\glsxtr@usesee\@glo@see\@end@glsxtr@usesee + }% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtr@usesee} +%\changes{1.06}{2016-06-18}{new} +% \begin{macrocode} +\newcommand*{\glsxtr@usesee}[1][\seename]{% + \@glsxtr@usesee[#1]% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@glsxtr@usesee} +%\changes{1.06}{2016-06-18}{new} +% \begin{macrocode} +\def\@glsxtr@usesee[#1]#2\@end@glsxtr@usesee{% + \glsxtruseseeformat{#1}{#2}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtruseseeformat} +%\changes{1.06}{2016-06-18}{new} +%The format used by \cs{glsxtrusesee}. The first argument is the tag +%(such as \cs{seename}). The second argument is the comma-separated +%list of cross-referenced labels. +% \begin{macrocode} +\newcommand*{\glsxtruseseeformat}[2]{% + \glsseeformat[#1]{#2}{}% +} +% \end{macrocode} +%\end{macro} +% % Add all unused cross-references at the end of the document. % \begin{macrocode} \AtEndDocument{\if@glsxtrindexcrossrefs\glsxtraddallcrossrefs\fi} @@ -907,12 +1014,32 @@ Dickimaw Books\\ % %\begin{macro}{\makenoidxglossaries} %Modify \cs{makenoidxglossaries} so that it automatically switches -%off and disables the \pkgopt{docdef} key. +%off (unless the restricted setting is on) and disables the \pkgopt{docdef} key. % \begin{macrocode} \let\glsxtr@orgmakenoidxglossaries\makenoidxglossaries \renewcommand{\makenoidxglossaries}{% \glsxtr@orgmakenoidxglossaries - \@glsxtrdocdeffalse + \if@glsxtrdocdefrestricted +% \end{macrocode} +%If restricted document definitions allowed, adjust +%\cs{@gls@reference} so that it doesn't test for existence. +% \begin{macrocode} + \renewcommand*{\@gls@reference}[3]{% + \ifcsundef{@glsref@##1}{\csgdef{@glsref@##1}{}}{}% + \ifinlistcs{##2}{@glsref@##1}% + {}% + {\listcsgadd{@glsref@##1}{##2}}% + \ifcsundef{glo@\glsdetoklabel{##2}@loclist}% + {\csgdef{glo@\glsdetoklabel{##2}@loclist}{}}% + {}% + \listcsgadd{glo@\glsdetoklabel{##2}@loclist}{##3}% + }% + \else +% \end{macrocode} +%Disable document definitions. +% \begin{macrocode} + \@glsxtrdocdeffalse + \fi \disable@keys{glossaries-extra.sty}{docdef}% } % \end{macrocode} @@ -923,21 +1050,31 @@ Dickimaw Books\\ % the \pkgopt{docdef} value. % \begin{macrocode} \renewcommand*{\gls@defdocnewglossaryentry}{% - \if@glsxtrdocdef + \ifcase\@glsxtr@docdefval % \end{macrocode} -% Since the \gloskey{see} value is now saved in a field, it -% can be used by entries that have been defined in the document. +% \pkgopt[false]{docdef}: % \begin{macrocode} - \let\gls@checkseeallowed\relax - \let\newglossaryentry\new@glossaryentry - \else \renewcommand*{\newglossaryentry}[2]{% \PackageError{glossaries-extra}{Glossary entries must be \MessageBreak defined in the preamble with \MessageBreak - package option `docdef=false'}{Move your glossary definitions to + package option `docdef=false'\MessageBreak(consider using + `docdef=restricted')}{Move your glossary definitions to the preamble. You can also put them in a \MessageBreak separate file and load them with \string\loadglsentries.}% }% + \or +% \end{macrocode} +% \pkgopt[true]{docdef} +% Since the \gloskey{see} value is now saved in a field, it +% can be used by entries that have been defined in the document. +% \begin{macrocode} + \let\gls@checkseeallowed\relax + \let\newglossaryentry\new@glossaryentry + \or +% \end{macrocode} +%Restricted mode just needs to allow the \gloskey{see} value. +% \begin{macrocode} + \let\gls@checkseeallowed\relax \fi }% % \end{macrocode} @@ -1207,7 +1344,7 @@ Dickimaw Books\\ % \end{macrocode} %\end{macro} % -% In case we have an old version of \sty{glossaries}: +% In case we have an old version of \styfmt{glossaries}: % \begin{macrocode} \ifdef\@glossary@default@style {} @@ -1483,7 +1620,7 @@ Dickimaw Books\\ %\end{macro} % % Commands like \cs{glsifplural} are only used by the \cs{gls}-like -% commands in the \sty{glossaries} package, but it might be useful +% commands in the \styfmt{glossaries} package, but it might be useful % for the postlink hook to know if the user has used, say, % \cs{glsfirst} or \cs{glsplural}. This can provide better % consistency with the formatting of the \cs{gls}-like commands, @@ -2508,7 +2645,7 @@ Dickimaw Books\\ %\end{macro} % %\begin{macro}{\@gls@link@nocheckfirsthyper} -% Old versions of \sty{glossaries} don't define +% Old versions of \styfmt{glossaries} don't define % this, so provide it just in case it hasn't been defined. % \begin{macrocode} \providecommand*{\@gls@link@nocheckfirsthyper}{} @@ -2550,7 +2687,7 @@ Dickimaw Books\\ %\end{macro} % %\begin{macro}{\do@glsdisablehyperinlist} -% This command was introduced in \sty{glossaries} v4.19. If it +% This command was introduced in \styfmt{glossaries} v4.19. If it % hasn't been defined, we're using an earlier version, in which case % the \catattr{nohyper} attribute can't be implemented. % \begin{macrocode} @@ -2574,7 +2711,7 @@ Dickimaw Books\\ % \end{macrocode} % %If \cs{@gls@setdefault@glslink@opts} has been defined -%(\sty{glossaries} v4.20) use it to set the default keys in +%(\styfmt{glossaries} v4.20) use it to set the default keys in %\cs{@glslink}. %\begin{macro}{\@gls@setdefault@glslink@opts} %\changes{0.5.4}{2015-12-15}{new} @@ -2756,7 +2893,7 @@ Dickimaw Books\\ % %\begin{macro}{\glsdisablehyper} %\changes{0.5.4}{2015-12-15}{added} -% Redefine in case we have an old version of \sty{glossaries}. +% Redefine in case we have an old version of \styfmt{glossaries}. % \begin{macrocode} \ifundef\glsdonohyperlink {% @@ -2771,8 +2908,8 @@ Dickimaw Books\\ %\end{macro} % %\begin{macro}{\glsdonohyperlink} -% This command was only introduced in \sty{glossaries} v4.20, so it may -% not be defined. For older \sty{glossaries} versions, this won't be +% This command was only introduced in \styfmt{glossaries} v4.20, so it may +% not be defined. For older \styfmt{glossaries} versions, this won't be % used if \sty{hyperref} hasn't been loaded, which means the % indexing will still take place. %\changes{0.5.4}{2015-12-15}{added} @@ -3084,7 +3221,7 @@ Dickimaw Books\\ % %\subsection{Entry Counting} % -% The entry counting mechanism from \sty{glossaries} is adjusted +% The entry counting mechanism from \styfmt{glossaries} is adjusted % here to work with category attributes. Provide a convenient % command to enable entry counting, set the \catattr{entrycount} % attribute for given categories and redefine \ics{gls} etc to @@ -3460,7 +3597,7 @@ Dickimaw Books\\ % \end{macrocode} %\end{macro} % -% Add all upper case versions not provided by \sty{glossaries}. +% Add all upper case versions not provided by \styfmt{glossaries}. %\begin{macro}{\cGLS} %\changes{0.5}{2015-12-07}{new} % \begin{macrocode} @@ -3937,7 +4074,7 @@ Dickimaw Books\\ %\end{macro} % %\begin{macro}{\@glsxtr@setentryunitcountunsetattr} -%\changes{0.5.4}{}{new} +%\changes{0.5.4}{2015-12-15}{new} % \begin{macrocode} \newcommand*{\@glsxtr@setentryunitcountunsetattr}[3]{% \@for\@glsxtr@cat:=#1\do @@ -3956,10 +4093,10 @@ Dickimaw Books\\ %\subsection{Acronym Modifications} % It's more consistent to use the abbreviation code for acronyms, % but make some adjustments to allow for continued use of the -% \sty{glossaries} package's custom acronym format. (For example, +% \styfmt{glossaries} package's custom acronym format. (For example, % user may already have defined some acronym styles with % \cs{newacronymstyle} which they would like to continue to use.) -% The original \sty{glossaries} acronym code can be restored +% The original \styfmt{glossaries} acronym code can be restored % with \cs{RestoreAcronyms}, but adjust \cs{SetGenericNewAcronym} % so that \cs{newacronym} adds the category. % @@ -4067,7 +4204,7 @@ Dickimaw Books\\ % \end{macrocode} % %\begin{macro}{\RestoreAcronyms} -% Restore acronyms to \sty{glossaries} interface. +% Restore acronyms to \styfmt{glossaries} interface. % \begin{macrocode} \newcommand*{\RestoreAcronyms}{% \SetGenericNewAcronym @@ -4102,7 +4239,7 @@ Dickimaw Books\\ %\subsection{Indexing and Displaying Glossaries} %From time-to-time users ask if they can have one glossary sorted %normally and another sorted by definition or usage. With the -% base \sty{glossaries} package this can only be achieved with the +% base \styfmt{glossaries} package this can only be achieved with the % \qt{noidx} commands (Option~1). This is an attempt to mix and % match. % @@ -4635,11 +4772,11 @@ want %\section{Integration with glossaries-accsupp} % Provide better integration with the \sty{glossaries-accsupp} % package. (Must be loaded before the main code of -% \sty{glossaries-extra} either explicitly or through the +% \styfmt{glossaries-extra} either explicitly or through the % \pkgopt{accsupp} package option.) % % These commands have their definitions set according to whether -% or not \sty{glossaries-extra} has been loaded. +% or not \styfmt{glossaries-extra} has been loaded. %\changes{0.5.2}{2015-12-08}{fixed typo in glossaries-accsupp and tidied up code to use % just one \cs{@ifpackageloaded}} % \begin{macrocode} @@ -6031,7 +6168,7 @@ want \@ifpackageloaded{glossaries-accsupp} { \renewcommand*{\glossentryname}[1]{% - \glsdoifexistsorwarn{#1}% + \@glsdoifexistsorwarn{#1}% {% \glssetabbrvfmt{\glscategory{#1}}% % \end{macrocode} @@ -6104,7 +6241,7 @@ want } { \renewcommand*{\glossentryname}[1]{% - \glsdoifexistsorwarn{#1}% + \@glsdoifexistsorwarn{#1}% {% \glssetabbrvfmt{\glscategory{#1}}% \glshasattribute{#1}{glossnamefont}% @@ -6143,7 +6280,7 @@ want }% {% % \end{macrocode} -% This little trick is used by \sty{glossaries} to allow the user to +% This little trick is used by \styfmt{glossaries} to allow the user to % redefine \ics{glsnamefont} to use \cs{makefirstuc}. Support it % even though they can now use the \catattr{firstuc} attribute. % \begin{macrocode} @@ -6170,7 +6307,7 @@ want \@ifpackageloaded{glossaries-accsupp} { \renewcommand*{\Glossentryname}[1]{% - \glsdoifexistsorwarn{#1}% + \@glsdoifexistsorwarn{#1}% {% \glssetabbrvfmt{\glscategory{#1}}% % \end{macrocode} @@ -6207,7 +6344,7 @@ want } { \renewcommand*{\Glossentryname}[1]{% - \glsdoifexistsorwarn{#1}% + \@glsdoifexistsorwarn{#1}% {% \glssetabbrvfmt{\glscategory{#1}}% \glshasattribute{#1}{glossnamefont}% @@ -6705,7 +6842,7 @@ want %\end{macro} % %\begin{macro}{\@glsxtr@activate@initialtagging} -% Used in \cs{printglossary} but at least v4.19 of \sty{glossaries} +% Used in \cs{printglossary} but at least v4.19 of \styfmt{glossaries} % required. %\changes{0.5.2}{2015-12-08}{new} % \begin{macrocode} @@ -6733,7 +6870,7 @@ want %\end{macro} % %\begin{macro}{\@gls@preglossaryhook} -% This macro was introduced in \sty{glossaries} version 4.19, so it +% This macro was introduced in \styfmt{glossaries} version 4.19, so it % may not be defined. If it hasn't been defined this feature is % unavailable. A check is added for the entry's existence to prevent % errors from occurring if the user removes an entry or changes the @@ -7053,7 +7190,7 @@ want % %\section{Abbreviations} % -%The \qt{acronym} code from \sty{glossaries} is misnamed as it's more +%The \qt{acronym} code from \styfmt{glossaries} is misnamed as it's more %often used for other forms of abbreviations. This code corrects %this inconsistency, but rather than just having synonyms, provide % commands for abbreviations that have a similar, but not identical, @@ -10160,7 +10297,7 @@ want % The format of the parenthetical information. % The first argument is the long/short form. The second argument % is the entry's label. If \cs{glscurrentfieldvalue} has been -% defined, then we have at least \sty{glossaries} v4.23, which makes +% defined, then we have at least \styfmt{glossaries} v4.23, which makes % it easier for the user to adjust this. % \begin{macrocode} \ifdef\glscurrentfieldvalue @@ -10382,7 +10519,7 @@ want % entry's location list, the label is corrupted if used inside % \ics{MakeUppercase} (which is used by the default headings style) % and they need to be expandable for PDF bookmarks. The -% \sty{glossaries} package therefore recommends the use of the +% \styfmt{glossaries} package therefore recommends the use of the % expandable commands, such as \cs{glsentryshort}, instead but this % doesn't reflect the formatting since it doesn't include % \cs{glsabbrvfont}. The commands below are an attempt to get around @@ -10398,7 +10535,7 @@ want % dealt with, and that's what to do if the heading style % uses \cs{MakeUppercase}. % -% Note that \sty{glossaries} automatically loads \sty{textcase}, so +% Note that \styfmt{glossaries} automatically loads \sty{textcase}, so % the label can be protected from case change with \sty{textcase}'s % \cs{NoCaseChange}. This means that we don't have a problem % provided the page style uses \cs{MakeTextUppercase}, but the @@ -11623,7 +11760,7 @@ want % First identify package: % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-stylemods}[2016/06/10 v1.05 (NLCT)] +\ProvidesPackage{glossaries-extra-stylemods}[2016/06/18 v1.06 (NLCT)] % \end{macrocode} % Provide package options to automatically load required predefined % styles. The simplest method is to just test for the existence of @@ -11974,7 +12111,7 @@ want % Only redefine this style if it's already been defined. % %\begin{macro}{\glsxtralttreeSymbolDescLocation} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} %\begin{definition} %\cs{glsxtralttreeSymbolDescLocation}\marg{label}\marg{location %list} @@ -11992,16 +12129,16 @@ want %\end{macro} % %\begin{macro}{\glsxtrAltTreeIndent} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % Paragraph indent for subsequent paragraphs in multi-paragraph % descriptions. % \begin{macrocode} -\newlength\glsxtrAltTreeIndent + \newlength\glsxtrAltTreeIndent % \end{macrocode} %\end{macro} % %\begin{macro}{\glsxtrAltTreePar} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} %Multi-paragraph descriptions need to keep the hanging indent. % \begin{macrocode} \newcommand{\glsxtrAltTreePar}{% @@ -12013,7 +12150,7 @@ want %\end{macro} % %\begin{macro}{\glsxtralttreeSubSymbolDescLocation} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} %\begin{definition} %\cs{glsxtralttreeSubSymbolDescLocation}\marg{level}\marg{label}\marg{location %list} @@ -12028,7 +12165,7 @@ want %\end{macro} % %\begin{macro}{\glsxtrtreetopindent} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % The original style has to keep computing the width of the name at % each entry. This register allows the style to compute it once for % the top-level at the start of the glossary. @@ -12038,7 +12175,7 @@ want %\end{macro} % %\begin{macro}{\glsxtralttreeInit} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % User-level initialisation for the \glostyle{alttree} style. % \begin{macrocode} \newcommand*{\glsxtralttreeInit}{% @@ -12049,7 +12186,7 @@ want %\end{macro} % %\begin{macro}{\eglssetwidest} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % The original \cs{glssetwidest} only uses \cs{def}. This uses % \cs{protected@csedef}. % \begin{macrocode} @@ -12060,7 +12197,7 @@ want %\end{macro} % %\begin{macro}{\xglssetwidest} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} %Like the above but uses \cs{protected@csxdef}. % \begin{macrocode} \newcommand*{\xglssetwidest}[2][0]{% @@ -12070,7 +12207,7 @@ want %\end{macro} % %\begin{macro}{\glsgetwidestname} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % Provide a user-level macro to obtain the widest top-level name. % \begin{macrocode} \newcommand*{\glsgetwidestname}{\@glswidestname} @@ -12078,7 +12215,7 @@ want %\end{macro} % %\begin{macro}{\glsgetwidestsubname} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % Provide a user-level macro to obtain the widest sub-entry name. % \begin{macrocode} \newcommand*{\glsgetwidestsubname}[1]{% @@ -12098,7 +12235,7 @@ want %\end{macro} % %\begin{macro}{\glsFindWidestUsedTopLevelName} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % Like \cs{glsfindwidesttoplevelname} but has an additional check % that the entry has been used. Only useful if the glossaries occur % at the end of the document, in which case this command should go @@ -12133,7 +12270,7 @@ want %\end{macro} % %\begin{macro}{\glsFindWidestUsedAnyName} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % Like the above but doesn't check the parent key. Useful if all % levels should have the same width for the name. % \begin{macrocode} @@ -12161,7 +12298,7 @@ want %\end{macro} % %\begin{macro}{\glsFindWidestAnyName} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % Like the above but doesn't check is the entry has been used. % \begin{macrocode} \newrobustcmd*{\glsFindWidestAnyName}[1][\@glo@types]{% @@ -12184,7 +12321,7 @@ want %\end{macro} % %\begin{macro}{\glsFindWidestUsedLevelTwo} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % This is like \cs{glsFindWidestUsedTopLevelName} but also sets the % first two sub-levels as well. Any entry that has a % great-grandparent is ignored. @@ -12242,7 +12379,7 @@ want %\end{macro} % %\begin{macro}{\glsFindWidestLevelTwo} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % This is like \cs{glsFindWidestUsedLevelTwo} but doesn't check if the % entry has been used. % \begin{macrocode} @@ -12295,7 +12432,7 @@ want %\end{macro} % %\begin{macro}{\glsFindWidestUsedAnyNameSymbol} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % Like the \cs{glsFindWidestUsedAnyName} but also measures the % symbol. The length of the widest symbol is stored in the second argument % should be a length register. @@ -12330,7 +12467,7 @@ want %\end{macro} % %\begin{macro}{\glsFindWidestAnyNameSymbol} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % Like the above but doesn't check if the entry has been used. % \begin{macrocode} \newrobustcmd*{\glsFindWidestAnyNameSymbol}[2][\@glo@types]{% @@ -12359,7 +12496,7 @@ want %\end{macro} % %\begin{macro}{\glsFindWidestUsedAnyNameSymbolLocation} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % Like the \cs{glsFindWidestUsedAnyNameSymbol} but also measures the % location list. This requires \ics{glsentrynumberlist}. % The length of the widest symbol is stored in the second argument @@ -12403,7 +12540,7 @@ want %\end{macro} % %\begin{macro}{\glsFindWidestAnyNameSymbolLocation} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % Like the \cs{glsFindWidestUsedAnyNameSymbol} but doesn't check if % the entry has been used. % \begin{macrocode} @@ -12439,7 +12576,7 @@ want %\end{macro} % %\begin{macro}{\glsFindWidestUsedAnyNameLocation} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % Like the \cs{glsFindWidestUsedAnyNameSymbolLocation} but doesn't % measure the symbol. The length of the widest location % list is stored in the second argument, which should be a @@ -12475,7 +12612,7 @@ want %\end{macro} % %\begin{macro}{\glsFindWidestAnyNameLocation} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % Like the \cs{glsFindWidestAnyNameLocation} but doesn't % check the \gls{firstuse} flag. % \begin{macrocode} @@ -12505,7 +12642,7 @@ want %\end{macro} % %\begin{macro}{\glsxtrComputeTreeIndent} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % Compute the value of \cs{glstreeindent}. Argument is the entry label. % (Ignored in default definition, but this command may be redefined % to take the particular entry into account.) Note that the @@ -12518,7 +12655,7 @@ want %\end{macro} % %\begin{macro}{\glsxtrComputeTreeSubIndent} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} %\begin{macrocode} %\cs{\glsxtrComputeTreeSubIndent}\marg{level}\marg{label}\marg{register} %\end{macrocode} @@ -12540,7 +12677,7 @@ want %\end{macro} % %\begin{macro}{\glsxtrAltTreeSetHangIndent} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % Set \cs{hangindent} for top-level entries: % \begin{macrocode} \newcommand*{\glsxtrAltTreeSetHangIndent}{\hangindent\glstreeindent} @@ -12548,7 +12685,7 @@ want %\end{macro} % %\begin{macro}{\glsxtrAltTreeSetSubHangIndent} -%\changes{1.05}{??}{new} +%\changes{1.05}{2016-06-10}{new} % Set \cs{hangindent} for sub-entries: % \begin{macrocode} \newcommand*{\glsxtrAltTreeSetSubHangIndent}[1]{\hangindent\glstreeindent} 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 24b9ba0af4c..25d0bcecd52 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.1 2016/6/10 17:48 +% glossaries-extra.ins generated using makedtx version 1.1 2016/6/18 16:35 \input docstrip \preamble -- cgit v1.2.3