summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/glossaries-extra
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-19 22:07:21 +0000
committerKarl Berry <karl@freefriends.org>2017-01-19 22:07:21 +0000
commitb83fe0210c4b3eb248892e1c50424808d8880498 (patch)
tree0c1bd465b09edb8c4048b052d168b5c3baaf58e1 /Master/texmf-dist/source/latex/glossaries-extra
parent460e2fdeae5c294d5575ad3ad7b3115ad6349c98 (diff)
glossaries-extra (19jan17)
git-svn-id: svn://tug.org/texlive/trunk@42994 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.dtx421
-rw-r--r--Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins4
2 files changed, 396 insertions, 29 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 99576c79d0f..4356869f109 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"
-% -doc "glossaries-extra-codedoc.tex"
% -section "chapter"
-% -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"
+% -doc "glossaries-extra-codedoc.tex"
+% -author "Nicola Talbot"
+% -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})"
% glossaries-extra
-% Created on 2016/12/17 13:01
+% Created on 2017/1/19 14:10
%\fi
%\iffalse
%<*package>
@@ -31,7 +31,7 @@
%\fi
% \iffalse
% Doc-Source file to use with LaTeX2e
-% Copyright (C) 2016 Nicola Talbot, all rights reserved.
+% Copyright (C) 2017 Nicola Talbot, all rights reserved.
% \fi
% \iffalse
%<*driver>
@@ -118,7 +118,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\setcounter{IndexColumns}{2}
-\CheckSum{10014}
+\CheckSum{10304}
\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.10:
+\title{glossaries-extra.sty v1.11:
documented code}
\author{Nicola L.C. Talbot\\[10pt]
Dickimaw Books\\
\url{http://www.dickimaw-books.com/}}
-\date{2016-12-17}
+\date{2017-01-19}
\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/12/17 v1.10 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2017/01/19 v1.11 (NLCT)]
% \end{macrocode}
% Requires \sty{xkeyval} to define package options.
% \begin{macrocode}
@@ -310,14 +310,41 @@ Dickimaw Books\\
%\changes{1.08}{2016-12-13}{new}
% \begin{macrocode}
\newcommand*{\@glsxtr@warn@onexistsordo}[1]{%
- \GlossariesExtraWarning{glossaries-extra}{%
- \string#1\space hasn't been defined, so
+ \GlossariesExtraWarning{\string#1\space hasn't been defined, so
some errors won't be converted to warnings.
(This most likely means your version of
glossaries.sty is below version 4.19.)}%
}
% \end{macrocode}
%\end{macro}
+
+%\begin{macro}{\@glsxtr@redef@forglsentries}
+%\changes{1.11}{2017-01-19}{new}
+% \begin{macrocode}
+\newcommand*{\@glsxtr@redef@forglsentries}{}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@glsxtr@do@redef@forglsentries}
+%\changes{1.11}{2017-01-19}{new}
+% \begin{macrocode}
+\newcommand*{\@glsxtr@do@redef@forglsentries}{%
+ \renewcommand*{\forglsentries}[3][\glsdefaulttype]{%
+ \edef\@@glo@list{\csname glolist@##1\endcsname}%
+ \ifdefstring{\@@glo@list}{,}%
+ {%
+ \GlossariesExtraWarning{No entries defined in glossary `##1'}%
+ }%
+ {%
+ \@for##2:=\@@glo@list\do
+ {%
+ \ifdefempty{##2}{}{##3}%
+ }%
+ }%
+ }%
+}%
+% \end{macrocode}
+%\end{macro}
%
% \begin{macrocode}
\define@choicekey{glossaries-extra.sty}{undefaction}[\val\nr]%
@@ -326,9 +353,11 @@ Dickimaw Books\\
\ifcase\nr\relax
\let\glsxtrundefaction\@glsxtr@warn@undefaction
\let\glsxtr@warnonexistsordo\@glsxtr@warn@onexistsordo
+ \let\@glsxtr@redef@forglsentries\@glsxtr@do@redef@forglsentries
\or
\let\glsxtrundefaction\@glsxtr@err@undefaction
\let\glsxtr@warnonexistsordo\@gobble
+ \let\@glsxtr@redef@forglsentries\relax
\fi
}
% \end{macrocode}
@@ -441,6 +470,38 @@ Dickimaw Books\\
\appto\@newglossaryentryposthook{%
\gls@assign@field{}{\@glo@label}{loclist}{\@glo@loclist}%
}%
+ \glssetnoexpandfield{loclist}%
+ }%
+ {}%
+% \end{macrocode}
+%\changes{1.11}{2017-01-19}{added location key}
+%The loclist field is just a comma-separated list. The location
+%field is the formatted list.
+% \begin{macrocode}
+ \key@ifundefined{glossentry}{location}%
+ {%
+ \define@key{glossentry}{location}{\def\@glo@location{##1}}%
+ \appto\@gls@keymap{,{location}{location}}%
+ \appto\@newglossaryentryprehook{\def\@glo@location{}}%
+ \appto\@newglossaryentryposthook{%
+ \gls@assign@field{}{\@glo@label}{location}{\@glo@location}%
+ }%
+ \glssetnoexpandfield{location}%
+ }%
+ {}%
+% \end{macrocode}
+%\changes{1.11}{2017-01-19}{added group key}
+%Add a key to store the group heading.
+% \begin{macrocode}
+ \key@ifundefined{glossentry}{group}%
+ {%
+ \define@key{glossentry}{group}{\def\@glo@group{##1}}%
+ \appto\@gls@keymap{,{group}{group}}%
+ \appto\@newglossaryentryprehook{\def\@glo@group{}}%
+ \appto\@newglossaryentryposthook{%
+ \gls@assign@field{}{\@glo@label}{group}{\@glo@group}%
+ }%
+ \glssetnoexpandfield{group}%
}%
{}%
}
@@ -712,7 +773,7 @@ Dickimaw Books\\
% \end{macrocode}
%\end{macro}
%
-% Always use the long forms, not the shortcuts, where portablity is
+% Always use the long forms, not the shortcuts, where portability is
% an issue. (For example, when defining entries in a file that may
% be input by multiple documents.)
%
@@ -723,6 +784,14 @@ Dickimaw Books\\
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\@glsxtr@shortcutsval}
+% Store the value of the shortcuts option. (Needed by bib2gls.)
+%\changes{1.11}{2017-01-19}{new}
+% \begin{macrocode}
+\newcommand*{\@glsxtr@shortcutsval}{\ifglsacrshortcuts acro\else none\fi}%
+% \end{macrocode}
+%\end{macro}
+%
%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
@@ -732,6 +801,7 @@ Dickimaw Books\\
% \begin{macrocode}
\define@choicekey{glossaries-extra.sty}{shortcuts}[\val\nr]%
{acronyms,acro,abbreviations,abbr,other,all,true,none,false}[true]{%
+ \let\@glsxtr@shortcutsval\val
\ifcase\nr\relax % acronyms
\renewcommand*{\@glsxtr@setupshortcuts}{%
\glsacrshortcutstrue
@@ -914,6 +984,10 @@ Dickimaw Books\\
% \begin{macrocode}
\@glsxtr@setupshortcuts
% \end{macrocode}
+%Redefine \cs{@glsxtr@redef@forglsentries} if required.
+% \begin{macrocode}
+\@glsxtr@redef@forglsentries
+% \end{macrocode}
%
%\begin{macro}{\glossariesextrasetup}
%Allow user to set options after the package has been loaded.
@@ -927,11 +1001,13 @@ Dickimaw Books\\
\newcommand*{\glossariesextrasetup}[1]{%
\let\glsxtr@setup@record\relax
\let\@glsxtr@setupshortcuts\relax
+ \let\@glsxtr@redef@forglsentries\relax
\setkeys{glossaries-extra.sty}{#1}%
\@glsxtr@abbreviationsdef
\let\@glsxtr@abbreviationsdef\relax
\@glsxtr@setupshortcuts
\glsxtr@setup@record
+ \@glsxtr@redef@forglsentries
}
% \end{macrocode}
%\end{macro}
@@ -1003,10 +1079,69 @@ Dickimaw Books\\
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glsxtrpageref}
+% Like \cs{glsrefentry} but references the page number instead (if
+% entry counting is on).
+% \begin{macrocode}
+\ifglsentrycounter
+ \newcommand*{\glsxtrpageref}[1]{\pageref{glsentry-\glsdetoklabel{#1}}}
+\else
+ \ifglssubentrycounter
+ \newcommand*{\glsxtrpageref}[1]{\pageref{glsentry-\glsdetoklabel{#1}}}
+ \else
+ \newcommand*{\glsxtrpageref}[1]{\gls{#1}}
+ \fi
+\fi
+% \end{macrocode}
+%\end{macro}
+%
%\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.
%
+%Provide a starred version of \cs{newignoredglossary} that doesn't
+%add the glossary to the nohyperlist list.
+%
+%\begin{macro}{\glsxtr@org@newignoredglossary}
+%Save the original definition.
+%\changes{1.11}{2017-01-19}{new}
+% \begin{macrocode}
+\let\glsxtr@org@newignoredglossary\newignoredglossary
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtr@s@newignoredglossary}
+%Starred form.
+%\changes{1.11}{2017-01-19}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtr@s@newignoredglossary}[1]{%
+ \ifdefempty\@ignored@glossaries
+ {%
+ \edef\@ignored@glossaries{#1}%
+ }%
+ {%
+ \eappto\@ignored@glossaries{,#1}%
+ }%
+ \csgdef{glolist@#1}{,}%
+ \ifcsundef{gls@#1@entryfmt}%
+ {%
+ \defglsentryfmt[#1]{\glsentryfmt}%
+ }%
+ {}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\newignoredglossary}
+%\changes{1.11}{2017-01-19}{added starred version}
+%Redefine to check for star.
+% \begin{macrocode}
+\renewcommand{\newignoredglossary}{%
+ \@ifstar\glsxtr@s@newignoredglossary\glsxtr@org@newignoredglossary
+}
+% \end{macrocode}
+%\end{macro}
+%
%\subsection{Existence Checks}
%\begin{macro}{\glsdoifexists}
% Modify \cs{glsdoifexists} to take account of the
@@ -3300,14 +3435,42 @@ Dickimaw Books\\
% This also patches the short form commands like \cs{acrshort}
% and \cs{glsxtrshort} to use \cs{glsentryshort} and, similarly, the
% long form commands like \cs{acrlong} and \cs{glsxtrlong} to use
-% \cs{glsentrylong}.
+% \cs{glsentrylong}. Added attribute check.
%\changes{0.5.4}{2015-12-15}{added}
% \begin{macrocode}
\renewcommand*{\glsdohyperlink}[2]{%
- \hyperlink{#1}{{\glsxtrprotectlinks#2}}}
+ \glshasattribute{\glslabel}{targeturl}%
+ {%
+ \glshasattribute{\glslabel}{targetname}%
+ {%
+ \glshasattribute{\glslabel}{targetcategory}%
+ {%
+ \hyperref{\glsgetattribute{\glslabel}{targeturl}}%
+ {\glsgetattribute{\glslabel}{targetcategory}}%
+ {\glsgetattribute{\glslabel}{targetname}}%
+ {{\glsxtrprotectlinks#2}}%
+ }%
+ {%
+ \hyperref{\glsgetattribute{\glslabel}{targeturl}}%
+ {}%
+ {\glsgetattribute{\glslabel}{targetname}}%
+ {{\glsxtrprotectlinks#2}}%
+ }%
+ }%
+ {%
+ \href{\glsgetattribute{\glslabel}{targeturl}}%
+ {{\glsxtrprotectlinks#2}}%
+ }%
+ }%
+ {%
+ \hyperlink{#1}{{\glsxtrprotectlinks#2}}%
+ }%
+}
% \end{macrocode}
%\end{macro}
%
+%
+%
%\begin{macro}{\glsdisablehyper}
%\changes{0.5.4}{2015-12-15}{added}
% Redefine in case we have an old version of \styfmt{glossaries}.
@@ -3328,7 +3491,7 @@ Dickimaw Books\\
% 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.
+% indexing will still take place. The generated text is scoped.
%\changes{0.5.4}{2015-12-15}{added}
% \begin{macrocode}
\def\glsdonohyperlink#1#2{{\glsxtrprotectlinks #2}}
@@ -4298,6 +4461,8 @@ Dickimaw Books\\
\@GLSpl@{#1}{#2}[#3]%
}%
}%
+% \end{macrocode}
+%\end{macro}
%
% Remove default warnings from \cs{cgls} etc so that it can be used
% interchangeable with \cs{gls} etc.
@@ -5337,6 +5502,47 @@ Dickimaw Books\\
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\@print@noidx@glossary}
+%\changes{1.11}{2017-01-19}{added redefinition}
+% \begin{macrocode}
+\renewcommand*{\@print@noidx@glossary}{%
+ \ifcsdef{@glsref@\@glo@type}%
+ {%
+ \ifcsdef{@glo@sortmacro@\@glo@sorttype}%
+ {%
+ \csuse{@glo@sortmacro@\@glo@sorttype}{\@glo@type}%
+ }%
+ {%
+ \PackageError{glossaries}{Unknown sort handler `\@glo@sorttype'}{}%
+ }%
+ \glossarysection[\glossarytoctitle]{\glossarytitle}%
+ \glossarypreamble
+% \end{macrocode}
+%Moved this command definition outside of environment in case of
+%scoping issues (e.g. in tabular-like styles).
+% \begin{macrocode}
+ \def\@gls@currentlettergroup{}%
+ \begin{theglossary}%
+ \glossaryheader
+ \glsresetentrylist
+ \forlistcsloop{\@gls@noidx@do}{@glsref@\@glo@type}%
+ \end{theglossary}%
+ \glossarypostamble
+ }%
+ {%
+% \end{macrocode}
+%Add section header if there are actually entries defined in this
+%glossary as the document is likely pending a re-run.
+% \begin{macrocode}
+ \glsxtrifemptyglossary{\@glo@type}%
+ {}%
+ {\glossarysection[\glossarytoctitle]{\glossarytitle}}%
+ \@gls@noref@warn{\@glo@type}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
% Give a bit of assistance to new users who are confused and don't
% know how to read transcript messages.
%\begin{macro}{\@print@glossary}
@@ -5606,23 +5812,48 @@ Dickimaw Books\\
% \end{macrocode}
%\end{macro}
%
-%Provide some commands to accompany the \pkgopt{record} option.
+%Provide some commands to accompany the \pkgopt{record} option
+%for use with \href{https://github.com/nlct/bib2gls}{bib2gls}.
%\begin{macro}{\glsxtrresourcefile}
%\changes{1.08}{2016-12-13}{new}
-%This is provided for the benefit of any external helper
-%application.
+%\changes{1.11}{2017-01-19}{changed extension to .glstex}
+%Since it's dangerous for an external application to
+%create a file with a .tex extension, as from v1.11 this
+%enforces a .glstex extension to avoid conflict.
% \begin{macrocode}
\newcommand*{\glsxtrresourcefile}[2][]{%
\protected@write\@auxout{}{\string\glsxtr@resource{#1}{#2}}%
- \InputIfFileExists{#2}{}%
+ \glsxtr@writefields
+ \let\@glsxtr@org@see@noindex\@gls@see@noindex
+ \let\@gls@see@noindex\relax
+ \InputIfFileExists{#2.glstex}{}%
{%
- \GlossariesExtraWarning{No file `#2'}%
+ \GlossariesExtraWarning{No file `#2.glstex'}%
}%
+ \let\@gls@see@noindex\@glsxtr@org@see@noindex
}
\@onlypreamble\glsxtrresourcefile
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\GlsXtrLoadResources}
+%\changes{1.11}{2017-01-19}{new}
+%Short cut that uses \cs{glsxtrresourcefile} with \cs{jobname} as
+%the mandatory argument.
+% \begin{macrocode}
+\newcommand*{\GlsXtrLoadResources}[1][]{%
+ \glsxtrresourcefile[#1]{\jobname}%
+ \renewcommand*{\GlsXtrLoadResources}[1][]{%
+ \PackageError{glossaries-extra}%
+ {Only 1 \string\GlsXtrLoadResources\space permitted per
+ document. Use \string\glsxtrresourcefile\space for additional
+ resources}%
+ {}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\glsxtr@resource}
%\changes{1.08}{2016-12-13}{new}
% \begin{macrocode}
@@ -5630,6 +5861,61 @@ Dickimaw Books\\
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glsxtr@fields}
+%\changes{1.11}{2017-01-19}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtr@fields}[1]{}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtr@texencoding}
+%\changes{1.11}{2017-01-19}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtr@texencoding}[1]{}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtr@shortcutsval}
+%\changes{1.11}{2017-01-19}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtr@shortcutsval}[1]{}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtr@linkprefix}
+%\changes{1.11}{2017-01-19}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtr@linkprefix}[1]{}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtr@writefields}
+%\changes{1.11}{2017-01-19}{new}
+%This information only needs to be written once, so disable it after
+%it's been used.
+% \begin{macrocode}
+\newcommand*{\glsxtr@writefields}{%
+ \protected@write\@auxout{}{\string\glsxtr@fields{\@gls@keymap}}%
+ \ifdef\inputencodingname
+ {%
+ \protected@write\@auxout{}{\string\glsxtr@texencoding{\inputencodingname}}%
+ }%
+ {%
+% \end{macrocode}
+%If \sty{fontspec} has been loaded, assume UTF-8. (The encoding can
+%be changed with \cs{XeTeXinputencoding}, but I can't work out how
+%to determine the current encoding.)
+% \begin{macrocode}
+ \@ifpackageloaded{fontspec}%
+ {\protected@write\@auxout{}{\string\glsxtr@texencoding{utf8}}}%
+ {}%
+ }%
+ \protected@write\@auxout{}{\string\glsxtr@shortcutsval{\@glsxtr@shortcutsval}}%
+ \protected@write\@auxout{}{\string\glsxtr@linkprefix{\glolinkprefix}}%
+ \let\glsxtr@writefields\relax
+}
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\printunsrtglossary}
%\changes{1.08}{2016-12-13}{new}
%Similar to \cs{printnoidxglossary} but it displays all entries
@@ -5661,11 +5947,14 @@ Dickimaw Books\\
% \end{macrocode}
%check for empty list
% \begin{macrocode}
- \ifcsempty{glolist@\@glo@type}
+ \glsxtrifemptyglossary{\@glo@type}%
{%
- \GlossariesExtraWarning{No entries defined in glossary `\@glo@type'}%
+ \GlossariesExtraWarning{No entries defined in glossary `\@glo@type'}%
}%
{%
+ \key@ifundefined{glossentry}{group}%
+ {\let\@gls@getgrouptitle\@glsxtr@noidx@getgrouptitle}%
+ {\let\@gls@getgrouptitle\@glsxtr@unsrt@getgrouptitle}%
\begin{theglossary}%
\glossaryheader
\glsresetentrylist
@@ -5674,7 +5963,7 @@ Dickimaw Books\\
:\expandafter=\csname glolist@\@glo@type\endcsname\do{%
\ifdefempty{\glscurrententrylabel}
{}%
- {\@gls@noidx@do\glscurrententrylabel}%
+ {\@glsxtr@noidx@do\glscurrententrylabel}%
}%
\end{theglossary}%
}%
@@ -5683,6 +5972,84 @@ Dickimaw Books\\
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\@glsxtr@unsrt@getgrouptitle}
+%\changes{1.11}{2017-01-19}{new}
+% \begin{macrocode}
+\newcommand*{\@glsxtr@unsrt@getgrouptitle}[2]{%
+ \def#2{#1}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@glsxtr@noidx@do}
+%\changes{1.11}{2017-01-19}{new}
+%Minor modification of \cs{@gls@noidx@do} to check for location
+%field if present.
+% \begin{macrocode}
+\newcommand{\@glsxtr@noidx@do}[1]{%
+ \global\letcs{\@gls@loclist}{glo@\glsdetoklabel{#1}@loclist}%
+ \global\letcs{\@gls@location}{glo@\glsdetoklabel{#1}@location}%
+ \ifglshasparent{#1}%
+ {%
+ \gls@level=\csuse{glo@\glsdetoklabel{#1}@level}\relax
+ \ifdefvoid{\@gls@location}%
+ {%
+ \ifdefvoid{\@gls@loclist}%
+ {%
+ \subglossentry{\gls@level}{#1}{}%
+ }%
+ {%
+ \subglossentry{\gls@level}{#1}%
+ {%
+ \glossaryentrynumbers{\glsnoidxloclist{\@gls@loclist}}%
+ }%
+ }%
+ }%
+ {%
+ \subglossentry{\gls@level}{#1}{\glossaryentrynumbers{\@gls@location}}%
+ }%
+ }%
+ {%
+ \letcs{\@gls@sort}{glo@\glsdetoklabel{#1}@sort}%
+ \key@ifundefined{glossentry}{group}%
+ {%
+ \expandafter\glo@grabfirst\@gls@sort{}{}\@nil
+ }%
+ {%
+ \protected@xdef\@glo@thislettergrp{%
+ \csname glo@\glsdetoklabel{#1}@group\endcsname}%
+ }%
+ \ifdefequal{\@glo@thislettergrp}{\@gls@currentlettergroup}%
+ {}%
+ {%
+ \ifdefempty{\@gls@currentlettergroup}{}{\glsgroupskip}%
+ \glsgroupheading{\@glo@thislettergrp}%
+ }%
+ \let\@gls@currentlettergroup\@glo@thislettergrp
+ \ifdefvoid{\@gls@location}%
+ {%
+ \ifdefvoid{\@gls@loclist}
+ {%
+ \glossentry{#1}{}%
+ }%
+ {%
+ \glossentry{#1}%
+ {%
+ \glossaryentrynumbers{\glsnoidxloclist{\@gls@loclist}}%
+ }%
+ }%
+ }%
+ {%
+ \glossentry{#1}%
+ {%
+ \glossaryentrynumbers{\@gls@location}%
+ }%
+ }%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\section{Integration with glossaries-accsupp}
% Provide better integration with the \sty{glossaries-accsupp}
% package. (Must be loaded before the main code of
@@ -12760,7 +13127,7 @@ Dickimaw Books\\
% First identify package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2016/12/17 v1.10 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2017/01/19 v1.11 (NLCT)]
% \end{macrocode}
% Provide package options to automatically load required predefined
% styles. The simplest method is to just test for the existence of
@@ -13656,9 +14023,9 @@ Dickimaw Books\\
%
%\begin{macro}{\glsxtrComputeTreeSubIndent}
%\changes{1.05}{2016-06-10}{new}
-%\begin{macrocode}
-%\cs{\glsxtrComputeTreeSubIndent}\marg{level}\marg{label}\marg{register}
-%\end{macrocode}
+%\begin{definition}
+%\cs{glsxtrComputeTreeSubIndent}\marg{level}\marg{label}\marg{register}
+%\end{definition}
% Compute the indent for the sub-entries. The first argument is the
% level, the second argument is the entry label and the third
% argument is the length register used to store the computed indent.
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 4255f8c6e00..bd6494afdea 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.1 2016/12/17 13:01
+% glossaries-extra.ins generated using makedtx version 1.1 2017/1/19 14:10
\input docstrip
\preamble
glossaries-extra.dtx
- Copyright 2016 Nicola Talbot
+ Copyright 2017 Nicola Talbot
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3