diff options
author | Karl Berry <karl@freefriends.org> | 2009-09-25 00:48:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-09-25 00:48:57 +0000 |
commit | 1b5baf0f475cbfdc378718a46057c5c481b59065 (patch) | |
tree | 6ee2f82a5e33642af5af9bfffe47cbc0c48ecbfa /Master/texmf-dist/source/latex/glossaries | |
parent | f453f119c796c9607b391bbf26971fda1826c51c (diff) |
glossaries update (24sep09)
git-svn-id: svn://tug.org/texlive/trunk@15452 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/glossaries')
-rw-r--r-- | Master/texmf-dist/source/latex/glossaries/glossaries.dtx | 829 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/glossaries/glossaries.ins | 2 |
2 files changed, 495 insertions, 336 deletions
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx index be88ef3a3d0..3eb92b44564 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx @@ -26,7 +26,7 @@ % -doc "glossaries-manual.tex" % -codetitle "Glossaries Documented Code" % glossaries -% Created on 2009/7/13 14:13 +% Created on 2009/9/24 16:55 %\fi %\iffalse %<*package> @@ -73,6 +73,11 @@ %have active links, but at least it will keep makeindex happy. +\usepackage{dox} +\doxitem{Option}{option}{package options} +\doxitem{GlsKey}{key}{glossary keys} +\doxitem{Style}{style}{glossary styles} + \renewcommand{\usage}[1]{\textit{\hyperpage{#1}}} \renewcommand{\main}[1]{\hyperpage{#1}} \newcommand{\see}[2]{\emph{see} #1} @@ -81,7 +86,7 @@ \makeatother \RecordChanges \PageIndex -\CheckSum{8711} +\CheckSum{8767} \CodelineNumbered \newcommand*{\termdef}[1]{\emph{#1}\iterm{#1}} \newcommand*{\term}[1]{#1\iterm{#1}} @@ -104,6 +109,12 @@ \newcommand*{\tick}{\ding{51}} +\makeatletter +\renewenvironment{theindex}{\twocolumn[\index@prologue] +\let\item\@idxitem +\ignorespaces +}{} +\makeatother \newcommand*{\ifirstuse}{\iterm{first use}} \newcommand*{\firstuse}{first use\ifirstuse} @@ -121,14 +132,14 @@ \newcommand*{\pkgoptni}[1]{\textsf{#1}} \newcommand*{\ipkgopt}[2][]{% \ifthenelse{\equal{#1}{}}{% -\index{package options>#2=\pkgoptni{#2}|hyperpage}}{% -\index{package options>#2=\pkgoptni{#2}>#1=\pkgoptni{#1}|hyperpage}}} +\index{package options:>#2={\protect\ttfamily #2}|main}}{% +\index{package options:>#2={\protect\ttfamily #2}>#1={\protect\ttfamily #1}|main}}} \newcommand*{\pkgopt}[2][]{% \ifthenelse{\equal{#1}{}}{% -\pkgoptni{#2}\index{package options>#2=\pkgoptni{#2}|hyperpage}}{% -\pkgoptni{#2=#1}\index{package options>#2=\pkgoptni{#2}>#1=\pkgoptni{#1}|hyperpage}}} -\newcommand*{\pkgoptval}[2]{\pkgoptni{#1}\index{package options>#2=\pkgoptni{#2}>#1=\pkgoptni{#1}|hyperpage}} -\newcommand*{\glostyle}[1]{\textsf{#1}\index{glossary styles>#1|hyperpage}} +\pkgoptni{#2}\index{package options:>#2={\protect\ttfamily #2}|main}}{% +\pkgoptni{#2=#1}\index{package options:>#2={\protect\ttfamily #2}>#1={\protect\ttfamily #1}|main}}} +\newcommand*{\pkgoptval}[2]{\pkgoptni{#1}\index{package options:>#2={\protect\ttfamily #2}>#1={\protect\ttfamily#1}|main}} +\newcommand*{\glostyle}[1]{\textsf{#1}\index{glossary styles:>#1={\protect\ttfamily#1}|main}} \newcommand*{\filetype}[1]{\texttt{#1}\index{file types>#1|hyperpage}} \newcommand*{\sty}[1]{\textsf{#1}} \newcommand*{\isty}[1]{\sty{#1}\index{#1 package=\sty{#1} package|hyperpage}} @@ -144,7 +155,7 @@ %\MakeShortVerb{"} %\DeleteShortVerb{\|} % -% \title{glossaries.sty v 2.02: \LaTeXe\ Package to Assist Generating Glossaries} +% \title{glossaries.sty v 2.03: \LaTeXe\ Package to Assist Generating Glossaries} % \author{Nicola L.C. Talbot\\[10pt] %School of Computing Sciences\\ %University of East Anglia\\ @@ -152,7 +163,7 @@ %NR4 7TJ. United Kingdom.\\ %\url{http://theoval.cmp.uea.ac.uk/~nlct/}} % -% \date{13th July 2009} +% \date{23rd September 2009} % \maketitle %\tableofcontents % @@ -255,7 +266,7 @@ %You can test your installation using this file. To create the %complete document you will need to do the following steps: % \begin{enumerate} -% \item Run \texttt{minimalgls.tex} through \LaTeX\ by either +% \item Run \texttt{minimalgls.tex} through \LaTeX\ either by % typing %\begin{verbatim} %latex minimalgls @@ -273,7 +284,7 @@ % package. % % \item Run \appname{makeglossaries} on the document. This can -% be done on a terminal by either typing +% be done on a terminal either by typing %\begin{verbatim} %makeglossaries minimalgls %\end{verbatim} @@ -483,7 +494,7 @@ %don't use \appname{makeglossaries}, you will need to specify the %required information. Note that if you set the style file to %\texttt{samplexdy-mc.xdy} you must also specify \ics{noist}, -%otherwise the \isty{glossaries} package will overwrite +%otherwise the \sty{glossaries} package will overwrite %\texttt{samplexdy-mc.xdy} and you will lose the \dq{Mc} letter group. % %To create the document do: @@ -596,8 +607,8 @@ %However you must load \isty{babel} \emph{before} %\sty{glossaries} to enable this. Note that if \isty{babel} is loaded %and the \isty{translator} package is detected on \TeX's path, then the -%\isty{translator} package will be loaded automatically, however, -%it may not pick up on the required languages, so if the predefined +%\isty{translator} package will be loaded automatically. However, +%it may not pick up on the required languages so, if the predefined %text is not translated, you may need to explicitly load the %\isty{translator} package with the required languages. For example: %\begin{verbatim} @@ -625,7 +636,7 @@ %\end{verbatim} % %The following languages are currently supported by the -%\isty{glossaries} package: +%\sty{glossaries} package: %\begin{center} %\begin{tabular}{lc} %\bfseries Language & \bfseries As from version\\ @@ -681,14 +692,38 @@ %the \isty{babel} package and do not have the \isty{translator} package %installed, you need to be familiar with the % advice given in \url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=latexwords}. +%If you have the \isty{translator} package installed, then you +%can change the translations using \cs{deftranslation}. See the +%\isty{translator} documentation for further details. +% +%If you don't want to use the \isty{translator} interface, you +%can suppress it using the package option \pkgopt[false]{translate}, +%and either load \isty{glossaries-babel} after \sty{glossaries} +%or specify you're own translations. For example: +%\begin{verbatim} +%\documentclass[british]{article} % -%If you have the \isty{translator} package installed, then it becomes -%much easier to change the default translations. For example, if you -%are writing in Irish and you want \cs{symbolname} to produce -%\dq{Siombail} instead of \dq{Comhartha}, then you can put the following -%in your document preamble: +%\usepackage{babel} +%\usepackage[translate=false]{glossaries} +%\usepackage{glossaries-babel} +%\end{verbatim} +%or: %\begin{verbatim} -%\deftranslation[to=Irish]{Symbol (glossaries)}{Siombail} +%\documentclass[british]{article} +% +%\usepackage{babel} +%\usepackage[translate=false]{glossaries} +% +%\addto\captionsbritish{% +% \renewcommand*{\glossaryname}{List of Terms}% +% \renewcommand*{\acronymname}{List of Acronyms}% +% \renewcommand*{\entryname}{Notation}% +% \renewcommand*{\descriptionname}{Description}% +% \renewcommand*{\symbolname}{Symbol}% +% \renewcommand*{\pagelistname}{Page List}% +% \renewcommand*{\glssymbolsgroupname}{Symbols}% +% \renewcommand*{\glsnumbersgroupname}{Numbers}% +%} %\end{verbatim} % %Note that \appname{xindy} provides much better multi-lingual @@ -830,6 +865,11 @@ %does this for Windows users, but you must have Perl installed to %be able to use it. % +%The \appname{makeglossaries} script contains POD (Plain Old +%Documentation). If you want, you can create a man page for +%\appname{makeglossaries} using \appname{pod2man} and move the +%resulting file onto the man path. +% %\subsubsection{Using xindy explicitly} %\label{sec:xindyapp} % @@ -1023,6 +1063,13 @@ %capitals, while upper case letters remain their usual size. Therefore %you need to specify the acronym in lower case letters. % +%\item \textbf{Q.} My acronyms won't break across a line when they're +%expanded. +% +%\textbf{A.} PDF\LaTeX\ can break hyperlinks across a line, but +%\LaTeX\ can't. If you can't use PDF\LaTeX\ then disable the first use +%links using the package option \pkgopt[false]{hyperfirst}. +% %\item \textbf{Q.} How do I change the font that the acronyms are displayed in? % %\textbf{A.} The easiest way to do this is to specify the \pkgopt{smaller} package @@ -1148,6 +1195,16 @@ % %The \sty{glossaries} package options are as follows: %\begin{description} +%\item[\pkgopt{nowarn}] This suppresses all warnings generated by +%the \sty{glossaries} package. +% +%\item[\pkgopt{nomain}] This suppresses the creation of the main +%glossary. Note that if you use this option, you must create another +%glossary in which to put all your entries (either via the +%\pkgopt{acronym} package option described below or via +%\ics{newglossary} described in +%\autoref{sec:newglossary}). +% %\item[\pkgopt{toc}] Add the glossaries to the table of contents. %Note that an extra \LaTeX\ run is required with this option. % @@ -1174,14 +1231,6 @@ %the glossary whose label is given by \ics{acronymtype}, unless %another glossary is explicitly specified. % -%\item[\pkgopt{nomain}] This suppresses the creation of the main -%glossary. Note that if you use this option, you must create another -%glossary in which to put all your entries (either via the -%\pkgopt{acronym} package option described above or via -%\ics{newglossary} described in -%\autoref{sec:newglossary}). -% -% %\item[\pkgopt{section}] This is a \meta{key}=\meta{value} option. Its %value should be the name of a sectional unit (e.g.\ chapter). %This will make the glossaries appear in the named sectional unit, @@ -1201,9 +1250,10 @@ %\end{verbatim} %You can change this value later in the document using\\[10pt] %\DescribeMacro{\setglossarysection}\cs{setglossarysection}\marg{name}\\[10pt] -%where \meta{name} is the sectional unit. The start of each glossary -%adds information to the page header via -%\DescribeMacro{glossarymark}\cs{glossarymark}\marg{glossary title}. +%where \meta{name} is the sectional unit. +% +%The start of each glossary adds information to the page header via +%\DescribeMacro{\glossarymark}\cs{glossarymark}\marg{glossary title}. %This defaults to \cs{@mkboth}, but you may need to redefine it. %For example, to only change the right header: %\begin{verbatim} @@ -1361,7 +1411,11 @@ %\ics{newacronym} and the way that acronyms are displayed. See \autoref{sec:acronyms} for further details. % %\item[\pkgopt{smaller}] This option changes the definition of -%\ics{newacronym} and the way that acronyms are displayed. See \autoref{sec:acronyms} for further details. +%\ics{newacronym} and the way that acronyms are displayed. +%If you use this option, you will need to include the \isty{relsize} +%package or otherwise define \ics{textsmaller} or redefine +%\ics{acronymfont}. See +%\autoref{sec:acronyms} for further details. % %\item[\pkgopt{dua}] This option changes the definition of %\ics{newacronym} so that acronyms are always expanded. @@ -1406,8 +1460,30 @@ %is word ordering. Note that this option has no effect if you %don't use \appname{makeglossaries}. % -%\item[\pkgopt{nowarn}] This suppresses all warnings generated by -%the \sty{glossaries} package. +%\item[\pkgopt{translate}] This is a boolean option. The default is +%\pkgoptval{true}{translate} if \isty{babel} or \isty{translator} +%have been loaded, otherwise the default value is +%\pkgoptval{false}{translate}. +% +% \begin{description} +% \item[{\pkgopt[true]{translate}}] If the \isty{translator} package +% is installed, it will be loaded and the translations will be +% provided by the \isty{translator} package interface. If the +% \isty{translator} package isn't installed, the +% \isty{glossaries-babel} package will be loaded and the translations +% will be provided using \sty{babel}'s +% \cs{addto}\cs{caption}\meta{language} mechanism. +% +% \item[{\pkgopt[false]{translate}}] Don't provide translations, even +% if \isty{babel} has been loaded. You can then provide you're +% own translations or explicitly load \isty{glossaries-babel}. +% \end{description} +% +%\item[\pkgopt{hyperfirst}] This is a boolean option that specifies +%whether each term has a hyperlink on \firstuse. The default is +%\pkgopt[true]{hyperfirst} (terms on first use have a hyperlink, +%unless explicitly suppressed using starred versions of commands +%such as \cs{gls*}). % %\end{description} %\subsection{Defining Glossary Entries} @@ -2335,6 +2411,12 @@ %within a group. Note that you should only use \cs{glsenablehyper} %if the commands \ics{hyperlink} and \ics{hypertarget} have been %defined (for example, by the \isty{hyperref} package). +% +%You can disable just the first use links using the package +%option \pkgopt[false]{hyperfirst}. Note that this option only +%affects commands that recognise the \firstuse\ flag, for example +%\ics{gls}, \ics{glspl} and \ics{glsdisp} but not \ics{glslink}. +% %\subsection{Adding an Entry to the Glossary Without Generating Text} %\label{sec:glsadd} % @@ -2546,7 +2628,8 @@ % %\item[{\gloskey[printglossary]{toctitle}}] This is the title %to use for the table of contents (if the \pkgopt{toc} package -%option has been used). If omitted, the glossary title is used. +%option has been used). It may also be used for the page header, +%depending on the page style. If omitted, the glossary title is used. % %\item[{\gloskey[printglossary]{style}}] This specifies which %glossary style to use for this glossary, overriding the effect @@ -3352,7 +3435,7 @@ %\cs{}\meta{acr-name} when defining the acronym \meta{acr-name}. % %In order to facilitate migrating from the old package to the new -%one, the \isty{glossaries} package\footnote{as from version 1.18} +%one, the \sty{glossaries} package\footnote{as from version 1.18} %provides the command:\\[10pt] %\DescribeMacro{\oldacronym}\cs{oldacronym}\oarg{label}\marg{abbrv}\marg{long}\marg{key-val list}\\[10pt] %This uses the same syntax as the \isty{glossary} package's @@ -3376,7 +3459,7 @@ %\isty{xspace} package. %\end{important} % -%The \isty{glossaries} package doesn't load the \isty{xspace} package +%The \sty{glossaries} package doesn't load the \isty{xspace} package %since there are both advantages and disadvantages to using %\ics{xspace} in \cs{}\meta{label}. If you don't use the %\isty{xspace} package you need to explicitly force a space using @@ -4407,7 +4490,7 @@ % This package requires \LaTeXe. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2009/07/13 v2.02 (NLCT)] +\ProvidesPackage{glossaries}[2009/09/23 v2.03 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -4427,15 +4510,15 @@ % \end{macrocode} % % \subsection{Package Options}\label{sec:pkgopt} -%\begin{macro}{toc} +%\begin{option}{toc} % The \pkgopt{toc} package option will add the glossaries % to the table of contents. This is a boolean key, if the % value is omitted it is taken to be true. % \begin{macrocode} \define@boolkey{glossaries.sty}[gls]{toc}[true]{} % \end{macrocode} -%\end{macro} -%\begin{macro}{numberline} +%\end{option} +%\begin{option}{numberline} %\changes{1.1}{2008 Feb 22}{numberline option added} % The \pkgopt{numberline} package option adds \cs{numberline} to % \cs{addcontentsline}. Note that this option only has an effect @@ -4443,7 +4526,7 @@ % \begin{macrocode} \define@boolkey{glossaries.sty}[gls]{numberline}[true]{} % \end{macrocode} -%\end{macro} +%\end{option} % % The sectional unit used to start the glossary is stored in % \cs{@@glossarysec}. If chapters are defined, this @@ -4456,7 +4539,7 @@ % \end{macrocode} %\end{macro} % -%\begin{macro}{section} +%\begin{option}{section} % The \pkgopt{section} key can be used to set the sectional unit. % If no unit is specified, use \texttt{section} as the default. % The starred form of the named sectional unit will be used. @@ -4468,7 +4551,7 @@ subsection,subsubsection,paragraph,subparagraph}[section]{% \renewcommand*{\@@glossarysec}{#1}} % \end{macrocode} -%\end{macro} +%\end{option} % % Determine whether or not to use numbered sections. %\begin{macro}{\@@glossarysecstar} @@ -4488,7 +4571,7 @@ subsection,subsubsection,paragraph,subparagraph}[section]{% \newcommand*{\glsautoprefix}{} % \end{macrocode} %\end{macro} -%\begin{macro}{numberedsection} +%\begin{option}{numberedsection} %\changes{1.1}{2008 Feb 22}{numberedsection package option added} % \begin{macrocode} \define@choicekey{glossaries.sty}{numberedsection}[\val\nr]{% @@ -4504,7 +4587,7 @@ false,nolabel,autolabel}[nolabel]{% \renewcommand*{\@@glossaryseclabel}{\label{\glsautoprefix\@glo@type}}% \fi} % \end{macrocode} -%\end{macro} +%\end{option} % % The default glossary style is stored in % \cs{@glossary@default@style}. This is initialised to @@ -4517,7 +4600,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} %\end{macro} % -%\begin{macro}{style} +%\begin{option}{style} % The default glossary style can be changed using the \pkgopt{style} % package option. The value can be the name of any % defined glossary style. The glossary style is set at the beginning @@ -4529,7 +4612,7 @@ false,nolabel,autolabel}[nolabel]{% \define@key{glossaries.sty}{style}{% \renewcommand*{\@glossary@default@style}{#1}} % \end{macrocode} -%\end{macro} +%\end{option} % % Each entry within a given glossary will have an associated % number list. By default, this refers to the page numbers on @@ -4541,7 +4624,7 @@ false,nolabel,autolabel}[nolabel]{% \newcommand*{\glossaryentrynumbers}[1]{#1} % \end{macrocode} %\end{macro} -%\begin{macro}{nonumberlist} +%\begin{option}{nonumberlist} % Note that the entire number list for a given entry will be % passed to \cs{glossaryentrynumbers} so any font changes % will also be applied to the delimiters. @@ -4552,7 +4635,7 @@ false,nolabel,autolabel}[nolabel]{% \DeclareOptionX{nonumberlist}{% \renewcommand*{\glossaryentrynumbers}[1]{}} % \end{macrocode} -%\end{macro} +%\end{option} % %\begin{macro}{\@gls@loadlong} %\changes{1.18}{2009 January 14}{new} @@ -4560,7 +4643,7 @@ false,nolabel,autolabel}[nolabel]{% \newcommand*{\@gls@loadlong}{\RequirePackage{glossary-long}} % \end{macrocode} %\end{macro} -%\begin{macro}{nolong} +%\begin{option}{nolong} %\changes{1.18}{2009 January 14}{new} % This option prevents \isty{glossary-long} from being loaded. % This means that the glossary styles that use the @@ -4570,7 +4653,7 @@ false,nolabel,autolabel}[nolabel]{% % \begin{macrocode} \DeclareOptionX{nolong}{\renewcommand*{\@gls@loadlong}{}} % \end{macrocode} -%\end{macro} +%\end{option} % %\begin{macro}{\@gls@loadsuper} %\changes{1.18}{2009 January 14}{new} @@ -4582,7 +4665,7 @@ false,nolabel,autolabel}[nolabel]{% \newcommand*{\@gls@loadsuper}{}} % \end{macrocode} %\end{macro} -%\begin{macro}{nosuper} +%\begin{option}{nosuper} %\changes{1.18}{2009 January 14}{new} % This option prevents \isty{glossary-super} from being loaded. % This means that the glossary styles that use the @@ -4592,7 +4675,7 @@ false,nolabel,autolabel}[nolabel]{% % \begin{macrocode} \DeclareOptionX{nosuper}{\renewcommand*{\@gls@loadsuper}{}} % \end{macrocode} -%\end{macro} +%\end{option} % %\begin{macro}{\@gls@loadlist} %\changes{1.18}{2009 January 14}{new} @@ -4600,7 +4683,7 @@ false,nolabel,autolabel}[nolabel]{% \newcommand*{\@gls@loadlist}{\RequirePackage{glossary-list}} % \end{macrocode} %\end{macro} -%\begin{macro}{nolist} +%\begin{option}{nolist} %\changes{1.18}{2009 January 14}{new} % This option prevents \isty{glossary-list} from being loaded % (to reduce overheads if required). Naturally, the styles defined @@ -4609,7 +4692,7 @@ false,nolabel,autolabel}[nolabel]{% % \begin{macrocode} \DeclareOptionX{nolist}{\renewcommand*{\@gls@loadlist}{}} % \end{macrocode} -%\end{macro} +%\end{option} % %\begin{macro}{\@gls@loadtree} %\changes{1.18}{2009 January 14}{new} @@ -4617,7 +4700,7 @@ false,nolabel,autolabel}[nolabel]{% \newcommand*{\@gls@loadtree}{\RequirePackage{glossary-tree}} % \end{macrocode} %\end{macro} -%\begin{macro}{notree} +%\begin{option}{notree} %\changes{1.18}{2009 January 14}{new} % This option prevents \isty{glossary-tree} from being loaded % (to reduce overheads if required). Naturally, the styles defined @@ -4626,9 +4709,9 @@ false,nolabel,autolabel}[nolabel]{% % \begin{macrocode} \DeclareOptionX{notree}{\renewcommand*{\@gls@loadtree}{}} % \end{macrocode} -%\end{macro} +%\end{option} % -%\begin{macro}{nostyles} +%\begin{option}{nostyles} %\changes{1.18}{2009 January 14}{new} % Provide an option to suppress all the predefined styles (in the % event that the user has custom styles that are not dependent @@ -4642,7 +4725,7 @@ false,nolabel,autolabel}[nolabel]{% \let\@glossary@default@style\relax } % \end{macrocode} -%\end{macro} +%\end{option} % %\begin{macro}{\glsdefmain} %\changes{2.01}{2009 May 30}{new} @@ -4689,14 +4772,14 @@ false,nolabel,autolabel}[nolabel]{% } % \end{macrocode} % -%\begin{macro}{acronym} +%\begin{option}{acronym} % The \pkgopt{acronym} option sets an associated conditional % which is used in \autoref{sec:acronym} to determine whether % or not to define a separate glossary for acronyms. % \begin{macrocode} \define@boolkey{glossaries.sty}[gls]{acronym}[true]{} % \end{macrocode} -%\end{macro} +%\end{option} % % The default counter associated with the numbers in the glossary % is stored in \cs{glscounter}. This is initialised to the @@ -4709,14 +4792,14 @@ false,nolabel,autolabel}[nolabel]{% \newcommand{\glscounter}{page} % \end{macrocode} %\end{macro} -%\begin{macro}{counter} +%\begin{option}{counter} % The \pkgopt{counter} option changes the default counter. (This % just redefines \cs{glscounter}.) % \begin{macrocode} \define@key{glossaries.sty}{counter}{% \renewcommand*{\glscounter}{#1}} % \end{macrocode} -%\end{macro} +%\end{option} % % The glossary keys whose values are written to another file (i.e.\ % \gloskey{sort}, \gloskey{name}, \gloskey{description} and @@ -4801,7 +4884,7 @@ false,nolabel,autolabel}[nolabel]{% \fi} % \end{macrocode} % -%\begin{macro}{sanitize} +%\begin{option}{sanitize} % Now define the \pkgopt{sanitize} option. It can either take % a key-val list as its value, or it can take the keyword % \texttt{none}, which is equivalent to \texttt{description=false, @@ -4816,15 +4899,15 @@ name=true]{% }{\setkeys[gls]{sanitize}{#1}}% } % \end{macrocode} -%\end{macro} -%\begin{macro}{translate} +%\end{option} +%\begin{option}{translate} %\changes{1.1}{2008 Feb 22}{translate option added} % Define \pkgopt{translate} option. If false don't set up % multi-lingual support. % \begin{macrocode} \define@boolkey{glossaries.sty}[gls]{translate}[true]{} % \end{macrocode} -%\end{macro} +%\end{option} % Set the default value: % \begin{macrocode} \glstranslatefalse @@ -4832,7 +4915,16 @@ name=true]{% \@ifpackageloaded{babel}{\glstranslatetrue}{}} % \end{macrocode} % -%\begin{macro}{footnote} +%\begin{option}{hyperfirst} +%\changes{2.03}{2009 Sep 23}{new} +% Set whether or not terms should have a hyperlink on first use. +% \begin{macrocode} +\define@boolkey{glossaries.sty}[gls]{hyperfirst}[true]{} +\glshyperfirsttrue +% \end{macrocode} +%\end{option} +% +%\begin{option}{footnote} % Set the long form of the acronym in footnote on first use. % \begin{macrocode} \define@boolkey{glossaries.sty}[glsacr]{footnote}[true]{% @@ -4840,8 +4932,8 @@ name=true]{% {\renewcommand*{\@gls@sanitizedesc}{}}% } % \end{macrocode} -%\end{macro} -%\begin{macro}{description} +%\end{option} +%\begin{option}{description} % Allow acronyms to have a description (needs to be set using % the \gloskey{description} key in the optional argument of % \ics{newacronym}). @@ -4850,16 +4942,16 @@ name=true]{% \renewcommand*{\@gls@sanitizesymbol}{}% } % \end{macrocode} -%\end{macro} -%\begin{macro}{smallcaps} +%\end{option} +%\begin{option}{smallcaps} % Define \ics{newacronym} to set the short form in small capitals. % \begin{macrocode} \define@boolkey{glossaries.sty}[glsacr]{smallcaps}[true]{% \renewcommand*{\@gls@sanitizesymbol}{}% } % \end{macrocode} -%\end{macro} -%\begin{macro}{smaller} +%\end{option} +%\begin{option}{smaller} % Define \ics{newacronym} to set the short form using \cs{smaller} % which obviously needs to be defined by loading the appropriate % package. @@ -4868,8 +4960,8 @@ name=true]{% \renewcommand*{\@gls@sanitizesymbol}{}% } % \end{macrocode} -%\end{macro} -%\begin{macro}{dua} +%\end{option} +%\begin{option}{dua} % Define \ics{newacronym} to always use the long forms % (i.e.\ don't use acronyms) % \begin{macrocode} @@ -4877,13 +4969,13 @@ name=true]{% \renewcommand*{\@gls@sanitizesymbol}{}% } % \end{macrocode} -%\end{macro} -%\begin{macro}{shotcuts} +%\end{option} +%\begin{option}{shotcuts} % Define acronym shortcuts. % \begin{macrocode} \define@boolkey{glossaries.sty}[glsacr]{shortcuts}[true]{} % \end{macrocode} -%\end{macro} +%\end{option} % %\begin{macro}{\glsorder} % Stores the glossary ordering. This may either be \dq{word} @@ -4902,13 +4994,13 @@ name=true]{% % \end{macrocode} %\end{macro} % -%\begin{macro}{order} +%\begin{option}{order} %\changes{1.17}{2008 December 26}{order package option added} % \begin{macrocode} \define@choicekey{glossaries.sty}{order}{word,letter}{% \def\glsorder{#1}} % \end{macrocode} -%\end{macro} +%\end{option} % %\changes{1.17}{2008 December 26}{added xindy support} %\begin{macro}{\ifglsxindy} @@ -5454,19 +5546,34 @@ name=true]{% %\begin{macro}{\glossarysection} % \begin{macrocode} \newcommand*{\glossarysection}[2][\@gls@title]{% -\def\@gls@title{#2}% -\@ifundefined{phantomsection}{% -\@glossarysection{#1}{#2}}{\@p@glossarysection{#1}{#2}}% -\glossarymark{\glossarytoctitle}% + \def\@gls@title{#2}% + \@ifundefined{phantomsection}{% + \@glossarysection{#1}{#2}}{\@p@glossarysection{#1}{#2}}% + \glossarymark{\glossarytoctitle}% } % \end{macrocode} %\end{macro} %\begin{macro}{\glossarymark} -%\changes{2.02}{2007 July 13}{New} +%\changes{2.02}{2009 July 13}{New} +%\changes{2.03}{2009 Sep 23}{Added check to see if it's already +%defined} % Sets the header mark for the glossary. Takes the glossary short % (TOC) title as the argument. % \begin{macrocode} -\newcommand{\glossarymark}[1]{\@mkboth{#1}{#1}} +\@ifundefined{glossarymark}{% + \newcommand{\glossarymark}[1]{\@mkboth{#1}{#1}} +}{% + \GlossariesWarning{overriding \string\glossarymark}% + \@ifclassloaded{memoir}% + { + \renewcommand{\glossarymark}[1]{% + \markboth{\memUChead{#1}}{\memUChead{#1}}% + } + } + { + \renewcommand{\glossarymark}[1]{\@mkboth{#1}{#1}} + } +} % \end{macrocode} %\end{macro} % @@ -6214,7 +6321,7 @@ name=true]{% % and \gloskey{description} key before they are sanitized). % % -%\begin{macro}{name} +%\begin{key}{name} %The \gloskey{name} key indicates the name % of the term being defined. This is how the term will appear in % the glossary. The \gloskey{name} key is required when defining @@ -6224,9 +6331,9 @@ name=true]{% \def\@glo@name{#1}% } % \end{macrocode} -%\end{macro} +%\end{key} % -%\begin{macro}{description} +%\begin{key}{description} % The \gloskey{description} key is usually only used in % the glossary, but can be made to appear in the text by redefining % \ics{glsdisplay} and \ics{glsdisplayfirst} (or @@ -6248,17 +6355,17 @@ name=true]{% \def\@glo@desc{#1}% } % \end{macrocode} -%\end{macro} -%\begin{macro}{descriptionplural} +%\end{key} +%\begin{key}{descriptionplural} % \changes{1.12}{2008 Mar 8}{new} % \begin{macrocode} \define@key{glossentry}{descriptionplural}{% \def\@glo@descplural{#1}% } % \end{macrocode} -%\end{macro} +%\end{key} % -%\begin{macro}{sort} +%\begin{key}{sort} % The \gloskey{sort} key needs to be sanitized here % (the sort key is provided for \appname{makeindex}'s benefit, % not for use in the document). The \gloskey{sort} key is optional @@ -6269,9 +6376,9 @@ name=true]{% \define@key{glossentry}{sort}{% \def\@glo@sort{#1}} % \end{macrocode} -%\end{macro} +%\end{key} % -%\begin{macro}{text} +%\begin{key}{text} % The \gloskey{text} key determines how the term should appear when % used in the document (i.e.\ outside of the glossary). If omitted, % the value of the \gloskey{name} key is used instead. @@ -6280,9 +6387,9 @@ name=true]{% \def\@glo@text{#1}% } % \end{macrocode} -%\end{macro} +%\end{key} % -%\begin{macro}{plural} +%\begin{key}{plural} % The \gloskey{plural} key determines how the plural form of the term % should be displayed in the document. If omitted, the plural is % constructed by appending \ics{glspluralsuffix} to the value of the @@ -6292,9 +6399,9 @@ name=true]{% \def\@glo@plural{#1}% } % \end{macrocode} -%\end{macro} +%\end{key} % -%\begin{macro}{first} +%\begin{key}{first} % The \gloskey{first} key determines how the entry should be displayed % in the document when it is first used. If omitted, it is taken % to be the same as the value of the \gloskey{text} key. @@ -6303,9 +6410,9 @@ name=true]{% \def\@glo@first{#1}% } % \end{macrocode} -%\end{macro} +%\end{key} % -%\begin{macro}{firstplural} +%\begin{key}{firstplural} % The \gloskey{firstplural} key is used to set the plural form for % first use, in the event that the plural is required the first % time the term is used. If omitted, it is constructed by @@ -6315,9 +6422,9 @@ name=true]{% \def\@glo@firstplural{#1}% } % \end{macrocode} -%\end{macro} +%\end{key} % -%\begin{macro}{symbol} +%\begin{key}{symbol} % The \gloskey{symbol} key is ignored by most of the predefined % glossary styles, and defaults to \cs{relax} if omitted. % It is provided for glossary styles that require an associated @@ -6334,26 +6441,26 @@ name=true]{% \def\@glo@symbol{#1}% } % \end{macrocode} -%\end{macro} -%\begin{macro}{symbolplural} +%\end{key} +%\begin{key}{symbolplural} % \changes{1.12}{2008 Mar 8}{new} % \begin{macrocode} \define@key{glossentry}{symbolplural}{% \def\@glo@symbolplural{#1}% } % \end{macrocode} -%\end{macro} +%\end{key} % -%\begin{macro}{type} +%\begin{key}{type} % The \gloskey{type} key specifies to which glossary this % entry belongs. If omitted, the default glossary is used. % \begin{macrocode} \define@key{glossentry}{type}{% \def\@glo@type{#1}} % \end{macrocode} -%\end{macro} +%\end{key} % -%\begin{macro}{counter} +%\begin{key}{counter} % The \gloskey{counter} key specifies the name of the counter % associated with this glossary entry: % \begin{macrocode} @@ -6363,18 +6470,18 @@ called `#1'}{The counter key should have the name of a valid counter as its value}}{% \def\@glo@counter{#1}}} % \end{macrocode} -%\end{macro} +%\end{key} % -%\begin{macro}{see} +%\begin{key}{see} % The \gloskey{see} key specifies a list of cross-references % \changes{1.17}{2008 December 26}{new} % \begin{macrocode} \define@key{glossentry}{see}{% \def\@glo@see{#1}} % \end{macrocode} -%\end{macro} +%\end{key} % -%\begin{macro}{parent} +%\begin{key}{parent} % The \gloskey{parent} key specifies the parent entry, if % required. % \changes{1.17}{2008 December 26}{new} @@ -6382,9 +6489,9 @@ counter as its value}}{% \define@key{glossentry}{parent}{% \def\@glo@parent{#1}} % \end{macrocode} -%\end{macro} +%\end{key} % -%\begin{macro}{nonumberlist} +%\begin{key}{nonumberlist} % The \gloskey{nonumberlist} key suppresses the number list % for the given entry. % \changes{1.17}{2008 December 26}{new} @@ -6392,7 +6499,7 @@ counter as its value}}{% \define@key{glossentry}{nonumberlist}[none]{% \def\@glo@prefix{\glsnonextpages}} % \end{macrocode} -%\end{macro} +%\end{key} % %\begin{macro}{\@glsnoname} % \changes{1.17}{2008 December 26}{new} @@ -7058,23 +7165,53 @@ counter as its value}}{% %\begin{macro}{\glslink} % \begin{macrocode} \newcommand{\glslink}{% -\@ifstar\@sgls@link\@gls@link} +\@ifstar\@sgls@link\@gls@@link} % \end{macrocode} %\end{macro} -% Define the starred version: %\begin{macro}{\@sgls@link} +% The starred version of \cs{glslink} calls the unstarred version +% with hyperlinks disabled. % \begin{macrocode} -\newcommand*{\@sgls@link}[1][]{\@gls@link[hyper=false,#1]} +\newcommand*{\@sgls@link}[1][]{\@gls@@link[hyper=false,#1]} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@gls@@link} +%\changes{2.03}{2009 Sep 23}{new} +% The unstarred version of \cs{glslink} checks for the existance +% of the term. The main part of the business is in \cs{@gls@link} +% which shouldn't check if the term is defined as it's called by +% \cs{gls} etc which also perform that check. +% \begin{macrocode} +\newcommand*{\@gls@@link}[3][]{% + \ifglsentryexists{#2}% + {% + \@gls@link[#1]{#2}{#3}% + }{% + \PackageError{glossaries}{Glossary entry `#2' has not been + defined}{You need to define a glossary entry before you + can use it.}% +% \end{macrocode} +% Display the specified text. (The entry doesn't exist so +% there's nothing to link it to.) +% \begin{macrocode} + \glstextformat{#3}% + }% +} % \end{macrocode} %\end{macro} -% Define the un-starred version: %\begin{macro}{\@gls@link} %\changes{1.07}{2007 Sep 13}{fixed bug caused by \cs{theglsentrycounter} setting the page number too soon} %\changes{1.15}{2008 August 15}{added 'glslabel} % \begin{macrocode} -\newcommand*{\@gls@link}[3][]{% - \glsdoifexists{#2}% - {% +\def\@gls@link[#1]#2#3{% +% \end{macrocode} +%\changes{2.03}{2009 Sep 23}{Moved entry existance check to +% avoid } +%\changes{2.03}{2009 Sep 23}{added \cs{leavevmode}} +% Inserting \cs{leavevmode} suggested by Donald~Arseneau (avoids +% problem with tabularx). +% \begin{macrocode} + \leavevmode \def\glslabel{#2}% \def\@glsnumberformat{glsnumberformat}% \edef\@gls@counter{\csname glo@#2@counter\endcsname}% @@ -7092,7 +7229,6 @@ counter as its value}}{% \else \glstextformat{#3}\relax \fi - }% } % \end{macrocode} %\end{macro} @@ -7617,16 +7753,19 @@ counter as its value}}{% {\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. +% If \pkgopt{footnote} package option has been used and the glossary +% type is \cs{acronymtype}, suppress +% hyperlink for first use. Likewise if the \pkgopt[false]{hyperfirst} +% package option is used. %\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to %checking if footnote option has been used} +%\changes{2.03}{2009 Sep 23}{Added check for hyperfirst} % \begin{macrocode} \ifglsused{#2}{% \@gls@link[#1]{#2}{\@glo@text}% }{% - \ifthenelse{\equal{\@glo@type}{\acronymtype}\and - \boolean{glsacrfootnote}}{% + \ifthenelse{\(\equal{\@glo@type}{\acronymtype}\AND + \boolean{glsacrfootnote}\) \OR \NOT\boolean{glshyperfirst}}{% \@gls@link[#1,hyper=false]{#2}{\@glo@text}% }{% \@gls@link[#1]{#2}{\@glo@text}% @@ -7682,17 +7821,20 @@ counter as its value}}{% {\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. +% If \pkgopt{footnote} package option has been used and the glossary +% type is \cs{acronymtype}, suppress +% hyperlink for first use. Likewise if the \pkgopt[false]{hyperfirst} +% package option is used. %\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to %checking if footnote option has been used} +%\changes{2.03}{2009 Sep 23}{Added check for hyperfirst} % \begin{macrocode} \ifglsused{#2}{% \@gls@link[#1]{#2}{% \expandafter\makefirstuc\expandafter{\@glo@text}}% }{% - \ifthenelse{\equal{\@glo@type}{\acronymtype}\and - \boolean{glsacrfootnote}}{% + \ifthenelse{\(\equal{\@glo@type}{\acronymtype}\AND + \boolean{glsacrfootnote}\) \OR \NOT\boolean{glshyperfirst}}{% \@gls@link[#1,hyper=false]{#2}{% \expandafter\makefirstuc\expandafter{\@glo@text}}% }{% @@ -7747,16 +7889,19 @@ counter as its value}}{% {\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. +% If \pkgopt{footnote} package option has been used and the glossary +% type is \cs{acronymtype}, suppress +% hyperlink for first use. Likewise if the \pkgopt[false]{hyperfirst} +% package option is used. %\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to %checking if footnote option has been used} +%\changes{2.03}{2009 Sep 23}{Added check for hyperfirst} % \begin{macrocode} \ifglsused{#2}{% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% }{% - \ifthenelse{\equal{\@glo@type}{\acronymtype}\and - \boolean{glsacrfootnote}}{% + \ifthenelse{\(\equal{\@glo@type}{\acronymtype}\AND + \boolean{glsacrfootnote}\) \OR \NOT\boolean{glshyperfirst}}{% \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}% }{% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% @@ -7812,17 +7957,20 @@ counter as its value}}{% {\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. +% Call \cs{@gls@link}. +% If \pkgopt{footnote} package option has been used and the glossary +% type is \cs{acronymtype}, suppress +% hyperlink for first use. Likewise if the \pkgopt[false]{hyperfirst} +% package option is used. %\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to %checking if footnote option has been used} +%\changes{2.03}{2009 Sep 23}{Added check for hyperfirst} % \begin{macrocode} \ifglsused{#2}{% \@gls@link[#1]{#2}{\@glo@text}% }{% - \ifthenelse{\equal{\@glo@type}{\acronymtype}\and - \boolean{glsacrfootnote}}{% + \ifthenelse{\(\equal{\@glo@type}{\acronymtype}\AND + \boolean{glsacrfootnote}\) \OR \NOT\boolean{glshyperfirst}}{% \@gls@link[#1,hyper=false]{#2}{\@glo@text}% }{% \@gls@link[#1]{#2}{\@glo@text}% @@ -7881,18 +8029,21 @@ counter as its value}}{% {\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. +% Call \cs{@gls@link}. +% If \pkgopt{footnote} package option has been used and the glossary +% type is \cs{acronymtype}, suppress +% hyperlink for first use. Likewise if the \pkgopt[false]{hyperfirst} +% package option is used. %\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to %checking if footnote option has been used} +%\changes{2.03}{2009 Sep 23}{Added check for hyperfirst} % \begin{macrocode} \ifglsused{#2}{% \@gls@link[#1]{#2}{% \expandafter\makefirstuc\expandafter{\@glo@text}}% }{% - \ifthenelse{\equal{\@glo@type}{\acronymtype}\and - \boolean{glsacrfootnote}}{% + \ifthenelse{\(\equal{\@glo@type}{\acronymtype}\AND + \boolean{glsacrfootnote}\) \OR \NOT\boolean{glshyperfirst}}{% \@gls@link[#1,hyper=false]{#2}{% \expandafter\makefirstuc\expandafter{\@glo@text}}% }{% @@ -7950,17 +8101,20 @@ counter as its value}}{% {\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. +% Call \cs{@gls@link}. +% If \pkgopt{footnote} package option has been used and the glossary +% type is \cs{acronymtype}, suppress +% hyperlink for first use. Likewise if the \pkgopt[false]{hyperfirst} +% package option is used. %\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to %checking if footnote option has been used} +%\changes{2.03}{2009 Sep 23}{Added check for hyperfirst} % \begin{macrocode} \ifglsused{#2}{% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% }{% - \ifthenelse{\equal{\@glo@type}{\acronymtype}\and - \boolean{glsacrfootnote}}{% + \ifthenelse{\(\equal{\@glo@type}{\acronymtype}\AND + \boolean{glsacrfootnote}\) \OR \NOT\boolean{glshyperfirst}}{% \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}% }{% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% @@ -7997,52 +8151,57 @@ counter as its value}}{% %\begin{macro}{\@glsdisp} % \begin{macrocode} \newcommand*{\@glsdisp}[3][]{% - \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% + \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}% + \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}}{}}% - }% + \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. +% If \pkgopt{footnote} package option has been used and the glossary +% type is \cs{acronymtype}, suppress +% hyperlink for first use. Likewise if the \pkgopt[false]{hyperfirst} +% package option is used. %\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to %checking if footnote option has been used} +%\changes{2.03}{2009 Sep 23}{Added check for hyperfirst} % \begin{macrocode} - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{\@glo@text}% - }% - {% - \ifthenelse{\equal{\@glo@type}{\acronymtype}\and - \boolean{glsacrfootnote}}% + \ifglsused{#2}% {% - \@gls@link[#1,hyper=false]{#2}{\@glo@text}% + \@gls@link[#1]{#2}{\@glo@text}% }% {% - \@gls@link[#1]{#2}{\@glo@text}% + \ifthenelse{\(\equal{\@glo@type}{\acronymtype}\AND + \boolean{glsacrfootnote}\) \OR \NOT\boolean{glshyperfirst}}% + {% + \@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}}% + \glsunset{#2}}% + }% } % \end{macrocode} %\end{macro} @@ -9852,7 +10011,7 @@ using \string\makeglossary}}} % This is a convenience command to set \cs{@glossary}. % It is used by \cs{@makeglossary} and then redefined to % do nothing, as it only needs to be done once. -%\begin{macro}{@gls@renewglossary} +%\begin{macro}{\@gls@renewglossary} % \begin{macrocode} \newcommand{\@gls@renewglossary}{% \gdef\@glossary[##1]{\@bsphack\begingroup\@wrglossary{##1}}% @@ -11927,7 +12086,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \begin{macrocode} \ProvidesPackage{glossary-list}[2009/05/30 v2.01 (NLCT)] % \end{macrocode} -%\begin{macro}{list} +%\begin{style}{list} % The \glostyle{list} glossary style % uses the \envname{description} environment. The group separator % \ics{glsgroupskip} is redefined as \cs{indexspace} @@ -11967,9 +12126,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupskip}{\indexspace}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{listgroup} +%\begin{style}{listgroup} % The \glostyle{listgroup} style is like the \glostyle{list} % style, but the glossary groups have headings. %\changes{1.08}{2007 Oct 13}{changed listgroup style to use \cs{glsgetgrouptitle}} @@ -11984,9 +12143,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \begin{macrocode} \renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}} % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{listhypergroup} +%\begin{style}{listhypergroup} % The \glostyle{listhypergroup} style is like the \glostyle{listgroup} % style, but has a set of links to the groups at the % start of the glossary. @@ -12007,9 +12166,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupheading}[1]{% \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}} % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altlist} +%\begin{style}{altlist} % The \glostyle{altlist} glossary style is like the \glostyle{list} % style, but places the description on a new line. Sub-entries % follow in separate paragraphs without the sub-entry name. This @@ -12034,8 +12193,8 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \par\glstarget{##2}{\strut}##4\glspostdescription\space ##6}% } % \end{macrocode} -%\end{macro} -%\begin{macro}{altlistgroup} +%\end{style} +%\begin{style}{altlistgroup} % The \glostyle{altlistgroup} glossary style is like the % \glostyle{altlist} style, but the glossary groups have headings. %\changes{1.08}{2007 Oct 13}{changed altlistgroup style to use \cs{glsgetgrouptitle}} @@ -12050,9 +12209,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \begin{macrocode} \renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}} % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altlisthypergroup} +%\begin{style}{altlisthypergroup} % The \glostyle{altlisthypergroup} glossary style is like the % \glostyle{altlistgroup} style, but has a % set of links to the groups at the start of the glossary. @@ -12073,9 +12232,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupheading}[1]{% \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}} % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{listdotted} +%\begin{style}{listdotted} % The \glostyle{listdotted} glossary style was supplied by % Axel~Menzel. I've modified it slightly so that the distance from % the start of the name to the end of the dotted line is specified @@ -12103,7 +12262,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##4}% } % \end{macrocode} -%\end{macro} +%\end{style} %\begin{macro}{\glslistdottedwidth} %\changes{2.01}{2009 May 30}{changed \cs{linewidth} to \cs{hsize}} % \begin{macrocode} @@ -12112,7 +12271,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \end{macrocode} %\end{macro} % -%\begin{macro}{sublistdotted} +%\begin{style}{sublistdotted} % This style is similar to the glostyle{listdotted} style, except % that the main entries just have the name displayed. % \begin{macrocode} @@ -12128,7 +12287,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \item[\glstarget{##1}{##2}]}% } % \end{macrocode} -%\end{macro} +%\end{style} %\iffalse % \begin{macrocode} %</glossary-list.sty> @@ -12176,7 +12335,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \end{macrocode} %\end{macro} % -%\begin{macro}{long} +%\begin{style}{long} % The \glostyle{long} glossary style command which % uses the \envname{longtable} environment: % \begin{macrocode} @@ -12211,9 +12370,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupskip}{ & \\}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{longborder} +%\begin{style}{longborder} % The \glostyle{longborder} style is like the above, but with horizontal and % vertical lines: % \begin{macrocode} @@ -12234,9 +12393,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{longheader} +%\begin{style}{longheader} % The \glostyle{longheader} style is like the % \glostyle{long} style but with a header: % \begin{macrocode} @@ -12252,9 +12411,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \bfseries \entryname & \bfseries \descriptionname\\\endhead}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{longheaderborder} +%\begin{style}{longheaderborder} % The \glostyle{longheaderborder} style is % like the \glostyle{long} style but with a header and border: % \begin{macrocode} @@ -12272,9 +12431,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \hline\endfoot}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{long3col} +%\begin{style}{long3col} % The \glostyle{long3col} style is like \glostyle{long} but with 3 columns % \begin{macrocode} \newglossarystyle{long3col}{% @@ -12310,9 +12469,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupskip}{ & &\\}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{long3colborder} +%\begin{style}{long3colborder} % The \glostyle{long3colborder} style is like the % \glostyle{long3col} style but with a border: % \begin{macrocode} @@ -12334,9 +12493,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{long3colheader} +%\begin{style}{long3colheader} % The \glostyle{long3colheader} style is like \glostyle{long3col} but with a header row: % \begin{macrocode} \newglossarystyle{long3colheader}{% @@ -12352,9 +12511,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \bfseries\pagelistname\\\endhead}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{long3colheaderborder} +%\begin{style}{long3colheaderborder} % The \glostyle{long3colheaderborder} style is like the above but with a border % \begin{macrocode} \newglossarystyle{long3colheaderborder}{% @@ -12372,9 +12531,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \hline\endfoot}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{long4col} +%\begin{style}{long4col} % The \glostyle{long4col} style has four columns where the third % column contains the value of the associated \gloskey{symbol} key. % \begin{macrocode} @@ -12412,9 +12571,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupskip}{ & & &\\}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{long4colheader} +%\begin{style}{long4colheader} % The \glostyle{long4colheader} style is like \glostyle{long4col} % but with a header row. % \begin{macrocode} @@ -12432,9 +12591,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \bfseries\pagelistname\\\endhead}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{long4colborder} +%\begin{style}{long4colborder} % The \glostyle{long4colborder} style is like \glostyle{long4col} % but with a border. % \begin{macrocode} @@ -12456,9 +12615,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{long4colheaderborder} +%\begin{style}{long4colheaderborder} % The \glostyle{long4colheaderborder} style is like the above but % with a border. % \begin{macrocode} @@ -12483,9 +12642,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \bfseries\pagelistname\\\hline\endhead\hline\endfoot}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altlong4col} +%\begin{style}{altlong4col} % The \glostyle{altlong4col} style is like the \glostyle{long4col} % style but can have multiline descriptions and page lists. % \begin{macrocode} @@ -12503,9 +12662,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{longtable}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altlong4colheader} +%\begin{style}{altlong4colheader} % The \glostyle{altlong4colheader} style is like % \glostyle{altlong4col} but with a header row. % \begin{macrocode} @@ -12523,9 +12682,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{longtable}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altlong4colborder} +%\begin{style}{altlong4colborder} % The \glostyle{altlong4colborder} style is like % \glostyle{altlong4col} but with a border. % \begin{macrocode} @@ -12543,9 +12702,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{longtable}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altlong4colheaderborder} +%\begin{style}{altlong4colheaderborder} % The \glostyle{altlong4colheaderborder} style is like the above but % with a header as well as a border. % \begin{macrocode} @@ -12563,7 +12722,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{longtable}}% } % \end{macrocode} -%\end{macro} +%\end{style} %\iffalse % \begin{macrocode} %</glossary-long.sty> @@ -12612,7 +12771,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \end{macrocode} %\end{macro} % -%\begin{macro}{longragged} +%\begin{style}{longragged} % The \glostyle{longragged} glossary style is like the % \glostyle{long} but uses ragged right formatting for the % description column. @@ -12650,9 +12809,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupskip}{ & \tabularnewline}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{longraggedborder} +%\begin{style}{longraggedborder} % The \glostyle{longraggedborder} style is like the above, but with horizontal and % vertical lines: % \begin{macrocode} @@ -12674,9 +12833,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{longraggedheader} +%\begin{style}{longraggedheader} % The \glostyle{longraggedheader} style is like the % \glostyle{longragged} style but with a header: % \begin{macrocode} @@ -12693,9 +12852,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \tabularnewline\endhead}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{longraggedheaderborder} +%\begin{style}{longraggedheaderborder} % The \glostyle{longraggedheaderborder} style is % like the \glostyle{longragged} style but with a header and border: % \begin{macrocode} @@ -12714,9 +12873,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \hline\endfoot}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{longragged3col} +%\begin{style}{longragged3col} % The \glostyle{longragged3col} style is like \glostyle{longragged} but with 3 columns % \begin{macrocode} \newglossarystyle{longragged3col}{% @@ -12753,9 +12912,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupskip}{ & &\tabularnewline}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{longragged3colborder} +%\begin{style}{longragged3colborder} % The \glostyle{longragged3colborder} style is like the % \glostyle{longragged3col} style but with a border: % \begin{macrocode} @@ -12778,9 +12937,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{longragged3colheader} +%\begin{style}{longragged3colheader} % The \glostyle{longragged3colheader} style is like \glostyle{longragged3col} but with a header row: % \begin{macrocode} \newglossarystyle{longragged3colheader}{% @@ -12796,9 +12955,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \bfseries\pagelistname\tabularnewline\endhead}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{longragged3colheaderborder} +%\begin{style}{longragged3colheaderborder} % The \glostyle{longragged3colheaderborder} style is like the above but with a border % \begin{macrocode} \newglossarystyle{longragged3colheaderborder}{% @@ -12816,9 +12975,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \hline\endfoot}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altlongragged4col} +%\begin{style}{altlongragged4col} % The \glostyle{altlongragged4col} style is like the \glostyle{altlong4col} % style defined in the \isty{glossary-long} package, except that % ragged right formatting is used for the description and page list @@ -12860,9 +13019,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupskip}{ & & &\tabularnewline}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altlongragged4colheader} +%\begin{style}{altlongragged4colheader} % The \glostyle{altlongragged4colheader} style is like % \glostyle{altlongragged4col} but with a header row. % \begin{macrocode} @@ -12888,9 +13047,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \bfseries\pagelistname\tabularnewline\endhead}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altlongragged4colborder} +%\begin{style}{altlongragged4colborder} % The \glostyle{altlongragged4colborder} style is like % \glostyle{altlongragged4col} but with a border. % \begin{macrocode} @@ -12913,9 +13072,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altlongragged4colheaderborder} +%\begin{style}{altlongragged4colheaderborder} % The \glostyle{altlongragged4colheaderborder} style is like the above but % with a header as well as a border. % \begin{macrocode} @@ -12942,7 +13101,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \hline\endfoot}% } % \end{macrocode} -%\end{macro} +%\end{style} %\iffalse % \begin{macrocode} %</glossary-longragged.sty> @@ -12989,7 +13148,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \end{macrocode} %\end{macro} % -%\begin{macro}{super} +%\begin{style}{super} % The \glostyle{super} glossary style uses the % \envname{supertabular} environment % (it uses lengths defined in the \isty{glossary-long} package.) @@ -13029,9 +13188,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupskip}{ & \\}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{superborder} +%\begin{style}{superborder} % The \glostyle{superborder} style is like the above, but with % horizontal and vertical lines: % \begin{macrocode} @@ -13050,9 +13209,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{superheader} +%\begin{style}{superheader} % The \glostyle{superheader} style is like the % \glostyle{super} style, but with a header: % \begin{macrocode} @@ -13072,9 +13231,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{superheaderborder} +%\begin{style}{superheaderborder} % The \glostyle{superheaderborder} style is like % the \glostyle{super} style but with a header and border: % \begin{macrocode} @@ -13096,9 +13255,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{super3col} +%\begin{style}{super3col} % The \glostyle{super3col} style is like the \glostyle{super} % style, but with 3 columns: % \begin{macrocode} @@ -13137,9 +13296,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupskip}{ & &\\}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{super3colborder} +%\begin{style}{super3colborder} % The \glostyle{super3colborder} style is like the % \glostyle{super3col} style, but with a border: % \begin{macrocode} @@ -13158,9 +13317,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{super3colheader} +%\begin{style}{super3colheader} % The \glostyle{super3colheader} style is like % the \glostyle{super3col} style but with a header row: % \begin{macrocode} @@ -13180,9 +13339,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{super3colheaderborder} +%\begin{style}{super3colheaderborder} % The \glostyle{super3colheaderborder} style is like % the \glostyle{super3col} style but with a header and border: % \begin{macrocode} @@ -13205,9 +13364,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{super4col} +%\begin{style}{super4col} % The \glostyle{super4col} glossary style has four columns, % where the third column contains the value of the % corresponding \gloskey{symbol} key used when that entry @@ -13249,9 +13408,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupskip}{ & & &\\}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{super4colheader} +%\begin{style}{super4colheader} % The \glostyle{super4colheader} style is like % the \glostyle{super4col} but with a header row. % \begin{macrocode} @@ -13273,9 +13432,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{super4colborder} +%\begin{style}{super4colborder} % The \glostyle{super4colborder} style is like % the \glostyle{super4col} but with a border. % \begin{macrocode} @@ -13294,9 +13453,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{super4colheaderborder} +%\begin{style}{super4colheaderborder} % The \glostyle{super4colheaderborder} style is like % the \glostyle{super4col} but with a header and border. % \begin{macrocode} @@ -13318,9 +13477,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altsuper4col} +%\begin{style}{altsuper4col} % The \glostyle{altsuper4col} glossary style is like % \glostyle{super4col} but has provision for multiline descriptions. % \begin{macrocode} @@ -13339,9 +13498,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altsuper4colheader} +%\begin{style}{altsuper4colheader} % The \glostyle{altsuper4colheader} style is like % the \glostyle{altsuper4col} but with a header row. % \begin{macrocode} @@ -13362,9 +13521,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altsuper4colborder} +%\begin{style}{altsuper4colborder} % The \glostyle{altsuper4colborder} style is like % the \glostyle{altsuper4col} but with a border. % \begin{macrocode} @@ -13384,9 +13543,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altsuper4colheaderborder} +%\begin{style}{altsuper4colheaderborder} % The \glostyle{altsuper4colheaderborder} style is like % the \glostyle{altsuper4col} but with a header and border. % \begin{macrocode} @@ -13412,7 +13571,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} %\iffalse % \begin{macrocode} %</glossary-super.sty> @@ -13461,7 +13620,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \end{macrocode} %\end{macro} % -%\begin{macro}{superragged} +%\begin{style}{superragged} % The \glostyle{superragged} glossary style uses the % \envname{supertabular} environment. % \begin{macrocode} @@ -13502,9 +13661,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupskip}{ & \tabularnewline}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{superraggedborder} +%\begin{style}{superraggedborder} % The \glostyle{superraggedborder} style is like the above, but with % horizontal and vertical lines: % \begin{macrocode} @@ -13523,9 +13682,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{superraggedheader} +%\begin{style}{superraggedheader} % The \glostyle{superraggedheader} style is like the % \glostyle{super} style, but with a header: % \begin{macrocode} @@ -13546,9 +13705,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{superraggedheaderborder} +%\begin{style}{superraggedheaderborder} % The \glostyle{superraggedheaderborder} style is like % the \glostyle{superragged} style but with a header and border: % \begin{macrocode} @@ -13570,9 +13729,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{superragged3col} +%\begin{style}{superragged3col} % The \glostyle{superragged3col} style is like the \glostyle{superragged} % style, but with 3 columns: % \begin{macrocode} @@ -13612,9 +13771,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupskip}{ & &\tabularnewline}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{superragged3colborder} +%\begin{style}{superragged3colborder} % The \glostyle{superragged3colborder} style is like the % \glostyle{superragged3col} style, but with a border: % \begin{macrocode} @@ -13634,9 +13793,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{superragged3colheader} +%\begin{style}{superragged3colheader} % The \glostyle{superragged3colheader} style is like % the \glostyle{superragged3col} style but with a header row: % \begin{macrocode} @@ -13657,9 +13816,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{superraggedright3colheaderborder} +%\begin{style}{superraggedright3colheaderborder} % The \glostyle{superragged3colheaderborder} style is like % the \glostyle{superragged3col} style but with a header and border: % \begin{macrocode} @@ -13683,9 +13842,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altsuperragged4col} +%\begin{style}{altsuperragged4col} % The \glostyle{altsuperragged4col} glossary style is like % \glostyle{altsuper4col} style in the \isty{glossary-super} % package but uses ragged right formatting in the description @@ -13727,9 +13886,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupskip}{ & & &\tabularnewline}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altsuperragged4colheader} +%\begin{style}{altsuperragged4colheader} % The \glostyle{altsuperragged4colheader} style is like % the \glostyle{altsuperragged4col} style but with a header row. % \begin{macrocode} @@ -13751,9 +13910,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altsuperragged4colborder} +%\begin{style}{altsuperragged4colborder} % The \glostyle{altsuperragged4colborder} style is like % the \glostyle{altsuperragged4col} style but with a border. % \begin{macrocode} @@ -13774,9 +13933,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{altsuperragged4colheaderborder} +%\begin{style}{altsuperragged4colheaderborder} % The \glostyle{altsuperragged4colheaderborder} style is like % the \glostyle{altsuperragged4col} style but with a header and border. % \begin{macrocode} @@ -13803,7 +13962,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% {\end{supertabular}}% } % \end{macrocode} -%\end{macro} +%\end{style} %\iffalse % \begin{macrocode} %</glossary-superragged.sty> @@ -13822,7 +13981,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \ProvidesPackage{glossary-tree}[2009/01/14 v1.01 (NLCT)] % \end{macrocode} % -%\begin{macro}{index} +%\begin{style}{index} % The \glostyle{index} glossary style % is similar in style to the way indices are usually typeset % using \cs{item}, \cs{subitem} and \cs{subsubitem}. @@ -13892,9 +14051,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \begin{macrocode} \renewcommand*{\glsgroupskip}{\indexspace}} % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{indexgroup} +%\begin{style}{indexgroup} % The \glostyle{indexgroup} style is like the \glostyle{index} % style but has headings. % \begin{macrocode} @@ -13911,9 +14070,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \item\textbf{\glsgetgrouptitle{##1}}\indexspace}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{indexhypergroup} +%\begin{style}{indexhypergroup} % The \glostyle{indexhypergroup} style is like the % \glostyle{indexgroup} style but has hyper navigation. % \begin{macrocode} @@ -13936,9 +14095,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \indexspace}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{tree} +%\begin{style}{tree} % The \glostyle{tree} glossary style % is similar in style to the \glostyle{index} style, but % can have arbitrary levels. @@ -13993,9 +14152,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \begin{macrocode} \renewcommand*{\glsgroupskip}{\indexspace}} % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{treegroup} +%\begin{style}{treegroup} % Like the \glostyle{tree} style but the glossary groups have % headings. % \begin{macrocode} @@ -14011,9 +14170,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{treehypergroup} +%\begin{style}{treehypergroup} % The \glostyle{treehypergroup} style is like the \glostyle{treegroup} % style, but has a set of links to the groups at the % start of the glossary. @@ -14039,7 +14198,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \indexspace}% } % \end{macrocode} -%\end{macro} +%\end{style} % %\begin{macro}{\glstreeindent} % Length governing left indent for each level of the \glostyle{tree} @@ -14050,7 +14209,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \end{macrocode} %\end{macro} % -%\begin{macro}{treenoname} +%\begin{style}{treenoname} % The \glostyle{treenoname} glossary style % is like the \glostyle{tree} style, but % doesn't print the name or symbol for sub-levels. @@ -14101,9 +14260,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupskip}{\indexspace}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{treenonamegroup} +%\begin{style}{treenonamegroup} % Like the \glostyle{treenoname} style but the glossary groups have % headings. % \begin{macrocode} @@ -14119,9 +14278,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{treenonamehypergroup} +%\begin{style}{treenonamehypergroup} % The \glostyle{treenonamehypergroup} style is like the \glostyle{treenonamegroup} % style, but has a set of links to the groups at the % start of the glossary. @@ -14147,7 +14306,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \indexspace}% } % \end{macrocode} -%\end{macro} +%\end{style} % %\begin{macro}{\glssetwidest} % \cs{glssetwidest}\oarg{level}\marg{text} sets the widest @@ -14168,7 +14327,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \end{macrocode} %\end{macro} % -%\begin{macro}{alttree} +%\begin{style}{alttree} % The \glostyle{alttree} glossary style % is similar in style to the \glostyle{tree} style, but % the indentation is obtained from the width of @@ -14314,9 +14473,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupskip}{\indexspace}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{alttreegroup} +%\begin{style}{alttreegroup} % Like the \glostyle{alttree} style but the glossary groups have % headings. % \begin{macrocode} @@ -14335,9 +14494,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \textbf{\glsgetgrouptitle{##1}}\par\indexspace}% } % \end{macrocode} -%\end{macro} +%\end{style} % -%\begin{macro}{alttreehypergroup} +%\begin{style}{alttreehypergroup} % The \glostyle{alttreehypergroup} style is like the % \glostyle{alttreegroup} style, but has a set of links to the % groups at the start of the glossary. @@ -14367,7 +14526,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par \indexspace}} % \end{macrocode} -%\end{macro} +%\end{style} % %\iffalse % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins index c02ce0f12ea..ec6ed3a5306 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/7/13 14:13 +% glossaries.ins generated using makedtx version 0.94b 2009/9/24 16:55 \input docstrip \preamble |