summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/glossaries-extra
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-24 23:43:17 +0000
committerKarl Berry <karl@freefriends.org>2017-11-24 23:43:17 +0000
commit39dc5cdbdf0c89c978293f541900e89a11db8de9 (patch)
tree74ee8e1db2c16d53619015be1a8475271129120a /Master/texmf-dist/source/latex/glossaries-extra
parentbe0c0fc03286786001cce79d67c268d3aa536c2a (diff)
glossaries-extra (24nov17)
git-svn-id: svn://tug.org/texlive/trunk@45898 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/glossaries-extra')
-rw-r--r--Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx241
-rw-r--r--Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins2
2 files changed, 177 insertions, 66 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 dcef80670b4..e9151f3574c 100644
--- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
+++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
@@ -6,17 +6,17 @@
% -src "glossary-bookindex.sty\Z=>glossary-bookindex.sty"
% -src "(example-glossaries-.+\.tex)\Z=>\1"
% -src "(example-glossaries-.+\.bib)\Z=>\1"
+% -author "Nicola Talbot"
+% -section "chapter"
% -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})"
% -macrocode ".*\.tex"
% -macrocode ".*\.bib"
+% -doc "glossaries-extra-codedoc.tex"
% -comment ".*\.tex"
% -comment ".*\.bib"
-% -section "chapter"
-% -author "Nicola Talbot"
-% -doc "glossaries-extra-codedoc.tex"
% -setambles ".*\.bib=>\nopreamble\nopostamble"
% glossaries-extra
-% Created on 2017/11/14 20:50
+% Created on 2017/11/24 16:50
%\fi
%\iffalse
%<*package>
@@ -126,7 +126,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\setcounter{IndexColumns}{2}
-\CheckSum{20211}
+\CheckSum{20152}
\newcommand*{\ifirstuse}{\iterm{first use}}
\newcommand*{\firstuse}{\gls{firstuse}}
@@ -166,13 +166,13 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\raggedright
}
-\title{glossaries-extra.sty v1.24:
+\title{glossaries-extra.sty v1.25:
documented code}
\author{Nicola L.C. Talbot\\[10pt]
Dickimaw Books\\
\url{http://www.dickimaw-books.com/}}
-\date{2017-11-14}
+\date{2017-11-24}
\begin{document}
\DocInput{glossaries-extra.dtx}
@@ -217,7 +217,7 @@ Dickimaw Books\\
%\section{Package Initialisation and Options}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2017/11/14 v1.24 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2017/11/24 v1.25 (NLCT)]
% \end{macrocode}
% Requires \sty{xkeyval} to define package options.
% \begin{macrocode}
@@ -11326,6 +11326,10 @@ defined}{}%
\let\@glsnumberformat\@glsxtr@defaultnumberformat
\glsxtrdoautoindexname{#1}{indexname}%
% \end{macrocode}
+%Allow additional code regardless of category:
+% \begin{macrocode}
+ \glsextrapostnamehook{#1}%
+% \end{macrocode}
% Allow categories to hook in here.
%\changes{1.04}{2016-05-02}{added category check}
% \begin{macrocode}
@@ -11334,6 +11338,13 @@ defined}{}%
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glsextrapostnamehook}
+%\changes{1.25}{2017-11-24}{new}
+% \begin{macrocode}
+\newcommand*{\glsextrapostnamehook}[1]{}%
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\glsxtr@setaccessdisplay}
%\changes{1.22}{2017-11-08}{new}
% \begin{macrocode}
@@ -12102,9 +12113,10 @@ defined}{}%
% Provide a command for appending the description in parentheses on
% first use, for the convenience of users wanting to add this to the
% post link hook.
+%\changes{1.25}{2017-11-24}{changed to use \cs{glsxtrparen}}
% \begin{macrocode}
\newcommand*{\glsxtrpostlinkAddDescOnFirstUse}{%
- \glsxtrifwasfirstuse{\space(\glsaccessdesc{\glslabel})}{}%
+ \glsxtrifwasfirstuse{\space\glsxtrparen{\glsaccessdesc{\glslabel}}}{}%
}
% \end{macrocode}
%\end{macro}
@@ -12114,11 +12126,14 @@ defined}{}%
% Provide a command for appending the symbol (if defined) in parentheses on
% first use, for the convenience of users wanting to add this to the
% post link hook.
+%\changes{1.25}{2017-11-24}{changed to use \cs{glsxtrparen}}
% \begin{macrocode}
\newcommand*{\glsxtrpostlinkAddSymbolOnFirstUse}{%
\glsxtrifwasfirstuse
{%
- \ifglshassymbol{\glslabel}{\space(\glsaccesssymbol{\glslabel})}{}%
+ \ifglshassymbol{\glslabel}%
+ {\space\glsxtrparen{\glsaccesssymbol{\glslabel}}}%
+ {}%
}%
{}%
}
@@ -13851,6 +13866,15 @@ defined}{}%
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glsxtrlongshortname}
+%\changes{1.25}{2017-11-24}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrlongshortname}{%
+ \protect\glsabbrvfont{\the\glsshorttok}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\changes{1.17}{2017-08-09}{removed some inconsistencies in the abbreviation
%styles}
%\begin{abbrvstyle}{long-short}
@@ -13858,7 +13882,7 @@ defined}{}%
\newabbreviationstyle{long-short}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\glsxtrlongshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlongfont{\the\glslongtok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
@@ -13989,13 +14013,22 @@ defined}{}%
% \end{macrocode}
%\end{abbrvstyle}
%
+%\begin{macro}{\glsxtrshortlongname}
+%\changes{1.25}{2017-11-24}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrshortlongname}{%
+ \protect\glsabbrvfont{\the\glsshorttok}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{abbrvstyle}{short-long}
% Short form followed by long form in parenthesis on first use.
% \begin{macrocode}
\newabbreviationstyle{short-long}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\glsxtrshortlongname},
sort={\the\glsshorttok},
description={\the\glslongtok},%
first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
@@ -14151,13 +14184,22 @@ defined}{}%
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glsxtrfootnotename}
+%\changes{1.25}{2017-11-24}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrfootnotename}{%
+ \protect\glsabbrvfont{\the\glsshorttok}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{abbrvstyle}{footnote}
% Short form followed by long form in footnote on first use.
% \begin{macrocode}
\newabbreviationstyle{footnote}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\glsxtrfootnotename},
sort={\the\glsshorttok},
description={\the\glslongtok},%
% \end{macrocode}
@@ -14271,7 +14313,7 @@ defined}{}%
\newabbreviationstyle{postfootnote}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\glsxtrfootnotename},
sort={\the\glsshorttok},
description={\the\glslongtok},%
first={\protect\glsfirstabbrvfont{\the\glsshorttok}},%
@@ -14381,6 +14423,15 @@ defined}{}%
% \end{macrocode}
%\end{abbrvstyle}
%
+%\begin{macro}{\glsxtrshortnolongname}
+%\changes{1.25}{2017-11-24}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrshortnolongname}{%
+ \protect\glsabbrvfont{\the\glsshorttok}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{abbrvstyle}{short}
% Provide a style that only displays the short form on first use,
% but the short and long form can be displayed with the \qt{full}
@@ -14392,7 +14443,7 @@ defined}{}%
\newabbreviationstyle{short}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\glsxtrshortnolongname},
sort={\the\glsshorttok},
first={\protect\glsfirstabbrvfont{\the\glsshorttok}},
firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}},
@@ -14685,6 +14736,15 @@ defined}{}%
% \end{macrocode}
%\end{abbrvstyle}
%
+%\begin{macro}{\glsxtrlongnoshortdescname}
+%\changes{1.25}{2017-11-24}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrlongnoshortdescname}{%
+ \protect\glslongfont{\the\glslongtok}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{abbrvstyle}{long-desc}
% Provide a style that only displays the long form,
% but the long and short form can be displayed with the \qt{full}
@@ -14695,7 +14755,7 @@ defined}{}%
\newabbreviationstyle{long-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\protect\glslongfont{\the\glslongtok}},
+ name={\glsxtrlongnoshortdescname},
sort={\the\glslongtok},
first={\protect\glsfirstlongfont{\the\glslongtok}},
firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},
@@ -14814,6 +14874,15 @@ defined}{}%
% \end{macrocode}
%\end{abbrvstyle}
%
+%\begin{macro}{\glsxtrlongnoshortname}
+%\changes{1.25}{2017-11-24}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrlongnoshortname}{%
+ \protect\glsabbrvfont{\the\glsshorttok}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{abbrvstyle}{long}
% 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
@@ -14824,7 +14893,7 @@ defined}{}%
\newabbreviationstyle{long}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\glsxtrlongnoshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlongfont{\the\glslongtok}},
firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},
@@ -14916,7 +14985,7 @@ defined}{}%
\newabbreviationstyle{long-short-sc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ name={\glsxtrlongshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
@@ -15015,7 +15084,7 @@ defined}{}%
\newabbreviationstyle{short-sc-long}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ name={\glsxtrshortlongname},
sort={\the\glsshorttok},
description={\the\glslongtok},%
first={\protect\glsfirstabbrvscfont{\the\glsshorttok}%
@@ -15116,7 +15185,7 @@ defined}{}%
\newabbreviationstyle{short-sc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ name={\glsxtrshortnolongname},
sort={\the\glsshorttok},
first={\protect\glsfirstabbrvscfont{\the\glsshorttok}},
firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}},
@@ -15325,7 +15394,7 @@ defined}{}%
\newabbreviationstyle{long-noshort-sc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ name={\glsxtrlongnoshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlongdefaultfont{\the\glslongtok}},
firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}},
@@ -15519,7 +15588,7 @@ defined}{}%
\newabbreviationstyle{short-sc-footnote}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ name={\glsxtrfootnotename},
sort={\the\glsshorttok},
description={\the\glslongtok},%
first={\protect\glsfirstabbrvscfont{\the\glsshorttok}%
@@ -15621,7 +15690,7 @@ defined}{}%
\newabbreviationstyle{short-sc-postfootnote}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ name={\glsxtrfootnotename},
sort={\the\glsshorttok},
description={\the\glslongtok},%
first={\protect\glsfirstabbrvscfont{\the\glsshorttok}},%
@@ -15767,7 +15836,7 @@ defined}{}%
\newabbreviationstyle{long-short-sm}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ name={\glsxtrlongshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
@@ -15867,7 +15936,7 @@ defined}{}%
\newabbreviationstyle{short-sm-long}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ name={\glsxtrshortlongname},
sort={\the\glsshorttok},
description={\the\glslongtok},%
first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}%
@@ -15968,7 +16037,7 @@ defined}{}%
\newabbreviationstyle{short-sm}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ name={\glsxtrshortnolongname},
sort={\the\glsshorttok},
first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}},
firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}},
@@ -16173,7 +16242,7 @@ defined}{}%
\newabbreviationstyle{long-noshort-sm}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ name={\glsxtrlongnoshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlongdefaultfont{\the\glslongtok}},
firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}},
@@ -16362,7 +16431,7 @@ defined}{}%
\newabbreviationstyle{short-sm-footnote}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ name={\glsxtrfootnotename},
sort={\the\glsshorttok},
description={\the\glslongtok},%
first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}%
@@ -16461,7 +16530,7 @@ defined}{}%
\newabbreviationstyle{short-sm-postfootnote}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ name={\glsxtrfootnotename},
sort={\the\glsshorttok},
description={\the\glslongtok},%
first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}},%
@@ -16603,7 +16672,7 @@ defined}{}%
\newabbreviationstyle{long-short-em}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ name={\glsxtrlongshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
@@ -16706,7 +16775,7 @@ defined}{}%
%doesn't set the style.
% \begin{macrocode}
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ name={\glsxtrlongshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlongemfont{\the\glslongtok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
@@ -16806,7 +16875,7 @@ defined}{}%
\newabbreviationstyle{short-em-long}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ name={\glsxtrshortlongname},
sort={\the\glsshorttok},
description={\the\glslongtok},%
first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
@@ -16912,7 +16981,7 @@ defined}{}%
%doesn't set the style.
% \begin{macrocode}
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ name={\glsxtrshortlongname},
sort={\the\glsshorttok},
description={\protect\glslongemfont{\the\glslongtok}},%
first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
@@ -17012,7 +17081,7 @@ defined}{}%
\newabbreviationstyle{short-em}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ name={\glsxtrshortnolongname},
sort={\the\glsshorttok},
first={\protect\glsfirstabbrvemfont{\the\glsshorttok}},
firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}},
@@ -17216,7 +17285,7 @@ defined}{}%
\newabbreviationstyle{long-noshort-em}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ name={\glsxtrlongnoshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlongdefaultfont{\the\glslongtok}},
firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}},
@@ -17315,7 +17384,7 @@ defined}{}%
\newabbreviationstyle{long-em-noshort-em}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ name={\glsxtrlongnoshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlongemfont{\the\glslongtok}},
firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}},
@@ -17523,7 +17592,7 @@ defined}{}%
\newabbreviationstyle{long-em-noshort-em-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\protect\glslongemfont{\the\glslongtok}},
+ name={\glsxtrlongnoshortdescname},
sort={\the\glslongtok},
first={\protect\glsfirstlongemfont{\the\glslongtok}},
firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}},
@@ -17638,7 +17707,7 @@ defined}{}%
\newabbreviationstyle{short-em-footnote}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ name={\glsxtrfootnotename},
sort={\the\glsshorttok},
description={\the\glslongtok},%
first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
@@ -17737,7 +17806,7 @@ defined}{}%
\newabbreviationstyle{short-em-postfootnote}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ name={\glsxtrfootnotename},
sort={\the\glsshorttok},
description={\the\glslongtok},%
first={\protect\glsfirstabbrvemfont{\the\glsshorttok}},%
@@ -17916,7 +17985,7 @@ defined}{}%
\newabbreviationstyle{long-short-user}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvuserfont{\the\glsshorttok}},
+ name={\glsxtrlongshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlonguserfont{\the\glslongtok}%
\protect\glsxtruserparen{\protect\glsfirstabbrvuserfont{\the\glsshorttok}}%
@@ -17986,7 +18055,7 @@ defined}{}%
\newabbreviationstyle{long-postshort-user}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvuserfont{\the\glsshorttok}},
+ name={\glsxtrlongshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
@@ -18068,6 +18137,17 @@ defined}{}%
% \end{macrocode}
%\end{abbrvstyle}
%
+%\begin{macro}{\glsxtrlongshortuserdescname}
+%\changes{1.25}{2017-11-24}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrlongshortuserdescname}{%
+ \protect\glslonguserfont{\the\glslongtok}%
+ \protect\glsxtruserparen
+ {\protect\glsabbrvuserfont{\the\glsshorttok}}{\the\glslabeltok}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{abbrvstyle}{long-postshort-user-desc}
%\changes{1.12}{2017-02-03}{new}
%Like \abbrstyle{long-postshort-user} but the user supplies the
@@ -18076,9 +18156,7 @@ defined}{}%
\newabbreviationstyle{long-postshort-user-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glslonguserfont{\the\glslongtok}%
- \protect\glsxtruserparen
- {\protect\glsabbrvuserfont{\the\glsshorttok}}{\the\glslabeltok}},
+ name={\glsxtrlongshortuserdescname},
sort={\the\glslongtok},
first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
@@ -18119,7 +18197,7 @@ defined}{}%
\newabbreviationstyle{short-postlong-user}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvuserfont{\the\glsshorttok}},
+ name={\glsxtrshortlongname},
sort={\the\glsshorttok},
first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
@@ -18201,6 +18279,18 @@ defined}{}%
% \end{macrocode}
%\end{abbrvstyle}
%
+%\begin{macro}{\glsxtrshortlonguserdescname}
+%\changes{1.25}{2017-11-24}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrshortlonguserdescname}{%
+ \protect\glsabbrvuserfont{\the\glsshorttok}%
+ \protect\glsxtruserparen
+ {\protect\glslonguserfont{\the\glslongpltok}}%
+ {\the\glslabeltok}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{abbrvstyle}{short-postlong-user-desc}
%\changes{1.12}{2017-02-03}{new}
%Like \abbrstyle{short-postlong-user} but leaves the user to specify
@@ -18209,10 +18299,7 @@ defined}{}%
\newabbreviationstyle{short-postlong-user-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvuserfont{\the\glsshorttok}%
- \protect\glsxtruserparen
- {\protect\glslonguserfont{\the\glslongpltok}}%
- {\the\glslabeltok}},
+ name={\glsxtrshortlonguserdescname},
sort={\the\glsshorttok},
first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
@@ -18251,7 +18338,7 @@ defined}{}%
\newabbreviationstyle{long-short-user-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\glsxtrlongshortdescname},
+ name={\glsxtrlongshortuserdescname},
sort={\glsxtrlongshortdescsort},%
% \end{macrocode}
%\changes{1.17}{2017-08-09}{corrected first forms}
@@ -18292,7 +18379,7 @@ defined}{}%
%doesn't set the style.
% \begin{macrocode}
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvuserfont{\the\glsshorttok}},
+ name={\glsxtrshortlongname},
sort={\the\glsshorttok},
description={\protect\glslonguserfont{\the\glslongtok}},%
first={\protect\glsfirstabbrvuserfont{\the\glsshorttok}%
@@ -18360,7 +18447,7 @@ defined}{}%
\newabbreviationstyle{short-long-user-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\glsxtrshortlongdescname},
+ name={\glsxtrshortlonguserdescname},
sort={\glsxtrshortlongdescsort},%
% \end{macrocode}
%\changes{1.17}{2017-08-09}{corrected first forms}
@@ -18494,7 +18581,7 @@ defined}{}%
\newabbreviationstyle{long-hyphen-short-hyphen}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+ name={\glsxtrlongshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlonghyphenfont{\the\glslongtok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
@@ -18616,7 +18703,7 @@ defined}{}%
\newabbreviationstyle{long-hyphen-noshort-desc-noreg}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\protect\glslonghyphenfont{\the\glslongtok}},
+ name={\glsxtrlongnoshortdescname},
sort={\expandonce\glsxtrorglong},
first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
@@ -18705,7 +18792,7 @@ defined}{}%
%
%\begin{abbrvstyle}{long-hyphen-noshort-noreg}
% It doesn't really make a great deal of sense to have a long-only
-% style that doesn't have a descriptionnless no glossary is
+% style that doesn't have a description (unless no glossary is
% required), but the best course of
% action here is to use the short form as the name and the long
% form as the description.
@@ -18713,7 +18800,7 @@ defined}{}%
\newabbreviationstyle{long-hyphen-noshort-noreg}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\glsxtrlongnoshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
@@ -18806,7 +18893,7 @@ defined}{}%
\newabbreviationstyle{long-hyphen-postshort-hyphen}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+ name={\glsxtrlongshortname},
sort={\the\glsshorttok},
first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
@@ -18977,7 +19064,7 @@ defined}{}%
\newabbreviationstyle{short-hyphen-long-hyphen}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+ name={\glsxtrshortlongname},
sort={\the\glsshorttok},
first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
@@ -19115,7 +19202,7 @@ defined}{}%
\newabbreviationstyle{short-hyphen-postlong-hyphen}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+ name={\glsxtrshortlongname},
sort={\the\glsshorttok},
first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}},%
firstplural={\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}},%
@@ -19286,13 +19373,23 @@ defined}{}%
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glsxtronlyname}
+%\changes{1.25}{2017-11-24}{new}
+% The default name format for this style.
+% \begin{macrocode}
+\newcommand*{\glsxtronlyname}{%
+ \protect\glsabbrvonlyfont{\the\glsshorttok}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{abbrvstyle}{long-only-short-only}
%\changes{1.17}{2017-08-09}{new}
% \begin{macrocode}
\newabbreviationstyle{long-only-short-only}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvonlyfont{\the\glsshorttok}},
+ name={\glsxtronlyname},
sort={\the\glsshorttok},
first={\protect\glsfirstlongonlyfont{\the\glslongtok}},%
firstplural={\protect\glsfirstlongonlyfont{\the\glslongpltok}},%
@@ -20829,7 +20926,7 @@ defined}{}%
% First identify package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2017/11/14 v1.24 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2017/11/24 v1.25 (NLCT)]
% \end{macrocode}
% Provide package options to automatically load required predefined
% styles. The simplest method is to just test for the existence of
@@ -22886,7 +22983,7 @@ defined}{}%
%\section{Package Initialisation and Options}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-bookindex}[2017/11/14 v1.24 (NLCT)]
+\ProvidesPackage{glossary-bookindex}[2017/11/24 v1.25 (NLCT)]
% \end{macrocode}
%Load required packages.
% \begin{macrocode}
@@ -23054,6 +23151,14 @@ defined}{}%
\newcommand*{\glsxtrbookindexcolspread}{}
% \end{macrocode}
%\end{macro}
+%
+%\begin{macro}{\glsxtrbookindexmulticolsenv}
+%\changes{1.25}{2017-11-14}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrbookindexmulticolsenv}{multicols}
+% \end{macrocode}
+%\end{macro}
+%
%Define the style.
% \begin{macrocode}
\newglossarystyle{bookindex}{%
@@ -23061,8 +23166,14 @@ defined}{}%
\renewenvironment{theglossary}%
{%
\ifdefempty\glsxtrbookindexcolspread
- {\begin{multicols}{\glsxtrbookindexcols}}%
- {\begin{multicols}{\glsxtrbookindexcols}[\glsxtrbookindexcolspread]}%
+ {%
+ \expandafter\begin\expandafter{\glsxtrbookindexmulticolsenv}%
+ {\glsxtrbookindexcols}%
+ }%
+ {%
+ \expandafter\begin\expandafter{\glsxtrbookindexmulticolsenv}%
+ {\glsxtrbookindexcols}[\glsxtrbookindexcolspread]%
+ }%
\setlength{\parindent}{0pt}%
\setlength{\parskip}{0pt plus 0.3pt}%
\let\@glsxtr@bookindex@sep\glsxtrbookindexparentchildsep
@@ -23085,7 +23196,7 @@ defined}{}%
% \end{macrocode}
%End \env{multicols} environment.
% \begin{macrocode}
- \end{multicols}%
+ \expandafter\end\expandafter{\glsxtrbookindexmulticolsenv}%
}%
% \end{macrocode}
%Use ragged right as columns are likely to be narrow and
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 679399bc50b..b675e9517f1 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 2017/11/14 20:50
+% glossaries-extra.ins generated using makedtx version 1.2 2017/11/24 16:50
\input docstrip
\preamble