summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-22 20:49:17 +0000
committerKarl Berry <karl@freefriends.org>2019-03-22 20:49:17 +0000
commitb22baef408c481cea9a3570cdc3912c89a1356cd (patch)
tree9e314284c900f1395337d3cb11707e6bd931f59a /Master/texmf-dist/source
parentb354402d84508424356bc8b971a7f2c3029e0983 (diff)
glossaries-extra (22mar19)
git-svn-id: svn://tug.org/texlive/trunk@50533 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx488
-rw-r--r--Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins7
2 files changed, 434 insertions, 61 deletions
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 689ab422a7f..db0689230ef 100644
--- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
+++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
@@ -1,8 +1,12 @@
%\iffalse
% glossaries-extra.dtx generated using makedtx version 1.2 (c) Nicola Talbot
% Command line args:
-% -setambles ".*\.bib=>\nopreamble\nopostamble"
% -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})"
+% -section "chapter"
+% -doc "glossaries-extra-codedoc.tex"
+% -comment ".*\.tex"
+% -comment ".*\.bib"
+% -author "Nicola Talbot"
% -macrocode ".*\.tex"
% -macrocode ".*\.bib"
% -src "glossaries-extra.sty\Z=>glossaries-extra.sty"
@@ -12,13 +16,9 @@
% -src "glossary-longextra.sty\Z=>glossary-longextra.sty"
% -src "(example-glossaries-.+\.tex)\Z=>\1"
% -src "(example-glossaries-.+\.bib)\Z=>\1"
-% -section "chapter"
-% -comment ".*\.tex"
-% -comment ".*\.bib"
-% -author "Nicola Talbot"
-% -doc "glossaries-extra-codedoc.tex"
+% -setambles ".*\.bib=>\nopreamble\nopostamble"
% glossaries-extra
-% Created on 2018/12/1 12:12
+% Created on 2019/3/22 13:20
%\fi
%\iffalse
%<*package>
@@ -41,7 +41,7 @@
%\fi
% \iffalse
% Doc-Source file to use with LaTeX2e
-% Copyright (C) 2018 Nicola Talbot, all rights reserved.
+% Copyright (C) 2019 Nicola Talbot, all rights reserved.
% \fi
% \iffalse
%<*driver>
@@ -140,7 +140,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\setcounter{IndexColumns}{2}
-\CheckSum{25100}
+\CheckSum{25236}
\newcommand*{\ifirstuse}{\iterm{first use}}
\newcommand*{\firstuse}{\gls{firstuse}}
@@ -180,13 +180,13 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\raggedright
}
-\title{glossaries-extra.sty v1.38:
+\title{glossaries-extra.sty v1.39:
documented code}
\author{Nicola L.C. Talbot\\[10pt]
Dickimaw Books\\
\url{http://www.dickimaw-books.com/}}
-\date{2018-12-01}
+\date{2019-03-22}
\begin{document}
\DocInput{glossaries-extra.dtx}
@@ -231,7 +231,7 @@ Dickimaw Books\\
%\section{Package Initialisation and Options}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2018/12/01 1.38 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2019/03/22 1.39 (NLCT)]
% \end{macrocode}
% Requires \sty{xkeyval} to define package options.
% \begin{macrocode}
@@ -660,8 +660,16 @@ Dickimaw Books\\
\ifx\theglsentrycounter\theHglsentrycounter
\def\@glo@counterprefix{}%
\else
- \edef\@do@gls@getcounterprefix{\noexpand\@gls@getcounterprefix
- {\theglsentrycounter}{\theHglsentrycounter}%
+% \end{macrocode}
+%\changes{1.39}{2019-03-22}{added protection for fragile commands}
+% Protect against non-expandable commands occurring in the location.
+% \begin{macrocode}
+ \protected@edef\@glsxtr@theentrycounter{\theglsentrycounter}%
+ \protected@edef\@glsxtr@theHentrycounter{\theHglsentrycounter}%
+ \@onelevel@sanitize\@glsxtr@theentrycounter
+ \@onelevel@sanitize\@glsxtr@theHentrycounter
+ \protected@edef\@do@gls@getcounterprefix{\noexpand\@gls@getcounterprefix
+ {\@glsxtr@theentrycounter}{\@glsxtr@theHentrycounter}%
}%
\@do@gls@getcounterprefix
\fi
@@ -2496,9 +2504,19 @@ Dickimaw Books\\
%\begin{macro}{\GlsXtrIfFieldNonZero}
%\changes{1.31}{2018-05-09}{new}
%Designed for numeric fields.
+%\changes{1.39}{2019-03-22}{added starred version}
% \begin{macrocode}
-\newcommand{\GlsXtrIfFieldNonZero}[4]{%
- \GlsXtrIfFieldCmpNum{#1}{#2}{=}{0}{#4}{#3}%
+\newcommand{\GlsXtrIfFieldNonZero}{%
+ \@ifstar\s@GlsXtrIfFieldNonZero\@GlsXtrIfFieldNonZero
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@GlsXtrIfFieldNonZero}
+%\changes{1.39}{2019-03-22}{new}
+% \begin{macrocode}
+\newcommand{\@GlsXtrIfFieldNonZero}[4]{%
+ \@GlsXtrIfFieldCmpNum{#1}{#2}{=}{0}{#4}{#3}%
}
% \end{macrocode}
%\end{macro}
@@ -2509,9 +2527,28 @@ Dickimaw Books\\
%\cs{GlsXtrIfFieldEqNum}\marg{field}\marg{label}\marg{value}\marg{true}\marg{false}
%\end{definition}
%Designed for numeric fields.
+%\changes{1.39}{2019-03-22}{added starred version}
+% \begin{macrocode}
+\newcommand{\GlsXtrIfFieldEqNum}{%
+ \@ifstar\s@GlsXtrIfFieldEqNum\@GlsXtrIfFieldEqNum
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@GlsXtrIfFieldEqNum}
+%\changes{1.39}{2019-03-22}{new}
+% \begin{macrocode}
+\newcommand{\@GlsXtrIfFieldEqNum}[5]{%
+ \@GlsXtrIfFieldCmpNum{#1}{#2}{=}{#3}{#4}{#5}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\s@GlsXtrIfFieldEqNum}
+%\changes{1.39}{2019-03-22}{new}
% \begin{macrocode}
-\newcommand{\GlsXtrIfFieldEqNum}[5]{%
- \GlsXtrIfFieldCmpNum{#1}{#2}{=}{#3}{#4}{#5}%
+\newcommand{\s@GlsXtrIfFieldEqNum}[5]{%
+ \s@GlsXtrIfFieldCmpNum{#1}{#2}{=}{#3}{#4}{#5}%
}
% \end{macrocode}
%\end{macro}
@@ -2522,8 +2559,18 @@ Dickimaw Books\\
%\cs{GlsXtrIfFieldCmpNum}\marg{field}\marg{label}\marg{comparison}\marg{value}\marg{true}\marg{false}
%\end{definition}
%Designed for numeric fields.
+%\changes{1.39}{2019-03-22}{added starred version}
% \begin{macrocode}
-\newcommand{\GlsXtrIfFieldCmpNum}[6]{%
+\newcommand{\GlsXtrIfFieldCmpNum}{%
+ \@ifstar\s@GlsXtrIfFieldCmpNum\@GlsXtrIfFieldCmpNum
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@GlsXtrIfFieldCmpNum}
+%\changes{1.39}{2019-03-22}{new}
+% \begin{macrocode}
+\newcommand{\@GlsXtrIfFieldCmpNum}[6]{%
{%
\letcs{\glscurrentfieldvalue}{glo@\glsdetoklabel{#2}@#1}%
\ifundef\glscurrentfieldvalue
@@ -2539,6 +2586,23 @@ Dickimaw Books\\
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\s@GlsXtrIfFieldCmpNum}
+%\changes{1.39}{2019-03-22}{new}
+% \begin{macrocode}
+\newcommand{\s@GlsXtrIfFieldCmpNum}[6]{%
+ \letcs{\glscurrentfieldvalue}{glo@\glsdetoklabel{#2}@#1}%
+ \ifundef\glscurrentfieldvalue
+ {\def\glscurrentfieldvalue{0}}%
+ {%
+ \ifdefempty\glscurrentfieldvalue
+ {\def\glscurrentfieldvalue{0}}%
+ {}%
+ }%
+ \ifnum\glscurrentfieldvalue#3#4\relax #5\else #6\fi
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\GlsXtrIfFieldUndef}
%\changes{1.23}{2017-11-12}{new}
%\begin{definition}
@@ -2606,6 +2670,17 @@ Dickimaw Books\\
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glsxtrentryparentname}
+%\changes{1.39}{2019-03-22}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrentryparentname}[1]{%
+ \ifcsdef{glo@\glsdetoklabel{#1}@parent}%
+ {\csuse{glo@\csuse{glo@\glsdetoklabel{#1}@parent}@name}}%
+ {}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\glsxtrdeffield}
%\changes{1.12}{2017-02-03}{new}
%Just use \cs{csdef} to provide a field value for the given entry.
@@ -2713,9 +2788,34 @@ Dickimaw Books\\
%
%\begin{macro}{\GlsXtrIfFieldEqStr}
%\changes{1.21}{2017-11-03}{new}
+%\changes{1.39}{2019-03-22}{added starred form}
+%Starred version uses starred version of \cs{glsxtrifhasfield}
+%(that is, no grouping).
+% \begin{macrocode}
+\newcommand*{\GlsXtrIfFieldEqStr}{%
+ \@ifstar\s@GlsXtrIfFieldEqStr\@GlsXtrIfFieldEqStr
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@GlsXtrIfFieldEqStr}
+%\changes{1.39}{2019-03-22}{new}
+% \begin{macrocode}
+\newrobustcmd*{\@GlsXtrIfFieldEqStr}[5]{%
+ \@glsxtrifhasfield{#1}{#2}%
+ {%
+ \ifdefstring{\glscurrentfieldvalue}{#3}{#4}{#5}%
+ }%
+ {#5}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\s@GlsXtrIfFieldEqStr}
+%\changes{1.39}{2019-03-22}{new}
% \begin{macrocode}
-\newrobustcmd*{\GlsXtrIfFieldEqStr}[5]{%
- \glsxtrifhasfield{#1}{#2}%
+\newrobustcmd*{\s@GlsXtrIfFieldEqStr}[5]{%
+ \s@glsxtrifhasfield{#1}{#2}%
{%
\ifdefstring{\glscurrentfieldvalue}{#3}{#4}{#5}%
}%
@@ -2727,9 +2827,35 @@ Dickimaw Books\\
%\begin{macro}{\GlsXtrIfFieldEqXpStr}
%\changes{1.31}{2018-05-09}{new}
%Like the above but first expands the string.
+%Starred version uses starred version of \cs{glsxtrifhasfield}
+%(that is, no grouping).
+%\changes{1.39}{2019-03-22}{added starred form}
+% \begin{macrocode}
+\newcommand*{\GlsXtrIfFieldEqXpStr}{%
+ \@ifstar\s@GlsXtrIfFieldEqXpStr\@GlsXtrIfFieldEqXpStr
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@GlsXtrIfFieldEqXpStr}
+%\changes{1.39}{2019-03-22}{new}
% \begin{macrocode}
-\newrobustcmd*{\GlsXtrIfFieldEqXpStr}[5]{%
- \glsxtrifhasfield{#1}{#2}%
+\newrobustcmd*{\@GlsXtrIfFieldEqXpStr}[5]{%
+ \@glsxtrifhasfield{#1}{#2}%
+ {%
+ \protected@edef\@gls@tmp{#3}%
+ \ifdefequal{\glscurrentfieldvalue}{\@gls@tmp}{#4}{#5}%
+ }%
+ {#5}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\s@GlsXtrIfFieldEqXpStr}
+%\changes{1.39}{2019-03-22}{new}
+% \begin{macrocode}
+\newrobustcmd*{\s@GlsXtrIfFieldEqXpStr}[5]{%
+ \s@glsxtrifhasfield{#1}{#2}%
{%
\protected@edef\@gls@tmp{#3}%
\ifdefequal{\glscurrentfieldvalue}{\@gls@tmp}{#4}{#5}%
@@ -2742,9 +2868,37 @@ Dickimaw Books\\
%\begin{macro}{\GlsXtrIfXpFieldEqXpStr}
%\changes{1.31}{2018-05-09}{new}
%Like the above but also expands the field value.
+%Starred version uses starred version of \cs{glsxtrifhasfield}
+%(that is, no grouping).
+%\changes{1.39}{2019-03-22}{added starred form}
% \begin{macrocode}
-\newrobustcmd*{\GlsXtrIfXpFieldEqXpStr}[5]{%
- \glsxtrifhasfield{#1}{#2}%
+\newcommand*{\GlsXtrIfXpFieldEqXpStr}{%
+ \@ifstar\s@GlsXtrIfXpFieldEqXpStr\@GlsXtrIfXpFieldEqXpStr
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@GlsXtrIfXpFieldEqXpStr}
+%\changes{1.39}{2019-03-22}{new}
+% \begin{macrocode}
+\newrobustcmd*{\@GlsXtrIfXpFieldEqXpStr}[5]{%
+ \@glsxtrifhasfield{#1}{#2}%
+ {%
+ \protected@edef\@gls@tmp{\glscurrentfieldvalue}%
+ \let\glscurrentfieldvalue\@gls@tmp
+ \protected@edef\@gls@tmp{#3}%
+ \ifdefequal{\glscurrentfieldvalue}{\@gls@tmp}{#4}{#5}%
+ }%
+ {#5}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\s@GlsXtrIfXpFieldEqXpStr}
+%\changes{1.39}{2019-03-22}{new}
+% \begin{macrocode}
+\newrobustcmd*{\s@GlsXtrIfXpFieldEqXpStr}[5]{%
+ \s@glsxtrifhasfield{#1}{#2}%
{%
\protected@edef\@gls@tmp{\glscurrentfieldvalue}%
\let\glscurrentfieldvalue\@gls@tmp
@@ -6433,9 +6587,11 @@ Dickimaw Books\\
{#2}%
\else
\glsifattribute{#1}{indexonlyfirst}{true}%
- {\ifglsused{#1}
- {\glsxtrdoautoindexname{#1}{dualindex}}%
- {#2}}%
+ {%
+ \ifglsused{#1}%
+ {\glsxtrdoautoindexname{#1}{dualindex}}%
+ {#2}%
+ }%
{#2}%
\fi
}%
@@ -8583,6 +8739,11 @@ Dickimaw Books\\
{You may only use the hybrid \string\makeglossaries[...]\space with
record=off option}%
\else
+% \end{macrocode}
+%\cs{@gls@@automake@immediate} was introduced to \sty{glossaries}
+%v4.42 so it may not be defined.
+% \begin{macrocode}
+ \ifdef\@gls@@automake@immediate{\@gls@@automake@immediate}{}%
\edef\@glsxtr@reg@glosslist{#1}%
\ifundef{\glswrite}{\newwrite\glswrite}{}%
\protected@write\@auxout{}{\string\providecommand
@@ -8965,6 +9126,28 @@ Dickimaw Books\\
}
% \end{macrocode}
%
+%\changes{1.39}{2019-03-22}{added \texttt{label} key for \texttt{printgloss}}
+% \begin{macrocode}
+\define@key{printgloss}{label}{%
+ \glsxtrsetglossarylabel{#1}%
+}
+% \end{macrocode}
+%
+%\begin{macro}{\glsxtrsetglossarylabel}
+%\changes{1.39}{2019-03-22}{new}
+%Set the label for subsequent glossaries. If the label is
+%fixed (that is, doesn't change with each glossary) this will need
+%to be scoped or changed again to prevent duplicate labels.
+% \begin{macrocode}
+\newcommand{\glsxtrsetglossarylabel}[1]{%
+ \renewcommand*{\@@glossaryseclabel}{%
+ \protected@edef\@currentlabelname{\glossarytoctitle}%
+ \label{#1}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\glsdohypertarget}
%\changes{1.20}{2017-09-11}{added redefinition}
%Redefine to insert \cs{@glsxtrhypernameprefix} before the target
@@ -9400,8 +9583,11 @@ Dickimaw Books\\
\def\@gls@removespaces#1 #2\@nil{%
\toks@=\expandafter{\the\toks@#1}%
\ifx\\#2\\%
- \edef\x{\the\toks@}%
- \ifx\x\empty
+% \end{macrocode}
+%\changes{1.39}{2019-03-22}{changed \cs{x} to \cs{@glo@tmp}}
+% \begin{macrocode}
+ \edef\@glo@tmp{\the\toks@}%
+ \ifx\@glo@tmp\empty
\else
% \end{macrocode}
%Expand location (just in case \cs{toks@} is needed for something
@@ -9586,7 +9772,7 @@ Dickimaw Books\\
\begin{itemize}
\item Run the external (Lua) application:
- \texttt{makeglossaries-lite.lua \string"\jobname\string"}
+ \texttt{makeglossaries-lite \string"\jobname\string"}
\item Run the external (Perl) application:
@@ -9972,7 +10158,9 @@ Dickimaw Books\\
\let\glsxtr@writefields\relax
% \end{macrocode}
%If the \pkgopt{automake} option is on, try running bib2gls if
-%the aux file exists.
+%the aux file exists. This has to be done before the aux file is
+%opened (so package options \pkgopt[immediate]{automake} and
+%\pkgopt[true]{automake} are identical if just bib2gls is used).
%\changes{1.14}{2017-04-18}{added check for automake}
%\changes{1.19}{2017-09-09}{removed double-quotes around \cs{jobname}}
%The double-quotes around \cs{jobname} have been removed (v1.19)
@@ -12539,7 +12727,7 @@ defined}{}%
% \end{macrocode}
%
%\begin{macro}{\glssetregularcategory}
-%Convenient shortcut to create add the regular attribute.
+%Convenient shortcut to add the regular attribute.
% \begin{macrocode}
\newcommand*{\glssetregularcategory}[1]{%
\glssetcategoryattribute{#1}{regular}{true}%
@@ -16550,9 +16738,13 @@ defined}{}%
%
%\begin{macro}{\glsxtrshortdescname}
%\changes{1.17}{2017-08-09}{new}
+%\changes{1.39}{2019-03-22}{corrected to show long form as advertised in the
+%manual}
% \begin{macrocode}
\newcommand*{\glsxtrshortdescname}{%
\protect\glsabbrvfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \protect\glsxtrparen{\protect\glslongfont{\the\glslongtok}}%
}
% \end{macrocode}
%\end{macro}
@@ -16563,6 +16755,8 @@ defined}{}%
% post-description hooks set) might be a better option.
%\changes{1.01}{2016-02-02}{fixed typo in
%\cs{glsxtrinlinefullformat} and added missing second argument}
+%\changes{1.39}{2019-03-22}{corrected to omit \gloskey{description} key as advertised in the
+%manual}
% \begin{macrocode}
\newabbreviationstyle{short-desc}%
{%
@@ -16572,8 +16766,7 @@ defined}{}%
first={\protect\glsfirstabbrvfont{\the\glsshorttok}},
firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}},
text={\protect\glsabbrvfont{\the\glsshorttok}},
- plural={\protect\glsabbrvfont{\the\glsshortpltok}},
- description={\the\glslongtok}}%
+ plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
@@ -17263,6 +17456,8 @@ defined}{}%
%\end{abbrvstyle}
%
%\begin{abbrvstyle}{short-sc-desc}
+%\changes{1.39}{2019-03-22}{bug fix: omit \gloskey{description} key as advertised in the
+%manual}
% \begin{macrocode}
\newabbreviationstyle{short-sc-desc}%
{%
@@ -17272,8 +17467,7 @@ defined}{}%
first={\protect\glsfirstabbrvscfont{\the\glsshorttok}},
firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}},
text={\protect\glsabbrvscfont{\the\glsshorttok}},
- plural={\protect\glsabbrvscfont{\the\glsshortpltok}},
- description={\the\glslongtok}}%
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
@@ -18113,6 +18307,8 @@ defined}{}%
%
%\begin{abbrvstyle}{short-sm-desc}
%\changes{0.5}{2015-12-07}{new}
+%\changes{1.39}{2019-03-22}{corrected to omit \gloskey{description} key as advertised in the
+%manual}
% \begin{macrocode}
\newabbreviationstyle{short-sm-desc}%
{%
@@ -18122,8 +18318,7 @@ defined}{}%
first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}},
firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}},
text={\protect\glsabbrvsmfont{\the\glsshorttok}},
- plural={\protect\glsabbrvsmfont{\the\glsshortpltok}},
- description={\the\glslongtok}}%
+ plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
@@ -19157,6 +19352,8 @@ defined}{}%
%
%\begin{abbrvstyle}{short-em-desc}
%\changes{0.5}{2015-12-07}{new}
+%\changes{1.39}{2019-03-22}{bug fix: omit \gloskey{description} key as advertised in the
+%manual}
% \begin{macrocode}
\newabbreviationstyle{short-em-desc}%
{%
@@ -19166,8 +19363,7 @@ defined}{}%
first={\protect\glsfirstabbrvemfont{\the\glsshorttok}},
firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}},
text={\protect\glsabbrvemfont{\the\glsshorttok}},
- plural={\protect\glsabbrvemfont{\the\glsshortpltok}},
- description={\the\glslongtok}}%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
@@ -19583,7 +19779,7 @@ defined}{}%
%\begin{abbrvstyle}{long-em-noshort-em-desc}
%\changes{1.04}{2016-05-02}{new}
% The short form is explicitly invoked through commands like
-% \cs{glsshort}. The long form is emphasized.
+% \cs{glsxtrshort}. The long form is emphasized.
% \begin{macrocode}
\newabbreviationstyle{long-em-noshort-em-desc}%
{%
@@ -20801,6 +20997,7 @@ defined}{}%
%\end{abbrvstyle}
%
%\begin{abbrvstyle}{long-hyphen-noshort-noreg}
+%\changes{1.17}{2017-08-09}{new}
% It doesn't really make a great deal of sense to have a long-only
% style that doesn't have a description (unless no glossary is
% required), but the best course of
@@ -22959,7 +23156,7 @@ defined}{}%
%automatically loaded by the record option.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-bib2gls}[2018/12/01 1.38 (NLCT)]
+\ProvidesPackage{glossaries-extra-bib2gls}[2019/03/22 1.39 (NLCT)]
% \end{macrocode}
%
%These are some convenient macros for use with custom rules.
@@ -25952,7 +26149,7 @@ defined}{}%
% First identify package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2018/12/01 1.38 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2019/03/22 1.39 (NLCT)]
% \end{macrocode}
% Provide package options to automatically load required predefined
% styles. The simplest method is to just test for the existence of
@@ -28130,7 +28327,7 @@ defined}{}%
%\section{Package Initialisation and Options}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-bookindex}[2018/12/01 1.38 (NLCT)]
+\ProvidesPackage{glossary-bookindex}[2019/03/22 1.39 (NLCT)]
% \end{macrocode}
%Load required packages.
% \begin{macrocode}
@@ -28192,6 +28389,28 @@ defined}{}%
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glsxtrbookindexlocation}
+%\changes{1.39}{2019-03-22}{new}
+%\begin{definition}
+%\cs{glsxtrbookindexlocation}\marg{label}\marg{location}
+%\end{definition}
+%Displays the location.
+% \begin{macrocode}
+\newcommand*{\glsxtrbookindexlocation}[2]{#2}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtrbookindexsublocation}
+%\changes{1.39}{2019-03-22}{new}
+%\begin{definition}
+%\cs{glsxtrbookindexlocation}\marg{label}\marg{location}
+%\end{definition}
+%Displays the location for sub-entries.
+% \begin{macrocode}
+\newcommand*{\glsxtrbookindexsublocation}{\glsxtrbookindexlocation}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\glsxtrbookindexparentchildsep}
%\changes{1.21}{2017-11-03}{new}
%Separator used between top-level parent and child entry.
@@ -28312,15 +28531,24 @@ defined}{}%
\setglossarystyle{index}%
\renewenvironment{theglossary}%
{%
- \ifdefempty\glsxtrbookindexcolspread
- {%
- \expandafter\begin\expandafter{\glsxtrbookindexmulticolsenv}%
- {\glsxtrbookindexcols}%
- }%
- {%
- \expandafter\begin\expandafter{\glsxtrbookindexmulticolsenv}%
- {\glsxtrbookindexcols}[\glsxtrbookindexcolspread]%
- }%
+ \ifnum\glsxtrbookindexcols>1\relax
+ \ifdefempty\glsxtrbookindexcolspread
+ {%
+ \edef\glsxtr@beginbookindex{%
+ \noexpand\begin{\glsxtrbookindexmulticolsenv}
+ {\glsxtrbookindexcols}%
+ }%
+ }%
+ {%
+ \edef\glsxtr@beginbookindex{%
+ \noexpand\begin{\glsxtrbookindexmulticolsenv}%
+ {\glsxtrbookindexcols}[\glsxtrbookindexcolspread]%
+ }%
+ }%
+ \else
+ \def\glsxtr@beginbookindex{}%
+ \fi
+ \glsxtr@beginbookindex
\setlength{\parindent}{0pt}%
\setlength{\parskip}{0pt plus 0.3pt}%
\let\@glsxtr@bookindex@sep\glsxtrbookindexparentchildsep
@@ -28343,7 +28571,14 @@ defined}{}%
% \end{macrocode}
%End \env{multicols} environment.
% \begin{macrocode}
- \expandafter\end\expandafter{\glsxtrbookindexmulticolsenv}%
+ \ifnum\glsxtrbookindexcols>1\relax
+ \edef\glsxtr@endbookindex{%
+ \noexpand\end{\glsxtrbookindexmulticolsenv}%
+ }%
+ \else
+ \def\glsxtr@endbookindex{}%
+ \fi
+ \glsxtr@endbookindex
}%
% \end{macrocode}
%Use ragged right as columns are likely to be narrow and
@@ -28379,7 +28614,8 @@ defined}{}%
\glstreeitem
\glsentryitem{##1}%
\glstarget{##1}{\glsxtrbookindexname{##1}}%
- \glsxtrbookindexprelocation{##1}##2%
+ \glsxtrbookindexprelocation{##1}%
+ \glsxtrbookindexlocation{##1}{##2}%
}%
\renewcommand{\subglossentry}[3]{%
\ifcase##1\relax
@@ -28435,7 +28671,8 @@ defined}{}%
% Format entry.
% \begin{macrocode}
\glstarget{##2}{\glsxtrbookindexsubname{##2}}%
- \glsxtrbookindexsubprelocation{##2}##3%
+ \glsxtrbookindexsubprelocation{##2}%
+ \glsxtrbookindexsublocation{##2}{##3}%
}%
% \end{macrocode}
% The group skip is moved to the group heading to avoid interfering
@@ -28575,7 +28812,7 @@ defined}{}%
%Provides additional long styles.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-longextra}[2018/12/01 1.38 (NLCT)]
+\ProvidesPackage{glossary-longextra}[2019/03/22 1.39 (NLCT)]
% \end{macrocode}
%Load required packages.
% \begin{macrocode}
@@ -31844,6 +32081,141 @@ suscipit}
%\fi
%\iffalse
% \begin{macrocode}
+%<*example-glossaries-symbolnames.bib>
+% \end{macrocode}
+%\fi
+%\iffalse
+% \begin{macrocode}
+% Encoding: UTF-8
+@entry{sym.alpha,
+ name = {\ensuremath{\alpha}},
+ description = {Quisque ullamcorper placerat ipsum.}
+}
+
+@entry{sym.beta,
+ name = {\ensuremath{\beta}},
+ description = {Cras nibh.}
+}
+
+@entry{sym.gamma,
+ name = {\ensuremath{\gamma}},
+ description = {Morbi vel justo vitae lacus tincidunt ultrices.}
+}
+
+@entry{sym.delta,
+ name = {\ensuremath{\delta}},
+ description = {Lorem ipsum dolor sit amet, consectetuer adipiscing
+elit.}
+}
+
+@entry{sym.epsilon,
+ name = {\ensuremath{\epsilon}},
+ description = {In hac habitasse platea dictumst.}
+}
+
+@entry{sym.zeta,
+ name = {\ensuremath{\zeta}},
+ description = {Integer tempus convallis augue.}
+}
+
+@entry{sym.eta,
+ name = {\ensuremath{\eta}},
+ description = {Etiam facilisis.}
+}
+
+@entry{sym.theta,
+ name = {\ensuremath{\theta}},
+ description = {Nunc elementum fermentum wisi.}
+}
+
+@entry{sym.iota,
+ name = {\ensuremath{i}},
+ description = {Aenean placerat.}
+}
+
+@entry{sym.kappa,
+ name = {\ensuremath{\kappa}},
+ description = {Ut imperdiet, enim sed gravida sollicitudin, felis odio
+placerat quam, ac pulvinar elit purus eget enim.}
+}
+
+@entry{sym.lambda,
+ name = {\ensuremath{\lambda}},
+ description = {Nunc vitae tortor.}
+}
+
+@entry{sym.mu,
+ name = {\ensuremath{\mu}},
+ description = {Proin tempus nibh sit amet nisl.}
+}
+
+@entry{sym.nu,
+ name = {\ensuremath{\nu}},
+ description = {Vivamus quis tortor vitae risus porta vehicula.}
+}
+
+@entry{sym.xi,
+ name = {\ensuremath{\xi}},
+ description = {Fusce mauris.}
+}
+
+@entry{sym.pi,
+ name = {\ensuremath{\pi}},
+ description = {Vestibulum luctus nibh at lectus.}
+}
+
+@entry{sym.rho,
+ name = {\ensuremath{\rho}},
+ description = {Sed bibendum, nulla a faucibus semper, leo velit
+ultricies tellus, ac venenatis arcu wisi vel nisl. Vestibulum diam.}
+}
+
+@entry{sym.sigma,
+ name = {\ensuremath{\sigma}},
+ description = {Aliquam pellentesque, augue quis sagittis posuere,
+turpis lacus congue quam, in hendrerit risus eros eget felis.}
+}
+
+@entry{sym.tau,
+ name = {\ensuremath{\tau}},
+ description = {Maecenas eget erat in sapien mattis porttitor.}
+}
+
+@entry{sym.upsilon,
+ name = {\ensuremath{\upsilon}},
+ description = {Vestibulum porttitor.}
+}
+
+@entry{sym.phi,
+ name = {\ensuremath{\phi}},
+ description = {Nulla facilisi.}
+}
+
+@entry{sym.chi,
+ name = {\ensuremath{\chi}},
+ description = {Sed a turpis eu lacus commodo facilisis.}
+}
+
+@entry{sym.psi,
+ name = {\ensuremath{\psi}},
+ description = {Morbi fringilla, wisi in dignissim interdum, justo
+lectus sagittis dui, et vehicula libero dui cursus dui.}
+}
+
+@entry{sym.omega,
+ name = {\ensuremath{\omega}},
+ description = {Mauris tempor ligula sed lacus.}
+}
+
+% \end{macrocode}
+%\fi
+%\iffalse
+% \begin{macrocode}
+%</example-glossaries-symbolnames.bib>
+% \end{macrocode}
+%\fi
+%\iffalse
+% \begin{macrocode}
%<*example-glossaries-symbols.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 024e734a605..9db68e37774 100644
--- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins
+++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins
@@ -1,10 +1,10 @@
-% glossaries-extra.ins generated using makedtx version 1.2 2018/12/1 12:12
+% glossaries-extra.ins generated using makedtx version 1.2 2019/3/22 13:20
\input docstrip
\preamble
glossaries-extra.dtx
- Copyright 2018 Nicola Talbot
+ Copyright 2019 Nicola Talbot
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -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-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.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-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib.
+ This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-bib2gls.sty, glossaries-extra-stylemods.sty, glossary-bookindex.sty, glossary-longextra.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-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbolnames.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib.
\endpreamble
@@ -46,6 +46,7 @@
\file{example-glossaries-long.bib}{\nopreamble\nopostamble\from{glossaries-extra.dtx}{example-glossaries-long.bib}}
\file{example-glossaries-multipar.bib}{\nopreamble\nopostamble\from{glossaries-extra.dtx}{example-glossaries-multipar.bib}}
\file{example-glossaries-parent.bib}{\nopreamble\nopostamble\from{glossaries-extra.dtx}{example-glossaries-parent.bib}}
+\file{example-glossaries-symbolnames.bib}{\nopreamble\nopostamble\from{glossaries-extra.dtx}{example-glossaries-symbolnames.bib}}
\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-xr.bib}{\nopreamble\nopostamble\from{glossaries-extra.dtx}{example-glossaries-xr.bib}}