summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/glossaries
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-04-07 20:57:48 +0000
committerKarl Berry <karl@freefriends.org>2018-04-07 20:57:48 +0000
commit861b4de389db24dd94535880edb8de1ea4386cf6 (patch)
treef2bb6520aaad7c2d8f62a7f0f97f9fa02b405c49 /Master/texmf-dist/source/latex/glossaries
parente1741ac648c6bdfc6300752f4b2b783b34533b12 (diff)
glossaries (7apr18)
git-svn-id: svn://tug.org/texlive/trunk@47357 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/glossaries')
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.dtx97
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.ins2
2 files changed, 62 insertions, 37 deletions
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
index ac87b170a7d..cc9a7cd8385 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
@@ -1,6 +1,15 @@
%\iffalse
% glossaries.dtx generated using makedtx version 1.2 (c) Nicola Talbot
% Command line args:
+% -author "Nicola Talbot"
+% -setambles ".*\.perl=>\nopreamble\nopostamble"
+% -setambles ".*\.tex=>\nopreamble\nopostamble"
+% -setambles ".*\.xdy=>\nopreamble\nopostamble"
+% -codetitle "Main Package Code"
+% -section "chapter"
+% -macrocode ".*\.perl"
+% -macrocode ".*\.tex"
+% -macrocode ".*\.xdy"
% -src "glossaries\.sty\Z=>glossaries.sty"
% -src "glossaries-prefix.sty\Z=>glossaries-prefix.sty"
% -src "(glossary-.+)\.(sty)\Z=>\1.\2"
@@ -17,21 +26,12 @@
% -src "(samplexdy-mc.*\.xdy)\Z=>\1"
% -src "(database.*\.tex)\Z=>\1"
% -src "(.*\.perl)\Z=>\1"
-% -section "chapter"
-% -setambles ".*\.perl=>\nopreamble\nopostamble"
-% -setambles ".*\.tex=>\nopreamble\nopostamble"
-% -setambles ".*\.xdy=>\nopreamble\nopostamble"
-% -codetitle "Main Package Code"
-% -author "Nicola Talbot"
-% -macrocode ".*\.perl"
-% -macrocode ".*\.tex"
-% -macrocode ".*\.xdy"
% -doc "glossaries-manual.tex"
% -comment ".*\.perl"
% -comment ".*\.tex"
% -comment ".*\.xdy"
% glossaries
-% Created on 2018/3/7 13:12
+% Created on 2018/4/7 16:28
%\fi
%\iffalse
%<*package>
@@ -145,7 +145,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\setcounter{IndexColumns}{2}
-\CheckSum{19480}
+\CheckSum{19495}
\newcommand*{\ifirstuse}{\iterm{first use}}
\newcommand*{\firstuse}{\gls{firstuse}}
@@ -172,12 +172,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
%\fi
%\MakeShortVerb{"}
%
-% \title{Documented Code For glossaries v4.36}
+% \title{Documented Code For glossaries v4.37}
% \author{Nicola L.C. Talbot\\[10pt]
%Dickimaw Books\\
%\url{http://www.dickimaw-books.com/}}
%
-% \date{2018-03-07}
+% \date{2018-04-07}
% \maketitle
%
%This is the documented code for the \styfmt{glossaries} package.
@@ -193,7 +193,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
%glossaries package}.
%
%\item[\url{glossaries-user.pdf}]
-%For the main user guide, read \qt{glossaries.sty v4.36:
+%For the main user guide, read \qt{glossaries.sty v4.37:
%\LaTeX2e\ Package to Assist Generating Glossaries}.
%
%\item[\url{mfirstuc-manual.pdf}]
@@ -248,7 +248,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
% This package requires \LaTeXe.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2018/03/07 v4.36 (NLCT)]
+\ProvidesPackage{glossaries}[2018/04/07 v4.37 (NLCT)]
% \end{macrocode}
%\changes{4.18}{2015-09-09}{split mfirstuc into separate bundle}
% Required packages:
@@ -5240,7 +5240,10 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%
%\begin{macro}{\new@glossaryentry}
%\changes{3.10a}{2013-10-13}{new}
-% For use in document environment.
+% For use in document environment. This opens the \texttt{.glsdefs}
+% file, if not already open, so that the entry definition can be
+% saved for the next \LaTeX\ run. This means that any glossaries at
+% the start of the document can access the entry information.
% \begin{macrocode}
\newrobustcmd{\new@glossaryentry}[2]{%
\ifundef\@gls@deffile
@@ -5255,15 +5258,37 @@ false,nolabel,autolabel,nameref}[nolabel]{%
}%
\@gls@writedef{#1}%
}
-\AtBeginDocument
-{
+% \end{macrocode}
+%At the start of the document input the \texttt{.glsdefs} file if it
+%exists. This is now done by \cs{gls@begindocdefs}, which is
+%redefined by \sty{glossaries-extra}, so that
+%this step can be skipped to avoid loading an obsolete
+%\texttt{.glsdefs} file if the user switches to
+%\sty{glossaries-extra} with \texttt{docdef=restricted}.
+% \begin{macrocode}
+\AtBeginDocument{\gls@begindocdefs}
+% \end{macrocode}
+%The end of the document needs to check if the \texttt{.glsdefs}
+%file has been opened, in which case it needs to be closed.
+% \begin{macrocode}
+\AtEndDocument{\ifdef\@gls@deffile{\closeout\@gls@deffile}{}}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\gls@begindocdefs}
+%\changes{4.37}{2018-04-07}{new}
+%Input the \verb|.glsdefs| file if it exists and enable document
+%definitions if permitted.
+% \begin{macrocode}
+\newcommand*{\gls@begindocdefs}{%
\@gls@enablesavenonumberlist
+ \edef\@gls@restoreat{\noexpand\catcode`\noexpand\@=\number\catcode`\@\relax}%
\makeatletter
\InputIfFileExists{\jobname.glsdefs}{}{}%
- \makeatother
+ \@gls@restoreat
+ \undef\@gls@restoreat
\gls@defdocnewglossaryentry
}
-\AtEndDocument{\ifdef\@gls@deffile{\closeout\@gls@deffile}{}}
% \end{macrocode}
%\end{macro}
%
@@ -18883,7 +18908,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \cs{gls}\marg{label}} on subsequent use.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-prefix}[2018/03/07 v4.36 (NLCT)]
+\ProvidesPackage{glossaries-prefix}[2018/04/07 v4.37 (NLCT)]
% \end{macrocode}
% Pass all options to \sty{glossaries}:
% \begin{macrocode}
@@ -19298,7 +19323,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%\label{sec:code:hypernav}
% Package Definition:
% \begin{macrocode}
-\ProvidesPackage{glossary-hypernav}[2018/03/07 v4.36 (NLCT)]
+\ProvidesPackage{glossary-hypernav}[2018/04/07 v4.37 (NLCT)]
% \end{macrocode}
%
% The commands defined in this package are provided to
@@ -19491,7 +19516,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% This defines an in-line style where the entries are
% comma-separated with just the name and description displayed.
% \begin{macrocode}
-\ProvidesPackage{glossary-inline}[2018/03/07 v4.36 (NLCT)]
+\ProvidesPackage{glossary-inline}[2018/04/07 v4.37 (NLCT)]
% \end{macrocode}
%
%\begin{style}{inline}
@@ -19682,7 +19707,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \ics{item} command, it will appear in a bold font by
% default.
% \begin{macrocode}
-\ProvidesPackage{glossary-list}[2018/03/07 v4.36 (NLCT)]
+\ProvidesPackage{glossary-list}[2018/04/07 v4.37 (NLCT)]
% \end{macrocode}
%\begin{macro}{\indexspace}
%\changes{4.13}{2015-02-03}{new}
@@ -19964,7 +19989,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% The glossary styles defined in the \isty{glossary-long} package
% used the \env{longtable} environment in the glossary.
% \begin{macrocode}
-\ProvidesPackage{glossary-long}[2018/03/07 v4.36 (NLCT)]
+\ProvidesPackage{glossary-long}[2018/04/07 v4.37 (NLCT)]
% \end{macrocode}
% Requires the \isty{longtable} package:
% \begin{macrocode}
@@ -20461,7 +20486,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \url{http://tex.stackexchange.com/a/56890}
%
% \begin{macrocode}
-\ProvidesPackage{glossary-longbooktabs}[2018/03/07 v4.36 (NLCT)]
+\ProvidesPackage{glossary-longbooktabs}[2018/04/07 v4.37 (NLCT)]
% \end{macrocode}
% Requires \sty{booktabs} package:
% \begin{macrocode}
@@ -20802,7 +20827,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% used the \env{longtable} environment in the glossary and use
% ragged right formatting for the multiline columns.
% \begin{macrocode}
-\ProvidesPackage{glossary-longragged}[2018/03/07 v4.36 (NLCT)]
+\ProvidesPackage{glossary-longragged}[2018/04/07 v4.37 (NLCT)]
% \end{macrocode}
% Requires the \isty{array} package:
% \begin{macrocode}
@@ -21235,7 +21260,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%use the \sty{multicol} package. These use the tree-like glossary
%styles in a multicol environment.
% \begin{macrocode}
-\ProvidesPackage{glossary-mcols}[2018/03/07 v4.36 (NLCT)]
+\ProvidesPackage{glossary-mcols}[2018/04/07 v4.37 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -21672,7 +21697,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% The glossary styles defined in the \isty{glossary-super} package
% use the \env{supertabular} environment.
% \begin{macrocode}
-\ProvidesPackage{glossary-super}[2018/03/07 v4.36 (NLCT)]
+\ProvidesPackage{glossary-super}[2018/04/07 v4.37 (NLCT)]
% \end{macrocode}
% Requires the \isty{supertabular} package:
% \begin{macrocode}
@@ -22204,7 +22229,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% are like those provided by the \isty{glossary-super} package,
% except that the multiline columns have ragged right justification.
% \begin{macrocode}
-\ProvidesPackage{glossary-superragged}[2018/03/07 v4.36 (NLCT)]
+\ProvidesPackage{glossary-superragged}[2018/04/07 v4.37 (NLCT)]
% \end{macrocode}
% Requires the \isty{array} package:
% \begin{macrocode}
@@ -22644,7 +22669,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% that have a tree-like structure. These are designed for
% hierarchical glossaries.
% \begin{macrocode}
-\ProvidesPackage{glossary-tree}[2018/03/07 v4.36 (NLCT)]
+\ProvidesPackage{glossary-tree}[2018/04/07 v4.37 (NLCT)]
% \end{macrocode}
%
%\begin{macro}{\indexspace}
@@ -23365,7 +23390,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% hyperlinks may not work properly.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-207}[2018/03/07 v4.36 (NLCT)]
+\ProvidesPackage{glossaries-compatible-207}[2018/04/07 v4.37 (NLCT)]
% \end{macrocode}
%\begin{macro}{\GlsAddXdyAttribute}
% Adds an attribute in old format.
@@ -23726,7 +23751,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%\section{glossaries-compatible-307}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-307}[2018/03/07 v4.36 (NLCT)]
+\ProvidesPackage{glossaries-compatible-307}[2018/04/07 v4.37 (NLCT)]
% \end{macrocode}
%
% Compatibility macros for predefined glossary styles:
@@ -24534,7 +24559,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Package version number now in line with main glossaries package number.
% \begin{macrocode}
-\ProvidesPackage{glossaries-accsupp}[2018/03/07 v4.36 (NLCT)
+\ProvidesPackage{glossaries-accsupp}[2018/04/07 v4.37 (NLCT)
Experimental glossaries accessibility]
% \end{macrocode}
% Pass all options to \sty{glossaries}:
@@ -26973,7 +26998,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% modules.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2018/03/07 v4.36 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2018/04/07 v4.37 (NLCT)]
% \end{macrocode}
% Load \sty{tracklang} to obtain language settings.
% \begin{macrocode}
@@ -27017,7 +27042,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% modules.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-polyglossia}[2018/03/07 v4.36 (NLCT)]
+\ProvidesPackage{glossaries-polyglossia}[2018/04/07 v4.37 (NLCT)]
% \end{macrocode}
% Load \sty{tracklang} to obtain language settings.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
index ba5e2c5179c..8bb5f4b9224 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.ins
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
@@ -1,4 +1,4 @@
-% glossaries.ins generated using makedtx version 1.2 2018/3/7 13:12
+% glossaries.ins generated using makedtx version 1.2 2018/4/7 16:28
\input docstrip
\preamble