From 734a944ad1d694094e6cac8d4ce2c1f2c8adfb71 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 7 Jan 2017 23:39:19 +0000 Subject: glossaries (8jan17) git-svn-id: svn://tug.org/texlive/trunk@42894 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/glossaries/glossaries.dtx | 88 +++++++++++++--------- .../source/latex/glossaries/glossaries.ins | 4 +- 2 files changed, 56 insertions(+), 36 deletions(-) (limited to 'Master/texmf-dist/source/latex/glossaries') diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx index d89d5e605bf..92ffabe225c 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx @@ -2,18 +2,7 @@ % glossaries.dtx generated using makedtx version 1.1 (c) Nicola Talbot % Command line args: % -codetitle "Main Package Code" -% -setambles ".*\.perl=>\nopreamble\nopostamble" -% -setambles ".*\.tex=>\nopreamble\nopostamble" -% -setambles ".*\.xdy=>\nopreamble\nopostamble" % -section "chapter" -% -macrocode ".*\.perl" -% -macrocode ".*\.tex" -% -macrocode ".*\.xdy" -% -doc "glossaries-manual.tex" -% -comment ".*\.perl" -% -comment ".*\.tex" -% -comment ".*\.xdy" -% -author "Nicola Talbot" % -src "glossaries\.sty\Z=>glossaries.sty" % -src "glossaries-prefix.sty\Z=>glossaries-prefix.sty" % -src "(glossary-.+)\.(sty)\Z=>\1.\2" @@ -30,8 +19,19 @@ % -src "(samplexdy-mc.*\.xdy)\Z=>\1" % -src "(database.*\.tex)\Z=>\1" % -src "(.*\.perl)\Z=>\1" +% -comment ".*\.perl" +% -comment ".*\.tex" +% -comment ".*\.xdy" +% -author "Nicola Talbot" +% -doc "glossaries-manual.tex" +% -macrocode ".*\.perl" +% -macrocode ".*\.tex" +% -macrocode ".*\.xdy" +% -setambles ".*\.perl=>\nopreamble\nopostamble" +% -setambles ".*\.tex=>\nopreamble\nopostamble" +% -setambles ".*\.xdy=>\nopreamble\nopostamble" % glossaries -% Created on 2016/12/16 14:05 +% Created on 2017/1/7 15:23 %\fi %\iffalse %<*package> @@ -54,7 +54,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> @@ -145,7 +145,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \setcounter{IndexColumns}{2} -\CheckSum{19216} +\CheckSum{19235} \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.27} +% \title{Documented Code For glossaries v4.28} % \author{Nicola L.C. Talbot\\[10pt] %Dickimaw Books\\ %\url{http://www.dickimaw-books.com/}} % -% \date{2016-12-16} +% \date{2017-01-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.27: +%For the main user guide, read \qt{glossaries.sty v4.28: %\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}[2016/12/16 v4.27 (NLCT)] +\ProvidesPackage{glossaries}[2017/01/07 v4.28 (NLCT)] % \end{macrocode} %\changes{4.18}{2015-09-09}{split mfirstuc into separate bundle} % Required packages: @@ -6201,6 +6201,26 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \end{macrocode} %\end{macro} % +%\begin{macro}{\glspatchtabularx} +%\changes{4.28}{2017-01-07}{new} +%Patch \cs{TX@trial} (as per David Carlisle's answer in +%\url{http://tex.stackexchange.com/a/94895}). This does nothing +%if \cs{TX@trial} hasn't been defined. +% \begin{macrocode} +\def\@gls@patchtabularx#1\hbox#2#3!!{% + \def\TX@trial##1{#1\hbox{\let\glsunset\@gobble#2}#3}% +} +\newcommand*\glspatchtabularx{% + \ifdef\TX@trial + {% + \expandafter\@gls@patchtabularx\TX@trial{##1}!!% + \let\glspatchtabularx\relax + }% + {}% +} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\glsreset} % The command \cs{glsreset}\marg{label} can be used % to set the entry flag to indicate that it hasn't been used yet. The @@ -18355,7 +18375,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \cs{gls}\marg{label}} on subsequent use. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-prefix}[2016/12/16 v4.27 (NLCT)] +\ProvidesPackage{glossaries-prefix}[2017/01/07 v4.28 (NLCT)] % \end{macrocode} % Pass all options to \sty{glossaries}: % \begin{macrocode} @@ -18770,7 +18790,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% %\label{sec:code:hypernav} % Package Definition: % \begin{macrocode} -\ProvidesPackage{glossary-hypernav}[2016/12/16 v4.27 (NLCT)] +\ProvidesPackage{glossary-hypernav}[2017/01/07 v4.28 (NLCT)] % \end{macrocode} % % The commands defined in this package are provided to @@ -18942,7 +18962,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}[2016/12/16 v4.27 (NLCT)] +\ProvidesPackage{glossary-inline}[2017/01/07 v4.28 (NLCT)] % \end{macrocode} % %\begin{style}{inline} @@ -19133,7 +19153,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \ics{item} command, it will appear in a bold font by % default. % \begin{macrocode} -\ProvidesPackage{glossary-list}[2016/12/16 v4.27 (NLCT)] +\ProvidesPackage{glossary-list}[2017/01/07 v4.28 (NLCT)] % \end{macrocode} %\begin{macro}{\indexspace} %\changes{4.13}{2015-02-03}{new} @@ -19415,7 +19435,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}[2016/12/16 v4.27 (NLCT)] +\ProvidesPackage{glossary-long}[2017/01/07 v4.28 (NLCT)] % \end{macrocode} % Requires the \isty{longtable} package: % \begin{macrocode} @@ -19912,7 +19932,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \url{http://tex.stackexchange.com/a/56890} % % \begin{macrocode} -\ProvidesPackage{glossary-longbooktabs}[2016/12/16 v4.27 (NLCT)] +\ProvidesPackage{glossary-longbooktabs}[2017/01/07 v4.28 (NLCT)] % \end{macrocode} % Requires \sty{booktabs} package: % \begin{macrocode} @@ -20253,7 +20273,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}[2016/12/16 v4.27 (NLCT)] +\ProvidesPackage{glossary-longragged}[2017/01/07 v4.28 (NLCT)] % \end{macrocode} % Requires the \isty{array} package: % \begin{macrocode} @@ -20686,7 +20706,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}[2016/12/16 v4.27 (NLCT)] +\ProvidesPackage{glossary-mcols}[2017/01/07 v4.28 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -21122,7 +21142,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}[2016/12/16 v4.27 (NLCT)] +\ProvidesPackage{glossary-super}[2017/01/07 v4.28 (NLCT)] % \end{macrocode} % Requires the \isty{supertabular} package: % \begin{macrocode} @@ -21654,7 +21674,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}[2016/12/16 v4.27 (NLCT)] +\ProvidesPackage{glossary-superragged}[2017/01/07 v4.28 (NLCT)] % \end{macrocode} % Requires the \isty{array} package: % \begin{macrocode} @@ -22094,7 +22114,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % that have a tree-like structure. These are designed for % hierarchical glossaries. % \begin{macrocode} -\ProvidesPackage{glossary-tree}[2016/12/16 v4.27 (NLCT)] +\ProvidesPackage{glossary-tree}[2017/01/07 v4.28 (NLCT)] % \end{macrocode} % %\begin{macro}{\indexspace} @@ -22815,7 +22835,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % hyperlinks may not work properly. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-207}[2016/12/16 v4.27 (NLCT)] +\ProvidesPackage{glossaries-compatible-207}[2017/01/07 v4.28 (NLCT)] % \end{macrocode} %\begin{macro}{\GlsAddXdyAttribute} % Adds an attribute in old format. @@ -23176,7 +23196,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% %\section{glossaries-compatible-307} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-307}[2016/12/16 v4.27 (NLCT)] +\ProvidesPackage{glossaries-compatible-307}[2017/01/07 v4.28 (NLCT)] % \end{macrocode} % % Compatibility macros for predefined glossary styles: @@ -23984,7 +24004,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \end{macrocode} % Package version number now in line with main glossaries package number. % \begin{macrocode} -\ProvidesPackage{glossaries-accsupp}[2016/12/16 v4.27 (NLCT) +\ProvidesPackage{glossaries-accsupp}[2017/01/07 v4.28 (NLCT) Experimental glossaries accessibility] % \end{macrocode} % Pass all options to \sty{glossaries}: @@ -26415,7 +26435,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % modules. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-babel}[2016/12/16 v4.27 (NLCT)] +\ProvidesPackage{glossaries-babel}[2017/01/07 v4.28 (NLCT)] % \end{macrocode} % Load \sty{tracklang} to obtain language settings. % \begin{macrocode} @@ -26459,7 +26479,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % modules. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-polyglossia}[2016/12/16 v4.27 (NLCT)] +\ProvidesPackage{glossaries-polyglossia}[2017/01/07 v4.28 (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 52568d43904..422d00d1d61 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.ins +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.ins @@ -1,10 +1,10 @@ -% glossaries.ins generated using makedtx version 1.1 2016/12/16 14:05 +% glossaries.ins generated using makedtx version 1.1 2017/1/7 15:23 \input docstrip \preamble glossaries.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 -- cgit v1.2.3