diff options
| author | Karl Berry <karl@freefriends.org> | 2008-03-10 00:06:45 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2008-03-10 00:06:45 +0000 |
| commit | 11ac15c4cffc0e2fc7483cbfb12df95486027c39 (patch) | |
| tree | 09ef077e1f27d0f859b4bf4da9fff02f041c4641 /Master | |
| parent | 6334e64f786e98ab10d13c8ef58e72e9dc461b4b (diff) | |
glossaries 1.12 (9mar08)
git-svn-id: svn://tug.org/texlive/trunk@6924 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
28 files changed, 2166 insertions, 1288 deletions
diff --git a/Master/texmf-dist/doc/latex/glossaries/CHANGES b/Master/texmf-dist/doc/latex/glossaries/CHANGES index c54ec6c055a..7b3154dacee 100644 --- a/Master/texmf-dist/doc/latex/glossaries/CHANGES +++ b/Master/texmf-dist/doc/latex/glossaries/CHANGES @@ -1,5 +1,36 @@ glossaries change log: +v1.12 (8 March 2008): + * Fixed bug that causes \glspl to print the plural short form + on first use instead of the plural long form. + + * Added descriptionplural and symbolplural keys. + + * Added \glsshortkey, \glsshortpluralkey, \glslongkey and + \glslongpluralkey. + + * Fixed bugs in \glsname, \glstext, \glsdesc etc. + + * Added a check for \hypertarget in addition to checking + for \hyperlink (in the event that \hyperlink is defined + but not \hypertarget). + + * Changed #! line in makeglossaries to use /usr/bin/env + + * Added package mfirstuc.sty which provides the command + \makefirstuc{<stuff>} which makes the first object of + <stuff> uppercase unless <stuff> starts with a control + sequence followed by a group, in which case the first + object in the group is converted to uppercase. Examples: + + \makefirstuc{abc} -> Abc + \makefirstuc{\emph{abc}} -> \emph{Abc} + \makefirstuc{{\'a}bc} -> {\'A}bc + \makefirstuc{\ae bc} -> \AE bc + \makefirstuc{{\ae}bc} -> {\AE}bc + + (but don't do \makefirstuc{\ae{}bc} which produces \ae Bc.) + v1.11 (2 March 2008): * Fixed error in manual (glossary style is set using \glossarystyle not \setglossarystyle). diff --git a/Master/texmf-dist/doc/latex/glossaries/INSTALL b/Master/texmf-dist/doc/latex/glossaries/INSTALL index 054c8ab7a25..60085abb76f 100644 --- a/Master/texmf-dist/doc/latex/glossaries/INSTALL +++ b/Master/texmf-dist/doc/latex/glossaries/INSTALL @@ -76,15 +76,13 @@ Move the sample files (*.tex) to TEXMF/doc/latex/glossaries/sample/ Move the documentation (*.pdf) to TEXMF/doc/latex/glossaries/
-Move glossaries.sty to TEXMF/tex/latex/glossaries/base/
+Move glossaries.sty and mfirstuc.sty to TEXMF/tex/latex/glossaries/base/
Move the other style files (*.sty) to TEXMF/tex/latex/glossaries/styles/
Move the dictionary files (*.dic) to TEXMF/tex/latex/glossaries/dict/
-Move makeglossaries to somewhere on your path, e.g. /usr/bin/. You
-may need to edit the first line of makeglossaries if perl is
-located somewhere other than /usr/bin/.
+Move makeglossaries to somewhere on your path, e.g. /usr/bin/.
If you are a Windows user, you will also need to move makeglossaries.bat
to the same location as makeglossaries, but you will need to have
diff --git a/Master/texmf-dist/doc/latex/glossaries/README b/Master/texmf-dist/doc/latex/glossaries/README index a03181fb5f6..fcf56417811 100644 --- a/Master/texmf-dist/doc/latex/glossaries/README +++ b/Master/texmf-dist/doc/latex/glossaries/README @@ -1,6 +1,6 @@ -LaTeX Package : glossaries v 1.11
+LaTeX Package : glossaries v 1.12
-Last Modified : 2 March 2008
+Last Modified : 8 March 2008
Author : Nicola Talbot
@@ -15,6 +15,20 @@ to the relevant glossary. *This package replaces the glossary package which is now obsolete.*
+The glossaries bundle also includes mfirstuc.sty which provides
+\makefirstuc{<stuff>} which makes the first object of
+<stuff> uppercase unless <stuff> starts with a control
+sequence followed by a group, in which case the first
+object in the group is converted to uppercase. Examples:
+
+ \makefirstuc{abc} -> Abc
+ \makefirstuc{\emph{abc}} -> \emph{Abc}
+ \makefirstuc{{\'a}bc} -> {\'A}bc
+ \makefirstuc{\ae bc} -> \AE bc
+ \makefirstuc{{\ae}bc} -> {\AE}bc
+
+(but don't do \makefirstuc{\ae{}bc} which produces \ae Bc.)
+
INSTALLATION
See INSTALL file for installation instructions.
diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.html b/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.html index d442c01dab1..ba1371b0e38 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.html +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.html @@ -7,8 +7,8 @@ original version by: Nikos Drakos, CBLU, University of Leeds Jens Lippmann, Marek Rouchal, Martin Wilck and others --> <HTML> <HEAD> -<TITLE>glossaries.sty v 1.11: LaTeX2e Package to Assist Generating Glossaries</TITLE> -<META NAME="description" CONTENT="glossaries.sty v 1.11: LaTeX2e Package to Assist Generating Glossaries"> +<TITLE>glossaries.sty v 1.12: LaTeX2e Package to Assist Generating Glossaries</TITLE> +<META NAME="description" CONTENT="glossaries.sty v 1.12: LaTeX2e Package to Assist Generating Glossaries"> <META NAME="keywords" CONTENT="glossaries-manual"> <META NAME="resource-type" CONTENT="document"> <META NAME="distribution" CONTENT="global"> @@ -27,7 +27,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds <P> - <H1 ALIGN="CENTER">glossaries.sty v 1.11: LaTeX2e Package to Assist Generating Glossaries</H1> + <H1 ALIGN="CENTER">glossaries.sty v 1.12: LaTeX2e Package to Assist Generating Glossaries</H1> <P ALIGN="CENTER"><STRONG>Nicola L.C. Talbot <BR> <BR> @@ -40,7 +40,7 @@ Norwich. Norfolk NR4 7TJ. United Kingdom. <BR><TT><A NAME="tex2html1" HREF="http://theoval.cmp.uea.ac.uk/~nlct/">http://theoval.cmp.uea.ac.uk/~nlct/</A></TT></STRONG></P> -<P ALIGN="CENTER"><STRONG>2nd March 2008</STRONG></P> +<P ALIGN="CENTER"><STRONG>8th March 2008</STRONG></P> <BR> <H2><A NAME="SECTION00010000000000000000"> @@ -49,46 +49,48 @@ Contents</A> <!--Table of Contents--> <UL> -<LI><A NAME="tex2html34" +<LI><A NAME="tex2html35" HREF="glossaries-manual.html#SECTION00020000000000000000">Introduction</A> <UL> -<LI><A NAME="tex2html35" - HREF="glossaries-manual.html#SECTION00021000000000000000">Generating the associated glossary files</A> <LI><A NAME="tex2html36" + HREF="glossaries-manual.html#SECTION00021000000000000000">Generating the associated glossary files</A> +<LI><A NAME="tex2html37" HREF="glossaries-manual.html#SECTION00022000000000000000">Troubleshooting</A> </UL> <BR> -<LI><A NAME="tex2html37" - HREF="glossaries-manual.html#SECTION00030000000000000000">A Quick Guide For The Impatient</A> <LI><A NAME="tex2html38" + HREF="glossaries-manual.html#SECTION00030000000000000000">A Quick Guide For The Impatient</A> +<LI><A NAME="tex2html39" HREF="glossaries-manual.html#SECTION00040000000000000000">Overview</A> <UL> -<LI><A NAME="tex2html39" - HREF="glossaries-manual.html#SECTION00041000000000000000">Package Options</A> <LI><A NAME="tex2html40" - HREF="glossaries-manual.html#SECTION00042000000000000000">Defining Glossary Entries</A> + HREF="glossaries-manual.html#SECTION00041000000000000000">Package Options</A> <LI><A NAME="tex2html41" - HREF="glossaries-manual.html#SECTION00043000000000000000">Number lists</A> + HREF="glossaries-manual.html#SECTION00042000000000000000">Defining Glossary Entries</A> <LI><A NAME="tex2html42" - HREF="glossaries-manual.html#SECTION00044000000000000000">Links to Glossary Entries</A> + HREF="glossaries-manual.html#SECTION00043000000000000000">Number lists</A> <LI><A NAME="tex2html43" - HREF="glossaries-manual.html#SECTION00045000000000000000">Adding an entry to the glossary without generating text</A> + HREF="glossaries-manual.html#SECTION00044000000000000000">Links to Glossary Entries</A> <LI><A NAME="tex2html44" - HREF="glossaries-manual.html#SECTION00046000000000000000">Displaying a glossary</A> + HREF="glossaries-manual.html#SECTION00045000000000000000">Adding an entry to the glossary without generating text</A> <LI><A NAME="tex2html45" - HREF="glossaries-manual.html#SECTION00047000000000000000">Defining New Glossaries</A> + HREF="glossaries-manual.html#SECTION00046000000000000000">Displaying a glossary</A> <LI><A NAME="tex2html46" - HREF="glossaries-manual.html#SECTION00048000000000000000">Acronyms</A> + HREF="glossaries-manual.html#SECTION00047000000000000000">Defining New Glossaries</A> <LI><A NAME="tex2html47" - HREF="glossaries-manual.html#SECTION00049000000000000000">Unsetting and resetting entry flags</A> + HREF="glossaries-manual.html#SECTION00048000000000000000">Acronyms</A> <LI><A NAME="tex2html48" - HREF="glossaries-manual.html#SECTION000410000000000000000">Glossary Styles</A> + HREF="glossaries-manual.html#SECTION00049000000000000000">Unsetting and resetting entry flags</A> <LI><A NAME="tex2html49" + HREF="glossaries-manual.html#SECTION000410000000000000000">Glossary Styles</A> +<LI><A NAME="tex2html50" HREF="glossaries-manual.html#SECTION000411000000000000000">Defining your own glossary style</A> </UL> <BR> -<LI><A NAME="tex2html50" - HREF="glossaries-manual.html#SECTION00050000000000000000">Index</A> +<LI><A NAME="tex2html51" + HREF="glossaries-manual.html#SECTION00050000000000000000">Mfirstuc Package</A> +<LI><A NAME="tex2html52" + HREF="glossaries-manual.html#SECTION00060000000000000000">Index</A> </UL> <!--End of Table of Contents--> <P> @@ -105,28 +107,32 @@ It also supports acronyms and glossary styles that include symbols (in addition to a name and description) for glossary entries. There is provision for loading a database of glossary terms where only those terms used in the text are added to the glossary. -This package replaces the <TT>glossary</TT><A NAME="1800"></A> package which is now +This package replaces the <TT>glossary</TT><A NAME="1873"></A> package which is now obsolete. <P> As from version 1.08, the <TT>glossaries</TT> package now has limited multi-lingual support, thanks to all the people who have sent me the relevant translations either via email or via comp.text.tex. -However you must load <TT>babel</TT><A NAME="1804"></A> <I>before</I> +However you must load <TT>babel</TT><A NAME="1877"></A> <I>before</I> <TT>glossaries</TT> to enable this. As from version 1.1, the <TT>glossaries</TT> package also supports -Till Tantau's <TT>translator</TT><A NAME="1810"></A> package provided it is loaded +Till Tantau's <TT>translator</TT><A NAME="1883"></A> package provided it is loaded before the <TT>glossaries</TT> package. This makes it easier to change the default translations or add new dictionaries. If you don't want to use the predefined translations, you can use the -package option <TT>translate=false</TT><A NAME="1821"></A> and supply your own translations. +package option <TT>translate=false</TT><A NAME="1894"></A> and supply your own translations. <P> This documentation is structured as follows: <A HREF="glossaries-manual.html#sec:quick">A Quick Guide For The Impatient</A> is for people who want a few quick pointers of how to get started, without having to read through lengthy descriptions, -and <A HREF="glossaries-manual.html#sec:overview">Overview</A> gives an overview of available commands -and their syntax. +<A HREF="glossaries-manual.html#sec:overview">Overview</A> gives an overview of available commands +and their syntax and +<A HREF="glossaries-manual.html#sec:mfirstuc">Mfirstuc</A> describes the associated +<TT>mfirstuc</TT> +package. + <P> <A HREF="glossaries-manual.html#top">Top</A> @@ -140,9 +146,9 @@ Generating the associated glossary files <P> The <TT>glossaries</TT> package comes with the Perl script -<TT>makeglossaries</TT><A NAME="1827"></A> which will run <TT>makeindex</TT><A NAME="1830"></A> on -all the glossary files using a customized <TT>makeindex</TT><A NAME="1833"></A> -<TT>.ist</TT><A NAME="1836"></A> style file (which is created by <TT>\makeglossaries</TT><A NAME="1838"></A>). +<TT>makeglossaries</TT><A NAME="1901"></A> which will run <TT>makeindex</TT><A NAME="1904"></A> on +all the glossary files using a customized <TT>makeindex</TT><A NAME="1907"></A> +<TT>.ist</TT><A NAME="1910"></A> style file (which is created by <TT>\makeglossaries</TT><A NAME="1912"></A>). The relevant extensions are obtained from the auxiliary file, so you should only pass the basename as the argument. For example, if your document is called @@ -152,7 +158,7 @@ latex myfile makeglossaries myfile latex myfile </PRE> -You may need to explicitly load <TT>makeglossaries</TT><A NAME="1841"></A> into +You may need to explicitly load <TT>makeglossaries</TT><A NAME="1915"></A> into Perl: <PRE> perl makeglossaries myfile @@ -162,8 +168,8 @@ does this for Windows users. <P> If you don't have Perl installed, you will have to run -<TT>makeindex</TT><A NAME="1844"></A> for each glossary type you have defined. -For example, if you have used the <TT>acronym</TT><A NAME="1852"></A> package option +<TT>makeindex</TT><A NAME="1918"></A> for each glossary type you have defined. +For example, if you have used the <TT>acronym</TT><A NAME="1926"></A> package option then you will have both a main glossary as well as a list of acronyms, so you will need to do (assuming your document is called <TT>myfile.tex</TT>): <PRE> @@ -172,14 +178,14 @@ makeindex -s myfile.ist -t myfile.alg -o myfile.acr myfile.acn </PRE> This requires remembering all extensions for each of the glossaries defined in your document, so where possible you should use -<TT>makeglossaries</TT><A NAME="1856"></A> instead to reduce the possibility of error. +<TT>makeglossaries</TT><A NAME="1930"></A> instead to reduce the possibility of error. Don't pass all the glossary files in a single call to -<TT>makeindex</TT><A NAME="1859"></A> or it will merge all your glossaries into a +<TT>makeindex</TT><A NAME="1933"></A> or it will merge all your glossaries into a single glossary. <P> If any problems occur, remember to check the transcript files -(e.g. <TT>.glg</TT><A NAME="1862"></A> or <TT>.alg</TT><A NAME="1864"></A>) for messages. +(e.g. <TT>.glg</TT><A NAME="1936"></A> or <TT>.alg</TT><A NAME="1938"></A>) for messages. <P> <A HREF="glossaries-manual.html#top">Top</A> @@ -221,12 +227,12 @@ lengthy descriptions. <P> <OL> -<LI>Load <TT>glossaries</TT> <I>after</I> <TT>hyperref</TT><A NAME="1874"></A>: +<LI>Load <TT>glossaries</TT> <I>after</I> <TT>hyperref</TT><A NAME="1948"></A>: <PRE> \usepackage{hyperref} \usepackage{glossaries} </PRE> -Similarly for the <TT>html</TT><A NAME="1877"></A> package: +Similarly for the <TT>html</TT><A NAME="1951"></A> package: <PRE> \usepackage{html} \usepackage{glossaries} @@ -234,19 +240,19 @@ Similarly for the <TT>html</TT><A NAME="1877"></A> package: <P> </LI> -<LI>Always use <TT>\makeglossaries</TT><A NAME="1880"></A> if you want the glossary +<LI>Always use <TT>\makeglossaries</TT><A NAME="1954"></A> if you want the glossary entries to be written to the glossary file: <PRE> \documentclass{article} \usepackage{glossaries} \makeglossaries </PRE> -If you don't use <TT>\makeglossaries</TT><A NAME="1883"></A>, your glossaries will +If you don't use <TT>\makeglossaries</TT><A NAME="1957"></A>, your glossaries will not appear in the document! <P> </LI> -<LI>Use <TT>\printglossaries</TT><A NAME="1886"></A> to make your glossaries appear +<LI>Use <TT>\printglossaries</TT><A NAME="1960"></A> to make your glossaries appear in the document at that point. For example: <PRE> \maketitle @@ -259,13 +265,13 @@ document text will appear in the glossary. <P> </LI> <LI>When you have created your document, run LaTeX on it, -then the Perl script <TT>makeglossaries</TT><A NAME="1889"></A>, then run LaTeX on it again: +then the Perl script <TT>makeglossaries</TT><A NAME="1963"></A>, then run LaTeX on it again: <PRE> latex myfile makeglossaries myfile latex myfile </PRE> -(You may need to run LaTeX again if you have used the <TT>toc</TT><A NAME="1897"></A> +(You may need to run LaTeX again if you have used the <TT>toc</TT><A NAME="1971"></A> package option.) If you use Windows, there is a batch file called <TT>makeglossaries.bat</TT> which you can use, but you will @@ -275,23 +281,23 @@ still need Perl installed. </LI> <LI>New glossaries can be defined using: <P> -<TT>\newglossary</TT><A NAME="1901"></A><TT>[</TT><EM>log-ext</EM><TT>]{</TT><EM>label</EM><TT>}{</TT><EM>in-ext</EM><TT>}{</TT><EM>out-ext</EM><TT>}{</TT><EM>title</EM><TT>}</TT> +<TT>\newglossary</TT><A NAME="1975"></A><TT>[</TT><EM>log-ext</EM><TT>]{</TT><EM>label</EM><TT>}{</TT><EM>in-ext</EM><TT>}{</TT><EM>out-ext</EM><TT>}{</TT><EM>title</EM><TT>}</TT> <P> where <I>label</I> is an identifying label, <I>in-ext</I> is the extension of the file to be created -by <TT>makeindex</TT><A NAME="1904"></A> (called by <TT>makeglossaries</TT><A NAME="1907"></A>), +by <TT>makeindex</TT><A NAME="1978"></A> (called by <TT>makeglossaries</TT><A NAME="1981"></A>), <I>out-ext</I> is the extension of the file to be read by -<TT>makeindex</TT><A NAME="1910"></A> and <I>title</I> is the title for this +<TT>makeindex</TT><A NAME="1984"></A> and <I>title</I> is the title for this new glossary. The first optional argument <I>log-ext</I> specifies -the extension of the <TT>makeindex</TT><A NAME="1913"></A> transcript file. Example: +the extension of the <TT>makeindex</TT><A NAME="1987"></A> transcript file. Example: <PRE> \newglossary[nlg]{notation}{not}{ntn}{Notation} </PRE> This glossary's label is <TT>notation</TT> and its title -will be Notation. If you use <TT>makeglossaries</TT><A NAME="1916"></A>, the -<TT>makeindex</TT><A NAME="1919"></A> transcript will be written to a file with the -extension <TT>.nlg</TT><A NAME="1922"></A>. If <I>log-ext</I> is omitted, the extension -<TT>.glg</TT><A NAME="1924"></A> will be used. +will be Notation. If you use <TT>makeglossaries</TT><A NAME="1990"></A>, the +<TT>makeindex</TT><A NAME="1993"></A> transcript will be written to a file with the +extension <TT>.nlg</TT><A NAME="1996"></A>. If <I>log-ext</I> is omitted, the extension +<TT>.glg</TT><A NAME="1998"></A> will be used. <P> </LI> @@ -306,7 +312,7 @@ extension <TT>.nlg</TT><A NAME="1922"></A>. If <I>log-ext</I> is omitted, the ex <P> </LI> -<LI>If you use the <TT>acronym</TT><A NAME="1931"></A> package option, the +<LI>If you use the <TT>acronym</TT><A NAME="2005"></A> package option, the <TT>glossaries</TT> package will automatically create a new glossary type labelled <TT>acronym</TT>: @@ -317,8 +323,8 @@ will automatically create a new glossary type labelled <P> </LI> <LI>If your pages have a hyphen compositor (i.e. your page -numbers appear in the form 2-1), redefine <TT>\glscompositor</TT><A NAME="1936"></A> -<I>before</I> <TT>\makeglossaries</TT><A NAME="1939"></A>: +numbers appear in the form 2-1), redefine <TT>\glscompositor</TT><A NAME="2010"></A> +<I>before</I> <TT>\makeglossaries</TT><A NAME="2013"></A>: <PRE> \documentclass{article} \usepackage{glossaries} @@ -329,7 +335,7 @@ numbers appear in the form 2-1), redefine <TT>\glscompositor</TT><A NAME="19 <P> </LI> <LI>To add the glossaries to the table of contents use the -<TT>toc</TT><A NAME="1947"></A> package option: +<TT>toc</TT><A NAME="2021"></A> package option: <PRE> \usepackage[toc]{glossaries} </PRE> @@ -338,10 +344,10 @@ numbers appear in the form 2-1), redefine <TT>\glscompositor</TT><A NAME="19 </LI> <LI>Define a new entry with: <P> -<TT>\newglossaryentry</TT><A NAME="1951"></A><TT>{</TT><EM>label</EM><TT>}{</TT><EM>key-val list</EM><TT>}</TT> +<TT>\newglossaryentry</TT><A NAME="2025"></A><TT>{</TT><EM>label</EM><TT>}{</TT><EM>key-val list</EM><TT>}</TT> <P> -The <I>key-val list</I> must at least contain a <TT>name</TT><A NAME="1954"></A> -key and a <TT>description</TT><A NAME="1957"></A> key. +The <I>key-val list</I> must at least contain a <TT>name</TT><A NAME="2028"></A> +key and a <TT>description</TT><A NAME="2031"></A> key. For example: <PRE> \newglossaryentry{perl}{name=Perl, @@ -355,15 +361,21 @@ to use to identify it. </LI> <LI>If the entry name starts with an accented letter, you will need to group the first letter (otherwise it will cause a -problem for <TT>\Gls</TT><A NAME="1960"></A> and <TT>\Glspl</TT><A NAME="1963"></A>): +problem for <TT>\Gls</TT><A NAME="2034"></A> and <TT>\Glspl</TT><A NAME="2037"></A>): <PRE> \newglossaryentry{elite}{name={{\'e}lite}, description={select group or class}} </PRE> +Likewise with commands such as <TT>\ae</TT> and <TT>\oe</TT>: +<PRE> +\newglossaryentry{oesophagus}{% +name={{\oe}sophagus}, +description={canal from mouth to stomach}} +</PRE> <P> </LI> -<LI>If you have multiple glossaries, use the <TT>type</TT><A NAME="1966"></A> +<LI>If you have multiple glossaries, use the <TT>type</TT><A NAME="2040"></A> key to specify in which glossary the entry belongs. For example: <PRE> \newglossary{languages}{lan}{lng}{Index of Languages} @@ -374,7 +386,7 @@ key to specify in which glossary the entry belongs. For example: description=A scripting language, type=languages} </PRE> -If <TT>type</TT><A NAME="1969"></A> is omitted, the default glossary is used. +If <TT>type</TT><A NAME="2043"></A> is omitted, the default glossary is used. <P> </LI> @@ -390,7 +402,7 @@ description={A list of individual pages or page ranges </LI> <LI>Plural forms are assumed to be the singular form with an "s" appended, unless otherwise specified. To specify an -irregular plural, use the <TT>plural</TT><A NAME="1972"></A> key. For example: +irregular plural, use the <TT>plural</TT><A NAME="2046"></A> key. For example: <PRE> \newglossaryentry{matrix}{name=matrix, description=rectangular array of quantities, @@ -430,7 +442,7 @@ and subsequently appears as "SM" or "SMs". </LI> <LI>The quick and easy way to define an acronym is to use: <P> -<TT>\newacronym</TT><A NAME="1975"></A><TT>[</TT><EM>key-val list</EM><TT>]{</TT><EM>label</EM><TT>}{</TT><EM>abbrev</EM><TT>}{</TT><EM>long</EM><TT>}</TT> +<TT>\newacronym</TT><A NAME="2049"></A><TT>[</TT><EM>key-val list</EM><TT>]{</TT><EM>label</EM><TT>}{</TT><EM>abbrev</EM><TT>}{</TT><EM>long</EM><TT>}</TT> <P> For example: <PRE> @@ -446,30 +458,30 @@ first={support vector machine (SVM)}, plural={SVMs}, firstplural={support vector machines (SVMs)}} </PRE> -(The value of <TT>\acronymtype</TT><A NAME="1978"></A> varies depending on whether -the <TT>acronym</TT><A NAME="1986"></A> package option is used or not. +(The value of <TT>\acronymtype</TT><A NAME="2052"></A> varies depending on whether +the <TT>acronym</TT><A NAME="2060"></A> package option is used or not. The optional argument <I>key-val list</I> can be used to -override any of the <TT>\newglossaryentry</TT><A NAME="1990"></A> keys; for +override any of the <TT>\newglossaryentry</TT><A NAME="2064"></A> keys; for example, if the acronym has an irregular plural.) <P> </LI> <LI>The font used to display the entry name in the glossary -is governed by <TT>\glsnamefont</TT><A NAME="1993"></A>. This can be redefined +is governed by <TT>\glsnamefont</TT><A NAME="2067"></A>. This can be redefined as required. For example, to make the entry names appear in a medium sans-serif font do: <PRE> \renewcommand{\glsnamefont}[1]{\textsf{\mdseries #1}} </PRE> Note that the list-like glossary styles defined in the -<TT>glossary-list</TT><A NAME="1996"></A> package place the entry name in -the optional argument to <TT>\item</TT><A NAME="1999"></A>, so they will -appear in bold, unless you redefine <TT>\glsnamefont</TT><A NAME="2002"></A> to counteract the +<TT>glossary-list</TT><A NAME="2070"></A> package place the entry name in +the optional argument to <TT>\item</TT><A NAME="2073"></A>, so they will +appear in bold, unless you redefine <TT>\glsnamefont</TT><A NAME="2076"></A> to counteract the bold font. <P> </LI> -<LI>In the document use <TT>\gls</TT><A NAME="2005"></A><TT>{</TT><EM>label</EM><TT>}</TT> +<LI>In the document use <TT>\gls</TT><A NAME="2079"></A><TT>{</TT><EM>label</EM><TT>}</TT> to use a predefined term (this will also enter the term into the associated glossary output file). For example: <PRE> @@ -481,21 +493,21 @@ A \gls{singmtx} is a matrix with a zero determinant. <LI>Other variations: <UL> -<LI><TT>\Gls</TT><A NAME="2008"></A><TT>{</TT><EM>label</EM><TT>}</TT> : like <TT>\gls</TT>, +<LI><TT>\Gls</TT><A NAME="2082"></A><TT>{</TT><EM>label</EM><TT>}</TT> : like <TT>\gls</TT>, but with first letter in upper case </LI> -<LI><TT>\GLS</TT><A NAME="2011"></A><TT>{</TT><EM>label</EM><TT>}</TT> : like <TT>\gls</TT>, +<LI><TT>\GLS</TT><A NAME="2085"></A><TT>{</TT><EM>label</EM><TT>}</TT> : like <TT>\gls</TT>, but all upper case. </LI> -<LI><TT>\glspl</TT><A NAME="2014"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural +<LI><TT>\glspl</TT><A NAME="2088"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural </LI> -<LI><TT>\Glspl</TT><A NAME="2017"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural with +<LI><TT>\Glspl</TT><A NAME="2091"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural with first letter in upper case </LI> -<LI><TT>\GLSpl</TT><A NAME="2020"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural but +<LI><TT>\GLSpl</TT><A NAME="2094"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural but all upper case </LI> -<LI><TT>\glslink</TT><A NAME="2023"></A><TT>{</TT><EM>label</EM><TT>}{</TT><EM>link text</EM><TT>}</TT> : +<LI><TT>\glslink</TT><A NAME="2097"></A><TT>{</TT><EM>label</EM><TT>}{</TT><EM>link text</EM><TT>}</TT> : use <I>link text</I> to link to the given entry in the glossary. </LI> </UL> @@ -516,8 +528,8 @@ The \gls{singmtx}['s] dimensions \ldots <P> </LI> <LI>The format of the associated entry number can be -changed using the <TT>format</TT><A NAME="2026"></A> key in the optional argument. -Note that the value of the <TT>format</TT><A NAME="2029"></A> key should be the +changed using the <TT>format</TT><A NAME="2100"></A> key in the optional argument. +Note that the value of the <TT>format</TT><A NAME="2103"></A> key should be the name of a command <I>without</I> the initial backslash. For example: <PRE> @@ -533,23 +545,23 @@ it will no longer have a hyperlink (if hyperlinks are enabled.) change the font whilst ensuring that the number remains a hyperlink. These are of the form <TT>\hyper</TT><I>xx</I> and are equivalent to the standard font changing commands of the -form <TT>\text</TT><I>xx</I>, as well as <TT>\hyperemph</TT><A NAME="2033"></A> -(which uses <TT>\emph</TT><A NAME="2036"></A>.) For example: +form <TT>\text</TT><I>xx</I>, as well as <TT>\hyperemph</TT><A NAME="2107"></A> +(which uses <TT>\emph</TT><A NAME="2110"></A>.) For example: <PRE> The primary definition of \glspl[format=hyperbf]{singmtx}. </PRE> <P> </LI> -<LI>Don't use declarations in <TT>format</TT><A NAME="2039"></A> as this can +<LI>Don't use declarations in <TT>format</TT><A NAME="2113"></A> as this can cause unpredictable results, as there is no guarantee that the effect will be localised to the required text. <P> </LI> <LI>Entries can be added to the glossary without producing -any text using <TT>\glsadd</TT><A NAME="2042"></A><TT>{</TT><EM>label</EM><TT>}</TT> or -<TT>\glsaddall</TT><A NAME="2045"></A>. These commands also taken an optional +any text using <TT>\glsadd</TT><A NAME="2116"></A><TT>{</TT><EM>label</EM><TT>}</TT> or +<TT>\glsaddall</TT><A NAME="2119"></A>. These commands also taken an optional argument where you can specify the format. For example <PRE> \glsadd[format=hyperbf]{singmtx} @@ -563,7 +575,7 @@ any text where the command occurs. <LI>A number range can be entered using <code>format=(</code> and <code>format=)</code> to mark the beginning and ending of the range<A NAME="tex2html4" - HREF="#foot370"><SUP>1</SUP></A>. For example: + HREF="#foot378"><SUP>1</SUP></A>. For example: <PRE> \glsadd[format=(]{singmtx} This is a very long section all about \glspl{singmtx}. @@ -572,7 +584,7 @@ range<A NAME="tex2html4" \glsadd[format=)]{singmtx} </PRE> -This is equivalent to <TT>makeindex</TT><A NAME="2048"></A>'s <code>|(</code> and <code>|)</code> +This is equivalent to <TT>makeindex</TT><A NAME="2122"></A>'s <code>|(</code> and <code>|)</code> formats. <P> @@ -594,13 +606,13 @@ formats. <LI>Only those terms that have actually been used in the document will be placed in the glossary. If you have defined a term that doesn't appear in the document, then it means -you haven't used it in the text (either via <TT>\glslink</TT><A NAME="2051"></A> -or <TT>\gls</TT><A NAME="2054"></A> and related commands, or via <TT>\glsadd</TT><A NAME="2057"></A> -or <TT>\glsaddall</TT><A NAME="2060"></A>.) +you haven't used it in the text (either via <TT>\glslink</TT><A NAME="2125"></A> +or <TT>\gls</TT><A NAME="2128"></A> and related commands, or via <TT>\glsadd</TT><A NAME="2131"></A> +or <TT>\glsaddall</TT><A NAME="2134"></A>.) <P> </LI> -<LI>To change the sorting order, use the <TT>sort</TT><A NAME="2063"></A> key. +<LI>To change the sorting order, use the <TT>sort</TT><A NAME="2137"></A> key. For example: <PRE> \newglossaryentry{universal}{name={\ensuremath{\mathcal{U}}}, @@ -610,7 +622,7 @@ sort=U} <P> </LI> -<LI>You don't need to escape <TT>makeindex</TT><A NAME="2066"></A>'s special characters: +<LI>You don't need to escape <TT>makeindex</TT><A NAME="2140"></A>'s special characters: <PRE> \newglossaryentry{quote}{name={"}, description={Double quote character}} @@ -632,21 +644,21 @@ description={A metric measurement of length}, symbol={m}} </PRE> The predefined glossary styles that display the entry symbol -are: <TT>long4col</TT><A NAME="2069"></A>, <TT>long4colheader</TT><A NAME="2071"></A>, -<TT>long4colborder</TT><A NAME="2073"></A>, <TT>long4colheaderborder</TT><A NAME="2075"></A>, -<TT>super4col</TT><A NAME="2077"></A>, <TT>super4colheader</TT><A NAME="2079"></A>, -<TT>super4colborder</TT><A NAME="2081"></A> and <TT>super4colheaderborder</TT><A NAME="2083"></A>. +are: <TT>long4col</TT><A NAME="2143"></A>, <TT>long4colheader</TT><A NAME="2145"></A>, +<TT>long4colborder</TT><A NAME="2147"></A>, <TT>long4colheaderborder</TT><A NAME="2149"></A>, +<TT>super4col</TT><A NAME="2151"></A>, <TT>super4colheader</TT><A NAME="2153"></A>, +<TT>super4colborder</TT><A NAME="2155"></A> and <TT>super4colheaderborder</TT><A NAME="2157"></A>. All the other styles supplied by this package ignore the associated symbol. <P> </LI> -<LI>Glossary styles can be set using the <TT>style</TT><A NAME="2090"></A> +<LI>Glossary styles can be set using the <TT>style</TT><A NAME="2164"></A> package option. For example: <PRE> \usepackage[style=long3col]{glossaries} </PRE> -or using <TT>\glossarystyle</TT><A NAME="2094"></A><TT>{</TT><EM>style</EM><TT>}</TT>. For example: +or using <TT>\glossarystyle</TT><A NAME="2168"></A><TT>{</TT><EM>style</EM><TT>}</TT>. For example: <PRE> \glossarystyle{altlist} </PRE> @@ -656,7 +668,7 @@ bundle are listed in <A HREF="glossaries-manual.html#sec:styles">Glossary Styles <P> </LI> <LI>The list of numbers associated with each glossary entry -can be suppressed using the package option <TT>nonumberlist</TT><A NAME="2103"></A>: +can be suppressed using the package option <TT>nonumberlist</TT><A NAME="2177"></A>: <PRE> \usepackage[nonumberlist]{glossaries} </PRE> @@ -665,14 +677,14 @@ can be suppressed using the package option <TT>nonumberlist</TT><A NAME="2103">< </LI> <LI>By default, the glossaries will appear in an unnumbered chapter if chapters are defined, otherwise in an unnumbered -section. This can be changed using the <TT>section</TT><A NAME="2112"></A> package +section. This can be changed using the <TT>section</TT><A NAME="2186"></A> package option. For example, to make the glossaries appear in an unnumbered section, even if chapters are defined, do: <PRE> \usepackage[section]{glossaries} </PRE> Other sectional units can also be specified as -<TT>section</TT><A NAME="2121"></A>=<I>value</I>. For example, to make the glossaries +<TT>section</TT><A NAME="2195"></A>=<I>value</I>. For example, to make the glossaries appear in unnumbered subsections: <PRE> \usepackage[section=subsection]{glossaries} @@ -700,28 +712,28 @@ Package Options</A> <P> The <TT>glossaries</TT> package options are as follows: <DL> -<DT><STRONG><TT>toc</TT><A NAME="2134"></A></STRONG></DT> +<DT><STRONG><TT>toc</TT><A NAME="2208"></A></STRONG></DT> <DD>Add the glossaries to the table of contents. <P> </DD> -<DT><STRONG><TT>numberline</TT><A NAME="2143"></A></STRONG></DT> -<DD>When used with <TT>toc</TT><A NAME="2152"></A>, this will +<DT><STRONG><TT>numberline</TT><A NAME="2217"></A></STRONG></DT> +<DD>When used with <TT>toc</TT><A NAME="2226"></A>, this will add <TT>\numberline</TT><code>{}</code> in the final argument of <TT>\addcontentsline</TT>. This will align the table of contents entry with the numbered section titles. Note that this option has no -effect if the <TT>toc</TT><A NAME="2161"></A> option is omitted. If <TT>toc</TT><A NAME="2170"></A> is -used without <TT>numberline</TT><A NAME="2179"></A>, the title will be aligned with +effect if the <TT>toc</TT><A NAME="2235"></A> option is omitted. If <TT>toc</TT><A NAME="2244"></A> is +used without <TT>numberline</TT><A NAME="2253"></A>, the title will be aligned with the section numbers rather than the section titles. <P> </DD> -<DT><STRONG><TT>acronym</TT><A NAME="2188"></A></STRONG></DT> +<DT><STRONG><TT>acronym</TT><A NAME="2262"></A></STRONG></DT> <DD>Make a separate glossary for acronyms. <P> </DD> -<DT><STRONG><TT>section</TT><A NAME="2197"></A></STRONG></DT> +<DT><STRONG><TT>section</TT><A NAME="2271"></A></STRONG></DT> <DD>This is a <I>key</I>=<I>value</I> 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, @@ -739,22 +751,22 @@ is equivalent to \usepackage[section=section]{glossaries} </PRE> You can change this value later in the document using -<TT>\setglossarysection</TT><A NAME="2201"></A><TT>{</TT><EM>type</EM><TT>}</TT>. +<TT>\setglossarysection</TT><A NAME="2275"></A><TT>{</TT><EM>type</EM><TT>}</TT>. <P> </DD> -<DT><STRONG><TT>numberedsection</TT><A NAME="2209"></A></STRONG></DT> +<DT><STRONG><TT>numberedsection</TT><A NAME="2283"></A></STRONG></DT> <DD>The glossaries are placed in unnumbered sectional units by default, -but this can be changed using <TT>numberedsection</TT><A NAME="2218"></A>. This option can take -three possible values: <TT>false</TT><A NAME="2222"></A> (no -number, i.e. use starred form), <TT>nolabel</TT><A NAME="2224"></A> +but this can be changed using <TT>numberedsection</TT><A NAME="2292"></A>. This option can take +three possible values: <TT>false</TT><A NAME="2296"></A> (no +number, i.e. use starred form), <TT>nolabel</TT><A NAME="2298"></A> (numbered, i.e. unstarred form, but not labelled) and -<TT>autolabel</TT><A NAME="2226"></A> (numbered with automatic -labelling). If <TT>numberedsection=autolabel</TT><A NAME="2235"></A> is used, each +<TT>autolabel</TT><A NAME="2300"></A> (numbered with automatic +labelling). If <TT>numberedsection=autolabel</TT><A NAME="2309"></A> is used, each glossary is given a label that matches the glossary type, so the main (default) glossary is labelled <TT>main</TT>, the list of acronyms is labelled <TT>acronym</TT><A NAME="tex2html5" - HREF="#foot1670"><SUP>2</SUP></A> and additional glossaries are labelled + HREF="#foot1737"><SUP>2</SUP></A> and additional glossaries are labelled using the value specified in the first mandatory argument to <TT>\newglossary</TT>. For example, if you load <TT>glossaries</TT> using: @@ -769,100 +781,100 @@ acronyms is in section~\ref{acronym}. </PRE> If you can't decide whether to have the acronyms in the main glossary or a separate list of acronyms, you can use -<TT>\acronymtype</TT><A NAME="2247"></A> which is set to <TT>main</TT> if the -<TT>acronym</TT><A NAME="2255"></A> option is not used and is set to <TT>acronym</TT> -if the <TT>acronym</TT><A NAME="2264"></A> option is used. For example: +<TT>\acronymtype</TT><A NAME="2321"></A> which is set to <TT>main</TT> if the +<TT>acronym</TT><A NAME="2329"></A> option is not used and is set to <TT>acronym</TT> +if the <TT>acronym</TT><A NAME="2338"></A> option is used. For example: <PRE> The list of acronyms is in section~\ref{\acronymtype}. </PRE> <P> </DD> -<DT><STRONG><TT>style</TT><A NAME="2273"></A></STRONG></DT> +<DT><STRONG><TT>style</TT><A NAME="2347"></A></STRONG></DT> <DD>This is a <I>key</I>=<I>value</I> option. Its value should be the name of the glossary style to use. Predefined glossary styles are listed <A HREF="glossaries-manual.html#sec:styles">later</A>. <P> </DD> -<DT><STRONG><TT>nonumberlist</TT><A NAME="2282"></A></STRONG></DT> +<DT><STRONG><TT>nonumberlist</TT><A NAME="2356"></A></STRONG></DT> <DD>This option will suppress the -associated number lists<A NAME="2285"></A> in the glossaries (see also +associated number lists<A NAME="2359"></A> in the glossaries (see also <A HREF="glossaries-manual.html#sec:numberlists">Number Lists</A>.) <P> </DD> -<DT><STRONG><TT>counter</TT><A NAME="2292"></A></STRONG></DT> +<DT><STRONG><TT>counter</TT><A NAME="2366"></A></STRONG></DT> <DD>This is a <I>key</I>=<I>value</I> option. The value should be the name of the default counter to use in the number -lists<A NAME="2295"></A>. +lists<A NAME="2369"></A>. <P> <A NAME="sanitize"></A> </DD> -<DT><STRONG><TT>sanitize</TT><A NAME="2302"></A></STRONG></DT> +<DT><STRONG><TT>sanitize</TT><A NAME="2376"></A></STRONG></DT> <DD>This is a <I>key</I>=<I>value</I> option whose value is also a <I>key</I>=<I>value</I> list. By default, the <TT>glossaries</TT> package sanitizes the values of the -<TT>name</TT><A NAME="2307"></A>, <TT>description</TT><A NAME="2310"></A> and <TT>symbol</TT><A NAME="2313"></A> keys used +<TT>name</TT><A NAME="2381"></A>, <TT>description</TT><A NAME="2384"></A> and <TT>symbol</TT><A NAME="2387"></A> keys used when defining a new glossary entry. This may lead to unexpected results if you try to display these values within the document text. This -sanitization can be switched off using the <TT>sanitize</TT><A NAME="2321"></A> package +sanitization can be switched off using the <TT>sanitize</TT><A NAME="2395"></A> package option. For example, to switch off the sanitization for the -<TT>description</TT><A NAME="2325"></A> and <TT>name</TT><A NAME="2328"></A> keys, but not for the -<TT>symbol</TT><A NAME="2331"></A> key, do: +<TT>description</TT><A NAME="2399"></A> and <TT>name</TT><A NAME="2402"></A> keys, but not for the +<TT>symbol</TT><A NAME="2405"></A> key, do: <PRE> \usepackage[sanitize={name=false,description=false,% symbol=true}]{glossaries} </PRE> <P> -<B>Note</B>: this sanitization only applies to the <TT>name</TT><A NAME="2334"></A>, -<TT>description</TT><A NAME="2337"></A> and <TT>symbol</TT><A NAME="2340"></A> keys. It doesn't apply -to any of the other keys (except the <TT>sort</TT><A NAME="2343"></A> key which is +<B>Note</B>: this sanitization only applies to the <TT>name</TT><A NAME="2408"></A>, +<TT>description</TT><A NAME="2411"></A> and <TT>symbol</TT><A NAME="2414"></A> keys. It doesn't apply +to any of the other keys (except the <TT>sort</TT><A NAME="2417"></A> key which is always sanitized) so fragile commands contained in the value of the other keys must always be protected using <TT>\protect</TT>. -Since the value of the <TT>text</TT><A NAME="2346"></A> key is obtained from the -<TT>name</TT><A NAME="2349"></A> key, you will still need to protect fragile commands -in the <TT>name</TT><A NAME="2352"></A> key if you don't use the <TT>text</TT><A NAME="2355"></A> key. +Since the value of the <TT>text</TT><A NAME="2420"></A> key is obtained from the +<TT>name</TT><A NAME="2423"></A> key, you will still need to protect fragile commands +in the <TT>name</TT><A NAME="2426"></A> key if you don't use the <TT>text</TT><A NAME="2429"></A> key. <P> </DD> -<DT><STRONG><TT>babel</TT><A NAME="2363"></A></STRONG></DT> +<DT><STRONG><TT>babel</TT><A NAME="2437"></A></STRONG></DT> <DD>This is a boolean key and is for use when the <TT>glossaries</TT> package is used in conjunction with the -<TT>babel</TT><A NAME="2368"></A> package. The default is <TT>babel=true</TT><A NAME="2378"></A>, which -adds the glossary translations to <TT>babel</TT><A NAME="2380"></A>'s captions. If +<TT>babel</TT><A NAME="2442"></A> package. The default is <TT>babel=true</TT><A NAME="2452"></A>, which +adds the glossary translations to <TT>babel</TT><A NAME="2454"></A>'s captions. If you don't like the translations provided by the <TT>glossaries</TT> -package, you can set <TT>babel=false</TT><A NAME="2391"></A> and provide your own +package, you can set <TT>babel=false</TT><A NAME="2465"></A> and provide your own translations. <P> </DD> -<DT><STRONG><TT>description</TT><A NAME="2398"></A></STRONG></DT> +<DT><STRONG><TT>description</TT><A NAME="2472"></A></STRONG></DT> <DD>This option changes the definition of -<TT>\newacronym</TT><A NAME="2402"></A> to allow a description. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> +<TT>\newacronym</TT><A NAME="2476"></A> to allow a description. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> for further details. <P> </DD> -<DT><STRONG><TT>footnote</TT><A NAME="2410"></A></STRONG></DT> +<DT><STRONG><TT>footnote</TT><A NAME="2484"></A></STRONG></DT> <DD>This option changes the definition of -<TT>\newacronym</TT><A NAME="2414"></A> and the way that acronyms are displayed. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> +<TT>\newacronym</TT><A NAME="2488"></A> and the way that acronyms are displayed. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> for further details. <P> </DD> -<DT><STRONG><TT>smallcaps</TT><A NAME="2422"></A></STRONG></DT> +<DT><STRONG><TT>smallcaps</TT><A NAME="2496"></A></STRONG></DT> <DD>This option changes the definition of -<TT>\newacronym</TT><A NAME="2426"></A> and the way that acronyms are displayed. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> +<TT>\newacronym</TT><A NAME="2500"></A> and the way that acronyms are displayed. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> for further details. <P> </DD> -<DT><STRONG><TT>dua</TT><A NAME="2434"></A></STRONG></DT> +<DT><STRONG><TT>dua</TT><A NAME="2508"></A></STRONG></DT> <DD>This option changes the definition of -<TT>\newacronym</TT><A NAME="2438"></A> so that acronyms are always expanded. +<TT>\newacronym</TT><A NAME="2512"></A> so that acronyms are always expanded. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> for further details. @@ -886,18 +898,18 @@ the preamble. Only those entries that occur in the document (using any of the commands described in <A HREF="glossaries-manual.html#sec:glslink">Links to Glossary Entries</A> and <A HREF="glossaries-manual.html#sec:glsadd">Adding an entry to the glossary without generating text</A>) will appear in the glossary. Each time an entry is used in this way, a line is added to an associated glossary -(<TT>.glo</TT><A NAME="2444"></A>) file, which then needs to be converted into a -corresponding <TT>.gls</TT><A NAME="2446"></A> file which contains the typeset glossary -which is input by <TT>\printglossary</TT><A NAME="2448"></A> or -<TT>\printglossaries</TT><A NAME="2451"></A>. The Perl script <TT>makeglossaries</TT><A NAME="2454"></A> -can be used to call <TT>makeindex</TT><A NAME="2457"></A>, using a customised -<TT>.ist</TT><A NAME="2460"></A> style file, for each of the glossaries that are defined +(<TT>.glo</TT><A NAME="2518"></A>) file, which then needs to be converted into a +corresponding <TT>.gls</TT><A NAME="2520"></A> file which contains the typeset glossary +which is input by <TT>\printglossary</TT><A NAME="2522"></A> or +<TT>\printglossaries</TT><A NAME="2525"></A>. The Perl script <TT>makeglossaries</TT><A NAME="2528"></A> +can be used to call <TT>makeindex</TT><A NAME="2531"></A>, using a customised +<TT>.ist</TT><A NAME="2534"></A> style file, for each of the glossaries that are defined in the document. Note that there should be no need for you to explicitly edit or input any of these external files. <P> The command <TT>\makeglossaries</TT> must be placed in the preamble in -order to create the customised <TT>makeindex</TT><A NAME="2462"></A> <TT>.ist</TT><A NAME="2465"></A> +order to create the customised <TT>makeindex</TT><A NAME="2536"></A> <TT>.ist</TT><A NAME="2539"></A> style file and to ensure that glossary entries are written to the appropriate output file. If you omit <TT>\makeglossaries</TT> none of the glossaries will be created. Note that if your page numbers use a @@ -919,91 +931,122 @@ The first argument, <I>label</I>, must be a unique label with which to identify this entry. The second argument, <I>key-val list</I>, is a <I>key</I>=<I>value</I> list that supplies the relevant information -about this entry. There are two required fields: <TT>name</TT><A NAME="2467"></A> and -<TT>description</TT><A NAME="2470"></A>. Available fields are listed below: +about this entry. There are two required fields: <TT>name</TT><A NAME="2541"></A> and +<TT>description</TT><A NAME="2544"></A>. Available fields are listed below: <P> <DL> -<DT><STRONG><TT>name</TT><A NAME="2473"></A></STRONG></DT> +<DT><STRONG><TT>name</TT><A NAME="2547"></A></STRONG></DT> <DD>The name of the entry (as it will appear in the glossary). <P> </DD> -<DT><STRONG><TT>description</TT><A NAME="2476"></A></STRONG></DT> +<DT><STRONG><TT>description</TT><A NAME="2550"></A></STRONG></DT> <DD>A brief description of this term (to appear in the glossary). <P> </DD> -<DT><STRONG><TT>text</TT><A NAME="2479"></A></STRONG></DT> +<DT><STRONG><TT>descriptionplural</TT><A NAME="2553"></A></STRONG></DT> +<DD>The plural form of the +description (as passed to <TT>\glsdisplay</TT><A NAME="2556"></A> and <TT>\glsdisplayfirst</TT><A NAME="2559"></A> +by <TT>\glspl</TT><A NAME="2562"></A>, <TT>\Glspl</TT><A NAME="2565"></A> and <TT>\GLSpl</TT><A NAME="2568"></A>). If omitted, the value +is set to the same as the <TT>description</TT><A NAME="2571"></A> key. + +<P> +</DD> +<DT><STRONG><TT>text</TT><A NAME="2574"></A></STRONG></DT> <DD>How this entry will appear in the document text -when using <TT>\gls</TT><A NAME="2482"></A> (or one of its uppercase variants). If this -field is omitted, the value of the <TT>name</TT><A NAME="2485"></A> key is used. +when using <TT>\gls</TT><A NAME="2577"></A> (or one of its uppercase variants). If this +field is omitted, the value of the <TT>name</TT><A NAME="2580"></A> key is used. <P> </DD> -<DT><STRONG><TT>first</TT><A NAME="2488"></A></STRONG></DT> +<DT><STRONG><TT>first</TT><A NAME="2583"></A></STRONG></DT> <DD>How the entry will appear in the document text -the first time it is used with <TT>\gls</TT><A NAME="2491"></A> (or one of its uppercase -variants). If this field is omitted, the value of the <TT>text</TT><A NAME="2494"></A> +the first time it is used with <TT>\gls</TT><A NAME="2586"></A> (or one of its uppercase +variants). If this field is omitted, the value of the <TT>text</TT><A NAME="2589"></A> key is used. <P> </DD> -<DT><STRONG><TT>plural</TT><A NAME="2497"></A></STRONG></DT> +<DT><STRONG><TT>plural</TT><A NAME="2592"></A></STRONG></DT> <DD>How the entry will appear in the document text -when using <TT>\glspl</TT><A NAME="2500"></A> (or one of its uppercase variants). +when using <TT>\glspl</TT><A NAME="2595"></A> (or one of its uppercase variants). If this field is omitted, the value is obtained by appending an -"s" to the value of the <TT>text</TT><A NAME="2503"></A> field. +"s" to the value of the <TT>text</TT><A NAME="2598"></A> field. <P> </DD> -<DT><STRONG><TT>firstplural</TT><A NAME="2506"></A></STRONG></DT> +<DT><STRONG><TT>firstplural</TT><A NAME="2601"></A></STRONG></DT> <DD>How the entry will appear in the document -text the first time it is used with <TT>\glspl</TT><A NAME="2509"></A> (or one of +text the first time it is used with <TT>\glspl</TT><A NAME="2604"></A> (or one of its uppercase variants). If this field is omitted, the value is -obtained by appending an "s" to the value of the <TT>first</TT><A NAME="2512"></A> +obtained by appending an "s" to the value of the <TT>first</TT><A NAME="2607"></A> field. <P> </DD> -<DT><STRONG><TT>symbol</TT><A NAME="2515"></A></STRONG></DT> +<DT><STRONG><TT>symbol</TT><A NAME="2610"></A></STRONG></DT> <DD>This field is provided to allow the user to specify an associated symbol, but most glossary styles ignore this value. If omitted, the value is set to <TT>\relax</TT>. <P> </DD> -<DT><STRONG><TT>sort</TT><A NAME="2518"></A></STRONG></DT> -<DD>This value indicates how <TT>makeindex</TT><A NAME="2521"></A> +<DT><STRONG><TT>symbolplural</TT><A NAME="2613"></A></STRONG></DT> +<DD>This is the plural form of the +symbol (as passed to <TT>\glsdisplay</TT><A NAME="2616"></A> and <TT>\glsdisplayfirst</TT><A NAME="2619"></A> +by <TT>\glspl</TT><A NAME="2622"></A>, <TT>\Glspl</TT><A NAME="2625"></A> and <TT>\GLSpl</TT><A NAME="2628"></A>). If omitted, the value +is set to the same as the <TT>symbol</TT><A NAME="2631"></A> key. + +<P> +</DD> +<DT><STRONG><TT>sort</TT><A NAME="2634"></A></STRONG></DT> +<DD>This value indicates how <TT>makeindex</TT><A NAME="2637"></A> should sort this entry. If omitted, the value is given by the -<TT>name</TT><A NAME="2524"></A> field. This value is equivalent to -<TT>makeindex</TT><A NAME="2527"></A>'s "actual" character (which is usually the +<TT>name</TT><A NAME="2640"></A> field. This value is equivalent to +<TT>makeindex</TT><A NAME="2643"></A>'s "actual" character (which is usually the at-sign @ although the <TT>glossaries</TT> package uses a different symbol). <P> </DD> -<DT><STRONG><TT>type</TT><A NAME="2531"></A></STRONG></DT> +<DT><STRONG><TT>type</TT><A NAME="2647"></A></STRONG></DT> <DD>This is the glossary type to which this entry belongs. If omitted, the default glossary is assumed (<TT>type=main</TT>). The list of acronyms type is given by -<TT>\acronymtype</TT><A NAME="2534"></A> which will either be <TT>main</TT> or -<TT>acronym</TT>, depending on whether the <TT>acronym</TT><A NAME="2542"></A> package +<TT>\acronymtype</TT><A NAME="2650"></A> which will either be <TT>main</TT> or +<TT>acronym</TT>, depending on whether the <TT>acronym</TT><A NAME="2658"></A> package option was used. </DD> </DL> -Note that if the <TT>text</TT><A NAME="2546"></A> key (or the <TT>name</TT><A NAME="2549"></A> key, if the -<TT>text</TT><A NAME="2552"></A> key is omitted) starts with an accented letter, +Note that if the key starts with an accented letter, you must group the accented letter, otherwise it will cause a problem for <TT>\Gls</TT> and <TT>\Glspl</TT>. For example: <PRE> \newglossaryentry{elite}{name={{\'e}lite}, description={select group or class}} </PRE> -(Likewise for the <TT>plural</TT><A NAME="2555"></A>, <TT>first</TT><A NAME="2558"></A> and -<TT>firstplural</TT><A NAME="2561"></A> keys.) +Similarly, commands such as <TT>\ae</TT> and <TT>\oe</TT> should either be placed +inside a group or followed by a space. For example: +<PRE> +\newglossaryentry{oesophagus}{% +name={{\oe}sophagus}, +description={canal from mouth to stomach}} +</PRE> +The following is also fine: +<PRE> +\newglossaryentry{oesophagus}{% +name={\oe sophagus}, +description={canal from mouth to stomach}} +</PRE> +but don't do <code>\oe{}sophagus</code> as it will confuse +<TT>\makefirstuc</TT><A NAME="2662"></A> (described +<A HREF="glossaries-manual.html#sec:mfirstuc">later</A>) +and will produce oeSophagus instead of +OEsophagus. <P> You can store all your glossary entry definitions in another @@ -1015,7 +1058,7 @@ file, and use: where <I>filename</I> is the name of the file containing all the <TT>\newglossaryentry</TT> commands. The optional argument <I>type</I> is the name of the glossary to which those entries -should belong, for those entries where the <TT>type</TT><A NAME="2564"></A> key has +should belong, for those entries where the <TT>type</TT><A NAME="2665"></A> key has been omitted. Note that only those entries that have been used in the text will appear in the relevant glossaries. <P> @@ -1030,13 +1073,13 @@ Number lists </H2> <P> -Each entry in the glossary has an associated <I>number list</I><A NAME="2570"></A>. +Each entry in the glossary has an associated <I>number list</I><A NAME="2671"></A>. By default, these numbers refer to the pages on which that entry has been used (using any of the commands described in <A HREF="glossaries-manual.html#sec:glslink">Links to Glossary Entries</A> and <A HREF="glossaries-manual.html#sec:glsadd">Adding an entry to the glossary without generating text</A>). The number list can be suppressed using -the <TT>nonumberlist</TT><A NAME="2577"></A> package option, or an alternative counter -can be set as the default using the <TT>counter</TT><A NAME="2586"></A> package option. +the <TT>nonumberlist</TT><A NAME="2678"></A> package option, or an alternative counter +can be set as the default using the <TT>counter</TT><A NAME="2687"></A> package option. <P> <A HREF="glossaries-manual.html#top">Top</A> @@ -1050,16 +1093,16 @@ Links to Glossary Entries <P> Once you have defined a glossary entry using -<TT>\newglossaryentry</TT><A NAME="2593"></A>, you can refer to that entry in the +<TT>\newglossaryentry</TT><A NAME="2694"></A>, you can refer to that entry in the document using one of the commands listed in this section. The text which appears at that point in the document when using one of these commands is referred to as the -<I>link text</I><A NAME="2596"></A> (even if there are no hyperlinks). +<I>link text</I><A NAME="2697"></A> (even if there are no hyperlinks). <P> -The way the link text<A NAME="2597"></A> is displayed +The way the link text<A NAME="2698"></A> is displayed depends on <TT>\glstextformat{</TT><EM>text</EM><TT>}</TT>. -For example, to make all link text<A NAME="2598"></A> appear in a sans-serif +For example, to make all link text<A NAME="2699"></A> appear in a sans-serif font, do: <PRE> \renewcommand*{\glstextformat}[1]{\textsf{#1}} @@ -1080,10 +1123,10 @@ list which can take any of the following keys: <P> <DL> -<DT><STRONG><TT>format</TT><A NAME="2600"></A></STRONG></DT> +<DT><STRONG><TT>format</TT><A NAME="2701"></A></STRONG></DT> <DD>This specifies how to format the associated number for this entry in the glossary. This value is -equivalent to the <TT>makeindex</TT><A NAME="2603"></A> encap value, and (as with +equivalent to the <TT>makeindex</TT><A NAME="2704"></A> encap value, and (as with <TT>\index</TT>) the value needs to be the name of a command <I>without</I> the initial backslash. As with <TT>\index</TT>, the characters <code>(</code> and <code>)</code> can also be used to specify the beginning and ending of a @@ -1101,7 +1144,7 @@ and use that command. <P> If you are using hyperlinks and you want to change the font of the -hyperlink, don't use <TT>\hyperpage</TT> (provided by the <TT>hyperref</TT><A NAME="2606"></A> +hyperlink, don't use <TT>\hyperpage</TT> (provided by the <TT>hyperref</TT><A NAME="2707"></A> package) as the numbers may not refer to a page number. Instead, the <TT>glossaries</TT> package provides the following number formats: @@ -1160,19 +1203,19 @@ command called, say, <TT>\hyperbsf</TT>: <PRE> \newcommand{\hyperbsf}[1]{\textbf{\hypersf{#1}}} </PRE> -and then use <TT>hyperbsf</TT> as the value for the <TT>format</TT><A NAME="2610"></A> +and then use <TT>hyperbsf</TT> as the value for the <TT>format</TT><A NAME="2711"></A> key. <P> </DD> -<DT><STRONG><TT>counter</TT><A NAME="2613"></A></STRONG></DT> +<DT><STRONG><TT>counter</TT><A NAME="2714"></A></STRONG></DT> <DD>This specifies which counter to use for the associated number for this glossary entry. (See also <A HREF="glossaries-manual.html#sec:numberlists">Number Lists</A>.) <P> </DD> -<DT><STRONG><TT>hyper</TT><A NAME="2616"></A></STRONG></DT> +<DT><STRONG><TT>hyper</TT><A NAME="2717"></A></STRONG></DT> <DD>This is a boolean key which can be used to enable/disable the hyperlink to the relevant entry in the glossary. (Note that setting <TT>hyper=true</TT> will have no @@ -1197,10 +1240,10 @@ The command: <BR><TT>\gls[</TT><EM>options</EM><TT>]{</TT><EM>label</EM><TT>}[</TT><EM>insert</EM><TT>]</TT> <BR> <BR> -is the same as <TT>\glslink</TT>, except that the link text<A NAME="2618"></A> -is determined from the values of the <TT>text</TT><A NAME="2620"></A> and -<TT>first</TT><A NAME="2623"></A> keys supplied when the entry was defined using -<TT>\newglossaryentry</TT><A NAME="2626"></A>. There are two uppercase variants: +is the same as <TT>\glslink</TT>, except that the link text<A NAME="2719"></A> +is determined from the values of the <TT>text</TT><A NAME="2721"></A> and +<TT>first</TT><A NAME="2724"></A> keys supplied when the entry was defined using +<TT>\newglossaryentry</TT><A NAME="2727"></A>. There are two uppercase variants: <BR> <BR> <TT>\Gls[</TT><EM>options</EM><TT>]{</TT><EM>label</EM><TT>}[</TT><EM>insert</EM><TT>]</TT> @@ -1220,7 +1263,7 @@ The final optional argument <I>insert</I>, allows you to insert some additional text into the link text. By default, this will append <I>insert</I> at the end of the link text. The first optional argument <I>options</I> is the same as the optional argument to -<TT>\glslink</TT><A NAME="2629"></A>. As with <TT>\glslink</TT>, these commands also have +<TT>\glslink</TT><A NAME="2730"></A>. As with <TT>\glslink</TT>, these commands also have a starred version that disable the hyperlink. <P> @@ -1236,8 +1279,8 @@ There are also analogous plural forms: <TT>\GLSpl[</TT><EM>options</EM><TT>]{</TT><EM>label</EM><TT>}[</TT><EM>insert</EM><TT>]</TT> <BR> <BR> -These determine the link text from the <TT>plural</TT><A NAME="2632"></A> and -<TT>firstplural</TT><A NAME="2635"></A> keys supplied when the entry was first +These determine the link text from the <TT>plural</TT><A NAME="2733"></A> and +<TT>firstplural</TT><A NAME="2736"></A> keys supplied when the entry was first defined. As before, these commands also have a starred version that disable the hyperlink. @@ -1247,8 +1290,8 @@ The command: <BR><TT>\glstext[</TT><EM>options</EM><TT>]{</TT><EM>label</EM><TT>}[</TT><EM>insert</EM><TT>]</TT> <BR> <BR> -is similar to <TT>\gls</TT><A NAME="2638"></A> except that it always uses the value -of the <TT>text</TT><A NAME="2641"></A> key and does not mark the entry as +is similar to <TT>\gls</TT><A NAME="2739"></A> except that it always uses the value +of the <TT>text</TT><A NAME="2742"></A> key and does not mark the entry as having been used. <P> @@ -1270,8 +1313,8 @@ The command: <BR><TT>\glsfirst[</TT><EM>options</EM><TT>]{</TT><EM>label</EM><TT>}[</TT><EM>insert</EM><TT>]</TT> <BR> <BR> -is similar to <TT>\gls</TT><A NAME="2644"></A> except that it always uses the value -of the <TT>first</TT><A NAME="2647"></A> key and does not mark the entry as +is similar to <TT>\gls</TT><A NAME="2745"></A> except that it always uses the value +of the <TT>first</TT><A NAME="2748"></A> key and does not mark the entry as having been used. <P> @@ -1293,8 +1336,8 @@ The command: <BR><TT>\glsplural[</TT><EM>options</EM><TT>]{</TT><EM>label</EM><TT>}[</TT><EM>insert</EM><TT>]</TT> <BR> <BR> -is similar to <TT>\gls</TT><A NAME="2650"></A> except that it always uses the value -of the <TT>plural</TT><A NAME="2653"></A> key and does not mark the entry as +is similar to <TT>\gls</TT><A NAME="2751"></A> except that it always uses the value +of the <TT>plural</TT><A NAME="2754"></A> key and does not mark the entry as having been used. <P> @@ -1316,8 +1359,8 @@ The command: <BR><TT>\glsfirstplural[</TT><EM>options</EM><TT>]{</TT><EM>label</EM><TT>}[</TT><EM>insert</EM><TT>]</TT> <BR> <BR> -is similar to <TT>\gls</TT><A NAME="2656"></A> except that it always uses the value -of the <TT>firstplural</TT><A NAME="2659"></A> key and does not mark the entry as +is similar to <TT>\gls</TT><A NAME="2757"></A> except that it always uses the value +of the <TT>firstplural</TT><A NAME="2760"></A> key and does not mark the entry as having been used. <P> @@ -1339,12 +1382,12 @@ The command: <BR><TT>\glsname[</TT><EM>options</EM><TT>]{</TT><EM>label</EM><TT>}[</TT><EM>insert</EM><TT>]</TT> <BR> <BR> -is similar to <TT>\gls</TT><A NAME="2662"></A> except that it always uses the value -of the <TT>name</TT><A NAME="2665"></A> key and does not mark the entry as +is similar to <TT>\gls</TT><A NAME="2763"></A> except that it always uses the value +of the <TT>name</TT><A NAME="2766"></A> key and does not mark the entry as having been used. Note: if you want to use this command and the -<TT>name</TT><A NAME="2668"></A> key contains commands, you will have to disable the +<TT>name</TT><A NAME="2769"></A> key contains commands, you will have to disable the <A HREF="glossaries-manual.html#sanitize">sanitization</A> -of the <TT>name</TT><A NAME="2671"></A> key and protect fragile commands. +of the <TT>name</TT><A NAME="2772"></A> key and protect fragile commands. <P> There are also analogous commands: @@ -1365,12 +1408,12 @@ The command: <BR><TT>\glssymbol[</TT><EM>options</EM><TT>]{</TT><EM>label</EM><TT>}[</TT><EM>insert</EM><TT>]</TT> <BR> <BR> -is similar to <TT>\gls</TT><A NAME="2674"></A> except that it always uses the value -of the <TT>symbol</TT><A NAME="2677"></A> key and does not mark the entry as +is similar to <TT>\gls</TT><A NAME="2775"></A> except that it always uses the value +of the <TT>symbol</TT><A NAME="2778"></A> key and does not mark the entry as having been used. Note: if you want to use this command and the -<TT>symbol</TT><A NAME="2680"></A> key contains commands, you will have to disable the +<TT>symbol</TT><A NAME="2781"></A> key contains commands, you will have to disable the <A HREF="glossaries-manual.html#sanitize">sanitization</A> -of the <TT>symbol</TT><A NAME="2683"></A> key and protect fragile commands. +of the <TT>symbol</TT><A NAME="2784"></A> key and protect fragile commands. <P> There are also analogous commands: @@ -1391,12 +1434,12 @@ The command: <BR><TT>\glsdesc[</TT><EM>options</EM><TT>]{</TT><EM>label</EM><TT>}[</TT><EM>insert</EM><TT>]</TT> <BR> <BR> -is similar to <TT>\gls</TT><A NAME="2686"></A> except that it always uses the value -of the <TT>description</TT><A NAME="2689"></A> key and does not mark the entry as +is similar to <TT>\gls</TT><A NAME="2787"></A> except that it always uses the value +of the <TT>description</TT><A NAME="2790"></A> key and does not mark the entry as having been used. Note: if you want to use this command and the -<TT>description</TT><A NAME="2692"></A> key contains commands, you will have to disable the +<TT>description</TT><A NAME="2793"></A> key contains commands, you will have to disable the <A HREF="glossaries-manual.html#sanitize">sanitization</A> -of the <TT>description</TT><A NAME="2695"></A> key and protect fragile commands. +of the <TT>description</TT><A NAME="2796"></A> key and protect fragile commands. <P> There are also analogous commands: @@ -1425,18 +1468,18 @@ Changing the format of the link text </H3> <P> -The format of the link text<A NAME="2700"></A> for <TT>\gls</TT><A NAME="2702"></A>, <TT>\glspl</TT><A NAME="2705"></A> +The format of the link text<A NAME="2801"></A> for <TT>\gls</TT><A NAME="2803"></A>, <TT>\glspl</TT><A NAME="2806"></A> and their uppercase variants is governed by two commands: <TT>\glsdisplayfirst</TT>, which is used the first time a glossary entry is used in the text and <TT>\glsdisplay</TT>, which is used subsequently. Both commands take four arguments: the first is either the singular or -plural form given by the <TT>text</TT><A NAME="2708"></A>, <TT>plural</TT><A NAME="2711"></A>, -<TT>first</TT><A NAME="2714"></A> or <TT>firstplural</TT><A NAME="2717"></A> keys (used when the term was +plural form given by the <TT>text</TT><A NAME="2809"></A>, <TT>plural</TT><A NAME="2812"></A>, +<TT>first</TT><A NAME="2815"></A> or <TT>firstplural</TT><A NAME="2818"></A> keys (used when the term was defined) depending on context; the second argument is the term's -description (as supplied by the <TT>description</TT><A NAME="2720"></A> key); the third +description (as supplied by the <TT>description</TT><A NAME="2821"></A> key); the third argument is the symbol associated with the term (as supplied by the -<TT>symbol</TT><A NAME="2723"></A> key) and the fourth argument is the additional text +<TT>symbol</TT><A NAME="2824"></A> key) and the fourth argument is the additional text supplied in the final optional argument to <TT>\gls</TT> or <TT>\glspl</TT> (or their uppercase variants). The default definitions of <TT>\glsdisplay</TT> and <TT>\glsdisplayfirst</TT> simply @@ -1445,7 +1488,7 @@ The remaining arguments are ignored. <P> For example, suppose you want a glossary of measurements and -units, you can use the <TT>symbol</TT><A NAME="2726"></A> key to store the unit: +units, you can use the <TT>symbol</TT><A NAME="2827"></A> key to store the unit: <PRE> \newglossaryentry{distance}{name=distance, description={The length between two points}, @@ -1465,8 +1508,8 @@ the two points" -- but in this instance it may be better not to use a contraction). <P> -Note also that all of the link text<A NAME="2728"></A> will be formatted according -to <TT>\glstextformat</TT><A NAME="2730"></A> (described earlier). So if you do, say: +Note also that all of the link text<A NAME="2829"></A> will be formatted according +to <TT>\glstextformat</TT><A NAME="2831"></A> (described earlier). So if you do, say: <PRE> \renewcommand{\glstextformat}[1]{\textbf{#1}} \renewcommand{\glsdisplayfirst}[4]{#1#4 (#3)} @@ -1486,7 +1529,7 @@ of redefining <TT>\glsdisplay</TT> and <TT>\glsdisplayfirst</TT>. <P> Both <TT>\defglsdisplay</TT> and <TT>\defglsdisplayfirst</TT> take two arguments: the first (which is optional) is the glossary name<A NAME="tex2html6" - HREF="#foot1718"><SUP>3</SUP></A> and the second is how the term should be + HREF="#foot1791"><SUP>3</SUP></A> and the second is how the term should be displayed when it is invoked using commands <TT>\gls</TT>, <TT>\glspl</TT> and their uppercase variants. This is similar to the way <TT>\glsdisplayfirst</TT> was redefined above. @@ -1512,10 +1555,10 @@ will be displayed as: "set (denoted <I>S</I>)" (similarly for <TT>\glspl</TT> and the uppercase variants). <P> -Remember that if you use the <TT>symbol</TT><A NAME="2737"></A> key, you need to use a +Remember that if you use the <TT>symbol</TT><A NAME="2838"></A> key, you need to use a glossary style that displays the symbol, as many of the styles ignore it. In addition, if you want either the description or symbol to appear -in the link text<A NAME="2739"></A>, you will have to disable the +in the link text<A NAME="2840"></A>, you will have to disable the <A HREF="glossaries-manual.html#sanitize">sanitization</A> of these keys and protect fragile commands. <P> @@ -1528,10 +1571,10 @@ Enabling and disabling hyperlinks to glossary entries</A> </H3> <P> -If you load the <TT>hyperref</TT><A NAME="2744"></A> or <TT>html</TT><A NAME="2747"></A> packages prior to -loading the <TT>glossaries</TT> package, commands such as <TT>\glslink</TT><A NAME="2751"></A> -and <TT>\gls</TT><A NAME="2754"></A>, described above, will automatically have hyperlinks -to the relevant glossary entry, unless the <TT>hyper</TT><A NAME="2757"></A> +If you load the <TT>hyperref</TT><A NAME="2845"></A> or <TT>html</TT><A NAME="2848"></A> packages prior to +loading the <TT>glossaries</TT> package, commands such as <TT>\glslink</TT><A NAME="2852"></A> +and <TT>\gls</TT><A NAME="2855"></A>, described above, will automatically have hyperlinks +to the relevant glossary entry, unless the <TT>hyper</TT><A NAME="2858"></A> option has been set to <TT>false</TT>. You can disable or enable links using: <BR> <BR><TT>\glsdisablehyper</TT> @@ -1544,8 +1587,8 @@ and <BR> respectively. The effect can be localised by placing the commands within a group. Note that you should only use <TT>\glsenablehyper</TT> -if the commands <TT>\hyperlink</TT><A NAME="2760"></A> and <TT>\hypertarget</TT><A NAME="2763"></A> have been -defined (for example, by the <TT>hyperref</TT><A NAME="2766"></A> package). +if the commands <TT>\hyperlink</TT><A NAME="2861"></A> and <TT>\hypertarget</TT><A NAME="2864"></A> have been +defined (for example, by the <TT>hyperref</TT><A NAME="2867"></A> package). <P> @@ -1562,8 +1605,8 @@ generating any text at that point in the document using: <BR><TT>\glsadd[</TT><EM>options</EM><TT>]{</TT><EM>label</EM><TT>}</TT> <BR> <BR> -This is similar to <TT>\glslink</TT><A NAME="2769"></A>, only it doesn't produce -any text (so therefore, there is no <TT>hyper</TT><A NAME="2772"></A> key +This is similar to <TT>\glslink</TT><A NAME="2870"></A>, only it doesn't produce +any text (so therefore, there is no <TT>hyper</TT><A NAME="2873"></A> key available in <I>options</I> but all the other options that can be used with <TT>\glslink</TT> can be passed to <TT>\glsadd</TT>). @@ -1594,12 +1637,12 @@ Displaying a glossary</A> <P> The command <TT>\printglossaries</TT> will display all the defined glossaries. Note that no glossaries will appear until -you have either used the Perl script <TT>makeglossaries</TT><A NAME="2778"></A> -or have directly used <TT>makeindex</TT><A NAME="2781"></A> (as described in +you have either used the Perl script <TT>makeglossaries</TT><A NAME="2879"></A> +or have directly used <TT>makeindex</TT><A NAME="2882"></A> (as described in <A HREF="glossaries-manual.html#sec:makeglossaries">Generating the Associated Glossary Files</A>). If the glossary still does not appear after you re-LaTeX your document, check -the <TT>makeindex</TT><A NAME="2784"></A> log files to see if there is a problem. -Remember that you also need to use the command <TT>\makeglossaries</TT><A NAME="2787"></A> in +the <TT>makeindex</TT><A NAME="2885"></A> log files to see if there is a problem. +Remember that you also need to use the command <TT>\makeglossaries</TT><A NAME="2888"></A> in the preamble to enable the glossaries. <P> @@ -1611,7 +1654,7 @@ An individual glossary is displayed using: where <I>options</I> is a <I>key</I>=<I>value</I> list of options. The following keys are available: <DL> -<DT><STRONG><TT>type</TT><A NAME="2790"></A></STRONG></DT> +<DT><STRONG><TT>type</TT><A NAME="2891"></A></STRONG></DT> <DD>The value of this key specifies which glossary to print. If omitted, the default glossary is assumed. For example, to print the list of acronyms: @@ -1621,24 +1664,24 @@ glossary is assumed. For example, to print the list of acronyms: <P> </DD> -<DT><STRONG><TT>title</TT><A NAME="2793"></A></STRONG></DT> +<DT><STRONG><TT>title</TT><A NAME="2894"></A></STRONG></DT> <DD>This is the glossary's title (overriding the title specified when the glossary was defined). <P> </DD> -<DT><STRONG><TT>toctitle</TT><A NAME="2796"></A></STRONG></DT> +<DT><STRONG><TT>toctitle</TT><A NAME="2897"></A></STRONG></DT> <DD>This is the title -to use for the table of contents (if the <TT>toc</TT><A NAME="2804"></A> package +to use for the table of contents (if the <TT>toc</TT><A NAME="2905"></A> package option has been used). If omitted, the glossary title is used. <P> </DD> -<DT><STRONG><TT>style</TT><A NAME="2808"></A></STRONG></DT> +<DT><STRONG><TT>style</TT><A NAME="2909"></A></STRONG></DT> <DD>This specifies which glossary style to use for this glossary, overriding the effect -of the <TT>style</TT><A NAME="2816"></A> option or <TT>\glossarystyle</TT><A NAME="2820"></A>. +of the <TT>style</TT><A NAME="2917"></A> option or <TT>\glossarystyle</TT><A NAME="2921"></A>. </DD> </DL> @@ -1725,10 +1768,10 @@ where <I>name</I> is label to assign to this glossary. The arguments input and output files for that glossary, <I>title</I> is the default title for this new glossary and the final optional argument <I>counter</I> specifies which counter to use for the associated number -lists<A NAME="2828"></A> (see also <A HREF="glossaries-manual.html#sec:numberlists">Number Lists</A>.) The +lists<A NAME="2929"></A> (see also <A HREF="glossaries-manual.html#sec:numberlists">Number Lists</A>.) The first optional argument specifies the extension for the -<TT>makeindex</TT><A NAME="2830"></A> transcript file (this information is only used by -<TT>makeglossaries</TT><A NAME="2833"></A> which picks up the information from the +<TT>makeindex</TT><A NAME="2931"></A> transcript file (this information is only used by +<TT>makeglossaries</TT><A NAME="2934"></A> which picks up the information from the auxiliary file.) <P> @@ -1737,15 +1780,15 @@ Note that the main (default) glossary is automatically created as: \newglossary{main}{gls}{glo}{\glossaryname} </PRE> so it can be identified by the label <TT>main</TT>. Using the -<TT>acronym</TT><A NAME="2841"></A> package option is equivalent to: +<TT>acronym</TT><A NAME="2942"></A> package option is equivalent to: <PRE> \newglossary[alg]{acronym}{acr}{acn}{\acronymname} </PRE> so it can be identified by the label <TT>acronym</TT>. If you are -not sure whether the <TT>acronym</TT><A NAME="2850"></A> option has been used, you +not sure whether the <TT>acronym</TT><A NAME="2951"></A> option has been used, you can identify the list of acronyms by the command <TT>\acronymtype</TT> which is set to -<TT>acronym</TT>, if the <TT>acronym</TT><A NAME="2859"></A> option has been used, +<TT>acronym</TT>, if the <TT>acronym</TT><A NAME="2960"></A> option has been used, otherwise it is set to <TT>main</TT>. <P> <A HREF="glossaries-manual.html#top">Top</A> @@ -1788,7 +1831,7 @@ firstplural={</TT> <I>long</I><TT>s (</TT> <I>abbrv</I><TT>s)}, <P> As mentioned in the previous section, the command <TT>\acronymtype</TT> is the name of the glossary in which the acronyms should appear. If the -<TT>acronym</TT><A NAME="2872"></A> package option has been used, this will be +<TT>acronym</TT><A NAME="2973"></A> package option has been used, this will be <TT>acronym</TT>, otherwise it will be <TT>main</TT>. The acronyms can then be used in exactly the same way as any other glossary entry. For example, the following defines the acronym IDN: @@ -1810,19 +1853,19 @@ first use and "IDN" on subsequent uses. <P> The <TT>glossaries</TT> package has options that change the -definition of <TT>\newacronym</TT><A NAME="2877"></A> for common acronym formats. These +definition of <TT>\newacronym</TT><A NAME="2978"></A> for common acronym formats. These options also change the way the link text is displayed for the acronyms. <P> Table <A HREF="glossaries-manual.html#tab:acronymsettings">1</A> lists the package options and how the keys are used to store <I>long</I> (the long form) and -<I>abbrv</I> (the short form). Note that the <TT>smallcaps</TT><A NAME="2885"></A> -option redefines <TT>\acronymfont</TT><A NAME="2889"></A> so that it sets its argument +<I>abbrv</I> (the short form). Note that the <TT>smallcaps</TT><A NAME="2986"></A> +option redefines <TT>\acronymfont</TT><A NAME="2990"></A> so that it sets its argument in small captials otherwise <TT>\acronymfont</TT> simply displays its argument in the surrounding font. Note also that if none of -the package options <TT>smallcaps</TT><A NAME="2897"></A>, <TT>description</TT><A NAME="2906"></A> -or <TT>footnote</TT><A NAME="2915"></A> are used, <TT>\acronymfont</TT> is not used, so +the package options <TT>smallcaps</TT><A NAME="2998"></A>, <TT>description</TT><A NAME="3007"></A> +or <TT>footnote</TT><A NAME="3016"></A> are used, <TT>\acronymfont</TT> is not used, so changing the definition of <TT>\acronymfont</TT> will have no effect under such circumstances. @@ -1832,48 +1875,48 @@ under such circumstances. <A NAME="tab:acronymsettings"></A> <DIV ALIGN="CENTER"> -<A NAME="1161"></A> +<A NAME="1191"></A> <TABLE CELLPADDING=3> <CAPTION><STRONG>Table 1:</STRONG> Package options governing acronyms and how the information is stored in the glossary keys</CAPTION> <TR><TH ALIGN="LEFT"><B>Package Option </B></TH> -<TD ALIGN="LEFT"><TT>first</TT><A NAME="2919"></A></TD> -<TD ALIGN="LEFT"><TT>text</TT><A NAME="2922"></A></TD> -<TD ALIGN="LEFT"><TT>description</TT><A NAME="2925"></A></TD> -<TD ALIGN="LEFT"><TT>symbol</TT><A NAME="2928"></A></TD> +<TD ALIGN="LEFT"><TT>first</TT><A NAME="3020"></A></TD> +<TD ALIGN="LEFT"><TT>text</TT><A NAME="3023"></A></TD> +<TD ALIGN="LEFT"><TT>description</TT><A NAME="3026"></A></TD> +<TD ALIGN="LEFT"><TT>symbol</TT><A NAME="3029"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>description</TT><A NAME="2936"></A>,<TT>footnote</TT><A NAME="2945"></A></TD> +<TR><TD ALIGN="LEFT"><TT>description</TT><A NAME="3037"></A>,<TT>footnote</TT><A NAME="3046"></A></TD> <TD ALIGN="LEFT"><I>abbrv</I></TD> <TD ALIGN="LEFT"><I>abbrv</I></TD> <TD ALIGN="LEFT">user supplied</TD> <TD ALIGN="LEFT"><I>long</I></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>description</TT><A NAME="2954"></A>,<TT>dua</TT><A NAME="2963"></A></TD> +<TR><TD ALIGN="LEFT"><TT>description</TT><A NAME="3055"></A>,<TT>dua</TT><A NAME="3064"></A></TD> <TD ALIGN="LEFT"><I>long</I></TD> <TD ALIGN="LEFT"><I>long</I></TD> <TD ALIGN="LEFT">user supplied</TD> <TD ALIGN="LEFT"><I>abbrv</I></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>description</TT><A NAME="2972"></A></TD> +<TR><TD ALIGN="LEFT"><TT>description</TT><A NAME="3073"></A></TD> <TD ALIGN="LEFT"><I>long</I></TD> <TD ALIGN="LEFT"><I>abbrv</I></TD> <TD ALIGN="LEFT">user supplied</TD> <TD ALIGN="LEFT"><I>abbrv</I></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>footnote</TT><A NAME="2981"></A></TD> +<TR><TD ALIGN="LEFT"><TT>footnote</TT><A NAME="3082"></A></TD> <TD ALIGN="LEFT"><I>abbrv</I></TD> <TD ALIGN="LEFT"><I>abbrv</I></TD> <TD ALIGN="LEFT"><I>long</I></TD> <TD ALIGN="LEFT"> </TD> </TR> -<TR><TD ALIGN="LEFT"><TT>smallcaps</TT><A NAME="2990"></A></TD> +<TR><TD ALIGN="LEFT"><TT>smallcaps</TT><A NAME="3091"></A></TD> <TD ALIGN="LEFT"><I>long</I></TD> <TD ALIGN="LEFT"><I>abbrv</I></TD> <TD ALIGN="LEFT"><I>long</I></TD> <TD ALIGN="LEFT"><I>abbrv</I></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>dua</TT><A NAME="2999"></A></TD> +<TR><TD ALIGN="LEFT"><TT>dua</TT><A NAME="3100"></A></TD> <TD ALIGN="LEFT"><I>long</I></TD> <TD ALIGN="LEFT"><I>long</I></TD> <TD ALIGN="LEFT"><I>long</I></TD> @@ -1891,14 +1934,42 @@ is stored in the glossary keys</CAPTION> <BR> <P> -Each of the package options <TT>smallcaps</TT><A NAME="3008"></A>, <TT>footnote</TT><A NAME="3017"></A> -and <TT>description</TT><A NAME="3026"></A> use <TT>\defglsdisplay</TT><A NAME="3030"></A> and -<TT>\defglsdisplayfirst</TT><A NAME="3033"></A> (described <A HREF="glossaries-manual.html#sec:glsdisplay">earlier</A>) +In case you can't remember which key stores the long or short forms +(or their plurals) the <TT>glossaries</TT> package provides the +commands: + +<UL> +<LI><TT>\glsshortkey</TT> +The key used to store the short form. +</LI> +<LI><TT>\glsshortpluralkey</TT> +The key used to store the plural version of the short form. +</LI> +<LI><TT>\glslongkey</TT> +The key used to store the long form. +</LI> +<LI><TT>\glslongpluralkey</TT> +The key used to store the plural version of the long form. +</LI> +</UL> +These can be used in the optional argument of <TT>\newacronym</TT> +to override the defaults. For example: +<PRE> +\newacronym[\glslongpluralkey={diagonal matrices}]{dm}{DM}{diagonal +matrix} +</PRE> +If the first use uses the plural form, <code>\glspl{dm}</code> will +display: diagonal matrices (DMs). + +<P> +Each of the package options <TT>smallcaps</TT><A NAME="3110"></A>, <TT>footnote</TT><A NAME="3119"></A> +and <TT>description</TT><A NAME="3128"></A> use <TT>\defglsdisplay</TT><A NAME="3132"></A> and +<TT>\defglsdisplayfirst</TT><A NAME="3135"></A> (described <A HREF="glossaries-manual.html#sec:glsdisplay">earlier</A>) to change the way the link text is displayed. <P> <DL> -<DT><STRONG><TT>description</TT><A NAME="3041"></A>,<TT>footnote</TT><A NAME="3050"></A></STRONG></DT> +<DT><STRONG><TT>description</TT><A NAME="3143"></A>,<TT>footnote</TT><A NAME="3152"></A></STRONG></DT> <DD> When these two options are used together, the first use displays the entry as: @@ -1918,30 +1989,30 @@ variants. <P> Note also that when these two package options are used (in the given order), the <TT>glossaries</TT> package additionally implements the -<TT>sanitize</TT><A NAME="3060"></A> option using -<A NAME="3069"></A><A NAME="3076"></A><code>sanitize={description=false,symbol=false}</code>, so +<TT>sanitize</TT><A NAME="3162"></A> option using +<A NAME="3171"></A><A NAME="3178"></A><code>sanitize={description=false,symbol=false}</code>, so remember to protect fragile commands when defining acronyms. <P> </DD> <DT><STRONG>dua</STRONG></DT> <DD> -The <TT>dua</TT><A NAME="3083"></A> package option always displays the expanded -form and so may not be used with <TT>footnote</TT><A NAME="3092"></A> or -<TT>smallcaps</TT><A NAME="3101"></A>. Both first use and subsequent use displays the +The <TT>dua</TT><A NAME="3185"></A> package option always displays the expanded +form and so may not be used with <TT>footnote</TT><A NAME="3194"></A> or +<TT>smallcaps</TT><A NAME="3203"></A>. Both first use and subsequent use displays the entry in the form: <BR> <BR><I>long</I><I>insert</I> <BR> <BR> -If the <TT>description</TT><A NAME="3110"></A> option is also used, the <TT>name</TT><A NAME="3114"></A> -key is set to the long form, otherwise the <TT>name</TT><A NAME="3117"></A> key is -set to the short form and the <TT>description</TT><A NAME="3120"></A> key is set to +If the <TT>description</TT><A NAME="3212"></A> option is also used, the <TT>name</TT><A NAME="3216"></A> +key is set to the long form, otherwise the <TT>name</TT><A NAME="3219"></A> key is +set to the short form and the <TT>description</TT><A NAME="3222"></A> key is set to the long form. <P> </DD> -<DT><STRONG><TT>description</TT><A NAME="3128"></A></STRONG></DT> +<DT><STRONG><TT>description</TT><A NAME="3230"></A></STRONG></DT> <DD> This option displays the entry on first use as: <BR> @@ -1955,12 +2026,12 @@ while subsequent use displays the entry as: <BR> Note also that if this package option is used, the <TT>glossaries</TT> package additionally implements the option -<A NAME="3138"></A><code>sanitize={symbol=false}</code>, so +<A NAME="3240"></A><code>sanitize={symbol=false}</code>, so remember to protect fragile commands when defining acronyms. <P> </DD> -<DT><STRONG><TT>footnote</TT><A NAME="3145"></A></STRONG></DT> +<DT><STRONG><TT>footnote</TT><A NAME="3247"></A></STRONG></DT> <DD> This option displays the entry on first use as: <BR> @@ -1974,14 +2045,14 @@ while subsequent use displays the entry as: <P> Note also that if this package option is used, the <TT>glossaries</TT> package additionally implements the option -<A NAME="3155"></A><code>sanitize={description=false}</code>, so +<A NAME="3257"></A><code>sanitize={description=false}</code>, so remember to protect fragile commands when defining acronyms. <P> </DD> -<DT><STRONG><TT>smallcaps</TT><A NAME="3162"></A></STRONG></DT> +<DT><STRONG><TT>smallcaps</TT><A NAME="3264"></A></STRONG></DT> <DD> -If neither the <TT>footnote</TT><A NAME="3171"></A> nor <TT>description</TT><A NAME="3180"></A> options +If neither the <TT>footnote</TT><A NAME="3273"></A> nor <TT>description</TT><A NAME="3282"></A> options have been set, this option displays the entry on first use as: <BR> <BR><I>long</I><I>insert</I> (<TT>\acronymfont{</TT><EM>abbrv</EM><TT>}</TT>) @@ -1997,15 +2068,15 @@ where <TT>\acronymfont</TT> is set to <TT>\textsc</TT>. <P> Note also that if this package option is used, the <TT>glossaries</TT> package additionally implements the option -<A NAME="3190"></A><code>sanitize={symbol=false}</code>, so +<A NAME="3292"></A><code>sanitize={symbol=false}</code>, so remember to protect fragile commands when defining acronyms. <P> </DD> <DT><STRONG>None of the above</STRONG></DT> <DD> -If none of the package options <TT>smallcaps</TT><A NAME="3197"></A>, <TT>footnote</TT><A NAME="3206"></A> -or <TT>description</TT><A NAME="3215"></A> are used, then on first use the entry is +If none of the package options <TT>smallcaps</TT><A NAME="3299"></A>, <TT>footnote</TT><A NAME="3308"></A> +or <TT>description</TT><A NAME="3317"></A> are used, then on first use the entry is displayed as: <BR> <BR><I>long</I> (<I>abbrv</I>)<I>insert</I> @@ -2022,7 +2093,7 @@ while subsequent use displays the entry as: <P> Recall from <A HREF="glossaries-manual.html#sec:glslink">earlier</A> that you can access the values of individual keys using commands -like <TT>\glstext</TT><A NAME="3219"></A>, so it is possible to use these commands to +like <TT>\glstext</TT><A NAME="3321"></A>, so it is possible to use these commands to print just the long form or just the abbreviation without affecting the flag that determines whether the entry has been used. However the keys that store the long and short form vary depending on @@ -2042,8 +2113,8 @@ as follows: <BR> Print the abbreviated version with a hyperlink (if necessary) to the relevant entry in the glossary. This is usually equivalent to -<TT>\glstext</TT><A NAME="3223"></A> (or its uppercase variants) but may additionally -put the link text within the argument to <TT>\acronymfont</TT><A NAME="3226"></A>. +<TT>\glstext</TT><A NAME="3325"></A> (or its uppercase variants) but may additionally +put the link text within the argument to <TT>\acronymfont</TT><A NAME="3328"></A>. <BR> <BR> <P> @@ -2057,7 +2128,7 @@ put the link text within the argument to <TT>\acronymfont</TT><A NAME="3226" <BR> Print the long version with a hyperlink (if necessary) to the relevant entry in the glossary. This is may be equivalent to -<TT>\glsdesc</TT><A NAME="3229"></A>, <TT>\glssymbol</TT><A NAME="3232"></A> or <TT>\glsfirst</TT><A NAME="3235"></A> (or their uppercase +<TT>\glsdesc</TT><A NAME="3331"></A>, <TT>\glssymbol</TT><A NAME="3334"></A> or <TT>\glsfirst</TT><A NAME="3337"></A> (or their uppercase variants), depending on package options. <BR> <BR> @@ -2075,10 +2146,10 @@ with a hyperlink (if necessary) to the relevant entry in the glossary. <P> -Note that if you change the definition of <TT>\newacronym</TT><A NAME="3238"></A>, you +Note that if you change the definition of <TT>\newacronym</TT><A NAME="3340"></A>, you may additionally need to change the above commands as well as -the changing way the text is displayed using <TT>\defglsdisplay</TT><A NAME="3241"></A> -and <TT>\defglsdisplayfirst</TT><A NAME="3244"></A>. +the changing way the text is displayed using <TT>\defglsdisplay</TT><A NAME="3343"></A> +and <TT>\defglsdisplayfirst</TT><A NAME="3346"></A>. <P> @@ -2092,10 +2163,10 @@ Unsetting and resetting entry flags</A> </H2> <P> -When using commands such as <TT>\gls</TT><A NAME="3250"></A> it is possible that you may want -to use the value given by the <TT>first</TT><A NAME="3253"></A> key, even though you have +When using commands such as <TT>\gls</TT><A NAME="3352"></A> it is possible that you may want +to use the value given by the <TT>first</TT><A NAME="3355"></A> key, even though you have already used the glossary entry. Conversely, you may want to use the -value given by the <TT>text</TT><A NAME="3256"></A> key, even though you haven't used the +value given by the <TT>text</TT><A NAME="3358"></A> key, even though you haven't used the glossary entry. The former can be achieved by one of the following commands: <BR> @@ -2133,7 +2204,7 @@ The <TT>glossaries</TT> package comes with some pre-defined glossary styles. These are as follows: <DL> <DT><STRONG>list</STRONG></DT> -<DD>The <TT>list</TT><A NAME="3263"></A> style uses the <TT>description</TT> +<DD>The <TT>list</TT><A NAME="3365"></A> style uses the <TT>description</TT> environment. The entry name is placed in the optional argument of the <TT>\item</TT> command (so it will appear in bold by default). The description follows, and then the associated number @@ -2142,33 +2213,33 @@ list for that entry. <P> </DD> <DT><STRONG>listgroup</STRONG></DT> -<DD>The <TT>listgroup</TT><A NAME="3266"></A> style is like -<TT>list</TT><A NAME="3268"></A> but the glossary groups have headings. +<DD>The <TT>listgroup</TT><A NAME="3368"></A> style is like +<TT>list</TT><A NAME="3370"></A> but the glossary groups have headings. <P> </DD> <DT><STRONG>listhypergroup</STRONG></DT> -<DD>The <TT>listhypergroup</TT><A NAME="3270"></A> style is like -<TT>listgroup</TT><A NAME="3272"></A> but has a set of links to the glossary +<DD>The <TT>listhypergroup</TT><A NAME="3372"></A> style is like +<TT>listgroup</TT><A NAME="3374"></A> but has a set of links to the glossary groups. <P> </DD> <DT><STRONG>altlist</STRONG></DT> -<DD>The <TT>altlist</TT><A NAME="3274"></A> style is like <TT>list</TT><A NAME="3276"></A> +<DD>The <TT>altlist</TT><A NAME="3376"></A> style is like <TT>list</TT><A NAME="3378"></A> but the description is placed on the following line. <P> </DD> <DT><STRONG>altlistgroup</STRONG></DT> -<DD>The <TT>altlistgroup</TT><A NAME="3278"></A> style is like -<TT>altlist</TT><A NAME="3280"></A> but the glossary groups have headings. +<DD>The <TT>altlistgroup</TT><A NAME="3380"></A> style is like +<TT>altlist</TT><A NAME="3382"></A> but the glossary groups have headings. <P> </DD> <DT><STRONG>altlisthypergroup</STRONG></DT> -<DD>The <TT>altlisthypergroup</TT><A NAME="3282"></A> style is like -<TT>altlistgroup</TT><A NAME="3284"></A> but has a set of links to the glossary +<DD>The <TT>altlisthypergroup</TT><A NAME="3384"></A> style is like +<TT>altlistgroup</TT><A NAME="3386"></A> but has a set of links to the glossary groups. <P> @@ -2177,172 +2248,172 @@ groups. <DD>This style uses the <TT>description</TT> environment. Each entry starts with <code>\item[]</code>, followed by the name followed by a dotted line, followed by the description. Note that -this style ignores both the number list<A NAME="3286"></A> and the symbol. The +this style ignores both the number list<A NAME="3388"></A> and the symbol. The length <TT>\glslistdottedwidth</TT> governs where the description should start.<A NAME="tex2html8" - HREF="#foot1409"><SUP>4</SUP></A> + HREF="#foot1453"><SUP>4</SUP></A> <P> </DD> <DT><STRONG>long</STRONG></DT> -<DD>The <TT>long</TT><A NAME="3288"></A> style uses the <TT>longtable</TT> -environment (defined by the <TT>longtable</TT><A NAME="3291"></A> package). It has two +<DD>The <TT>long</TT><A NAME="3390"></A> style uses the <TT>longtable</TT> +environment (defined by the <TT>longtable</TT><A NAME="3393"></A> package). It has two columns: the first column contains the entry's name and the second -column contains the description followed by the number list<A NAME="3293"></A>. +column contains the description followed by the number list<A NAME="3395"></A>. <P> </DD> <DT><STRONG>longborder</STRONG></DT> -<DD>The <TT>longborder</TT><A NAME="3295"></A> style is like -<TT>long</TT><A NAME="3297"></A> but has horizontal and vertical lines around it. +<DD>The <TT>longborder</TT><A NAME="3397"></A> style is like +<TT>long</TT><A NAME="3399"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>longheader</STRONG></DT> -<DD>The <TT>longheader</TT><A NAME="3299"></A> style is like -<TT>long</TT><A NAME="3301"></A> but has a header row. +<DD>The <TT>longheader</TT><A NAME="3401"></A> style is like +<TT>long</TT><A NAME="3403"></A> but has a header row. <P> </DD> <DT><STRONG>longheaderborder</STRONG></DT> -<DD>The <TT>longheaderborder</TT><A NAME="3303"></A> style is -like <TT>longheader</TT><A NAME="3305"></A> but has horizontal and vertical lines +<DD>The <TT>longheaderborder</TT><A NAME="3405"></A> style is +like <TT>longheader</TT><A NAME="3407"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>long3col</STRONG></DT> -<DD>The <TT>long3col</TT><A NAME="3307"></A> style is like -<TT>long</TT><A NAME="3309"></A> but has three columns. The first column contains +<DD>The <TT>long3col</TT><A NAME="3409"></A> style is like +<TT>long</TT><A NAME="3411"></A> but has three columns. The first column contains the entry's name, the second column contains the description -and the third column contains the number list<A NAME="3310"></A>. +and the third column contains the number list<A NAME="3412"></A>. <P> </DD> <DT><STRONG>long3colborder</STRONG></DT> -<DD>The <TT>long3colborder</TT><A NAME="3312"></A> style is like -the <TT>long3col</TT><A NAME="3314"></A> style but has horizontal and vertical +<DD>The <TT>long3colborder</TT><A NAME="3414"></A> style is like +the <TT>long3col</TT><A NAME="3416"></A> style but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>long3colheader</STRONG></DT> -<DD>The <TT>long3colheader</TT><A NAME="3316"></A> style is like -<TT>long3col</TT><A NAME="3318"></A> but has a header row. +<DD>The <TT>long3colheader</TT><A NAME="3418"></A> style is like +<TT>long3col</TT><A NAME="3420"></A> but has a header row. <P> </DD> <DT><STRONG>long3colheaderborder</STRONG></DT> -<DD>The <TT>long3colheaderborder</TT><A NAME="3320"></A> style is -like <TT>long3colheader</TT><A NAME="3322"></A> but has horizontal and vertical lines +<DD>The <TT>long3colheaderborder</TT><A NAME="3422"></A> style is +like <TT>long3colheader</TT><A NAME="3424"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>long4col</STRONG></DT> -<DD>The <TT>long4col</TT><A NAME="3324"></A> style is like -<TT>long3col</TT><A NAME="3326"></A> but has an additional column in which the +<DD>The <TT>long4col</TT><A NAME="3426"></A> style is like +<TT>long3col</TT><A NAME="3428"></A> but has an additional column in which the entry's associated symbol appears. <P> </DD> <DT><STRONG>long4colborder</STRONG></DT> -<DD>The <TT>long4colborder</TT><A NAME="3328"></A> style is like -the <TT>long4col</TT><A NAME="3330"></A> style but has horizontal and vertical +<DD>The <TT>long4colborder</TT><A NAME="3430"></A> style is like +the <TT>long4col</TT><A NAME="3432"></A> style but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>long4colheader</STRONG></DT> -<DD>The <TT>long4colheader</TT><A NAME="3332"></A> style is like -<TT>long4col</TT><A NAME="3334"></A> but has a header row. +<DD>The <TT>long4colheader</TT><A NAME="3434"></A> style is like +<TT>long4col</TT><A NAME="3436"></A> but has a header row. <P> </DD> <DT><STRONG>long4colheaderborder</STRONG></DT> -<DD>The <TT>long4colheaderborder</TT><A NAME="3336"></A> style is -like <TT>long4colheader</TT><A NAME="3338"></A> but has horizontal and vertical lines +<DD>The <TT>long4colheaderborder</TT><A NAME="3438"></A> style is +like <TT>long4colheader</TT><A NAME="3440"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>super</STRONG></DT> -<DD>The <TT>super</TT><A NAME="3340"></A> style uses the <TT>supertabular</TT> -environment (defined by the <TT>supertabular</TT><A NAME="3343"></A> package). It has two +<DD>The <TT>super</TT><A NAME="3442"></A> style uses the <TT>supertabular</TT> +environment (defined by the <TT>supertabular</TT><A NAME="3445"></A> package). It has two columns: the first column contains the entry's name and the second -column contains the description followed by the number list<A NAME="3345"></A>. +column contains the description followed by the number list<A NAME="3447"></A>. <P> </DD> <DT><STRONG>superborder</STRONG></DT> -<DD>The <TT>superborder</TT><A NAME="3347"></A> style is like -<TT>super</TT><A NAME="3349"></A> but has horizontal and vertical lines around it. +<DD>The <TT>superborder</TT><A NAME="3449"></A> style is like +<TT>super</TT><A NAME="3451"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>superheader</STRONG></DT> -<DD>The <TT>superheader</TT><A NAME="3351"></A> style is like -<TT>super</TT><A NAME="3353"></A> but has a header row. +<DD>The <TT>superheader</TT><A NAME="3453"></A> style is like +<TT>super</TT><A NAME="3455"></A> but has a header row. <P> </DD> <DT><STRONG>superheaderborder</STRONG></DT> -<DD>The <TT>superheaderborder</TT><A NAME="3355"></A> style is -like <TT>superheader</TT><A NAME="3357"></A> but has horizontal and vertical lines +<DD>The <TT>superheaderborder</TT><A NAME="3457"></A> style is +like <TT>superheader</TT><A NAME="3459"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>super3col</STRONG></DT> -<DD>The <TT>super3col</TT><A NAME="3359"></A> style is like -<TT>super</TT><A NAME="3361"></A> but has three columns. The first column contains +<DD>The <TT>super3col</TT><A NAME="3461"></A> style is like +<TT>super</TT><A NAME="3463"></A> but has three columns. The first column contains the entry's name, the second column contains the description -and the third column contains the <A NAME="3362"></A>. +and the third column contains the <A NAME="3464"></A>. <P> </DD> <DT><STRONG>super3colborder</STRONG></DT> -<DD>The <TT>super3colborder</TT><A NAME="3364"></A> style is like -the <TT>super3col</TT><A NAME="3366"></A> style but has horizontal and vertical +<DD>The <TT>super3colborder</TT><A NAME="3466"></A> style is like +the <TT>super3col</TT><A NAME="3468"></A> style but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>super3colheader</STRONG></DT> -<DD>The <TT>super3colheader</TT><A NAME="3368"></A> style is like -<TT>super3col</TT><A NAME="3370"></A> but has a header row. +<DD>The <TT>super3colheader</TT><A NAME="3470"></A> style is like +<TT>super3col</TT><A NAME="3472"></A> but has a header row. <P> </DD> <DT><STRONG>super3colheaderborder</STRONG></DT> -<DD>The <TT>super3colheaderborder</TT><A NAME="3372"></A> style -is like <TT>super3colheader</TT><A NAME="3374"></A> but has horizontal and vertical +<DD>The <TT>super3colheaderborder</TT><A NAME="3474"></A> style +is like <TT>super3colheader</TT><A NAME="3476"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>super4col</STRONG></DT> -<DD>The <TT>super4col</TT><A NAME="3376"></A> style is like -<TT>super3col</TT><A NAME="3378"></A> but has an additional column in which the +<DD>The <TT>super4col</TT><A NAME="3478"></A> style is like +<TT>super3col</TT><A NAME="3480"></A> but has an additional column in which the entry's associated symbol appears. <P> </DD> <DT><STRONG>super4colborder</STRONG></DT> -<DD>The <TT>super4colborder</TT><A NAME="3380"></A> style is like -the <TT>super4col</TT><A NAME="3382"></A> style but has horizontal and vertical +<DD>The <TT>super4colborder</TT><A NAME="3482"></A> style is like +the <TT>super4col</TT><A NAME="3484"></A> style but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>super4colheader</STRONG></DT> -<DD>The <TT>super4colheader</TT><A NAME="3384"></A> style is like -<TT>super4col</TT><A NAME="3386"></A> but has a header row. +<DD>The <TT>super4colheader</TT><A NAME="3486"></A> style is like +<TT>super4col</TT><A NAME="3488"></A> but has a header row. <P> </DD> <DT><STRONG>super4colheaderborder</STRONG></DT> -<DD>The <TT>super4colheaderborder</TT><A NAME="3388"></A> style -is like <TT>super4colheader</TT><A NAME="3390"></A> but has horizontal and vertical +<DD>The <TT>super4colheaderborder</TT><A NAME="3490"></A> style +is like <TT>super4colheader</TT><A NAME="3492"></A> but has horizontal and vertical lines around it. <P> @@ -2350,16 +2421,16 @@ lines around it. </DL> <P> -The glossary style can be set using the <TT>style</TT><A NAME="3397"></A> package option -or using the <TT>style</TT><A NAME="3401"></A> key in the optional -argument to <TT>\printglossary</TT><A NAME="3404"></A> or using the command: +The glossary style can be set using the <TT>style</TT><A NAME="3499"></A> package option +or using the <TT>style</TT><A NAME="3503"></A> key in the optional +argument to <TT>\printglossary</TT><A NAME="3506"></A> or using the command: <BR> <BR><TT>\glossarystyle{</TT><EM>style-name</EM><TT>}</TT> <BR> <BR> <P> All the styles except for the three- and four-column styles and the -<TT>listdotted</TT><A NAME="3407"></A> style use the command +<TT>listdotted</TT><A NAME="3509"></A> style use the command <TT>\glspostdescription</TT> after the description. This simply displays a full stop by default. To eliminate this full stop (or replace it with something else, say a comma), you @@ -2395,7 +2466,7 @@ This environment defines how the main body of the glossary should be typeset. Note that this does not include the section heading, the glossary preamble (defined by <TT>\glossarypreamble</TT>) or the glossary postamble (defined by <TT>\glossarypostamble</TT>.) For example, -the <TT>list</TT><A NAME="3413"></A> style uses the <TT>description</TT> environment, +the <TT>list</TT><A NAME="3515"></A> style uses the <TT>description</TT> environment, so the <TT>theglossary</TT> environment is simply redefined to begin and end the <TT>description</TT> environment. @@ -2408,8 +2479,8 @@ and end the <TT>description</TT> environment. This macro indicates what to do at the start of the main body of the glossary. Note that this is not the same as <TT>\glossarypreamble</TT>, which should not be affected by changes in -the glossary style. The <TT>list</TT><A NAME="3418"></A> glossary style redefines -<TT>\glossaryheader</TT> to do nothing, whereas the <TT>longheader</TT><A NAME="3420"></A> +the glossary style. The <TT>list</TT><A NAME="3520"></A> glossary style redefines +<TT>\glossaryheader</TT> to do nothing, whereas the <TT>longheader</TT><A NAME="3522"></A> glossary style redefines <TT>\glossaryheader</TT> to do a header row. <P> @@ -2421,14 +2492,14 @@ glossary style redefines <TT>\glossaryheader</TT> to do a header row. This macro indicates what to do at the start of each logical block within the main body of the glossary. The glossary is sub-divided into twenty-eight logical blocks that are determined by the first character -of the <TT>sort</TT><A NAME="3422"></A> key (or <TT>name</TT><A NAME="3425"></A> key if the <TT>sort</TT><A NAME="3428"></A> +of the <TT>sort</TT><A NAME="3524"></A> key (or <TT>name</TT><A NAME="3527"></A> key if the <TT>sort</TT><A NAME="3530"></A> key is omitted). The sub-divisions are in the following order: symbols, numbers, A, ..., Z. Note that the argument to <TT>\glsgroupheading</TT> is a label <I>not</I> the group title. The group title can be obtained via <TT>\glsgetgrouptitle{</TT><EM>label</EM><TT>}</TT>, and a navigation hypertarget can be created using <TT>\glsnavhypertarget{</TT><EM>label</EM><TT>}</TT>. Most of the predefined glossary styles redefine <TT>\glsgroupheading</TT> to simply -ignore its argument. The <TT>listhypergroup</TT><A NAME="3431"></A> style redefines +ignore its argument. The <TT>listhypergroup</TT><A NAME="3533"></A> style redefines <TT>\glsgroupheading</TT> as follows: <PRE> \renewcommand*{\glsgroupheading}[1]{% @@ -2444,7 +2515,7 @@ See also <TT>\glsgroupskip</TT> below. (Note that command definitions withi <TT>\glsgroupskip</TT> <P> This macro determines what to do after one logical group but before -the header for the next logical group. The <TT>list</TT><A NAME="3433"></A> glossary +the header for the next logical group. The <TT>list</TT><A NAME="3535"></A> glossary style simply redefines <TT>\glsgroupskip</TT> to be <TT>\indexspace</TT>. <P> @@ -2463,14 +2534,14 @@ Note that <I>label</I> is the label used when the glossary entry was defined via either <TT>\newglossaryentry</TT> or <TT>\newacronym</TT>. Each time you use a glossary entry it creates a link<A NAME="tex2html9" - HREF="#foot1752"><SUP>5</SUP></A> + HREF="#foot1825"><SUP>5</SUP></A> using <TT>\@glslink{</TT><EM>label</EM><TT>}{</TT><EM>text</EM><TT>}</TT> with the label <TT>glo:</TT><I>label</I>. Your new glossary style must therefore redefine <TT>\glossaryentryfield</TT> so that it uses <TT>\@glstarget</TT><code>{</code><TT>glo:</TT><I>label</I><code>}</code><TT>{</TT><EM>text</EM><TT>}</TT> to ensure the hyperlinks function correctly.<A NAME="tex2html10" - HREF="#foot1753"><SUP>6</SUP></A> For example, the -<TT>list</TT><A NAME="3435"></A> style defines <TT>\glossaryentryfield</TT> as follows: + HREF="#foot1826"><SUP>6</SUP></A> For example, the +<TT>list</TT><A NAME="3537"></A> style defines <TT>\glossaryentryfield</TT> as follows: <PRE> \renewcommand*{\glossaryentryfield}[5]{% \item[\@glstarget{glo:##1}{##2}] ##3\glspostdescription\space ##5} @@ -2489,15 +2560,15 @@ may contain <TT>\delimN</TT> (to delimit individual numbers) and/or multiple occurrences of <TT>\setentrycounter{</TT><EM>counter name</EM><TT>}\glsnumberformat{</TT><EM>number(s)</EM><TT>}</TT>, but note that the entire number list is enclosed within the argument -to <TT>\glossaryentrynumbers</TT><A NAME="3437"></A>. The user can redefine this to change +to <TT>\glossaryentrynumbers</TT><A NAME="3539"></A>. The user can redefine this to change the way the entire number list is formatted, regardless of the glossary style. However the most common use of <TT>\glossaryentrynumbers</TT> is to provide a means of suppressing the -number list altogether. (In fact, the <TT>nonumberlist</TT><A NAME="3445"></A> option +number list altogether. (In fact, the <TT>nonumberlist</TT><A NAME="3547"></A> option redefines <TT>\glossaryentrynumbers</TT> to ignore its argument.) Therefore, when you define a new glossary style, you don't need to worry about whether the user has specified the -<TT>nonumberlist</TT><A NAME="3454"></A> package option. +<TT>nonumberlist</TT><A NAME="3556"></A> package option. </DD> </DL> <P> @@ -2526,7 +2597,7 @@ should do nothing) and suppose you don't want anything to appear immediately after <code>\begin{theglossary}</code> (so <TT>\glossaryheader</TT> should do nothing). In addition, let's suppose the symbol should appear in brackets after the name, followed by the description and -last of all the number list<A NAME="3462"></A> should appear within square brackets +last of all the number list<A NAME="3564"></A> should appear within square brackets at the end. Then you can create this new glossary style, called, say, <TT>mylist</TT>, as follows: <PRE> @@ -2564,7 +2635,7 @@ If you want to define a new style that is a slightly modified version of an existing style, you can use <TT>\glossarystyle</TT> within the second argument of <TT>\newglossarystyle</TT> followed by whatever alterations you require. For example, suppose you want -a style like the <TT>list</TT><A NAME="3467"></A> style but you don't want the extra +a style like the <TT>list</TT><A NAME="3569"></A> style but you don't want the extra vertical space created by <TT>\indexspace</TT> between groups, then you can create a new glossary style called, say, <TT>mylist</TT> as follows: @@ -2580,640 +2651,710 @@ follows: <P> +<H1><A NAME="SECTION00050000000000000000"></A> +<A NAME="sec:mfirstuc"></A> +<BR> +Mfirstuc Package +</H1> + <P> +The <TT>glossaries</TT> package is supplied with the package +<TT>mfirstuc</TT><A NAME="3575"></A> which provides the command: +<BR> <BR> +<TT>\makefirstuc{</TT><EM>stuff</EM><TT>}</TT> +<BR> +<BR> +which makes the first object of +<I>stuff</I> uppercase unless <I>stuff</I> starts with a control +sequence followed by a group, in which case the first +object in the group is converted to uppercase. Examples: -<H2><A NAME="SECTION00050000000000000000"> +<UL> +<LI><code>\makefirstuc{abc}</code> produces Abc + +<P> +</LI> +<LI><code>\makefirstuc{\emph{abc}}</code> produces <I>Abc</I> +(<TT>\MakeUppercase</TT><A NAME="3578"></A> has been applied to the letter "a" rather +than <TT>\emph</TT>.) + +<P> +</LI> +<LI><code>\makefirstuc{{\'a}bc}</code> produces Ábc + +<P> +</LI> +<LI><code>\makefirstuc{\ae bc}</code> produces Æbc + +<P> +</LI> +<LI><code>\makefirstuc{{\ae}bc}</code> produces Æbc +</LI> +</UL> + +<P> +Note however that <code>\makefirstuc{\ae{}bc}</code> produces æBc since +the empty group following <TT>\ae</TT> is considered to be the argument +of <TT>\ae</TT> which is in fact not the case. + +<P> +<A HREF="glossaries-manual.html#top">Top</A> + +<P> + +<P> +<BR> + +<H2><A NAME="SECTION00060000000000000000"> Index</A> </H2><DL COMPACT> <DT><STRONG><TT>\acronymfont</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2889">Acronyms</A> - | <A HREF="glossaries-manual.html#3226">Acronyms</A> +<DD><A HREF="glossaries-manual.html#2990">Acronyms</A> + | <A HREF="glossaries-manual.html#3328">Acronyms</A> <DT><STRONG><TT>\acronymtype</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1978">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2247">Package Options</A> - | <A HREF="glossaries-manual.html#2534">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#2052">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2321">Package Options</A> + | <A HREF="glossaries-manual.html#2650">Defining Glossary Entries</A> <DT><STRONG><TT>babel</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1804">Introduction</A> - | <A HREF="glossaries-manual.html#2368">Package Options</A> - | <A HREF="glossaries-manual.html#2380">Package Options</A> +<DD><A HREF="glossaries-manual.html#1877">Introduction</A> + | <A HREF="glossaries-manual.html#2442">Package Options</A> + | <A HREF="glossaries-manual.html#2454">Package Options</A> <DT><STRONG><TT>\defglsdisplay</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3030">Acronyms</A> - | <A HREF="glossaries-manual.html#3241">Acronyms</A> +<DD><A HREF="glossaries-manual.html#3132">Acronyms</A> + | <A HREF="glossaries-manual.html#3343">Acronyms</A> <DT><STRONG><TT>\defglsdisplayfirst</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3033">Acronyms</A> - | <A HREF="glossaries-manual.html#3244">Acronyms</A> +<DD><A HREF="glossaries-manual.html#3135">Acronyms</A> + | <A HREF="glossaries-manual.html#3346">Acronyms</A> <DT><STRONG><TT>\emph</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2036">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2110">A Quick Guide For</A> <DT><STRONG>file types</STRONG> <DD><DL COMPACT> <DT><STRONG>.alg</STRONG> -<DD><A HREF="glossaries-manual.html#1864">Generating the associated glossary</A> +<DD><A HREF="glossaries-manual.html#1938">Generating the associated glossary</A> <DT><STRONG>.glg</STRONG> -<DD><A HREF="glossaries-manual.html#1862">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#1924">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#1936">Generating the associated glossary</A> + | <A HREF="glossaries-manual.html#1998">A Quick Guide For</A> <DT><STRONG>.glo</STRONG> -<DD><A HREF="glossaries-manual.html#2444">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#2518">Defining Glossary Entries</A> <DT><STRONG>.gls</STRONG> -<DD><A HREF="glossaries-manual.html#2446">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#2520">Defining Glossary Entries</A> <DT><STRONG>.ist</STRONG> -<DD><A HREF="glossaries-manual.html#1836">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#2460">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2465">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#1910">Generating the associated glossary</A> + | <A HREF="glossaries-manual.html#2534">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2539">Defining Glossary Entries</A> <DT><STRONG>.nlg</STRONG> -<DD><A HREF="glossaries-manual.html#1922">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#1996">A Quick Guide For</A> </DL> <DT><STRONG><TT>glossary</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1800">Introduction</A> +<DD><A HREF="glossaries-manual.html#1873">Introduction</A> <DT><STRONG>glossary styles</STRONG> <DD><DL COMPACT> <DT><STRONG>altlist</STRONG> -<DD><A HREF="glossaries-manual.html#3274">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3280">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3376">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3382">Glossary Styles</A> <DT><STRONG>altlistgroup</STRONG> -<DD><A HREF="glossaries-manual.html#3278">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3284">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3380">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3386">Glossary Styles</A> <DT><STRONG>altlisthypergroup</STRONG> -<DD><A HREF="glossaries-manual.html#3282">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3384">Glossary Styles</A> <DT><STRONG>list</STRONG> -<DD><A HREF="glossaries-manual.html#3263">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3268">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3276">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3413">Defining your own glossary</A> - | <A HREF="glossaries-manual.html#3418">Defining your own glossary</A> - | <A HREF="glossaries-manual.html#3433">Defining your own glossary</A> - | <A HREF="glossaries-manual.html#3435">Defining your own glossary</A> - | <A HREF="glossaries-manual.html#3467">Example: creating a new</A> +<DD><A HREF="glossaries-manual.html#3365">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3370">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3378">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3515">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#3520">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#3535">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#3537">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#3569">Example: creating a new</A> <DT><STRONG>listdotted</STRONG> -<DD><A HREF="glossaries-manual.html#3407">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3509">Glossary Styles</A> <DT><STRONG>listgroup</STRONG> -<DD><A HREF="glossaries-manual.html#3266">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3272">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3368">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3374">Glossary Styles</A> <DT><STRONG>listhypergroup</STRONG> -<DD><A HREF="glossaries-manual.html#3270">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3431">Defining your own glossary</A> +<DD><A HREF="glossaries-manual.html#3372">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3533">Defining your own glossary</A> <DT><STRONG>long</STRONG> -<DD><A HREF="glossaries-manual.html#3288">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3297">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3301">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3309">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3390">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3399">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3403">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3411">Glossary Styles</A> <DT><STRONG>long3col</STRONG> -<DD><A HREF="glossaries-manual.html#3307">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3314">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3318">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3326">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3409">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3416">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3420">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3428">Glossary Styles</A> <DT><STRONG>long3colborder</STRONG> -<DD><A HREF="glossaries-manual.html#3312">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3414">Glossary Styles</A> <DT><STRONG>long3colheader</STRONG> -<DD><A HREF="glossaries-manual.html#3316">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3322">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3418">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3424">Glossary Styles</A> <DT><STRONG>long3colheaderborder</STRONG> -<DD><A HREF="glossaries-manual.html#3320">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3422">Glossary Styles</A> <DT><STRONG>long4col</STRONG> -<DD><A HREF="glossaries-manual.html#2069">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3324">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3330">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3334">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2143">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3426">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3432">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3436">Glossary Styles</A> <DT><STRONG>long4colborder</STRONG> -<DD><A HREF="glossaries-manual.html#2073">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3328">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2147">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3430">Glossary Styles</A> <DT><STRONG>long4colheader</STRONG> -<DD><A HREF="glossaries-manual.html#2071">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3332">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3338">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2145">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3434">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3440">Glossary Styles</A> <DT><STRONG>long4colheaderborder</STRONG> -<DD><A HREF="glossaries-manual.html#2075">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3336">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2149">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3438">Glossary Styles</A> <DT><STRONG>longborder</STRONG> -<DD><A HREF="glossaries-manual.html#3295">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3397">Glossary Styles</A> <DT><STRONG>longheader</STRONG> -<DD><A HREF="glossaries-manual.html#3299">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3305">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3420">Defining your own glossary</A> +<DD><A HREF="glossaries-manual.html#3401">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3407">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3522">Defining your own glossary</A> <DT><STRONG>longheaderborder</STRONG> -<DD><A HREF="glossaries-manual.html#3303">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3405">Glossary Styles</A> <DT><STRONG>super</STRONG> -<DD><A HREF="glossaries-manual.html#3340">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3349">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3353">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3361">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3442">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3451">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3455">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3463">Glossary Styles</A> <DT><STRONG>super3col</STRONG> -<DD><A HREF="glossaries-manual.html#3359">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3366">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3370">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3378">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3461">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3468">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3472">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3480">Glossary Styles</A> <DT><STRONG>super3colborder</STRONG> -<DD><A HREF="glossaries-manual.html#3364">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3466">Glossary Styles</A> <DT><STRONG>super3colheader</STRONG> -<DD><A HREF="glossaries-manual.html#3368">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3374">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3470">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3476">Glossary Styles</A> <DT><STRONG>super3colheaderborder</STRONG> -<DD><A HREF="glossaries-manual.html#3372">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3474">Glossary Styles</A> <DT><STRONG>super4col</STRONG> -<DD><A HREF="glossaries-manual.html#2077">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3376">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3382">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3386">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2151">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3478">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3484">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3488">Glossary Styles</A> <DT><STRONG>super4colborder</STRONG> -<DD><A HREF="glossaries-manual.html#2081">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3380">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2155">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3482">Glossary Styles</A> <DT><STRONG>super4colheader</STRONG> -<DD><A HREF="glossaries-manual.html#2079">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3384">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3390">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2153">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3486">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3492">Glossary Styles</A> <DT><STRONG>super4colheaderborder</STRONG> -<DD><A HREF="glossaries-manual.html#2083">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3388">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2157">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3490">Glossary Styles</A> <DT><STRONG>superborder</STRONG> -<DD><A HREF="glossaries-manual.html#3347">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3449">Glossary Styles</A> <DT><STRONG>superheader</STRONG> -<DD><A HREF="glossaries-manual.html#3351">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3357">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3453">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3459">Glossary Styles</A> <DT><STRONG>superheaderborder</STRONG> -<DD><A HREF="glossaries-manual.html#3355">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3457">Glossary Styles</A> </DL> <DT><STRONG><TT>glossary-list</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1996">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2070">A Quick Guide For</A> <DT><STRONG><TT>\glossaryentrynumbers</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3437">Defining your own glossary</A> +<DD><A HREF="glossaries-manual.html#3539">Defining your own glossary</A> <DT><STRONG><TT>\glossarystyle</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2094">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2820">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#2168">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2921">Displaying a glossary</A> <DT><STRONG><TT>\gls</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1960">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2005">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2008">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2011">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2054">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2482">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2491">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2638">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2644">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2650">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2656">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2662">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2674">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2686">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2702">Changing the format of</A> - | <A HREF="glossaries-manual.html#2754">Enabling and disabling hyperlinks</A> - | <A HREF="glossaries-manual.html#3250">Unsetting and resetting entry</A> +<DD><A HREF="glossaries-manual.html#2034">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2079">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2082">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2085">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2128">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2577">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2586">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2739">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2745">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2751">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2757">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2763">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2775">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2787">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2803">Changing the format of</A> + | <A HREF="glossaries-manual.html#2855">Enabling and disabling hyperlinks</A> + | <A HREF="glossaries-manual.html#3352">Unsetting and resetting entry</A> <DT><STRONG><TT>\glsadd</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2042">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2057">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2116">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2131">A Quick Guide For</A> <DT><STRONG><TT>\glsaddall</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2045">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2060">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2119">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2134">A Quick Guide For</A> <DT><STRONG><TT>\glscompositor</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1936">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2010">A Quick Guide For</A> <DT><STRONG><TT>\glsdesc</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3229">Acronyms</A> +<DD><A HREF="glossaries-manual.html#3331">Acronyms</A> +<DT><STRONG><TT>\glsdisplay</TT></STRONG> +<DD><A HREF="glossaries-manual.html#2556">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2616">Defining Glossary Entries</A> +<DT><STRONG><TT>\glsdisplayfirst</TT></STRONG> +<DD><A HREF="glossaries-manual.html#2559">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2619">Defining Glossary Entries</A> <DT><STRONG><TT>\glsfirst</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3235">Acronyms</A> +<DD><A HREF="glossaries-manual.html#3337">Acronyms</A> <DT><STRONG><TT>\glslink</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2023">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2051">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2629">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2751">Enabling and disabling hyperlinks</A> - | <A HREF="glossaries-manual.html#2769">Adding an entry to</A> +<DD><A HREF="glossaries-manual.html#2097">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2125">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2730">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2852">Enabling and disabling hyperlinks</A> + | <A HREF="glossaries-manual.html#2870">Adding an entry to</A> <DT><STRONG><TT>\glslink</TT> keys</STRONG> <DD><DL COMPACT> <DT><STRONG>counter</STRONG> -<DD><A HREF="glossaries-manual.html#2613">Links to Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#2714">Links to Glossary Entries</A> <DT><STRONG>format</STRONG> -<DD><A HREF="glossaries-manual.html#2026">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2029">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2039">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2600">Links to Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#2100">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2103">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2113">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2701">Links to Glossary Entries</A> <DT><STRONG>hyper</STRONG> -<DD><A HREF="glossaries-manual.html#2616">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2757">Enabling and disabling hyperlinks</A> - | <A HREF="glossaries-manual.html#2772">Adding an entry to</A> +<DD><A HREF="glossaries-manual.html#2717">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2858">Enabling and disabling hyperlinks</A> + | <A HREF="glossaries-manual.html#2873">Adding an entry to</A> </DL> <DT><STRONG><TT>\glsnamefont</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1993">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2002">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2067">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2076">A Quick Guide For</A> <DT><STRONG><TT>\glspl</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1963">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2014">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2017">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2020">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2500">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2509">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2705">Changing the format of</A> +<DD><A HREF="glossaries-manual.html#2037">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2088">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2091">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2094">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2562">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2565">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2568">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2595">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2604">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2622">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2625">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2628">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2806">Changing the format of</A> <DT><STRONG><TT>\glssymbol</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3232">Acronyms</A> +<DD><A HREF="glossaries-manual.html#3334">Acronyms</A> <DT><STRONG><TT>\glstext</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3219">Acronyms</A> - | <A HREF="glossaries-manual.html#3223">Acronyms</A> +<DD><A HREF="glossaries-manual.html#3321">Acronyms</A> + | <A HREF="glossaries-manual.html#3325">Acronyms</A> <DT><STRONG><TT>\glstextformat</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2730">Changing the format of</A> +<DD><A HREF="glossaries-manual.html#2831">Changing the format of</A> <DT><STRONG><TT>html</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1877">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2747">Enabling and disabling hyperlinks</A> +<DD><A HREF="glossaries-manual.html#1951">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2848">Enabling and disabling hyperlinks</A> <DT><STRONG><TT>\hyperemph</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2033">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2107">A Quick Guide For</A> <DT><STRONG><TT>\hyperlink</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2760">Enabling and disabling hyperlinks</A> +<DD><A HREF="glossaries-manual.html#2861">Enabling and disabling hyperlinks</A> <DT><STRONG><TT>hyperref</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1874">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2606">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2744">Enabling and disabling hyperlinks</A> - | <A HREF="glossaries-manual.html#2766">Enabling and disabling hyperlinks</A> +<DD><A HREF="glossaries-manual.html#1948">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2707">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2845">Enabling and disabling hyperlinks</A> + | <A HREF="glossaries-manual.html#2867">Enabling and disabling hyperlinks</A> <DT><STRONG><TT>\hypertarget</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2763">Enabling and disabling hyperlinks</A> +<DD><A HREF="glossaries-manual.html#2864">Enabling and disabling hyperlinks</A> <DT><STRONG><TT>\item</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1999">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2073">A Quick Guide For</A> <DT><STRONG>link text</STRONG> -<DD><A HREF="glossaries-manual.html#2596">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2597">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2598">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2618">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2700">Changing the format of</A> - | <A HREF="glossaries-manual.html#2728">Changing the format of</A> - | <A HREF="glossaries-manual.html#2739">Changing the format of</A> +<DD><A HREF="glossaries-manual.html#2697">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2698">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2699">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2719">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2801">Changing the format of</A> + | <A HREF="glossaries-manual.html#2829">Changing the format of</A> + | <A HREF="glossaries-manual.html#2840">Changing the format of</A> <DT><STRONG><TT>longtable</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3291">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3393">Glossary Styles</A> +<DT><STRONG><TT>\makefirstuc</TT></STRONG> +<DD><A HREF="glossaries-manual.html#2662">Defining Glossary Entries</A> <DT><STRONG><TT>makeglossaries</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1827">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#1838">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#1841">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#1856">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#1880">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#1883">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#1889">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#1907">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#1916">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#1939">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2454">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2778">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#2787">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#2833">Defining New Glossaries</A> +<DD><A HREF="glossaries-manual.html#1901">Generating the associated glossary</A> + | <A HREF="glossaries-manual.html#1912">Generating the associated glossary</A> + | <A HREF="glossaries-manual.html#1915">Generating the associated glossary</A> + | <A HREF="glossaries-manual.html#1930">Generating the associated glossary</A> + | <A HREF="glossaries-manual.html#1954">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#1957">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#1963">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#1981">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#1990">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2013">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2528">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2879">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#2888">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#2934">Defining New Glossaries</A> <DT><STRONG><TT>makeindex</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1830">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#1833">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#1844">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#1859">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#1904">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#1910">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#1913">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#1919">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2048">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2066">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2457">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2462">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2521">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2527">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2603">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2781">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#2784">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#2830">Defining New Glossaries</A> +<DD><A HREF="glossaries-manual.html#1904">Generating the associated glossary</A> + | <A HREF="glossaries-manual.html#1907">Generating the associated glossary</A> + | <A HREF="glossaries-manual.html#1918">Generating the associated glossary</A> + | <A HREF="glossaries-manual.html#1933">Generating the associated glossary</A> + | <A HREF="glossaries-manual.html#1978">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#1984">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#1987">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#1993">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2122">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2140">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2531">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2536">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2637">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2643">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2704">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2882">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#2885">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#2931">Defining New Glossaries</A> +<DT><STRONG><TT>\MakeUppercase</TT></STRONG> +<DD><A HREF="glossaries-manual.html#3578">Mfirstuc Package</A> +<DT><STRONG><TT>mfirstuc</TT></STRONG> +<DD><A HREF="glossaries-manual.html#3575">Mfirstuc Package</A> <DT><STRONG><TT>\newacronym</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1975">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2402">Package Options</A> - | <A HREF="glossaries-manual.html#2414">Package Options</A> - | <A HREF="glossaries-manual.html#2426">Package Options</A> - | <A HREF="glossaries-manual.html#2438">Package Options</A> - | <A HREF="glossaries-manual.html#2877">Acronyms</A> - | <A HREF="glossaries-manual.html#3238">Acronyms</A> +<DD><A HREF="glossaries-manual.html#2049">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2476">Package Options</A> + | <A HREF="glossaries-manual.html#2488">Package Options</A> + | <A HREF="glossaries-manual.html#2500">Package Options</A> + | <A HREF="glossaries-manual.html#2512">Package Options</A> + | <A HREF="glossaries-manual.html#2978">Acronyms</A> + | <A HREF="glossaries-manual.html#3340">Acronyms</A> <DT><STRONG><TT>\newglossary</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1901">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#1975">A Quick Guide For</A> <DT><STRONG><TT>\newglossaryentry</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1951">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#1990">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2593">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2626">Links to Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#2025">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2064">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2694">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2727">Links to Glossary Entries</A> <DT><STRONG><TT>\newglossaryentry</TT> keys</STRONG> <DD><DL COMPACT> <DT><STRONG>description</STRONG> -<DD><A HREF="glossaries-manual.html#1957">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2310">Package Options</A> - | <A HREF="glossaries-manual.html#2325">Package Options</A> - | <A HREF="glossaries-manual.html#2337">Package Options</A> - | <A HREF="glossaries-manual.html#2476">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2470">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2689">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2692">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2695">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2720">Changing the format of</A> - | <A HREF="glossaries-manual.html#2925">Acronyms</A> - | <A HREF="glossaries-manual.html#3120">Acronyms</A> +<DD><A HREF="glossaries-manual.html#2031">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2384">Package Options</A> + | <A HREF="glossaries-manual.html#2399">Package Options</A> + | <A HREF="glossaries-manual.html#2411">Package Options</A> + | <A HREF="glossaries-manual.html#2550">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2544">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2571">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2790">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2793">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2796">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2821">Changing the format of</A> + | <A HREF="glossaries-manual.html#3026">Acronyms</A> + | <A HREF="glossaries-manual.html#3222">Acronyms</A> +<DT><STRONG>descriptionplural</STRONG> +<DD><A HREF="glossaries-manual.html#2553">Defining Glossary Entries</A> <DT><STRONG>first</STRONG> -<DD><A HREF="glossaries-manual.html#2488">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2512">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2558">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2623">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2647">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2714">Changing the format of</A> - | <A HREF="glossaries-manual.html#2919">Acronyms</A> - | <A HREF="glossaries-manual.html#3253">Unsetting and resetting entry</A> +<DD><A HREF="glossaries-manual.html#2583">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2607">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2724">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2748">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2815">Changing the format of</A> + | <A HREF="glossaries-manual.html#3020">Acronyms</A> + | <A HREF="glossaries-manual.html#3355">Unsetting and resetting entry</A> <DT><STRONG>firstplural</STRONG> -<DD><A HREF="glossaries-manual.html#2506">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2561">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2635">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2659">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2717">Changing the format of</A> +<DD><A HREF="glossaries-manual.html#2601">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2736">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2760">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2818">Changing the format of</A> <DT><STRONG>format</STRONG> -<DD><A HREF="glossaries-manual.html#2610">Links to Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#2711">Links to Glossary Entries</A> <DT><STRONG>name</STRONG> -<DD><A HREF="glossaries-manual.html#1954">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2307">Package Options</A> - | <A HREF="glossaries-manual.html#2328">Package Options</A> - | <A HREF="glossaries-manual.html#2334">Package Options</A> - | <A HREF="glossaries-manual.html#2349">Package Options</A> - | <A HREF="glossaries-manual.html#2352">Package Options</A> - | <A HREF="glossaries-manual.html#2473">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2467">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2485">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2524">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2549">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2665">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2668">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2671">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3114">Acronyms</A> - | <A HREF="glossaries-manual.html#3117">Acronyms</A> - | <A HREF="glossaries-manual.html#3425">Defining your own glossary</A> +<DD><A HREF="glossaries-manual.html#2028">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2381">Package Options</A> + | <A HREF="glossaries-manual.html#2402">Package Options</A> + | <A HREF="glossaries-manual.html#2408">Package Options</A> + | <A HREF="glossaries-manual.html#2423">Package Options</A> + | <A HREF="glossaries-manual.html#2426">Package Options</A> + | <A HREF="glossaries-manual.html#2547">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2541">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2580">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2640">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2766">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2769">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2772">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3216">Acronyms</A> + | <A HREF="glossaries-manual.html#3219">Acronyms</A> + | <A HREF="glossaries-manual.html#3527">Defining your own glossary</A> <DT><STRONG>plural</STRONG> -<DD><A HREF="glossaries-manual.html#1972">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2497">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2555">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2632">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2653">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2711">Changing the format of</A> +<DD><A HREF="glossaries-manual.html#2046">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2592">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2733">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2754">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2812">Changing the format of</A> <DT><STRONG>sort</STRONG> -<DD><A HREF="glossaries-manual.html#2063">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2343">Package Options</A> - | <A HREF="glossaries-manual.html#2518">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3422">Defining your own glossary</A> - | <A HREF="glossaries-manual.html#3428">Defining your own glossary</A> +<DD><A HREF="glossaries-manual.html#2137">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2417">Package Options</A> + | <A HREF="glossaries-manual.html#2634">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3524">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#3530">Defining your own glossary</A> <DT><STRONG>symbol</STRONG> -<DD><A HREF="glossaries-manual.html#2313">Package Options</A> - | <A HREF="glossaries-manual.html#2331">Package Options</A> - | <A HREF="glossaries-manual.html#2340">Package Options</A> - | <A HREF="glossaries-manual.html#2515">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2677">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2680">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2683">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2723">Changing the format of</A> - | <A HREF="glossaries-manual.html#2726">Changing the format of</A> - | <A HREF="glossaries-manual.html#2737">Changing the format of</A> - | <A HREF="glossaries-manual.html#2928">Acronyms</A> +<DD><A HREF="glossaries-manual.html#2387">Package Options</A> + | <A HREF="glossaries-manual.html#2405">Package Options</A> + | <A HREF="glossaries-manual.html#2414">Package Options</A> + | <A HREF="glossaries-manual.html#2610">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2631">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2778">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2781">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2784">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2824">Changing the format of</A> + | <A HREF="glossaries-manual.html#2827">Changing the format of</A> + | <A HREF="glossaries-manual.html#2838">Changing the format of</A> + | <A HREF="glossaries-manual.html#3029">Acronyms</A> +<DT><STRONG>symbolplural</STRONG> +<DD><A HREF="glossaries-manual.html#2613">Defining Glossary Entries</A> <DT><STRONG>text</STRONG> -<DD><A HREF="glossaries-manual.html#2346">Package Options</A> - | <A HREF="glossaries-manual.html#2355">Package Options</A> - | <A HREF="glossaries-manual.html#2479">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2494">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2503">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2546">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2552">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2620">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2641">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#2708">Changing the format of</A> - | <A HREF="glossaries-manual.html#2922">Acronyms</A> - | <A HREF="glossaries-manual.html#3256">Unsetting and resetting entry</A> +<DD><A HREF="glossaries-manual.html#2420">Package Options</A> + | <A HREF="glossaries-manual.html#2429">Package Options</A> + | <A HREF="glossaries-manual.html#2574">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2589">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2598">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2721">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2742">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#2809">Changing the format of</A> + | <A HREF="glossaries-manual.html#3023">Acronyms</A> + | <A HREF="glossaries-manual.html#3358">Unsetting and resetting entry</A> <DT><STRONG>type</STRONG> -<DD><A HREF="glossaries-manual.html#1966">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#1969">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2531">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2564">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#2040">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2043">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2647">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2665">Defining Glossary Entries</A> </DL> <DT><STRONG>number list</STRONG> -<DD><A HREF="glossaries-manual.html#2285">Package Options</A> - | <A HREF="glossaries-manual.html#2295">Package Options</A> - | <A HREF="glossaries-manual.html#2570">Number lists</A> - | <A HREF="glossaries-manual.html#2828">Defining New Glossaries</A> - | <A HREF="glossaries-manual.html#3286">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3293">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3310">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3345">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3362">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3462">Example: creating a completely</A> +<DD><A HREF="glossaries-manual.html#2359">Package Options</A> + | <A HREF="glossaries-manual.html#2369">Package Options</A> + | <A HREF="glossaries-manual.html#2671">Number lists</A> + | <A HREF="glossaries-manual.html#2929">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#3388">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3395">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3412">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3447">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3464">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3564">Example: creating a completely</A> <DT><STRONG>package options</STRONG> <DD><DL COMPACT> <DT><STRONG>acronym</STRONG> -<DD><A HREF="glossaries-manual.html#1852">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#1854">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#1931">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#1933">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#1986">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#1988">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2188">Package Options</A> - | <A HREF="glossaries-manual.html#2190">Package Options</A> - | <A HREF="glossaries-manual.html#2242">Package Options</A> - | <A HREF="glossaries-manual.html#2244">Package Options</A> - | <A HREF="glossaries-manual.html#2255">Package Options</A> - | <A HREF="glossaries-manual.html#2257">Package Options</A> +<DD><A HREF="glossaries-manual.html#1926">Generating the associated glossary</A> + | <A HREF="glossaries-manual.html#1928">Generating the associated glossary</A> + | <A HREF="glossaries-manual.html#2005">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2007">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2060">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2062">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2262">Package Options</A> | <A HREF="glossaries-manual.html#2264">Package Options</A> - | <A HREF="glossaries-manual.html#2266">Package Options</A> - | <A HREF="glossaries-manual.html#2542">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2544">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#2841">Defining New Glossaries</A> - | <A HREF="glossaries-manual.html#2843">Defining New Glossaries</A> - | <A HREF="glossaries-manual.html#2850">Defining New Glossaries</A> - | <A HREF="glossaries-manual.html#2852">Defining New Glossaries</A> - | <A HREF="glossaries-manual.html#2859">Defining New Glossaries</A> - | <A HREF="glossaries-manual.html#2861">Defining New Glossaries</A> - | <A HREF="glossaries-manual.html#2872">Acronyms</A> - | <A HREF="glossaries-manual.html#2874">Acronyms</A> + | <A HREF="glossaries-manual.html#2316">Package Options</A> + | <A HREF="glossaries-manual.html#2318">Package Options</A> + | <A HREF="glossaries-manual.html#2329">Package Options</A> + | <A HREF="glossaries-manual.html#2331">Package Options</A> + | <A HREF="glossaries-manual.html#2338">Package Options</A> + | <A HREF="glossaries-manual.html#2340">Package Options</A> + | <A HREF="glossaries-manual.html#2658">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2660">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#2942">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#2944">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#2951">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#2953">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#2960">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#2962">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#2973">Acronyms</A> + | <A HREF="glossaries-manual.html#2975">Acronyms</A> <DT><STRONG>babel</STRONG> -<DD><A HREF="glossaries-manual.html#2363">Package Options</A> - | <A HREF="glossaries-manual.html#2365">Package Options</A> - | <A HREF="glossaries-manual.html#2376">Package Options</A> - | <A HREF="glossaries-manual.html#2389">Package Options</A> +<DD><A HREF="glossaries-manual.html#2437">Package Options</A> + | <A HREF="glossaries-manual.html#2439">Package Options</A> + | <A HREF="glossaries-manual.html#2450">Package Options</A> + | <A HREF="glossaries-manual.html#2463">Package Options</A> <DD><DL COMPACT> <DT><STRONG>false</STRONG> -<DD><A HREF="glossaries-manual.html#2391">Package Options</A> +<DD><A HREF="glossaries-manual.html#2465">Package Options</A> <DT><STRONG>true</STRONG> -<DD><A HREF="glossaries-manual.html#2378">Package Options</A> +<DD><A HREF="glossaries-manual.html#2452">Package Options</A> </DL> <DT><STRONG>counter</STRONG> -<DD><A HREF="glossaries-manual.html#2292">Package Options</A> - | <A HREF="glossaries-manual.html#2294">Package Options</A> - | <A HREF="glossaries-manual.html#2586">Number lists</A> - | <A HREF="glossaries-manual.html#2588">Number lists</A> +<DD><A HREF="glossaries-manual.html#2366">Package Options</A> + | <A HREF="glossaries-manual.html#2368">Package Options</A> + | <A HREF="glossaries-manual.html#2687">Number lists</A> + | <A HREF="glossaries-manual.html#2689">Number lists</A> <DT><STRONG>description</STRONG> -<DD><A HREF="glossaries-manual.html#2398">Package Options</A> - | <A HREF="glossaries-manual.html#2400">Package Options</A> - | <A HREF="glossaries-manual.html#2906">Acronyms</A> - | <A HREF="glossaries-manual.html#2908">Acronyms</A> - | <A HREF="glossaries-manual.html#2936">Acronyms</A> - | <A HREF="glossaries-manual.html#2938">Acronyms</A> - | <A HREF="glossaries-manual.html#2954">Acronyms</A> - | <A HREF="glossaries-manual.html#2956">Acronyms</A> - | <A HREF="glossaries-manual.html#2972">Acronyms</A> - | <A HREF="glossaries-manual.html#2974">Acronyms</A> - | <A HREF="glossaries-manual.html#3026">Acronyms</A> - | <A HREF="glossaries-manual.html#3028">Acronyms</A> - | <A HREF="glossaries-manual.html#3041">Acronyms</A> - | <A HREF="glossaries-manual.html#3043">Acronyms</A> - | <A HREF="glossaries-manual.html#3110">Acronyms</A> - | <A HREF="glossaries-manual.html#3112">Acronyms</A> +<DD><A HREF="glossaries-manual.html#2472">Package Options</A> + | <A HREF="glossaries-manual.html#2474">Package Options</A> + | <A HREF="glossaries-manual.html#3007">Acronyms</A> + | <A HREF="glossaries-manual.html#3009">Acronyms</A> + | <A HREF="glossaries-manual.html#3037">Acronyms</A> + | <A HREF="glossaries-manual.html#3039">Acronyms</A> + | <A HREF="glossaries-manual.html#3055">Acronyms</A> + | <A HREF="glossaries-manual.html#3057">Acronyms</A> + | <A HREF="glossaries-manual.html#3073">Acronyms</A> + | <A HREF="glossaries-manual.html#3075">Acronyms</A> | <A HREF="glossaries-manual.html#3128">Acronyms</A> | <A HREF="glossaries-manual.html#3130">Acronyms</A> - | <A HREF="glossaries-manual.html#3180">Acronyms</A> - | <A HREF="glossaries-manual.html#3182">Acronyms</A> - | <A HREF="glossaries-manual.html#3215">Acronyms</A> - | <A HREF="glossaries-manual.html#3217">Acronyms</A> + | <A HREF="glossaries-manual.html#3143">Acronyms</A> + | <A HREF="glossaries-manual.html#3145">Acronyms</A> + | <A HREF="glossaries-manual.html#3212">Acronyms</A> + | <A HREF="glossaries-manual.html#3214">Acronyms</A> + | <A HREF="glossaries-manual.html#3230">Acronyms</A> + | <A HREF="glossaries-manual.html#3232">Acronyms</A> + | <A HREF="glossaries-manual.html#3282">Acronyms</A> + | <A HREF="glossaries-manual.html#3284">Acronyms</A> + | <A HREF="glossaries-manual.html#3317">Acronyms</A> + | <A HREF="glossaries-manual.html#3319">Acronyms</A> <DT><STRONG>dua</STRONG> -<DD><A HREF="glossaries-manual.html#2434">Package Options</A> - | <A HREF="glossaries-manual.html#2436">Package Options</A> - | <A HREF="glossaries-manual.html#2963">Acronyms</A> - | <A HREF="glossaries-manual.html#2965">Acronyms</A> - | <A HREF="glossaries-manual.html#2999">Acronyms</A> - | <A HREF="glossaries-manual.html#3001">Acronyms</A> - | <A HREF="glossaries-manual.html#3083">Acronyms</A> - | <A HREF="glossaries-manual.html#3085">Acronyms</A> +<DD><A HREF="glossaries-manual.html#2508">Package Options</A> + | <A HREF="glossaries-manual.html#2510">Package Options</A> + | <A HREF="glossaries-manual.html#3064">Acronyms</A> + | <A HREF="glossaries-manual.html#3066">Acronyms</A> + | <A HREF="glossaries-manual.html#3100">Acronyms</A> + | <A HREF="glossaries-manual.html#3102">Acronyms</A> + | <A HREF="glossaries-manual.html#3185">Acronyms</A> + | <A HREF="glossaries-manual.html#3187">Acronyms</A> <DT><STRONG>footnote</STRONG> -<DD><A HREF="glossaries-manual.html#2410">Package Options</A> - | <A HREF="glossaries-manual.html#2412">Package Options</A> - | <A HREF="glossaries-manual.html#2915">Acronyms</A> - | <A HREF="glossaries-manual.html#2917">Acronyms</A> - | <A HREF="glossaries-manual.html#2945">Acronyms</A> - | <A HREF="glossaries-manual.html#2947">Acronyms</A> - | <A HREF="glossaries-manual.html#2981">Acronyms</A> - | <A HREF="glossaries-manual.html#2983">Acronyms</A> - | <A HREF="glossaries-manual.html#3017">Acronyms</A> - | <A HREF="glossaries-manual.html#3019">Acronyms</A> - | <A HREF="glossaries-manual.html#3050">Acronyms</A> - | <A HREF="glossaries-manual.html#3052">Acronyms</A> - | <A HREF="glossaries-manual.html#3092">Acronyms</A> - | <A HREF="glossaries-manual.html#3094">Acronyms</A> - | <A HREF="glossaries-manual.html#3145">Acronyms</A> - | <A HREF="glossaries-manual.html#3147">Acronyms</A> - | <A HREF="glossaries-manual.html#3171">Acronyms</A> - | <A HREF="glossaries-manual.html#3173">Acronyms</A> - | <A HREF="glossaries-manual.html#3206">Acronyms</A> - | <A HREF="glossaries-manual.html#3208">Acronyms</A> +<DD><A HREF="glossaries-manual.html#2484">Package Options</A> + | <A HREF="glossaries-manual.html#2486">Package Options</A> + | <A HREF="glossaries-manual.html#3016">Acronyms</A> + | <A HREF="glossaries-manual.html#3018">Acronyms</A> + | <A HREF="glossaries-manual.html#3046">Acronyms</A> + | <A HREF="glossaries-manual.html#3048">Acronyms</A> + | <A HREF="glossaries-manual.html#3082">Acronyms</A> + | <A HREF="glossaries-manual.html#3084">Acronyms</A> + | <A HREF="glossaries-manual.html#3119">Acronyms</A> + | <A HREF="glossaries-manual.html#3121">Acronyms</A> + | <A HREF="glossaries-manual.html#3152">Acronyms</A> + | <A HREF="glossaries-manual.html#3154">Acronyms</A> + | <A HREF="glossaries-manual.html#3194">Acronyms</A> + | <A HREF="glossaries-manual.html#3196">Acronyms</A> + | <A HREF="glossaries-manual.html#3247">Acronyms</A> + | <A HREF="glossaries-manual.html#3249">Acronyms</A> + | <A HREF="glossaries-manual.html#3273">Acronyms</A> + | <A HREF="glossaries-manual.html#3275">Acronyms</A> + | <A HREF="glossaries-manual.html#3308">Acronyms</A> + | <A HREF="glossaries-manual.html#3310">Acronyms</A> <DT><STRONG>nonumberlist</STRONG> -<DD><A HREF="glossaries-manual.html#2103">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2105">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2282">Package Options</A> - | <A HREF="glossaries-manual.html#2284">Package Options</A> - | <A HREF="glossaries-manual.html#2577">Number lists</A> - | <A HREF="glossaries-manual.html#2579">Number lists</A> - | <A HREF="glossaries-manual.html#3445">Defining your own glossary</A> - | <A HREF="glossaries-manual.html#3447">Defining your own glossary</A> - | <A HREF="glossaries-manual.html#3454">Defining your own glossary</A> - | <A HREF="glossaries-manual.html#3456">Defining your own glossary</A> +<DD><A HREF="glossaries-manual.html#2177">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2179">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2356">Package Options</A> + | <A HREF="glossaries-manual.html#2358">Package Options</A> + | <A HREF="glossaries-manual.html#2678">Number lists</A> + | <A HREF="glossaries-manual.html#2680">Number lists</A> + | <A HREF="glossaries-manual.html#3547">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#3549">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#3556">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#3558">Defining your own glossary</A> <DT><STRONG>numberedsection</STRONG> -<DD><A HREF="glossaries-manual.html#2209">Package Options</A> - | <A HREF="glossaries-manual.html#2211">Package Options</A> - | <A HREF="glossaries-manual.html#2218">Package Options</A> - | <A HREF="glossaries-manual.html#2220">Package Options</A> - | <A HREF="glossaries-manual.html#2233">Package Options</A> +<DD><A HREF="glossaries-manual.html#2283">Package Options</A> + | <A HREF="glossaries-manual.html#2285">Package Options</A> + | <A HREF="glossaries-manual.html#2292">Package Options</A> + | <A HREF="glossaries-manual.html#2294">Package Options</A> + | <A HREF="glossaries-manual.html#2307">Package Options</A> <DD><DL COMPACT> <DT><STRONG>autolabel</STRONG> -<DD><A HREF="glossaries-manual.html#2235">Package Options</A> - | <A HREF="glossaries-manual.html#2226">Package Options</A> +<DD><A HREF="glossaries-manual.html#2309">Package Options</A> + | <A HREF="glossaries-manual.html#2300">Package Options</A> <DT><STRONG>false</STRONG> -<DD><A HREF="glossaries-manual.html#2222">Package Options</A> +<DD><A HREF="glossaries-manual.html#2296">Package Options</A> <DT><STRONG>nolabel</STRONG> -<DD><A HREF="glossaries-manual.html#2224">Package Options</A> +<DD><A HREF="glossaries-manual.html#2298">Package Options</A> </DL> <DT><STRONG>numberline</STRONG> -<DD><A HREF="glossaries-manual.html#2143">Package Options</A> - | <A HREF="glossaries-manual.html#2145">Package Options</A> - | <A HREF="glossaries-manual.html#2179">Package Options</A> - | <A HREF="glossaries-manual.html#2181">Package Options</A> +<DD><A HREF="glossaries-manual.html#2217">Package Options</A> + | <A HREF="glossaries-manual.html#2219">Package Options</A> + | <A HREF="glossaries-manual.html#2253">Package Options</A> + | <A HREF="glossaries-manual.html#2255">Package Options</A> <DT><STRONG>sanitize</STRONG> -<DD><A HREF="glossaries-manual.html#2302">Package Options</A> - | <A HREF="glossaries-manual.html#2304">Package Options</A> - | <A HREF="glossaries-manual.html#2321">Package Options</A> - | <A HREF="glossaries-manual.html#2323">Package Options</A> - | <A HREF="glossaries-manual.html#3060">Acronyms</A> - | <A HREF="glossaries-manual.html#3062">Acronyms</A> - | <A HREF="glossaries-manual.html#3068">Acronyms</A> - | <A HREF="glossaries-manual.html#3075">Acronyms</A> - | <A HREF="glossaries-manual.html#3137">Acronyms</A> - | <A HREF="glossaries-manual.html#3154">Acronyms</A> - | <A HREF="glossaries-manual.html#3189">Acronyms</A> +<DD><A HREF="glossaries-manual.html#2376">Package Options</A> + | <A HREF="glossaries-manual.html#2378">Package Options</A> + | <A HREF="glossaries-manual.html#2395">Package Options</A> + | <A HREF="glossaries-manual.html#2397">Package Options</A> + | <A HREF="glossaries-manual.html#3162">Acronyms</A> + | <A HREF="glossaries-manual.html#3164">Acronyms</A> + | <A HREF="glossaries-manual.html#3170">Acronyms</A> + | <A HREF="glossaries-manual.html#3177">Acronyms</A> + | <A HREF="glossaries-manual.html#3239">Acronyms</A> + | <A HREF="glossaries-manual.html#3256">Acronyms</A> + | <A HREF="glossaries-manual.html#3291">Acronyms</A> <DD><DL COMPACT> <DT><STRONG>description</STRONG> -<DD><A HREF="glossaries-manual.html#3069">Acronyms</A> - | <A HREF="glossaries-manual.html#3155">Acronyms</A> +<DD><A HREF="glossaries-manual.html#3171">Acronyms</A> + | <A HREF="glossaries-manual.html#3257">Acronyms</A> <DT><STRONG>symbol</STRONG> -<DD><A HREF="glossaries-manual.html#3076">Acronyms</A> - | <A HREF="glossaries-manual.html#3138">Acronyms</A> - | <A HREF="glossaries-manual.html#3190">Acronyms</A> +<DD><A HREF="glossaries-manual.html#3178">Acronyms</A> + | <A HREF="glossaries-manual.html#3240">Acronyms</A> + | <A HREF="glossaries-manual.html#3292">Acronyms</A> </DL> <DT><STRONG>section</STRONG> -<DD><A HREF="glossaries-manual.html#2112">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2114">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2121">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2123">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2197">Package Options</A> - | <A HREF="glossaries-manual.html#2199">Package Options</A> +<DD><A HREF="glossaries-manual.html#2186">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2188">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2195">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2197">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2271">Package Options</A> + | <A HREF="glossaries-manual.html#2273">Package Options</A> <DT><STRONG>smallcaps</STRONG> -<DD><A HREF="glossaries-manual.html#2422">Package Options</A> - | <A HREF="glossaries-manual.html#2424">Package Options</A> - | <A HREF="glossaries-manual.html#2885">Acronyms</A> - | <A HREF="glossaries-manual.html#2887">Acronyms</A> - | <A HREF="glossaries-manual.html#2897">Acronyms</A> - | <A HREF="glossaries-manual.html#2899">Acronyms</A> - | <A HREF="glossaries-manual.html#2990">Acronyms</A> - | <A HREF="glossaries-manual.html#2992">Acronyms</A> - | <A HREF="glossaries-manual.html#3008">Acronyms</A> - | <A HREF="glossaries-manual.html#3010">Acronyms</A> - | <A HREF="glossaries-manual.html#3101">Acronyms</A> - | <A HREF="glossaries-manual.html#3103">Acronyms</A> - | <A HREF="glossaries-manual.html#3162">Acronyms</A> - | <A HREF="glossaries-manual.html#3164">Acronyms</A> - | <A HREF="glossaries-manual.html#3197">Acronyms</A> - | <A HREF="glossaries-manual.html#3199">Acronyms</A> +<DD><A HREF="glossaries-manual.html#2496">Package Options</A> + | <A HREF="glossaries-manual.html#2498">Package Options</A> + | <A HREF="glossaries-manual.html#2986">Acronyms</A> + | <A HREF="glossaries-manual.html#2988">Acronyms</A> + | <A HREF="glossaries-manual.html#2998">Acronyms</A> + | <A HREF="glossaries-manual.html#3000">Acronyms</A> + | <A HREF="glossaries-manual.html#3091">Acronyms</A> + | <A HREF="glossaries-manual.html#3093">Acronyms</A> + | <A HREF="glossaries-manual.html#3110">Acronyms</A> + | <A HREF="glossaries-manual.html#3112">Acronyms</A> + | <A HREF="glossaries-manual.html#3203">Acronyms</A> + | <A HREF="glossaries-manual.html#3205">Acronyms</A> + | <A HREF="glossaries-manual.html#3264">Acronyms</A> + | <A HREF="glossaries-manual.html#3266">Acronyms</A> + | <A HREF="glossaries-manual.html#3299">Acronyms</A> + | <A HREF="glossaries-manual.html#3301">Acronyms</A> <DT><STRONG>style</STRONG> -<DD><A HREF="glossaries-manual.html#2090">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2092">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2273">Package Options</A> - | <A HREF="glossaries-manual.html#2275">Package Options</A> - | <A HREF="glossaries-manual.html#2816">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#2818">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#3397">Glossary Styles</A> - | <A HREF="glossaries-manual.html#3399">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2164">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2166">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2347">Package Options</A> + | <A HREF="glossaries-manual.html#2349">Package Options</A> + | <A HREF="glossaries-manual.html#2917">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#2919">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#3499">Glossary Styles</A> + | <A HREF="glossaries-manual.html#3501">Glossary Styles</A> <DT><STRONG>toc</STRONG> -<DD><A HREF="glossaries-manual.html#1897">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#1899">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#1947">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#1949">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2134">Package Options</A> - | <A HREF="glossaries-manual.html#2136">Package Options</A> - | <A HREF="glossaries-manual.html#2152">Package Options</A> - | <A HREF="glossaries-manual.html#2154">Package Options</A> - | <A HREF="glossaries-manual.html#2161">Package Options</A> - | <A HREF="glossaries-manual.html#2163">Package Options</A> - | <A HREF="glossaries-manual.html#2170">Package Options</A> - | <A HREF="glossaries-manual.html#2172">Package Options</A> - | <A HREF="glossaries-manual.html#2804">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#2806">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#1971">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#1973">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2021">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2023">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2208">Package Options</A> + | <A HREF="glossaries-manual.html#2210">Package Options</A> + | <A HREF="glossaries-manual.html#2226">Package Options</A> + | <A HREF="glossaries-manual.html#2228">Package Options</A> + | <A HREF="glossaries-manual.html#2235">Package Options</A> + | <A HREF="glossaries-manual.html#2237">Package Options</A> + | <A HREF="glossaries-manual.html#2244">Package Options</A> + | <A HREF="glossaries-manual.html#2246">Package Options</A> + | <A HREF="glossaries-manual.html#2905">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#2907">Displaying a glossary</A> <DT><STRONG>translate</STRONG> -<DD><A HREF="glossaries-manual.html#1819">Introduction</A> +<DD><A HREF="glossaries-manual.html#1892">Introduction</A> <DD><DL COMPACT> <DT><STRONG>false</STRONG> -<DD><A HREF="glossaries-manual.html#1821">Introduction</A> +<DD><A HREF="glossaries-manual.html#1894">Introduction</A> </DL> </DL> <DT><STRONG><TT>\printglossaries</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1886">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2451">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#1960">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2525">Defining Glossary Entries</A> <DT><STRONG><TT>\printglossary</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2448">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3404">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2522">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3506">Glossary Styles</A> <DT><STRONG><TT>\printglossary</TT> keys</STRONG> <DD><DL COMPACT> <DT><STRONG>style</STRONG> -<DD><A HREF="glossaries-manual.html#2808">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#3401">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2909">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#3503">Glossary Styles</A> <DT><STRONG>title</STRONG> -<DD><A HREF="glossaries-manual.html#2793">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#2894">Displaying a glossary</A> <DT><STRONG>toctitle</STRONG> -<DD><A HREF="glossaries-manual.html#2796">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#2897">Displaying a glossary</A> <DT><STRONG>type</STRONG> -<DD><A HREF="glossaries-manual.html#2790">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#2891">Displaying a glossary</A> </DL> <DT><STRONG><TT>\setglossarysection</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2201">Package Options</A> +<DD><A HREF="glossaries-manual.html#2275">Package Options</A> <DT><STRONG><TT>supertabular</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3343">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3445">Glossary Styles</A> <DT><STRONG><TT>translator</TT></STRONG> -<DD><A HREF="glossaries-manual.html#1810">Introduction</A> +<DD><A HREF="glossaries-manual.html#1883">Introduction</A> </DL> <P> @@ -3222,20 +3363,20 @@ Index</A> <P> <BR><HR><H4>Footnotes</H4> <DL> -<DT><A NAME="foot370">... +<DT><A NAME="foot378">... range</A><A HREF="glossaries-manual.html#tex2html4"><SUP>1</SUP></A></DT> <DD>This is new to version 1.01 </DD> -<DT><A NAME="foot1670">...acronym</A><A +<DT><A NAME="foot1737">...acronym</A><A HREF="glossaries-manual.html#tex2html5"><SUP>2</SUP></A></DT> <DD>if the -<TT>acronym</TT><A NAME="2242"></A> option is used, otherwise the list of +<TT>acronym</TT><A NAME="2316"></A> option is used, otherwise the list of acronyms is the main glossary </DD> -<DT><A NAME="foot1718">... name</A><A +<DT><A NAME="foot1791">... name</A><A HREF="glossaries-manual.html#tex2html6"><SUP>3</SUP></A></DT> <DD><TT>main</TT> for the main (default) glossary, <TT>\acronymtype</TT> for the list of acronyms, or the @@ -3243,20 +3384,20 @@ name supplied in the first mandatory argument to <TT>\newglossary</TT> for additional glossaries. </DD> -<DT><A NAME="foot1409">... start.</A><A +<DT><A NAME="foot1453">... start.</A><A HREF="glossaries-manual.html#tex2html8"><SUP>4</SUP></A></DT> <DD>This style was supplied by Axel Menzel. </DD> -<DT><A NAME="foot1752">... +<DT><A NAME="foot1825">... link</A><A HREF="glossaries-manual.html#tex2html9"><SUP>5</SUP></A></DT> <DD>if the document doesn't have hyperlinks enabled <TT>\@glslink</TT> ignores the label and simply typesets the text. </DD> -<DT><A NAME="foot1753">... correctly.</A><A +<DT><A NAME="foot1826">... correctly.</A><A HREF="glossaries-manual.html#tex2html10"><SUP>6</SUP></A></DT> <DD>again, if the document doesn't support hyperlinks, <TT>\@glstarget</TT> will ignore diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.tex b/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.tex index 9ede69d65e0..c46dc8497f7 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.tex +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.tex @@ -23,7 +23,7 @@ \makeatother \RecordChanges \PageIndex -\CheckSum{4357} +\CheckSum{4630} \CodelineNumbered \newcommand*{\termdef}[1]{\emph{#1}\iterm{#1}} \newcommand*{\term}[1]{#1\iterm{#1}} @@ -92,7 +92,7 @@ \MakeShortVerb{"} \DeleteShortVerb{\|} - \title{glossaries.sty v 1.11: \LaTeXe\ Package to Assist Generating Glossaries} + \title{glossaries.sty v 1.12: \LaTeXe\ Package to Assist Generating Glossaries} \author{Nicola L.C. Talbot\\[10pt] School of Computing Sciences\\ University of East Anglia\\ @@ -100,7 +100,7 @@ Norwich. Norfolk\\ NR4 7TJ. United Kingdom.\\ \url{http://theoval.cmp.uea.ac.uk/~nlct/}} - \date{2nd March 2008} + \date{8th March 2008} \maketitle \tableofcontents @@ -121,7 +121,7 @@ As from version 1.08, the \sty{glossaries} package now has limited multi-lingual support, thanks to all the people who have sent me the relevant translations either via email or via comp.text.tex. However you must load \isty{babel} \emph{before} -\sty{glossaries} to enable this. \ifmakedtx{(See \autoref{sec:predefinednames} for the +\sty{glossaries} to enable this. \ifmakedtx{(See \autoref{sec:predefinednames} for the predefined names used by the \sty{glossaries} package.)}{} As from version 1.1, the \sty{glossaries} package also supports Till~Tantau's \isty{translator} package provided it is loaded @@ -133,11 +133,15 @@ package option \pkgopt[false]{translate} and supply your own translations. This documentation is structured as follows: \ifmakedtx{\autoref{sec:quick}}{\htmlref{{A Quick Guide For The Impatient}}{sec:quick}} is for people who want a few quick pointers of how to get started, without having to read through lengthy descriptions, -\ifmakedtx{\autoref{sec:overview}}{and \htmlref{Overview}{sec:overview}} gives an overview of available commands -and their syntax\ifmakedtx{, \autoref{sec:code} contains the documented +\ifmakedtx{\autoref{sec:overview}}{\htmlref{Overview}{sec:overview}} gives an overview of available commands +and their syntax\ifmakedtx{, \autoref{sec:mfirstuc}}{ and +\htmlref{Mfirstuc}{sec:mfirstuc}} describes the associated +\sty{mfirstuc} +package\ifmakedtx{, \autoref{sec:code} contains the documented source code for those who want to know more about how the -package works, and how to do more complicated things, such as -changing the way glossary entries appear}{}.\ifmakedtx{}{\toTop} +package works and how to do more complicated things, such as +changing the way glossary entries appear}{}. +\ifmakedtx{}{\toTop} \subsection{Generating the associated glossary files} \label{sec:makeglossaries} @@ -319,6 +323,12 @@ problem for \ics{Gls} and \ics{Glspl}): \newglossaryentry{elite}{name={{\'e}lite}, description={select group or class}} \end{verbatim} +Likewise with commands such as \cs{ae} and \cs{oe}: +\begin{verbatim} +\newglossaryentry{oesophagus}{% +name={{\oe}sophagus}, +description={canal from mouth to stomach}} +\end{verbatim} \item If you have multiple glossaries, use the \gloskey{type} key to specify in which glossary the entry belongs. For example: @@ -769,6 +779,11 @@ glossary). \item[{\gloskey{description}}] A brief description of this term (to appear in the glossary). +\item[{\gloskey{descriptionplural}}] The plural form of the +description (as passed to \ics{glsdisplay} and \ics{glsdisplayfirst} +by \ics{glspl}, \ics{Glspl} and \ics{GLSpl}). If omitted, the value +is set to the same as the \gloskey{description} key. + \item[{\gloskey{text}}] How this entry will appear in the document text when using \ics{gls} (or one of its uppercase variants). If this field is omitted, the value of the \gloskey{name} key is used. @@ -793,6 +808,11 @@ field. specify an associated symbol, but most glossary styles ignore this value. If omitted, the value is set to \cs{relax}. +\item[{\gloskey{symbolplural}}] This is the plural form of the +symbol (as passed to \ics{glsdisplay} and \ics{glsdisplayfirst} +by \ics{glspl}, \ics{Glspl} and \ics{GLSpl}). If omitted, the value +is set to the same as the \gloskey{symbol} key. + \item[{\gloskey{sort}}] This value indicates how \appname{makeindex} should sort this entry. If omitted, the value is given by the \gloskey{name} field. This value is equivalent to @@ -807,16 +827,32 @@ belongs. If omitted, the default glossary is assumed \texttt{acronym}, depending on whether the \pkgopt{acronym} package option was used. \end{description} -Note that if the \gloskey{text} key (or the \gloskey{name} key, if the -\gloskey{text} key is omitted) starts with an accented letter, +Note that if the key starts with an accented letter, you must group the accented letter, otherwise it will cause a problem for \cs{Gls} and \cs{Glspl}. For example: \begin{verbatim} \newglossaryentry{elite}{name={{\'e}lite}, description={select group or class}} \end{verbatim} -(Likewise for the \gloskey{plural}, \gloskey{first} and -\gloskey{firstplural} keys.) +Similarly, commands such as \cs{ae} and \cs{oe} should either be placed +inside a group or followed by a space. For example: +\begin{verbatim} +\newglossaryentry{oesophagus}{% +name={{\oe}sophagus}, +description={canal from mouth to stomach}} +\end{verbatim} +The following is also fine: +\begin{verbatim} +\newglossaryentry{oesophagus}{% +name={\oe sophagus}, +description={canal from mouth to stomach}} +\end{verbatim} +but don't do \verb|\oe{}sophagus| as it will confuse +\ics{makefirstuc} (described +\ifmakedtx{in \autoref{sec:mfirstuc}}{\htmlref{later}{sec:mfirstuc}}) +and will produce \ifmakedtx{\oe{}}{oe}Sophagus instead of +\ifmakedtx{{\OE}}{OE}sophagus. + \DescribeMacro{\loadglsentries} You can store all your glossary entry definitions in another @@ -1477,6 +1513,28 @@ None of the above& \end{center} \end{table} +In case you can't remember which key stores the long or short forms +(or their plurals) the \sty{glossaries} package provides the +commands: +\begin{itemize} +\item\DescribeMacro{\glsshortkey}\cs{glsshortkey} +The key used to store the short form. +\item\DescribeMacro{\glsshortpluralkey}\cs{glsshortpluralkey} +The key used to store the plural version of the short form. +\item\DescribeMacro{\glslongkey}\cs{glslongkey} +The key used to store the long form. +\item\DescribeMacro{\glslongpluralkey}\cs{glslongpluralkey} +The key used to store the plural version of the long form. +\end{itemize} +These can be used in the optional argument of \cs{newacronym} +to override the defaults. For example: +\begin{verbatim} +\newacronym[\glslongpluralkey={diagonal matrices}]{dm}{DM}{diagonal +matrix} +\end{verbatim} +If the first use uses the plural form, \verb|\glspl{dm}| will +display: diagonal matrices (DMs). + Each of the package options \pkgopt{smallcaps}, \pkgopt{footnote} and \pkgopt{description} use \ics{defglsdisplay} and \ics{defglsdisplayfirst} (described \ifmakedtx{in @@ -1940,6 +1998,36 @@ follows: \end{verbatim} \ifmakedtx{}{\toTop} +\section{Mfirstuc Package} +\label{sec:mfirstuc} + +The \sty{glossaries} package is supplied with the package +\isty{mfirstuc} which provides the command:\\[10pt] +\DescribeMacro{\makefirstuc} +\cs{makefirstuc}\marg{stuff}\\[10pt] +which makes the first object of +\meta{stuff} uppercase unless \meta{stuff} starts with a control +sequence followed by a group, in which case the first +object in the group is converted to uppercase. Examples: +\begin{itemize} +\item \verb|\makefirstuc{abc}| produces Abc + +\item \verb|\makefirstuc{\emph{abc}}| produces \emph{Abc} +(\ics{MakeUppercase} has been applied to the letter \dq{a} rather +than \cs{emph}.) + +\item \verb|\makefirstuc{{\'a}bc}| produces {\'A}bc + +\item \verb|\makefirstuc{\ae bc}| produces \AE bc + +\item \verb|\makefirstuc{{\ae}bc}| produces {\AE}bc +\end{itemize} + +Note however that \verb|\makefirstuc{\ae{}bc}| produces \ae Bc since +the empty group following \cs{ae} is considered to be the argument +of \cs{ae} which is in fact not the case. +\ifmakedtx{}{\toTop} + \StopEventually{\clearpage\phantomsection\addcontentsline{toc}{section}{Index}\PrintIndex} \ifmakedtx{}{\printindex\toTop} diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries.pdf b/Master/texmf-dist/doc/latex/glossaries/glossaries.pdf Binary files differindex 34cab2da055..b8489784a93 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf Binary files differindex 7280a20d692..87013fafe46 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf diff --git a/Master/texmf-dist/scripts/glossaries/makeglossaries b/Master/texmf-dist/scripts/glossaries/makeglossaries index 20a4b236fff..6807b69bae3 100755 --- a/Master/texmf-dist/scripts/glossaries/makeglossaries +++ b/Master/texmf-dist/scripts/glossaries/makeglossaries @@ -1,8 +1,8 @@ -#!/usr/bin/perl -w +#!/usr/bin/env perl # File : makeglossaries # Author : Nicola Talbot -# Version : 1.2 (2008/03/02) +# Version : 1.3 (2008/03/08) # Description: simple Perl script that calls makeindex. # Intended for use with "glossaries.sty" (saves having to remember # all the various switches) @@ -22,11 +22,15 @@ # 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, glossary-hypernav.sty, -# glossary-list.sty, glossary-long.sty, glossary-super.sty, -# glossaries.perl. Also makeglossaries and makeglossaries. +# and the derived files glossaries.sty, mfirstuc.sty, +# glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, +# glossary-super.sty, glossaries.perl. +# Also makeglossaries and makeglossaries. # # History: +# v1.3 (2008-03-08) : +# * changed first line from /usr/bin/perl -w to /usr/bin/env perl +# (Thanks to Karl Berry for suggesting this.) # v1.2 (2008-03-02) : # * added support for --help and --version # * improved error handling @@ -41,7 +45,7 @@ use strict; $Getopt::Std::STANDARD_HELP_VERSION = 1; -my $version="1.2 (2008-03-02)"; +my $version="1.3 (2008-03-08)"; my($opt_q, $opt_t, $opt_o, $opt_s, $opt_p, $opt_g, $opt_c, $opt_r, $opt_l, $opt_i)=("","","","","","","","","",""); diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx index 08536be6b18..b4c707a604c 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx @@ -4,6 +4,7 @@ % -macrocode "glossaries\.perl" % -macrocode ".*\.tex" % -src "glossaries.sty\Z=>glossaries.sty" +% -src "mfirstuc.sty\Z=>mfirstuc.sty" % -src "(glossary-.+)\.(sty)\Z=>\1.\2" % -src "(glossaries-babel)\.(sty)\Z=>\1.\2" % -src "(glossaries-dictionary-.+)\.(dict)\Z=>\1.\2" @@ -19,7 +20,7 @@ % -doc "glossaries-manual.tex" % -codetitle "Documented Code" % glossaries -% Created on 2008/3/4 12:06 +% Created on 2008/3/8 23:00 %\fi %\iffalse %<*package> @@ -70,7 +71,7 @@ \makeatother \RecordChanges \PageIndex -\CheckSum{4357} +\CheckSum{4630} \CodelineNumbered \newcommand*{\termdef}[1]{\emph{#1}\iterm{#1}} \newcommand*{\term}[1]{#1\iterm{#1}} @@ -108,7 +109,7 @@ %\MakeShortVerb{"} %\DeleteShortVerb{\|} % -% \title{glossaries.sty v 1.11: \LaTeXe\ Package to Assist Generating Glossaries} +% \title{glossaries.sty v 1.12: \LaTeXe\ Package to Assist Generating Glossaries} % \author{Nicola L.C. Talbot\\[10pt] %School of Computing Sciences\\ %University of East Anglia\\ @@ -116,7 +117,7 @@ %NR4 7TJ. United Kingdom.\\ %\url{http://theoval.cmp.uea.ac.uk/~nlct/}} % -% \date{2nd March 2008} +% \date{8th March 2008} % \maketitle %\tableofcontents % @@ -137,7 +138,7 @@ %limited multi-lingual support, thanks to all the people who have sent %me the relevant translations either via email or via comp.text.tex. %However you must load \isty{babel} \emph{before} -%\sty{glossaries} to enable this. (See \autoref{sec:predefinednames} for thepredefined names used by the \sty{glossaries} package.) +%\sty{glossaries} to enable this. (See \autoref{sec:predefinednames} for the predefined names used by the \sty{glossaries} package.) %As from version 1.1, the \sty{glossaries} package also supports %Till~Tantau's \isty{translator} package provided it is loaded %before the \sty{glossaries} package. This makes it easier to change @@ -147,7 +148,12 @@ % %This documentation is structured as follows: \autoref{sec:quick} is for people who want a few quick pointers of how to get started, %without having to read through lengthy descriptions, -%\autoref{sec:overview} gives an overview of available commands. +%\autoref{sec:overview} gives an overview of available commands and their syntax, \autoref{sec:mfirstuc} describes the associated +%\sty{mfirstuc} +%package, \autoref{sec:code} contains the documented source code for those who want to know more about how the +%package works and how to do more complicated things, such as +%changing the way glossary entries appear. +% %\subsection{Generating the associated glossary files} %\label{sec:makeglossaries} % @@ -326,6 +332,12 @@ %\newglossaryentry{elite}{name={{\'e}lite}, %description={select group or class}} %\end{verbatim} +%Likewise with commands such as \cs{ae} and \cs{oe}: +%\begin{verbatim} +%\newglossaryentry{oesophagus}{% +%name={{\oe}sophagus}, +%description={canal from mouth to stomach}} +%\end{verbatim} % %\item If you have multiple glossaries, use the \gloskey{type} %key to specify in which glossary the entry belongs. For example: @@ -763,6 +775,11 @@ %\item[{\gloskey{description}}] A brief description of this term (to %appear in the glossary). % +%\item[{\gloskey{descriptionplural}}] The plural form of the +%description (as passed to \ics{glsdisplay} and \ics{glsdisplayfirst} +%by \ics{glspl}, \ics{Glspl} and \ics{GLSpl}). If omitted, the value +%is set to the same as the \gloskey{description} key. +% %\item[{\gloskey{text}}] How this entry will appear in the document text %when using \ics{gls} (or one of its uppercase variants). If this %field is omitted, the value of the \gloskey{name} key is used. @@ -787,6 +804,11 @@ %specify an associated symbol, but most glossary styles ignore %this value. If omitted, the value is set to \cs{relax}. % +%\item[{\gloskey{symbolplural}}] This is the plural form of the +%symbol (as passed to \ics{glsdisplay} and \ics{glsdisplayfirst} +%by \ics{glspl}, \ics{Glspl} and \ics{GLSpl}). If omitted, the value +%is set to the same as the \gloskey{symbol} key. +% %\item[{\gloskey{sort}}] This value indicates how \appname{makeindex} %should sort this entry. If omitted, the value is given by the %\gloskey{name} field. This value is equivalent to @@ -801,16 +823,29 @@ %\texttt{acronym}, depending on whether the \pkgopt{acronym} package %option was used. %\end{description} -%Note that if the \gloskey{text} key (or the \gloskey{name} key, if the -%\gloskey{text} key is omitted) starts with an accented letter, +%Note that if the key starts with an accented letter, %you must group the accented letter, otherwise it will cause a %problem for \cs{Gls} and \cs{Glspl}. For example: %\begin{verbatim} %\newglossaryentry{elite}{name={{\'e}lite}, %description={select group or class}} %\end{verbatim} -%(Likewise for the \gloskey{plural}, \gloskey{first} and -%\gloskey{firstplural} keys.) +%Similarly, commands such as \cs{ae} and \cs{oe} should either be placed +%inside a group or followed by a space. For example: +%\begin{verbatim} +%\newglossaryentry{oesophagus}{% +%name={{\oe}sophagus}, +%description={canal from mouth to stomach}} +%\end{verbatim} +%The following is also fine: +%\begin{verbatim} +%\newglossaryentry{oesophagus}{% +%name={\oe sophagus}, +%description={canal from mouth to stomach}} +%\end{verbatim} +%but don't do \verb|\oe{}sophagus| as it will confuse +%\ics{makefirstuc} (described +%in \autoref{sec:mfirstuc}) and will produce \oe{}Sophagus instead of {\OE}sophagus. % %\DescribeMacro{\loadglsentries} %You can store all your glossary entry definitions in another @@ -1429,6 +1464,28 @@ %\end{center} %\end{table} % +%In case you can't remember which key stores the long or short forms +%(or their plurals) the \sty{glossaries} package provides the +%commands: +%\begin{itemize} +%\item\DescribeMacro{\glsshortkey}\cs{glsshortkey} +%The key used to store the short form. +%\item\DescribeMacro{\glsshortpluralkey}\cs{glsshortpluralkey} +%The key used to store the plural version of the short form. +%\item\DescribeMacro{\glslongkey}\cs{glslongkey} +%The key used to store the long form. +%\item\DescribeMacro{\glslongpluralkey}\cs{glslongpluralkey} +%The key used to store the plural version of the long form. +%\end{itemize} +%These can be used in the optional argument of \cs{newacronym} +%to override the defaults. For example: +%\begin{verbatim} +%\newacronym[\glslongpluralkey={diagonal matrices}]{dm}{DM}{diagonal +%matrix} +%\end{verbatim} +%If the first use uses the plural form, \verb|\glspl{dm}| will +%display: diagonal matrices (DMs). +% %Each of the package options \pkgopt{smallcaps}, \pkgopt{footnote} %and \pkgopt{description} use \ics{defglsdisplay} and %\ics{defglsdisplayfirst} (described in \autoref{sec:glsdisplay}) @@ -1878,6 +1935,35 @@ %} %\end{verbatim} % +%\section{Mfirstuc Package} +%\label{sec:mfirstuc} +% +%The \sty{glossaries} package is supplied with the package +%\isty{mfirstuc} which provides the command:\\[10pt] +%\DescribeMacro{\makefirstuc} +%\cs{makefirstuc}\marg{stuff}\\[10pt] +%which makes the first object of +%\meta{stuff} uppercase unless \meta{stuff} starts with a control +%sequence followed by a group, in which case the first +%object in the group is converted to uppercase. Examples: +%\begin{itemize} +%\item \verb|\makefirstuc{abc}| produces Abc +% +%\item \verb|\makefirstuc{\emph{abc}}| produces \emph{Abc} +%(\ics{MakeUppercase} has been applied to the letter \dq{a} rather +%than \cs{emph}.) +% +%\item \verb|\makefirstuc{{\'a}bc}| produces {\'A}bc +% +%\item \verb|\makefirstuc{\ae bc}| produces \AE bc +% +%\item \verb|\makefirstuc{{\ae}bc}| produces {\AE}bc +%\end{itemize} +% +%Note however that \verb|\makefirstuc{\ae{}bc}| produces \ae Bc since +%the empty group following \cs{ae} is considered to be the argument +%of \cs{ae} which is in fact not the case. +% % \StopEventually{\clearpage\phantomsection\addcontentsline{toc}{section}{Index}\PrintIndex} % % @@ -1894,12 +1980,13 @@ % This package requires \LaTeXe. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2008/02/22 v1.11 (NLCT)] +\ProvidesPackage{glossaries}[2008/03/08 v1.12 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] +\RequirePackage{mfirstuc} % \end{macrocode} %\changes{1.1}{2008 Feb 22}{amsgen now loaded (\cs{new@ifnextchar} needed)} % Need to use \cs{new@ifnextchar} instead of \cs{@ifnextchar} in @@ -2774,6 +2861,12 @@ exists}% \def\@glo@desc{#1}% } % \end{macrocode} +% \changes{1.12}{2008 Mar 8}{descriptionplural key added} +% \begin{macrocode} +\define@key{glossentry}{descriptionplural}{% +\def\@glo@descplural{#1}% +} +% \end{macrocode} % % The \gloskey{sort} key needs to be sanitized here % (the sort key is provided for \appname{makeindex}'s benefit, @@ -2840,6 +2933,12 @@ exists}% \def\@glo@symbol{#1}% } % \end{macrocode} +% \changes{1.12}{2008 Mar 8}{symbolplural key added} +% \begin{macrocode} +\define@key{glossentry}{symbolplural}{% +\def\@glo@symbolplural{#1}% +} +% \end{macrocode} % % The \gloskey{type} key specifies to which glossary this % entry belongs. If omitted, the default glossary is used. @@ -2882,12 +2981,30 @@ counter as its value}}{% \string\newglossaryentry}{You haven't specified the entry name}}% \def\@glo@desc{\PackageError{glossaries}{description key required in \string\newglossaryentry}{You haven't specified the entry description}}% +% \end{macrocode} +% \changes{1.12}{2008 Mar 8}{descriptionplural support added} +% \begin{macrocode} +\def\@glo@descplural{\@glo@desc}% +% \end{macrocode} +% \begin{macrocode} \def\@glo@type{\glsdefaulttype}% \def\@glo@symbol{\relax}% +% \end{macrocode} +% \changes{1.12}{2008 Mar 8}{symbolplural support added} +% \begin{macrocode} +\def\@glo@symbolplural{\@glo@symbol}% +% \end{macrocode} +% \begin{macrocode} \def\@glo@text{\@glo@name}% \def\@glo@plural{\@glo@text s}% \def\@glo@first{\@glo@text}% -\def\@glo@firstplural{\@glo@plural}% +% \end{macrocode} +% \changes{1.12}{2008 Mar 8}{Changed default first plural to be first +% key with s appended (was text key with s appended)} +% \begin{macrocode} +\def\@glo@firstplural{\@glo@first s}% +% \end{macrocode} +% \begin{macrocode} \def\@glo@sort{\@glo@name}% \def\@glo@counter{\@gls@getcounter{\@glo@type}}% % \end{macrocode} @@ -2918,9 +3035,11 @@ in it}}{% \expandafter\protected@xdef\csname glo@#1@name\endcsname{\@glo@name}% \@gls@sanitizedesc \expandafter\protected@xdef\csname glo@#1@desc\endcsname{\@glo@desc}% +\expandafter\protected@xdef\csname glo@#1@descplural\endcsname{\@glo@descplural}% \expandafter\protected@xdef\csname glo@#1@sort\endcsname{\@glo@sort}% \@gls@sanitizesymbol \expandafter\protected@xdef\csname glo@#1@symbol\endcsname{\@glo@symbol}% +\expandafter\protected@xdef\csname glo@#1@symbolplural\endcsname{\@glo@symbolplural}% % \end{macrocode} % Define an associated boolean variable to determine whether this % entry has been used yet (needs to be defined globally): @@ -3539,17 +3658,31 @@ counter as its value}}{% % \end{macrocode} %\end{macro} % -% If \ics{hyperlink} -% is not defined, \cs{@glslink} and \cs{@glstarget} -% ignore their first argument, and just do the second argument, -% otherwise they are equivalent to \ics{hyperlink} and -%\ics{hypertarget}. +%\begin{macro}{\@glslink} +% If \ics{hyperlink} is not defined \cs{@glslink} +% ignores its first argument and just does the second argument, +% otherwise it is equivalent to \ics{hyperlink}. % \begin{macrocode} \@ifundefined{hyperlink}{% -\gdef\@glslink#1#2{#2}\gdef\@glstarget#1#2{#2}% -}{\gdef\@glslink#1#2{\hyperlink{#1}{#2}}% -\gdef\@glstarget#1#2{\hypertarget{#1}{#2}}} + \gdef\@glslink#1#2{#2}% +}{% + \gdef\@glslink#1#2{\hyperlink{#1}{#2}}% +} +% \end{macrocode} +%\end{macro} +%\changes{1.12}{2008 Mar 8}{added check for 'hypertarget separate +% to 'hyperlink (memoir defines 'hyperlink but not 'hypertarget)} +%\begin{macro}{\@glstarget} +% If \ics{hypertarget} is not defined, \cs{@glstarget} +% ignores its first argument and just does the second argument, +% otherwise it is equivalent to \ics{hypertarget}. +% \begin{macrocode} +\@ifundefined{hypertarget}{% + \gdef\@glstarget#1#2{#2}% +}{% + \gdef\@glstarget#1#2{\hypertarget{#1}{#2}}} % \end{macrocode} +%\end{macro} % % Glossary hyperlinks can be disabled using \cs{glsdisablehyper} % (effect can be localised): @@ -3693,12 +3826,15 @@ counter as its value}}{% % hyperlink for first use. % \begin{macrocode} \ifglsused{#2}{% - \@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% + \@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }{% \ifglsacrfootnote - \@gls@link[#1,hyper=false]{#2}{\expandafter\MakeUppercase\@glo@text}% + \@gls@link[#1,hyper=false]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% \else - \@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% + \@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% \fi }% % \end{macrocode} @@ -3794,13 +3930,17 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +%\changes{1.12}{2008 Mar 8}{now uses 'glsentrydescplural and +% 'glsentrysymbolplural instead of 'glsentrydesc and 'glsentrysymbol} % \begin{macrocode} \ifglsused{#2}{\protected@edef\@glo@text{% \csname gls@\@glo@type @display\endcsname -{\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}{% +{\glsentryplural{#2}}{\glsentrydescplural{#2}}{% +\glsentrysymbolplural{#2}}{#3}}}{% \protected@edef\@glo@text{% \csname gls@\@glo@type @displayfirst\endcsname -{\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}% +{\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}{% +\glsentrysymbolplural{#2}}{#3}}}% % \end{macrocode} % Call \cs{@gls@link} % If \pkgopt{footnote} package option has been used, suppress @@ -3853,25 +3993,32 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +%\changes{1.12}{2008 Mar 8}{now uses 'glsentrydescplural and +% 'glsentrysymbolplural instead of 'glsentrydesc and 'glsentrysymbol} % \begin{macrocode} \ifglsused{#2}{\protected@edef\@glo@text{% \csname gls@\@glo@type @display\endcsname -{\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}{% +{\glsentryplural{#2}}{\glsentrydescplural{#2}}{% +\glsentrysymbolplural{#2}}{#3}}}{% \protected@edef\@glo@text{% \csname gls@\@glo@type @displayfirst\endcsname -{\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}% +{\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}{\expandafter\MakeUppercase\@glo@text}% + \@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }{% \ifglsacrfootnote - \@gls@link[#1,hyper=false]{#2}{\expandafter\MakeUppercase\@glo@text}% + \@gls@link[#1,hyper=false]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% \else - \@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% + \@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% \fi }% % \end{macrocode} @@ -3910,13 +4057,17 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +%\changes{1.12}{2008 Mar 8}{now uses 'glsentrydescplural and +% 'glsentrysymbolplural instead of 'glsentrydesc and 'glsentrysymbol} % \begin{macrocode} \ifglsused{#2}{\protected@edef\@glo@text{% \csname gls@\@glo@type @display\endcsname -{\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}{% +{\glsentryplural{#2}}{\glsentrydescplural{#2}}{% +\glsentrysymbolplural{#2}}{#3}}}{% \protected@edef\@glo@text{% \csname gls@\@glo@type @displayfirst\endcsname -{\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}% +{\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}{% +\glsentrysymbolplural{#2}}{#3}}}% % \end{macrocode} % Call \cs{@gls@link} % If \pkgopt{footnote} package option has been used, suppress @@ -3963,10 +4114,10 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('glstext shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentrytext{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} @@ -3999,10 +4150,10 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('GLStext shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentrytext{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} @@ -4035,14 +4186,15 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('Glstext shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentrytext{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} -\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }% } % \end{macrocode} @@ -4072,10 +4224,10 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('glsfirst shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryfirst{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} @@ -4108,14 +4260,15 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('Glsfirst shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryfirst{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} -\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }% } % \end{macrocode} @@ -4144,10 +4297,10 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('GLSfirst shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryfirst{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} @@ -4181,10 +4334,10 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('glsplural shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryplural{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} @@ -4217,14 +4370,15 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('Glsplural shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryplural{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} -\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }% } % \end{macrocode} @@ -4253,10 +4407,10 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('GLSplural shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryplural{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} @@ -4290,10 +4444,10 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('glsfirstplural shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryfirstplural{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} @@ -4326,14 +4480,15 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('Glsfirstplural shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryfirstplural{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} -\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }% } % \end{macrocode} @@ -4362,10 +4517,10 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('GLSfirstplural shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryfirstplural{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} @@ -4399,10 +4554,10 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('glsname shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryname{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryname{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} @@ -4435,14 +4590,15 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('glsname shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryname{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryname{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} -\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }% } % \end{macrocode} @@ -4471,10 +4627,10 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('GLSname shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryname{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryname{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} @@ -4508,10 +4664,10 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('glsdesc shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrydesc{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentrydesc{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} @@ -4544,14 +4700,15 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('Glsdesc shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrydesc{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentrydesc{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} -\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }% } % \end{macrocode} @@ -4580,10 +4737,114 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('GLSdesc shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrydesc{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentrydesc{#2}}% +% \end{macrocode} +% Call \cs{@gls@link} +% \begin{macrocode} +\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% +}% +} +% \end{macrocode} +% +% \cs{glsdescplural} behaves like \ics{gls} except it always uses the value +% given by the \gloskey{descriptionplural} key and it doesn't mark the entry +% as used. +%\begin{macro}{\glsdescplural} +% \begin{macrocode} +\newcommand*{\glsdescplural}{\@ifstar\@sglsdescplural\@glsdescplural} +% \end{macrocode} +%\end{macro} +% Define the starred form: +% \begin{macrocode} +\newcommand*{\@sglsdescplural}[1][]{\@glsdescplural[hyper=false,#1]} +% \end{macrocode} +% Defined the un-starred form. Need to determine if there is +% a final optional argument +% \begin{macrocode} +\newcommand*{\@glsdescplural}[2][]{% +\new@ifnextchar[{\@glsdescplural@{#1}{#2}}{\@glsdescplural@{#1}{#2}[]}} +% \end{macrocode} +% Read in the final optional argument: +% \begin{macrocode} +\def\@glsdescplural@#1#2[#3]{% +\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% +% \end{macrocode} +% Determine what the link text should be (this is stored in +% \cs{@glo@text}) +% \begin{macrocode} +\protected@edef\@glo@text{\glsentrydescplural{#2}}% +% \end{macrocode} +% Call \cs{@gls@link} +% \begin{macrocode} +\@gls@link[#1]{#2}{\@glo@text}% +}% +} +% \end{macrocode} +% +% \cs{Glsdescplural} behaves like \ics{glsdescplural} except that the +% first letter is converted to uppercase. +%\begin{macro}{\Glsdescplural} +% \begin{macrocode} +\newcommand*{\Glsdescplural}{\@ifstar\@sGlsdescplural\@Glsdescplural} +% \end{macrocode} +%\end{macro} +% Define the starred form: +% \begin{macrocode} +\newcommand*{\@sGlsdescplural}[1][]{\@Glsdescplural[hyper=false,#1]} +% \end{macrocode} +% Defined the un-starred form. Need to determine if there is +% a final optional argument +% \begin{macrocode} +\newcommand*{\@Glsdescplural}[2][]{% +\new@ifnextchar[{\@Glsdescplural@{#1}{#2}}{\@Glsdescplural@{#1}{#2}[]}} +% \end{macrocode} +% Read in the final optional argument: +% \begin{macrocode} +\def\@Glsdescplural@#1#2[#3]{% +\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% +% \end{macrocode} +% Determine what the link text should be (this is stored in +% \cs{@glo@text}) +% \begin{macrocode} +\protected@edef\@glo@text{\glsentrydescplural{#2}}% +% \end{macrocode} +% Call \cs{@gls@link} +% \begin{macrocode} +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% +}% +} +% \end{macrocode} +% +% \cs{GLSdescplural} behaves like \ics{glsdescplural} except that the +% link text is converted to uppercase. +%\begin{macro}{\GLSdescplural} +% \begin{macrocode} +\newcommand*{\GLSdescplural}{\@ifstar\@sGLSdescplural\@GLSdescplural} +% \end{macrocode} +%\end{macro} +% Define the starred form: +% \begin{macrocode} +\newcommand*{\@sGLSdescplural}[1][]{\@GLSdescplural[hyper=false,#1]} +% \end{macrocode} +% Defined the un-starred form. Need to determine if there is +% a final optional argument +% \begin{macrocode} +\newcommand*{\@GLSdescplural}[2][]{% +\new@ifnextchar[{\@GLSdescplural@{#1}{#2}}{\@GLSdescplural@{#1}{#2}[]}} +% \end{macrocode} +% Read in the final optional argument: +% \begin{macrocode} +\def\@GLSdescplural@#1#2[#3]{% +\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% +% \end{macrocode} +% Determine what the link text should be (this is stored in +% \cs{@glo@text}) +% \begin{macrocode} +\protected@edef\@glo@text{\glsentrydescplural{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} @@ -4617,10 +4878,10 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('glssymbol shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrysymbol{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentrysymbol{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} @@ -4653,14 +4914,15 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('Glssymbol shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrysymbol{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentrysymbol{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} -\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }% } % \end{macrocode} @@ -4689,10 +4951,116 @@ counter as its value}}{% % \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('GLSsymbol shouldn't use +% 'gls@\meta{type}@display)} % \begin{macrocode} -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrysymbol{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentrysymbol{#2}}% +% \end{macrocode} +% Call \cs{@gls@link} +% \begin{macrocode} +\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% +}% +} +% \end{macrocode} +% +% \cs{glssymbolplural} behaves like \ics{gls} except it always uses the value +% given by the \gloskey{symbolplural} key and it doesn't mark the entry as +% used. +%\begin{macro}{\glssymbolplural} +% \begin{macrocode} +\newcommand*{\glssymbolplural}{\@ifstar\@sglssymbolplural\@glssymbolplural} +% \end{macrocode} +%\end{macro} +% Define the starred form: +% \begin{macrocode} +\newcommand*{\@sglssymbolplural}[1][]{\@glssymbolplural[hyper=false,#1]} +% \end{macrocode} +% Defined the un-starred form. Need to determine if there is +% a final optional argument +% \begin{macrocode} +\newcommand*{\@glssymbolplural}[2][]{% +\new@ifnextchar[{\@glssymbolplural@{#1}{#2}}{\@glssymbolplural@{#1}{#2}[]}} +% \end{macrocode} +% Read in the final optional argument: +% \begin{macrocode} +\def\@glssymbolplural@#1#2[#3]{% +\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% +% \end{macrocode} +% Determine what the link text should be (this is stored in +% \cs{@glo@text}) +% \changes{1.12}{2008 Mar 8}{fixed bug ('glssymbolplural shouldn't use +% 'gls@\meta{type}@display)} +% \begin{macrocode} +\protected@edef\@glo@text{\glsentrysymbolplural{#2}}% +% \end{macrocode} +% Call \cs{@gls@link} +% \begin{macrocode} +\@gls@link[#1]{#2}{\@glo@text}% +}% +} +% \end{macrocode} +% +% \cs{Glssymbolplural} behaves like \ics{glssymbolplural} except that the +% first letter is converted to uppercase. +%\begin{macro}{\Glssymbolplural} +% \begin{macrocode} +\newcommand*{\Glssymbolplural}{\@ifstar\@sGlssymbolplural\@Glssymbolplural} +% \end{macrocode} +%\end{macro} +% Define the starred form: +% \begin{macrocode} +\newcommand*{\@sGlssymbolplural}[1][]{\@Glssymbolplural[hyper=false,#1]} +% \end{macrocode} +% Defined the un-starred form. Need to determine if there is +% a final optional argument +% \begin{macrocode} +\newcommand*{\@Glssymbolplural}[2][]{% +\new@ifnextchar[{\@Glssymbolplural@{#1}{#2}}{\@Glssymbolplural@{#1}{#2}[]}} +% \end{macrocode} +% Read in the final optional argument: +% \begin{macrocode} +\def\@Glssymbolplural@#1#2[#3]{% +\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% +% \end{macrocode} +% Determine what the link text should be (this is stored in +% \cs{@glo@text}) +% \begin{macrocode} +\protected@edef\@glo@text{\glsentrysymbolplural{#2}}% +% \end{macrocode} +% Call \cs{@gls@link} +% \begin{macrocode} +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% +}% +} +% \end{macrocode} +% +% \cs{GLSsymbolplural} behaves like \ics{glssymbolplural} except that the +% link text is converted to uppercase. +%\begin{macro}{\GLSsymbolplural} +% \begin{macrocode} +\newcommand*{\GLSsymbolplural}{\@ifstar\@sGLSsymbolplural\@GLSsymbolplural} +% \end{macrocode} +%\end{macro} +% Define the starred form: +% \begin{macrocode} +\newcommand*{\@sGLSsymbolplural}[1][]{\@GLSsymbolplural[hyper=false,#1]} +% \end{macrocode} +% Defined the un-starred form. Need to determine if there is +% a final optional argument +% \begin{macrocode} +\newcommand*{\@GLSsymbolplural}[2][]{% +\new@ifnextchar[{\@GLSsymbolplural@{#1}{#2}}{\@GLSsymbolplural@{#1}{#2}[]}} +% \end{macrocode} +% Read in the final optional argument: +% \begin{macrocode} +\def\@GLSsymbolplural@#1#2[#3]{% +\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% +% \end{macrocode} +% Determine what the link text should be (this is stored in +% \cs{@glo@text}) +% \begin{macrocode} +\protected@edef\@glo@text{\glsentrysymbolplural{#2}}% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} @@ -4711,7 +5079,7 @@ counter as its value}}{% % when the entry was defined.) The argument % is the label associated with the entry. Note that unless you % used \texttt{name=false} in the \pkgopt{sanitize} package option -% you may get unexpected results if the \gloskey{name} key contained +% you may get unexpected results if the \gloskey{name} key contains % any commands. %\begin{macro}{\glsentryname} % \begin{macrocode} @@ -4720,8 +5088,9 @@ counter as its value}}{% %\end{macro} %\begin{macro}{\Glsentryname} % \begin{macrocode} -\newcommand*{\Glsentryname}[1]{\expandafter -\MakeUppercase\csname glo@#1@name\endcsname} +\newcommand*{\Glsentryname}[1]{% +\protected@edef\@glo@text{\csname glo@#1@name\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} %\end{macro} % @@ -4738,8 +5107,25 @@ counter as its value}}{% %\end{macro} %\begin{macro}{\Glsentrydesc} % \begin{macrocode} -\newcommand*{\Glsentrydesc}[1]{\expandafter -\MakeUppercase\csname glo@#1@desc\endcsname} +\newcommand*{\Glsentrydesc}[1]{% +\protected@edef\@glo@text{\csname glo@#1@desc\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} +% \end{macrocode} +%\end{macro} +% Plural form: +%\begin{macro}{\glsentrydescplural} +%\changes{1.12}{2008 Mar 8}{New} +% \begin{macrocode} +\newcommand*{\glsentrydescplural}[1]{% +\csname glo@#1@descplural\endcsname} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\Glsentrydescplural} +%\changes{1.12}{2008 Mar 8}{New} +% \begin{macrocode} +\newcommand*{\Glsentrydescplural}[1]{% +\protected@edef\@glo@text{\csname glo@#1@descplural\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} %\end{macro} % @@ -4753,8 +5139,9 @@ counter as its value}}{% %\end{macro} %\begin{macro}{\Glsentrytext} % \begin{macrocode} -\newcommand*{\Glsentrytext}[1]{\expandafter -\MakeUppercase\csname glo@#1@text\endcsname} +\newcommand*{\Glsentrytext}[1]{% +\protected@edef\@glo@text{\csname glo@#1@text\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} %\end{macro} % @@ -4766,8 +5153,9 @@ counter as its value}}{% %\end{macro} %\begin{macro}{\Glsentryplural} % \begin{macrocode} -\newcommand*{\Glsentryplural}[1]{\expandafter -\MakeUppercase\csname glo@#1@plural\endcsname} +\newcommand*{\Glsentryplural}[1]{% +\protected@edef\@glo@text{\csname glo@#1@plural\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} %\end{macro} % @@ -4783,8 +5171,25 @@ counter as its value}}{% %\end{macro} %\begin{macro}{\Glsentrysymbol} % \begin{macrocode} -\newcommand*{\Glsentrysymbol}[1]{\expandafter -\MakeUppercase\csname glo@#1@symbol\endcsname} +\newcommand*{\Glsentrysymbol}[1]{% +\protected@edef\@glo@text{\csname glo@#1@symbol\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} +% \end{macrocode} +%\end{macro} +% Plural form: +%\begin{macro}{\glsentrysymbolplural} +%\changes{1.12}{2008 Mar 8}{New} +% \begin{macrocode} +\newcommand*{\glsentrysymbolplural}[1]{% +\csname glo@#1@symbolplural\endcsname} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\Glsentrysymbolplural} +%\changes{1.12}{2008 Mar 8}{New} +% \begin{macrocode} +\newcommand*{\Glsentrysymbolplural}[1]{% +\protected@edef\@glo@text{\csname glo@#1@symbolplural\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} %\end{macro} % @@ -4798,8 +5203,9 @@ counter as its value}}{% %\end{macro} %\begin{macro}{\Glsentryfirst} % \begin{macrocode} -\newcommand*{\Glsentryfirst}[1]{\expandafter -\MakeUppercase\csname glo@#1@first\endcsname} +\newcommand*{\Glsentryfirst}[1]{% +\protected@edef\@glo@text{\csname glo@#1@first\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} %\end{macro} % @@ -4814,7 +5220,8 @@ counter as its value}}{% %\begin{macro}{\Glsentryfirstplural} % \begin{macrocode} \newcommand*{\Glsentryfirstplural}[1]{% -\expandafter\MakeUppercase\csname glo@#1@firstpl\endcsname} +\protected@edef\@glo@text{\csname glo@#1@firstpl\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} %\end{macro} % @@ -5500,8 +5907,10 @@ style `#1' undefined}{}}{% % \begin{macrocode} \newcommand{\newacronym}[4][]{% \newglossaryentry{#2}{type=\acronymtype,% -name={#3},description={#4},text={#3},% -first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} +name={#3},description={#4},text={#3},descriptionplural={#4s},% +first={#4 (#3)},plural={#3s},% +firstplural={\@glo@descplural\space (\@glo@plural)},% +#1}} % \end{macrocode} %\end{macro} % New acronyms can only be defined in the preamble: @@ -5512,6 +5921,29 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} % \cs{newacronym} is changed (or if the \gloskey{description} key % is changed). % +% Make a note of the keys that are used to store the long and +% short forms: +%\begin{macro}{\glsshortkey} +% \begin{macrocode} +\newcommand*{\glsshortkey}{text} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glsshortpluralkey} +% \begin{macrocode} +\newcommand*{\glsshortpluralkey}{plural} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glslongkey} +% \begin{macrocode} +\newcommand*{\glslongkey}{description} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glslongpluralkey} +% \begin{macrocode} +\newcommand*{\glslongpluralkey}{descriptionplural} +% \end{macrocode} +%\end{macro} +% % Using the default definitions, \ics{acrshort} is the same as % \ics{glstext}, which means that it will print the abbreviation. %\begin{macro}{\acrshort} @@ -5605,6 +6037,14 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} symbol={#4},% #1}} % \end{macrocode} +% Set up the commands to make a note of the keys to store the long +% and short forms: +% \begin{macrocode} +\def\glsshortkey{text}% +\def\glsshortpluralkey{plural}% +\def\glslongkey{symbol}% +\def\glslongpluralkey{symbolplural}% +% \end{macrocode} % Set up short cuts. Short form: % \begin{macrocode} \def\@acrshort#1#2[#3]{\acronymfont{\@glstext@{#1}{#2}[#3]}} @@ -5630,10 +6070,13 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} % If \pkgopt{footnote} package option is specified, set the first % use to append the long form (stored in \gloskey{symbol}) as a % footnote. +%\changes{1.12}{2008 Mar 8}{Added 'protect before 'footnote +% and 'glslink} % \begin{macrocode} \defglsdisplayfirst[\acronymtype]{% - \acronymfont{#1}#4\noexpand\footnote{% - \noexpand\glslink[\@gls@link@opts]{\@gls@link@label}{#3}}}% + \acronymfont{#1}#4\noexpand\protect\noexpand\footnote{% + \noexpand\protect\noexpand\glslink + [\@gls@link@opts]{\@gls@link@label}{#3}}}% \defglsdisplay[\acronymtype]{\acronymfont{#1}#4}% \ifglsacrsmallcaps \renewcommand*{\acronymfont}[1]{\textsc{#1}} @@ -5661,6 +6104,14 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} symbol={#3},% #1}} % \end{macrocode} +% Set up the commands to make a note of the keys to store the long +% and short forms: +% \begin{macrocode} +\def\glsshortkey{symbol}% +\def\glsshortpluralkey{symbolplural}% +\def\glslongkey{first}% +\def\glslongpluralkey{plural}% +% \end{macrocode} % Set up short cuts. Short form: % \begin{macrocode} \def\@acrshort#1#2[#3]{\acronymfont{\@glssymbol@{#1}{#2}[#3]}} @@ -5698,6 +6149,14 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} symbol={#3},% #1}} % \end{macrocode} +% Set up the commands to make a note of the keys to store the long +% and short forms: +% \begin{macrocode} +\def\glsshortkey{text}% +\def\glsshortpluralkey{plural}% +\def\glslongkey{first}% +\def\glslongpluralkey{firstplural}% +% \end{macrocode} % Set up short cuts. Short form: % \begin{macrocode} \def\@acrshort#1#2[#3]{\acronymfont{\@glstext@{#1}{#2}[#3]}} @@ -5749,11 +6208,22 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} description={#4},% #1}} % \end{macrocode} +% Set up the commands to make a note of the keys to store the long +% and short forms: +% \begin{macrocode} +\def\glsshortkey{text}% +\def\glsshortpluralkey{plural}% +\def\glslongkey{description}% +\def\glslongpluralkey{descriptionplural}% +% \end{macrocode} % Set display +%\changes{1.12}{2008 Mar 8}{Added 'protect before 'footnote and +% 'glslink} % \begin{macrocode} \defglsdisplayfirst[\acronymtype]{% - \acronymfont{#1}#4\noexpand\footnote{% - \noexpand\glslink[\@gls@link@opts]{\@gls@link@label}{#2}}}% + \acronymfont{#1}#4\noexpand\protect\noexpand\footnote{% + \noexpand\protect\noexpand\glslink + [\@gls@link@opts]{\@gls@link@label}{#2}}}% \defglsdisplay[\acronymtype]{\acronymfont{#1}#4}% % \end{macrocode} % Set up short cuts. Short form: @@ -5798,10 +6268,7 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} % % Neither footnote nor description required. % Use the \gloskey{symbol} key to store the short form and -% \gloskey{first} to store the description. -% Note that this way makes the first use plural form -% appear as \dq{\meta{long}s (\meta{short})} instead of -% \dq{\meta{long}s (\meta{short}s)}. +% \gloskey{first} to store the long form. % \begin{macrocode} \renewcommand{\newacronym}[4][]{% \newglossaryentry{#2}{type=\acronymtype,% @@ -5811,6 +6278,14 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} symbol={#3},% #1}} % \end{macrocode} +% Set up the commands to make a note of the keys to store the long +% and short forms: +% \begin{macrocode} +\def\glsshortkey{symbol}% +\def\glsshortpluralkey{symbolplural}% +\def\glslongkey{first}% +\def\glslongpluralkey{firstplural}% +% \end{macrocode} % Change the display since \gloskey{first} only contains long form. % \begin{macrocode} \defglsdisplayfirst[\acronymtype]{#1#4 (\acronymfont{#3})} @@ -5860,6 +6335,14 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} symbol={#3},% #1}} % \end{macrocode} +% Set up the commands to make a note of the keys to store the long +% and short forms: +% \begin{macrocode} +\def\glsshortkey{symbol}% +\def\glsshortpluralkey{symbolplural}% +\def\glslongkey{text}% +\def\glslongpluralkey{plural}% +% \end{macrocode} % Set the display % \begin{macrocode} \defglsdisplayfirst[\acronymtype]{#1#4} @@ -5912,6 +6395,78 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} %\fi %\iffalse % \begin{macrocode} +%<*mfirstuc.sty> +% \end{macrocode} +%\fi +%\section{Mfirstuc package} +% \begin{macrocode} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{mfirstuc}[2008/03/08 v1.0 (NLCT)] +% \end{macrocode} +%\begin{macro}{\makefirstuc} +% Syntax:\\ +% \cs{makefirstuc}\marg{text}\\ +% Makes the first letter uppercase, but will +% skip initial control sequences if they are followed by a group +% and make the first thing in the group uppercase. +% Thus \verb|\makefirstuc{abc}| will produce: Abc, +% \verb|\makefirstuc{\ae bc}| will produce: \AE bc, but +% \verb|\makefirstuc{\emph{abc}}| will produce \emph{Abc}. +% This is required by \ics{Gls} and \ics{Glspl}. +% \begin{macrocode} +\newif\if@glscs +\def\makefirstuc#1{% +\def\gls@argi{#1}% +\ifx\gls@argi\@empty +\else + \protected@edef\@gls@tmp{\ #1}% + \@onelevel@sanitize\@gls@tmp + \expandafter\@gls@checkcs\@gls@tmp\relax\relax + \if@glscs + \@gls@getbody #1{}\@nil + \ifx\@gls@rest\@empty + \MakeUppercase #1% + \else + \@gls@body{\expandafter\@gls@makefirstuc\@gls@rest}% + \fi + \else + \MakeUppercase #1% + \fi +\fi +} +% \end{macrocode} +%\end{macro} +% \begin{macrocode} +\def\@gls@checkcs#1 #2#3\relax{% +\def\@gls@argi{#1}\def\@gls@argii{#2}% +\ifx\@gls@argi\@gls@argii + \@glscstrue +\else + \@glscsfalse +\fi +} +% \end{macrocode} +% Make first thing upper case: +% \begin{macrocode} +\def\@gls@makefirstuc#1{\MakeUppercase #1} +% \end{macrocode} +% +% Get the first grouped argument and stores in \cs{@gls@body}. +% \begin{macrocode} +\def\@gls@getbody#1#{\def\@gls@body{#1}\@gls@gobbletonil} +% \end{macrocode} +% Scoup up everything to \cs{@nil} and store in \cs{@gls@rest}: +% \begin{macrocode} +\def\@gls@gobbletonil#1\@nil{\def\@gls@rest{#1}} +% \end{macrocode} +% +%\iffalse +% \begin{macrocode} +%</mfirstuc.sty> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} %<*glossary-hypernav.sty> % \end{macrocode} %\fi @@ -8035,7 +8590,7 @@ $glsnumformat{'main'} = $GLSCURRENTFORMAT; $gls_displayfirst{'main'} = "glsdisplayfirst"; $gls_display{'main'} = "glsdisplay"; -%glsentry = (); + %glsentry = (); $acronymtype = 'main'; diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins index 9efa72599bc..37cd7cde61e 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 2008/3/4 12:06 +% glossaries.ins generated using makedtx version 0.94b 2008/3/8 23:00 \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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, 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, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. \endpreamble @@ -26,6 +26,8 @@ \generate{\file{glossaries.sty}{\usepreamble\defaultpreamble \usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries.sty,package}} +\file{mfirstuc.sty}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries.dtx}{mfirstuc.sty,package}} \file{glossary-hypernav.sty}{\usepreamble\defaultpreamble \usepostamble\defaultpostamble\from{glossaries.dtx}{glossary-hypernav.sty,package}} \file{glossary-list.sty}{\usepreamble\defaultpreamble diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.perl b/Master/texmf-dist/source/latex/glossaries/glossaries.perl index 8a64fbe3aca..d666df02b57 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.perl +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.perl @@ -55,6 +55,7 @@ $glsnumformat{'main'} = $GLSCURRENTFORMAT; $gls_displayfirst{'main'} = "glsdisplayfirst"; $gls_display{'main'} = "glsdisplay"; + %glsentry = (); $acronymtype = 'main'; diff --git a/Master/texmf-dist/tex/latex/glossaries/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty index e75d00d56eb..0387464125f 100644 --- a/Master/texmf-dist/tex/latex/glossaries/glossaries.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty @@ -21,7 +21,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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, 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, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -39,9 +39,10 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2008/02/22 v1.11 (NLCT)] +\ProvidesPackage{glossaries}[2008/03/08 v1.12 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] +\RequirePackage{mfirstuc} \RequirePackage{amsgen} \define@boolkey{glossaries.sty}[gls]{toc}[true]{} \define@boolkey{glossaries.sty}[gls]{numberline}[true]{} @@ -253,6 +254,9 @@ exists}% \define@key{glossentry}{description}{% \def\@glo@desc{#1}% } +\define@key{glossentry}{descriptionplural}{% +\def\@glo@descplural{#1}% +} \define@key{glossentry}{sort}{% \def\@glo@sort{#1}% \@onelevel@sanitize\@glo@sort} @@ -271,6 +275,9 @@ exists}% \define@key{glossentry}{symbol}{% \def\@glo@symbol{#1}% } +\define@key{glossentry}{symbolplural}{% +\def\@glo@symbolplural{#1}% +} \define@key{glossentry}{type}{% \def\@glo@type{#1}} \define@key{glossentry}{counter}{% @@ -284,12 +291,14 @@ counter as its value}}{% \string\newglossaryentry}{You haven't specified the entry name}}% \def\@glo@desc{\PackageError{glossaries}{description key required in \string\newglossaryentry}{You haven't specified the entry description}}% +\def\@glo@descplural{\@glo@desc}% \def\@glo@type{\glsdefaulttype}% \def\@glo@symbol{\relax}% +\def\@glo@symbolplural{\@glo@symbol}% \def\@glo@text{\@glo@name}% \def\@glo@plural{\@glo@text s}% \def\@glo@first{\@glo@text}% -\def\@glo@firstplural{\@glo@plural}% +\def\@glo@firstplural{\@glo@first s}% \def\@glo@sort{\@glo@name}% \def\@glo@counter{\@gls@getcounter{\@glo@type}}% \setkeys{glossentry}{#2}% @@ -310,9 +319,11 @@ in it}}{% \expandafter\protected@xdef\csname glo@#1@name\endcsname{\@glo@name}% \@gls@sanitizedesc \expandafter\protected@xdef\csname glo@#1@desc\endcsname{\@glo@desc}% +\expandafter\protected@xdef\csname glo@#1@descplural\endcsname{\@glo@descplural}% \expandafter\protected@xdef\csname glo@#1@sort\endcsname{\@glo@sort}% \@gls@sanitizesymbol \expandafter\protected@xdef\csname glo@#1@symbol\endcsname{\@glo@symbol}% +\expandafter\protected@xdef\csname glo@#1@symbolplural\endcsname{\@glo@symbolplural}% \expandafter\gdef\csname glo@#1@flagfalse\endcsname{% \expandafter\global\expandafter \let\csname ifglo@#1@flag\endcsname\iffalse}% @@ -627,9 +638,14 @@ counter as its value}}{% \fi \@@gls@checkactual} \@ifundefined{hyperlink}{% -\gdef\@glslink#1#2{#2}\gdef\@glstarget#1#2{#2}% -}{\gdef\@glslink#1#2{\hyperlink{#1}{#2}}% -\gdef\@glstarget#1#2{\hypertarget{#1}{#2}}} + \gdef\@glslink#1#2{#2}% +}{% + \gdef\@glslink#1#2{\hyperlink{#1}{#2}}% +} +\@ifundefined{hypertarget}{% + \gdef\@glstarget#1#2{#2}% +}{% + \gdef\@glstarget#1#2{\hypertarget{#1}{#2}}} \newcommand{\glsdisablehyper}{% \renewcommand*\@glslink[2]{##2}% \renewcommand*\@glstarget[2]{##2}} @@ -676,12 +692,15 @@ counter as its value}}{% \csname gls@\@glo@type @displayfirst\endcsname {\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}% \ifglsused{#2}{% - \@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% + \@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }{% \ifglsacrfootnote - \@gls@link[#1,hyper=false]{#2}{\expandafter\MakeUppercase\@glo@text}% + \@gls@link[#1,hyper=false]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% \else - \@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% + \@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% \fi }% \glsunset{#2}}% @@ -721,10 +740,12 @@ counter as its value}}{% \def\@gls@link@label{#2}% \ifglsused{#2}{\protected@edef\@glo@text{% \csname gls@\@glo@type @display\endcsname -{\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}{% +{\glsentryplural{#2}}{\glsentrydescplural{#2}}{% +\glsentrysymbolplural{#2}}{#3}}}{% \protected@edef\@glo@text{% \csname gls@\@glo@type @displayfirst\endcsname -{\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}% +{\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}{% +\glsentrysymbolplural{#2}}{#3}}}% \ifglsused{#2}{% \@gls@link[#1]{#2}{\@glo@text}% }{% @@ -746,17 +767,22 @@ counter as its value}}{% \def\@gls@link@label{#2}% \ifglsused{#2}{\protected@edef\@glo@text{% \csname gls@\@glo@type @display\endcsname -{\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}{% +{\glsentryplural{#2}}{\glsentrydescplural{#2}}{% +\glsentrysymbolplural{#2}}{#3}}}{% \protected@edef\@glo@text{% \csname gls@\@glo@type @displayfirst\endcsname -{\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}% +{\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}{% +\glsentrysymbolplural{#2}}{#3}}}% \ifglsused{#2}{% - \@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% + \@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }{% \ifglsacrfootnote - \@gls@link[#1,hyper=false]{#2}{\expandafter\MakeUppercase\@glo@text}% + \@gls@link[#1,hyper=false]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% \else - \@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% + \@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% \fi }% \glsunset{#2}}% @@ -771,10 +797,12 @@ counter as its value}}{% \def\@gls@link@label{#2}% \ifglsused{#2}{\protected@edef\@glo@text{% \csname gls@\@glo@type @display\endcsname -{\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}{% +{\glsentryplural{#2}}{\glsentrydescplural{#2}}{% +\glsentrysymbolplural{#2}}{#3}}}{% \protected@edef\@glo@text{% \csname gls@\@glo@type @displayfirst\endcsname -{\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}}% +{\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}{% +\glsentrysymbolplural{#2}}{#3}}}% \ifglsused{#2}{% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% }{% @@ -792,9 +820,7 @@ counter as its value}}{% \new@ifnextchar[{\@glstext@{#1}{#2}}{\@glstext@{#1}{#2}[]}} \def\@glstext@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentrytext{#2}}% \@gls@link[#1]{#2}{\@glo@text}% }% } @@ -804,9 +830,7 @@ counter as its value}}{% \new@ifnextchar[{\@GLStext@{#1}{#2}}{\@GLStext@{#1}{#2}[]}} \def\@GLStext@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentrytext{#2}}% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% }% } @@ -816,10 +840,9 @@ counter as its value}}{% \new@ifnextchar[{\@Glstext@{#1}{#2}}{\@Glstext@{#1}{#2}[]}} \def\@Glstext@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% -\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% +\protected@edef\@glo@text{\glsentrytext{#2}}% +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }% } \newcommand*{\glsfirst}{\@ifstar\@sglsfirst\@glsfirst} @@ -828,9 +851,7 @@ counter as its value}}{% \new@ifnextchar[{\@glsfirst@{#1}{#2}}{\@glsfirst@{#1}{#2}[]}} \def\@glsfirst@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryfirst{#2}}% \@gls@link[#1]{#2}{\@glo@text}% }% } @@ -840,10 +861,9 @@ counter as its value}}{% \new@ifnextchar[{\@Glsfirst@{#1}{#2}}{\@Glsfirst@{#1}{#2}[]}} \def\@Glsfirst@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% -\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% +\protected@edef\@glo@text{\glsentryfirst{#2}}% +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }% } \newcommand*{\GLSfirst}{\@ifstar\@sGLSfirst\@GLSfirst} @@ -852,9 +872,7 @@ counter as its value}}{% \new@ifnextchar[{\@GLSfirst@{#1}{#2}}{\@GLSfirst@{#1}{#2}[]}} \def\@GLSfirst@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryfirst{#2}}% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% }% } @@ -864,9 +882,7 @@ counter as its value}}{% \new@ifnextchar[{\@glsplural@{#1}{#2}}{\@glsplural@{#1}{#2}[]}} \def\@glsplural@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryplural{#2}}% \@gls@link[#1]{#2}{\@glo@text}% }% } @@ -876,10 +892,9 @@ counter as its value}}{% \new@ifnextchar[{\@Glsplural@{#1}{#2}}{\@Glsplural@{#1}{#2}[]}} \def\@Glsplural@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% -\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% +\protected@edef\@glo@text{\glsentryplural{#2}}% +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }% } \newcommand*{\GLSplural}{\@ifstar\@sGLSplural\@GLSplural} @@ -888,9 +903,7 @@ counter as its value}}{% \new@ifnextchar[{\@GLSplural@{#1}{#2}}{\@GLSplural@{#1}{#2}[]}} \def\@GLSplural@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryplural{#2}}% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% }% } @@ -900,9 +913,7 @@ counter as its value}}{% \new@ifnextchar[{\@glsfirstplural@{#1}{#2}}{\@glsfirstplural@{#1}{#2}[]}} \def\@glsfirstplural@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryfirstplural{#2}}% \@gls@link[#1]{#2}{\@glo@text}% }% } @@ -912,10 +923,9 @@ counter as its value}}{% \new@ifnextchar[{\@Glsfirstplural@{#1}{#2}}{\@Glsfirstplural@{#1}{#2}[]}} \def\@Glsfirstplural@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% -\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% +\protected@edef\@glo@text{\glsentryfirstplural{#2}}% +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }% } \newcommand*{\GLSfirstplural}{\@ifstar\@sGLSfirstplural\@GLSfirstplural} @@ -924,9 +934,7 @@ counter as its value}}{% \new@ifnextchar[{\@GLSfirstplural@{#1}{#2}}{\@GLSfirstplural@{#1}{#2}[]}} \def\@GLSfirstplural@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryfirstplural{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryfirstplural{#2}}% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% }% } @@ -936,9 +944,7 @@ counter as its value}}{% \new@ifnextchar[{\@glsname@{#1}{#2}}{\@glsname@{#1}{#2}[]}} \def\@glsname@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryname{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryname{#2}}% \@gls@link[#1]{#2}{\@glo@text}% }% } @@ -948,10 +954,9 @@ counter as its value}}{% \new@ifnextchar[{\@Glsname@{#1}{#2}}{\@Glsname@{#1}{#2}[]}} \def\@Glsname@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryname{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% -\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% +\protected@edef\@glo@text{\glsentryname{#2}}% +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }% } \newcommand*{\GLSname}{\@ifstar\@sGLSname\@GLSname} @@ -960,9 +965,7 @@ counter as its value}}{% \new@ifnextchar[{\@GLSname@{#1}{#2}}{\@GLSname@{#1}{#2}[]}} \def\@GLSname@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentryname{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentryname{#2}}% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% }% } @@ -972,9 +975,7 @@ counter as its value}}{% \new@ifnextchar[{\@glsdesc@{#1}{#2}}{\@glsdesc@{#1}{#2}[]}} \def\@glsdesc@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrydesc{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentrydesc{#2}}% \@gls@link[#1]{#2}{\@glo@text}% }% } @@ -984,10 +985,9 @@ counter as its value}}{% \new@ifnextchar[{\@Glsdesc@{#1}{#2}}{\@Glsdesc@{#1}{#2}[]}} \def\@Glsdesc@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrydesc{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% -\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% +\protected@edef\@glo@text{\glsentrydesc{#2}}% +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }% } \newcommand*{\GLSdesc}{\@ifstar\@sGLSdesc\@GLSdesc} @@ -996,9 +996,38 @@ counter as its value}}{% \new@ifnextchar[{\@GLSdesc@{#1}{#2}}{\@GLSdesc@{#1}{#2}[]}} \def\@GLSdesc@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrydesc{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentrydesc{#2}}% +\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% +}% +} +\newcommand*{\glsdescplural}{\@ifstar\@sglsdescplural\@glsdescplural} +\newcommand*{\@sglsdescplural}[1][]{\@glsdescplural[hyper=false,#1]} +\newcommand*{\@glsdescplural}[2][]{% +\new@ifnextchar[{\@glsdescplural@{#1}{#2}}{\@glsdescplural@{#1}{#2}[]}} +\def\@glsdescplural@#1#2[#3]{% +\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% +\protected@edef\@glo@text{\glsentrydescplural{#2}}% +\@gls@link[#1]{#2}{\@glo@text}% +}% +} +\newcommand*{\Glsdescplural}{\@ifstar\@sGlsdescplural\@Glsdescplural} +\newcommand*{\@sGlsdescplural}[1][]{\@Glsdescplural[hyper=false,#1]} +\newcommand*{\@Glsdescplural}[2][]{% +\new@ifnextchar[{\@Glsdescplural@{#1}{#2}}{\@Glsdescplural@{#1}{#2}[]}} +\def\@Glsdescplural@#1#2[#3]{% +\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% +\protected@edef\@glo@text{\glsentrydescplural{#2}}% +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% +}% +} +\newcommand*{\GLSdescplural}{\@ifstar\@sGLSdescplural\@GLSdescplural} +\newcommand*{\@sGLSdescplural}[1][]{\@GLSdescplural[hyper=false,#1]} +\newcommand*{\@GLSdescplural}[2][]{% +\new@ifnextchar[{\@GLSdescplural@{#1}{#2}}{\@GLSdescplural@{#1}{#2}[]}} +\def\@GLSdescplural@#1#2[#3]{% +\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% +\protected@edef\@glo@text{\glsentrydescplural{#2}}% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% }% } @@ -1008,9 +1037,7 @@ counter as its value}}{% \new@ifnextchar[{\@glssymbol@{#1}{#2}}{\@glssymbol@{#1}{#2}[]}} \def\@glssymbol@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrysymbol{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentrysymbol{#2}}% \@gls@link[#1]{#2}{\@glo@text}% }% } @@ -1020,10 +1047,9 @@ counter as its value}}{% \new@ifnextchar[{\@Glssymbol@{#1}{#2}}{\@Glssymbol@{#1}{#2}[]}} \def\@Glssymbol@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrysymbol{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% -\@gls@link[#1]{#2}{\expandafter\MakeUppercase\@glo@text}% +\protected@edef\@glo@text{\glsentrysymbol{#2}}% +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% }% } \newcommand*{\GLSsymbol}{\@ifstar\@sGLSsymbol\@GLSsymbol} @@ -1032,34 +1058,80 @@ counter as its value}}{% \new@ifnextchar[{\@GLSsymbol@{#1}{#2}}{\@GLSsymbol@{#1}{#2}[]}} \def\@GLSsymbol@#1#2[#3]{% \glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{% -\csname gls@\@glo@type @display\endcsname -{\glsentrysymbol{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% +\protected@edef\@glo@text{\glsentrysymbol{#2}}% +\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% +}% +} +\newcommand*{\glssymbolplural}{\@ifstar\@sglssymbolplural\@glssymbolplural} +\newcommand*{\@sglssymbolplural}[1][]{\@glssymbolplural[hyper=false,#1]} +\newcommand*{\@glssymbolplural}[2][]{% +\new@ifnextchar[{\@glssymbolplural@{#1}{#2}}{\@glssymbolplural@{#1}{#2}[]}} +\def\@glssymbolplural@#1#2[#3]{% +\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% +\protected@edef\@glo@text{\glsentrysymbolplural{#2}}% +\@gls@link[#1]{#2}{\@glo@text}% +}% +} +\newcommand*{\Glssymbolplural}{\@ifstar\@sGlssymbolplural\@Glssymbolplural} +\newcommand*{\@sGlssymbolplural}[1][]{\@Glssymbolplural[hyper=false,#1]} +\newcommand*{\@Glssymbolplural}[2][]{% +\new@ifnextchar[{\@Glssymbolplural@{#1}{#2}}{\@Glssymbolplural@{#1}{#2}[]}} +\def\@Glssymbolplural@#1#2[#3]{% +\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% +\protected@edef\@glo@text{\glsentrysymbolplural{#2}}% +\@gls@link[#1]{#2}{% + \expandafter\makefirstuc\expandafter{\@glo@text}}% +}% +} +\newcommand*{\GLSsymbolplural}{\@ifstar\@sGLSsymbolplural\@GLSsymbolplural} +\newcommand*{\@sGLSsymbolplural}[1][]{\@GLSsymbolplural[hyper=false,#1]} +\newcommand*{\@GLSsymbolplural}[2][]{% +\new@ifnextchar[{\@GLSsymbolplural@{#1}{#2}}{\@GLSsymbolplural@{#1}{#2}[]}} +\def\@GLSsymbolplural@#1#2[#3]{% +\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% +\protected@edef\@glo@text{\glsentrysymbolplural{#2}}% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% }% } \newcommand*{\glsentryname}[1]{\csname glo@#1@name\endcsname} -\newcommand*{\Glsentryname}[1]{\expandafter -\MakeUppercase\csname glo@#1@name\endcsname} +\newcommand*{\Glsentryname}[1]{% +\protected@edef\@glo@text{\csname glo@#1@name\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentrydesc}[1]{\csname glo@#1@desc\endcsname} -\newcommand*{\Glsentrydesc}[1]{\expandafter -\MakeUppercase\csname glo@#1@desc\endcsname} +\newcommand*{\Glsentrydesc}[1]{% +\protected@edef\@glo@text{\csname glo@#1@desc\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} +\newcommand*{\glsentrydescplural}[1]{% +\csname glo@#1@descplural\endcsname} +\newcommand*{\Glsentrydescplural}[1]{% +\protected@edef\@glo@text{\csname glo@#1@descplural\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentrytext}[1]{\csname glo@#1@text\endcsname} -\newcommand*{\Glsentrytext}[1]{\expandafter -\MakeUppercase\csname glo@#1@text\endcsname} +\newcommand*{\Glsentrytext}[1]{% +\protected@edef\@glo@text{\csname glo@#1@text\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentryplural}[1]{\csname glo@#1@plural\endcsname} -\newcommand*{\Glsentryplural}[1]{\expandafter -\MakeUppercase\csname glo@#1@plural\endcsname} +\newcommand*{\Glsentryplural}[1]{% +\protected@edef\@glo@text{\csname glo@#1@plural\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentrysymbol}[1]{\csname glo@#1@symbol\endcsname} -\newcommand*{\Glsentrysymbol}[1]{\expandafter -\MakeUppercase\csname glo@#1@symbol\endcsname} +\newcommand*{\Glsentrysymbol}[1]{% +\protected@edef\@glo@text{\csname glo@#1@symbol\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} +\newcommand*{\glsentrysymbolplural}[1]{% +\csname glo@#1@symbolplural\endcsname} +\newcommand*{\Glsentrysymbolplural}[1]{% +\protected@edef\@glo@text{\csname glo@#1@symbolplural\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentryfirst}[1]{\csname glo@#1@first\endcsname} -\newcommand*{\Glsentryfirst}[1]{\expandafter -\MakeUppercase\csname glo@#1@first\endcsname} +\newcommand*{\Glsentryfirst}[1]{% +\protected@edef\@glo@text{\csname glo@#1@first\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentryfirstplural}[1]{% \csname glo@#1@firstpl\endcsname} \newcommand*{\Glsentryfirstplural}[1]{% -\expandafter\MakeUppercase\csname glo@#1@firstpl\endcsname} +\protected@edef\@glo@text{\csname glo@#1@firstpl\endcsname}% +\expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentrytype}[1]{\csname glo@#1@type\endcsname} \newcommand*{\glsentrysort}[1]{\csname glo@#1@sort\endcsname} \define@key{glossadd}{counter}{\def\@glo@counter{#1}} @@ -1265,9 +1337,15 @@ style `#1' undefined}{}}{% \fi \newcommand{\newacronym}[4][]{% \newglossaryentry{#2}{type=\acronymtype,% -name={#3},description={#4},text={#3},% -first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} +name={#3},description={#4},text={#3},descriptionplural={#4s},% +first={#4 (#3)},plural={#3s},% +firstplural={\@glo@descplural\space (\@glo@plural)},% +#1}} \@onlypreamble{\newacronym} +\newcommand*{\glsshortkey}{text} +\newcommand*{\glsshortpluralkey}{plural} +\newcommand*{\glslongkey}{description} +\newcommand*{\glslongpluralkey}{descriptionplural} \newcommand*{\acrshort}[2][]{% \new@ifnextchar[{\@acrshort{#1}{#2}}{\@acrshort{#1}{#2}[]}} \def\@acrshort#1#2[#3]{\@glstext@{#1}{#2}[#3]} @@ -1303,6 +1381,10 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} name={#3},% symbol={#4},% #1}} +\def\glsshortkey{text}% +\def\glsshortpluralkey{plural}% +\def\glslongkey{symbol}% +\def\glslongpluralkey{symbolplural}% \def\@acrshort#1#2[#3]{\acronymfont{\@glstext@{#1}{#2}[#3]}} \def\@Acrshort#1#2[#3]{\acronymfont{\@Glstext@{#1}{#2}[#3]}} \def\@ACRshort#1#2[#3]{\acronymfont{\@GLStext@{#1}{#2}[#3]}} @@ -1316,8 +1398,9 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} \def\@ACRfull#1#2[#3]{\@GLSsymbol@{#1}{#2}[#3] (\acronymfont{\@GLStext@{#1}{#2}[#3]})} \defglsdisplayfirst[\acronymtype]{% - \acronymfont{#1}#4\noexpand\footnote{% - \noexpand\glslink[\@gls@link@opts]{\@gls@link@label}{#3}}}% + \acronymfont{#1}#4\noexpand\protect\noexpand\footnote{% + \noexpand\protect\noexpand\glslink + [\@gls@link@opts]{\@gls@link@label}{#3}}}% \defglsdisplay[\acronymtype]{\acronymfont{#1}#4}% \ifglsacrsmallcaps \renewcommand*{\acronymfont}[1]{\textsc{#1}} @@ -1338,6 +1421,10 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} first={#4},% symbol={#3},% #1}} +\def\glsshortkey{symbol}% +\def\glsshortpluralkey{symbolplural}% +\def\glslongkey{first}% +\def\glslongpluralkey{plural}% \def\@acrshort#1#2[#3]{\acronymfont{\@glssymbol@{#1}{#2}[#3]}} \def\@Acrshort#1#2[#3]{\acronymfont{\@Glssymbol@{#1}{#2}[#3]}} \def\@ACRshort#1#2[#3]{\acronymfont{\@GLSsymbol@{#1}{#2}[#3]}} @@ -1359,6 +1446,10 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} first={#4},% symbol={#3},% #1}} +\def\glsshortkey{text}% +\def\glsshortpluralkey{plural}% +\def\glslongkey{first}% +\def\glslongpluralkey{firstplural}% \def\@acrshort#1#2[#3]{\acronymfont{\@glstext@{#1}{#2}[#3]}} \def\@Acrshort#1#2[#3]{\acronymfont{\@Glstext@{#1}{#2}[#3]}} \def\@ACRshort#1#2[#3]{\acronymfont{\@GLStext@{#1}{#2}[#3]}} @@ -1385,9 +1476,14 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} name={#3},% description={#4},% #1}} +\def\glsshortkey{text}% +\def\glsshortpluralkey{plural}% +\def\glslongkey{description}% +\def\glslongpluralkey{descriptionplural}% \defglsdisplayfirst[\acronymtype]{% - \acronymfont{#1}#4\noexpand\footnote{% - \noexpand\glslink[\@gls@link@opts]{\@gls@link@label}{#2}}}% + \acronymfont{#1}#4\noexpand\protect\noexpand\footnote{% + \noexpand\protect\noexpand\glslink + [\@gls@link@opts]{\@gls@link@label}{#2}}}% \defglsdisplay[\acronymtype]{\acronymfont{#1}#4}% \def\@acrshort#1#2[#3]{\acronymfont{\@glstext@{#1}{#2}[#3]}} \def\@Acrshort#1#2[#3]{\acronymfont{\@Glstext@{#1}{#2}[#3]}} @@ -1417,6 +1513,10 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} description={#4},% symbol={#3},% #1}} +\def\glsshortkey{symbol}% +\def\glsshortpluralkey{symbolplural}% +\def\glslongkey{first}% +\def\glslongpluralkey{firstplural}% \defglsdisplayfirst[\acronymtype]{#1#4 (\acronymfont{#3})} \defglsdisplay[\acronymtype]{\acronymfont{#1}#4} \renewcommand*{\acronymfont}[1]{\textsc{#1}} @@ -1445,6 +1545,10 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}} text={#4},% symbol={#3},% #1}} +\def\glsshortkey{symbol}% +\def\glsshortpluralkey{symbolplural}% +\def\glslongkey{text}% +\def\glslongpluralkey{plural}% \defglsdisplayfirst[\acronymtype]{#1#4} \defglsdisplay[\acronymtype]{#1#4} \def\@acrshort#1#2[#3]{\@glssymbol@{#1}{#2}[#3]} diff --git a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty new file mode 100644 index 00000000000..24c55288a1b --- /dev/null +++ b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty @@ -0,0 +1,76 @@ +%% +%% This is file `mfirstuc.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries.dtx (with options: `mfirstuc.sty,package') +%% +%% glossaries.dtx +%% Copyright 2008 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license of (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% 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, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{mfirstuc}[2008/03/08 v1.0 (NLCT)] +\newif\if@glscs +\def\makefirstuc#1{% +\def\gls@argi{#1}% +\ifx\gls@argi\@empty +\else + \protected@edef\@gls@tmp{\ #1}% + \@onelevel@sanitize\@gls@tmp + \expandafter\@gls@checkcs\@gls@tmp\relax\relax + \if@glscs + \@gls@getbody #1{}\@nil + \ifx\@gls@rest\@empty + \MakeUppercase #1% + \else + \@gls@body{\expandafter\@gls@makefirstuc\@gls@rest}% + \fi + \else + \MakeUppercase #1% + \fi +\fi +} +\def\@gls@checkcs#1 #2#3\relax{% +\def\@gls@argi{#1}\def\@gls@argii{#2}% +\ifx\@gls@argi\@gls@argii + \@glscstrue +\else + \@glscsfalse +\fi +} +\def\@gls@makefirstuc#1{\MakeUppercase #1} +\def\@gls@getbody#1#{\def\@gls@body{#1}\@gls@gobbletonil} +\def\@gls@gobbletonil#1\@nil{\def\@gls@rest{#1}} +\endinput +%% +%% End of file `mfirstuc.sty'. diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict index 11ebed0f117..0f99fa88fe0 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict @@ -21,7 +21,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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, 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, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict index abfff1740e5..247ecb15e77 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict @@ -21,7 +21,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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, 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, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict index 64140682399..ad793008dde 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict @@ -21,7 +21,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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, 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, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict index 41e36266967..28e2a790146 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict @@ -21,7 +21,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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, 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, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict index 03ce4a53d80..ee7a2810ed1 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict @@ -21,7 +21,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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, 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, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict index 72f5e8f3e2c..1bc102453c8 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict @@ -21,7 +21,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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, 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, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict index f12f26816ce..f8852c772bd 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict @@ -21,7 +21,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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, 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, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict index b364df126b0..55d3984c53a 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict @@ -21,7 +21,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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, 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, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict index 1579534bbed..c19ee9274e5 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict @@ -21,7 +21,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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, 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, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/glossaries-babel.sty b/Master/texmf-dist/tex/latex/glossaries/glossaries-babel.sty deleted file mode 100644 index 695e13dc5a2..00000000000 --- a/Master/texmf-dist/tex/latex/glossaries/glossaries-babel.sty +++ /dev/null @@ -1,137 +0,0 @@ -%% -%% This is file `glossaries-babel.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% glossaries.dtx (with options: `glossaries-babel.sty,package') -%% -%% glossaries.dtx -%% Copyright 2008 Nicola Talbot -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license of (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. -%% -%% This work has the LPPL maintenance status `maintained'. -%% -%% 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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. -%% -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-babel}[2008/02/22 v1.0 (NLCT)] -\addto\captionsenglish{% -\renewcommand*{\glossaryname}{Glossary}% -\renewcommand*{\acronymname}{Acronyms}% -\renewcommand*{\entryname}{Notation}% -\renewcommand*{\descriptionname}{Description}% -\renewcommand*{\symbolname}{Symbol}% -\renewcommand*{\pagelistname}{Page List}% -\renewcommand*{\glssymbolsgroupname}{Symbols}% -\renewcommand*{\glsnumbersgroupname}{Numbers}% -}% -\addto\captionsgerman{% -\renewcommand*{\glossaryname}{Glossar}% -\renewcommand*{\acronymname}{Akronyme}% -\renewcommand*{\entryname}{Bezeichnung}% -\renewcommand*{\descriptionname}{Beschreibung}% -\renewcommand*{\symbolname}{Symbol}% -\renewcommand*{\pagelistname}{Seiten}% -\renewcommand*{\glssymbolsgroupname}{Symbole}% -\renewcommand*{\glsnumbersgroupname}{Zahlen}} -\addto\captionsngerman{% -\renewcommand*{\glossaryname}{Glossar}% -\renewcommand*{\acronymname}{Akronyme}% -\renewcommand*{\entryname}{Bezeichnung}% -\renewcommand*{\descriptionname}{Beschreibung}% -\renewcommand*{\symbolname}{Symbol}% -\renewcommand*{\pagelistname}{Seiten}% -\renewcommand*{\glssymbolsgroupname}{Symbole}% -\renewcommand*{\glsnumbersgroupname}{Zahlen}} -\addto\captionsitalian{% -\renewcommand*{\glossaryname}{Glossario}% -\renewcommand*{\acronymname}{Acronimi}% -\renewcommand*{\entryname}{Nomenclatura}% -\renewcommand*{\descriptionname}{Descrizione}% -\renewcommand*{\symbolname}{Simbolo}% -\renewcommand*{\pagelistname}{Elenco delle pagine}% -\renewcommand*{\glssymbolsgroupname}{Simboli}% -\renewcommand*{\glsnumbersgroupname}{Numeri}} -\addto\captionsdutch{% -\renewcommand*{\glossaryname}{Woordenlijst}% -\renewcommand*{\acronymname}{Acroniemen}% -\renewcommand*{\entryname}{Benaming}% -\renewcommand*{\descriptionname}{Beschrijving}% -\renewcommand*{\symbolname}{Symbool}% -\renewcommand*{\pagelistname}{Pagina's}% -\renewcommand*{\glssymbolsgroupname}{Symbolen}% -\renewcommand*{\glsnumbersgroupname}{Cijfers}} -\addto\captionsspanish{% -\renewcommand*{\glossaryname}{Glosario}% -\renewcommand*{\acronymname}{Siglas}% -\renewcommand*{\entryname}{Entrada}% -\renewcommand*{\descriptionname}{Descripci\'on}% -\renewcommand*{\symbolname}{S\'{\i}mbolo}% -\renewcommand*{\pagelistname}{Lista de p\'aginas}% -\renewcommand*{\glssymbolsgroupname}{S\'{\i}mbolos}% -\renewcommand*{\glsnumbersgroupname}{N\'umeros}} -\addto\captionsfrench{% -\renewcommand*{\glossaryname}{Glossaire}% -\renewcommand*{\acronymname}{Acronymes}% -\renewcommand*{\entryname}{Terme}% -\renewcommand*{\descriptionname}{Description}% -\renewcommand*{\symbolname}{Symbole}% -\renewcommand*{\pagelistname}{Pages}% -\renewcommand*{\glssymbolsgroupname}{Symboles}% -\renewcommand*{\glsnumbersgroupname}{Nombres}} -\addto\captionsdanish{% -\renewcommand*{\glossaryname}{Ordliste}% -\renewcommand*{\acronymname}{Akronymer}% -\renewcommand*{\entryname}{Symbolforklaring}% -\renewcommand*{\descriptionname}{Beskrivelse}% -\renewcommand*{\symbolname}{Symbol}% -\renewcommand*{\pagelistname}{Side}% -\renewcommand*{\glssymbolsgroupname}{Symboler}% -\renewcommand*{\glsnumbersgroupname}{Tal}} -\addto\captionsirish{% -\renewcommand*{\glossaryname}{Gluais}% -\renewcommand*{\acronymname}{Acrainmneacha}% -\renewcommand*{\entryname}{Ciall}% -\renewcommand*{\descriptionname}{Tuairisc}% -\renewcommand*{\symbolname}{Comhartha}% -\renewcommand*{\glssymbolsgroupname}{Comhartha\'{\i}}% -\renewcommand*{\pagelistname}{Leathanaigh}% -\renewcommand*{\glsnumbersgroupname}{Uimhreacha}} -\addto\captionsmagyar{% -\renewcommand*{\glossaryname}{Sz\'ojegyz\'ek}% -\renewcommand*{\acronymname}{Bet\H uszavak}% -\renewcommand*{\entryname}{Kifejez\'es}% -\renewcommand*{\descriptionname}{Magyar\'azat}% -\renewcommand*{\symbolname}{Jel\"ol\'es}% -\renewcommand*{\pagelistname}{Oldalsz\'am}% -\renewcommand*{\glssymbolsgroupname}{Jelek}% -\renewcommand*{\glsnumbersgroupname}{Sz\'amjegyek}% -} -\endinput -%% -%% End of file `glossaries-babel.sty'. diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-hypernav.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty index 0b165f3f5c2..d37948d34f9 100644 --- a/Master/texmf-dist/tex/latex/glossaries/glossary-hypernav.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty @@ -21,7 +21,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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, 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, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty index 66bc2e17350..cb3a4964f6b 100644 --- a/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty @@ -21,7 +21,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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, 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, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-long.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty index c17680f813c..630d47e31b5 100644 --- a/Master/texmf-dist/tex/latex/glossaries/glossary-long.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty @@ -21,7 +21,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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, 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, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-super.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty index b05bbd1cf8a..88680332267 100644 --- a/Master/texmf-dist/tex/latex/glossaries/glossary-super.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty @@ -21,7 +21,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, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, 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, glossaries-babel.sty, 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-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds index 91e3b6f25fc..30181149d25 100755 --- a/Master/tlpkg/bin/ctan2tds +++ b/Master/tlpkg/bin/ctan2tds @@ -181,7 +181,8 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw 'gfsneohellenic', "&MAKEflatten", 'gfsporson', "&MAKEflatten", 'gfssolomos', "&MAKEflatten", - 'glossaries', "die 'needs setup from ctan:install, sorry'", #&MAKEcopy", +# 'glossaries', "die 'needs setup from ctan:install, sorry'", #&MAKEcopy", + 'glossaries', "&MAKEcopy", 'glhyph', "die 'hyphenation madness needs work, sorry'", 'graphics', "&MAKEcopy", # we use latex-tds/graphics.zip 'graphicxsp', "die 'skipping, requires adobe distiller'", |