summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/glossaries
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-03-05 16:48:05 +0000
committerKarl Berry <karl@freefriends.org>2009-03-05 16:48:05 +0000
commitee0a8f0a1356961de5774c1001ae13f270da85ba (patch)
treede39142787ad1a1d41d089845e2dd899961c5ce7 /Master/texmf-dist/source/latex/glossaries
parent76576609315cae4d1822d8acba81734a87651975 (diff)
glossaries 1.19 (3mar09)
git-svn-id: svn://tug.org/texlive/trunk@12314 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/glossaries')
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.dtx798
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.ins7
2 files changed, 737 insertions, 68 deletions
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
index be27ab049ec..fb6b52015fb 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
@@ -7,6 +7,7 @@
% -src "glossaries.sty\Z=>glossaries.sty"
% -src "mfirstuc.sty\Z=>mfirstuc.sty"
% -src "(glossary-.+)\.(sty)\Z=>\1.\2"
+% -src "(glossaries-accsupp)\.(sty)\Z=>\1.\2"
% -src "(glossaries-babel)\.(sty)\Z=>\1.\2"
% -src "(glossaries-dictionary-.+)\.(dict)\Z=>\1.\2"
% -src "(minimalgls\.tex)\Z=>\1"
@@ -25,7 +26,7 @@
% -doc "glossaries-manual.tex"
% -codetitle "Documented Code"
% glossaries
-% Created on 2009/1/16 12:27
+% Created on 2009/3/3 11:05
%\fi
%\iffalse
%<*package>
@@ -58,6 +59,7 @@
\usepackage{pifont}
\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
+\usepackage{cmap}
\usepackage[colorlinks,
bookmarks,
hyperindex=false,
@@ -79,7 +81,7 @@
\makeatother
\RecordChanges
\PageIndex
-\CheckSum{7872}
+\CheckSum{8209}
\CodelineNumbered
\newcommand*{\termdef}[1]{\emph{#1}\iterm{#1}}
\newcommand*{\term}[1]{#1\iterm{#1}}
@@ -142,7 +144,7 @@
%\MakeShortVerb{"}
%\DeleteShortVerb{\|}
%
-% \title{glossaries.sty v 1.18: \LaTeXe\ Package to Assist Generating Glossaries}
+% \title{glossaries.sty v 1.19: \LaTeXe\ Package to Assist Generating Glossaries}
% \author{Nicola L.C. Talbot\\[10pt]
%School of Computing Sciences\\
%University of East Anglia\\
@@ -150,7 +152,7 @@
%NR4 7TJ. United Kingdom.\\
%\url{http://theoval.cmp.uea.ac.uk/~nlct/}}
%
-% \date{14th January 2009}
+% \date{2nd March 2009}
% \maketitle
%\tableofcontents
%
@@ -178,8 +180,8 @@
%\htmladdnormallink{Perl}{http://www.perl.org/about.html} script
%called \appname{makeglossaries}. This provides a convenient interface
%to \appname{makeindex} or \appname{xindy}. It is strongly
-%recommended that you use this script, but it is not
-%essential. If you are reluctant to install Perl, or for any
+%recommended that you use this script, but \emph{it is not
+%essential}. If you are reluctant to install Perl, or for any
%other reason you don't want to use \appname{makeglossaries}, you
%can called \appname{makeindex} or \appname{xindy} explicitly.
%See \autoref{sec:makeglossaries} for
@@ -229,7 +231,20 @@
%documents that illustrate the various functions. These should
%be located in the \texttt{samples} subdirectory (folder) of the
%\sty{glossaries} documentation directory. This location varies
-%according to your operating system and \TeX\ distribution.
+%according to your operating system and \TeX\ distribution. You
+%can use \texttt{texdoc} to locate the main glossaries documentation.
+%For example, in a terminal or command prompt, type:
+%\begin{verbatim}
+%texdoc -l glossaries
+%\end{verbatim}
+%This should display the full pathname of the file
+%\texttt{glossaries.pdf}. View the contents of that directory and
+%see if it contains the \texttt{samples} subdirectory.
+%
+%If you can't find the sample files, they are available in the
+%\texttt{doc/latex/glossaries/samples/} subdirectory of the
+%\texttt{glossaries.tds.zip} archive which can be downloaded from
+%CTAN.
%
%The sample documents are as follows:
%\begin{description}
@@ -523,6 +538,13 @@
%sampleutf8.glo
%\end{verbatim}
%
+%\item[sampleaccsupp.tex]\label{ex:sampleaccsupp} This document
+%uses the experimental \isty{glossaries-accsupp} package. The
+%symbol is set to the replacement text. Note that some PDF
+%viewers don't use the accessibility support. Information
+%about the \sty{glossaries-accsupp} package can be found in
+%\autoref{sec:accsupp}.
+%
%\end{description}
%
%\subsection{Multi-Lingual Support}
@@ -971,7 +993,7 @@
%\textbf{A.} The easiest way to do this is to specify the \pkgopt{smaller} package
%option and redefine \cs{firstacronymfont} to use the required
%command. Note that if you don't want the acronym on subsequent use
-%to use \cs{smaller}, you will also need to redefine \cs{acronymfont},
+%to use \cs{textsmaller}, you will also need to redefine \cs{acronymfont},
%as above. For example to make the acronym emphasized on
%\firstuse, but use the surrounding font for subsequent use, you can do:
%\begin{verbatim}
@@ -1020,6 +1042,15 @@
%to the class file. Check the \sty{translator} package documentation
%for further details.
%
+%\item \textbf{Q.} My acronyms contain strange characters when I use commands
+%like \ics{acrlong}.
+%
+%\textbf{A.} Switch off the sanitization:
+%\begin{verbatim}
+%\usepackage[sanitize=none]{glossaries}
+%\end{verbatim}
+%and protect fragile commands.
+%
%\item \textbf{Q.} My glossaries haven't appeared.
%
%\textbf{A.} Remember to do the following:
@@ -1046,6 +1077,21 @@
%
%Check the log files (\filetype{.log}, \filetype{.glg} etc) for any
%warnings.
+%
+%\item \textbf{Q.} It is possible to change the rules used to sort
+%the glossary entries?
+%
+%\item \textbf{A.} If it's for an individual entry, then you can
+%use the entry's \gloskey{sort} key to sort it according to a
+%different term. If it's for the entire alphabet, then you will need
+%to use \appname{xindy} (instead of \appname{makeindex}) and use an
+%appropriate \appname{xindy} language module. Writing \appname{xindy}
+%modules or styles is beyond the scope of this manual. Further
+%information about \appname{xindy} can be found at the
+%\href{http://xindy.sourceforge.net/}{Xindy Web Site}.\footnote{\texttt{http://xindy.sourceforge.net/}}
+%There is also a link to the \appname{xindy} mailing list from that
+%site.
+%
%\end{enumerate}
%
%\section{A Quick Guide For The Impatient}
@@ -1552,6 +1598,15 @@
%\usepackage[section=subsection]{glossaries}
%\end{verbatim}
%
+%\item If you are using the \isty{hyperref} package and the
+%glossaries are in chapters, you may need to redefine
+%\ics{glsclearpage} to do \ics{clearpage} instead of
+%\cs{cleardoublepage} to prevent an unwanted blank page appearing
+%before the glossary:
+%\begin{verbatim}
+%\renewcommand*{\glsclearpage}{\clearpage}
+%\end{verbatim}
+%
%\end{enumerate}
%\section{Overview of User Commands}\label{sec:overview}
% \changes{1.02}{2007 May 25}{added overview section}
@@ -1608,6 +1663,15 @@
%\DescribeMacro{\setglossarysection}\cs{setglossarysection}\marg{name}\\[10pt]
%where \meta{name} is the sectional unit.
%
+%Note that if you are using the \isty{hyperref} package and the
+%glossaries are put in chapters, you may need to redefine
+%\ics{glsclearpage} to do \ics{clearpage} instead of
+%\cs{cleardoublepage} to prevent an unwanted blank page appearing
+%before the glossary:
+%\begin{verbatim}
+%\renewcommand*{\glsclearpage}{\clearpage}
+%\end{verbatim}
+%
%\item[\pkgopt{numberedsection}]
%The glossaries are placed in unnumbered sectional units by default,
%but this can be changed using \pkgopt{numberedsection}. This option can take
@@ -2015,7 +2079,7 @@
%multiple plurals (for a given term) then use the \gloskey{plural} key
%for one of them (typically the one you are most likely to use) and
%for the others you will need to explicitly write the plural form using
-%\cs{glslink} rather than using \cs{glspl}. Returning to the cow
+%\ics{glslink} or \ics{glsdisp} rather than using \cs{glspl}. Returning to the cow
%example above, suppose you will mostly be using \dq{cows} as the
%plural, but occasionally you want to use \dq{kine} as the plural,
%then define the term as
@@ -2467,13 +2531,25 @@
%defined. As before, these commands also have
%a starred version that disable the hyperlink.
%
+%Note that \cs{glslink} doesn't use or affect the \firstuseflag,
+%nor does it use \ics{glsdisplay} or \ics{glsdisplayfirst} (see
+%\autoref{sec:glsdisplay}). Instead, you can use:\\[10pt]
+%\DescribeMacro{glsdisp}
+%\cs{glsdisp}\oarg{options}\marg{label}\marg{link text}\\[10pt]
+%This behaves in the same way as \cs{gls}, except that it uses
+%\meta{link text} instead of the value of the \gloskey{first}
+%or \gloskey{text} key. (Note that this command always sets
+%\meta{insert} to nothing.)
+%
%\DescribeMacro{\glstext}The command:\\[10pt]
%\cs{glstext}\oarg{options}\marg{label}\oarg{insert}\\[10pt]
%is similar to \ics{gls} except that it always uses the value
%of the \gloskey{text} key and does not affect the
%\firstuseflag.
%Unlike \cs{gls}, the inserted text \meta{insert}
-%is always appended to the link text.
+%is always appended to the link text since \cs{glstext} doesn't
+%use \ics{glsdisplay} or \ics{glsdisplayfirst}. (The same is
+%true for all the following commands described in this section.)
%
%There are also analogous commands:\\[10pt]
%\DescribeMacro{\Glstext}
@@ -2603,15 +2679,17 @@
%print the first argument immediately followed by the fourth argument.
%The remaining arguments are ignored.
%
-%Note that \ics{glslink} (which
-%is used by commands like \cs{gls} and \cs{glspl}) sets
-%\DescribeMacro{\glslabel}\ics{glslabel} to the label for the given
-%entry (i.e.\ the label supplied to the mandatory argument to
-%\cs{gls}), so it is possible to use this label in the definition of
-%\cs{glsdisplay} or \cs{glsdisplayfirst} to supply additional
-%information using any of the commands described in
+%If required, you can access the label for the given entry via
+%\DescribeMacro{\glslabel}\ics{glslabel}, so it is possible to use
+%this label in the definition of \cs{glsdisplay} or
+%\cs{glsdisplayfirst} to supply additional information using any of
+%the commands described in
%\autoref{sec:glsnolink}, if required.
%
+%Note that \cs{glsdisplay} and \cs{glsdisplayfirst} are not used
+%by \ics{glslink}. If you want to supply your own link text, you
+%need to use \ics{glsdisp} instead.
+%
%For example, suppose you want a glossary of measurements and
%units, you can use the \gloskey{symbol} key to store the unit:
%\begin{verbatim}
@@ -3339,13 +3417,16 @@
%\DescribeMacro{\firstacronymfont}\cs{firstacronymfont}\marg{text}\\[10pt]
%where \cs{firstacronymfont} is applied on \firstuse\ and
%\cs{acronymfont} is applied on subsequent use. Note that if you
-%don't use any of the above package options, changing the
-%definition of \cs{acronymfont} or \cs{firstacronymfont} will have
-%no effect. In this case, the recommended route is to use
-%the \pkgopt{smaller} package option and redefine \cs{acronymfont}
-%and \cs{firstacronymfont} as required. For example, if you want
-%acronyms in a normal font on first use and emphasized on
-%subsequent use, do:
+%don't use any of the above package options, changing the definition
+%of \cs{acronymfont} or \cs{firstacronymfont} will have no effect. In
+%this case, the recommended route is to use either the
+%\pkgopt{smaller} or the \pkgopt{smallcaps} package option and
+%redefine \cs{acronymfont} and \cs{firstacronymfont} as required.
+%(The \pkgopt{smallcaps} option sets the default plural suffix in an
+%upright font to cancel the effect of \cs{textsc}, whereas
+%\pkgopt{smaller} sets the suffix in the surrounding font.)
+%For example, if you want acronyms in a normal font on first use and
+%emphasized on subsequent use, do:
%\begin{verbatim}
%\usepackage[smaller]{glossaries}
%\renewcommand*{\firstacronymfont}[1]{#1}
@@ -3359,13 +3440,13 @@
%the acronym styles and how the \ics{newglossaryentry} keys are used
%to store \meta{long} (the long form) and \meta{abbrv} (the short
%form). Note that the \pkgopt{smallcaps} option redefines
-%\cs{acronymfont} so that it sets its
-%argument using \cs{textsc} (so you should use lower case characters
-%in \meta{abbrv}) and the \pkgopt{smaller} option redefines
-%\cs{acronymfont} to use \cs{smaller},\footnote{you will need to load
-%a package, such as \sty{relsize}, that defines \cs{smaller} if you
-%use this option.} otherwise \cs{acronymfont} simply displays its
-%argument in the surrounding font.
+%\cs{acronymfont} so that it sets its argument using \cs{textsc} (so
+%you should use lower case characters in \meta{abbrv}) and the
+%\pkgopt{smaller} option redefines \cs{acronymfont} to use
+%\cs{textsmaller},\footnote{you will need to load a package, such as
+%\sty{relsize}, that defines \cs{textsmaller} if you use this
+%option.}\ otherwise \cs{acronymfont} simply displays its argument in
+%the surrounding font.
%
%\begin{table}[htbp]
%\caption{Package options governing \cs{newacronym} and how the
@@ -3579,11 +3660,14 @@
%\meta{long}\meta{insert} (\cs{firstacronymfont}\marg{abbrv})\\[10pt]
%while subsequent use displays the entry as:\\[10pt]
%\cs{acronymfont}\marg{abbrv}\meta{insert}\\[10pt]
-%where \cs{acronymfont} is set to \verb|{\smaller #1}|.
+%where \cs{acronymfont} is set to
+%\verb|\textsmaller{#1}|.\footnote{not that this was change from
+%using \ics{smaller} to \ics{textsmaller} as declarations
+%cause a problem for \ics{makefirstuc}.}
%The entries will be sorted according to the short form.
%
%\begin{important}
-%Remember to load a package that defines \ics{smaller} (such as
+%Remember to load a package that defines \ics{textsmaller} (such as
%\isty{relsize}) if you want to use this option, unless you want
%to redefine \ics{acronymfont} to use some other formatting command.
%\end{important}
@@ -3600,6 +3684,8 @@
%while subsequent use displays the entry as:\\[10pt]
%\meta{abbrv}\meta{insert}\\[10pt]
%Entries will be sorted according to the short form.
+%Note that if none of the acronym-related package options are used,
+%the \pkgopt{sanitize} option will not be affected.
%\end{description}
%
%Recall from \autoref{sec:glslink} that you can access the values of individual keys using commands
@@ -3643,6 +3729,18 @@
%with (if required) a hyperlink to the
%relevant entry in the glossary.
%
+%\begin{important}
+%Note that if any of the above commands produce unexpected output
+%and you haven't used any of the acronym-related package options,
+%you will need to switch off the sanitization\ipkgopt{sanitize}.
+%For example:
+%\begin{verbatim}
+%\usepackage[sanitize=none]{glossaries}
+%\end{verbatim}
+%However, if you do this, you must remember to protect fragile
+%commands when defining acronyms or glossary entries.
+%\end{important}
+%
%Note that if you change the definition of \ics{newacronym}, you
%may additionally need to change the above commands as well as
%changing the way the text is displayed using \ics{defglsdisplay}
@@ -3683,6 +3781,7 @@
%
%
%\subsubsection{Upgrading From the glossary Package}
+%\label{sec:oldacronym}
%Users of the obsolete \isty{glossary} package may recall that
%the syntax used to define new acronyms has changed with the
%replacement \sty{glossaries} package. In addition, the old
@@ -4450,6 +4549,25 @@
%}
%\end{verbatim}
%
+%\subsection{Accessibility Support}\label{sec:accsupp}
+%Limited accessibility support is provided by the accompanying
+%\isty{glossaries-accsupp} package, but note that this package is
+%experimental and it requires the \isty{accsupp} package
+%which is also listed as experimental. The \gloskey{symbol} key
+%is used to specify the replacement text. For example:
+%\begin{verbatim}
+%\newglossaryentry{tex}{name={\TeX},description={Document preparation
+%language},symbol={TeX}}
+%\end{verbatim}
+%When you reference this entry using \ics{gls}, \ics{glspl} or
+%their uppercase variants, the symbol is used as the replacement
+%text. For example, \verb|\gls{tex}| would be equivalent to
+%\begin{verbatim}
+%\BeginAccSupp{ActualText=TeX}\TeX\EndAccSupp{}
+%\end{verbatim}
+%See \autoref{sec:code:accsupp} for further details. It is
+%recommended that you also read the \isty{accsupp} documentation.
+%
%\section{Mfirstuc Package}
%\label{sec:mfirstuc}
%
@@ -4466,7 +4584,9 @@
%
%\item \verb|\makefirstuc{\emph{abc}}| produces \emph{Abc}
%(\ics{MakeUppercase} has been applied to the letter \dq{a} rather
-%than \cs{emph}.)
+%than \cs{emph}.) Note however that
+%\verb|\makefirstuc{{\em abc}}| produces \emph{ABC} and
+%\verb|{\makefirstuc{\em abc}}| produces abc.
%
%\item \verb|\makefirstuc{{\'a}bc}| produces \MakeUppercase{\'a}bc
%
@@ -4536,7 +4656,7 @@
% This package requires \LaTeXe.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2009/01/14 v1.18 (NLCT)]
+\ProvidesPackage{glossaries}[2009/03/02 v1.19 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -5578,7 +5698,7 @@ name=true]{%
%\changes{1.1}{2008 Feb 22}{numbered sections and auto label added}
% \begin{macrocode}
\newcommand*{\@p@glossarysection}[2]{%
-\gls@doclearpage
+\glsclearpage
\phantomsection
\ifx\@@glossarysecstar\@empty
\csname\@@glossarysec\endcsname{#2}%
@@ -5596,12 +5716,20 @@ name=true]{%
% sectional unit is something else, do nothing.
%\begin{macro}{\gls@doclearpage}
% \begin{macrocode}
-\newcommand{\gls@doclearpage}{%
+\newcommand*{\gls@doclearpage}{%
\ifthenelse{\equal{\@@glossarysec}{chapter}}{%
\@ifundefined{cleardoublepage}{\clearpage}{\cleardoublepage}}{}%
}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\glsclearpage}
+% This just calls \cs{gls@doclearpage}, but it makes it easier to
+% have a user command so that the user can override it.
+%\changes{1.19}{2009 Mar 2}{new}
+% \begin{macrocode}
+\newcommand*{\glsclearpage}{\gls@doclearpage}
+% \end{macrocode}
+%\end{macro}
%
% The glossary is added to the table of contents if glstoc flag set.
% If it is set, \cs{@gls@toc} will add a line to the
@@ -7119,21 +7247,23 @@ counter as its value}}{%
%\changes{1.15}{2008 August 15}{added 'glslabel}
% \begin{macrocode}
\newcommand*{\@gls@link}[3][]{%
-\glsdoifexists{#2}{%
-\def\glslabel{#2}%
-\def\@glsnumberformat{glsnumberformat}%
-\edef\@gls@counter{\csname glo@#2@counter\endcsname}%
-\KV@glslink@hypertrue
-\setkeys{glslink}{#1}%
-\edef\theglsentrycounter{\expandafter\noexpand
- \csname the\@gls@counter\endcsname}%
-\ifKV@glslink@hyper
-\@glslink{glo:#2}{\glstextformat{#3}}%
-\else
-\glstextformat{#3}\relax
-\fi
-\@do@wrglossary{#2}%
-}}
+ \glsdoifexists{#2}%
+ {%
+ \def\glslabel{#2}%
+ \def\@glsnumberformat{glsnumberformat}%
+ \edef\@gls@counter{\csname glo@#2@counter\endcsname}%
+ \KV@glslink@hypertrue
+ \setkeys{glslink}{#1}%
+ \edef\theglsentrycounter{\expandafter\noexpand
+ \csname the\@gls@counter\endcsname}%
+ \ifKV@glslink@hyper
+ \@glslink{glo:#2}{\glstextformat{#3}}%
+ \else
+ \glstextformat{#3}\relax
+ \fi
+ \@do@wrglossary{#2}%
+ }%
+}
% \end{macrocode}
%\end{macro}
%\changes{1.01}{2007 May 17}{Added range facility in format key}%
@@ -7635,6 +7765,7 @@ counter as its value}}{%
\new@ifnextchar[{\@gls@{#1}{#2}}{\@gls@{#1}{#2}[]}}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\@gls@}
% Read in the final optional argument:
% \begin{macrocode}
\def\@gls@#1#2[#3]{%
@@ -7677,6 +7808,7 @@ counter as its value}}{%
\glsunset{#2}}%
}
% \end{macrocode}
+%\end{macro}
%
% \cs{Gls} behaves like \cs{gls}, but the first letter
% of the link text is converted to uppercase (note that if the
@@ -7698,6 +7830,7 @@ counter as its value}}{%
\newcommand*{\@Gls}[2][]{%
\new@ifnextchar[{\@Gls@{#1}{#2}}{\@Gls@{#1}{#2}[]}}
% \end{macrocode}
+%\begin{macro}{\@Gls@}
% Read in the final optional argument:
% \begin{macrocode}
\def\@Gls@#1#2[#3]{%
@@ -7743,6 +7876,7 @@ counter as its value}}{%
\glsunset{#2}}%
}
% \end{macrocode}
+%\end{macro}
%
% \cs{GLS} behaves like \ics{gls}, but the link
% text is converted to uppercase:
@@ -7761,6 +7895,7 @@ counter as its value}}{%
\newcommand*{\@GLS}[2][]{%
\new@ifnextchar[{\@GLS@{#1}{#2}}{\@GLS@{#1}{#2}[]}}
% \end{macrocode}
+%\begin{macro}{\@GLS@}
% Read in the final optional argument:
% \begin{macrocode}
\def\@GLS@#1#2[#3]{%
@@ -7772,7 +7907,7 @@ counter as its value}}{%
\def\@gls@link@label{#2}%
% \end{macrocode}
% Determine what the link text should be (this is stored in
-% \cs{@glo@text})
+% \cs{@glo@text}).
% \begin{macrocode}
\ifglsused{#2}{\protected@edef\@glo@text{%
\csname gls@\@glo@type @display\endcsname
@@ -7803,6 +7938,7 @@ counter as its value}}{%
\glsunset{#2}}%
}
% \end{macrocode}
+%\end{macro}
%
% \cs{glspl} behaves in the same way as \ics{gls} except
% it uses the plural form.
@@ -7821,6 +7957,7 @@ counter as its value}}{%
\newcommand*{\@glspl}[2][]{%
\new@ifnextchar[{\@glspl@{#1}{#2}}{\@glspl@{#1}{#2}[]}}
% \end{macrocode}
+%\begin{macro}{\@glspl@}
% Read in the final optional argument:
% \begin{macrocode}
\def\@glspl@#1#2[#3]{%
@@ -7867,6 +8004,7 @@ counter as its value}}{%
\glsunset{#2}}%
}
% \end{macrocode}
+%\end{macro}
%
% \cs{Glspl} behaves in the same way as \ics{glspl}, except
% that the first letter of the link text is converted to uppercase
@@ -7887,6 +8025,7 @@ counter as its value}}{%
\newcommand*{\@Glspl}[2][]{%
\new@ifnextchar[{\@Glspl@{#1}{#2}}{\@Glspl@{#1}{#2}[]}}
% \end{macrocode}
+%\begin{macro}{\@Glspl@}
% Read in the final optional argument:
% \begin{macrocode}
\def\@Glspl@#1#2[#3]{%
@@ -7898,7 +8037,8 @@ counter as its value}}{%
\def\@gls@link@label{#2}%
% \end{macrocode}
% Determine what the link text should be (this is stored in
-% \cs{@glo@text})
+% \cs{@glo@text}). This needs to be expanded so that the
+% \cs{@glo@text} can be passed to \cs{xmakefirstuc}.
%\changes{1.12}{2008 Mar 8}{now uses 'glsentrydescplural and
% 'glsentrysymbolplural instead of 'glsentrydesc and 'glsentrysymbol}
% \begin{macrocode}
@@ -7936,6 +8076,7 @@ counter as its value}}{%
\glsunset{#2}}%
}
% \end{macrocode}
+%\end{macro}
%
% \cs{GLSpl} behaves like \ics{glspl} except that all the
% link text is converted to uppercase.
@@ -7954,6 +8095,7 @@ counter as its value}}{%
\newcommand*{\@GLSpl}[2][]{%
\new@ifnextchar[{\@GLSpl@{#1}{#2}}{\@GLSpl@{#1}{#2}[]}}
% \end{macrocode}
+%\begin{macro}{\@GLSpl}
% Read in the final optional argument:
% \begin{macrocode}
\def\@GLSpl@#1#2[#3]{%
@@ -8000,6 +8142,80 @@ counter as its value}}{%
\glsunset{#2}}%
}
% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsdisp}
+%\changes{1.19}{2009 Mar 2}{new}
+%\cs{glsdisp}\oarg{options}\marg{label}\marg{text}
+% This is like \cs{gls} except that the link text is provided.
+% This differs from \cs{glslink} in that it uses
+% \cs{glsdisplay} or \cs{glsdisplayfirst} and unsets the first use
+% flag.
+%
+% First determine if we are using the starred form:
+% \begin{macrocode}
+\newcommand*{\glsdisp}{\@ifstar\@sglsdisp\@glsdisp}
+% \end{macrocode}
+%\end{macro}
+% Define the starred form:
+%\begin{macro}{\@sgls}
+% \begin{macrocode}
+\newcommand*{\@sglsdisp}[1][]{\@glsdisp[hyper=false,#1]}
+% \end{macrocode}
+%\end{macro}
+% Defined the un-starred form.
+%\begin{macro}{\@glsdisp}
+% \begin{macrocode}
+\newcommand*{\@glsdisp}[3][]{%
+ \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}%
+% \end{macrocode}
+% Save options in \cs{@gls@link@opts} and label in \cs{@gls@link@label}
+% \begin{macrocode}
+ \def\@gls@link@opts{#1}%
+ \def\@gls@link@label{#2}%
+% \end{macrocode}
+% Determine what the link text should be (this is stored in
+% \cs{@glo@text})
+% \begin{macrocode}
+ \ifglsused{#2}%
+ {%
+ \def\@glo@text{%
+ \csname gls@\@glo@type @display\endcsname
+ {#3}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{}}%
+ }%
+ {%
+ \def\@glo@text{%
+ \csname gls@\@glo@type @displayfirst\endcsname
+ {#3}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{}}%
+ }%
+% \end{macrocode}
+% Call \cs{@gls@link}.
+% If \pkgopt{footnote} package option has been used, suppress
+% hyperlink for first use.
+%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to
+%checking if footnote option has been used}
+% \begin{macrocode}
+ \ifglsused{#2}%
+ {%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ }%
+ {%
+ \ifthenelse{\equal{\@glo@type}{\acronymtype}\and
+ \boolean{glsacrfootnote}}%
+ {%
+ \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
+ }%
+ {%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ }%
+ }%
+% \end{macrocode}
+% Indicate that this entry has now been used
+% \begin{macrocode}
+ \glsunset{#2}}%
+}
+% \end{macrocode}
+%\end{macro}
%
% \cs{glstext} behaves like \ics{gls} except it always uses the value
% given by the \gloskey{text} key and it doesn't mark the entry as
@@ -9700,6 +9916,16 @@ using \string\makeglossary}}}
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\warn@nomakeglossaries}
+% Issue warning that \cs{makeglossaries} hasn't been used.
+% \begin{macrocode}
+\newcommand*{\warn@nomakeglossaries}{%
+ \PackageWarningNoLine{glossaries}{\string\makeglossaries\space
+ hasn't been used,^^Jthe glossaries will not be updated}%
+}
+% \end{macrocode}
+%\end{macro}
+%
% \cs{makeglossaries} will use \cs{@makeglossary}
% for each glossary type that has been defined. New glossaries
% need to be defined before using \cs{makeglossary}, so
@@ -9739,6 +9965,10 @@ using \string\makeglossary}}}
% Disable all commands that have no effect after \cs{makeglossaries}
% \begin{macrocode}
\@disable@onlypremakeg
+% \end{macrocode}
+% Suppress warning about no \cs{makeglossaries}
+% \begin{macrocode}
+ \let\warn@nomakeglossaries\relax
}
% \end{macrocode}
%\end{macro}
@@ -9758,12 +9988,9 @@ using \string\makeglossary}}}
% Also issue a warning if neither \ics{printglossaries} nor
% \ics{printglossary} have been used.
% \begin{macrocode}
-\AtEndDocument{\ifx\makeglossaries\relax
-\else
- \PackageWarningNoLine{glossaries}{\string\makeglossaries\space
- hasn't been used,^^Jthe glossaries will not be updated}%
-\fi
-\warn@noprintglossary
+\AtEndDocument{%
+ \warn@nomakeglossaries
+ \warn@noprintglossary
}
% \end{macrocode}
%
@@ -10008,8 +10235,8 @@ using \string\makeglossary}}}
% glossary.)
% \begin{macrocode}
\def\warn@noprintglossary{\PackageWarningNoLine{glossaries}{No
-\string\printglossary\space or \string\printglossaries\space
-found.^^JThis document will not have a glossary.}}
+ \string\printglossary\space or \string\printglossaries\space
+ found.^^JThis document will not have a glossary.}}
% \end{macrocode}
%\end{macro}
%
@@ -10964,6 +11191,8 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
% Redefine \ics{acronymfont} if small caps required. The plural suffix
% is set in an upright font so that it remains in normal lower case,
% otherwise it looks as though it's part of the acronym.
+%\changes{1.19}{2009 Mar 2}{changed 'acronymfont to use 'textsmaller instead
+%of 'smaller}
% \begin{macrocode}
\ifglsacrsmallcaps
\renewcommand*{\acronymfont}[1]{\textsc{#1}}%
@@ -10971,7 +11200,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
\textup{\glspluralsuffix}}%
\else
\ifglsacrsmaller
- \renewcommand*{\acronymfont}[1]{{\smaller #1}}%
+ \renewcommand*{\acronymfont}[1]{\textsmaller{#1}}%
\fi
\fi
% \end{macrocode}
@@ -11145,6 +11374,8 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
% Redefine \ics{acronymfont} if small caps required. The plural suffix
% is set in an upright font so that it remains in normal lower case,
% otherwise it looks as though it's part of the acronym.
+%\changes{1.19}{2009 Mar 2}{changed 'acronymfont to use 'textsmaller instead
+%of 'smaller}
% \begin{macrocode}
\ifglsacrsmallcaps
\renewcommand{\acronymfont}[1]{\textsc{#1}}
@@ -11152,7 +11383,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
\textup{\glspluralsuffix}}%
\else
\ifglsacrsmaller
- \renewcommand*{\acronymfont}[1]{{\smaller #1}}%
+ \renewcommand*{\acronymfont}[1]{\textsmaller{#1}}%
\fi
\fi
\fi
@@ -11242,6 +11473,8 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
% Redefine \ics{acronymfont} if small caps required. The plural suffix
% is set in an upright font so that it remains in normal lower case,
% otherwise it looks as though it's part of the acronym.
+%\changes{1.19}{2009 Mar 2}{changed 'acronymfont to use 'textsmaller instead
+%of 'smaller}
% \begin{macrocode}
\ifglsacrsmallcaps
\renewcommand*{\acronymfont}[1]{\textsc{#1}}%
@@ -11249,7 +11482,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
\textup{\glspluralsuffix}}%
\else
\ifglsacrsmaller
- \renewcommand*{\acronymfont}[1]{{\smaller #1}}%
+ \renewcommand*{\acronymfont}[1]{\textsmaller{#1}}%
\fi
\fi
% \end{macrocode}
@@ -11300,13 +11533,15 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
% Redefine \ics{acronymfont} if small caps required. The plural suffix
% is set in an upright font so that it remains in normal lower case,
% otherwise it looks as though it's part of the acronym.
+%\changes{1.19}{2009 Mar 2}{changed 'acronymfont to use 'textsmaller instead
+%of 'smaller}
% \begin{macrocode}
\ifglsacrsmallcaps
\renewcommand*{\acronymfont}[1]{\textsc{#1}}
\renewcommand*{\acrpluralsuffix}{%
\textup{\glspluralsuffix}}%
\else
- \renewcommand*{\acronymfont}[1]{{\smaller #1}}
+ \renewcommand*{\acronymfont}[1]{\textsmaller{#1}}
\fi
% \end{macrocode}
% Set up short cuts. Short form:
@@ -13532,6 +13767,413 @@ firstplural={\@glo@descplural\space (\@glo@plural)},%
%\fi
%\iffalse
% \begin{macrocode}
+%<*glossaries-accsupp.sty>
+% \end{macrocode}
+%\fi
+%\section{Accessibilty Support (glossaries-accsupp Code)}
+%\label{sec:code:accsupp}
+% The \isty{glossaries-accsupp} package is experimental. It is
+% intended to provide a means of using the PDF accessibilty support
+% in glossary entries. See the \isty{accsupp} documentation for
+% further details about accessibility support.
+% \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{glossaries-accsupp}[2009/03/02 v0.1 (NLCT)]
+% \end{macrocode}
+% Required packages:
+% \begin{macrocode}
+\RequirePackage{glossaries}
+\RequirePackage{accsupp}
+% \end{macrocode}
+%
+% Store the replacement text in the \gloskey{symbol} key when
+% defining new glossary entries. For example:
+%\begin{verbatim}
+%\newglossaryentry{dr}{name=Dr,description={},symbol={Doctor}}
+%\end{verbatim}
+% The accessibility support is only provided via the commands
+% \ics{gls}, \ics{glspl} and their uppercase variants,
+% e.g.\ \verb|\gls{dr}|.
+%
+%\begin{macro}{\glsaccsupp}
+%\cs{glsaccsupp}\marg{replacement text}\marg{text}\\[10pt]
+% This can be redefined to use "E" or "Alt" instead of
+% "ActualText". (I don't have the software to test the "E" or
+% "Alt" options.)
+% \begin{macrocode}
+\newcommand*{\glsaccsupp}[2]{%
+ \BeginAccSupp{ActualText=#1}#2\EndAccSupp{}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsdisplay}
+% Redefine \cs{glsdisplay} to use symbol as replacement text
+% \begin{macrocode}
+\renewcommand{\glsdisplay}[4]{%
+ \protected@edef\@glo@symbol{#3}%
+ \ifx\@glo@symbol\relax
+ #1%
+ \else
+ \expandafter\glsaccsupp\expandafter{\@glo@symbol}{#1}%
+ \fi
+ #4%
+}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\glsdisplayfirst}
+% Redefine \cs{glsdisplayfirst} to use symbol as replacement text
+% on first use.
+% \begin{macrocode}
+\renewcommand{\glsdisplayfirst}[4]{%
+ \protected@edef\@glo@symbol{#3}%
+ \ifx\@glo@symbol\relax
+ #1%
+ \else
+ \expandafter\glsaccsupp\expandafter{\@glo@symbol}{#1}%
+ \fi
+ #4%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@gls@}
+% Redefine \cs{@gls@} to change the way the link text is defined
+% \begin{macrocode}
+\def\@gls@#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+% \end{macrocode}
+% Save options in \cs{@gls@link@opts} and label in \cs{@gls@link@label}
+% \begin{macrocode}
+ \def\@gls@link@opts{#1}%
+ \def\@gls@link@label{#2}%
+% \end{macrocode}
+% Determine what the link text should be (this is stored in
+% \cs{@glo@text}). This is no longer expanded.
+% \begin{macrocode}
+ \ifglsused{#2}%
+ {%
+ \def\@glo@text{\csname gls@\@glo@type @display\endcsname
+ {\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}%
+ {#3}}%
+ }%
+ {%
+ \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
+ {\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}%
+ {#3}}%
+ }%
+% \end{macrocode}
+% Call \cs{@gls@link}.
+% If \pkgopt{footnote} package option has been used, suppress
+% hyperlink for first use.
+% \begin{macrocode}
+ \ifglsused{#2}%
+ {%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ }%
+ {%
+ \ifthenelse{\equal{\@glo@type}{\acronymtype}\and
+ \boolean{glsacrfootnote}}%
+ {%
+ \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
+ }%
+ {%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ }%
+ }%
+% \end{macrocode}
+% Indicate that this entry has now been used
+% \begin{macrocode}
+ \glsunset{#2}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@Gls@}
+% \begin{macrocode}
+\def\@Gls@#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+% \end{macrocode}
+% Save options in \cs{@gls@link@opts} and label in \cs{@gls@link@label}
+% \begin{macrocode}
+ \def\@gls@link@opts{#1}%
+ \def\@gls@link@label{#2}%
+% \end{macrocode}
+% Determine what the link text should be (this is stored in
+% \cs{@glo@text}). The first character of the entry text is
+% converted to uppercase before passing to
+% \cs{gls@}\meta{type}"@display" or
+% \cs{gls@}\meta{type}"@displayfirst"
+% \begin{macrocode}
+ \ifglsused{#2}%
+ {%
+ \def\@glo@text{\csname gls@\@glo@type @display\endcsname
+ {\Glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}%
+ {#3}}%
+ }%
+ {%
+ \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
+ {\Glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}%
+ {#3}}%
+ }%
+% \end{macrocode}
+% Call \cs{@gls@link}.
+% If \pkgopt{footnote} package option has been used, suppress
+% hyperlink for first use.
+% \begin{macrocode}
+ \ifglsused{#2}%
+ {%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ }%
+ {%
+ \ifthenelse{\equal{\@glo@type}{\acronymtype}\and
+ \boolean{glsacrfootnote}}%
+ {%
+ \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
+ }%
+ {%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ }%
+ }%
+% \end{macrocode}
+% Indicate that this entry has now been used
+% \begin{macrocode}
+ \glsunset{#2}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@GLS@}
+% \begin{macrocode}
+\def\@GLS@#1#2[#3]{%
+ \glsdoifexists{#2}{%
+ \edef\@glo@type{\glsentrytype{#2}}%
+% \end{macrocode}
+% Save options in \cs{@gls@link@opts} and label in \cs{@gls@link@label}
+% \begin{macrocode}
+ \def\@gls@link@opts{#1}%
+ \def\@gls@link@label{#2}%
+% \end{macrocode}
+% Determine what the link text should be (this is stored in
+% \cs{@glo@text}).
+% \begin{macrocode}
+ \ifglsused{#2}%
+ {%
+ \def\@glo@text{\csname gls@\@glo@type @display\endcsname
+ {\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}%
+ {#3}}%
+ }%
+ {%
+ \edef\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
+ {\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}%
+ {#3}}%
+ }%
+% \end{macrocode}
+% Call \cs{@gls@link}
+% If \pkgopt{footnote} package option has been used, suppress
+% hyperlink for first use.
+%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to
+%checking if footnote option has been used}
+% \begin{macrocode}
+ \ifglsused{#2}%
+ {%
+ \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+ }%
+ {%
+ \ifthenelse{\equal{\@glo@type}{\acronymtype}\and
+ \boolean{glsacrfootnote}}{%
+ \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}%
+ }%
+ {%
+ \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+ }%
+ }%
+% \end{macrocode}
+% Indicate that this entry has now been used
+% \begin{macrocode}
+ \glsunset{#2}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@gls@pl@}
+% \begin{macrocode}
+\def\@glspl@#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+% \end{macrocode}
+% Save options in \cs{@gls@link@opts} and label in \cs{@gls@link@label}
+% \begin{macrocode}
+ \def\@gls@link@opts{#1}%
+ \def\@gls@link@label{#2}%
+% \end{macrocode}
+% Determine what the link text should be (this is stored in
+% \cs{@glo@text})
+% \begin{macrocode}
+ \ifglsused{#2}%
+ {%
+ \def\@glo@text{\csname gls@\@glo@type @display\endcsname
+ {\glsentryplural{#2}}{\glsentrydescplural{#2}}%
+ {\glsentrysymbolplural{#2}}{#3}}%
+ }%
+ {%
+ \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
+ {\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}%
+ {\glsentrysymbolplural{#2}}{#3}}%
+ }%
+% \end{macrocode}
+% Call \cs{@gls@link}
+% If \pkgopt{footnote} package option has been used, suppress
+% hyperlink for first use.
+%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to
+%checking if footnote option has been used}
+% \begin{macrocode}
+ \ifglsused{#2}%
+ {%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ }%
+ {%
+ \ifthenelse{\equal{\@glo@type}{\acronymtype}\and
+ \boolean{glsacrfootnote}}%
+ {%
+ \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
+ }%
+ {%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ }%
+ }%
+% \end{macrocode}
+% Indicate that this entry has now been used
+% \begin{macrocode}
+ \glsunset{#2}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@Glspl@}
+% \begin{macrocode}
+\def\@Glspl@#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+% \end{macrocode}
+% Save options in \cs{@gls@link@opts} and label in \cs{@gls@link@label}
+% \begin{macrocode}
+ \def\@gls@link@opts{#1}%
+ \def\@gls@link@label{#2}%
+% \end{macrocode}
+% Determine what the link text should be (this is stored in
+% \cs{@glo@text}).
+% \begin{macrocode}
+ \ifglsused{#2}%
+ {%
+ \def\@glo@text{\csname gls@\@glo@type @display\endcsname
+ {\Glsentryplural{#2}}{\glsentrydescplural{#2}}%
+ {\glsentrysymbolplural{#2}}{#3}}%
+ }%
+ {%
+ \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
+ {\Glsentryfirstplural{#2}}{\glsentrydescplural{#2}}%
+ {\glsentrysymbolplural{#2}}{#3}}%
+ }%
+% \end{macrocode}
+% Call \cs{@gls@link}
+% If \pkgopt{footnote} package option has been used, suppress
+% hyperlink for first use.
+% \begin{macrocode}
+ \ifglsused{#2}%
+ {%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ }%
+ {%
+ \ifthenelse{\equal{\@glo@type}{\acronymtype}\and
+ \boolean{glsacrfootnote}}%
+ {%
+ \@gls@link[#1,hyper=false]{#2}{\@glo@text}%
+ }%
+ {%
+ \@gls@link[#1]{#2}{\@glo@text}%
+ }%
+ }%
+% \end{macrocode}
+% Indicate that this entry has now been used
+% \begin{macrocode}
+ \glsunset{#2}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@GLSpl@}
+% \begin{macrocode}
+\def\@GLSpl@#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+% \end{macrocode}
+% Save options in \cs{@gls@link@opts} and label in \cs{@gls@link@label}
+% \begin{macrocode}
+ \def\@gls@link@opts{#1}%
+ \def\@gls@link@label{#2}%
+% \end{macrocode}
+% Determine what the link text should be (this is stored in
+% \cs{@glo@text})
+% \begin{macrocode}
+ \ifglsused{#2}%
+ {%
+ \def\@glo@text{\csname gls@\@glo@type @display\endcsname
+ {\glsentryplural{#2}}{\glsentrydescplural{#2}}%
+ {\glsentrysymbolplural{#2}}{#3}}%
+ }%
+ {%
+ \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname
+ {\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}%
+ {\glsentrysymbolplural{#2}}{#3}}%
+ }%
+% \end{macrocode}
+% Call \cs{@gls@link}
+% If \pkgopt{footnote} package option has been used, suppress
+% hyperlink for first use.
+% \begin{macrocode}
+ \ifglsused{#2}%
+ {%
+ \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+ }%
+ {%
+ \ifthenelse{\equal{\@glo@type}{\acronymtype}\and
+ \boolean{glsacrfootnote}}%
+ {%
+ \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}%
+ }%
+ {%
+ \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}%
+ }%
+ }%
+% \end{macrocode}
+% Indicate that this entry has now been used
+% \begin{macrocode}
+ \glsunset{#2}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\iffalse
+% \begin{macrocode}
+%</glossaries-accsupp.sty>
+% \end{macrocode}
+%\fi
+%\iffalse
+% \begin{macrocode}
%<*glossaries-babel.sty>
% \end{macrocode}
%\fi
@@ -14396,6 +15038,30 @@ measured in kilograms.
%\fi
%\iffalse
% \begin{macrocode}
+%<*sampleaccsupp.tex>
+% \end{macrocode}
+%\fi
+%\iffalse
+% \begin{macrocode}
+\documentclass{article}
+
+\usepackage{glossaries-accsupp}
+
+ % Replacement text is stored in symbol
+\newglossaryentry{dr}{name=Dr,description={},symbol={Doctor}}
+
+\begin{document}
+\gls{dr}~Jones.
+\end{document}
+% \end{macrocode}
+%\fi
+%\iffalse
+% \begin{macrocode}
+%</sampleaccsupp.tex>
+% \end{macrocode}
+%\fi
+%\iffalse
+% \begin{macrocode}
%<*sampleAcr.tex>
% \end{macrocode}
%\fi
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
index 1c40b7f2a26..39a8f64df47 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 0.94b 2009/1/16 12:27
+% glossaries.ins generated using makedtx version 0.94b 2009/3/3 11:05
\input docstrip
\preamble
@@ -18,7 +18,7 @@
The Current Maintainer of this work is Nicola Talbot.
- This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+ This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
\endpreamble
@@ -38,6 +38,8 @@
\usepostamble\defaultpostamble\from{glossaries.dtx}{glossary-super.sty,package}}
\file{glossary-tree.sty}{\usepreamble\defaultpreamble
\usepostamble\defaultpostamble\from{glossaries.dtx}{glossary-tree.sty,package}}
+\file{glossaries-accsupp.sty}{\usepreamble\defaultpreamble
+\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-accsupp.sty,package}}
\file{glossaries-babel.sty}{\usepreamble\defaultpreamble
\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-babel.sty,package}}
\file{glossaries-dictionary-Brazil.dict}{\usepreamble\defaultpreamble
@@ -65,6 +67,7 @@
\file{minimalgls.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{minimalgls.tex}}
\file{sample.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample.tex}}
\file{sample4col.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample4col.tex}}
+\file{sampleaccsupp.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleaccsupp.tex}}
\file{sampleAcr.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleAcr.tex}}
\file{sampleAcrDesc.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleAcrDesc.tex}}
\file{sampleDB.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleDB.tex}}