From 666535e53fe160d45e038feb00c7d348809d9a6e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 12 Aug 2014 21:32:53 +0000 Subject: glossaries (12aug14) git-svn-id: svn://tug.org/texlive/trunk@34916 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/glossaries/glossaries.dtx | 30 +++++++++++++++------- .../source/latex/glossaries/glossaries.ins | 2 +- 2 files changed, 22 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx index e5df3b925d9..89c64a46137 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx @@ -31,7 +31,7 @@ % -author "Nicola Talbot" % -codetitle "Main Package Code" % glossaries -% Created on 2014/7/31 17:34 +% Created on 2014/8/12 14:54 %\fi %\iffalse %<*package> @@ -141,7 +141,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \setcounter{IndexColumns}{2} -\CheckSum{18588} +\CheckSum{18594} \newcommand*{\ifirstuse}{\iterm{first use}} \newcommand*{\firstuse}{\gls{firstuse}} @@ -169,12 +169,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of %\MakeShortVerb{"} %\DeleteShortVerb{\|} % -% \title{Documented Code For glossaries v4.08} +% \title{Documented Code For glossaries v4.09} % \author{Nicola L.C. Talbot\\[10pt] %Dickimaw Books\\ %\url{http://www.dickimaw-books.com/}} % -% \date{2014-07-30} +% \date{2014-08-12} % \maketitle % %This is the documented code for the \styfmt{glossaries} package. @@ -190,7 +190,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.08: +%For the main user guide, read \qt{glossaries.sty v4.09: %\LaTeX2e\ Package to Assist Generating Glossaries}. % %\item[\url{mfirstuc-manual.pdf}] @@ -234,7 +234,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of % This package requires \LaTeXe. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2014/07/30 v4.08 (NLCT)] +\ProvidesPackage{glossaries}[2014/08/12 v4.09 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -4918,8 +4918,8 @@ name=true]{% % \end{macrocode} %\changes{4.08}{2014-07-30}{switched to using \cs{@gls@hyp@opt}} %\changes{4.08}{2014-07-30}{removed \cs{@sgls@user@\meta{key}}} +%\changes{4.09}{2014-08-12}{fixed bug in user commands} % \begin{macrocode} - \newrobustcmd*{#5}{\@gls@hyp@opt{\csuse{@gls@user@#1}}}% \expandafter\newcommand\expandafter*\expandafter {\csname @gls@user@#1\endcsname}[2][]{% \new@ifnextchar[% @@ -4928,6 +4928,8 @@ name=true]{% \csdef{@gls@user@#1@}##1##2[##3]{% \@gls@field@link{##1}{##2}{#3{##2}##3}% }% + \newrobustcmd*{#5}{% + \expandafter\@gls@hyp@opt\csname @gls@user@#1\endcsname}% }% % \end{macrocode} % Next the version with the first letter converted to upper case: @@ -4944,7 +4946,6 @@ name=true]{% %\changes{4.08}{2014-07-30}{switched to using \cs{@gls@hyp@opt}} %\changes{4.08}{2014-07-30}{removed \cs{@sGls@user@\meta{key}}} % \begin{macrocode} - \newrobustcmd*{#6}{\@gls@hyp@opt{\csuse{@Gls@user@#1}}}% \expandafter\newcommand\expandafter*\expandafter {\csname @Gls@user@#1\endcsname}[2][]{% \new@ifnextchar[% @@ -4953,6 +4954,8 @@ name=true]{% \csdef{@Gls@user@#1@}##1##2[##3]{% \@gls@field@link{##1}{##2}{#4{##2}##3}% }% + \newrobustcmd*{#6}{% + \expandafter\@gls@hyp@opt\csname @Gls@user@#1\endcsname}% }% % \end{macrocode} % Finally the all caps version: @@ -4969,7 +4972,6 @@ name=true]{% %\changes{4.08}{2014-07-30}{switched to using \cs{@gls@hyp@opt}} %\changes{4.08}{2014-07-30}{removed \cs{@sGLS@user@\meta{key}}} % \begin{macrocode} - \newrobustcmd*{#7}{\@gls@hyp@opt{\csuse{@GLS@user@#1}}}% \expandafter\newcommand\expandafter*\expandafter {\csname @GLS@user@#1\endcsname}[2][]{% \new@ifnextchar[% @@ -4978,6 +4980,8 @@ name=true]{% \csdef{@GLS@user@#1@}##1##2[##3]{% \@gls@field@link{##1}{##2}{\mfirstucMakeUppercase{#3{##2}##3}}% }% + \newrobustcmd*{#7}{% + \expandafter\@gls@hyp@opt\csname @GLS@user@#1\endcsname}% }% }% {% @@ -27210,6 +27214,14 @@ The duck was \glsing{waddle} round the dog. The dog \glsed{run} away from the duck. +First letter uppercase: \Glsed{jump}, \Glsing{jump}, +\Glsed{waddle}, \Glsing{waddle}, +\Glsed{run}, \Glsing{run}. + +All uppercase: \GLSed{jump}, \GLSing{jump}, +\GLSed{waddle}, \GLSing{waddle}, +\GLSed{run}, \GLSing{run}. + \printglossaries \end{document} diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins index 4f659d8aab9..86c0eaa7948 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.1 2014/7/31 17:34 +% glossaries.ins generated using makedtx version 1.1 2014/8/12 14:54 \input docstrip \preamble -- cgit v1.2.3