diff options
15 files changed, 3352 insertions, 1520 deletions
diff --git a/Master/texmf-dist/doc/latex/glossaries/CHANGES b/Master/texmf-dist/doc/latex/glossaries/CHANGES index df15408017a..3ae3e3e5440 100644 --- a/Master/texmf-dist/doc/latex/glossaries/CHANGES +++ b/Master/texmf-dist/doc/latex/glossaries/CHANGES @@ -1,5 +1,42 @@ glossaries change log: +v1.16 : + * fixed bug that causes footnote option to remove hyperlink + for first use entries in glossaries other than the list + of acronyms. (footnote option should only affect entries + in \acronymtype glossary.) + + * Raised hypertarget so that links to glossary entries don't + scroll off the top of the page. + + * Fixed expansion-related bug (thanks to fix provided by + Ulrich Diez) + +v1.15 : + * added \glslabel + + * added altlong4col* and altsuper4col* styles + + * fixed PDF encoding problem caused when both translator + and hyperref packages are being used + + * fixed bug when using smallcaps and smaller options that causes + the long form in the list of acronyms to be the same for each + entry + + * Added warnings when rerun required when using glossary + group hyper navigation + +glossaries.perl v1.04: + * add do_cmd_glslabel + + * changed links to the start of the relevant glossary entry + rather than the entry's backlink + + * added implementation of starred forms of \gls etc + + * added frame related code if frames.pl has been loaded + v1.14 : * Fixed bug in \glsnavhyperlink that causes an error when used with hyperref and translator packages. diff --git a/Master/texmf-dist/doc/latex/glossaries/INSTALL b/Master/texmf-dist/doc/latex/glossaries/INSTALL index cfe9abd7580..e192b2517b7 100644 --- a/Master/texmf-dist/doc/latex/glossaries/INSTALL +++ b/Master/texmf-dist/doc/latex/glossaries/INSTALL @@ -1,105 +1,105 @@ -INSTALLATION - -If you have downloaded the glossaries package using the TeX Directory -Structure (TDS), that is you have downloaded an archive containing -doc, tex, scripts and source directories, you need to follow the -"Installing from TDS" instructions below. - -If you have downloaded the following files: - -glossaries.dtx -glossaries.ins -makeglossaries -makeglossaries.bat - -You need to follow the "Installing from DTX and INS" instructions -below. - -For further information on installing LaTeX packages see: - -http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings - -INSTALLING FROM TDS -=================== - -Files in tex and doc directories should go in the -corresponding TEXMF directories (for example, /usr/share/texmf-local/ -or C:\localtexmf\). The scripts/glossaries/ directory -contains the Perl script makeglossaries and the batch file -makeglossaries.bat which should go somewhere on your operating system's -PATH. (Both files are required for Windows, but only the Perl script is -required for other operating systems.) - -*Remember to refresh TeX's database* - -A minimal example file called minimalgls.tex is provided for testing -and debugging purposes and can be found in the package documentation -samples directory (doc/latex/glossaries/samples/). To test your -installation do: - -latex minimalgls -makeglossaries minimalgls -latex minimalgls - -The LaTeX2HTML style file, glossaries.perl, is located in -source/latex/glossaries and should go in the LaTeX2HTML styles -directory. - -INSTALLING FROM DTX AND INS -=========================== - -Run LaTeX on glossaries.ins to generate the package style files, -sample files and LaTeX2HTML style file: - -latex glossaries.ins - -To create the package documentation (glossaries.pdf): - -pdflatex glossaries.dtx -makeindex -s gind.ist glossaries.idx -makeindex -s gglo.ist -o glossaries.gls glossaries.glo -pdflatex glossaries.dtx -pdflatex glossaries.dtx - -If TEXMF denotes the base directory of your local TeX installation (e.g. -/usr/share/texmf-local/ or C:\localtexmf\) then create the following -directories (if they don't already exist): - -TEXMF/doc/latex/glossaries -TEXMF/doc/latex/glossaries/samples -TEXMF/tex/latex/glossaries -TEXMF/tex/latex/glossaries/base -TEXMF/tex/latex/glossaries/styles -TEXMF/tex/latex/glossaries/dict - -Move the sample files (*.tex) to TEXMF/doc/latex/glossaries/sample/ - -Move the documentation (*.pdf) to TEXMF/doc/latex/glossaries/ - -Move glossaries.sty, glossaries-babel.sty and mfirstuc.sty to TEXMF/tex/latex/glossaries/base/ - -Move the other style files (glossary-*.sty) to TEXMF/tex/latex/glossaries/styles/ - -Move the dictionary files (*.dict) to TEXMF/tex/latex/glossaries/dict/ - -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 -Perl installed to be able to use makeglossaries. (It is possible -to use makeindex directly if you don't have Perl installed. See -the manual, glossaries.pdf, for details.) - -*Remember to refresh TeX's database* - -A minimal example file called minimalgls.tex is provided for testing -and debugging purposes. This file is created along with all the other -sample files when you run glossaries.ins through LaTeX. To test your -installation do: - -latex minimalgls -makeglossaries minimalgls -latex minimalgls - -If you want to use the glossaries package with LaTeX2HTML: -move glossaries.perl to the LaTeX2HTML styles directory. +INSTALLATION
+
+If you have downloaded the glossaries package using the TeX Directory
+Structure (TDS), that is you have downloaded an archive containing
+doc, tex, scripts and source directories, you need to follow the
+"Installing from TDS" instructions below.
+
+If you have downloaded the following files:
+
+glossaries.dtx
+glossaries.ins
+makeglossaries
+makeglossaries.bat
+
+You need to follow the "Installing from DTX and INS" instructions
+below.
+
+For further information on installing LaTeX packages see:
+
+http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings
+
+INSTALLING FROM TDS
+===================
+
+Files in tex and doc directories should go in the
+corresponding TEXMF directories (for example, /usr/share/texmf-local/
+or C:\localtexmf\). The scripts/glossaries/ directory
+contains the Perl script makeglossaries and the batch file
+makeglossaries.bat which should go somewhere on your operating system's
+PATH. (Both files are required for Windows, but only the Perl script is
+required for other operating systems.)
+
+*Remember to refresh TeX's database*
+
+A minimal example file called minimalgls.tex is provided for testing
+and debugging purposes and can be found in the package documentation
+samples directory (doc/latex/glossaries/samples/). To test your
+installation do:
+
+latex minimalgls
+makeglossaries minimalgls
+latex minimalgls
+
+The LaTeX2HTML style file, glossaries.perl, is located in
+source/latex/glossaries and should go in the LaTeX2HTML styles
+directory.
+
+INSTALLING FROM DTX AND INS
+===========================
+
+Run LaTeX on glossaries.ins to generate the package style files,
+sample files and LaTeX2HTML style file:
+
+latex glossaries.ins
+
+To create the package documentation (glossaries.pdf):
+
+pdflatex glossaries.dtx
+makeindex -s gind.ist glossaries.idx
+makeindex -s gglo.ist -o glossaries.gls glossaries.glo
+pdflatex glossaries.dtx
+pdflatex glossaries.dtx
+
+If TEXMF denotes the base directory of your local TeX installation (e.g.
+/usr/share/texmf-local/ or C:\localtexmf\) then create the following
+directories (if they don't already exist):
+
+TEXMF/doc/latex/glossaries
+TEXMF/doc/latex/glossaries/samples
+TEXMF/tex/latex/glossaries
+TEXMF/tex/latex/glossaries/base
+TEXMF/tex/latex/glossaries/styles
+TEXMF/tex/latex/glossaries/dict
+
+Move the sample files (*.tex) to TEXMF/doc/latex/glossaries/sample/
+
+Move the documentation (*.pdf) to TEXMF/doc/latex/glossaries/
+
+Move glossaries.sty, glossaries-babel.sty and mfirstuc.sty to TEXMF/tex/latex/glossaries/base/
+
+Move the other style files (glossary-*.sty) to TEXMF/tex/latex/glossaries/styles/
+
+Move the dictionary files (*.dict) to TEXMF/tex/latex/glossaries/dict/
+
+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
+Perl installed to be able to use makeglossaries. (It is possible
+to use makeindex directly if you don't have Perl installed. See
+the manual, glossaries.pdf, for details.)
+
+*Remember to refresh TeX's database*
+
+A minimal example file called minimalgls.tex is provided for testing
+and debugging purposes. This file is created along with all the other
+sample files when you run glossaries.ins through LaTeX. To test your
+installation do:
+
+latex minimalgls
+makeglossaries minimalgls
+latex minimalgls
+
+If you want to use the glossaries package with LaTeX2HTML:
+move glossaries.perl to the LaTeX2HTML styles directory.
diff --git a/Master/texmf-dist/doc/latex/glossaries/README b/Master/texmf-dist/doc/latex/glossaries/README index 3530e14c9c4..4660f2a409d 100644 --- a/Master/texmf-dist/doc/latex/glossaries/README +++ b/Master/texmf-dist/doc/latex/glossaries/README @@ -1,55 +1,55 @@ -LaTeX Package : glossaries v 1.14 - -Last Modified : 17 June 2008 - -Author : Nicola Talbot - -This package is provided to assist generating glossaries. -The package supports acronyms and multiple glossaries. -New entries are defined to have a name and description (and -optionally an associated symbol.) Plural forms can also be -specified. New glossary styles can be defined, and preambles -and postambles can be specified. There is provision for loading -a database of terms, only terms used in the text will be added -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 non-empty 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 - \makefirstuc{\ae{}bc} -> \AE{}bc - -INSTALLATION - -See INSTALL file for installation instructions. - -REQUIREMENTS - -The glossaries package requires at least version 2.5f (2006/11/18) of -the xkeyval package. - -LaTeX2HTML - -This package comes with a LaTeX2HTML style file glossaries.perl -which should be placed in the relevant LaTeX2HTML styles directory, but -note that glossaries.perl only supplies a sub-set of the commands -provided by glossaries.sty, so some commands may not be implemented or -may be implemented in a different way. - -LICENCE - -This material is subject to the LaTeX Project Public License. -See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html -for the details of that license. - -Author's home page: http://theoval.cmp.uea.ac.uk/~nlct/ - +LaTeX Package : glossaries v 1.16
+
+Last Modified : 27 August 2008
+
+Author : Nicola Talbot
+
+This package is provided to assist generating glossaries.
+The package supports acronyms and multiple glossaries.
+New entries are defined to have a name and description (and
+optionally an associated symbol.) Plural forms can also be
+specified. New glossary styles can be defined, and preambles
+and postambles can be specified. There is provision for loading
+a database of terms, only terms used in the text will be added
+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 non-empty 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
+ \makefirstuc{\ae{}bc} -> \AE{}bc
+
+INSTALLATION
+
+See INSTALL file for installation instructions.
+
+REQUIREMENTS
+
+The glossaries package requires at least version 2.5f (2006/11/18) of
+the xkeyval package.
+
+LaTeX2HTML
+
+This package comes with a LaTeX2HTML style file glossaries.perl
+which should be placed in the relevant LaTeX2HTML styles directory, but
+note that glossaries.perl only supplies a sub-set of the commands
+provided by glossaries.sty, so some commands may not be implemented or
+may be implemented in a different way.
+
+LICENCE
+
+This material is subject to the LaTeX Project Public License.
+See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
+for the details of that license.
+
+Author's home page: http://theoval.cmp.uea.ac.uk/~nlct/
+
diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.html b/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.html index d95128495a4..537b85512f9 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.14: LaTeX2e Package to Assist Generating Glossaries</TITLE> -<META NAME="description" CONTENT="glossaries.sty v 1.14: LaTeX2e Package to Assist Generating Glossaries"> +<TITLE>glossaries.sty v 1.16: LaTeX2e Package to Assist Generating Glossaries</TITLE> +<META NAME="description" CONTENT="glossaries.sty v 1.16: 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.14: LaTeX2e Package to Assist Generating Glossaries</H1> + <H1 ALIGN="CENTER">glossaries.sty v 1.16: 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>18th June 2008</STRONG></P> +<P ALIGN="CENTER"><STRONG>27th August 2008</STRONG></P> <BR> <H2><A NAME="SECTION00010000000000000000"> @@ -49,49 +49,74 @@ Contents</A> <!--Table of Contents--> <UL> -<LI><A NAME="tex2html46" +<LI><A NAME="tex2html47" HREF="glossaries-manual.html#SECTION00020000000000000000">Introduction</A> <UL> -<LI><A NAME="tex2html47" - HREF="glossaries-manual.html#SECTION00021000000000000000">Multi-Lingual Support</A> <LI><A NAME="tex2html48" - HREF="glossaries-manual.html#SECTION00022000000000000000">Generating the associated glossary files</A> + HREF="glossaries-manual.html#SECTION00021000000000000000">Multi-Lingual Support</A> <LI><A NAME="tex2html49" + HREF="glossaries-manual.html#SECTION00022000000000000000">Generating the Associated Glossary Files</A> +<LI><A NAME="tex2html50" HREF="glossaries-manual.html#SECTION00023000000000000000">Troubleshooting</A> </UL> <BR> -<LI><A NAME="tex2html50" - HREF="glossaries-manual.html#SECTION00030000000000000000">A Quick Guide For The Impatient</A> <LI><A NAME="tex2html51" + HREF="glossaries-manual.html#SECTION00030000000000000000">A Quick Guide For The Impatient</A> +<LI><A NAME="tex2html52" HREF="glossaries-manual.html#SECTION00040000000000000000">Overview</A> <UL> -<LI><A NAME="tex2html52" - HREF="glossaries-manual.html#SECTION00041000000000000000">Package Options</A> <LI><A NAME="tex2html53" - HREF="glossaries-manual.html#SECTION00042000000000000000">Defining Glossary Entries</A> + HREF="glossaries-manual.html#SECTION00041000000000000000">Package Options</A> <LI><A NAME="tex2html54" - HREF="glossaries-manual.html#SECTION00043000000000000000">Number lists</A> + HREF="glossaries-manual.html#SECTION00042000000000000000">Defining Glossary Entries</A> +<UL> <LI><A NAME="tex2html55" - HREF="glossaries-manual.html#SECTION00044000000000000000">Links to Glossary Entries</A> + HREF="glossaries-manual.html#SECTION00042100000000000000">Plurals</A> <LI><A NAME="tex2html56" - HREF="glossaries-manual.html#SECTION00045000000000000000">Adding an entry to the glossary without generating text</A> + HREF="glossaries-manual.html#SECTION00042200000000000000">Loading Entries From a File</A> +</UL> <LI><A NAME="tex2html57" - HREF="glossaries-manual.html#SECTION00046000000000000000">Displaying a glossary</A> + HREF="glossaries-manual.html#SECTION00043000000000000000">Number lists</A> <LI><A NAME="tex2html58" - HREF="glossaries-manual.html#SECTION00047000000000000000">Defining New Glossaries</A> + HREF="glossaries-manual.html#SECTION00044000000000000000">Links to Glossary Entries</A> +<UL> <LI><A NAME="tex2html59" - HREF="glossaries-manual.html#SECTION00048000000000000000">Acronyms</A> + HREF="glossaries-manual.html#SECTION00044100000000000000">Changing the format of the link text</A> <LI><A NAME="tex2html60" - HREF="glossaries-manual.html#SECTION00049000000000000000">Unsetting and resetting entry flags</A> + HREF="glossaries-manual.html#SECTION00044200000000000000">Enabling and disabling hyperlinks to glossary entries</A> +</UL> <LI><A NAME="tex2html61" - HREF="glossaries-manual.html#SECTION000410000000000000000">Glossary Styles</A> + HREF="glossaries-manual.html#SECTION00045000000000000000">Adding an Entry to the Glossary Without Generating Text</A> <LI><A NAME="tex2html62" - HREF="glossaries-manual.html#SECTION000411000000000000000">Defining your own glossary style</A> + HREF="glossaries-manual.html#SECTION00046000000000000000">Using Glossary Terms Without Links</A> +<LI><A NAME="tex2html63" + HREF="glossaries-manual.html#SECTION00047000000000000000">Displaying a glossary</A> +<UL> +<LI><A NAME="tex2html64" + HREF="glossaries-manual.html#SECTION00047100000000000000">Changing the way the entry name appears in the glossary</A> +</UL> +<LI><A NAME="tex2html65" + HREF="glossaries-manual.html#SECTION00048000000000000000">Defining New Glossaries</A> +<LI><A NAME="tex2html66" + HREF="glossaries-manual.html#SECTION00049000000000000000">Acronyms</A> +<LI><A NAME="tex2html67" + HREF="glossaries-manual.html#SECTION000410000000000000000">Unsetting and Resetting Entry Flags</A> +<LI><A NAME="tex2html68" + HREF="glossaries-manual.html#SECTION000411000000000000000">Glossary Styles</A> +<LI><A NAME="tex2html69" + HREF="glossaries-manual.html#SECTION000412000000000000000">Defining your own glossary style</A> +<UL> +<LI><A NAME="tex2html70" + HREF="glossaries-manual.html#SECTION000412100000000000000">Example: creating a completely new style</A> +<LI><A NAME="tex2html71" + HREF="glossaries-manual.html#SECTION000412200000000000000">Example: creating a new glossary style based on an +existing style</A> +</UL> </UL> <BR> -<LI><A NAME="tex2html63" +<LI><A NAME="tex2html72" HREF="glossaries-manual.html#SECTION00050000000000000000">Mfirstuc Package</A> -<LI><A NAME="tex2html64" +<LI><A NAME="tex2html73" HREF="glossaries-manual.html#SECTION00060000000000000000">Index</A> </UL> <!--End of Table of Contents--> @@ -109,7 +134,7 @@ 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="2316"></A> package which is now +This package replaces the <TT>glossary</TT><A NAME="2483"></A> package which is now obsolete. <P> @@ -138,13 +163,13 @@ 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 <TT>comp.text.tex</TT>. -However you must load <TT>babel</TT><A NAME="2325"></A> <I>before</I> -<TT>glossaries</TT> to enable this. Note that if <TT>babel</TT><A NAME="2329"></A> is loaded -and the <TT>translator</TT><A NAME="2332"></A> package is detected on T<SMALL>E</SMALL>X's path, then the -<TT>translator</TT><A NAME="2335"></A> package will be loaded automatically, however, +However you must load <TT>babel</TT><A NAME="2492"></A> <I>before</I> +<TT>glossaries</TT> to enable this. Note that if <TT>babel</TT><A NAME="2496"></A> is loaded +and the <TT>translator</TT><A NAME="2499"></A> package is detected on T<SMALL>E</SMALL>X's path, then the +<TT>translator</TT><A NAME="2502"></A> package will be loaded automatically, however, it may not pick up on the required languages, so if the predefined text is not translated, you may need to explicitly load the -<TT>translator</TT><A NAME="2338"></A> package with the required languages. For example: +<TT>translator</TT><A NAME="2505"></A> package with the required languages. For example: <PRE> \usepackage[spanish]{babel} \usepackage[spanish]{translator} @@ -152,8 +177,8 @@ text is not translated, you may need to explicitly load the </PRE> <P> -If you want to use <TT>ngerman</TT><A NAME="2341"></A> or <TT>german</TT><A NAME="2344"></A> instead -of <TT>babel</TT><A NAME="2347"></A>, you will need to include the <TT>translator</TT><A NAME="2350"></A> package +If you want to use <TT>ngerman</TT><A NAME="2508"></A> or <TT>german</TT><A NAME="2511"></A> instead +of <TT>babel</TT><A NAME="2514"></A>, you will need to include the <TT>translator</TT><A NAME="2517"></A> package to provide the translations. For example: <PRE> \documentclass[ngerman]{article} @@ -201,7 +226,7 @@ The following languages are currently supported: </TR> </TABLE> </DIV> -The language dependent commands and <TT>translator</TT><A NAME="2353"></A> keys used by the +The language dependent commands and <TT>translator</TT><A NAME="2520"></A> keys used by the glossaries package are listed in <A HREF="glossaries-manual.html#tab:predefinednames">table </A><A HREF="glossaries-manual.html#tab:predefinednames">1</A>. <P> @@ -218,41 +243,41 @@ Customised Text</CAPTION> <TH ALIGN="LEFT"><B>Translator key word </B></TH> <TH ALIGN="LEFT" VALIGN="TOP" WIDTH=200><B>What it's for</B></TH> <TD ALIGN="LEFT"> </TD></TR> -<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\glossaryname</TT><A NAME="2359"></A></TD> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\glossaryname</TT><A NAME="2526"></A></TD> <TD ALIGN="LEFT"><TT>Glossary</TT></TD> <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=200>Title of the main glossary.</TD> <TD ALIGN="LEFT"> </TD></TR> -<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\acronymname</TT><A NAME="2362"></A></TD> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\acronymname</TT><A NAME="2529"></A></TD> <TD ALIGN="LEFT"><TT>Acronyms</TT></TD> <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=200>Title of the list of acronyms -(when used with package option <TT>acronym</TT><A NAME="2370"></A>).</TD> +(when used with package option <TT>acronym</TT><A NAME="2537"></A>).</TD> <TD ALIGN="LEFT"> </TD></TR> -<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\entryname</TT><A NAME="2374"></A></TD> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\entryname</TT><A NAME="2541"></A></TD> <TD ALIGN="LEFT"><TT>Notation (glossaries)</TT></TD> <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=200>Header for first column in glossary (for 2, 3 or 4 column glossaries that support headers).</TD> <TD ALIGN="LEFT"> </TD></TR> -<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\descriptionname</TT><A NAME="2377"></A></TD> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\descriptionname</TT><A NAME="2544"></A></TD> <TD ALIGN="LEFT"><TT>Description (glossaries)</TT></TD> <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=200>Header for second column in glossary (for 2, 3 or 4 column glossaries that support headers).</TD> <TD ALIGN="LEFT"> </TD></TR> -<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\symbolname</TT><A NAME="2380"></A></TD> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\symbolname</TT><A NAME="2547"></A></TD> <TD ALIGN="LEFT"><TT>Symbol (glossaries)</TT></TD> <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=200>Header for symbol column in glossary for glossary styles that support this option.</TD> <TD ALIGN="LEFT"> </TD></TR> -<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\pagelistname</TT><A NAME="2383"></A></TD> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\pagelistname</TT><A NAME="2550"></A></TD> <TD ALIGN="LEFT"><TT>Page List (glossaries)</TT></TD> <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=200>Header for page list column in glossary for glossaries that support this option.</TD> <TD ALIGN="LEFT"> </TD></TR> -<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\glssymbolsgroupname</TT><A NAME="2386"></A></TD> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\glssymbolsgroupname</TT><A NAME="2553"></A></TD> <TD ALIGN="LEFT"><TT>Symbols (glossaries)</TT></TD> <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=200>Header for symbols section of the glossary for glossary styles that support this option.</TD> <TD ALIGN="LEFT"> </TD></TR> -<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\glsnumbersgroupname</TT><A NAME="2389"></A></TD> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\glsnumbersgroupname</TT><A NAME="2556"></A></TD> <TD ALIGN="LEFT"><TT>Numbers (glossaries)</TT></TD> <TD ALIGN="LEFT" VALIGN="TOP" WIDTH=200>Header for numbers section of the glossary for glossary styles that support @@ -266,13 +291,13 @@ this option.</TD> <P> Due to the varied nature of glossaries, it's likely that the predefined translations may not be appropriate. If you are using -the <TT>babel</TT><A NAME="2392"></A> package and do not have the <TT>translator</TT><A NAME="2395"></A> package +the <TT>babel</TT><A NAME="2559"></A> package and do not have the <TT>translator</TT><A NAME="2562"></A> package installed, you need to be familiar with the advice on <A NAME="tex2html4" HREF="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=latexwords">changing the words babel uses</A>. <P> -If you have the <TT>translator</TT><A NAME="2398"></A> package installed, then it becomes +If you have the <TT>translator</TT><A NAME="2565"></A> package installed, then it becomes much easier to change the default translations. For example, if you are writing in Irish and you want <TT>\symbolname</TT> to produce "Siombail" instead of "Comhartha", then you can put the following @@ -286,14 +311,14 @@ in your document preamble: <H2><A NAME="SECTION00022000000000000000"></A> <A NAME="sec:makeglossaries"></A> <BR> -Generating the associated glossary files +Generating the Associated Glossary Files </H2> <P> The <TT>glossaries</TT> package comes with the Perl script -<TT>makeglossaries</TT><A NAME="2402"></A> which will run <TT>makeindex</TT><A NAME="2405"></A> on -all the glossary files using a customized <TT>makeindex</TT><A NAME="2408"></A> -<TT>.ist</TT><A NAME="2411"></A> style file (which is created by <TT>\makeglossaries</TT><A NAME="2413"></A>). +<TT>makeglossaries</TT><A NAME="2569"></A> which will run <TT>makeindex</TT><A NAME="2572"></A> on +all the glossary files using a customized <TT>makeindex</TT><A NAME="2575"></A> +<TT>.ist</TT><A NAME="2578"></A> style file (which is created by <TT>\makeglossaries</TT><A NAME="2580"></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 @@ -303,7 +328,7 @@ latex myfile makeglossaries myfile latex myfile </PRE> -You may need to explicitly load <TT>makeglossaries</TT><A NAME="2416"></A> into +You may need to explicitly load <TT>makeglossaries</TT><A NAME="2583"></A> into Perl: <PRE> perl makeglossaries myfile @@ -314,8 +339,8 @@ be able to use it. <P> If you don't have Perl installed, you will have to run -<TT>makeindex</TT><A NAME="2419"></A> for each glossary type you have defined. -For example, if you have used the <TT>acronym</TT><A NAME="2427"></A> package option +<TT>makeindex</TT><A NAME="2586"></A> for each glossary type you have defined. +For example, if you have used the <TT>acronym</TT><A NAME="2594"></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> @@ -324,14 +349,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="2431"></A> instead to reduce the possibility of error. +<TT>makeglossaries</TT><A NAME="2598"></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="2434"></A> or it will merge all your glossaries into a +<TT>makeindex</TT><A NAME="2601"></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="2437"></A> or <TT>.alg</TT><A NAME="2439"></A>) for messages. +(e.g. <TT>.glg</TT><A NAME="2604"></A> or <TT>.alg</TT><A NAME="2606"></A>) for messages. <P> <A HREF="glossaries-manual.html#top">Top</A> @@ -358,11 +383,11 @@ other queries, consult the <TT>glossaries</TT> FAQ at <P> <OL> -<LI>I've used the <TT>smallcaps</TT><A NAME="2451"></A> option, but the acronyms +<LI>I've used the <TT>smallcaps</TT><A NAME="2618"></A> option, but the acronyms are displayed in normal sized upper case letters. <P> -The <TT>smallcaps</TT><A NAME="2460"></A> package option uses <TT>\textsc</TT> to typeset +The <TT>smallcaps</TT><A NAME="2627"></A> package option uses <TT>\textsc</TT> to typeset the acronyms. This command converts lower case letters to small capitals, while upper case letters remain their usual size. Therefore you need to specify the acronym in lower case letters. @@ -372,7 +397,7 @@ you need to specify the acronym in lower case letters. <LI>How do I change the font that the acronyms are displayed in? <P> -The easiest way to do this is to specify the <TT>smaller</TT><A NAME="2469"></A> package +The easiest way to do this is to specify the <TT>smaller</TT><A NAME="2636"></A> package option and redefine <TT>\acronymfont</TT> to use the required typesetting command. For example, suppose you would like the acronyms displayed in a sans-serif font, then you can do: @@ -387,7 +412,7 @@ a sans-serif font, then you can do: on first use? <P> -The easiest way to do this is to specify the <TT>smaller</TT><A NAME="2478"></A> package +The easiest way to do this is to specify the <TT>smaller</TT><A NAME="2645"></A> package option and redefine <TT>\firstacronymfont</TT> to use the required command. Note that if you don't want the acronym on subsequent use to use <TT>\smaller</TT>, you will also need to redefine <TT>\acronymfont</TT>, @@ -402,7 +427,7 @@ but use the surrounding font for subsequent use, you can do: <P> </LI> <LI>I don't have Perl installed, do I have to use -<TT>makeglossaries</TT><A NAME="2482"></A>? +<TT>makeglossaries</TT><A NAME="2649"></A>? <P> Read <A HREF="glossaries-manual.html#sec:makeglossaries">the previous @@ -411,7 +436,7 @@ section</A>. <P> </LI> <LI>I'm used to using the <TT>glossary</TT> package: are there any -instructions on migrating from the <TT>glossary</TT><A NAME="2486"></A> package to the +instructions on migrating from the <TT>glossary</TT><A NAME="2653"></A> package to the <TT>glossaries</TT> package? <P> @@ -423,7 +448,7 @@ same location as this document. <P> </LI> -<LI>I'm using <TT>babel</TT><A NAME="2490"></A> but the fixed names haven't been +<LI>I'm using <TT>babel</TT><A NAME="2657"></A> but the fixed names haven't been translated. <P> @@ -434,7 +459,7 @@ send me the translations, and I'll add them to the next version. <P> If you are using one of the above languages, but the text hasn't been -translated, try adding the <TT>translator</TT><A NAME="2494"></A> package with the +translated, try adding the <TT>translator</TT><A NAME="2661"></A> package with the required languages explicitly (before you load the <TT>glossaries</TT> package). For example: <PRE> @@ -454,22 +479,22 @@ further details. Remember to do the following: <UL> -<LI>Add <TT>\makeglossaries</TT><A NAME="2499"></A> to the document preamble. +<LI>Add <TT>\makeglossaries</TT><A NAME="2666"></A> to the document preamble. <P> </LI> -<LI>Use either <TT>\printglossary</TT><A NAME="2502"></A> for each glossary that has -been defined or <TT>\printglossaries</TT><A NAME="2505"></A>. +<LI>Use either <TT>\printglossary</TT><A NAME="2669"></A> for each glossary that has +been defined or <TT>\printglossaries</TT><A NAME="2672"></A>. <P> </LI> -<LI>Use <TT>\gls</TT><A NAME="2508"></A>, <TT>\Gls</TT><A NAME="2511"></A>, <TT>\GLS</TT><A NAME="2514"></A>, <TT>\glspl</TT><A NAME="2517"></A>, <TT>\Glspl</TT><A NAME="2520"></A>, -<TT>\GLSpl</TT><A NAME="2523"></A>, <TT>\glslink</TT><A NAME="2526"></A>, <TT>\glsadd</TT><A NAME="2529"></A> or <TT>\glsaddall</TT><A NAME="2532"></A> in the +<LI>Use <TT>\gls</TT><A NAME="2675"></A>, <TT>\Gls</TT><A NAME="2678"></A>, <TT>\GLS</TT><A NAME="2681"></A>, <TT>\glspl</TT><A NAME="2684"></A>, <TT>\Glspl</TT><A NAME="2687"></A>, +<TT>\GLSpl</TT><A NAME="2690"></A>, <TT>\glslink</TT><A NAME="2693"></A>, <TT>\glsadd</TT><A NAME="2696"></A> or <TT>\glsaddall</TT><A NAME="2699"></A> in the document. <P> </LI> -<LI>Run LaTeX on your document, then run <TT>makeglossaries</TT><A NAME="2535"></A>, +<LI>Run LaTeX on your document, then run <TT>makeglossaries</TT><A NAME="2702"></A>, then run LaTeX on your document again. If you want the glossaries to appear in the table of contents, you will need an extra LaTeX run. </LI> @@ -497,12 +522,12 @@ for additional commands and advice not listed here. <P> <OL> -<LI>Load <TT>glossaries</TT> <I>after</I> <TT>hyperref</TT><A NAME="2542"></A>: +<LI>Load <TT>glossaries</TT> <I>after</I> <TT>hyperref</TT><A NAME="2709"></A>: <PRE> \usepackage{hyperref} \usepackage{glossaries} </PRE> -Similarly for the <TT>html</TT><A NAME="2545"></A> package: +Similarly for the <TT>html</TT><A NAME="2712"></A> package: <PRE> \usepackage{html} \usepackage{glossaries} @@ -510,19 +535,19 @@ Similarly for the <TT>html</TT><A NAME="2545"></A> package: <P> </LI> -<LI>Always use <TT>\makeglossaries</TT><A NAME="2548"></A> if you want the glossary +<LI>Always use <TT>\makeglossaries</TT><A NAME="2715"></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="2551"></A>, your glossaries will +If you don't use <TT>\makeglossaries</TT><A NAME="2718"></A>, your glossaries will not appear in the document! <P> </LI> -<LI>Use <TT>\printglossaries</TT><A NAME="2554"></A> to make your glossaries appear +<LI>Use <TT>\printglossaries</TT><A NAME="2721"></A> to make your glossaries appear in the document at that point. For example: <PRE> \maketitle @@ -535,13 +560,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="2557"></A>, then run LaTeX on it again: +then the Perl script <TT>makeglossaries</TT><A NAME="2724"></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="2565"></A> +(You may need to run LaTeX again if you have used the <TT>toc</TT><A NAME="2732"></A> package option.) If you use Windows, there is a batch file called <TT>makeglossaries.bat</TT> which you can use, but you will @@ -551,23 +576,23 @@ still need Perl installed. </LI> <LI>New glossaries can be defined using: <P> -<TT>\newglossary</TT><A NAME="2569"></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="2736"></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="2572"></A> (called by <TT>makeglossaries</TT><A NAME="2575"></A>), +by <TT>makeindex</TT><A NAME="2739"></A> (called by <TT>makeglossaries</TT><A NAME="2742"></A>), <I>out-ext</I> is the extension of the file to be read by -<TT>makeindex</TT><A NAME="2578"></A> and <I>title</I> is the title for this +<TT>makeindex</TT><A NAME="2745"></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="2581"></A> transcript file. Example: +the extension of the <TT>makeindex</TT><A NAME="2748"></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="2584"></A>, the -<TT>makeindex</TT><A NAME="2587"></A> transcript will be written to a file with the -extension <TT>.nlg</TT><A NAME="2590"></A>. If <I>log-ext</I> is omitted, the extension -<TT>.glg</TT><A NAME="2592"></A> will be used. +will be Notation. If you use <TT>makeglossaries</TT><A NAME="2751"></A>, the +<TT>makeindex</TT><A NAME="2754"></A> transcript will be written to a file with the +extension <TT>.nlg</TT><A NAME="2757"></A>. If <I>log-ext</I> is omitted, the extension +<TT>.glg</TT><A NAME="2759"></A> will be used. <P> </LI> @@ -582,7 +607,7 @@ extension <TT>.nlg</TT><A NAME="2590"></A>. If <I>log-ext</I> is omitted, the ex <P> </LI> -<LI>If you use the <TT>acronym</TT><A NAME="2599"></A> package option, the +<LI>If you use the <TT>acronym</TT><A NAME="2766"></A> package option, the <TT>glossaries</TT> package will automatically create a new glossary type labelled <TT>acronym</TT>: @@ -593,8 +618,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="2604"></A> -<I>before</I> <TT>\makeglossaries</TT><A NAME="2607"></A>: +numbers appear in the form 2-1), redefine <TT>\glscompositor</TT><A NAME="2771"></A> +<I>before</I> <TT>\makeglossaries</TT><A NAME="2774"></A>: <PRE> \documentclass{article} \usepackage{glossaries} @@ -605,7 +630,7 @@ numbers appear in the form 2-1), redefine <TT>\glscompositor</TT><A NAME="26 <P> </LI> <LI>To add the glossaries to the table of contents use the -<TT>toc</TT><A NAME="2615"></A> package option: +<TT>toc</TT><A NAME="2782"></A> package option: <PRE> \usepackage[toc]{glossaries} </PRE> @@ -614,10 +639,10 @@ numbers appear in the form 2-1), redefine <TT>\glscompositor</TT><A NAME="26 </LI> <LI>Define a new entry with: <P> -<TT>\newglossaryentry</TT><A NAME="2619"></A><TT>{</TT><EM>label</EM><TT>}{</TT><EM>key-val list</EM><TT>}</TT> +<TT>\newglossaryentry</TT><A NAME="2786"></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="2622"></A> -key and a <TT>description</TT><A NAME="2625"></A> key. +The <I>key-val list</I> must at least contain a <TT>name</TT><A NAME="2789"></A> +key and a <TT>description</TT><A NAME="2792"></A> key. For example: <PRE> \newglossaryentry{perl}{name=Perl, @@ -631,7 +656,7 @@ 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="2628"></A> and <TT>\Glspl</TT><A NAME="2631"></A>): +problem for <TT>\Gls</TT><A NAME="2795"></A> and <TT>\Glspl</TT><A NAME="2798"></A>): <PRE> \newglossaryentry{elite}{name={{\'e}lite}, description={select group or class}} @@ -645,7 +670,7 @@ description={canal from mouth to stomach}} <P> </LI> -<LI>If you have multiple glossaries, use the <TT>type</TT><A NAME="2634"></A> +<LI>If you have multiple glossaries, use the <TT>type</TT><A NAME="2801"></A> key to specify in which glossary the entry belongs. For example: <PRE> \newglossary{languages}{lan}{lng}{Index of Languages} @@ -656,7 +681,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="2637"></A> is omitted, the default glossary is used. +If <TT>type</TT><A NAME="2804"></A> is omitted, the default glossary is used. <P> </LI> @@ -672,7 +697,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="2640"></A> key. For example: +irregular plural, use the <TT>plural</TT><A NAME="2807"></A> key. For example: <PRE> \newglossaryentry{matrix}{name=matrix, description=rectangular array of quantities, @@ -712,7 +737,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="2643"></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="2810"></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> @@ -728,30 +753,30 @@ first={support vector machine (SVM)}, plural={SVMs}, firstplural={support vector machines (SVMs)}} </PRE> -(The value of <TT>\acronymtype</TT><A NAME="2646"></A> varies depending on whether -the <TT>acronym</TT><A NAME="2654"></A> package option is used or not. +(The value of <TT>\acronymtype</TT><A NAME="2813"></A> varies depending on whether +the <TT>acronym</TT><A NAME="2821"></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="2658"></A> keys; for +override any of the <TT>\newglossaryentry</TT><A NAME="2825"></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="2661"></A>. This can be redefined +is governed by <TT>\glsnamefont</TT><A NAME="2828"></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="2664"></A> package place the entry name in -the optional argument to <TT>\item</TT><A NAME="2667"></A>, so they will -appear in bold, unless you redefine <TT>\glsnamefont</TT><A NAME="2670"></A> to counteract the +<TT>glossary-list</TT><A NAME="2831"></A> package place the entry name in +the optional argument to <TT>\item</TT><A NAME="2834"></A>, so they will +appear in bold, unless you redefine <TT>\glsnamefont</TT><A NAME="2837"></A> to counteract the bold font. <P> </LI> -<LI>In the document use <TT>\gls</TT><A NAME="2673"></A><TT>{</TT><EM>label</EM><TT>}</TT> +<LI>In the document use <TT>\gls</TT><A NAME="2840"></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> @@ -763,21 +788,21 @@ A \gls{singmtx} is a matrix with a zero determinant. <LI>Other variations: <UL> -<LI><TT>\Gls</TT><A NAME="2676"></A><TT>{</TT><EM>label</EM><TT>}</TT> : like <TT>\gls</TT>, +<LI><TT>\Gls</TT><A NAME="2843"></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="2679"></A><TT>{</TT><EM>label</EM><TT>}</TT> : like <TT>\gls</TT>, +<LI><TT>\GLS</TT><A NAME="2846"></A><TT>{</TT><EM>label</EM><TT>}</TT> : like <TT>\gls</TT>, but all upper case. </LI> -<LI><TT>\glspl</TT><A NAME="2682"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural +<LI><TT>\glspl</TT><A NAME="2849"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural </LI> -<LI><TT>\Glspl</TT><A NAME="2685"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural with +<LI><TT>\Glspl</TT><A NAME="2852"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural with first letter in upper case </LI> -<LI><TT>\GLSpl</TT><A NAME="2688"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural but +<LI><TT>\GLSpl</TT><A NAME="2855"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural but all upper case </LI> -<LI><TT>\glslink</TT><A NAME="2691"></A><TT>{</TT><EM>label</EM><TT>}{</TT><EM>link text</EM><TT>}</TT> : +<LI><TT>\glslink</TT><A NAME="2858"></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> @@ -798,8 +823,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="2694"></A> key in the optional argument. -Note that the value of the <TT>format</TT><A NAME="2697"></A> key should be the +changed using the <TT>format</TT><A NAME="2861"></A> key in the optional argument. +Note that the value of the <TT>format</TT><A NAME="2864"></A> key should be the name of a command <I>without</I> the initial backslash. For example: <PRE> @@ -807,7 +832,7 @@ The primary definition of \glspl[format=textbf]{singmtx}. </PRE> In this example the relevant glossary entry will have the page number in bold (since it uses <TT>\textbf</TT>) but -it will no longer have a hyperlink (if hyperlinks are enabled.) +it will no longer have a hyperlink (if hyperlinks are enabled). <P> </LI> @@ -815,23 +840,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="2701"></A> -(which uses <TT>\emph</TT><A NAME="2704"></A>.) For example: +form <TT>\text</TT><I>xx</I>, as well as <TT>\hyperemph</TT><A NAME="2868"></A> +(which uses <TT>\emph</TT><A NAME="2871"></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="2707"></A> as this can +<LI>Don't use declarations in <TT>format</TT><A NAME="2874"></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="2710"></A><TT>{</TT><EM>label</EM><TT>}</TT> or -<TT>\glsaddall</TT><A NAME="2713"></A>. These commands also take an optional +any text using <TT>\glsadd</TT><A NAME="2877"></A><TT>{</TT><EM>label</EM><TT>}</TT> or +<TT>\glsaddall</TT><A NAME="2880"></A>. These commands also take an optional argument where you can specify the format. For example <PRE> \glsadd[format=hyperbf]{singmtx} @@ -854,7 +879,7 @@ range<A NAME="tex2html8" \glsadd[format=)]{singmtx} </PRE> -This is equivalent to <TT>makeindex</TT><A NAME="2716"></A>'s <code>|(</code> and <code>|)</code> +This is equivalent to <TT>makeindex</TT><A NAME="2883"></A>'s <code>|(</code> and <code>|)</code> formats. <P> @@ -876,15 +901,25 @@ 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="2719"></A> -or <TT>\gls</TT><A NAME="2722"></A> and related commands, or via <TT>\glsadd</TT><A NAME="2725"></A> -or <TT>\glsaddall</TT><A NAME="2728"></A>.) +you haven't used it in the text (either via <TT>\glslink</TT><A NAME="2886"></A> +or <TT>\gls</TT><A NAME="2889"></A> and related commands, or via <TT>\glsadd</TT><A NAME="2892"></A> +or <TT>\glsaddall</TT><A NAME="2895"></A>). <P> </LI> -<LI>To change the sorting order, use the <TT>sort</TT><A NAME="2731"></A> key. +<LI>To change the sorting order, use the <TT>sort</TT><A NAME="2898"></A> key. For example: <PRE> +\newglossaryentry{tex}{name={\TeX}, +description={A typesetting language}, +sort=tex} +</PRE> +This will put the entry in the "T" group (entries starting with +the letter "t" or "T") rather than the +"symbols" group (entries starting with a symbol). +Similarly, the following example puts the entry in the "U" +group instead of the "symbol" group. +<PRE> \newglossaryentry{universal}{name={\ensuremath{\mathcal{U}}}, description=The universal set, sort=U} @@ -892,7 +927,7 @@ sort=U} <P> </LI> -<LI>You don't need to escape <TT>makeindex</TT><A NAME="2734"></A>'s special characters: +<LI>You don't need to escape <TT>makeindex</TT><A NAME="2901"></A>'s special characters: <PRE> \newglossaryentry{quote}{name={"}, description={Double quote character}} @@ -914,21 +949,25 @@ description={A metric measurement of length}, symbol={m}} </PRE> The predefined glossary styles that display the entry symbol -are: <TT>long4col</TT><A NAME="2737"></A>, <TT>long4colheader</TT><A NAME="2739"></A>, -<TT>long4colborder</TT><A NAME="2741"></A>, <TT>long4colheaderborder</TT><A NAME="2743"></A>, -<TT>super4col</TT><A NAME="2745"></A>, <TT>super4colheader</TT><A NAME="2747"></A>, -<TT>super4colborder</TT><A NAME="2749"></A> and <TT>super4colheaderborder</TT><A NAME="2751"></A>. +are: <TT>long4col</TT><A NAME="2904"></A>, <TT>long4colheader</TT><A NAME="2906"></A>, +<TT>long4colborder</TT><A NAME="2908"></A>, <TT>long4colheaderborder</TT><A NAME="2910"></A>, + <TT>altlong4col</TT><A NAME="2912"></A>, <TT>altlong4colheader</TT><A NAME="2914"></A>, +<TT>altlong4colborder</TT><A NAME="2916"></A>, <TT>altlong4colheaderborder</TT><A NAME="2918"></A>, +<TT>super4col</TT><A NAME="2920"></A>, <TT>super4colheader</TT><A NAME="2922"></A>, +<TT>super4colborder</TT><A NAME="2924"></A>, <TT>super4colheaderborder</TT><A NAME="2926"></A>. +<TT>altsuper4col</TT><A NAME="2928"></A>, <TT>altsuper4colheader</TT><A NAME="2930"></A>, +<TT>altsuper4colborder</TT><A NAME="2932"></A> and <TT>altsuper4colheaderborder</TT><A NAME="2934"></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="2758"></A> +<LI>Glossary styles can be set using the <TT>style</TT><A NAME="2941"></A> package option. For example: <PRE> \usepackage[style=long3col]{glossaries} </PRE> -or using <TT>\glossarystyle</TT><A NAME="2762"></A><TT>{</TT><EM>style</EM><TT>}</TT>. For example: +or using <TT>\glossarystyle</TT><A NAME="2945"></A><TT>{</TT><EM>style</EM><TT>}</TT>. For example: <PRE> \glossarystyle{altlist} </PRE> @@ -938,7 +977,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="2771"></A>: +can be suppressed using the package option <TT>nonumberlist</TT><A NAME="2954"></A>: <PRE> \usepackage[nonumberlist]{glossaries} </PRE> @@ -947,14 +986,14 @@ can be suppressed using the package option <TT>nonumberlist</TT><A NAME="2771">< </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="2780"></A> package +section. This can be changed using the <TT>section</TT><A NAME="2963"></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="2789"></A>=<I>value</I>. For example, to make the glossaries +<TT>section</TT><A NAME="2972"></A>=<I>value</I>. For example, to make the glossaries appear in unnumbered subsections: <PRE> \usepackage[section=subsection]{glossaries} @@ -984,28 +1023,28 @@ Package Options <P> The <TT>glossaries</TT> package options are as follows: <DL> -<DT><STRONG><TT>toc</TT><A NAME="2802"></A></STRONG></DT> +<DT><STRONG><TT>toc</TT><A NAME="2985"></A></STRONG></DT> <DD>Add the glossaries to the table of contents. <P> </DD> -<DT><STRONG><TT>numberline</TT><A NAME="2811"></A></STRONG></DT> -<DD>When used with <TT>toc</TT><A NAME="2820"></A>, this will +<DT><STRONG><TT>numberline</TT><A NAME="2994"></A></STRONG></DT> +<DD>When used with <TT>toc</TT><A NAME="3003"></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="2829"></A> option is omitted. If <TT>toc</TT><A NAME="2838"></A> is -used without <TT>numberline</TT><A NAME="2847"></A>, the title will be aligned with +effect if the <TT>toc</TT><A NAME="3012"></A> option is omitted. If <TT>toc</TT><A NAME="3021"></A> is +used without <TT>numberline</TT><A NAME="3030"></A>, the title will be aligned with the section numbers rather than the section titles. <P> </DD> -<DT><STRONG><TT>acronym</TT><A NAME="2856"></A></STRONG></DT> +<DT><STRONG><TT>acronym</TT><A NAME="3039"></A></STRONG></DT> <DD>Make a separate glossary for acronyms. <P> </DD> -<DT><STRONG><TT>section</TT><A NAME="2865"></A></STRONG></DT> +<DT><STRONG><TT>section</TT><A NAME="3048"></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, @@ -1023,22 +1062,22 @@ is equivalent to \usepackage[section=section]{glossaries} </PRE> You can change this value later in the document using -<TT>\setglossarysection</TT><A NAME="2869"></A><TT>{</TT><EM>type</EM><TT>}</TT>. +<TT>\setglossarysection</TT><A NAME="3052"></A><TT>{</TT><EM>type</EM><TT>}</TT>. <P> </DD> -<DT><STRONG><TT>numberedsection</TT><A NAME="2877"></A></STRONG></DT> +<DT><STRONG><TT>numberedsection</TT><A NAME="3060"></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="2886"></A>. This option can take -three possible values: <TT>false</TT><A NAME="2890"></A> (no -number, i.e. use starred form), <TT>nolabel</TT><A NAME="2892"></A> +but this can be changed using <TT>numberedsection</TT><A NAME="3069"></A>. This option can take +three possible values: <TT>false</TT><A NAME="3073"></A> (no +number, i.e. use starred form), <TT>nolabel</TT><A NAME="3075"></A> (numbered, i.e. unstarred form, but not labelled) and -<TT>autolabel</TT><A NAME="2894"></A> (numbered with automatic -labelling). If <TT>numberedsection=autolabel</TT><A NAME="2903"></A> is used, each +<TT>autolabel</TT><A NAME="3077"></A> (numbered with automatic +labelling). If <TT>numberedsection=autolabel</TT><A NAME="3086"></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="tex2html9" - HREF="#foot2159"><SUP>2</SUP></A> and additional glossaries are labelled + HREF="#foot2320"><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: @@ -1053,9 +1092,9 @@ 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="2915"></A> which is set to <TT>main</TT> if the -<TT>acronym</TT><A NAME="2923"></A> option is not used and is set to <TT>acronym</TT> -if the <TT>acronym</TT><A NAME="2932"></A> option is used. For example: +<TT>\acronymtype</TT><A NAME="3098"></A> which is set to <TT>main</TT> if the +<TT>acronym</TT><A NAME="3106"></A> option is not used and is set to <TT>acronym</TT> +if the <TT>acronym</TT><A NAME="3115"></A> option is used. For example: <PRE> The list of acronyms is in section~\ref{\acronymtype}. </PRE> @@ -1079,93 +1118,93 @@ The list of acronyms is in section~\ref{\glsautoprefix\acronymtype}. <P> </DD> -<DT><STRONG><TT>style</TT><A NAME="2941"></A></STRONG></DT> +<DT><STRONG><TT>style</TT><A NAME="3124"></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="2950"></A></STRONG></DT> +<DT><STRONG><TT>nonumberlist</TT><A NAME="3133"></A></STRONG></DT> <DD>This option will suppress the -associated number lists<A NAME="2953"></A> in the glossaries (see also -<A HREF="glossaries-manual.html#sec:numberlists">Number Lists</A>.) +associated number lists<A NAME="3136"></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="2960"></A></STRONG></DT> +<DT><STRONG><TT>counter</TT><A NAME="3143"></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="2963"></A>. +lists<A NAME="3146"></A>. <P> <A NAME="sanitize"></A> </DD> -<DT><STRONG><TT>sanitize</TT><A NAME="2970"></A></STRONG></DT> +<DT><STRONG><TT>sanitize</TT><A NAME="3153"></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="2975"></A>, <TT>description</TT><A NAME="2978"></A> and <TT>symbol</TT><A NAME="2981"></A> keys used +<TT>name</TT><A NAME="3158"></A>, <TT>description</TT><A NAME="3161"></A> and <TT>symbol</TT><A NAME="3164"></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="2989"></A> package +sanitization can be switched off using the <TT>sanitize</TT><A NAME="3172"></A> package option. For example, to switch off the sanitization for the -<TT>description</TT><A NAME="2993"></A> and <TT>name</TT><A NAME="2996"></A> keys, but not for the -<TT>symbol</TT><A NAME="2999"></A> key, do: +<TT>description</TT><A NAME="3176"></A> and <TT>name</TT><A NAME="3179"></A> keys, but not for the +<TT>symbol</TT><A NAME="3182"></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="3002"></A>, -<TT>description</TT><A NAME="3005"></A> and <TT>symbol</TT><A NAME="3008"></A> keys. It doesn't apply -to any of the other keys (except the <TT>sort</TT><A NAME="3011"></A> key which is +<B>Note</B>: this sanitization only applies to the <TT>name</TT><A NAME="3185"></A>, +<TT>description</TT><A NAME="3188"></A> and <TT>symbol</TT><A NAME="3191"></A> keys. It doesn't apply +to any of the other keys (except the <TT>sort</TT><A NAME="3194"></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="3014"></A> key is obtained from the -<TT>name</TT><A NAME="3017"></A> key, you will still need to protect fragile commands -in the <TT>name</TT><A NAME="3020"></A> key if you don't use the <TT>text</TT><A NAME="3023"></A> key. +Since the value of the <TT>text</TT><A NAME="3197"></A> key is obtained from the +<TT>name</TT><A NAME="3200"></A> key, you will still need to protect fragile commands +in the <TT>name</TT><A NAME="3203"></A> key if you don't use the <TT>text</TT><A NAME="3206"></A> key. <P> </DD> -<DT><STRONG><TT>description</TT><A NAME="3031"></A></STRONG></DT> +<DT><STRONG><TT>description</TT><A NAME="3214"></A></STRONG></DT> <DD>This option changes the definition of -<TT>\newacronym</TT><A NAME="3035"></A> to allow a description. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> +<TT>\newacronym</TT><A NAME="3218"></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="3043"></A></STRONG></DT> +<DT><STRONG><TT>footnote</TT><A NAME="3226"></A></STRONG></DT> <DD>This option changes the definition of -<TT>\newacronym</TT><A NAME="3047"></A> and the way that acronyms are displayed. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> +<TT>\newacronym</TT><A NAME="3230"></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="3055"></A></STRONG></DT> +<DT><STRONG><TT>smallcaps</TT><A NAME="3238"></A></STRONG></DT> <DD>This option changes the definition of -<TT>\newacronym</TT><A NAME="3059"></A> and the way that acronyms are displayed. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> +<TT>\newacronym</TT><A NAME="3242"></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>smaller</TT><A NAME="3067"></A></STRONG></DT> +<DT><STRONG><TT>smaller</TT><A NAME="3250"></A></STRONG></DT> <DD>This option changes the definition of -<TT>\newacronym</TT><A NAME="3071"></A> and the way that acronyms are displayed. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> +<TT>\newacronym</TT><A NAME="3254"></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="3079"></A></STRONG></DT> +<DT><STRONG><TT>dua</TT><A NAME="3262"></A></STRONG></DT> <DD>This option changes the definition of -<TT>\newacronym</TT><A NAME="3083"></A> so that acronyms are always expanded. +<TT>\newacronym</TT><A NAME="3266"></A> so that acronyms are always expanded. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> for further details. <P> </DD> -<DT><STRONG><TT>shortcuts</TT><A NAME="3091"></A></STRONG></DT> +<DT><STRONG><TT>shortcuts</TT><A NAME="3274"></A></STRONG></DT> <DD>This option provides shortcut commands for acronyms. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> @@ -1188,23 +1227,23 @@ Defining Glossary Entries <P> All glossary entries must be defined before they are used, so it is better to define them in the preamble to ensure this.<A NAME="tex2html10" - HREF="#foot2179"><SUP>3</SUP></A> However + HREF="#foot2340"><SUP>3</SUP></A> However 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="3098"></A>) file, which then needs to be converted into a -corresponding <TT>.gls</TT><A NAME="3100"></A> file which contains the typeset glossary -which is input by <TT>\printglossary</TT><A NAME="3102"></A> or -<TT>\printglossaries</TT><A NAME="3105"></A>. The Perl script <TT>makeglossaries</TT><A NAME="3108"></A> -can be used to call <TT>makeindex</TT><A NAME="3111"></A>, using a customised -<TT>.ist</TT><A NAME="3114"></A> style file, for each of the glossaries that are defined +(<TT>.glo</TT><A NAME="3281"></A>) file, which then needs to be converted into a +corresponding <TT>.gls</TT><A NAME="3283"></A> file which contains the typeset glossary +which is input by <TT>\printglossary</TT><A NAME="3285"></A> or +<TT>\printglossaries</TT><A NAME="3288"></A>. The Perl script <TT>makeglossaries</TT><A NAME="3291"></A> +can be used to call <TT>makeindex</TT><A NAME="3294"></A>, using a customised +<TT>.ist</TT><A NAME="3297"></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="3116"></A> <TT>.ist</TT><A NAME="3119"></A> +order to create the customised <TT>makeindex</TT><A NAME="3299"></A> <TT>.ist</TT><A NAME="3302"></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 @@ -1226,102 +1265,102 @@ 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="3121"></A> and -<TT>description</TT><A NAME="3124"></A>. Available fields are listed below: +about this entry. There are two required fields: <TT>name</TT><A NAME="3304"></A> and +<TT>description</TT><A NAME="3307"></A>. Available fields are listed below: <P> <DL> -<DT><STRONG><TT>name</TT><A NAME="3127"></A></STRONG></DT> +<DT><STRONG><TT>name</TT><A NAME="3310"></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="3130"></A></STRONG></DT> +<DT><STRONG><TT>description</TT><A NAME="3313"></A></STRONG></DT> <DD>A brief description of this term (to appear in the glossary). <P> </DD> -<DT><STRONG><TT>descriptionplural</TT><A NAME="3133"></A></STRONG></DT> +<DT><STRONG><TT>descriptionplural</TT><A NAME="3316"></A></STRONG></DT> <DD>The plural form of the -description (as passed to <TT>\glsdisplay</TT><A NAME="3136"></A> and <TT>\glsdisplayfirst</TT><A NAME="3139"></A> -by <TT>\glspl</TT><A NAME="3142"></A>, <TT>\Glspl</TT><A NAME="3145"></A> and <TT>\GLSpl</TT><A NAME="3148"></A>). If omitted, the value -is set to the same as the <TT>description</TT><A NAME="3151"></A> key. +description (as passed to <TT>\glsdisplay</TT><A NAME="3319"></A> and <TT>\glsdisplayfirst</TT><A NAME="3322"></A> +by <TT>\glspl</TT><A NAME="3325"></A>, <TT>\Glspl</TT><A NAME="3328"></A> and <TT>\GLSpl</TT><A NAME="3331"></A>). If omitted, the value +is set to the same as the <TT>description</TT><A NAME="3334"></A> key. <P> </DD> -<DT><STRONG><TT>text</TT><A NAME="3154"></A></STRONG></DT> +<DT><STRONG><TT>text</TT><A NAME="3337"></A></STRONG></DT> <DD>How this entry will appear in the document text -when using <TT>\gls</TT><A NAME="3157"></A> (or one of its uppercase variants). If this -field is omitted, the value of the <TT>name</TT><A NAME="3160"></A> key is used. +when using <TT>\gls</TT><A NAME="3340"></A> (or one of its uppercase variants). If this +field is omitted, the value of the <TT>name</TT><A NAME="3343"></A> key is used. <P> </DD> -<DT><STRONG><TT>first</TT><A NAME="3163"></A></STRONG></DT> +<DT><STRONG><TT>first</TT><A NAME="3346"></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="3166"></A> (or one of its uppercase -variants). If this field is omitted, the value of the <TT>text</TT><A NAME="3169"></A> +the first time it is used with <TT>\gls</TT><A NAME="3349"></A> (or one of its uppercase +variants). If this field is omitted, the value of the <TT>text</TT><A NAME="3352"></A> key is used. <P> </DD> -<DT><STRONG><TT>plural</TT><A NAME="3172"></A></STRONG></DT> +<DT><STRONG><TT>plural</TT><A NAME="3355"></A></STRONG></DT> <DD>How the entry will appear in the document text -when using <TT>\glspl</TT><A NAME="3175"></A> (or one of its uppercase variants). +when using <TT>\glspl</TT><A NAME="3358"></A> (or one of its uppercase variants). If this field is omitted, the value is obtained by appending -<TT>\glspluralsuffix</TT><A NAME="3178"></A> to the value of the <TT>text</TT><A NAME="3181"></A> field. +<TT>\glspluralsuffix</TT><A NAME="3361"></A> to the value of the <TT>text</TT><A NAME="3364"></A> field. <P> </DD> -<DT><STRONG><TT>firstplural</TT><A NAME="3184"></A></STRONG></DT> +<DT><STRONG><TT>firstplural</TT><A NAME="3367"></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="3187"></A> (or one of its +document text the first time it is used with <TT>\glspl</TT><A NAME="3370"></A> (or one of its uppercase variants). If this field is omitted, the value is obtained -from the <TT>plural</TT><A NAME="3190"></A> key, if the <TT>first</TT><A NAME="3193"></A> key is omitted, -or by appending <TT>\glspluralsuffix</TT><A NAME="3196"></A> to the value of the -<TT>first</TT><A NAME="3199"></A> field, if the <TT>first</TT><A NAME="3202"></A> field is present. +from the <TT>plural</TT><A NAME="3373"></A> key, if the <TT>first</TT><A NAME="3376"></A> key is omitted, +or by appending <TT>\glspluralsuffix</TT><A NAME="3379"></A> to the value of the +<TT>first</TT><A NAME="3382"></A> field, if the <TT>first</TT><A NAME="3385"></A> field is present. <P> <B>Note:</B> prior to version 1.13, the default value of -<TT>firstplural</TT><A NAME="3205"></A> was always taken by appending "s" to the -<TT>first</TT><A NAME="3208"></A> key, which meant that you had to specify both -<TT>plural</TT><A NAME="3211"></A> and <TT>firstplural</TT><A NAME="3214"></A>, even if you hadn't -used the <TT>first</TT><A NAME="3217"></A> key. +<TT>firstplural</TT><A NAME="3388"></A> was always taken by appending "s" to the +<TT>first</TT><A NAME="3391"></A> key, which meant that you had to specify both +<TT>plural</TT><A NAME="3394"></A> and <TT>firstplural</TT><A NAME="3397"></A>, even if you hadn't +used the <TT>first</TT><A NAME="3400"></A> key. <P> </DD> -<DT><STRONG><TT>symbol</TT><A NAME="3220"></A></STRONG></DT> +<DT><STRONG><TT>symbol</TT><A NAME="3403"></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>symbolplural</TT><A NAME="3223"></A></STRONG></DT> +<DT><STRONG><TT>symbolplural</TT><A NAME="3406"></A></STRONG></DT> <DD>This is the plural form of the -symbol (as passed to <TT>\glsdisplay</TT><A NAME="3226"></A> and <TT>\glsdisplayfirst</TT><A NAME="3229"></A> -by <TT>\glspl</TT><A NAME="3232"></A>, <TT>\Glspl</TT><A NAME="3235"></A> and <TT>\GLSpl</TT><A NAME="3238"></A>). If omitted, the value -is set to the same as the <TT>symbol</TT><A NAME="3241"></A> key. +symbol (as passed to <TT>\glsdisplay</TT><A NAME="3409"></A> and <TT>\glsdisplayfirst</TT><A NAME="3412"></A> +by <TT>\glspl</TT><A NAME="3415"></A>, <TT>\Glspl</TT><A NAME="3418"></A> and <TT>\GLSpl</TT><A NAME="3421"></A>). If omitted, the value +is set to the same as the <TT>symbol</TT><A NAME="3424"></A> key. <P> </DD> -<DT><STRONG><TT>sort</TT><A NAME="3244"></A></STRONG></DT> -<DD>This value indicates how <TT>makeindex</TT><A NAME="3247"></A> +<DT><STRONG><TT>sort</TT><A NAME="3427"></A></STRONG></DT> +<DD>This value indicates how <TT>makeindex</TT><A NAME="3430"></A> should sort this entry. If omitted, the value is given by the -<TT>name</TT><A NAME="3250"></A> field. This value is equivalent to -<TT>makeindex</TT><A NAME="3253"></A>'s "actual" character (which is usually the +<TT>name</TT><A NAME="3433"></A> field. This value is equivalent to +<TT>makeindex</TT><A NAME="3436"></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="3257"></A></STRONG></DT> +<DT><STRONG><TT>type</TT><A NAME="3440"></A></STRONG></DT> <DD>This is the glossary type to which this entry belongs. If omitted, the default glossary is assumed. The list of acronyms type is given by -<TT>\acronymtype</TT><A NAME="3260"></A> which will either be <TT>main</TT> or -<TT>acronym</TT>, depending on whether the <TT>acronym</TT><A NAME="3268"></A> package +<TT>\acronymtype</TT><A NAME="3443"></A> which will either be <TT>main</TT> or +<TT>acronym</TT>, depending on whether the <TT>acronym</TT><A NAME="3451"></A> package option was used. </DD> </DL> @@ -1360,7 +1399,7 @@ description={a fully grown female of any bovine animal}} <P> If you are writing in a language that supports -multiple plurals (for a given term) then use the <TT>plural</TT><A NAME="3275"></A> key +multiple plurals (for a given term) then use the <TT>plural</TT><A NAME="3458"></A> key for one of them (typically the one you are most likely to use) and for the others you will need to explicitly write the plural form using <TT>\glslink</TT> rather than using <TT>\glspl</TT>. Returning to the cow @@ -1380,7 +1419,7 @@ by appending a different letter, or sequence of letters, you can redefine <TT>\glspluralsuffix</TT> as required. However, this must be done <I>before</I> the entries are defined. For languages that don't form plurals by simply appending a suffix, all the plural forms must be -specified using the <TT>plural</TT><A NAME="3278"></A> key (and the <TT>firstplural</TT><A NAME="3281"></A> +specified using the <TT>plural</TT><A NAME="3461"></A> key (and the <TT>firstplural</TT><A NAME="3464"></A> key where necessary). <P> @@ -1406,7 +1445,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="3287"></A> key has +should belong, for those entries where the <TT>type</TT><A NAME="3470"></A> key has been omitted (or, more specifically, for those entries whose type has been specified by <TT>\glsdefaulttype</TT>, which is what <TT>\newglossaryentry</TT> uses by default). For example, suppose I have @@ -1417,7 +1456,7 @@ name={Perl}, description={A scripting language}} \newglossaryentry{tex}{name={\TeX}, -description={A typesetting language}} +description={A typesetting language},sort={TeX}} \newglossaryentry{html}{type=\glsdefaulttype, name={html}, @@ -1447,9 +1486,9 @@ then (supposing I have defined a new glossary type called \loadglsentries[altacronym]{myacronyms} </PRE> will add <TT>aca</TT> to the glossary type <TT>acronym</TT>, if the -package option <TT>acronym</TT><A NAME="3295"></A> has been specified, or will add +package option <TT>acronym</TT><A NAME="3478"></A> has been specified, or will add <TT>aca</TT> to the glossary type <TT>altacronym</TT>, if the -package option <TT>acronym</TT><A NAME="3304"></A> is not specified. In this instance, +package option <TT>acronym</TT><A NAME="3487"></A> is not specified. In this instance, it is better to change <TT>myacronyms.tex</TT> to: <PRE> \newacronym[type=\glsdefaulttype]{aca}{aca}{a contrived acronym} @@ -1459,7 +1498,7 @@ and now \loadglsentries[altacronym]{myacronyms} </PRE> will add <TT>aca</TT> to the glossary type <TT>altacronym</TT>, -regardless of whether or not the package option <TT>acronym</TT><A NAME="3313"></A> is +regardless of whether or not the package option <TT>acronym</TT><A NAME="3496"></A> is used. <P> @@ -1479,13 +1518,13 @@ Number lists </H2> <P> -Each entry in the glossary has an associated <I>number list</I><A NAME="3320"></A>. +Each entry in the glossary has an associated <I>number list</I><A NAME="3503"></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="3327"></A> package option, or an alternative counter -can be set as the default using the <TT>counter</TT><A NAME="3336"></A> package option. +the <TT>nonumberlist</TT><A NAME="3510"></A> package option, or an alternative counter +can be set as the default using the <TT>counter</TT><A NAME="3519"></A> package option. <P> <A HREF="glossaries-manual.html#top">Top</A> @@ -1499,16 +1538,31 @@ Links to Glossary Entries <P> Once you have defined a glossary entry using -<TT>\newglossaryentry</TT><A NAME="3343"></A>, you can refer to that entry in the +<TT>\newglossaryentry</TT><A NAME="3526"></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="3346"></A> (even if there are no hyperlinks). +<I>link text</I><A NAME="3529"></A> (even if there are no hyperlinks). The commands +in this section also add a line to an external file that is used +by <TT>makeindex</TT><A NAME="3531"></A> to generate the relevant entry in the +glossary. It is strongly recommended that you don't use the commands +defined in this section in the arguments of sectioning or caption +commands. This is particularly important if you are using the +<TT>glossaries</TT> package in conjunction with the <TT>hyperref</TT><A NAME="3535"></A> package. +Instead, use one of the commands listed in +<A HREF="glossaries-manual.html#sec:glsnolink">Using Glossary Terms +Without Links</A> (such as <TT>\glsentrytext</TT>) or provide an alternative via +the optional argument to the sectioning/caption command. +Examples: +<PRE> +\section{An overview of \glsentrytext{perl}} +\section[An overview of Perl]{An overview of \gls{perl}} +</PRE> <P> -The way the link text<A NAME="3347"></A> is displayed +The way the link text<A NAME="3537"></A> is displayed depends on <TT>\glstextformat{</TT><EM>text</EM><TT>}</TT>. -For example, to make all link text<A NAME="3348"></A> appear in a sans-serif +For example, to make all link text<A NAME="3538"></A> appear in a sans-serif font, do: <PRE> \renewcommand*{\glstextformat}[1]{\textsf{#1}} @@ -1529,10 +1583,10 @@ any of the following keys: <P> <DL> -<DT><STRONG><TT>format</TT><A NAME="3350"></A></STRONG></DT> +<DT><STRONG><TT>format</TT><A NAME="3540"></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="3353"></A> encap value, and (as with +equivalent to the <TT>makeindex</TT><A NAME="3543"></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 @@ -1550,7 +1604,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="3356"></A> +hyperlink, don't use <TT>\hyperpage</TT> (provided by the <TT>hyperref</TT><A NAME="3546"></A> package) as the numbers may not refer to a page number. Instead, the <TT>glossaries</TT> package provides the following number formats: @@ -1609,19 +1663,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="3360"></A> +and then use <TT>hyperbsf</TT> as the value for the <TT>format</TT><A NAME="3550"></A> key. <P> </DD> -<DT><STRONG><TT>counter</TT><A NAME="3363"></A></STRONG></DT> +<DT><STRONG><TT>counter</TT><A NAME="3553"></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="3366"></A></STRONG></DT> +<DT><STRONG><TT>hyper</TT><A NAME="3556"></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 @@ -1646,12 +1700,12 @@ 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="3368"></A> -is determined from the values of the <TT>text</TT><A NAME="3370"></A> and -<TT>first</TT><A NAME="3373"></A> keys supplied when the entry was defined using -<TT>\newglossaryentry</TT><A NAME="3376"></A>. If the entry has been marked as having -been used, the value of the <TT>text</TT><A NAME="3379"></A> key will be used, otherwise -the value of the <TT>first</TT><A NAME="3382"></A> key will be used. +is the same as <TT>\glslink</TT>, except that the link text<A NAME="3558"></A> +is determined from the values of the <TT>text</TT><A NAME="3560"></A> and +<TT>first</TT><A NAME="3563"></A> keys supplied when the entry was defined using +<TT>\newglossaryentry</TT><A NAME="3566"></A>. If the entry has been marked as having +been used, the value of the <TT>text</TT><A NAME="3569"></A> key will be used, otherwise +the value of the <TT>first</TT><A NAME="3572"></A> key will be used. On completion, <TT>\gls</TT> will mark the entry given by <I>label</I> as used. @@ -1680,7 +1734,7 @@ can be changed (see <P> The first optional argument <I>options</I> is the same as the optional -argument to <TT>\glslink</TT><A NAME="3385"></A>. As with <TT>\glslink</TT>, these commands also +argument to <TT>\glslink</TT><A NAME="3575"></A>. As with <TT>\glslink</TT>, these commands also have a starred version that disable the hyperlink. <P> @@ -1696,8 +1750,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="3388"></A> and -<TT>firstplural</TT><A NAME="3391"></A> keys supplied when the entry was first +These determine the link text from the <TT>plural</TT><A NAME="3578"></A> and +<TT>firstplural</TT><A NAME="3581"></A> keys supplied when the entry was first defined. As before, these commands also have a starred version that disable the hyperlink. @@ -1707,8 +1761,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="3394"></A> except that it always uses the value -of the <TT>text</TT><A NAME="3397"></A> key and does not mark the entry as +is similar to <TT>\gls</TT><A NAME="3584"></A> except that it always uses the value +of the <TT>text</TT><A NAME="3587"></A> key and does not mark the entry as having been used. Unlike <TT>\gls</TT>, the inserted text <I>insert</I> is always appended to the link text. @@ -1731,8 +1785,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>\glstext</TT><A NAME="3400"></A> except that it always uses the value -of the <TT>first</TT><A NAME="3403"></A> key. Again, <I>insert</I> is always appended +is similar to <TT>\glstext</TT><A NAME="3590"></A> except that it always uses the value +of the <TT>first</TT><A NAME="3593"></A> key. Again, <I>insert</I> is always appended to the end of the link text and does not mark the entry as having been used. @@ -1755,8 +1809,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>\glstext</TT><A NAME="3406"></A> except that it always uses the value -of the <TT>plural</TT><A NAME="3409"></A> key. Again, <I>insert</I> is always appended +is similar to <TT>\glstext</TT><A NAME="3596"></A> except that it always uses the value +of the <TT>plural</TT><A NAME="3599"></A> key. Again, <I>insert</I> is always appended to the end of the link text and does not mark the entry as having been used. @@ -1779,8 +1833,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>\glstext</TT><A NAME="3412"></A> except that it always uses the value -of the <TT>firstplural</TT><A NAME="3415"></A> key. Again, <I>insert</I> is always +is similar to <TT>\glstext</TT><A NAME="3602"></A> except that it always uses the value +of the <TT>firstplural</TT><A NAME="3605"></A> key. Again, <I>insert</I> is always appended to the end of the link text and does not mark the entry as having been used. @@ -1803,13 +1857,13 @@ 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>\glstext</TT><A NAME="3418"></A> except that it always uses the value of the -<TT>name</TT><A NAME="3421"></A> key. Again, <I>insert</I> is always appended to the end +is similar to <TT>\glstext</TT><A NAME="3608"></A> except that it always uses the value of the +<TT>name</TT><A NAME="3611"></A> key. Again, <I>insert</I> is always appended to the end of the link text 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="3424"></A> key contains commands, you will have to disable the +<TT>name</TT><A NAME="3614"></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="3427"></A> key and protect fragile commands. +of the <TT>name</TT><A NAME="3617"></A> key and protect fragile commands. <P> There are also analogous commands: @@ -1830,13 +1884,13 @@ 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>\glstext</TT><A NAME="3430"></A> except that it always uses the value of the -<TT>symbol</TT><A NAME="3433"></A> key. Again, <I>insert</I> is always appended to the +is similar to <TT>\glstext</TT><A NAME="3620"></A> except that it always uses the value of the +<TT>symbol</TT><A NAME="3623"></A> key. Again, <I>insert</I> is always appended to the end of the link text 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="3436"></A> key contains commands, you will have to disable the +<TT>symbol</TT><A NAME="3626"></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="3439"></A> key and protect fragile commands. +of the <TT>symbol</TT><A NAME="3629"></A> key and protect fragile commands. <P> There are also analogous commands: @@ -1857,14 +1911,14 @@ 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>\glstext</TT><A NAME="3442"></A> except that it always uses the value -of the <TT>description</TT><A NAME="3445"></A> key. Again, <I>insert</I> is always +is similar to <TT>\glstext</TT><A NAME="3632"></A> except that it always uses the value +of the <TT>description</TT><A NAME="3635"></A> key. Again, <I>insert</I> is always appended to the end of the link text 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="3448"></A> key contains commands, you will +command and the <TT>description</TT><A NAME="3638"></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="3451"></A> key and protect fragile commands. +of the <TT>description</TT><A NAME="3641"></A> key and protect fragile commands. <P> There are also analogous commands: @@ -1893,27 +1947,35 @@ Changing the format of the link text </H3> <P> -The format of the link text<A NAME="3456"></A> for <TT>\gls</TT><A NAME="3458"></A>, <TT>\glspl</TT><A NAME="3461"></A> +The format of the link text<A NAME="3646"></A> for <TT>\gls</TT><A NAME="3648"></A>, <TT>\glspl</TT><A NAME="3651"></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="3464"></A>, <TT>plural</TT><A NAME="3467"></A>, -<TT>first</TT><A NAME="3470"></A> or <TT>firstplural</TT><A NAME="3473"></A> keys (used when the term was +plural form given by the <TT>text</TT><A NAME="3654"></A>, <TT>plural</TT><A NAME="3657"></A>, +<TT>first</TT><A NAME="3660"></A> or <TT>firstplural</TT><A NAME="3663"></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="3476"></A> key); the third +description (as supplied by the <TT>description</TT><A NAME="3666"></A> key); the third argument is the symbol associated with the term (as supplied by the -<TT>symbol</TT><A NAME="3479"></A> key) and the fourth argument is the additional text +<TT>symbol</TT><A NAME="3669"></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 print the first argument immediately followed by the fourth argument. -The remaining arguments are ignored. +The remaining arguments are ignored. Note that <TT>\glslink</TT><A NAME="3672"></A> (which +is used by commands like <TT>\gls</TT> and <TT>\glspl</TT>) sets +<TT>\glslabel</TT><A NAME="3675"></A> to the label for the given +entry (i.e. the label supplied to the mandatory argument to +<TT>\gls</TT>), so it is possible to use this label in the definition of +<TT>\glsdisplay</TT> or <TT>\glsdisplayfirst</TT> to supply additional +information using any of the commands described in +<A HREF="glossaries-manual.html#sec:glsnolink">Using Glossary Terms +Without Links</A>, if required. <P> For example, suppose you want a glossary of measurements and -units, you can use the <TT>symbol</TT><A NAME="3482"></A> key to store the unit: +units, you can use the <TT>symbol</TT><A NAME="3678"></A> key to store the unit: <PRE> \newglossaryentry{distance}{name=distance, description={The length between two points}, @@ -1933,8 +1995,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="3484"></A> will be formatted according -to <TT>\glstextformat</TT><A NAME="3486"></A> (described earlier). So if you do, say: +Note also that all of the link text<A NAME="3680"></A> will be formatted according +to <TT>\glstextformat</TT><A NAME="3682"></A> (described earlier). So if you do, say: <PRE> \renewcommand{\glstextformat}[1]{\textbf{#1}} \renewcommand{\glsdisplayfirst}[4]{#1#4 (#3)} @@ -1954,7 +2016,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's label<A NAME="tex2html11" - HREF="#foot2218"><SUP>4</SUP></A> and the second is how the term should be + HREF="#foot2383"><SUP>4</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. @@ -1980,10 +2042,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="3493"></A> key, you need to use a +Remember that if you use the <TT>symbol</TT><A NAME="3689"></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="3495"></A>, you will have to disable the +in the link text<A NAME="3691"></A>, you will have to disable the <A HREF="glossaries-manual.html#sanitize">sanitization</A> of these keys and protect fragile commands. <P> @@ -1996,10 +2058,10 @@ Enabling and disabling hyperlinks to glossary entries</A> </H3> <P> -If you load the <TT>hyperref</TT><A NAME="3500"></A> or <TT>html</TT><A NAME="3503"></A> packages prior to -loading the <TT>glossaries</TT> package, commands such as <TT>\glslink</TT><A NAME="3507"></A> -and <TT>\gls</TT><A NAME="3510"></A>, described above, will automatically have hyperlinks -to the relevant glossary entry, unless the <TT>hyper</TT><A NAME="3513"></A> +If you load the <TT>hyperref</TT><A NAME="3696"></A> or <TT>html</TT><A NAME="3699"></A> packages prior to +loading the <TT>glossaries</TT> package, commands such as <TT>\glslink</TT><A NAME="3703"></A> +and <TT>\gls</TT><A NAME="3706"></A>, described above, will automatically have hyperlinks +to the relevant glossary entry, unless the <TT>hyper</TT><A NAME="3709"></A> option has been set to <TT>false</TT>. You can disable or enable links using: <BR> <BR><TT>\glsdisablehyper</TT> @@ -2012,15 +2074,17 @@ 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="3516"></A> and <TT>\hypertarget</TT><A NAME="3519"></A> have been -defined (for example, by the <TT>hyperref</TT><A NAME="3522"></A> package). +if the commands <TT>\hyperlink</TT><A NAME="3712"></A> and <TT>\hypertarget</TT><A NAME="3715"></A> have been +defined (for example, by the <TT>hyperref</TT><A NAME="3718"></A> package). +<P> +<A HREF="glossaries-manual.html#top">Top</A> <P> <H2><A NAME="SECTION00045000000000000000"></A> <A NAME="sec:glsadd"></A> <BR> -Adding an entry to the glossary without generating text +Adding an Entry to the Glossary Without Generating Text </H2> <P> @@ -2030,8 +2094,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="3525"></A>, only it doesn't produce -any text (so therefore, there is no <TT>hyper</TT><A NAME="3528"></A> key +This is similar to <TT>\glslink</TT><A NAME="3724"></A>, only it doesn't produce +any text (so therefore, there is no <TT>hyper</TT><A NAME="3727"></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>). For example, to add a page range to the glossary number list for the @@ -2049,7 +2113,7 @@ To add all entries that have been defined, use: <BR> <BR> The optional argument is the same as for <TT>\glsadd</TT>, except -there is also a key <TT>types</TT><A NAME="3531"></A> which can be +there is also a key <TT>types</TT><A NAME="3730"></A> which can be used to specify which glossaries to use. This should be a comma separated list. For example, if you only want to add all the entries belonging to the list of acronyms (specified by @@ -2065,7 +2129,109 @@ do: <P> -<H2><A NAME="SECTION00046000000000000000"> +<H2><A NAME="SECTION00046000000000000000"></A> +<A NAME="sec:glsnolink"></A> +<BR> +Using Glossary Terms Without Links +</H2> + +<P> +The commands described in this section display entry details without +adding any information to the glossary. They don't use +<TT>\glstextformat</TT>, they don't have any optional arguments, +they don't affect the flag that determines if the term has been +used and they don't produce hyperlinks. + +<P> + +<TT>\glsentryname{</TT><EM>label</EM><TT>}</TT> +<BR><TT>\Glsentryname{</TT><EM>label</EM><TT>}</TT> +<P> +These commands display the name of the glossary entry given by +<I>label</I>, as specified by the <TT>name</TT><A NAME="3736"></A> key. +<TT>\Glsentryname</TT> makes the first letter uppercase. + +<P> + +<TT>\glsentrytext{</TT><EM>label</EM><TT>}</TT> +<BR><TT>\Glsentrytext{</TT><EM>label</EM><TT>}</TT> +<P> +These commands display the subsequent use text for the glossary entry +given by <I>label</I>, as specified by the <TT>text</TT><A NAME="3739"></A> key. +<TT>\Glsentrytext</TT> makes the first letter uppercase. + +<P> + +<TT>\glsentryplural{</TT><EM>label</EM><TT>}</TT> +<BR><TT>\Glsentryplural{</TT><EM>label</EM><TT>}</TT> +<P> +These commands display the subsequent use plural text for the glossary +entry given by <I>label</I>, as specified by the <TT>plural</TT><A NAME="3742"></A> key. +<TT>\Glsentryplural</TT> makes the first letter uppercase. + +<P> + +<TT>\glsentryfirst{</TT><EM>label</EM><TT>}</TT> +<BR><TT>\Glsentryfirst{</TT><EM>label</EM><TT>}</TT> +<P> +These commands display the first use text for the glossary entry +given by <I>label</I>, as specified by the <TT>first</TT><A NAME="3745"></A> key. +<TT>\Glsentryfirst</TT> makes the first letter uppercase. + +<P> + +<TT>\glsentryfirstplural{</TT><EM>label</EM><TT>}</TT> +<BR><TT>\Glsentryfirstplural{</TT><EM>label</EM><TT>}</TT> +<P> +These commands display the plural form of the first use text for the +glossary entry given by <I>label</I>, as specified by the +<TT>firstplural</TT><A NAME="3748"></A> key. <TT>\Glsentryfirstplural</TT> makes the first +letter uppercase. + +<P> + +<TT>\glsentrydesc{</TT><EM>label</EM><TT>}</TT> +<BR><TT>\Glsentrydesc{</TT><EM>label</EM><TT>}</TT> +<P> +These commands display the description for the glossary entry given by +<I>label</I>. <TT>\Glsentrydesc</TT> makes the first letter uppercase. + +<P> + +<TT>\glsentrydescplural{</TT><EM>label</EM><TT>}</TT> +<BR><TT>\Glsentrydescplural{</TT><EM>label</EM><TT>}</TT> +<P> +These commands display the plural description for the glossary entry +given by <I>label</I>. <TT>\Glsentrydescplural</TT> makes the first letter +uppercase. + +<P> + +<TT>\glsentrysymbol{</TT><EM>label</EM><TT>}</TT> +<BR><TT>\Glsentrysymbol{</TT><EM>label</EM><TT>}</TT> +<P> +These commands display the symbol for the glossary entry given by +<I>label</I>. <TT>\Glsentrysymbol</TT> makes the first letter uppercase. + +<P> + +<TT>\glsentrysymbolplural{</TT><EM>label</EM><TT>}</TT> +<BR><TT>\Glsentrysymbolplural{</TT><EM>label</EM><TT>}</TT> +<P> +These commands display the plural symbol for the glossary entry given by +<I>label</I>. <TT>\Glsentrysymbolplural</TT> makes the first letter uppercase. + +<P> +For further information see the +section "Displaying entry details without adding information to +the glossary" in the document <TT>glossaries.pdf</TT>. + +<P> +<A HREF="glossaries-manual.html#top">Top</A> + +<P> + +<H2><A NAME="SECTION00047000000000000000"> Displaying a glossary</A> </H2> @@ -2073,12 +2239,12 @@ Displaying a glossary</A> The command <TT>\printglossaries</TT> will display all the glossaries in the order in which they were defined. Note that no glossaries will appear until -you have either used the Perl script <TT>makeglossaries</TT><A NAME="3537"></A> -or have directly used <TT>makeindex</TT><A NAME="3540"></A> (as described in +you have either used the Perl script <TT>makeglossaries</TT><A NAME="3754"></A> +or have directly used <TT>makeindex</TT><A NAME="3757"></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="3543"></A> log files to see if there is a problem. -Remember that you also need to use the command <TT>\makeglossaries</TT><A NAME="3546"></A> in +the <TT>makeindex</TT><A NAME="3760"></A> log files to see if there is a problem. +Remember that you also need to use the command <TT>\makeglossaries</TT><A NAME="3763"></A> in the preamble to enable the glossaries. <P> @@ -2090,7 +2256,7 @@ An individual glossary can be 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="3549"></A></STRONG></DT> +<DT><STRONG><TT>type</TT><A NAME="3766"></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: @@ -2100,37 +2266,37 @@ glossary is assumed. For example, to print the list of acronyms: <P> </DD> -<DT><STRONG><TT>title</TT><A NAME="3552"></A></STRONG></DT> +<DT><STRONG><TT>title</TT><A NAME="3769"></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="3555"></A></STRONG></DT> +<DT><STRONG><TT>toctitle</TT><A NAME="3772"></A></STRONG></DT> <DD>This is the title -to use for the table of contents (if the <TT>toc</TT><A NAME="3563"></A> package +to use for the table of contents (if the <TT>toc</TT><A NAME="3780"></A> package option has been used). If omitted, the glossary title is used. <P> </DD> -<DT><STRONG><TT>style</TT><A NAME="3567"></A></STRONG></DT> +<DT><STRONG><TT>style</TT><A NAME="3784"></A></STRONG></DT> <DD>This specifies which glossary style to use for this glossary, overriding the effect -of the <TT>style</TT><A NAME="3575"></A> package option or <TT>\glossarystyle</TT><A NAME="3579"></A>. +of the <TT>style</TT><A NAME="3792"></A> package option or <TT>\glossarystyle</TT><A NAME="3796"></A>. <P> </DD> -<DT><STRONG><TT>numberedsection</TT><A NAME="3582"></A></STRONG></DT> +<DT><STRONG><TT>numberedsection</TT><A NAME="3799"></A></STRONG></DT> <DD>This specifies whether to use a numbered section for this glossary, overriding -the effect of the <TT>numberedsection</TT><A NAME="3590"></A> package option. This -key has the same syntax as the <TT>numberedsection</TT><A NAME="3599"></A> package +the effect of the <TT>numberedsection</TT><A NAME="3807"></A> package option. This +key has the same syntax as the <TT>numberedsection</TT><A NAME="3816"></A> package option, described <A HREF="glossaries-manual.html#sec:pkgopts">earlier</A>. <P> </DD> -<DT><STRONG><TT>nonumberlist</TT><A NAME="3603"></A></STRONG></DT> +<DT><STRONG><TT>nonumberlist</TT><A NAME="3820"></A></STRONG></DT> <DD>Unlike the package option of the same name, this key is a boolean key. If true (<code>nonumberlist=true</code>) the numberlist is suppressed for this glossary. If false (<code>nonumberlist=false</code>) the numberlist is @@ -2181,7 +2347,7 @@ glossary. <P> -<H3><A NAME="SECTION00046100000000000000"></A> +<H3><A NAME="SECTION00047100000000000000"></A> <A NAME="sec:glsnamefont"></A> <BR> Changing the way the entry name appears in the glossary @@ -2209,7 +2375,7 @@ medium weight small caps, then you can do: <P> -<H2><A NAME="SECTION00047000000000000000"> +<H2><A NAME="SECTION00048000000000000000"> Defining New Glossaries</A> </H2> @@ -2224,10 +2390,10 @@ where <I>name</I> is the 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="3611"></A> (see also <A HREF="glossaries-manual.html#sec:numberlists">Number Lists</A>). The +lists<A NAME="3828"></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="3613"></A> transcript file (this information is only used by -<TT>makeglossaries</TT><A NAME="3616"></A> which picks up the information from the +<TT>makeindex</TT><A NAME="3830"></A> transcript file (this information is only used by +<TT>makeglossaries</TT><A NAME="3833"></A> which picks up the information from the auxiliary file). <P> @@ -2236,22 +2402,23 @@ 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="3624"></A> package option is equivalent to: +<TT>acronym</TT><A NAME="3841"></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="3633"></A> option has been used, you +not sure whether the <TT>acronym</TT><A NAME="3850"></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="3642"></A> option has been used, +<TT>acronym</TT>, if the <TT>acronym</TT><A NAME="3859"></A> option has been used, otherwise it is set to <TT>main</TT>. + <P> <A HREF="glossaries-manual.html#top">Top</A> <P> -<H2><A NAME="SECTION00048000000000000000"></A> +<H2><A NAME="SECTION00049000000000000000"></A> <A NAME="sec:acronyms"></A> <BR> Acronyms @@ -2288,7 +2455,7 @@ firstplural={</TT> <I>long</I><TT><TT>\glspluralsuffix\space</TT> <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="3655"></A> package option has been used, this will be +<TT>acronym</TT><A NAME="3872"></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. @@ -2321,10 +2488,10 @@ first use and "IDN" on subsequent uses. This section describes acronyms that have been defined using <TT>\newacronym</TT>. If you prefer to define all your acronyms using <TT>\newglossaryentry</TT> explicitly, then you should skip this section -and ignore the package options: <TT>smallcaps</TT><A NAME="3664"></A>, <TT>smaller</TT><A NAME="3673"></A>, -<TT>description</TT><A NAME="3682"></A>, <TT>dua</TT><A NAME="3691"></A>, <TT>footnote</TT><A NAME="3700"></A> and -<TT>shortcuts</TT><A NAME="3709"></A>, as these options change the -definition of <TT>\newacronym</TT><A NAME="3713"></A> for common acronym formats +and ignore the package options: <TT>smallcaps</TT><A NAME="3881"></A>, <TT>smaller</TT><A NAME="3890"></A>, +<TT>description</TT><A NAME="3899"></A>, <TT>dua</TT><A NAME="3908"></A>, <TT>footnote</TT><A NAME="3917"></A> and +<TT>shortcuts</TT><A NAME="3926"></A>, as these options change the +definition of <TT>\newacronym</TT><A NAME="3930"></A> for common acronym formats as well as the way that the link text is displayed (see <A HREF="glossaries-manual.html#sec:glsdisplay">earlier</A>). Likewise you should ignore the new commands described in this section, @@ -2333,24 +2500,24 @@ such as <TT>\acrshort</TT>, as they vary according to the definition of <P> <A HREF="glossaries-manual.html#tab:acronymsettings">Table </A><A HREF="glossaries-manual.html#tab:acronymsettings">2</A> lists the package options and how the -<TT>\newglossaryentry</TT><A NAME="3719"></A> keys are used to store <I>long</I> (the long +<TT>\newglossaryentry</TT><A NAME="3936"></A> 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="3727"></A> option redefines +<TT>smallcaps</TT><A NAME="3944"></A> option redefines <TT>\acronymfont</TT> so that it sets its argument using <TT>\textsc</TT> (so you should use lower case characters in -<I>abbrv</I>) and the <TT>smaller</TT><A NAME="3736"></A> option redefines +<I>abbrv</I>) and the <TT>smaller</TT><A NAME="3953"></A> option redefines <TT>\acronymfont</TT> to use <TT>\smaller</TT>,<A NAME="tex2html12" - HREF="#foot2250"><SUP>5</SUP></A> otherwise <TT>\acronymfont</TT> simply displays its argument + HREF="#foot2417"><SUP>5</SUP></A> 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="3746"></A>, <TT>smaller</TT><A NAME="3755"></A>, <TT>dua</TT><A NAME="3764"></A>, -<TT>description</TT><A NAME="3773"></A> or <TT>footnote</TT><A NAME="3782"></A> are used, <TT>\acronymfont</TT> is +<TT>smallcaps</TT><A NAME="3963"></A>, <TT>smaller</TT><A NAME="3972"></A>, <TT>dua</TT><A NAME="3981"></A>, +<TT>description</TT><A NAME="3990"></A> or <TT>footnote</TT><A NAME="3999"></A> are used, <TT>\acronymfont</TT> is not used, so changing the definition of <TT>\acronymfont</TT> will have no effect under such circumstances. <P> If you want to display the acronym in another font, for example, -emphasized, then use the <TT>smaller</TT><A NAME="3791"></A> package option and -redefine <TT>\acronymfont</TT><A NAME="3795"></A> to use the required font. For example: +emphasized, then use the <TT>smaller</TT><A NAME="4008"></A> package option and +redefine <TT>\acronymfont</TT><A NAME="4012"></A> to use the required font. For example: <PRE> \usepackage[smaller]{glossaries} \renewcommand*{\acronymfont}[1]{\emph{#1}} @@ -2367,54 +2534,54 @@ first use. <A NAME="tab:acronymsettings"></A> <DIV ALIGN="CENTER"> -<A NAME="2251"></A> +<A NAME="2418"></A> <TABLE CELLPADDING=3> <CAPTION><STRONG>Table 2:</STRONG> Package options governing <TT>\newacronym</TT> and how the information is stored in the keys for <TT>\newglossaryentry</TT></CAPTION> <TR><TH ALIGN="LEFT"><B>Package Option </B></TH> -<TD ALIGN="LEFT"><TT>first</TT><A NAME="3798"></A> key</TD> -<TD ALIGN="LEFT"><TT>text</TT><A NAME="3801"></A> key</TD> -<TD ALIGN="LEFT"><TT>description</TT><A NAME="3804"></A> key</TD> -<TD ALIGN="LEFT"><TT>symbol</TT><A NAME="3807"></A> key</TD> +<TD ALIGN="LEFT"><TT>first</TT><A NAME="4015"></A> key</TD> +<TD ALIGN="LEFT"><TT>text</TT><A NAME="4018"></A> key</TD> +<TD ALIGN="LEFT"><TT>description</TT><A NAME="4021"></A> key</TD> +<TD ALIGN="LEFT"><TT>symbol</TT><A NAME="4024"></A> key</TD> </TR> -<TR><TD ALIGN="LEFT"><TT>description</TT><A NAME="3815"></A>,<TT>footnote</TT><A NAME="3824"></A></TD> +<TR><TD ALIGN="LEFT"><TT>description</TT><A NAME="4032"></A>,<TT>footnote</TT><A NAME="4041"></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="3833"></A>,<TT>dua</TT><A NAME="3842"></A></TD> +<TR><TD ALIGN="LEFT"><TT>description</TT><A NAME="4050"></A>,<TT>dua</TT><A NAME="4059"></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="3851"></A></TD> +<TR><TD ALIGN="LEFT"><TT>description</TT><A NAME="4068"></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="3860"></A></TD> +<TR><TD ALIGN="LEFT"><TT>footnote</TT><A NAME="4077"></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="3869"></A></TD> +<TR><TD ALIGN="LEFT"><TT>smallcaps</TT><A NAME="4086"></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>smaller</TT><A NAME="3878"></A></TD> +<TR><TD ALIGN="LEFT"><TT>smaller</TT><A NAME="4095"></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="3887"></A></TD> +<TR><TD ALIGN="LEFT"><TT>dua</TT><A NAME="4104"></A></TD> <TD ALIGN="LEFT"><I>long</I></TD> <TD ALIGN="LEFT"><I>long</I></TD> <TD ALIGN="LEFT"><I>long</I></TD> @@ -2460,15 +2627,19 @@ 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="3897"></A>, <TT>smaller</TT><A NAME="3906"></A>, -<TT>footnote</TT><A NAME="3915"></A>, <TT>dua</TT><A NAME="3924"></A> -and <TT>description</TT><A NAME="3933"></A> use <TT>\defglsdisplay</TT><A NAME="3937"></A> and -<TT>\defglsdisplayfirst</TT><A NAME="3940"></A> (described <A HREF="glossaries-manual.html#sec:glsdisplay">earlier</A>) -to change the way the link text is displayed. +Each of the package options <TT>smallcaps</TT><A NAME="4114"></A>, <TT>smaller</TT><A NAME="4123"></A>, +<TT>footnote</TT><A NAME="4132"></A>, <TT>dua</TT><A NAME="4141"></A> +and <TT>description</TT><A NAME="4150"></A> use <TT>\defglsdisplay</TT><A NAME="4154"></A> and +<TT>\defglsdisplayfirst</TT><A NAME="4157"></A> (described <A HREF="glossaries-manual.html#sec:glsdisplay">earlier</A>) +to change the way the link text is displayed. This means that these +package options only work for the glossary type given by +<TT>\acronymtype</TT>. If you have multiple lists of acronyms, you +will need to make the appropriate changes for each additional +glossary type. <P> <DL> -<DT><STRONG><TT>description</TT><A NAME="3948"></A>,<TT>footnote</TT><A NAME="3957"></A></STRONG></DT> +<DT><STRONG><TT>description</TT><A NAME="4165"></A>,<TT>footnote</TT><A NAME="4174"></A></STRONG></DT> <DD> When these two package options are used together, the first use displays the entry as: @@ -2488,30 +2659,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="3967"></A> option using -<A NAME="3976"></A><A NAME="3983"></A><code>sanitize={description=false,symbol=false}</code>, so +<TT>sanitize</TT><A NAME="4184"></A> option using +<A NAME="4193"></A><A NAME="4200"></A><code>sanitize={description=false,symbol=false}</code>, so remember to protect fragile commands when defining acronyms. <P> </DD> -<DT><STRONG><TT>dua</TT><A NAME="3990"></A></STRONG></DT> +<DT><STRONG><TT>dua</TT><A NAME="4207"></A></STRONG></DT> <DD> -The <TT>dua</TT><A NAME="3999"></A> package option always displays the expanded -form and so may not be used with <TT>footnote</TT><A NAME="4008"></A>, <TT>smaller</TT><A NAME="4017"></A> or -<TT>smallcaps</TT><A NAME="4026"></A>. Both first use and subsequent use displays the +The <TT>dua</TT><A NAME="4216"></A> package option always displays the expanded +form and so may not be used with <TT>footnote</TT><A NAME="4225"></A>, <TT>smaller</TT><A NAME="4234"></A> or +<TT>smallcaps</TT><A NAME="4243"></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="4035"></A> package option is also used, the -<TT>name</TT><A NAME="4039"></A> key is set to the long form, otherwise the -<TT>name</TT><A NAME="4042"></A> key is set to the short form and the -<TT>description</TT><A NAME="4045"></A> key is set to the long form. +If the <TT>description</TT><A NAME="4252"></A> package option is also used, the +<TT>name</TT><A NAME="4256"></A> key is set to the long form, otherwise the +<TT>name</TT><A NAME="4259"></A> key is set to the short form and the +<TT>description</TT><A NAME="4262"></A> key is set to the long form. <P> </DD> -<DT><STRONG><TT>description</TT><A NAME="4053"></A></STRONG></DT> +<DT><STRONG><TT>description</TT><A NAME="4270"></A></STRONG></DT> <DD> This package option displays the entry on first use as: <BR> @@ -2525,12 +2696,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="4063"></A><code>sanitize={symbol=false}</code>, so +<A NAME="4280"></A><code>sanitize={symbol=false}</code>, so remember to protect fragile commands when defining acronyms. <P> </DD> -<DT><STRONG><TT>footnote</TT><A NAME="4070"></A></STRONG></DT> +<DT><STRONG><TT>footnote</TT><A NAME="4287"></A></STRONG></DT> <DD> This package option displays the entry on first use as: <BR> @@ -2544,14 +2715,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="4080"></A><code>sanitize={description=false}</code>, so +<A NAME="4297"></A><code>sanitize={description=false}</code>, so remember to protect fragile commands when defining acronyms. <P> </DD> -<DT><STRONG><TT>smallcaps</TT><A NAME="4087"></A></STRONG></DT> +<DT><STRONG><TT>smallcaps</TT><A NAME="4304"></A></STRONG></DT> <DD> -If neither the <TT>footnote</TT><A NAME="4096"></A> nor <TT>description</TT><A NAME="4105"></A> options +If neither the <TT>footnote</TT><A NAME="4313"></A> nor <TT>description</TT><A NAME="4322"></A> options have been set, this option displays the entry on first use as: <BR> <BR><I>long</I><I>insert</I> (<TT>\firstacronymfont{</TT><EM>abbrv</EM><TT>}</TT>) @@ -2568,14 +2739,14 @@ should be specified in lower case. <P> Note also that if this package option is used, the <TT>glossaries</TT> package additionally implements the option -<A NAME="4115"></A><code>sanitize={symbol=false}</code>, so +<A NAME="4332"></A><code>sanitize={symbol=false}</code>, so remember to protect fragile commands when defining acronyms. <P> </DD> -<DT><STRONG><TT>smaller</TT><A NAME="4122"></A></STRONG></DT> +<DT><STRONG><TT>smaller</TT><A NAME="4339"></A></STRONG></DT> <DD> -If neither the <TT>footnote</TT><A NAME="4131"></A> nor <TT>description</TT><A NAME="4140"></A> options +If neither the <TT>footnote</TT><A NAME="4348"></A> nor <TT>description</TT><A NAME="4357"></A> options have been set, this option displays the entry on first use as: <BR> <BR><I>long</I><I>insert</I> (<TT>\firstacronymfont{</TT><EM>abbrv</EM><TT>}</TT>) @@ -2589,21 +2760,21 @@ while subsequent use displays the entry as: where <TT>\acronymfont</TT> is set to <code>{\smaller #1}</code>. <P> -Remember to load a package that defines <TT>\smaller</TT><A NAME="4144"></A> (such as -<TT>relsize</TT><A NAME="4147"></A>) if you want to use this option. +Remember to load a package that defines <TT>\smaller</TT><A NAME="4361"></A> (such as +<TT>relsize</TT><A NAME="4364"></A>) if you want to use this option. <P> Note also that if this package option is used, the <TT>glossaries</TT> package additionally implements the option -<A NAME="4156"></A><code>sanitize={symbol=false}</code>, so +<A NAME="4373"></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="4163"></A>, <TT>smaller</TT><A NAME="4172"></A>, -<TT>footnote</TT><A NAME="4181"></A>, <TT>dua</TT><A NAME="4190"></A> or <TT>description</TT><A NAME="4199"></A> are used, +If none of the package options <TT>smallcaps</TT><A NAME="4380"></A>, <TT>smaller</TT><A NAME="4389"></A>, +<TT>footnote</TT><A NAME="4398"></A>, <TT>dua</TT><A NAME="4407"></A> or <TT>description</TT><A NAME="4416"></A> are used, then on first use the entry is displayed as: <BR> <BR><I>long</I> (<I>abbrv</I>)<I>insert</I> @@ -2618,7 +2789,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="4203"></A>, so it is possible to use these commands to +like <TT>\glstext</TT><A NAME="4420"></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 @@ -2638,8 +2809,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="4207"></A> (or its uppercase variants) but may additionally -put the link text within the argument to <TT>\acronymfont</TT><A NAME="4210"></A>. +<TT>\glstext</TT><A NAME="4424"></A> (or its uppercase variants) but may additionally +put the link text within the argument to <TT>\acronymfont</TT><A NAME="4427"></A>. <BR> <BR> <P> @@ -2653,7 +2824,7 @@ put the link text within the argument to <TT>\acronymfont</TT><A NAME="4210" <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="4213"></A>, <TT>\glssymbol</TT><A NAME="4216"></A> or <TT>\glsfirst</TT><A NAME="4219"></A> (or their uppercase +<TT>\glsdesc</TT><A NAME="4430"></A>, <TT>\glssymbol</TT><A NAME="4433"></A> or <TT>\glsfirst</TT><A NAME="4436"></A> (or their uppercase variants), depending on package options. <BR> <BR> @@ -2671,16 +2842,16 @@ 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="4222"></A>, you +Note that if you change the definition of <TT>\newacronym</TT><A NAME="4439"></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="4225"></A> -and <TT>\defglsdisplayfirst</TT><A NAME="4228"></A>. +the changing way the text is displayed using <TT>\defglsdisplay</TT><A NAME="4442"></A> +and <TT>\defglsdisplayfirst</TT><A NAME="4445"></A>. <P> -The package option <TT>shortcuts</TT><A NAME="4236"></A> provides the synonyms listed +The package option <TT>shortcuts</TT><A NAME="4453"></A> provides the synonyms listed in <A HREF="glossaries-manual.html#tab:shortcuts">table </A><A HREF="glossaries-manual.html#tab:shortcuts">3</A>. If any of those commands generate an "undefined control sequence" error message, check that you -have enabled the shortcuts using the <TT>shortcuts</TT><A NAME="4248"></A> package +have enabled the shortcuts using the <TT>shortcuts</TT><A NAME="4465"></A> package option. Note that there are no shortcuts for the commands that produce all upper case text. @@ -2690,60 +2861,60 @@ produce all upper case text. <A NAME="tab:shortcuts"></A> <DIV ALIGN="CENTER"> -<A NAME="2263"></A> +<A NAME="2430"></A> <TABLE CELLPADDING=3> <CAPTION><STRONG>Table 3:</STRONG> -Synonyms provided by the package option <TT>shortcuts</TT><A NAME="4257"></A></CAPTION> +Synonyms provided by the package option <TT>shortcuts</TT><A NAME="4474"></A></CAPTION> <TR><TH ALIGN="LEFT"><B>Shortcut Command </B></TH> <TH ALIGN="LEFT"><B>Equivalent Command</B></TH> </TR> -<TR><TD ALIGN="LEFT"><TT>\acs</TT><A NAME="4261"></A></TD> -<TD ALIGN="LEFT"><TT>\acrshort</TT><A NAME="4264"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\acs</TT><A NAME="4478"></A></TD> +<TD ALIGN="LEFT"><TT>\acrshort</TT><A NAME="4481"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\Acs</TT><A NAME="4267"></A></TD> -<TD ALIGN="LEFT"><TT>\Acrshort</TT><A NAME="4270"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\Acs</TT><A NAME="4484"></A></TD> +<TD ALIGN="LEFT"><TT>\Acrshort</TT><A NAME="4487"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\acsp</TT><A NAME="4273"></A></TD> -<TD ALIGN="LEFT"><TT>\acrshortpl</TT><A NAME="4276"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\acsp</TT><A NAME="4490"></A></TD> +<TD ALIGN="LEFT"><TT>\acrshortpl</TT><A NAME="4493"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\Acsp</TT><A NAME="4279"></A></TD> -<TD ALIGN="LEFT"><TT>\Acrshortpl</TT><A NAME="4282"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\Acsp</TT><A NAME="4496"></A></TD> +<TD ALIGN="LEFT"><TT>\Acrshortpl</TT><A NAME="4499"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\acl</TT><A NAME="4285"></A></TD> -<TD ALIGN="LEFT"><TT>\acrlong</TT><A NAME="4288"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\acl</TT><A NAME="4502"></A></TD> +<TD ALIGN="LEFT"><TT>\acrlong</TT><A NAME="4505"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\Acl</TT><A NAME="4291"></A></TD> -<TD ALIGN="LEFT"><TT>\Acrlong</TT><A NAME="4294"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\Acl</TT><A NAME="4508"></A></TD> +<TD ALIGN="LEFT"><TT>\Acrlong</TT><A NAME="4511"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\aclp</TT><A NAME="4297"></A></TD> -<TD ALIGN="LEFT"><TT>\acrlongpl</TT><A NAME="4300"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\aclp</TT><A NAME="4514"></A></TD> +<TD ALIGN="LEFT"><TT>\acrlongpl</TT><A NAME="4517"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\Aclp</TT><A NAME="4303"></A></TD> -<TD ALIGN="LEFT"><TT>\Acrlongpl</TT><A NAME="4306"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\Aclp</TT><A NAME="4520"></A></TD> +<TD ALIGN="LEFT"><TT>\Acrlongpl</TT><A NAME="4523"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\acf</TT><A NAME="4309"></A></TD> -<TD ALIGN="LEFT"><TT>\acrfull</TT><A NAME="4312"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\acf</TT><A NAME="4526"></A></TD> +<TD ALIGN="LEFT"><TT>\acrfull</TT><A NAME="4529"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\Acf</TT><A NAME="4315"></A></TD> -<TD ALIGN="LEFT"><TT>\Acrfull</TT><A NAME="4318"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\Acf</TT><A NAME="4532"></A></TD> +<TD ALIGN="LEFT"><TT>\Acrfull</TT><A NAME="4535"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\acfp</TT><A NAME="4321"></A></TD> -<TD ALIGN="LEFT"><TT>\acrfullpl</TT><A NAME="4324"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\acfp</TT><A NAME="4538"></A></TD> +<TD ALIGN="LEFT"><TT>\acrfullpl</TT><A NAME="4541"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\Acfp</TT><A NAME="4327"></A></TD> -<TD ALIGN="LEFT"><TT>\Acrfullpl</TT><A NAME="4330"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\Acfp</TT><A NAME="4544"></A></TD> +<TD ALIGN="LEFT"><TT>\Acrfullpl</TT><A NAME="4547"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\ac</TT><A NAME="4333"></A></TD> -<TD ALIGN="LEFT"><TT>\gls</TT><A NAME="4336"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\ac</TT><A NAME="4550"></A></TD> +<TD ALIGN="LEFT"><TT>\gls</TT><A NAME="4553"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\Ac</TT><A NAME="4339"></A></TD> -<TD ALIGN="LEFT"><TT>\Gls</TT><A NAME="4342"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\Ac</TT><A NAME="4556"></A></TD> +<TD ALIGN="LEFT"><TT>\Gls</TT><A NAME="4559"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\acp</TT><A NAME="4345"></A></TD> -<TD ALIGN="LEFT"><TT>\glspl</TT><A NAME="4348"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\acp</TT><A NAME="4562"></A></TD> +<TD ALIGN="LEFT"><TT>\glspl</TT><A NAME="4565"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\Acp</TT><A NAME="4351"></A></TD> -<TD ALIGN="LEFT"><TT>\Glspl</TT><A NAME="4354"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\Acp</TT><A NAME="4568"></A></TD> +<TD ALIGN="LEFT"><TT>\Glspl</TT><A NAME="4571"></A></TD> </TR> </TABLE> </DIV> @@ -2757,16 +2928,16 @@ Synonyms provided by the package option <TT>shortcuts</TT><A NAME="4257"></A></C <P> -<H2><A NAME="SECTION00049000000000000000"> -Unsetting and resetting entry flags</A> +<H2><A NAME="SECTION000410000000000000000"> +Unsetting and Resetting Entry Flags</A> </H2> <P> -When using <TT>\gls</TT><A NAME="4360"></A>, <TT>\glspl</TT><A NAME="4363"></A> and their uppercase variants it is +When using <TT>\gls</TT><A NAME="4577"></A>, <TT>\glspl</TT><A NAME="4580"></A> and their uppercase variants it is possible that you may want to use the value given by the -<TT>first</TT><A NAME="4366"></A> key, even though you have already used the glossary +<TT>first</TT><A NAME="4583"></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="4369"></A> key, even though you haven't used the glossary entry. +<TT>text</TT><A NAME="4586"></A> key, even though you haven't used the glossary entry. The former can be achieved by one of the following commands: <BR> <BR><TT>\glsreset{</TT><EM>label</EM><TT>}</TT> @@ -2794,7 +2965,7 @@ entry has been used, <I>true part</I> will be done, otherwise <P> -<H2><A NAME="SECTION000410000000000000000"></A> +<H2><A NAME="SECTION000411000000000000000"></A> <A NAME="sec:styles"></A> <BR> Glossary Styles @@ -2803,7 +2974,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="4376"></A> style uses the <TT>description</TT> +<DD>The <TT>list</TT><A NAME="4593"></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 @@ -2812,14 +2983,14 @@ list for that entry. Sub groups are separated using <TT>\indexspace</TT>. <P> </DD> <DT><STRONG>listgroup</STRONG></DT> -<DD>The <TT>listgroup</TT><A NAME="4379"></A> style is like -<TT>list</TT><A NAME="4381"></A> but the glossary groups have headings. +<DD>The <TT>listgroup</TT><A NAME="4596"></A> style is like +<TT>list</TT><A NAME="4598"></A> but the glossary groups have headings. <P> </DD> <DT><STRONG>listhypergroup</STRONG></DT> -<DD>The <TT>listhypergroup</TT><A NAME="4383"></A> style is like -<TT>listgroup</TT><A NAME="4385"></A> but has a set of links to the glossary +<DD>The <TT>listhypergroup</TT><A NAME="4600"></A> style is like +<TT>listgroup</TT><A NAME="4602"></A> but has a set of links to the glossary groups. The start of the glossary has a navigation panel to each group that is present in the glossary. This requires an additional run through LaTeX to ensure the group information @@ -2835,28 +3006,28 @@ to simply have a space separating each group, do: Note that the hyper-navigation panel is now (as from version 1.14) set inside the optional argument to <TT>\item</TT> instead of after it to prevent a spurious space at the start. This can be changed -by redefining <TT>\glossaryheader</TT><A NAME="4387"></A>, but note that this needs to +by redefining <TT>\glossaryheader</TT><A NAME="4604"></A>, but note that this needs to be done <I>after</I> the glossary style has been set. <P> </DD> <DT><STRONG>altlist</STRONG></DT> -<DD>The <TT>altlist</TT><A NAME="4390"></A> style is like <TT>list</TT><A NAME="4392"></A> +<DD>The <TT>altlist</TT><A NAME="4607"></A> style is like <TT>list</TT><A NAME="4609"></A> but the description is placed on the following line. <P> </DD> <DT><STRONG>altlistgroup</STRONG></DT> -<DD>The <TT>altlistgroup</TT><A NAME="4394"></A> style is like -<TT>altlist</TT><A NAME="4396"></A> but the glossary groups have headings. +<DD>The <TT>altlistgroup</TT><A NAME="4611"></A> style is like +<TT>altlist</TT><A NAME="4613"></A> but the glossary groups have headings. <P> </DD> <DT><STRONG>altlisthypergroup</STRONG></DT> -<DD>The <TT>altlisthypergroup</TT><A NAME="4398"></A> style is like -<TT>altlistgroup</TT><A NAME="4400"></A> but has a set of links to the glossary +<DD>The <TT>altlisthypergroup</TT><A NAME="4615"></A> style is like +<TT>altlistgroup</TT><A NAME="4617"></A> but has a set of links to the glossary groups. The navigation panel is the same as that for -<TT>listhypergroup</TT><A NAME="4402"></A>, described above. +<TT>listhypergroup</TT><A NAME="4619"></A>, described above. <P> </DD> @@ -2864,214 +3035,310 @@ groups. The navigation panel is the same as that for <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="4404"></A> and the symbol. The +this style ignores both the number list<A NAME="4621"></A> and the symbol. The length <TT>\glslistdottedwidth</TT> governs where the description should start.<A NAME="tex2html15" - HREF="#foot1825"><SUP>6</SUP></A> + HREF="#foot1949"><SUP>6</SUP></A> <P> </DD> <DT><STRONG>long</STRONG></DT> -<DD>The <TT>long</TT><A NAME="4406"></A> style uses the <TT>longtable</TT> -environment (defined by the <TT>longtable</TT><A NAME="4409"></A> package). It has two +<DD>The <TT>long</TT><A NAME="4623"></A> style uses the <TT>longtable</TT> +environment (defined by the <TT>longtable</TT><A NAME="4626"></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="4411"></A>. -Sub groups are separated with a blank row. +column contains the description followed by the number list<A NAME="4628"></A>. +Sub groups are separated with a blank row. The width of the +first column is governed by the widest entry in that column. The +width of the second column is governed by the length +<TT>\glsdescwidth</TT><A NAME="4630"></A>. <P> </DD> <DT><STRONG>longborder</STRONG></DT> -<DD>The <TT>longborder</TT><A NAME="4413"></A> style is like -<TT>long</TT><A NAME="4415"></A> but has horizontal and vertical lines around it. +<DD>The <TT>longborder</TT><A NAME="4633"></A> style is like +<TT>long</TT><A NAME="4635"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>longheader</STRONG></DT> -<DD>The <TT>longheader</TT><A NAME="4417"></A> style is like -<TT>long</TT><A NAME="4419"></A> but has a header row. +<DD>The <TT>longheader</TT><A NAME="4637"></A> style is like +<TT>long</TT><A NAME="4639"></A> but has a header row. <P> </DD> <DT><STRONG>longheaderborder</STRONG></DT> -<DD>The <TT>longheaderborder</TT><A NAME="4421"></A> style is -like <TT>longheader</TT><A NAME="4423"></A> but has horizontal and vertical lines +<DD>The <TT>longheaderborder</TT><A NAME="4641"></A> style is +like <TT>longheader</TT><A NAME="4643"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>long3col</STRONG></DT> -<DD>The <TT>long3col</TT><A NAME="4425"></A> style is like -<TT>long</TT><A NAME="4427"></A> but has three columns. The first column contains +<DD>The <TT>long3col</TT><A NAME="4645"></A> style is like +<TT>long</TT><A NAME="4647"></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="4428"></A>. +and the third column contains the number list<A NAME="4648"></A>. The width of the +first column is governed by the widest entry in that column. The +width of the second column is governed by the length +<TT>\glsdescwidth</TT><A NAME="4650"></A>. The width of the third column is governed by the +length <TT>\glspagelistwidth</TT><A NAME="4653"></A>. <P> </DD> <DT><STRONG>long3colborder</STRONG></DT> -<DD>The <TT>long3colborder</TT><A NAME="4430"></A> style is like -the <TT>long3col</TT><A NAME="4432"></A> style but has horizontal and vertical +<DD>The <TT>long3colborder</TT><A NAME="4656"></A> style is like +the <TT>long3col</TT><A NAME="4658"></A> style but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>long3colheader</STRONG></DT> -<DD>The <TT>long3colheader</TT><A NAME="4434"></A> style is like -<TT>long3col</TT><A NAME="4436"></A> but has a header row. +<DD>The <TT>long3colheader</TT><A NAME="4660"></A> style is like +<TT>long3col</TT><A NAME="4662"></A> but has a header row. <P> </DD> <DT><STRONG>long3colheaderborder</STRONG></DT> -<DD>The <TT>long3colheaderborder</TT><A NAME="4438"></A> style is -like <TT>long3colheader</TT><A NAME="4440"></A> but has horizontal and vertical lines +<DD>The <TT>long3colheaderborder</TT><A NAME="4664"></A> style is +like <TT>long3colheader</TT><A NAME="4666"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>long4col</STRONG></DT> -<DD>The <TT>long4col</TT><A NAME="4442"></A> style is like -<TT>long3col</TT><A NAME="4444"></A> but has an additional column in which the -entry's associated symbol appears. +<DD>The <TT>long4col</TT><A NAME="4668"></A> style is like +<TT>long3col</TT><A NAME="4670"></A> but has an additional column in which the +entry's associated symbol appears. This style is used for brief +single line descriptions. The column widths are governed by the +widest entry in the given column. Use <TT>altlong4col</TT><A NAME="4672"></A> for long +descriptions. <P> </DD> <DT><STRONG>long4colborder</STRONG></DT> -<DD>The <TT>long4colborder</TT><A NAME="4446"></A> style is like -the <TT>long4col</TT><A NAME="4448"></A> style but has horizontal and vertical +<DD>The <TT>long4colborder</TT><A NAME="4674"></A> style is like +the <TT>long4col</TT><A NAME="4676"></A> style but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>long4colheader</STRONG></DT> -<DD>The <TT>long4colheader</TT><A NAME="4450"></A> style is like -<TT>long4col</TT><A NAME="4452"></A> but has a header row. +<DD>The <TT>long4colheader</TT><A NAME="4678"></A> style is like +<TT>long4col</TT><A NAME="4680"></A> but has a header row. <P> </DD> <DT><STRONG>long4colheaderborder</STRONG></DT> -<DD>The <TT>long4colheaderborder</TT><A NAME="4454"></A> style is -like <TT>long4colheader</TT><A NAME="4456"></A> but has horizontal and vertical lines +<DD>The <TT>long4colheaderborder</TT><A NAME="4682"></A> style is +like <TT>long4colheader</TT><A NAME="4684"></A> but has horizontal and vertical lines around it. <P> </DD> +<DT><STRONG>altlong4col</STRONG></DT> +<DD>The <TT>altlong4col</TT><A NAME="4686"></A> style is like +<TT>long4col</TT><A NAME="4688"></A> but allows multi-line descriptions and page lists. +The width of the description column is governed by the length +<TT>\glsdescwidth</TT><A NAME="4690"></A> and the width of the page list column is +governed by the length <TT>\glspagelistwidth</TT><A NAME="4693"></A>. The width of the name +and symbol columns is governed by the widest entry in the +given column. + +<P> +</DD> +<DT><STRONG>altlong4colborder</STRONG></DT> +<DD>The <TT>altlong4colborder</TT><A NAME="4696"></A> style is like +the <TT>long4colborder</TT><A NAME="4698"></A> but allows multi-line descriptions and +page lists. + +<P> +</DD> +<DT><STRONG>altlong4colheader</STRONG></DT> +<DD>The <TT>altlong4colheader</TT><A NAME="4700"></A> style is like +<TT>long4colheader</TT><A NAME="4702"></A> but allows multi-line descriptions and +page lists. + +<P> +</DD> +<DT><STRONG>altlong4colheaderborder</STRONG></DT> +<DD>The <TT>altlong4colheaderborder</TT><A NAME="4704"></A> +style is like <TT>long4colheaderborder</TT><A NAME="4706"></A> but allows multi-line +descriptions and page lists. + +<P> +</DD> <DT><STRONG>super</STRONG></DT> -<DD>The <TT>super</TT><A NAME="4458"></A> style uses the <TT>supertabular</TT> -environment (defined by the <TT>supertabular</TT><A NAME="4461"></A> package). It has two +<DD>The <TT>super</TT><A NAME="4708"></A> style uses the <TT>supertabular</TT> +environment (defined by the <TT>supertabular</TT><A NAME="4711"></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="4463"></A>. -Sub groups are separated with a blank row. +column contains the description followed by the number list<A NAME="4713"></A>. +Sub groups are separated with a blank row. The width of the +first column is governed by the widest entry in that column. The +width of the second column is governed by the length +<TT>\glsdescwidth</TT><A NAME="4715"></A>. <P> </DD> <DT><STRONG>superborder</STRONG></DT> -<DD>The <TT>superborder</TT><A NAME="4465"></A> style is like -<TT>super</TT><A NAME="4467"></A> but has horizontal and vertical lines around it. +<DD>The <TT>superborder</TT><A NAME="4718"></A> style is like +<TT>super</TT><A NAME="4720"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>superheader</STRONG></DT> -<DD>The <TT>superheader</TT><A NAME="4469"></A> style is like -<TT>super</TT><A NAME="4471"></A> but has a header row. +<DD>The <TT>superheader</TT><A NAME="4722"></A> style is like +<TT>super</TT><A NAME="4724"></A> but has a header row. <P> </DD> <DT><STRONG>superheaderborder</STRONG></DT> -<DD>The <TT>superheaderborder</TT><A NAME="4473"></A> style is -like <TT>superheader</TT><A NAME="4475"></A> but has horizontal and vertical lines +<DD>The <TT>superheaderborder</TT><A NAME="4726"></A> style is +like <TT>superheader</TT><A NAME="4728"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>super3col</STRONG></DT> -<DD>The <TT>super3col</TT><A NAME="4477"></A> style is like -<TT>super</TT><A NAME="4479"></A> but has three columns. The first column contains +<DD>The <TT>super3col</TT><A NAME="4730"></A> style is like +<TT>super</TT><A NAME="4732"></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="4480"></A>. +and the third column contains the <A NAME="4733"></A>. The width of the +first column is governed by the widest entry in that column. The +width of the second column is governed by the length +<TT>\glsdescwidth</TT><A NAME="4735"></A>. The width of the third column is governed by the +length <TT>\glspagelistwidth</TT><A NAME="4738"></A>. <P> </DD> <DT><STRONG>super3colborder</STRONG></DT> -<DD>The <TT>super3colborder</TT><A NAME="4482"></A> style is like -the <TT>super3col</TT><A NAME="4484"></A> style but has horizontal and vertical +<DD>The <TT>super3colborder</TT><A NAME="4741"></A> style is like +the <TT>super3col</TT><A NAME="4743"></A> style but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>super3colheader</STRONG></DT> -<DD>The <TT>super3colheader</TT><A NAME="4486"></A> style is like -<TT>super3col</TT><A NAME="4488"></A> but has a header row. +<DD>The <TT>super3colheader</TT><A NAME="4745"></A> style is like +<TT>super3col</TT><A NAME="4747"></A> but has a header row. <P> </DD> <DT><STRONG>super3colheaderborder</STRONG></DT> -<DD>The <TT>super3colheaderborder</TT><A NAME="4490"></A> style -is like <TT>super3colheader</TT><A NAME="4492"></A> but has horizontal and vertical +<DD>The <TT>super3colheaderborder</TT><A NAME="4749"></A> style +is like <TT>super3colheader</TT><A NAME="4751"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>super4col</STRONG></DT> -<DD>The <TT>super4col</TT><A NAME="4494"></A> style is like -<TT>super3col</TT><A NAME="4496"></A> but has an additional column in which the -entry's associated symbol appears. +<DD>The <TT>super4col</TT><A NAME="4753"></A> style is like +<TT>super3col</TT><A NAME="4755"></A> but has an additional column in which the +entry's associated symbol appears. This style is designed for +entries with brief single line descriptions. The column widths are governed by the +widest entry in the given column. Use <TT>altsuper4col</TT><A NAME="4757"></A> +for longer descriptions. <P> </DD> <DT><STRONG>super4colborder</STRONG></DT> -<DD>The <TT>super4colborder</TT><A NAME="4498"></A> style is like -the <TT>super4col</TT><A NAME="4500"></A> style but has horizontal and vertical +<DD>The <TT>super4colborder</TT><A NAME="4759"></A> style is like +the <TT>super4col</TT><A NAME="4761"></A> style but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>super4colheader</STRONG></DT> -<DD>The <TT>super4colheader</TT><A NAME="4502"></A> style is like -<TT>super4col</TT><A NAME="4504"></A> but has a header row. +<DD>The <TT>super4colheader</TT><A NAME="4763"></A> style is like +<TT>super4col</TT><A NAME="4765"></A> but has a header row. <P> </DD> <DT><STRONG>super4colheaderborder</STRONG></DT> -<DD>The <TT>super4colheaderborder</TT><A NAME="4506"></A> style -is like <TT>super4colheader</TT><A NAME="4508"></A> but has horizontal and vertical +<DD>The <TT>super4colheaderborder</TT><A NAME="4767"></A> style +is like <TT>super4colheader</TT><A NAME="4769"></A> but has horizontal and vertical lines around it. <P> </DD> +<DT><STRONG>altsuper4col</STRONG></DT> +<DD>The <TT>altsuper4col</TT><A NAME="4771"></A> style is like +<TT>super4col</TT><A NAME="4773"></A> but allows multi-line descriptions and page +lists. +The width of the description column is governed by the length +<TT>\glsdescwidth</TT><A NAME="4775"></A> and the width of the page list column is +governed by the length <TT>\glspagelistwidth</TT><A NAME="4778"></A>. The width of the name +and symbol columns is governed by the widest entry in the +given column. + +<P> +</DD> +<DT><STRONG>altsuper4colborder</STRONG></DT> +<DD>The <TT>altsuper4colborder</TT><A NAME="4781"></A> style is like +the <TT>super4colborder</TT><A NAME="4783"></A> style but allows multi-line descriptions +and page lists. + +<P> +</DD> +<DT><STRONG>altsuper4colheader</STRONG></DT> +<DD>The <TT>altsuper4colheader</TT><A NAME="4785"></A> style is like +<TT>super4colheader</TT><A NAME="4787"></A> but allows multi-line descriptions and +page lists. + +<P> +</DD> +<DT><STRONG>altsuper4colheaderborder</STRONG></DT> +<DD>The <TT>altsuper4colheaderborder</TT><A NAME="4789"></A> +style is like <TT>super4colheaderborder</TT><A NAME="4791"></A> but allows multi-line +descriptions and page lists. + +<P> +</DD> </DL> <P> -The glossary style can be set using the <TT>style</TT><A NAME="4515"></A> package option -or using the <TT>style</TT><A NAME="4519"></A> key in the optional -argument to <TT>\printglossary</TT><A NAME="4522"></A> or using the command: +The glossary style can be set using the <TT>style</TT><A NAME="4798"></A> package option +or using the <TT>style</TT><A NAME="4802"></A> key in the optional +argument to <TT>\printglossary</TT><A NAME="4805"></A> or using the command: <BR> <BR><TT>\glossarystyle{</TT><EM>style-name</EM><TT>}</TT> <BR> <BR> +The tabular-like styles that allow multi-line descriptions and page +lists use the length <TT>\glsdescwidth</TT> to +set the width of the description column and the length +<TT>\glspagelistwidth</TT> to set the +width of the page list column. These will need to be changed using +<TT>\setlength</TT> if the glossary is too wide. Note that the +<TT>long4col</TT><A NAME="4808"></A> and <TT>super4col</TT><A NAME="4810"></A> styles (and their header and border +variations) don't use these lengths as they are designed for single +line entries. Instead you should use the analogous +<TT>altlong4col</TT><A NAME="4812"></A> and <TT>altsuper4col</TT><A NAME="4814"></A> styles. + <P> -Note that if you use the <TT>style</TT><A NAME="4525"></A> key in the -optional argument to <TT>\printglossary</TT><A NAME="4528"></A>, it will override any +Note that if you use the <TT>style</TT><A NAME="4816"></A> key in the +optional argument to <TT>\printglossary</TT><A NAME="4819"></A>, it will override any previous style settings for the given glossary, so if, for example, you do: <PRE> \renewcommand*{\glsgroupskip}{} \printglossary[style=long] </PRE> -The new definition of <TT>\glsgroupskip</TT><A NAME="4531"></A> will not have an affect +The new definition of <TT>\glsgroupskip</TT><A NAME="4822"></A> will not have an affect for this glossary, as <TT>\glsgroupskip</TT> is redefined by -<code>style=long</code>. Likewise, <TT>\glossarystyle</TT><A NAME="4534"></A> will also +<code>style=long</code>. Likewise, <TT>\glossarystyle</TT><A NAME="4825"></A> will also override any previous style definitions, so, again: <PRE> \renewcommand*{\glsgroupskip}{} \glossarystyle{long} </PRE> will reset <TT>\glsgroupskip</TT> back to its default definition for the -named glossary style ("long" in this case). If you want to -modify the styles, either use <TT>\newglossarystyle</TT><A NAME="4537"></A> (described +named glossary style (<TT>long</TT><A NAME="4828"></A> in this case). If you want to +modify the styles, either use <TT>\newglossarystyle</TT><A NAME="4830"></A> (described in the next section) or make the modifications after -<TT>\glossarystyle</TT><A NAME="4540"></A>. +<TT>\glossarystyle</TT><A NAME="4833"></A>. <P> All the styles except for the three- and four-column styles and the -<TT>listdotted</TT><A NAME="4543"></A> style use the command +<TT>listdotted</TT><A NAME="4836"></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 @@ -3082,7 +3349,7 @@ displayed. <P> -<H2><A NAME="SECTION000411000000000000000"> +<H2><A NAME="SECTION000412000000000000000"> Defining your own glossary style</A> </H2> @@ -3106,8 +3373,8 @@ needs to redefine all of the following: 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="4549"></A> style uses the <TT>description</TT> environment, +glossary postamble (defined by <TT>\glossarypostamble</TT>). For example, +the <TT>list</TT><A NAME="4842"></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. @@ -3120,8 +3387,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="4554"></A> glossary style redefines -<TT>\glossaryheader</TT> to do nothing, whereas the <TT>longheader</TT><A NAME="4556"></A> +the glossary style. The <TT>list</TT><A NAME="4847"></A> glossary style redefines +<TT>\glossaryheader</TT> to do nothing, whereas the <TT>longheader</TT><A NAME="4849"></A> glossary style redefines <TT>\glossaryheader</TT> to do a header row. <P> @@ -3133,14 +3400,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="4558"></A> key (or <TT>name</TT><A NAME="4561"></A> key if the <TT>sort</TT><A NAME="4564"></A> +of the <TT>sort</TT><A NAME="4851"></A> key (or <TT>name</TT><A NAME="4854"></A> key if the <TT>sort</TT><A NAME="4857"></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="4567"></A> style redefines +ignore its argument. The <TT>listhypergroup</TT><A NAME="4860"></A> style redefines <TT>\glsgroupheading</TT> as follows: <PRE> \renewcommand*{\glsgroupheading}[1]{% @@ -3156,7 +3423,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="4569"></A> glossary +the header for the next logical group. The <TT>list</TT><A NAME="4862"></A> glossary style simply redefines <TT>\glsgroupskip</TT> to be <TT>\indexspace</TT>. <P> @@ -3175,14 +3442,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="tex2html16" - HREF="#foot2264"><SUP>7</SUP></A> + HREF="#foot2431"><SUP>7</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="tex2html17" - HREF="#foot2265"><SUP>8</SUP></A> For example, the -<TT>list</TT><A NAME="4571"></A> style defines <TT>\glossaryentryfield</TT> as follows: + HREF="#foot2432"><SUP>8</SUP></A> For example, the +<TT>list</TT><A NAME="4864"></A> style defines <TT>\glossaryentryfield</TT> as follows: <PRE> \renewcommand*{\glossaryentryfield}[5]{% \item[\@glstarget{glo:##1}{##2}] ##3\glspostdescription\space ##5} @@ -3201,15 +3468,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="4573"></A>. The user can redefine this to change +to <TT>\glossaryentrynumbers</TT><A NAME="4866"></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="4581"></A> option +number list altogether. (In fact, the <TT>nonumberlist</TT><A NAME="4874"></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="4590"></A> package option. +<TT>nonumberlist</TT><A NAME="4883"></A> package option. </DD> </DL> <P> @@ -3217,7 +3484,7 @@ to worry about whether the user has specified the <P> -<H3><A NAME="SECTION000411100000000000000"> +<H3><A NAME="SECTION000412100000000000000"> Example: creating a completely new style</A> </H3> @@ -3238,7 +3505,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="4598"></A> should appear within square brackets +last of all the number list<A NAME="4891"></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> @@ -3266,7 +3533,7 @@ at the end. Then you can create this new glossary style, called, say, <P> -<H3><A NAME="SECTION000411200000000000000"> +<H3><A NAME="SECTION000412200000000000000"> Example: creating a new glossary style based on an existing style</A> </H3> @@ -3276,7 +3543,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="4603"></A> style but you don't want the extra +a style like the <TT>list</TT><A NAME="4896"></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: @@ -3300,7 +3567,7 @@ Mfirstuc Package <P> The <TT>glossaries</TT> package is supplied with the package -<TT>mfirstuc</TT><A NAME="4609"></A> which provides the command: +<TT>mfirstuc</TT><A NAME="4902"></A> which provides the command: <BR> <BR> <TT>\makefirstuc{</TT><EM>stuff</EM><TT>}</TT> @@ -3317,7 +3584,7 @@ object in the group is converted to uppercase. Examples: <P> </LI> <LI><code>\makefirstuc{\emph{abc}}</code> produces <I>Abc</I> -(<TT>\MakeUppercase</TT><A NAME="4612"></A> has been applied to the letter "a" rather +(<TT>\MakeUppercase</TT><A NAME="4905"></A> has been applied to the letter "a" rather than <TT>\emph</TT>.) <P> @@ -3370,7 +3637,7 @@ produces: Abc. <P> If you want to use an alternative command to convert to uppercase, for example <TT>\MakeTextUppercase</TT><A NAME="tex2html18" - HREF="#foot2266"><SUP>9</SUP></A>, you can redefine the internal + HREF="#foot2433"><SUP>9</SUP></A>, you can redefine the internal command <TT>\@gls@makefirstuc</TT>. For example: <PRE> \renewcommand{\@gls@makefirstuc}[1]{\MakeTextUppercase #1} @@ -3393,841 +3660,902 @@ either be placed in packages or be placed between <TT>\makeatletter</TT> Index</A> </H2><DL COMPACT> <DT><STRONG><TT>\Ac</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4333">Acronyms</A> - | <A HREF="glossaries-manual.html#4339">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4550">Acronyms</A> + | <A HREF="glossaries-manual.html#4556">Acronyms</A> <DT><STRONG><TT>\Acf</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4309">Acronyms</A> - | <A HREF="glossaries-manual.html#4315">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4526">Acronyms</A> + | <A HREF="glossaries-manual.html#4532">Acronyms</A> <DT><STRONG><TT>\Acfp</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4321">Acronyms</A> - | <A HREF="glossaries-manual.html#4327">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4538">Acronyms</A> + | <A HREF="glossaries-manual.html#4544">Acronyms</A> <DT><STRONG><TT>\Acl</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4285">Acronyms</A> - | <A HREF="glossaries-manual.html#4291">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4502">Acronyms</A> + | <A HREF="glossaries-manual.html#4508">Acronyms</A> <DT><STRONG><TT>\Aclp</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4297">Acronyms</A> - | <A HREF="glossaries-manual.html#4303">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4514">Acronyms</A> + | <A HREF="glossaries-manual.html#4520">Acronyms</A> <DT><STRONG><TT>\Acp</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4345">Acronyms</A> - | <A HREF="glossaries-manual.html#4351">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4562">Acronyms</A> + | <A HREF="glossaries-manual.html#4568">Acronyms</A> <DT><STRONG><TT>\Acrfull</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4312">Acronyms</A> - | <A HREF="glossaries-manual.html#4318">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4529">Acronyms</A> + | <A HREF="glossaries-manual.html#4535">Acronyms</A> <DT><STRONG><TT>\Acrfullpl</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4324">Acronyms</A> - | <A HREF="glossaries-manual.html#4330">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4541">Acronyms</A> + | <A HREF="glossaries-manual.html#4547">Acronyms</A> <DT><STRONG><TT>\Acrlong</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4288">Acronyms</A> - | <A HREF="glossaries-manual.html#4294">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4505">Acronyms</A> + | <A HREF="glossaries-manual.html#4511">Acronyms</A> <DT><STRONG><TT>\Acrlongpl</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4300">Acronyms</A> - | <A HREF="glossaries-manual.html#4306">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4517">Acronyms</A> + | <A HREF="glossaries-manual.html#4523">Acronyms</A> <DT><STRONG><TT>\acronymfont</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3795">Acronyms</A> - | <A HREF="glossaries-manual.html#4210">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4012">Acronyms</A> + | <A HREF="glossaries-manual.html#4427">Acronyms</A> <DT><STRONG><TT>\acronymname</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2362">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#2529">Multi-Lingual Support</A> <DT><STRONG><TT>\acronymtype</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2646">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2915">Package Options</A> - | <A HREF="glossaries-manual.html#3260">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#2813">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3098">Package Options</A> + | <A HREF="glossaries-manual.html#3443">Defining Glossary Entries</A> <DT><STRONG><TT>\Acrshort</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4264">Acronyms</A> - | <A HREF="glossaries-manual.html#4270">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4481">Acronyms</A> + | <A HREF="glossaries-manual.html#4487">Acronyms</A> <DT><STRONG><TT>\Acrshortpl</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4276">Acronyms</A> - | <A HREF="glossaries-manual.html#4282">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4493">Acronyms</A> + | <A HREF="glossaries-manual.html#4499">Acronyms</A> <DT><STRONG><TT>\Acs</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4261">Acronyms</A> - | <A HREF="glossaries-manual.html#4267">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4478">Acronyms</A> + | <A HREF="glossaries-manual.html#4484">Acronyms</A> <DT><STRONG><TT>\Acsp</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4273">Acronyms</A> - | <A HREF="glossaries-manual.html#4279">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4490">Acronyms</A> + | <A HREF="glossaries-manual.html#4496">Acronyms</A> <DT><STRONG><TT>babel</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2325">Multi-Lingual Support</A> - | <A HREF="glossaries-manual.html#2329">Multi-Lingual Support</A> - | <A HREF="glossaries-manual.html#2347">Multi-Lingual Support</A> - | <A HREF="glossaries-manual.html#2392">Multi-Lingual Support</A> - | <A HREF="glossaries-manual.html#2490">Troubleshooting</A> +<DD><A HREF="glossaries-manual.html#2492">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#2496">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#2514">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#2559">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#2657">Troubleshooting</A> <DT><STRONG><TT>\defglsdisplay</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3937">Acronyms</A> - | <A HREF="glossaries-manual.html#4225">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4154">Acronyms</A> + | <A HREF="glossaries-manual.html#4442">Acronyms</A> <DT><STRONG><TT>\defglsdisplayfirst</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3940">Acronyms</A> - | <A HREF="glossaries-manual.html#4228">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4157">Acronyms</A> + | <A HREF="glossaries-manual.html#4445">Acronyms</A> <DT><STRONG><TT>\descriptionname</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2377">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#2544">Multi-Lingual Support</A> <DT><STRONG><TT>\emph</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2704">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2871">A Quick Guide For</A> <DT><STRONG><TT>\entryname</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2374">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#2541">Multi-Lingual Support</A> <DT><STRONG>file types</STRONG> <DD><DL COMPACT> <DT><STRONG>.alg</STRONG> -<DD><A HREF="glossaries-manual.html#2439">Generating the associated glossary</A> +<DD><A HREF="glossaries-manual.html#2606">Generating the Associated Glossary</A> <DT><STRONG>.glg</STRONG> -<DD><A HREF="glossaries-manual.html#2437">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#2592">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2604">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#2759">A Quick Guide For</A> <DT><STRONG>.glo</STRONG> -<DD><A HREF="glossaries-manual.html#3098">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#3281">Defining Glossary Entries</A> <DT><STRONG>.gls</STRONG> -<DD><A HREF="glossaries-manual.html#3100">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#3283">Defining Glossary Entries</A> <DT><STRONG>.ist</STRONG> -<DD><A HREF="glossaries-manual.html#2411">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#3114">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3119">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#2578">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3297">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3302">Defining Glossary Entries</A> <DT><STRONG>.nlg</STRONG> -<DD><A HREF="glossaries-manual.html#2590">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2757">A Quick Guide For</A> </DL> <DT><STRONG><TT>german</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2344">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#2511">Multi-Lingual Support</A> <DT><STRONG><TT>glossary</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2316">Introduction</A> - | <A HREF="glossaries-manual.html#2486">Troubleshooting</A> +<DD><A HREF="glossaries-manual.html#2483">Introduction</A> + | <A HREF="glossaries-manual.html#2653">Troubleshooting</A> <DT><STRONG>glossary styles</STRONG> <DD><DL COMPACT> <DT><STRONG>altlist</STRONG> -<DD><A HREF="glossaries-manual.html#4390">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4396">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4607">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4613">Glossary Styles</A> <DT><STRONG>altlistgroup</STRONG> -<DD><A HREF="glossaries-manual.html#4394">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4400">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4611">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4617">Glossary Styles</A> <DT><STRONG>altlisthypergroup</STRONG> -<DD><A HREF="glossaries-manual.html#4398">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4615">Glossary Styles</A> +<DT><STRONG>altlong4col</STRONG> +<DD><A HREF="glossaries-manual.html#2912">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4672">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4686">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4812">Glossary Styles</A> +<DT><STRONG>altlong4colborder</STRONG> +<DD><A HREF="glossaries-manual.html#2916">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4696">Glossary Styles</A> +<DT><STRONG>altlong4colheader</STRONG> +<DD><A HREF="glossaries-manual.html#2914">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4700">Glossary Styles</A> +<DT><STRONG>altlong4colheaderborder</STRONG> +<DD><A HREF="glossaries-manual.html#2918">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4704">Glossary Styles</A> +<DT><STRONG>altsuper4col</STRONG> +<DD><A HREF="glossaries-manual.html#2928">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4757">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4771">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4814">Glossary Styles</A> +<DT><STRONG>altsuper4colborder</STRONG> +<DD><A HREF="glossaries-manual.html#2932">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4781">Glossary Styles</A> +<DT><STRONG>altsuper4colheader</STRONG> +<DD><A HREF="glossaries-manual.html#2930">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4785">Glossary Styles</A> +<DT><STRONG>altsuper4colheaderborder</STRONG> +<DD><A HREF="glossaries-manual.html#2934">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4789">Glossary Styles</A> <DT><STRONG>list</STRONG> -<DD><A HREF="glossaries-manual.html#4376">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4381">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4392">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4549">Defining your own glossary</A> - | <A HREF="glossaries-manual.html#4554">Defining your own glossary</A> - | <A HREF="glossaries-manual.html#4569">Defining your own glossary</A> - | <A HREF="glossaries-manual.html#4571">Defining your own glossary</A> - | <A HREF="glossaries-manual.html#4603">Example: creating a new</A> +<DD><A HREF="glossaries-manual.html#4593">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4598">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4609">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4842">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#4847">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#4862">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#4864">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#4896">Example: creating a new</A> <DT><STRONG>listdotted</STRONG> -<DD><A HREF="glossaries-manual.html#4543">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4836">Glossary Styles</A> <DT><STRONG>listgroup</STRONG> -<DD><A HREF="glossaries-manual.html#4379">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4385">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4596">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4602">Glossary Styles</A> <DT><STRONG>listhypergroup</STRONG> -<DD><A HREF="glossaries-manual.html#4383">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4402">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4567">Defining your own glossary</A> +<DD><A HREF="glossaries-manual.html#4600">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4619">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4860">Defining your own glossary</A> <DT><STRONG>long</STRONG> -<DD><A HREF="glossaries-manual.html#4406">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4415">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4419">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4427">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4623">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4635">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4639">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4647">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4828">Glossary Styles</A> <DT><STRONG>long3col</STRONG> -<DD><A HREF="glossaries-manual.html#4425">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4432">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4436">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4444">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4645">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4658">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4662">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4670">Glossary Styles</A> <DT><STRONG>long3colborder</STRONG> -<DD><A HREF="glossaries-manual.html#4430">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4656">Glossary Styles</A> <DT><STRONG>long3colheader</STRONG> -<DD><A HREF="glossaries-manual.html#4434">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4440">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4660">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4666">Glossary Styles</A> <DT><STRONG>long3colheaderborder</STRONG> -<DD><A HREF="glossaries-manual.html#4438">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4664">Glossary Styles</A> <DT><STRONG>long4col</STRONG> -<DD><A HREF="glossaries-manual.html#2737">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#4442">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4448">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4452">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2904">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4668">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4676">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4680">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4688">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4808">Glossary Styles</A> <DT><STRONG>long4colborder</STRONG> -<DD><A HREF="glossaries-manual.html#2741">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#4446">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2908">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4674">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4698">Glossary Styles</A> <DT><STRONG>long4colheader</STRONG> -<DD><A HREF="glossaries-manual.html#2739">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#4450">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4456">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2906">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4678">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4684">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4702">Glossary Styles</A> <DT><STRONG>long4colheaderborder</STRONG> -<DD><A HREF="glossaries-manual.html#2743">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#4454">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2910">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4682">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4706">Glossary Styles</A> <DT><STRONG>longborder</STRONG> -<DD><A HREF="glossaries-manual.html#4413">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4633">Glossary Styles</A> <DT><STRONG>longheader</STRONG> -<DD><A HREF="glossaries-manual.html#4417">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4423">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4556">Defining your own glossary</A> +<DD><A HREF="glossaries-manual.html#4637">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4643">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4849">Defining your own glossary</A> <DT><STRONG>longheaderborder</STRONG> -<DD><A HREF="glossaries-manual.html#4421">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4641">Glossary Styles</A> <DT><STRONG>super</STRONG> -<DD><A HREF="glossaries-manual.html#4458">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4467">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4471">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4479">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4708">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4720">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4724">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4732">Glossary Styles</A> <DT><STRONG>super3col</STRONG> -<DD><A HREF="glossaries-manual.html#4477">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4484">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4488">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4496">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4730">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4743">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4747">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4755">Glossary Styles</A> <DT><STRONG>super3colborder</STRONG> -<DD><A HREF="glossaries-manual.html#4482">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4741">Glossary Styles</A> <DT><STRONG>super3colheader</STRONG> -<DD><A HREF="glossaries-manual.html#4486">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4492">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4745">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4751">Glossary Styles</A> <DT><STRONG>super3colheaderborder</STRONG> -<DD><A HREF="glossaries-manual.html#4490">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4749">Glossary Styles</A> <DT><STRONG>super4col</STRONG> -<DD><A HREF="glossaries-manual.html#2745">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#4494">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4500">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4504">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2920">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4753">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4761">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4765">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4773">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4810">Glossary Styles</A> <DT><STRONG>super4colborder</STRONG> -<DD><A HREF="glossaries-manual.html#2749">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#4498">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2924">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4759">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4783">Glossary Styles</A> <DT><STRONG>super4colheader</STRONG> -<DD><A HREF="glossaries-manual.html#2747">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#4502">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4508">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2922">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4763">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4769">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4787">Glossary Styles</A> <DT><STRONG>super4colheaderborder</STRONG> -<DD><A HREF="glossaries-manual.html#2751">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#4506">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2926">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4767">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4791">Glossary Styles</A> <DT><STRONG>superborder</STRONG> -<DD><A HREF="glossaries-manual.html#4465">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4718">Glossary Styles</A> <DT><STRONG>superheader</STRONG> -<DD><A HREF="glossaries-manual.html#4469">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4475">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4722">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4728">Glossary Styles</A> <DT><STRONG>superheaderborder</STRONG> -<DD><A HREF="glossaries-manual.html#4473">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4726">Glossary Styles</A> </DL> <DT><STRONG><TT>glossary-list</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2664">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2831">A Quick Guide For</A> <DT><STRONG><TT>\glossaryentrynumbers</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4573">Defining your own glossary</A> +<DD><A HREF="glossaries-manual.html#4866">Defining your own glossary</A> <DT><STRONG><TT>\glossaryheader</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4387">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4604">Glossary Styles</A> <DT><STRONG><TT>\glossaryname</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2359">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#2526">Multi-Lingual Support</A> <DT><STRONG><TT>\glossarystyle</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2762">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3579">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#4534">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4540">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2945">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3796">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#4825">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4833">Glossary Styles</A> <DT><STRONG><TT>\gls</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2508">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2511">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2514">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2628">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2673">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2676">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2679">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2722">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3157">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3166">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3394">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3458">Changing the format of</A> - | <A HREF="glossaries-manual.html#3510">Enabling and disabling hyperlinks</A> - | <A HREF="glossaries-manual.html#4336">Acronyms</A> - | <A HREF="glossaries-manual.html#4342">Acronyms</A> - | <A HREF="glossaries-manual.html#4360">Unsetting and resetting entry</A> +<DD><A HREF="glossaries-manual.html#2675">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2678">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2681">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2795">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2840">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2843">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2846">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2889">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3340">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3349">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3584">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3648">Changing the format of</A> + | <A HREF="glossaries-manual.html#3706">Enabling and disabling hyperlinks</A> + | <A HREF="glossaries-manual.html#4553">Acronyms</A> + | <A HREF="glossaries-manual.html#4559">Acronyms</A> + | <A HREF="glossaries-manual.html#4577">Unsetting and Resetting Entry</A> <DT><STRONG><TT>\glsadd</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2529">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2710">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2725">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2696">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2877">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2892">A Quick Guide For</A> <DT><STRONG><TT>\glsaddall</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2532">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2713">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2728">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2699">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2880">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2895">A Quick Guide For</A> <DT><STRONG><TT>\glsaddall</TT> keys</STRONG> <DD><DL COMPACT> <DT><STRONG>types</STRONG> -<DD><A HREF="glossaries-manual.html#3531">Adding an entry to</A> +<DD><A HREF="glossaries-manual.html#3730">Adding an Entry to</A> </DL> <DT><STRONG><TT>\glscompositor</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2604">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2771">A Quick Guide For</A> <DT><STRONG><TT>\glsdesc</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4213">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4430">Acronyms</A> +<DT><STRONG><TT>\glsdescwidth</TT></STRONG> +<DD><A HREF="glossaries-manual.html#4630">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4650">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4690">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4715">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4735">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4775">Glossary Styles</A> <DT><STRONG><TT>\glsdisplay</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3136">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3226">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#3319">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3409">Defining Glossary Entries</A> <DT><STRONG><TT>\glsdisplayfirst</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3139">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3229">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#3322">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3412">Defining Glossary Entries</A> <DT><STRONG><TT>\glsfirst</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4219">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4436">Acronyms</A> <DT><STRONG><TT>\glsgroupskip</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4531">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4822">Glossary Styles</A> +<DT><STRONG><TT>\glslabel</TT></STRONG> +<DD><A HREF="glossaries-manual.html#3675">Changing the format of</A> <DT><STRONG><TT>\glslink</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2526">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2691">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2719">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3385">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3507">Enabling and disabling hyperlinks</A> - | <A HREF="glossaries-manual.html#3525">Adding an entry to</A> +<DD><A HREF="glossaries-manual.html#2693">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2858">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2886">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3575">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3672">Changing the format of</A> + | <A HREF="glossaries-manual.html#3703">Enabling and disabling hyperlinks</A> + | <A HREF="glossaries-manual.html#3724">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#3363">Links to Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#3553">Links to Glossary Entries</A> <DT><STRONG>format</STRONG> -<DD><A HREF="glossaries-manual.html#2694">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2697">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2707">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3350">Links to Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#2861">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2864">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2874">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3540">Links to Glossary Entries</A> <DT><STRONG>hyper</STRONG> -<DD><A HREF="glossaries-manual.html#3366">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3513">Enabling and disabling hyperlinks</A> - | <A HREF="glossaries-manual.html#3528">Adding an entry to</A> +<DD><A HREF="glossaries-manual.html#3556">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3709">Enabling and disabling hyperlinks</A> + | <A HREF="glossaries-manual.html#3727">Adding an Entry to</A> </DL> <DT><STRONG><TT>\glsnamefont</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2661">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2670">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2828">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2837">A Quick Guide For</A> <DT><STRONG><TT>\glsnumbersgroupname</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2389">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#2556">Multi-Lingual Support</A> +<DT><STRONG><TT>\glspagelistwidth</TT></STRONG> +<DD><A HREF="glossaries-manual.html#4653">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4693">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4738">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4778">Glossary Styles</A> <DT><STRONG><TT>\glspl</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2517">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2520">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2523">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2631">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2682">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2685">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2688">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3142">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3145">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3148">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3175">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3187">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3232">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3235">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3238">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3461">Changing the format of</A> - | <A HREF="glossaries-manual.html#4348">Acronyms</A> - | <A HREF="glossaries-manual.html#4354">Acronyms</A> - | <A HREF="glossaries-manual.html#4363">Unsetting and resetting entry</A> +<DD><A HREF="glossaries-manual.html#2684">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2687">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2690">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2798">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2849">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2852">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2855">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3325">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3328">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3331">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3358">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3370">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3415">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3418">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3421">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3651">Changing the format of</A> + | <A HREF="glossaries-manual.html#4565">Acronyms</A> + | <A HREF="glossaries-manual.html#4571">Acronyms</A> + | <A HREF="glossaries-manual.html#4580">Unsetting and Resetting Entry</A> <DT><STRONG><TT>\glspluralsuffix</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3178">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3196">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#3361">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3379">Defining Glossary Entries</A> <DT><STRONG><TT>\glssymbol</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4216">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4433">Acronyms</A> <DT><STRONG><TT>\glssymbolsgroupname</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2386">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#2553">Multi-Lingual Support</A> <DT><STRONG><TT>\glstext</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3400">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3406">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3412">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3418">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3430">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3442">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#4203">Acronyms</A> - | <A HREF="glossaries-manual.html#4207">Acronyms</A> +<DD><A HREF="glossaries-manual.html#3590">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3596">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3602">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3608">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3620">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3632">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#4420">Acronyms</A> + | <A HREF="glossaries-manual.html#4424">Acronyms</A> <DT><STRONG><TT>\glstextformat</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3486">Changing the format of</A> +<DD><A HREF="glossaries-manual.html#3682">Changing the format of</A> <DT><STRONG><TT>html</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2545">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3503">Enabling and disabling hyperlinks</A> +<DD><A HREF="glossaries-manual.html#2712">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3699">Enabling and disabling hyperlinks</A> <DT><STRONG><TT>\hyperemph</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2701">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2868">A Quick Guide For</A> <DT><STRONG><TT>\hyperlink</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3516">Enabling and disabling hyperlinks</A> +<DD><A HREF="glossaries-manual.html#3712">Enabling and disabling hyperlinks</A> <DT><STRONG><TT>hyperref</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2542">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3356">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3500">Enabling and disabling hyperlinks</A> - | <A HREF="glossaries-manual.html#3522">Enabling and disabling hyperlinks</A> +<DD><A HREF="glossaries-manual.html#2709">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3535">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3546">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3696">Enabling and disabling hyperlinks</A> + | <A HREF="glossaries-manual.html#3718">Enabling and disabling hyperlinks</A> <DT><STRONG><TT>\hypertarget</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3519">Enabling and disabling hyperlinks</A> +<DD><A HREF="glossaries-manual.html#3715">Enabling and disabling hyperlinks</A> <DT><STRONG><TT>\item</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2667">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2834">A Quick Guide For</A> <DT><STRONG>link text</STRONG> -<DD><A HREF="glossaries-manual.html#3346">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3347">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3348">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3368">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3456">Changing the format of</A> - | <A HREF="glossaries-manual.html#3484">Changing the format of</A> - | <A HREF="glossaries-manual.html#3495">Changing the format of</A> +<DD><A HREF="glossaries-manual.html#3529">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3537">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3538">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3558">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3646">Changing the format of</A> + | <A HREF="glossaries-manual.html#3680">Changing the format of</A> + | <A HREF="glossaries-manual.html#3691">Changing the format of</A> <DT><STRONG><TT>longtable</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4409">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4626">Glossary Styles</A> <DT><STRONG><TT>makeglossaries</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2402">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#2413">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#2416">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#2431">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#2482">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2499">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2535">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2548">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2551">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2557">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2575">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2584">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2607">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3108">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3537">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#3546">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#3616">Defining New Glossaries</A> +<DD><A HREF="glossaries-manual.html#2569">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#2580">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#2583">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#2598">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#2649">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2666">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2702">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2715">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2718">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2724">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2742">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2751">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2774">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3291">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3754">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#3763">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#3833">Defining New Glossaries</A> <DT><STRONG><TT>makeindex</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2405">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#2408">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#2419">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#2434">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#2572">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2578">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2581">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2587">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2716">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2734">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3111">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3116">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3247">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3253">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3353">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3540">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#3543">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#3613">Defining New Glossaries</A> +<DD><A HREF="glossaries-manual.html#2572">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#2575">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#2586">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#2601">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#2739">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2745">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2748">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2754">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2883">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2901">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3294">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3299">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3430">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3436">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3531">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3543">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3757">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#3760">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#3830">Defining New Glossaries</A> <DT><STRONG><TT>\MakeUppercase</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4612">Mfirstuc Package</A> +<DD><A HREF="glossaries-manual.html#4905">Mfirstuc Package</A> <DT><STRONG><TT>mfirstuc</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4609">Mfirstuc Package</A> +<DD><A HREF="glossaries-manual.html#4902">Mfirstuc Package</A> <DT><STRONG><TT>\newacronym</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2643">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3035">Package Options</A> - | <A HREF="glossaries-manual.html#3047">Package Options</A> - | <A HREF="glossaries-manual.html#3059">Package Options</A> - | <A HREF="glossaries-manual.html#3071">Package Options</A> - | <A HREF="glossaries-manual.html#3083">Package Options</A> - | <A HREF="glossaries-manual.html#3713">Acronyms</A> - | <A HREF="glossaries-manual.html#4222">Acronyms</A> +<DD><A HREF="glossaries-manual.html#2810">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3218">Package Options</A> + | <A HREF="glossaries-manual.html#3230">Package Options</A> + | <A HREF="glossaries-manual.html#3242">Package Options</A> + | <A HREF="glossaries-manual.html#3254">Package Options</A> + | <A HREF="glossaries-manual.html#3266">Package Options</A> + | <A HREF="glossaries-manual.html#3930">Acronyms</A> + | <A HREF="glossaries-manual.html#4439">Acronyms</A> <DT><STRONG><TT>\newglossary</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2569">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#2736">A Quick Guide For</A> <DT><STRONG><TT>\newglossaryentry</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2619">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2658">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3343">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3376">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3719">Acronyms</A> +<DD><A HREF="glossaries-manual.html#2786">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2825">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3526">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3566">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3936">Acronyms</A> <DT><STRONG><TT>\newglossaryentry</TT> keys</STRONG> <DD><DL COMPACT> <DT><STRONG>description</STRONG> -<DD><A HREF="glossaries-manual.html#2625">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2978">Package Options</A> - | <A HREF="glossaries-manual.html#2993">Package Options</A> - | <A HREF="glossaries-manual.html#3005">Package Options</A> - | <A HREF="glossaries-manual.html#3130">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3124">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3151">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3445">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3448">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3451">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3476">Changing the format of</A> - | <A HREF="glossaries-manual.html#3804">Acronyms</A> - | <A HREF="glossaries-manual.html#4045">Acronyms</A> +<DD><A HREF="glossaries-manual.html#2792">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3161">Package Options</A> + | <A HREF="glossaries-manual.html#3176">Package Options</A> + | <A HREF="glossaries-manual.html#3188">Package Options</A> + | <A HREF="glossaries-manual.html#3313">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3307">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3334">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3635">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3638">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3641">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3666">Changing the format of</A> + | <A HREF="glossaries-manual.html#4021">Acronyms</A> + | <A HREF="glossaries-manual.html#4262">Acronyms</A> <DT><STRONG>descriptionplural</STRONG> -<DD><A HREF="glossaries-manual.html#3133">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#3316">Defining Glossary Entries</A> <DT><STRONG>first</STRONG> -<DD><A HREF="glossaries-manual.html#3163">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3193">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3199">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3202">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3208">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3217">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3373">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3382">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3403">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3470">Changing the format of</A> - | <A HREF="glossaries-manual.html#3798">Acronyms</A> - | <A HREF="glossaries-manual.html#4366">Unsetting and resetting entry</A> +<DD><A HREF="glossaries-manual.html#3346">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3376">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3382">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3385">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3391">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3400">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3563">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3572">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3593">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3660">Changing the format of</A> + | <A HREF="glossaries-manual.html#3745">Using Glossary Terms Without</A> + | <A HREF="glossaries-manual.html#4015">Acronyms</A> + | <A HREF="glossaries-manual.html#4583">Unsetting and Resetting Entry</A> <DT><STRONG>firstplural</STRONG> -<DD><A HREF="glossaries-manual.html#3184">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3205">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3214">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3281">Plurals</A> - | <A HREF="glossaries-manual.html#3391">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3415">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3473">Changing the format of</A> +<DD><A HREF="glossaries-manual.html#3367">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3388">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3397">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3464">Plurals</A> + | <A HREF="glossaries-manual.html#3581">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3605">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3663">Changing the format of</A> + | <A HREF="glossaries-manual.html#3748">Using Glossary Terms Without</A> <DT><STRONG>format</STRONG> -<DD><A HREF="glossaries-manual.html#3360">Links to Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#3550">Links to Glossary Entries</A> <DT><STRONG>name</STRONG> -<DD><A HREF="glossaries-manual.html#2622">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2975">Package Options</A> - | <A HREF="glossaries-manual.html#2996">Package Options</A> - | <A HREF="glossaries-manual.html#3002">Package Options</A> - | <A HREF="glossaries-manual.html#3017">Package Options</A> - | <A HREF="glossaries-manual.html#3020">Package Options</A> - | <A HREF="glossaries-manual.html#3127">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3121">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3160">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3250">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3421">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3424">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3427">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#4039">Acronyms</A> - | <A HREF="glossaries-manual.html#4042">Acronyms</A> - | <A HREF="glossaries-manual.html#4561">Defining your own glossary</A> +<DD><A HREF="glossaries-manual.html#2789">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3158">Package Options</A> + | <A HREF="glossaries-manual.html#3179">Package Options</A> + | <A HREF="glossaries-manual.html#3185">Package Options</A> + | <A HREF="glossaries-manual.html#3200">Package Options</A> + | <A HREF="glossaries-manual.html#3203">Package Options</A> + | <A HREF="glossaries-manual.html#3310">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3304">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3343">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3433">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3611">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3614">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3617">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3736">Using Glossary Terms Without</A> + | <A HREF="glossaries-manual.html#4256">Acronyms</A> + | <A HREF="glossaries-manual.html#4259">Acronyms</A> + | <A HREF="glossaries-manual.html#4854">Defining your own glossary</A> <DT><STRONG>plural</STRONG> -<DD><A HREF="glossaries-manual.html#2640">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3172">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3190">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3211">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3275">Plurals</A> - | <A HREF="glossaries-manual.html#3278">Plurals</A> - | <A HREF="glossaries-manual.html#3388">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3409">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3467">Changing the format of</A> +<DD><A HREF="glossaries-manual.html#2807">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3355">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3373">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3394">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3458">Plurals</A> + | <A HREF="glossaries-manual.html#3461">Plurals</A> + | <A HREF="glossaries-manual.html#3578">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3599">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3657">Changing the format of</A> + | <A HREF="glossaries-manual.html#3742">Using Glossary Terms Without</A> <DT><STRONG>sort</STRONG> -<DD><A HREF="glossaries-manual.html#2731">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3011">Package Options</A> - | <A HREF="glossaries-manual.html#3244">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#4558">Defining your own glossary</A> - | <A HREF="glossaries-manual.html#4564">Defining your own glossary</A> +<DD><A HREF="glossaries-manual.html#2898">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3194">Package Options</A> + | <A HREF="glossaries-manual.html#3427">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#4851">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#4857">Defining your own glossary</A> <DT><STRONG>symbol</STRONG> -<DD><A HREF="glossaries-manual.html#2981">Package Options</A> - | <A HREF="glossaries-manual.html#2999">Package Options</A> - | <A HREF="glossaries-manual.html#3008">Package Options</A> - | <A HREF="glossaries-manual.html#3220">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3241">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3433">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3436">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3439">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3479">Changing the format of</A> - | <A HREF="glossaries-manual.html#3482">Changing the format of</A> - | <A HREF="glossaries-manual.html#3493">Changing the format of</A> - | <A HREF="glossaries-manual.html#3807">Acronyms</A> +<DD><A HREF="glossaries-manual.html#3164">Package Options</A> + | <A HREF="glossaries-manual.html#3182">Package Options</A> + | <A HREF="glossaries-manual.html#3191">Package Options</A> + | <A HREF="glossaries-manual.html#3403">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3424">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3623">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3626">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3629">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3669">Changing the format of</A> + | <A HREF="glossaries-manual.html#3678">Changing the format of</A> + | <A HREF="glossaries-manual.html#3689">Changing the format of</A> + | <A HREF="glossaries-manual.html#4024">Acronyms</A> <DT><STRONG>symbolplural</STRONG> -<DD><A HREF="glossaries-manual.html#3223">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#3406">Defining Glossary Entries</A> <DT><STRONG>text</STRONG> -<DD><A HREF="glossaries-manual.html#3014">Package Options</A> - | <A HREF="glossaries-manual.html#3023">Package Options</A> - | <A HREF="glossaries-manual.html#3154">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3169">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3181">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3370">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3379">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3397">Links to Glossary Entries</A> - | <A HREF="glossaries-manual.html#3464">Changing the format of</A> - | <A HREF="glossaries-manual.html#3801">Acronyms</A> - | <A HREF="glossaries-manual.html#4369">Unsetting and resetting entry</A> +<DD><A HREF="glossaries-manual.html#3197">Package Options</A> + | <A HREF="glossaries-manual.html#3206">Package Options</A> + | <A HREF="glossaries-manual.html#3337">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3352">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3364">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3560">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3569">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3587">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#3654">Changing the format of</A> + | <A HREF="glossaries-manual.html#3739">Using Glossary Terms Without</A> + | <A HREF="glossaries-manual.html#4018">Acronyms</A> + | <A HREF="glossaries-manual.html#4586">Unsetting and Resetting Entry</A> <DT><STRONG>type</STRONG> -<DD><A HREF="glossaries-manual.html#2634">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2637">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3257">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3287">Loading Entries From a</A> +<DD><A HREF="glossaries-manual.html#2801">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2804">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3440">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3470">Loading Entries From a</A> </DL> <DT><STRONG><TT>\newglossarystyle</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4537">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4830">Glossary Styles</A> <DT><STRONG><TT>ngerman</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2341">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#2508">Multi-Lingual Support</A> <DT><STRONG>number list</STRONG> -<DD><A HREF="glossaries-manual.html#2953">Package Options</A> - | <A HREF="glossaries-manual.html#2963">Package Options</A> - | <A HREF="glossaries-manual.html#3320">Number lists</A> - | <A HREF="glossaries-manual.html#3611">Defining New Glossaries</A> - | <A HREF="glossaries-manual.html#4404">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4411">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4428">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4463">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4480">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4598">Example: creating a completely</A> +<DD><A HREF="glossaries-manual.html#3136">Package Options</A> + | <A HREF="glossaries-manual.html#3146">Package Options</A> + | <A HREF="glossaries-manual.html#3503">Number lists</A> + | <A HREF="glossaries-manual.html#3828">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#4621">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4628">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4648">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4713">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4733">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4891">Example: creating a completely</A> <DT><STRONG>package options</STRONG> <DD><DL COMPACT> <DT><STRONG>acronym</STRONG> -<DD><A HREF="glossaries-manual.html#2370">Multi-Lingual Support</A> - | <A HREF="glossaries-manual.html#2372">Multi-Lingual Support</A> - | <A HREF="glossaries-manual.html#2427">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#2429">Generating the associated glossary</A> - | <A HREF="glossaries-manual.html#2599">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2601">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2654">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2656">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2856">Package Options</A> - | <A HREF="glossaries-manual.html#2858">Package Options</A> - | <A HREF="glossaries-manual.html#2910">Package Options</A> - | <A HREF="glossaries-manual.html#2912">Package Options</A> - | <A HREF="glossaries-manual.html#2923">Package Options</A> - | <A HREF="glossaries-manual.html#2925">Package Options</A> - | <A HREF="glossaries-manual.html#2932">Package Options</A> - | <A HREF="glossaries-manual.html#2934">Package Options</A> - | <A HREF="glossaries-manual.html#3268">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3270">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3295">Loading Entries From a</A> - | <A HREF="glossaries-manual.html#3297">Loading Entries From a</A> - | <A HREF="glossaries-manual.html#3304">Loading Entries From a</A> - | <A HREF="glossaries-manual.html#3306">Loading Entries From a</A> - | <A HREF="glossaries-manual.html#3313">Loading Entries From a</A> - | <A HREF="glossaries-manual.html#3315">Loading Entries From a</A> - | <A HREF="glossaries-manual.html#3624">Defining New Glossaries</A> - | <A HREF="glossaries-manual.html#3626">Defining New Glossaries</A> - | <A HREF="glossaries-manual.html#3633">Defining New Glossaries</A> - | <A HREF="glossaries-manual.html#3635">Defining New Glossaries</A> - | <A HREF="glossaries-manual.html#3642">Defining New Glossaries</A> - | <A HREF="glossaries-manual.html#3644">Defining New Glossaries</A> - | <A HREF="glossaries-manual.html#3655">Acronyms</A> - | <A HREF="glossaries-manual.html#3657">Acronyms</A> +<DD><A HREF="glossaries-manual.html#2537">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#2539">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#2594">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#2596">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#2766">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2768">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2821">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2823">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3039">Package Options</A> + | <A HREF="glossaries-manual.html#3041">Package Options</A> + | <A HREF="glossaries-manual.html#3093">Package Options</A> + | <A HREF="glossaries-manual.html#3095">Package Options</A> + | <A HREF="glossaries-manual.html#3106">Package Options</A> + | <A HREF="glossaries-manual.html#3108">Package Options</A> + | <A HREF="glossaries-manual.html#3115">Package Options</A> + | <A HREF="glossaries-manual.html#3117">Package Options</A> + | <A HREF="glossaries-manual.html#3451">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3453">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#3478">Loading Entries From a</A> + | <A HREF="glossaries-manual.html#3480">Loading Entries From a</A> + | <A HREF="glossaries-manual.html#3487">Loading Entries From a</A> + | <A HREF="glossaries-manual.html#3489">Loading Entries From a</A> + | <A HREF="glossaries-manual.html#3496">Loading Entries From a</A> + | <A HREF="glossaries-manual.html#3498">Loading Entries From a</A> + | <A HREF="glossaries-manual.html#3841">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#3843">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#3850">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#3852">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#3859">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#3861">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#3872">Acronyms</A> + | <A HREF="glossaries-manual.html#3874">Acronyms</A> <DT><STRONG>counter</STRONG> -<DD><A HREF="glossaries-manual.html#2960">Package Options</A> - | <A HREF="glossaries-manual.html#2962">Package Options</A> - | <A HREF="glossaries-manual.html#3336">Number lists</A> - | <A HREF="glossaries-manual.html#3338">Number lists</A> +<DD><A HREF="glossaries-manual.html#3143">Package Options</A> + | <A HREF="glossaries-manual.html#3145">Package Options</A> + | <A HREF="glossaries-manual.html#3519">Number lists</A> + | <A HREF="glossaries-manual.html#3521">Number lists</A> <DT><STRONG>description</STRONG> -<DD><A HREF="glossaries-manual.html#3031">Package Options</A> - | <A HREF="glossaries-manual.html#3033">Package Options</A> - | <A HREF="glossaries-manual.html#3682">Acronyms</A> - | <A HREF="glossaries-manual.html#3684">Acronyms</A> - | <A HREF="glossaries-manual.html#3773">Acronyms</A> - | <A HREF="glossaries-manual.html#3775">Acronyms</A> - | <A HREF="glossaries-manual.html#3815">Acronyms</A> - | <A HREF="glossaries-manual.html#3817">Acronyms</A> - | <A HREF="glossaries-manual.html#3833">Acronyms</A> - | <A HREF="glossaries-manual.html#3835">Acronyms</A> - | <A HREF="glossaries-manual.html#3851">Acronyms</A> - | <A HREF="glossaries-manual.html#3853">Acronyms</A> - | <A HREF="glossaries-manual.html#3933">Acronyms</A> - | <A HREF="glossaries-manual.html#3935">Acronyms</A> - | <A HREF="glossaries-manual.html#3948">Acronyms</A> - | <A HREF="glossaries-manual.html#3950">Acronyms</A> - | <A HREF="glossaries-manual.html#4035">Acronyms</A> - | <A HREF="glossaries-manual.html#4037">Acronyms</A> - | <A HREF="glossaries-manual.html#4053">Acronyms</A> - | <A HREF="glossaries-manual.html#4055">Acronyms</A> - | <A HREF="glossaries-manual.html#4105">Acronyms</A> - | <A HREF="glossaries-manual.html#4107">Acronyms</A> - | <A HREF="glossaries-manual.html#4140">Acronyms</A> - | <A HREF="glossaries-manual.html#4142">Acronyms</A> - | <A HREF="glossaries-manual.html#4199">Acronyms</A> - | <A HREF="glossaries-manual.html#4201">Acronyms</A> -<DT><STRONG>dua</STRONG> -<DD><A HREF="glossaries-manual.html#3079">Package Options</A> - | <A HREF="glossaries-manual.html#3081">Package Options</A> - | <A HREF="glossaries-manual.html#3691">Acronyms</A> - | <A HREF="glossaries-manual.html#3693">Acronyms</A> - | <A HREF="glossaries-manual.html#3764">Acronyms</A> - | <A HREF="glossaries-manual.html#3766">Acronyms</A> - | <A HREF="glossaries-manual.html#3842">Acronyms</A> - | <A HREF="glossaries-manual.html#3844">Acronyms</A> - | <A HREF="glossaries-manual.html#3887">Acronyms</A> - | <A HREF="glossaries-manual.html#3889">Acronyms</A> - | <A HREF="glossaries-manual.html#3924">Acronyms</A> - | <A HREF="glossaries-manual.html#3926">Acronyms</A> +<DD><A HREF="glossaries-manual.html#3214">Package Options</A> + | <A HREF="glossaries-manual.html#3216">Package Options</A> + | <A HREF="glossaries-manual.html#3899">Acronyms</A> + | <A HREF="glossaries-manual.html#3901">Acronyms</A> | <A HREF="glossaries-manual.html#3990">Acronyms</A> | <A HREF="glossaries-manual.html#3992">Acronyms</A> - | <A HREF="glossaries-manual.html#3999">Acronyms</A> - | <A HREF="glossaries-manual.html#4001">Acronyms</A> - | <A HREF="glossaries-manual.html#4190">Acronyms</A> - | <A HREF="glossaries-manual.html#4192">Acronyms</A> + | <A HREF="glossaries-manual.html#4032">Acronyms</A> + | <A HREF="glossaries-manual.html#4034">Acronyms</A> + | <A HREF="glossaries-manual.html#4050">Acronyms</A> + | <A HREF="glossaries-manual.html#4052">Acronyms</A> + | <A HREF="glossaries-manual.html#4068">Acronyms</A> + | <A HREF="glossaries-manual.html#4070">Acronyms</A> + | <A HREF="glossaries-manual.html#4150">Acronyms</A> + | <A HREF="glossaries-manual.html#4152">Acronyms</A> + | <A HREF="glossaries-manual.html#4165">Acronyms</A> + | <A HREF="glossaries-manual.html#4167">Acronyms</A> + | <A HREF="glossaries-manual.html#4252">Acronyms</A> + | <A HREF="glossaries-manual.html#4254">Acronyms</A> + | <A HREF="glossaries-manual.html#4270">Acronyms</A> + | <A HREF="glossaries-manual.html#4272">Acronyms</A> + | <A HREF="glossaries-manual.html#4322">Acronyms</A> + | <A HREF="glossaries-manual.html#4324">Acronyms</A> + | <A HREF="glossaries-manual.html#4357">Acronyms</A> + | <A HREF="glossaries-manual.html#4359">Acronyms</A> + | <A HREF="glossaries-manual.html#4416">Acronyms</A> + | <A HREF="glossaries-manual.html#4418">Acronyms</A> +<DT><STRONG>dua</STRONG> +<DD><A HREF="glossaries-manual.html#3262">Package Options</A> + | <A HREF="glossaries-manual.html#3264">Package Options</A> + | <A HREF="glossaries-manual.html#3908">Acronyms</A> + | <A HREF="glossaries-manual.html#3910">Acronyms</A> + | <A HREF="glossaries-manual.html#3981">Acronyms</A> + | <A HREF="glossaries-manual.html#3983">Acronyms</A> + | <A HREF="glossaries-manual.html#4059">Acronyms</A> + | <A HREF="glossaries-manual.html#4061">Acronyms</A> + | <A HREF="glossaries-manual.html#4104">Acronyms</A> + | <A HREF="glossaries-manual.html#4106">Acronyms</A> + | <A HREF="glossaries-manual.html#4141">Acronyms</A> + | <A HREF="glossaries-manual.html#4143">Acronyms</A> + | <A HREF="glossaries-manual.html#4207">Acronyms</A> + | <A HREF="glossaries-manual.html#4209">Acronyms</A> + | <A HREF="glossaries-manual.html#4216">Acronyms</A> + | <A HREF="glossaries-manual.html#4218">Acronyms</A> + | <A HREF="glossaries-manual.html#4407">Acronyms</A> + | <A HREF="glossaries-manual.html#4409">Acronyms</A> <DT><STRONG>footnote</STRONG> -<DD><A HREF="glossaries-manual.html#3043">Package Options</A> - | <A HREF="glossaries-manual.html#3045">Package Options</A> - | <A HREF="glossaries-manual.html#3700">Acronyms</A> - | <A HREF="glossaries-manual.html#3702">Acronyms</A> - | <A HREF="glossaries-manual.html#3782">Acronyms</A> - | <A HREF="glossaries-manual.html#3784">Acronyms</A> - | <A HREF="glossaries-manual.html#3824">Acronyms</A> - | <A HREF="glossaries-manual.html#3826">Acronyms</A> - | <A HREF="glossaries-manual.html#3860">Acronyms</A> - | <A HREF="glossaries-manual.html#3862">Acronyms</A> - | <A HREF="glossaries-manual.html#3915">Acronyms</A> +<DD><A HREF="glossaries-manual.html#3226">Package Options</A> + | <A HREF="glossaries-manual.html#3228">Package Options</A> | <A HREF="glossaries-manual.html#3917">Acronyms</A> - | <A HREF="glossaries-manual.html#3957">Acronyms</A> - | <A HREF="glossaries-manual.html#3959">Acronyms</A> - | <A HREF="glossaries-manual.html#4008">Acronyms</A> - | <A HREF="glossaries-manual.html#4010">Acronyms</A> - | <A HREF="glossaries-manual.html#4070">Acronyms</A> - | <A HREF="glossaries-manual.html#4072">Acronyms</A> - | <A HREF="glossaries-manual.html#4096">Acronyms</A> - | <A HREF="glossaries-manual.html#4098">Acronyms</A> - | <A HREF="glossaries-manual.html#4131">Acronyms</A> - | <A HREF="glossaries-manual.html#4133">Acronyms</A> - | <A HREF="glossaries-manual.html#4181">Acronyms</A> - | <A HREF="glossaries-manual.html#4183">Acronyms</A> + | <A HREF="glossaries-manual.html#3919">Acronyms</A> + | <A HREF="glossaries-manual.html#3999">Acronyms</A> + | <A HREF="glossaries-manual.html#4001">Acronyms</A> + | <A HREF="glossaries-manual.html#4041">Acronyms</A> + | <A HREF="glossaries-manual.html#4043">Acronyms</A> + | <A HREF="glossaries-manual.html#4077">Acronyms</A> + | <A HREF="glossaries-manual.html#4079">Acronyms</A> + | <A HREF="glossaries-manual.html#4132">Acronyms</A> + | <A HREF="glossaries-manual.html#4134">Acronyms</A> + | <A HREF="glossaries-manual.html#4174">Acronyms</A> + | <A HREF="glossaries-manual.html#4176">Acronyms</A> + | <A HREF="glossaries-manual.html#4225">Acronyms</A> + | <A HREF="glossaries-manual.html#4227">Acronyms</A> + | <A HREF="glossaries-manual.html#4287">Acronyms</A> + | <A HREF="glossaries-manual.html#4289">Acronyms</A> + | <A HREF="glossaries-manual.html#4313">Acronyms</A> + | <A HREF="glossaries-manual.html#4315">Acronyms</A> + | <A HREF="glossaries-manual.html#4348">Acronyms</A> + | <A HREF="glossaries-manual.html#4350">Acronyms</A> + | <A HREF="glossaries-manual.html#4398">Acronyms</A> + | <A HREF="glossaries-manual.html#4400">Acronyms</A> <DT><STRONG>nonumberlist</STRONG> -<DD><A HREF="glossaries-manual.html#2771">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2773">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2950">Package Options</A> - | <A HREF="glossaries-manual.html#2952">Package Options</A> - | <A HREF="glossaries-manual.html#3327">Number lists</A> - | <A HREF="glossaries-manual.html#3329">Number lists</A> - | <A HREF="glossaries-manual.html#4581">Defining your own glossary</A> - | <A HREF="glossaries-manual.html#4583">Defining your own glossary</A> - | <A HREF="glossaries-manual.html#4590">Defining your own glossary</A> - | <A HREF="glossaries-manual.html#4592">Defining your own glossary</A> +<DD><A HREF="glossaries-manual.html#2954">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2956">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3133">Package Options</A> + | <A HREF="glossaries-manual.html#3135">Package Options</A> + | <A HREF="glossaries-manual.html#3510">Number lists</A> + | <A HREF="glossaries-manual.html#3512">Number lists</A> + | <A HREF="glossaries-manual.html#4874">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#4876">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#4883">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#4885">Defining your own glossary</A> <DT><STRONG>numberedsection</STRONG> -<DD><A HREF="glossaries-manual.html#2877">Package Options</A> - | <A HREF="glossaries-manual.html#2879">Package Options</A> - | <A HREF="glossaries-manual.html#2886">Package Options</A> - | <A HREF="glossaries-manual.html#2888">Package Options</A> - | <A HREF="glossaries-manual.html#2901">Package Options</A> - | <A HREF="glossaries-manual.html#3590">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#3592">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#3599">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#3601">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#3060">Package Options</A> + | <A HREF="glossaries-manual.html#3062">Package Options</A> + | <A HREF="glossaries-manual.html#3069">Package Options</A> + | <A HREF="glossaries-manual.html#3071">Package Options</A> + | <A HREF="glossaries-manual.html#3084">Package Options</A> + | <A HREF="glossaries-manual.html#3807">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#3809">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#3816">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#3818">Displaying a glossary</A> <DD><DL COMPACT> <DT><STRONG>autolabel</STRONG> -<DD><A HREF="glossaries-manual.html#2903">Package Options</A> - | <A HREF="glossaries-manual.html#2894">Package Options</A> +<DD><A HREF="glossaries-manual.html#3086">Package Options</A> + | <A HREF="glossaries-manual.html#3077">Package Options</A> <DT><STRONG>false</STRONG> -<DD><A HREF="glossaries-manual.html#2890">Package Options</A> +<DD><A HREF="glossaries-manual.html#3073">Package Options</A> <DT><STRONG>nolabel</STRONG> -<DD><A HREF="glossaries-manual.html#2892">Package Options</A> +<DD><A HREF="glossaries-manual.html#3075">Package Options</A> </DL> <DT><STRONG>numberline</STRONG> -<DD><A HREF="glossaries-manual.html#2811">Package Options</A> - | <A HREF="glossaries-manual.html#2813">Package Options</A> - | <A HREF="glossaries-manual.html#2847">Package Options</A> - | <A HREF="glossaries-manual.html#2849">Package Options</A> +<DD><A HREF="glossaries-manual.html#2994">Package Options</A> + | <A HREF="glossaries-manual.html#2996">Package Options</A> + | <A HREF="glossaries-manual.html#3030">Package Options</A> + | <A HREF="glossaries-manual.html#3032">Package Options</A> <DT><STRONG>sanitize</STRONG> -<DD><A HREF="glossaries-manual.html#2970">Package Options</A> - | <A HREF="glossaries-manual.html#2972">Package Options</A> - | <A HREF="glossaries-manual.html#2989">Package Options</A> - | <A HREF="glossaries-manual.html#2991">Package Options</A> - | <A HREF="glossaries-manual.html#3967">Acronyms</A> - | <A HREF="glossaries-manual.html#3969">Acronyms</A> - | <A HREF="glossaries-manual.html#3975">Acronyms</A> - | <A HREF="glossaries-manual.html#3982">Acronyms</A> - | <A HREF="glossaries-manual.html#4062">Acronyms</A> - | <A HREF="glossaries-manual.html#4079">Acronyms</A> - | <A HREF="glossaries-manual.html#4114">Acronyms</A> - | <A HREF="glossaries-manual.html#4155">Acronyms</A> +<DD><A HREF="glossaries-manual.html#3153">Package Options</A> + | <A HREF="glossaries-manual.html#3155">Package Options</A> + | <A HREF="glossaries-manual.html#3172">Package Options</A> + | <A HREF="glossaries-manual.html#3174">Package Options</A> + | <A HREF="glossaries-manual.html#4184">Acronyms</A> + | <A HREF="glossaries-manual.html#4186">Acronyms</A> + | <A HREF="glossaries-manual.html#4192">Acronyms</A> + | <A HREF="glossaries-manual.html#4199">Acronyms</A> + | <A HREF="glossaries-manual.html#4279">Acronyms</A> + | <A HREF="glossaries-manual.html#4296">Acronyms</A> + | <A HREF="glossaries-manual.html#4331">Acronyms</A> + | <A HREF="glossaries-manual.html#4372">Acronyms</A> <DD><DL COMPACT> <DT><STRONG>description</STRONG> -<DD><A HREF="glossaries-manual.html#3976">Acronyms</A> - | <A HREF="glossaries-manual.html#4080">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4193">Acronyms</A> + | <A HREF="glossaries-manual.html#4297">Acronyms</A> <DT><STRONG>symbol</STRONG> -<DD><A HREF="glossaries-manual.html#3983">Acronyms</A> - | <A HREF="glossaries-manual.html#4063">Acronyms</A> - | <A HREF="glossaries-manual.html#4115">Acronyms</A> - | <A HREF="glossaries-manual.html#4156">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4200">Acronyms</A> + | <A HREF="glossaries-manual.html#4280">Acronyms</A> + | <A HREF="glossaries-manual.html#4332">Acronyms</A> + | <A HREF="glossaries-manual.html#4373">Acronyms</A> </DL> <DT><STRONG>section</STRONG> -<DD><A HREF="glossaries-manual.html#2780">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2782">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2789">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2791">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2865">Package Options</A> - | <A HREF="glossaries-manual.html#2867">Package Options</A> +<DD><A HREF="glossaries-manual.html#2963">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2965">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2972">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2974">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3048">Package Options</A> + | <A HREF="glossaries-manual.html#3050">Package Options</A> <DT><STRONG>shortcuts</STRONG> -<DD><A HREF="glossaries-manual.html#3091">Package Options</A> - | <A HREF="glossaries-manual.html#3093">Package Options</A> - | <A HREF="glossaries-manual.html#3709">Acronyms</A> - | <A HREF="glossaries-manual.html#3711">Acronyms</A> - | <A HREF="glossaries-manual.html#4236">Acronyms</A> - | <A HREF="glossaries-manual.html#4238">Acronyms</A> - | <A HREF="glossaries-manual.html#4248">Acronyms</A> - | <A HREF="glossaries-manual.html#4250">Acronyms</A> - | <A HREF="glossaries-manual.html#4257">Acronyms</A> - | <A HREF="glossaries-manual.html#4259">Acronyms</A> - | <A HREF="glossaries-manual.html#4257">Acronyms</A> - | <A HREF="glossaries-manual.html#4259">Acronyms</A> +<DD><A HREF="glossaries-manual.html#3274">Package Options</A> + | <A HREF="glossaries-manual.html#3276">Package Options</A> + | <A HREF="glossaries-manual.html#3926">Acronyms</A> + | <A HREF="glossaries-manual.html#3928">Acronyms</A> + | <A HREF="glossaries-manual.html#4453">Acronyms</A> + | <A HREF="glossaries-manual.html#4455">Acronyms</A> + | <A HREF="glossaries-manual.html#4465">Acronyms</A> + | <A HREF="glossaries-manual.html#4467">Acronyms</A> + | <A HREF="glossaries-manual.html#4474">Acronyms</A> + | <A HREF="glossaries-manual.html#4476">Acronyms</A> + | <A HREF="glossaries-manual.html#4474">Acronyms</A> + | <A HREF="glossaries-manual.html#4476">Acronyms</A> <DT><STRONG>smallcaps</STRONG> -<DD><A HREF="glossaries-manual.html#2451">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2453">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2460">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2462">Troubleshooting</A> - | <A HREF="glossaries-manual.html#3055">Package Options</A> - | <A HREF="glossaries-manual.html#3057">Package Options</A> - | <A HREF="glossaries-manual.html#3664">Acronyms</A> - | <A HREF="glossaries-manual.html#3666">Acronyms</A> - | <A HREF="glossaries-manual.html#3727">Acronyms</A> - | <A HREF="glossaries-manual.html#3729">Acronyms</A> - | <A HREF="glossaries-manual.html#3746">Acronyms</A> - | <A HREF="glossaries-manual.html#3748">Acronyms</A> - | <A HREF="glossaries-manual.html#3869">Acronyms</A> - | <A HREF="glossaries-manual.html#3871">Acronyms</A> - | <A HREF="glossaries-manual.html#3897">Acronyms</A> - | <A HREF="glossaries-manual.html#3899">Acronyms</A> - | <A HREF="glossaries-manual.html#4026">Acronyms</A> - | <A HREF="glossaries-manual.html#4028">Acronyms</A> - | <A HREF="glossaries-manual.html#4087">Acronyms</A> - | <A HREF="glossaries-manual.html#4089">Acronyms</A> - | <A HREF="glossaries-manual.html#4163">Acronyms</A> - | <A HREF="glossaries-manual.html#4165">Acronyms</A> +<DD><A HREF="glossaries-manual.html#2618">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2620">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2627">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2629">Troubleshooting</A> + | <A HREF="glossaries-manual.html#3238">Package Options</A> + | <A HREF="glossaries-manual.html#3240">Package Options</A> + | <A HREF="glossaries-manual.html#3881">Acronyms</A> + | <A HREF="glossaries-manual.html#3883">Acronyms</A> + | <A HREF="glossaries-manual.html#3944">Acronyms</A> + | <A HREF="glossaries-manual.html#3946">Acronyms</A> + | <A HREF="glossaries-manual.html#3963">Acronyms</A> + | <A HREF="glossaries-manual.html#3965">Acronyms</A> + | <A HREF="glossaries-manual.html#4086">Acronyms</A> + | <A HREF="glossaries-manual.html#4088">Acronyms</A> + | <A HREF="glossaries-manual.html#4114">Acronyms</A> + | <A HREF="glossaries-manual.html#4116">Acronyms</A> + | <A HREF="glossaries-manual.html#4243">Acronyms</A> + | <A HREF="glossaries-manual.html#4245">Acronyms</A> + | <A HREF="glossaries-manual.html#4304">Acronyms</A> + | <A HREF="glossaries-manual.html#4306">Acronyms</A> + | <A HREF="glossaries-manual.html#4380">Acronyms</A> + | <A HREF="glossaries-manual.html#4382">Acronyms</A> <DT><STRONG>smaller</STRONG> -<DD><A HREF="glossaries-manual.html#2469">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2471">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2478">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2480">Troubleshooting</A> - | <A HREF="glossaries-manual.html#3067">Package Options</A> - | <A HREF="glossaries-manual.html#3069">Package Options</A> - | <A HREF="glossaries-manual.html#3673">Acronyms</A> - | <A HREF="glossaries-manual.html#3675">Acronyms</A> - | <A HREF="glossaries-manual.html#3736">Acronyms</A> - | <A HREF="glossaries-manual.html#3738">Acronyms</A> - | <A HREF="glossaries-manual.html#3755">Acronyms</A> - | <A HREF="glossaries-manual.html#3757">Acronyms</A> - | <A HREF="glossaries-manual.html#3791">Acronyms</A> - | <A HREF="glossaries-manual.html#3793">Acronyms</A> - | <A HREF="glossaries-manual.html#3878">Acronyms</A> - | <A HREF="glossaries-manual.html#3880">Acronyms</A> - | <A HREF="glossaries-manual.html#3906">Acronyms</A> - | <A HREF="glossaries-manual.html#3908">Acronyms</A> - | <A HREF="glossaries-manual.html#4017">Acronyms</A> - | <A HREF="glossaries-manual.html#4019">Acronyms</A> - | <A HREF="glossaries-manual.html#4122">Acronyms</A> - | <A HREF="glossaries-manual.html#4124">Acronyms</A> - | <A HREF="glossaries-manual.html#4172">Acronyms</A> - | <A HREF="glossaries-manual.html#4174">Acronyms</A> +<DD><A HREF="glossaries-manual.html#2636">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2638">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2645">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2647">Troubleshooting</A> + | <A HREF="glossaries-manual.html#3250">Package Options</A> + | <A HREF="glossaries-manual.html#3252">Package Options</A> + | <A HREF="glossaries-manual.html#3890">Acronyms</A> + | <A HREF="glossaries-manual.html#3892">Acronyms</A> + | <A HREF="glossaries-manual.html#3953">Acronyms</A> + | <A HREF="glossaries-manual.html#3955">Acronyms</A> + | <A HREF="glossaries-manual.html#3972">Acronyms</A> + | <A HREF="glossaries-manual.html#3974">Acronyms</A> + | <A HREF="glossaries-manual.html#4008">Acronyms</A> + | <A HREF="glossaries-manual.html#4010">Acronyms</A> + | <A HREF="glossaries-manual.html#4095">Acronyms</A> + | <A HREF="glossaries-manual.html#4097">Acronyms</A> + | <A HREF="glossaries-manual.html#4123">Acronyms</A> + | <A HREF="glossaries-manual.html#4125">Acronyms</A> + | <A HREF="glossaries-manual.html#4234">Acronyms</A> + | <A HREF="glossaries-manual.html#4236">Acronyms</A> + | <A HREF="glossaries-manual.html#4339">Acronyms</A> + | <A HREF="glossaries-manual.html#4341">Acronyms</A> + | <A HREF="glossaries-manual.html#4389">Acronyms</A> + | <A HREF="glossaries-manual.html#4391">Acronyms</A> <DT><STRONG>style</STRONG> -<DD><A HREF="glossaries-manual.html#2758">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2760">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2941">Package Options</A> - | <A HREF="glossaries-manual.html#2943">Package Options</A> - | <A HREF="glossaries-manual.html#3575">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#3577">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#4515">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4517">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2941">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2943">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3124">Package Options</A> + | <A HREF="glossaries-manual.html#3126">Package Options</A> + | <A HREF="glossaries-manual.html#3792">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#3794">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#4798">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4800">Glossary Styles</A> <DT><STRONG>toc</STRONG> -<DD><A HREF="glossaries-manual.html#2565">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2567">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2615">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2617">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2802">Package Options</A> - | <A HREF="glossaries-manual.html#2804">Package Options</A> - | <A HREF="glossaries-manual.html#2820">Package Options</A> - | <A HREF="glossaries-manual.html#2822">Package Options</A> - | <A HREF="glossaries-manual.html#2829">Package Options</A> - | <A HREF="glossaries-manual.html#2831">Package Options</A> - | <A HREF="glossaries-manual.html#2838">Package Options</A> - | <A HREF="glossaries-manual.html#2840">Package Options</A> - | <A HREF="glossaries-manual.html#3563">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#3565">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#2732">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2734">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2782">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2784">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#2985">Package Options</A> + | <A HREF="glossaries-manual.html#2987">Package Options</A> + | <A HREF="glossaries-manual.html#3003">Package Options</A> + | <A HREF="glossaries-manual.html#3005">Package Options</A> + | <A HREF="glossaries-manual.html#3012">Package Options</A> + | <A HREF="glossaries-manual.html#3014">Package Options</A> + | <A HREF="glossaries-manual.html#3021">Package Options</A> + | <A HREF="glossaries-manual.html#3023">Package Options</A> + | <A HREF="glossaries-manual.html#3780">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#3782">Displaying a glossary</A> </DL> <DT><STRONG><TT>\pagelistname</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2383">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#2550">Multi-Lingual Support</A> <DT><STRONG><TT>\printglossaries</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2505">Troubleshooting</A> - | <A HREF="glossaries-manual.html#2554">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3105">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#2672">Troubleshooting</A> + | <A HREF="glossaries-manual.html#2721">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#3288">Defining Glossary Entries</A> <DT><STRONG><TT>\printglossary</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2502">Troubleshooting</A> - | <A HREF="glossaries-manual.html#3102">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#4522">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4528">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#2669">Troubleshooting</A> + | <A HREF="glossaries-manual.html#3285">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#4805">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4819">Glossary Styles</A> <DT><STRONG><TT>\printglossary</TT> keys</STRONG> <DD><DL COMPACT> <DT><STRONG>nonumberlist</STRONG> -<DD><A HREF="glossaries-manual.html#3603">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#3820">Displaying a glossary</A> <DT><STRONG>numberedsection</STRONG> -<DD><A HREF="glossaries-manual.html#3582">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#3799">Displaying a glossary</A> <DT><STRONG>style</STRONG> -<DD><A HREF="glossaries-manual.html#3567">Displaying a glossary</A> - | <A HREF="glossaries-manual.html#4519">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4525">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3784">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#4802">Glossary Styles</A> + | <A HREF="glossaries-manual.html#4816">Glossary Styles</A> <DT><STRONG>title</STRONG> -<DD><A HREF="glossaries-manual.html#3552">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#3769">Displaying a glossary</A> <DT><STRONG>toctitle</STRONG> -<DD><A HREF="glossaries-manual.html#3555">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#3772">Displaying a glossary</A> <DT><STRONG>type</STRONG> -<DD><A HREF="glossaries-manual.html#3549">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#3766">Displaying a glossary</A> </DL> <DT><STRONG><TT>relsize</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4147">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4364">Acronyms</A> <DT><STRONG><TT>\setglossarysection</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2869">Package Options</A> +<DD><A HREF="glossaries-manual.html#3052">Package Options</A> <DT><STRONG><TT>\smaller</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4144">Acronyms</A> +<DD><A HREF="glossaries-manual.html#4361">Acronyms</A> <DT><STRONG><TT>supertabular</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4461">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#4711">Glossary Styles</A> <DT><STRONG><TT>\symbolname</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2380">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#2547">Multi-Lingual Support</A> <DT><STRONG><TT>translator</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2332">Multi-Lingual Support</A> - | <A HREF="glossaries-manual.html#2335">Multi-Lingual Support</A> - | <A HREF="glossaries-manual.html#2338">Multi-Lingual Support</A> - | <A HREF="glossaries-manual.html#2350">Multi-Lingual Support</A> - | <A HREF="glossaries-manual.html#2353">Multi-Lingual Support</A> - | <A HREF="glossaries-manual.html#2395">Multi-Lingual Support</A> - | <A HREF="glossaries-manual.html#2398">Multi-Lingual Support</A> - | <A HREF="glossaries-manual.html#2494">Troubleshooting</A> +<DD><A HREF="glossaries-manual.html#2499">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#2502">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#2505">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#2517">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#2520">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#2562">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#2565">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#2661">Troubleshooting</A> </DL> <P> @@ -4242,14 +4570,14 @@ range</A><A <DD>This is new to version 1.01 </DD> -<DT><A NAME="foot2159">...acronym</A><A +<DT><A NAME="foot2320">...acronym</A><A HREF="glossaries-manual.html#tex2html9"><SUP>2</SUP></A></DT> <DD>if the -<TT>acronym</TT><A NAME="2910"></A> option is used, otherwise the list of +<TT>acronym</TT><A NAME="3093"></A> option is used, otherwise the list of acronyms is the main glossary </DD> -<DT><A NAME="foot2179">... this.</A><A +<DT><A NAME="foot2340">... this.</A><A HREF="glossaries-manual.html#tex2html10"><SUP>3</SUP></A></DT> <DD>The only preamble restriction on <TT>\newglossaryentry</TT> and <TT>\newacronym</TT> @@ -4257,7 +4585,7 @@ was removed in version 1.13, but the restriction remains for <TT>\loadglsentries</TT>. </DD> -<DT><A NAME="foot2218">... label</A><A +<DT><A NAME="foot2383">... label</A><A HREF="glossaries-manual.html#tex2html11"><SUP>4</SUP></A></DT> <DD><TT>main</TT> for the main (default) glossary, <TT>\acronymtype</TT> for the list of acronyms, or the @@ -4265,34 +4593,34 @@ name supplied in the first mandatory argument to <TT>\newglossary</TT> for additional glossaries. </DD> -<DT><A NAME="foot2250">...smaller,</A><A +<DT><A NAME="foot2417">...smaller,</A><A HREF="glossaries-manual.html#tex2html12"><SUP>5</SUP></A></DT> <DD>you will need to load a package, such as <TT>relsize</TT>, that defines <TT>\smaller</TT> if you use this option. </DD> -<DT><A NAME="foot1825">... start.</A><A +<DT><A NAME="foot1949">... start.</A><A HREF="glossaries-manual.html#tex2html15"><SUP>6</SUP></A></DT> <DD>This style was supplied by Axel Menzel. </DD> -<DT><A NAME="foot2264">... +<DT><A NAME="foot2431">... link</A><A HREF="glossaries-manual.html#tex2html16"><SUP>7</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="foot2265">... correctly.</A><A +<DT><A NAME="foot2432">... correctly.</A><A HREF="glossaries-manual.html#tex2html17"><SUP>8</SUP></A></DT> <DD>again, if the document doesn't support hyperlinks, <TT>\@glstarget</TT> will ignore the label, and just typeset the text. </DD> -<DT><A NAME="foot2266">...MakeTextUppercase</A><A +<DT><A NAME="foot2433">...MakeTextUppercase</A><A HREF="glossaries-manual.html#tex2html18"><SUP>9</SUP></A></DT> <DD>defined in the <TT>textcase</TT> package diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.tex b/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.tex index ac8cf241478..52a7a33f3c1 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{5121} +\CheckSum{5329} \CodelineNumbered \newcommand*{\termdef}[1]{\emph{#1}\iterm{#1}} \newcommand*{\term}[1]{#1\iterm{#1}} @@ -109,7 +109,7 @@ \MakeShortVerb{"} \DeleteShortVerb{\|} - \title{glossaries.sty v 1.14: \LaTeXe\ Package to Assist Generating Glossaries} + \title{glossaries.sty v 1.16: \LaTeXe\ Package to Assist Generating Glossaries} \author{Nicola L.C. Talbot\\[10pt] School of Computing Sciences\\ University of East Anglia\\ @@ -117,7 +117,7 @@ Norwich. Norfolk\\ NR4 7TJ. United Kingdom.\\ \url{http://theoval.cmp.uea.ac.uk/~nlct/}} - \date{18th June 2008} + \date{27th August 2008} \maketitle \tableofcontents @@ -243,7 +243,7 @@ in your document preamble: \deftranslation[to=Irish]{Symbol (glossaries)}{Siombail} \end{verbatim} -\subsection{Generating the associated glossary files} +\subsection{Generating the Associated Glossary Files} \label{sec:makeglossaries} The \sty{glossaries} package comes with the Perl script @@ -659,14 +659,14 @@ The primary definition of \glspl[format=textbf]{singmtx}. \end{verbatim} In this example the relevant glossary entry will have the page number in bold (since it uses \cs{textbf}) but -it will no longer have a hyperlink (if hyperlinks are enabled.) +it will no longer have a hyperlink (if hyperlinks are enabled). \item The \sty{glossaries} package provides commands to change the font whilst ensuring that the number remains a hyperlink. These are of the form \cs{hyper}\meta{xx} and are equivalent to the standard font changing commands of the form \cs{text}\meta{xx}, as well as \ics{hyperemph} -(which uses \ics{emph}.) For example: +(which uses \ics{emph}). For example: \begin{verbatim} The primary definition of \glspl[format=hyperbf]{singmtx}. \end{verbatim} @@ -717,11 +717,21 @@ 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 \ics{glslink} or \ics{gls} and related commands, or via \ics{glsadd} -or \ics{glsaddall}.) +or \ics{glsaddall}). \item To change the sorting order, use the \gloskey{sort} key. For example: \begin{verbatim} +\newglossaryentry{tex}{name={\TeX}, +description={A typesetting language}, +sort=tex} +\end{verbatim} +This will put the entry in the \dq{T} group (entries starting with +the letter \dq{t} or \dq{T}) rather than the +\dq{symbols} group (entries starting with a symbol). +Similarly, the following example puts the entry in the \dq{U} +group instead of the \dq{symbol} group. +\begin{verbatim} \newglossaryentry{universal}{name={\ensuremath{\mathcal{U}}}, description=The universal set, sort=U} @@ -749,8 +759,12 @@ symbol={m}} The predefined glossary styles that display the entry symbol are: \glostyle{long4col}, \glostyle{long4colheader}, \glostyle{long4colborder}, \glostyle{long4colheaderborder}, + \glostyle{altlong4col}, \glostyle{altlong4colheader}, +\glostyle{altlong4colborder}, \glostyle{altlong4colheaderborder}, \glostyle{super4col}, \glostyle{super4colheader}, -\glostyle{super4colborder} and \glostyle{super4colheaderborder}. +\glostyle{super4colborder}, \glostyle{super4colheaderborder}. +\glostyle{altsuper4col}, \glostyle{altsuper4colheader}, +\glostyle{altsuper4colborder} and \glostyle{altsuper4colheaderborder}. All the other styles supplied by this package ignore the associated symbol. @@ -886,7 +900,7 @@ glossary styles are listed \ifmakedtx{in \autoref{sec:styles}}{\htmlref{later}{s \item[\pkgopt{nonumberlist}] This option will suppress the associated number lists\iterm{number list} in the glossaries (see also -\ifmakedtx{\autoref{sec:numberlists}}{\htmlref{Number Lists}{sec:numberlists}}.) +\ifmakedtx{\autoref{sec:numberlists}}{\htmlref{Number Lists}{sec:numberlists}}). \item[\pkgopt{counter}] This is a \meta{key}=\meta{value} option. The value should be the name of the default counter to use in the number @@ -1128,7 +1142,7 @@ name={Perl}, description={A scripting language}} \newglossaryentry{tex}{name={\TeX}, -description={A typesetting language}} +description={A typesetting language},sort={TeX}} \newglossaryentry{html}{type=\glsdefaulttype, name={html}, @@ -1196,7 +1210,22 @@ Once you have defined a glossary entry using 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 -\termdef{link text} (even if there are no hyperlinks). +\termdef{link text} (even if there are no hyperlinks). The commands +in this section also add a line to an external file that is used +by \appname{makeindex} to generate the relevant entry in the +glossary. It is strongly recommended that you don't use the commands +defined in this section in the arguments of sectioning or caption +commands. This is particularly important if you are using the +\sty{glossaries} package in conjunction with the \isty{hyperref} package. +Instead, use one of the commands listed in +\ifmakedtx{\autoref{sec:glsnolink}}{\htmlref{Using Glossary Terms +Without Links}{sec:glsnolink}} (such as \cs{glsentrytext}) or provide an alternative via +the optional argument to the sectioning/caption command. +Examples: +\begin{verbatim} +\section{An overview of \glsentrytext{perl}} +\section[An overview of Perl]{An overview of \gls{perl}} +\end{verbatim} The way the \term{link text} is displayed depends on \DescribeMacro{\glstextformat}\cs{glstextformat}\marg{text}. @@ -1495,7 +1524,15 @@ supplied in the final optional argument to \cs{gls} or \cs{glspl} (or their uppercase variants). The default definitions of \cs{glsdisplay} and \cs{glsdisplayfirst} simply print the first argument immediately followed by the fourth argument. -The remaining arguments are ignored. +The remaining arguments are ignored. Note that \ics{glslink} (which +is used by commands like \cs{gls} and \cs{glspl}) sets +\DescribeMacro{\glslabel}\ics{glslabel} to the label for the given +entry (i.e.\ the label supplied to the mandatory argument to +\cs{gls}), so it is possible to use this label in the definition of +\cs{glsdisplay} or \cs{glsdisplayfirst} to supply additional +information using any of the commands described in +\ifmakedtx{\autoref{sec:glsnolink}}{\htmlref{Using Glossary Terms +Without Links}{sec:glsnolink}}, if required. For example, suppose you want a glossary of measurements and units, you can use the \gloskey{symbol} key to store the unit: @@ -1582,9 +1619,9 @@ and\\[10pt] respectively. The effect can be localised by placing the commands within a group. Note that you should only use \cs{glsenablehyper} if the commands \ics{hyperlink} and \ics{hypertarget} have been -defined (for example, by the \isty{hyperref} package). +defined (for example, by the \isty{hyperref} package).\ifmakedtx{}{\toTop} -\subsection{Adding an entry to the glossary without generating text} +\subsection{Adding an Entry to the Glossary Without Generating Text} \label{sec:glsadd} \DescribeMacro{\glsadd} @@ -1619,6 +1656,72 @@ do: \end{verbatim} \ifmakedtx{}{\toTop} +\subsection{Using Glossary Terms Without Links} +\label{sec:glsnolink} + +The commands described in this section display entry details without +adding any information to the glossary. They don't use +\cs{glstextformat}, they don't have any optional arguments, +they don't affect the flag that determines if the term has been +used and they don't produce hyperlinks. +\par\vskip10pt\noindent +\DescribeMacro{\glsentryname}\cs{glsentryname}\marg{label}\\ +\DescribeMacro{\Glsentryname}\cs{Glsentryname}\marg{label}\par\vskip10pt\noindent +These commands display the name of the glossary entry given by +\meta{label}, as specified by the \gloskey{name} key. +\cs{Glsentryname} makes the first letter uppercase. +\par\vskip10pt\noindent +\DescribeMacro{\glsentrytext}\cs{glsentrytext}\marg{label}\\ +\DescribeMacro{\Glsentrytext}\cs{Glsentrytext}\marg{label}\par\vskip10pt\noindent +These commands display the subsequent use text for the glossary entry +given by \meta{label}, as specified by the \gloskey{text} key. +\cs{Glsentrytext} makes the first letter uppercase. +\par\vskip10pt\noindent +\DescribeMacro{\glsentryplural}\cs{glsentryplural}\marg{label}\\ +\DescribeMacro{\Glsentryplural}\cs{Glsentryplural}\marg{label}\par\vskip10pt\noindent +These commands display the subsequent use plural text for the glossary +entry given by \meta{label}, as specified by the \gloskey{plural} key. +\cs{Glsentryplural} makes the first letter uppercase. +\par\vskip10pt\noindent +\DescribeMacro{\glsentryfirst}\cs{glsentryfirst}\marg{label}\\ +\DescribeMacro{\Glsentryfirst}\cs{Glsentryfirst}\marg{label}\par\vskip10pt\noindent +These commands display the first use text for the glossary entry +given by \meta{label}, as specified by the \gloskey{first} key. +\cs{Glsentryfirst} makes the first letter uppercase. +\par\vskip10pt\noindent +\DescribeMacro{\glsentryfirstplural}\cs{glsentryfirstplural}\marg{label}\\ +\DescribeMacro{\Glsentryfirstplural}\cs{Glsentryfirstplural}\marg{label}\par\vskip10pt\noindent +These commands display the plural form of the first use text for the +glossary entry given by \meta{label}, as specified by the +\gloskey{firstplural} key. \cs{Glsentryfirstplural} makes the first +letter uppercase. +\par\vskip10pt\noindent +\DescribeMacro{\glsentrydesc}\cs{glsentrydesc}\marg{label}\\ +\DescribeMacro{\Glsentrydesc}\cs{Glsentrydesc}\marg{label}\par\vskip10pt\noindent +These commands display the description for the glossary entry given by +\meta{label}. \cs{Glsentrydesc} makes the first letter uppercase. +\par\vskip10pt\noindent +\DescribeMacro{\glsentrydescplural}\cs{glsentrydescplural}\marg{label}\\ +\DescribeMacro{\Glsentrydescplural}\cs{Glsentrydescplural}\marg{label}\par\vskip10pt\noindent +These commands display the plural description for the glossary entry +given by \meta{label}. \cs{Glsentrydescplural} makes the first letter +uppercase. +\par\vskip10pt\noindent +\DescribeMacro{\glsentrysymbol}\cs{glsentrysymbol}\marg{label}\\ +\DescribeMacro{\Glsentrysymbol}\cs{Glsentrysymbol}\marg{label}\par\vskip10pt\noindent +These commands display the symbol for the glossary entry given by +\meta{label}. \cs{Glsentrysymbol} makes the first letter uppercase. +\par\vskip10pt\noindent +\DescribeMacro{\glsentrysymbolplural}\cs{glsentrysymbolplural}\marg{label}\\ +\DescribeMacro{\Glsentrysymbolplural}\cs{Glsentrysymbolplural}\marg{label}\par\vskip10pt\noindent +These commands display the plural symbol for the glossary entry given by +\meta{label}. \cs{Glsentrysymbolplural} makes the first letter uppercase. + +For further information see \ifmakedtx{\autoref{sec:code:glsnolink}}{the +section \dq{Displaying entry details without adding information to +the glossary} in the document \texttt{glossaries.pdf}}. +\ifmakedtx{}{\toTop} + \subsection{Displaying a glossary} \DescribeMacro{\printglossaries} @@ -1756,7 +1859,8 @@ not sure whether the \pkgopt{acronym} option has been used, you can identify the list of acronyms by the command \DescribeMacro{\acronymtype}\cs{acronymtype} which is set to \texttt{acronym}, if the \pkgopt{acronym} option has been used, -otherwise it is set to \texttt{main}.\ifmakedtx{}{\toTop} +otherwise it is set to \texttt{main}. +\ifmakedtx{}{\toTop} \subsection{Acronyms} \label{sec:acronyms} @@ -1936,7 +2040,11 @@ Each of the package options \pkgopt{smallcaps}, \pkgopt{smaller}, and \pkgopt{description} use \ics{defglsdisplay} and \ics{defglsdisplayfirst} (described \ifmakedtx{in \autoref{sec:glsdisplay}}{\htmlref{earlier}{sec:glsdisplay}}) -to change the way the link text is displayed. +to change the way the link text is displayed. This means that these +package options only work for the glossary type given by +\cs{acronymtype}. If you have multiple lists of acronyms, you +will need to make the appropriate changes for each additional +glossary type. \begin{description} \item[\pkgopt{description},\pkgopt{footnote}]\ifmakedtx{\mbox{}\par}{} @@ -2109,7 +2217,7 @@ produce all upper case text. \ifmakedtx{}{\toTop} -\subsection{Unsetting and resetting entry flags} +\subsection{Unsetting and Resetting Entry Flags} When using \ics{gls}, \ics{glspl} and their uppercase variants it is possible that you may want to use the value given by the @@ -2187,7 +2295,10 @@ supplied by Axel~Menzel.} environment (defined by the \isty{longtable} package). It has two columns: the first column contains the entry's name and the second column contains the description followed by the \term{number list}. -Sub groups are separated with a blank row. +Sub groups are separated with a blank row. The width of the +first column is governed by the widest entry in that column. The +width of the second column is governed by the length +\ics{glsdescwidth}. \item[longborder] The \glostyle{longborder} style is like \glostyle{long} but has horizontal and vertical lines around it. @@ -2202,7 +2313,11 @@ around it. \item[long3col] The \glostyle{long3col} style is like \glostyle{long} but has three columns. The first column contains the entry's name, the second column contains the description -and the third column contains the \term{number list}. +and the third column contains the \term{number list}. The width of the +first column is governed by the widest entry in that column. The +width of the second column is governed by the length +\ics{glsdescwidth}. The width of the third column is governed by the +length \ics{glspagelistwidth}. \item[long3colborder] The \glostyle{long3colborder} style is like the \glostyle{long3col} style but has horizontal and vertical @@ -2217,7 +2332,10 @@ around it. \item[long4col] The \glostyle{long4col} style is like \glostyle{long3col} but has an additional column in which the -entry's associated symbol appears. +entry's associated symbol appears. This style is used for brief +single line descriptions. The column widths are governed by the +widest entry in the given column. Use \glostyle{altlong4col} for long +descriptions. \item[long4colborder] The \glostyle{long4colborder} style is like the \glostyle{long4col} style but has horizontal and vertical @@ -2230,11 +2348,34 @@ lines around it. like \glostyle{long4colheader} but has horizontal and vertical lines around it. +\item[altlong4col] The \glostyle{altlong4col} style is like +\glostyle{long4col} but allows multi-line descriptions and page lists. +The width of the description column is governed by the length +\ics{glsdescwidth} and the width of the page list column is +governed by the length \ics{glspagelistwidth}. The width of the name +and symbol columns is governed by the widest entry in the +given column. + +\item[altlong4colborder] The \glostyle{altlong4colborder} style is like +the \glostyle{long4colborder} but allows multi-line descriptions and +page lists. + +\item[altlong4colheader] The \glostyle{altlong4colheader} style is like +\glostyle{long4colheader} but allows multi-line descriptions and +page lists. + +\item[altlong4colheaderborder] The \glostyle{altlong4colheaderborder} +style is like \glostyle{long4colheaderborder} but allows multi-line +descriptions and page lists. + \item[super] The \glostyle{super} style uses the \envname{supertabular} environment (defined by the \isty{supertabular} package). It has two columns: the first column contains the entry's name and the second column contains the description followed by the \term{number list}. -Sub groups are separated with a blank row. +Sub groups are separated with a blank row. The width of the +first column is governed by the widest entry in that column. The +width of the second column is governed by the length +\ics{glsdescwidth}. \item[superborder] The \glostyle{superborder} style is like \glostyle{super} but has horizontal and vertical lines around it. @@ -2249,7 +2390,11 @@ around it. \item[super3col] The \glostyle{super3col} style is like \glostyle{super} but has three columns. The first column contains the entry's name, the second column contains the description -and the third column contains the \iterm{number list}. +and the third column contains the \iterm{number list}. The width of the +first column is governed by the widest entry in that column. The +width of the second column is governed by the length +\ics{glsdescwidth}. The width of the third column is governed by the +length \ics{glspagelistwidth}. \item[super3colborder] The \glostyle{super3colborder} style is like the \glostyle{super3col} style but has horizontal and vertical @@ -2264,7 +2409,10 @@ lines around it. \item[super4col] The \glostyle{super4col} style is like \glostyle{super3col} but has an additional column in which the -entry's associated symbol appears. +entry's associated symbol appears. This style is designed for +entries with brief single line descriptions. The column widths are governed by the +widest entry in the given column. Use \glostyle{altsuper4col} +for longer descriptions. \item[super4colborder] The \glostyle{super4colborder} style is like the \glostyle{super4col} style but has horizontal and vertical @@ -2277,12 +2425,43 @@ lines around it. is like \glostyle{super4colheader} but has horizontal and vertical lines around it. +\item[altsuper4col] The \glostyle{altsuper4col} style is like +\glostyle{super4col} but allows multi-line descriptions and page +lists. +The width of the description column is governed by the length +\ics{glsdescwidth} and the width of the page list column is +governed by the length \ics{glspagelistwidth}. The width of the name +and symbol columns is governed by the widest entry in the +given column. + +\item[altsuper4colborder] The \glostyle{altsuper4colborder} style is like +the \glostyle{super4colborder} style but allows multi-line descriptions +and page lists. + +\item[altsuper4colheader] The \glostyle{altsuper4colheader} style is like +\glostyle{super4colheader} but allows multi-line descriptions and +page lists. + +\item[altsuper4colheaderborder] The \glostyle{altsuper4colheaderborder} +style is like \glostyle{super4colheaderborder} but allows multi-line +descriptions and page lists. + \end{description} The glossary style can be set using the \pkgopt{style} package option or using the \gloskey[printglossary]{style} key in the optional argument to \ics{printglossary} or using the command:\\[10pt] \DescribeMacro{\glossarystyle}\cs{glossarystyle}\marg{style-name}\\[10pt] +The tabular-like styles that allow multi-line descriptions and page +lists use the length \DescribeMacro{\glsdescwidth}\cs{glsdescwidth} to +set the width of the description column and the length +\DescribeMacro{\glspagelistwidth}\cs{glspagelistwidth} to set the +width of the page list column. These will need to be changed using +\cs{setlength} if the glossary is too wide. Note that the +\glostyle{long4col} and \glostyle{super4col} styles (and their header and border +variations) don't use these lengths as they are designed for single +line entries. Instead you should use the analogous +\glostyle{altlong4col} and \glostyle{altsuper4col} styles. Note that if you use the \gloskey[printglossary]{style} key in the optional argument to \ics{printglossary}, it will override any @@ -2301,7 +2480,7 @@ override any previous style definitions, so, again: \glossarystyle{long} \end{verbatim} will reset \cs{glsgroupskip} back to its default definition for the -named glossary style (\dq{long} in this case). If you want to +named glossary style (\glostyle{long} in this case). If you want to modify the styles, either use \ics{newglossarystyle} (described in the next section) or make the modifications after \ics{glossarystyle}. @@ -2331,7 +2510,7 @@ needs to redefine all of the following: 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 \cs{glossarypreamble}) or the -glossary postamble (defined by \cs{glossarypostamble}.) For example, +glossary postamble (defined by \cs{glossarypostamble}). For example, the \glostyle{list} style uses the \envname{description} environment, so the \envname{theglossary} environment is simply redefined to begin and end the \envname{description} environment. diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries.pdf b/Master/texmf-dist/doc/latex/glossaries/glossaries.pdf Binary files differindex f125d355fc9..11a435b53bb 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/samples/minimalgls.tex b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex index 1f97e1fffec..768bddf6924 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex @@ -23,8 +23,9 @@ \documentclass{article} \listfiles +\usepackage{hyperref} %\usepackage{glossaries} % acronym will go in main glossary - \usepackage[acronym]{glossaries} % make a separate list of acronyms + \usepackage[acronym,footnote]{glossaries} % make a separate list of acronyms \makeglossaries diff --git a/Master/texmf-dist/scripts/glossaries/makeglossaries.bat b/Master/texmf-dist/scripts/glossaries/makeglossaries.bat index d91f67bd3e9..64a6a20750c 100755 --- a/Master/texmf-dist/scripts/glossaries/makeglossaries.bat +++ b/Master/texmf-dist/scripts/glossaries/makeglossaries.bat @@ -1,3 +1,3 @@ -@rem = '-*- Perl -*- -@echo off -perl -S "%~dp0makeglossaries" %* +@rem = '-*- Perl -*-
+@echo off
+perl -S "%~dp0makeglossaries" %*
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx index 4422a782e6f..2f8ddb199a9 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx @@ -21,7 +21,7 @@ % -doc "glossaries-manual.tex" % -codetitle "Documented Code" % glossaries -% Created on 2008/6/18 16:44 +% Created on 2008/8/27 12:55 %\fi %\iffalse %<*package> @@ -72,7 +72,7 @@ \makeatother \RecordChanges \PageIndex -\CheckSum{5121} +\CheckSum{5329} \CodelineNumbered \newcommand*{\termdef}[1]{\emph{#1}\iterm{#1}} \newcommand*{\term}[1]{#1\iterm{#1}} @@ -124,7 +124,7 @@ %\MakeShortVerb{"} %\DeleteShortVerb{\|} % -% \title{glossaries.sty v 1.14: \LaTeXe\ Package to Assist Generating Glossaries} +% \title{glossaries.sty v 1.16: \LaTeXe\ Package to Assist Generating Glossaries} % \author{Nicola L.C. Talbot\\[10pt] %School of Computing Sciences\\ %University of East Anglia\\ @@ -132,7 +132,7 @@ %NR4 7TJ. United Kingdom.\\ %\url{http://theoval.cmp.uea.ac.uk/~nlct/}} % -% \date{18th June 2008} +% \date{27th August 2008} % \maketitle %\tableofcontents % @@ -252,7 +252,7 @@ %\deftranslation[to=Irish]{Symbol (glossaries)}{Siombail} %\end{verbatim} % -%\subsection{Generating the associated glossary files} +%\subsection{Generating the Associated Glossary Files} %\label{sec:makeglossaries} % %The \sty{glossaries} package comes with the Perl script @@ -662,14 +662,14 @@ %\end{verbatim} %In this example the relevant glossary entry will have the %page number in bold (since it uses \cs{textbf}) but -%it will no longer have a hyperlink (if hyperlinks are enabled.) +%it will no longer have a hyperlink (if hyperlinks are enabled). % %\item The \sty{glossaries} package provides commands to %change the font whilst ensuring that the number remains a %hyperlink. These are of the form \cs{hyper}\meta{xx} and %are equivalent to the standard font changing commands of the %form \cs{text}\meta{xx}, as well as \ics{hyperemph} -%(which uses \ics{emph}.) For example: +%(which uses \ics{emph}). For example: %\begin{verbatim} %The primary definition of \glspl[format=hyperbf]{singmtx}. %\end{verbatim} @@ -720,11 +720,21 @@ %a term that doesn't appear in the document, then it means %you haven't used it in the text (either via \ics{glslink} %or \ics{gls} and related commands, or via \ics{glsadd} -%or \ics{glsaddall}.) +%or \ics{glsaddall}). % %\item To change the sorting order, use the \gloskey{sort} key. %For example: %\begin{verbatim} +%\newglossaryentry{tex}{name={\TeX}, +%description={A typesetting language}, +%sort=tex} +%\end{verbatim} +%This will put the entry in the \dq{T} group (entries starting with +%the letter \dq{t} or \dq{T}) rather than the +%\dq{symbols} group (entries starting with a symbol). +%Similarly, the following example puts the entry in the \dq{U} +%group instead of the \dq{symbol} group. +%\begin{verbatim} %\newglossaryentry{universal}{name={\ensuremath{\mathcal{U}}}, %description=The universal set, %sort=U} @@ -752,8 +762,12 @@ %The predefined glossary styles that display the entry symbol %are: \glostyle{long4col}, \glostyle{long4colheader}, %\glostyle{long4colborder}, \glostyle{long4colheaderborder}, +% \glostyle{altlong4col}, \glostyle{altlong4colheader}, +%\glostyle{altlong4colborder}, \glostyle{altlong4colheaderborder}, %\glostyle{super4col}, \glostyle{super4colheader}, -%\glostyle{super4colborder} and \glostyle{super4colheaderborder}. +%\glostyle{super4colborder}, \glostyle{super4colheaderborder}. +%\glostyle{altsuper4col}, \glostyle{altsuper4colheader}, +%\glostyle{altsuper4colborder} and \glostyle{altsuper4colheaderborder}. %All the other styles supplied by this package ignore the associated %symbol. % @@ -886,7 +900,7 @@ %glossary styles are listed in \autoref{sec:styles}. %\item[\pkgopt{nonumberlist}] This option will suppress the %associated number lists\iterm{number list} in the glossaries (see also -%\autoref{sec:numberlists}.) +%\autoref{sec:numberlists}). %\item[\pkgopt{counter}] This is a \meta{key}=\meta{value} option. The %value should be the name of the default counter to use in the number %lists\iterm{number list}. @@ -1114,7 +1128,7 @@ %description={A scripting language}} % %\newglossaryentry{tex}{name={\TeX}, -%description={A typesetting language}} +%description={A typesetting language},sort={TeX}} % %\newglossaryentry{html}{type=\glsdefaulttype, %name={html}, @@ -1177,7 +1191,21 @@ %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 -%\termdef{link text} (even if there are no hyperlinks). +%\termdef{link text} (even if there are no hyperlinks). The commands +%in this section also add a line to an external file that is used +%by \appname{makeindex} to generate the relevant entry in the +%glossary. It is strongly recommended that you don't use the commands +%defined in this section in the arguments of sectioning or caption +%commands. This is particularly important if you are using the +%\sty{glossaries} package in conjunction with the \isty{hyperref} package. +%Instead, use one of the commands listed in +%\autoref{sec:glsnolink} (such as \cs{glsentrytext}) or provide an alternative via +%the optional argument to the sectioning/caption command. +%Examples: +%\begin{verbatim} +%\section{An overview of \glsentrytext{perl}} +%\section[An overview of Perl]{An overview of \gls{perl}} +%\end{verbatim} % %The way the \term{link text} is displayed %depends on \DescribeMacro{\glstextformat}\cs{glstextformat}\marg{text}. @@ -1447,7 +1475,14 @@ %\cs{glspl} (or their uppercase variants). The default definitions %of \cs{glsdisplay} and \cs{glsdisplayfirst} simply %print the first argument immediately followed by the fourth argument. -%The remaining arguments are ignored. +%The remaining arguments are ignored. Note that \ics{glslink} (which +%is used by commands like \cs{gls} and \cs{glspl}) sets +%\DescribeMacro{\glslabel}\ics{glslabel} to the label for the given +%entry (i.e.\ the label supplied to the mandatory argument to +%\cs{gls}), so it is possible to use this label in the definition of +%\cs{glsdisplay} or \cs{glsdisplayfirst} to supply additional +%information using any of the commands described in +%\autoref{sec:glsnolink}, if required. % %For example, suppose you want a glossary of measurements and %units, you can use the \gloskey{symbol} key to store the unit: @@ -1532,8 +1567,7 @@ %within a group. Note that you should only use \cs{glsenablehyper} %if the commands \ics{hyperlink} and \ics{hypertarget} have been %defined (for example, by the \isty{hyperref} package). -% -%\subsection{Adding an entry to the glossary without generating text} +%\subsection{Adding an Entry to the Glossary Without Generating Text} %\label{sec:glsadd} % %\DescribeMacro{\glsadd} @@ -1567,6 +1601,69 @@ %\glsaddall[types={\acronymtype,notation}] %\end{verbatim} % +%\subsection{Using Glossary Terms Without Links} +%\label{sec:glsnolink} +% +%The commands described in this section display entry details without +%adding any information to the glossary. They don't use +%\cs{glstextformat}, they don't have any optional arguments, +%they don't affect the flag that determines if the term has been +%used and they don't produce hyperlinks. +%\par\vskip10pt\noindent +%\DescribeMacro{\glsentryname}\cs{glsentryname}\marg{label}\\ +%\DescribeMacro{\Glsentryname}\cs{Glsentryname}\marg{label}\par\vskip10pt\noindent +%These commands display the name of the glossary entry given by +%\meta{label}, as specified by the \gloskey{name} key. +%\cs{Glsentryname} makes the first letter uppercase. +%\par\vskip10pt\noindent +%\DescribeMacro{\glsentrytext}\cs{glsentrytext}\marg{label}\\ +%\DescribeMacro{\Glsentrytext}\cs{Glsentrytext}\marg{label}\par\vskip10pt\noindent +%These commands display the subsequent use text for the glossary entry +%given by \meta{label}, as specified by the \gloskey{text} key. +%\cs{Glsentrytext} makes the first letter uppercase. +%\par\vskip10pt\noindent +%\DescribeMacro{\glsentryplural}\cs{glsentryplural}\marg{label}\\ +%\DescribeMacro{\Glsentryplural}\cs{Glsentryplural}\marg{label}\par\vskip10pt\noindent +%These commands display the subsequent use plural text for the glossary +%entry given by \meta{label}, as specified by the \gloskey{plural} key. +%\cs{Glsentryplural} makes the first letter uppercase. +%\par\vskip10pt\noindent +%\DescribeMacro{\glsentryfirst}\cs{glsentryfirst}\marg{label}\\ +%\DescribeMacro{\Glsentryfirst}\cs{Glsentryfirst}\marg{label}\par\vskip10pt\noindent +%These commands display the first use text for the glossary entry +%given by \meta{label}, as specified by the \gloskey{first} key. +%\cs{Glsentryfirst} makes the first letter uppercase. +%\par\vskip10pt\noindent +%\DescribeMacro{\glsentryfirstplural}\cs{glsentryfirstplural}\marg{label}\\ +%\DescribeMacro{\Glsentryfirstplural}\cs{Glsentryfirstplural}\marg{label}\par\vskip10pt\noindent +%These commands display the plural form of the first use text for the +%glossary entry given by \meta{label}, as specified by the +%\gloskey{firstplural} key. \cs{Glsentryfirstplural} makes the first +%letter uppercase. +%\par\vskip10pt\noindent +%\DescribeMacro{\glsentrydesc}\cs{glsentrydesc}\marg{label}\\ +%\DescribeMacro{\Glsentrydesc}\cs{Glsentrydesc}\marg{label}\par\vskip10pt\noindent +%These commands display the description for the glossary entry given by +%\meta{label}. \cs{Glsentrydesc} makes the first letter uppercase. +%\par\vskip10pt\noindent +%\DescribeMacro{\glsentrydescplural}\cs{glsentrydescplural}\marg{label}\\ +%\DescribeMacro{\Glsentrydescplural}\cs{Glsentrydescplural}\marg{label}\par\vskip10pt\noindent +%These commands display the plural description for the glossary entry +%given by \meta{label}. \cs{Glsentrydescplural} makes the first letter +%uppercase. +%\par\vskip10pt\noindent +%\DescribeMacro{\glsentrysymbol}\cs{glsentrysymbol}\marg{label}\\ +%\DescribeMacro{\Glsentrysymbol}\cs{Glsentrysymbol}\marg{label}\par\vskip10pt\noindent +%These commands display the symbol for the glossary entry given by +%\meta{label}. \cs{Glsentrysymbol} makes the first letter uppercase. +%\par\vskip10pt\noindent +%\DescribeMacro{\glsentrysymbolplural}\cs{glsentrysymbolplural}\marg{label}\\ +%\DescribeMacro{\Glsentrysymbolplural}\cs{Glsentrysymbolplural}\marg{label}\par\vskip10pt\noindent +%These commands display the plural symbol for the glossary entry given by +%\meta{label}. \cs{Glsentrysymbolplural} makes the first letter uppercase. +% +%For further information see \autoref{sec:code:glsnolink}. +% %\subsection{Displaying a glossary} % %\DescribeMacro{\printglossaries} @@ -1700,6 +1797,7 @@ %\DescribeMacro{\acronymtype}\cs{acronymtype} which is set to %\texttt{acronym}, if the \pkgopt{acronym} option has been used, %otherwise it is set to \texttt{main}. +% %\subsection{Acronyms} %\label{sec:acronyms} % @@ -1874,7 +1972,11 @@ %\pkgopt{footnote}, \pkgopt{dua} %and \pkgopt{description} use \ics{defglsdisplay} and %\ics{defglsdisplayfirst} (described in \autoref{sec:glsdisplay}) -%to change the way the link text is displayed. +%to change the way the link text is displayed. This means that these +%package options only work for the glossary type given by +%\cs{acronymtype}. If you have multiple lists of acronyms, you +%will need to make the appropriate changes for each additional +%glossary type. % %\begin{description} %\item[\pkgopt{description},\pkgopt{footnote}]\mbox{}\par When these two package options are used together, the first use displays @@ -2038,7 +2140,7 @@ %\end{table} % % -%\subsection{Unsetting and resetting entry flags} +%\subsection{Unsetting and Resetting Entry Flags} % %When using \ics{gls}, \ics{glspl} and their uppercase variants it is %possible that you may want to use the value given by the @@ -2115,7 +2217,10 @@ %environment (defined by the \isty{longtable} package). It has two %columns: the first column contains the entry's name and the second %column contains the description followed by the \term{number list}. -%Sub groups are separated with a blank row. +%Sub groups are separated with a blank row. The width of the +%first column is governed by the widest entry in that column. The +%width of the second column is governed by the length +%\ics{glsdescwidth}. % %\item[longborder] The \glostyle{longborder} style is like %\glostyle{long} but has horizontal and vertical lines around it. @@ -2130,7 +2235,11 @@ %\item[long3col] The \glostyle{long3col} style is like %\glostyle{long} but has three columns. The first column contains %the entry's name, the second column contains the description -%and the third column contains the \term{number list}. +%and the third column contains the \term{number list}. The width of the +%first column is governed by the widest entry in that column. The +%width of the second column is governed by the length +%\ics{glsdescwidth}. The width of the third column is governed by the +%length \ics{glspagelistwidth}. % %\item[long3colborder] The \glostyle{long3colborder} style is like %the \glostyle{long3col} style but has horizontal and vertical @@ -2145,7 +2254,10 @@ % %\item[long4col] The \glostyle{long4col} style is like %\glostyle{long3col} but has an additional column in which the -%entry's associated symbol appears. +%entry's associated symbol appears. This style is used for brief +%single line descriptions. The column widths are governed by the +%widest entry in the given column. Use \glostyle{altlong4col} for long +%descriptions. % %\item[long4colborder] The \glostyle{long4colborder} style is like %the \glostyle{long4col} style but has horizontal and vertical @@ -2158,11 +2270,34 @@ %like \glostyle{long4colheader} but has horizontal and vertical lines %around it. % +%\item[altlong4col] The \glostyle{altlong4col} style is like +%\glostyle{long4col} but allows multi-line descriptions and page lists. +%The width of the description column is governed by the length +%\ics{glsdescwidth} and the width of the page list column is +%governed by the length \ics{glspagelistwidth}. The width of the name +%and symbol columns is governed by the widest entry in the +%given column. +% +%\item[altlong4colborder] The \glostyle{altlong4colborder} style is like +%the \glostyle{long4colborder} but allows multi-line descriptions and +%page lists. +% +%\item[altlong4colheader] The \glostyle{altlong4colheader} style is like +%\glostyle{long4colheader} but allows multi-line descriptions and +%page lists. +% +%\item[altlong4colheaderborder] The \glostyle{altlong4colheaderborder} +%style is like \glostyle{long4colheaderborder} but allows multi-line +%descriptions and page lists. +% %\item[super] The \glostyle{super} style uses the \envname{supertabular} %environment (defined by the \isty{supertabular} package). It has two %columns: the first column contains the entry's name and the second %column contains the description followed by the \term{number list}. -%Sub groups are separated with a blank row. +%Sub groups are separated with a blank row. The width of the +%first column is governed by the widest entry in that column. The +%width of the second column is governed by the length +%\ics{glsdescwidth}. % %\item[superborder] The \glostyle{superborder} style is like %\glostyle{super} but has horizontal and vertical lines around it. @@ -2177,7 +2312,11 @@ %\item[super3col] The \glostyle{super3col} style is like %\glostyle{super} but has three columns. The first column contains %the entry's name, the second column contains the description -%and the third column contains the \iterm{number list}. +%and the third column contains the \iterm{number list}. The width of the +%first column is governed by the widest entry in that column. The +%width of the second column is governed by the length +%\ics{glsdescwidth}. The width of the third column is governed by the +%length \ics{glspagelistwidth}. % %\item[super3colborder] The \glostyle{super3colborder} style is like %the \glostyle{super3col} style but has horizontal and vertical @@ -2192,7 +2331,10 @@ % %\item[super4col] The \glostyle{super4col} style is like %\glostyle{super3col} but has an additional column in which the -%entry's associated symbol appears. +%entry's associated symbol appears. This style is designed for +%entries with brief single line descriptions. The column widths are governed by the +%widest entry in the given column. Use \glostyle{altsuper4col} +%for longer descriptions. % %\item[super4colborder] The \glostyle{super4colborder} style is like %the \glostyle{super4col} style but has horizontal and vertical @@ -2205,12 +2347,43 @@ %is like \glostyle{super4colheader} but has horizontal and vertical %lines around it. % +%\item[altsuper4col] The \glostyle{altsuper4col} style is like +%\glostyle{super4col} but allows multi-line descriptions and page +%lists. +%The width of the description column is governed by the length +%\ics{glsdescwidth} and the width of the page list column is +%governed by the length \ics{glspagelistwidth}. The width of the name +%and symbol columns is governed by the widest entry in the +%given column. +% +%\item[altsuper4colborder] The \glostyle{altsuper4colborder} style is like +%the \glostyle{super4colborder} style but allows multi-line descriptions +%and page lists. +% +%\item[altsuper4colheader] The \glostyle{altsuper4colheader} style is like +%\glostyle{super4colheader} but allows multi-line descriptions and +%page lists. +% +%\item[altsuper4colheaderborder] The \glostyle{altsuper4colheaderborder} +%style is like \glostyle{super4colheaderborder} but allows multi-line +%descriptions and page lists. +% %\end{description} % %The glossary style can be set using the \pkgopt{style} package option %or using the \gloskey[printglossary]{style} key in the optional %argument to \ics{printglossary} or using the command:\\[10pt] %\DescribeMacro{\glossarystyle}\cs{glossarystyle}\marg{style-name}\\[10pt] +%The tabular-like styles that allow multi-line descriptions and page +%lists use the length \DescribeMacro{\glsdescwidth}\cs{glsdescwidth} to +%set the width of the description column and the length +%\DescribeMacro{\glspagelistwidth}\cs{glspagelistwidth} to set the +%width of the page list column. These will need to be changed using +%\cs{setlength} if the glossary is too wide. Note that the +%\glostyle{long4col} and \glostyle{super4col} styles (and their header and border +%variations) don't use these lengths as they are designed for single +%line entries. Instead you should use the analogous +%\glostyle{altlong4col} and \glostyle{altsuper4col} styles. % %Note that if you use the \gloskey[printglossary]{style} key in the %optional argument to \ics{printglossary}, it will override any @@ -2229,7 +2402,7 @@ %\glossarystyle{long} %\end{verbatim} %will reset \cs{glsgroupskip} back to its default definition for the -%named glossary style (\dq{long} in this case). If you want to +%named glossary style (\glostyle{long} in this case). If you want to %modify the styles, either use \ics{newglossarystyle} (described %in the next section) or make the modifications after %\ics{glossarystyle}. @@ -2258,7 +2431,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 \cs{glossarypreamble}) or the -%glossary postamble (defined by \cs{glossarypostamble}.) For example, +%glossary postamble (defined by \cs{glossarypostamble}). For example, %the \glostyle{list} style uses the \envname{description} environment, %so the \envname{theglossary} environment is simply redefined to begin %and end the \envname{description} environment. @@ -2491,13 +2664,14 @@ % This package requires \LaTeXe. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2008/06/17 v1.14 (NLCT)] +\ProvidesPackage{glossaries}[2008/08/27 v1.16 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} +\RequirePackage{xfor} % \end{macrocode} % If \isty{babel} package is loaded, check to see if \isty{translator} is installed. % \begin{macrocode} @@ -2621,7 +2795,7 @@ false,nolabel,autolabel}[nolabel]{% % will also be applied to the delimiters. % The \pkgopt{nonumberlist} package option suppresses the % number lists (this simply redefines -% \cs{glossaryentrynumbers} to ignores its argument.) +% \cs{glossaryentrynumbers} to ignores its argument). % \begin{macrocode} \DeclareOptionX{nonumberlist}{% \renewcommand*{\glossaryentrynumbers}[1]{}} @@ -2633,7 +2807,7 @@ false,nolabel,autolabel}[nolabel]{% % affects any commands that can optionally take a glossary name % as an argument (or as the value of the % \gloskey{type}\igloskey[printglossary]{type} key in -%a key-value list.) This was mainly done so that +%a key-value list). This was mainly done so that % \ics{loadglsentries} can temporarily change % \cs{glsdefaulttype} while it loads a file containing % new glossary entries (see \autoref{sec:load}). @@ -2871,6 +3045,14 @@ name=true]{% \providecommand*{\acronymname}{Acronyms} % \end{macrocode} %\end{macro} +%\begin{macro}{\glssettoctitle} +% Sets the TOC title for the given glossary. +%\changes{1.15}{2008 August 15}{new} +% \begin{macrocode} +\newcommand*{\glssettoctitle}[1]{% +\def\glossarytoctitle{\csname @glotype@#1@title\endcsname}} +% \end{macrocode} +%\end{macro} % % The following commands provide text for the headers used by % some of the tabular-like glossary @@ -2924,8 +3106,15 @@ name=true]{% % \isty{babel} captions, otherwise load \isty{translator} % dictionary. %\changes{1.1}{2008 Feb 22}{Added support for translator package} +%\changes{1.15}{2008 August 15}{Added 'glssettoctitle} % \begin{macrocode} \@ifpackageloaded{translator}{\usedictionary{glossaries-dictionary}% + \renewcommand*{\glssettoctitle}[1]{% + \ifthenelse{\equal{#1}{main}}{% + \translatelet{\glossarytoctitle}{Glossary}}{% + \ifthenelse{\equal{#1}{acronym}}{% + \translatelet{\glossarytoctitle}{Acronyms}}{% + \def\glossarytoctitle{\csname @glotype@#1@title\endcsname}}}}% \renewcommand*{\glossaryname}{\translate{Glossary}}% \renewcommand*{\acronymname}{\translate{Acronyms}}% \renewcommand*{\entryname}{\translate{Notation (glossaries)}}% @@ -3002,7 +3191,7 @@ name=true]{% %\end{macro} % Individual numbers in an entry's associated number list are % delimited using \cs{delimN} (which corresponds to the -% \istkey{delim\_n} \appname{makeindex} keyword.) The default value +% \istkey{delim\_n} \appname{makeindex} keyword). The default value % is a comma followed by a space. %\begin{macro}{\delimN} % \begin{macrocode} @@ -3011,7 +3200,7 @@ name=true]{% %\end{macro} % A range of numbers within an entry's associated number list is % delimited using \cs{delimR} (which corresponds to the -% \istkey{delim\_r} \appname{makeindex} keyword.) The default is +% \istkey{delim\_r} \appname{makeindex} keyword). The default is % an en-dash. %\begin{macro}{\delimR} % \begin{macrocode} @@ -3042,7 +3231,7 @@ name=true]{% % This is provided to allow the user to % add something after the end of the \envname{theglossary} % environment (again, this shouldn't be affected by the -% glossary style.) It is, of course, possible to simply add the +% glossary style). It is, of course, possible to simply add the % text after \ics{printglossary}, but if you only want the % postamble to appear after the first glossary, but not after % subsequent glossaries, you can do something like: @@ -3260,7 +3449,7 @@ been defined.}{}}{#2}} % in \cs{@glo@types}. When a new glossary type % is created, its identifying name is added to this list. % This is used by commands that iterate through all glossaries -% (such as \ics{makeglossaries} and \ics{printglossaries}.) +% (such as \ics{makeglossaries} and \ics{printglossaries}). %\begin{macro}{\@glo@types} % \begin{macrocode} \newcommand*{\@glo@types}{,} @@ -3282,7 +3471,7 @@ been defined.}{}}{#2}} % belonging to this glossary. The \appname{makeglossaries} Perl % script reads in the relevant extensions from the auxiliary file, % and passes the appropriate file names and switches to -% \appname{makeindex}.) +% \appname{makeindex}. %\begin{macro}{\newglossary} % \begin{macrocode} \newcommand*{\newglossary}[5][glg]{% @@ -3395,7 +3584,7 @@ exists}% % you will have to disable the sanitize option (using the % \pkgopt{sanitize} package option, % "sanitize={description=false}", and protect fragile -% commands.) The \gloskey{description} key is required when +% commands). The \gloskey{description} key is required when % defining a new glossary entry. (Be careful not to make the % description too long, because \appname{makeindex} has a limited % buffer. \cs{@glo@desc} is defined to be a short command @@ -3418,7 +3607,7 @@ exists}% % % The \gloskey{sort} key needs to be sanitized here % (the sort key is provided for \appname{makeindex}'s benefit, -% not for use in the document.) The \gloskey{sort} key is optional +% not for use in the document). The \gloskey{sort} key is optional % when defining a new glossary entry. If omitted, the value % is given by \meta{name} \meta{description}. % \begin{macrocode} @@ -3475,7 +3664,7 @@ exists}% % by commands like \ics{gls}, you will need to change % \ics{glsdisplay} and \ics{glsdisplayfirst} (either % explicitly for all glossaries or via \ics{defglsdisplay} -% and \ics{defglsdisplayfirst} for individual glossaries.) +% and \ics{defglsdisplayfirst} for individual glossaries). % \begin{macrocode} \define@key{glossentry}{symbol}{% \def\@glo@symbol{#1}% @@ -3547,14 +3736,18 @@ counter as its value}}{% \def\@glo@plural{\@glo@text\glspluralsuffix}% % \end{macrocode} % \changes{1.13}{2008 May 10}{Changed default first value} +% Using \cs{let} instead of \cs{def} to make later comparison +% avoid expansion issues. (Thanks to Ulrich~Diez for suggesting +% this.) +% \changes{1.16}{2008 August 27}{Changed def to let} % \begin{macrocode} -\def\@glo@first{\relax}% +\let\@glo@first\relax % \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)} % \changes{1.13}{2008 May 10}{Changed default firstplural value} % \begin{macrocode} -\def\@glo@firstplural{\relax}% +\let\@glo@firstplural\relax % \end{macrocode} % \begin{macrocode} \def\@glo@sort{\@glo@name}% @@ -3580,16 +3773,19 @@ in it}}{% % has been specified, then form \gloskey{firstplural} by appending % \cs{glspluralsuffix} to value of \gloskey{first} key, otherwise % obtain the value from the \gloskey{plural} key. +% \changes{1.16}{2008 August 27}{Changed if to ifx} +% This now uses \cs{ifx} instead of \cs{if} to avoid expansion +% issues. (Thanks to Ulrich~Diez for suggesting this.) % \begin{macrocode} -\if\relax\@glo@firstplural\relax% - \if\relax\@glo@first\relax% +\ifx\relax\@glo@firstplural + \ifx\relax\@glo@first \def\@glo@firstplural{\@glo@plural}% \def\@glo@first{\@glo@text}% \else \def\@glo@firstplural{\@glo@first\glspluralsuffix}% \fi \else - \if\relax\@glo@first\relax% + \ifx\relax\@glo@first \def\@glo@first{\@glo@text}% \fi \fi @@ -3604,10 +3800,27 @@ in it}}{% \expandafter\protected@xdef\csname glo@#1@counter\endcsname{\@glo@counter}% \@gls@sanitizename \expandafter\protected@xdef\csname glo@#1@name\endcsname{\@glo@name}% +% \end{macrocode} +% The smaller and smallcaps options set the description to +% \cs{@glo@first}. Need to check for this, otherwise it won't get +% expanded if the description gets sanitized. +%\changes{1.15}{2008 August 15}{check for '@glo@first in description}% +% \begin{macrocode} +\def\@glo@@desc{\@glo@first}% +\ifx\@glo@desc\@glo@@desc + \let\@glo@desc\@glo@first +\fi \@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}% +% \end{macrocode} +%\changes{1.15}{2008 August 15}{check for '@glo@text in symbol}% +% \begin{macrocode} +\def\@glo@@symbol{\@glo@text}% +\ifx\@glo@symbol\@glo@@symbol + \let\@glo@symbol\@glo@text +\fi \@gls@sanitizesymbol \expandafter\protected@xdef\csname glo@#1@symbol\endcsname{\@glo@symbol}% \expandafter\protected@xdef\csname glo@#1@symbolplural\endcsname{\@glo@symbolplural}% @@ -3632,7 +3845,7 @@ in it}}{% % Each glossary entry is assigned a conditional of the form %\cs{ifglo@}\meta{label}\texttt{@flag} which determines % whether or not the entry has been used (see also -% \ics{ifglsused} defined below.) These flags can +% \ics{ifglsused} defined below). These flags can % be set and unset using the following macros: % % The command \cs{glsreset}\marg{label} can be used @@ -3722,8 +3935,8 @@ in it}}{% % glossary is used. Only those entries used in the document (via % \ics{glslink}, \ics{gls}, \ics{glspl} and uppercase % variants or \ics{glsadd} and \ics{glsaddall} -% will appear in the glossary.) The mandatory argument is -% the filename (with or without .tex extension.) +% will appear in the glossary). The mandatory argument is +% the filename (with or without .tex extension). %\begin{macro}{\loadglsentries} % \begin{macrocode} \newcommand*{\loadglsentries}[2][\@gls@default]{% @@ -3747,7 +3960,7 @@ in it}}{% % \ics{glslink}, the way the term appears in the text is % determined by \ics{glsdisplayfirst} (if it is the first % time the term has been used) or \ics{glsdisplay} (for -% subsequent use.) Any formatting commands (such as \cs{textbf} +% subsequent use). Any formatting commands (such as \cs{textbf} % is governed by \ics{glstextformat}. By default this just % displays the \term{link text} ``as is''. %\changes{1.04}{2007 Aug 3}{Added 'glstextformat}% @@ -3893,9 +4106,11 @@ counter as its value}}{% % Define the un-starred version: %\begin{macro}{\@gls@link} %\changes{1.07}{2007 Sep 13}{fixed bug caused by \cs{theglsentrycounter} setting the page number too soon} +%\changes{1.15}{2008 August 15}{added 'glslabel} % \begin{macrocode} \newcommand*{\@gls@link}[3][]{% \glsdoifexists{#2}{% +\def\glslabel{#2}% \def\@glsnumberformat{glsnumberformat}% \edef\@gls@counter{\csname glo@#2@counter\endcsname}% \KV@glslink@hypertrue @@ -4245,11 +4460,17 @@ counter as its value}}{% % 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}. +%\changes{1.16}{2008 August 27}{raised the hypertarget so the target text doesn't +% scroll off the top of the page} % \begin{macrocode} +\newlength\gls@tmplen \@ifundefined{hypertarget}{% \gdef\@glstarget#1#2{#2}% }{% - \gdef\@glstarget#1#2{\hypertarget{#1}{#2}}} + \gdef\@glstarget#1#2{% + \settoheight{\gls@tmplen}{#2}% + \raisebox{\gls@tmplen}{\hypertarget{#1}{}}#2}% +} % \end{macrocode} %\end{macro} % @@ -4268,7 +4489,9 @@ counter as its value}}{% % \begin{macrocode} \newcommand{\glsenablehyper}{% \renewcommand*\@glslink[2]{\hyperlink{##1}{##2}}% -\renewcommand*\@glstarget[2]{\hypertarget{##1}{##2}}} +\renewcommand*\@glstarget[2]{% + \settoheight{\gls@tmplen}{##2}% + \raisebox{\gls@tmplen}{\hypertarget{##1}{}}##2}} % \end{macrocode} %\end{macro} % @@ -4333,15 +4556,18 @@ counter as its value}}{% % Call \cs{@gls@link}. % If \pkgopt{footnote} package option has been used, suppress % hyperlink for first use. +%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to +%checking if footnote option has been used} % \begin{macrocode} \ifglsused{#2}{% \@gls@link[#1]{#2}{\@glo@text}% }{% - \ifglsacrfootnote + \ifthenelse{\equal{\@glo@type}{\acronymtype}\and + \boolean{glsacrfootnote}}{% \@gls@link[#1,hyper=false]{#2}{\@glo@text}% - \else + }{% \@gls@link[#1]{#2}{\@glo@text}% - \fi + }% }% % \end{macrocode} % Indicate that this entry has now been used @@ -4353,7 +4579,7 @@ counter as its value}}{% % \cs{Gls} behaves like \cs{gls}, but the first letter % of the link text is converted to uppercase (note that if the % first letter has an accent, the accented letter will need to -% be grouped when you define the entry.) It is mainly intended +% be grouped when you define the entry). It is mainly intended % for terms that start a sentence: %\begin{macro}{\Gls} % \begin{macrocode} @@ -4393,18 +4619,21 @@ counter as its value}}{% % Call \cs{@gls@link} % If \pkgopt{footnote} package option has been used, suppress % hyperlink for first use. +%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to +%checking if footnote option has been used} % \begin{macrocode} \ifglsused{#2}{% \@gls@link[#1]{#2}{% \expandafter\makefirstuc\expandafter{\@glo@text}}% }{% - \ifglsacrfootnote + \ifthenelse{\equal{\@glo@type}{\acronymtype}\and + \boolean{glsacrfootnote}}{% \@gls@link[#1,hyper=false]{#2}{% \expandafter\makefirstuc\expandafter{\@glo@text}}% - \else + }{% \@gls@link[#1]{#2}{% \expandafter\makefirstuc\expandafter{\@glo@text}}% - \fi + }% }% % \end{macrocode} % Indicate that this entry has now been used @@ -4453,15 +4682,18 @@ counter as its value}}{% % Call \cs{@gls@link} % If \pkgopt{footnote} package option has been used, suppress % hyperlink for first use. +%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to +%checking if footnote option has been used} % \begin{macrocode} \ifglsused{#2}{% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% }{% - \ifglsacrfootnote + \ifthenelse{\equal{\@glo@type}{\acronymtype}\and + \boolean{glsacrfootnote}}{% \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}% - \else + }{% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% - \fi + }% }% % \end{macrocode} % Indicate that this entry has now been used @@ -4514,15 +4746,18 @@ counter as its value}}{% % Call \cs{@gls@link} % If \pkgopt{footnote} package option has been used, suppress % hyperlink for first use. +%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to +%checking if footnote option has been used} % \begin{macrocode} \ifglsused{#2}{% \@gls@link[#1]{#2}{\@glo@text}% }{% - \ifglsacrfootnote + \ifthenelse{\equal{\@glo@type}{\acronymtype}\and + \boolean{glsacrfootnote}}{% \@gls@link[#1,hyper=false]{#2}{\@glo@text}% - \else + }{% \@gls@link[#1]{#2}{\@glo@text}% - \fi + }% }% % \end{macrocode} % Indicate that this entry has now been used @@ -4534,7 +4769,7 @@ counter as its value}}{% % \cs{Glspl} behaves in the same way as \ics{glspl}, except % that the first letter of the link text is converted to uppercase % (as with \ics{Gls}, if the first letter has an accent, it -% will need to be grouped.) +% will need to be grouped). %\begin{macro}{\Glspl} % \begin{macrocode} \newcommand*{\Glspl}{\@ifstar\@sGlspl\@Glspl} @@ -4577,18 +4812,21 @@ counter as its value}}{% % Call \cs{@gls@link} % If \pkgopt{footnote} package option has been used, suppress % hyperlink for first use. +%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to +%checking if footnote option has been used} % \begin{macrocode} \ifglsused{#2}{% \@gls@link[#1]{#2}{% \expandafter\makefirstuc\expandafter{\@glo@text}}% }{% - \ifglsacrfootnote + \ifthenelse{\equal{\@glo@type}{\acronymtype}\and + \boolean{glsacrfootnote}}{% \@gls@link[#1,hyper=false]{#2}{% \expandafter\makefirstuc\expandafter{\@glo@text}}% - \else + }{% \@gls@link[#1]{#2}{% \expandafter\makefirstuc\expandafter{\@glo@text}}% - \fi + }% }% % \end{macrocode} % Indicate that this entry has now been used @@ -4641,15 +4879,18 @@ counter as its value}}{% % Call \cs{@gls@link} % If \pkgopt{footnote} package option has been used, suppress % hyperlink for first use. +%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to +%checking if footnote option has been used} % \begin{macrocode} \ifglsused{#2}{% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% }{% - \ifglsacrfootnote + \ifthenelse{\equal{\@glo@type}{\acronymtype}\and + \boolean{glsacrfootnote}}{% \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}% - \else + }{% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% - \fi + }% }% % \end{macrocode} % Indicate that this entry has now been used @@ -5667,12 +5908,13 @@ counter as its value}}{% % % \subsubsection{Displaying entry details without adding % information to the glossary} +%\label{sec:code:glsnolink} % % These commands merely display entry information without adding % entries in the associated file or having hyperlinks. % % Get the entry name (as specified by the \gloskey{name} key -% when the entry was defined.) The argument +% 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 contains @@ -5691,7 +5933,7 @@ counter as its value}}{% %\end{macro} % % Get the entry description (as specified by the -% \gloskey{description} when the entry was defined.) The argument +% \gloskey{description} when the entry was defined). The argument % is the label associated with the entry. Note that unless you % used \texttt{description=false} in the \pkgopt{sanitize} package % option you may get unexpected results if the \gloskey{description} @@ -5791,7 +6033,7 @@ counter as its value}}{% % % Get the entry text to be used when the entry is first used in % the document (as specified by the \gloskey{first} key when -% the entry was defined.) +% the entry was defined). %\begin{macro}{\glsentryfirst} % \begin{macrocode} \newcommand*{\glsentryfirst}[1]{\csname glo@#1@first\endcsname} @@ -5806,7 +6048,7 @@ counter as its value}}{% %\end{macro} % % Get the plural form (as specified by the \gloskey{firstplural} -% key when the entry was defined.) +% key when the entry was defined). %\begin{macro}{\glsentryfirstplural} % \begin{macrocode} \newcommand*{\glsentryfirstplural}[1]{% @@ -5887,7 +6129,7 @@ counter as its value}}{% %\vskip5pt %\cs{glsaddall}\oarg{glossary list}\\[10pt] % Add all terms defined for the listed glossaries (without displaying -% any text.) If \gloskey[glsaddall]{types} key is omitted, apply to all +% any text). If \gloskey[glsaddall]{types} key is omitted, apply to all % glossary types. %\begin{macro}{\glsaddall} % \begin{macrocode} @@ -5915,7 +6157,7 @@ counter as its value}}{% % but don't change these values, because the characters are % encoded in the command definitions that are used to escape % the special characters (which means that the user no longer -% needs to worry about \appname{makeindex} special characters.) +% needs to worry about \appname{makeindex} special characters). % % The symbols and numbers label for group headings are hardwired into % the \filetype{.ist} file as \texttt{glssymbols} and @@ -5976,7 +6218,7 @@ counter as its value}}{% % %The command \cs{noist} will suppress the creation of % the \filetype{.ist} file (it simply redefines -% \cs{writeist} to do nothing.) Obviously you need to use this +% \cs{writeist} to do nothing). Obviously you need to use this % command before \cs{writeist} to have any effect. Since % the \filetype{.ist} file should only be created once, \cs{noist} % is called at the end of \cs{writeist}. @@ -5993,13 +6235,13 @@ counter as its value}}{% % \meta{out-ext} parameter used in \ics{newglossary} % (and it will also activate the \ics{glossary} command, % and create the customized \filetype{.ist} \appname{makeindex} -% style file.) +% style file). % % Note that you can't use \cs{@makeglossary} for only some of the % defined glossaries. You either need to have a \cs{makeglossary} % for all glossaries or none (otherwise you will end up with a % situation where \TeX\ is trying to write to a non-existant -% file.) The relevant glossary must be +% file). The relevant glossary must be % defined prior to using \cs{@makeglossary}. %\begin{macro}{\@makeglossary} % \begin{macrocode} @@ -6086,7 +6328,7 @@ to move \string\makeglossaries\space after all your % The \cs{@wrglossary} command is redefined to have % two arguments. The first argument is the glossary type, % the second argument is the glossary entry -% (the format of which is set in \cs{glslink}.) +% (the format of which is set in \cs{glslink}). %\begin{macro}{\@wrglossary} % \begin{macrocode} \renewcommand*{\@wrglossary}[2]{% @@ -6102,15 +6344,21 @@ to move \string\makeglossaries\space after all your % The optional argument can be used to specify an alternative % glossary, and can also be used to set the style, title and % entry in the table of contents. Available keys are defined below. +% %\begin{macro}{\printglossary} +%\changes{1.15}{2008 August 15}{changed the way the TOC title is set} +% The TOC title needs to be processed in a different manner +% to the main title in case the \sty{translator} and \sty{hyperref} packages +% are both being used. % \begin{macrocode} \newcommand*{\printglossary}[1][type=\glsdefaulttype]{% \def\@glo@type{\glsdefaulttype}% \def\glossarytitle{\csname @glotype@\@glo@type @title\endcsname}% -\def\glossarytoctitle{\glossarytitle}% \def\@glossarystyle{}% +\def\gls@dotoctitle{\glssettoctitle{\@glo@type}}% \bgroup \setkeys{printgloss}{#1}% +\gls@dotoctitle \@glossarystyle \makeatletter \@input@{\jobname.\csname @glotype@\@glo@type @in\endcsname}% @@ -6150,10 +6398,12 @@ to move \string\makeglossaries\space after all your % The \gloskey[printglossary]{toctitle} sets the text used for the relevant entry % in the table of contents. % \begin{macrocode} -\define@key{printgloss}{toctitle}{\def\glossarytoctitle{#1}} +\define@key{printgloss}{toctitle}{\def\glossarytoctitle{#1}% +\let\gls@dotoctitle\relax +} % \end{macrocode} % The \gloskey[printglossary]{style} key sets the glossary style (but only for -% the given glossary.) +% the given glossary). % \begin{macrocode} \define@key{printgloss}{style}{% \@ifundefined{@glsstyle@#1}{\PackageError{glossaries}{Glossary @@ -6263,7 +6513,7 @@ false,nolabel,autolabel}[nolabel]{% % you want each group to have a heading, you would then need to % modify the translation control sequences \cs{glsgetgrouptitle} % and \cs{glsgetgrouplabel} so that the label is translated -% into the required title (and vice-versa.) +% into the required title (and vice-versa). %\\[10pt] %\cs{glsgetgrouptitle}\marg{label}\\[10pt] % This command produces the title for the glossary group @@ -6324,7 +6574,7 @@ style `#1' undefined}{}}{% % \envname{theglossary}, \ics{glossaryheader}, % \ics{glsgroupheading}, \ics{glossaryentryfield} and % \ics{glsgroupskip} (see \autoref{sec:code:styles} for the -% definitions of predefined styles.) Glossary styles should not +% definitions of predefined styles). Glossary styles should not % redefine \ics{glossarypreamble} and % \ics{glossarypostamble}, as % the user should be able to switch between styles without affecting @@ -6382,7 +6632,7 @@ style `#1' undefined}{}}{% % \cs{@delimR} displays a range of numbers for the counter % whose name is given by % \cs{@gls@counter} (which must be set prior to using -% \cs{glshypernumber}.) +% \cs{glshypernumber}). %\begin{macro}{\@delimR} % \begin{macrocode} \def\@delimR#1\delimR #2\delimR #3\\{% @@ -7555,14 +7805,47 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % by \meta{type}. %\begin{macro}{\glsnavhypertarget} %\changes{1.14}{2008 June 17}{added write to aux file} +%\changes{1.15}{2008 August 15}{added check if rerun required} % \begin{macrocode} \@ifundefined{hypertarget}{% \newcommand*{\glsnavhypertarget}[3][\@glo@type]{% \protected@write\@auxout{}{\string\@gls@hypergroup{#1}{#2}}% -#3}}{% +#3% +\expandafter +\let\expandafter\@gls@list\csname @gls@hypergrouplist@#1\endcsname +\@for\@gls@elem:=\@gls@list\do{% +\ifthenelse{\equal{\@gls@elem}{#2}}{\@endfortrue}{}}% +\if@endfor +\else + \PackageWarningNoLine{glossaries}{Navigation panel + for glossary type `#1'^^Jmissing group `#2'}% + \gdef\gls@hypergrouprerun{% + \PackageWarningNoLine{glossaries}{Navigation panel + has changed. Rerun LaTeX}}% +\fi}}{% \newcommand*{\glsnavhypertarget}[3][\@glo@type]{% \protected@write\@auxout{}{\string\@gls@hypergroup{#1}{#2}}% -\hypertarget{glsn:#1@#2}{#3}}} +\hypertarget{glsn:#1@#2}{#3}% +\expandafter +\let\expandafter\@gls@list\csname @gls@hypergrouplist@#1\endcsname +\@for\@gls@elem:=\@gls@list\do{% +\ifthenelse{\equal{\@gls@elem}{#2}}{\@endfortrue}{}}% +\if@endfor +\else + \PackageWarningNoLine{glossaries}{Navigation panel + for glossary type `#1'^^Jmissing group `#2'}% + \gdef\gls@hypergrouprerun{% + \PackageWarningNoLine{glossaries}{Navigation panel + has changed. Rerun LaTeX}}% +\fi}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\gls@hypergrouprerun} +% Give a warning at the end if rerun required +%\changes{1.15}{2008 August 15}{new} +% \begin{macrocode} +\let\gls@hypergrouprerun\relax +\AtEndDocument{\gls@hypergrouprerun} % \end{macrocode} %\end{macro} % @@ -7703,7 +7986,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}} % \end{macrocode} % The \glostyle{altlisthypergroup} glossary style is like the -% \glostyle{altlisthypergroup} style, but has a +% \glostyle{altlistgroup} style, but has a % set of links to the groups at the start of the glossary. % \begin{macrocode} \newglossarystyle{altlisthypergroup}{% @@ -7899,6 +8182,46 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \bfseries\pagelistname\\\hline\endhead\hline\endfoot}% } % \end{macrocode} +% The \glostyle{altlong4col} style is like the \glostyle{long4col} +% style but can have multiline descriptions and page lists. +% \begin{macrocode} +\newglossarystyle{altlong4col}{% +\glossarystyle{long4col}% +\renewenvironment{theglossary}{% +\begin{longtable}{lp{\glsdescwidth}lp{\glspagelistwidth}}}{% +\end{longtable}}% +} +% \end{macrocode} +% The \glostyle{altlong4colheader} style is like \glostyle{altlong4col} +% but with a header row. +% \begin{macrocode} +\newglossarystyle{altlong4colheader}{% +\glossarystyle{long4colheader}% +\renewenvironment{theglossary}{% +\begin{longtable}{lp{\glsdescwidth}lp{\glspagelistwidth}}}{% +\end{longtable}}% +} +% \end{macrocode} +% The \glostyle{altlong4colborder} style is like +% \glostyle{altlong4col} but with a border. +% \begin{macrocode} +\newglossarystyle{altlong4colborder}{% +\glossarystyle{long4colborder}% +\renewenvironment{theglossary}{% +\begin{longtable}{|l|p{\glsdescwidth}|l|p{\glspagewidthlist}|}}{% +\end{longtable}}% +} +% \end{macrocode} +% The \glostyle{altlong4colheaderborder} style is like the above but +% with a header as well as a border. +% \begin{macrocode} +\newglossarystyle{altlong4colheaderborder}{% +\glossarystyle{long4colheaderborder}% +\renewenvironment{theglossary}{% +\begin{longtable}{|l|p{\glsdescwidth}|l|p{\glspagewidthlist}|}}{% +\end{longtable}}% +} +% \end{macrocode} %\iffalse % \begin{macrocode} %</glossary-long.sty> @@ -8069,6 +8392,54 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \end{supertabular}}% } % \end{macrocode} +% The \glostyle{altsuper4col} glossary style is like \glostyle{super4col} +% but has provision for multiline descriptions. +% \begin{macrocode} +\newglossarystyle{altsuper4col}{% +\glossarystyle{super4col}% +\renewenvironment{theglossary}{% +\tablehead{}\tabletail{}% +\begin{supertabular}{lp{\glsdescwidth}lp{\glspagelistwidth}}}{% +\end{supertabular}}% +} +% \end{macrocode} +% The \glostyle{altsuper4colheader} style is like +% the \glostyle{altsuper4col} but with a header row. +% \begin{macrocode} +\newglossarystyle{altsuper4colheader}{% +\glossarystyle{super4colheader}% +\renewenvironment{theglossary}{% +\tablehead{\bfseries\entryname&\bfseries\descriptionname& +\bfseries\symbolname & +\bfseries\pagelistname\\}\tabletail{}% +\begin{supertabular}{lp{\glsdescwidth}lp{\glspagelistwidth}}}{% +\end{supertabular}}% +} +% \end{macrocode} +% The \glostyle{altsuper4colborder} style is like +% the \glostyle{altsuper4col} but with a border. +% \begin{macrocode} +\newglossarystyle{altsuper4colborder}{% +\glossarystyle{super4colborder}% +\renewenvironment{theglossary}{% +\tablehead{\hline}\tabletail{\hline}% +\begin{supertabular}{|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}{% +\end{supertabular}}% +} +% \end{macrocode} +% The \glostyle{altsuper4colheaderborder} style is like +% the \glostyle{altsuper4col} but with a header and border. +% \begin{macrocode} +\newglossarystyle{altsuper4colheaderborder}{% +\glossarystyle{super4colheaderborder}% +\renewenvironment{theglossary}{% +\tablehead{\hline\bfseries\entryname&\bfseries\descriptionname& +\bfseries\symbolname & +\bfseries\pagelistname\\}\tabletail{\hline}% +\begin{supertabular}{|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}{% +\end{supertabular}}% +} +% \end{macrocode} %\iffalse % \begin{macrocode} %</glossary-super.sty> @@ -8541,8 +8912,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \documentclass{article} \listfiles +\usepackage{hyperref} %\usepackage{glossaries} % acronym will go in main glossary - \usepackage[acronym]{glossaries} % make a separate list of acronyms + \usepackage[acronym,footnote]{glossaries} % make a separate list of acronyms \makeglossaries @@ -9721,8 +10093,8 @@ description={the hash symbol}} # File : glossaries.perl # Author : Nicola L.C. Talbot # Date : 14th June 2007 -# Last Modified : 22 February 2008 -# Version : 1.03 +# Last Modified : 25th July 2008 +# Version : 1.04 # Description : LaTeX2HTML (limited!) implementation of glossaries # package. Note that not all the glossaries.sty # macros have been implemented. @@ -9761,7 +10133,8 @@ sub do_glossaries_toc{ sub do_glossaries_toc_true{ } -$GLSCURRENTFORMAT="textrm"; +$GLSCURRENTFORMAT="textrm" if (!defined($GLSCURRENTFORMAT)); +$GLOSSARY_END_DESCRIPTION = '. ' if (!defined($GLOSSARY_END_DESCRIPTION)); sub do_cmd_glossaryname{ "Glossary$_[0]" @@ -9921,14 +10294,14 @@ sub add_real_gls{ $delimN . $glossary{$type}{$key} . $linktext - . "</A>\n" + . "</A>" : "<DT>" - . $name + . "<A NAME=\"gls:$entry\">$name</A>" . "<DD>" . $glsentry{$entry}{'description'} - . $symbol . '. ' + . $symbol . $GLOSSARY_END_DESCRIPTION . $glossary{$type}{$key} - . $linktext. "</A>\n"); + . $linktext. "</A>"); $previous = $current; } $glossary = '<DD>'.$glossary unless ($glossary =~ /^\s*<D(T|D)>/); @@ -10061,6 +10434,11 @@ sub make_textohtmlglossary{ $toc_sec_title = $toctitle; $glsfile{$type} = $CURRENT_FILE; + if (defined($frame_main_suffix)) + { + $glsfile{$type}=~s/$frame_main_suffix/$frame_body_suffix/; + } + $TITLE=&translate_commands($toctitle); if (%glossary_labels) { &make_glossary_labels(); } @@ -10139,7 +10517,9 @@ sub make_glossary_entry { &make_real_glossary_entry(@_) } sub make_real_glossary_entry { local($entry,$text,$type) = @_; local($this_file) = $CURRENT_FILE; - $TITLE = $saved_title if (($saved_title)&&(!($TITLE)||($TITLE eq $default_title))); + + $TITLE = $saved_title + if (($saved_title)&&(!($TITLE)||($TITLE eq $default_title))); local($sort) = $glsentry{$entry}{'sort'}; @@ -10148,12 +10528,30 @@ sub make_real_glossary_entry { # concatenate multiple spaces into a single space # otherwise keys won't sort properly $str=~s/\s+/ /gs; - local($br_id) = ++$global{'max_id'}; - $glossary{$type}{$str} .= &make_half_href($this_file."#$br_id"); + + local($id) = ++$glsentry{$entry}{'maxid'}; + local($glsanchor)="gls:$entry$id"; + + local($target) = $frame_body_name; + + if (defined($frame_main_suffix)) + { + $this_file=~s/$frame_main_suffix/$frame_body_suffix/; + } + + $glossary{$type}{$str} .= &make_half_href($this_file."#$glsanchor"); $glossary_format{$type}{$str} = $GLSCURRENTFORMAT; $glossary_entry{$type}{$str} = $entry; $glossary_linktext{$type}{$str} = $TITLE; - "<A HREF=$gls_file_mark{$type}#tex2html$href_name NAME=\"$br_id\">$text<\/A>"; + + if (defined($frame_foot_name)) + { + "<A HREF=$gls_file_mark{$type}#gls:$entry NAME=\"$glsanchor\" TARGET=\"$frame_foot_name\">$text<\/A>"; + } + else + { + "<A HREF=$gls_file_mark{$type}#gls:$entry NAME=\"$glsanchor\">$text<\/A>"; + } } sub do_cmd_newglossary{ @@ -10332,7 +10730,8 @@ sub gls_entry_init{ plural => "${name}s", firstplural => "${name}s", symbol => '', - flag => 0 + flag => 0, + maxid=>0 ); } @@ -10877,10 +11276,16 @@ sub do_cmd_glsunsetall{ $_; } +$glslabel = ''; + +sub do_cmd_glslabel{ $glslabel.$_[0] } + sub make_glslink{ local($type,$label,$format,$text) = @_; local($str) = ''; + $glslabel = $label; + if (defined $type) { $str = &gls_add_entry($type,$label,$format,$text); @@ -10919,6 +11324,25 @@ sub do_cmd_glslink{ &make_glslink($type, $label, $format, $text) . $_; } +sub do_cmd_glslinkstar{ + local($_) = @_; + local($optarg,$pat,$label,$text,$type,$format,$str); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + $text = &missing_braces unless + (s/$next_pair_pr_rx/$text=$2;''/eo); + + $type = &gls_get_type($label); + + $text . $_; +} + sub do_cmd_glsentrydesc{ local($_) = @_; @@ -11111,6 +11535,64 @@ sub do_cmd_gls{ &make_glslink($type, $label, $format, $link_text) .$space . $_; } +# added v1.04 +sub do_cmd_glsstar{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + if (&gls_used($label)) + { + # entry has already been used + + $text = &gls_get_text($label); + $display = &gls_get_display($type); + } + else + { + # entry hasn't been used + + $text = &gls_get_first($label); + $display = &gls_get_displayfirst($type); + + &unset_entry($label); + } + + local($args) = ''; + + local($id) = ++$global{'max_id'}; + $args .= "$OP$id$CP$text$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{description}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{symbol}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$insert$OP$id$CP"; + + local($link_text) = &translate_commands("$display$args"); + + $link_text . $space . $_; +} + sub do_cmd_glspl{ local($_) = @_; local($optarg,$pat,$label,$text, $format, $insert); @@ -11168,6 +11650,64 @@ sub do_cmd_glspl{ &make_glslink($type, $label, $format, $link_text) . $space . $_; } +# added v1.04 +sub do_cmd_glsplstar{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = $glsentry{$label}{'type'}; + + if (&gls_used($label)) + { + # entry has already been used + + $text = &gls_get_plural($label); + $display = &gls_get_display($type);; + } + else + { + # entry hasn't been used + + $text = &gls_get_firstplural($label); + $display = &gls_get_displayfirst($type); + + &unset_entry($label); + } + + local($args) = ''; + + local($id) = ++$global{'max_id'}; + $args .= "$OP$id$CP$text$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{description}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{symbol}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$insert$OP$id$CP"; + + local($link_text) = &translate_commands("$display$args"); + + $link_text . $space . $_; +} + sub do_cmd_Gls{ local($_) = @_; local($optarg,$pat,$label,$text, $format, $insert); @@ -11225,6 +11765,64 @@ sub do_cmd_Gls{ &make_glslink($type, $label, $format, ucfirst($link_text)). $space . $_; } +# added v1.04 +sub do_cmd_Glsstar{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = $glsentry{$label}{'type'}; + + if (&gls_used($label)) + { + # entry has already been used + + $text = &gls_get_text($label); + $display = &gls_get_display($type);; + } + else + { + # entry hasn't been used + + $text = &gls_get_first($label); + $display = &gls_get_displayfirst($type); + + &unset_entry($label); + } + + local($args) = ''; + + local($id) = ++$global{'max_id'}; + $args .= "$OP$id$CP$text$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{description}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{symbol}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$insert$OP$id$CP"; + + local($link_text) = &translate_commands("$display$args"); + + ucfirst($link_text). $space . $_; +} + sub do_cmd_Glspl{ local($_) = @_; local($optarg,$pat,$label,$text, $format, $insert); @@ -11282,6 +11880,64 @@ sub do_cmd_Glspl{ &make_glslink($type, $label, $format, ucfirst($link_text)).$space . $_; } +# added v1.04 +sub do_cmd_Glsplstar{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = $glsentry{$label}{'type'}; + + if (&gls_used($label)) + { + # entry has already been used + + $text = &gls_get_plural($label); + $display = &gls_get_display($type);; + } + else + { + # entry hasn't been used + + $text = &gls_get_firstplural($label); + $display = &gls_get_displayfirst($type); + + &unset_entry($label); + } + + local($args) = ''; + + local($id) = ++$global{'max_id'}; + $args .= "$OP$id$CP$text$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{description}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{symbol}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$insert$OP$id$CP"; + + local($link_text) = &translate_commands("$display$args"); + + ucfirst($link_text).$space . $_; +} + sub do_cmd_GLS{ local($_) = @_; local($optarg,$pat,$label,$text, $format, $insert); @@ -11339,6 +11995,64 @@ sub do_cmd_GLS{ &make_glslink($type, $label, $format, uc($link_text)).$space . $_; } +# added v1.04 +sub do_cmd_GLSstar{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = $glsentry{$label}{'type'}; + + if (&gls_used($label)) + { + # entry has already been used + + $text = &gls_get_text($label); + $display = &gls_get_display($type);; + } + else + { + # entry hasn't been used + + $text = &gls_get_first($label); + $display = &gls_get_displayfirst($type); + + &unset_entry($label); + } + + local($args) = ''; + + local($id) = ++$global{'max_id'}; + $args .= "$OP$id$CP$text$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{description}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{symbol}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$insert$OP$id$CP"; + + local($link_text) = &translate_commands("$display$args"); + + uc($link_text).$space . $_; +} + sub do_cmd_GLSpl{ local($_) = @_; local($optarg,$pat,$label,$text, $format, $insert); @@ -11396,6 +12110,64 @@ sub do_cmd_GLSpl{ &make_glslink($type, $label, $format, uc($link_text)).$space . $_; } +# added v1.04 +sub do_cmd_GLSplstar{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = $glsentry{$label}{'type'}; + + if (&gls_used($label)) + { + # entry has already been used + + $text = &gls_get_plural($label); + $display = &gls_get_display($type);; + } + else + { + # entry hasn't been used + + $text = &gls_get_firstplural($label); + $display = &gls_get_displayfirst($type); + + &unset_entry($label); + } + + local($args) = ''; + + local($id) = ++$global{'max_id'}; + $args .= "$OP$id$CP$text$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{description}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{symbol}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$insert$OP$id$CP"; + + local($link_text) = &translate_commands("$display$args"); + + uc($link_text).$space . $_; +} + # added 22 Feb 2008 sub do_cmd_glstext{ local($_) = @_; diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins index 7996164767c..1fad698c1d4 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/6/18 16:44 +% glossaries.ins generated using makedtx version 0.94b 2008/8/27 12:55 \input docstrip \preamble diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.perl b/Master/texmf-dist/source/latex/glossaries/glossaries.perl index d666df02b57..9aa8f17e5bb 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.perl +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.perl @@ -1,8 +1,8 @@ # File : glossaries.perl # Author : Nicola L.C. Talbot # Date : 14th June 2007 -# Last Modified : 22 February 2008 -# Version : 1.03 +# Last Modified : 25th July 2008 +# Version : 1.04 # Description : LaTeX2HTML (limited!) implementation of glossaries # package. Note that not all the glossaries.sty # macros have been implemented. @@ -40,7 +40,8 @@ sub do_glossaries_toc{ sub do_glossaries_toc_true{ } -$GLSCURRENTFORMAT="textrm"; +$GLSCURRENTFORMAT="textrm" if (!defined($GLSCURRENTFORMAT)); +$GLOSSARY_END_DESCRIPTION = '. ' if (!defined($GLOSSARY_END_DESCRIPTION)); sub do_cmd_glossaryname{ "Glossary$_[0]" @@ -200,14 +201,14 @@ sub add_real_gls{ $delimN . $glossary{$type}{$key} . $linktext - . "</A>\n" + . "</A>" : "<DT>" - . $name + . "<A NAME=\"gls:$entry\">$name</A>" . "<DD>" . $glsentry{$entry}{'description'} - . $symbol . '. ' + . $symbol . $GLOSSARY_END_DESCRIPTION . $glossary{$type}{$key} - . $linktext. "</A>\n"); + . $linktext. "</A>"); $previous = $current; } $glossary = '<DD>'.$glossary unless ($glossary =~ /^\s*<D(T|D)>/); @@ -340,6 +341,11 @@ sub make_textohtmlglossary{ $toc_sec_title = $toctitle; $glsfile{$type} = $CURRENT_FILE; + if (defined($frame_main_suffix)) + { + $glsfile{$type}=~s/$frame_main_suffix/$frame_body_suffix/; + } + $TITLE=&translate_commands($toctitle); if (%glossary_labels) { &make_glossary_labels(); } @@ -418,7 +424,9 @@ sub make_glossary_entry { &make_real_glossary_entry(@_) } sub make_real_glossary_entry { local($entry,$text,$type) = @_; local($this_file) = $CURRENT_FILE; - $TITLE = $saved_title if (($saved_title)&&(!($TITLE)||($TITLE eq $default_title))); + + $TITLE = $saved_title + if (($saved_title)&&(!($TITLE)||($TITLE eq $default_title))); local($sort) = $glsentry{$entry}{'sort'}; @@ -427,12 +435,30 @@ sub make_real_glossary_entry { # concatenate multiple spaces into a single space # otherwise keys won't sort properly $str=~s/\s+/ /gs; - local($br_id) = ++$global{'max_id'}; - $glossary{$type}{$str} .= &make_half_href($this_file."#$br_id"); + + local($id) = ++$glsentry{$entry}{'maxid'}; + local($glsanchor)="gls:$entry$id"; + + local($target) = $frame_body_name; + + if (defined($frame_main_suffix)) + { + $this_file=~s/$frame_main_suffix/$frame_body_suffix/; + } + + $glossary{$type}{$str} .= &make_half_href($this_file."#$glsanchor"); $glossary_format{$type}{$str} = $GLSCURRENTFORMAT; $glossary_entry{$type}{$str} = $entry; $glossary_linktext{$type}{$str} = $TITLE; - "<A HREF=$gls_file_mark{$type}#tex2html$href_name NAME=\"$br_id\">$text<\/A>"; + + if (defined($frame_foot_name)) + { + "<A HREF=$gls_file_mark{$type}#gls:$entry NAME=\"$glsanchor\" TARGET=\"$frame_foot_name\">$text<\/A>"; + } + else + { + "<A HREF=$gls_file_mark{$type}#gls:$entry NAME=\"$glsanchor\">$text<\/A>"; + } } sub do_cmd_newglossary{ @@ -611,7 +637,8 @@ sub gls_entry_init{ plural => "${name}s", firstplural => "${name}s", symbol => '', - flag => 0 + flag => 0, + maxid=>0 ); } @@ -1156,10 +1183,16 @@ sub do_cmd_glsunsetall{ $_; } +$glslabel = ''; + +sub do_cmd_glslabel{ $glslabel.$_[0] } + sub make_glslink{ local($type,$label,$format,$text) = @_; local($str) = ''; + $glslabel = $label; + if (defined $type) { $str = &gls_add_entry($type,$label,$format,$text); @@ -1198,6 +1231,25 @@ sub do_cmd_glslink{ &make_glslink($type, $label, $format, $text) . $_; } +sub do_cmd_glslinkstar{ + local($_) = @_; + local($optarg,$pat,$label,$text,$type,$format,$str); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + $text = &missing_braces unless + (s/$next_pair_pr_rx/$text=$2;''/eo); + + $type = &gls_get_type($label); + + $text . $_; +} + sub do_cmd_glsentrydesc{ local($_) = @_; @@ -1390,6 +1442,64 @@ sub do_cmd_gls{ &make_glslink($type, $label, $format, $link_text) .$space . $_; } +# added v1.04 +sub do_cmd_glsstar{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + if (&gls_used($label)) + { + # entry has already been used + + $text = &gls_get_text($label); + $display = &gls_get_display($type); + } + else + { + # entry hasn't been used + + $text = &gls_get_first($label); + $display = &gls_get_displayfirst($type); + + &unset_entry($label); + } + + local($args) = ''; + + local($id) = ++$global{'max_id'}; + $args .= "$OP$id$CP$text$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{description}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{symbol}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$insert$OP$id$CP"; + + local($link_text) = &translate_commands("$display$args"); + + $link_text . $space . $_; +} + sub do_cmd_glspl{ local($_) = @_; local($optarg,$pat,$label,$text, $format, $insert); @@ -1447,6 +1557,64 @@ sub do_cmd_glspl{ &make_glslink($type, $label, $format, $link_text) . $space . $_; } +# added v1.04 +sub do_cmd_glsplstar{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = $glsentry{$label}{'type'}; + + if (&gls_used($label)) + { + # entry has already been used + + $text = &gls_get_plural($label); + $display = &gls_get_display($type);; + } + else + { + # entry hasn't been used + + $text = &gls_get_firstplural($label); + $display = &gls_get_displayfirst($type); + + &unset_entry($label); + } + + local($args) = ''; + + local($id) = ++$global{'max_id'}; + $args .= "$OP$id$CP$text$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{description}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{symbol}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$insert$OP$id$CP"; + + local($link_text) = &translate_commands("$display$args"); + + $link_text . $space . $_; +} + sub do_cmd_Gls{ local($_) = @_; local($optarg,$pat,$label,$text, $format, $insert); @@ -1504,6 +1672,64 @@ sub do_cmd_Gls{ &make_glslink($type, $label, $format, ucfirst($link_text)). $space . $_; } +# added v1.04 +sub do_cmd_Glsstar{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = $glsentry{$label}{'type'}; + + if (&gls_used($label)) + { + # entry has already been used + + $text = &gls_get_text($label); + $display = &gls_get_display($type);; + } + else + { + # entry hasn't been used + + $text = &gls_get_first($label); + $display = &gls_get_displayfirst($type); + + &unset_entry($label); + } + + local($args) = ''; + + local($id) = ++$global{'max_id'}; + $args .= "$OP$id$CP$text$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{description}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{symbol}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$insert$OP$id$CP"; + + local($link_text) = &translate_commands("$display$args"); + + ucfirst($link_text). $space . $_; +} + sub do_cmd_Glspl{ local($_) = @_; local($optarg,$pat,$label,$text, $format, $insert); @@ -1561,6 +1787,64 @@ sub do_cmd_Glspl{ &make_glslink($type, $label, $format, ucfirst($link_text)).$space . $_; } +# added v1.04 +sub do_cmd_Glsplstar{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = $glsentry{$label}{'type'}; + + if (&gls_used($label)) + { + # entry has already been used + + $text = &gls_get_plural($label); + $display = &gls_get_display($type);; + } + else + { + # entry hasn't been used + + $text = &gls_get_firstplural($label); + $display = &gls_get_displayfirst($type); + + &unset_entry($label); + } + + local($args) = ''; + + local($id) = ++$global{'max_id'}; + $args .= "$OP$id$CP$text$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{description}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{symbol}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$insert$OP$id$CP"; + + local($link_text) = &translate_commands("$display$args"); + + ucfirst($link_text).$space . $_; +} + sub do_cmd_GLS{ local($_) = @_; local($optarg,$pat,$label,$text, $format, $insert); @@ -1618,6 +1902,64 @@ sub do_cmd_GLS{ &make_glslink($type, $label, $format, uc($link_text)).$space . $_; } +# added v1.04 +sub do_cmd_GLSstar{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = $glsentry{$label}{'type'}; + + if (&gls_used($label)) + { + # entry has already been used + + $text = &gls_get_text($label); + $display = &gls_get_display($type);; + } + else + { + # entry hasn't been used + + $text = &gls_get_first($label); + $display = &gls_get_displayfirst($type); + + &unset_entry($label); + } + + local($args) = ''; + + local($id) = ++$global{'max_id'}; + $args .= "$OP$id$CP$text$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{description}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{symbol}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$insert$OP$id$CP"; + + local($link_text) = &translate_commands("$display$args"); + + uc($link_text).$space . $_; +} + sub do_cmd_GLSpl{ local($_) = @_; local($optarg,$pat,$label,$text, $format, $insert); @@ -1675,6 +2017,64 @@ sub do_cmd_GLSpl{ &make_glslink($type, $label, $format, uc($link_text)).$space . $_; } +# added v1.04 +sub do_cmd_GLSplstar{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = $glsentry{$label}{'type'}; + + if (&gls_used($label)) + { + # entry has already been used + + $text = &gls_get_plural($label); + $display = &gls_get_display($type);; + } + else + { + # entry hasn't been used + + $text = &gls_get_firstplural($label); + $display = &gls_get_displayfirst($type); + + &unset_entry($label); + } + + local($args) = ''; + + local($id) = ++$global{'max_id'}; + $args .= "$OP$id$CP$text$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{description}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$glsentry{$label}{symbol}$OP$id$CP"; + + $id = ++$global{'max_id'}; + $args .= "$OP$id$CP$insert$OP$id$CP"; + + local($link_text) = &translate_commands("$display$args"); + + uc($link_text).$space . $_; +} + # added 22 Feb 2008 sub do_cmd_glstext{ local($_) = @_; diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty index c30716a7552..0209e843f0c 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty @@ -39,10 +39,11 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2008/06/17 v1.14 (NLCT)] +\ProvidesPackage{glossaries}[2008/08/27 v1.16 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} +\RequirePackage{xfor} \@ifpackageloaded{babel}{\IfFileExists{translator.sty}{% \RequirePackage{translator}}{}}{} \RequirePackage{amsgen} @@ -140,6 +141,8 @@ name=true]{% \@ifundefined{hyperdef}{}{\hyperdef{section}{\thesection}{}}}}}{} \providecommand*{\glossaryname}{Glossary} \providecommand*{\acronymname}{Acronyms} +\newcommand*{\glssettoctitle}[1]{% +\def\glossarytoctitle{\csname @glotype@#1@title\endcsname}} \providecommand*{\entryname}{Notation} \providecommand*{\descriptionname}{Description} \providecommand*{\symbolname}{Symbol} @@ -149,6 +152,12 @@ name=true]{% \newcommand*{\glspluralsuffix}{s} \ifglstranslate \@ifpackageloaded{translator}{\usedictionary{glossaries-dictionary}% + \renewcommand*{\glssettoctitle}[1]{% + \ifthenelse{\equal{#1}{main}}{% + \translatelet{\glossarytoctitle}{Glossary}}{% + \ifthenelse{\equal{#1}{acronym}}{% + \translatelet{\glossarytoctitle}{Acronyms}}{% + \def\glossarytoctitle{\csname @glotype@#1@title\endcsname}}}}% \renewcommand*{\glossaryname}{\translate{Glossary}}% \renewcommand*{\acronymname}{\translate{Acronyms}}% \renewcommand*{\entryname}{\translate{Notation (glossaries)}}% @@ -309,8 +318,8 @@ counter as its value}}{% \def\@glo@symbolplural{\@glo@symbol}% \def\@glo@text{\@glo@name}% \def\@glo@plural{\@glo@text\glspluralsuffix}% -\def\@glo@first{\relax}% -\def\@glo@firstplural{\relax}% +\let\@glo@first\relax +\let\@glo@firstplural\relax \def\@glo@sort{\@glo@name}% \def\@glo@counter{\@gls@getcounter{\@glo@type}}% \setkeys{glossentry}{#2}% @@ -321,15 +330,15 @@ in it}}{% \protected@edef\@glolist@{\csname glolist@\@glo@type\endcsname}% \expandafter\xdef\csname glolist@\@glo@type\endcsname{\@glolist@{#1},}% }% -\if\relax\@glo@firstplural\relax% - \if\relax\@glo@first\relax% +\ifx\relax\@glo@firstplural + \ifx\relax\@glo@first \def\@glo@firstplural{\@glo@plural}% \def\@glo@first{\@glo@text}% \else \def\@glo@firstplural{\@glo@first\glspluralsuffix}% \fi \else - \if\relax\@glo@first\relax% + \ifx\relax\@glo@first \def\@glo@first{\@glo@text}% \fi \fi @@ -341,10 +350,18 @@ in it}}{% \expandafter\protected@xdef\csname glo@#1@counter\endcsname{\@glo@counter}% \@gls@sanitizename \expandafter\protected@xdef\csname glo@#1@name\endcsname{\@glo@name}% +\def\@glo@@desc{\@glo@first}% +\ifx\@glo@desc\@glo@@desc + \let\@glo@desc\@glo@first +\fi \@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}% +\def\@glo@@symbol{\@glo@text}% +\ifx\@glo@symbol\@glo@@symbol + \let\@glo@symbol\@glo@text +\fi \@gls@sanitizesymbol \expandafter\protected@xdef\csname glo@#1@symbol\endcsname{\@glo@symbol}% \expandafter\protected@xdef\csname glo@#1@symbolplural\endcsname{\@glo@symbolplural}% @@ -405,6 +422,7 @@ counter as its value}}{% \newcommand*{\@sgls@link}[1][]{\@gls@link[hyper=false,#1]} \newcommand*{\@gls@link}[3][]{% \glsdoifexists{#2}{% +\def\glslabel{#2}% \def\@glsnumberformat{glsnumberformat}% \edef\@gls@counter{\csname glo@#2@counter\endcsname}% \KV@glslink@hypertrue @@ -665,16 +683,22 @@ counter as its value}}{% }{% \gdef\@glslink#1#2{\hyperlink{#1}{#2}}% } +\newlength\gls@tmplen \@ifundefined{hypertarget}{% \gdef\@glstarget#1#2{#2}% }{% - \gdef\@glstarget#1#2{\hypertarget{#1}{#2}}} + \gdef\@glstarget#1#2{% + \settoheight{\gls@tmplen}{#2}% + \raisebox{\gls@tmplen}{\hypertarget{#1}{}}#2}% +} \newcommand{\glsdisablehyper}{% \renewcommand*\@glslink[2]{##2}% \renewcommand*\@glstarget[2]{##2}} \newcommand{\glsenablehyper}{% \renewcommand*\@glslink[2]{\hyperlink{##1}{##2}}% -\renewcommand*\@glstarget[2]{\hypertarget{##1}{##2}}} +\renewcommand*\@glstarget[2]{% + \settoheight{\gls@tmplen}{##2}% + \raisebox{\gls@tmplen}{\hypertarget{##1}{}}##2}} \newcommand*{\gls}{\@ifstar\@sgls\@gls} \newcommand*{\@sgls}[1][]{\@gls[hyper=false,#1]} \newcommand*{\@gls}[2][]{% @@ -692,11 +716,12 @@ counter as its value}}{% \ifglsused{#2}{% \@gls@link[#1]{#2}{\@glo@text}% }{% - \ifglsacrfootnote + \ifthenelse{\equal{\@glo@type}{\acronymtype}\and + \boolean{glsacrfootnote}}{% \@gls@link[#1,hyper=false]{#2}{\@glo@text}% - \else + }{% \@gls@link[#1]{#2}{\@glo@text}% - \fi + }% }% \glsunset{#2}}% } @@ -718,13 +743,14 @@ counter as its value}}{% \@gls@link[#1]{#2}{% \expandafter\makefirstuc\expandafter{\@glo@text}}% }{% - \ifglsacrfootnote + \ifthenelse{\equal{\@glo@type}{\acronymtype}\and + \boolean{glsacrfootnote}}{% \@gls@link[#1,hyper=false]{#2}{% \expandafter\makefirstuc\expandafter{\@glo@text}}% - \else + }{% \@gls@link[#1]{#2}{% \expandafter\makefirstuc\expandafter{\@glo@text}}% - \fi + }% }% \glsunset{#2}}% } @@ -745,11 +771,12 @@ counter as its value}}{% \ifglsused{#2}{% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% }{% - \ifglsacrfootnote + \ifthenelse{\equal{\@glo@type}{\acronymtype}\and + \boolean{glsacrfootnote}}{% \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}% - \else + }{% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% - \fi + }% }% \glsunset{#2}}% } @@ -772,11 +799,12 @@ counter as its value}}{% \ifglsused{#2}{% \@gls@link[#1]{#2}{\@glo@text}% }{% - \ifglsacrfootnote + \ifthenelse{\equal{\@glo@type}{\acronymtype}\and + \boolean{glsacrfootnote}}{% \@gls@link[#1,hyper=false]{#2}{\@glo@text}% - \else + }{% \@gls@link[#1]{#2}{\@glo@text}% - \fi + }% }% \glsunset{#2}}% } @@ -800,13 +828,14 @@ counter as its value}}{% \@gls@link[#1]{#2}{% \expandafter\makefirstuc\expandafter{\@glo@text}}% }{% - \ifglsacrfootnote + \ifthenelse{\equal{\@glo@type}{\acronymtype}\and + \boolean{glsacrfootnote}}{% \@gls@link[#1,hyper=false]{#2}{% \expandafter\makefirstuc\expandafter{\@glo@text}}% - \else + }{% \@gls@link[#1]{#2}{% \expandafter\makefirstuc\expandafter{\@glo@text}}% - \fi + }% }% \glsunset{#2}}% } @@ -829,11 +858,12 @@ counter as its value}}{% \ifglsused{#2}{% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% }{% - \ifglsacrfootnote + \ifthenelse{\equal{\@glo@type}{\acronymtype}\and + \boolean{glsacrfootnote}}{% \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}% - \else + }{% \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% - \fi + }% }% \glsunset{#2}}% } @@ -1262,10 +1292,11 @@ to move \string\makeglossaries\space after all your \newcommand*{\printglossary}[1][type=\glsdefaulttype]{% \def\@glo@type{\glsdefaulttype}% \def\glossarytitle{\csname @glotype@\@glo@type @title\endcsname}% -\def\glossarytoctitle{\glossarytitle}% \def\@glossarystyle{}% +\def\gls@dotoctitle{\glssettoctitle{\@glo@type}}% \bgroup \setkeys{printgloss}{#1}% +\gls@dotoctitle \@glossarystyle \makeatletter \@input@{\jobname.\csname @glotype@\@glo@type @in\endcsname}% @@ -1275,7 +1306,9 @@ to move \string\makeglossaries\space after all your \forallglossaries{\@@glo@type}{\printglossary[type=\@@glo@type]}} \define@key{printgloss}{type}{\def\@glo@type{#1}} \define@key{printgloss}{title}{\def\glossarytitle{#1}} -\define@key{printgloss}{toctitle}{\def\glossarytoctitle{#1}} +\define@key{printgloss}{toctitle}{\def\glossarytoctitle{#1}% +\let\gls@dotoctitle\relax +} \define@key{printgloss}{style}{% \@ifundefined{@glsstyle@#1}{\PackageError{glossaries}{Glossary style `#1' undefined}{}}{% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty index e8d3a4ee331..9137a38056a 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty @@ -47,10 +47,36 @@ \@ifundefined{hypertarget}{% \newcommand*{\glsnavhypertarget}[3][\@glo@type]{% \protected@write\@auxout{}{\string\@gls@hypergroup{#1}{#2}}% -#3}}{% +#3% +\expandafter +\let\expandafter\@gls@list\csname @gls@hypergrouplist@#1\endcsname +\@for\@gls@elem:=\@gls@list\do{% +\ifthenelse{\equal{\@gls@elem}{#2}}{\@endfortrue}{}}% +\if@endfor +\else + \PackageWarningNoLine{glossaries}{Navigation panel + for glossary type `#1'^^Jmissing group `#2'}% + \gdef\gls@hypergrouprerun{% + \PackageWarningNoLine{glossaries}{Navigation panel + has changed. Rerun LaTeX}}% +\fi}}{% \newcommand*{\glsnavhypertarget}[3][\@glo@type]{% \protected@write\@auxout{}{\string\@gls@hypergroup{#1}{#2}}% -\hypertarget{glsn:#1@#2}{#3}}} +\hypertarget{glsn:#1@#2}{#3}% +\expandafter +\let\expandafter\@gls@list\csname @gls@hypergrouplist@#1\endcsname +\@for\@gls@elem:=\@gls@list\do{% +\ifthenelse{\equal{\@gls@elem}{#2}}{\@endfortrue}{}}% +\if@endfor +\else + \PackageWarningNoLine{glossaries}{Navigation panel + for glossary type `#1'^^Jmissing group `#2'}% + \gdef\gls@hypergrouprerun{% + \PackageWarningNoLine{glossaries}{Navigation panel + has changed. Rerun LaTeX}}% +\fi}} +\let\gls@hypergrouprerun\relax +\AtEndDocument{\gls@hypergrouprerun} \newcommand*{\@gls@hypergroup}[2]{% \@ifundefined{@gls@hypergrouplist@#1}{% \expandafter\xdef\csname @gls@hypergrouplist@#1\endcsname{#2}% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty index ff84856213b..954d8e7074e 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty @@ -131,6 +131,30 @@ \bfseries \symbolname& \bfseries\pagelistname\\\hline\endhead\hline\endfoot}% } +\newglossarystyle{altlong4col}{% +\glossarystyle{long4col}% +\renewenvironment{theglossary}{% +\begin{longtable}{lp{\glsdescwidth}lp{\glspagelistwidth}}}{% +\end{longtable}}% +} +\newglossarystyle{altlong4colheader}{% +\glossarystyle{long4colheader}% +\renewenvironment{theglossary}{% +\begin{longtable}{lp{\glsdescwidth}lp{\glspagelistwidth}}}{% +\end{longtable}}% +} +\newglossarystyle{altlong4colborder}{% +\glossarystyle{long4colborder}% +\renewenvironment{theglossary}{% +\begin{longtable}{|l|p{\glsdescwidth}|l|p{\glspagewidthlist}|}}{% +\end{longtable}}% +} +\newglossarystyle{altlong4colheaderborder}{% +\glossarystyle{long4colheaderborder}% +\renewenvironment{theglossary}{% +\begin{longtable}{|l|p{\glsdescwidth}|l|p{\glspagewidthlist}|}}{% +\end{longtable}}% +} \endinput %% %% End of file `glossary-long.sty'. diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty index 7de79f26b45..9ee597674a9 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty @@ -140,6 +140,38 @@ \begin{supertabular}{|l|l|l|l|}}{% \end{supertabular}}% } +\newglossarystyle{altsuper4col}{% +\glossarystyle{super4col}% +\renewenvironment{theglossary}{% +\tablehead{}\tabletail{}% +\begin{supertabular}{lp{\glsdescwidth}lp{\glspagelistwidth}}}{% +\end{supertabular}}% +} +\newglossarystyle{altsuper4colheader}{% +\glossarystyle{super4colheader}% +\renewenvironment{theglossary}{% +\tablehead{\bfseries\entryname&\bfseries\descriptionname& +\bfseries\symbolname & +\bfseries\pagelistname\\}\tabletail{}% +\begin{supertabular}{lp{\glsdescwidth}lp{\glspagelistwidth}}}{% +\end{supertabular}}% +} +\newglossarystyle{altsuper4colborder}{% +\glossarystyle{super4colborder}% +\renewenvironment{theglossary}{% +\tablehead{\hline}\tabletail{\hline}% +\begin{supertabular}{|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}{% +\end{supertabular}}% +} +\newglossarystyle{altsuper4colheaderborder}{% +\glossarystyle{super4colheaderborder}% +\renewenvironment{theglossary}{% +\tablehead{\hline\bfseries\entryname&\bfseries\descriptionname& +\bfseries\symbolname & +\bfseries\pagelistname\\}\tabletail{\hline}% +\begin{supertabular}{|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}{% +\end{supertabular}}% +} \endinput %% %% End of file `glossary-super.sty'. |