diff options
| author | Dr. Clea F. Rees <cfrees@imapmail.org> | 2008-12-28 23:49:33 +0000 |
|---|---|---|
| committer | Dr. Clea F. Rees <cfrees@imapmail.org> | 2008-12-28 23:49:33 +0000 |
| commit | 7051fa90f609a783739882d5f945d4c11bf44c48 (patch) | |
| tree | d51c96157c87cc798fa65f22cfec5559d7df9b3a /Master | |
| parent | b82fe98b309f7cf832c3dca6f124c2f5c48af80f (diff) | |
glossaries update 2008/12/28
git-svn-id: svn://tug.org/texlive/trunk@11739 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
39 files changed, 14732 insertions, 2894 deletions
diff --git a/Master/bin/win32/makeglossaries.bat b/Master/bin/win32/makeglossaries.bat index fe949613d7c..64a6a20750c 100755 --- a/Master/bin/win32/makeglossaries.bat +++ b/Master/bin/win32/makeglossaries.bat @@ -1,8 +1,3 @@ +@rem = '-*- Perl -*-
@echo off
-rem tl-w32-starter.bat
-rem universal script starter, batch file part
-rem this program calls the tl-w32-wrapper.texlua
-setlocal
-set ownpath=%~dp0%
-texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
-endlocal
+perl -S "%~dp0makeglossaries" %*
diff --git a/Master/texmf-dist/doc/latex/glossaries/CHANGES b/Master/texmf-dist/doc/latex/glossaries/CHANGES index 3ae3e3e5440..d5e529684af 100644 --- a/Master/texmf-dist/doc/latex/glossaries/CHANGES +++ b/Master/texmf-dist/doc/latex/glossaries/CHANGES @@ -1,5 +1,33 @@ glossaries change log: +v1.17: + * changed definition of \@glossary to prevent conflict with + memoir + + * added check to determine if \printglossary is defined. (If + it is, issue warning and redefine.) + + * provided means to suppress number list for specific entries + + * provided means to suppress description terminator for + specific entries + + * added cross-referencing support + + * added hierarchical support + + * added xindy support + + * modified \glshypernumber to support \nohyperpage + (code provided by Heiko Oberdiek) + + * added 2 and 3-page suffix support + + * added "order" package option to set word/letter ordering + (only has an effect in combination with makeglossaries script) + + * added Brazilian dictionary (supplied by Thiago de Melo) + v1.16 : * fixed bug that causes footnote option to remove hyperlink for first use entries in glossaries other than the list diff --git a/Master/texmf-dist/doc/latex/glossaries/README b/Master/texmf-dist/doc/latex/glossaries/README index 4660f2a409d..3d2dbe45aeb 100644 --- a/Master/texmf-dist/doc/latex/glossaries/README +++ b/Master/texmf-dist/doc/latex/glossaries/README @@ -1,6 +1,6 @@ -LaTeX Package : glossaries v 1.16
+LaTeX Package : glossaries v 1.17
-Last Modified : 27 August 2008
+Last Modified : 26 December 2008
Author : Nicola Talbot
diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.html b/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.html index 537b85512f9..12a1968e72c 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.html +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.html @@ -7,13 +7,13 @@ original version by: Nikos Drakos, CBLU, University of Leeds Jens Lippmann, Marek Rouchal, Martin Wilck and others --> <HTML> <HEAD> -<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"> +<TITLE>glossaries.sty v 1.17: LaTeX2e Package to Assist Generating Glossaries</TITLE> +<META NAME="description" CONTENT="glossaries.sty v 1.17: LaTeX2e Package to Assist Generating Glossaries"> <META NAME="keywords" CONTENT="glossaries-manual"> <META NAME="resource-type" CONTENT="document"> <META NAME="distribution" CONTENT="global"> -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> +<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8"> <META NAME="Generator" CONTENT="LaTeX2HTML v2002"> <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> @@ -27,7 +27,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds <P> - <H1 ALIGN="CENTER">glossaries.sty v 1.16: LaTeX2e Package to Assist Generating Glossaries</H1> + <H1 ALIGN="CENTER">glossaries.sty v 1.17: LaTeX2e Package to Assist Generating Glossaries</H1> <P ALIGN="CENTER"><STRONG>Nicola L.C. Talbot <BR> <BR> @@ -39,8 +39,8 @@ Norwich. Norfolk <BR> 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>27th August 2008</STRONG></P> + HREF="http://theoval.cmp.uea.ac.uk/~nlct/">http://theoval.cmp.uea.ac.uk/~nlct/</A></TT></STRONG></P> +<P ALIGN="CENTER"><STRONG>26th December 2008</STRONG></P> <BR> <H2><A NAME="SECTION00010000000000000000"> @@ -49,74 +49,94 @@ Contents</A> <!--Table of Contents--> <UL> -<LI><A NAME="tex2html47" +<LI><A NAME="tex2html72" HREF="glossaries-manual.html#SECTION00020000000000000000">Introduction</A> <UL> -<LI><A NAME="tex2html48" - 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> +<LI><A NAME="tex2html73" + HREF="glossaries-manual.html#SECTION00021000000000000000">Sample Documents</A> +<LI><A NAME="tex2html74" + HREF="glossaries-manual.html#SECTION00022000000000000000">Multi-Lingual Support</A> +<UL> +<LI><A NAME="tex2html75" + HREF="glossaries-manual.html#SECTION00022100000000000000">Changing the Fixed Names</A> +</UL> +<LI><A NAME="tex2html76" + HREF="glossaries-manual.html#SECTION00023000000000000000">Generating the Associated Glossary Files</A> +<UL> +<LI><A NAME="tex2html77" + HREF="glossaries-manual.html#SECTION00023100000000000000">Using the makeglossaries Perl Script</A> +<LI><A NAME="tex2html78" + HREF="glossaries-manual.html#SECTION00023200000000000000">Using xindy explicitly</A> +<LI><A NAME="tex2html79" + HREF="glossaries-manual.html#SECTION00023300000000000000">Using makeindex explicitly</A> +</UL> +<LI><A NAME="tex2html80" + HREF="glossaries-manual.html#SECTION00024000000000000000">Troubleshooting</A> </UL> <BR> -<LI><A NAME="tex2html51" +<LI><A NAME="tex2html81" HREF="glossaries-manual.html#SECTION00030000000000000000">A Quick Guide For The Impatient</A> -<LI><A NAME="tex2html52" +<LI><A NAME="tex2html82" HREF="glossaries-manual.html#SECTION00040000000000000000">Overview</A> <UL> -<LI><A NAME="tex2html53" +<LI><A NAME="tex2html83" HREF="glossaries-manual.html#SECTION00041000000000000000">Package Options</A> -<LI><A NAME="tex2html54" +<LI><A NAME="tex2html84" HREF="glossaries-manual.html#SECTION00042000000000000000">Defining Glossary Entries</A> <UL> -<LI><A NAME="tex2html55" +<LI><A NAME="tex2html85" HREF="glossaries-manual.html#SECTION00042100000000000000">Plurals</A> -<LI><A NAME="tex2html56" - HREF="glossaries-manual.html#SECTION00042200000000000000">Loading Entries From a File</A> +<LI><A NAME="tex2html86" + HREF="glossaries-manual.html#SECTION00042200000000000000">Sub-Entries</A> +<LI><A NAME="tex2html87" + HREF="glossaries-manual.html#SECTION00042300000000000000">Loading Entries From a File</A> </UL> -<LI><A NAME="tex2html57" +<LI><A NAME="tex2html88" HREF="glossaries-manual.html#SECTION00043000000000000000">Number lists</A> -<LI><A NAME="tex2html58" +<LI><A NAME="tex2html89" HREF="glossaries-manual.html#SECTION00044000000000000000">Links to Glossary Entries</A> <UL> -<LI><A NAME="tex2html59" +<LI><A NAME="tex2html90" HREF="glossaries-manual.html#SECTION00044100000000000000">Changing the format of the link text</A> -<LI><A NAME="tex2html60" +<LI><A NAME="tex2html91" HREF="glossaries-manual.html#SECTION00044200000000000000">Enabling and disabling hyperlinks to glossary entries</A> </UL> -<LI><A NAME="tex2html61" +<LI><A NAME="tex2html92" HREF="glossaries-manual.html#SECTION00045000000000000000">Adding an Entry to the Glossary Without Generating Text</A> -<LI><A NAME="tex2html62" - HREF="glossaries-manual.html#SECTION00046000000000000000">Using Glossary Terms Without Links</A> -<LI><A NAME="tex2html63" - HREF="glossaries-manual.html#SECTION00047000000000000000">Displaying a glossary</A> +<LI><A NAME="tex2html93" + HREF="glossaries-manual.html#SECTION00046000000000000000">Cross-Referencing Entries</A> +<LI><A NAME="tex2html94" + HREF="glossaries-manual.html#SECTION00047000000000000000">Using Glossary Terms Without Links</A> +<LI><A NAME="tex2html95" + HREF="glossaries-manual.html#SECTION00048000000000000000">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> +<LI><A NAME="tex2html96" + HREF="glossaries-manual.html#SECTION00048100000000000000">Changing the way the entry name appears in the glossary</A> +<LI><A NAME="tex2html97" + HREF="glossaries-manual.html#SECTION00048200000000000000">Xindy</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> +<LI><A NAME="tex2html98" + HREF="glossaries-manual.html#SECTION00049000000000000000">Defining New Glossaries</A> +<LI><A NAME="tex2html99" + HREF="glossaries-manual.html#SECTION000410000000000000000">Acronyms</A> +<LI><A NAME="tex2html100" + HREF="glossaries-manual.html#SECTION000411000000000000000">Unsetting and Resetting Entry Flags</A> +<LI><A NAME="tex2html101" + HREF="glossaries-manual.html#SECTION000412000000000000000">Glossary Styles</A> +<LI><A NAME="tex2html102" + HREF="glossaries-manual.html#SECTION000413000000000000000">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 +<LI><A NAME="tex2html103" + HREF="glossaries-manual.html#SECTION000413100000000000000">Example: creating a completely new style</A> +<LI><A NAME="tex2html104" + HREF="glossaries-manual.html#SECTION000413200000000000000">Example: creating a new glossary style based on an existing style</A> </UL> </UL> <BR> -<LI><A NAME="tex2html72" +<LI><A NAME="tex2html105" HREF="glossaries-manual.html#SECTION00050000000000000000">Mfirstuc Package</A> -<LI><A NAME="tex2html73" +<LI><A NAME="tex2html106" HREF="glossaries-manual.html#SECTION00060000000000000000">Index</A> </UL> <!--End of Table of Contents--> @@ -128,24 +148,89 @@ Introduction</A> <P> The <TT>glossaries</TT> package is provided to assist generating -glossaries. It has a certain amount of flexibility, allowing the user -to customize the format of the glossary and define multiple glossaries. -It also supports acronyms and glossary styles that include -symbols (in addition to a name and description) for glossary +glossaries. It has a certain amount of flexibility, allowing the +user to customize the format of the glossary and define multiple +glossaries. 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="2483"></A> package which is now -obsolete. <P> -This documentation is structured as follows: <A HREF="glossaries-manual.html#sec:quick">A Quick Guide For The Impatient</A> is for -people who want a few quick pointers of how to get started, -without having to read through lengthy descriptions, -<A HREF="glossaries-manual.html#sec:overview">Overview</A> gives an overview of available commands -and their syntax and -<A HREF="glossaries-manual.html#sec:mfirstuc">Mfirstuc</A> describes the associated -<TT>mfirstuc</TT> -package. +<B>This package replaces the <TT>glossary</TT><A NAME="3641"></A> package which is +now obsolete. Please see the file +<TT><A NAME="tex2html3" + HREF="glossary2glossaries.html">glossary2glossaries.html</A></TT> for assistance in upgrading.</B> + +<P> +The <TT>glossaries</TT> package comes with a +<A NAME="tex2html4" + HREF="http://www.perl.org/about.html">Perl</A> +script +called <TT>makeglossaries</TT><A NAME="3645"></A>. This provides a convenient interface +to <TT>makeindex</TT><A NAME="3648"></A> or <TT>xindy</TT><A NAME="3651"></A>. It is strongly +recommended that you use this script, but it is not +essential. If you are reluctant to install Perl, or for any +other reason you don't want to use <TT>makeglossaries</TT><A NAME="3654"></A>, you +can called <TT>makeindex</TT><A NAME="3657"></A> or <TT>xindy</TT><A NAME="3660"></A> explicitly. +See <A HREF="glossaries-manual.html#sec:makeglossaries">Generating the +Associated Glossary Files</A> for +further details. + +<P> +One of the strengths of this package is its flexibility, however +the drawback of this is the necessity of having a large manual +that can cover all the various settings. The documentation is +therefore structured as follows: + +<UL> +<LI><A HREF="glossaries-manual.html#sec:quick">A Quick Guide For +The Impatient</A> is for people who want a few quick +pointers of how to get started creating a basic glossary, without +having to read through lengthy descriptions. + +<P> +</LI> +<LI><A HREF="glossaries-manual.html#sec:overview">Overview</A> +gives an overview of available commands and their syntax. + +<P> +</LI> +<LI><A HREF="glossaries-manual.html#sec:mfirstuc">Mfirstuc</A> +describes the associated <TT>mfirstuc</TT> package. + +<P> + +</LI> +</UL> + +<P> +The remainder of this introductory section covers the +following: + +<UL> +<LI><A HREF="glossaries-manual.html#sec:samples">Sample +Documents</A> lists the sample documents provided +with this package. + +<P> +</LI> +<LI><A HREF="glossaries-manual.html#sec:languages">Multi-Lingual +Support</A> provides information for users who +wish to write in a language other than English. + +<P> +</LI> +<LI><A HREF="glossaries-manual.html#sec:makeglossaries">Generating +the Associated Glossary Files</A> +describes how to use a post-processor to create the sorted glossaries +for your document. + +<P> +</LI> +<LI><A HREF="glossaries-manual.html#sec:trouble">Troubleshooting</A> provides some assistance in the event that you +encounter a problem. +</LI> +</UL> <P> <A HREF="glossaries-manual.html#top">Top</A> @@ -153,32 +238,445 @@ package. <P> <H2><A NAME="SECTION00021000000000000000"></A> +<A NAME="sec:samples"></A> +<BR> +Sample Documents +</H2> + +<P> +The <TT>glossaries</TT> package is provided with some sample +documents that illustrate the various functions. These should +be located in the <TT>samples</TT> subdirectory (folder) of the +<TT>glossaries</TT> documentation directory. This location varies +according to your operating system and T<SMALL>E</SMALL>X distribution. + +<P> +The sample documents are as follows: +<DL> +<DT><STRONG>minimalgls.tex</STRONG></DT> +<DD>This document is a minimal working example. +You can test your installation using this file. To create the +complete document you will need to do the following steps: + +<OL> +<LI>Run <TT>minimalgls.tex</TT> through LaTeX by either + typing +<PRE> +latex minimalgls +</PRE> + in a terminal or by using the relevant button or menu item in + your text editor or front-end. This will create the required + associated files but you will not see the glossary. If you use + PDFLaTeX you will also get warnings about non-existent + references. These warnings may be ignored on the first run. + +<P> +</LI> +<LI>Run <TT>makeglossaries</TT><A NAME="3670"></A> on the document. This can + be done on a terminal by either typing +<PRE> +makeglossaries minimalgls +</PRE> + or by typing +<PRE> +perl makeglossaries minimalgls +</PRE> + If your system doesn't recognise the command <TT>perl</TT> then + it's likely you don't have Perl installed. In which case you + will need to use <TT>makeindex</TT><A NAME="3673"></A> directly. You can do this + in a terminal by typing (all on one line): +<PRE> +makeindex -s minimalgls.ist -t minimalgls.glg -o minimalgls.gls +minimalgls.glo +</PRE> + (See +<A HREF="glossaries-manual.html#sec:makeindexapp">later</A> + for further details on using <TT>makeindex</TT><A NAME="3676"></A> explicitly.) + +<P> +Note that if you need to specify the full path and the path + contains spaces, you will need to delimit the file names with + the double-quote character. + +<P> +</LI> +<LI>Run <TT>minimalgls.tex</TT> through LaTeX again (as step 1) + +</LI> +</OL> +You should now have a complete document. The number following +each entry in the glossary is the location number. By default, this +is the page number where the entry was referenced. + +<P> +</DD> +<DT><STRONG>sample4col.tex</STRONG></DT> +<DD>This document illustrates a four column +glossary where the entries have a symbol in addition to the +name and description. To create the complete document, you need +to do: +<PRE> +latex sample4col +makeglossaries sample4col +latex sample4col +</PRE> +As before, if you don't have Perl installed, you will need to +use <TT>makeindex</TT><A NAME="3679"></A> directly instead of using +<TT>makeglossaries</TT><A NAME="3682"></A>. The vertical gap between entries +is the gap created at the start of each group. This can be +suppressed by redefining <TT>\glsgroupskip</TT><A NAME="3685"></A> after the glossary +style has been set: +<PRE> +\renewcommand*{\glsgroupskip}{} +</PRE> + +<P> +</DD> +<DT><STRONG>sampleAcr.tex</STRONG></DT> +<DD>This document has some sample acronyms. It +also adds the glossary to the table of contents, so an extra +run through LaTeX is required to ensure the document is up-to-date: +<PRE> +latex sampleAcr +makeglossaries sampleAcr +latex sampleAcr +latex sampleAcr +</PRE> + +<P> +</DD> +<DT><STRONG>sampleAcrDesc.tex</STRONG></DT> +<DD>This is similar to the previous example, +except that the acronyms have an associated description. As with +the previous example, the glossary is added to the table of +contents, so an extra run through LaTeX is required: +<PRE> +latex sampleAcrDesc +makeglossaries sampleAcrDesc +latex sampleAcrDesc +latex sampleAcrDesc +</PRE> + +<P> +</DD> +<DT><STRONG>sampleDesc.tex</STRONG></DT> +<DD>This is similar to the previous example, +except that it defines the acronyms using <TT>\newglossaryentry</TT><A NAME="3688"></A> +instead of <TT>\newacronym</TT><A NAME="3691"></A>. As with +the previous example, the glossary is added to the table of +contents, so an extra run through LaTeX is required: +<PRE> +latex sampleDesc +makeglossaries sampleDesc +latex sampleDesc +latex sampleDesc +</PRE> + +<P> +</DD> +<DT><STRONG>sampleDB.tex</STRONG></DT> +<DD>This document illustrates how to load +an external files containing the glossary definitions. It also +illustrates how to define a new glossary type. This document +has the number list<A NAME="3693"></A> suppressed and uses <TT>\glsaddall</TT><A NAME="3695"></A> to add +all the entries to the glossaries without referencing each one +explicitly. To create the document do: +<PRE> +latex sampleDB +makeglossaries sampleDB +latex sampleDB +</PRE> +The glossary definitions are stored in the files +<TT>database1.tex</TT> and <TT>database2.tex</TT>. Note that if +you don't have Perl installed, you will need to use +<TT>makeindex</TT><A NAME="3698"></A> twice instead of using <TT>makeglossaries</TT><A NAME="3701"></A>: + +<OL> +<LI>Create the main glossary: +<PRE> +makeindex -s sampleDB.ist -t sampleDB.glg -o sampleDB.gls sampleDB.glo +</PRE> +</LI> +<LI>Create the secondary glossary: +<PRE> +makeindex -s sampleDB.ist -t sampleDB.nlg -o sampleDB.not sampleDB.ntn +</PRE> +</LI> +</OL> + +<P> +</DD> +<DT><STRONG>sampleEq.tex</STRONG></DT> +<DD>This document illustrates how to change the +location to something other than the page number. In this case, +the <TT>equation</TT> counter is used since all glossary entries +appear inside an <TT>equation</TT> environment. To create the +document do: +<PRE> +latex sampleEq +makeglossaries sampleEq +latex sampleEq +</PRE> + +<P> +</DD> +<DT><STRONG>sampleEqPg.tex</STRONG></DT> +<DD>This is similar to the previous example, +but the number lists<A NAME="3704"></A> are a mixture of page +numbers and equation numbers. This example adds the glossary to the +table of contents, so an extra LaTeX run is required: +<PRE> +latex sampleEqPg +makeglossaries sampleEqPg +latex sampleEqPg +latex sampleEqPg +</PRE> + +<P> +</DD> +<DT><STRONG>sampleSec.tex</STRONG></DT> +<DD>This document also illustrates how to change +the location to something other than the page number. In this case, +the <TT>section</TT> counter is used. This example adds the +glossary to the table of contents, so an extra LaTeX run is +required: +<PRE> +latex sampleSec +makeglossaries sampleSec +latex sampleSec +latex sampleSec +</PRE> + +<P> +</DD> +<DT><STRONG>sampleNtn.tex</STRONG></DT> +<DD>This document illustrates how to create +an additional glossary type. This example adds the glossary to the +table of contents, so an extra LaTeX run is required: +<PRE> +latex sampleNtn +makeglossaries sampleNtn +latex sampleNtn +latex sampleNtn +</PRE> +Note that if you don't have Perl installed, you will need to use +<TT>makeindex</TT><A NAME="3706"></A> twice instead of using <TT>makeglossaries</TT><A NAME="3709"></A>: + +<OL> +<LI>Create the main glossary: +<PRE> +makeindex -s sampleNtn.ist -t sampleNtn.glg -o sampleNtn.gls sampleNtn.glo +</PRE> +</LI> +<LI>Create the secondary glossary: +<PRE> +makeindex -s sampleNtn.ist -t sampleNtn.nlg -o sampleNtn.not sampleNtn.ntn +</PRE> +</LI> +</OL> + +<P> +</DD> +<DT><STRONG>sample.tex</STRONG></DT> +<DD>This document illustrates some of the basics, +including how to create child entries that use the same name as the +parent entry. This example adds the glossary to the table of +contents, so an extra LaTeX run is required: +<PRE> +latex sample +makeglossaries sample +latex sample +latex sample +</PRE> +You can see the difference between word and letter ordering +if you substitute <TT>order=word</TT><A NAME="3719"></A> with +<TT>order=letter</TT><A NAME="3728"></A>. (Note that this will only have an +effect if you use <TT>makeglossaries</TT><A NAME="3730"></A>. If you use +<TT>makeindex</TT><A NAME="3733"></A> explicitly, you will need to use the +<TT>-l</TT> switch to indicate letter ordering.) + +<P> +</DD> +<DT><STRONG>sampletree.tex</STRONG></DT> +<DD>This document illustrates a hierarchical +glossary structure where child entries have different names +to their corresponding parent entry. To create the document do: +<PRE> +latex sampletree +makeglossaries sampletree +latex sampletree +</PRE> + +<P> +</DD> +<DT><STRONG>samplexdy.tex</STRONG></DT> +<DD>This document illustrates how to use the +<TT>glossaries</TT> package with <TT>xindy</TT><A NAME="3737"></A> instead of +<TT>makeindex</TT><A NAME="3740"></A>. The document uses UTF8 encoding (with the +<TT>inputenc</TT><A NAME="3743"></A> package). The encoding is picked up by +<TT>makeglossaries</TT><A NAME="3746"></A>. By default, this document will create +a <TT>xindy</TT><A NAME="3749"></A> style file called <TT>samplexdy.xdy</TT>, but +if you uncomment the lines +<PRE> +\setStyleFile{samplexdy-mc} +\noist +\GlsSetXdyLanguage{} +</PRE> +it will set the style file to <TT>samplexdy-mc.xdy</TT> instead. +This provides an additional letter group for entries starting +with "Mc" or "Mac". If you use <TT>makeglossaries</TT><A NAME="3752"></A>, +you don't need to supply any additional information. If you +don't use <TT>makeglossaries</TT><A NAME="3755"></A>, you will need to specify the +required information. Note that if you set the style file to +<TT>samplexdy-mc.xdy</TT> you must also specify <TT>\noist</TT><A NAME="3758"></A>, +otherwise the <TT>glossaries</TT><A NAME="3761"></A> package will overwrite +<TT>samplexdy-mc.xdy</TT> and you will lose the "Mc" letter group. + +<P> +To create the document do: +<PRE> +latex samplexdy +makeglossaries samplexdy +latex samplexdy +</PRE> +If you don't have Perl installed, you will have to call +<TT>xindy</TT><A NAME="3764"></A> explicitly instead of using <TT>makeglossaries</TT><A NAME="3767"></A>. +If you are using the default style file <TT>samplexdy.xdy</TT>, then +do (no line breaks): +<PRE> +xindy -L english -C utf8 -I xindy -M samplexdy -t samplexdy.glg +-o samplexdy.gls samplexdy.glo +</PRE> +otherwise, if you are using <TT>samplexdy-mc.xdy</TT>, then do +(no line breaks): +<PRE> +xindy -I xindy -M samplexdy-mc -t samplexdy.glg -o samplexdy.gls +samplexdy.glo +</PRE> + +<P> +</DD> +<DT><STRONG>sampleutf8.tex</STRONG></DT> +<DD>This is another example that uses +<TT>xindy</TT><A NAME="3770"></A>. Unlike <TT>makeindex</TT><A NAME="3773"></A>, <TT>xindy</TT><A NAME="3776"></A> can +cope with accented or non-Latin characters. This document uses +UTF8 encoding. To create the document do: +<PRE> +latex sampleutf8 +makeglossaries sampleutf8 +latex sampleutf8 +</PRE> +If you don't have Perl installed, you will have to call +<TT>xindy</TT><A NAME="3779"></A> explicitly instead of using <TT>makeglossaries</TT><A NAME="3782"></A> +(no line breaks): +<PRE> +xindy -L english -C utf8 -I xindy -M sampleutf8 -t sampleutf8.glg +-o sampleutf8.gls sampleutf8.glo +</PRE> + +<P> +If you remove the <TT>xindy</TT><A NAME="3790"></A> option and do: +<PRE> +latex sampleutf8 +makeglossaries sampleutf8 +latex sampleutf8 +</PRE> +you will see that the entries that start with a non-Latin character +now appear in the symbols group, and the word "manÅ“uvre" is now +after "manor" instead of before it. If you are unable to use +<TT>makeglossaries</TT><A NAME="3794"></A>, the call to <TT>makeindex</TT><A NAME="3797"></A> is as +follows (no line breaks): +<PRE> +makeindex -s sampleutf8.ist -t sampleutf8.glg -o sampleutf8.gls +sampleutf8.glo +</PRE> + +<P> +</DD> +</DL> + +<P> +<A HREF="glossaries-manual.html#top">Top</A> + +<P> + +<H2><A NAME="SECTION00022000000000000000"></A> <A NAME="sec:languages"></A> <BR> Multi-Lingual Support </H2> <P> +As from version 1.17, the <TT>glossaries</TT> package can now be +used with <TT>xindy</TT><A NAME="3804"></A> as well as <TT>makeindex</TT><A NAME="3807"></A>. If you +are writing in a language that uses accented characters or +non-Latin characters it is recommended that you use <TT>xindy</TT><A NAME="3810"></A> +as <TT>makeindex</TT><A NAME="3813"></A> is hard-coded for Latin languages. This +means that you are not restricted to the A, ..., Z letter groups. +If you want to use <TT>xindy</TT><A NAME="3816"></A>, remember to use the +<TT>xindy</TT><A NAME="3824"></A> package option. For example: +<PRE> +\documentclass[frenchb]{article} +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +\usepackage{babel} +\usepackage[xindy]{glossaries} +</PRE> + +<P> +If you use an accented or non-Latin character at the start of +an entry name, you must place it in a group, or it will cause +a problem for commands that convert the first letter to uppercase +(e.g. <TT>\Gls</TT><A NAME="3828"></A>) due to expansion issues. For example: +<PRE> +\newglossaryentry{elite}{name={{é}lite}, +description={select group or class}} +</PRE> + +<P> +If you use the <TT>inputenc</TT><A NAME="3831"></A> package, <TT>makeglossaries</TT><A NAME="3834"></A> +will pick up the encoding from the auxiliary file. If you use +<TT>xindy</TT><A NAME="3837"></A> explicitly instead of via <TT>makeglossaries</TT><A NAME="3840"></A>, +you may need to specify the encoding using the <TT>-C</TT> +option. Read the <TT>xindy</TT><A NAME="3843"></A> manual for further details. + +<P> + +<H3><A NAME="SECTION00022100000000000000"></A> +<A NAME="sec:fixednames"></A> +<BR> +Changing the Fixed Names +</H3> + +<P> As from version 1.08, the <TT>glossaries</TT> package now has limited multi-lingual support, thanks to all the people who have sent me the relevant translations either via email or via <TT>comp.text.tex</TT>. -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, +However you must load <TT>babel</TT><A NAME="3847"></A> <I>before</I> +<TT>glossaries</TT> to enable this. Note that if <TT>babel</TT><A NAME="3851"></A> is loaded +and the <TT>translator</TT><A NAME="3854"></A> package is detected on T<SMALL>E</SMALL>X's path, then the +<TT>translator</TT><A NAME="3857"></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="2505"></A> package with the required languages. For example: +<TT>translator</TT><A NAME="3860"></A> package with the required languages. For example: <PRE> \usepackage[spanish]{babel} \usepackage[spanish]{translator} \usepackage{glossaries} </PRE> +Alternatively, specify the language as a class option rather +than a package option. For example: +<PRE> +\documentclass[spanish]{report} + +\usepackage{babel} +\usepackage{glossaries} +</PRE> <P> -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 +If you want to use <TT>ngerman</TT><A NAME="3863"></A> or <TT>german</TT><A NAME="3866"></A> instead +of <TT>babel</TT><A NAME="3869"></A>, you will need to include the <TT>translator</TT><A NAME="3872"></A> package to provide the translations. For example: <PRE> \documentclass[ngerman]{article} @@ -188,12 +686,16 @@ to provide the translations. For example: </PRE> <P> -The following languages are currently supported: +The following languages are currently supported by the +<TT>glossaries</TT><A NAME="3875"></A> package: <DIV ALIGN="CENTER"> <TABLE CELLPADDING=3> <TR><TH ALIGN="LEFT"><B>Language </B></TH> <TH ALIGN="CENTER"><B>As from version</B></TH> </TR> +<TR><TD ALIGN="LEFT">Brazilian Portuguese</TD> +<TD ALIGN="CENTER">1.17</TD> +</TR> <TR><TD ALIGN="LEFT">Danish</TD> <TD ALIGN="CENTER">1.08</TD> </TR> @@ -226,7 +728,7 @@ The following languages are currently supported: </TR> </TABLE> </DIV> -The language dependent commands and <TT>translator</TT><A NAME="2520"></A> keys used by the +The language dependent commands and <TT>translator</TT><A NAME="3878"></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> @@ -235,7 +737,7 @@ glossaries package are listed in <A HREF="glossaries-manual.html#tab:predefinedn <A NAME="tab:predefinednames"></A> <DIV ALIGN="CENTER"> -<A NAME="225"></A> +<A NAME="437"></A> <TABLE CELLPADDING=3> <CAPTION><STRONG>Table 1:</STRONG> Customised Text</CAPTION> @@ -243,41 +745,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="2526"></A></TD> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\glossaryname</TT><A NAME="3884"></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="2529"></A></TD> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\acronymname</TT><A NAME="3887"></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="2537"></A>).</TD> +(when used with package option <TT>acronym</TT><A NAME="3895"></A>).</TD> <TD ALIGN="LEFT"> </TD></TR> -<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\entryname</TT><A NAME="2541"></A></TD> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\entryname</TT><A NAME="3899"></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 +<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=200>Header for first column in the 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="2544"></A></TD> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\descriptionname</TT><A NAME="3902"></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 +<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=200>Header for second column in the 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="2547"></A></TD> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\symbolname</TT><A NAME="3905"></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> +column in the 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="2550"></A></TD> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\pagelistname</TT><A NAME="3908"></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 +<TD ALIGN="LEFT" VALIGN="TOP" WIDTH=200>Header for page list column in the 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="2553"></A></TD> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\glssymbolsgroupname</TT><A NAME="3911"></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="2556"></A></TD> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\glsnumbersgroupname</TT><A NAME="3914"></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 @@ -291,13 +793,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="2559"></A> package and do not have the <TT>translator</TT><A NAME="2562"></A> package +the <TT>babel</TT><A NAME="3917"></A> package and do not have the <TT>translator</TT><A NAME="3920"></A> package installed, you need to be familiar with the -advice on <A NAME="tex2html4" +advice on <A NAME="tex2html7" 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="2565"></A> package installed, then it becomes +If you have the <TT>translator</TT><A NAME="3923"></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 @@ -307,87 +809,373 @@ in your document preamble: </PRE> <P> +Note that <TT>xindy</TT><A NAME="3926"></A> provides much better multi-lingual +support than <TT>makeindex</TT><A NAME="3929"></A>, so it's recommended that you +use <TT>xindy</TT><A NAME="3932"></A> if you have glossary entries that contain +accented characters or non-Roman letters. See +<A NAME="tex2html8" + HREF="sec:xindy">Xindy</A> +for further details. +<P> +<A HREF="glossaries-manual.html#top">Top</A> -<H2><A NAME="SECTION00022000000000000000"></A> +<P> + +<H2><A NAME="SECTION00023000000000000000"></A> <A NAME="sec:makeglossaries"></A> <BR> Generating the Associated Glossary Files </H2> <P> +In order to generate a sorted glossary with compact location lists, +it is necessary to use an external indexing application as an +intermediate step. It is this application that creates the file +containing the code that typesets the glossary. If this step +is omitted, the glossaries will not appear in your document. The +two indexing applications that are most commonly used with +LaTeX are <TT>makeindex</TT><A NAME="3938"></A> and <TT>xindy</TT><A NAME="3941"></A>. As +from version 1.17, the <TT>glossaries</TT> package can be used +with either of these applications. Previous versions were designed +to be used with <TT>makeindex</TT><A NAME="3945"></A> only. Note that +<TT>xindy</TT><A NAME="3948"></A> has much better multi-lingual support than +<TT>makeindex</TT><A NAME="3951"></A>, so <TT>xindy</TT><A NAME="3954"></A> is recommended if you're +not writing in English. Commands that only have an +effect when <TT>xindy</TT><A NAME="3957"></A> is used are described +<A HREF="glossaries-manual.html#sec:xindy">later</A>. + +<P> The <TT>glossaries</TT> package comes with the Perl script -<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 -<TT>myfile.tex</TT>, do: +<TT>makeglossaries</TT><A NAME="3961"></A> which will run <TT>makeindex</TT><A NAME="3964"></A> or +<TT>xindy</TT><A NAME="3967"></A> on all the glossary files using a customized style +file (which is created by <TT>\makeglossaries</TT><A NAME="3970"></A>). See +<A HREF="glossaries-manual.html#sec:makeglossariesapp">Using the +makeglossaries Perl script</A> for further +details. Perl is stable, cross-platform, open source software that +is used by a number of T<SMALL>E</SMALL>X-related applications. Further +information is available at <TT><A NAME="tex2html9" + HREF="http://www.perl.org/about.html">http://www.perl.org/about.html</A></TT>. +However, whilst it is strongly recommended that you use the +<TT>makeglossaries</TT><A NAME="3973"></A> script, it is possible to use the +<TT>glossaries</TT> package without having Perl installed. In which +case, if you have used the <TT>xindy</TT><A NAME="3982"></A> package option, you will +need to use <TT>xindy</TT><A NAME="3986"></A> (see +<A HREF="glossaries-manual.html#sec:xindyapp">Using xindy +explicitly</A>), otherwise you will need to use +<TT>makeindex</TT><A NAME="3989"></A> (see +<A HREF="glossaries-manual.html#sec:makeindexapp">Using makeindex +explicitly</A>). Note that some commands and +package options have no effect if you don't use +<TT>makeglossaries</TT><A NAME="3992"></A>. These are listed in +Table <A HREF="glossaries-manual.html#tab:makeglossariesCmds">2</A>. + +<P> +Note that if any of your entries use an entry +that is not referenced outside the glossary, you will need to +do an additional <TT>makeglossaries</TT><A NAME="3995"></A>, <TT>makeindex</TT><A NAME="3998"></A> +or <TT>xindy</TT><A NAME="4001"></A> run, as appropriate. For example, +suppose you have defined the following entries: <PRE> -latex myfile -makeglossaries myfile -latex myfile +\newglossaryentry{citrusfruit}{name={citrus fruit}, +description={fruit of any citrus tree. (See also +\gls{orange})}} + +\newglossaryentry{orange}{name={orange}, +description={an orange coloured fruit.}} +</PRE> +and suppose you have <code>\gls{citrusfruit}</code> in your document +but don't reference the <TT>orange</TT> entry, then the +<TT>orange</TT> entry won't appear in your glossary until +you first create the glossary and then do another run +of <TT>makeglossaries</TT><A NAME="4004"></A>, <TT>makeindex</TT><A NAME="4007"></A> or <TT>xindy</TT><A NAME="4010"></A>. +For example, if the document is called <TT>myDoc.tex</TT>, then +you must do: +<PRE> +latex myDoc +makeglossaries myDoc +latex myDoc +makeglossaries myDoc +latex myDoc +</PRE> + +<P> +Likewise, an additional <TT>makeglossaries</TT><A NAME="4013"></A> and LaTeX run +may be required if the document pages shift with re-runs. For +example, if the page numbering is not reset after the table of +contents, the insertion of the table of contents on the second +LaTeX run may push glossary entries across page boundaries, which +means that the number lists<A NAME="4015"></A> in the glossary may +need updating. + +<P> +The examples in this document assume that you are accessing +<TT>makeglossaries</TT><A NAME="4017"></A>, <TT>xindy</TT><A NAME="4020"></A> or <TT>makeindex</TT><A NAME="4023"></A> via +a terminal. Windows users can use the MSDOS Prompt which +is usually accessed via the +<I>Start</I>-><I>All Programs</I> +menu or +<I>Start</I>-><I>All Programs</I>-><I>Accessories</I> +menu. Alternatively, your text editor may have the +facility to create a function that will call the +required application. See your editor's user manual for further +details. + +<P> +If any problems occur, remember to check the transcript files +(e.g. <TT>.glg</TT><A NAME="4026"></A> or <TT>.alg</TT><A NAME="4028"></A>) for messages. + +<P> +<BR><P></P> +<DIV ALIGN="CENTER"> + +<A NAME="tab:makeglossariesCmds"></A><A NAME="3374"></A> +<TABLE CELLPADDING=3> +<CAPTION><STRONG>Table 2:</STRONG> +Commands and package options that have no effect when +using <TT>xindy</TT> or <TT>makeindex</TT> explicity</CAPTION> +<TR><TD ALIGN="LEFT"> </TD><TH ALIGN="LEFT"><B>Command or Package Option </B></TH> +<TD ALIGN="LEFT"><TT>makeindex</TT><A NAME="4030"></A></TD> +<TD ALIGN="LEFT"><TT>xindy</TT><A NAME="4033"></A></TD> +<TD ALIGN="LEFT"> </TD></TR> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>order=letter</TT><A NAME="4043"></A></TD> +<TD ALIGN="LEFT">use <TT>-l</TT></TD> +<TD ALIGN="LEFT">use <TT>-M ord/letorder</TT></TD> +<TD ALIGN="LEFT"> </TD></TR> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>order=word</TT><A NAME="4052"></A></TD> +<TD ALIGN="LEFT">default</TD> +<TD ALIGN="LEFT">default</TD> +<TD ALIGN="LEFT"> </TD></TR> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>xindy</TT><A NAME="4059"></A>={<TT>language=</TT><I>lang</I><TT>,codename=</TT><I>code</I>}</TD> +<TD ALIGN="LEFT">N/A</TD> +<TD ALIGN="LEFT">use <TT>-L</TT> <I>lang</I> <TT>-C</TT> <I>code</I></TD> +<TD ALIGN="LEFT"> </TD></TR> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\GlsSetXdyLanguage</TT><A NAME="4065"></A><TT>{</TT><EM>lang</EM><TT>}</TT></TD> +<TD ALIGN="LEFT">N/A</TD> +<TD ALIGN="LEFT">use <TT>-L</TT> <I>lang</I></TD> +<TD ALIGN="LEFT"> </TD></TR> +<TR><TD ALIGN="LEFT"> </TD><TD ALIGN="LEFT"><TT>\GlsSetXdyCodePage</TT><A NAME="4068"></A><TT>{</TT><EM>code</EM><TT>}</TT></TD> +<TD ALIGN="LEFT">N/A</TD> +<TD ALIGN="LEFT">use <TT>-C</TT> <I>code</I></TD> +<TD ALIGN="LEFT"> </TD></TR> +</TABLE> + +<P> + +</DIV> +<BR> + +<P> +<A HREF="glossaries-manual.html#top">Top</A> + +<P> + +<H3><A NAME="SECTION00023100000000000000"></A> +<A NAME="sec:makeglossariesapp"></A> +<BR> +Using the makeglossaries Perl Script +</H3> + +<P> +The <TT>makeglossaries</TT><A NAME="4074"></A> script picks up the relevant +information from the auxiliary (<TT>.aux</TT><A NAME="4077"></A>) file and +will either call <TT>xindy</TT><A NAME="4079"></A> or <TT>makeindex</TT><A NAME="4082"></A>, +depending on whether the indexing style file ends with +<TT>.xdy</TT><A NAME="4085"></A> or <TT>.ist</TT><A NAME="4087"></A>. Therefore, you only need to +pass the document's name without the extension to +<TT>makeglossaries</TT><A NAME="4089"></A>. +For example, if your document is called <TT>myDoc.tex</TT>, +type the following in your terminal: +<PRE> +latex myDoc +makeglossaries myDoc +latex myDoc </PRE> -You may need to explicitly load <TT>makeglossaries</TT><A NAME="2583"></A> into +You may need to explicitly load <TT>makeglossaries</TT><A NAME="4092"></A> into Perl: <PRE> -perl makeglossaries myfile +perl makeglossaries myDoc </PRE> There is a batch file called <TT>makeglossaries.bat</TT> which does this for Windows users, but you must have Perl installed to be able to use it. <P> -If you don't have Perl installed, you will have to run -<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>): +<A HREF="glossaries-manual.html#top">Top</A> + +<P> + +<H3><A NAME="SECTION00023200000000000000"></A> +<A NAME="sec:xindyapp"></A> +<BR> +Using xindy explicitly +</H3> + +<P> +If you want to use <TT>xindy</TT><A NAME="4098"></A> to process the glossary +files, you must make sure you have used the +<TT>xindy</TT><A NAME="4106"></A> package option: <PRE> -makeindex -s myfile.ist -t myfile.glg -o myfile.gls myfile.glo -makeindex -s myfile.ist -t myfile.alg -o myfile.acr myfile.acn +\usepackage[xindy]{glossaries} </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="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="2601"></A> or it will merge all your glossaries into a -single glossary. +This is required regardless of whether you use <TT>xindy</TT><A NAME="4110"></A> +explicitly or via <TT>makeglossaries</TT><A NAME="4113"></A>. This causes the glossary +entries to be written in raw <TT>xindy</TT><A NAME="4116"></A> format, so you need to +use <TT>-I xindy</TT> <I>not</I> <TT>-I tex</TT>. <P> -If any problems occur, remember to check the transcript files -(e.g. <TT>.glg</TT><A NAME="2604"></A> or <TT>.alg</TT><A NAME="2606"></A>) for messages. +To run <TT>xindy</TT><A NAME="4119"></A> type the following in your terminal +(all on one line): +<BR> +<BR><TT>xindy -L </TT> <I>language</I><TT> -C </TT> <I>encoding</I><TT> -I xindy +-M </TT> <I>style</I><TT> -t </TT> <I>base</I><TT>.glg +<BR> +-o </TT> <I>base</I><TT>.gls </TT> <I>base</I><TT>.glo +</TT> +<BR> +<BR> +where <I>language</I> is required language name, <I>encoding</I> is +the encoding, <I>base</I> is the name of the document without +the <TT>.tex</TT><A NAME="4122"></A> extension and <I>style</I> is the name of the +<TT>xindy</TT><A NAME="4124"></A> style file without the <TT>.xdy</TT><A NAME="4127"></A> extension. The +default name for this style file is <I>base</I><TT>.xdy</TT><A NAME="4129"></A> but +can be changed via <TT>\setStyleFile</TT><A NAME="4131"></A><TT>{</TT><EM>style</EM><TT>}</TT>. You may need to +specify the full path name. If any of the file names contain spaces, +you must delimit them using double-quotes. + +<P> +For example, if your document is called <TT>myDoc.tex</TT> and +you are using UTF8 encoding in English, then type the +following in your terminal: +<PRE> +xindy -L english -C utf8 -I xindy -M myDoc -t myDoc.glg -o myDoc.gls myDoc.glo +</PRE> + +<P> +Note that this just creates the main glossary. You need to do +the same for each of the other glossaries (including the +list of acronyms if you have used the <TT>acronym</TT><A NAME="4139"></A> +package option), substituting <TT>.glg</TT><A NAME="4143"></A>, <TT>.gls</TT><A NAME="4145"></A> +and <TT>.glo</TT><A NAME="4147"></A> with the relevant extensions. For example, +if you have used the <TT>acronym</TT><A NAME="4154"></A> package option, then +you would need to do: +<PRE> +xindy -L english -C utf8 -I xindy -M myDoc -t myDoc.alg -o myDoc.acr myDoc.acn +</PRE> +For additional glossaries, the extensions are those supplied +when you created the glossary with <TT>\newglossary</TT><A NAME="4158"></A>. + +<P> +Note that if you use <TT>makeglossaries</TT><A NAME="4161"></A> instead, you can +replace all those calls to <TT>xindy</TT><A NAME="4164"></A> with just one call +to <TT>makeglossaries</TT><A NAME="4167"></A>: +<PRE> +makeglossaries myDoc +</PRE> +Note also that some commands and package options have no effect if +you use <TT>xindy</TT><A NAME="4170"></A> explicitly instead of using +<TT>makeglossaries</TT><A NAME="4173"></A>. These are listed in +Table <A HREF="glossaries-manual.html#tab:makeglossariesCmds">2</A>. + <P> <A HREF="glossaries-manual.html#top">Top</A> <P> -<H2><A NAME="SECTION00023000000000000000"> -Troubleshooting</A> +<H3><A NAME="SECTION00023300000000000000"></A> +<A NAME="sec:makeindexapp"></A> +<BR> +Using makeindex explicitly +</H3> + +<P> +If you want to use <TT>makeindex</TT><A NAME="4179"></A> explicitly, you must +make sure that you haven't used the <TT>xindy</TT><A NAME="4187"></A> package +option or the glossary entries will be written in the wrong +format. To run <TT>makeindex</TT><A NAME="4191"></A>, type the following in +your terminal: +<BR> +<BR><TT>makeindex -s </TT> <I>style</I><TT>.ist -t </TT> <I>base</I><TT>.glg +-o </TT> <I>base</I><TT>.gls </TT> <I>base</I><TT>.glo +</TT> +<BR> +<BR> +where <I>base</I> is the name of your document without the +<TT>.tex</TT><A NAME="4194"></A> extension and <I>style</I><TT>.ist</TT><A NAME="4196"></A> is the +name of the <TT>makeindex</TT><A NAME="4198"></A> style file. By default, this is +<I>base</I><TT>.ist</TT><A NAME="4201"></A>, but may be changed via +<TT>\setStyleFile</TT><A NAME="4203"></A><TT>{</TT><EM>style</EM><TT>}</TT>. Note that there are other options, +such as <TT>-l</TT> (letter ordering). See the <TT>makeindex</TT><A NAME="4206"></A> +manual for further details. + +<P> +For example, if your document is called <TT>myDoc.tex</TT>, then +type the following at the terminal: +<PRE> +makeindex -s myDoc.ist -t myDoc.glg -o myDoc.gls myDoc.glo +</PRE> +Note that this only creates the main glossary. If you have +additional glossaries (for example, if you have used the +<TT>acronym</TT><A NAME="4214"></A> package option) then you must call +<TT>makeindex</TT><A NAME="4218"></A> for each glossary, substituting +<TT>.glg</TT><A NAME="4221"></A>, <TT>.gls</TT><A NAME="4223"></A> and <TT>.glo</TT><A NAME="4225"></A> with the +relevant extensions. For example, if you have used the +<TT>acronym</TT><A NAME="4232"></A> package option, then you need to type the +following in your terminal: +<PRE> +makeindex -s myDoc.ist -t myDoc.alg -o myDoc.acr myDoc.acn +</PRE> +For additional glossaries, the extensions are those supplied +when you created the glossary with <TT>\newglossary</TT><A NAME="4236"></A>. + +<P> +Note that if you use <TT>makeglossaries</TT><A NAME="4239"></A> instead, you can +replace all those calls to <TT>makeindex</TT><A NAME="4242"></A> with just one call +to <TT>makeglossaries</TT><A NAME="4245"></A>: +<PRE> +makeglossaries myDoc +</PRE> +Note also that some commands and package options have no effect if +you use <TT>makeindex</TT><A NAME="4248"></A> explicitly instead of using +<TT>makeglossaries</TT><A NAME="4251"></A>. These are listed in +Table <A HREF="glossaries-manual.html#tab:makeglossariesCmds">2</A>. + +<P> +<A HREF="glossaries-manual.html#top">Top</A> + +<P> + +<H2><A NAME="SECTION00024000000000000000"></A> +<A NAME="sec:trouble"></A> +<BR> +Troubleshooting </H2> <P> The <TT>glossaries</TT> package comes with a minimal file called <TT>minimalgls.tex</TT> which can be used for testing. This -should be located in <TT>texmf/doc/latex/glossaries/samples/</TT>. +should be located in the <TT>samples</TT> subdirectory (folder) +of the <TT>glossaries</TT> documentation directory. The location +varies according to your operating system and T<SMALL>E</SMALL>X installation. +For example, on my Linux partition it can be found in +<TT>/usr/local/texlive/2008/texmf-dist/doc/latex/glossaries/</TT>. Further information on debugging LaTeX code is available at -<TT><A NAME="tex2html5" +<TT><A NAME="tex2html11" HREF="http://theoval.cmp.uea.ac.uk/~nlct/latex/minexample/">http://theoval.cmp.uea.ac.uk/~nlct/latex/minexample/</A></TT>. <P> Below is a list of the most frequently asked questions. For other queries, consult the <TT>glossaries</TT> FAQ at -<TT><A NAME="tex2html6" +<TT><A NAME="tex2html12" HREF="http://theoval.cmp.uea.ac.uk/~nlct/latex/packages/faq/glossariesfaq.html">http://theoval.cmp.uea.ac.uk/~nlct/latex/packages/faq/glossariesfaq.html</A></TT>. <P> <OL> -<LI>I've used the <TT>smallcaps</TT><A NAME="2618"></A> option, but the acronyms +<LI>I've used the <TT>smallcaps</TT><A NAME="4265"></A> option, but the acronyms are displayed in normal sized upper case letters. <P> -The <TT>smallcaps</TT><A NAME="2627"></A> package option uses <TT>\textsc</TT> to typeset +The <TT>smallcaps</TT><A NAME="4274"></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. @@ -397,7 +1185,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="2636"></A> package +The easiest way to do this is to specify the <TT>smaller</TT><A NAME="4283"></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: @@ -412,7 +1200,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="2645"></A> package +The easiest way to do this is to specify the <TT>smaller</TT><A NAME="4292"></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>, @@ -427,20 +1215,23 @@ 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="2649"></A>? +<TT>makeglossaries</TT><A NAME="4296"></A>? <P> -Read <A HREF="glossaries-manual.html#sec:makeglossaries">the previous -section</A>. +Read <A HREF="glossaries-manual.html#sec:xindyapp">Using +xindy explicitly</A> or +<A HREF="glossaries-manual.html#sec:makeindexapp">Using +makeindex explicitly</A>, depending on +whether you want to use <TT>xindy</TT><A NAME="4299"></A> or <TT>makeindex</TT><A NAME="4302"></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="2653"></A> package to the +instructions on migrating from the <TT>glossary</TT><A NAME="4306"></A> package to the <TT>glossaries</TT> package? <P> -Read <A NAME="tex2html7" +Read <A NAME="tex2html13" HREF="glossary2glossaries.html">Upgrading from the glossary package to the glossaries package</A> which should be available from the @@ -448,18 +1239,19 @@ same location as this document. <P> </LI> -<LI>I'm using <TT>babel</TT><A NAME="2657"></A> but the fixed names haven't been +<LI>I'm using <TT>babel</TT><A NAME="4310"></A> but the fixed names haven't been translated. <P> The <TT>glossaries</TT> package currently only supports the following -languages: Danish, Dutch, English, French, German, Irish, Italian, -Hungarian, Polish and Spanish. If you want to add another language, -send me the translations, and I'll add them to the next version. +languages: Brazilian Portuguese, Danish, Dutch, English, French, +German, Irish, Italian, Hungarian, Polish and Spanish. If you want +to add another language, 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="2661"></A> package with the +translated, try adding the <TT>translator</TT><A NAME="4314"></A> package with the required languages explicitly (before you load the <TT>glossaries</TT> package). For example: <PRE> @@ -467,9 +1259,9 @@ package). For example: \usepackage[ngerman]{translator} \usepackage{glossaries} </PRE> -Alternatively, you may be able to add the language as a global option -to the class file. Check the <TT>translator</TT> package documentation for -further details. +Alternatively, you can add the language as a global option +to the class file. Check the <TT>translator</TT> package documentation +for further details. <P> </LI> @@ -479,26 +1271,38 @@ further details. Remember to do the following: <UL> -<LI>Add <TT>\makeglossaries</TT><A NAME="2666"></A> to the document preamble. +<LI>Add <TT>\makeglossaries</TT><A NAME="4319"></A> to the document preamble. <P> </LI> -<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>. +<LI>Use either <TT>\printglossary</TT><A NAME="4322"></A> for each glossary that has +been defined or <TT>\printglossaries</TT><A NAME="4325"></A>. <P> </LI> -<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. +<LI>Use the commands listed in +<A HREF="glossaries-manual.html#sec:glslink">Links to Glossary +Entries</A>, +<A HREF="glossaries-manual.html#sec:glsadd">Adding an Entry to the +Glossary Without Generating Text</A> or +<A HREF="#sec:glssee">Cross-Referencing +Entries</A> for each entry +that you want to appear in the glossary. <P> </LI> -<LI>Run LaTeX on your document, then run <TT>makeglossaries</TT><A NAME="2702"></A>, +<LI>Run LaTeX on your document, then run <TT>makeglossaries</TT><A NAME="4328"></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. +to appear in the table of contents, you will need an extra LaTeX run. If any of your entries cross-reference an entry that's not +referenced in the main body of the document, you will need to +run <TT>makeglossaries</TT><A NAME="4331"></A> after the second LaTeX run, followed +by another LaTeX run. </LI> </UL> + +<P> +Check the log files (<TT>.log</TT><A NAME="4334"></A>, <TT>.glg</TT><A NAME="4336"></A> etc) for any +warnings. </LI> </OL> @@ -517,17 +1321,20 @@ A Quick Guide For The Impatient This section is for people who want a few quick pointers of how to get started. However it is recommended that you read <A HREF="glossaries-manual.html#sec:overview">the overview section</A> -for additional commands and advice not listed here. +for additional commands and advice not listed here. There are +also some sample files to help you get started, listed in +<A HREF="glossaries-manual.html#sec:samples">Sample +Documents</A>. <P> <OL> -<LI>Load <TT>glossaries</TT> <I>after</I> <TT>hyperref</TT><A NAME="2709"></A>: +<LI>Load <TT>glossaries</TT> <I>after</I> <TT>hyperref</TT><A NAME="4342"></A>: <PRE> \usepackage{hyperref} \usepackage{glossaries} </PRE> -Similarly for the <TT>html</TT><A NAME="2712"></A> package: +Similarly for the <TT>html</TT><A NAME="4345"></A> package: <PRE> \usepackage{html} \usepackage{glossaries} @@ -535,19 +1342,18 @@ Similarly for the <TT>html</TT><A NAME="2712"></A> package: <P> </LI> -<LI>Always use <TT>\makeglossaries</TT><A NAME="2715"></A> if you want the glossary +<LI>Always use <TT>\makeglossaries</TT><A NAME="4348"></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="2718"></A>, your glossaries will +If you don't use <TT>\makeglossaries</TT><A NAME="4351"></A>, your glossaries will not appear in the document! <P> </LI> -<LI>Use <TT>\printglossaries</TT><A NAME="2721"></A> to make your glossaries appear +<LI>Use <TT>\printglossaries</TT><A NAME="4354"></A> to make your glossaries appear in the document at that point. For example: <PRE> \maketitle @@ -560,46 +1366,68 @@ 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="2724"></A>, then run LaTeX on it again: +then the Perl script <TT>makeglossaries</TT><A NAME="4357"></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="2732"></A> -package option.) +(You need to run LaTeX again if you have used the <TT>toc</TT><A NAME="4365"></A> +package option. You may also need an extra <TT>makeglossaries</TT><A NAME="4369"></A> +run and another LaTeX run if an entry is only referenced in the +glossary, or if including the glossary has caused the +number lists<A NAME="4371"></A> to change.) + +<P> If you use Windows, there is a batch file called <TT>makeglossaries.bat</TT> which you can use, but you will -still need Perl installed. +still need Perl installed. Alternatively, you can call +<TT>makeindex</TT><A NAME="4373"></A> directly. See +<A HREF="glossaries-manual.html#sec:makeglossaries">Generating the +Associated Glossary Files</A> for +further details. + +<P> +</LI> +<LI>If you want to use <TT>xindy</TT><A NAME="4376"></A> instead of +<TT>makeindex</TT><A NAME="4379"></A>, you must specify it in the package option: +<PRE> +\usepackage[xindy]{glossaries} +</PRE> +See +<A HREF="glossaries-manual.html#sec:makeglossaries">Generating the +Associated Glossary Files</A> for +further details. <P> </LI> <LI>New glossaries can be defined using: <P> -<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> +<TT>\newglossary</TT><A NAME="4382"></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="2739"></A> (called by <TT>makeglossaries</TT><A NAME="2742"></A>), +by <TT>makeindex</TT><A NAME="4385"></A> or <TT>xindy</TT><A NAME="4388"></A> (called by +<TT>makeglossaries</TT><A NAME="4391"></A>), <I>out-ext</I> is the extension of the file to be read by -<TT>makeindex</TT><A NAME="2745"></A> and <I>title</I> is the title for this +<TT>makeindex</TT><A NAME="4394"></A> or <TT>xindy</TT><A NAME="4397"></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="2748"></A> transcript file. Example: +the extension of the <TT>makeindex</TT><A NAME="4400"></A> or <TT>xindy</TT><A NAME="4403"></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="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. +will be Notation. If you use <TT>makeglossaries</TT><A NAME="4406"></A>, the +<TT>makeindex</TT><A NAME="4409"></A> or <TT>xindy</TT><A NAME="4412"></A> transcript will be written to a file with the +extension <TT>.nlg</TT><A NAME="4415"></A>. If <I>log-ext</I> is omitted, the extension +<TT>.glg</TT><A NAME="4417"></A> will be used. <P> </LI> <LI>Any new glossaries must be defined before -<TT>\makeglossaries</TT> +<TT>\makeglossaries</TT><A NAME="4419"></A>: <PRE> -\documentclass{article} \usepackage{glossaries} \newglossary{notation}{not}{ntn}{Notation} \makeglossaries @@ -607,7 +1435,7 @@ extension <TT>.nlg</TT><A NAME="2757"></A>. If <I>log-ext</I> is omitted, the ex <P> </LI> -<LI>If you use the <TT>acronym</TT><A NAME="2766"></A> package option, the +<LI>If you use the <TT>acronym</TT><A NAME="4427"></A> package option, the <TT>glossaries</TT> package will automatically create a new glossary type labelled <TT>acronym</TT>: @@ -618,31 +1446,35 @@ 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="2771"></A> -<I>before</I> <TT>\makeglossaries</TT><A NAME="2774"></A>: +numbers appear in the form 2-1), use <TT>\glsSetCompositor</TT><A NAME="4432"></A> +<I>before</I> <TT>\makeglossaries</TT><A NAME="4435"></A>: <PRE> \documentclass{article} \usepackage{glossaries} -\renewcommand{\glscompositor}{-} +\glsSetCompositor{-} \makeglossaries </PRE> <P> </LI> <LI>To add the glossaries to the table of contents use the -<TT>toc</TT><A NAME="2782"></A> package option: +<TT>toc</TT><A NAME="4443"></A> package option: <PRE> \usepackage[toc]{glossaries} </PRE> +This will require an extra LaTeX run. Note that if the table +of contents affects the subsequent page numbering (i.e. the +page numbers are not reset after the table of contents) then you +may need to rerun <TT>makeglossaries</TT><A NAME="4447"></A> and LaTeX. <P> </LI> <LI>Define a new entry with: <P> -<TT>\newglossaryentry</TT><A NAME="2786"></A><TT>{</TT><EM>label</EM><TT>}{</TT><EM>key-val list</EM><TT>}</TT> +<TT>\newglossaryentry</TT><A NAME="4450"></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="2789"></A> -key and a <TT>description</TT><A NAME="2792"></A> key. +The <I>key-val list</I> must at least contain a <TT>name</TT><A NAME="4453"></A> +key and a <TT>description</TT><A NAME="4456"></A> key. For example: <PRE> \newglossaryentry{perl}{name=Perl, @@ -654,23 +1486,108 @@ to use to identify it. <P> </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="2795"></A> and <TT>\Glspl</TT><A NAME="2798"></A>): +<LI>To define a sub-entry, use the <TT>parent</TT><A NAME="4459"></A> key. For +example: +<PRE> +\newglossaryentry{fruit}{name={fruit}, % parent entry +description={tree product that contains seeds}} + +\newglossaryentry{apple}{name={apple}, % sub-entry +description={firm, round fruit}, +parent=fruit} +</PRE> + +<P> +</LI> +<LI>To change the sorting order, use the <TT>sort</TT><A NAME="4462"></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} +</PRE> + +<P> +Note that if you use <TT>xindy</TT><A NAME="4465"></A> instead of <TT>makeindex</TT><A NAME="4468"></A>, +characters such as a backslash are ignored, so if you have used +the <TT>xindy</TT><A NAME="4476"></A> package option, you can just do: +<PRE> +\newglossaryentry{tex}{name={\TeX}, +description={A typesetting language}, +} +</PRE> + +<P> +</LI> +<LI>Sub-entries may have the same name as the parent entry: +<PRE> +\newglossaryentry{glossary}{name=glossary, % parent entry +description={\nopostdesc}, +plural={glossaries}} + +\newglossaryentry{glossarylist}{% first child entry +description={1) list of technical words}, +sort={1}, +parent={glossary}} + +\newglossaryentry{glossarycol}{% second child entry +description={2) collection of glosses}, +sort={2}, +parent={glossary}} +</PRE> +Note that in this instance the <TT>name</TT><A NAME="4480"></A> key is not +required for the child entries, but the <TT>sort</TT><A NAME="4483"></A> key is +needed to sort the sub-entries. The parent entry has no +description, so the description terminator is suppressed using +<TT>\nopostdesc</TT><A NAME="4486"></A>. + +<P> +</LI> +<LI>If the entry name starts with an accented letter or +non-Latin character, you will need to group the first letter +(otherwise it will cause a problem for commands like <TT>\Gls</TT><A NAME="4489"></A> and +<TT>\Glspl</TT><A NAME="4492"></A>): <PRE> \newglossaryentry{elite}{name={{\'e}lite}, +sort=elite, description={select group or class}} </PRE> Likewise with commands such as <TT>\ae</TT> and <TT>\oe</TT>: <PRE> \newglossaryentry{oesophagus}{% name={{\oe}sophagus}, +sort=oesophagus, description={canal from mouth to stomach}} </PRE> <P> </LI> -<LI>If you have multiple glossaries, use the <TT>type</TT><A NAME="2801"></A> +<LI>If you use <TT>xindy</TT><A NAME="4495"></A>, you can specify the accented +or non-Latin character directly (in combination with the +<TT>inputenc</TT><A NAME="4498"></A> and <TT>fontenc</TT><A NAME="4501"></A> packages) but you still +need to group the first letter (otherwise it will cause a +problem for commands like <TT>\Gls</TT><A NAME="4504"></A> and <TT>\Glspl</TT><A NAME="4507"></A> due to +expansion issues): +<PRE> +\newglossaryentry{elite}{name={{é}lite}, +description={select group or class}} +</PRE> +Note that in this case the <TT>sort</TT><A NAME="4510"></A> key is not required +as <TT>xindy</TT><A NAME="4513"></A> knows how to sort the letter é. + +<P> +</LI> +<LI>If you have multiple glossaries, use the <TT>type</TT><A NAME="4516"></A> key to specify in which glossary the entry belongs. For example: <PRE> \newglossary{languages}{lan}{lng}{Index of Languages} @@ -681,7 +1598,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="2804"></A> is omitted, the default glossary is used. +If <TT>type</TT><A NAME="4519"></A> is omitted, the default glossary is used. <P> </LI> @@ -695,9 +1612,32 @@ description={A list of individual pages or page ranges <P> </LI> +<LI>You can cross-reference an entry using the +<TT>see</TT><A NAME="4522"></A> key when you define it. For example, suppose +you have defined an entry whose label is <TT>taylorstheorem</TT>, +then you can cross-reference it: +<PRE> +\newglossaryentry{maclaurinseries}{name={Maclaurin series}, +description={Series expansion}, +see={taylorstheorem}} +</PRE> +Alternatively, you can use <TT>\glssee</TT><A NAME="4525"></A> after you have defined +the entry: +<PRE> +\glssee{maclaurinseries}{taylorstheorem} +</PRE> +(The final argument may be a comma-separated list of labels.) +The "see" tag may be overridden for a given entry: +<PRE> +\glssee[see also]{maclaurinseries}{taylorstheorem} +</PRE> +or it can be changed for all entries by redefining <TT>\seename</TT><A NAME="4528"></A>. + +<P> +</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="2807"></A> key. For example: +irregular plural, use the <TT>plural</TT><A NAME="4531"></A> key. For example: <PRE> \newglossaryentry{matrix}{name=matrix, description=rectangular array of quantities, @@ -737,7 +1677,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="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> +<TT>\newacronym</TT><A NAME="4534"></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> @@ -753,30 +1693,30 @@ first={support vector machine (SVM)}, plural={SVMs}, firstplural={support vector machines (SVMs)}} </PRE> -(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 value of <TT>\acronymtype</TT><A NAME="4537"></A> varies depending on whether +the <TT>acronym</TT><A NAME="4545"></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="2825"></A> keys; for +override any of the <TT>\newglossaryentry</TT><A NAME="4549"></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="2828"></A>. This can be redefined +is governed by <TT>\glsnamefont</TT><A NAME="4552"></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="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. +Note that the list-like glossary styles place the entry name in +the optional argument to <TT>\item</TT><A NAME="4555"></A>, so they will +appear in bold, unless you redefine <TT>\glsnamefont</TT><A NAME="4558"></A> to counteract +the bold font. Similarly, the tree-like styles display the +entry name in bold. <P> </LI> -<LI>In the document use <TT>\gls</TT><A NAME="2840"></A><TT>{</TT><EM>label</EM><TT>}</TT> +<LI>In the document use <TT>\gls</TT><A NAME="4561"></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> @@ -788,21 +1728,21 @@ A \gls{singmtx} is a matrix with a zero determinant. <LI>Other variations: <UL> -<LI><TT>\Gls</TT><A NAME="2843"></A><TT>{</TT><EM>label</EM><TT>}</TT> : like <TT>\gls</TT>, +<LI><TT>\Gls</TT><A NAME="4564"></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="2846"></A><TT>{</TT><EM>label</EM><TT>}</TT> : like <TT>\gls</TT>, +<LI><TT>\GLS</TT><A NAME="4567"></A><TT>{</TT><EM>label</EM><TT>}</TT> : like <TT>\gls</TT>, but all upper case. </LI> -<LI><TT>\glspl</TT><A NAME="2849"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural +<LI><TT>\glspl</TT><A NAME="4570"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural </LI> -<LI><TT>\Glspl</TT><A NAME="2852"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural with +<LI><TT>\Glspl</TT><A NAME="4573"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural with first letter in upper case </LI> -<LI><TT>\GLSpl</TT><A NAME="2855"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural but +<LI><TT>\GLSpl</TT><A NAME="4576"></A><TT>{</TT><EM>label</EM><TT>}</TT> : use plural but all upper case </LI> -<LI><TT>\glslink</TT><A NAME="2858"></A><TT>{</TT><EM>label</EM><TT>}{</TT><EM>link text</EM><TT>}</TT> : +<LI><TT>\glslink</TT><A NAME="4579"></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> @@ -823,8 +1763,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="2861"></A> key in the optional argument. -Note that the value of the <TT>format</TT><A NAME="2864"></A> key should be the +changed using the <TT>format</TT><A NAME="4582"></A> key in the optional argument. +Note that the value of the <TT>format</TT><A NAME="4585"></A> key should be the name of a command <I>without</I> the initial backslash. For example: <PRE> @@ -840,23 +1780,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="2868"></A> -(which uses <TT>\emph</TT><A NAME="2871"></A>). For example: +form <TT>\text</TT><I>xx</I>, as well as <TT>\hyperemph</TT><A NAME="4589"></A> +(which uses <TT>\emph</TT><A NAME="4592"></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="2874"></A> as this can -cause unpredictable results, as there is no guarantee that the effect -will be localised to the required text. +<LI>Don't use declarations in <TT>format</TT><A NAME="4595"></A> (e.g. <TT>format=bfseries</TT>) as this can cause unpredictable results, +since 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="2877"></A><TT>{</TT><EM>label</EM><TT>}</TT> or -<TT>\glsaddall</TT><A NAME="2880"></A>. These commands also take an optional +any text using <TT>\glsadd</TT><A NAME="4598"></A><TT>{</TT><EM>label</EM><TT>}</TT> or +<TT>\glsaddall</TT><A NAME="4601"></A>. These commands also take an optional argument where you can specify the format. For example <PRE> \glsadd[format=hyperbf]{singmtx} @@ -869,8 +1809,7 @@ any text where the command occurs. </LI> <LI>A number range can be entered using <code>format=(</code> and <code>format=)</code> to mark the beginning and ending of the -range<A NAME="tex2html8" - HREF="#foot515"><SUP>1</SUP></A>. For example: +range. For example: <PRE> \glsadd[format=(]{singmtx} This is a very long section all about \glspl{singmtx}. @@ -879,8 +1818,9 @@ range<A NAME="tex2html8" \glsadd[format=)]{singmtx} </PRE> -This is equivalent to <TT>makeindex</TT><A NAME="2883"></A>'s <code>|(</code> and <code>|)</code> -formats. +This is equivalent to <TT>makeindex</TT><A NAME="4604"></A>'s <code>|(</code> and <code>|)</code> +formats or <TT>xindy</TT><A NAME="4607"></A>'s <TT>:open-range</TT> and +<TT>:close-range</TT> tags. <P> </LI> @@ -901,33 +1841,13 @@ formats. <LI>Only those terms that have actually been used in the document will be placed in the glossary. If you have defined a term that doesn't appear in the document, then it means -you haven't used it in the text (either via <TT>\glslink</TT><A NAME="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>). +you haven't used it in the text (either via <TT>\glslink</TT><A NAME="4610"></A> +or <TT>\gls</TT><A NAME="4613"></A> and related commands or via <TT>\glsadd</TT><A NAME="4616"></A> +or <TT>\glsaddall</TT><A NAME="4619"></A> or via <TT>\glssee</TT><A NAME="4622"></A>). <P> </LI> -<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} -</PRE> - -<P> -</LI> -<LI>You don't need to escape <TT>makeindex</TT><A NAME="2901"></A>'s special characters: +<LI>You don't need to escape <TT>makeindex</TT><A NAME="4625"></A>'s special characters: <PRE> \newglossaryentry{quote}{name={"}, description={Double quote character}} @@ -948,52 +1868,45 @@ For example: description={A metric measurement of length}, symbol={m}} </PRE> -The predefined glossary styles that display the entry symbol -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. +See <A HREF="glossaries-manual.html#sec:styles">Glossary +Styles</A> for a list of predefined glossary +styles. <P> </LI> -<LI>Glossary styles can be set using the <TT>style</TT><A NAME="2941"></A> +<LI>Glossary styles can be set using the <TT>style</TT><A NAME="4633"></A> package option. For example: <PRE> \usepackage[style=long3col]{glossaries} </PRE> -or using <TT>\glossarystyle</TT><A NAME="2945"></A><TT>{</TT><EM>style</EM><TT>}</TT>. For example: +or using <TT>\glossarystyle</TT><A NAME="4637"></A><TT>{</TT><EM>style</EM><TT>}</TT>. For example: <PRE> \glossarystyle{altlist} </PRE> The predefined glossary styles provided by the <TT>glossaries</TT> -bundle are listed in <A HREF="glossaries-manual.html#sec:styles">Glossary Styles</A>. +bundle are listed in <A HREF="glossaries-manual.html#sec:styles">Glossary +Styles</A>. <P> </LI> <LI>The list of numbers associated with each glossary entry -can be suppressed using the package option <TT>nonumberlist</TT><A NAME="2954"></A>: +can be suppressed using the package option <TT>nonumberlist</TT><A NAME="4646"></A>: <PRE> \usepackage[nonumberlist]{glossaries} </PRE> <P> </LI> -<LI>By default, the glossaries will appear in an unnumbered +<LI>By default, the glossary 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="2963"></A> package +section. This can be changed using the <TT>section</TT><A NAME="4655"></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="2972"></A>=<I>value</I>. For example, to make the glossaries +<TT>section</TT><A NAME="4664"></A>=<I>value</I>. For example, to make the glossaries appear in unnumbered subsections: <PRE> \usepackage[section=subsection]{glossaries} @@ -1023,33 +1936,43 @@ Package Options <P> The <TT>glossaries</TT> package options are as follows: <DL> -<DT><STRONG><TT>toc</TT><A NAME="2985"></A></STRONG></DT> +<DT><STRONG><TT>toc</TT><A NAME="4677"></A></STRONG></DT> <DD>Add the glossaries to the table of contents. +Note that an extra LaTeX run is required with this option. <P> </DD> -<DT><STRONG><TT>numberline</TT><A NAME="2994"></A></STRONG></DT> -<DD>When used with <TT>toc</TT><A NAME="3003"></A>, this will +<DT><STRONG><TT>numberline</TT><A NAME="4686"></A></STRONG></DT> +<DD>When used with <TT>toc</TT><A NAME="4695"></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="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 +effect if the <TT>toc</TT><A NAME="4704"></A> option is omitted. If <TT>toc</TT><A NAME="4713"></A> is +used without <TT>numberline</TT><A NAME="4722"></A>, the title will be aligned with the section numbers rather than the section titles. <P> </DD> -<DT><STRONG><TT>acronym</TT><A NAME="3039"></A></STRONG></DT> -<DD>Make a separate glossary for acronyms. +<DT><STRONG><TT>acronym</TT><A NAME="4731"></A></STRONG></DT> +<DD>This creates a new glossary with the +label <TT>acronym</TT>: +<PRE> +\newglossary[alg]{acronym}{acr}{acn}{\acronymname} +</PRE> +If the <TT>acronym</TT><A NAME="4740"></A> package option is used, <TT>\acronymtype</TT><A NAME="4744"></A> +is set to <TT>acronym</TT> otherwise it is set to +<TT>main</TT>.<A NAME="tex2html14" + HREF="#foot3410"><SUP>1</SUP></A>Entries that are defined using <TT>\newacronym</TT><A NAME="4765"></A> are placed in +the glossary whose label is given by <TT>\acronymtype</TT><A NAME="4768"></A>. <P> </DD> -<DT><STRONG><TT>section</TT><A NAME="3048"></A></STRONG></DT> +<DT><STRONG><TT>section</TT><A NAME="4776"></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, otherwise each glossary will appear in a chapter, if chapters -exists, otherwise in a section. Unnumbered sectional units will be used +exist, otherwise in a section. Unnumbered sectional units will be used by default. Example: <PRE> \usepackage[section=subsection]{glossaries} @@ -1062,22 +1985,26 @@ is equivalent to \usepackage[section=section]{glossaries} </PRE> You can change this value later in the document using -<TT>\setglossarysection</TT><A NAME="3052"></A><TT>{</TT><EM>type</EM><TT>}</TT>. +<BR> +<BR><TT>\setglossarysection{</TT><EM>name</EM><TT>}</TT> +<BR> +<BR> +where <I>name</I> is the sectional unit. <P> </DD> -<DT><STRONG><TT>numberedsection</TT><A NAME="3060"></A></STRONG></DT> +<DT><STRONG><TT>numberedsection</TT><A NAME="4785"></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="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> +but this can be changed using <TT>numberedsection</TT><A NAME="4794"></A>. This option can take +three possible values: <TT>false</TT><A NAME="4798"></A> (no +number, i.e. use starred form), <TT>nolabel</TT><A NAME="4800"></A> (numbered, i.e. unstarred form, but not labelled) and -<TT>autolabel</TT><A NAME="3077"></A> (numbered with automatic -labelling). If <TT>numberedsection=autolabel</TT><A NAME="3086"></A> is used, each +<TT>autolabel</TT><A NAME="4802"></A> (numbered with automatic +labelling). If <TT>numberedsection=autolabel</TT><A NAME="4811"></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="#foot2320"><SUP>2</SUP></A> and additional glossaries are labelled +acronyms is labelled <TT>acronym</TT><A NAME="tex2html15" + HREF="#foot3411"><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: @@ -1092,9 +2019,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="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: +<TT>\acronymtype</TT><A NAME="4823"></A> which is set to <TT>main</TT> if the +<TT>acronym</TT><A NAME="4831"></A> option is not used and is set to <TT>acronym</TT> +if the <TT>acronym</TT><A NAME="4840"></A> option is used. For example: <PRE> The list of acronyms is in section~\ref{\acronymtype}. </PRE> @@ -1118,93 +2045,93 @@ The list of acronyms is in section~\ref{\glsautoprefix\acronymtype}. <P> </DD> -<DT><STRONG><TT>style</TT><A NAME="3124"></A></STRONG></DT> +<DT><STRONG><TT>style</TT><A NAME="4849"></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="3133"></A></STRONG></DT> +<DT><STRONG><TT>nonumberlist</TT><A NAME="4858"></A></STRONG></DT> <DD>This option will suppress the -associated number lists<A NAME="3136"></A> in the glossaries (see also +associated number lists<A NAME="4861"></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="3143"></A></STRONG></DT> +<DT><STRONG><TT>counter</TT><A NAME="4868"></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="3146"></A>. +lists<A NAME="4871"></A>. <P> <A NAME="sanitize"></A> </DD> -<DT><STRONG><TT>sanitize</TT><A NAME="3153"></A></STRONG></DT> +<DT><STRONG><TT>sanitize</TT><A NAME="4878"></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="3158"></A>, <TT>description</TT><A NAME="3161"></A> and <TT>symbol</TT><A NAME="3164"></A> keys used +<TT>name</TT><A NAME="4883"></A>, <TT>description</TT><A NAME="4886"></A> and <TT>symbol</TT><A NAME="4889"></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="3172"></A> package +sanitization can be switched off using the <TT>sanitize</TT><A NAME="4897"></A> package option. For example, to switch off the sanitization for the -<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: +<TT>description</TT><A NAME="4901"></A> and <TT>name</TT><A NAME="4904"></A> keys, but not for the +<TT>symbol</TT><A NAME="4907"></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="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 +<B>Note</B>: this sanitization only applies to the <TT>name</TT><A NAME="4910"></A>, +<TT>description</TT><A NAME="4913"></A> and <TT>symbol</TT><A NAME="4916"></A> keys. It doesn't apply +to any of the other keys (except the <TT>sort</TT><A NAME="4919"></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="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. +Since the value of the <TT>text</TT><A NAME="4922"></A> key is obtained from the +<TT>name</TT><A NAME="4925"></A> key, you will still need to protect fragile commands +in the <TT>name</TT><A NAME="4928"></A> key if you don't use the <TT>text</TT><A NAME="4931"></A> key. <P> </DD> -<DT><STRONG><TT>description</TT><A NAME="3214"></A></STRONG></DT> +<DT><STRONG><TT>description</TT><A NAME="4939"></A></STRONG></DT> <DD>This option changes the definition of -<TT>\newacronym</TT><A NAME="3218"></A> to allow a description. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> +<TT>\newacronym</TT><A NAME="4943"></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="3226"></A></STRONG></DT> +<DT><STRONG><TT>footnote</TT><A NAME="4951"></A></STRONG></DT> <DD>This option changes the definition of -<TT>\newacronym</TT><A NAME="3230"></A> and the way that acronyms are displayed. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> +<TT>\newacronym</TT><A NAME="4955"></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="3238"></A></STRONG></DT> +<DT><STRONG><TT>smallcaps</TT><A NAME="4963"></A></STRONG></DT> <DD>This option changes the definition of -<TT>\newacronym</TT><A NAME="3242"></A> and the way that acronyms are displayed. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> +<TT>\newacronym</TT><A NAME="4967"></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="3250"></A></STRONG></DT> +<DT><STRONG><TT>smaller</TT><A NAME="4975"></A></STRONG></DT> <DD>This option changes the definition of -<TT>\newacronym</TT><A NAME="3254"></A> and the way that acronyms are displayed. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> +<TT>\newacronym</TT><A NAME="4979"></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="3262"></A></STRONG></DT> +<DT><STRONG><TT>dua</TT><A NAME="4987"></A></STRONG></DT> <DD>This option changes the definition of -<TT>\newacronym</TT><A NAME="3266"></A> so that acronyms are always expanded. +<TT>\newacronym</TT><A NAME="4991"></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="3274"></A></STRONG></DT> +<DT><STRONG><TT>shortcuts</TT><A NAME="4999"></A></STRONG></DT> <DD>This option provides shortcut commands for acronyms. See <A HREF="glossaries-manual.html#sec:acronyms">later</A> @@ -1212,6 +2139,52 @@ for further details. <P> </DD> +<DT><STRONG><TT>makeindex</TT><A NAME="5008"></A></STRONG></DT> +<DD>(Default) The glossary information and +indexing style file will be written in <TT>makeindex</TT><A NAME="5012"></A> format. If you use +<TT>makeglossaries</TT><A NAME="5015"></A>, it will automatically detect that it needs +to call <TT>makeindex</TT><A NAME="5018"></A>. If you don't use +<TT>makeglossaries</TT><A NAME="5021"></A>, you need to remember to use +<TT>makeindex</TT><A NAME="5024"></A> not <TT>xindy</TT><A NAME="5027"></A>. The indexing style file +will been given a <TT>.ist</TT><A NAME="5030"></A> extension. + +<P> +</DD> +<DT><STRONG><TT>xindy</TT><A NAME="5037"></A></STRONG></DT> +<DD>The glossary information and indexing style file will +be written in <TT>xindy</TT><A NAME="5041"></A> format. If you use +<TT>makeglossaries</TT><A NAME="5044"></A>, it will automatically detect that it needs +to call <TT>xindy</TT><A NAME="5047"></A>. If you don't use <TT>makeglossaries</TT><A NAME="5050"></A>, +you need to remember to use <TT>xindy</TT><A NAME="5053"></A> not <TT>makeindex</TT><A NAME="5056"></A>. +The indexing style file will been given a <TT>.xdy</TT><A NAME="5059"></A> extension. + +<P> +The <TT>xindy</TT><A NAME="5066"></A> package option may additionally have a +value that is a key=value comma-separated list to override +the language and codepage. For example: +<PRE> +\usepackage[xindy={language=english,codepage=utf8}]{glossaries} +</PRE> +You can also specify whether you want a number group in +the glossary. This defaults to true, but can be suppressed. For +example: +<PRE> +\usepackage[xindy={glsnumbers=false}]{glossaries} +</PRE> +See <A HREF="glossaries-manual.html#sec:xindy">Xindy</A> +for further details on using <TT>xindy</TT><A NAME="5070"></A> with the +<TT>glossaries</TT> package. + +<P> +</DD> +<DT><STRONG><TT>order</TT><A NAME="5079"></A></STRONG></DT> +<DD>This may take two values: +<TT>word</TT><A NAME="5083"></A> or <TT>letter</TT><A NAME="5085"></A>. The default +is word ordering. Note that this option has no effect if you +don't use <TT>makeglossaries</TT><A NAME="5087"></A>. + +<P> +</DD> </DL> <P> <A HREF="glossaries-manual.html#top">Top</A> @@ -1226,34 +2199,95 @@ 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="#foot2340"><SUP>3</SUP></A> However +is better to define them in the preamble to ensure this.<A NAME="tex2html16" + HREF="#foot3433"><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="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. +is used in this way, a line is added to an associated glossary file +(<TT>.glo</TT><A NAME="5093"></A>), which then needs to be converted into a +corresponding <TT>.gls</TT><A NAME="5095"></A> file which contains the typeset +glossary which is input by <TT>\printglossary</TT><A NAME="5097"></A> or +<TT>\printglossaries</TT><A NAME="5100"></A>. The Perl script <TT>makeglossaries</TT><A NAME="5103"></A> can +be used to call <TT>makeindex</TT><A NAME="5106"></A> or <TT>xindy</TT><A NAME="5109"></A>, using a +customised indexing 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. See +<A HREF="glossaries-manual.html#sec:makeglossaries">Generating the +Associated Glossary Files</A> +for further details. <P> The command <TT>\makeglossaries</TT> must be placed in the preamble in -order to create the customised <TT>makeindex</TT><A NAME="3299"></A> <TT>.ist</TT><A NAME="3302"></A> +order to create the customised <TT>makeindex</TT><A NAME="5112"></A> (<TT>.ist</TT><A NAME="5115"></A>) +or <TT>xindy</TT><A NAME="5117"></A> (<TT>.xdy</TT><A NAME="5120"></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 -hyphen compositor, you must set this by redefining -<TT>\glscompositor</TT> <I>before</I> -using <TT>\makeglossaries</TT>: +appropriate output files. If you omit <TT>\makeglossaries</TT> none of the +glossaries will be created. + +<P> +Note that some of the commands provided by the <TT>glossaries</TT> +package must be placed before <TT>\makeglossaries</TT> as they are +required when creating the customised style file. If you attempt +to use those commands after <TT>\makeglossaries</TT> you will generate +an error. + +<P> +You can suppress the creation of the customised <TT>xindy</TT><A NAME="5123"></A> +or <TT>makeindex</TT><A NAME="5126"></A> style file using <TT>\noist</TT>. Note that this +command must be used before <TT>\makeglossaries</TT>. + +<P> +The default name for the customised style file is given by +<TT>\jobname</TT><A NAME="5129"></A><TT>.ist</TT><A NAME="5132"></A> (for <TT>makeindex</TT><A NAME="5134"></A>) or +<TT>\jobname</TT><A NAME="5137"></A><TT>.xdy</TT><A NAME="5140"></A> (for <TT>xindy</TT><A NAME="5142"></A>). This name may be +changed using: +<BR> +<BR> +<TT>\setStyleFile{</TT><EM>name</EM><TT>}</TT> +<BR> +<BR> +where <I>name</I> is the name of the style file without the +extension. Note that this command must be used before +<TT>\makeglossaries</TT>. + +<P> +Each glossary entry is assigned a number list<A NAME="5144"></A> that lists all +the locations in the document where that entry was used. By default, +the location refers to the page number but this may be overridden +using the <TT>counter</TT><A NAME="5151"></A> package option. The default form of +the location number assumes a full stop compositor (e.g. 1.2), +but if your location numbers use a different compositor (e.g. 1-2) +you need to set this using +<BR> +<BR><TT>\glsSetCompositor{</TT><EM>symbol</EM><TT>}</TT> +<BR> +<BR> +For example: <PRE> -\renewcommand*{\glscompositor}{-} +\glsSetCompositor{-} </PRE> -(The default value of <TT>\glscompositor</TT> is a full stop.) +Note that this command must be used before <TT>\makeglossaries</TT>. + +<P> +If you use <TT>xindy</TT><A NAME="5155"></A>, you can have a different compositor +for page numbers starting with an uppercase alphabetical +character using: +<BR> +<BR><TT>\glsSetAlphaCompositor{</TT><EM>symbol</EM><TT>}</TT> +<BR> +<BR> +Note that this command has no effect if you haven't used the +<TT>xindy</TT><A NAME="5163"></A> package option. For example, if you want +number lists<A NAME="5166"></A> containing a mixture of A-1 and 2.3 +style formats, then do: +<PRE> +\glsSetCompositor{.} +\glsSetAlphaCompositor{-} +</PRE> +See <A HREF="glossaries-manual.html#sec:numberlists">Number +lists</A> for +further information about number lists<A NAME="5167"></A>. <P> New glossary entries are defined using the command: @@ -1265,112 +2299,161 @@ 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="3304"></A> and -<TT>description</TT><A NAME="3307"></A>. Available fields are listed below: +about this entry. There are two required fields: <TT>name</TT><A NAME="5169"></A> and +<TT>description</TT><A NAME="5172"></A>, except for sub-entries where the +<TT>name</TT><A NAME="5175"></A> field may be omitted. Available fields are listed +below: <P> <DL> -<DT><STRONG><TT>name</TT><A NAME="3310"></A></STRONG></DT> -<DD>The name of the entry (as it will appear in the -glossary). +<DT><STRONG><TT>name</TT><A NAME="5178"></A></STRONG></DT> +<DD>The name of the entry (as it will appear in +the glossary). If this key is omitted and the <TT>parent</TT><A NAME="5181"></A> +key is supplied, this value will be the same as the parent's name. <P> </DD> -<DT><STRONG><TT>description</TT><A NAME="3313"></A></STRONG></DT> +<DT><STRONG><TT>description</TT><A NAME="5184"></A></STRONG></DT> <DD>A brief description of this term (to -appear in the glossary). +appear in the glossary). Within this value, you can use +<TT>\nopostdesc</TT> to suppress the +description terminator for this entry. For example, if this +entry is a parent entry that doesn't require a description, you +can do <code>description={\nopostdesc}</code>. If you want a paragraph +break in the description use <TT>\glspar</TT>. +However, note that not all glossary styles support multi-line +descriptions. + +<P> +</DD> +<DT><STRONG><TT>parent</TT><A NAME="5187"></A></STRONG></DT> +<DD>The label of the parent entry. Note that +the parent entry must be defined before its sub-entries. +See <A HREF="glossaries-manual.html#sec:subentries">Sub-Entries</A> for +further details. <P> </DD> -<DT><STRONG><TT>descriptionplural</TT><A NAME="3316"></A></STRONG></DT> +<DT><STRONG><TT>descriptionplural</TT><A NAME="5190"></A></STRONG></DT> <DD>The plural form of the -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. +description (as passed to <TT>\glsdisplay</TT><A NAME="5193"></A> and <TT>\glsdisplayfirst</TT><A NAME="5196"></A> +by <TT>\glspl</TT><A NAME="5199"></A>, <TT>\Glspl</TT><A NAME="5202"></A> and <TT>\GLSpl</TT><A NAME="5205"></A>). If omitted, the value +is set to the same as the <TT>description</TT><A NAME="5208"></A> key. <P> </DD> -<DT><STRONG><TT>text</TT><A NAME="3337"></A></STRONG></DT> +<DT><STRONG><TT>text</TT><A NAME="5211"></A></STRONG></DT> <DD>How this entry will appear in the document text -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. +when using <TT>\gls</TT><A NAME="5214"></A> (or one of its uppercase variants). If this +field is omitted, the value of the <TT>name</TT><A NAME="5217"></A> key is used. <P> </DD> -<DT><STRONG><TT>first</TT><A NAME="3346"></A></STRONG></DT> +<DT><STRONG><TT>first</TT><A NAME="5220"></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="3349"></A> (or one of its uppercase -variants). If this field is omitted, the value of the <TT>text</TT><A NAME="3352"></A> +the first time it is used with <TT>\gls</TT><A NAME="5223"></A> (or one of its uppercase +variants). If this field is omitted, the value of the <TT>text</TT><A NAME="5226"></A> key is used. <P> </DD> -<DT><STRONG><TT>plural</TT><A NAME="3355"></A></STRONG></DT> +<DT><STRONG><TT>plural</TT><A NAME="5229"></A></STRONG></DT> <DD>How the entry will appear in the document text -when using <TT>\glspl</TT><A NAME="3358"></A> (or one of its uppercase variants). +when using <TT>\glspl</TT><A NAME="5232"></A> (or one of its uppercase variants). If this field is omitted, the value is obtained by appending -<TT>\glspluralsuffix</TT><A NAME="3361"></A> to the value of the <TT>text</TT><A NAME="3364"></A> field. +<TT>\glspluralsuffix</TT><A NAME="5235"></A> to the value of the <TT>text</TT><A NAME="5238"></A> field. <P> </DD> -<DT><STRONG><TT>firstplural</TT><A NAME="3367"></A></STRONG></DT> +<DT><STRONG><TT>firstplural</TT><A NAME="5241"></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="3370"></A> (or one of its +document text the first time it is used with <TT>\glspl</TT><A NAME="5244"></A> (or one of its uppercase variants). If this field is omitted, the value is obtained -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. +from the <TT>plural</TT><A NAME="5247"></A> key, if the <TT>first</TT><A NAME="5250"></A> key is omitted, +or by appending <TT>\glspluralsuffix</TT><A NAME="5253"></A> to the value of the +<TT>first</TT><A NAME="5256"></A> field, if the <TT>first</TT><A NAME="5259"></A> field is present. <P> <B>Note:</B> prior to version 1.13, the default value of -<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. +<TT>firstplural</TT><A NAME="5262"></A> was always taken by appending "s" to the +<TT>first</TT><A NAME="5265"></A> key, which meant that you had to specify both +<TT>plural</TT><A NAME="5268"></A> and <TT>firstplural</TT><A NAME="5271"></A>, even if you hadn't +used the <TT>first</TT><A NAME="5274"></A> key. <P> </DD> -<DT><STRONG><TT>symbol</TT><A NAME="3403"></A></STRONG></DT> +<DT><STRONG><TT>symbol</TT><A NAME="5277"></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>. +specify an associated symbol. If omitted, the value is set to +<TT>\relax</TT>. Note that not all glossary styles display the +symbol. <P> </DD> -<DT><STRONG><TT>symbolplural</TT><A NAME="3406"></A></STRONG></DT> +<DT><STRONG><TT>symbolplural</TT><A NAME="5280"></A></STRONG></DT> <DD>This is the plural form of the -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. +symbol (as passed to <TT>\glsdisplay</TT><A NAME="5283"></A> and <TT>\glsdisplayfirst</TT><A NAME="5286"></A> +by <TT>\glspl</TT><A NAME="5289"></A>, <TT>\Glspl</TT><A NAME="5292"></A> and <TT>\GLSpl</TT><A NAME="5295"></A>). If omitted, the value +is set to the same as the <TT>symbol</TT><A NAME="5298"></A> key. <P> </DD> -<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="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). +<DT><STRONG><TT>sort</TT><A NAME="5301"></A></STRONG></DT> +<DD>This value indicates how <TT>makeindex</TT><A NAME="5304"></A> +or <TT>xindy</TT><A NAME="5307"></A> should sort this entry. If omitted, the value is +given by the <TT>name</TT><A NAME="5310"></A> field. <P> </DD> -<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="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 +<DT><STRONG><TT>type</TT><A NAME="5313"></A></STRONG></DT> +<DD>This specifies the label of the glossary in +which this entry belongs. If omitted, the default glossary is +assumed. The list of acronyms type is given by +<TT>\acronymtype</TT><A NAME="5316"></A> which will either be <TT>main</TT> or +<TT>acronym</TT>, depending on whether the <TT>acronym</TT><A NAME="5324"></A> package option was used. + +<P> +</DD> +<DT><STRONG><TT>nonumberlist</TT><A NAME="5328"></A></STRONG></DT> +<DD>Suppress the number list<A NAME="5330"></A> for +this entry. + +<P> +</DD> +<DT><STRONG><TT>see</TT><A NAME="5332"></A></STRONG></DT> +<DD>Cross-reference another entry. Using the +<TT>see</TT><A NAME="5335"></A> key will automatically add this entry to the +glossary, but will not automatically add the cross-referenced entry. +The referenced entry should be supplied as the value to this key. +If you want to override the "see" tag, you can supply the new +tag in square brackets before the label. For example +<code>see=[see also]{anotherlabel}</code>. For further details, +see <A HREF="glossaries-manual.html#sec:crossref">later</A>. + +<P> </DD> </DL> -Note that if the key starts with an accented letter, -you must group the accented letter, otherwise it will cause a -problem for commands like <TT>\Gls</TT> and <TT>\Glspl</TT>. For example: +Note that if the name starts with an accented letter or non-Latin +character, you must group the accented letter, otherwise it will +cause a problem for commands like <TT>\Gls</TT> and <TT>\Glspl</TT>. +For example: <PRE> \newglossaryentry{elite}{name={{\'e}lite}, description={select group or class}} </PRE> +Note that the same applies if you are using the <TT>inputenc</TT><A NAME="5338"></A> +package: +<PRE> +\newglossaryentry{elite}{name={{é}lite}, +description={select group or class}} +</PRE> +Note that in both of the above examples, you will also need to +supply the <TT>sort</TT><A NAME="5341"></A> key if you are using <TT>makeindex</TT><A NAME="5344"></A> +whereas <TT>xindy</TT><A NAME="5347"></A> is usually able to sort accented letters +correctly. + +<P> <P> <A HREF="glossaries-manual.html#top">Top</A> @@ -1381,17 +2464,18 @@ description={select group or class}} Plurals</A> </H3> You may have noticed from above that you can specify the plural form -when you define a term. If you omit this, the plural will be obtained -by appending <TT>\glspluralsuffix</TT> to -the singular form. This command defaults to <TT>s</TT>. For example: +when you define a term. If you omit this, the plural will be +obtained by appending +<TT>\glspluralsuffix</TT> to +the singular form. This command defaults to "s". For example: <PRE> \newglossaryentry{cow}{name=cow,description={a fully grown female of any bovine animal}} </PRE> -defines a new entry whose singular form is "cow" and plural form -is "cows". However, if you are writing in archaic English, you -may want to use "kine" as the plural form, in which case you would -have to do: +defines a new entry whose singular form is "cow" and plural form +is "cows". However, if you are writing in archaic English, you +may want to use "kine" as the plural form, in which case you +would have to do: <PRE> \newglossaryentry{cow}{name=cow,plural=kine, description={a fully grown female of any bovine animal}} @@ -1399,7 +2483,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="3458"></A> key +multiple plurals (for a given term) then use the <TT>plural</TT><A NAME="5353"></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 @@ -1419,7 +2503,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="3461"></A> key (and the <TT>firstplural</TT><A NAME="3464"></A> +specified using the <TT>plural</TT><A NAME="5356"></A> key (and the <TT>firstplural</TT><A NAME="5359"></A> key where necessary). <P> @@ -1430,6 +2514,140 @@ key where necessary). <P> <H3><A NAME="SECTION00042200000000000000"></A> +<A NAME="sec:subentries"></A> +<BR> +Sub-Entries +</H3> + +<P> +As from version 1.17, it is possible to specify sub-entries. These +may be used to order the glossary into categories, in which case +the sub-entry will have a different name to its parent entry, or +it may be used to distinguish different definitions for the same +word, in which case the sub-entries will have the same name as +the parent entry. Note that not all glossary styles support +hierarchical entries and may display all the entries in a flat +format. Of the styles that support sub-entries, some display the +sub-entry's name whilst others don't. Therefore you need to +ensure that you use a suitable style. See <A HREF="glossaries-manual.html#sec:styles">later</A> +for a list of predefined +styles. + +<P> +Note that the parent entry will automatically be added to the +glossary if any of its child entries are used in the document. +If the parent entry is not referenced in the document, it will not +have a number list<A NAME="5364"></A>. + +<P> +<A HREF="glossaries-manual.html#top">Top</A> + +<P> + +<H4><A NAME="SECTION00042210000000000000"> +Hierarchical Categories</A> +</H4> To arrange a glossary +with hierarchical categories, you need to first define the +category and then define the sub-entries using the relevant +category entry as the value of the <TT>parent</TT><A NAME="5369"></A> key. For +example, suppose I want a glossary of mathematical symbols that +are divided into Greek letters and Roman letters. Then I can +define the categories as follows: +<PRE> +\newglossaryentry{greekletter}{name={Greek letters}, +text={Greek letter}, +description={\nopostdesc}} + +\newglossaryentry{romanletter}{name={Roman letters}, +text={Roman letter}, +description={\nopostdesc}} +</PRE> + +<P> +Note that in this example, the category entries don't need a +description so I have set the descriptions to <TT>\nopostdesc</TT><A NAME="5372"></A>. +This gives a blank description and suppresses the +description terminator. + +<P> +I can now define my sub-entries as follows: +<PRE> +\newglossaryentry{pi}{name={pi}, +description={ratio of the circumference of a circle to the diameter}, +parent=greekletter} + +\newglossaryentry{C}{name=C, +description={Euler's constant}, +parent=romanletter} +</PRE> + +<P> +<A HREF="glossaries-manual.html#top">Top</A> + +<P> + +<H4><A NAME="SECTION00042220000000000000"> +Homographs</A> +</H4> Sub-entries that have the same name as +the parent entry, don't need to have the <TT>name</TT><A NAME="5378"></A> key. +For example, the word "glossary" can mean a list of technical +words or a collection of glosses. In both cases the plural is +"glossaries". So first define the parent entry: +<PRE> +\newglossaryentry{glossary}{name=glossary, +description={\nopostdesc}, +plural={glossaries}} +</PRE> +Again, the parent entry has no description, so the description +terminator needs to be suppressed using <TT>\nopostdesc</TT><A NAME="5381"></A>. + +<P> +Now define the two different meanings of the word: +<PRE> +\newglossaryentry{glossarylist}{ +description={1) list of technical words}, +sort={1}, +parent={glossary}} + +\newglossaryentry{glossarycol}{ +description={2) collection of glosses}, +sort={2}, +parent={glossary}} +</PRE> +Note that if I reference the parent entry, the location will be +added to the parent's number list<A NAME="5383"></A>, whereas if I reference +any of the child entries, the location will be added to the child +entry's number list. Note also that since the sub-entries have the +same name, the <TT>sort</TT><A NAME="5385"></A> key is required. + +<P> +In the above example, the plural form for both of the child entries +is the same as the parent entry, so the <TT>plural</TT><A NAME="5388"></A> key was +not required for the child entries. However, if the sub-entries +have different plurals, they will need to be specified. For example: +<PRE> +\newglossaryentry{bravo}{name={bravo}, +description={\nopostdesc}} + +\newglossaryentry{bravocry}{description={1) cry of approval +(pl.\ bravos)}, +sort={1}, +plural={bravos}, +parent=bravo} + +\newglossaryentry{bravoruffian}{description={2) hired ruffian or +killer (pl.\ bravoes)}, +sort={2}, +plural={bravoes}, +parent=bravo} +</PRE> + +<P> +<A HREF="glossaries-manual.html#top">Top</A> + +<P> + +<H3><A NAME="SECTION00042300000000000000"></A> <A NAME="sec:loadglsentries"></A> <BR> Loading Entries From a File @@ -1445,7 +2663,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="3470"></A> key has +should belong, for those entries where the <TT>type</TT><A NAME="5394"></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 @@ -1486,9 +2704,10 @@ 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="3478"></A> has been specified, or will add +package option <TT>acronym</TT><A NAME="5402"></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="3487"></A> is not specified. In this instance, +package option <TT>acronym</TT><A NAME="5411"></A> is not specified.<A NAME="tex2html17" + HREF="#foot3464"><SUP>4</SUP></A> In this instance, it is better to change <TT>myacronyms.tex</TT> to: <PRE> \newacronym[type=\glsdefaulttype]{aca}{aca}{a contrived acronym} @@ -1498,7 +2717,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="3496"></A> is +regardless of whether or not the package option <TT>acronym</TT><A NAME="5429"></A> is used. <P> @@ -1518,13 +2737,64 @@ Number lists </H2> <P> -Each entry in the glossary has an associated <I>number list</I><A NAME="3503"></A>. +Each entry in the glossary has an associated <I>number list</I><A NAME="5436"></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="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. +the <TT>nonumberlist</TT><A NAME="5443"></A> package option, or an alternative counter +can be set as the default using the <TT>counter</TT><A NAME="5452"></A> package option. +The number list is also referred to as the location +list<A NAME="3469"></A>. + +<P> +Both <TT>makeindex</TT><A NAME="5456"></A> and <TT>xindy</TT><A NAME="5459"></A> concatenate a +sequence of 3 or more consecutive pages into a range. With +<TT>xindy</TT><A NAME="5462"></A> you can vary the minimum sequence length using +<TT>\GlsSetXdyMinRangeLength</TT><A NAME="5465"></A><TT>{</TT><EM>n</EM><TT>}</TT> where <I>n</I> is either +an integer or the keyword <TT>none</TT> which indicates that there +should be no range formation. + +<P> +Note that <TT>\GlsSetXdyMinRangeLength</TT> must be used before +<TT>\makeglossaries</TT><A NAME="5468"></A> and has no effect if <TT>\noist</TT><A NAME="5471"></A> is used. + +<P> +With both <TT>makeindex</TT><A NAME="5474"></A> and <TT>xindy</TT><A NAME="5477"></A>, you can replace +separator and the closing number in the range using: +<BR> +<BR><TT>\glsSetSuffixF{</TT><EM>suffix</EM><TT>}</TT> +<BR><TT>\glsSetSuffixFF{</TT><EM>suffix</EM><TT>}</TT> +<BR> +<BR> +where the former command specifies the suffix to use for a 2 page +list and the latter specifies the suffix to use for longer lists. +For example: +<PRE> +\glsSetSuffixF{f.} +\glsSetSuffixFF{ff.} +</PRE> +Note that if you use <TT>xindy</TT><A NAME="5480"></A>, you will also need to +set the minimum range length to 1 if you want to change these +suffixes: +<PRE> +\GlsSetXdyMinRangeLength{1} +</PRE> +Note that if you use the <TT>hyperref</TT><A NAME="5483"></A> package, you will need +to use <TT>\nohyperpage</TT><A NAME="5486"></A> in the suffix to ensure that the hyperlinks +work correctly. For example: +<PRE> +\glsSetSuffixF{\nohyperpage{f.}} +\glsSetSuffixFF{\nohyperpage{ff.}} +</PRE> + +<P> +Note that <TT>\glsSetSuffixF</TT> and <TT>\glsSetSuffixFF</TT> must be used +before <TT>\makeglossaries</TT><A NAME="5489"></A> and have no effect if <TT>\noist</TT><A NAME="5492"></A> is +used. + +<P> + <P> <A HREF="glossaries-manual.html#top">Top</A> @@ -1538,17 +2808,26 @@ Links to Glossary Entries <P> Once you have defined a glossary entry using -<TT>\newglossaryentry</TT><A NAME="3526"></A>, you can refer to that entry in the +<TT>\newglossaryentry</TT><A NAME="5498"></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="3529"></A> (even if there are no hyperlinks). The commands +<I>link text</I><A NAME="5501"></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 +by <TT>makeindex</TT><A NAME="5503"></A> or <TT>xindy</TT><A NAME="5506"></A> to generate the relevant +entry in the glossary. This information includes an +associated location that is added to the number list<A NAME="5508"></A> for that +entry. By default, the location refers to the page number. For +further information on number lists, see <A HREF="glossaries-manual.html#sec:numberlists">Number Lists</A>. + +<P> +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. +commands. + +<P> +The above warning is particularly important if you are using the +<TT>glossaries</TT> package in conjunction with the <TT>hyperref</TT><A NAME="5511"></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 @@ -1560,9 +2839,9 @@ Examples: </PRE> <P> -The way the link text<A NAME="3537"></A> is displayed +The way the link text<A NAME="5513"></A> is displayed depends on <TT>\glstextformat{</TT><EM>text</EM><TT>}</TT>. -For example, to make all link text<A NAME="3538"></A> appear in a sans-serif +For example, to make all link text<A NAME="5514"></A> appear in a sans-serif font, do: <PRE> \renewcommand*{\glstextformat}[1]{\textsf{#1}} @@ -1574,108 +2853,141 @@ The command: <BR><TT>\glslink[</TT><EM>options</EM><TT>]{</TT><EM>label</EM><TT>}{</TT><EM>text</EM><TT>}</TT> <BR> <BR> -will place <TT>\glstextformat{</TT><EM>text</EM><TT>}</TT> in the document at that point -and add a line into the associated glossary file for the glossary entry -given by <I>label</I>. If hyperlinks are supported, <I>text</I> will be -a hyperlink to the relevant line in the glossary. The optional argument -<I>options</I> must be a <I>key</I>=<I>value</I> list which can take -any of the following keys: +will place <TT>\glstextformat{</TT><EM>text</EM><TT>}</TT> in the document at that +point and add a line into the associated glossary file for the +glossary entry given by <I>label</I>. If hyperlinks are supported, +<I>text</I> will be a hyperlink to the relevant line in the +glossary. The optional argument <I>options</I> must be a +<I>key</I>=<I>value</I> list which can take any of the following +keys: <P> <DL> -<DT><STRONG><TT>format</TT><A NAME="3540"></A></STRONG></DT> +<DT><STRONG><TT>format</TT><A NAME="5516"></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="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 -number range. Again as with <TT>\index</TT>, the command should be the name -of a command which takes an argument (which will be the associated -number). Be careful not to use a declaration (such as <TT>\bfseries</TT>) -instead of a text block command (such as <TT>\textbf</TT>) as the effect is -not guaranteed to be localised. If you want to apply more than one -style to a given entry (e.g. <B>bold</B> and <I>italic</I>) you will -need to create a command that applies both formats, e.g. +associated location number for this entry in the glossary. This +value is equivalent to the <TT>makeindex</TT><A NAME="5519"></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 number range. Again as with <TT>\index</TT>, +the command should be the name of a command which takes an argument +(which will be the associated location). Be careful not to use a +declaration (such as <TT>bfseries</TT>) instead of a text block command +(such as <TT>textbf</TT>) as the effect is not guaranteed to be +localised. If you want to apply more than one style to a given entry +(e.g. <B>bold</B> and <I>italic</I>) you will need to create a +command that applies both formats, e.g. <PRE> \newcommand*{\textbfem}[1]{\textbf{\emph{#1}}} </PRE> and use that command. <P> +In this document, the standard formats refer to the standard text +block commands such as <TT>\textbf</TT><A NAME="5522"></A> or <TT>\emph</TT><A NAME="5525"></A> or any of the +commands listed in Table <A HREF="glossaries-manual.html#tab:hyperxx">3</A>. + +<P> +If you use <TT>xindy</TT><A NAME="5528"></A> instead of <TT>makeindex</TT><A NAME="5531"></A>, you +must specify any non-standard formats that you want to use +with the <TT>format</TT><A NAME="5534"></A> key using +<TT>\GlsAddXdyAttribute</TT><A NAME="5537"></A><TT>{</TT><EM>name</EM><TT>}</TT>. For example +<PRE> +\GlsAddXdyAttribute{textbfem} +</PRE> + +<P> +Note that unlike <TT>\index</TT>, you can't have +anything following the command name, such as an asterisk or +arguments. If you want to cross-reference another entry, either +use the <TT>see</TT><A NAME="5540"></A> key when you define the entry or use +<TT>\glssee</TT><A NAME="5543"></A> (described <A HREF="glossaries-manual.html#sec:crossref">later</A>). + +<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="3546"></A> -package) as the numbers may not refer to a page number. -Instead, the <TT>glossaries</TT> package provides the following -number formats: +hyperlinked location, don't use <TT>\hyperpage</TT><A NAME="5546"></A> (provided by the +<TT>hyperref</TT><A NAME="5549"></A> package) as the locations may not refer to a page +number. Instead, the <TT>glossaries</TT> package provides number +formats listed in Table <A HREF="glossaries-manual.html#tab:hyperxx">3</A>. + +<P> +<BR><P></P> <DIV ALIGN="CENTER"> + +<A NAME="tab:hyperxx"></A> +<DIV ALIGN="CENTER"><A NAME="1634"></A> <TABLE CELLPADDING=3> -<TR><TD ALIGN="LEFT"><TT>hyperrm</TT></TD> -<TD ALIGN="LEFT">The number is a serif hyperlink to the relevant part of the -document</TD> +<CAPTION><STRONG>Table 3:</STRONG> +Predefined Hyperlinked Location Formats</CAPTION> +<TR><TD ALIGN="LEFT"><TT>hyperrm</TT><A NAME="5553"></A></TD> +<TD ALIGN="LEFT">serif hyperlink</TD> </TR> -<TR><TD ALIGN="LEFT"><TT>hypersf</TT></TD> -<TD ALIGN="LEFT">The number is a sans-serif hyperlink to the relevant part -of the document</TD> +<TR><TD ALIGN="LEFT"><TT>hypersf</TT><A NAME="5556"></A></TD> +<TD ALIGN="LEFT">sans-serif hyperlink</TD> </TR> -<TR><TD ALIGN="LEFT"><TT>hypertt</TT></TD> -<TD ALIGN="LEFT">The number is a monospaced hyperlink to the relevant part -of the document</TD> +<TR><TD ALIGN="LEFT"><TT>hypertt</TT><A NAME="5559"></A></TD> +<TD ALIGN="LEFT">monospaced hyperlink</TD> </TR> -<TR><TD ALIGN="LEFT"><TT>hyperbf</TT></TD> -<TD ALIGN="LEFT">The number is a bold hyperlink to the relevant part of the -document</TD> +<TR><TD ALIGN="LEFT"><TT>hyperbf</TT><A NAME="5562"></A></TD> +<TD ALIGN="LEFT">bold hyperlink</TD> </TR> -<TR><TD ALIGN="LEFT"><TT>hypermd</TT></TD> -<TD ALIGN="LEFT">The number is a medium weight hyperlink to the relevant -part of the document</TD> +<TR><TD ALIGN="LEFT"><TT>hypermd</TT><A NAME="5565"></A></TD> +<TD ALIGN="LEFT">medium weight hyperlink</TD> </TR> -<TR><TD ALIGN="LEFT"><TT>hyperit</TT></TD> -<TD ALIGN="LEFT">The number is an italic hyperlink to the relevant -part of the document</TD> +<TR><TD ALIGN="LEFT"><TT>hyperit</TT><A NAME="5568"></A></TD> +<TD ALIGN="LEFT">italic hyperlink</TD> </TR> -<TR><TD ALIGN="LEFT"><TT>hypersl</TT></TD> -<TD ALIGN="LEFT">The number is a slanted hyperlink to the relevant -part of the document</TD> +<TR><TD ALIGN="LEFT"><TT>hypersl</TT><A NAME="5571"></A></TD> +<TD ALIGN="LEFT">slanted hyperlink</TD> </TR> -<TR><TD ALIGN="LEFT"><TT>hyperup</TT></TD> -<TD ALIGN="LEFT">The number is an upright hyperlink to the relevant -part of the document</TD> +<TR><TD ALIGN="LEFT"><TT>hyperup</TT><A NAME="5574"></A></TD> +<TD ALIGN="LEFT">upright hyperlink</TD> </TR> -<TR><TD ALIGN="LEFT"><TT>hypersc</TT></TD> -<TD ALIGN="LEFT">The number is a small caps hyperlink to the relevant -part of the document</TD> +<TR><TD ALIGN="LEFT"><TT>hypersc</TT><A NAME="5577"></A></TD> +<TD ALIGN="LEFT">small caps hyperlink</TD> </TR> -<TR><TD ALIGN="LEFT"><TT>hyperemph</TT></TD> -<TD ALIGN="LEFT">The number is an emphasized hyperlink to the relevant -part of the document</TD> +<TR><TD ALIGN="LEFT"><TT>hyperemph</TT><A NAME="5580"></A></TD> +<TD ALIGN="LEFT">emphasized hyperlink</TD> </TR> </TABLE> - </DIV> -Note that if the <TT>\hyperlink</TT> command hasn't been defined, +<P> +<DIV ALIGN="CENTER"></DIV> +</DIV> +<BR> + +<P> +Note that if the <TT>\hyperlink</TT><A NAME="5583"></A> command hasn't been defined, the <TT>hyper</TT><I>xx</I> formats are equivalent to the -analogous <TT>\text</TT><I>xx</I> font commands. If you want to +analogous <TT>text</TT><I>xx</I> font commands (and <TT>hyperemph</TT> +is equivalent to <TT>emph</TT>). If you want to make a new format, you will need to define a command which takes -one argument and use that; for example, if you want the associated -number in the glossary to be in a bold sans-serif font, you can define a +one argument and use that; for example, if you want the location +number to be in a bold sans-serif font, you can define a 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="3550"></A> -key. +and then use <TT>hyperbsf</TT> as the value for the <TT>format</TT><A NAME="5586"></A> +key. +Remember that if you use <TT>xindy</TT><A NAME="5589"></A>, you will need to add +this to the list of location attributes: +<PRE> +\GlsAddXdyAttribute{hyperbsf} +</PRE> <P> </DD> -<DT><STRONG><TT>counter</TT><A NAME="3553"></A></STRONG></DT> +<DT><STRONG><TT>counter</TT><A NAME="5592"></A></STRONG></DT> <DD>This specifies which counter -to use for the associated number for this glossary entry. (See also +to use for this location. This overrides the default counter +used by this entry. (See also <A HREF="glossaries-manual.html#sec:numberlists">Number Lists</A>.) <P> </DD> -<DT><STRONG><TT>hyper</TT><A NAME="3556"></A></STRONG></DT> +<DT><STRONG><TT>hyper</TT><A NAME="5595"></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 @@ -1700,12 +3012,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="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. +is the same as <TT>\glslink</TT>, except that the link text<A NAME="5597"></A> +is determined from the values of the <TT>text</TT><A NAME="5599"></A> and +<TT>first</TT><A NAME="5602"></A> keys supplied when the entry was defined using +<TT>\newglossaryentry</TT><A NAME="5605"></A>. If the entry has been marked as having +been used, the value of the <TT>text</TT><A NAME="5608"></A> key will be used, otherwise +the value of the <TT>first</TT><A NAME="5611"></A> key will be used. On completion, <TT>\gls</TT> will mark the entry given by <I>label</I> as used. @@ -1734,7 +3046,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="3575"></A>. As with <TT>\glslink</TT>, these commands also +argument to <TT>\glslink</TT><A NAME="5614"></A>. As with <TT>\glslink</TT>, these commands also have a starred version that disable the hyperlink. <P> @@ -1750,8 +3062,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="3578"></A> and -<TT>firstplural</TT><A NAME="3581"></A> keys supplied when the entry was first +These determine the link text from the <TT>plural</TT><A NAME="5617"></A> and +<TT>firstplural</TT><A NAME="5620"></A> keys supplied when the entry was first defined. As before, these commands also have a starred version that disable the hyperlink. @@ -1761,8 +3073,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="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 +is similar to <TT>\gls</TT><A NAME="5623"></A> except that it always uses the value +of the <TT>text</TT><A NAME="5626"></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. @@ -1785,8 +3097,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="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 +is similar to <TT>\glstext</TT><A NAME="5629"></A> except that it always uses the value +of the <TT>first</TT><A NAME="5632"></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. @@ -1809,8 +3121,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="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 +is similar to <TT>\glstext</TT><A NAME="5635"></A> except that it always uses the value +of the <TT>plural</TT><A NAME="5638"></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. @@ -1833,8 +3145,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="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 +is similar to <TT>\glstext</TT><A NAME="5641"></A> except that it always uses the value +of the <TT>firstplural</TT><A NAME="5644"></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. @@ -1857,13 +3169,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="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 +is similar to <TT>\glstext</TT><A NAME="5647"></A> except that it always uses the value of the +<TT>name</TT><A NAME="5650"></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="3614"></A> key contains commands, you will have to disable the +<TT>name</TT><A NAME="5653"></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="3617"></A> key and protect fragile commands. +of the <TT>name</TT><A NAME="5656"></A> key and protect fragile commands. <P> There are also analogous commands: @@ -1884,13 +3196,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="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 +is similar to <TT>\glstext</TT><A NAME="5659"></A> except that it always uses the value of the +<TT>symbol</TT><A NAME="5662"></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="3626"></A> key contains commands, you will have to disable the +<TT>symbol</TT><A NAME="5665"></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="3629"></A> key and protect fragile commands. +of the <TT>symbol</TT><A NAME="5668"></A> key and protect fragile commands. <P> There are also analogous commands: @@ -1911,14 +3223,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="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 +is similar to <TT>\glstext</TT><A NAME="5671"></A> except that it always uses the value +of the <TT>description</TT><A NAME="5674"></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="3638"></A> key contains commands, you will +command and the <TT>description</TT><A NAME="5677"></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="3641"></A> key and protect fragile commands. +of the <TT>description</TT><A NAME="5680"></A> key and protect fragile commands. <P> There are also analogous commands: @@ -1947,25 +3259,28 @@ Changing the format of the link text </H3> <P> -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> +The format of the link text<A NAME="5685"></A> for <TT>\gls</TT><A NAME="5687"></A>, <TT>\glspl</TT><A NAME="5690"></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="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 +plural form given by the <TT>text</TT><A NAME="5693"></A>, <TT>plural</TT><A NAME="5696"></A>, +<TT>first</TT><A NAME="5699"></A> or <TT>firstplural</TT><A NAME="5702"></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="3666"></A> key); the third +description (as supplied by the <TT>description</TT><A NAME="5705"></A> key); the third argument is the symbol associated with the term (as supplied by the -<TT>symbol</TT><A NAME="3669"></A> key) and the fourth argument is the additional text +<TT>symbol</TT><A NAME="5708"></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. Note that <TT>\glslink</TT><A NAME="3672"></A> (which +The remaining arguments are ignored. + +<P> +Note that <TT>\glslink</TT><A NAME="5711"></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 +<TT>\glslabel</TT><A NAME="5714"></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 @@ -1975,7 +3290,7 @@ 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="3678"></A> key to store the unit: +units, you can use the <TT>symbol</TT><A NAME="5717"></A> key to store the unit: <PRE> \newglossaryentry{distance}{name=distance, description={The length between two points}, @@ -1995,8 +3310,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="3680"></A> will be formatted according -to <TT>\glstextformat</TT><A NAME="3682"></A> (described earlier). So if you do, say: +Note also that all of the link text<A NAME="5719"></A> will be formatted according +to <TT>\glstextformat</TT><A NAME="5721"></A> (described earlier). So if you do, say: <PRE> \renewcommand{\glstextformat}[1]{\textbf{#1}} \renewcommand{\glsdisplayfirst}[4]{#1#4 (#3)} @@ -2006,7 +3321,7 @@ then <code>\gls{distance}</code> will produce "<B>distance (km)</B>". <P> If you have multiple glossaries, changing <TT>\glsdisplayfirst</TT> and <TT>\glsdisplay</TT> will change the way entries for all of the -glossaries appear when using commands <TT>\gls</TT>, <TT>\glspl</TT> and their +glossaries appear when using the commands <TT>\gls</TT>, <TT>\glspl</TT> and their uppercase variants. If you only want the change to affect entries for a given glossary, then you need to use <TT>\defglsdisplay</TT> and @@ -2015,8 +3330,8 @@ 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="#foot2383"><SUP>4</SUP></A> and the second is how the term should be +the first (which is optional) is the glossary's label<A NAME="tex2html19" + HREF="#foot3493"><SUP>5</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. @@ -2042,10 +3357,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="3689"></A> key, you need to use a +Remember that if you use the <TT>symbol</TT><A NAME="5728"></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="3691"></A>, you will have to disable the +in the link text<A NAME="5730"></A>, you will have to disable the <A HREF="glossaries-manual.html#sanitize">sanitization</A> of these keys and protect fragile commands. <P> @@ -2058,10 +3373,10 @@ Enabling and disabling hyperlinks to glossary entries</A> </H3> <P> -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> +If you load the <TT>hyperref</TT><A NAME="5735"></A> or <TT>html</TT><A NAME="5738"></A> packages prior to +loading the <TT>glossaries</TT> package, commands such as <TT>\glslink</TT><A NAME="5742"></A> +and <TT>\gls</TT><A NAME="5745"></A>, described above, will automatically have hyperlinks +to the relevant glossary entry, unless the <TT>hyper</TT><A NAME="5748"></A> option has been set to <TT>false</TT>. You can disable or enable links using: <BR> <BR><TT>\glsdisablehyper</TT> @@ -2074,8 +3389,8 @@ and <BR> respectively. The effect can be localised by placing the commands within a group. Note that you should only use <TT>\glsenablehyper</TT> -if the commands <TT>\hyperlink</TT><A NAME="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). +if the commands <TT>\hyperlink</TT><A NAME="5751"></A> and <TT>\hypertarget</TT><A NAME="5754"></A> have been +defined (for example, by the <TT>hyperref</TT><A NAME="5757"></A> package). <P> <A HREF="glossaries-manual.html#top">Top</A> @@ -2094,8 +3409,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="3724"></A>, only it doesn't produce -any text (so therefore, there is no <TT>hyper</TT><A NAME="3727"></A> key +This is similar to <TT>\glslink</TT><A NAME="5763"></A>, only it doesn't produce +any text (so therefore, there is no <TT>hyper</TT><A NAME="5766"></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 @@ -2113,7 +3428,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="3730"></A> which can be +there is also a key <TT>types</TT><A NAME="5769"></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 @@ -2130,6 +3445,94 @@ do: <P> <H2><A NAME="SECTION00046000000000000000"></A> +<A NAME="sec:crossref"></A> +<BR> +Cross-Referencing Entries +</H2> + +<P> +There are several ways of cross-referencing entries in the +glossary: + +<P> + +<OL> +<LI>You can use commands such as <TT>\gls</TT><A NAME="5775"></A> in the +entries description. For example: +<PRE> +\newglossaryentry{apple}{name=apple, +description={firm, round fruit. See also \gls{pear}}} +</PRE> +Note that with this method, if you don't use the +cross-referenced term in the glossary, you will need two runs of +<TT>makeglossaries</TT><A NAME="5778"></A>: +<PRE> +latex filename +makeglossaries filename +latex filename +makeglossaries filename +latex filename +</PRE> + +<P> +</LI> +<LI>As described <A HREF="glossaries-manual.html#sec:newglosentry">earlier</A>, +you can use the <TT>see</TT><A NAME="5781"></A> key when you define the entry. For +example: +<PRE> +\newglossaryentry{MaclaurinSeries}{name={Maclaurin series}, +description={Series expansion}, +see={TaylorsTheorem}} +</PRE> +Note that in this case, the entry with the <TT>see</TT><A NAME="5784"></A> key will +automatically be added to the glossary, but the cross-referenced +entry won't. You therefore need to ensure that you use the +cross-referenced term with the commands described in +Links to Glossary Entries or +Adding an Entry to the Glossary +Without Generating Text. + +<P> +You can optionally override the "see" tag using square brackets +at the start of the <TT>see</TT><A NAME="5787"></A> value. For example: +<PRE> +\newglossaryentry{MaclaurinSeries}{name={Maclaurin series}, +description={Series expansion}, +see=[see also]{TaylorsTheorem}} +</PRE> + +<P> +</LI> +<LI>After you have defined the entry, use +<BR> +<BR><TT>\glssee[</TT><EM>tag</EM><TT>]{</TT><EM>label</EM><TT>}{</TT><EM>xr label list</EM><TT>}</TT> +<BR> +<BR> +where <I>xr label list</I> is a comma-separated list of entry +labels to be cross-referenced, <I>label</I> is the label of the +entry doing the cross-referencing and <I>tag</I> is the "see" tag. +For example: +<PRE> +\glssee[see also]{series}{FourierSeries,TaylorsTheorem} +</PRE> +Note that this automatically adds the entry given by <I>label</I> to +the glossary but doesn't add the cross-referenced entries (specified +by <I>xr label list</I>) to the glossary. +</LI> +</OL> + +<P> +In both cases 2 and 3 above, the cross-referenced information appears +in the number list<A NAME="5789"></A>, whereas in case 1, the cross-referenced +information appears in the description. In cases 2 and 3, the +default text for the "see" tag is given by <TT>\seename</TT><A NAME="5791"></A>. + +<P> +<A HREF="glossaries-manual.html#top">Top</A> + +<P> + +<H2><A NAME="SECTION00047000000000000000"></A> <A NAME="sec:glsnolink"></A> <BR> Using Glossary Terms Without Links @@ -2140,7 +3543,8 @@ 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. +used and, apart from <TT>\glshyperlink</TT><A NAME="5797"></A>, they don't produce +hyperlinks. <P> @@ -2148,7 +3552,7 @@ used and they don't produce hyperlinks. <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. +<I>label</I>, as specified by the <TT>name</TT><A NAME="5800"></A> key. <TT>\Glsentryname</TT> makes the first letter uppercase. <P> @@ -2157,7 +3561,7 @@ These commands display the name of the glossary entry given by <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. +given by <I>label</I>, as specified by the <TT>text</TT><A NAME="5803"></A> key. <TT>\Glsentrytext</TT> makes the first letter uppercase. <P> @@ -2166,7 +3570,7 @@ given by <I>label</I>, as specified by the <TT>text</TT><A NAME="3739"></A> key. <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. +entry given by <I>label</I>, as specified by the <TT>plural</TT><A NAME="5806"></A> key. <TT>\Glsentryplural</TT> makes the first letter uppercase. <P> @@ -2175,7 +3579,7 @@ entry given by <I>label</I>, as specified by the <TT>plural</TT><A NAME="3742">< <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. +given by <I>label</I>, as specified by the <TT>first</TT><A NAME="5809"></A> key. <TT>\Glsentryfirst</TT> makes the first letter uppercase. <P> @@ -2185,7 +3589,7 @@ given by <I>label</I>, as specified by the <TT>first</TT><A NAME="3745"></A> key <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 +<TT>firstplural</TT><A NAME="5812"></A> key. <TT>\Glsentryfirstplural</TT> makes the first letter uppercase. <P> @@ -2222,16 +3626,33 @@ These commands display the plural symbol for the glossary entry given by <I>label</I>. <TT>\Glsentrysymbolplural</TT> makes the first letter uppercase. <P> + +<TT>\glshyperlink[</TT><EM>link text</EM><TT>]{</TT><EM>label</EM><TT>}</TT> +<P> +This command provides a hyperlink to the glossary entry given by +<I>label</I> <B>but does not add any information to the +glossary file</B>. The link text is given by +<TT>\glsentryname</TT><A NAME="5815"></A><TT>{</TT><EM>label</EM><TT>}</TT> by default, but can be overridden +using the optional argument. +If you use <TT>\glshyperlink</TT>, you need to ensure that the relevant +entry has been added to the glossary using any of the +commands described in <A HREF="glossaries-manual.html#sec:glslink">Links to Glossary Entries</A> or +<A HREF="glossaries-manual.html#sec:glsadd">Adding an Entry to the Glossary Without Generating +Text</A> otherwise you will end up with a broken +link. + +<P> For further information see the section "Displaying entry details without adding information to -the glossary" in the document <TT>glossaries.pdf</TT>. +the glossary" in the document <TT><A NAME="tex2html20" + HREF="glossaries.pdf">glossaries.pdf</A></TT>. <P> <A HREF="glossaries-manual.html#top">Top</A> <P> -<H2><A NAME="SECTION00047000000000000000"> +<H2><A NAME="SECTION00048000000000000000"> Displaying a glossary</A> </H2> @@ -2239,13 +3660,15 @@ 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="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="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. +you have either used the Perl script <TT>makeglossaries</TT><A NAME="5821"></A> +or have directly used <TT>makeindex</TT><A NAME="5824"></A> or <TT>xindy</TT><A NAME="5827"></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="5830"></A>/<TT>xindy</TT><A NAME="5833"></A> log files to see if there is a +problem. Remember that you also need to use the command +<TT>\makeglossaries</TT><A NAME="5836"></A> in the preamble to enable the glossaries. <P> An individual glossary can be displayed using: @@ -2256,7 +3679,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="3766"></A></STRONG></DT> +<DT><STRONG><TT>type</TT><A NAME="5839"></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: @@ -2266,37 +3689,37 @@ glossary is assumed. For example, to print the list of acronyms: <P> </DD> -<DT><STRONG><TT>title</TT><A NAME="3769"></A></STRONG></DT> +<DT><STRONG><TT>title</TT><A NAME="5842"></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="3772"></A></STRONG></DT> +<DT><STRONG><TT>toctitle</TT><A NAME="5845"></A></STRONG></DT> <DD>This is the title -to use for the table of contents (if the <TT>toc</TT><A NAME="3780"></A> package +to use for the table of contents (if the <TT>toc</TT><A NAME="5853"></A> package option has been used). If omitted, the glossary title is used. <P> </DD> -<DT><STRONG><TT>style</TT><A NAME="3784"></A></STRONG></DT> +<DT><STRONG><TT>style</TT><A NAME="5857"></A></STRONG></DT> <DD>This specifies which glossary style to use for this glossary, overriding the effect -of the <TT>style</TT><A NAME="3792"></A> package option or <TT>\glossarystyle</TT><A NAME="3796"></A>. +of the <TT>style</TT><A NAME="5865"></A> package option or <TT>\glossarystyle</TT><A NAME="5869"></A>. <P> </DD> -<DT><STRONG><TT>numberedsection</TT><A NAME="3799"></A></STRONG></DT> +<DT><STRONG><TT>numberedsection</TT><A NAME="5872"></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="3807"></A> package option. This -key has the same syntax as the <TT>numberedsection</TT><A NAME="3816"></A> package +the effect of the <TT>numberedsection</TT><A NAME="5880"></A> package option. This +key has the same syntax as the <TT>numberedsection</TT><A NAME="5889"></A> package option, described <A HREF="glossaries-manual.html#sec:pkgopts">earlier</A>. <P> </DD> -<DT><STRONG><TT>nonumberlist</TT><A NAME="3820"></A></STRONG></DT> +<DT><STRONG><TT>nonumberlist</TT><A NAME="5893"></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 @@ -2308,7 +3731,8 @@ assumed. </DL> <P> -Information can be added to the start of the glossary by redefining +Information can be added to the start of the glossary (after the +title and before the main body of the glossary) by redefining <TT>\glossarypreamble</TT>. For example: <PRE> \renewcommand{\glossarypreamble}{Numbers in italic indicate @@ -2347,7 +3771,7 @@ glossary. <P> -<H3><A NAME="SECTION00047100000000000000"></A> +<H3><A NAME="SECTION00048100000000000000"></A> <A NAME="sec:glsnamefont"></A> <BR> Changing the way the entry name appears in the glossary @@ -2355,13 +3779,17 @@ Changing the way the entry name appears in the glossary <P> Within each glossary, each entry name is -formatted according to <TT>\glsnamefont</TT> which takes one argument: the -entry name. This command is always used regardless of the glossary -style. By default, <TT>\glsnamefont</TT> simply displays its argument in -whatever the surrounding font happens to be. This means that in the -list styles the name will appear in bold, since the name is placed in -the optional argument of <TT>\item</TT>, whereas in the tabular styles the -name will appear in the normal font. +formatted according to <TT>\glsnamefont</TT> which takes one argument: +the entry name. This command is always used regardless of the +glossary style. By default, <TT>\glsnamefont</TT> simply displays its +argument in whatever the surrounding font happens to be. This means +that in the list-like glossary styles (defined in the +<TT>glossary-list</TT><A NAME="5899"></A> style file) the name will appear in bold, since +the name is placed in the optional argument of <TT>\item</TT>, whereas in +the tabular styles (defined in the <TT>glossary-long</TT><A NAME="5902"></A> and +<TT>glossary-super</TT><A NAME="5905"></A> style files) the name will appear in the +normal font. The hierarchical glossary styles (defined in the +<TT>glossary-tree</TT><A NAME="5908"></A> style file) also set the name in bold. <P> For example, suppose you want all the entry names to appear in @@ -2375,7 +3803,318 @@ medium weight small caps, then you can do: <P> -<H2><A NAME="SECTION00048000000000000000"> +<H3><A NAME="SECTION00048200000000000000"></A> +<A NAME="sec:xindy"></A> +<BR> +Xindy +</H3> + +<P> +If you want to use <TT>xindy</TT><A NAME="5914"></A> to sort the glossary, you +must use the package option <TT>xindy</TT><A NAME="5922"></A>: +<PRE> +\usepackage[xindy]{glossaries} +</PRE> +This ensures that the glossary information is written in +<TT>xindy</TT><A NAME="5926"></A> syntax. + +<P> +The section +<A HREF="glossaries-manual.html#sec:makeglossaries">Generating the Associated Glossary +Files</A> covers how to use the external +indexing application. This section covers the commands provided +by the <TT>glossaries</TT> package that allow you to adjust the +<TT>xindy</TT><A NAME="5930"></A> style file (<TT>.xdy</TT><A NAME="5933"></A>) and parameters. + +<P> +To assist writing information to the <TT>xindy</TT><A NAME="5935"></A> style +file, the <TT>glossaries</TT> package provides the following +commands: +<BR> +<BR><TT>\glsopenbrace</TT> +<BR><TT>\glsclosebrace</TT> +<BR> +<BR> +which produce an open and closing brace. (This is needed because +<code>\{</code> and <code>\}</code> don't expand to a simple brace character +when written to a file.) + +<P> +In addition, if you are using a package that makes the double +quote character active (e.g. <TT>ngerman</TT><A NAME="5939"></A>) you can use: +<BR> +<BR><TT>\glsquote{</TT><EM>text</EM><TT>}</TT> +<BR> +<BR> +which will produce <code>"</code><I>text</I><code>"</code>. Alternatively, +you can use <code>\string"</code> to write the double-quote character. +This document assumes that the double quote character has not been +made active, so the examples just use <code>"</code> for clarity. + +<P> +If you want greater control over the <TT>xindy</TT><A NAME="5942"></A> style file than +is available through the LaTeX commands provided by the +<TT>glossaries</TT> package, you will need to edit the <TT>xindy</TT><A NAME="5946"></A> +style file. In +which case, you must use <TT>\noist</TT><A NAME="5949"></A> to prevent the style file from +being overwritten by the <TT>glossaries</TT> package. For additional +information about <TT>xindy</TT><A NAME="5953"></A>, read the <TT>xindy</TT><A NAME="5956"></A> +documentation. +<P> +<A HREF="glossaries-manual.html#top">Top</A> + +<P> + +<H4><A NAME="SECTION00048210000000000000"> +Language and Encodings</A> +</H4> +When you use <TT>xindy</TT><A NAME="5962"></A>, you need to specify the language +and encoding used (unless you have written your own custom +<TT>xindy</TT><A NAME="5965"></A> style file that defines the relevant alphabet +and sort rules). If you use <TT>makeglossaries</TT><A NAME="5968"></A>, +this information is obtained from the document's auxiliary +(<TT>.aux</TT><A NAME="5971"></A>) file. The <TT>glossaries</TT> package attempts to +find the root language, but in the event that it gets it wrong or if +<TT>xindy</TT><A NAME="5974"></A> doesn't support that language, then you can +specify the language using: +<BR> +<BR> +<TT>\GlsSetXdyLanguage[</TT><EM>glossary type</EM><TT>]{</TT><EM>language</EM><TT>}</TT> +<BR> +<BR> +where <I>language</I> is the name of the language. The +optional argument can be used if you have multiple glossaries +in different languages. If <I>glossary type</I> is omitted, it +will be applied to all glossaries, otherwise the language +setting will only be applied to the glossary given by +<I>glossary type</I>. + +<P> +If the <TT>inputenc</TT><A NAME="5977"></A> package is used, the encoding will be +obtained from the value of <TT>\inputencodingname</TT><A NAME="5980"></A>. +Alternatively, you can specify the encoding using: +<BR> +<BR> +<TT>\GlsSetXdyCodePage{</TT><EM>code</EM><TT>}</TT> +<BR> +<BR> +where <I>code</I> is the name of the encoding. For example: +<PRE> +\GlsSetXdyCodePage{utf8} +</PRE> + +<P> +Note that you can also specify the language and encoding using +the package option +<code>xindy={language=</code><I>lang</I><code>,codepage=</code><I>code</I><code>}</code>. +For example: +<PRE> +\usepackage[xindy={language=english,codepage=utf8}]{glossaries} +</PRE> + +<P> +If you write your own custom <TT>xindy</TT><A NAME="5983"></A> style file that +includes the language settings, you need to set the language +to nothing: +<PRE> +\GlsSetXdyLanguage{} +</PRE> +(and remember to use <TT>\noist</TT><A NAME="5986"></A> to prevent the style file from +being overwritten). + +<P> +The commands <TT>\GlsSetXdyLanguage</TT> and <TT>\GlsSetXdyCodePage</TT> +have no effect if you don't use <TT>makeglossaries</TT><A NAME="5989"></A>. If +you call <TT>xindy</TT><A NAME="5992"></A> without <TT>makeglossaries</TT><A NAME="5995"></A> you +need to remember to set the language and encoding using the +<TT>-L</TT> and <TT>-C</TT> switches. + +<P> +<A HREF="glossaries-manual.html#top">Top</A> + +<P> + +<H4><A NAME="SECTION00048220000000000000"> +Locations and Number lists</A> +</H4> + +<P> +The most likely attributes used in the <TT>format</TT><A NAME="6001"></A> +key (<TT>textrm</TT><A NAME="6004"></A>, <TT>hyperrm</TT><A NAME="6007"></A> etc) are automatically added +to the <TT>xindy</TT><A NAME="6010"></A> style file, but if you want to use another +attribute, you need to add it using: +<BR> +<BR> +<TT>\GlsAddXdyAttribute{</TT><EM>name</EM><TT>}</TT> +<BR> +<BR> +where <I>name</I> is the name of the attribute, as used in +the <TT>format</TT><A NAME="6013"></A> key. For example, suppose I want a +bold, italic, hyperlinked location. I first need to define a +command that will do this: +<PRE> +\newcommand*{\hyperbfit}[1]{\textit{\hyperbf{#1}}} +</PRE> +but with <TT>xindy</TT><A NAME="6016"></A>, I also need to add this as an allowed +attribute: +<PRE> +\GlsAddXdyAttribute{hyperbfit} +</PRE> + +<P> +Note that <TT>\GlsAddXdyAttribute</TT> has no effect if <TT>\noist</TT><A NAME="6019"></A> is +used or if <TT>\makeglossaries</TT><A NAME="6022"></A> is omitted. + +<P> +<TT>\GlsAddXdyAttribute</TT> must be used before <TT>\makeglossaries</TT><A NAME="6025"></A>. + +<P> +If the location numbers don't get expanded to a simple Arabic or +Roman number or a letter from a, ..., z or A, ..., Z, then +you need to add a location style in the appropriate format. + +<P> +For example, suppose you want the page numbers written as words +rather than digits and you use the <TT>fmtcount</TT><A NAME="6028"></A> package to +do this. You can redefine <TT>\thepage</TT><A NAME="6031"></A> as follows: +<PRE> +\renewcommand*{\thepage}{\Numberstring{page}} +</PRE> +This gets expanded to <code>\protect \Numberstringnum </code><TT>{</TT><EM>n</EM><TT>}</TT> +where <I>n</I> is the page number. This means that you need to +define a new location that has that form: +<PRE> +\GlsAddXdyLocation{Numberstring}{:sep "\string\protect\space + \string\Numberstringnum\space\glsopenbrace" + "arabic-numbers" :sep "\glsclosebrace"} +</PRE> +Note that it's necessary to use <TT>\space</TT> to indicate that +spaces also appear in the format, since, unlike T<SMALL>E</SMALL>X, +<TT>xindy</TT><A NAME="6034"></A> doesn't ignore spaces after control sequences. + +<P> +Note that <TT>\GlsAddXdyLocation</TT> has no effect if <TT>\noist</TT><A NAME="6037"></A> is +used or if <TT>\makeglossaries</TT><A NAME="6040"></A> is omitted. + +<P> +<TT>\GlsAddXdyLocation</TT> must be used before <TT>\makeglossaries</TT><A NAME="6043"></A>. + +<P> +In the number list<A NAME="6045"></A>, the locations are sorted according to +type. The default ordering is: +<TT>roman-page-numbers</TT> (e.g. i), +<TT>arabic-page-numbers</TT> (e.g. 1), +<TT>arabic-section-numbers</TT> (e.g. 1.1 if the compositor +is a full stop or 1-1 if the compositor is a hyphen<A NAME="tex2html21" + HREF="#foot3593"><SUP>6</SUP></A>), +<TT>alpha-page-numbers</TT> (e.g. a), +<TT>Roman-page-numbers</TT> (e.g. I), +<TT>Alpha-page-numbers</TT> (e.g. A), +<TT>Appendix-page-numbers</TT> (e.g. A.1 if the Alpha compositor +is a full stop or A-1 if the Alpha compositor is a +hyphen<A NAME="tex2html22" + HREF="#foot3594"><SUP>7</SUP></A>), +user defined location names (as specified by +<TT>\GlsAddXdyLocation</TT><A NAME="6053"></A> in the order in which they were defined), +<TT>see</TT> (cross-referenced entries). +This ordering can be changed using: +<BR> +<BR> +<TT>\GlsSetXdyLocationClassOrder</TT> +<BR> +<BR> +where each location name is delimited by double quote marks. +For example: +<PRE> +\GlsSetXdyLocationClassOrder{ + "arabic-page-numbers" + "arabic-section-numbers" + "roman-page-numbers" + "Roman-page-numbers" + "alpha-page-numbers" + "Alpha-page-numbers" + "Appendix-page-numbers" + "see" +} +</PRE> + +<P> +Note that <TT>\GlsSetXdyLocationClassOrder</TT> has no effect if +<TT>\noist</TT><A NAME="6056"></A> is used or if <TT>\makeglossaries</TT><A NAME="6059"></A> is omitted. + +<P> +<TT>\GlsSetXdyLocationClassOrder</TT> must be used before +<TT>\makeglossaries</TT><A NAME="6062"></A>. + +<P> +If a number list<A NAME="6064"></A> consists of a sequence of consecutive +numbers, the range will be concatenated. The +number of consecutive locations that causes a range formation +defaults to 2, but can be changed using: +<BR> +<BR> +<TT>\GlsSetXdyMinRangeLength{</TT><EM>n</EM><TT>}</TT> +<BR> +<BR> +For example: +<PRE> +\GlsSetXdyMinRangeLength{3} +</PRE> +The argument may also be the keyword <TT>none</TT>, to indicate that +there should be no range formations. See the <TT>xindy</TT><A NAME="6066"></A> +manual for further details on range formations. + +<P> +Note that <TT>\GlsSetXdyMinRangeLength</TT> has no effect if <TT>\noist</TT><A NAME="6069"></A> +is used or if <TT>\makeglossaries</TT><A NAME="6072"></A> is omitted. + +<P> +<TT>\GlsSetXdyMinRangeLength</TT> must be used before +<TT>\makeglossaries</TT><A NAME="6075"></A>. + +<P> +See <A HREF="glossaries-manual.html#sec:numberlists">Number Lists</A> for +further details. + +<P> +<A HREF="glossaries-manual.html#top">Top</A> + +<P> + +<H4><A NAME="SECTION00048230000000000000"> +Glossary Groups</A> +</H4> +The glossary is divided into groups according to the first +letter of the sort key. The <TT>glossaries</TT> package also adds +a number group by default, unless you suppress it in the +<TT>xindy</TT><A NAME="6087"></A> package option. For example: +<PRE> +\usepackage[xindy={glsnumbers=false}]{glossaries} +</PRE> +Any entry that doesn't go in one of the letter groups or the +number group is placed in the default group. + +<P> +If you have a number group, the default behaviour is to locate +it before the "A" letter group. If you are not using a +Roman alphabet, you can change this using +<BR> +<BR><TT>\GlsSetXdyFirstLetterAfterDigits{</TT><EM>letter</EM><TT>}</TT> + +<P> +Note that <TT>\GlsSetXdyFirstLetterAfterDigits</TT> has no effect if +<TT>\noist</TT><A NAME="6091"></A> is used or if <TT>\makeglossaries</TT><A NAME="6094"></A> is omitted. + +<P> +<TT>\GlsSetXdyFirstLetterAfterDigits</TT> must be used before +<TT>\makeglossaries</TT><A NAME="6097"></A>. + +<P> +<A HREF="glossaries-manual.html#top">Top</A> + +<P> + +<H2><A NAME="SECTION00049000000000000000"> Defining New Glossaries</A> </H2> @@ -2390,11 +4129,11 @@ 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="3828"></A> (see also <A HREF="glossaries-manual.html#sec:numberlists">Number Lists</A>). The +lists<A NAME="6102"></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="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). +<TT>makeindex</TT><A NAME="6104"></A> or <TT>xindy</TT><A NAME="6107"></A> transcript file (this +information is only used by <TT>makeglossaries</TT><A NAME="6110"></A> which picks up +the information from the auxiliary file). <P> Note that the main (default) glossary is automatically created as: @@ -2402,15 +4141,15 @@ Note that the main (default) glossary is automatically created as: \newglossary{main}{gls}{glo}{\glossaryname} </PRE> so it can be identified by the label <TT>main</TT>. Using the -<TT>acronym</TT><A NAME="3841"></A> package option is equivalent to: +<TT>acronym</TT><A NAME="6118"></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="3850"></A> option has been used, you +not sure whether the <TT>acronym</TT><A NAME="6127"></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="3859"></A> option has been used, +<TT>acronym</TT>, if the <TT>acronym</TT><A NAME="6136"></A> option has been used, otherwise it is set to <TT>main</TT>. <P> @@ -2418,7 +4157,7 @@ otherwise it is set to <TT>main</TT>. <P> -<H2><A NAME="SECTION00049000000000000000"></A> +<H2><A NAME="SECTION000410000000000000000"></A> <A NAME="sec:acronyms"></A> <BR> Acronyms @@ -2437,7 +4176,7 @@ defines the command: By default, this is equivalent to: <P> <TT> -<TT>\newglossaryentry</TT></TT> <TT>{</TT><EM>label</EM><TT>}{type=<TT>\acronymtype</TT>, +<TT>\newglossaryentry</TT></TT> <TT>{</TT><EM>label</EM><TT>}{type=<TT>\acronymtype</TT><A NAME="6144"></A>, <BR> name=</TT> <TT>{</TT><EM>abbrv</EM><TT>}, <BR> @@ -2453,18 +4192,20 @@ firstplural={</TT> <I>long</I><TT><TT>\glspluralsuffix\space</TT> (</TT> <I>abbrv</I><TT><TT>\glspluralsuffix</TT>)}, <BR></TT> <I>key-val list</I><TT>}</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="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. +As mentioned in the previous section, the command <TT>\acronymtype</TT><A NAME="6147"></A> +is the name of the glossary in which the acronyms should appear. If +the <TT>acronym</TT><A NAME="6155"></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. <P> <B>Note:</B> since <TT>\newacronym</TT> sets <code>type=\acronymtype</code>, if you want to load a file containing acronym definitions using <TT>\loadglsentries[</TT><EM>type</EM><TT>]{</TT><EM>filename</EM><TT>}</TT>, the optional argument <I>type</I> will not have an effect unless you explicitly set the -type as <code>type=\glsdefaulttype</code>. See <A HREF="glossaries-manual.html#sec:loadglsentries">earlier</A> for details. +type as <code>type=\glsdefaulttype</code> in the optional argument to +<TT>\newacronym</TT><A NAME="6159"></A>. See <A HREF="glossaries-manual.html#sec:loadglsentries">earlier</A> for details. <P> For example, the following defines the acronym IDN: @@ -2488,36 +4229,36 @@ 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="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 +and ignore the package options: <TT>smallcaps</TT><A NAME="6167"></A>, <TT>smaller</TT><A NAME="6176"></A>, +<TT>description</TT><A NAME="6185"></A>, <TT>dua</TT><A NAME="6194"></A> and <TT>footnote</TT><A NAME="6203"></A>, as these +options change the definition of <TT>\newacronym</TT><A NAME="6207"></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, +Likewise you should ignore the package option <TT>shortcuts</TT><A NAME="6215"></A> +and the new commands described in this section, such as <TT>\acrshort</TT>, as they vary according to the definition of <TT>\newacronym</TT>. <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="3936"></A> keys are used to store <I>long</I> (the long +<A HREF="glossaries-manual.html#tab:acronymsettings">Table </A><A HREF="glossaries-manual.html#tab:acronymsettings">4</A> lists the package options and how the +<TT>\newglossaryentry</TT><A NAME="6222"></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="3944"></A> option redefines +<TT>smallcaps</TT><A NAME="6230"></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="3953"></A> option redefines -<TT>\acronymfont</TT> to use <TT>\smaller</TT>,<A NAME="tex2html12" - HREF="#foot2417"><SUP>5</SUP></A> otherwise <TT>\acronymfont</TT> simply displays its argument +<I>abbrv</I>) and the <TT>smaller</TT><A NAME="6239"></A> option redefines +<TT>\acronymfont</TT> to use <TT>\smaller</TT>,<A NAME="tex2html23" + HREF="#foot3541"><SUP>8</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="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 +<TT>smallcaps</TT><A NAME="6249"></A>, <TT>smaller</TT><A NAME="6258"></A>, <TT>dua</TT><A NAME="6267"></A>, +<TT>description</TT><A NAME="6276"></A> or <TT>footnote</TT><A NAME="6285"></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="4008"></A> package option and -redefine <TT>\acronymfont</TT><A NAME="4012"></A> to use the required font. For example: +emphasized, then use the <TT>smaller</TT><A NAME="6294"></A> package option and +redefine <TT>\acronymfont</TT><A NAME="6298"></A> to use the required font. For example: <PRE> \usepackage[smaller]{glossaries} \renewcommand*{\acronymfont}[1]{\emph{#1}} @@ -2534,54 +4275,54 @@ first use. <A NAME="tab:acronymsettings"></A> <DIV ALIGN="CENTER"> -<A NAME="2418"></A> +<A NAME="3542"></A> <TABLE CELLPADDING=3> -<CAPTION><STRONG>Table 2:</STRONG> +<CAPTION><STRONG>Table 4:</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="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> +<TD ALIGN="LEFT"><TT>first</TT><A NAME="6301"></A> key</TD> +<TD ALIGN="LEFT"><TT>text</TT><A NAME="6304"></A> key</TD> +<TD ALIGN="LEFT"><TT>description</TT><A NAME="6307"></A> key</TD> +<TD ALIGN="LEFT"><TT>symbol</TT><A NAME="6310"></A> key</TD> </TR> -<TR><TD ALIGN="LEFT"><TT>description</TT><A NAME="4032"></A>,<TT>footnote</TT><A NAME="4041"></A></TD> +<TR><TD ALIGN="LEFT"><TT>description</TT><A NAME="6318"></A>,<TT>footnote</TT><A NAME="6327"></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="4050"></A>,<TT>dua</TT><A NAME="4059"></A></TD> +<TR><TD ALIGN="LEFT"><TT>description</TT><A NAME="6336"></A>,<TT>dua</TT><A NAME="6345"></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="4068"></A></TD> +<TR><TD ALIGN="LEFT"><TT>description</TT><A NAME="6354"></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="4077"></A></TD> +<TR><TD ALIGN="LEFT"><TT>footnote</TT><A NAME="6363"></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="4086"></A></TD> +<TR><TD ALIGN="LEFT"><TT>smallcaps</TT><A NAME="6372"></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="4095"></A></TD> +<TR><TD ALIGN="LEFT"><TT>smaller</TT><A NAME="6381"></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="4104"></A></TD> +<TR><TD ALIGN="LEFT"><TT>dua</TT><A NAME="6390"></A></TD> <TD ALIGN="LEFT"><I>long</I></TD> <TD ALIGN="LEFT"><I>long</I></TD> <TD ALIGN="LEFT"><I>long</I></TD> @@ -2627,10 +4368,10 @@ 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="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>) +Each of the package options <TT>smallcaps</TT><A NAME="6400"></A>, <TT>smaller</TT><A NAME="6409"></A>, +<TT>footnote</TT><A NAME="6418"></A>, <TT>dua</TT><A NAME="6427"></A> +and <TT>description</TT><A NAME="6436"></A> use <TT>\defglsdisplay</TT><A NAME="6440"></A> and +<TT>\defglsdisplayfirst</TT><A NAME="6443"></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 @@ -2639,7 +4380,7 @@ glossary type. <P> <DL> -<DT><STRONG><TT>description</TT><A NAME="4165"></A>,<TT>footnote</TT><A NAME="4174"></A></STRONG></DT> +<DT><STRONG><TT>description</TT><A NAME="6451"></A>,<TT>footnote</TT><A NAME="6460"></A></STRONG></DT> <DD> When these two package options are used together, the first use displays the entry as: @@ -2657,32 +4398,48 @@ optional argument to <TT>\gls</TT>, <TT>\glspl</TT> or their uppercase variants. <P> +In this case, the long form is stored in the <TT>symbol</TT><A NAME="6464"></A> key. +This means that the long form will not be displayed in the list of +acronyms unless you use a glossary style that displays the entry's +symbol (for example, the <TT>index</TT><A NAME="6467"></A> style). Entries will +be sorted according to the short form. + +<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="4184"></A> option using -<A NAME="4193"></A><A NAME="4200"></A><code>sanitize={description=false,symbol=false}</code>, so +<TT>sanitize</TT><A NAME="6475"></A> option using +<A NAME="6484"></A><A NAME="6491"></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="4207"></A></STRONG></DT> +<DT><STRONG><TT>dua</TT><A NAME="6498"></A></STRONG></DT> <DD> -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 +The <TT>dua</TT><A NAME="6507"></A> package option always displays the expanded +form and so may not be used with <TT>footnote</TT><A NAME="6516"></A>, <TT>smaller</TT><A NAME="6525"></A> or +<TT>smallcaps</TT><A NAME="6534"></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="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. +If the <TT>description</TT><A NAME="6543"></A> package option is also used, the +<TT>name</TT><A NAME="6547"></A> key is set to the long form, otherwise the +<TT>name</TT><A NAME="6550"></A> key is set to the short form and the +<TT>description</TT><A NAME="6553"></A> key is set to the long form. In both +cases the <TT>symbol</TT><A NAME="6556"></A> is set to the short form. Therefore, +if you use the <TT>description</TT><A NAME="6564"></A> package option and you want +the short form to appear in the list of acronyms, you will need +to use a glossary style that displays the entry's symbol (for +example, the <TT>index</TT><A NAME="6568"></A> style). Entries will be sorted +according to the long form if the <TT>description</TT><A NAME="6575"></A> option +is used, otherwise they will be sorted according to the +short form (unless overridden by the <TT>sort</TT><A NAME="6579"></A> key in +the optional argument of <TT>\newacronym</TT><A NAME="6582"></A>). <P> </DD> -<DT><STRONG><TT>description</TT><A NAME="4270"></A></STRONG></DT> +<DT><STRONG><TT>description</TT><A NAME="6590"></A></STRONG></DT> <DD> This package option displays the entry on first use as: <BR> @@ -2696,12 +4453,32 @@ 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="4280"></A><code>sanitize={symbol=false}</code>, so +<A NAME="6600"></A><code>sanitize={symbol=false}</code>, so remember to protect fragile commands when defining acronyms. <P> +Note that with this option, you need to specify the description +using the <TT>description</TT><A NAME="6602"></A> key in the optional argument +of <TT>\newacronym</TT><A NAME="6605"></A>. When this option is used without +the <TT>footnote</TT><A NAME="6613"></A> or <TT>dua</TT><A NAME="6622"></A> options, the name field +is specified as +<TT>\acrnameformat</TT><A NAME="6626"></A><TT>{</TT><EM>short</EM><TT>}{</TT><EM>long</EM><TT>}</TT>. This +defaults to <TT>\acronymfont</TT><A NAME="6629"></A><TT>{</TT><EM>short</EM><TT>}</TT>, which means that the +long form will not appear in the list of acronyms by default. +To change this, you need to redefine <TT>\acrnameformat</TT><A NAME="6632"></A> as +appropriate. For example, to display the long form followed +by the short form in parentheses do: +<PRE> +\renewcommand*{\acrnameformat}[2]{#2 (\acronymfont{#1})} +</PRE> +Note that even if you redefine <TT>\acrnameformat</TT><A NAME="6635"></A>, the +entries will be sorted according to the short form, unless you +override this using the <TT>sort</TT><A NAME="6638"></A> key in the optional +argument to <TT>\newacronym</TT><A NAME="6641"></A>. + +<P> </DD> -<DT><STRONG><TT>footnote</TT><A NAME="4287"></A></STRONG></DT> +<DT><STRONG><TT>footnote</TT><A NAME="6649"></A></STRONG></DT> <DD> This package option displays the entry on first use as: <BR> @@ -2711,18 +4488,45 @@ This package option displays the entry on first use as: while subsequent use displays the entry as: <BR> <BR><TT>\acronymfont{</TT><EM>abbrv</EM><TT>}</TT><I>insert</I> +<BR> +<BR> +Acronyms will be sorted according to the short form. <P> Note also that if this package option is used, the <TT>glossaries</TT> package additionally implements the option -<A NAME="4297"></A><code>sanitize={description=false}</code>, so +<A NAME="6659"></A><code>sanitize={description=false}</code>, so remember to protect fragile commands when defining acronyms. <P> +Note that on first use, it is the long form in the footnote that +links to the relevant glossary entry (where hyperlinks are enabled), +whereas on subsequent use, the acronym links to the relevant +glossary entry. It is possible to change this to make the acronym +on first use have the hyperlink instead of the footnote, but +since the footnote marker will also be a hyperlink, you will +have two hyperlinks in immediate succession. This can be +ambiguous where the hyperlinks are coloured rather than boxed. +The code required to change the first use to make the +acronym a hyperlink is as follows: +<PRE> + \defglsdisplayfirst[\acronymtype]{% + \noexpand\protect\noexpand + \glslink[\@gls@link@opts]{\@gls@link@label}{\firstacronymfont{#1}#4}% + \noexpand\protect\noexpand\footnote{#2}}% +</PRE> +<B>Note</B> that this involves using internal commands +(i.e. commands whose name contains an <code>@</code> character), so +if this code is place in a <TT>.tex</TT> file it needs to be +placed within a <TT>\makeatletter</TT> ... <TT>\makeatother</TT> pair. +(See <TT><A NAME="tex2html25" + HREF="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=atsigns">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=atsigns</A></TT>for further details.) + +<P> </DD> -<DT><STRONG><TT>smallcaps</TT><A NAME="4304"></A></STRONG></DT> +<DT><STRONG><TT>smallcaps</TT><A NAME="6666"></A></STRONG></DT> <DD> -If neither the <TT>footnote</TT><A NAME="4313"></A> nor <TT>description</TT><A NAME="4322"></A> options +If neither the <TT>footnote</TT><A NAME="6675"></A> nor <TT>description</TT><A NAME="6684"></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>) @@ -2733,20 +4537,24 @@ while subsequent use displays the entry as: <BR><TT>\acronymfont{</TT><EM>abbrv</EM><TT>}</TT><I>insert</I> <BR> <BR> -where <TT>\acronymfont</TT> is set to <code>\textsc{#1}</code>, so <I>abbrv</I> -should be specified in lower case. +where <TT>\acronymfont</TT> is set to <code>\textsc{#1}</code>. + +<P> +Note that since the acronym is displayed using <TT>\textsc</TT><A NAME="6688"></A>, +the short form, <I>abbrv</I>, 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="4332"></A><code>sanitize={symbol=false}</code>, so +<A NAME="6697"></A><code>sanitize={symbol=false}</code>, so remember to protect fragile commands when defining acronyms. <P> </DD> -<DT><STRONG><TT>smaller</TT><A NAME="4339"></A></STRONG></DT> +<DT><STRONG><TT>smaller</TT><A NAME="6704"></A></STRONG></DT> <DD> -If neither the <TT>footnote</TT><A NAME="4348"></A> nor <TT>description</TT><A NAME="4357"></A> options +If neither the <TT>footnote</TT><A NAME="6713"></A> nor <TT>description</TT><A NAME="6722"></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>) @@ -2758,23 +4566,25 @@ while subsequent use displays the entry as: <BR> <BR> where <TT>\acronymfont</TT> is set to <code>{\smaller #1}</code>. +The entries will be sorted according to the short form. <P> -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. +Remember to load a package that defines <TT>\smaller</TT><A NAME="6726"></A> (such as +<TT>relsize</TT><A NAME="6729"></A>) if you want to use this option, unless you want +to redefine <TT>\acronymfont</TT><A NAME="6732"></A> to use some other formatting command. <P> Note also that if this package option is used, the <TT>glossaries</TT> package additionally implements the option -<A NAME="4373"></A><code>sanitize={symbol=false}</code>, so +<A NAME="6741"></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="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, +If none of the package options <TT>smallcaps</TT><A NAME="6748"></A>, <TT>smaller</TT><A NAME="6757"></A>, +<TT>footnote</TT><A NAME="6766"></A>, <TT>dua</TT><A NAME="6775"></A> or <TT>description</TT><A NAME="6784"></A> are used, then on first use the entry is displayed as: <BR> <BR><I>long</I> (<I>abbrv</I>)<I>insert</I> @@ -2783,13 +4593,16 @@ then on first use the entry is displayed as: while subsequent use displays the entry as: <BR> <BR><I>abbrv</I><I>insert</I> +<BR> +<BR> +Entries will be sorted according to the short form. </DD> </DL> <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="4420"></A>, so it is possible to use these commands to +like <TT>\glstext</TT><A NAME="6788"></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 @@ -2809,8 +4622,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="4424"></A> (or its uppercase variants) but may additionally -put the link text within the argument to <TT>\acronymfont</TT><A NAME="4427"></A>. +<TT>\glstext</TT><A NAME="6792"></A> (or its uppercase variants) but may additionally +put the link text within the argument to <TT>\acronymfont</TT><A NAME="6795"></A>. <BR> <BR> <P> @@ -2824,7 +4637,7 @@ put the link text within the argument to <TT>\acronymfont</TT><A NAME="4427" <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="4430"></A>, <TT>\glssymbol</TT><A NAME="4433"></A> or <TT>\glsfirst</TT><A NAME="4436"></A> (or their uppercase +<TT>\glsdesc</TT><A NAME="6798"></A>, <TT>\glssymbol</TT><A NAME="6801"></A> or <TT>\glsfirst</TT><A NAME="6804"></A> (or their uppercase variants), depending on package options. <BR> <BR> @@ -2842,16 +4655,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="4439"></A>, you +Note that if you change the definition of <TT>\newacronym</TT><A NAME="6807"></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="4442"></A> -and <TT>\defglsdisplayfirst</TT><A NAME="4445"></A>. +changing the way the text is displayed using <TT>\defglsdisplay</TT><A NAME="6810"></A> +and <TT>\defglsdisplayfirst</TT><A NAME="6813"></A>. <P> -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 +The package option <TT>shortcuts</TT><A NAME="6821"></A> provides the synonyms listed +in <A HREF="glossaries-manual.html#tab:shortcuts">table </A><A HREF="glossaries-manual.html#tab:shortcuts">5</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="4465"></A> package +have enabled the shortcuts using the <TT>shortcuts</TT><A NAME="6833"></A> package option. Note that there are no shortcuts for the commands that produce all upper case text. @@ -2861,60 +4674,60 @@ produce all upper case text. <A NAME="tab:shortcuts"></A> <DIV ALIGN="CENTER"> -<A NAME="2430"></A> +<A NAME="3555"></A> <TABLE CELLPADDING=3> -<CAPTION><STRONG>Table 3:</STRONG> -Synonyms provided by the package option <TT>shortcuts</TT><A NAME="4474"></A></CAPTION> +<CAPTION><STRONG>Table 5:</STRONG> +Synonyms provided by the package option <TT>shortcuts</TT><A NAME="6842"></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="4478"></A></TD> -<TD ALIGN="LEFT"><TT>\acrshort</TT><A NAME="4481"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\acs</TT><A NAME="6846"></A></TD> +<TD ALIGN="LEFT"><TT>\acrshort</TT><A NAME="6849"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\Acs</TT><A NAME="4484"></A></TD> -<TD ALIGN="LEFT"><TT>\Acrshort</TT><A NAME="4487"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\Acs</TT><A NAME="6852"></A></TD> +<TD ALIGN="LEFT"><TT>\Acrshort</TT><A NAME="6855"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\acsp</TT><A NAME="4490"></A></TD> -<TD ALIGN="LEFT"><TT>\acrshortpl</TT><A NAME="4493"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\acsp</TT><A NAME="6858"></A></TD> +<TD ALIGN="LEFT"><TT>\acrshortpl</TT><A NAME="6861"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\Acsp</TT><A NAME="4496"></A></TD> -<TD ALIGN="LEFT"><TT>\Acrshortpl</TT><A NAME="4499"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\Acsp</TT><A NAME="6864"></A></TD> +<TD ALIGN="LEFT"><TT>\Acrshortpl</TT><A NAME="6867"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\acl</TT><A NAME="4502"></A></TD> -<TD ALIGN="LEFT"><TT>\acrlong</TT><A NAME="4505"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\acl</TT><A NAME="6870"></A></TD> +<TD ALIGN="LEFT"><TT>\acrlong</TT><A NAME="6873"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\Acl</TT><A NAME="4508"></A></TD> -<TD ALIGN="LEFT"><TT>\Acrlong</TT><A NAME="4511"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\Acl</TT><A NAME="6876"></A></TD> +<TD ALIGN="LEFT"><TT>\Acrlong</TT><A NAME="6879"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\aclp</TT><A NAME="4514"></A></TD> -<TD ALIGN="LEFT"><TT>\acrlongpl</TT><A NAME="4517"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\aclp</TT><A NAME="6882"></A></TD> +<TD ALIGN="LEFT"><TT>\acrlongpl</TT><A NAME="6885"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\Aclp</TT><A NAME="4520"></A></TD> -<TD ALIGN="LEFT"><TT>\Acrlongpl</TT><A NAME="4523"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\Aclp</TT><A NAME="6888"></A></TD> +<TD ALIGN="LEFT"><TT>\Acrlongpl</TT><A NAME="6891"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\acf</TT><A NAME="4526"></A></TD> -<TD ALIGN="LEFT"><TT>\acrfull</TT><A NAME="4529"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\acf</TT><A NAME="6894"></A></TD> +<TD ALIGN="LEFT"><TT>\acrfull</TT><A NAME="6897"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\Acf</TT><A NAME="4532"></A></TD> -<TD ALIGN="LEFT"><TT>\Acrfull</TT><A NAME="4535"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\Acf</TT><A NAME="6900"></A></TD> +<TD ALIGN="LEFT"><TT>\Acrfull</TT><A NAME="6903"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\acfp</TT><A NAME="4538"></A></TD> -<TD ALIGN="LEFT"><TT>\acrfullpl</TT><A NAME="4541"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\acfp</TT><A NAME="6906"></A></TD> +<TD ALIGN="LEFT"><TT>\acrfullpl</TT><A NAME="6909"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\Acfp</TT><A NAME="4544"></A></TD> -<TD ALIGN="LEFT"><TT>\Acrfullpl</TT><A NAME="4547"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\Acfp</TT><A NAME="6912"></A></TD> +<TD ALIGN="LEFT"><TT>\Acrfullpl</TT><A NAME="6915"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\ac</TT><A NAME="4550"></A></TD> -<TD ALIGN="LEFT"><TT>\gls</TT><A NAME="4553"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\ac</TT><A NAME="6918"></A></TD> +<TD ALIGN="LEFT"><TT>\gls</TT><A NAME="6921"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\Ac</TT><A NAME="4556"></A></TD> -<TD ALIGN="LEFT"><TT>\Gls</TT><A NAME="4559"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\Ac</TT><A NAME="6924"></A></TD> +<TD ALIGN="LEFT"><TT>\Gls</TT><A NAME="6927"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\acp</TT><A NAME="4562"></A></TD> -<TD ALIGN="LEFT"><TT>\glspl</TT><A NAME="4565"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\acp</TT><A NAME="6930"></A></TD> +<TD ALIGN="LEFT"><TT>\glspl</TT><A NAME="6933"></A></TD> </TR> -<TR><TD ALIGN="LEFT"><TT>\Acp</TT><A NAME="4568"></A></TD> -<TD ALIGN="LEFT"><TT>\Glspl</TT><A NAME="4571"></A></TD> +<TR><TD ALIGN="LEFT"><TT>\Acp</TT><A NAME="6936"></A></TD> +<TD ALIGN="LEFT"><TT>\Glspl</TT><A NAME="6939"></A></TD> </TR> </TABLE> </DIV> @@ -2928,16 +4741,16 @@ Synonyms provided by the package option <TT>shortcuts</TT><A NAME="4474"></A></C <P> -<H2><A NAME="SECTION000410000000000000000"> +<H2><A NAME="SECTION000411000000000000000"> Unsetting and Resetting Entry Flags</A> </H2> <P> -When using <TT>\gls</TT><A NAME="4577"></A>, <TT>\glspl</TT><A NAME="4580"></A> and their uppercase variants it is +When using <TT>\gls</TT><A NAME="6945"></A>, <TT>\glspl</TT><A NAME="6948"></A> and their uppercase variants it is possible that you may want to use the value given by the -<TT>first</TT><A NAME="4583"></A> key, even though you have already used the glossary +<TT>first</TT><A NAME="6951"></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="4586"></A> key, even though you haven't used the glossary entry. +<TT>text</TT><A NAME="6954"></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> @@ -2965,36 +4778,47 @@ entry has been used, <I>true part</I> will be done, otherwise <P> -<H2><A NAME="SECTION000411000000000000000"></A> +<H2><A NAME="SECTION000412000000000000000"></A> <A NAME="sec:styles"></A> <BR> Glossary Styles </H2> The <TT>glossaries</TT> package comes with some pre-defined -glossary styles. These are as follows: +glossary styles. Note that the styles are suited to different +types of glossaries: some styles ignore the associated +symbol; some styles are not designed for hierarchical entries, +so they display sub-entries in the same way as they display top +level entries; some styles are designed for homographs, so they +ignore the name for sub-entries. You should therefore pick a style +that suits your type of glossary. +The predefined styles are as follows: + +<P> <DL> <DT><STRONG>list</STRONG></DT> -<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 -list for that entry. Sub groups are separated using <TT>\indexspace</TT>. +<DD>The <TT>list</TT><A NAME="6961"></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 list<A NAME="6963"></A> for +that entry. The symbol is ignored. If the entry has child entries, +the description and number list follows (but not the name) for each +child entry. Groups are separated using <TT>\indexspace</TT>. <P> </DD> <DT><STRONG>listgroup</STRONG></DT> -<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. +<DD>The <TT>listgroup</TT><A NAME="6965"></A> style is like +<TT>list</TT><A NAME="6967"></A> but the glossary groups have headings. <P> </DD> <DT><STRONG>listhypergroup</STRONG></DT> -<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 -is up-to-date. In the navigation panel, each group is separated +<DD>The <TT>listhypergroup</TT><A NAME="6969"></A> style is like +<TT>listgroup</TT><A NAME="6971"></A> but has a navigation line at the start of +the glossary with links to each group that is present in the +glossary. This requires an additional run through LaTeX to ensure +the group information is up-to-date. In the navigation line, each +group is separated by <TT>\glshypernavsep</TT> which defaults to a vertical bar with a space on either side. For example, to simply have a space separating each group, do: @@ -3003,31 +4827,34 @@ to simply have a space separating each group, do: </PRE> <P> -Note that the hyper-navigation panel is now (as from version 1.14) +Note that the hyper-navigation line 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="4604"></A>, but note that this needs to +by redefining <TT>\glossaryheader</TT><A NAME="6973"></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="4607"></A> style is like <TT>list</TT><A NAME="4609"></A> -but the description is placed on the following line. +<DD>The <TT>altlist</TT><A NAME="6976"></A> style is like <TT>list</TT><A NAME="6978"></A> +but the description starts on the line following the name. (As +with the <TT>list</TT><A NAME="6980"></A> style, the symbol is ignored.) Each child +entry starts a new line, but as with the <TT>list</TT><A NAME="6982"></A> style, +the name associated with each child entry is ignored. <P> </DD> <DT><STRONG>altlistgroup</STRONG></DT> -<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. +<DD>The <TT>altlistgroup</TT><A NAME="6984"></A> style is like +<TT>altlist</TT><A NAME="6986"></A> but the glossary groups have headings. <P> </DD> <DT><STRONG>altlisthypergroup</STRONG></DT> -<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="4619"></A>, described above. +<DD>The <TT>altlisthypergroup</TT><A NAME="6988"></A> style is like +<TT>altlistgroup</TT><A NAME="6990"></A> but has a set of links to the glossary +groups. The navigation line is the same as that for +<TT>listhypergroup</TT><A NAME="6992"></A>, described above. <P> </DD> @@ -3035,269 +4862,387 @@ 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="4621"></A> and the symbol. The +this style ignores both the number list<A NAME="6994"></A> and the symbol. The length <TT>\glslistdottedwidth</TT> -governs where the description should start.<A NAME="tex2html15" - HREF="#foot1949"><SUP>6</SUP></A> +governs where the description should start.<A NAME="tex2html27" + HREF="#foot2916"><SUP>9</SUP></A> This is a flat style, so child +entries are formatted in the same way as the parent entries. + <P> </DD> <DT><STRONG>long</STRONG></DT> -<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 +<DD>The <TT>long</TT><A NAME="6996"></A> style uses the <TT>longtable</TT> +environment (defined by the <TT>longtable</TT><A NAME="6999"></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="4628"></A>. +column contains the description followed by the number list<A NAME="7001"></A>. +The entry's symbol is ignored. 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>. +<TT>\glsdescwidth</TT><A NAME="7003"></A>. Child entries have a similar format to the +parent entries except that their name is suppressed. <P> </DD> <DT><STRONG>longborder</STRONG></DT> -<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. +<DD>The <TT>longborder</TT><A NAME="7006"></A> style is like +<TT>long</TT><A NAME="7008"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>longheader</STRONG></DT> -<DD>The <TT>longheader</TT><A NAME="4637"></A> style is like -<TT>long</TT><A NAME="4639"></A> but has a header row. +<DD>The <TT>longheader</TT><A NAME="7010"></A> style is like +<TT>long</TT><A NAME="7012"></A> but has a header row. <P> </DD> <DT><STRONG>longheaderborder</STRONG></DT> -<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 +<DD>The <TT>longheaderborder</TT><A NAME="7014"></A> style is +like <TT>longheader</TT><A NAME="7016"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>long3col</STRONG></DT> -<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 +<DD>The <TT>long3col</TT><A NAME="7018"></A> style is like +<TT>long</TT><A NAME="7020"></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="4648"></A>. The width of the -first column is governed by the widest entry in that column. The +and the third column contains the number list<A NAME="7021"></A>. +The entry's symbol is ignored. 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>. +<TT>\glsdescwidth</TT><A NAME="7023"></A>, and the width of the third column is governed by the +length <TT>\glspagelistwidth</TT><A NAME="7026"></A>. <P> </DD> <DT><STRONG>long3colborder</STRONG></DT> -<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 +<DD>The <TT>long3colborder</TT><A NAME="7029"></A> style is like +the <TT>long3col</TT><A NAME="7031"></A> style but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>long3colheader</STRONG></DT> -<DD>The <TT>long3colheader</TT><A NAME="4660"></A> style is like -<TT>long3col</TT><A NAME="4662"></A> but has a header row. +<DD>The <TT>long3colheader</TT><A NAME="7033"></A> style is like +<TT>long3col</TT><A NAME="7035"></A> but has a header row. <P> </DD> <DT><STRONG>long3colheaderborder</STRONG></DT> -<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 +<DD>The <TT>long3colheaderborder</TT><A NAME="7037"></A> style is +like <TT>long3colheader</TT><A NAME="7039"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>long4col</STRONG></DT> -<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 +<DD>The <TT>long4col</TT><A NAME="7041"></A> style is like +<TT>long3col</TT><A NAME="7043"></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. +widest entry in the given column. Use <TT>altlong4col</TT><A NAME="7045"></A> for +multi-line descriptions. <P> </DD> <DT><STRONG>long4colborder</STRONG></DT> -<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 +<DD>The <TT>long4colborder</TT><A NAME="7047"></A> style is like +the <TT>long4col</TT><A NAME="7049"></A> style but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>long4colheader</STRONG></DT> -<DD>The <TT>long4colheader</TT><A NAME="4678"></A> style is like -<TT>long4col</TT><A NAME="4680"></A> but has a header row. +<DD>The <TT>long4colheader</TT><A NAME="7051"></A> style is like +<TT>long4col</TT><A NAME="7053"></A> but has a header row. <P> </DD> <DT><STRONG>long4colheaderborder</STRONG></DT> -<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 +<DD>The <TT>long4colheaderborder</TT><A NAME="7055"></A> style is +like <TT>long4colheader</TT><A NAME="7057"></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 +<DD>The <TT>altlong4col</TT><A NAME="7059"></A> style is like +<TT>long4col</TT><A NAME="7061"></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="7063"></A> and the width of the page list column is +governed by the length <TT>\glspagelistwidth</TT><A NAME="7066"></A>. The widths of the +name and symbol columns are 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 +<DD>The <TT>altlong4colborder</TT><A NAME="7069"></A> style is like +the <TT>long4colborder</TT><A NAME="7071"></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 +<DD>The <TT>altlong4colheader</TT><A NAME="7073"></A> style is like +<TT>long4colheader</TT><A NAME="7075"></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 +<DD>The <TT>altlong4colheaderborder</TT><A NAME="7077"></A> +style is like <TT>long4colheaderborder</TT><A NAME="7079"></A> but allows multi-line descriptions and page lists. <P> </DD> <DT><STRONG>super</STRONG></DT> -<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 +<DD>The <TT>super</TT><A NAME="7081"></A> style uses the <TT>supertabular</TT> +environment (defined by the <TT>supertabular</TT><A NAME="7084"></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="4713"></A>. +column contains the description followed by the number list<A NAME="7086"></A>. +The entry's symbol is ignored. 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>. +<TT>\glsdescwidth</TT><A NAME="7088"></A>. Child entries have a similar format to the +parent entries except that their name is suppressed. <P> </DD> <DT><STRONG>superborder</STRONG></DT> -<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. +<DD>The <TT>superborder</TT><A NAME="7091"></A> style is like +<TT>super</TT><A NAME="7093"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>superheader</STRONG></DT> -<DD>The <TT>superheader</TT><A NAME="4722"></A> style is like -<TT>super</TT><A NAME="4724"></A> but has a header row. +<DD>The <TT>superheader</TT><A NAME="7095"></A> style is like +<TT>super</TT><A NAME="7097"></A> but has a header row. <P> </DD> <DT><STRONG>superheaderborder</STRONG></DT> -<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 +<DD>The <TT>superheaderborder</TT><A NAME="7099"></A> style is +like <TT>superheader</TT><A NAME="7101"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>super3col</STRONG></DT> -<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 +<DD>The <TT>super3col</TT><A NAME="7103"></A> style is like +<TT>super</TT><A NAME="7105"></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="4733"></A>. The width of the +and the third column contains the number list<A NAME="7106"></A>. The +entry's symbol is ignored. 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>. +<TT>\glsdescwidth</TT><A NAME="7108"></A>. The width of the third column is governed by the +length <TT>\glspagelistwidth</TT><A NAME="7111"></A>. <P> </DD> <DT><STRONG>super3colborder</STRONG></DT> -<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 +<DD>The <TT>super3colborder</TT><A NAME="7114"></A> style is like +the <TT>super3col</TT><A NAME="7116"></A> style but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>super3colheader</STRONG></DT> -<DD>The <TT>super3colheader</TT><A NAME="4745"></A> style is like -<TT>super3col</TT><A NAME="4747"></A> but has a header row. +<DD>The <TT>super3colheader</TT><A NAME="7118"></A> style is like +<TT>super3col</TT><A NAME="7120"></A> but has a header row. <P> </DD> <DT><STRONG>super3colheaderborder</STRONG></DT> -<DD>The <TT>super3colheaderborder</TT><A NAME="4749"></A> style -is like <TT>super3colheader</TT><A NAME="4751"></A> but has horizontal and vertical +<DD>The <TT>super3colheaderborder</TT><A NAME="7122"></A> style +is like <TT>super3colheader</TT><A NAME="7124"></A> but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>super4col</STRONG></DT> -<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 +<DD>The <TT>super4col</TT><A NAME="7126"></A> style is like +<TT>super3col</TT><A NAME="7128"></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. +widest entry in the given column. Use <TT>altsuper4col</TT><A NAME="7130"></A> +for multi-line descriptions. <P> </DD> <DT><STRONG>super4colborder</STRONG></DT> -<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 +<DD>The <TT>super4colborder</TT><A NAME="7132"></A> style is like +the <TT>super4col</TT><A NAME="7134"></A> style but has horizontal and vertical lines around it. <P> </DD> <DT><STRONG>super4colheader</STRONG></DT> -<DD>The <TT>super4colheader</TT><A NAME="4763"></A> style is like -<TT>super4col</TT><A NAME="4765"></A> but has a header row. +<DD>The <TT>super4colheader</TT><A NAME="7136"></A> style is like +<TT>super4col</TT><A NAME="7138"></A> but has a header row. <P> </DD> <DT><STRONG>super4colheaderborder</STRONG></DT> -<DD>The <TT>super4colheaderborder</TT><A NAME="4767"></A> style -is like <TT>super4colheader</TT><A NAME="4769"></A> but has horizontal and vertical +<DD>The <TT>super4colheaderborder</TT><A NAME="7140"></A> style +is like <TT>super4colheader</TT><A NAME="7142"></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 +<DD>The <TT>altsuper4col</TT><A NAME="7144"></A> style is like +<TT>super4col</TT><A NAME="7146"></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 +<TT>\glsdescwidth</TT><A NAME="7148"></A> and the width of the page list column is +governed by the length <TT>\glspagelistwidth</TT><A NAME="7151"></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 +<DD>The <TT>altsuper4colborder</TT><A NAME="7154"></A> style is like +the <TT>super4colborder</TT><A NAME="7156"></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 +<DD>The <TT>altsuper4colheader</TT><A NAME="7158"></A> style is like +<TT>super4colheader</TT><A NAME="7160"></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 +<DD>The <TT>altsuper4colheaderborder</TT><A NAME="7162"></A> +style is like <TT>super4colheaderborder</TT><A NAME="7164"></A> but allows multi-line descriptions and page lists. <P> </DD> +<DT><STRONG>index</STRONG></DT> +<DD>The <TT>index</TT><A NAME="7166"></A> style is similar to the +way indices are usually formatted in that it has a +hierarchical structure up to three levels. The name is typeset in +bold, and if the symbol is present it is set in parentheses after +the name and before the description. Sub-entries are indented and +also include the name, the symbol (if present) and the description. +Groups are separated using <TT>\indexspace</TT><A NAME="7168"></A>. + +<P> +</DD> +<DT><STRONG>indexgroup</STRONG></DT> +<DD>The <TT>indexgroup</TT><A NAME="7171"></A> style is similar to +the <TT>index</TT><A NAME="7173"></A> style except that each group has a heading. + +<P> +</DD> +<DT><STRONG>indexhypergroup</STRONG></DT> +<DD>The <TT>indexhypergroup</TT><A NAME="7175"></A> style is like +<TT>indexgroup</TT><A NAME="7177"></A> but has a set of links to the glossary +groups. The navigation line is the same as that for +<TT>listhypergroup</TT><A NAME="7179"></A>, described above. + +<P> +</DD> +<DT><STRONG>tree</STRONG></DT> +<DD>The <TT>tree</TT><A NAME="7181"></A> style is similar to the +<TT>index</TT><A NAME="7183"></A> style except that it can have arbitrary levels. +(Note that <TT>makeindex</TT><A NAME="7185"></A> is limited to three levels, so +you will need to use <TT>xindy</TT><A NAME="7188"></A> if you want more than +three levels.) Each sub-level is indented by +<TT>\glstreeindent</TT>. Note that the +name, symbol (if present) and description are placed in the +same paragraph block. If you want the name to be apart from the +description, use the <TT>alttree</TT><A NAME="7191"></A> style instead. (See below.) + +<P> +</DD> +<DT><STRONG>treegroup</STRONG></DT> +<DD>The <TT>treegroup</TT><A NAME="7193"></A> style is similar to +the <TT>tree</TT><A NAME="7195"></A> style except that each group has a heading. + +<P> +</DD> +<DT><STRONG>treehypergroup</STRONG></DT> +<DD>The <TT>treehypergroup</TT><A NAME="7197"></A> style is like +<TT>treegroup</TT><A NAME="7199"></A> but has a set of links to the glossary +groups. The navigation line is the same as that for +<TT>listhypergroup</TT><A NAME="7201"></A>, described above. + +<P> +</DD> +<DT><STRONG>treenoname</STRONG></DT> +<DD>The <TT>treenoname</TT><A NAME="7203"></A> style is like +the <TT>tree</TT><A NAME="7205"></A> style except that the name for each sub-entry +is ignored. + +<P> +</DD> +<DT><STRONG>treenonamegroup</STRONG></DT> +<DD>The <TT>treenonamegroup</TT><A NAME="7207"></A> style is +similar to the <TT>treenoname</TT><A NAME="7209"></A> style except that each group +has a heading. + +<P> +</DD> +<DT><STRONG>treenonamehypergroup</STRONG></DT> +<DD>The <TT>treenonamehypergroup</TT><A NAME="7211"></A> +style is like <TT>treenonamegroup</TT><A NAME="7213"></A> but has a set of links to +the glossary groups. The navigation line is the same as that for +<TT>listhypergroup</TT><A NAME="7215"></A>, described above. + +<P> +</DD> +<DT><STRONG>alttree</STRONG></DT> +<DD>The <TT>alttree</TT><A NAME="7217"></A> style is similar to the +<TT>tree</TT><A NAME="7219"></A> style except that the indentation for each level +is determined by the width of the text specified by +<BR> +<BR><TT>\glssetwidest[</TT><EM>level</EM><TT>]{</TT><EM>text</EM><TT>}</TT> +<BR> +<BR> +The optional argument <I>level</I> indicates the level, where +0 indicates the top-most level, 1 indicates the first level +sub-entries, etc. If <TT>\glssetwidest</TT> hasn't been used for a +given sub-level, the level 0 widest text is used instead. If +<I>level</I> is omitted, 0 is assumed. + +<P> +For each level, the name is placed to the left of the paragraph +block containing the symbol (optional) and the description. If the +symbol is present, it is placed in parentheses before the +description. + +<P> +</DD> +<DT><STRONG>alttreegroup</STRONG></DT> +<DD>The <TT>alttreegroup</TT><A NAME="7221"></A> is like the +<TT>alttree</TT><A NAME="7223"></A> style except that each group has a heading. + +<P> +</DD> +<DT><STRONG>alttreehypergroup</STRONG></DT> +<DD>The <TT>alttreehypergroup</TT><A NAME="7225"></A> style is +like <TT>alttreegroup</TT><A NAME="7227"></A> but has a set of links to the glossary +groups. The navigation line is the same as that for +<TT>listhypergroup</TT><A NAME="7229"></A>, described above. + +<P> +</DD> </DL> <P> -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: +The glossary style can be set using the <TT>style</TT><A NAME="7236"></A> package option +or using the <TT>style</TT><A NAME="7240"></A> key in the optional +argument to <TT>\printglossary</TT><A NAME="7243"></A> or using the command: <BR> <BR><TT>\glossarystyle{</TT><EM>style-name</EM><TT>}</TT> <BR> @@ -3308,49 +5253,62 @@ 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 +<TT>long4col</TT><A NAME="7246"></A> and <TT>super4col</TT><A NAME="7248"></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. +<TT>altlong4col</TT><A NAME="7250"></A> and <TT>altsuper4col</TT><A NAME="7252"></A> styles. +Note that if you want to explicitly create a line-break within +a multi-line description you should use <TT>\newline</TT><A NAME="7254"></A> instead +of <code>\\</code>. <P> -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 +Note that if you use the <TT>style</TT><A NAME="7257"></A> key in the +optional argument to <TT>\printglossary</TT><A NAME="7260"></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="4822"></A> will not have an affect +The new definition of <TT>\glsgroupskip</TT><A NAME="7263"></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="4825"></A> will also +<code>style=long</code>. Likewise, <TT>\glossarystyle</TT><A NAME="7266"></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 (<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 +named glossary style (<TT>long</TT><A NAME="7269"></A> in this case). If you want to +modify the styles, either use <TT>\newglossarystyle</TT><A NAME="7271"></A> (described in the next section) or make the modifications after -<TT>\glossarystyle</TT><A NAME="4833"></A>. +<TT>\glossarystyle</TT><A NAME="7274"></A>, e.g.: +<PRE> +\glossarystyle{long} +\renewcommand*{\glsgroupskip}{} +</PRE> <P> All the styles except for the three- and four-column styles and the -<TT>listdotted</TT><A NAME="4836"></A> style use the command +<TT>listdotted</TT><A NAME="7277"></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 will need to redefine <TT>\glspostdescription</TT> before the glossary is -displayed. +displayed. Alternatively, you can suppress it for a given entry +by placing <TT>\nopostdesc</TT><A NAME="7279"></A> in the entry's description. + +<P> + <P> <A HREF="glossaries-manual.html#top">Top</A> <P> -<H2><A NAME="SECTION000412000000000000000"> -Defining your own glossary style</A> +<H2><A NAME="SECTION000413000000000000000"></A> +<A NAME="sec:newglossarystyle"></A> +<BR> +Defining your own glossary style </H2> <P> @@ -3374,7 +5332,7 @@ This environment defines how the main body of the glossary should be typeset. Note that this does not include the section heading, the glossary preamble (defined by <TT>\glossarypreamble</TT>) or the glossary postamble (defined by <TT>\glossarypostamble</TT>). For example, -the <TT>list</TT><A NAME="4842"></A> style uses the <TT>description</TT> environment, +the <TT>list</TT><A NAME="7286"></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. @@ -3387,8 +5345,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="4847"></A> glossary style redefines -<TT>\glossaryheader</TT> to do nothing, whereas the <TT>longheader</TT><A NAME="4849"></A> +the glossary style. The <TT>list</TT><A NAME="7291"></A> glossary style redefines +<TT>\glossaryheader</TT> to do nothing, whereas the <TT>longheader</TT><A NAME="7293"></A> glossary style redefines <TT>\glossaryheader</TT> to do a header row. <P> @@ -3400,21 +5358,22 @@ 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="4851"></A> key (or <TT>name</TT><A NAME="4854"></A> key if the <TT>sort</TT><A NAME="4857"></A> +of the <TT>sort</TT><A NAME="7295"></A> key (or <TT>name</TT><A NAME="7298"></A> key if the <TT>sort</TT><A NAME="7301"></A> key is omitted). The sub-divisions are in the following order: symbols, -numbers, A, ..., Z. Note that the argument to <TT>\glsgroupheading</TT> +numbers, A, ..., Z. (This may be different if you use +<TT>xindy</TT><A NAME="7304"></A>.) 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="4860"></A> style redefines +ignore its argument. The <TT>listhypergroup</TT><A NAME="7307"></A> style redefines <TT>\glsgroupheading</TT> as follows: <PRE> \renewcommand*{\glsgroupheading}[1]{% \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]} </PRE> See also <TT>\glsgroupskip</TT> below. (Note that command definitions within -<TT>\newglossarystyle</TT> must use <code>##1</code> etc instead of <code>#1</code> etc.) +<TT>\newglossarystyle</TT> must use <code>##1</code> instead of <code>#1</code> etc.) <P> </DD> @@ -3423,8 +5382,10 @@ 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="4862"></A> glossary -style simply redefines <TT>\glsgroupskip</TT> to be <TT>\indexspace</TT>. +the header for the next logical group. The <TT>list</TT><A NAME="7309"></A> glossary +style simply redefines <TT>\glsgroupskip</TT> to be <TT>\indexspace</TT>, +whereas the tabular-like styles redefine <TT>\glsgroupskip</TT> to +produce a blank row. <P> </DD> @@ -3441,15 +5402,15 @@ font for the entry name, regardless of the glossary style used. 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="#foot2431"><SUP>7</SUP></A> +link<A NAME="tex2html28" + HREF="#foot3556"><SUP>10</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="#foot2432"><SUP>8</SUP></A> For example, the -<TT>list</TT><A NAME="4864"></A> style defines <TT>\glossaryentryfield</TT> as follows: +to ensure the hyperlinks function correctly.<A NAME="tex2html29" + HREF="#foot3557"><SUP>11</SUP></A> For example, the +<TT>list</TT><A NAME="7311"></A> style defines <TT>\glossaryentryfield</TT> as follows: <PRE> \renewcommand*{\glossaryentryfield}[5]{% \item[\@glstarget{glo:##1}{##2}] ##3\glspostdescription\space ##5} @@ -3468,15 +5429,29 @@ 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="4866"></A>. The user can redefine this to change +to <TT>\glossaryentrynumbers</TT><A NAME="7313"></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="4874"></A> option +number list altogether. (In fact, the <TT>nonumberlist</TT><A NAME="7321"></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="4883"></A> package option. +<TT>nonumberlist</TT><A NAME="7330"></A> package option. + +<P> +</DD> +<DT></DT> +<DD> +<TT>\glossarysubentryfield{</TT><EM>level</EM><TT>}{</TT><EM>label</EM><TT>}{</TT><EM>formatted +name</EM><TT>}{</TT><EM>description</EM><TT>}{</TT><EM>symbol</EM><TT>}</TT> +<TT>{</TT><EM>number list</EM><TT>}</TT> +<P> +This is new to version 1.17, and is used to display sub-entries. +The first argument, <I>level</I>, indicates the sub-entry level. +This must be an integer from 1 (first sub-level) onwards. The +remaining arguments are analogous to those for +<TT>\glossaryentryfield</TT><A NAME="7334"></A> described above. </DD> </DL> <P> @@ -3484,7 +5459,7 @@ to worry about whether the user has specified the <P> -<H3><A NAME="SECTION000412100000000000000"> +<H3><A NAME="SECTION000413100000000000000"> Example: creating a completely new style</A> </H3> @@ -3505,7 +5480,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="4891"></A> should appear within square brackets +last of all the number list<A NAME="7341"></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> @@ -3525,15 +5500,20 @@ at the end. Then you can create this new glossary style, called, say, \space ##3% the description \space [##5]% the number list in square brackets }% + % set how sub-entries appear: + \renewcommand*{\glossarysubentryfield}[6]{% + \glossaryentryfield{#2}{#3}{#4}{#5}{#6}}% } </PRE> +Note that this style creates a flat glossary, where sub-entries +are displayed in exactly the same way as the top level entries. <P> <A HREF="glossaries-manual.html#top">Top</A> <P> -<H3><A NAME="SECTION000412200000000000000"> +<H3><A NAME="SECTION000413200000000000000"> Example: creating a new glossary style based on an existing style</A> </H3> @@ -3543,7 +5523,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="4896"></A> style but you don't want the extra +a style like the <TT>list</TT><A NAME="7346"></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: @@ -3566,8 +5546,8 @@ Mfirstuc Package </H1> <P> -The <TT>glossaries</TT> package is supplied with the package -<TT>mfirstuc</TT><A NAME="4902"></A> which provides the command: +The <TT>glossaries</TT> bundle is supplied with the package +<TT>mfirstuc</TT><A NAME="7352"></A> which provides the command: <BR> <BR> <TT>\makefirstuc{</TT><EM>stuff</EM><TT>}</TT> @@ -3584,7 +5564,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="4905"></A> has been applied to the letter "a" rather +(<TT>\MakeUppercase</TT><A NAME="7355"></A> has been applied to the letter "a" rather than <TT>\emph</TT>.) <P> @@ -3598,8 +5578,17 @@ than <TT>\emph</TT>.) <P> </LI> <LI><code>\makefirstuc{{\ae}bc}</code> produces Æbc + +<P> +</LI> +<LI><code>\makefirstuc{{ä}bc}</code> produces Äbc + +<P> </LI> </UL> +Note that non-Latin or accented characters appearing at the +start of the text must be placed in a group (even if you are +using the <TT>inputenc</TT><A NAME="7358"></A> package) due to expansion issues. <P> In version 1.02 of <TT>mfirstuc</TT>, a bug fix resulted in a change @@ -3615,7 +5604,7 @@ Note also that \makefirstuc{\abc} </PRE> produces: ABC. This is because the first object in the argument of -<TT>\makefirstuc</TT> is <TT>\abc</TT>, so it does <code>\MakeUppercase{\abc}</code>. +<TT>\makefirstuc</TT> is <TT>\abc</TT>, so it does <code>\MakeUppercase\abc</code>. Whereas: <PRE> \newcommand{\abc}{abc} @@ -3636,8 +5625,8 @@ produces: Abc. <P> If you want to use an alternative command to convert to uppercase, -for example <TT>\MakeTextUppercase</TT><A NAME="tex2html18" - HREF="#foot2433"><SUP>9</SUP></A>, you can redefine the internal +for example <TT>\MakeTextUppercase</TT>,<A NAME="tex2html30" + HREF="#foot3561"><SUP>12</SUP></A> you can redefine the internal command <TT>\@gls@makefirstuc</TT>. For example: <PRE> \renewcommand{\@gls@makefirstuc}[1]{\MakeTextUppercase #1} @@ -3660,902 +5649,1378 @@ 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#4550">Acronyms</A> - | <A HREF="glossaries-manual.html#4556">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6918">Acronyms</A> + | <A HREF="glossaries-manual.html#6924">Acronyms</A> <DT><STRONG><TT>\Acf</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4526">Acronyms</A> - | <A HREF="glossaries-manual.html#4532">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6894">Acronyms</A> + | <A HREF="glossaries-manual.html#6900">Acronyms</A> <DT><STRONG><TT>\Acfp</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4538">Acronyms</A> - | <A HREF="glossaries-manual.html#4544">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6906">Acronyms</A> + | <A HREF="glossaries-manual.html#6912">Acronyms</A> <DT><STRONG><TT>\Acl</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4502">Acronyms</A> - | <A HREF="glossaries-manual.html#4508">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6870">Acronyms</A> + | <A HREF="glossaries-manual.html#6876">Acronyms</A> <DT><STRONG><TT>\Aclp</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4514">Acronyms</A> - | <A HREF="glossaries-manual.html#4520">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6882">Acronyms</A> + | <A HREF="glossaries-manual.html#6888">Acronyms</A> <DT><STRONG><TT>\Acp</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4562">Acronyms</A> - | <A HREF="glossaries-manual.html#4568">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6930">Acronyms</A> + | <A HREF="glossaries-manual.html#6936">Acronyms</A> <DT><STRONG><TT>\Acrfull</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4529">Acronyms</A> - | <A HREF="glossaries-manual.html#4535">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6897">Acronyms</A> + | <A HREF="glossaries-manual.html#6903">Acronyms</A> <DT><STRONG><TT>\Acrfullpl</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4541">Acronyms</A> - | <A HREF="glossaries-manual.html#4547">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6909">Acronyms</A> + | <A HREF="glossaries-manual.html#6915">Acronyms</A> <DT><STRONG><TT>\Acrlong</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4505">Acronyms</A> - | <A HREF="glossaries-manual.html#4511">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6873">Acronyms</A> + | <A HREF="glossaries-manual.html#6879">Acronyms</A> <DT><STRONG><TT>\Acrlongpl</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4517">Acronyms</A> - | <A HREF="glossaries-manual.html#4523">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6885">Acronyms</A> + | <A HREF="glossaries-manual.html#6891">Acronyms</A> +<DT><STRONG><TT>\acrnameformat</TT></STRONG> +<DD><A HREF="glossaries-manual.html#6626">Acronyms</A> + | <A HREF="glossaries-manual.html#6632">Acronyms</A> + | <A HREF="glossaries-manual.html#6635">Acronyms</A> <DT><STRONG><TT>\acronymfont</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4012">Acronyms</A> - | <A HREF="glossaries-manual.html#4427">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6298">Acronyms</A> + | <A HREF="glossaries-manual.html#6629">Acronyms</A> + | <A HREF="glossaries-manual.html#6732">Acronyms</A> + | <A HREF="glossaries-manual.html#6795">Acronyms</A> <DT><STRONG><TT>\acronymname</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2529">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#3887">Changing the Fixed Names</A> <DT><STRONG><TT>\acronymtype</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4537">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4747">Package Options</A> + | <A HREF="glossaries-manual.html#4744">Package Options</A> + | <A HREF="glossaries-manual.html#4768">Package Options</A> + | <A HREF="glossaries-manual.html#4823">Package Options</A> + | <A HREF="glossaries-manual.html#5316">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#6144">Acronyms</A> + | <A HREF="glossaries-manual.html#6147">Acronyms</A> <DT><STRONG><TT>\Acrshort</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4481">Acronyms</A> - | <A HREF="glossaries-manual.html#4487">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6849">Acronyms</A> + | <A HREF="glossaries-manual.html#6855">Acronyms</A> <DT><STRONG><TT>\Acrshortpl</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4493">Acronyms</A> - | <A HREF="glossaries-manual.html#4499">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6861">Acronyms</A> + | <A HREF="glossaries-manual.html#6867">Acronyms</A> <DT><STRONG><TT>\Acs</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4478">Acronyms</A> - | <A HREF="glossaries-manual.html#4484">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6846">Acronyms</A> + | <A HREF="glossaries-manual.html#6852">Acronyms</A> <DT><STRONG><TT>\Acsp</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4490">Acronyms</A> - | <A HREF="glossaries-manual.html#4496">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6858">Acronyms</A> + | <A HREF="glossaries-manual.html#6864">Acronyms</A> <DT><STRONG><TT>babel</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#3847">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#3851">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#3869">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#3917">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#4310">Troubleshooting</A> <DT><STRONG><TT>\defglsdisplay</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4154">Acronyms</A> - | <A HREF="glossaries-manual.html#4442">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6440">Acronyms</A> + | <A HREF="glossaries-manual.html#6810">Acronyms</A> <DT><STRONG><TT>\defglsdisplayfirst</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4157">Acronyms</A> - | <A HREF="glossaries-manual.html#4445">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6443">Acronyms</A> + | <A HREF="glossaries-manual.html#6813">Acronyms</A> <DT><STRONG><TT>\descriptionname</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2544">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#3902">Changing the Fixed Names</A> <DT><STRONG><TT>\emph</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2871">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#4592">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5525">Links to Glossary Entries</A> <DT><STRONG><TT>\entryname</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2541">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#3899">Changing the Fixed Names</A> <DT><STRONG>file types</STRONG> <DD><DL COMPACT> <DT><STRONG>.alg</STRONG> -<DD><A HREF="glossaries-manual.html#2606">Generating the Associated Glossary</A> +<DD><A HREF="glossaries-manual.html#4028">Generating the Associated Glossary</A> +<DT><STRONG>.aux</STRONG> +<DD><A HREF="glossaries-manual.html#4077">Using the makeglossaries Perl</A> + | <A HREF="glossaries-manual.html#5971">Language and Encodings</A> <DT><STRONG>.glg</STRONG> -<DD><A HREF="glossaries-manual.html#2604">Generating the Associated Glossary</A> - | <A HREF="glossaries-manual.html#2759">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#4026">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4143">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4221">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4336">Troubleshooting</A> + | <A HREF="glossaries-manual.html#4417">A Quick Guide For</A> <DT><STRONG>.glo</STRONG> -<DD><A HREF="glossaries-manual.html#3281">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#4147">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4225">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#5093">Defining Glossary Entries</A> <DT><STRONG>.gls</STRONG> -<DD><A HREF="glossaries-manual.html#3283">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#4145">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4223">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#5095">Defining Glossary Entries</A> <DT><STRONG>.ist</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4087">Using the makeglossaries Perl</A> + | <A HREF="glossaries-manual.html#4196">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4201">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#5030">Package Options</A> + | <A HREF="glossaries-manual.html#5115">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5132">Defining Glossary Entries</A> +<DT><STRONG>.log</STRONG> +<DD><A HREF="glossaries-manual.html#4334">Troubleshooting</A> <DT><STRONG>.nlg</STRONG> -<DD><A HREF="glossaries-manual.html#2757">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#4415">A Quick Guide For</A> +<DT><STRONG>.tex</STRONG> +<DD><A HREF="glossaries-manual.html#4122">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4194">Using makeindex explicitly</A> +<DT><STRONG>.xdy</STRONG> +<DD><A HREF="glossaries-manual.html#4085">Using the makeglossaries Perl</A> + | <A HREF="glossaries-manual.html#4127">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4129">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#5059">Package Options</A> + | <A HREF="glossaries-manual.html#5120">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5140">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5933">Xindy</A> </DL> +<DT><STRONG><TT>fmtcount</TT></STRONG> +<DD><A HREF="glossaries-manual.html#6028">Locations and Number lists</A> +<DT><STRONG><TT>fontenc</TT></STRONG> +<DD><A HREF="glossaries-manual.html#4501">A Quick Guide For</A> <DT><STRONG><TT>german</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2511">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#3866">Changing the Fixed Names</A> +<DT><STRONG><TT>glossaries</TT></STRONG> +<DD><A HREF="glossaries-manual.html#3761">Sample Documents</A> + | <A HREF="glossaries-manual.html#3875">Changing the Fixed Names</A> <DT><STRONG><TT>glossary</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2483">Introduction</A> - | <A HREF="glossaries-manual.html#2653">Troubleshooting</A> +<DD><A HREF="glossaries-manual.html#3641">Introduction</A> + | <A HREF="glossaries-manual.html#4306">Troubleshooting</A> <DT><STRONG>glossary styles</STRONG> <DD><DL COMPACT> <DT><STRONG>altlist</STRONG> -<DD><A HREF="glossaries-manual.html#4607">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4613">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#6976">Glossary Styles</A> + | <A HREF="glossaries-manual.html#6986">Glossary Styles</A> <DT><STRONG>altlistgroup</STRONG> -<DD><A HREF="glossaries-manual.html#4611">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4617">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#6984">Glossary Styles</A> + | <A HREF="glossaries-manual.html#6990">Glossary Styles</A> <DT><STRONG>altlisthypergroup</STRONG> -<DD><A HREF="glossaries-manual.html#4615">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#6988">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> +<DD><A HREF="glossaries-manual.html#7045">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7059">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7250">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> +<DD><A HREF="glossaries-manual.html#7069">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> +<DD><A HREF="glossaries-manual.html#7073">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> +<DD><A HREF="glossaries-manual.html#7077">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> +<DD><A HREF="glossaries-manual.html#7130">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7144">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7252">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> +<DD><A HREF="glossaries-manual.html#7154">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> +<DD><A HREF="glossaries-manual.html#7158">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> +<DD><A HREF="glossaries-manual.html#7162">Glossary Styles</A> +<DT><STRONG>alttree</STRONG> +<DD><A HREF="glossaries-manual.html#7191">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7217">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7223">Glossary Styles</A> +<DT><STRONG>alttreegroup</STRONG> +<DD><A HREF="glossaries-manual.html#7221">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7227">Glossary Styles</A> +<DT><STRONG>alttreehypergroup</STRONG> +<DD><A HREF="glossaries-manual.html#7225">Glossary Styles</A> +<DT><STRONG>index</STRONG> +<DD><A HREF="glossaries-manual.html#6467">Acronyms</A> + | <A HREF="glossaries-manual.html#6568">Acronyms</A> + | <A HREF="glossaries-manual.html#7166">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7173">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7183">Glossary Styles</A> +<DT><STRONG>indexgroup</STRONG> +<DD><A HREF="glossaries-manual.html#7171">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7177">Glossary Styles</A> +<DT><STRONG>indexhypergroup</STRONG> +<DD><A HREF="glossaries-manual.html#7175">Glossary Styles</A> <DT><STRONG>list</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#6961">Glossary Styles</A> + | <A HREF="glossaries-manual.html#6967">Glossary Styles</A> + | <A HREF="glossaries-manual.html#6978">Glossary Styles</A> + | <A HREF="glossaries-manual.html#6980">Glossary Styles</A> + | <A HREF="glossaries-manual.html#6982">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7286">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#7291">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#7309">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#7311">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#7346">Example: creating a new</A> <DT><STRONG>listdotted</STRONG> -<DD><A HREF="glossaries-manual.html#4836">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#7277">Glossary Styles</A> <DT><STRONG>listgroup</STRONG> -<DD><A HREF="glossaries-manual.html#4596">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4602">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#6965">Glossary Styles</A> + | <A HREF="glossaries-manual.html#6971">Glossary Styles</A> <DT><STRONG>listhypergroup</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#6969">Glossary Styles</A> + | <A HREF="glossaries-manual.html#6992">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7179">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7201">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7215">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7229">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7307">Defining your own glossary</A> <DT><STRONG>long</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#6996">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7008">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7012">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7020">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7269">Glossary Styles</A> <DT><STRONG>long3col</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#7018">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7031">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7035">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7043">Glossary Styles</A> <DT><STRONG>long3colborder</STRONG> -<DD><A HREF="glossaries-manual.html#4656">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#7029">Glossary Styles</A> <DT><STRONG>long3colheader</STRONG> -<DD><A HREF="glossaries-manual.html#4660">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4666">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#7033">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7039">Glossary Styles</A> <DT><STRONG>long3colheaderborder</STRONG> -<DD><A HREF="glossaries-manual.html#4664">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#7037">Glossary Styles</A> <DT><STRONG>long4col</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#7041">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7049">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7053">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7061">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7246">Glossary Styles</A> <DT><STRONG>long4colborder</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#7047">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7071">Glossary Styles</A> <DT><STRONG>long4colheader</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#7051">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7057">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7075">Glossary Styles</A> <DT><STRONG>long4colheaderborder</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#7055">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7079">Glossary Styles</A> <DT><STRONG>longborder</STRONG> -<DD><A HREF="glossaries-manual.html#4633">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#7006">Glossary Styles</A> <DT><STRONG>longheader</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#7010">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7016">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7293">Defining your own glossary</A> <DT><STRONG>longheaderborder</STRONG> -<DD><A HREF="glossaries-manual.html#4641">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#7014">Glossary Styles</A> <DT><STRONG>super</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#7081">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7093">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7097">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7105">Glossary Styles</A> <DT><STRONG>super3col</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#7103">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7116">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7120">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7128">Glossary Styles</A> <DT><STRONG>super3colborder</STRONG> -<DD><A HREF="glossaries-manual.html#4741">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#7114">Glossary Styles</A> <DT><STRONG>super3colheader</STRONG> -<DD><A HREF="glossaries-manual.html#4745">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4751">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#7118">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7124">Glossary Styles</A> <DT><STRONG>super3colheaderborder</STRONG> -<DD><A HREF="glossaries-manual.html#4749">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#7122">Glossary Styles</A> <DT><STRONG>super4col</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#7126">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7134">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7138">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7146">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7248">Glossary Styles</A> <DT><STRONG>super4colborder</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#7132">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7156">Glossary Styles</A> <DT><STRONG>super4colheader</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#7136">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7142">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7160">Glossary Styles</A> <DT><STRONG>super4colheaderborder</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#7140">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7164">Glossary Styles</A> <DT><STRONG>superborder</STRONG> -<DD><A HREF="glossaries-manual.html#4718">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#7091">Glossary Styles</A> <DT><STRONG>superheader</STRONG> -<DD><A HREF="glossaries-manual.html#4722">Glossary Styles</A> - | <A HREF="glossaries-manual.html#4728">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#7095">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7101">Glossary Styles</A> <DT><STRONG>superheaderborder</STRONG> -<DD><A HREF="glossaries-manual.html#4726">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#7099">Glossary Styles</A> +<DT><STRONG>tree</STRONG> +<DD><A HREF="glossaries-manual.html#7181">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7195">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7205">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7219">Glossary Styles</A> +<DT><STRONG>treegroup</STRONG> +<DD><A HREF="glossaries-manual.html#7193">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7199">Glossary Styles</A> +<DT><STRONG>treehypergroup</STRONG> +<DD><A HREF="glossaries-manual.html#7197">Glossary Styles</A> +<DT><STRONG>treenoname</STRONG> +<DD><A HREF="glossaries-manual.html#7203">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7209">Glossary Styles</A> +<DT><STRONG>treenonamegroup</STRONG> +<DD><A HREF="glossaries-manual.html#7207">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7213">Glossary Styles</A> +<DT><STRONG>treenonamehypergroup</STRONG> +<DD><A HREF="glossaries-manual.html#7211">Glossary Styles</A> </DL> <DT><STRONG><TT>glossary-list</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2831">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#5899">Changing the way the</A> +<DT><STRONG><TT>glossary-long</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5902">Changing the way the</A> +<DT><STRONG><TT>glossary-super</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5905">Changing the way the</A> +<DT><STRONG><TT>glossary-tree</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5908">Changing the way the</A> +<DT><STRONG><TT>\glossaryentryfield</TT></STRONG> +<DD><A HREF="glossaries-manual.html#7334">Defining your own glossary</A> <DT><STRONG><TT>\glossaryentrynumbers</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4866">Defining your own glossary</A> +<DD><A HREF="glossaries-manual.html#7313">Defining your own glossary</A> <DT><STRONG><TT>\glossaryheader</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4604">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#6973">Glossary Styles</A> <DT><STRONG><TT>\glossaryname</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2526">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#3884">Changing the Fixed Names</A> <DT><STRONG><TT>\glossarystyle</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4637">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5869">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#7266">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7274">Glossary Styles</A> <DT><STRONG><TT>\gls</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#3828">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#4489">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4504">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4561">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4564">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4567">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4613">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5214">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5223">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5623">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5687">Changing the format of</A> + | <A HREF="glossaries-manual.html#5745">Enabling and disabling hyperlinks</A> + | <A HREF="glossaries-manual.html#5775">Cross-Referencing Entries</A> + | <A HREF="glossaries-manual.html#6921">Acronyms</A> + | <A HREF="glossaries-manual.html#6927">Acronyms</A> + | <A HREF="glossaries-manual.html#6945">Unsetting and Resetting Entry</A> <DT><STRONG><TT>\glsadd</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4598">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4616">A Quick Guide For</A> <DT><STRONG><TT>\glsaddall</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#3695">Sample Documents</A> + | <A HREF="glossaries-manual.html#4601">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4619">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#3730">Adding an Entry to</A> +<DD><A HREF="glossaries-manual.html#5769">Adding an Entry to</A> </DL> -<DT><STRONG><TT>\glscompositor</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2771">A Quick Guide For</A> +<DT><STRONG><TT>\GlsAddXdyAttribute</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5537">Links to Glossary Entries</A> +<DT><STRONG><TT>\GlsAddXdyLocation</TT></STRONG> +<DD><A HREF="glossaries-manual.html#6053">Locations and Number lists</A> +<DT><STRONG><TT>\glsdefaulttype</TT></STRONG> +<DD><A HREF="glossaries-manual.html#4750">Package Options</A> + | <A HREF="glossaries-manual.html#4762">Package Options</A> <DT><STRONG><TT>\glsdesc</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4430">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6798">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> +<DD><A HREF="glossaries-manual.html#7003">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7023">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7063">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7088">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7108">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7148">Glossary Styles</A> <DT><STRONG><TT>\glsdisplay</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3319">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3409">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#5193">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5283">Defining Glossary Entries</A> <DT><STRONG><TT>\glsdisplayfirst</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3322">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3412">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#5196">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5286">Defining Glossary Entries</A> +<DT><STRONG><TT>\glsentryname</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5815">Using Glossary Terms Without</A> <DT><STRONG><TT>\glsfirst</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4436">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6804">Acronyms</A> <DT><STRONG><TT>\glsgroupskip</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4822">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#3685">Sample Documents</A> + | <A HREF="glossaries-manual.html#7263">Glossary Styles</A> +<DT><STRONG><TT>\glshyperlink</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5797">Using Glossary Terms Without</A> <DT><STRONG><TT>\glslabel</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3675">Changing the format of</A> +<DD><A HREF="glossaries-manual.html#5714">Changing the format of</A> <DT><STRONG><TT>\glslink</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4579">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4610">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5614">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5711">Changing the format of</A> + | <A HREF="glossaries-manual.html#5742">Enabling and disabling hyperlinks</A> + | <A HREF="glossaries-manual.html#5763">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#3553">Links to Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#5592">Links to Glossary Entries</A> <DT><STRONG>format</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4582">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4585">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4595">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5516">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5534">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#6001">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6013">Locations and Number lists</A> <DT><STRONG>hyper</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#5595">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5748">Enabling and disabling hyperlinks</A> + | <A HREF="glossaries-manual.html#5766">Adding an Entry to</A> </DL> <DT><STRONG><TT>\glsnamefont</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2828">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#2837">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#4552">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4558">A Quick Guide For</A> <DT><STRONG><TT>\glsnumbersgroupname</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2556">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#3914">Changing the Fixed Names</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> +<DD><A HREF="glossaries-manual.html#7026">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7066">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7111">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7151">Glossary Styles</A> <DT><STRONG><TT>\glspl</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4492">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4507">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4570">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4573">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4576">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5199">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5202">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5205">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5232">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5244">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5289">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5292">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5295">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5690">Changing the format of</A> + | <A HREF="glossaries-manual.html#6933">Acronyms</A> + | <A HREF="glossaries-manual.html#6939">Acronyms</A> + | <A HREF="glossaries-manual.html#6948">Unsetting and Resetting Entry</A> <DT><STRONG><TT>\glspluralsuffix</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3361">Defining Glossary Entries</A> - | <A HREF="glossaries-manual.html#3379">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#5235">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5253">Defining Glossary Entries</A> +<DT><STRONG><TT>\glssee</TT></STRONG> +<DD><A HREF="glossaries-manual.html#4525">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4622">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5543">Links to Glossary Entries</A> +<DT><STRONG><TT>\glsSetCompositor</TT></STRONG> +<DD><A HREF="glossaries-manual.html#4432">A Quick Guide For</A> +<DT><STRONG><TT>\GlsSetXdyCodePage</TT></STRONG> +<DD><A HREF="glossaries-manual.html#4068">Generating the Associated Glossary</A> +<DT><STRONG><TT>\GlsSetXdyLanguage</TT></STRONG> +<DD><A HREF="glossaries-manual.html#4065">Generating the Associated Glossary</A> +<DT><STRONG><TT>\GlsSetXdyMinRangeLength</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5465">Number lists</A> <DT><STRONG><TT>\glssymbol</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4433">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6801">Acronyms</A> <DT><STRONG><TT>\glssymbolsgroupname</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2553">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#3911">Changing the Fixed Names</A> <DT><STRONG><TT>\glstext</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#5629">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5635">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5641">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5647">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5659">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5671">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#6788">Acronyms</A> + | <A HREF="glossaries-manual.html#6792">Acronyms</A> <DT><STRONG><TT>\glstextformat</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3682">Changing the format of</A> +<DD><A HREF="glossaries-manual.html#5721">Changing the format of</A> <DT><STRONG><TT>html</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2712">A Quick Guide For</A> - | <A HREF="glossaries-manual.html#3699">Enabling and disabling hyperlinks</A> +<DD><A HREF="glossaries-manual.html#4345">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5738">Enabling and disabling hyperlinks</A> +<DT><STRONG><TT>\hyperbf</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5562">Links to Glossary Entries</A> <DT><STRONG><TT>\hyperemph</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2868">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#4589">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5580">Links to Glossary Entries</A> +<DT><STRONG><TT>\hyperit</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5568">Links to Glossary Entries</A> <DT><STRONG><TT>\hyperlink</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3712">Enabling and disabling hyperlinks</A> +<DD><A HREF="glossaries-manual.html#5583">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5751">Enabling and disabling hyperlinks</A> +<DT><STRONG><TT>\hypermd</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5565">Links to Glossary Entries</A> +<DT><STRONG><TT>\hyperpage</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5546">Links to Glossary Entries</A> <DT><STRONG><TT>hyperref</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4342">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5483">Number lists</A> + | <A HREF="glossaries-manual.html#5511">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5549">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5735">Enabling and disabling hyperlinks</A> + | <A HREF="glossaries-manual.html#5757">Enabling and disabling hyperlinks</A> +<DT><STRONG><TT>\hyperrm</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5553">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#6007">Locations and Number lists</A> +<DT><STRONG><TT>\hypersc</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5577">Links to Glossary Entries</A> +<DT><STRONG><TT>\hypersf</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5556">Links to Glossary Entries</A> +<DT><STRONG><TT>\hypersl</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5571">Links to Glossary Entries</A> <DT><STRONG><TT>\hypertarget</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3715">Enabling and disabling hyperlinks</A> +<DD><A HREF="glossaries-manual.html#5754">Enabling and disabling hyperlinks</A> +<DT><STRONG><TT>\hypertt</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5559">Links to Glossary Entries</A> +<DT><STRONG><TT>\hyperup</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5574">Links to Glossary Entries</A> +<DT><STRONG><TT>\indexspace</TT></STRONG> +<DD><A HREF="glossaries-manual.html#7168">Glossary Styles</A> +<DT><STRONG><TT>inputenc</TT></STRONG> +<DD><A HREF="glossaries-manual.html#3743">Sample Documents</A> + | <A HREF="glossaries-manual.html#3831">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#4498">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5338">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5977">Language and Encodings</A> + | <A HREF="glossaries-manual.html#7358">Mfirstuc Package</A> +<DT><STRONG><TT>\inputencodingname</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5980">Language and Encodings</A> <DT><STRONG><TT>\item</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2834">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#4555">A Quick Guide For</A> +<DT><STRONG><TT>\jobname</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5129">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5137">Defining Glossary Entries</A> <DT><STRONG>link text</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#5501">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5513">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5514">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5597">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5685">Changing the format of</A> + | <A HREF="glossaries-manual.html#5719">Changing the format of</A> + | <A HREF="glossaries-manual.html#5730">Changing the format of</A> +<DT><STRONG>location list</STRONG> +<DD><i>see </i> number list <DT><STRONG><TT>longtable</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4626">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#6999">Glossary Styles</A> <DT><STRONG><TT>makeglossaries</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#3645">Introduction</A> + | <A HREF="glossaries-manual.html#3654">Introduction</A> + | <A HREF="glossaries-manual.html#3670">Sample Documents</A> + | <A HREF="glossaries-manual.html#3682">Sample Documents</A> + | <A HREF="glossaries-manual.html#3701">Sample Documents</A> + | <A HREF="glossaries-manual.html#3709">Sample Documents</A> + | <A HREF="glossaries-manual.html#3730">Sample Documents</A> + | <A HREF="glossaries-manual.html#3746">Sample Documents</A> + | <A HREF="glossaries-manual.html#3752">Sample Documents</A> + | <A HREF="glossaries-manual.html#3755">Sample Documents</A> + | <A HREF="glossaries-manual.html#3767">Sample Documents</A> + | <A HREF="glossaries-manual.html#3782">Sample Documents</A> + | <A HREF="glossaries-manual.html#3794">Sample Documents</A> + | <A HREF="glossaries-manual.html#3834">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#3840">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#3961">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3970">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3973">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3992">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3995">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4004">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4013">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4017">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4074">Using the makeglossaries Perl</A> + | <A HREF="glossaries-manual.html#4089">Using the makeglossaries Perl</A> + | <A HREF="glossaries-manual.html#4092">Using the makeglossaries Perl</A> + | <A HREF="glossaries-manual.html#4113">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4161">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4167">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4173">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4239">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4245">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4251">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4296">Troubleshooting</A> + | <A HREF="glossaries-manual.html#4319">Troubleshooting</A> + | <A HREF="glossaries-manual.html#4328">Troubleshooting</A> + | <A HREF="glossaries-manual.html#4331">Troubleshooting</A> + | <A HREF="glossaries-manual.html#4348">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4351">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4357">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4369">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4391">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4406">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4419">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4435">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4447">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5015">Package Options</A> + | <A HREF="glossaries-manual.html#5021">Package Options</A> + | <A HREF="glossaries-manual.html#5044">Package Options</A> + | <A HREF="glossaries-manual.html#5050">Package Options</A> + | <A HREF="glossaries-manual.html#5087">Package Options</A> + | <A HREF="glossaries-manual.html#5103">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5468">Number lists</A> + | <A HREF="glossaries-manual.html#5489">Number lists</A> + | <A HREF="glossaries-manual.html#5778">Cross-Referencing Entries</A> + | <A HREF="glossaries-manual.html#5821">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#5836">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#5968">Language and Encodings</A> + | <A HREF="glossaries-manual.html#5989">Language and Encodings</A> + | <A HREF="glossaries-manual.html#5995">Language and Encodings</A> + | <A HREF="glossaries-manual.html#6022">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6025">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6040">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6043">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6059">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6062">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6072">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6075">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6094">Glossary Groups</A> + | <A HREF="glossaries-manual.html#6097">Glossary Groups</A> + | <A HREF="glossaries-manual.html#6110">Defining New Glossaries</A> <DT><STRONG><TT>makeindex</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#3648">Introduction</A> + | <A HREF="glossaries-manual.html#3657">Introduction</A> + | <A HREF="glossaries-manual.html#3673">Sample Documents</A> + | <A HREF="glossaries-manual.html#3676">Sample Documents</A> + | <A HREF="glossaries-manual.html#3679">Sample Documents</A> + | <A HREF="glossaries-manual.html#3698">Sample Documents</A> + | <A HREF="glossaries-manual.html#3706">Sample Documents</A> + | <A HREF="glossaries-manual.html#3733">Sample Documents</A> + | <A HREF="glossaries-manual.html#3740">Sample Documents</A> + | <A HREF="glossaries-manual.html#3773">Sample Documents</A> + | <A HREF="glossaries-manual.html#3797">Sample Documents</A> + | <A HREF="glossaries-manual.html#3807">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#3813">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#3929">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#4030">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3938">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3945">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3951">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3964">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3989">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3998">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4007">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4023">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4082">Using the makeglossaries Perl</A> + | <A HREF="glossaries-manual.html#4179">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4191">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4198">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4206">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4218">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4242">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4248">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4302">Troubleshooting</A> + | <A HREF="glossaries-manual.html#4373">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4379">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4385">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4394">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4400">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4409">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4468">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4604">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4625">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5012">Package Options</A> + | <A HREF="glossaries-manual.html#5018">Package Options</A> + | <A HREF="glossaries-manual.html#5024">Package Options</A> + | <A HREF="glossaries-manual.html#5056">Package Options</A> + | <A HREF="glossaries-manual.html#5106">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5112">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5126">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5134">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5304">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5344">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5456">Number lists</A> + | <A HREF="glossaries-manual.html#5474">Number lists</A> + | <A HREF="glossaries-manual.html#5503">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5519">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5531">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5824">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#5830">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#6104">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#7185">Glossary Styles</A> <DT><STRONG><TT>\MakeUppercase</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4905">Mfirstuc Package</A> +<DD><A HREF="glossaries-manual.html#7355">Mfirstuc Package</A> <DT><STRONG><TT>mfirstuc</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4902">Mfirstuc Package</A> +<DD><A HREF="glossaries-manual.html#7352">Mfirstuc Package</A> <DT><STRONG><TT>\newacronym</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#3691">Sample Documents</A> + | <A HREF="glossaries-manual.html#4534">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4765">Package Options</A> + | <A HREF="glossaries-manual.html#4943">Package Options</A> + | <A HREF="glossaries-manual.html#4955">Package Options</A> + | <A HREF="glossaries-manual.html#4967">Package Options</A> + | <A HREF="glossaries-manual.html#4979">Package Options</A> + | <A HREF="glossaries-manual.html#4991">Package Options</A> + | <A HREF="glossaries-manual.html#6159">Acronyms</A> + | <A HREF="glossaries-manual.html#6207">Acronyms</A> + | <A HREF="glossaries-manual.html#6582">Acronyms</A> + | <A HREF="glossaries-manual.html#6605">Acronyms</A> + | <A HREF="glossaries-manual.html#6641">Acronyms</A> + | <A HREF="glossaries-manual.html#6807">Acronyms</A> <DT><STRONG><TT>\newglossary</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2736">A Quick Guide For</A> +<DD><A HREF="glossaries-manual.html#4158">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4236">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4382">A Quick Guide For</A> <DT><STRONG><TT>\newglossaryentry</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#3688">Sample Documents</A> + | <A HREF="glossaries-manual.html#4450">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4549">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5498">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5605">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#6222">Acronyms</A> <DT><STRONG><TT>\newglossaryentry</TT> keys</STRONG> <DD><DL COMPACT> <DT><STRONG>description</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4456">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4886">Package Options</A> + | <A HREF="glossaries-manual.html#4901">Package Options</A> + | <A HREF="glossaries-manual.html#4913">Package Options</A> + | <A HREF="glossaries-manual.html#5184">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5172">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5208">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5674">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5677">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5680">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5705">Changing the format of</A> + | <A HREF="glossaries-manual.html#6307">Acronyms</A> + | <A HREF="glossaries-manual.html#6553">Acronyms</A> + | <A HREF="glossaries-manual.html#6602">Acronyms</A> <DT><STRONG>descriptionplural</STRONG> -<DD><A HREF="glossaries-manual.html#3316">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#5190">Defining Glossary Entries</A> <DT><STRONG>first</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#5220">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5250">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5256">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5259">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5265">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5274">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5602">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5611">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5632">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5699">Changing the format of</A> + | <A HREF="glossaries-manual.html#5809">Using Glossary Terms Without</A> + | <A HREF="glossaries-manual.html#6301">Acronyms</A> + | <A HREF="glossaries-manual.html#6951">Unsetting and Resetting Entry</A> <DT><STRONG>firstplural</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#5241">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5262">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5271">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5359">Plurals</A> + | <A HREF="glossaries-manual.html#5620">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5644">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5702">Changing the format of</A> + | <A HREF="glossaries-manual.html#5812">Using Glossary Terms Without</A> <DT><STRONG>format</STRONG> -<DD><A HREF="glossaries-manual.html#3550">Links to Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#5586">Links to Glossary Entries</A> <DT><STRONG>name</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4453">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4480">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4883">Package Options</A> + | <A HREF="glossaries-manual.html#4904">Package Options</A> + | <A HREF="glossaries-manual.html#4910">Package Options</A> + | <A HREF="glossaries-manual.html#4925">Package Options</A> + | <A HREF="glossaries-manual.html#4928">Package Options</A> + | <A HREF="glossaries-manual.html#5178">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5169">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5175">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5217">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5310">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5378">Homographs</A> + | <A HREF="glossaries-manual.html#5650">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5653">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5656">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5800">Using Glossary Terms Without</A> + | <A HREF="glossaries-manual.html#6547">Acronyms</A> + | <A HREF="glossaries-manual.html#6550">Acronyms</A> + | <A HREF="glossaries-manual.html#7298">Defining your own glossary</A> +<DT><STRONG>nonumberlist</STRONG> +<DD><A HREF="glossaries-manual.html#5328">Defining Glossary Entries</A> +<DT><STRONG>parent</STRONG> +<DD><A HREF="glossaries-manual.html#4459">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5187">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5181">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5369">Hierarchical Categories</A> <DT><STRONG>plural</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4531">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5229">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5247">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5268">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5353">Plurals</A> + | <A HREF="glossaries-manual.html#5356">Plurals</A> + | <A HREF="glossaries-manual.html#5388">Homographs</A> + | <A HREF="glossaries-manual.html#5617">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5638">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5696">Changing the format of</A> + | <A HREF="glossaries-manual.html#5806">Using Glossary Terms Without</A> +<DT><STRONG>see</STRONG> +<DD><A HREF="glossaries-manual.html#4522">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5332">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5335">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5540">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5781">Cross-Referencing Entries</A> + | <A HREF="glossaries-manual.html#5784">Cross-Referencing Entries</A> + | <A HREF="glossaries-manual.html#5787">Cross-Referencing Entries</A> <DT><STRONG>sort</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4462">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4483">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4510">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4919">Package Options</A> + | <A HREF="glossaries-manual.html#5301">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5341">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5385">Homographs</A> + | <A HREF="glossaries-manual.html#6579">Acronyms</A> + | <A HREF="glossaries-manual.html#6638">Acronyms</A> + | <A HREF="glossaries-manual.html#7295">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#7301">Defining your own glossary</A> <DT><STRONG>symbol</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4889">Package Options</A> + | <A HREF="glossaries-manual.html#4907">Package Options</A> + | <A HREF="glossaries-manual.html#4916">Package Options</A> + | <A HREF="glossaries-manual.html#5277">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5298">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5662">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5665">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5668">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5708">Changing the format of</A> + | <A HREF="glossaries-manual.html#5717">Changing the format of</A> + | <A HREF="glossaries-manual.html#5728">Changing the format of</A> + | <A HREF="glossaries-manual.html#6310">Acronyms</A> + | <A HREF="glossaries-manual.html#6464">Acronyms</A> + | <A HREF="glossaries-manual.html#6556">Acronyms</A> <DT><STRONG>symbolplural</STRONG> -<DD><A HREF="glossaries-manual.html#3406">Defining Glossary Entries</A> +<DD><A HREF="glossaries-manual.html#5280">Defining Glossary Entries</A> <DT><STRONG>text</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4922">Package Options</A> + | <A HREF="glossaries-manual.html#4931">Package Options</A> + | <A HREF="glossaries-manual.html#5211">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5226">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5238">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5599">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5608">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5626">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5693">Changing the format of</A> + | <A HREF="glossaries-manual.html#5803">Using Glossary Terms Without</A> + | <A HREF="glossaries-manual.html#6304">Acronyms</A> + | <A HREF="glossaries-manual.html#6954">Unsetting and Resetting Entry</A> <DT><STRONG>type</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4516">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4519">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5313">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5394">Loading Entries From a</A> </DL> <DT><STRONG><TT>\newglossarystyle</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4830">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#7271">Glossary Styles</A> +<DT><STRONG><TT>\newline</TT></STRONG> +<DD><A HREF="glossaries-manual.html#7254">Glossary Styles</A> <DT><STRONG><TT>ngerman</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2508">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#3863">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#5939">Xindy</A> +<DT><STRONG><TT>\nohyperpage</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5486">Number lists</A> +<DT><STRONG><TT>\noist</TT></STRONG> +<DD><A HREF="glossaries-manual.html#3758">Sample Documents</A> + | <A HREF="glossaries-manual.html#5471">Number lists</A> + | <A HREF="glossaries-manual.html#5492">Number lists</A> + | <A HREF="glossaries-manual.html#5949">Xindy</A> + | <A HREF="glossaries-manual.html#5986">Language and Encodings</A> + | <A HREF="glossaries-manual.html#6019">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6037">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6056">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6069">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6091">Glossary Groups</A> +<DT><STRONG><TT>\nopostdesc</TT></STRONG> +<DD><A HREF="glossaries-manual.html#4486">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5372">Hierarchical Categories</A> + | <A HREF="glossaries-manual.html#5381">Homographs</A> + | <A HREF="glossaries-manual.html#7279">Glossary Styles</A> <DT><STRONG>number list</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#3693">Sample Documents</A> + | <A HREF="glossaries-manual.html#3704">Sample Documents</A> + | <A HREF="glossaries-manual.html#4015">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4371">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4861">Package Options</A> + | <A HREF="glossaries-manual.html#4871">Package Options</A> + | <A HREF="glossaries-manual.html#5144">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5166">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5167">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5330">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5364">Sub-Entries</A> + | <A HREF="glossaries-manual.html#5383">Homographs</A> + | <A HREF="glossaries-manual.html#5436">Number lists</A> + | <A HREF="glossaries-manual.html#5508">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5789">Cross-Referencing Entries</A> + | <A HREF="glossaries-manual.html#6045">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6064">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6102">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#6963">Glossary Styles</A> + | <A HREF="glossaries-manual.html#6994">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7001">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7021">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7086">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7106">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7341">Example: creating a completely</A> <DT><STRONG>package options</STRONG> <DD><DL COMPACT> <DT><STRONG>acronym</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#3895">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#3897">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#4139">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4141">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4154">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4156">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4214">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4216">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4232">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4234">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4427">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4429">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4545">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4547">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4731">Package Options</A> + | <A HREF="glossaries-manual.html#4733">Package Options</A> + | <A HREF="glossaries-manual.html#4740">Package Options</A> + | <A HREF="glossaries-manual.html#4742">Package Options</A> + | <A HREF="glossaries-manual.html#4758">Package Options</A> + | <A HREF="glossaries-manual.html#4760">Package Options</A> + | <A HREF="glossaries-manual.html#4818">Package Options</A> + | <A HREF="glossaries-manual.html#4820">Package Options</A> + | <A HREF="glossaries-manual.html#4831">Package Options</A> + | <A HREF="glossaries-manual.html#4833">Package Options</A> + | <A HREF="glossaries-manual.html#4840">Package Options</A> + | <A HREF="glossaries-manual.html#4842">Package Options</A> + | <A HREF="glossaries-manual.html#5324">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5326">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5402">Loading Entries From a</A> + | <A HREF="glossaries-manual.html#5404">Loading Entries From a</A> + | <A HREF="glossaries-manual.html#5411">Loading Entries From a</A> + | <A HREF="glossaries-manual.html#5413">Loading Entries From a</A> + | <A HREF="glossaries-manual.html#5420">Loading Entries From a</A> + | <A HREF="glossaries-manual.html#5422">Loading Entries From a</A> + | <A HREF="glossaries-manual.html#5429">Loading Entries From a</A> + | <A HREF="glossaries-manual.html#5431">Loading Entries From a</A> + | <A HREF="glossaries-manual.html#6118">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#6120">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#6127">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#6129">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#6136">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#6138">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#6155">Acronyms</A> + | <A HREF="glossaries-manual.html#6157">Acronyms</A> <DT><STRONG>counter</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4868">Package Options</A> + | <A HREF="glossaries-manual.html#4870">Package Options</A> + | <A HREF="glossaries-manual.html#5151">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5153">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5452">Number lists</A> + | <A HREF="glossaries-manual.html#5454">Number lists</A> <DT><STRONG>description</STRONG> -<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#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> +<DD><A HREF="glossaries-manual.html#4939">Package Options</A> + | <A HREF="glossaries-manual.html#4941">Package Options</A> + | <A HREF="glossaries-manual.html#6185">Acronyms</A> + | <A HREF="glossaries-manual.html#6187">Acronyms</A> + | <A HREF="glossaries-manual.html#6276">Acronyms</A> + | <A HREF="glossaries-manual.html#6278">Acronyms</A> + | <A HREF="glossaries-manual.html#6318">Acronyms</A> + | <A HREF="glossaries-manual.html#6320">Acronyms</A> + | <A HREF="glossaries-manual.html#6336">Acronyms</A> + | <A HREF="glossaries-manual.html#6338">Acronyms</A> + | <A HREF="glossaries-manual.html#6354">Acronyms</A> + | <A HREF="glossaries-manual.html#6356">Acronyms</A> + | <A HREF="glossaries-manual.html#6436">Acronyms</A> + | <A HREF="glossaries-manual.html#6438">Acronyms</A> + | <A HREF="glossaries-manual.html#6451">Acronyms</A> + | <A HREF="glossaries-manual.html#6453">Acronyms</A> + | <A HREF="glossaries-manual.html#6543">Acronyms</A> + | <A HREF="glossaries-manual.html#6545">Acronyms</A> + | <A HREF="glossaries-manual.html#6564">Acronyms</A> + | <A HREF="glossaries-manual.html#6566">Acronyms</A> + | <A HREF="glossaries-manual.html#6575">Acronyms</A> + | <A HREF="glossaries-manual.html#6577">Acronyms</A> + | <A HREF="glossaries-manual.html#6590">Acronyms</A> + | <A HREF="glossaries-manual.html#6592">Acronyms</A> + | <A HREF="glossaries-manual.html#6684">Acronyms</A> + | <A HREF="glossaries-manual.html#6686">Acronyms</A> + | <A HREF="glossaries-manual.html#6722">Acronyms</A> + | <A HREF="glossaries-manual.html#6724">Acronyms</A> + | <A HREF="glossaries-manual.html#6784">Acronyms</A> + | <A HREF="glossaries-manual.html#6786">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> +<DD><A HREF="glossaries-manual.html#4987">Package Options</A> + | <A HREF="glossaries-manual.html#4989">Package Options</A> + | <A HREF="glossaries-manual.html#6194">Acronyms</A> + | <A HREF="glossaries-manual.html#6196">Acronyms</A> + | <A HREF="glossaries-manual.html#6267">Acronyms</A> + | <A HREF="glossaries-manual.html#6269">Acronyms</A> + | <A HREF="glossaries-manual.html#6345">Acronyms</A> + | <A HREF="glossaries-manual.html#6347">Acronyms</A> + | <A HREF="glossaries-manual.html#6390">Acronyms</A> + | <A HREF="glossaries-manual.html#6392">Acronyms</A> + | <A HREF="glossaries-manual.html#6427">Acronyms</A> + | <A HREF="glossaries-manual.html#6429">Acronyms</A> + | <A HREF="glossaries-manual.html#6498">Acronyms</A> + | <A HREF="glossaries-manual.html#6500">Acronyms</A> + | <A HREF="glossaries-manual.html#6507">Acronyms</A> + | <A HREF="glossaries-manual.html#6509">Acronyms</A> + | <A HREF="glossaries-manual.html#6622">Acronyms</A> + | <A HREF="glossaries-manual.html#6624">Acronyms</A> + | <A HREF="glossaries-manual.html#6775">Acronyms</A> + | <A HREF="glossaries-manual.html#6777">Acronyms</A> <DT><STRONG>footnote</STRONG> -<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#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> +<DD><A HREF="glossaries-manual.html#4951">Package Options</A> + | <A HREF="glossaries-manual.html#4953">Package Options</A> + | <A HREF="glossaries-manual.html#6203">Acronyms</A> + | <A HREF="glossaries-manual.html#6205">Acronyms</A> + | <A HREF="glossaries-manual.html#6285">Acronyms</A> + | <A HREF="glossaries-manual.html#6287">Acronyms</A> + | <A HREF="glossaries-manual.html#6327">Acronyms</A> + | <A HREF="glossaries-manual.html#6329">Acronyms</A> + | <A HREF="glossaries-manual.html#6363">Acronyms</A> + | <A HREF="glossaries-manual.html#6365">Acronyms</A> + | <A HREF="glossaries-manual.html#6418">Acronyms</A> + | <A HREF="glossaries-manual.html#6420">Acronyms</A> + | <A HREF="glossaries-manual.html#6460">Acronyms</A> + | <A HREF="glossaries-manual.html#6462">Acronyms</A> + | <A HREF="glossaries-manual.html#6516">Acronyms</A> + | <A HREF="glossaries-manual.html#6518">Acronyms</A> + | <A HREF="glossaries-manual.html#6613">Acronyms</A> + | <A HREF="glossaries-manual.html#6615">Acronyms</A> + | <A HREF="glossaries-manual.html#6649">Acronyms</A> + | <A HREF="glossaries-manual.html#6651">Acronyms</A> + | <A HREF="glossaries-manual.html#6675">Acronyms</A> + | <A HREF="glossaries-manual.html#6677">Acronyms</A> + | <A HREF="glossaries-manual.html#6713">Acronyms</A> + | <A HREF="glossaries-manual.html#6715">Acronyms</A> + | <A HREF="glossaries-manual.html#6766">Acronyms</A> + | <A HREF="glossaries-manual.html#6768">Acronyms</A> +<DT><STRONG>makeindex</STRONG> +<DD><A HREF="glossaries-manual.html#5008">Package Options</A> + | <A HREF="glossaries-manual.html#5010">Package Options</A> <DT><STRONG>nonumberlist</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4646">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4648">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4858">Package Options</A> + | <A HREF="glossaries-manual.html#4860">Package Options</A> + | <A HREF="glossaries-manual.html#5443">Number lists</A> + | <A HREF="glossaries-manual.html#5445">Number lists</A> + | <A HREF="glossaries-manual.html#7321">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#7323">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#7330">Defining your own glossary</A> + | <A HREF="glossaries-manual.html#7332">Defining your own glossary</A> <DT><STRONG>numberedsection</STRONG> -<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><A HREF="glossaries-manual.html#4785">Package Options</A> + | <A HREF="glossaries-manual.html#4787">Package Options</A> + | <A HREF="glossaries-manual.html#4794">Package Options</A> + | <A HREF="glossaries-manual.html#4796">Package Options</A> + | <A HREF="glossaries-manual.html#4809">Package Options</A> + | <A HREF="glossaries-manual.html#5880">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#5882">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#5889">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#5891">Displaying a glossary</A> <DD><DL COMPACT> <DT><STRONG>autolabel</STRONG> -<DD><A HREF="glossaries-manual.html#3086">Package Options</A> - | <A HREF="glossaries-manual.html#3077">Package Options</A> +<DD><A HREF="glossaries-manual.html#4811">Package Options</A> + | <A HREF="glossaries-manual.html#4802">Package Options</A> <DT><STRONG>false</STRONG> -<DD><A HREF="glossaries-manual.html#3073">Package Options</A> +<DD><A HREF="glossaries-manual.html#4798">Package Options</A> <DT><STRONG>nolabel</STRONG> -<DD><A HREF="glossaries-manual.html#3075">Package Options</A> +<DD><A HREF="glossaries-manual.html#4800">Package Options</A> </DL> <DT><STRONG>numberline</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4686">Package Options</A> + | <A HREF="glossaries-manual.html#4688">Package Options</A> + | <A HREF="glossaries-manual.html#4722">Package Options</A> + | <A HREF="glossaries-manual.html#4724">Package Options</A> +<DT><STRONG>order</STRONG> +<DD><A HREF="glossaries-manual.html#3717">Sample Documents</A> + | <A HREF="glossaries-manual.html#3726">Sample Documents</A> + | <A HREF="glossaries-manual.html#4041">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4050">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#5079">Package Options</A> + | <A HREF="glossaries-manual.html#5081">Package Options</A> +<DD><DL COMPACT> +<DT><STRONG>letter</STRONG> +<DD><A HREF="glossaries-manual.html#3728">Sample Documents</A> + | <A HREF="glossaries-manual.html#4043">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#5085">Package Options</A> +<DT><STRONG>word</STRONG> +<DD><A HREF="glossaries-manual.html#3719">Sample Documents</A> + | <A HREF="glossaries-manual.html#4052">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#5083">Package Options</A> +</DL> <DT><STRONG>sanitize</STRONG> -<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><A HREF="glossaries-manual.html#4878">Package Options</A> + | <A HREF="glossaries-manual.html#4880">Package Options</A> + | <A HREF="glossaries-manual.html#4897">Package Options</A> + | <A HREF="glossaries-manual.html#4899">Package Options</A> + | <A HREF="glossaries-manual.html#6475">Acronyms</A> + | <A HREF="glossaries-manual.html#6477">Acronyms</A> + | <A HREF="glossaries-manual.html#6483">Acronyms</A> + | <A HREF="glossaries-manual.html#6490">Acronyms</A> + | <A HREF="glossaries-manual.html#6599">Acronyms</A> + | <A HREF="glossaries-manual.html#6658">Acronyms</A> + | <A HREF="glossaries-manual.html#6696">Acronyms</A> + | <A HREF="glossaries-manual.html#6740">Acronyms</A> <DD><DL COMPACT> <DT><STRONG>description</STRONG> -<DD><A HREF="glossaries-manual.html#4193">Acronyms</A> - | <A HREF="glossaries-manual.html#4297">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6484">Acronyms</A> + | <A HREF="glossaries-manual.html#6659">Acronyms</A> <DT><STRONG>symbol</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#6491">Acronyms</A> + | <A HREF="glossaries-manual.html#6600">Acronyms</A> + | <A HREF="glossaries-manual.html#6697">Acronyms</A> + | <A HREF="glossaries-manual.html#6741">Acronyms</A> </DL> <DT><STRONG>section</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4655">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4657">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4664">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4666">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4776">Package Options</A> + | <A HREF="glossaries-manual.html#4778">Package Options</A> <DT><STRONG>shortcuts</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4999">Package Options</A> + | <A HREF="glossaries-manual.html#5001">Package Options</A> + | <A HREF="glossaries-manual.html#6215">Acronyms</A> + | <A HREF="glossaries-manual.html#6217">Acronyms</A> + | <A HREF="glossaries-manual.html#6821">Acronyms</A> + | <A HREF="glossaries-manual.html#6823">Acronyms</A> + | <A HREF="glossaries-manual.html#6833">Acronyms</A> + | <A HREF="glossaries-manual.html#6835">Acronyms</A> + | <A HREF="glossaries-manual.html#6842">Acronyms</A> + | <A HREF="glossaries-manual.html#6844">Acronyms</A> <DT><STRONG>smallcaps</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4265">Troubleshooting</A> + | <A HREF="glossaries-manual.html#4267">Troubleshooting</A> + | <A HREF="glossaries-manual.html#4274">Troubleshooting</A> + | <A HREF="glossaries-manual.html#4276">Troubleshooting</A> + | <A HREF="glossaries-manual.html#4963">Package Options</A> + | <A HREF="glossaries-manual.html#4965">Package Options</A> + | <A HREF="glossaries-manual.html#6167">Acronyms</A> + | <A HREF="glossaries-manual.html#6169">Acronyms</A> + | <A HREF="glossaries-manual.html#6230">Acronyms</A> + | <A HREF="glossaries-manual.html#6232">Acronyms</A> + | <A HREF="glossaries-manual.html#6249">Acronyms</A> + | <A HREF="glossaries-manual.html#6251">Acronyms</A> + | <A HREF="glossaries-manual.html#6372">Acronyms</A> + | <A HREF="glossaries-manual.html#6374">Acronyms</A> + | <A HREF="glossaries-manual.html#6400">Acronyms</A> + | <A HREF="glossaries-manual.html#6402">Acronyms</A> + | <A HREF="glossaries-manual.html#6534">Acronyms</A> + | <A HREF="glossaries-manual.html#6536">Acronyms</A> + | <A HREF="glossaries-manual.html#6666">Acronyms</A> + | <A HREF="glossaries-manual.html#6668">Acronyms</A> + | <A HREF="glossaries-manual.html#6748">Acronyms</A> + | <A HREF="glossaries-manual.html#6750">Acronyms</A> <DT><STRONG>smaller</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4283">Troubleshooting</A> + | <A HREF="glossaries-manual.html#4285">Troubleshooting</A> + | <A HREF="glossaries-manual.html#4292">Troubleshooting</A> + | <A HREF="glossaries-manual.html#4294">Troubleshooting</A> + | <A HREF="glossaries-manual.html#4975">Package Options</A> + | <A HREF="glossaries-manual.html#4977">Package Options</A> + | <A HREF="glossaries-manual.html#6176">Acronyms</A> + | <A HREF="glossaries-manual.html#6178">Acronyms</A> + | <A HREF="glossaries-manual.html#6239">Acronyms</A> + | <A HREF="glossaries-manual.html#6241">Acronyms</A> + | <A HREF="glossaries-manual.html#6258">Acronyms</A> + | <A HREF="glossaries-manual.html#6260">Acronyms</A> + | <A HREF="glossaries-manual.html#6294">Acronyms</A> + | <A HREF="glossaries-manual.html#6296">Acronyms</A> + | <A HREF="glossaries-manual.html#6381">Acronyms</A> + | <A HREF="glossaries-manual.html#6383">Acronyms</A> + | <A HREF="glossaries-manual.html#6409">Acronyms</A> + | <A HREF="glossaries-manual.html#6411">Acronyms</A> + | <A HREF="glossaries-manual.html#6525">Acronyms</A> + | <A HREF="glossaries-manual.html#6527">Acronyms</A> + | <A HREF="glossaries-manual.html#6704">Acronyms</A> + | <A HREF="glossaries-manual.html#6706">Acronyms</A> + | <A HREF="glossaries-manual.html#6757">Acronyms</A> + | <A HREF="glossaries-manual.html#6759">Acronyms</A> <DT><STRONG>style</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4633">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4635">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4849">Package Options</A> + | <A HREF="glossaries-manual.html#4851">Package Options</A> + | <A HREF="glossaries-manual.html#5865">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#5867">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#7236">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7238">Glossary Styles</A> <DT><STRONG>toc</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4365">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4367">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4443">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4445">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4677">Package Options</A> + | <A HREF="glossaries-manual.html#4679">Package Options</A> + | <A HREF="glossaries-manual.html#4695">Package Options</A> + | <A HREF="glossaries-manual.html#4697">Package Options</A> + | <A HREF="glossaries-manual.html#4704">Package Options</A> + | <A HREF="glossaries-manual.html#4706">Package Options</A> + | <A HREF="glossaries-manual.html#4713">Package Options</A> + | <A HREF="glossaries-manual.html#4715">Package Options</A> + | <A HREF="glossaries-manual.html#5853">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#5855">Displaying a glossary</A> +<DT><STRONG>xindy</STRONG> +<DD><A HREF="glossaries-manual.html#3790">Sample Documents</A> + | <A HREF="glossaries-manual.html#3792">Sample Documents</A> + | <A HREF="glossaries-manual.html#3824">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#3826">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#3982">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3984">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4059">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4061">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4106">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4108">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4187">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4189">Using makeindex explicitly</A> + | <A HREF="glossaries-manual.html#4476">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4478">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5037">Package Options</A> + | <A HREF="glossaries-manual.html#5039">Package Options</A> + | <A HREF="glossaries-manual.html#5066">Package Options</A> + | <A HREF="glossaries-manual.html#5068">Package Options</A> + | <A HREF="glossaries-manual.html#5163">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5165">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5922">Xindy</A> + | <A HREF="glossaries-manual.html#5924">Xindy</A> + | <A HREF="glossaries-manual.html#6087">Glossary Groups</A> + | <A HREF="glossaries-manual.html#6089">Glossary Groups</A> </DL> <DT><STRONG><TT>\pagelistname</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2550">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#3908">Changing the Fixed Names</A> <DT><STRONG><TT>\printglossaries</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4325">Troubleshooting</A> + | <A HREF="glossaries-manual.html#4354">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5100">Defining Glossary Entries</A> <DT><STRONG><TT>\printglossary</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#4322">Troubleshooting</A> + | <A HREF="glossaries-manual.html#5097">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#7243">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7260">Glossary Styles</A> <DT><STRONG><TT>\printglossary</TT> keys</STRONG> <DD><DL COMPACT> <DT><STRONG>nonumberlist</STRONG> -<DD><A HREF="glossaries-manual.html#3820">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#5893">Displaying a glossary</A> <DT><STRONG>numberedsection</STRONG> -<DD><A HREF="glossaries-manual.html#3799">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#5872">Displaying a glossary</A> <DT><STRONG>style</STRONG> -<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> +<DD><A HREF="glossaries-manual.html#5857">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#7240">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7257">Glossary Styles</A> <DT><STRONG>title</STRONG> -<DD><A HREF="glossaries-manual.html#3769">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#5842">Displaying a glossary</A> <DT><STRONG>toctitle</STRONG> -<DD><A HREF="glossaries-manual.html#3772">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#5845">Displaying a glossary</A> <DT><STRONG>type</STRONG> -<DD><A HREF="glossaries-manual.html#3766">Displaying a glossary</A> +<DD><A HREF="glossaries-manual.html#5839">Displaying a glossary</A> </DL> <DT><STRONG><TT>relsize</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4364">Acronyms</A> -<DT><STRONG><TT>\setglossarysection</TT></STRONG> -<DD><A HREF="glossaries-manual.html#3052">Package Options</A> +<DD><A HREF="glossaries-manual.html#6729">Acronyms</A> +<DT><STRONG><TT>\seename</TT></STRONG> +<DD><A HREF="glossaries-manual.html#4528">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5791">Cross-Referencing Entries</A> +<DT><STRONG><TT>\setAlphaCompositor</TT></STRONG> +<DD><A HREF="glossaries-manual.html#6050">Locations and Number lists</A> +<DT><STRONG><TT>\setCompositor</TT></STRONG> +<DD><A HREF="glossaries-manual.html#6047">Locations and Number lists</A> +<DT><STRONG><TT>\setStyleFile</TT></STRONG> +<DD><A HREF="glossaries-manual.html#4131">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4203">Using makeindex explicitly</A> <DT><STRONG><TT>\smaller</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4361">Acronyms</A> +<DD><A HREF="glossaries-manual.html#6726">Acronyms</A> <DT><STRONG><TT>supertabular</TT></STRONG> -<DD><A HREF="glossaries-manual.html#4711">Glossary Styles</A> +<DD><A HREF="glossaries-manual.html#7084">Glossary Styles</A> <DT><STRONG><TT>\symbolname</TT></STRONG> -<DD><A HREF="glossaries-manual.html#2547">Multi-Lingual Support</A> +<DD><A HREF="glossaries-manual.html#3905">Changing the Fixed Names</A> +<DT><STRONG><TT>\textbf</TT></STRONG> +<DD><A HREF="glossaries-manual.html#5522">Links to Glossary Entries</A> +<DT><STRONG><TT>\textrm</TT></STRONG> +<DD><A HREF="glossaries-manual.html#6004">Locations and Number lists</A> +<DT><STRONG><TT>\textsc</TT></STRONG> +<DD><A HREF="glossaries-manual.html#6688">Acronyms</A> +<DT><STRONG><TT>\thepage</TT></STRONG> +<DD><A HREF="glossaries-manual.html#6031">Locations and Number lists</A> <DT><STRONG><TT>translator</TT></STRONG> -<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> +<DD><A HREF="glossaries-manual.html#3854">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#3857">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#3860">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#3872">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#3878">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#3920">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#3923">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#4314">Troubleshooting</A> +<DT><STRONG><TT>xindy</TT></STRONG> +<DD><A HREF="glossaries-manual.html#3651">Introduction</A> + | <A HREF="glossaries-manual.html#3660">Introduction</A> + | <A HREF="glossaries-manual.html#3737">Sample Documents</A> + | <A HREF="glossaries-manual.html#3749">Sample Documents</A> + | <A HREF="glossaries-manual.html#3764">Sample Documents</A> + | <A HREF="glossaries-manual.html#3770">Sample Documents</A> + | <A HREF="glossaries-manual.html#3776">Sample Documents</A> + | <A HREF="glossaries-manual.html#3779">Sample Documents</A> + | <A HREF="glossaries-manual.html#3804">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#3810">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#3816">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#3837">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#3843">Multi-Lingual Support</A> + | <A HREF="glossaries-manual.html#3926">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#3932">Changing the Fixed Names</A> + | <A HREF="glossaries-manual.html#4033">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3941">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3948">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3954">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3957">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3967">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#3986">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4001">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4010">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4020">Generating the Associated Glossary</A> + | <A HREF="glossaries-manual.html#4079">Using the makeglossaries Perl</A> + | <A HREF="glossaries-manual.html#4098">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4110">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4116">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4119">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4124">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4164">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4170">Using xindy explicitly</A> + | <A HREF="glossaries-manual.html#4299">Troubleshooting</A> + | <A HREF="glossaries-manual.html#4376">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4388">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4397">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4403">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4412">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4465">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4495">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4513">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#4607">A Quick Guide For</A> + | <A HREF="glossaries-manual.html#5027">Package Options</A> + | <A HREF="glossaries-manual.html#5041">Package Options</A> + | <A HREF="glossaries-manual.html#5047">Package Options</A> + | <A HREF="glossaries-manual.html#5053">Package Options</A> + | <A HREF="glossaries-manual.html#5070">Package Options</A> + | <A HREF="glossaries-manual.html#5109">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5117">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5123">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5142">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5155">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5307">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5347">Defining Glossary Entries</A> + | <A HREF="glossaries-manual.html#5459">Number lists</A> + | <A HREF="glossaries-manual.html#5462">Number lists</A> + | <A HREF="glossaries-manual.html#5477">Number lists</A> + | <A HREF="glossaries-manual.html#5480">Number lists</A> + | <A HREF="glossaries-manual.html#5506">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5528">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5589">Links to Glossary Entries</A> + | <A HREF="glossaries-manual.html#5827">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#5833">Displaying a glossary</A> + | <A HREF="glossaries-manual.html#5914">Xindy</A> + | <A HREF="glossaries-manual.html#5926">Xindy</A> + | <A HREF="glossaries-manual.html#5930">Xindy</A> + | <A HREF="glossaries-manual.html#5935">Xindy</A> + | <A HREF="glossaries-manual.html#5942">Xindy</A> + | <A HREF="glossaries-manual.html#5946">Xindy</A> + | <A HREF="glossaries-manual.html#5953">Xindy</A> + | <A HREF="glossaries-manual.html#5956">Xindy</A> + | <A HREF="glossaries-manual.html#5962">Language and Encodings</A> + | <A HREF="glossaries-manual.html#5965">Language and Encodings</A> + | <A HREF="glossaries-manual.html#5974">Language and Encodings</A> + | <A HREF="glossaries-manual.html#5983">Language and Encodings</A> + | <A HREF="glossaries-manual.html#5992">Language and Encodings</A> + | <A HREF="glossaries-manual.html#6010">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6016">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6034">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6066">Locations and Number lists</A> + | <A HREF="glossaries-manual.html#6107">Defining New Glossaries</A> + | <A HREF="glossaries-manual.html#7188">Glossary Styles</A> + | <A HREF="glossaries-manual.html#7304">Defining your own glossary</A> </DL> <P> @@ -4564,64 +7029,89 @@ Index</A> <P> <BR><HR><H4>Footnotes</H4> <DL> -<DT><A NAME="foot515">... -range</A><A - HREF="glossaries-manual.html#tex2html8"><SUP>1</SUP></A></DT> -<DD>This is new to version 1.01 +<DT><A NAME="foot3410">...main.</A><A + HREF="glossaries-manual.html#tex2html14"><SUP>1</SUP></A></DT> +<DD>Actually it sets <TT>\acronymtype</TT><A NAME="4747"></A> to +<TT>\glsdefaulttype</TT><A NAME="4750"></A> if the <TT>acronym</TT><A NAME="4758"></A> package option is +not used, but <TT>\glsdefaulttype</TT><A NAME="4762"></A> usually has the value +<TT>main</TT>. </DD> -<DT><A NAME="foot2320">...acronym</A><A - HREF="glossaries-manual.html#tex2html9"><SUP>2</SUP></A></DT> +<DT><A NAME="foot3411">...acronym</A><A + HREF="glossaries-manual.html#tex2html15"><SUP>2</SUP></A></DT> <DD>if the -<TT>acronym</TT><A NAME="3093"></A> option is used, otherwise the list of +<TT>acronym</TT><A NAME="4818"></A> option is used, otherwise the list of acronyms is the main glossary </DD> -<DT><A NAME="foot2340">... this.</A><A - HREF="glossaries-manual.html#tex2html10"><SUP>3</SUP></A></DT> +<DT><A NAME="foot3433">... this.</A><A + HREF="glossaries-manual.html#tex2html16"><SUP>3</SUP></A></DT> <DD>The only preamble restriction on <TT>\newglossaryentry</TT> and <TT>\newacronym</TT> was removed in version 1.13, but the restriction remains for <TT>\loadglsentries</TT>. </DD> -<DT><A NAME="foot2383">... label</A><A - HREF="glossaries-manual.html#tex2html11"><SUP>4</SUP></A></DT> +<DT><A NAME="foot3464">... specified.</A><A + HREF="glossaries-manual.html#tex2html17"><SUP>4</SUP></A></DT> +<DD>This +is because <TT>\acronymtype</TT> is set to <TT>\glsdefaulttype</TT> if +the <TT>acronym</TT><A NAME="5420"></A> package option is not used. + +</DD> +<DT><A NAME="foot3493">... label</A><A + HREF="glossaries-manual.html#tex2html19"><SUP>5</SUP></A></DT> <DD><TT>main</TT> for the main (default) glossary, <TT>\acronymtype</TT> for the list of acronyms, or the name supplied in the first mandatory argument to <TT>\newglossary</TT> for additional glossaries. </DD> -<DT><A NAME="foot2417">...smaller,</A><A - HREF="glossaries-manual.html#tex2html12"><SUP>5</SUP></A></DT> +<DT><A NAME="foot3593">... hyphen</A><A + HREF="glossaries-manual.html#tex2html21"><SUP>6</SUP></A></DT> +<DD>see +<TT>\setCompositor</TT><A NAME="6047"></A> described in +<A HREF="glossaries-manual.html#sec:newglosentry">Defining Glossary +Entries</A> + +</DD> +<DT><A NAME="foot3594">... +hyphen</A><A + HREF="glossaries-manual.html#tex2html22"><SUP>7</SUP></A></DT> +<DD>see <TT>\setAlphaCompositor</TT><A NAME="6050"></A> described in +<A HREF="glossaries-manual.html#sec:newglosentry">Defining Glossary +Entries</A> + +</DD> +<DT><A NAME="foot3541">...smaller,</A><A + HREF="glossaries-manual.html#tex2html23"><SUP>8</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="foot1949">... start.</A><A - HREF="glossaries-manual.html#tex2html15"><SUP>6</SUP></A></DT> +<DT><A NAME="foot2916">... start.</A><A + HREF="glossaries-manual.html#tex2html27"><SUP>9</SUP></A></DT> <DD>This style was supplied by Axel Menzel. </DD> -<DT><A NAME="foot2431">... +<DT><A NAME="foot3556">... link</A><A - HREF="glossaries-manual.html#tex2html16"><SUP>7</SUP></A></DT> + HREF="glossaries-manual.html#tex2html28"><SUP>10</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="foot2432">... correctly.</A><A - HREF="glossaries-manual.html#tex2html17"><SUP>8</SUP></A></DT> +<DT><A NAME="foot3557">... correctly.</A><A + HREF="glossaries-manual.html#tex2html29"><SUP>11</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="foot2433">...MakeTextUppercase</A><A - HREF="glossaries-manual.html#tex2html18"><SUP>9</SUP></A></DT> +<DT><A NAME="foot3561">...MakeTextUppercase,</A><A + HREF="glossaries-manual.html#tex2html30"><SUP>12</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 52a7a33f3c1..55746a63862 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.tex +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-manual.tex @@ -1,6 +1,8 @@ \documentclass[a4paper]{ltxdoc} \usepackage{ifthen} \usepackage{alltt} +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} \usepackage[colorlinks, bookmarks, hyperindex=false, @@ -23,7 +25,7 @@ \makeatother \RecordChanges \PageIndex -\CheckSum{5329} +\CheckSum{7758} \CodelineNumbered \newcommand*{\termdef}[1]{\emph{#1}\iterm{#1}} \newcommand*{\term}[1]{#1\iterm{#1}} @@ -61,46 +63,54 @@ \ifmakedtx{ \newcommand*{\istkey}[1]{\texttt{#1}\index{makeindex=\texttt{makeindex}>#1=\texttt{#1}|hyperpage}} +\newcommand*{\locfmt}[1]{\texttt{#1}\SpecialMainIndex{#1}} \newcommand*{\ics}[1]{\texttt{\char`\\#1}\SpecialMainIndex{#1}} \newcommand*{\appname}[1]{\texttt{#1}\index{#1=\texttt{#1}|hyperpage}} \newcommand*{\mkidxspch}{\index{makeindex=\texttt{makeindex}>special characters|hyperpage}} \newcommand*{\igloskey}[2][newglossaryentry]{\index{#1 options=\cs{#1} options>#2=\textsf{#2}|hyperpage}} \newcommand*{\gloskey}[2][newglossaryentry]{\textsf{#2}\igloskey[#1]{#2}} +\newcommand*{\pkgoptni}[1]{\textsf{#1}} \newcommand*{\ipkgopt}[2][]{% \ifthenelse{\equal{#1}{}}{% -\index{package options>#2=\textsf{#2}|hyperpage}}{% -\index{package options>#2=\textsf{#2}>#1=\textsf{#1}|hyperpage}}} +\index{package options>#2=\pkgoptni{#2}|hyperpage}}{% +\index{package options>#2=\pkgoptni{#2}>#1=\pkgoptni{#1}|hyperpage}}} \newcommand*{\pkgopt}[2][]{% \ifthenelse{\equal{#1}{}}{% -\textsf{#2}\index{package options>#2=\textsf{#2}|hyperpage}}{% -\textsf{#2=#1}\index{package options>#2=\textsf{#2}>#1=\textsf{#1}|hyperpage}}} -\newcommand*{\pkgoptval}[2]{\textsf{#1}\index{package options>#2=\textsf{#2}>#1=\textsf{#1}|hyperpage}} +\pkgoptni{#2}\index{package options>#2=\pkgoptni{#2}|hyperpage}}{% +\pkgoptni{#2=#1}\index{package options>#2=\pkgoptni{#2}>#1=\pkgoptni{#1}|hyperpage}}} +\newcommand*{\pkgoptval}[2]{\pkgoptni{#1}\index{package options>#2=\pkgoptni{#2}>#1=\pkgoptni{#1}|hyperpage}} \newcommand*{\glostyle}[1]{\textsf{#1}\index{glossary styles>#1|hyperpage}} \newcommand*{\filetype}[1]{\texttt{#1}\index{file types>#1|hyperpage}} \newcommand*{\sty}[1]{\textsf{#1}} \newcommand*{\isty}[1]{\sty{#1}\index{#1 package=\sty{#1} package|hyperpage}} +\newcommand*{\cls}[1]{\textsf{#1}} +\newcommand*{\icls}[1]{\cls{#1}\index{#1 class=\cls{#1} class|hyperpage}} \newcommand*{\envname}[1]{\textsf{#1}} } { \newcommand{\istkey}[1]{\texttt{#1}\index{makeindex key!#1}} +\newcommand{\locfmt}[1]{\texttt{#1}\index{#1@\cs{#1}}} \newcommand{\ics}[1]{\texttt{\char`\\#1}\index{#1@\cs{#1}}} \html{\newcommand{\SpecialMainIndex}[1]{\index{#1@\cs{#1}}}} \newcommand{\appname}[1]{\texttt{#1}\index{#1@\texttt{#1}}} \newcommand*{\mkidxspch}{\index{makeindex@\texttt{makeindex}!special characters|hyperpage}} \newcommand{\gloskey}[2][newglossaryentry]{\texttt{#2}\index{#1 keys@\cs{#1} keys!#2}} +\newcommand*{\pkgoptni}[1]{\texttt{#1}} \newcommand{\ipkgopt}[2][]{% \ifthenelse{\equal{#1}{}}{% \index{package options!#2}}{% \index{package options!#2!#1}}} \newcommand{\pkgopt}[2][]{% \ifthenelse{\equal{#1}{}}{% -\texttt{#2}\index{package options!#2}}{% -\texttt{#2=#1}\index{package options!#2!#1}}} -\newcommand{\pkgoptval}[2]{\texttt{#1}\index{package options!#2!#1}} +\pkgoptni{#2}\index{package options!#2}}{% +\pkgoptni{#2=#1}\index{package options!#2!#1}}} +\newcommand{\pkgoptval}[2]{\pkgoptni{#1}\index{package options!#2!#1}} \newcommand{\glostyle}[1]{\texttt{#1}\index{glossary styles!#1}} \newcommand{\filetype}[1]{\texttt{#1}\index{file types!#1}} \newcommand{\sty}[1]{\texttt{#1}} \newcommand{\isty}[1]{\sty{#1}\index{#1@\sty{#1}}} +\newcommand{\cls}[1]{\texttt{#1}} +\newcommand{\icls}[1]{\cls{#1}\index{#1@\cls{#1}}} \newcommand{\envname}[1]{\texttt{#1}} \newcommand{\toTop}{\mbox{}\par\htmlref{Top}{top}} } @@ -109,7 +119,7 @@ \MakeShortVerb{"} \DeleteShortVerb{\|} - \title{glossaries.sty v 1.16: \LaTeXe\ Package to Assist Generating Glossaries} + \title{glossaries.sty v 1.17: \LaTeXe\ Package to Assist Generating Glossaries} \author{Nicola L.C. Talbot\\[10pt] School of Computing Sciences\\ University of East Anglia\\ @@ -117,7 +127,7 @@ Norwich. Norfolk\\ NR4 7TJ. United Kingdom.\\ \url{http://theoval.cmp.uea.ac.uk/~nlct/}} - \date{27th August 2008} + \date{26th December 2008} \maketitle \tableofcontents @@ -125,31 +135,412 @@ NR4 7TJ. United Kingdom.\\ \changes{1.0}{2007 May 16}{Initial version} The \sty{glossaries} package is provided to assist generating -glossaries. It has a certain amount of flexibility, allowing the user -to customize the format of the glossary and define multiple glossaries. -It also supports acronyms and glossary styles that include -symbols (in addition to a name and description) for glossary +glossaries. It has a certain amount of flexibility, allowing the +user to customize the format of the glossary and define multiple +glossaries. 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 \isty{glossary} package which is now -obsolete. - -This documentation is structured as follows: \ifmakedtx{\autoref{sec:quick}}{\htmlref{{A Quick Guide For The Impatient}}{sec:quick}} is for -people who want a few quick pointers of how to get started, -without having to read through lengthy descriptions, -\ifmakedtx{\autoref{sec:overview}}{\htmlref{Overview}{sec:overview}} gives an overview of available commands -and their syntax\ifmakedtx{, \autoref{sec:mfirstuc}}{ and -\htmlref{Mfirstuc}{sec:mfirstuc}} describes the associated -\sty{mfirstuc} -package\ifmakedtx{, \autoref{sec:code} contains the documented -source code for those who want to know more about how the -package works and \autoref{sec:code:mfirstuc} contains the documented -code for the \sty{mfirstuc} package}{}. + +\textbf{This package replaces the \isty{glossary} package which is +now obsolete. Please see the file +\ifmakedtx{\url{glossary2glossaries.pdf}}{% +\url{glossary2glossaries.html}} for assistance in upgrading.} + +\begin{important} +The \sty{glossaries} package comes with a +\htmladdnormallink{Perl}{http://www.perl.org/about.html} script +called \appname{makeglossaries}. This provides a convenient interface +to \appname{makeindex} or \appname{xindy}. It is strongly +recommended that you use this script, but it is not +essential. If you are reluctant to install Perl, or for any +other reason you don't want to use \appname{makeglossaries}, you +can called \appname{makeindex} or \appname{xindy} explicitly. +See \ifmakedtx{\autoref{sec:makeglossaries}}{\htmlref{Generating the +Associated Glossary Files}{sec:makeglossaries}} for +further details. +\end{important} + +One of the strengths of this package is its flexibility, however +the drawback of this is the necessity of having a large manual +that can cover all the various settings. The documentation is +therefore structured as follows: +\begin{itemize} +\item \ifmakedtx{\autoref{sec:quick}}{\htmlref{{A Quick Guide For +The Impatient}}{sec:quick}} is for people who want a few quick +pointers of how to get started creating a basic glossary, without +having to read through lengthy descriptions. + +\item \ifmakedtx{\autoref{sec:overview}}{\htmlref{Overview}{sec:overview}} +gives an overview of available commands and their syntax. + +\item \ifmakedtx{\autoref{sec:mfirstuc}}{\htmlref{Mfirstuc}{sec:mfirstuc}} +describes the associated \sty{mfirstuc} package. + +\ifmakedtx{\item +\autoref{sec:code} contains the documented source code for those who +want to know more about how the package works. + +\item \autoref{sec:code:mfirstuc} contains the documented code for +the \sty{mfirstuc} package.}{} +\end{itemize} + +\noindent The remainder of this introductory section covers the +following: +\begin{itemize} +\item \ifmakedtx{\autoref{sec:samples}}{\htmlref{Sample +Documents}{sec:samples}} lists the sample documents provided +with this package. + +\item \ifmakedtx{\autoref{sec:languages}}{\htmlref{Multi-Lingual +Support}{sec:languages}} provides information for users who +wish to write in a language other than English. + +\item \ifmakedtx{\autoref{sec:makeglossaries}}{\htmlref{Generating +the Associated Glossary Files}{sec:makeglossaries}} +describes how to use a post-processor to create the sorted glossaries +for your document. + +\item \ifmakedtx{\autoref{sec:trouble}}{\htmlref{Troubleshooting}{sec:trouble}} provides some assistance in the event that you +encounter a problem. +\end{itemize} +\ifmakedtx{}{\toTop} + +\subsection{Sample Documents} +\label{sec:samples} + +The \sty{glossaries} package is provided with some sample +documents that illustrate the various functions. These should +be located in the \texttt{samples} subdirectory (folder) of the +\sty{glossaries} documentation directory. This location varies +according to your operating system and \TeX\ distribution. + +The sample documents are as follows: +\begin{description} +\item[minimalgls.tex] This document is a minimal working example. +You can test your installation using this file. To create the +complete document you will need to do the following steps: + \begin{enumerate} + \item Run \texttt{minimalgls.tex} through \LaTeX\ by either + typing +\begin{verbatim} +latex minimalgls +\end{verbatim} + in a terminal or by using the relevant button or menu item in + your text editor or front-end. This will create the required + associated files but you will not see the glossary. If you use + PDF\LaTeX\ you will also get warnings about non-existent + references. These warnings may be ignored on the first run. + + \item Run \appname{makeglossaries} on the document. This can + be done on a terminal by either typing +\begin{verbatim} +makeglossaries minimalgls +\end{verbatim} + or by typing +\begin{verbatim} +perl makeglossaries minimalgls +\end{verbatim} + If your system doesn't recognise the command \texttt{perl} then + it's likely you don't have Perl installed. In which case you + will need to use \appname{makeindex} directly. You can do this + in a terminal by typing (all on one line): +\begin{verbatim} +makeindex -s minimalgls.ist -t minimalgls.glg -o minimalgls.gls +minimalgls.glo +\end{verbatim} + (See +\ifmakedtx{\autoref{sec:makeindexapp}}{\htmlref{later}{sec:makeindexapp}} + for further details on using \appname{makeindex} explicitly.) + + Note that if you need to specify the full path and the path + contains spaces, you will need to delimit the file names with + the double-quote character. + + \item Run \texttt{minimalgls.tex} through \LaTeX\ again (as step~1) + \end{enumerate} +You should now have a complete document. The number following +each entry in the glossary is the location number. By default, this +is the page number where the entry was referenced. + +\item[sample4col.tex] This document illustrates a four column +glossary where the entries have a symbol in addition to the +name and description. To create the complete document, you need +to do: +\begin{verbatim} +latex sample4col +makeglossaries sample4col +latex sample4col +\end{verbatim} +As before, if you don't have Perl installed, you will need to +use \appname{makeindex} directly instead of using +\appname{makeglossaries}. The vertical gap between entries +is the gap created at the start of each group. This can be +suppressed by redefining \ics{glsgroupskip} after the glossary +style has been set: +\begin{verbatim} +\renewcommand*{\glsgroupskip}{} +\end{verbatim} + +\item[sampleAcr.tex] This document has some sample acronyms. It +also adds the glossary to the table of contents, so an extra +run through \LaTeX\ is required to ensure the document is up-to-date: +\begin{verbatim} +latex sampleAcr +makeglossaries sampleAcr +latex sampleAcr +latex sampleAcr +\end{verbatim} + +\item[sampleAcrDesc.tex] This is similar to the previous example, +except that the acronyms have an associated description. As with +the previous example, the glossary is added to the table of +contents, so an extra run through \LaTeX\ is required: +\begin{verbatim} +latex sampleAcrDesc +makeglossaries sampleAcrDesc +latex sampleAcrDesc +latex sampleAcrDesc +\end{verbatim} + +\item[sampleDesc.tex] This is similar to the previous example, +except that it defines the acronyms using \ics{newglossaryentry} +instead of \ics{newacronym}. As with +the previous example, the glossary is added to the table of +contents, so an extra run through \LaTeX\ is required: +\begin{verbatim} +latex sampleDesc +makeglossaries sampleDesc +latex sampleDesc +latex sampleDesc +\end{verbatim} + +\item[sampleDB.tex] This document illustrates how to load +an external files containing the glossary definitions. It also +illustrates how to define a new glossary type. This document +has the \term{number list} suppressed and uses \ics{glsaddall} to add +all the entries to the glossaries without referencing each one +explicitly. To create the document do: +\begin{verbatim} +latex sampleDB +makeglossaries sampleDB +latex sampleDB +\end{verbatim} +The glossary definitions are stored in the files +\texttt{database1.tex} and \texttt{database2.tex}. Note that if +you don't have Perl installed, you will need to use +\appname{makeindex} twice instead of using \appname{makeglossaries}: +\begin{enumerate} +\item Create the main glossary: +\begin{verbatim} +makeindex -s sampleDB.ist -t sampleDB.glg -o sampleDB.gls sampleDB.glo +\end{verbatim} +\item Create the secondary glossary: +\begin{verbatim} +makeindex -s sampleDB.ist -t sampleDB.nlg -o sampleDB.not sampleDB.ntn +\end{verbatim} +\end{enumerate} + +\item[sampleEq.tex] This document illustrates how to change the +location to something other than the page number. In this case, +the \texttt{equation} counter is used since all glossary entries +appear inside an \envname{equation} environment. To create the +document do: +\begin{verbatim} +latex sampleEq +makeglossaries sampleEq +latex sampleEq +\end{verbatim} + +\item[sampleEqPg.tex] This is similar to the previous example, +but the number lists\iterm{number list} are a mixture of page +numbers and equation numbers. This example adds the glossary to the +table of contents, so an extra \LaTeX\ run is required: +\begin{verbatim} +latex sampleEqPg +makeglossaries sampleEqPg +latex sampleEqPg +latex sampleEqPg +\end{verbatim} + +\item[sampleSec.tex] This document also illustrates how to change +the location to something other than the page number. In this case, +the \texttt{section} counter is used. This example adds the +glossary to the table of contents, so an extra \LaTeX\ run is +required: +\begin{verbatim} +latex sampleSec +makeglossaries sampleSec +latex sampleSec +latex sampleSec +\end{verbatim} + +\item[sampleNtn.tex] This document illustrates how to create +an additional glossary type. This example adds the glossary to the +table of contents, so an extra \LaTeX\ run is required: +\begin{verbatim} +latex sampleNtn +makeglossaries sampleNtn +latex sampleNtn +latex sampleNtn +\end{verbatim} +Note that if you don't have Perl installed, you will need to use +\appname{makeindex} twice instead of using \appname{makeglossaries}: +\begin{enumerate} +\item Create the main glossary: +\begin{verbatim} +makeindex -s sampleNtn.ist -t sampleNtn.glg -o sampleNtn.gls sampleNtn.glo +\end{verbatim} +\item Create the secondary glossary: +\begin{verbatim} +makeindex -s sampleNtn.ist -t sampleNtn.nlg -o sampleNtn.not sampleNtn.ntn +\end{verbatim} +\end{enumerate} + +\item[sample.tex] This document illustrates some of the basics, +including how to create child entries that use the same name as the +parent entry. This example adds the glossary to the table of +contents, so an extra \LaTeX\ run is required: +\begin{verbatim} +latex sample +makeglossaries sample +latex sample +latex sample +\end{verbatim} +You can see the difference between word and letter ordering +if you substitute \pkgopt[word]{order} with +\pkgopt[letter]{order}. (Note that this will only have an +effect if you use \appname{makeglossaries}. If you use +\appname{makeindex} explicitly, you will need to use the +\texttt{-l} switch to indicate letter ordering.) + +\item[sampletree.tex] This document illustrates a hierarchical +glossary structure where child entries have different names +to their corresponding parent entry. To create the document do: +\begin{verbatim} +latex sampletree +makeglossaries sampletree +latex sampletree +\end{verbatim} + +\item[samplexdy.tex] This document illustrates how to use the +\sty{glossaries} package with \appname{xindy} instead of +\appname{makeindex}. The document uses UTF8 encoding (with the +\isty{inputenc} package). The encoding is picked up by +\appname{makeglossaries}. By default, this document will create +a \appname{xindy} style file called \texttt{samplexdy.xdy}, but +if you uncomment the lines +\begin{verbatim} +\setStyleFile{samplexdy-mc} +\noist +\GlsSetXdyLanguage{} +\end{verbatim} +it will set the style file to \texttt{samplexdy-mc.xdy} instead. +This provides an additional letter group for entries starting +with \dq{Mc} or \dq{Mac}. If you use \appname{makeglossaries}, +you don't need to supply any additional information. If you +don't use \appname{makeglossaries}, you will need to specify the +required information. Note that if you set the style file to +\texttt{samplexdy-mc.xdy} you must also specify \ics{noist}, +otherwise the \isty{glossaries} package will overwrite +\texttt{samplexdy-mc.xdy} and you will lose the \dq{Mc} letter group. + +To create the document do: +\begin{verbatim} +latex samplexdy +makeglossaries samplexdy +latex samplexdy +\end{verbatim} +If you don't have Perl installed, you will have to call +\appname{xindy} explicitly instead of using \appname{makeglossaries}. +If you are using the default style file \texttt{samplexdy.xdy}, then +do (no line breaks): +\begin{verbatim} +xindy -L english -C utf8 -I xindy -M samplexdy -t samplexdy.glg +-o samplexdy.gls samplexdy.glo +\end{verbatim} +otherwise, if you are using \texttt{samplexdy-mc.xdy}, then do +(no line breaks): +\begin{verbatim} +xindy -I xindy -M samplexdy-mc -t samplexdy.glg -o samplexdy.gls +samplexdy.glo +\end{verbatim} + +\item[sampleutf8.tex] This is another example that uses +\appname{xindy}. Unlike \appname{makeindex}, \appname{xindy} can +cope with accented or non-Latin characters. This document uses +UTF8 encoding. To create the document do: +\begin{verbatim} +latex sampleutf8 +makeglossaries sampleutf8 +latex sampleutf8 +\end{verbatim} +If you don't have Perl installed, you will have to call +\appname{xindy} explicitly instead of using \appname{makeglossaries} +(no line breaks): +\begin{verbatim} +xindy -L english -C utf8 -I xindy -M sampleutf8 -t sampleutf8.glg +-o sampleutf8.gls sampleutf8.glo +\end{verbatim} + +If you remove the \pkgopt{xindy} option and do: +\begin{verbatim} +latex sampleutf8 +makeglossaries sampleutf8 +latex sampleutf8 +\end{verbatim} +you will see that the entries that start with a non-Latin character +now appear in the symbols group, and the word \dq{manœuvre} is now +after \dq{manor} instead of before it. If you are unable to use +\appname{makeglossaries}, the call to \appname{makeindex} is as +follows (no line breaks): +\begin{verbatim} +makeindex -s sampleutf8.ist -t sampleutf8.glg -o sampleutf8.gls +sampleutf8.glo +\end{verbatim} + +\end{description} \ifmakedtx{}{\toTop} \subsection{Multi-Lingual Support} \label{sec:languages} +As from version 1.17, the \sty{glossaries} package can now be +used with \appname{xindy} as well as \appname{makeindex}. If you +are writing in a language that uses accented characters or +non-Latin characters it is recommended that you use \appname{xindy} +as \appname{makeindex} is hard-coded for Latin languages. This +means that you are not restricted to the A, \ldots, Z letter groups. +If you want to use \appname{xindy}, remember to use the +\pkgopt{xindy} package option. For example: +\begin{verbatim} +\documentclass[frenchb]{article} +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +\usepackage{babel} +\usepackage[xindy]{glossaries} +\end{verbatim} + +\begin{important} +If you use an accented or non-Latin character at the start of +an entry name, you must place it in a group, or it will cause +a problem for commands that convert the first letter to uppercase +(e.g.\ \ics{Gls}) due to expansion issues. For example: +\begin{verbatim} +\newglossaryentry{elite}{name={{é}lite}, +description={select group or class}} +\end{verbatim} +\end{important} + +If you use the \isty{inputenc} package, \appname{makeglossaries} +will pick up the encoding from the auxiliary file. If you use +\appname{xindy} explicitly instead of via \appname{makeglossaries}, +you may need to specify the encoding using the \texttt{-C} +option. Read the \appname{xindy} manual for further details. + +\subsubsection{Changing the Fixed Names} +\label{sec:fixednames} + As from version 1.08, the \sty{glossaries} package now has limited multi-lingual support, thanks to all the people who have sent me the relevant translations either via email or via @@ -166,6 +557,14 @@ text is not translated, you may need to explicitly load the \usepackage[spanish]{translator} \usepackage{glossaries} \end{verbatim} +Alternatively, specify the language as a class option rather +than a package option. For example: +\begin{verbatim} +\documentclass[spanish]{report} + +\usepackage{babel} +\usepackage{glossaries} +\end{verbatim} If you want to use \isty{ngerman} or \isty{german} instead of \isty{babel}, you will need to include the \isty{translator} package @@ -177,10 +576,12 @@ to provide the translations. For example: \usepackage{glossaries} \end{verbatim} -The following languages are currently supported: +The following languages are currently supported by the +\isty{glossaries} package: \begin{center} \begin{tabular}{lc} \bfseries Language & \bfseries As from version\\ +Brazilian Portuguese & 1.17\\ Danish & 1.08\\ Dutch & 1.08\\ English & 1.08\\ @@ -207,15 +608,15 @@ glossaries package are listed in \tableref{tab:predefinednames}. \ics{acronymname} & \texttt{Acronyms} & Title of the list of acronyms (when used with package option \pkgopt{acronym}).\\ \ics{entryname} & \texttt{Notation (glossaries)} & -Header for first column in glossary (for 2, 3 or 4 column glossaries +Header for first column in the glossary (for 2, 3 or 4 column glossaries that support headers).\\ \ics{descriptionname} & \texttt{Description (glossaries)} & -Header for second column in glossary (for 2, 3 or 4 column glossaries +Header for second column in the glossary (for 2, 3 or 4 column glossaries that support headers).\\ \ics{symbolname} & \texttt{Symbol (glossaries)} & Header for symbol -column in glossary for glossary styles that support this option.\\ +column in the glossary for glossary styles that support this option.\\ \ics{pagelistname} & \texttt{Page List (glossaries)} & -Header for page list column in glossary for glossaries that support +Header for page list column in the glossary for glossaries that support this option.\\ \ics{glssymbolsgroupname} & \texttt{Symbols (glossaries)} & Header for symbols section of the glossary for glossary styles that @@ -243,55 +644,281 @@ in your document preamble: \deftranslation[to=Irish]{Symbol (glossaries)}{Siombail} \end{verbatim} +Note that \appname{xindy} provides much better multi-lingual +support than \appname{makeindex}, so it's recommended that you +use \appname{xindy} if you have glossary entries that contain +accented characters or non-Roman letters. See +\ifmakedtx{\autoref{sec:xindy}}{\htmladdnormallink{Xindy}{sec:xindy}} +for further details.\ifmakedtx{}{\toTop} + \subsection{Generating the Associated Glossary Files} \label{sec:makeglossaries} +In order to generate a sorted glossary with compact location lists, +it is necessary to use an external indexing application as an +intermediate step. It is this application that creates the file +containing the code that typesets the glossary. If this step +is omitted, the glossaries will not appear in your document. The +two indexing applications that are most commonly used with +\LaTeX\ are \appname{makeindex} and \appname{xindy}. As +from version 1.17, the \sty{glossaries} package can be used +with either of these applications. Previous versions were designed +to be used with \appname{makeindex} only. Note that +\appname{xindy} has much better multi-lingual support than +\appname{makeindex}, so \appname{xindy} is recommended if you're +not writing in English. Commands that only have an +effect when \appname{xindy} is used are described +\ifmakedtx{in \autoref{sec:xindy}}{\htmlref{later}{sec:xindy}}. + + The \sty{glossaries} package comes with the Perl script -\appname{makeglossaries} which will run \appname{makeindex} on -all the glossary files using a customized \appname{makeindex} -\filetype{.ist} style file (which is created by \ics{makeglossaries}). -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 -\texttt{myfile.tex}, do: +\appname{makeglossaries} which will run \appname{makeindex} or +\appname{xindy} on all the glossary files using a customized style +file (which is created by \ics{makeglossaries}). See +\ifmakedtx{\autoref{sec:makeglossariesapp}}{\htmlref{Using the +makeglossaries Perl script}{sec:makeglossariesapp}} for further +details. Perl is stable, cross-platform, open source software that +is used by a number of \TeX-related applications. Further +information is available at \url{http://www.perl.org/about.html}. +However, whilst it is strongly recommended that you use the +\appname{makeglossaries} script, it is possible to use the +\sty{glossaries} package without having Perl installed. In which +case, if you have used the \pkgopt{xindy} package option, you will +need to use \appname{xindy} (see +\ifmakedtx{\autoref{sec:xindyapp}}{\htmlref{Using xindy +explicitly}{sec:xindyapp}}), otherwise you will need to use +\appname{makeindex} (see +\ifmakedtx{\autoref{sec:makeindexapp}}{\htmlref{Using makeindex +explicitly}{sec:makeindexapp}}). Note that some commands and +package options have no effect if you don't use +\appname{makeglossaries}. These are listed in +Table~\ref{tab:makeglossariesCmds}. + +Note that if any of your entries use an entry +that is not referenced outside the glossary, you will need to +do an additional \appname{makeglossaries}, \appname{makeindex} +or \appname{xindy} run, as appropriate. For example, +suppose you have defined the following entries: \begin{verbatim} -latex myfile -makeglossaries myfile -latex myfile +\newglossaryentry{citrusfruit}{name={citrus fruit}, +description={fruit of any citrus tree. (See also +\gls{orange})}} + +\newglossaryentry{orange}{name={orange}, +description={an orange coloured fruit.}} +\end{verbatim} +and suppose you have \verb|\gls{citrusfruit}| in your document +but don't reference the \texttt{orange} entry, then the +\texttt{orange} entry won't appear in your glossary until +you first create the glossary and then do another run +of \appname{makeglossaries}, \appname{makeindex} or \appname{xindy}. +For example, if the document is called \texttt{myDoc.tex}, then +you must do: +\begin{verbatim} +latex myDoc +makeglossaries myDoc +latex myDoc +makeglossaries myDoc +latex myDoc +\end{verbatim} + +Likewise, an additional \appname{makeglossaries} and \LaTeX\ run +may be required if the document pages shift with re-runs. For +example, if the page numbering is not reset after the table of +contents, the insertion of the table of contents on the second +\LaTeX\ run may push glossary entries across page boundaries, which +means that the number lists\iterm{number list} in the glossary may +need updating. + +The examples in this document assume that you are accessing +\appname{makeglossaries}, \appname{xindy} or \appname{makeindex} via +a terminal. Windows users can use the MSDOS Prompt which +is usually accessed via the +\textsf{Start}\ifmakedtx{$\to$}{-\textgreater}\textsf{All Programs} +menu or +\textsf{Start}\ifmakedtx{$\to$}{-\textgreater}\textsf{All Programs}% +\ifmakedtx{$\to$}{-\textgreater}\textsf{Accessories} +menu. Alternatively, your text editor may have the +facility to create a function that will call the +required application. See your editor's user manual for further +details. + +If any problems occur, remember to check the transcript files +(e.g.\ \filetype{.glg} or \filetype{.alg}) for messages. + +\begin{table}[htbp] +\caption{Commands and package options that have no effect when +using \texttt{xindy} or \texttt{makeindex} explicity} +\label{tab:makeglossariesCmds} +\vskip\baselineskip +\begin{tabular}{@{}lll@{}} +\bfseries Command or Package Option & \appname{makeindex} & +\appname{xindy}\\ +\pkgopt[letter]{order} & use \texttt{-l} & + use \texttt{-M ord/letorder}\\ +\pkgopt[word]{order} & default & default\\ +\pkgopt{xindy}=\{\pkgoptni{language=}\meta{lang}\pkgoptni{,codename=}\meta{code}\} & +N/A & use \texttt{-L} \meta{lang} \texttt{-C} \meta{code}\\ +\ics{GlsSetXdyLanguage}\marg{lang} & N/A & +use \texttt{-L} \meta{lang}\\ +\ics{GlsSetXdyCodePage}\marg{code} & N/A & +use \texttt{-C} \meta{code} +\end{tabular} +\par +\end{table} +\ifmakedtx{}{\toTop} + +\subsubsection{Using the makeglossaries Perl Script} +\label{sec:makeglossariesapp} + +The \appname{makeglossaries} script picks up the relevant +information from the auxiliary (\filetype{.aux}) file and +will either call \appname{xindy} or \appname{makeindex}, +depending on whether the indexing style file ends with +\filetype{.xdy} or \filetype{.ist}. Therefore, you only need to +pass the document's name without the extension to +\appname{makeglossaries}. +For example, if your document is called \texttt{myDoc.tex}, +type the following in your terminal: +\begin{verbatim} +latex myDoc +makeglossaries myDoc +latex myDoc \end{verbatim} You may need to explicitly load \appname{makeglossaries} into Perl: \begin{verbatim} -perl makeglossaries myfile +perl makeglossaries myDoc \end{verbatim} There is a batch file called \texttt{makeglossaries.bat} which does this for Windows users, but you must have Perl installed to be able to use it. +\ifmakedtx{}{\toTop} + +\subsubsection{Using xindy explicitly} +\label{sec:xindyapp} + +If you want to use \appname{xindy} to process the glossary +files, you must make sure you have used the +\pkgopt{xindy} package option: +\begin{verbatim} +\usepackage[xindy]{glossaries} +\end{verbatim} +This is required regardless of whether you use \appname{xindy} +explicitly or via \appname{makeglossaries}. This causes the glossary +entries to be written in raw \appname{xindy} format, so you need to +use \texttt{-I xindy} \emph{not} \texttt{-I tex}. + +To run \appname{xindy} type the following in your terminal +(all on one line):\\[10pt] +\begin{ttfamily} +xindy -L \textrm{\meta{language}} -C \textrm{\meta{encoding}} -I xindy +-M \textrm{\meta{style}} -t \textrm{\meta{base}}.glg\newline +-o \textrm{\meta{base}}.gls \textrm{\meta{base}}.glo +\end{ttfamily} +\\[10pt] +where \meta{language} is required language name, \meta{encoding} is +the encoding, \meta{base} is the name of the document without +the \filetype{.tex} extension and \meta{style} is the name of the +\appname{xindy} style file without the \filetype{.xdy} extension. The +default name for this style file is \meta{base}\filetype{.xdy} but +can be changed via \ics{setStyleFile}\marg{style}. You may need to +specify the full path name. If any of the file names contain spaces, +you must delimit them using double-quotes. + +For example, if your document is called \texttt{myDoc.tex} and +you are using UTF8 encoding in English, then type the +following in your terminal: +\begin{verbatim} +xindy -L english -C utf8 -I xindy -M myDoc -t myDoc.glg -o myDoc.gls myDoc.glo +\end{verbatim} -If you don't have Perl installed, you will have to run -\appname{makeindex} for each glossary type you have defined. -For example, if you have used the \pkgopt{acronym} 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 \texttt{myfile.tex}): +Note that this just creates the main glossary. You need to do +the same for each of the other glossaries (including the +list of acronyms if you have used the \pkgopt{acronym} +package option), substituting \filetype{.glg}, \filetype{.gls} +and \filetype{.glo} with the relevant extensions. For example, +if you have used the \pkgopt{acronym} package option, then +you would need to do: \begin{verbatim} -makeindex -s myfile.ist -t myfile.glg -o myfile.gls myfile.glo -makeindex -s myfile.ist -t myfile.alg -o myfile.acr myfile.acn +xindy -L english -C utf8 -I xindy -M myDoc -t myDoc.alg -o myDoc.acr myDoc.acn \end{verbatim} -This requires remembering all extensions for each of the glossaries -defined in your document, so where possible you should use -\appname{makeglossaries} instead to reduce the possibility of error. -Don't pass all the glossary files in a single call to -\appname{makeindex} or it will merge all your glossaries into a -single glossary. +For additional glossaries, the extensions are those supplied +when you created the glossary with \ics{newglossary}. -If any problems occur, remember to check the transcript files -(e.g.\ \filetype{.glg} or \filetype{.alg}) for messages.\ifmakedtx{}{\toTop} +Note that if you use \appname{makeglossaries} instead, you can +replace all those calls to \appname{xindy} with just one call +to \appname{makeglossaries}: +\begin{verbatim} +makeglossaries myDoc +\end{verbatim} +Note also that some commands and package options have no effect if +you use \appname{xindy} explicitly instead of using +\appname{makeglossaries}. These are listed in +Table~\ref{tab:makeglossariesCmds}. +\ifmakedtx{}{\toTop} + +\subsubsection{Using makeindex explicitly} +\label{sec:makeindexapp} + +If you want to use \appname{makeindex} explicitly, you must +make sure that you haven't used the \pkgopt{xindy} package +option or the glossary entries will be written in the wrong +format. To run \appname{makeindex}, type the following in +your terminal:\\[10pt] +\begin{ttfamily} +makeindex -s \textrm{\meta{style}}.ist -t \textrm{\meta{base}}.glg +-o \textrm{\meta{base}}.gls \textrm{\meta{base}}.glo +\end{ttfamily}\\[10pt] +where \meta{base} is the name of your document without the +\filetype{.tex} extension and \meta{style}\filetype{.ist} is the +name of the \appname{makeindex} style file. By default, this is +\meta{base}\filetype{.ist}, but may be changed via +\ics{setStyleFile}\marg{style}. Note that there are other options, +such as \texttt{-l} (letter ordering). See the \appname{makeindex} +manual for further details. + +For example, if your document is called \texttt{myDoc.tex}, then +type the following at the terminal: +\begin{verbatim} +makeindex -s myDoc.ist -t myDoc.glg -o myDoc.gls myDoc.glo +\end{verbatim} +Note that this only creates the main glossary. If you have +additional glossaries (for example, if you have used the +\pkgopt{acronym} package option) then you must call +\appname{makeindex} for each glossary, substituting +\filetype{.glg}, \filetype{.gls} and \filetype{.glo} with the +relevant extensions. For example, if you have used the +\pkgopt{acronym} package option, then you need to type the +following in your terminal: +\begin{verbatim} +makeindex -s myDoc.ist -t myDoc.alg -o myDoc.acr myDoc.acn +\end{verbatim} +For additional glossaries, the extensions are those supplied +when you created the glossary with \ics{newglossary}. + +Note that if you use \appname{makeglossaries} instead, you can +replace all those calls to \appname{makeindex} with just one call +to \appname{makeglossaries}: +\begin{verbatim} +makeglossaries myDoc +\end{verbatim} +Note also that some commands and package options have no effect if +you use \appname{makeindex} explicitly instead of using +\appname{makeglossaries}. These are listed in +Table~\ref{tab:makeglossariesCmds}. +\ifmakedtx{}{\toTop} \subsection{Troubleshooting} +\label{sec:trouble} The \sty{glossaries} package comes with a minimal file called \texttt{minimalgls.tex} which can be used for testing. This -should be located in \texttt{texmf/doc/latex/glossaries/samples/}. +should be located in the \texttt{samples} subdirectory (folder) +of the \sty{glossaries} documentation directory. The location +varies according to your operating system and \TeX\ installation. +For example, on my Linux partition it can be found in +\texttt{/usr/local/texlive/2008/texmf-dist/doc/latex/glossaries/}. Further information on debugging \LaTeX\ code is available at \url{http://theoval.cmp.uea.ac.uk/~nlct/latex/minexample/}. @@ -337,8 +964,11 @@ but use the surrounding font for subsequent use, you can do: \item I don't have Perl installed, do I have to use \appname{makeglossaries}? -Read \ifmakedtx{\autoref{sec:makeglossaries}}{\htmlref{the previous -section}{sec:makeglossaries}}. +Read \ifmakedtx{\autoref{sec:xindyapp}}{\htmlref{Using +xindy explicitly}{sec:xindyapp}} or +\ifmakedtx{\autoref{sec:makeindexapp}}{\htmlref{Using +makeindex explicitly}{sec:makeindexapp}}, depending on +whether you want to use \appname{xindy} or \appname{makeindex}. \item I'm used to using the \sty{glossary} package: are there any @@ -354,9 +984,10 @@ same location as this document. translated. The \sty{glossaries} package currently only supports the following -languages: Danish, Dutch, English, French, German, Irish, Italian, -Hungarian, Polish and Spanish. If you want to add another language, -send me the translations, and I'll add them to the next version. +languages: Brazilian Portuguese, Danish, Dutch, English, French, +German, Irish, Italian, Hungarian, Polish and Spanish. If you want +to add another language, send me the translations, and I'll add them +to the next version. If you are using one of the above languages, but the text hasn't been translated, try adding the \isty{translator} package with the @@ -367,9 +998,9 @@ package). For example: \usepackage[ngerman]{translator} \usepackage{glossaries} \end{verbatim} -Alternatively, you may be able to add the language as a global option -to the class file. Check the \sty{translator} package documentation for -further details. +Alternatively, you can add the language as a global option +to the class file. Check the \sty{translator} package documentation +for further details. \item My glossaries haven't appeared. @@ -380,15 +1011,26 @@ Remember to do the following: \item Use either \ics{printglossary} for each glossary that has been defined or \ics{printglossaries}. -\item Use \ics{gls}, \ics{Gls}, \ics{GLS}, \ics{glspl}, \ics{Glspl}, -\ics{GLSpl}, \ics{glslink}, \ics{glsadd} or \ics{glsaddall} in the -document. +\item Use the commands listed in +\ifmakedtx{\autoref{sec:glslink}}{\htmlref{Links to Glossary +Entries}{sec:glslink}}, +\ifmakedtx{\autoref{sec:glsadd}}{\htmlref{Adding an Entry to the +Glossary Without Generating Text}{sec:glsadd}} or +\ifmakedtx{\autoref{sec:glssee}}{\htmlref{Cross-Referencing +Entries}{sec:glssee}} for each entry +that you want to appear in the glossary. \item Run \LaTeX\ on your document, then run \appname{makeglossaries}, 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. +run. If any of your entries cross-reference an entry that's not +referenced in the main body of the document, you will need to +run \appname{makeglossaries} after the second \LaTeX\ run, followed +by another \LaTeX\ run. \end{itemize} + +Check the log files (\filetype{.log}, \filetype{.glg} etc) for any +warnings. \end{enumerate} \ifmakedtx{}{\toTop} @@ -398,7 +1040,11 @@ run. This section is for people who want a few quick pointers of how to get started. However it is recommended that you read \ifmakedtx{\autoref{sec:overview}}{\htmlref{the overview section}{sec:overview}} -for additional commands and advice not listed here. +for additional commands and advice not listed here. There are +also some sample files to help you get started, listed in +\ifmakedtx{\autoref{sec:samples}}{\htmlref{Sample +Documents}{sec:samples}}. + \begin{enumerate} \item Load \sty{glossaries} \emph{after} \isty{hyperref}: @@ -415,7 +1061,6 @@ Similarly for the \isty{html} package: \item Always use \ics{makeglossaries} if you want the glossary entries to be written to the glossary file: \begin{verbatim} -\documentclass{article} \usepackage{glossaries} \makeglossaries \end{verbatim} @@ -440,35 +1085,54 @@ latex myfile makeglossaries myfile latex myfile \end{verbatim} -(You may need to run \LaTeX\ again if you have used the \pkgopt{toc} -package option.) +(You need to run \LaTeX\ again if you have used the \pkgopt{toc} +package option. You may also need an extra \appname{makeglossaries} +run and another \LaTeX\ run if an entry is only referenced in the +glossary, or if including the glossary has caused the +number lists\iterm{number list} to change.) + If you use Windows, there is a batch file called \texttt{makeglossaries.bat} which you can use, but you will -still need Perl installed. +still need Perl installed. Alternatively, you can call +\appname{makeindex} directly. See +\ifmakedtx{\autoref{sec:makeglossaries}}{\htmlref{Generating the +Associated Glossary Files}{sec:makeglossaries}} for +further details. + +\item If you want to use \appname{xindy} instead of +\appname{makeindex}, you must specify it in the package option: +\begin{verbatim} +\usepackage[xindy]{glossaries} +\end{verbatim} +See +\ifmakedtx{\autoref{sec:makeglossaries}}{\htmlref{Generating the +Associated Glossary Files}{sec:makeglossaries}} for +further details. \item New glossaries can be defined using:\par \ics{newglossary}\oarg{log-ext}% \marg{label}\marg{in-ext}\marg{out-ext}% \marg{title}\par where \meta{label} is an identifying label, \meta{in-ext} is the extension of the file to be created -by \appname{makeindex} (called by \appname{makeglossaries}), +by \appname{makeindex} or \appname{xindy} (called by +\appname{makeglossaries}), \meta{out-ext} is the extension of the file to be read by -\appname{makeindex} and \meta{title} is the title for this +\appname{makeindex} or \appname{xindy} and \meta{title} is the title for this new glossary. The first optional argument \meta{log-ext} specifies -the extension of the \appname{makeindex} transcript file. Example: +the extension of the \appname{makeindex} or \appname{xindy} +transcript file. Example: \begin{verbatim} \newglossary[nlg]{notation}{not}{ntn}{Notation} \end{verbatim} This glossary's label is \texttt{notation} and its title will be Notation. If you use \appname{makeglossaries}, the -\appname{makeindex} transcript will be written to a file with the +\appname{makeindex} or \appname{xindy} transcript will be written to a file with the extension \filetype{.nlg}. If \meta{log-ext} is omitted, the extension \filetype{.glg} will be used. \item Any new glossaries must be defined before -\cs{makeglossaries} +\ics{makeglossaries}: \begin{verbatim} -\documentclass{article} \usepackage{glossaries} \newglossary{notation}{not}{ntn}{Notation} \makeglossaries @@ -483,12 +1147,12 @@ will automatically create a new glossary type labelled \end{verbatim} \item If your pages have a hyphen compositor (i.e.\ your page -numbers appear in the form 2-1), redefine \ics{glscompositor} +numbers appear in the form 2-1), use \ics{glsSetCompositor} \emph{before} \ics{makeglossaries}: \begin{verbatim} \documentclass{article} \usepackage{glossaries} -\renewcommand{\glscompositor}{-} +\glsSetCompositor{-} \makeglossaries \end{verbatim} @@ -497,6 +1161,10 @@ numbers appear in the form 2-1), redefine \ics{glscompositor} \begin{verbatim} \usepackage[toc]{glossaries} \end{verbatim} +This will require an extra \LaTeX\ run. Note that if the table +of contents affects the subsequent page numbering (i.e.\ the +page numbers are not reset after the table of contents) then you +may need to rerun \appname{makeglossaries} and \LaTeX. \item Define a new entry with:\par \ics{newglossaryentry}\marg{label}\marg{key-val list}\par @@ -511,20 +1179,96 @@ In this example, I have given the entry the label \texttt{perl}. Whenever I want to use this entry, that is the label I need to use to identify it. -\item If the entry name starts with an accented letter, you will -need to group the first letter (otherwise it will cause a -problem for \ics{Gls} and \ics{Glspl}): +\item To define a sub-entry, use the \gloskey{parent} key. For +example: +\begin{verbatim} +\newglossaryentry{fruit}{name={fruit}, % parent entry +description={tree product that contains seeds}} + +\newglossaryentry{apple}{name={apple}, % sub-entry +description={firm, round fruit}, +parent=fruit} +\end{verbatim} + +\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} +\end{verbatim} + +Note that if you use \appname{xindy} instead of \appname{makeindex}, +characters such as a backslash are ignored, so if you have used +the \pkgopt{xindy} package option, you can just do: +\begin{verbatim} +\newglossaryentry{tex}{name={\TeX}, +description={A typesetting language}, +} +\end{verbatim} + +\item Sub-entries may have the same name as the parent entry: +\begin{verbatim} +\newglossaryentry{glossary}{name=glossary, % parent entry +description={\nopostdesc}, +plural={glossaries}} + +\newglossaryentry{glossarylist}{% first child entry +description={1) list of technical words}, +sort={1}, +parent={glossary}} + +\newglossaryentry{glossarycol}{% second child entry +description={2) collection of glosses}, +sort={2}, +parent={glossary}} +\end{verbatim} +Note that in this instance the \gloskey{name} key is not +required for the child entries, but the \gloskey{sort} key is +needed to sort the sub-entries. The parent entry has no +description, so the description terminator is suppressed using +\ics{nopostdesc}. + +\item If the entry name starts with an accented letter or +non-Latin character, you will need to group the first letter +(otherwise it will cause a problem for commands like \ics{Gls} and +\ics{Glspl}): \begin{verbatim} \newglossaryentry{elite}{name={{\'e}lite}, +sort=elite, description={select group or class}} \end{verbatim} Likewise with commands such as \cs{ae} and \cs{oe}: \begin{verbatim} \newglossaryentry{oesophagus}{% name={{\oe}sophagus}, +sort=oesophagus, description={canal from mouth to stomach}} \end{verbatim} +\item If you use \appname{xindy}, you can specify the accented +or non-Latin character directly (in combination with the +\isty{inputenc} and \isty{fontenc} packages) but you still +need to group the first letter (otherwise it will cause a +problem for commands like \ics{Gls} and \ics{Glspl} due to +expansion issues): +\begin{verbatim} +\newglossaryentry{elite}{name={{é}lite}, +description={select group or class}} +\end{verbatim} +Note that in this case the \gloskey{sort} key is not required +as \appname{xindy} knows how to sort the letter \'e. + \item If you have multiple glossaries, use the \gloskey{type} key to specify in which glossary the entry belongs. For example: \begin{verbatim} @@ -546,6 +1290,27 @@ description={A list of individual pages or page ranges (e.g.\ 1,2,4,7--9)}} \end{verbatim} +\item You can cross-reference an entry using the +\gloskey{see} key when you define it. For example, suppose +you have defined an entry whose label is \texttt{taylorstheorem}, +then you can cross-reference it: +\begin{verbatim} +\newglossaryentry{maclaurinseries}{name={Maclaurin series}, +description={Series expansion}, +see={taylorstheorem}} +\end{verbatim} +Alternatively, you can use \ics{glssee} after you have defined +the entry: +\begin{verbatim} +\glssee{maclaurinseries}{taylorstheorem} +\end{verbatim} +(The final argument may be a comma-separated list of labels.) +The \dq{see} tag may be overridden for a given entry: +\begin{verbatim} +\glssee[see also]{maclaurinseries}{taylorstheorem} +\end{verbatim} +or it can be changed for all entries by redefining \ics{seename}. + \item Plural forms are assumed to be the singular form with an \dq{s} appended, unless otherwise specified. To specify an irregular plural, use the \gloskey{plural} key. For example: @@ -610,11 +1375,11 @@ in a medium sans-serif font do: \begin{verbatim} \renewcommand{\glsnamefont}[1]{\textsf{\mdseries #1}} \end{verbatim} -Note that the list-like glossary styles defined in the -\isty{glossary-list} package place the entry name in +Note that the list-like glossary styles place the entry name in the optional argument to \ics{item}, so they will -appear in bold, unless you redefine \ics{glsnamefont} to counteract the -bold font. +appear in bold, unless you redefine \ics{glsnamefont} to counteract +the bold font. Similarly, the tree-like styles display the +entry name in bold. \item In the document use \ics{gls}\marg{label} to use a predefined term (this will also enter the term into @@ -671,9 +1436,10 @@ form \cs{text}\meta{xx}, as well as \ics{hyperemph} The primary definition of \glspl[format=hyperbf]{singmtx}. \end{verbatim} -\item Don't use declarations in \gloskey[glslink]{format} as this can -cause unpredictable results, as there is no guarantee that the effect -will be localised to the required text. +\item Don't use declarations in \gloskey[glslink]{format} (e.g.\ +\texttt{format=bfseries}) as this can cause unpredictable results, +since there is no guarantee that the effect will be localised to the +required text. \item Entries can be added to the glossary without producing any text using \ics{glsadd}\marg{label} or @@ -688,7 +1454,7 @@ any text where the command occurs. \item A number range can be entered using \verb|format=(| and \verb"format=)" to mark the beginning and ending of the -range\footnote{This is new to version 1.01}. For example: +range. For example: \begin{verbatim} \glsadd[format=(]{singmtx} This is a very long section all about \glspl{singmtx}. @@ -698,7 +1464,8 @@ range\footnote{This is new to version 1.01}. For example: \glsadd[format=)]{singmtx} \end{verbatim} This is equivalent to \appname{makeindex}'s \verb"|(" and \verb"|)" -formats. +formats or \appname{xindy}'s \texttt{:open-range} and +\texttt{:close-range} tags. \item You can combine the range markers with a formatting command (again without the preceding backslash). For example: @@ -716,26 +1483,8 @@ formats. 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}). - -\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} -\end{verbatim} +or \ics{gls} and related commands or via \ics{glsadd} +or \ics{glsaddall} or via \ics{glssee}). \item You don't need to escape \appname{makeindex}'s special characters: \begin{verbatim} @@ -756,17 +1505,9 @@ For example: description={A metric measurement of length}, symbol={m}} \end{verbatim} -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}, \glostyle{super4colheaderborder}. -\glostyle{altsuper4col}, \glostyle{altsuper4colheader}, -\glostyle{altsuper4colborder} and \glostyle{altsuper4colheaderborder}. -All the other styles supplied by this package ignore the associated -symbol. +See \ifmakedtx{\autoref{sec:styles}}{\htmlref{Glossary +Styles}{sec:styles}} for a list of predefined glossary +styles. \item Glossary styles can be set using the \pkgopt{style} package option. For example: @@ -778,7 +1519,9 @@ or using \ics{glossarystyle}\marg{style}. For example: \glossarystyle{altlist} \end{verbatim} The predefined glossary styles provided by the \sty{glossaries} -bundle are listed in \ifmakedtx{\autoref{sec:styles}}{\htmlref{{Glossary Styles}}{sec:styles}}. +bundle are listed in \ifmakedtx{\autoref{sec:styles}}{\htmlref{{Glossary +Styles}}{sec:styles}}. + \item The list of numbers associated with each glossary entry can be suppressed using the package option \pkgopt{nonumberlist}: @@ -786,7 +1529,7 @@ can be suppressed using the package option \pkgopt{nonumberlist}: \usepackage[nonumberlist]{glossaries} \end{verbatim} -\item By default, the glossaries will appear in an unnumbered +\item By default, the glossary will appear in an unnumbered chapter if chapters are defined, otherwise in an unnumbered section. This can be changed using the \pkgopt{section} package option. For example, to make the glossaries appear in an unnumbered @@ -812,6 +1555,7 @@ appear in unnumbered subsections: The \sty{glossaries} package options are as follows: \begin{description} \item[\pkgopt{toc}] Add the glossaries to the table of contents. +Note that an extra \LaTeX\ run is required with this option. \item[\pkgopt{numberline}] When used with \pkgopt{toc}, this will add \cs{numberline}\verb|{}| in the final argument of @@ -821,13 +1565,25 @@ effect if the \pkgopt{toc} option is omitted. If \pkgopt{toc} is used without \pkgopt{numberline}, the title will be aligned with the section numbers rather than the section titles. -\item[\pkgopt{acronym}] Make a separate glossary for acronyms. +\item[\pkgopt{acronym}] This creates a new glossary with the +label \texttt{acronym}: +\begin{verbatim} +\newglossary[alg]{acronym}{acr}{acn}{\acronymname} +\end{verbatim} +If the \pkgopt{acronym} package option is used, \ics{acronymtype} +is set to \texttt{acronym} otherwise it is set to +\texttt{main}.\footnote{Actually it sets \ics{acronymtype} to +\ics{glsdefaulttype} if the \pkgopt{acronym} package option is +not used, but \ics{glsdefaulttype} usually has the value +\texttt{main}.} +Entries that are defined using \ics{newacronym} are placed in +the glossary whose label is given by \ics{acronymtype}. \item[\pkgopt{section}] This is a \meta{key}=\meta{value} option. Its value should be the name of a sectional unit (e.g.\ chapter). This will make the glossaries appear in the named sectional unit, otherwise each glossary will appear in a chapter, if chapters -exists, otherwise in a section. Unnumbered sectional units will be used +exist, otherwise in a section. Unnumbered sectional units will be used by default. Example: \begin{verbatim} \usepackage[section=subsection]{glossaries} @@ -840,8 +1596,9 @@ is equivalent to \begin{verbatim} \usepackage[section=section]{glossaries} \end{verbatim} -You can change this value later in the document using -\ics{setglossarysection}\marg{type}. +You can change this value later in the document using\\[10pt] +\DescribeMacro{\setglossarysection}\cs{setglossarysection}\marg{name}\\[10pt] +where \meta{name} is the sectional unit. \item[\pkgopt{numberedsection}] The glossaries are placed in unnumbered sectional units by default, @@ -960,6 +1717,42 @@ for acronyms. See \ifmakedtx{\autoref{sec:acronyms}}{\htmlref{later}{sec:acronyms}} for further details. +\item[\pkgopt{makeindex}] (Default) The glossary information and +indexing style file will be written in \appname{makeindex} format. If you use +\appname{makeglossaries}, it will automatically detect that it needs +to call \appname{makeindex}. If you don't use +\appname{makeglossaries}, you need to remember to use +\appname{makeindex} not \appname{xindy}. The indexing style file +will been given a \filetype{.ist} extension. + +\item[\pkgopt{xindy}] The glossary information and indexing style file will +be written in \appname{xindy} format. If you use +\appname{makeglossaries}, it will automatically detect that it needs +to call \appname{xindy}. If you don't use \appname{makeglossaries}, +you need to remember to use \appname{xindy} not \appname{makeindex}. +The indexing style file will been given a \filetype{.xdy} extension. + +The \pkgopt{xindy} package option may additionally have a +value that is a key=value comma-separated list to override +the language and codepage. For example: +\begin{verbatim} +\usepackage[xindy={language=english,codepage=utf8}]{glossaries} +\end{verbatim} +You can also specify whether you want a number group in +the glossary. This defaults to true, but can be suppressed. For +example: +\begin{verbatim} +\usepackage[xindy={glsnumbers=false}]{glossaries} +\end{verbatim} +See \ifmakedtx{\autoref{sec:xindy}}{\htmlref{Xindy}{sec:xindy}} +for further details on using \appname{xindy} with the +\sty{glossaries} package. + +\item[\pkgopt{order}] This may take two values: +\pkgoptval{word}{order} or \pkgoptval{letter}{order}. The default +is word ordering. Note that this option has no effect if you +don't use \appname{makeglossaries}. + \end{description}\ifmakedtx{}{\toTop} \subsection{Defining Glossary Entries} @@ -973,29 +1766,79 @@ was removed in version 1.13, but the restriction remains for only those entries that occur in the document (using any of the commands described in \ifmakedtx{\autoref{sec:glslink}}{\htmlref{Links to Glossary Entries}{sec:glslink}} and \ifmakedtx{\autoref{sec:glsadd}}{\htmlref{Adding an entry to the glossary without generating text}{sec:glsadd}}) will appear in the glossary. Each time an entry -is used in this way, a line is added to an associated glossary -(\filetype{.glo}) file, which then needs to be converted into a -corresponding \filetype{.gls} file which contains the typeset glossary -which is input by \ics{printglossary} or -\ics{printglossaries}. The Perl script \appname{makeglossaries} -can be used to call \appname{makeindex}, using a customised -\filetype{.ist} 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. +is used in this way, a line is added to an associated glossary file +(\filetype{.glo}), which then needs to be converted into a +corresponding \filetype{.gls} file which contains the typeset +glossary which is input by \ics{printglossary} or +\ics{printglossaries}. The Perl script \appname{makeglossaries} can +be used to call \appname{makeindex} or \appname{xindy}, using a +customised indexing 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. See +\ifmakedtx{\autoref{sec:makeglossaries}}{\htmlref{Generating the +Associated Glossary Files}{sec:makeglossaries}} +for further details. \DescribeMacro{\makeglossaries} The command \cs{makeglossaries} must be placed in the preamble in -order to create the customised \appname{makeindex} \filetype{.ist} +order to create the customised \appname{makeindex} (\filetype{.ist}) +or \appname{xindy} (\filetype{.xdy}) style file and to ensure that glossary entries are written to the -appropriate output file. If you omit \cs{makeglossaries} none of the -glossaries will be created. Note that if your page numbers use a -hyphen compositor, you must set this by redefining -\DescribeMacro{\glscompositor}\cs{glscompositor} \emph{before} -using \cs{makeglossaries}: +appropriate output files. If you omit \cs{makeglossaries} none of the +glossaries will be created. + +\begin{important} +Note that some of the commands provided by the \sty{glossaries} +package must be placed before \cs{makeglossaries} as they are +required when creating the customised style file. If you attempt +to use those commands after \cs{makeglossaries} you will generate +an error. +\end{important} + +\DescribeMacro{\noist} +You can suppress the creation of the customised \appname{xindy} +or \appname{makeindex} style file using \cs{noist}. Note that this +command must be used before \cs{makeglossaries}. + +The default name for the customised style file is given by +\ics{jobname}\filetype{.ist} (for \appname{makeindex}) or +\ics{jobname}\filetype{.xdy} (for \appname{xindy}). This name may be +changed using:\\[10pt] +\DescribeMacro{\setStyleFile} +\cs{setStyleFile}\marg{name}\\[10pt] +where \meta{name} is the name of the style file without the +extension. Note that this command must be used before +\cs{makeglossaries}. + +Each glossary entry is assigned a \term{number list} that lists all +the locations in the document where that entry was used. By default, +the location refers to the page number but this may be overridden +using the \pkgopt{counter} package option. The default form of +the location number assumes a full stop compositor (e.g.\ 1.2), +but if your location numbers use a different compositor (e.g. 1-2) +you need to set this using\\[10pt] +\DescribeMacro{\glsSetCompositor}\cs{glsSetCompositor}\marg{symbol}\\[10pt] +For example: +\begin{verbatim} +\glsSetCompositor{-} +\end{verbatim} +Note that this command must be used before \cs{makeglossaries}. + +If you use \appname{xindy}, you can have a different compositor +for page numbers starting with an uppercase alphabetical +character using:\\[10pt] +\DescribeMacro{\glsSetAlphaCompositor}\cs{glsSetAlphaCompositor}\marg{symbol}\\[10pt] +Note that this command has no effect if you haven't used the +\pkgopt{xindy} package option. For example, if you want +number lists\iterm{number list} containing a mixture of A-1 and 2.3 +style formats, then do: \begin{verbatim} -\renewcommand*{\glscompositor}{-} +\glsSetCompositor{.} +\glsSetAlphaCompositor{-} \end{verbatim} -(The default value of \cs{glscompositor} is a full stop.) +See \ifmakedtx{\autoref{sec:numberlists}}{\htmlref{Number +lists}{sec:numberlists}} for +further information about number lists\iterm{number list}. \DescribeMacro{\newglossaryentry} New glossary entries are defined using the command:\\[10pt] @@ -1004,14 +1847,29 @@ argument, \meta{label}, must be a unique label with which to identify this entry. The second argument, \meta{key-val list}, is a \meta{key}=\meta{value} list that supplies the relevant information about this entry. There are two required fields: \gloskey{name} and -\gloskey{description}. Available fields are listed below: +\gloskey{description}, except for sub-entries where the +\gloskey{name} field may be omitted. Available fields are listed +below: \begin{description} -\item[{\gloskey{name}}] The name of the entry (as it will appear in the -glossary). +\item[{\gloskey{name}}] The name of the entry (as it will appear in +the glossary). If this key is omitted and the \gloskey{parent} +key is supplied, this value will be the same as the parent's name. \item[{\gloskey{description}}] A brief description of this term (to -appear in the glossary). +appear in the glossary). Within this value, you can use +\DescribeMacro{\nopostdesc}\cs{nopostdesc} to suppress the +description terminator for this entry. For example, if this +entry is a parent entry that doesn't require a description, you +can do \verb|description={\nopostdesc}|. If you want a paragraph +break in the description use \DescribeMacro{\glspar}\cs{glspar}. +However, note that not all glossary styles support multi-line +descriptions. + +\item[{\gloskey{parent}}] The label of the parent entry. Note that +the parent entry must be defined before its sub-entries. +See \ifmakedtx{\autoref{sec:subentries}}{\htmlref{Sub-Entries}{sec:subentries}} for +further details. \item[{\gloskey{descriptionplural}}] The plural form of the description (as passed to \ics{glsdisplay} and \ics{glsdisplayfirst} @@ -1046,8 +1904,9 @@ or by appending \ics{glspluralsuffix} to the value of the used the \gloskey{first} key. \item[{\gloskey{symbol}}] 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 \cs{relax}. +specify an associated symbol. If omitted, the value is set to +\cs{relax}. Note that not all glossary styles display the +symbol. \item[{\gloskey{symbolplural}}] This is the plural form of the symbol (as passed to \ics{glsdisplay} and \ics{glsdisplayfirst} @@ -1055,42 +1914,65 @@ by \ics{glspl}, \ics{Glspl} and \ics{GLSpl}). If omitted, the value is set to the same as the \gloskey{symbol} key. \item[{\gloskey{sort}}] This value indicates how \appname{makeindex} -should sort this entry. If omitted, the value is given by the -\gloskey{name} field. This value is equivalent to -\appname{makeindex}'s \dq{actual} character (which is usually the -at-sign @ although the \sty{glossaries} package uses a different -symbol). - -\item[{\gloskey{type}}] 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 +or \appname{xindy} should sort this entry. If omitted, the value is +given by the \gloskey{name} field. + +\item[{\gloskey{type}}] This specifies the label of the glossary in +which this entry belongs. If omitted, the default glossary is +assumed. The list of acronyms type is given by \ics{acronymtype} which will either be \texttt{main} or \texttt{acronym}, depending on whether the \pkgopt{acronym} package option was used. + +\item[{\gloskey{nonumberlist}}] Suppress the \term{number list} for +this entry. + +\item[{\gloskey{see}}] Cross-reference another entry. Using the +\gloskey{see} key will automatically add this entry to the +glossary, but will not automatically add the cross-referenced entry. +The referenced entry should be supplied as the value to this key. +If you want to override the \dq{see} tag, you can supply the new +tag in square brackets before the label. For example +\verb|see=[see also]{anotherlabel}|. For further details, +see \ifmakedtx{\autoref{sec:crossref}}{\htmlref{later}{sec:crossref}}. + \end{description} -Note that if the key starts with an accented letter, -you must group the accented letter, otherwise it will cause a -problem for commands like \cs{Gls} and \cs{Glspl}. For example: +Note that if the name starts with an accented letter or non-Latin +character, you must group the accented letter, otherwise it will +cause a problem for commands like \cs{Gls} and \cs{Glspl}. +For example: \begin{verbatim} \newglossaryentry{elite}{name={{\'e}lite}, description={select group or class}} \end{verbatim} +Note that the same applies if you are using the \isty{inputenc} +package: +\begin{verbatim} +\newglossaryentry{elite}{name={{é}lite}, +description={select group or class}} +\end{verbatim} +Note that in both of the above examples, you will also need to +supply the \gloskey{sort} key if you are using \appname{makeindex} +whereas \appname{xindy} is usually able to sort accented letters +correctly. + \ifmakedtx{}{\toTop} \subsubsection{Plurals} You may have noticed from above that you can specify the plural form -when you define a term. If you omit this, the plural will be obtained -\DescribeMacro{\glspluralsuffix}by appending \cs{glspluralsuffix} to -the singular form. This command defaults to \texttt{s}. For example: +when you define a term. If you omit this, the plural will be +obtained by appending +\DescribeMacro{\glspluralsuffix}\cs{glspluralsuffix} to +the singular form. This command defaults to \dq{s}. For example: \begin{verbatim} \newglossaryentry{cow}{name=cow,description={a fully grown female of any bovine animal}} \end{verbatim} -defines a new entry whose singular form is \dq{cow} and plural form -is \dq{cows}. However, if you are writing in archaic English, you -may want to use \dq{kine} as the plural form, in which case you would -have to do: +defines a new entry whose singular form is \dq{cow} and plural form +is \dq{cows}. However, if you are writing in archaic English, you +may want to use \dq{kine} as the plural form, in which case you +would have to do: \begin{verbatim} \newglossaryentry{cow}{name=cow,plural=kine, description={a fully grown female of any bovine animal}} @@ -1121,6 +2003,115 @@ key where necessary). \ifmakedtx{}{\toTop} +\subsubsection{Sub-Entries} +\label{sec:subentries} + +As from version 1.17, it is possible to specify sub-entries. These +may be used to order the glossary into categories, in which case +the sub-entry will have a different name to its parent entry, or +it may be used to distinguish different definitions for the same +word, in which case the sub-entries will have the same name as +the parent entry. Note that not all glossary styles support +hierarchical entries and may display all the entries in a flat +format. Of the styles that support sub-entries, some display the +sub-entry's name whilst others don't. Therefore you need to +ensure that you use a suitable style. See \ifmakedtx{\autoref{sec:styles}}{\htmlref{later}{sec:styles}} +for a list of predefined +styles. + +Note that the parent entry will automatically be added to the +glossary if any of its child entries are used in the document. +If the parent entry is not referenced in the document, it will not +have a \term{number list}. +\ifmakedtx{}{\toTop} + +\paragraph{Hierarchical Categories} To arrange a glossary +with hierarchical categories, you need to first define the +category and then define the sub-entries using the relevant +category entry as the value of the \gloskey{parent} key. For +example, suppose I want a glossary of mathematical symbols that +are divided into Greek letters and Roman letters. Then I can +define the categories as follows: +\begin{verbatim} +\newglossaryentry{greekletter}{name={Greek letters}, +text={Greek letter}, +description={\nopostdesc}} + +\newglossaryentry{romanletter}{name={Roman letters}, +text={Roman letter}, +description={\nopostdesc}} +\end{verbatim} + +Note that in this example, the category entries don't need a +description so I have set the descriptions to \ics{nopostdesc}. +This gives a blank description and suppresses the +description terminator. + +I can now define my sub-entries as follows: +\begin{verbatim} +\newglossaryentry{pi}{name={pi}, +description={ratio of the circumference of a circle to the diameter}, +parent=greekletter} + +\newglossaryentry{C}{name=C, +description={Euler's constant}, +parent=romanletter} +\end{verbatim} +\ifmakedtx{}{\toTop} + +\paragraph{Homographs} Sub-entries that have the same name as +the parent entry, don't need to have the \gloskey{name} key. +For example, the word \dq{glossary} can mean a list of technical +words or a collection of glosses. In both cases the plural is +\dq{glossaries}. So first define the parent entry: +\begin{verbatim} +\newglossaryentry{glossary}{name=glossary, +description={\nopostdesc}, +plural={glossaries}} +\end{verbatim} +Again, the parent entry has no description, so the description +terminator needs to be suppressed using \ics{nopostdesc}. + +Now define the two different meanings of the word: +\begin{verbatim} +\newglossaryentry{glossarylist}{ +description={1) list of technical words}, +sort={1}, +parent={glossary}} + +\newglossaryentry{glossarycol}{ +description={2) collection of glosses}, +sort={2}, +parent={glossary}} +\end{verbatim} +Note that if I reference the parent entry, the location will be +added to the parent's \term{number list}, whereas if I reference +any of the child entries, the location will be added to the child +entry's number list. Note also that since the sub-entries have the +same name, the \gloskey{sort} key is required. + +In the above example, the plural form for both of the child entries +is the same as the parent entry, so the \gloskey{plural} key was +not required for the child entries. However, if the sub-entries +have different plurals, they will need to be specified. For example: +\begin{verbatim} +\newglossaryentry{bravo}{name={bravo}, +description={\nopostdesc}} + +\newglossaryentry{bravocry}{description={1) cry of approval +(pl.\ bravos)}, +sort={1}, +plural={bravos}, +parent=bravo} + +\newglossaryentry{bravoruffian}{description={2) hired ruffian or +killer (pl.\ bravoes)}, +sort={2}, +plural={bravoes}, +parent=bravo} +\end{verbatim} +\ifmakedtx{}{\toTop} + \subsubsection{Loading Entries From a File} \label{sec:loadglsentries} @@ -1173,7 +2164,9 @@ then (supposing I have defined a new glossary type called will add \texttt{aca} to the glossary type \texttt{acronym}, if the package option \pkgopt{acronym} has been specified, or will add \texttt{aca} to the glossary type \texttt{altacronym}, if the -package option \pkgopt{acronym} is not specified. In this instance, +package option \pkgopt{acronym} is not specified.\footnote{This +is because \cs{acronymtype} is set to \cs{glsdefaulttype} if +the \pkgopt{acronym} package option is not used.} In this instance, it is better to change \texttt{myacronyms.tex} to: \begin{verbatim} \newacronym[type=\glsdefaulttype]{aca}{aca}{a contrived acronym} @@ -1200,7 +2193,54 @@ these numbers refer to the pages on which that entry has been used (using any of the commands described in \ifmakedtx{\autoref{sec:glslink}}{\htmlref{Links to Glossary Entries}{sec:glslink}} and \ifmakedtx{\autoref{sec:glsadd}}{\htmlref{Adding an entry to the glossary without generating text}{sec:glsadd}}). The number list can be suppressed using the \pkgopt{nonumberlist} package option, or an alternative counter -can be set as the default using the \pkgopt{counter} package option.\ifmakedtx{}{\toTop} +can be set as the default using the \pkgopt{counter} package option. +The number list is also referred to as the location +list\index{location list|see{number list}}. + +Both \appname{makeindex} and \appname{xindy} concatenate a +sequence of 3 or more consecutive pages into a range. With +\appname{xindy} you can vary the minimum sequence length using +\ics{GlsSetXdyMinRangeLength}\marg{n} where \meta{n} is either +an integer or the keyword \texttt{none} which indicates that there +should be no range formation. + +\begin{important} +Note that \cs{GlsSetXdyMinRangeLength} must be used before +\ics{makeglossaries} and has no effect if \ics{noist} is used. +\end{important} + +With both \appname{makeindex} and \appname{xindy}, you can replace +separator and the closing number in the range using:\\[10pt] +\DescribeMacro{\glsSetSuffixF}\cs{glsSetSuffixF}\marg{suffix}\\ +\DescribeMacro{\glsSetSuffixFF}\cs{glsSetSuffixFF}\marg{suffix}\\[10pt] +where the former command specifies the suffix to use for a 2 page +list and the latter specifies the suffix to use for longer lists. +For example: +\begin{verbatim} +\glsSetSuffixF{f.} +\glsSetSuffixFF{ff.} +\end{verbatim} +Note that if you use \appname{xindy}, you will also need to +set the minimum range length to 1 if you want to change these +suffixes: +\begin{verbatim} +\GlsSetXdyMinRangeLength{1} +\end{verbatim} +Note that if you use the \isty{hyperref} package, you will need +to use \ics{nohyperpage} in the suffix to ensure that the hyperlinks +work correctly. For example: +\begin{verbatim} +\glsSetSuffixF{\nohyperpage{f.}} +\glsSetSuffixFF{\nohyperpage{ff.}} +\end{verbatim} + +\begin{important} +Note that \cs{glsSetSuffixF} and \cs{glsSetSuffixFF} must be used +before \ics{makeglossaries} and have no effect if \ics{noist} is +used. +\end{important} + +\ifmakedtx{}{\toTop} \subsection{Links to Glossary Entries} \label{sec:glslink} @@ -1212,10 +2252,20 @@ 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). 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 +by \appname{makeindex} or \appname{xindy} to generate the relevant +entry in the glossary. This information includes an +associated location that is added to the \term{number list} for that +entry. By default, the location refers to the page number. For +further information on number lists, see \ifmakedtx{\autoref{sec:numberlists}}{\htmlref{Number Lists}{sec:numberlists}}. + + +\begin{important} +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 +commands. +\end{important} + +The above warning 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 @@ -1238,97 +2288,103 @@ font, do: \DescribeMacro{\glslink} The command:\\[10pt] \cs{glslink}\oarg{options}\marg{label}\marg{text}\\[10pt] -will place \cs{glstextformat}\marg{text} in the document at that point -and add a line into the associated glossary file for the glossary entry -given by \meta{label}. If hyperlinks are supported, \meta{text} will be -a hyperlink to the relevant line in the glossary. The optional argument -\meta{options} must be a \meta{key}=\meta{value} list which can take -any of the following keys: +will place \cs{glstextformat}\marg{text} in the document at that +point and add a line into the associated glossary file for the +glossary entry given by \meta{label}. If hyperlinks are supported, +\meta{text} will be a hyperlink to the relevant line in the +glossary. The optional argument \meta{options} must be a +\meta{key}=\meta{value} list which can take any of the following +keys: \begin{description} \item[{\gloskey[glslink]{format}}] This specifies how to format the -associated number for this entry in the glossary. This value is -equivalent to the \appname{makeindex} encap value, and (as with -\cs{index}) the value needs to be the name of a command \emph{without} -the initial backslash. As with \cs{index}, the characters \verb"(" and -\verb")" can also be used to specify the beginning and ending of a -number range. Again as with \cs{index}, the command should be the name -of a command which takes an argument (which will be the associated -number). Be careful not to use a declaration (such as \cs{bfseries}) -instead of a text block command (such as \cs{textbf}) as the effect is -not guaranteed to be localised. If you want to apply more than one -style to a given entry (e.g.\ \textbf{bold} and \emph{italic}) you will -need to create a command that applies both formats, e.g.\ +associated location number for this entry in the glossary. This +value is equivalent to the \appname{makeindex} encap value, and (as +with \cs{index}) the value needs to be the name of a command +\emph{without} the initial backslash. As with \cs{index}, the +characters \verb"(" and \verb")" can also be used to specify the +beginning and ending of a number range. Again as with \cs{index}, +the command should be the name of a command which takes an argument +(which will be the associated location). Be careful not to use a +declaration (such as \texttt{bfseries}) instead of a text block command +(such as \texttt{textbf}) as the effect is not guaranteed to be +localised. If you want to apply more than one style to a given entry +(e.g.\ \textbf{bold} and \emph{italic}) you will need to create a +command that applies both formats, e.g.\ \begin{verbatim} \newcommand*{\textbfem}[1]{\textbf{\emph{#1}}} \end{verbatim} and use that command. +In this document, the standard formats refer to the standard text +block commands such as \ics{textbf} or \ics{emph} or any of the +commands listed in Table~\ref{tab:hyperxx}. + +\begin{important} +If you use \appname{xindy} instead of \appname{makeindex}, you +must specify any non-standard formats that you want to use +with the \gloskey[glslink]{format} key using +\ics{GlsAddXdyAttribute}\marg{name}. For example +\begin{verbatim} +\GlsAddXdyAttribute{textbfem} +\end{verbatim} +\end{important} + +Note that unlike \cs{index}, you can't have +anything following the command name, such as an asterisk or +arguments. If you want to cross-reference another entry, either +use the \gloskey{see} key when you define the entry or use +\ics{glssee} (described \ifmakedtx{in \autoref{sec:crossref}}{\htmlref{later}{sec:crossref}}). + + If you are using hyperlinks and you want to change the font of the -hyperlink, don't use \cs{hyperpage} (provided by the \isty{hyperref} -package) as the numbers may not refer to a page number. -Instead, the \sty{glossaries} package provides the following -number formats: -\begin{center} -\ifmakedtx{\begin{tabular}{@{\sffamily}lp{0.8\linewidth}} -hyperrm & The number is a serif hyperlink to the relevant part of the -document\\ -hypersf & The number is a sans-serif hyperlink to the relevant part -of the document\\ -hypertt & The number is a monospaced hyperlink to the relevant part -of the document\\ -hyperbf & The number is a bold hyperlink to the relevant part of the -document\\ -hypermd & The number is a medium weight hyperlink to the relevant -part of the document\\ -hyperit & The number is an italic hyperlink to the relevant -part of the document\\ -hypersl & The number is a slanted hyperlink to the relevant -part of the document\\ -hyperup & The number is an upright hyperlink to the relevant -part of the document\\ -hypersc & The number is a small caps hyperlink to the relevant -part of the document\\ -hyperemph & The number is an emphasized hyperlink to the relevant -part of the document -\end{tabular}}{\begin{tabular}{ll} -\texttt{hyperrm} & The number is a serif hyperlink to the relevant part of the -document\\ -\texttt{hypersf} & The number is a sans-serif hyperlink to the relevant part -of the document\\ -\texttt{hypertt} & The number is a monospaced hyperlink to the relevant part -of the document\\ -\texttt{hyperbf} & The number is a bold hyperlink to the relevant part of the -document\\ -\texttt{hypermd} & The number is a medium weight hyperlink to the relevant -part of the document\\ -\texttt{hyperit} & The number is an italic hyperlink to the relevant -part of the document\\ -\texttt{hypersl} & The number is a slanted hyperlink to the relevant -part of the document\\ -\texttt{hyperup} & The number is an upright hyperlink to the relevant -part of the document\\ -\texttt{hypersc} & The number is a small caps hyperlink to the relevant -part of the document\\ -\texttt{hyperemph} & The number is an emphasized hyperlink to the relevant -part of the document -\end{tabular}} -\end{center} -Note that if the \cs{hyperlink} command hasn't been defined, +hyperlinked location, don't use \ics{hyperpage} (provided by the +\isty{hyperref} package) as the locations may not refer to a page +number. Instead, the \sty{glossaries} package provides number +formats listed in Table~\ref{tab:hyperxx}. + +\begin{table}[htbp] +\caption{Predefined Hyperlinked Location Formats} +\label{tab:hyperxx} +\centering +\vskip\baselineskip +\begin{tabular}{ll} +\locfmt{hyperrm} & serif hyperlink\\ +\locfmt{hypersf} & sans-serif hyperlink\\ +\locfmt{hypertt} & monospaced hyperlink\\ +\locfmt{hyperbf} & bold hyperlink\\ +\locfmt{hypermd} & medium weight hyperlink\\ +\locfmt{hyperit} & italic hyperlink\\ +\locfmt{hypersl} & slanted hyperlink\\ +\locfmt{hyperup} & upright hyperlink\\ +\locfmt{hypersc} & small caps hyperlink\\ +\locfmt{hyperemph} & emphasized hyperlink +\end{tabular} +\par +\end{table} + +Note that if the \ics{hyperlink} command hasn't been defined, the \texttt{hyper}\meta{xx} formats are equivalent to the -analogous \cs{text}\meta{xx} font commands. If you want to +analogous \texttt{text}\meta{xx} font commands (and \texttt{hyperemph} +is equivalent to \texttt{emph}). If you want to make a new format, you will need to define a command which takes -one argument and use that; for example, if you want the associated -number in the glossary to be in a bold sans-serif font, you can define a +one argument and use that; for example, if you want the location +number to be in a bold sans-serif font, you can define a command called, say, \cs{hyperbsf}: \begin{verbatim} \newcommand{\hyperbsf}[1]{\textbf{\hypersf{#1}}} \end{verbatim} and then use \texttt{hyperbsf} as the value for the \gloskey{format} -key.\ifmakedtx{ (See also \autoref{sec:printglos}.)}{} +key.\ifmakedtx{ (See also \autoref{sec:printglos}.)}{} +Remember that if you use \appname{xindy}, you will need to add +this to the list of location attributes: +\begin{verbatim} +\GlsAddXdyAttribute{hyperbsf} +\end{verbatim} \item[{\gloskey[glslink]{counter}}] This specifies which counter -to use for the associated number for this glossary entry. (See also +to use for this location. This overrides the default counter +used by this entry. (See also \ifmakedtx{\autoref{sec:numberlists}}{\htmlref{Number Lists}{sec:numberlists}}.) \item[{\gloskey[glslink]{hyper}}] This is a boolean key which can @@ -1524,7 +2580,9 @@ 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. Note that \ics{glslink} (which +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 @@ -1564,7 +2622,7 @@ then \verb|\gls{distance}| will produce \dq{\textbf{distance (km)}}. If you have multiple glossaries, changing \cs{glsdisplayfirst} and \cs{glsdisplay} will change the way entries for all of the -glossaries appear when using commands \cs{gls}, \cs{glspl} and their +glossaries appear when using the commands \cs{gls}, \cs{glspl} and their uppercase variants. If you only want the change to affect entries for a given glossary, then you need to use \DescribeMacro{\defglsdisplay}\cs{defglsdisplay} and @@ -1656,6 +2714,76 @@ do: \end{verbatim} \ifmakedtx{}{\toTop} +\subsection{Cross-Referencing Entries} +\label{sec:crossref} + +There are several ways of cross-referencing entries in the +glossary: + +\begin{enumerate} +\item You can use commands such as \ics{gls} in the +entries description. For example: +\begin{verbatim} +\newglossaryentry{apple}{name=apple, +description={firm, round fruit. See also \gls{pear}}} +\end{verbatim} +Note that with this method, if you don't use the +cross-referenced term in the glossary, you will need two runs of +\appname{makeglossaries}: +\begin{verbatim} +latex filename +makeglossaries filename +latex filename +makeglossaries filename +latex filename +\end{verbatim} + +\item As described \ifmakedtx{in +\autoref{sec:newglosentry}}{\htmlref{earlier}{sec:newglosentry}}, +you can use the \gloskey{see} key when you define the entry. For +example: +\begin{verbatim} +\newglossaryentry{MaclaurinSeries}{name={Maclaurin series}, +description={Series expansion}, +see={TaylorsTheorem}} +\end{verbatim} +Note that in this case, the entry with the \gloskey{see} key will +automatically be added to the glossary, but the cross-referenced +entry won't. You therefore need to ensure that you use the +cross-referenced term with the commands described in +\ifmakedtx{\autoref{sec:glslink}}{Links to Glossary Entries} or +\ifmakedtx{\autoref{sec:glsadd}}{Adding an Entry to the Glossary +Without Generating Text}. + + +You can optionally override the \dq{see} tag using square brackets +at the start of the \gloskey{see} value. For example: +\begin{verbatim} +\newglossaryentry{MaclaurinSeries}{name={Maclaurin series}, +description={Series expansion}, +see=[see also]{TaylorsTheorem}} +\end{verbatim} + +\item After you have defined the entry, use\\[10pt] +\DescribeMacro{\glssee}\cs{glssee}\oarg{tag}\marg{label}\marg{xr label list}\\[10pt] +where \meta{xr label list} is a comma-separated list of entry +labels to be cross-referenced, \meta{label} is the label of the +entry doing the cross-referencing and \meta{tag} is the \dq{see} tag. +For example: +\begin{verbatim} +\glssee[see also]{series}{FourierSeries,TaylorsTheorem} +\end{verbatim} +Note that this automatically adds the entry given by \meta{label} to +the glossary but doesn't add the cross-referenced entries (specified +by \meta{xr label list}) to the glossary. +\end{enumerate} + +In both cases~2 and 3 above, the cross-referenced information appears +in the \term{number list}, whereas in case~1, the cross-referenced +information appears in the description. In cases~2 and~3, the +default text for the \dq{see} tag is given by \ics{seename}. +\ifmakedtx{}{\toTop} + \subsection{Using Glossary Terms Without Links} \label{sec:glsnolink} @@ -1663,7 +2791,8 @@ 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. +used and, apart from \ics{glshyperlink}, they don't produce +hyperlinks. \par\vskip10pt\noindent \DescribeMacro{\glsentryname}\cs{glsentryname}\marg{label}\\ \DescribeMacro{\Glsentryname}\cs{Glsentryname}\marg{label}\par\vskip10pt\noindent @@ -1716,10 +2845,25 @@ These commands display the symbol for the glossary entry given by \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. +\par\vskip10pt\noindent +\DescribeMacro{\glshyperlink}\cs{glshyperlink}\oarg{link text}\marg{label}\par\vskip10pt\noindent +This command provides a hyperlink to the glossary entry given by +\meta{label} \textbf{but does not add any information to the +glossary file}. The link text is given by +\ics{glsentryname}\marg{label} by default, but can be overridden +using the optional argument. +\begin{important} +If you use \cs{glshyperlink}, you need to ensure that the relevant +entry has been added to the glossary using any of the +commands described in \ifmakedtx{\autoref{sec:glslink} or \autoref{sec:glsadd}}{\htmlref{Links to Glossary Entries}{sec:glslink} or +\htmlref{Adding an Entry to the Glossary Without Generating +Text}{sec:glsadd}} otherwise you will end up with a broken +link. +\end{important} 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}}. +the glossary} in the document \url{glossaries.pdf}}. \ifmakedtx{}{\toTop} \subsection{Displaying a glossary} @@ -1729,12 +2873,14 @@ The command \cs{printglossaries} 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 \appname{makeglossaries} -or have directly used \appname{makeindex} (as described in -\ifmakedtx{\autoref{sec:makeglossaries}}{\htmlref{Generating the Associated Glossary Files}{sec:makeglossaries}}). If the glossary still -does not appear after you re-\LaTeX\ your document, check -the \appname{makeindex} log files to see if there is a problem. -Remember that you also need to use the command \ics{makeglossaries} in -the preamble to enable the glossaries. +or have directly used \appname{makeindex} or \appname{xindy} (as +described in +\ifmakedtx{\autoref{sec:makeglossaries}}{\htmlref{Generating the +Associated Glossary Files}{sec:makeglossaries}}). If the glossary +still does not appear after you re-\LaTeX\ your document, check the +\appname{makeindex}/\appname{xindy} log files to see if there is a +problem. Remember that you also need to use the command +\ics{makeglossaries} in the preamble to enable the glossaries. \DescribeMacro{\printglossary} An individual glossary can be displayed using:\\[10pt] @@ -1776,7 +2922,8 @@ assumed. \end{description} \DescribeMacro{\glossarypreamble} -Information can be added to the start of the glossary by redefining +Information can be added to the start of the glossary (after the +title and before the main body of the glossary) by redefining \cs{glossarypreamble}. For example: \begin{verbatim} \renewcommand{\glossarypreamble}{Numbers in italic indicate @@ -1814,13 +2961,17 @@ glossary.\ifmakedtx{}{\toTop} \label{sec:glsnamefont} \DescribeMacro{\glsnamefont}Within each glossary, each entry name is -formatted according to \cs{glsnamefont} which takes one argument: the -entry name. This command is always used regardless of the glossary -style. By default, \cs{glsnamefont} simply displays its argument in -whatever the surrounding font happens to be. This means that in the -list styles the name will appear in bold, since the name is placed in -the optional argument of \cs{item}, whereas in the tabular styles the -name will appear in the normal font. +formatted according to \cs{glsnamefont} which takes one argument: +the entry name. This command is always used regardless of the +glossary style. By default, \cs{glsnamefont} simply displays its +argument in whatever the surrounding font happens to be. This means +that in the list-like glossary styles (defined in the +\isty{glossary-list} style file) the name will appear in bold, since +the name is placed in the optional argument of \cs{item}, whereas in +the tabular styles (defined in the \isty{glossary-long} and +\isty{glossary-super} style files) the name will appear in the +normal font. The hierarchical glossary styles (defined in the +\isty{glossary-tree} style file) also set the name in bold. For example, suppose you want all the entry names to appear in medium weight small caps, then you can do: @@ -1829,6 +2980,259 @@ medium weight small caps, then you can do: \end{verbatim} \ifmakedtx{}{\toTop} +\subsubsection{Xindy} +\label{sec:xindy} + +If you want to use \appname{xindy} to sort the glossary, you +must use the package option \pkgopt{xindy}: +\begin{verbatim} +\usepackage[xindy]{glossaries} +\end{verbatim} +This ensures that the glossary information is written in +\appname{xindy} syntax. + +\ifmakedtx{Section~\ref{sec:makeglossaries}}{The section +\htmlref{Generating the Associated Glossary +Files}{sec:makeglossaries}} covers how to use the external +indexing application. This section covers the commands provided +by the \sty{glossaries} package that allow you to adjust the +\appname{xindy} style file (\filetype{.xdy}) and parameters. + +To assist writing information to the \appname{xindy} style +file, the \sty{glossaries} package provides the following +commands:\\[10pt] +\DescribeMacro{\glsopenbrace}\cs{glsopenbrace}\\ +\DescribeMacro{\glsclosebrace}\cs{glsclosebrace}\\[10pt] +which produce an open and closing brace. (This is needed because +\verb|\{| and \verb|\}| don't expand to a simple brace character +when written to a file.) + +In addition, if you are using a package that makes the double +quote character active (e.g. \isty{ngerman}) you can use:\\[10pt] +\DescribeMacro{\glsquote}\cs{glsquote}\marg{text}\\[10pt] +which will produce \verb|"|\meta{text}\verb|"|. Alternatively, +you can use \verb|\string"| to write the double-quote character. +This document assumes that the double quote character has not been +made active, so the examples just use \verb|"| for clarity. + +If you want greater control over the \appname{xindy} style file than +is available through the \LaTeX\ commands provided by the +\sty{glossaries} package, you will need to edit the \appname{xindy} +style file. In +which case, you must use \ics{noist} to prevent the style file from +being overwritten by the \sty{glossaries} package. For additional +information about \appname{xindy}, read the \appname{xindy} +documentation.\ifmakedtx{}{\toTop} + +\paragraph{Language and Encodings} +When you use \appname{xindy}, you need to specify the language +and encoding used (unless you have written your own custom +\appname{xindy} style file that defines the relevant alphabet +and sort rules). If you use \appname{makeglossaries}, +this information is obtained from the document's auxiliary +(\filetype{.aux}) file. The \sty{glossaries} package attempts to +find the root language, but in the event that it gets it wrong or if +\appname{xindy} doesn't support that language, then you can +specify the language using:\\[10pt] +\DescribeMacro{\GlsSetXdyLanguage} +\cs{GlsSetXdyLanguage}\oarg{glossary type}\marg{language}\\[10pt] +where \meta{language} is the name of the language. The +optional argument can be used if you have multiple glossaries +in different languages. If \meta{glossary type} is omitted, it +will be applied to all glossaries, otherwise the language +setting will only be applied to the glossary given by +\meta{glossary type}. + +If the \isty{inputenc} package is used, the encoding will be +obtained from the value of \ics{inputencodingname}. +Alternatively, you can specify the encoding using:\\[10pt] +\DescribeMacro{\GlsSetXdyCodePage} +\cs{GlsSetXdyCodePage}\marg{code}\\[10pt] +where \meta{code} is the name of the encoding. For example: +\begin{verbatim} +\GlsSetXdyCodePage{utf8} +\end{verbatim} + +Note that you can also specify the language and encoding using +the package option +\verb|xindy={language=|\meta{lang}\verb|,codepage=|\meta{code}\verb|}|. +For example: +\begin{verbatim} +\usepackage[xindy={language=english,codepage=utf8}]{glossaries} +\end{verbatim} + +If you write your own custom \appname{xindy} style file that +includes the language settings, you need to set the language +to nothing: +\begin{verbatim} +\GlsSetXdyLanguage{} +\end{verbatim} +(and remember to use \ics{noist} to prevent the style file from +being overwritten). + +\begin{important} +The commands \cs{GlsSetXdyLanguage} and \cs{GlsSetXdyCodePage} +have no effect if you don't use \appname{makeglossaries}. If +you call \appname{xindy} without \appname{makeglossaries} you +need to remember to set the language and encoding using the +\texttt{-L} and \texttt{-C} switches. +\end{important} +\ifmakedtx{}{\toTop} + +\paragraph{Locations and Number lists} + +The most likely attributes used in the \gloskey[glslink]{format} +key (\locfmt{textrm}, \locfmt{hyperrm} etc) are automatically added +to the \appname{xindy} style file, but if you want to use another +attribute, you need to add it using:\\[10pt] +\DescribeMacro{\GlsAddXdyAttribute} +\cs{GlsAddXdyAttribute}\marg{name}\\[10pt] +where \meta{name} is the name of the attribute, as used in +the \gloskey[glslink]{format} key. For example, suppose I want a +bold, italic, hyperlinked location. I first need to define a +command that will do this: +\begin{verbatim} +\newcommand*{\hyperbfit}[1]{\textit{\hyperbf{#1}}} +\end{verbatim} +but with \appname{xindy}, I also need to add this as an allowed +attribute: +\begin{verbatim} +\GlsAddXdyAttribute{hyperbfit} +\end{verbatim} + +\begin{important} +Note that \cs{GlsAddXdyAttribute} has no effect if \ics{noist} is +used or if \ics{makeglossaries} is omitted. + +\cs{GlsAddXdyAttribute} must be used before \ics{makeglossaries}. +\end{important} + +If the location numbers don't get expanded to a simple Arabic or +Roman number or a letter from a, \ldots, z or A, \ldots, Z, then +you need to add a location style in the appropriate format. + +For example, suppose you want the page numbers written as words +rather than digits and you use the \isty{fmtcount} package to +do this. You can redefine \ics{thepage} as follows: +\begin{verbatim} +\renewcommand*{\thepage}{\Numberstring{page}} +\end{verbatim} +This gets expanded to \verb|\protect \Numberstringnum |\marg{n} +where \meta{n} is the page number. This means that you need to +define a new location that has that form: +\begin{verbatim} +\GlsAddXdyLocation{Numberstring}{:sep "\string\protect\space + \string\Numberstringnum\space\glsopenbrace" + "arabic-numbers" :sep "\glsclosebrace"} +\end{verbatim} +Note that it's necessary to use \cs{space} to indicate that +spaces also appear in the format, since, unlike \TeX, +\appname{xindy} doesn't ignore spaces after control sequences. + +\begin{important} +Note that \cs{GlsAddXdyLocation} has no effect if \ics{noist} is +used or if \ics{makeglossaries} is omitted. + +\cs{GlsAddXdyLocation} must be used before \ics{makeglossaries}. +\end{important} + +In the \term{number list}, the locations are sorted according to +type. The default ordering is: +\texttt{roman-page-numbers} (e.g.\ i), +\texttt{arabic-page-numbers} (e.g.\ 1), +\texttt{arabic-section-numbers} (e.g.\ 1.1 if the compositor +is a full stop or 1-1 if the compositor is a hyphen\footnote{see +\ics{setCompositor} described in +\ifmakedtx{\autoref{sec:newglosentry}}{\htmlref{Defining Glossary +Entries}{sec:newglosentry}}}), +\texttt{alpha-page-numbers} (e.g.\ a), +\texttt{Roman-page-numbers} (e.g.\ I), +\texttt{Alpha-page-numbers} (e.g.\ A), +\texttt{Appendix-page-numbers} (e.g.\ A.1 if the Alpha compositor +is a full stop or A-1 if the Alpha compositor is a +hyphen\footnote{see \ics{setAlphaCompositor} described in +\ifmakedtx{\autoref{sec:newglosentry}}{\htmlref{Defining Glossary +Entries}{sec:newglosentry}}}), +user defined location names (as specified by +\ics{GlsAddXdyLocation} in the order in which they were defined), +\texttt{see} (cross-referenced entries). +This ordering can be changed using:\\[10pt] +\DescribeMacro{\GlsSetXdyLocationClassOrder} +\cs{GlsSetXdyLocationClassOrder}\\[10pt] +where each location name is delimited by double quote marks. +For example: +\begin{verbatim} +\GlsSetXdyLocationClassOrder{ + "arabic-page-numbers" + "arabic-section-numbers" + "roman-page-numbers" + "Roman-page-numbers" + "alpha-page-numbers" + "Alpha-page-numbers" + "Appendix-page-numbers" + "see" +} +\end{verbatim} + +\begin{important} +Note that \cs{GlsSetXdyLocationClassOrder} has no effect if +\ics{noist} is used or if \ics{makeglossaries} is omitted. + +\cs{GlsSetXdyLocationClassOrder} must be used before +\ics{makeglossaries}. +\end{important} + +If a \term{number list} consists of a sequence of consecutive +numbers, the range will be concatenated. The +number of consecutive locations that causes a range formation +defaults to 2, but can be changed using:\\[10pt] +\DescribeMacro{\GlsSetXdyMinRangeLength} +\cs{GlsSetXdyMinRangeLength}\marg{n}\\[10pt] +For example: +\begin{verbatim} +\GlsSetXdyMinRangeLength{3} +\end{verbatim} +The argument may also be the keyword \texttt{none}, to indicate that +there should be no range formations. See the \appname{xindy} +manual for further details on range formations. + +\begin{important} +Note that \cs{GlsSetXdyMinRangeLength} has no effect if \ics{noist} +is used or if \ics{makeglossaries} is omitted. + +\cs{GlsSetXdyMinRangeLength} must be used before +\ics{makeglossaries}. +\end{important} + +See \ifmakedtx{\autoref{sec:numberlists}}{\htmlref{Number Lists}{sec:numberlists}} for +further details. +\ifmakedtx{}{\toTop} + +\paragraph{Glossary Groups} +The glossary is divided into groups according to the first +letter of the sort key. The \sty{glossaries} package also adds +a number group by default, unless you suppress it in the +\pkgopt{xindy} package option. For example: +\begin{verbatim} +\usepackage[xindy={glsnumbers=false}]{glossaries} +\end{verbatim} +Any entry that doesn't go in one of the letter groups or the +number group is placed in the default group. + +If you have a number group, the default behaviour is to locate +it before the \dq{A} letter group. If you are not using a +Roman alphabet, you can change this using\\[10pt] +\cs{GlsSetXdyFirstLetterAfterDigits}\marg{letter} + +\begin{important} +Note that \cs{GlsSetXdyFirstLetterAfterDigits} has no effect if +\ics{noist} is used or if \ics{makeglossaries} is omitted. + +\cs{GlsSetXdyFirstLetterAfterDigits} must be used before +\ics{makeglossaries}. +\end{important} +\ifmakedtx{}{\toTop} + \subsection{Defining New Glossaries} \DescribeMacro{\newglossary} @@ -1841,9 +3245,9 @@ title for this new glossary and the final optional argument \meta{counter} specifies which counter to use for the associated number lists\iterm{number list} (see also \ifmakedtx{\autoref{sec:numberlists}}{\htmlref{Number Lists}{sec:numberlists}}). The first optional argument specifies the extension for the -\appname{makeindex} transcript file (this information is only used by -\appname{makeglossaries} which picks up the information from the -auxiliary file). +\appname{makeindex} or \appname{xindy} transcript file (this +information is only used by \appname{makeglossaries} which picks up +the information from the auxiliary file). Note that the main (default) glossary is automatically created as: \begin{verbatim} @@ -1874,7 +3278,7 @@ defines the command:\\[10pt] \cs{newacronym}\oarg{key-val list}\marg{label}\marg{abbrv}\marg{long}\\[10pt] By default, this is equivalent to:\vskip5pt \begin{ttfamily}\par\noindent -\cs{newglossaryentry}\textrm{\marg{label}}\{type=\cs{acronymtype},\\ +\cs{newglossaryentry}\textrm{\marg{label}}\{type=\ics{acronymtype},\\ name=\textrm{\marg{abbrv}},\\ description=\textrm{\marg{long}},\\ text=\textrm{\marg{abbrv}},\\ @@ -1885,18 +3289,20 @@ firstplural=\{\textrm{\meta{long}}\cs{glspluralsuffix}\cs{space} \textrm{\meta{key-val list}}\}\par \end{ttfamily} \vskip5pt -As mentioned in the previous section, the command \cs{acronymtype} is -the name of the glossary in which the acronyms should appear. If the -\pkgopt{acronym} package option has been used, this will be -\texttt{acronym}, otherwise it will be \texttt{main}. The acronyms can -then be used in exactly the same way as any other glossary entry. +As mentioned in the previous section, the command \ics{acronymtype} +is the name of the glossary in which the acronyms should appear. If +the \pkgopt{acronym} package option has been used, this will be +\texttt{acronym}, otherwise it will be \texttt{main}. The acronyms +can then be used in exactly the same way as any other glossary +entry. \begin{important}% \textbf{Note:} since \cs{newacronym} sets \verb|type=\acronymtype|, if you want to load a file containing acronym definitions using \cs{loadglsentries}\oarg{type}\marg{filename}, the optional argument \meta{type} will not have an effect unless you explicitly set the -type as \verb|type=\glsdefaulttype|. See \ifmakedtx{\autoref{sec:loadglsentries}}{\htmlref{earlier}{sec:loadglsentries} for details}. +type as \verb|type=\glsdefaulttype| in the optional argument to +\ics{newacronym}. See \ifmakedtx{\autoref{sec:loadglsentries}}{\htmlref{earlier}{sec:loadglsentries} for details}. \end{important} For example, the following defines the acronym IDN: @@ -1920,12 +3326,12 @@ This section describes acronyms that have been defined using \cs{newacronym}. If you prefer to define all your acronyms using \cs{newglossaryentry} explicitly, then you should skip this section and ignore the package options: \pkgopt{smallcaps}, \pkgopt{smaller}, -\pkgopt{description}, \pkgopt{dua}, \pkgopt{footnote} and -\pkgopt{shortcuts}, as these options change the -definition of \ics{newacronym} for common acronym formats -as well as the way that the link text is displayed (see +\pkgopt{description}, \pkgopt{dua} and \pkgopt{footnote}, as these +options change the definition of \ics{newacronym} for common acronym +formats as well as the way that the link text is displayed (see \ifmakedtx{\autoref{sec:glsdisplay}}{\htmlref{earlier}{sec:glsdisplay}}). -Likewise you should ignore the new commands described in this section, +Likewise you should ignore the package option \pkgopt{shortcuts} +and the new commands described in this section, such as \cs{acrshort}, as they vary according to the definition of \cs{newacronym}. @@ -2058,6 +3464,12 @@ where \meta{insert} indicates the text supplied in the final optional argument to \cs{gls}, \cs{glspl} or their uppercase variants. +In this case, the long form is stored in the \gloskey{symbol} key. +This means that the long form will not be displayed in the list of +acronyms unless you use a glossary style that displays the entry's +symbol (for example, the \glostyle{index} style). Entries will +be sorted according to the short form. + Note also that when these two package options are used (in the given order), the \sty{glossaries} package additionally implements the \pkgopt{sanitize} option using @@ -2073,7 +3485,16 @@ entry in the form:\\[10pt] If the \pkgopt{description} package option is also used, the \gloskey{name} key is set to the long form, otherwise the \gloskey{name} key is set to the short form and the -\gloskey{description} key is set to the long form. +\gloskey{description} key is set to the long form. In both +cases the \gloskey{symbol} is set to the short form. Therefore, +if you use the \pkgopt{description} package option and you want +the short form to appear in the list of acronyms, you will need +to use a glossary style that displays the entry's symbol (for +example, the \glostyle{index} style). Entries will be sorted +according to the long form if the \pkgopt{description} option +is used, otherwise they will be sorted according to the +short form (unless overridden by the \gloskey{sort} key in +the optional argument of \ics{newacronym}). \item[\pkgopt{description}]\ifmakedtx{\mbox{}\par}{} This package option displays the entry on first use as:\\[10pt] @@ -2085,25 +3506,74 @@ package additionally implements the option \ipkgopt[symbol]{sanitize}\verb|sanitize={symbol=false}|, so remember to protect fragile commands when defining acronyms. +Note that with this option, you need to specify the description +using the \gloskey{description} key in the optional argument +of \ics{newacronym}. When this option is used without +the \pkgopt{footnote} or \pkgopt{dua} options, the name field +is specified as +\DescribeMacro{\acrnameformat}\ics{acrnameformat}\marg{short}\marg{long}. This +defaults to \ics{acronymfont}\marg{short}, which means that the +long form will not appear in the list of acronyms by default. +To change this, you need to redefine \ics{acrnameformat} as +appropriate. For example, to display the long form followed +by the short form in parentheses do: +\begin{verbatim} +\renewcommand*{\acrnameformat}[2]{#2 (\acronymfont{#1})} +\end{verbatim} +Note that even if you redefine \ics{acrnameformat}, the +entries will be sorted according to the short form, unless you +override this using the \gloskey{sort} key in the optional +argument to \ics{newacronym}. + \item[\pkgopt{footnote}]\ifmakedtx{\mbox{}\par}{} This package option displays the entry on first use as:\\[10pt] \cs{firstacronymfont}\marg{abbrv}\meta{insert}\cs{footnote}\marg{long}\\[10pt] while subsequent use displays the entry as:\\[10pt] -\cs{acronymfont}\marg{abbrv}\meta{insert} +\cs{acronymfont}\marg{abbrv}\meta{insert}\\[10pt] +Acronyms will be sorted according to the short form. Note also that if this package option is used, the \sty{glossaries} package additionally implements the option \ipkgopt[description]{sanitize}\verb|sanitize={description=false}|, so remember to protect fragile commands when defining acronyms. +Note that on first use, it is the long form in the footnote that +links to the relevant glossary entry (where hyperlinks are enabled), +whereas on subsequent use, the acronym links to the relevant +glossary entry. It is possible to change this to make the acronym +on first use have the hyperlink instead of the footnote, but +since the footnote marker will also be a hyperlink, you will +have two hyperlinks in immediate succession. This can be +ambiguous where the hyperlinks are coloured rather than boxed. +The code required to change the first use to make the +acronym a hyperlink is as follows: +\begin{verbatim} + \defglsdisplayfirst[\acronymtype]{% + \noexpand\protect\noexpand + \glslink[\@gls@link@opts]{\@gls@link@label}{\firstacronymfont{#1}#4}% + \noexpand\protect\noexpand\footnote{#2}}% +\end{verbatim} +\textbf{Note} that this involves using internal commands +(i.e.\ commands whose name contains an \verb|@| character), so +if this code is place in a \texttt{.tex} file it needs to be +placed within a \cs{makeatletter} \ldots\ \cs{makeatother} pair. +(See \url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=atsigns} +for further details.) + \item[\pkgopt{smallcaps}]\ifmakedtx{\mbox{}\par}{} If neither the \pkgopt{footnote} nor \pkgopt{description} options have been set, this option displays the entry on first use as:\\[10pt] \meta{long}\meta{insert} (\cs{firstacronymfont}\marg{abbrv})\\[10pt] while subsequent use displays the entry as:\\[10pt] \cs{acronymfont}\marg{abbrv}\meta{insert}\\[10pt] -where \cs{acronymfont} is set to \verb|\textsc{#1}|, so \meta{abbrv} -should be specified in lower case. +where \cs{acronymfont} is set to \verb|\textsc{#1}|. + +\begin{important} +Note that since the acronym is displayed using \ics{textsc}, +the short form, \meta{abbrv}, should be specified in lower case. +\ifmakedtx{(Recall that "\textsc{abc}" produces \textsc{abc} whereas +"\textsc{ABC}" produces \textsc{ABC}.)}{} +\end{important} Note also that if this package option is used, the \sty{glossaries} package additionally implements the option @@ -2117,9 +3587,13 @@ have been set, this option displays the entry on first use as:\\[10pt] while subsequent use displays the entry as:\\[10pt] \cs{acronymfont}\marg{abbrv}\meta{insert}\\[10pt] where \cs{acronymfont} is set to \verb|{\smaller #1}|. +The entries will be sorted according to the short form. +\begin{important} Remember to load a package that defines \ics{smaller} (such as -\isty{relsize}) if you want to use this option. +\isty{relsize}) if you want to use this option, unless you want +to redefine \ics{acronymfont} to use some other formatting command. +\end{important} Note also that if this package option is used, the \sty{glossaries} package additionally implements the option @@ -2132,7 +3606,8 @@ If none of the package options \pkgopt{smallcaps}, \pkgopt{smaller}, then on first use the entry is displayed as:\\[10pt] \meta{long} (\meta{abbrv})\meta{insert}\\[10pt] while subsequent use displays the entry as:\\[10pt] -\meta{abbrv}\meta{insert} +\meta{abbrv}\meta{insert}\\[10pt] +Entries will be sorted according to the short form. \end{description} Recall from \ifmakedtx{\autoref{sec:glslink}}{\htmlref{earlier}{sec:glslink}} @@ -2179,7 +3654,7 @@ relevant entry in the glossary. Note that if you change the definition of \ics{newacronym}, you may additionally need to change the above commands as well as -the changing way the text is displayed using \ics{defglsdisplay} +changing the way the text is displayed using \ics{defglsdisplay} and \ics{defglsdisplayfirst}. The package option \pkgopt{shortcuts} provides the synonyms listed @@ -2190,7 +3665,7 @@ option. Note that there are no shortcuts for the commands that produce all upper case text. \begin{table}[htbp] -\caption{Synonyms provided by the package option \pkgopt{shortcuts}} +\caption[Synonyms provided by the package option shortcuts]{Synonyms provided by the package option \pkgopt{shortcuts}} \label{tab:shortcuts} \begin{center} \begin{tabular}{ll} @@ -2242,23 +3717,33 @@ entry has been used, \meta{true part} will be done, otherwise \subsection{Glossary Styles} \label{sec:styles} The \sty{glossaries} package comes with some pre-defined -glossary styles. These are as follows: +glossary styles. Note that the styles are suited to different +types of glossaries: some styles ignore the associated +symbol; some styles are not designed for hierarchical entries, +so they display sub-entries in the same way as they display top +level entries; some styles are designed for homographs, so they +ignore the name for sub-entries. You should therefore pick a style +that suits your type of glossary. +The predefined styles are as follows: + \begin{description} \item[list] The \glostyle{list} style uses the \envname{description} -environment. The entry name is placed in the optional argument -of the \cs{item} command (so it will appear in bold by -default). The description follows, and then the associated number -list for that entry. Sub groups are separated using \cs{indexspace}. +environment. The entry name is placed in the optional argument of +the \cs{item} command (so it will appear in bold by default). The +description follows, and then the associated \term{number list} for +that entry. The symbol is ignored. If the entry has child entries, +the description and number list follows (but not the name) for each +child entry. Groups are separated using \cs{indexspace}. \item[listgroup] The \glostyle{listgroup} style is like \glostyle{list} but the glossary groups have headings. \item[listhypergroup] The \glostyle{listhypergroup} style is like -\glostyle{listgroup} 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 -is up-to-date. In the navigation panel, each group is separated +\glostyle{listgroup} but has a navigation line at the start of +the glossary with links to each group that is present in the +glossary. This requires an additional run through \LaTeX\ to ensure +the group information is up-to-date. In the navigation line, each +group is separated by \DescribeMacro{\glshypernavsep}\cs{glshypernavsep} which defaults to a vertical bar with a space on either side. For example, to simply have a space separating each group, do: @@ -2266,21 +3751,24 @@ to simply have a space separating each group, do: \renewcommand*{\glshypernavsep}{\space} \end{verbatim} -Note that the hyper-navigation panel is now (as from version 1.14) +Note that the hyper-navigation line is now (as from version 1.14) set inside the optional argument to \cs{item} instead of after it to prevent a spurious space at the start. This can be changed by redefining \ics{glossaryheader}, but note that this needs to be done \emph{after} the glossary style has been set. \item[altlist] The \glostyle{altlist} style is like \glostyle{list} -but the description is placed on the following line. +but the description starts on the line following the name. (As +with the \glostyle{list} style, the symbol is ignored.) Each child +entry starts a new line, but as with the \glostyle{list} style, +the name associated with each child entry is ignored. \item[altlistgroup] The \glostyle{altlistgroup} style is like \glostyle{altlist} but the glossary groups have headings. \item[altlisthypergroup] The \glostyle{altlisthypergroup} style is like \glostyle{altlistgroup} but has a set of links to the glossary -groups. The navigation panel is the same as that for +groups. The navigation line is the same as that for \glostyle{listhypergroup}, described above. \item[listdotted] This style uses the \envname{description} @@ -2289,16 +3777,19 @@ name followed by a dotted line, followed by the description. Note that this style ignores both the \term{number list} and the symbol. The length \DescribeMacro{\glslistdottedwidth}\cs{glslistdottedwidth} governs where the description should start.\footnote{This style was -supplied by Axel~Menzel.} +supplied by Axel~Menzel.} This is a flat style, so child +entries are formatted in the same way as the parent entries. \item[long] The \glostyle{long} style uses the \envname{longtable} 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}. +The entry's symbol is ignored. 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}. +\ics{glsdescwidth}. Child entries have a similar format to the +parent entries except that their name is suppressed. \item[longborder] The \glostyle{longborder} style is like \glostyle{long} but has horizontal and vertical lines around it. @@ -2313,10 +3804,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}. The width of the -first column is governed by the widest entry in that column. The +and the third column contains the \term{number list}. +The entry's symbol is ignored. 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 +\ics{glsdescwidth}, and the width of the third column is governed by the length \ics{glspagelistwidth}. \item[long3colborder] The \glostyle{long3colborder} style is like @@ -2334,8 +3826,8 @@ around it. \glostyle{long3col} 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 \glostyle{altlong4col} for long -descriptions. +widest entry in the given column. Use \glostyle{altlong4col} for +multi-line descriptions. \item[long4colborder] The \glostyle{long4colborder} style is like the \glostyle{long4col} style but has horizontal and vertical @@ -2348,12 +3840,12 @@ 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 +\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 widths of the +name and symbol columns are governed by the widest entry in the given column. \item[altlong4colborder] The \glostyle{altlong4colborder} style is like @@ -2372,10 +3864,12 @@ descriptions and page lists. 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}. +The entry's symbol is ignored. 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}. +\ics{glsdescwidth}. Child entries have a similar format to the +parent entries except that their name is suppressed. \item[superborder] The \glostyle{superborder} style is like \glostyle{super} but has horizontal and vertical lines around it. @@ -2390,7 +3884,8 @@ 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}. The width of the +and the third column contains the \term{number list}. The +entry's symbol is ignored. 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 @@ -2412,7 +3907,7 @@ lines around it. 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. +for multi-line descriptions. \item[super4colborder] The \glostyle{super4colborder} style is like the \glostyle{super4col} style but has horizontal and vertical @@ -2446,6 +3941,76 @@ page lists. style is like \glostyle{super4colheaderborder} but allows multi-line descriptions and page lists. +\item[index] The \glostyle{index} style is similar to the +way indices are usually formatted in that it has a +hierarchical structure up to three levels. The name is typeset in +bold, and if the symbol is present it is set in parentheses after +the name and before the description. Sub-entries are indented and +also include the name, the symbol (if present) and the description. +Groups are separated using \ics{indexspace}. + +\item[indexgroup] The \glostyle{indexgroup} style is similar to +the \glostyle{index} style except that each group has a heading. + +\item[indexhypergroup] The \glostyle{indexhypergroup} style is like +\glostyle{indexgroup} but has a set of links to the glossary +groups. The navigation line is the same as that for +\glostyle{listhypergroup}, described above. + +\item[tree] The \glostyle{tree} style is similar to the +\glostyle{index} style except that it can have arbitrary levels. +(Note that \appname{makeindex} is limited to three levels, so +you will need to use \appname{xindy} if you want more than +three levels.) Each sub-level is indented by +\DescribeMacro{\glstreeindent}\cs{glstreeindent}. Note that the +name, symbol (if present) and description are placed in the +same paragraph block. If you want the name to be apart from the +description, use the \glostyle{alttree} style instead. (See below.) + +\item[treegroup] The \glostyle{treegroup} style is similar to +the \glostyle{tree} style except that each group has a heading. + +\item[treehypergroup] The \glostyle{treehypergroup} style is like +\glostyle{treegroup} but has a set of links to the glossary +groups. The navigation line is the same as that for +\glostyle{listhypergroup}, described above. + +\item[treenoname] The \glostyle{treenoname} style is like +the \glostyle{tree} style except that the name for each sub-entry +is ignored. + +\item[treenonamegroup] The \glostyle{treenonamegroup} style is +similar to the \glostyle{treenoname} style except that each group +has a heading. + +\item[treenonamehypergroup] The \glostyle{treenonamehypergroup} +style is like \glostyle{treenonamegroup} but has a set of links to +the glossary groups. The navigation line is the same as that for +\glostyle{listhypergroup}, described above. + +\item[alttree] The \glostyle{alttree} style is similar to the +\glostyle{tree} style except that the indentation for each level +is determined by the width of the text specified by\\[10pt] +\DescribeMacro{\glssetwidest}\cs{glssetwidest}\oarg{level}\marg{text}\\[10pt] +The optional argument \meta{level} indicates the level, where +0 indicates the top-most level, 1 indicates the first level +sub-entries, etc. If \cs{glssetwidest} hasn't been used for a +given sub-level, the level~0 widest text is used instead. If +\meta{level} is omitted, 0 is assumed. + +For each level, the name is placed to the left of the paragraph +block containing the symbol (optional) and the description. If the +symbol is present, it is placed in parentheses before the +description. + +\item[alttreegroup] The \glostyle{alttreegroup} is like the +\glostyle{alttree} style except that each group has a heading. + +\item[alttreehypergroup] The \glostyle{alttreehypergroup} style is +like \glostyle{alttreegroup} but has a set of links to the glossary +groups. The navigation line is the same as that for +\glostyle{listhypergroup}, described above. + \end{description} The glossary style can be set using the \pkgopt{style} package option @@ -2462,6 +4027,9 @@ width of the page list column. These will need to be changed using 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 want to explicitly create a line-break within +a multi-line description you should use \ics{newline} instead +of \verb|\\|. Note that if you use the \gloskey[printglossary]{style} key in the optional argument to \ics{printglossary}, it will override any @@ -2483,7 +4051,11 @@ will reset \cs{glsgroupskip} back to its default definition for the 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}. +\ics{glossarystyle}, e.g.: +\begin{verbatim} +\glossarystyle{long} +\renewcommand*{\glsgroupskip}{} +\end{verbatim} \changes{1.03}{2007 July 4}{'glspostdescription added} All the styles except for the three- and four-column styles and the @@ -2492,9 +4064,13 @@ All the styles except for the three- and four-column styles and 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 will need to redefine \cs{glspostdescription} before the glossary is -displayed.\ifmakedtx{}{\toTop} +displayed. Alternatively, you can suppress it for a given entry +by placing \ics{nopostdesc} in the entry's description. + +\ifmakedtx{}{\toTop} \subsection{Defining your own glossary style} +\label{sec:newglossarystyle} If the predefined styles don't fit your requirements, you can define your own style using\DescribeMacro{\newglossarystyle}:\\[10pt] @@ -2533,7 +4109,8 @@ 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 \gloskey{sort} key (or \gloskey{name} key if the \gloskey{sort} key is omitted). The sub-divisions are in the following order: symbols, -numbers, A, \ldots, Z. Note that the argument to \cs{glsgroupheading} +numbers, A, \ldots, Z\@. (This may be different if you use +\appname{xindy}.) Note that the argument to \cs{glsgroupheading} is a label \emph{not} the group title. The group title can be obtained via \cs{glsgetgrouptitle}\marg{label}, and a navigation hypertarget can be created using \cs{glsnavhypertarget}\marg{label}. Most of the @@ -2545,14 +4122,16 @@ ignore its argument. The \glostyle{listhypergroup} style redefines \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]} \end{verbatim} See also \cs{glsgroupskip} below. (Note that command definitions within -\cs{newglossarystyle} must use \verb|##1| etc instead of \verb|#1| etc.) +\cs{newglossarystyle} must use \verb|##1| instead of \verb|#1| etc.) \item \DescribeMacro{\glsgroupskip} \cs{glsgroupskip}\par\noindent This macro determines what to do after one logical group but before the header for the next logical group. The \glostyle{list} glossary -style simply redefines \cs{glsgroupskip} to be \cs{indexspace}. +style simply redefines \cs{glsgroupskip} to be \cs{indexspace}, +whereas the tabular-like styles redefine \cs{glsgroupskip} to +produce a blank row. \item \DescribeMacro{\glossaryentryfield} @@ -2599,6 +4178,17 @@ redefines \cs{glossaryentrynumbers} 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 \pkgopt{nonumberlist} package option. + +\item +\DescribeMacro{\glossarysubentryfield} +\cs{glossarysubentryfield}\marg{level}\marg{label}\marg{formatted +name}\marg{description}\marg{symbol} +\marg{number list}\par\noindent +This is new to version 1.17, and is used to display sub-entries. +The first argument, \meta{level}, indicates the sub-entry level. +This must be an integer from 1 (first sub-level) onwards. The +remaining arguments are analogous to those for +\ics{glossaryentryfield} described above. \end{description}\ifmakedtx{}{\toTop} \subsubsection{Example: creating a completely new style} @@ -2638,8 +4228,13 @@ at the end. Then you can create this new glossary style, called, say, \space ##3% the description \space [##5]% the number list in square brackets }% + % set how sub-entries appear: + \renewcommand*{\glossarysubentryfield}[6]{% + \glossaryentryfield{#2}{#3}{#4}{#5}{#6}}% } \end{verbatim} +Note that this style creates a flat glossary, where sub-entries +are displayed in exactly the same way as the top level entries. \ifmakedtx{}{\toTop} \subsubsection{Example: creating a new glossary style based on an @@ -2666,7 +4261,7 @@ follows: \section{Mfirstuc Package} \label{sec:mfirstuc} -The \sty{glossaries} package is supplied with the package +The \sty{glossaries} bundle is supplied with the package \isty{mfirstuc} which provides the command:\\[10pt] \DescribeMacro{\makefirstuc} \cs{makefirstuc}\marg{stuff}\\[10pt] @@ -2681,12 +4276,18 @@ object in the group is converted to uppercase. Examples: (\ics{MakeUppercase} has been applied to the letter \dq{a} rather than \cs{emph}.) -\item \verb|\makefirstuc{{\'a}bc}| produces {\'A}bc +\item \verb|\makefirstuc{{\'a}bc}| produces \MakeUppercase{\'a}bc + +\item \verb|\makefirstuc{\ae bc}| produces \ifmakedtx{\MakeUppercase\ae bc}{\AE bc} + +\item \verb|\makefirstuc{{\ae}bc}| produces \ifmakedtx{\MakeUppercase{\ae}bc}{\AE bc} -\item \verb|\makefirstuc{\ae bc}| produces \AE bc +\item \verb|\makefirstuc{{ä}bc}| produces \ifmakedtx{\MakeUppercase{ä}bc}{\MakeUppercase{\"a}bc} -\item \verb|\makefirstuc{{\ae}bc}| produces {\AE}bc \end{itemize} +Note that non-Latin or accented characters appearing at the +start of the text must be placed in a group (even if you are +using the \isty{inputenc} package) due to expansion issues. \begin{important} In version 1.02 of \sty{mfirstuc}, a bug fix resulted in a change @@ -2702,7 +4303,7 @@ Note also that \makefirstuc{\abc} \end{verbatim} produces: ABC. This is because the first object in the argument of -\cs{makefirstuc} is \cs{abc}, so it does \verb|\MakeUppercase{\abc}|. +\cs{makefirstuc} is \cs{abc}, so it does \verb|\MakeUppercase\abc|. Whereas: \begin{verbatim} \newcommand{\abc}{abc} @@ -2719,8 +4320,8 @@ This is equivalent to \cs{expandafter}\cs{makefirstuc}\cs{expandafter}\marg{stuf produces: Abc. If you want to use an alternative command to convert to uppercase, -for example \cs{MakeTextUppercase}\footnote{defined in the -\sty{textcase} package}, you can redefine the internal +for example \cs{MakeTextUppercase},\footnote{defined in the +\sty{textcase} package} you can redefine the internal command \cs{@gls@makefirstuc}. For example: \begin{verbatim} \renewcommand{\@gls@makefirstuc}[1]{\MakeTextUppercase #1} diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries.pdf b/Master/texmf-dist/doc/latex/glossaries/glossaries.pdf Binary files differindex 11a435b53bb..44fe93c7b30 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf Binary files differindex f72177a7152..dacc6f8a24b 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex index 768bddf6924..f8ba9ff12ae 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex @@ -23,9 +23,9 @@ \documentclass{article} \listfiles -\usepackage{hyperref} - %\usepackage{glossaries} % acronym will go in main glossary - \usepackage[acronym,footnote]{glossaries} % make a separate list of acronyms +\usepackage[colorlinks]{hyperref} + \usepackage{glossaries} % acronym will go in main glossary + %\usepackage[acronym]{glossaries} % make a separate list of acronyms \makeglossaries diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex index f91ab534f8e..39d57b22605 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex @@ -1,15 +1,24 @@ \documentclass[a4paper]{report} \usepackage[plainpages=false,colorlinks]{hyperref} -\usepackage[style=altlist]{glossaries} +\usepackage[toc,style=treenoname,order=word]{glossaries} \makeglossaries \newglossaryentry{glossary}{name=glossary, -description={1) list of technical words, 2) collection of -glosses}, +description={\nopostdesc}, plural={glossaries}} +\newglossaryentry{glossarylist}{ +description={1) list of technical words}, +sort={1}, +parent={glossary}} + +\newglossaryentry{glossarycol}{ +description={2) collection of glosses}, +sort={2}, +parent={glossary}} + \newglossaryentry{Perl}{name=\texttt{Perl}, sort=Perl, % need a sort key because name contains a command description=A scripting language} @@ -25,10 +34,41 @@ description={rectangular array of quantities}, % plural is not simply obtained by appending an s, so specify plural=matrices} -\newcommand{\pardescription}{distinct section of piece of -writing.\par Beginning on new, usually indented, line} + % entry with a paragraph break in the description + \newglossaryentry{par}{name=paragraph, -description=\pardescription} +description={distinct section of piece of +writing.\glspar Beginning on new, usually indented, line}} + + % entry with two types of plural. Set the plural form to the + % form most likely to be used. If you want to use a different + % plural, you will need to explicity specify it in \glslink +\newglossaryentry{cow}{name=cow, + % this isn't necessary, as this form (appending an s) is + % the default +plural=cows, + % description: +description={(\emph{pl.}\ cows, \emph{archaic} kine) an adult +female of any bovine animal}} + +\newglossaryentry{bravo}{name={bravo}, +description={\nopostdesc}} + +\newglossaryentry{bravo1}{description={1) cry of approval (pl.\ bravos)}, +sort={1}, +plural={bravos}, +parent=bravo} + +\newglossaryentry{bravo2}{description={2) hired ruffian or killer (pl.\ bravoes)}, +sort={2}, +plural={bravoes}, +parent=bravo} + +\newglossaryentry{seal}{name=seal,description={sea mammal with +flippers that eats fish}} + +\newglossaryentry{sealion}{name={sea lion}, +description={large seal}} \begin{document} @@ -43,11 +83,11 @@ description=\pardescription} \chapter{Introduction} \pagenumbering{arabic} -A \gls{glossary} is a very useful addition to any -technical document, although a \gls{glossary} can +A \gls{glossarylist} is a very useful addition to any +technical document, although a \gls{glossarycol} can also simply be a collection of glosses, which is another thing entirely. Some documents have -multiple \glspl{glossary}. +multiple \glspl{glossarylist}. Once you have run your document through \LaTeX, you will then need to run the \texttt{.glo} file through @@ -64,11 +104,29 @@ wrapper. If a comma appears within the name or description, grouping must be used, e.g.\ in the description of \gls{pagelist}. -Plurals are assumed to have the letter s appended, but if -this is not the case, as in \glspl{mtrx}, then you need -to specify the plural when you define the entry. +\chapter{Plurals and Paragraphs} + +Plurals are assumed to have the letter s appended, but if this is +not the case, as in \glspl{mtrx}, then you need to specify the +plural when you define the entry. If a term may have multiple +plurals (for example \glspl{cow}/\glslink{cow}{kine}) then +define the entry with the plural form most likely to be used and +explicitly specify the alternative form using \verb|\glslink|. +\Glspl{seal} and \glspl{sealion} have regular plural forms. + +\Gls{bravo} is a homograph, but the plural forms are spelt +differently. The plural of \gls{bravo1}, a cry of approval, +is \glspl{bravo1}, whereas the plural of \gls{bravo2}, a hired +ruffian or killer, is \glspl{bravo2}. + +\Glspl{par} can cause a problem in commands, so care is needed +when having a paragraph break in a \gls{glossarylist} entry. + +\chapter{Ordering} -\Glspl{par} can cause a problem in commands. +There are two types of ordering: word ordering (which places +``\gls{sealion}'' before ``\gls{seal}'') and letter ordering +(which places ``\gls{seal}'' before ``\gls{sealion}''). \printglossaries diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex index e8945a270e3..415a58b63e7 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex @@ -16,7 +16,7 @@ name={Support vector machine (svm)}% change the default way of displaying the en ]{svm}{svm}{support vector machine} \newacronym[description={Statistical pattern recognition technique -using the ``kernel trick'' (see also SVM)},% acronym's description +using the ``kernel trick'' (see also \glshyperlink[SVM]{svm})},% acronym's description name={Kernel support vector machine (ksvm)}% change the default way of displaying the entry name in the list of acronyms ]{ksvm}{ksvm}{kernel support vector machine} @@ -40,7 +40,8 @@ This is the entry in uppercase: \GLS{svm}. \chapter{Kernel Support Vector Machines} The \gls{ksvm} is \ifglsused{svm}{an}{a} \gls{svm} that uses -the so called ``kernel trick''. +the so called ``kernel trick''. This is the entry's description without +a link: \glsentrydesc{ksvm}. \glsresetall Possessive: \gls{ksvm}['s]. diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex index 39829705e77..e9ebc9cf811 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex @@ -4,10 +4,15 @@ \usepackage[colorlinks]{hyperref} \usepackage[style=long3colheader,counter=equation]{glossaries} +\makeglossaries + \newcommand{\erf}{\operatorname{erf}} \newcommand{\erfc}{\operatorname{erfc}} -\makeglossaries + % redefine the way hyperref creates the target for equations + % so that the glossary links to equation numbers work + +\renewcommand*\theHequation{\thechapter.\arabic{equation}} % Change the glossary headings diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex index 218b1a3fed4..1ec5c196775 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex @@ -1,3 +1,17 @@ + % To ensure that the page numbers are up-to-date: + % + % latex sampleEqPg + % makeglossaries sampleEqPg + % latex sampleEqPg + % makeglossaries sampleEqPg + % latex sampleEqPg + % + % The extra makeglossaries run is required because adding the + % glossary in the second LaTeX run shifts the page numbers on + % which means that the glossary needs to be updated again. + % (Note that this problem is avoided if the page numbering is + % reset after the glossary. For example, if the glossary has + % roman numbering and the subsequent pages have arabic numbering) \documentclass[a4paper,12pt]{report} \usepackage{amsmath} @@ -8,6 +22,11 @@ \newcommand{\erf}{\operatorname{erf}} \newcommand{\erfc}{\operatorname{erfc}} + % redefine the way hyperref creates the target for equations + % so that the glossary links to equation numbers work + +\renewcommand*\theHequation{\thechapter.\arabic{equation}} + \renewcommand{\glossaryname}{Index of Special Functions and Notations} \renewcommand{\glossarypreamble}{Numbers in italic indicate the equation number, diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex index b33269174f6..63fa4c202bd 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex @@ -60,9 +60,6 @@ doesn't have associated numbers. \tableofcontents \printglossaries - %\printglossary - %\setglossarysection{section} - %\printglossary[type=notation] \chapter{Introduction} \pagenumbering{arabic} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex new file mode 100644 index 00000000000..7c6034547f8 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex @@ -0,0 +1,64 @@ +\documentclass{report} + +\usepackage[colorlinks]{hyperref} +\usepackage[style=alttreehypergroup]{glossaries} + + % The alttree type of glossary styles need to know the + % widest entry name for each level +\glssetwidest{Roman letters} % level 0 widest name +\glssetwidest[1]{Sigma} % level 1 widest name + +\makeglossaries + +\newglossaryentry{greekletter}{name={Greek letters}, +text={Greek letter}, +description={\nopostdesc}} + +\newglossaryentry{sigma}{name={Sigma}, +text={\ensuremath{\Sigma}}, +first={\ensuremath{\Sigma} (uppercase sigma)}, +symbol={\ensuremath{\Sigma}}, +description={Used to indicate summation}, +parent=greekletter} + +\newglossaryentry{pi}{name={pi}, +text={\ensuremath{\pi}}, +first={\ensuremath{\pi} (lowercase pi)}, +symbol={\ensuremath{\pi}}, +description={Transcendental number}, +parent=greekletter} + +\newglossaryentry{romanletter}{name={Roman letters}, +text={Roman letter}, +description={\nopostdesc}} + +\newglossaryentry{e}{name={e}, +description={Unique real number such that the derivative of +the function $e^x$ is the function itself}, +parent=romanletter} + +\newglossaryentry{C}{name={C}, +description={Euler's constant}, +parent=romanletter} + +\begin{document} +This is a sample document illustrating hierarchical glossary +entries. + +\chapter{Greek Letters Used in Mathematics} + +Some information about \glspl{greekletter}. +The letter \gls{pi} is used to represent the ratio of a circle's +circumference to its diameter. +The letter \gls{sigma} is used to represent summation. + +\chapter{Roman Letters Used in Mathematics} + +Some information about \glspl{romanletter}. +The letter \gls{e} is the unique real number such that +the derivative of the function $e^x$ is the function itself. +The letter \gls{C} represents Euler's constant. + +\printglossaries + +\end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex new file mode 100644 index 00000000000..a134e1a5162 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex @@ -0,0 +1,48 @@ +\documentclass{article} + +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +\usepackage[xindy,nonumberlist,style=listgroup]{glossaries} + +\makeglossaries + +% Note that because the é is the first letter of the +% name, it needs to be grouped or it will cause a +% problem for \makefirstuc due to expansion issues. +\newglossaryentry{elite}{name={{é}lite}, +description={select group or class}} + +\newglossaryentry{elephant}{name=elephant, +description={large animal with trunk and tusks}} + +\newglossaryentry{elk}{name=elk, +description=large deer} + +\newglossaryentry{mannerly}{name=mannerly, +description=polite} + +% The œ is not the first letter, so it doesn't need to +% be grouped. +\newglossaryentry{manoeuvre}{name={manœuvre}, +description=planned and controlled movement} + +\newglossaryentry{manor}{name=manor, +description=large landed estate or its house} + +\newglossaryentry{odometer}{name=odometer, +description=instrument for measuring distance travelled by +a wheeled vehicle} + +\newglossaryentry{oesophagus}{name={{œ}sophagus}, +description={canal from mouth to stomach}} + +\newglossaryentry{ogre}{name=ogre, +description=man-eating giant} + +\begin{document} +\null % ensure that the first run produces some output +\glsaddall + +\printglossaries + +\end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-mc.xdy b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-mc.xdy new file mode 100644 index 00000000000..318205d8ffc --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-mc.xdy @@ -0,0 +1,594 @@ +;; xindy style file for samplexdy.tex that has Mc letter group + +(define-letter-group "A" :prefixes ("")) +(define-letter-group "B" :after "A" :prefixes ("")) +(define-letter-group "C" :after "B" :prefixes ("")) +(define-letter-group "D" :after "C" :prefixes ("")) +(define-letter-group "E" :after "D" :prefixes ("")) +(define-letter-group "F" :after "E" :prefixes ("")) +(define-letter-group "G" :after "F" :prefixes ("")) +(define-letter-group "H" :after "G" :prefixes ("¤")) +(define-letter-group "I" :after "H" :prefixes ("¨")) +(define-letter-group "J" :after "I" :prefixes ("¬")) +(define-letter-group "K" :after "J" :prefixes ("®")) +(define-letter-group "L" :after "K" :prefixes ("´")) +(define-letter-group "Mc" :after "L" :prefixes ("»")) +(define-letter-group "M" :after "Mc" :prefixes ("»")) +(define-letter-group "N" :after "M" :prefixes ("¼")) +(define-letter-group "O" :after "N" :prefixes ("Ã")) +(define-letter-group "P" :after "O" :prefixes ("È")) +(define-letter-group "Q" :after "P" :prefixes ("Ê")) +(define-letter-group "R" :after "Q" :prefixes ("Ë")) +(define-letter-group "S" :after "R" :prefixes ("Ð")) +(define-letter-group "T" :after "S" :prefixes ("Ú")) +(define-letter-group "U" :after "T" :prefixes ("à")) +(define-letter-group "V" :after "U" :prefixes ("å")) +(define-letter-group "W" :after "V" :prefixes ("æ")) +(define-letter-group "X" :after "W" :prefixes ("ë")) +(define-letter-group "Y" :after "X" :prefixes ("í")) +(define-letter-group "È" :after "Y" :prefixes ("ï")) +(define-letter-group "Z" :after "È" :prefixes ("ð")) +(define-letter-group "Ã" :after "Z" :prefixes ("ö")) +(define-letter-group "Æ¿" :after "Ã" :prefixes ("÷")) + +(define-rule-set "en-alphabetize" + + :rules (("à " "" :string) + ("Ã" "" :string) + ("Ã" "" :string) + ("æ" "" :string) + ("Ã" "" :string) + ("ç" "" :string) + ("ð" "" :string) + ("Ã" "" :string) + ("Ã" "" :string) + ("Ã" "" :string) + ("Ã" "" :string) + ("Ã" "" :string) + ("è" "" :string) + ("ë" "" :string) + ("ê" "" :string) + ("é" "" :string) + ("Ã" "¨" :string) + ("ï" "¨" :string) + ("Ã" "¼" :string) + ("ñ" "¼" :string) + ("Ã" "Ã" :string) + ("Ã" "Ã" :string) + ("ô" "Ã" :string) + ("ö" "Ã" :string) + ("Å" "Ã" :string) + ("Å" "Ã" :string) + ("È" "ï" :string) + ("È" "ï" :string) + ("þ" "ö" :string) + ("Ã" "ö" :string) + ("Ç·" "÷" :string) + ("Æ¿" "÷" :string) + ("a" "" :string) + ("A" "" :string) + ("b" "" :string) + ("B" "" :string) + ("C" "" :string) + ("c" "" :string) + ("d" "" :string) + ("D" "" :string) + ("E" "" :string) + ("e" "" :string) + ("F" "" :string) + ("f" "" :string) + ("g" "" :string) + ("G" "" :string) + ("H" "¤" :string) + ("h" "¤" :string) + ("I" "¨" :string) + ("i" "¨" :string) + ("J" "¬" :string) + ("j" "¬" :string) + ("K" "®" :string) + ("k" "®" :string) + ("L" "´" :string) + ("l" "´" :string) + ("Mc" "»" :string) + ("Mac" "»" :string) + ("M" "»" :string) + ("m" "»" :string) + ("N" "¼" :string) + ("n" "¼" :string) + ("O" "Ã" :string) + ("o" "Ã" :string) + ("P" "È" :string) + ("p" "È" :string) + ("q" "Ê" :string) + ("Q" "Ê" :string) + ("r" "Ë" :string) + ("R" "Ë" :string) + ("S" "Ð" :string) + ("s" "Ð" :string) + ("T" "Ú" :string) + ("t" "Ú" :string) + ("u" "à" :string) + ("U" "à" :string) + ("v" "å" :string) + ("V" "å" :string) + ("w" "æ" :string) + ("W" "æ" :string) + ("X" "ë" :string) + ("x" "ë" :string) + ("Y" "í" :string) + ("y" "í" :string) + ("z" "ð" :string) + ("Z" "ð" :string) + )) + +(define-rule-set "en-resolve-diacritics" + + :rules (("È" "¢" :string) + ("þ" "¢" :string) + ("Ç·" "¢" :string) + ("Ã" "¢" :string) + ("È" "¢" :string) + ("Æ¿" "¢" :string) + ("Ã" "£" :string) + ("Ã" "£" :string) + ("ð" "£" :string) + ("Ã" "£" :string) + ("Ã" "£" :string) + ("Ã" "£" :string) + ("ï" "£" :string) + ("ö" "£" :string) + ("ñ" "£" :string) + ("ç" "£" :string) + ("à " "£" :string) + ("Ã" "£" :string) + ("é" "£" :string) + ("Ã" "£" :string) + ("Ã" "¤" :string) + ("ô" "¤" :string) + ("Ã" "¤" :string) + ("è" "¤" :string) + ("Ã" "¥" :string) + ("ë" "¥" :string) + ("Ã" "¦" :string) + ("ê" "¦" :string) + ("Å" "ÿ" :string) + ("Ã" "ÿ" :string) + ("Å" "ÿ" :string) + ("æ" "ÿ" :string) + ("S" "¢" :string) + ("K" "¢" :string) + ("d" "¢" :string) + ("Y" "¢" :string) + ("E" "¢" :string) + ("y" "¢" :string) + ("g" "¢" :string) + ("e" "¢" :string) + ("J" "¢" :string) + ("q" "¢" :string) + ("D" "¢" :string) + ("b" "¢" :string) + ("z" "¢" :string) + ("w" "¢" :string) + ("Q" "¢" :string) + ("M" "¢" :string) + ("C" "¢" :string) + ("L" "¢" :string) + ("X" "¢" :string) + ("P" "¢" :string) + ("T" "¢" :string) + ("a" "¢" :string) + ("N" "¢" :string) + ("j" "¢" :string) + ("Z" "¢" :string) + ("u" "¢" :string) + ("k" "¢" :string) + ("t" "¢" :string) + ("W" "¢" :string) + ("v" "¢" :string) + ("s" "¢" :string) + ("B" "¢" :string) + ("H" "¢" :string) + ("c" "¢" :string) + ("I" "¢" :string) + ("G" "¢" :string) + ("U" "¢" :string) + ("F" "¢" :string) + ("r" "¢" :string) + ("x" "¢" :string) + ("V" "¢" :string) + ("h" "¢" :string) + ("f" "¢" :string) + ("i" "¢" :string) + ("A" "¢" :string) + ("O" "¢" :string) + ("n" "¢" :string) + ("m" "¢" :string) + ("l" "¢" :string) + ("p" "¢" :string) + ("R" "¢" :string) + ("o" "¢" :string) + )) + +(define-rule-set "en-resolve-case" + + :rules (("Ã" "8" :string) + ("Ã" "8" :string) + ("Ã" "8" :string) + ("Ã" "8" :string) + ("Ã" "8" :string) + ("Ã" "8" :string) + ("Ã" "8" :string) + ("Ã" "8" :string) + ("Ã" "8" :string) + ("Ç·" "8" :string) + ("Ã" "8" :string) + ("Ã" "8" :string) + ("È" "8" :string) + ("Ã" "8" :string) + ("Ã" "89" :string) + ("Å" "89" :string) + ("ð" "9" :string) + ("ô" "9" :string) + ("È" "9" :string) + ("ï" "9" :string) + ("ö" "9" :string) + ("ñ" "9" :string) + ("ç" "9" :string) + ("à " "9" :string) + ("þ" "9" :string) + ("è" "9" :string) + ("ë" "9" :string) + ("ê" "9" :string) + ("é" "9" :string) + ("Æ¿" "9" :string) + ("Å" "99" :string) + ("æ" "99" :string) + ("S" "8" :string) + ("K" "8" :string) + ("Y" "8" :string) + ("E" "8" :string) + ("J" "8" :string) + ("D" "8" :string) + ("Q" "8" :string) + ("M" "8" :string) + ("C" "8" :string) + ("L" "8" :string) + ("X" "8" :string) + ("P" "8" :string) + ("T" "8" :string) + ("N" "8" :string) + ("Z" "8" :string) + ("W" "8" :string) + ("B" "8" :string) + ("H" "8" :string) + ("I" "8" :string) + ("G" "8" :string) + ("U" "8" :string) + ("F" "8" :string) + ("V" "8" :string) + ("A" "8" :string) + ("O" "8" :string) + ("R" "8" :string) + ("d" "9" :string) + ("y" "9" :string) + ("g" "9" :string) + ("e" "9" :string) + ("q" "9" :string) + ("b" "9" :string) + ("z" "9" :string) + ("w" "9" :string) + ("a" "9" :string) + ("j" "9" :string) + ("u" "9" :string) + ("k" "9" :string) + ("t" "9" :string) + ("v" "9" :string) + ("s" "9" :string) + ("c" "9" :string) + ("r" "9" :string) + ("x" "9" :string) + ("h" "9" :string) + ("f" "9" :string) + ("i" "9" :string) + ("n" "9" :string) + ("m" "9" :string) + ("l" "9" :string) + ("p" "9" :string) + ("o" "9" :string) + )) + +(define-rule-set "en-ignore-special" + + :rules (("-" "" :string) + ("!" "" :string) + ("{" "" :string) + ("'" "" :string) + ("}" "" :string) + ("?" "" :string) + ("." "" :string) + )) + +(define-rule-set "en-resolve-special" + + :rules (("Ã" "¤" :string) + ("Ã" "¤" :string) + ("ð" "¤" :string) + ("Ã" "¤" :string) + ("Ã" "¤" :string) + ("Ã" "¤" :string) + ("ô" "¤" :string) + ("Ã" "¤" :string) + ("È" "¤" :string) + ("ï" "¤" :string) + ("Ã" "¤" :string) + ("ö" "¤" :string) + ("ñ" "¤" :string) + ("Ã" "¤" :string) + ("ç" "¤" :string) + ("Ã" "¤" :string) + ("à " "¤" :string) + ("þ" "¤" :string) + ("Ç·" "¤" :string) + ("è" "¤" :string) + ("Ã" "¤" :string) + ("ë" "¤" :string) + ("Ã" "¤" :string) + ("ê" "¤" :string) + ("é" "¤" :string) + ("È" "¤" :string) + ("Æ¿" "¤" :string) + ("Ã" "¤" :string) + ("Å" "¤¤" :string) + ("Ã" "¤¤" :string) + ("Å" "¤¤" :string) + ("æ" "¤¤" :string) + ("?" "¡" :string) + ("!" "¢" :string) + ("." "£" :string) + ("S" "¤" :string) + ("K" "¤" :string) + ("d" "¤" :string) + ("Y" "¤" :string) + ("E" "¤" :string) + ("y" "¤" :string) + ("g" "¤" :string) + ("e" "¤" :string) + ("J" "¤" :string) + ("q" "¤" :string) + ("D" "¤" :string) + ("b" "¤" :string) + ("z" "¤" :string) + ("w" "¤" :string) + ("Q" "¤" :string) + ("M" "¤" :string) + ("C" "¤" :string) + ("L" "¤" :string) + ("X" "¤" :string) + ("P" "¤" :string) + ("T" "¤" :string) + ("a" "¤" :string) + ("N" "¤" :string) + ("j" "¤" :string) + ("Z" "¤" :string) + ("u" "¤" :string) + ("k" "¤" :string) + ("t" "¤" :string) + ("W" "¤" :string) + ("v" "¤" :string) + ("s" "¤" :string) + ("B" "¤" :string) + ("H" "¤" :string) + ("c" "¤" :string) + ("I" "¤" :string) + ("G" "¤" :string) + ("U" "¤" :string) + ("F" "¤" :string) + ("r" "¤" :string) + ("x" "¤" :string) + ("V" "¤" :string) + ("h" "¤" :string) + ("f" "¤" :string) + ("i" "¤" :string) + ("A" "¤" :string) + ("O" "¤" :string) + ("n" "¤" :string) + ("m" "¤" :string) + ("l" "¤" :string) + ("p" "¤" :string) + ("R" "¤" :string) + ("o" "¤" :string) + ("-" "¥" :string) + ("'" "¦" :string) + ("{" "§" :string) + ("}" "¨" :string) + )) + +; The following section is customised for samplexdy.tex +; (copied from samplexdy.xdy automatically generated by +; samplexdy.tex) + +; required styles + +(require "tex.xdy") + +; list of allowed attributes (number formats) + +(define-attributes (("default" + "glsnumberformat" + "textrm" + "textsf" + "texttt" + "textbf" + "textmd" + "textit" + "textup" + "textsl" + "textsc" + "emph" + "glshypernumber" + "hyperrm" + "hypersf" + "hypertt" + "hyperbf" + "hypermd" + "hyperit" + "hyperup" + "hypersl" + "hypersc" + "hyperemph" + "hyperbfit"))) + +; user defined alphabets + + + +; location class definitions + +(define-location-class "roman-page-numbers" + ("roman-numbers-lowercase")) +(define-location-class "Roman-page-numbers" + ("roman-numbers-uppercase")) +(define-location-class "arabic-page-numbers" + ("arabic-numbers")) +(define-location-class "alpha-page-numbers" + ("alpha")) +(define-location-class "Alpha-page-numbers" + ("ALPHA")) +(define-location-class "Appendix-page-numbers" + ("ALPHA" :sep "." "arabic-numbers")) +(define-location-class "arabic-section-numbers" + ("arabic-numbers" :sep "." "arabic-numbers")) + +; user defined location classes + +(define-location-class "Numberstring" + (:sep "\protect \Numberstringnum {" "arabic-numbers" :sep "}")) + +; define cross-reference class + +(define-crossref-class "see" :unverified ) +(markup-crossref-list :class "see" + :open "\glsseeformat" :close "{}") + +; define the order of the location classes +(define-location-class-order ( + "roman-page-numbers" + "arabic-page-numbers" + "arabic-section-numbers" + "alpha-page-numbers" + "Roman-page-numbers" + "Alpha-page-numbers" + "Appendix-page-numbers" + "see" )) + +; define the glossary markup + +(markup-index + :open "\glossarysection[\glossarytoctitle]{\glossarytitle}\glossarypreamble~n\begin{theglossary}\glossaryheader~n" + :close "~n\end{theglossary}~n\glossarypostamble~n" + :tree) +(markup-letter-group-list :sep "\glsgroupskip~n") +(markup-indexentry :open "~n" :depth 0) +(markup-locclass-list :open "{\glossaryentrynumbers{\relax " + :sep ", " :close "}}") +(markup-locref-list :sep "\delimN ") +(markup-range :sep "\delimR ") + +; define format to use for locations + + +(markup-locref :open "~n\setentrycounter{page}\glsnumberformat{" + :close "}" + :attr "glsnumberformat") +(markup-locref :open "~n\setentrycounter{page}\textrm{" + :close "}" + :attr "textrm") +(markup-locref :open "~n\setentrycounter{page}\textsf{" + :close "}" + :attr "textsf") +(markup-locref :open "~n\setentrycounter{page}\texttt{" + :close "}" + :attr "texttt") +(markup-locref :open "~n\setentrycounter{page}\textbf{" + :close "}" + :attr "textbf") +(markup-locref :open "~n\setentrycounter{page}\textmd{" + :close "}" + :attr "textmd") +(markup-locref :open "~n\setentrycounter{page}\textit{" + :close "}" + :attr "textit") +(markup-locref :open "~n\setentrycounter{page}\textup{" + :close "}" + :attr "textup") +(markup-locref :open "~n\setentrycounter{page}\textsl{" + :close "}" + :attr "textsl") +(markup-locref :open "~n\setentrycounter{page}\textsc{" + :close "}" + :attr "textsc") +(markup-locref :open "~n\setentrycounter{page}\emph{" + :close "}" + :attr "emph") +(markup-locref :open "~n\setentrycounter{page}\glshypernumber{" + :close "}" + :attr "glshypernumber") +(markup-locref :open "~n\setentrycounter{page}\hyperrm{" + :close "}" + :attr "hyperrm") +(markup-locref :open "~n\setentrycounter{page}\hypersf{" + :close "}" + :attr "hypersf") +(markup-locref :open "~n\setentrycounter{page}\hypertt{" + :close "}" + :attr "hypertt") +(markup-locref :open "~n\setentrycounter{page}\hyperbf{" + :close "}" + :attr "hyperbf") +(markup-locref :open "~n\setentrycounter{page}\hypermd{" + :close "}" + :attr "hypermd") +(markup-locref :open "~n\setentrycounter{page}\hyperit{" + :close "}" + :attr "hyperit") +(markup-locref :open "~n\setentrycounter{page}\hyperup{" + :close "}" + :attr "hyperup") +(markup-locref :open "~n\setentrycounter{page}\hypersl{" + :close "}" + :attr "hypersl") +(markup-locref :open "~n\setentrycounter{page}\hypersc{" + :close "}" + :attr "hypersc") +(markup-locref :open "~n\setentrycounter{page}\hyperemph{" + :close "}" + :attr "hyperemph") +(markup-locref :open "~n\setentrycounter{page}\hyperbfit{" + :close "}" + :attr "hyperbfit") + +; define letter group list format + +(markup-letter-group-list :sep "\glsgroupskip~n") + +; letter group headings + +(markup-letter-group :open-head "\glsgroupheading{" + :close-head "}") + +(define-letter-group "glsnumbers" + :prefixes ("0" "1" "2" "3" "4" "5" "6" "7" "8" "9") + :before "A") + +; The following is copied from xindy/lang/english/utf8-lang.xdy + +(define-sort-rule-orientations (forward backward forward forward)) +(use-rule-set :run 0 + :rule-set ("en-alphabetize" "en-ignore-special")) +(use-rule-set :run 1 + :rule-set ("en-resolve-diacritics" "en-ignore-special")) +(use-rule-set :run 2 + :rule-set ("en-resolve-case" "en-ignore-special")) +(use-rule-set :run 3 + :rule-set ("en-resolve-special")) + diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex new file mode 100644 index 00000000000..c66ed0f66d0 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex @@ -0,0 +1,229 @@ + % This is a sample document illustrating how to use the + % glossaries package with xindy. To create the document: + % + % latex samplexdy + % makeglossaries samplexdy + % latex samplexdy + % + % If you don't have Perl installed, then use one of the + % following instead of makeglossaries: + % + % If you want to have a separate "Mc" letter group do: + % + % xindy -I xindy -M samplexdy-mc -t samplexdy.glg -o samplexdy.gls samplexdy.glo + % + % Otherwise do: + % + % xindy -L english -C utf8 -I xindy -M samplexdy -t samplexdy.glg -o samplexdy.gls samplexdy.glo + % +\documentclass{article} + +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +\usepackage{fmtcount} + + % remove redefinition of \thepage below if you want to uncomment + % the following line: + % \usepackage[colorlinks]{hyperref} + +\usepackage[xindy,style=altlistgroup]{glossaries} + + % Define a new command to do bold italic (it uses \hyperbf + % rather than \textbf in case I later introduce hyperlinks + % - although I would have to remove the fancy page numbering + % if I wanted to do that): + +\newcommand*{\hyperbfit}[1]{\textit{\hyperbf{#1}}} + + % Need to add this to the list of attributes in order + % to use it with xindy: + % (This command will have no effect if \noist is used) + +\GlsAddXdyAttribute{hyperbfit} + + % Redefine the page numbers so that they appear as a word: + + \renewcommand*{\thepage}{\Numberstring{page}} + + % Need to add this to the list of location styles. + % \Numberstring{page} gets expanded to + % \protect \Numberstringnum {<n>} (where <n> is the page number) + % so need to define the location in that format: + % (This command will have no effect if \noist is used) + +\GlsAddXdyLocation{Numberstring}{:sep "\string\protect\space + \string\Numberstringnum\space\glsopenbrace" + "arabic-numbers" :sep "\glsclosebrace"} + + % To have Mc as a separate group uncomment the following three + % lines: + + %\setStyleFile{samplexdy-mc} % note no extension + %\noist + %\GlsSetXdyLanguage{} + + % The above three lines specify to use samplexdy-mc.xdy (supplied + % with this file) and don't overwrite it. The language is + % unset using \GlsSetXdyLanguage{} as all the language + % dependent information is contained in samplexdy-mc.xdy + % Note that using \noist means that commands like + % \GlsAddXdyAttribute and \GlsAddXdyLocation will no longer have + % an effect. + + % Write the style file (if \noist isn't used) + % and activate glossary entries + +\makeglossaries + + % Define glossary entries + % \glshyperlink is used instead of \gls to prevent the glossary + % page numbers also appear in the locations, however I need + % to ensure that the referenced entries are added to the + % glossary via commands that use \glslink, \glsadd or \glssee + +\newglossaryentry{mcadam}{name={McAdam, John Loudon}, +first={John Loudon McAdam},text={McAdam}, +description={Scottish engineer}} + +\newglossaryentry{maclaurin}{name={Maclaurin, Colin}, +first={Colin Maclaurin},text={Maclaurin}, +description={Scottish mathematician best known for the +\gls{maclaurinseries}}} + +\newglossaryentry{maclaurinseries}{name={Maclaurin series}, +description={Series expansion},see={taylorstheorem}} + +\newglossaryentry{taylorstheorem}{name={Taylor's theorem}, +description={Theorem expressing a function $f(x)$ as the sum of +a polynomial and a remainder: +\[f(x) = f(a)+f'(a)(x-a)+f''(a)(x-a^2)/2!+\cdots+R_n\] +If $n\to\infty$ the expansion is a \glshyperlink{taylorseries} +and if $a=0$, the series is called a +\gls{maclaurinseries}}} + +\newglossaryentry{taylorseries}{name={Taylor series}, +description={Series expansion},see={taylorstheorem}} + +\newglossaryentry{taylor}{name={Taylor, Brook}, +first={Brook Taylor},text={Taylor}, +description={English mathematician}} + +\newglossaryentry{mcnemar}{name={McNemar, Quinn}, +first={Quinn McNemar},text={McNemar}, +description={Mathematician who introduced +\gls{mcnemarstest}. This entry has the number list +suppressed},nonumberlist} + +\newglossaryentry{mcnemarstest}{name={McNemar's test}, +description={A nonparametric test introduced by +\gls{mcnemar} in 1947}} + +\newglossaryentry{mach}{name={Mach, Ernst}, +first={Ernst Mach},text={Mach}, + % if using samplexdy-mc.xdy, the following line is needed + % to prevent this entry being put in the "Mc" group +sort={mach, Ernst}, +description={Czech/Austrian physicist and philosopher}} + +\newglossaryentry{machnumber}{name={Mach number}, + % if using samplexdy-mc.xdy, the following line is needed + % to prevent this entry being put in the "Mc" group +sort={mach number}, +description={Ratio of the speed of a body in a fluid to the +speed of sound in that fluid named after \gls{mach}}} + +\newglossaryentry{malthus}{name={Malthus, Thomas Robert}, +first={Thomas Robert Malthus},text={Malthus}, +description={English mathematician, sociologist and classicist}} + +\newglossaryentry{ampereandre}{name={Ampère, André-Marie}, +first={André-Marie Ampère},text={Ampère}, +description={French mathematician and physicist}} + +\newglossaryentry{ampere}{name={ampere}, +description={SI unit of electric current named after +\gls{ampereandre}}} + +\newglossaryentry{archimedes}{name={Archimedes of Syracuse}, +first={Archimedes of Syracuse},text={Archimedes}, +description={Greek mathematician}} + +\newglossaryentry{archimedesprinciple}{name={Archemedes' principle}, +description={Principle that if a body is submerged in a fluid +it experiences upthrust equal to the weight of the displaced +fluid. Named after \gls{archimedes}}} + +\newglossaryentry{galton}{name={Galton, Sir Francis}, +first={Sir Francis Galton},text={Galton}, +description={English anthropologist}} + +\newglossaryentry{gauss}{name={Gauss, Karl Friedrich}, +first={Karl Friedrich Gauss},text={Gauss}, +description={German mathematician}} + +\newglossaryentry{gaussianint}{name={Gaussian integer}, +description={Complex number where both real and imaginary +parts are integers}} + +\newglossaryentry{peano}{name={Peano, Giuseppe}, +first={Giuseppe Peano},text={Peano}, +description={Italian mathematician}} + +\newglossaryentry{peanoscurve}{name={Peano's curve}, +description={A space-filling curve discovered by +\gls{peano}}} + +\newglossaryentry{pearson}{name={Pearson, Karl}, +first={Karl Pearson},text={Pearson}, +description={English mathematician}} + +\newglossaryentry{pearspmcc}{name={Pearson's product moment +correlation coefficient},description={Product moment correlation +coefficient named after \gls{pearson}}} + +\begin{document} +\title{Sample Document Using the Glossaries Package With Xindy} +\author{Nicola Talbot} +\maketitle + +\section{\glsentryfirst{gauss}} + +This is a section on \gls[format=(]{gauss}. This section spans +several pages. + +\newpage + +This page talks about \glspl[format=hyperbfit]{gaussianint}. Since +it's the principle definition, the user-defined hyperbfit format is +used. + +\newpage + +The section on \gls[format=)]{gauss} ends here. + +\section{Series Expansions} + +This section is about series expansions. It mentions +\gls{maclaurin} and \gls{taylor}. It also discusses +\gls{taylorstheorem} which is related to the \gls{taylorseries}. +The \gls{maclaurinseries} is a special case of the +\gls{taylorseries}. + +\section{\glsentryname{archimedesprinciple}} + +This section discusses \gls{archimedesprinciple} which was +introduced by \gls{archimedes}. + +\section{Another section} + +This section covers \gls{mach} who introduced the \gls{machnumber}. +It also mentions \gls{ampereandre} after whom the +SI unit \gls{ampere} is named. It then discusses \gls{galton} +and \gls{malthus}. Finally it mentions \gls{mcadam}. + +\newpage +This page discusses \gls{mcnemar} who introduced +\gls{mcnemarstest} and \gls{peano} who discovered \gls{peanoscurve}. + +\printglossaries +\end{document} diff --git a/Master/texmf-dist/scripts/glossaries/makeglossaries b/Master/texmf-dist/scripts/glossaries/makeglossaries index 3b9f1cb6b48..0e9ea00ef8a 100755 --- a/Master/texmf-dist/scripts/glossaries/makeglossaries +++ b/Master/texmf-dist/scripts/glossaries/makeglossaries @@ -2,8 +2,8 @@ # File : makeglossaries # Author : Nicola Talbot -# Version : 1.4 (2008/05/10) -# Description: simple Perl script that calls makeindex. +# Version : 1.5 (2008/12/26) +# Description: simple Perl script that calls makeindex or xindy. # Intended for use with "glossaries.sty" (saves having to remember # all the various switches) @@ -28,6 +28,9 @@ # Also makeglossaries and makeglossaries. # # History: +# v1.5 (2008-12-26) : +# * added support for xindy +# * picks up ordering information from aux file # v1.4 (2008-05-10) : # * added support for filenames with spaces. # v1.3 (2008-03-08) : @@ -44,15 +47,19 @@ use Getopt::Std; use strict; +use vars qw($opt_q $opt_t $opt_o $opt_s $opt_p $opt_g $opt_c $opt_r + $opt_l $opt_i $opt_L $opt_n $opt_C); -$Getopt::Std::STANDARD_HELP_VERSION = 1; -my $version="1.3 (2008-03-08)"; +$Getopt::Std::STANDARD_HELP_VERSION = 1; -my($opt_q, $opt_t, $opt_o, $opt_s, $opt_p, $opt_g, $opt_c, $opt_r, - $opt_l, $opt_i)=("","","","","","","","","",""); +my $version="1.5 (2008-12-26)"; -getopts('s:o:t:p:ilqrcg'); +# v1.5 added -L <lang> for xindy (but language can be specified in +# .tex file) +# v1.5 added -n (print the command that would be issued but +# don't actually run the command) +getopts('s:o:t:p:L:C:ilqrcgn'); unless ($#ARGV == 0) { @@ -65,6 +72,11 @@ my %exttype = ( main => {in=>'glo', out=>'gls', 'log'=>'glg'}, ); +# v1.5 define require languages for xindy + +my %language = (); +my %codepage = (); + my $ext = ''; my $name = $ARGV[0]; @@ -85,7 +97,11 @@ if (length($ARGV[0]) > 3 and substr($ARGV[0],-4,1) eq ".") } } -my $istfile = "$name.ist"; +my $istfile = ""; + +# should letter ordering be used? (v1.5 added) + +my $letterordering = defined($opt_l); # check aux file for other glossary types # and for ist file name @@ -101,7 +117,7 @@ if (open AUXFILE, "$name.aux") $exttype{$1}{'out'} = $3; $exttype{$1}{'in'} = $4; - if (!$opt_q) + unless ($opt_q) { print "added glossary type '$1' ($2,$3,$4)\n"; } @@ -114,6 +130,44 @@ if (open AUXFILE, "$name.aux") # check if double quotes were added to \jobname $istfile=~s/^"(.*)"\.ist$/$1.ist/; } + + # v1.5 added + if (m/\\\@xdylanguage\s*{([^}]+)}{([^}]*)}/) + { + $language{$1} = $2; + } + + # v1.5 added + if (m/\\\@gls\@codepage\s*{([^}]+)}{([^}]*)}/) + { + $codepage{$1} = $2; + } + + # v1.5 added + # Allow -l switch to override specification in aux file + unless (defined($opt_l)) + { + if (m/\\\@glsorder\s*{([^}]+)}/) + { + my $ordering = $1; + + if ($ordering eq "word") + { + $letterordering = 0; + } + elsif ($ordering eq "letter") + { + $letterordering = 1; + } + else + { + print STDERR + "WARNING: Unknown ordering '$letterordering'\n", + "Assuming word ordering\n"; + $letterordering = 0; + } + } + } } close AUXFILE; @@ -123,6 +177,23 @@ else print STDERR "Unable to open $name.aux: $!\n"; } +# has the style file been specified? +unless ($istfile) +{ + die "No \\\@istfilename found in '$name.aux'.\n", + "Did your LaTeX run fail?\n", + "Did your LaTeX run produce any output?\n"; +} + +# v1.5 save the general xindy switches + +my $xdyopts = ''; + +unless ($opt_L eq "") +{ + $xdyopts .= " -L $opt_L"; +} + # save all the general makeindex switches my $mkidxopts = ''; @@ -132,14 +203,16 @@ if ($opt_i) $mkidxopts .= " -i"; } -if ($opt_l) +if ($letterordering) { $mkidxopts .= " -l"; + $xdyopts .= " -M ord/letorder"; } if ($opt_q) { $mkidxopts .= " -q"; + $xdyopts .= " -q"; } if ($opt_r) @@ -167,16 +240,29 @@ unless ($opt_s eq "") $istfile = $opt_s; } +# Use xindy if style file ends with .xdy otherwise use makeindex + +my $usexindy = $istfile=~m/\.xdy\Z/; + if ($ext ne '') { + # an extension has been specified, so only process + # the specified file my %thistype = %{$exttype{'main'}}; #default + my $thislang = ""; + my $thiscodepage = ""; + foreach my $type (keys %exttype) { if ($exttype{$type}{'in'} eq $ext) { %thistype = %{$exttype{$type}}; + $thislang = $language{$type}; + + $thiscodepage = $codepage{$type}; + last; } } @@ -203,11 +289,21 @@ if ($ext ne '') $transcript = $opt_t; } - &makeindex("$name.$ext",$outfile,$transcript,$istfile, - $mkidxopts,$opt_q); + if ($usexindy) + { + &xindy("$name.$ext", $outfile, $transcript,$istfile, + $thislang, $thiscodepage, $xdyopts, $opt_q, $opt_n); + } + else + { + &makeindex("$name.$ext",$outfile,$transcript,$istfile, + $mkidxopts,$opt_q, $opt_n); + } } else { + # no file extension specified so process all glossary types + foreach my $type (keys %exttype) { my %thistype = %{$exttype{$type}}; @@ -238,8 +334,17 @@ else $transcript = $opt_t; } - &makeindex($inputfile,$outfile,$transcript, - $istfile,$mkidxopts,$opt_q); + if ($usexindy) + { + &xindy($inputfile,$outfile,$transcript,$istfile, + $language{$type},$codepage{$type}, + $xdyopts,$opt_q,$opt_n); + } + else + { + &makeindex($inputfile,$outfile,$transcript, + $istfile,$mkidxopts,$opt_q,$opt_n); + } } else { @@ -249,7 +354,7 @@ else } sub makeindex{ - my($in,$out,$trans,$ist,$rest,$quiet) = @_; + my($in,$out,$trans,$ist,$rest,$quiet,$dontexec) = @_; my($name,$cmdstr,$buffer,$n,$i,$j); my(@stuff,@item); @@ -260,26 +365,321 @@ sub makeindex{ print "makeindex $cmdstr\n"; } - `makeindex $cmdstr`; + unless ($dontexec) + { + open STATUS, "makeindex $cmdstr 2>&1 |" + or die "Can't fork: $!\n"; + + my $status = ''; + + while (<STATUS>) + { + $status .= $_; + } + + close STATUS; + + if ($?) + { + my $errno = $?; + + if (open LOGFILE, ">>$trans") + { + print LOGFILE "\n$status"; + close LOGFILE; + } + else + { + print STDERR "Unable to open '$trans' $!\n"; + } + + die "Call to makeindex failed (errno=$errno):\n", $status; + } + + print $status; + } +} + +sub xindy{ + my($in,$out,$trans,$ist,$language,$codepage,$rest,$quiet, + $dontexec) = @_; + my($cmdstr, $langparam, $main); + my($module); + + $module = $ist; + $module=~s/\.xdy\Z//; + + # map babel names to xindy names + if ($language eq "frenchb") + { + $language = "french"; + } + elsif ($language=~/^n?germanb?$/) + { + $language = "german"; + } + elsif ($language eq "magyar") + { + $language = "hungarian"; + } + elsif ($language eq "lsorbian") + { + $language = "lower-sorbian"; + } + elsif ($language eq "norsk") + { + $language = "norwegian"; + } + elsif ($language eq "portuges") + { + $language = "portuguese"; + } + elsif ($language eq "russianb") + { + $language = "russian"; + } + elsif ($language eq "slovene") + { + $language = "slovenian"; + } + elsif ($language eq "ukraineb") + { + $language = "ukrainian"; + } + elsif ($language eq "usorbian") + { + $language = "upper-sorbian"; + } + + if ($language) + { + $langparam = "-L $language"; + } + else + { + $langparam = ""; + } + + # most languages work with xindy's default codepage, but + # some don't, so if the codepage isn't specific, check + # the known cases that will generate an error + # and supply a default. (For all other cases, it's up to the + # user to supply a codepage.) + + if ($codepage eq '') + { + if ($language eq 'dutch') + { + $codepage = "ij-as-ij"; + } + elsif ($language eq 'german') + { + $codepage = "din"; + } + elsif ($language eq 'gypsy') + { + $codepage = "northrussian"; + } + elsif ($language eq 'hausa') + { + $codepage = "utf"; + } + elsif ($language eq 'klingon') + { + $codepage = "utf"; + } + elsif ($language eq 'latin') + { + $codepage = "utf"; + } + elsif ($language eq 'mongolian') + { + $codepage = "cyrillic"; + } + elsif ($language eq 'slovak') + { + $codepage = "small"; + } + elsif ($language eq 'spanish') + { + $codepage = "modern"; + } + elsif ($language eq 'vietnamese') + { + $codepage = "utf"; + } + } + + my $codepageparam = ""; + + if ($codepage) + { + $codepageparam = "-C $codepage"; + } + + $main = join(' ', + "-I xindy", + "-M \"$module\"", + "-t \"$trans\"", + "-o \"$out\"", + "\"$in\""); + + $cmdstr = join(' ', $rest, $langparam, $codepageparam, $main); + + unless ($quiet) + { + print "xindy $cmdstr\n"; + } + + unless ($dontexec) + { + open STATUS, "xindy $cmdstr 2>&1 |" or die "Can't fork: $!\n"; + + my $status = ''; + my $warnings = ""; + my $retry =""; + + while (<STATUS>) + { + $status .= $_; + + $warnings .= $_ if /WARNING:/; + } + + close STATUS; + + if ($status=~/Cannot locate xindy module for language ([^\s]+) in codepage ([^\s]+)/) + { + $cmdstr = join(' ', $rest, $langparam, $main); + + unless ($quiet) + { + my $message = "$&\nRetrying using default codepage.\n"; + + print STDERR $message; + + $retry .= $message; + + print "xindy $cmdstr\n"; + } + + open STATUS, "xindy $cmdstr 2>&1 |" + or die "Can't fork: $!\n"; + + $status = ''; + + while (<STATUS>) + { + $status .= $_; + } + + close STATUS; + } + + if ($status=~/Cannot locate xindy module for language ([^\s]+)/ + and $1 ne 'general') + { + $cmdstr = join(' ', $rest, "-L general", $main); + + unless ($quiet) + { + my $message = "$&\nRetrying with -L general\n"; + + print STDERR $message; + $retry .= $message; + + print "xindy $cmdstr\n"; + } + + open STATUS, "xindy $cmdstr 2>&1 |" + or die "Can't fork: $!\n"; + + $status = ''; + + while (<STATUS>) + { + $status .= $_; + } + + close STATUS; + } + + if ($?) + { + my $errno = $?; + + if (open LOGFILE, ">>$trans") + { + print LOGFILE "\n$status"; + close LOGFILE; + } + else + { + print STDERR "Unable to open '$trans' $!\n"; + } + + if ($language) + { + die "Call to xindy failed (errno=$errno):\n", $status; + } + else + { + # If the language hasn't been set, then it may be + # because the document doesn't contain + # \printglossaries/\printglossary or it may be + # because the user has a customized style file that + # contains the language settings. + + die "Call to xindy failed (errno=$errno):\n", $status, + "\n\nNo language detected.", + "\nHave you remembered to use \\printglossary\n", + "or \\printglossaries in your document?\n\n"; + } + } + + print $status; + + if (open LOGFILE, ">>$trans") + { + print LOGFILE "\n$warnings"; + + if ($retry) + { + print LOGFILE "\nmakeglossaries messages:\n\n", $retry; + } + + close LOGFILE; + } + else + { + print STDERR "Unable to open '$trans' $!\n"; + } + + } } sub HELP_MESSAGE{ print "\nSyntax : makeglossaries [options] <filename>\n\n"; print "For use with the glossaries package to pass relevant\n"; - print "files to makeindex\n\n"; + print "files to makeindex or xindy\n\n"; print "<filename>\tBase name of glossary file(s). This should\n"; print "\t\tbe the name of your main LaTeX document without any\n"; print "\t\textension.\n"; - print "\nOptions:\n"; + print "\n General Options:\n"; + print "-o <gls>\tUse <gls> as the output file.\n"; + print "-q\t\tQuiet mode\n"; + print "-s <sty>\tEmploy <sty> as the style file\n"; + print "-t <log>\tEmploy <log> as the transcript file\n"; + + print "\n Xindy Options:\n"; + print "-L <language>\tUse <language>.\n"; + + print "\n Makeindex Options:\n"; print "-c\t\tCompress intermediate blanks\n"; print "-g\t\tEmploy German word ordering\n"; print "-l\t\tLetter ordering\n"; - print "-o <gls>\tUse <gls> as the output file.\n"; print "-p <num>\tSet the starting page number to be <num>\n"; - print "-q\t\tQuiet mode\n"; print "-r\t\tDisable implicit page range formation\n"; - print "-s <sty>\tEmploy <sty> as the style file\n"; - print "-t <log>\tEmploy <log> as the transcript file\n"; print "\nSee makeindex documentation for further details on these "; print "options\n"; } diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx index 2f8ddb199a9..2dcfce07d7d 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx @@ -3,6 +3,7 @@ % Command line args: % -macrocode "glossaries\.perl" % -macrocode ".*\.tex" +% -macrocode ".*\.xdy" % -src "glossaries.sty\Z=>glossaries.sty" % -src "mfirstuc.sty\Z=>mfirstuc.sty" % -src "(glossary-.+)\.(sty)\Z=>\1.\2" @@ -10,18 +11,21 @@ % -src "(glossaries-dictionary-.+)\.(dict)\Z=>\1.\2" % -src "(minimalgls\.tex)\Z=>\1" % -src "(sample.*\.tex)\Z=>\1" +% -src "(samplexdy-mc\.xdy)\Z=>\1" % -src "(database.*\.tex)\Z=>\1" % -src "(glossaries\.perl)\Z=>\1" % -author "Nicola Talbot" % -dir "source" % -setambles "glossaries\.perl=>\nopreamble\nopostamble" % -setambles ".*\.tex=>\nopreamble\nopostamble" +% -setambles ".*\.xdy=>\nopreamble\nopostamble" % -comment "glossaries\.perl" % -comment ".*\.tex" +% -comment ".*\.xdy" % -doc "glossaries-manual.tex" % -codetitle "Documented Code" % glossaries -% Created on 2008/8/27 12:55 +% Created on 2008/12/26 16:49 %\fi %\iffalse %<*package> @@ -51,6 +55,8 @@ \documentclass[a4paper]{ltxdoc} \usepackage{ifthen} \usepackage{alltt} +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} \usepackage[colorlinks, bookmarks, hyperindex=false, @@ -72,7 +78,7 @@ \makeatother \RecordChanges \PageIndex -\CheckSum{5329} +\CheckSum{7758} \CodelineNumbered \newcommand*{\termdef}[1]{\emph{#1}\iterm{#1}} \newcommand*{\term}[1]{#1\iterm{#1}} @@ -96,24 +102,28 @@ \newcommand*{\istkey}[1]{\texttt{#1}\index{makeindex=\texttt{makeindex}>#1=\texttt{#1}|hyperpage}} +\newcommand*{\locfmt}[1]{\texttt{#1}\SpecialMainIndex{#1}} \newcommand*{\ics}[1]{\texttt{\char`\\#1}\SpecialMainIndex{#1}} \newcommand*{\appname}[1]{\texttt{#1}\index{#1=\texttt{#1}|hyperpage}} \newcommand*{\mkidxspch}{\index{makeindex=\texttt{makeindex}>special characters|hyperpage}} \newcommand*{\igloskey}[2][newglossaryentry]{\index{#1 options=\cs{#1} options>#2=\textsf{#2}|hyperpage}} \newcommand*{\gloskey}[2][newglossaryentry]{\textsf{#2}\igloskey[#1]{#2}} +\newcommand*{\pkgoptni}[1]{\textsf{#1}} \newcommand*{\ipkgopt}[2][]{% \ifthenelse{\equal{#1}{}}{% -\index{package options>#2=\textsf{#2}|hyperpage}}{% -\index{package options>#2=\textsf{#2}>#1=\textsf{#1}|hyperpage}}} +\index{package options>#2=\pkgoptni{#2}|hyperpage}}{% +\index{package options>#2=\pkgoptni{#2}>#1=\pkgoptni{#1}|hyperpage}}} \newcommand*{\pkgopt}[2][]{% \ifthenelse{\equal{#1}{}}{% -\textsf{#2}\index{package options>#2=\textsf{#2}|hyperpage}}{% -\textsf{#2=#1}\index{package options>#2=\textsf{#2}>#1=\textsf{#1}|hyperpage}}} -\newcommand*{\pkgoptval}[2]{\textsf{#1}\index{package options>#2=\textsf{#2}>#1=\textsf{#1}|hyperpage}} +\pkgoptni{#2}\index{package options>#2=\pkgoptni{#2}|hyperpage}}{% +\pkgoptni{#2=#1}\index{package options>#2=\pkgoptni{#2}>#1=\pkgoptni{#1}|hyperpage}}} +\newcommand*{\pkgoptval}[2]{\pkgoptni{#1}\index{package options>#2=\pkgoptni{#2}>#1=\pkgoptni{#1}|hyperpage}} \newcommand*{\glostyle}[1]{\textsf{#1}\index{glossary styles>#1|hyperpage}} \newcommand*{\filetype}[1]{\texttt{#1}\index{file types>#1|hyperpage}} \newcommand*{\sty}[1]{\textsf{#1}} \newcommand*{\isty}[1]{\sty{#1}\index{#1 package=\sty{#1} package|hyperpage}} +\newcommand*{\cls}[1]{\textsf{#1}} +\newcommand*{\icls}[1]{\cls{#1}\index{#1 class=\cls{#1} class|hyperpage}} \newcommand*{\envname}[1]{\textsf{#1}} @@ -124,7 +134,7 @@ %\MakeShortVerb{"} %\DeleteShortVerb{\|} % -% \title{glossaries.sty v 1.16: \LaTeXe\ Package to Assist Generating Glossaries} +% \title{glossaries.sty v 1.17: \LaTeXe\ Package to Assist Generating Glossaries} % \author{Nicola L.C. Talbot\\[10pt] %School of Computing Sciences\\ %University of East Anglia\\ @@ -132,7 +142,7 @@ %NR4 7TJ. United Kingdom.\\ %\url{http://theoval.cmp.uea.ac.uk/~nlct/}} % -% \date{27th August 2008} +% \date{26th December 2008} % \maketitle %\tableofcontents % @@ -140,26 +150,399 @@ % % \changes{1.0}{2007 May 16}{Initial version} %The \sty{glossaries} package is provided to assist generating -%glossaries. It has a certain amount of flexibility, allowing the user -%to customize the format of the glossary and define multiple glossaries. -%It also supports acronyms and glossary styles that include -%symbols (in addition to a name and description) for glossary +%glossaries. It has a certain amount of flexibility, allowing the +%user to customize the format of the glossary and define multiple +%glossaries. 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 \isty{glossary} package which is now -%obsolete. % -%This documentation is structured as follows: \autoref{sec:quick} is for people who want a few quick pointers of how to get started, -%without having to read through lengthy descriptions, -%\autoref{sec:overview} gives an overview of available commands and their syntax, \autoref{sec:mfirstuc} describes the associated -%\sty{mfirstuc} -%package, \autoref{sec:code} contains the documented source code for those who want to know more about how the -%package works and \autoref{sec:code:mfirstuc} contains the documented -%code for the \sty{mfirstuc} package. +%\textbf{This package replaces the \isty{glossary} package which is +%now obsolete. Please see the file +%\url{glossary2glossaries.pdf} for assistance in upgrading.} +% +%\begin{important} +%The \sty{glossaries} package comes with a +%\htmladdnormallink{Perl}{http://www.perl.org/about.html} script +%called \appname{makeglossaries}. This provides a convenient interface +%to \appname{makeindex} or \appname{xindy}. It is strongly +%recommended that you use this script, but it is not +%essential. If you are reluctant to install Perl, or for any +%other reason you don't want to use \appname{makeglossaries}, you +%can called \appname{makeindex} or \appname{xindy} explicitly. +%See \autoref{sec:makeglossaries} for +%further details. +%\end{important} +% +%One of the strengths of this package is its flexibility, however +%the drawback of this is the necessity of having a large manual +%that can cover all the various settings. The documentation is +%therefore structured as follows: +%\begin{itemize} +%\item \autoref{sec:quick} is for people who want a few quick +%pointers of how to get started creating a basic glossary, without +%having to read through lengthy descriptions. +% +%\item \autoref{sec:overview} gives an overview of available commands and their syntax. +% +%\item \autoref{sec:mfirstuc} describes the associated \sty{mfirstuc} package. +% +%\item\autoref{sec:code} contains the documented source code for those who +%want to know more about how the package works. +% +%\item \autoref{sec:code:mfirstuc} contains the documented code for +%the \sty{mfirstuc} package. +%\end{itemize} +% +%\noindent The remainder of this introductory section covers the +%following: +%\begin{itemize} +%\item \autoref{sec:samples} lists the sample documents provided +%with this package. +% +%\item \autoref{sec:languages} provides information for users who +%wish to write in a language other than English. +% +%\item \autoref{sec:makeglossaries} +%describes how to use a post-processor to create the sorted glossaries +%for your document. +% +%\item \autoref{sec:trouble} provides some assistance in the event that you encounter a problem. +%\end{itemize} +% +%\subsection{Sample Documents} +%\label{sec:samples} +% +%The \sty{glossaries} package is provided with some sample +%documents that illustrate the various functions. These should +%be located in the \texttt{samples} subdirectory (folder) of the +%\sty{glossaries} documentation directory. This location varies +%according to your operating system and \TeX\ distribution. +% +%The sample documents are as follows: +%\begin{description} +%\item[minimalgls.tex] This document is a minimal working example. +%You can test your installation using this file. To create the +%complete document you will need to do the following steps: +% \begin{enumerate} +% \item Run \texttt{minimalgls.tex} through \LaTeX\ by either +% typing +%\begin{verbatim} +%latex minimalgls +%\end{verbatim} +% in a terminal or by using the relevant button or menu item in +% your text editor or front-end. This will create the required +% associated files but you will not see the glossary. If you use +% PDF\LaTeX\ you will also get warnings about non-existent +% references. These warnings may be ignored on the first run. +% +% \item Run \appname{makeglossaries} on the document. This can +% be done on a terminal by either typing +%\begin{verbatim} +%makeglossaries minimalgls +%\end{verbatim} +% or by typing +%\begin{verbatim} +%perl makeglossaries minimalgls +%\end{verbatim} +% If your system doesn't recognise the command \texttt{perl} then +% it's likely you don't have Perl installed. In which case you +% will need to use \appname{makeindex} directly. You can do this +% in a terminal by typing (all on one line): +%\begin{verbatim} +%makeindex -s minimalgls.ist -t minimalgls.glg -o minimalgls.gls +%minimalgls.glo +%\end{verbatim} +% (See +%\autoref{sec:makeindexapp} for further details on using \appname{makeindex} explicitly.) +% +% Note that if you need to specify the full path and the path +% contains spaces, you will need to delimit the file names with +% the double-quote character. +% +% \item Run \texttt{minimalgls.tex} through \LaTeX\ again (as step~1) +% \end{enumerate} +%You should now have a complete document. The number following +%each entry in the glossary is the location number. By default, this +%is the page number where the entry was referenced. +% +%\item[sample4col.tex] This document illustrates a four column +%glossary where the entries have a symbol in addition to the +%name and description. To create the complete document, you need +%to do: +%\begin{verbatim} +%latex sample4col +%makeglossaries sample4col +%latex sample4col +%\end{verbatim} +%As before, if you don't have Perl installed, you will need to +%use \appname{makeindex} directly instead of using +%\appname{makeglossaries}. The vertical gap between entries +%is the gap created at the start of each group. This can be +%suppressed by redefining \ics{glsgroupskip} after the glossary +%style has been set: +%\begin{verbatim} +%\renewcommand*{\glsgroupskip}{} +%\end{verbatim} +% +%\item[sampleAcr.tex] This document has some sample acronyms. It +%also adds the glossary to the table of contents, so an extra +%run through \LaTeX\ is required to ensure the document is up-to-date: +%\begin{verbatim} +%latex sampleAcr +%makeglossaries sampleAcr +%latex sampleAcr +%latex sampleAcr +%\end{verbatim} +% +%\item[sampleAcrDesc.tex] This is similar to the previous example, +%except that the acronyms have an associated description. As with +%the previous example, the glossary is added to the table of +%contents, so an extra run through \LaTeX\ is required: +%\begin{verbatim} +%latex sampleAcrDesc +%makeglossaries sampleAcrDesc +%latex sampleAcrDesc +%latex sampleAcrDesc +%\end{verbatim} +% +%\item[sampleDesc.tex] This is similar to the previous example, +%except that it defines the acronyms using \ics{newglossaryentry} +%instead of \ics{newacronym}. As with +%the previous example, the glossary is added to the table of +%contents, so an extra run through \LaTeX\ is required: +%\begin{verbatim} +%latex sampleDesc +%makeglossaries sampleDesc +%latex sampleDesc +%latex sampleDesc +%\end{verbatim} +% +%\item[sampleDB.tex] This document illustrates how to load +%an external files containing the glossary definitions. It also +%illustrates how to define a new glossary type. This document +%has the \term{number list} suppressed and uses \ics{glsaddall} to add +%all the entries to the glossaries without referencing each one +%explicitly. To create the document do: +%\begin{verbatim} +%latex sampleDB +%makeglossaries sampleDB +%latex sampleDB +%\end{verbatim} +%The glossary definitions are stored in the files +%\texttt{database1.tex} and \texttt{database2.tex}. Note that if +%you don't have Perl installed, you will need to use +%\appname{makeindex} twice instead of using \appname{makeglossaries}: +%\begin{enumerate} +%\item Create the main glossary: +%\begin{verbatim} +%makeindex -s sampleDB.ist -t sampleDB.glg -o sampleDB.gls sampleDB.glo +%\end{verbatim} +%\item Create the secondary glossary: +%\begin{verbatim} +%makeindex -s sampleDB.ist -t sampleDB.nlg -o sampleDB.not sampleDB.ntn +%\end{verbatim} +%\end{enumerate} +% +%\item[sampleEq.tex] This document illustrates how to change the +%location to something other than the page number. In this case, +%the \texttt{equation} counter is used since all glossary entries +%appear inside an \envname{equation} environment. To create the +%document do: +%\begin{verbatim} +%latex sampleEq +%makeglossaries sampleEq +%latex sampleEq +%\end{verbatim} +% +%\item[sampleEqPg.tex] This is similar to the previous example, +%but the number lists\iterm{number list} are a mixture of page +%numbers and equation numbers. This example adds the glossary to the +%table of contents, so an extra \LaTeX\ run is required: +%\begin{verbatim} +%latex sampleEqPg +%makeglossaries sampleEqPg +%latex sampleEqPg +%latex sampleEqPg +%\end{verbatim} +% +%\item[sampleSec.tex] This document also illustrates how to change +%the location to something other than the page number. In this case, +%the \texttt{section} counter is used. This example adds the +%glossary to the table of contents, so an extra \LaTeX\ run is +%required: +%\begin{verbatim} +%latex sampleSec +%makeglossaries sampleSec +%latex sampleSec +%latex sampleSec +%\end{verbatim} +% +%\item[sampleNtn.tex] This document illustrates how to create +%an additional glossary type. This example adds the glossary to the +%table of contents, so an extra \LaTeX\ run is required: +%\begin{verbatim} +%latex sampleNtn +%makeglossaries sampleNtn +%latex sampleNtn +%latex sampleNtn +%\end{verbatim} +%Note that if you don't have Perl installed, you will need to use +%\appname{makeindex} twice instead of using \appname{makeglossaries}: +%\begin{enumerate} +%\item Create the main glossary: +%\begin{verbatim} +%makeindex -s sampleNtn.ist -t sampleNtn.glg -o sampleNtn.gls sampleNtn.glo +%\end{verbatim} +%\item Create the secondary glossary: +%\begin{verbatim} +%makeindex -s sampleNtn.ist -t sampleNtn.nlg -o sampleNtn.not sampleNtn.ntn +%\end{verbatim} +%\end{enumerate} +% +%\item[sample.tex] This document illustrates some of the basics, +%including how to create child entries that use the same name as the +%parent entry. This example adds the glossary to the table of +%contents, so an extra \LaTeX\ run is required: +%\begin{verbatim} +%latex sample +%makeglossaries sample +%latex sample +%latex sample +%\end{verbatim} +%You can see the difference between word and letter ordering +%if you substitute \pkgopt[word]{order} with +%\pkgopt[letter]{order}. (Note that this will only have an +%effect if you use \appname{makeglossaries}. If you use +%\appname{makeindex} explicitly, you will need to use the +%\texttt{-l} switch to indicate letter ordering.) +% +%\item[sampletree.tex] This document illustrates a hierarchical +%glossary structure where child entries have different names +%to their corresponding parent entry. To create the document do: +%\begin{verbatim} +%latex sampletree +%makeglossaries sampletree +%latex sampletree +%\end{verbatim} +% +%\item[samplexdy.tex] This document illustrates how to use the +%\sty{glossaries} package with \appname{xindy} instead of +%\appname{makeindex}. The document uses UTF8 encoding (with the +%\isty{inputenc} package). The encoding is picked up by +%\appname{makeglossaries}. By default, this document will create +%a \appname{xindy} style file called \texttt{samplexdy.xdy}, but +%if you uncomment the lines +%\begin{verbatim} +%\setStyleFile{samplexdy-mc} +%\noist +%\GlsSetXdyLanguage{} +%\end{verbatim} +%it will set the style file to \texttt{samplexdy-mc.xdy} instead. +%This provides an additional letter group for entries starting +%with \dq{Mc} or \dq{Mac}. If you use \appname{makeglossaries}, +%you don't need to supply any additional information. If you +%don't use \appname{makeglossaries}, you will need to specify the +%required information. Note that if you set the style file to +%\texttt{samplexdy-mc.xdy} you must also specify \ics{noist}, +%otherwise the \isty{glossaries} package will overwrite +%\texttt{samplexdy-mc.xdy} and you will lose the \dq{Mc} letter group. +% +%To create the document do: +%\begin{verbatim} +%latex samplexdy +%makeglossaries samplexdy +%latex samplexdy +%\end{verbatim} +%If you don't have Perl installed, you will have to call +%\appname{xindy} explicitly instead of using \appname{makeglossaries}. +%If you are using the default style file \texttt{samplexdy.xdy}, then +%do (no line breaks): +%\begin{verbatim} +%xindy -L english -C utf8 -I xindy -M samplexdy -t samplexdy.glg +%-o samplexdy.gls samplexdy.glo +%\end{verbatim} +%otherwise, if you are using \texttt{samplexdy-mc.xdy}, then do +%(no line breaks): +%\begin{verbatim} +%xindy -I xindy -M samplexdy-mc -t samplexdy.glg -o samplexdy.gls +%samplexdy.glo +%\end{verbatim} +% +%\item[sampleutf8.tex] This is another example that uses +%\appname{xindy}. Unlike \appname{makeindex}, \appname{xindy} can +%cope with accented or non-Latin characters. This document uses +%UTF8 encoding. To create the document do: +%\begin{verbatim} +%latex sampleutf8 +%makeglossaries sampleutf8 +%latex sampleutf8 +%\end{verbatim} +%If you don't have Perl installed, you will have to call +%\appname{xindy} explicitly instead of using \appname{makeglossaries} +%(no line breaks): +%\begin{verbatim} +%xindy -L english -C utf8 -I xindy -M sampleutf8 -t sampleutf8.glg +%-o sampleutf8.gls sampleutf8.glo +%\end{verbatim} +% +%If you remove the \pkgopt{xindy} option and do: +%\begin{verbatim} +%latex sampleutf8 +%makeglossaries sampleutf8 +%latex sampleutf8 +%\end{verbatim} +%you will see that the entries that start with a non-Latin character +%now appear in the symbols group, and the word \dq{manœuvre} is now +%after \dq{manor} instead of before it. If you are unable to use +%\appname{makeglossaries}, the call to \appname{makeindex} is as +%follows (no line breaks): +%\begin{verbatim} +%makeindex -s sampleutf8.ist -t sampleutf8.glg -o sampleutf8.gls +%sampleutf8.glo +%\end{verbatim} +% +%\end{description} % %\subsection{Multi-Lingual Support} %\label{sec:languages} % +%As from version 1.17, the \sty{glossaries} package can now be +%used with \appname{xindy} as well as \appname{makeindex}. If you +%are writing in a language that uses accented characters or +%non-Latin characters it is recommended that you use \appname{xindy} +%as \appname{makeindex} is hard-coded for Latin languages. This +%means that you are not restricted to the A, \ldots, Z letter groups. +%If you want to use \appname{xindy}, remember to use the +%\pkgopt{xindy} package option. For example: +%\begin{verbatim} +%\documentclass[frenchb]{article} +%\usepackage[utf8]{inputenc} +%\usepackage[T1]{fontenc} +%\usepackage{babel} +%\usepackage[xindy]{glossaries} +%\end{verbatim} +% +%\begin{important} +%If you use an accented or non-Latin character at the start of +%an entry name, you must place it in a group, or it will cause +%a problem for commands that convert the first letter to uppercase +%(e.g.\ \ics{Gls}) due to expansion issues. For example: +%\begin{verbatim} +%\newglossaryentry{elite}{name={{é}lite}, +%description={select group or class}} +%\end{verbatim} +%\end{important} +% +%If you use the \isty{inputenc} package, \appname{makeglossaries} +%will pick up the encoding from the auxiliary file. If you use +%\appname{xindy} explicitly instead of via \appname{makeglossaries}, +%you may need to specify the encoding using the \texttt{-C} +%option. Read the \appname{xindy} manual for further details. +% +%\subsubsection{Changing the Fixed Names} +%\label{sec:fixednames} +% %As from version 1.08, the \sty{glossaries} package now has %limited multi-lingual support, thanks to all the people who have sent %me the relevant translations either via email or via @@ -176,6 +559,14 @@ %\usepackage[spanish]{translator} %\usepackage{glossaries} %\end{verbatim} +%Alternatively, specify the language as a class option rather +%than a package option. For example: +%\begin{verbatim} +%\documentclass[spanish]{report} +% +%\usepackage{babel} +%\usepackage{glossaries} +%\end{verbatim} % %If you want to use \isty{ngerman} or \isty{german} instead %of \isty{babel}, you will need to include the \isty{translator} package @@ -187,10 +578,12 @@ %\usepackage{glossaries} %\end{verbatim} % -%The following languages are currently supported: +%The following languages are currently supported by the +%\isty{glossaries} package: %\begin{center} %\begin{tabular}{lc} %\bfseries Language & \bfseries As from version\\ +%Brazilian Portuguese & 1.17\\ %Danish & 1.08\\ %Dutch & 1.08\\ %English & 1.08\\ @@ -217,15 +610,15 @@ %\ics{acronymname} & \texttt{Acronyms} & Title of the list of acronyms %(when used with package option \pkgopt{acronym}).\\ %\ics{entryname} & \texttt{Notation (glossaries)} & -%Header for first column in glossary (for 2, 3 or 4 column glossaries +%Header for first column in the glossary (for 2, 3 or 4 column glossaries %that support headers).\\ %\ics{descriptionname} & \texttt{Description (glossaries)} & -%Header for second column in glossary (for 2, 3 or 4 column glossaries +%Header for second column in the glossary (for 2, 3 or 4 column glossaries %that support headers).\\ %\ics{symbolname} & \texttt{Symbol (glossaries)} & Header for symbol -%column in glossary for glossary styles that support this option.\\ +%column in the glossary for glossary styles that support this option.\\ %\ics{pagelistname} & \texttt{Page List (glossaries)} & -%Header for page list column in glossary for glossaries that support +%Header for page list column in the glossary for glossaries that support %this option.\\ %\ics{glssymbolsgroupname} & \texttt{Symbols (glossaries)} & %Header for symbols section of the glossary for glossary styles that @@ -252,54 +645,268 @@ %\deftranslation[to=Irish]{Symbol (glossaries)}{Siombail} %\end{verbatim} % +%Note that \appname{xindy} provides much better multi-lingual +%support than \appname{makeindex}, so it's recommended that you +%use \appname{xindy} if you have glossary entries that contain +%accented characters or non-Roman letters. See +%\autoref{sec:xindy} for further details. %\subsection{Generating the Associated Glossary Files} %\label{sec:makeglossaries} % +%In order to generate a sorted glossary with compact location lists, +%it is necessary to use an external indexing application as an +%intermediate step. It is this application that creates the file +%containing the code that typesets the glossary. If this step +%is omitted, the glossaries will not appear in your document. The +%two indexing applications that are most commonly used with +%\LaTeX\ are \appname{makeindex} and \appname{xindy}. As +%from version 1.17, the \sty{glossaries} package can be used +%with either of these applications. Previous versions were designed +%to be used with \appname{makeindex} only. Note that +%\appname{xindy} has much better multi-lingual support than +%\appname{makeindex}, so \appname{xindy} is recommended if you're +%not writing in English. Commands that only have an +%effect when \appname{xindy} is used are described +%in \autoref{sec:xindy}. +% %The \sty{glossaries} package comes with the Perl script -%\appname{makeglossaries} which will run \appname{makeindex} on -%all the glossary files using a customized \appname{makeindex} -%\filetype{.ist} style file (which is created by \ics{makeglossaries}). -%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 -%\texttt{myfile.tex}, do: +%\appname{makeglossaries} which will run \appname{makeindex} or +%\appname{xindy} on all the glossary files using a customized style +%file (which is created by \ics{makeglossaries}). See +%\autoref{sec:makeglossariesapp} for further +%details. Perl is stable, cross-platform, open source software that +%is used by a number of \TeX-related applications. Further +%information is available at \url{http://www.perl.org/about.html}. +%However, whilst it is strongly recommended that you use the +%\appname{makeglossaries} script, it is possible to use the +%\sty{glossaries} package without having Perl installed. In which +%case, if you have used the \pkgopt{xindy} package option, you will +%need to use \appname{xindy} (see +%\autoref{sec:xindyapp}), otherwise you will need to use +%\appname{makeindex} (see +%\autoref{sec:makeindexapp}). Note that some commands and +%package options have no effect if you don't use +%\appname{makeglossaries}. These are listed in +%Table~\ref{tab:makeglossariesCmds}. +% +%Note that if any of your entries use an entry +%that is not referenced outside the glossary, you will need to +%do an additional \appname{makeglossaries}, \appname{makeindex} +%or \appname{xindy} run, as appropriate. For example, +%suppose you have defined the following entries: %\begin{verbatim} -%latex myfile -%makeglossaries myfile -%latex myfile +%\newglossaryentry{citrusfruit}{name={citrus fruit}, +%description={fruit of any citrus tree. (See also +%\gls{orange})}} +% +%\newglossaryentry{orange}{name={orange}, +%description={an orange coloured fruit.}} +%\end{verbatim} +%and suppose you have \verb|\gls{citrusfruit}| in your document +%but don't reference the \texttt{orange} entry, then the +%\texttt{orange} entry won't appear in your glossary until +%you first create the glossary and then do another run +%of \appname{makeglossaries}, \appname{makeindex} or \appname{xindy}. +%For example, if the document is called \texttt{myDoc.tex}, then +%you must do: +%\begin{verbatim} +%latex myDoc +%makeglossaries myDoc +%latex myDoc +%makeglossaries myDoc +%latex myDoc +%\end{verbatim} +% +%Likewise, an additional \appname{makeglossaries} and \LaTeX\ run +%may be required if the document pages shift with re-runs. For +%example, if the page numbering is not reset after the table of +%contents, the insertion of the table of contents on the second +%\LaTeX\ run may push glossary entries across page boundaries, which +%means that the number lists\iterm{number list} in the glossary may +%need updating. +% +%The examples in this document assume that you are accessing +%\appname{makeglossaries}, \appname{xindy} or \appname{makeindex} via +%a terminal. Windows users can use the MSDOS Prompt which +%is usually accessed via the +%\textsf{Start}$\to$\textsf{All Programs} menu or +%\textsf{Start}$\to$\textsf{All Programs}%$\to$\textsf{Accessories} menu. Alternatively, your text editor may have the +%facility to create a function that will call the +%required application. See your editor's user manual for further +%details. +% +%If any problems occur, remember to check the transcript files +%(e.g.\ \filetype{.glg} or \filetype{.alg}) for messages. +% +%\begin{table}[htbp] +%\caption{Commands and package options that have no effect when +%using \texttt{xindy} or \texttt{makeindex} explicity} +%\label{tab:makeglossariesCmds} +%\vskip\baselineskip +%\begin{tabular}{@{}lll@{}} +%\bfseries Command or Package Option & \appname{makeindex} & +%\appname{xindy}\\ +%\pkgopt[letter]{order} & use \texttt{-l} & +% use \texttt{-M ord/letorder}\\ +%\pkgopt[word]{order} & default & default\\ +%\pkgopt{xindy}=\{\pkgoptni{language=}\meta{lang}\pkgoptni{,codename=}\meta{code}\} & +%N/A & use \texttt{-L} \meta{lang} \texttt{-C} \meta{code}\\ +%\ics{GlsSetXdyLanguage}\marg{lang} & N/A & +%use \texttt{-L} \meta{lang}\\ +%\ics{GlsSetXdyCodePage}\marg{code} & N/A & +%use \texttt{-C} \meta{code} +%\end{tabular} +%\par +%\end{table} +% +%\subsubsection{Using the makeglossaries Perl Script} +%\label{sec:makeglossariesapp} +% +%The \appname{makeglossaries} script picks up the relevant +%information from the auxiliary (\filetype{.aux}) file and +%will either call \appname{xindy} or \appname{makeindex}, +%depending on whether the indexing style file ends with +%\filetype{.xdy} or \filetype{.ist}. Therefore, you only need to +%pass the document's name without the extension to +%\appname{makeglossaries}. +%For example, if your document is called \texttt{myDoc.tex}, +%type the following in your terminal: +%\begin{verbatim} +%latex myDoc +%makeglossaries myDoc +%latex myDoc %\end{verbatim} %You may need to explicitly load \appname{makeglossaries} into %Perl: %\begin{verbatim} -%perl makeglossaries myfile +%perl makeglossaries myDoc %\end{verbatim} %There is a batch file called \texttt{makeglossaries.bat} which %does this for Windows users, but you must have Perl installed to %be able to use it. % -%If you don't have Perl installed, you will have to run -%\appname{makeindex} for each glossary type you have defined. -%For example, if you have used the \pkgopt{acronym} 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 \texttt{myfile.tex}): +%\subsubsection{Using xindy explicitly} +%\label{sec:xindyapp} +% +%If you want to use \appname{xindy} to process the glossary +%files, you must make sure you have used the +%\pkgopt{xindy} package option: %\begin{verbatim} -%makeindex -s myfile.ist -t myfile.glg -o myfile.gls myfile.glo -%makeindex -s myfile.ist -t myfile.alg -o myfile.acr myfile.acn +%\usepackage[xindy]{glossaries} +%\end{verbatim} +%This is required regardless of whether you use \appname{xindy} +%explicitly or via \appname{makeglossaries}. This causes the glossary +%entries to be written in raw \appname{xindy} format, so you need to +%use \texttt{-I xindy} \emph{not} \texttt{-I tex}. +% +%To run \appname{xindy} type the following in your terminal +%(all on one line):\\[10pt] +%\begin{ttfamily} +%xindy -L \textrm{\meta{language}} -C \textrm{\meta{encoding}} -I xindy +%-M \textrm{\meta{style}} -t \textrm{\meta{base}}.glg\newline +%-o \textrm{\meta{base}}.gls \textrm{\meta{base}}.glo +%\end{ttfamily} +%\\[10pt] +%where \meta{language} is required language name, \meta{encoding} is +%the encoding, \meta{base} is the name of the document without +%the \filetype{.tex} extension and \meta{style} is the name of the +%\appname{xindy} style file without the \filetype{.xdy} extension. The +%default name for this style file is \meta{base}\filetype{.xdy} but +%can be changed via \ics{setStyleFile}\marg{style}. You may need to +%specify the full path name. If any of the file names contain spaces, +%you must delimit them using double-quotes. +% +%For example, if your document is called \texttt{myDoc.tex} and +%you are using UTF8 encoding in English, then type the +%following in your terminal: +%\begin{verbatim} +%xindy -L english -C utf8 -I xindy -M myDoc -t myDoc.glg -o myDoc.gls myDoc.glo %\end{verbatim} -%This requires remembering all extensions for each of the glossaries -%defined in your document, so where possible you should use -%\appname{makeglossaries} instead to reduce the possibility of error. -%Don't pass all the glossary files in a single call to -%\appname{makeindex} or it will merge all your glossaries into a -%single glossary. % -%If any problems occur, remember to check the transcript files -%(e.g.\ \filetype{.glg} or \filetype{.alg}) for messages. +%Note that this just creates the main glossary. You need to do +%the same for each of the other glossaries (including the +%list of acronyms if you have used the \pkgopt{acronym} +%package option), substituting \filetype{.glg}, \filetype{.gls} +%and \filetype{.glo} with the relevant extensions. For example, +%if you have used the \pkgopt{acronym} package option, then +%you would need to do: +%\begin{verbatim} +%xindy -L english -C utf8 -I xindy -M myDoc -t myDoc.alg -o myDoc.acr myDoc.acn +%\end{verbatim} +%For additional glossaries, the extensions are those supplied +%when you created the glossary with \ics{newglossary}. +% +%Note that if you use \appname{makeglossaries} instead, you can +%replace all those calls to \appname{xindy} with just one call +%to \appname{makeglossaries}: +%\begin{verbatim} +%makeglossaries myDoc +%\end{verbatim} +%Note also that some commands and package options have no effect if +%you use \appname{xindy} explicitly instead of using +%\appname{makeglossaries}. These are listed in +%Table~\ref{tab:makeglossariesCmds}. +% +%\subsubsection{Using makeindex explicitly} +%\label{sec:makeindexapp} +% +%If you want to use \appname{makeindex} explicitly, you must +%make sure that you haven't used the \pkgopt{xindy} package +%option or the glossary entries will be written in the wrong +%format. To run \appname{makeindex}, type the following in +%your terminal:\\[10pt] +%\begin{ttfamily} +%makeindex -s \textrm{\meta{style}}.ist -t \textrm{\meta{base}}.glg +%-o \textrm{\meta{base}}.gls \textrm{\meta{base}}.glo +%\end{ttfamily}\\[10pt] +%where \meta{base} is the name of your document without the +%\filetype{.tex} extension and \meta{style}\filetype{.ist} is the +%name of the \appname{makeindex} style file. By default, this is +%\meta{base}\filetype{.ist}, but may be changed via +%\ics{setStyleFile}\marg{style}. Note that there are other options, +%such as \texttt{-l} (letter ordering). See the \appname{makeindex} +%manual for further details. +% +%For example, if your document is called \texttt{myDoc.tex}, then +%type the following at the terminal: +%\begin{verbatim} +%makeindex -s myDoc.ist -t myDoc.glg -o myDoc.gls myDoc.glo +%\end{verbatim} +%Note that this only creates the main glossary. If you have +%additional glossaries (for example, if you have used the +%\pkgopt{acronym} package option) then you must call +%\appname{makeindex} for each glossary, substituting +%\filetype{.glg}, \filetype{.gls} and \filetype{.glo} with the +%relevant extensions. For example, if you have used the +%\pkgopt{acronym} package option, then you need to type the +%following in your terminal: +%\begin{verbatim} +%makeindex -s myDoc.ist -t myDoc.alg -o myDoc.acr myDoc.acn +%\end{verbatim} +%For additional glossaries, the extensions are those supplied +%when you created the glossary with \ics{newglossary}. +% +%Note that if you use \appname{makeglossaries} instead, you can +%replace all those calls to \appname{makeindex} with just one call +%to \appname{makeglossaries}: +%\begin{verbatim} +%makeglossaries myDoc +%\end{verbatim} +%Note also that some commands and package options have no effect if +%you use \appname{makeindex} explicitly instead of using +%\appname{makeglossaries}. These are listed in +%Table~\ref{tab:makeglossariesCmds}. +% %\subsection{Troubleshooting} +%\label{sec:trouble} % %The \sty{glossaries} package comes with a minimal file called %\texttt{minimalgls.tex} which can be used for testing. This -%should be located in \texttt{texmf/doc/latex/glossaries/samples/}. +%should be located in the \texttt{samples} subdirectory (folder) +%of the \sty{glossaries} documentation directory. The location +%varies according to your operating system and \TeX\ installation. +%For example, on my Linux partition it can be found in +%\texttt{/usr/local/texlive/2008/texmf-dist/doc/latex/glossaries/}. %Further information on debugging \LaTeX\ code is available at %\url{http://theoval.cmp.uea.ac.uk/~nlct/latex/minexample/}. % @@ -345,7 +952,9 @@ %\item I don't have Perl installed, do I have to use %\appname{makeglossaries}? % -%Read \autoref{sec:makeglossaries}. +%Read \autoref{sec:xindyapp} or +%\autoref{sec:makeindexapp}, depending on +%whether you want to use \appname{xindy} or \appname{makeindex}. % % %\item I'm used to using the \sty{glossary} package: are there any @@ -359,9 +968,10 @@ %translated. % %The \sty{glossaries} package currently only supports the following -%languages: Danish, Dutch, English, French, German, Irish, Italian, -%Hungarian, Polish and Spanish. If you want to add another language, -%send me the translations, and I'll add them to the next version. +%languages: Brazilian Portuguese, Danish, Dutch, English, French, +%German, Irish, Italian, Hungarian, Polish and Spanish. If you want +%to add another language, send me the translations, and I'll add them +%to the next version. % %If you are using one of the above languages, but the text hasn't been %translated, try adding the \isty{translator} package with the @@ -372,9 +982,9 @@ %\usepackage[ngerman]{translator} %\usepackage{glossaries} %\end{verbatim} -%Alternatively, you may be able to add the language as a global option -%to the class file. Check the \sty{translator} package documentation for -%further details. +%Alternatively, you can add the language as a global option +%to the class file. Check the \sty{translator} package documentation +%for further details. % %\item My glossaries haven't appeared. % @@ -385,15 +995,23 @@ %\item Use either \ics{printglossary} for each glossary that has %been defined or \ics{printglossaries}. % -%\item Use \ics{gls}, \ics{Gls}, \ics{GLS}, \ics{glspl}, \ics{Glspl}, -%\ics{GLSpl}, \ics{glslink}, \ics{glsadd} or \ics{glsaddall} in the -%document. +%\item Use the commands listed in +%\autoref{sec:glslink}, +%\autoref{sec:glsadd} or +%\autoref{sec:glssee} for each entry +%that you want to appear in the glossary. % %\item Run \LaTeX\ on your document, then run \appname{makeglossaries}, %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. +%run. If any of your entries cross-reference an entry that's not +%referenced in the main body of the document, you will need to +%run \appname{makeglossaries} after the second \LaTeX\ run, followed +%by another \LaTeX\ run. %\end{itemize} +% +%Check the log files (\filetype{.log}, \filetype{.glg} etc) for any +%warnings. %\end{enumerate} % %\section{A Quick Guide For The Impatient} @@ -401,7 +1019,10 @@ % %This section is for people who want a few quick pointers %of how to get started. However it is recommended that you read -%\autoref{sec:overview} for additional commands and advice not listed here. +%\autoref{sec:overview} for additional commands and advice not listed here. There are +%also some sample files to help you get started, listed in +%\autoref{sec:samples}. +% % %\begin{enumerate} %\item Load \sty{glossaries} \emph{after} \isty{hyperref}: @@ -418,7 +1039,6 @@ %\item Always use \ics{makeglossaries} if you want the glossary %entries to be written to the glossary file: %\begin{verbatim} -%\documentclass{article} %\usepackage{glossaries} %\makeglossaries %\end{verbatim} @@ -443,35 +1063,52 @@ %makeglossaries myfile %latex myfile %\end{verbatim} -%(You may need to run \LaTeX\ again if you have used the \pkgopt{toc} -%package option.) +%(You need to run \LaTeX\ again if you have used the \pkgopt{toc} +%package option. You may also need an extra \appname{makeglossaries} +%run and another \LaTeX\ run if an entry is only referenced in the +%glossary, or if including the glossary has caused the +%number lists\iterm{number list} to change.) +% %If you use Windows, there is a batch file called %\texttt{makeglossaries.bat} which you can use, but you will -%still need Perl installed. +%still need Perl installed. Alternatively, you can call +%\appname{makeindex} directly. See +%\autoref{sec:makeglossaries} for +%further details. +% +%\item If you want to use \appname{xindy} instead of +%\appname{makeindex}, you must specify it in the package option: +%\begin{verbatim} +%\usepackage[xindy]{glossaries} +%\end{verbatim} +%See +%\autoref{sec:makeglossaries} for +%further details. % %\item New glossaries can be defined using:\par %\ics{newglossary}\oarg{log-ext}% %\marg{label}\marg{in-ext}\marg{out-ext}% %\marg{title}\par where \meta{label} is an identifying label, %\meta{in-ext} is the extension of the file to be created -%by \appname{makeindex} (called by \appname{makeglossaries}), +%by \appname{makeindex} or \appname{xindy} (called by +%\appname{makeglossaries}), %\meta{out-ext} is the extension of the file to be read by -%\appname{makeindex} and \meta{title} is the title for this +%\appname{makeindex} or \appname{xindy} and \meta{title} is the title for this %new glossary. The first optional argument \meta{log-ext} specifies -%the extension of the \appname{makeindex} transcript file. Example: +%the extension of the \appname{makeindex} or \appname{xindy} +%transcript file. Example: %\begin{verbatim} %\newglossary[nlg]{notation}{not}{ntn}{Notation} %\end{verbatim} %This glossary's label is \texttt{notation} and its title %will be Notation. If you use \appname{makeglossaries}, the -%\appname{makeindex} transcript will be written to a file with the +%\appname{makeindex} or \appname{xindy} transcript will be written to a file with the %extension \filetype{.nlg}. If \meta{log-ext} is omitted, the extension %\filetype{.glg} will be used. % %\item Any new glossaries must be defined before -%\cs{makeglossaries} +%\ics{makeglossaries}: %\begin{verbatim} -%\documentclass{article} %\usepackage{glossaries} %\newglossary{notation}{not}{ntn}{Notation} %\makeglossaries @@ -486,12 +1123,12 @@ %\end{verbatim} % %\item If your pages have a hyphen compositor (i.e.\ your page -%numbers appear in the form 2-1), redefine \ics{glscompositor} +%numbers appear in the form 2-1), use \ics{glsSetCompositor} %\emph{before} \ics{makeglossaries}: %\begin{verbatim} %\documentclass{article} %\usepackage{glossaries} -%\renewcommand{\glscompositor}{-} +%\glsSetCompositor{-} %\makeglossaries %\end{verbatim} % @@ -500,6 +1137,10 @@ %\begin{verbatim} %\usepackage[toc]{glossaries} %\end{verbatim} +%This will require an extra \LaTeX\ run. Note that if the table +%of contents affects the subsequent page numbering (i.e.\ the +%page numbers are not reset after the table of contents) then you +%may need to rerun \appname{makeglossaries} and \LaTeX. % %\item Define a new entry with:\par %\ics{newglossaryentry}\marg{label}\marg{key-val list}\par @@ -514,20 +1155,96 @@ %Whenever I want to use this entry, that is the label I need %to use to identify it. % -%\item If the entry name starts with an accented letter, you will -%need to group the first letter (otherwise it will cause a -%problem for \ics{Gls} and \ics{Glspl}): +%\item To define a sub-entry, use the \gloskey{parent} key. For +%example: +%\begin{verbatim} +%\newglossaryentry{fruit}{name={fruit}, % parent entry +%description={tree product that contains seeds}} +% +%\newglossaryentry{apple}{name={apple}, % sub-entry +%description={firm, round fruit}, +%parent=fruit} +%\end{verbatim} +% +%\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} +%\end{verbatim} +% +%Note that if you use \appname{xindy} instead of \appname{makeindex}, +%characters such as a backslash are ignored, so if you have used +%the \pkgopt{xindy} package option, you can just do: +%\begin{verbatim} +%\newglossaryentry{tex}{name={\TeX}, +%description={A typesetting language}, +%} +%\end{verbatim} +% +%\item Sub-entries may have the same name as the parent entry: +%\begin{verbatim} +%\newglossaryentry{glossary}{name=glossary, % parent entry +%description={\nopostdesc}, +%plural={glossaries}} +% +%\newglossaryentry{glossarylist}{% first child entry +%description={1) list of technical words}, +%sort={1}, +%parent={glossary}} +% +%\newglossaryentry{glossarycol}{% second child entry +%description={2) collection of glosses}, +%sort={2}, +%parent={glossary}} +%\end{verbatim} +%Note that in this instance the \gloskey{name} key is not +%required for the child entries, but the \gloskey{sort} key is +%needed to sort the sub-entries. The parent entry has no +%description, so the description terminator is suppressed using +%\ics{nopostdesc}. +% +%\item If the entry name starts with an accented letter or +%non-Latin character, you will need to group the first letter +%(otherwise it will cause a problem for commands like \ics{Gls} and +%\ics{Glspl}): %\begin{verbatim} %\newglossaryentry{elite}{name={{\'e}lite}, +%sort=elite, %description={select group or class}} %\end{verbatim} %Likewise with commands such as \cs{ae} and \cs{oe}: %\begin{verbatim} %\newglossaryentry{oesophagus}{% %name={{\oe}sophagus}, +%sort=oesophagus, %description={canal from mouth to stomach}} %\end{verbatim} % +%\item If you use \appname{xindy}, you can specify the accented +%or non-Latin character directly (in combination with the +%\isty{inputenc} and \isty{fontenc} packages) but you still +%need to group the first letter (otherwise it will cause a +%problem for commands like \ics{Gls} and \ics{Glspl} due to +%expansion issues): +%\begin{verbatim} +%\newglossaryentry{elite}{name={{é}lite}, +%description={select group or class}} +%\end{verbatim} +%Note that in this case the \gloskey{sort} key is not required +%as \appname{xindy} knows how to sort the letter \'e. +% %\item If you have multiple glossaries, use the \gloskey{type} %key to specify in which glossary the entry belongs. For example: %\begin{verbatim} @@ -549,6 +1266,27 @@ %(e.g.\ 1,2,4,7--9)}} %\end{verbatim} % +%\item You can cross-reference an entry using the +%\gloskey{see} key when you define it. For example, suppose +%you have defined an entry whose label is \texttt{taylorstheorem}, +%then you can cross-reference it: +%\begin{verbatim} +%\newglossaryentry{maclaurinseries}{name={Maclaurin series}, +%description={Series expansion}, +%see={taylorstheorem}} +%\end{verbatim} +%Alternatively, you can use \ics{glssee} after you have defined +%the entry: +%\begin{verbatim} +%\glssee{maclaurinseries}{taylorstheorem} +%\end{verbatim} +%(The final argument may be a comma-separated list of labels.) +%The \dq{see} tag may be overridden for a given entry: +%\begin{verbatim} +%\glssee[see also]{maclaurinseries}{taylorstheorem} +%\end{verbatim} +%or it can be changed for all entries by redefining \ics{seename}. +% %\item Plural forms are assumed to be the singular form with an %\dq{s} appended, unless otherwise specified. To specify an %irregular plural, use the \gloskey{plural} key. For example: @@ -613,11 +1351,11 @@ %\begin{verbatim} %\renewcommand{\glsnamefont}[1]{\textsf{\mdseries #1}} %\end{verbatim} -%Note that the list-like glossary styles defined in the -%\isty{glossary-list} package place the entry name in +%Note that the list-like glossary styles place the entry name in %the optional argument to \ics{item}, so they will -%appear in bold, unless you redefine \ics{glsnamefont} to counteract the -%bold font. +%appear in bold, unless you redefine \ics{glsnamefont} to counteract +%the bold font. Similarly, the tree-like styles display the +%entry name in bold. % %\item In the document use \ics{gls}\marg{label} %to use a predefined term (this will also enter the term into @@ -674,9 +1412,10 @@ %The primary definition of \glspl[format=hyperbf]{singmtx}. %\end{verbatim} % -%\item Don't use declarations in \gloskey[glslink]{format} as this can -%cause unpredictable results, as there is no guarantee that the effect -%will be localised to the required text. +%\item Don't use declarations in \gloskey[glslink]{format} (e.g.\ +%\texttt{format=bfseries}) as this can cause unpredictable results, +%since there is no guarantee that the effect will be localised to the +%required text. % %\item Entries can be added to the glossary without producing %any text using \ics{glsadd}\marg{label} or @@ -691,7 +1430,7 @@ % %\item A number range can be entered using \verb|format=(| and %\verb"format=)" to mark the beginning and ending of the -%range\footnote{This is new to version 1.01}. For example: +%range. For example: %\begin{verbatim} % \glsadd[format=(]{singmtx} % This is a very long section all about \glspl{singmtx}. @@ -701,7 +1440,8 @@ % \glsadd[format=)]{singmtx} %\end{verbatim} %This is equivalent to \appname{makeindex}'s \verb"|(" and \verb"|)" -%formats. +%formats or \appname{xindy}'s \texttt{:open-range} and +%\texttt{:close-range} tags. % %\item You can combine the range markers with a formatting command %(again without the preceding backslash). For example: @@ -719,26 +1459,8 @@ %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}). -% -%\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} -%\end{verbatim} +%or \ics{gls} and related commands or via \ics{glsadd} +%or \ics{glsaddall} or via \ics{glssee}). % %\item You don't need to escape \appname{makeindex}'s special characters: %\begin{verbatim} @@ -759,17 +1481,8 @@ %description={A metric measurement of length}, %symbol={m}} %\end{verbatim} -%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}, \glostyle{super4colheaderborder}. -%\glostyle{altsuper4col}, \glostyle{altsuper4colheader}, -%\glostyle{altsuper4colborder} and \glostyle{altsuper4colheaderborder}. -%All the other styles supplied by this package ignore the associated -%symbol. +%See \autoref{sec:styles} for a list of predefined glossary +%styles. % %\item Glossary styles can be set using the \pkgopt{style} %package option. For example: @@ -782,13 +1495,15 @@ %\end{verbatim} %The predefined glossary styles provided by the \sty{glossaries} %bundle are listed in \autoref{sec:styles}. +% +% %\item The list of numbers associated with each glossary entry %can be suppressed using the package option \pkgopt{nonumberlist}: %\begin{verbatim} %\usepackage[nonumberlist]{glossaries} %\end{verbatim} % -%\item By default, the glossaries will appear in an unnumbered +%\item By default, the glossary will appear in an unnumbered %chapter if chapters are defined, otherwise in an unnumbered %section. This can be changed using the \pkgopt{section} package %option. For example, to make the glossaries appear in an unnumbered @@ -813,6 +1528,7 @@ %The \sty{glossaries} package options are as follows: %\begin{description} %\item[\pkgopt{toc}] Add the glossaries to the table of contents. +%Note that an extra \LaTeX\ run is required with this option. % %\item[\pkgopt{numberline}] When used with \pkgopt{toc}, this will %add \cs{numberline}\verb|{}| in the final argument of @@ -822,13 +1538,25 @@ %used without \pkgopt{numberline}, the title will be aligned with %the section numbers rather than the section titles. % -%\item[\pkgopt{acronym}] Make a separate glossary for acronyms. +%\item[\pkgopt{acronym}] This creates a new glossary with the +%label \texttt{acronym}: +%\begin{verbatim} +%\newglossary[alg]{acronym}{acr}{acn}{\acronymname} +%\end{verbatim} +%If the \pkgopt{acronym} package option is used, \ics{acronymtype} +%is set to \texttt{acronym} otherwise it is set to +%\texttt{main}.\footnote{Actually it sets \ics{acronymtype} to +%\ics{glsdefaulttype} if the \pkgopt{acronym} package option is +%not used, but \ics{glsdefaulttype} usually has the value +%\texttt{main}.} +%Entries that are defined using \ics{newacronym} are placed in +%the glossary whose label is given by \ics{acronymtype}. % %\item[\pkgopt{section}] This is a \meta{key}=\meta{value} option. Its %value should be the name of a sectional unit (e.g.\ chapter). %This will make the glossaries appear in the named sectional unit, %otherwise each glossary will appear in a chapter, if chapters -%exists, otherwise in a section. Unnumbered sectional units will be used +%exist, otherwise in a section. Unnumbered sectional units will be used %by default. Example: %\begin{verbatim} %\usepackage[section=subsection]{glossaries} @@ -841,8 +1569,9 @@ %\begin{verbatim} %\usepackage[section=section]{glossaries} %\end{verbatim} -%You can change this value later in the document using -%\ics{setglossarysection}\marg{type}. +%You can change this value later in the document using\\[10pt] +%\DescribeMacro{\setglossarysection}\cs{setglossarysection}\marg{name}\\[10pt] +%where \meta{name} is the sectional unit. % %\item[\pkgopt{numberedsection}] %The glossaries are placed in unnumbered sectional units by default, @@ -951,6 +1680,41 @@ %for acronyms. %See \autoref{sec:acronyms} for further details. % +%\item[\pkgopt{makeindex}] (Default) The glossary information and +%indexing style file will be written in \appname{makeindex} format. If you use +%\appname{makeglossaries}, it will automatically detect that it needs +%to call \appname{makeindex}. If you don't use +%\appname{makeglossaries}, you need to remember to use +%\appname{makeindex} not \appname{xindy}. The indexing style file +%will been given a \filetype{.ist} extension. +% +%\item[\pkgopt{xindy}] The glossary information and indexing style file will +%be written in \appname{xindy} format. If you use +%\appname{makeglossaries}, it will automatically detect that it needs +%to call \appname{xindy}. If you don't use \appname{makeglossaries}, +%you need to remember to use \appname{xindy} not \appname{makeindex}. +%The indexing style file will been given a \filetype{.xdy} extension. +% +%The \pkgopt{xindy} package option may additionally have a +%value that is a key=value comma-separated list to override +%the language and codepage. For example: +%\begin{verbatim} +%\usepackage[xindy={language=english,codepage=utf8}]{glossaries} +%\end{verbatim} +%You can also specify whether you want a number group in +%the glossary. This defaults to true, but can be suppressed. For +%example: +%\begin{verbatim} +%\usepackage[xindy={glsnumbers=false}]{glossaries} +%\end{verbatim} +%See \autoref{sec:xindy} for further details on using \appname{xindy} with the +%\sty{glossaries} package. +% +%\item[\pkgopt{order}] This may take two values: +%\pkgoptval{word}{order} or \pkgoptval{letter}{order}. The default +%is word ordering. Note that this option has no effect if you +%don't use \appname{makeglossaries}. +% %\end{description} %\subsection{Defining Glossary Entries} %\label{sec:newglosentry} @@ -961,29 +1725,77 @@ %was removed in version 1.13, but the restriction remains for %\cs{loadglsentries}.} However %only those entries that occur in the document -%(using any of the commands described in \autoref{sec:glslink} and \autoref{sec:glsadd}) will appear in the glossary. Each time an entry is used in this way, a line is added to an associated glossary -%(\filetype{.glo}) file, which then needs to be converted into a -%corresponding \filetype{.gls} file which contains the typeset glossary -%which is input by \ics{printglossary} or -%\ics{printglossaries}. The Perl script \appname{makeglossaries} -%can be used to call \appname{makeindex}, using a customised -%\filetype{.ist} 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. +%(using any of the commands described in \autoref{sec:glslink} and \autoref{sec:glsadd}) will appear in the glossary. Each time an entry is used in this way, a line is added to an associated glossary file +%(\filetype{.glo}), which then needs to be converted into a +%corresponding \filetype{.gls} file which contains the typeset +%glossary which is input by \ics{printglossary} or +%\ics{printglossaries}. The Perl script \appname{makeglossaries} can +%be used to call \appname{makeindex} or \appname{xindy}, using a +%customised indexing 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. See +%\autoref{sec:makeglossaries} +%for further details. % %\DescribeMacro{\makeglossaries} %The command \cs{makeglossaries} must be placed in the preamble in -%order to create the customised \appname{makeindex} \filetype{.ist} +%order to create the customised \appname{makeindex} (\filetype{.ist}) +%or \appname{xindy} (\filetype{.xdy}) %style file and to ensure that glossary entries are written to the -%appropriate output file. If you omit \cs{makeglossaries} none of the -%glossaries will be created. Note that if your page numbers use a -%hyphen compositor, you must set this by redefining -%\DescribeMacro{\glscompositor}\cs{glscompositor} \emph{before} -%using \cs{makeglossaries}: +%appropriate output files. If you omit \cs{makeglossaries} none of the +%glossaries will be created. +% +%\begin{important} +%Note that some of the commands provided by the \sty{glossaries} +%package must be placed before \cs{makeglossaries} as they are +%required when creating the customised style file. If you attempt +%to use those commands after \cs{makeglossaries} you will generate +%an error. +%\end{important} +% +%\DescribeMacro{\noist} +%You can suppress the creation of the customised \appname{xindy} +%or \appname{makeindex} style file using \cs{noist}. Note that this +%command must be used before \cs{makeglossaries}. +% +%The default name for the customised style file is given by +%\ics{jobname}\filetype{.ist} (for \appname{makeindex}) or +%\ics{jobname}\filetype{.xdy} (for \appname{xindy}). This name may be +%changed using:\\[10pt] +%\DescribeMacro{\setStyleFile} +%\cs{setStyleFile}\marg{name}\\[10pt] +%where \meta{name} is the name of the style file without the +%extension. Note that this command must be used before +%\cs{makeglossaries}. +% +%Each glossary entry is assigned a \term{number list} that lists all +%the locations in the document where that entry was used. By default, +%the location refers to the page number but this may be overridden +%using the \pkgopt{counter} package option. The default form of +%the location number assumes a full stop compositor (e.g.\ 1.2), +%but if your location numbers use a different compositor (e.g. 1-2) +%you need to set this using\\[10pt] +%\DescribeMacro{\glsSetCompositor}\cs{glsSetCompositor}\marg{symbol}\\[10pt] +%For example: +%\begin{verbatim} +%\glsSetCompositor{-} +%\end{verbatim} +%Note that this command must be used before \cs{makeglossaries}. +% +%If you use \appname{xindy}, you can have a different compositor +%for page numbers starting with an uppercase alphabetical +%character using:\\[10pt] +%\DescribeMacro{\glsSetAlphaCompositor}\cs{glsSetAlphaCompositor}\marg{symbol}\\[10pt] +%Note that this command has no effect if you haven't used the +%\pkgopt{xindy} package option. For example, if you want +%number lists\iterm{number list} containing a mixture of A-1 and 2.3 +%style formats, then do: %\begin{verbatim} -%\renewcommand*{\glscompositor}{-} +%\glsSetCompositor{.} +%\glsSetAlphaCompositor{-} %\end{verbatim} -%(The default value of \cs{glscompositor} is a full stop.) +%See \autoref{sec:numberlists} for +%further information about number lists\iterm{number list}. % %\DescribeMacro{\newglossaryentry} %New glossary entries are defined using the command:\\[10pt] @@ -992,14 +1804,28 @@ %this entry. The second argument, \meta{key-val list}, is a %\meta{key}=\meta{value} list that supplies the relevant information %about this entry. There are two required fields: \gloskey{name} and -%\gloskey{description}. Available fields are listed below: +%\gloskey{description}, except for sub-entries where the +%\gloskey{name} field may be omitted. Available fields are listed +%below: % %\begin{description} -%\item[{\gloskey{name}}] The name of the entry (as it will appear in the -%glossary). +%\item[{\gloskey{name}}] The name of the entry (as it will appear in +%the glossary). If this key is omitted and the \gloskey{parent} +%key is supplied, this value will be the same as the parent's name. % %\item[{\gloskey{description}}] A brief description of this term (to -%appear in the glossary). +%appear in the glossary). Within this value, you can use +%\DescribeMacro{\nopostdesc}\cs{nopostdesc} to suppress the +%description terminator for this entry. For example, if this +%entry is a parent entry that doesn't require a description, you +%can do \verb|description={\nopostdesc}|. If you want a paragraph +%break in the description use \DescribeMacro{\glspar}\cs{glspar}. +%However, note that not all glossary styles support multi-line +%descriptions. +% +%\item[{\gloskey{parent}}] The label of the parent entry. Note that +%the parent entry must be defined before its sub-entries. +%See \autoref{sec:subentries} for further details. % %\item[{\gloskey{descriptionplural}}] The plural form of the %description (as passed to \ics{glsdisplay} and \ics{glsdisplayfirst} @@ -1034,8 +1860,9 @@ %used the \gloskey{first} key. % %\item[{\gloskey{symbol}}] 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 \cs{relax}. +%specify an associated symbol. If omitted, the value is set to +%\cs{relax}. Note that not all glossary styles display the +%symbol. % %\item[{\gloskey{symbolplural}}] This is the plural form of the %symbol (as passed to \ics{glsdisplay} and \ics{glsdisplayfirst} @@ -1043,41 +1870,63 @@ %is set to the same as the \gloskey{symbol} key. % %\item[{\gloskey{sort}}] This value indicates how \appname{makeindex} -%should sort this entry. If omitted, the value is given by the -%\gloskey{name} field. This value is equivalent to -%\appname{makeindex}'s \dq{actual} character (which is usually the -%at-sign @ although the \sty{glossaries} package uses a different -%symbol). -% -%\item[{\gloskey{type}}] 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 +%or \appname{xindy} should sort this entry. If omitted, the value is +%given by the \gloskey{name} field. +% +%\item[{\gloskey{type}}] This specifies the label of the glossary in +%which this entry belongs. If omitted, the default glossary is +%assumed. The list of acronyms type is given by %\ics{acronymtype} which will either be \texttt{main} or %\texttt{acronym}, depending on whether the \pkgopt{acronym} package %option was used. +% +%\item[{\gloskey{nonumberlist}}] Suppress the \term{number list} for +%this entry. +% +%\item[{\gloskey{see}}] Cross-reference another entry. Using the +%\gloskey{see} key will automatically add this entry to the +%glossary, but will not automatically add the cross-referenced entry. +%The referenced entry should be supplied as the value to this key. +%If you want to override the \dq{see} tag, you can supply the new +%tag in square brackets before the label. For example +%\verb|see=[see also]{anotherlabel}|. For further details, +%see \autoref{sec:crossref}. %\end{description} -%Note that if the key starts with an accented letter, -%you must group the accented letter, otherwise it will cause a -%problem for commands like \cs{Gls} and \cs{Glspl}. For example: +%Note that if the name starts with an accented letter or non-Latin +%character, you must group the accented letter, otherwise it will +%cause a problem for commands like \cs{Gls} and \cs{Glspl}. +%For example: %\begin{verbatim} %\newglossaryentry{elite}{name={{\'e}lite}, %description={select group or class}} %\end{verbatim} +%Note that the same applies if you are using the \isty{inputenc} +%package: +%\begin{verbatim} +%\newglossaryentry{elite}{name={{é}lite}, +%description={select group or class}} +%\end{verbatim} +%Note that in both of the above examples, you will also need to +%supply the \gloskey{sort} key if you are using \appname{makeindex} +%whereas \appname{xindy} is usually able to sort accented letters +%correctly. +% % % %\subsubsection{Plurals} %You may have noticed from above that you can specify the plural form -%when you define a term. If you omit this, the plural will be obtained -%\DescribeMacro{\glspluralsuffix}by appending \cs{glspluralsuffix} to -%the singular form. This command defaults to \texttt{s}. For example: +%when you define a term. If you omit this, the plural will be +%obtained by appending +%\DescribeMacro{\glspluralsuffix}\cs{glspluralsuffix} to +%the singular form. This command defaults to \dq{s}. For example: %\begin{verbatim} %\newglossaryentry{cow}{name=cow,description={a fully grown %female of any bovine animal}} %\end{verbatim} -%defines a new entry whose singular form is \dq{cow} and plural form -%is \dq{cows}. However, if you are writing in archaic English, you -%may want to use \dq{kine} as the plural form, in which case you would -%have to do: +%defines a new entry whose singular form is \dq{cow} and plural form +%is \dq{cows}. However, if you are writing in archaic English, you +%may want to use \dq{kine} as the plural form, in which case you +%would have to do: %\begin{verbatim} %\newglossaryentry{cow}{name=cow,plural=kine, %description={a fully grown female of any bovine animal}} @@ -1107,6 +1956,111 @@ %key where necessary). % % +%\subsubsection{Sub-Entries} +%\label{sec:subentries} +% +%As from version 1.17, it is possible to specify sub-entries. These +%may be used to order the glossary into categories, in which case +%the sub-entry will have a different name to its parent entry, or +%it may be used to distinguish different definitions for the same +%word, in which case the sub-entries will have the same name as +%the parent entry. Note that not all glossary styles support +%hierarchical entries and may display all the entries in a flat +%format. Of the styles that support sub-entries, some display the +%sub-entry's name whilst others don't. Therefore you need to +%ensure that you use a suitable style. See \autoref{sec:styles} for a list of predefined +%styles. +% +%Note that the parent entry will automatically be added to the +%glossary if any of its child entries are used in the document. +%If the parent entry is not referenced in the document, it will not +%have a \term{number list}. +% +%\paragraph{Hierarchical Categories} To arrange a glossary +%with hierarchical categories, you need to first define the +%category and then define the sub-entries using the relevant +%category entry as the value of the \gloskey{parent} key. For +%example, suppose I want a glossary of mathematical symbols that +%are divided into Greek letters and Roman letters. Then I can +%define the categories as follows: +%\begin{verbatim} +%\newglossaryentry{greekletter}{name={Greek letters}, +%text={Greek letter}, +%description={\nopostdesc}} +% +%\newglossaryentry{romanletter}{name={Roman letters}, +%text={Roman letter}, +%description={\nopostdesc}} +%\end{verbatim} +% +%Note that in this example, the category entries don't need a +%description so I have set the descriptions to \ics{nopostdesc}. +%This gives a blank description and suppresses the +%description terminator. +% +%I can now define my sub-entries as follows: +%\begin{verbatim} +%\newglossaryentry{pi}{name={pi}, +%description={ratio of the circumference of a circle to the diameter}, +%parent=greekletter} +% +%\newglossaryentry{C}{name=C, +%description={Euler's constant}, +%parent=romanletter} +%\end{verbatim} +% +%\paragraph{Homographs} Sub-entries that have the same name as +%the parent entry, don't need to have the \gloskey{name} key. +%For example, the word \dq{glossary} can mean a list of technical +%words or a collection of glosses. In both cases the plural is +%\dq{glossaries}. So first define the parent entry: +%\begin{verbatim} +%\newglossaryentry{glossary}{name=glossary, +%description={\nopostdesc}, +%plural={glossaries}} +%\end{verbatim} +%Again, the parent entry has no description, so the description +%terminator needs to be suppressed using \ics{nopostdesc}. +% +%Now define the two different meanings of the word: +%\begin{verbatim} +%\newglossaryentry{glossarylist}{ +%description={1) list of technical words}, +%sort={1}, +%parent={glossary}} +% +%\newglossaryentry{glossarycol}{ +%description={2) collection of glosses}, +%sort={2}, +%parent={glossary}} +%\end{verbatim} +%Note that if I reference the parent entry, the location will be +%added to the parent's \term{number list}, whereas if I reference +%any of the child entries, the location will be added to the child +%entry's number list. Note also that since the sub-entries have the +%same name, the \gloskey{sort} key is required. +% +%In the above example, the plural form for both of the child entries +%is the same as the parent entry, so the \gloskey{plural} key was +%not required for the child entries. However, if the sub-entries +%have different plurals, they will need to be specified. For example: +%\begin{verbatim} +%\newglossaryentry{bravo}{name={bravo}, +%description={\nopostdesc}} +% +%\newglossaryentry{bravocry}{description={1) cry of approval +%(pl.\ bravos)}, +%sort={1}, +%plural={bravos}, +%parent=bravo} +% +%\newglossaryentry{bravoruffian}{description={2) hired ruffian or +%killer (pl.\ bravoes)}, +%sort={2}, +%plural={bravoes}, +%parent=bravo} +%\end{verbatim} +% %\subsubsection{Loading Entries From a File} %\label{sec:loadglsentries} % @@ -1158,7 +2112,9 @@ %will add \texttt{aca} to the glossary type \texttt{acronym}, if the %package option \pkgopt{acronym} has been specified, or will add %\texttt{aca} to the glossary type \texttt{altacronym}, if the -%package option \pkgopt{acronym} is not specified. In this instance, +%package option \pkgopt{acronym} is not specified.\footnote{This +%is because \cs{acronymtype} is set to \cs{glsdefaulttype} if +%the \pkgopt{acronym} package option is not used.} In this instance, %it is better to change \texttt{myacronyms.tex} to: %\begin{verbatim} %\newacronym[type=\glsdefaulttype]{aca}{aca}{a contrived acronym} @@ -1183,6 +2139,53 @@ %these numbers refer to the pages on which that entry has been used %(using any of the commands described in \autoref{sec:glslink} and \autoref{sec:glsadd}). The number list can be suppressed using the \pkgopt{nonumberlist} package option, or an alternative counter %can be set as the default using the \pkgopt{counter} package option. +%The number list is also referred to as the location +%list\index{location list|see{number list}}. +% +%Both \appname{makeindex} and \appname{xindy} concatenate a +%sequence of 3 or more consecutive pages into a range. With +%\appname{xindy} you can vary the minimum sequence length using +%\ics{GlsSetXdyMinRangeLength}\marg{n} where \meta{n} is either +%an integer or the keyword \texttt{none} which indicates that there +%should be no range formation. +% +%\begin{important} +%Note that \cs{GlsSetXdyMinRangeLength} must be used before +%\ics{makeglossaries} and has no effect if \ics{noist} is used. +%\end{important} +% +%With both \appname{makeindex} and \appname{xindy}, you can replace +%separator and the closing number in the range using:\\[10pt] +%\DescribeMacro{\glsSetSuffixF}\cs{glsSetSuffixF}\marg{suffix}\\ +%\DescribeMacro{\glsSetSuffixFF}\cs{glsSetSuffixFF}\marg{suffix}\\[10pt] +%where the former command specifies the suffix to use for a 2 page +%list and the latter specifies the suffix to use for longer lists. +%For example: +%\begin{verbatim} +%\glsSetSuffixF{f.} +%\glsSetSuffixFF{ff.} +%\end{verbatim} +%Note that if you use \appname{xindy}, you will also need to +%set the minimum range length to 1 if you want to change these +%suffixes: +%\begin{verbatim} +%\GlsSetXdyMinRangeLength{1} +%\end{verbatim} +%Note that if you use the \isty{hyperref} package, you will need +%to use \ics{nohyperpage} in the suffix to ensure that the hyperlinks +%work correctly. For example: +%\begin{verbatim} +%\glsSetSuffixF{\nohyperpage{f.}} +%\glsSetSuffixFF{\nohyperpage{ff.}} +%\end{verbatim} +% +%\begin{important} +%Note that \cs{glsSetSuffixF} and \cs{glsSetSuffixFF} must be used +%before \ics{makeglossaries} and have no effect if \ics{noist} is +%used. +%\end{important} +% +% %\subsection{Links to Glossary Entries} %\label{sec:glslink} % @@ -1193,10 +2196,19 @@ %one of these commands is referred to as the %\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 +%by \appname{makeindex} or \appname{xindy} to generate the relevant +%entry in the glossary. This information includes an +%associated location that is added to the \term{number list} for that +%entry. By default, the location refers to the page number. For +%further information on number lists, see \autoref{sec:numberlists}. +% +%\begin{important} +%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 +%commands. +%\end{important} +% +%The above warning 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 @@ -1218,74 +2230,101 @@ %\DescribeMacro{\glslink} %The command:\\[10pt] %\cs{glslink}\oarg{options}\marg{label}\marg{text}\\[10pt] -%will place \cs{glstextformat}\marg{text} in the document at that point -%and add a line into the associated glossary file for the glossary entry -%given by \meta{label}. If hyperlinks are supported, \meta{text} will be -%a hyperlink to the relevant line in the glossary. The optional argument -%\meta{options} must be a \meta{key}=\meta{value} list which can take -%any of the following keys: +%will place \cs{glstextformat}\marg{text} in the document at that +%point and add a line into the associated glossary file for the +%glossary entry given by \meta{label}. If hyperlinks are supported, +%\meta{text} will be a hyperlink to the relevant line in the +%glossary. The optional argument \meta{options} must be a +%\meta{key}=\meta{value} list which can take any of the following +%keys: % %\begin{description} %\item[{\gloskey[glslink]{format}}] This specifies how to format the -%associated number for this entry in the glossary. This value is -%equivalent to the \appname{makeindex} encap value, and (as with -%\cs{index}) the value needs to be the name of a command \emph{without} -%the initial backslash. As with \cs{index}, the characters \verb"(" and -%\verb")" can also be used to specify the beginning and ending of a -%number range. Again as with \cs{index}, the command should be the name -%of a command which takes an argument (which will be the associated -%number). Be careful not to use a declaration (such as \cs{bfseries}) -%instead of a text block command (such as \cs{textbf}) as the effect is -%not guaranteed to be localised. If you want to apply more than one -%style to a given entry (e.g.\ \textbf{bold} and \emph{italic}) you will -%need to create a command that applies both formats, e.g.\ +%associated location number for this entry in the glossary. This +%value is equivalent to the \appname{makeindex} encap value, and (as +%with \cs{index}) the value needs to be the name of a command +%\emph{without} the initial backslash. As with \cs{index}, the +%characters \verb"(" and \verb")" can also be used to specify the +%beginning and ending of a number range. Again as with \cs{index}, +%the command should be the name of a command which takes an argument +%(which will be the associated location). Be careful not to use a +%declaration (such as \texttt{bfseries}) instead of a text block command +%(such as \texttt{textbf}) as the effect is not guaranteed to be +%localised. If you want to apply more than one style to a given entry +%(e.g.\ \textbf{bold} and \emph{italic}) you will need to create a +%command that applies both formats, e.g.\ %\begin{verbatim} %\newcommand*{\textbfem}[1]{\textbf{\emph{#1}}} %\end{verbatim} %and use that command. % +%In this document, the standard formats refer to the standard text +%block commands such as \ics{textbf} or \ics{emph} or any of the +%commands listed in Table~\ref{tab:hyperxx}. +% +%\begin{important} +%If you use \appname{xindy} instead of \appname{makeindex}, you +%must specify any non-standard formats that you want to use +%with the \gloskey[glslink]{format} key using +%\ics{GlsAddXdyAttribute}\marg{name}. For example +%\begin{verbatim} +%\GlsAddXdyAttribute{textbfem} +%\end{verbatim} +%\end{important} +% +%Note that unlike \cs{index}, you can't have +%anything following the command name, such as an asterisk or +%arguments. If you want to cross-reference another entry, either +%use the \gloskey{see} key when you define the entry or use +%\ics{glssee} (described in \autoref{sec:crossref}). +% %If you are using hyperlinks and you want to change the font of the -%hyperlink, don't use \cs{hyperpage} (provided by the \isty{hyperref} -%package) as the numbers may not refer to a page number. -%Instead, the \sty{glossaries} package provides the following -%number formats: -%\begin{center} -%\begin{tabular}{@{\sffamily}lp{0.8\linewidth}}hyperrm & The number is a serif hyperlink to the relevant part of the -%document\\ -%hypersf & The number is a sans-serif hyperlink to the relevant part -%of the document\\ -%hypertt & The number is a monospaced hyperlink to the relevant part -%of the document\\ -%hyperbf & The number is a bold hyperlink to the relevant part of the -%document\\ -%hypermd & The number is a medium weight hyperlink to the relevant -%part of the document\\ -%hyperit & The number is an italic hyperlink to the relevant -%part of the document\\ -%hypersl & The number is a slanted hyperlink to the relevant -%part of the document\\ -%hyperup & The number is an upright hyperlink to the relevant -%part of the document\\ -%hypersc & The number is a small caps hyperlink to the relevant -%part of the document\\ -%hyperemph & The number is an emphasized hyperlink to the relevant -%part of the document +%hyperlinked location, don't use \ics{hyperpage} (provided by the +%\isty{hyperref} package) as the locations may not refer to a page +%number. Instead, the \sty{glossaries} package provides number +%formats listed in Table~\ref{tab:hyperxx}. +% +%\begin{table}[htbp] +%\caption{Predefined Hyperlinked Location Formats} +%\label{tab:hyperxx} +%\centering +%\vskip\baselineskip +%\begin{tabular}{ll} +%\locfmt{hyperrm} & serif hyperlink\\ +%\locfmt{hypersf} & sans-serif hyperlink\\ +%\locfmt{hypertt} & monospaced hyperlink\\ +%\locfmt{hyperbf} & bold hyperlink\\ +%\locfmt{hypermd} & medium weight hyperlink\\ +%\locfmt{hyperit} & italic hyperlink\\ +%\locfmt{hypersl} & slanted hyperlink\\ +%\locfmt{hyperup} & upright hyperlink\\ +%\locfmt{hypersc} & small caps hyperlink\\ +%\locfmt{hyperemph} & emphasized hyperlink %\end{tabular} -%\end{center} -%Note that if the \cs{hyperlink} command hasn't been defined, +%\par +%\end{table} +% +%Note that if the \ics{hyperlink} command hasn't been defined, %the \texttt{hyper}\meta{xx} formats are equivalent to the -%analogous \cs{text}\meta{xx} font commands. If you want to +%analogous \texttt{text}\meta{xx} font commands (and \texttt{hyperemph} +%is equivalent to \texttt{emph}). If you want to %make a new format, you will need to define a command which takes -%one argument and use that; for example, if you want the associated -%number in the glossary to be in a bold sans-serif font, you can define a +%one argument and use that; for example, if you want the location +%number to be in a bold sans-serif font, you can define a %command called, say, \cs{hyperbsf}: %\begin{verbatim} %\newcommand{\hyperbsf}[1]{\textbf{\hypersf{#1}}} %\end{verbatim} %and then use \texttt{hyperbsf} as the value for the \gloskey{format} -%key. (See also \autoref{sec:printglos}.) +%key. (See also \autoref{sec:printglos}.) Remember that if you use \appname{xindy}, you will need to add +%this to the list of location attributes: +%\begin{verbatim} +%\GlsAddXdyAttribute{hyperbsf} +%\end{verbatim} +% %\item[{\gloskey[glslink]{counter}}] This specifies which counter -%to use for the associated number for this glossary entry. (See also +%to use for this location. This overrides the default counter +%used by this entry. (See also %\autoref{sec:numberlists}.) %\item[{\gloskey[glslink]{hyper}}] This is a boolean key which can %be used to enable/disable the hyperlink to the relevant entry @@ -1475,7 +2514,9 @@ %\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. Note that \ics{glslink} (which +%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 @@ -1514,7 +2555,7 @@ % %If you have multiple glossaries, changing \cs{glsdisplayfirst} and %\cs{glsdisplay} will change the way entries for all of the -%glossaries appear when using commands \cs{gls}, \cs{glspl} and their +%glossaries appear when using the commands \cs{gls}, \cs{glspl} and their %uppercase variants. If you only %want the change to affect entries for a given glossary, then you need %to use \DescribeMacro{\defglsdisplay}\cs{defglsdisplay} and @@ -1601,6 +2642,72 @@ %\glsaddall[types={\acronymtype,notation}] %\end{verbatim} % +%\subsection{Cross-Referencing Entries} +%\label{sec:crossref} +% +%There are several ways of cross-referencing entries in the +%glossary: +% +%\begin{enumerate} +%\item You can use commands such as \ics{gls} in the +%entries description. For example: +%\begin{verbatim} +%\newglossaryentry{apple}{name=apple, +%description={firm, round fruit. See also \gls{pear}}} +%\end{verbatim} +%Note that with this method, if you don't use the +%cross-referenced term in the glossary, you will need two runs of +%\appname{makeglossaries}: +%\begin{verbatim} +%latex filename +%makeglossaries filename +%latex filename +%makeglossaries filename +%latex filename +%\end{verbatim} +% +%\item As described in \autoref{sec:newglosentry}, +%you can use the \gloskey{see} key when you define the entry. For +%example: +%\begin{verbatim} +%\newglossaryentry{MaclaurinSeries}{name={Maclaurin series}, +%description={Series expansion}, +%see={TaylorsTheorem}} +%\end{verbatim} +%Note that in this case, the entry with the \gloskey{see} key will +%automatically be added to the glossary, but the cross-referenced +%entry won't. You therefore need to ensure that you use the +%cross-referenced term with the commands described in +%\autoref{sec:glslink} or \autoref{sec:glsadd}. +% +% +%You can optionally override the \dq{see} tag using square brackets +%at the start of the \gloskey{see} value. For example: +%\begin{verbatim} +%\newglossaryentry{MaclaurinSeries}{name={Maclaurin series}, +%description={Series expansion}, +%see=[see also]{TaylorsTheorem}} +%\end{verbatim} +% +%\item After you have defined the entry, use\\[10pt] +%\DescribeMacro{\glssee}\cs{glssee}\oarg{tag}\marg{label}\marg{xr label list}\\[10pt] +%where \meta{xr label list} is a comma-separated list of entry +%labels to be cross-referenced, \meta{label} is the label of the +%entry doing the cross-referencing and \meta{tag} is the \dq{see} tag. +%For example: +%\begin{verbatim} +%\glssee[see also]{series}{FourierSeries,TaylorsTheorem} +%\end{verbatim} +%Note that this automatically adds the entry given by \meta{label} to +%the glossary but doesn't add the cross-referenced entries (specified +%by \meta{xr label list}) to the glossary. +%\end{enumerate} +% +%In both cases~2 and 3 above, the cross-referenced information appears +%in the \term{number list}, whereas in case~1, the cross-referenced +%information appears in the description. In cases~2 and~3, the +%default text for the \dq{see} tag is given by \ics{seename}. +% %\subsection{Using Glossary Terms Without Links} %\label{sec:glsnolink} % @@ -1608,7 +2715,8 @@ %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. +%used and, apart from \ics{glshyperlink}, they don't produce +%hyperlinks. %\par\vskip10pt\noindent %\DescribeMacro{\glsentryname}\cs{glsentryname}\marg{label}\\ %\DescribeMacro{\Glsentryname}\cs{Glsentryname}\marg{label}\par\vskip10pt\noindent @@ -1661,6 +2769,19 @@ %\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. +%\par\vskip10pt\noindent +%\DescribeMacro{\glshyperlink}\cs{glshyperlink}\oarg{link text}\marg{label}\par\vskip10pt\noindent +%This command provides a hyperlink to the glossary entry given by +%\meta{label} \textbf{but does not add any information to the +%glossary file}. The link text is given by +%\ics{glsentryname}\marg{label} by default, but can be overridden +%using the optional argument. +%\begin{important} +%If you use \cs{glshyperlink}, you need to ensure that the relevant +%entry has been added to the glossary using any of the +%commands described in \autoref{sec:glslink} or \autoref{sec:glsadd} otherwise you will end up with a broken +%link. +%\end{important} % %For further information see \autoref{sec:code:glsnolink}. % @@ -1671,11 +2792,13 @@ %glossaries in the order in which they were defined. %Note that no glossaries will appear until %you have either used the Perl script \appname{makeglossaries} -%or have directly used \appname{makeindex} (as described in -%\autoref{sec:makeglossaries}). If the glossary still does not appear after you re-\LaTeX\ your document, check -%the \appname{makeindex} log files to see if there is a problem. -%Remember that you also need to use the command \ics{makeglossaries} in -%the preamble to enable the glossaries. +%or have directly used \appname{makeindex} or \appname{xindy} (as +%described in +%\autoref{sec:makeglossaries}). If the glossary +%still does not appear after you re-\LaTeX\ your document, check the +%\appname{makeindex}/\appname{xindy} log files to see if there is a +%problem. Remember that you also need to use the command +%\ics{makeglossaries} in the preamble to enable the glossaries. % %\DescribeMacro{\printglossary} %An individual glossary can be displayed using:\\[10pt] @@ -1716,7 +2839,8 @@ %\end{description} % %\DescribeMacro{\glossarypreamble} -%Information can be added to the start of the glossary by redefining +%Information can be added to the start of the glossary (after the +%title and before the main body of the glossary) by redefining %\cs{glossarypreamble}. For example: %\begin{verbatim} %\renewcommand{\glossarypreamble}{Numbers in italic indicate @@ -1753,13 +2877,17 @@ %\label{sec:glsnamefont} % %\DescribeMacro{\glsnamefont}Within each glossary, each entry name is -%formatted according to \cs{glsnamefont} which takes one argument: the -%entry name. This command is always used regardless of the glossary -%style. By default, \cs{glsnamefont} simply displays its argument in -%whatever the surrounding font happens to be. This means that in the -%list styles the name will appear in bold, since the name is placed in -%the optional argument of \cs{item}, whereas in the tabular styles the -%name will appear in the normal font. +%formatted according to \cs{glsnamefont} which takes one argument: +%the entry name. This command is always used regardless of the +%glossary style. By default, \cs{glsnamefont} simply displays its +%argument in whatever the surrounding font happens to be. This means +%that in the list-like glossary styles (defined in the +%\isty{glossary-list} style file) the name will appear in bold, since +%the name is placed in the optional argument of \cs{item}, whereas in +%the tabular styles (defined in the \isty{glossary-long} and +%\isty{glossary-super} style files) the name will appear in the +%normal font. The hierarchical glossary styles (defined in the +%\isty{glossary-tree} style file) also set the name in bold. % %For example, suppose you want all the entry names to appear in %medium weight small caps, then you can do: @@ -1767,6 +2895,250 @@ %\renewcommand{\glsnamefont}[1]{\textsc{\mdseries #1}} %\end{verbatim} % +%\subsubsection{Xindy} +%\label{sec:xindy} +% +%If you want to use \appname{xindy} to sort the glossary, you +%must use the package option \pkgopt{xindy}: +%\begin{verbatim} +%\usepackage[xindy]{glossaries} +%\end{verbatim} +%This ensures that the glossary information is written in +%\appname{xindy} syntax. +% +%Section~\ref{sec:makeglossaries} covers how to use the external +%indexing application. This section covers the commands provided +%by the \sty{glossaries} package that allow you to adjust the +%\appname{xindy} style file (\filetype{.xdy}) and parameters. +% +%To assist writing information to the \appname{xindy} style +%file, the \sty{glossaries} package provides the following +%commands:\\[10pt] +%\DescribeMacro{\glsopenbrace}\cs{glsopenbrace}\\ +%\DescribeMacro{\glsclosebrace}\cs{glsclosebrace}\\[10pt] +%which produce an open and closing brace. (This is needed because +%\verb|\{| and \verb|\}| don't expand to a simple brace character +%when written to a file.) +% +%In addition, if you are using a package that makes the double +%quote character active (e.g. \isty{ngerman}) you can use:\\[10pt] +%\DescribeMacro{\glsquote}\cs{glsquote}\marg{text}\\[10pt] +%which will produce \verb|"|\meta{text}\verb|"|. Alternatively, +%you can use \verb|\string"| to write the double-quote character. +%This document assumes that the double quote character has not been +%made active, so the examples just use \verb|"| for clarity. +% +%If you want greater control over the \appname{xindy} style file than +%is available through the \LaTeX\ commands provided by the +%\sty{glossaries} package, you will need to edit the \appname{xindy} +%style file. In +%which case, you must use \ics{noist} to prevent the style file from +%being overwritten by the \sty{glossaries} package. For additional +%information about \appname{xindy}, read the \appname{xindy} +%documentation. +%\paragraph{Language and Encodings} +%When you use \appname{xindy}, you need to specify the language +%and encoding used (unless you have written your own custom +%\appname{xindy} style file that defines the relevant alphabet +%and sort rules). If you use \appname{makeglossaries}, +%this information is obtained from the document's auxiliary +%(\filetype{.aux}) file. The \sty{glossaries} package attempts to +%find the root language, but in the event that it gets it wrong or if +%\appname{xindy} doesn't support that language, then you can +%specify the language using:\\[10pt] +%\DescribeMacro{\GlsSetXdyLanguage} +%\cs{GlsSetXdyLanguage}\oarg{glossary type}\marg{language}\\[10pt] +%where \meta{language} is the name of the language. The +%optional argument can be used if you have multiple glossaries +%in different languages. If \meta{glossary type} is omitted, it +%will be applied to all glossaries, otherwise the language +%setting will only be applied to the glossary given by +%\meta{glossary type}. +% +%If the \isty{inputenc} package is used, the encoding will be +%obtained from the value of \ics{inputencodingname}. +%Alternatively, you can specify the encoding using:\\[10pt] +%\DescribeMacro{\GlsSetXdyCodePage} +%\cs{GlsSetXdyCodePage}\marg{code}\\[10pt] +%where \meta{code} is the name of the encoding. For example: +%\begin{verbatim} +%\GlsSetXdyCodePage{utf8} +%\end{verbatim} +% +%Note that you can also specify the language and encoding using +%the package option +%\verb|xindy={language=|\meta{lang}\verb|,codepage=|\meta{code}\verb|}|. +%For example: +%\begin{verbatim} +%\usepackage[xindy={language=english,codepage=utf8}]{glossaries} +%\end{verbatim} +% +%If you write your own custom \appname{xindy} style file that +%includes the language settings, you need to set the language +%to nothing: +%\begin{verbatim} +%\GlsSetXdyLanguage{} +%\end{verbatim} +%(and remember to use \ics{noist} to prevent the style file from +%being overwritten). +% +%\begin{important} +%The commands \cs{GlsSetXdyLanguage} and \cs{GlsSetXdyCodePage} +%have no effect if you don't use \appname{makeglossaries}. If +%you call \appname{xindy} without \appname{makeglossaries} you +%need to remember to set the language and encoding using the +%\texttt{-L} and \texttt{-C} switches. +%\end{important} +% +%\paragraph{Locations and Number lists} +% +%The most likely attributes used in the \gloskey[glslink]{format} +%key (\locfmt{textrm}, \locfmt{hyperrm} etc) are automatically added +%to the \appname{xindy} style file, but if you want to use another +%attribute, you need to add it using:\\[10pt] +%\DescribeMacro{\GlsAddXdyAttribute} +%\cs{GlsAddXdyAttribute}\marg{name}\\[10pt] +%where \meta{name} is the name of the attribute, as used in +%the \gloskey[glslink]{format} key. For example, suppose I want a +%bold, italic, hyperlinked location. I first need to define a +%command that will do this: +%\begin{verbatim} +%\newcommand*{\hyperbfit}[1]{\textit{\hyperbf{#1}}} +%\end{verbatim} +%but with \appname{xindy}, I also need to add this as an allowed +%attribute: +%\begin{verbatim} +%\GlsAddXdyAttribute{hyperbfit} +%\end{verbatim} +% +%\begin{important} +%Note that \cs{GlsAddXdyAttribute} has no effect if \ics{noist} is +%used or if \ics{makeglossaries} is omitted. +% +%\cs{GlsAddXdyAttribute} must be used before \ics{makeglossaries}. +%\end{important} +% +%If the location numbers don't get expanded to a simple Arabic or +%Roman number or a letter from a, \ldots, z or A, \ldots, Z, then +%you need to add a location style in the appropriate format. +% +%For example, suppose you want the page numbers written as words +%rather than digits and you use the \isty{fmtcount} package to +%do this. You can redefine \ics{thepage} as follows: +%\begin{verbatim} +%\renewcommand*{\thepage}{\Numberstring{page}} +%\end{verbatim} +%This gets expanded to \verb|\protect \Numberstringnum |\marg{n} +%where \meta{n} is the page number. This means that you need to +%define a new location that has that form: +%\begin{verbatim} +%\GlsAddXdyLocation{Numberstring}{:sep "\string\protect\space +% \string\Numberstringnum\space\glsopenbrace" +% "arabic-numbers" :sep "\glsclosebrace"} +%\end{verbatim} +%Note that it's necessary to use \cs{space} to indicate that +%spaces also appear in the format, since, unlike \TeX, +%\appname{xindy} doesn't ignore spaces after control sequences. +% +%\begin{important} +%Note that \cs{GlsAddXdyLocation} has no effect if \ics{noist} is +%used or if \ics{makeglossaries} is omitted. +% +%\cs{GlsAddXdyLocation} must be used before \ics{makeglossaries}. +%\end{important} +% +%In the \term{number list}, the locations are sorted according to +%type. The default ordering is: +%\texttt{roman-page-numbers} (e.g.\ i), +%\texttt{arabic-page-numbers} (e.g.\ 1), +%\texttt{arabic-section-numbers} (e.g.\ 1.1 if the compositor +%is a full stop or 1-1 if the compositor is a hyphen\footnote{see +%\ics{setCompositor} described in +%\autoref{sec:newglosentry}}), +%\texttt{alpha-page-numbers} (e.g.\ a), +%\texttt{Roman-page-numbers} (e.g.\ I), +%\texttt{Alpha-page-numbers} (e.g.\ A), +%\texttt{Appendix-page-numbers} (e.g.\ A.1 if the Alpha compositor +%is a full stop or A-1 if the Alpha compositor is a +%hyphen\footnote{see \ics{setAlphaCompositor} described in +%\autoref{sec:newglosentry}}), +%user defined location names (as specified by +%\ics{GlsAddXdyLocation} in the order in which they were defined), +%\texttt{see} (cross-referenced entries). +%This ordering can be changed using:\\[10pt] +%\DescribeMacro{\GlsSetXdyLocationClassOrder} +%\cs{GlsSetXdyLocationClassOrder}\\[10pt] +%where each location name is delimited by double quote marks. +%For example: +%\begin{verbatim} +%\GlsSetXdyLocationClassOrder{ +% "arabic-page-numbers" +% "arabic-section-numbers" +% "roman-page-numbers" +% "Roman-page-numbers" +% "alpha-page-numbers" +% "Alpha-page-numbers" +% "Appendix-page-numbers" +% "see" +%} +%\end{verbatim} +% +%\begin{important} +%Note that \cs{GlsSetXdyLocationClassOrder} has no effect if +%\ics{noist} is used or if \ics{makeglossaries} is omitted. +% +%\cs{GlsSetXdyLocationClassOrder} must be used before +%\ics{makeglossaries}. +%\end{important} +% +%If a \term{number list} consists of a sequence of consecutive +%numbers, the range will be concatenated. The +%number of consecutive locations that causes a range formation +%defaults to 2, but can be changed using:\\[10pt] +%\DescribeMacro{\GlsSetXdyMinRangeLength} +%\cs{GlsSetXdyMinRangeLength}\marg{n}\\[10pt] +%For example: +%\begin{verbatim} +%\GlsSetXdyMinRangeLength{3} +%\end{verbatim} +%The argument may also be the keyword \texttt{none}, to indicate that +%there should be no range formations. See the \appname{xindy} +%manual for further details on range formations. +% +%\begin{important} +%Note that \cs{GlsSetXdyMinRangeLength} has no effect if \ics{noist} +%is used or if \ics{makeglossaries} is omitted. +% +%\cs{GlsSetXdyMinRangeLength} must be used before +%\ics{makeglossaries}. +%\end{important} +% +%See \autoref{sec:numberlists} for further details. +% +%\paragraph{Glossary Groups} +%The glossary is divided into groups according to the first +%letter of the sort key. The \sty{glossaries} package also adds +%a number group by default, unless you suppress it in the +%\pkgopt{xindy} package option. For example: +%\begin{verbatim} +%\usepackage[xindy={glsnumbers=false}]{glossaries} +%\end{verbatim} +%Any entry that doesn't go in one of the letter groups or the +%number group is placed in the default group. +% +%If you have a number group, the default behaviour is to locate +%it before the \dq{A} letter group. If you are not using a +%Roman alphabet, you can change this using\\[10pt] +%\cs{GlsSetXdyFirstLetterAfterDigits}\marg{letter} +% +%\begin{important} +%Note that \cs{GlsSetXdyFirstLetterAfterDigits} has no effect if +%\ics{noist} is used or if \ics{makeglossaries} is omitted. +% +%\cs{GlsSetXdyFirstLetterAfterDigits} must be used before +%\ics{makeglossaries}. +%\end{important} +% %\subsection{Defining New Glossaries} % %\DescribeMacro{\newglossary} @@ -1778,9 +3150,9 @@ %title for this new glossary and the final optional argument %\meta{counter} specifies which counter to use for the associated number %lists\iterm{number list} (see also \autoref{sec:numberlists}). The first optional argument specifies the extension for the -%\appname{makeindex} transcript file (this information is only used by -%\appname{makeglossaries} which picks up the information from the -%auxiliary file). +%\appname{makeindex} or \appname{xindy} transcript file (this +%information is only used by \appname{makeglossaries} which picks up +%the information from the auxiliary file). % %Note that the main (default) glossary is automatically created as: %\begin{verbatim} @@ -1809,7 +3181,7 @@ %\cs{newacronym}\oarg{key-val list}\marg{label}\marg{abbrv}\marg{long}\\[10pt] %By default, this is equivalent to:\vskip5pt %\begin{ttfamily}\par\noindent -%\cs{newglossaryentry}\textrm{\marg{label}}\{type=\cs{acronymtype},\\ +%\cs{newglossaryentry}\textrm{\marg{label}}\{type=\ics{acronymtype},\\ %name=\textrm{\marg{abbrv}},\\ %description=\textrm{\marg{long}},\\ %text=\textrm{\marg{abbrv}},\\ @@ -1820,18 +3192,20 @@ %\textrm{\meta{key-val list}}\}\par %\end{ttfamily} %\vskip5pt -%As mentioned in the previous section, the command \cs{acronymtype} is -%the name of the glossary in which the acronyms should appear. If the -%\pkgopt{acronym} package option has been used, this will be -%\texttt{acronym}, otherwise it will be \texttt{main}. The acronyms can -%then be used in exactly the same way as any other glossary entry. +%As mentioned in the previous section, the command \ics{acronymtype} +%is the name of the glossary in which the acronyms should appear. If +%the \pkgopt{acronym} package option has been used, this will be +%\texttt{acronym}, otherwise it will be \texttt{main}. The acronyms +%can then be used in exactly the same way as any other glossary +%entry. % %\begin{important}% %\textbf{Note:} since \cs{newacronym} sets \verb|type=\acronymtype|, %if you want to load a file containing acronym definitions using %\cs{loadglsentries}\oarg{type}\marg{filename}, the optional argument %\meta{type} will not have an effect unless you explicitly set the -%type as \verb|type=\glsdefaulttype|. See \autoref{sec:loadglsentries}.\end{important} +%type as \verb|type=\glsdefaulttype| in the optional argument to +%\ics{newacronym}. See \autoref{sec:loadglsentries}.\end{important} % %For example, the following defines the acronym IDN: %\begin{verbatim} @@ -1854,11 +3228,11 @@ %\cs{newacronym}. If you prefer to define all your acronyms using %\cs{newglossaryentry} explicitly, then you should skip this section %and ignore the package options: \pkgopt{smallcaps}, \pkgopt{smaller}, -%\pkgopt{description}, \pkgopt{dua}, \pkgopt{footnote} and -%\pkgopt{shortcuts}, as these options change the -%definition of \ics{newacronym} for common acronym formats -%as well as the way that the link text is displayed (see -%\autoref{sec:glsdisplay}). Likewise you should ignore the new commands described in this section, +%\pkgopt{description}, \pkgopt{dua} and \pkgopt{footnote}, as these +%options change the definition of \ics{newacronym} for common acronym +%formats as well as the way that the link text is displayed (see +%\autoref{sec:glsdisplay}). Likewise you should ignore the package option \pkgopt{shortcuts} +%and the new commands described in this section, %such as \cs{acrshort}, as they vary according to the definition of %\cs{newacronym}. % @@ -1989,6 +3363,12 @@ %optional argument to \cs{gls}, \cs{glspl} or their uppercase %variants. % +%In this case, the long form is stored in the \gloskey{symbol} key. +%This means that the long form will not be displayed in the list of +%acronyms unless you use a glossary style that displays the entry's +%symbol (for example, the \glostyle{index} style). Entries will +%be sorted according to the short form. +% %Note also that when these two package options are used (in the %given order), the \sty{glossaries} package additionally implements the %\pkgopt{sanitize} option using @@ -2003,7 +3383,16 @@ %If the \pkgopt{description} package option is also used, the %\gloskey{name} key is set to the long form, otherwise the %\gloskey{name} key is set to the short form and the -%\gloskey{description} key is set to the long form. +%\gloskey{description} key is set to the long form. In both +%cases the \gloskey{symbol} is set to the short form. Therefore, +%if you use the \pkgopt{description} package option and you want +%the short form to appear in the list of acronyms, you will need +%to use a glossary style that displays the entry's symbol (for +%example, the \glostyle{index} style). Entries will be sorted +%according to the long form if the \pkgopt{description} option +%is used, otherwise they will be sorted according to the +%short form (unless overridden by the \gloskey{sort} key in +%the optional argument of \ics{newacronym}). % %\item[\pkgopt{description}]\mbox{}\par This package option displays the entry on first use as:\\[10pt] %\meta{long}\meta{insert} (\cs{firstacronymfont}\marg{abbrv})\\[10pt] @@ -2014,23 +3403,71 @@ %\ipkgopt[symbol]{sanitize}\verb|sanitize={symbol=false}|, so %remember to protect fragile commands when defining acronyms. % +%Note that with this option, you need to specify the description +%using the \gloskey{description} key in the optional argument +%of \ics{newacronym}. When this option is used without +%the \pkgopt{footnote} or \pkgopt{dua} options, the name field +%is specified as +%\DescribeMacro{\acrnameformat}\ics{acrnameformat}\marg{short}\marg{long}. This +%defaults to \ics{acronymfont}\marg{short}, which means that the +%long form will not appear in the list of acronyms by default. +%To change this, you need to redefine \ics{acrnameformat} as +%appropriate. For example, to display the long form followed +%by the short form in parentheses do: +%\begin{verbatim} +%\renewcommand*{\acrnameformat}[2]{#2 (\acronymfont{#1})} +%\end{verbatim} +%Note that even if you redefine \ics{acrnameformat}, the +%entries will be sorted according to the short form, unless you +%override this using the \gloskey{sort} key in the optional +%argument to \ics{newacronym}. +% %\item[\pkgopt{footnote}]\mbox{}\par This package option displays the entry on first use as:\\[10pt] %\cs{firstacronymfont}\marg{abbrv}\meta{insert}\cs{footnote}\marg{long}\\[10pt] %while subsequent use displays the entry as:\\[10pt] -%\cs{acronymfont}\marg{abbrv}\meta{insert} +%\cs{acronymfont}\marg{abbrv}\meta{insert}\\[10pt] +%Acronyms will be sorted according to the short form. % %Note also that if this package option is used, the \sty{glossaries} %package additionally implements the option %\ipkgopt[description]{sanitize}\verb|sanitize={description=false}|, so %remember to protect fragile commands when defining acronyms. % +%Note that on first use, it is the long form in the footnote that +%links to the relevant glossary entry (where hyperlinks are enabled), +%whereas on subsequent use, the acronym links to the relevant +%glossary entry. It is possible to change this to make the acronym +%on first use have the hyperlink instead of the footnote, but +%since the footnote marker will also be a hyperlink, you will +%have two hyperlinks in immediate succession. This can be +%ambiguous where the hyperlinks are coloured rather than boxed. +%The code required to change the first use to make the +%acronym a hyperlink is as follows: +%\begin{verbatim} +% \defglsdisplayfirst[\acronymtype]{% +% \noexpand\protect\noexpand +% \glslink[\@gls@link@opts]{\@gls@link@label}{\firstacronymfont{#1}#4}% +% \noexpand\protect\noexpand\footnote{#2}}% +%\end{verbatim} +%\textbf{Note} that this involves using internal commands +%(i.e.\ commands whose name contains an \verb|@| character), so +%if this code is place in a \texttt{.tex} file it needs to be +%placed within a \cs{makeatletter} \ldots\ \cs{makeatother} pair. +%(See \url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=atsigns} +%for further details.) +% %\item[\pkgopt{smallcaps}]\mbox{}\par If neither the \pkgopt{footnote} nor \pkgopt{description} options %have been set, this option displays the entry on first use as:\\[10pt] %\meta{long}\meta{insert} (\cs{firstacronymfont}\marg{abbrv})\\[10pt] %while subsequent use displays the entry as:\\[10pt] %\cs{acronymfont}\marg{abbrv}\meta{insert}\\[10pt] -%where \cs{acronymfont} is set to \verb|\textsc{#1}|, so \meta{abbrv} -%should be specified in lower case. +%where \cs{acronymfont} is set to \verb|\textsc{#1}|. +% +%\begin{important} +%Note that since the acronym is displayed using \ics{textsc}, +%the short form, \meta{abbrv}, should be specified in lower case. +%(Recall that "\textsc{abc}" produces \textsc{abc} whereas "\textsc{ABC}" produces \textsc{ABC}.) +%\end{important} % %Note also that if this package option is used, the \sty{glossaries} %package additionally implements the option @@ -2043,9 +3480,13 @@ %while subsequent use displays the entry as:\\[10pt] %\cs{acronymfont}\marg{abbrv}\meta{insert}\\[10pt] %where \cs{acronymfont} is set to \verb|{\smaller #1}|. +%The entries will be sorted according to the short form. % +%\begin{important} %Remember to load a package that defines \ics{smaller} (such as -%\isty{relsize}) if you want to use this option. +%\isty{relsize}) if you want to use this option, unless you want +%to redefine \ics{acronymfont} to use some other formatting command. +%\end{important} % %Note also that if this package option is used, the \sty{glossaries} %package additionally implements the option @@ -2057,7 +3498,8 @@ %then on first use the entry is displayed as:\\[10pt] %\meta{long} (\meta{abbrv})\meta{insert}\\[10pt] %while subsequent use displays the entry as:\\[10pt] -%\meta{abbrv}\meta{insert} +%\meta{abbrv}\meta{insert}\\[10pt] +%Entries will be sorted according to the short form. %\end{description} % %Recall from \autoref{sec:glslink} that you can access the values of individual keys using commands @@ -2103,7 +3545,7 @@ % %Note that if you change the definition of \ics{newacronym}, you %may additionally need to change the above commands as well as -%the changing way the text is displayed using \ics{defglsdisplay} +%changing the way the text is displayed using \ics{defglsdisplay} %and \ics{defglsdisplayfirst}. % %The package option \pkgopt{shortcuts} provides the synonyms listed @@ -2114,7 +3556,7 @@ %produce all upper case text. % %\begin{table}[htbp] -%\caption{Synonyms provided by the package option \pkgopt{shortcuts}} +%\caption[Synonyms provided by the package option shortcuts]{Synonyms provided by the package option \pkgopt{shortcuts}} %\label{tab:shortcuts} %\begin{center} %\begin{tabular}{ll} @@ -2164,23 +3606,33 @@ %\subsection{Glossary Styles} %\label{sec:styles} %The \sty{glossaries} package comes with some pre-defined -%glossary styles. These are as follows: +%glossary styles. Note that the styles are suited to different +%types of glossaries: some styles ignore the associated +%symbol; some styles are not designed for hierarchical entries, +%so they display sub-entries in the same way as they display top +%level entries; some styles are designed for homographs, so they +%ignore the name for sub-entries. You should therefore pick a style +%that suits your type of glossary. +%The predefined styles are as follows: +% %\begin{description} %\item[list] The \glostyle{list} style uses the \envname{description} -%environment. The entry name is placed in the optional argument -%of the \cs{item} command (so it will appear in bold by -%default). The description follows, and then the associated number -%list for that entry. Sub groups are separated using \cs{indexspace}. +%environment. The entry name is placed in the optional argument of +%the \cs{item} command (so it will appear in bold by default). The +%description follows, and then the associated \term{number list} for +%that entry. The symbol is ignored. If the entry has child entries, +%the description and number list follows (but not the name) for each +%child entry. Groups are separated using \cs{indexspace}. % %\item[listgroup] The \glostyle{listgroup} style is like %\glostyle{list} but the glossary groups have headings. % %\item[listhypergroup] The \glostyle{listhypergroup} style is like -%\glostyle{listgroup} 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 -%is up-to-date. In the navigation panel, each group is separated +%\glostyle{listgroup} but has a navigation line at the start of +%the glossary with links to each group that is present in the +%glossary. This requires an additional run through \LaTeX\ to ensure +%the group information is up-to-date. In the navigation line, each +%group is separated %by \DescribeMacro{\glshypernavsep}\cs{glshypernavsep} which %defaults to a vertical bar with a space on either side. For example, %to simply have a space separating each group, do: @@ -2188,21 +3640,24 @@ %\renewcommand*{\glshypernavsep}{\space} %\end{verbatim} % -%Note that the hyper-navigation panel is now (as from version 1.14) +%Note that the hyper-navigation line is now (as from version 1.14) %set inside the optional argument to \cs{item} instead of after it %to prevent a spurious space at the start. This can be changed %by redefining \ics{glossaryheader}, but note that this needs to %be done \emph{after} the glossary style has been set. % %\item[altlist] The \glostyle{altlist} style is like \glostyle{list} -%but the description is placed on the following line. +%but the description starts on the line following the name. (As +%with the \glostyle{list} style, the symbol is ignored.) Each child +%entry starts a new line, but as with the \glostyle{list} style, +%the name associated with each child entry is ignored. % %\item[altlistgroup] The \glostyle{altlistgroup} style is like %\glostyle{altlist} but the glossary groups have headings. % %\item[altlisthypergroup] The \glostyle{altlisthypergroup} style is like %\glostyle{altlistgroup} but has a set of links to the glossary -%groups. The navigation panel is the same as that for +%groups. The navigation line is the same as that for %\glostyle{listhypergroup}, described above. % %\item[listdotted] This style uses the \envname{description} @@ -2211,16 +3666,19 @@ %this style ignores both the \term{number list} and the symbol. The %length \DescribeMacro{\glslistdottedwidth}\cs{glslistdottedwidth} %governs where the description should start.\footnote{This style was -%supplied by Axel~Menzel.} +%supplied by Axel~Menzel.} This is a flat style, so child +%entries are formatted in the same way as the parent entries. % %\item[long] The \glostyle{long} style uses the \envname{longtable} %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}. +%The entry's symbol is ignored. %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}. +%\ics{glsdescwidth}. Child entries have a similar format to the +%parent entries except that their name is suppressed. % %\item[longborder] The \glostyle{longborder} style is like %\glostyle{long} but has horizontal and vertical lines around it. @@ -2235,10 +3693,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}. The width of the -%first column is governed by the widest entry in that column. The +%and the third column contains the \term{number list}. +%The entry's symbol is ignored. 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 +%\ics{glsdescwidth}, and the width of the third column is governed by the %length \ics{glspagelistwidth}. % %\item[long3colborder] The \glostyle{long3colborder} style is like @@ -2256,8 +3715,8 @@ %\glostyle{long3col} 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 \glostyle{altlong4col} for long -%descriptions. +%widest entry in the given column. Use \glostyle{altlong4col} for +%multi-line descriptions. % %\item[long4colborder] The \glostyle{long4colborder} style is like %the \glostyle{long4col} style but has horizontal and vertical @@ -2270,12 +3729,12 @@ %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 +%\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 widths of the +%name and symbol columns are governed by the widest entry in the %given column. % %\item[altlong4colborder] The \glostyle{altlong4colborder} style is like @@ -2294,10 +3753,12 @@ %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}. +%The entry's symbol is ignored. %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}. +%\ics{glsdescwidth}. Child entries have a similar format to the +%parent entries except that their name is suppressed. % %\item[superborder] The \glostyle{superborder} style is like %\glostyle{super} but has horizontal and vertical lines around it. @@ -2312,7 +3773,8 @@ %\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}. The width of the +%and the third column contains the \term{number list}. The +%entry's symbol is ignored. 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 @@ -2334,7 +3796,7 @@ %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. +%for multi-line descriptions. % %\item[super4colborder] The \glostyle{super4colborder} style is like %the \glostyle{super4col} style but has horizontal and vertical @@ -2368,6 +3830,76 @@ %style is like \glostyle{super4colheaderborder} but allows multi-line %descriptions and page lists. % +%\item[index] The \glostyle{index} style is similar to the +%way indices are usually formatted in that it has a +%hierarchical structure up to three levels. The name is typeset in +%bold, and if the symbol is present it is set in parentheses after +%the name and before the description. Sub-entries are indented and +%also include the name, the symbol (if present) and the description. +%Groups are separated using \ics{indexspace}. +% +%\item[indexgroup] The \glostyle{indexgroup} style is similar to +%the \glostyle{index} style except that each group has a heading. +% +%\item[indexhypergroup] The \glostyle{indexhypergroup} style is like +%\glostyle{indexgroup} but has a set of links to the glossary +%groups. The navigation line is the same as that for +%\glostyle{listhypergroup}, described above. +% +%\item[tree] The \glostyle{tree} style is similar to the +%\glostyle{index} style except that it can have arbitrary levels. +%(Note that \appname{makeindex} is limited to three levels, so +%you will need to use \appname{xindy} if you want more than +%three levels.) Each sub-level is indented by +%\DescribeMacro{\glstreeindent}\cs{glstreeindent}. Note that the +%name, symbol (if present) and description are placed in the +%same paragraph block. If you want the name to be apart from the +%description, use the \glostyle{alttree} style instead. (See below.) +% +%\item[treegroup] The \glostyle{treegroup} style is similar to +%the \glostyle{tree} style except that each group has a heading. +% +%\item[treehypergroup] The \glostyle{treehypergroup} style is like +%\glostyle{treegroup} but has a set of links to the glossary +%groups. The navigation line is the same as that for +%\glostyle{listhypergroup}, described above. +% +%\item[treenoname] The \glostyle{treenoname} style is like +%the \glostyle{tree} style except that the name for each sub-entry +%is ignored. +% +%\item[treenonamegroup] The \glostyle{treenonamegroup} style is +%similar to the \glostyle{treenoname} style except that each group +%has a heading. +% +%\item[treenonamehypergroup] The \glostyle{treenonamehypergroup} +%style is like \glostyle{treenonamegroup} but has a set of links to +%the glossary groups. The navigation line is the same as that for +%\glostyle{listhypergroup}, described above. +% +%\item[alttree] The \glostyle{alttree} style is similar to the +%\glostyle{tree} style except that the indentation for each level +%is determined by the width of the text specified by\\[10pt] +%\DescribeMacro{\glssetwidest}\cs{glssetwidest}\oarg{level}\marg{text}\\[10pt] +%The optional argument \meta{level} indicates the level, where +%0 indicates the top-most level, 1 indicates the first level +%sub-entries, etc. If \cs{glssetwidest} hasn't been used for a +%given sub-level, the level~0 widest text is used instead. If +%\meta{level} is omitted, 0 is assumed. +% +%For each level, the name is placed to the left of the paragraph +%block containing the symbol (optional) and the description. If the +%symbol is present, it is placed in parentheses before the +%description. +% +%\item[alttreegroup] The \glostyle{alttreegroup} is like the +%\glostyle{alttree} style except that each group has a heading. +% +%\item[alttreehypergroup] The \glostyle{alttreehypergroup} style is +%like \glostyle{alttreegroup} but has a set of links to the glossary +%groups. The navigation line is the same as that for +%\glostyle{listhypergroup}, described above. +% %\end{description} % %The glossary style can be set using the \pkgopt{style} package option @@ -2384,6 +3916,9 @@ %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 want to explicitly create a line-break within +%a multi-line description you should use \ics{newline} instead +%of \verb|\\|. % %Note that if you use the \gloskey[printglossary]{style} key in the %optional argument to \ics{printglossary}, it will override any @@ -2405,7 +3940,11 @@ %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}. +%\ics{glossarystyle}, e.g.: +%\begin{verbatim} +%\glossarystyle{long} +%\renewcommand*{\glsgroupskip}{} +%\end{verbatim} % % \changes{1.03}{2007 July 4}{'glspostdescription added} %All the styles except for the three- and four-column styles and the @@ -2414,8 +3953,12 @@ %description. This simply displays a full stop by default. To eliminate %this full stop (or replace it with something else, say a comma) you %will need to redefine \cs{glspostdescription} before the glossary is -%displayed. +%displayed. Alternatively, you can suppress it for a given entry +%by placing \ics{nopostdesc} in the entry's description. +% +% %\subsection{Defining your own glossary style} +%\label{sec:newglossarystyle} % %If the predefined styles don't fit your requirements, you can %define your own style using\DescribeMacro{\newglossarystyle}:\\[10pt] @@ -2454,7 +3997,8 @@ %twenty-eight logical blocks that are determined by the first character %of the \gloskey{sort} key (or \gloskey{name} key if the \gloskey{sort} %key is omitted). The sub-divisions are in the following order: symbols, -%numbers, A, \ldots, Z. Note that the argument to \cs{glsgroupheading} +%numbers, A, \ldots, Z\@. (This may be different if you use +%\appname{xindy}.) Note that the argument to \cs{glsgroupheading} %is a label \emph{not} the group title. The group title can be obtained %via \cs{glsgetgrouptitle}\marg{label}, and a navigation hypertarget can %be created using \cs{glsnavhypertarget}\marg{label}. Most of the @@ -2466,14 +4010,16 @@ %\item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]} %\end{verbatim} %See also \cs{glsgroupskip} below. (Note that command definitions within -%\cs{newglossarystyle} must use \verb|##1| etc instead of \verb|#1| etc.) +%\cs{newglossarystyle} must use \verb|##1| instead of \verb|#1| etc.) % %\item %\DescribeMacro{\glsgroupskip} %\cs{glsgroupskip}\par\noindent %This macro determines what to do after one logical group but before %the header for the next logical group. The \glostyle{list} glossary -%style simply redefines \cs{glsgroupskip} to be \cs{indexspace}. +%style simply redefines \cs{glsgroupskip} to be \cs{indexspace}, +%whereas the tabular-like styles redefine \cs{glsgroupskip} to +%produce a blank row. % %\item %\DescribeMacro{\glossaryentryfield} @@ -2520,6 +4066,17 @@ %Therefore, when you define a new glossary style, you don't need %to worry about whether the user has specified the %\pkgopt{nonumberlist} package option. +% +%\item +%\DescribeMacro{\glossarysubentryfield} +%\cs{glossarysubentryfield}\marg{level}\marg{label}\marg{formatted +%name}\marg{description}\marg{symbol} +%\marg{number list}\par\noindent +%This is new to version 1.17, and is used to display sub-entries. +%The first argument, \meta{level}, indicates the sub-entry level. +%This must be an integer from 1 (first sub-level) onwards. The +%remaining arguments are analogous to those for +%\ics{glossaryentryfield} described above. %\end{description} %\subsubsection{Example: creating a completely new style} % @@ -2558,8 +4115,13 @@ % \space ##3% the description % \space [##5]% the number list in square brackets % }% +% % set how sub-entries appear: +% \renewcommand*{\glossarysubentryfield}[6]{% +% \glossaryentryfield{#2}{#3}{#4}{#5}{#6}}% % } %\end{verbatim} +%Note that this style creates a flat glossary, where sub-entries +%are displayed in exactly the same way as the top level entries. % %\subsubsection{Example: creating a new glossary style based on an %existing style} @@ -2584,7 +4146,7 @@ %\section{Mfirstuc Package} %\label{sec:mfirstuc} % -%The \sty{glossaries} package is supplied with the package +%The \sty{glossaries} bundle is supplied with the package %\isty{mfirstuc} which provides the command:\\[10pt] %\DescribeMacro{\makefirstuc} %\cs{makefirstuc}\marg{stuff}\\[10pt] @@ -2599,12 +4161,15 @@ %(\ics{MakeUppercase} has been applied to the letter \dq{a} rather %than \cs{emph}.) % -%\item \verb|\makefirstuc{{\'a}bc}| produces {\'A}bc -% -%\item \verb|\makefirstuc{\ae bc}| produces \AE bc +%\item \verb|\makefirstuc{{\'a}bc}| produces \MakeUppercase{\'a}bc % -%\item \verb|\makefirstuc{{\ae}bc}| produces {\AE}bc +%\item \verb|\makefirstuc{\ae bc}| produces \MakeUppercase\ae bc +%\item \verb|\makefirstuc{{\ae}bc}| produces \MakeUppercase{\ae}bc +%\item \verb|\makefirstuc{{ä}bc}| produces \MakeUppercase{ä}bc %\end{itemize} +%Note that non-Latin or accented characters appearing at the +%start of the text must be placed in a group (even if you are +%using the \isty{inputenc} package) due to expansion issues. % %\begin{important} %In version 1.02 of \sty{mfirstuc}, a bug fix resulted in a change @@ -2620,7 +4185,7 @@ %\makefirstuc{\abc} %\end{verbatim} %produces: ABC. This is because the first object in the argument of -%\cs{makefirstuc} is \cs{abc}, so it does \verb|\MakeUppercase{\abc}|. +%\cs{makefirstuc} is \cs{abc}, so it does \verb|\MakeUppercase\abc|. %Whereas: %\begin{verbatim} %\newcommand{\abc}{abc} @@ -2637,8 +4202,8 @@ %produces: Abc. % %If you want to use an alternative command to convert to uppercase, -%for example \cs{MakeTextUppercase}\footnote{defined in the -%\sty{textcase} package}, you can redefine the internal +%for example \cs{MakeTextUppercase},\footnote{defined in the +%\sty{textcase} package} you can redefine the internal %command \cs{@gls@makefirstuc}. For example: %\begin{verbatim} %\renewcommand{\@gls@makefirstuc}[1]{\MakeTextUppercase #1} @@ -2664,7 +4229,7 @@ % This package requires \LaTeXe. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2008/08/27 v1.16 (NLCT)] +\ProvidesPackage{glossaries}[2008/12/26 v1.17 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -2682,19 +4247,22 @@ % Need to use \cs{new@ifnextchar} instead of \cs{@ifnextchar} in % commands that have a final optional argument (such as \ics{gls}) % so require \isty{amsgen}. -% Thanks to Morten~H{\o}gholm for suggesting this. (This has +% Thanks to Morten~H\o gholm for suggesting this. (This has % replaced using the \sty{xspace} package.) % \begin{macrocode} \RequirePackage{amsgen} % \end{macrocode} % % \subsection{Package Options}\label{sec:pkgopt} +%\begin{macro}{toc} % The \pkgopt{toc} package option will add the glossaries % to the table of contents. This is a boolean key, if the % value is omitted it is taken to be true. % \begin{macrocode} \define@boolkey{glossaries.sty}[gls]{toc}[true]{} % \end{macrocode} +%\end{macro} +%\begin{macro}{numberline} %\changes{1.1}{2008 Feb 22}{numberline option added} % The \pkgopt{numberline} package option adds \cs{numberline} to % \cs{addcontentsline}. Note that this option only has an effect @@ -2702,6 +4270,7 @@ % \begin{macrocode} \define@boolkey{glossaries.sty}[gls]{numberline}[true]{} % \end{macrocode} +%\end{macro} % % The sectional unit used to start the glossary is stored in % \cs{@@glossarysec}. If chapters are defined, this @@ -2713,6 +4282,8 @@ \newcommand*{\@@glossarysec}{chapter}} % \end{macrocode} %\end{macro} +% +%\begin{macro}{section} % The \pkgopt{section} key can be used to set the sectional unit. % If no unit is specified, use \texttt{section} as the default. % The starred form of the named sectional unit will be used. @@ -2724,7 +4295,8 @@ subsection,subsubsection,paragraph,subparagraph}[section]{% \renewcommand*{\@@glossarysec}{#1}} % \end{macrocode} -%\changes{1.1}{2008 Feb 22}{numberedsection option added} +%\end{macro} +% % Determine whether or not to use numbered sections. %\begin{macro}{\@@glossarysecstar} % \begin{macrocode} @@ -2743,6 +4315,8 @@ subsection,subsubsection,paragraph,subparagraph}[section]{% \newcommand*{\glsautoprefix}{} % \end{macrocode} %\end{macro} +%\begin{macro}{numberedsection} +%\changes{1.1}{2008 Feb 22}{numberedsection package option added} % \begin{macrocode} \define@choicekey{glossaries.sty}{numberedsection}[\val\nr]{% false,nolabel,autolabel}[nolabel]{% @@ -2757,6 +4331,7 @@ false,nolabel,autolabel}[nolabel]{% \renewcommand*{\@@glossaryseclabel}{\label{\glsautoprefix\@glo@type}}% \fi} % \end{macrocode} +%\end{macro} % % The default glossary style is stored in % \cs{@glossary@default@style}. This is initialised to @@ -2768,6 +4343,8 @@ false,nolabel,autolabel}[nolabel]{% \newcommand*{\@glossary@default@style}{list} % \end{macrocode} %\end{macro} +% +%\begin{macro}{style} % The default glossary style can be changed using the \pkgopt{style} % package option. The value can be the name of any % defined glossary style. The glossary style is set at the beginning @@ -2779,6 +4356,7 @@ false,nolabel,autolabel}[nolabel]{% \define@key{glossaries.sty}{style}{% \renewcommand*{\@glossary@default@style}{#1}} % \end{macrocode} +%\end{macro} % % Each entry within a given glossary will have an associated % number list. By default, this refers to the page numbers on @@ -2790,6 +4368,7 @@ false,nolabel,autolabel}[nolabel]{% \newcommand*{\glossaryentrynumbers}[1]{#1} % \end{macrocode} %\end{macro} +%\begin{macro}{nonumberlist} % Note that the entire number list for a given entry will be % passed to \cs{glossaryentrynumbers} so any font changes % will also be applied to the delimiters. @@ -2800,6 +4379,7 @@ false,nolabel,autolabel}[nolabel]{% \DeclareOptionX{nonumberlist}{% \renewcommand*{\glossaryentrynumbers}[1]{}} % \end{macrocode} +%\end{macro} % % Keep track of the default glossary. This is initialised to % the main glossary, but can be changed if for some reason @@ -2824,12 +4404,15 @@ false,nolabel,autolabel}[nolabel]{% \newcommand{\acronymtype}{\glsdefaulttype} % \end{macrocode} %\end{macro} +% +%\begin{macro}{acronym} % The \pkgopt{acronym} option sets an associated conditional % which is used in \autoref{sec:acronym} to determine whether % or not to define a separate glossary for acronyms. % \begin{macrocode} \define@boolkey{glossaries.sty}[gls]{acronym}[true]{} % \end{macrocode} +%\end{macro} % % The default counter associated with the numbers in the glossary % is stored in \cs{glscounter}. This is initialised to the @@ -2842,12 +4425,14 @@ false,nolabel,autolabel}[nolabel]{% \newcommand{\glscounter}{page} % \end{macrocode} %\end{macro} +%\begin{macro}{counter} % The \pkgopt{counter} option changes the default counter. (This % just redefines \cs{glscounter}.) % \begin{macrocode} \define@key{glossaries.sty}{counter}{% \renewcommand*{\glscounter}{#1}} % \end{macrocode} +%\end{macro} % % The glossary keys whose values are written to another file (i.e.\ % \gloskey{sort}, \gloskey{name}, \gloskey{description} and @@ -2892,8 +4477,8 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} %\end{macro} % (There is no equivalent for the \gloskey{sort} key, since that -% is only provided for the benefit of \appname{makeindex}, and -% so will always be sanitized.) +% is only provided for the benefit of \appname{makeindex} or +% \appname{xindy}, and so will always be sanitized.) % % Before defining the \pkgopt{sanitize} package option, The % key-value list for the \pkgopt{sanitize} value needs to be defined. @@ -2931,6 +4516,8 @@ false,nolabel,autolabel}[nolabel]{% \renewcommand*{\@gls@sanitizesymbol}{}% \fi} % \end{macrocode} +% +%\begin{macro}{sanitize} % Now define the \pkgopt{sanitize} option. It can either take % a key-val list as its value, or it can take the keyword % \texttt{none}, which is equivalent to \texttt{description=false, @@ -2945,18 +4532,23 @@ name=true]{% }{\setkeys[gls]{sanitize}{#1}}% } % \end{macrocode} +%\end{macro} +%\begin{macro}{translate} %\changes{1.1}{2008 Feb 22}{translate option added} % Define \pkgopt{translate} option. If false don't set up % multi-lingual support. % \begin{macrocode} \define@boolkey{glossaries.sty}[gls]{translate}[true]{} % \end{macrocode} +%\end{macro} % Set the default value: % \begin{macrocode} \glstranslatefalse \@ifpackageloaded{translator}{\glstranslatetrue}{% \@ifpackageloaded{babel}{\glstranslatetrue}{}} % \end{macrocode} +% +%\begin{macro}{footnote} % Set the long form of the acronym in footnote on first use. % \begin{macrocode} \define@boolkey{glossaries.sty}[glsacr]{footnote}[true]{% @@ -2964,6 +4556,8 @@ name=true]{% {\renewcommand*{\@gls@sanitizedesc}{}}% } % \end{macrocode} +%\end{macro} +%\begin{macro}{description} % Allow acronyms to have a description (needs to be set using % the \gloskey{description} key in the optional argument of % \ics{newacronym}). @@ -2972,12 +4566,16 @@ name=true]{% \renewcommand*{\@gls@sanitizesymbol}{}% } % \end{macrocode} +%\end{macro} +%\begin{macro}{smallcaps} % Define \ics{newacronym} to set the short form in small capitals. % \begin{macrocode} \define@boolkey{glossaries.sty}[glsacr]{smallcaps}[true]{% \renewcommand*{\@gls@sanitizesymbol}{}% } % \end{macrocode} +%\end{macro} +%\begin{macro}{smaller} % Define \ics{newacronym} to set the short form using \cs{smaller} % which obviously needs to be defined by loading the appropriate % package. @@ -2986,6 +4584,8 @@ name=true]{% \renewcommand*{\@gls@sanitizesymbol}{}% } % \end{macrocode} +%\end{macro} +%\begin{macro}{dua} % Define \ics{newacronym} to always use the long forms % (i.e.\ don't use acronyms) % \begin{macrocode} @@ -2993,11 +4593,104 @@ name=true]{% \renewcommand*{\@gls@sanitizesymbol}{}% } % \end{macrocode} +%\end{macro} +%\begin{macro}{shotcuts} % Define acronym shortcuts. % \begin{macrocode} \define@boolkey{glossaries.sty}[glsacr]{shortcuts}[true]{} % \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsorder} +% Stores the glossary ordering. This may either be \dq{word} +% or \dq{letter}. This passes the relevant information to +% \appname{makeglossaries}. The default is word ordering. +% \begin{macrocode} +\newcommand*{\glsorder}{word} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@glsorder} +% The ordering information is written to the auxiliary file +% for \appname{makeglossaries}, so ignore the auxiliary +% information. +% \begin{macrocode} +\newcommand*{\@glsorder}[1]{} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{order} +%\changes{1.17}{2008 December 26}{order package option added} +% \begin{macrocode} +\define@choicekey{glossaries.sty}{order}{word,letter}{% + \def\glsorder{#1}} +% \end{macrocode} +%\end{macro} +% +%\changes{1.17}{2008 December 26}{added xindy support} +%\begin{macro}{\ifglsxindy} +%\changes{1.17}{2008 December 26}{new} +% Provide boolean to determine whether \appname{xindy} or +% \appname{makeindex} will be used to sort the glossaries. +% \begin{macrocode} +\newif\ifglsxindy +% \end{macrocode} +%\end{macro} +% The default is \appname{makeindex}: +% \begin{macrocode} +\glsxindyfalse +% \end{macrocode} +% +% Define package option to specify that \appname{makeindex} will +% be used to sort the glossaries: +% \begin{macrocode} +\DeclareOptionX{makeindex}{\glsxindyfalse} +% \end{macrocode} +% +% The \pkgopt{xindy} package option may have a value which in +% turn can be a key=value list. First define the keys for this +% sub-list. The boolean "glsnumbers" determines whether to +% automatically add the \texttt{glsnumbers} letter group. +% \begin{macrocode} +\define@boolkey[gls]{xindy}{glsnumbers}[true]{} +\gls@xindy@glsnumberstrue +% \end{macrocode} +% +%\begin{macro}{\@xdy@main@language} +% Define what language to use for each glossary type (if a +% language is not defined for a particular glossary type +% the language specified for the main glossary is used.) +% \begin{macrocode} +\def\@xdy@main@language{\rootlanguagename}% +% \end{macrocode} +%\end{macro} +% Define key to set the language +% \begin{macrocode} +\define@key[gls]{xindy}{language}{\def\@xdy@main@language{#1}} +% \end{macrocode} +% +%\begin{macro}{\gls@codepage} +% Define the code page. If \ics{inputencodingname} is defined +% use that, otherwise have initialise with no codepage. +% \begin{macrocode} +\@ifundefined{inputencodingname}{% + \def\gls@codepage{}}{% + \def\gls@codepage{\inputencodingname} +} +% \end{macrocode} +% Define a key to set the code page. +% \begin{macrocode} +\define@key[gls]{xindy}{codepage}{\def\gls@codepage{#1}} +% \end{macrocode} +%\end{macro} % +% Define package option to specify that \appname{xindy} will be +% used to sort the glossaries: +% \begin{macrocode} +\define@key{glossaries.sty}{xindy}[]{% + \glsxindytrue + \setkeys[gls]{xindy}{#1}% +} +% \end{macrocode} % % Process package options: % \begin{macrocode} @@ -3025,6 +4718,47 @@ name=true]{% \@ifundefined{hyperdef}{}{\hyperdef{section}{\thesection}{}}}}}{} % \end{macrocode} % +%\begin{macro}{\@gls@onlypremakeg} +% Some commands only have an effect when used before +% \ics{makeglossaries}. So define a list of commands that +% should be disabled after \ics{makeglossaries} +% \begin{macrocode} +\newcommand*{\@gls@onlypremakeg}{} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@onlypremakeg} +% Adds the specified control sequence to the list of commands that +% must be disabled after \ics{makeglossaries}. +% \begin{macrocode} +\newcommand*{\@onlypremakeg}[1]{% +\ifx\@gls@onlypremakeg\@empty + \def\@gls@onlypremakeg{#1}% +\else + \expandafter\toks@\expandafter{\@gls@onlypremakeg}% + \edef\@gls@onlypremakeg{\the\toks@,\noexpand#1}% +\fi} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@disable@onlypremakeg} +% Disable all commands listed in \cs{@gls@onlypremakeg} +% \begin{macrocode} +\newcommand*{\@disable@onlypremakeg}{% +\@for\@thiscs:=\@gls@onlypremakeg\do{% + \expandafter\@disable@premakecs\@thiscs% +}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@disable@premakecs} +% Disables the given command. +% \begin{macrocode} +\newcommand*{\@disable@premakecs}[1]{% + \def#1{\PackageError{glossaries}{\string#1\space may only be + used before \string\makeglossaries}{You can't use + \string#1\space after \string\makeglossaries}}% +} +% \end{macrocode} +%\end{macro} +% %\subsection{Default values}\label{sec:predefinednames} % This section sets up default values that are used by this % package. Some of the names may already be defined (e.g.\ by @@ -3096,6 +4830,16 @@ name=true]{% \newcommand*{\glspluralsuffix}{s} % \end{macrocode} %\end{macro} +%\begin{macro}{\seename} +% \begin{macrocode} +\providecommand*{\seename}{see} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\andname} +% \begin{macrocode} +\providecommand*{\andname}{\&} +% \end{macrocode} +%\end{macro} % Add multi-lingual support\changes{1.08}{2007 Oct 13}{Added % babel support}. Thanks to everyone who contributed to the % translations from both comp.text.tex and via email. @@ -3131,29 +4875,80 @@ name=true]{% \@ifpackageloaded{babel}{\RequirePackage{glossaries-babel}}{}} \fi % \end{macrocode} +%\begin{macro}{\glspostdescription} % The description terminator is given by \cs{glspostdescription} % (except for the 3 and 4 column styles). This is a full stop % by default: -%\begin{macro}{\glspostdescription} % \begin{macrocode} \newcommand*{\glspostdescription}{.} % \end{macrocode} %\end{macro} % -% The name of the \appname{makeindex} style file is given by -% \cs{istfilename}. This file is +%\begin{macro}{\nopostdesc} +% Provide a means to suppress description terminator for a given +% entry. (Useful for entries with no description.) Has no +% effect outside the glossaries. +%\changes{1.17}{2008 December 26}{new} +% \begin{macrocode} +\newcommand*{\nopostdesc}{} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@nopostdesc} +% Suppress next description terminator. +% \begin{macrocode} +\newcommand*{\@nopostdesc}{% + \let\org@glspostdescription\glspostdescription + \def\glspostdescription{% + \let\glspostdescription\org@glspostdescription}% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glspar} +% Provide means of having a paragraph break in glossary entries +% \begin{macrocode} +\newcommand{\glspar}{\par} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\setStyleFile} +% Sets the style file. The relevent extension is appended. +% \begin{macrocode} +\ifglsxindy + \newcommand{\setStyleFile}[1]{% + \renewcommand{\istfilename}{#1.xdy}} +\else + \newcommand{\setStyleFile}[1]{% + \renewcommand{\istfilename}{#1.ist}} +\fi +% \end{macrocode} +% This command only has an effect prior to using +% \ics{makeglossaries}. +% \begin{macrocode} +\@onlypremakeg\setStyleFile +% \end{macrocode} +%\end{macro} +% +% The name of the \appname{makeindex} or \appname{xindy} style file +% is given by \cs{istfilename}. This file is % created by \ics{writeist} (which is used by % \ics{makeglossaries}) so % redefining this command will only have an effect if it is -% done \emph{before} the \filetype{.ist} file is created. +% done \emph{before} \cs{makeglossaries}. As from v1.17, use +% \ics{setStyleFile} instead of directly redefining \cs{istfilename}. %\begin{macro}{\istfilename} +%\changes{1.17}{2008 December 26}{added xindy support} % \begin{macrocode} -\providecommand*{\istfilename}{\jobname.ist} +\ifglsxindy + \def\istfilename{\jobname.xdy} +\else + \def\istfilename{\jobname.ist} +\fi % \end{macrocode} %\end{macro} % The \appname{makeglossaries} Perl script picks up this name -% from the auxiliary file and passes it to \appname{makeindex} -% using the \texttt{-s} option. Since its not required by +% from the auxiliary file. If the name ends with \filetype{.xdy} +% it calls \appname{xindy} otherwise it calls \appname{makeindex}. +% Since its not required by % \LaTeX, \cs{@istfilename} ignores its argument. %\begin{macro}{\@istfilename} % \begin{macrocode} @@ -3164,16 +4959,99 @@ name=true]{% % This command is the value of the \istkey{page\_compositor} % \appname{makeindex} key. Again, any redefinition of this command % must take place \emph{before} \cs{writeist} otherwise it -% will have no effect. +% will have no effect. As from 1.17, use \ics{glsSetCompositor} +% instead of directly redefining \cs{glscompositor}. %\begin{macro}{\glscompositor} % \begin{macrocode} -\newcommand{\glscompositor}{.} +\newcommand*{\glscompositor}{.} % \end{macrocode} %\end{macro} +%\begin{macro}{\glsSetCompositor} +% Sets the compositor. +% \begin{macrocode} +\newcommand*{\glsSetCompositor}[1]{% + \renewcommand*{\glscompositor}{#1}} +% \end{macrocode} +% Only use before \ics{makeglossaries} +% \begin{macrocode} +\@onlypremakeg\glsSetCompositor +% \end{macrocode} +%\end{macro} +% % (The page compositor is usually defined as a dash when using % \appname{makeindex}, but most of the standard counters used % by \LaTeX\ use a full stop as the compositor, which is why I -% have used it as the default.) +% have used it as the default.) If \appname{xindy} is used +% \cs{glscompositor} only affects the \texttt{arabic-page-numbers} +% location class. +%\begin{macro}{\@glsAlphacompositor} +% This is only used by \appname{xindy}. It specifies the +% compositor to use when location numbers are in the form +% \meta{letter}\meta{compositor}\meta{number}. For example, +% if \cs{@glsAlphacompositor} is set to ``.'' then it allows +% locations such as A.1 whereas if \cs{@glsAlphacompositor} is +% set to ``-'' then it allows locations such as A-1. +% \begin{macrocode} +\newcommand*{\@glsAlphacompositor}{\glscompositor} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsSetAlphaCompositor} +% Sets the alpha compositor. +% \begin{macrocode} +\ifglsxindy + \newcommand*\glsSetAlphaCompositor[1]{% + \renewcommand*\@glsAlphacompositor{#1}} +\else + \newcommand*\glsSetAlphaCompositor[1]{% + \glsnoxindywarning\glsSetAlphaCompositor} +\fi +% \end{macrocode} +% Can only be used before \ics{makeglossaries} +% \begin{macrocode} +\@onlypremakeg\glsSetAlphaCompositor +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\gls@suffixF} +%\changes{1.17}{2008 December 26}{new} +% Suffix to use for a two page list. This overrides the separator +% and the closing page number if set to something other than +% an empty macro. +% \begin{macrocode} +\newcommand*{\gls@suffixF}{} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glsSetSuffixF} +%\changes{1.17}{2008 December 26}{new} +% Sets the suffix to use for a two page list. +% \begin{macrocode} +\newcommand*{\glsSetSuffixF}[1]{% + \renewcommand*{\gls@suffixF}{#1}} +% \end{macrocode} +% Only has an effect when used before \ics{makeglossaries} +% \begin{macrocode} +\@onlypremakeg\glsSetSuffixF +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\gls@suffixFF} +%\changes{1.17}{2008 December 26}{new} +% Suffix to use for a three page list. This overrides the separator +% and the closing page number if set to something other than +% an empty macro. +% \begin{macrocode} +\newcommand*{\gls@suffixFF}{} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glsSetSuffixFF} +%\changes{1.17}{2008 December 26}{new} +% Sets the suffix to use for a three page list. +% \begin{macrocode} +\newcommand*{\glsSetSuffixFF}[1]{% + \renewcommand*{\gls@suffixFF}{#1}} +% \end{macrocode} +%\end{macro} % % The command \cs{glsnumberformat} indicates the default % format for the page numbers in the glossary. (Note that this @@ -3189,6 +5067,7 @@ name=true]{% \newcommand*{\glsnumberformat}[1]{\glshypernumber{#1}}} % \end{macrocode} %\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 @@ -3346,6 +5225,419 @@ name=true]{% % \end{macrocode} %\end{macro} % +%\subsection{Xindy} +% This section defines commands that only have an effect if +% \appname{xindy} is used to sort the glossaries. +%\begin{macro}{\glsnoxindywarning} +% Issues a warning if \appname{xindy} hasn't been specified. +% These warnings can be suppressed by redefining +% \cs{glsnoxindywarning} to ignore its argument +% \begin{macrocode} +\newcommand*{\glsnoxindywarning}[1]{% + \PackageWarning{glossaries}{Not in xindy mode --- ignoring + \string#1}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@xdyattributes} +% Define list of attributes (\cs{string} is used in case +% the double quote character has been made active) +% \begin{macrocode} +\ifglsxindy + \edef\@xdyattributes{\string"default\string"}% +\fi +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@xdylocref} +% Define list of markup location references. +% \begin{macrocode} +\ifglsxindy + \def\@xdylocref{} +\fi +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\GlsAddXdyAttribute} +% Adds an attribute. +% \begin{macrocode} +\ifglsxindy + \newcommand*\GlsAddXdyAttribute[1]{% + \edef\@xdyattributes{\@xdyattributes ^^J \string"#1\string"}% + \expandafter\toks@\expandafter{\@xdylocref}% + \edef\@xdylocref{\the\toks@ ^^J% + (markup-locref + :open \string"\string~n\string\setentrycounter + {\noexpand\glscounter}% + \expandafter\string\csname#1\endcsname + \expandafter\@gobble\string\{\string" ^^J + :close \string"\expandafter\@gobble\string\}\string" ^^J + :attr \string"#1\string")}} +% \end{macrocode} +% Only has an effect before \ics{writeist}: +% \begin{macrocode} + \@onlypremakeg\GlsAddXdyAttribute +\else + \newcommand*\GlsAddXdyAttribute[1]{% + \glsnoxindywarning\GlsAddXdyAttribute} +\fi +% \end{macrocode} +%\end{macro} +% Add known attributes: +% \begin{macrocode} +\ifglsxindy + \GlsAddXdyAttribute{glsnumberformat} + \GlsAddXdyAttribute{textrm} + \GlsAddXdyAttribute{textsf} + \GlsAddXdyAttribute{texttt} + \GlsAddXdyAttribute{textbf} + \GlsAddXdyAttribute{textmd} + \GlsAddXdyAttribute{textit} + \GlsAddXdyAttribute{textup} + \GlsAddXdyAttribute{textsl} + \GlsAddXdyAttribute{textsc} + \GlsAddXdyAttribute{emph} + \GlsAddXdyAttribute{glshypernumber} + \GlsAddXdyAttribute{hyperrm} + \GlsAddXdyAttribute{hypersf} + \GlsAddXdyAttribute{hypertt} + \GlsAddXdyAttribute{hyperbf} + \GlsAddXdyAttribute{hypermd} + \GlsAddXdyAttribute{hyperit} + \GlsAddXdyAttribute{hyperup} + \GlsAddXdyAttribute{hypersl} + \GlsAddXdyAttribute{hypersc} + \GlsAddXdyAttribute{hyperemph} +\fi +% \end{macrocode} +% +%\begin{macro}{\@xdyuseralphabets} +% List of additional alphabets +% \begin{macrocode} +\def\@xdyuseralphabets{} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\GlsAddXdyAlphabet} +% \cs{GlsAddXdyAlphabet}\marg{name}\marg{definition} +% adds a new alphabet called \meta{name}. The definition +% must use \appname{xindy} syntax. +% \begin{macrocode} +\ifglsxindy + \newcommand*{\GlsAddXdyAlphabet}[2]{% + \edef\@xdyuseralphabets{% + \@xdyuseralphabets ^^J + (define-alphabet "#1" (#2))}} +\else + \newcommand*{\GlsAddXdyAlphabet}[2]{% + \glsnoxindywarning\GlsAddXdyAlphabet} +\fi +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@xdyuserlocationdefs} +% List of additional location definitions +% (separated by "^^J") +% \begin{macrocode} +\def\@xdyuserlocationdefs{} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@xdyuserlocationnames} +% List of additional user location names +% \begin{macrocode} +\def\@xdyuserlocationnames{} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\GlsAddXdyLocation} +% \cs{GlsAddXdyLocation}\marg{name}\marg{definition} +% Define a new location called \meta{name}. The definition +% must use \appname{xindy} syntax. (Note that this doesn't +% check to see if the location is already defined. That is left +% to \appname{xindy} to complain about.) +% \begin{macrocode} +\ifglsxindy + \newcommand*{\GlsAddXdyLocation}[2]{% + \edef\@xdyuserlocationdefs{% + \@xdyuserlocationdefs ^^J% + (define-location-class \string"#1\string"^^J\space\space + \space(#2)) + }% + \edef\@xdyuserlocationnames{% + \@xdyuserlocationnames^^J\space\space\space + \string"#1\string"}% + } +% \end{macrocode} +% Only has an effect before \ics{writeist}: +% \begin{macrocode} + \@onlypremakeg\GlsAddXdyLocation +\else + \newcommand*{\GlsAddXdyLocation}[2]{% + \glsnoxindywarning\GlsAddXdyLocation} +\fi +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@xdylocationclassorder} +% Define location class order +% \begin{macrocode} +\ifglsxindy + \edef\@xdylocationclassorder{^^J\space\space\space + \string"roman-page-numbers\string"^^J\space\space\space + \string"arabic-page-numbers\string"^^J\space\space\space + \string"arabic-section-numbers\string"^^J\space\space\space + \string"alpha-page-numbers\string"^^J\space\space\space + \string"Roman-page-numbers\string"^^J\space\space\space + \string"Alpha-page-numbers\string"^^J\space\space\space + \string"Appendix-page-numbers\string" + \@xdyuserlocationnames^^J\space\space\space + \string"see\string" + } +\fi +% \end{macrocode} +%\end{macro} +% Change the location order. +%\begin{macro}{\GlsSetXdyLocationClassOrder} +% \begin{macrocode} +\ifglsxindy + \newcommand*\GlsSetXdyLocationClassOrder[1]{% + \def\@xdylocationclassorder{#1}} +\else + \newcommand*\GlsSetXdyLocationClassOrder[1]{% + \glsnoxindywarning\GlsSetXdyLocationClassOrder} +\fi +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@xdysortrules} +% Define sort rules +% \begin{macrocode} +\ifglsxindy + \def\@xdysortrules{} +\fi +% \end{macrocode} +%\end{macro} +%\begin{macro}{\GlsAddSortRule} +% Add a sort rule +% \begin{macrocode} +\ifglsxindy + \newcommand*\GlsAddSortRule[2]{% + \expandafter\toks@\expandafter{\@xdysortrules}% + \protected@edef\@xdysortrules{\the\toks@ ^^J + (sort-rule \string"#1\string" \string"#2\string")}% + } +\else + \newcommand*\GlsAddSortRule[2]{% + \glsnoxindywarning\GlsAddSortRule} +\fi +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@xdyrequiredstyles} +% Define list of required styles (this should be a comma-separated +% list of \appname{xindy} styles) +% \begin{macrocode} +\ifglsxindy + \def\@xdyrequiredstyles{tex} +\fi +% \end{macrocode} +%\end{macro} +%\begin{macro}{\GlsAddXdyStyle} +% Add a \appname{xindy} style to the list of required styles +% \begin{macrocode} +\ifglsxindy + \newcommand*\GlsAddXdyStyle[1]{% + \edef\@xdyrequiredstyles{\@xdyrequiredstyles,#1}}% +\else + \newcommand*\GlsAddXdyStyle[1]{% + \glsnoxindywarning\GlsAddXdyStyle} +\fi +% \end{macrocode} +%\end{macro} +%\begin{macro}{\GlsSetXdyStyles} +% Reset the list of required styles +% \begin{macrocode} +\ifglsxindy + \newcommand*\GlsSetXdyStyles[1]{% + \edef\@xdyrequiredstyles{#1}} +\else + \newcommand*\GlsSetXdyStyles[1]{% + \glsnoxindywarning\GlsSetXdyStyles} +\fi +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\findrootlanguage} +% The root language name is required by \appname{xindy}. This +% information is for \appname{makeglossaries} to pass to +% \appname{xindy}. Since \ics{languagename} only stores the +% regional dialect rather than the root language name, some +% trickery is required to determine the root language. +% \begin{macrocode} +\ifglsxindy + \@ifpackageloaded{babel}{% +% \end{macrocode} +% Need to parse \texttt{babel.sty} to determine the root language. +% This code was provided by Enrico~Gregorio. +% \begin{macrocode} + \def\findrootlanguage{\begingroup + \escapechar=-1\relax +% \end{macrocode} +% normalize \cs{languagename} to category 12 chars +% \begin{macrocode} + \edef\languagename{% + \expandafter\string\csname\languagename\endcsname}% +% \end{macrocode} +% disable \texttt{babel.sty} useless commands +% \begin{macrocode} + \def\NeedsTeXFormat##1[##2]{}% + \def\ProvidesPackage##1[##2]{}% + \let\LdfInit\relax + \def\languageattribute##1##2{}% +% \end{macrocode} +% change the meaning of \cs{DeclareOption} +% \begin{macrocode} + \def\DeclareOption##1##2{% +% \end{macrocode} +% at \cs{DeclareOption*} we end +% \begin{macrocode} + \ifx##1*\expandafter\endinput\else +% \end{macrocode} +% else we build a string with the first argument +% \begin{macrocode} + \edef\testlanguage{\expandafter\string\csname##1\endcsname}% +% \end{macrocode} +% if \cs{testlanguage} and \cs{languagename} are the same +% we execute the second argument +% \begin{macrocode} + \ifx\testlanguage\languagename##2\fi + \fi} +% \end{macrocode} +% almost all options of babel are \cs{input}"{"\meta{name}".ldf}" +% \begin{macrocode} + \def\input##1{\stripldf##1}% +% \end{macrocode} +% we put the root language name in \ics{rootlanguagename} +% \begin{macrocode} + \def\stripldf##1.ldf{\gdef\rootlanguagename{##1}}% +% \end{macrocode} +% now input babel.sty, using the primitive \cs{input} +% \begin{macrocode} + \@@input babel.sty + \endgroup}% + }{% +% \end{macrocode} +% \isty{babel} hasn't been loaded, so check if \isty{ngerman} has +% been loaded +% \begin{macrocode} + \@ifpackageloaded{ngerman}{% + \def\findrootlanguage{% + \def\rootlanguagename{german}}% + }{% +% \end{macrocode} +% Neither \sty{babel} nor \sty{ngerman} have been loaded, so +% assume the root language is English +% \begin{macrocode} + \def\findrootlanguage{% + \def\rootlanguagename{english}}% + }% + }% +\fi +% \end{macrocode} +%\end{macro} +%\begin{macro}{\rootlanguagename} +% Set default root language to English. +% \begin{macrocode} +\def\rootlanguagename{english} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@xdylanguage} +% The \appname{xindy} language setting is required by +% \appname{makeglossaries}, so provide a command for +% \appname{makeglossaries} to pick up the information +% from the auxiliary file. This command is not needed by the +% \sty{glossaries} package, so define it to ignore its arguments. +% \begin{macrocode} +\def\@xdylanguage#1#2{} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\GlsSetXdyLanguage} +% Define a command that allows the user to set the language +% for a given glossary type. The first argument indicates the +% glossary type. If omitted the main glossary is assumed. +% \begin{macrocode} +\ifglsxindy + \newcommand*\GlsSetXdyLanguage[2][\glsdefaulttype]{% + \ifglossaryexists{#1}{% + \expandafter\def\csname @xdy@#1@language\endcsname{#2}% + }{% + \PackageError{glossaries}{Can't set language type for + glossary type `#1' --- no such glossary}{% + You have specified a glossary type that doesn't exist}}} +\else + \newcommand*\GlsSetXdyLanguage[2][]{% + \glsnoxindywarning\GlsSetXdyLanguage} +\fi +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@gls@codepage} +% The \appname{xindy} codepage setting is required by +% \appname{makeglossaries}, so provide a command for +% \appname{makeglossaries} to pick up the information +% from the auxiliary file. This command is not needed by the +% \sty{glossaries} package, so define it to ignore its arguments. +% \begin{macrocode} +\def\@gls@codepage#1#2{} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\GlsSetXdyCodePage} +% Define command to set the code page. +% \begin{macrocode} +\ifglsxindy + \newcommand*{\GlsSetXdyCodePage}[1]{% + \renewcommand*{\gls@codepage}{#1}% + } +\else + \newcommand*{\GlsSetXdyCodePage}[1]{% + \glsnoxindywarning\GlsSetXdyCodePage} +\fi +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@xdylettergroups} +% Store letter group definitions. +% \begin{macrocode} +\ifglsxindy + \ifgls@xindy@glsnumbers + \def\@xdylettergroups{(define-letter-group + \string"glsnumbers\string"^^J\space\space\space + :prefixes (\string"0\string" \string"1\string" + \string"2\string" \string"3\string" \string"4\string" + \string"5\string" \string"6\string" \string"7\string" + \string"8\string" \string"9\string")^^J\space\space\space + :before \string"\@glsfirstletter\string")} + \else + \def\@xdylettergroups{} + \fi +\fi +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\GlsAddLetterGroup} +% Add a new letter group. The first argument is the name +% of the letter group. The second argument is the \appname{xindy} +% code specifying prefixes and ordering. +% \begin{macrocode} + \newcommand*\GlsAddLetterGroup[2]{% + \expandafter\toks@\expandafter{\@xdylettergroups}% + \protected@edef\@xdylettergroups{\the\toks@^^J% + (define-letter-group \string"#1\string"^^J\space\space\space#2)}% + }% +% \end{macrocode} +%\end{macro} +% %\subsection{Loops and conditionals} % To iterate through all glossaries (or comma-separated list of % glossary names given in optional argument) use:\\[10pt] @@ -3516,10 +5808,14 @@ exists}% \@ifnextchar[{\@gls@setcounter{#2}}{\@gls@setcounter{#2}[\glscounter]}}} % \end{macrocode} %\end{macro} -% Only defined new glossaries in the preamble: +% Only define new glossaries in the preamble: % \begin{macrocode} \@onlypreamble{\newglossary} % \end{macrocode} +% Only define new glossaries before \ics{makeglossaries} +% \begin{macrocode} +\@onlypremakeg\newglossary +% \end{macrocode} %\cs{@newglossary} is used to specify the file extensions % for the \appname{makeindex} input, output and transcript files. % It is written to the auxiliary file by \ics{newglossary}. @@ -3693,6 +5989,48 @@ called `#1'}{The counter key should have the name of a valid counter as its value}}{% \def\@glo@counter{#1}}} % \end{macrocode} +% The \gloskey{see} key specifies a list of cross-references +% \begin{macrocode} +\define@key{glossentry}{see}{% +\def\@glo@see{#1}} +% \end{macrocode} +% The \gloskey{parent} key specifies the parent entry, if +% required. +% \begin{macrocode} +\define@key{glossentry}{parent}{% +\def\@glo@parent{#1}} +% \end{macrocode} +% The \gloskey{nonumberlist} key suppresses the number list +% for the given entry. +% \begin{macrocode} +\define@key{glossentry}{nonumberlist}[none]{% +\def\@glo@prefix{\glsnonextpages}} +% \end{macrocode} +% +%\begin{macro}{\@glsnoname} +% \changes{1.17}{2008 December 26}{new} +% Define command to generate error if \gloskey{name} key is missing. +% \begin{macrocode} +\newcommand*{\@glsnoname}{% + \PackageError{glossaries}{name key required in + \string\newglossaryentry\space for entry `\@glo@label'}{You + haven't specified the entry name}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@glsdefaultplural} +% Define command to set default plural. +% \changes{1.17}{2008 December 26}{new} +% \begin{macrocode} +\newcommand*{\@glsdefaultplural}{\@glo@text\glspluralsuffix} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\gls@level} +% Register to increment entry levels. +% \begin{macrocode} +\newcount\gls@level +% \end{macrocode} +%\end{macro} % % Define \cs{newglossaryentry}% % \marg{label} \marg{key-val list}. @@ -3707,15 +6045,18 @@ counter as its value}}{% % \begin{macrocode} \glsdoifnoexists{#1}{% % \end{macrocode} +% Store label +% \begin{macrocode} +\def\@glo@label{#1}% +% \end{macrocode} % Set up defaults. If the \gloskey{name} or \gloskey{description} % keys are omitted, an error will be generated. -%\changes{1.05}{2007 Aug 10}{Changed the default value of the sort -% key to just the value of the name key}% +% \begin{macrocode} +\let\@glo@name\@glsnoname +% \end{macrocode} %\changes{1.08}{2007 Oct 13}{Fixed error message to say ``description %key'' rather than ``desc key''} % \begin{macrocode} -\def\@glo@name{\PackageError{glossaries}{name key required in -\string\newglossaryentry}{You haven't specified the entry name}}% \def\@glo@desc{\PackageError{glossaries}{description key required in \string\newglossaryentry}{You haven't specified the entry description}}% % \end{macrocode} @@ -3733,7 +6074,9 @@ counter as its value}}{% % \end{macrocode} % \begin{macrocode} \def\@glo@text{\@glo@name}% -\def\@glo@plural{\@glo@text\glspluralsuffix}% +% \end{macrocode} +% \begin{macrocode} +\let\@glo@plural\@glsdefaultplural % \end{macrocode} % \changes{1.13}{2008 May 10}{Changed default first value} % Using \cs{let} instead of \cs{def} to make later comparison @@ -3749,10 +6092,24 @@ counter as its value}}{% % \begin{macrocode} \let\@glo@firstplural\relax % \end{macrocode} +%\changes{1.05}{2007 Aug 10}{Changed the default value of the sort +% key to just the value of the name key}% % \begin{macrocode} \def\@glo@sort{\@glo@name}% \def\@glo@counter{\@gls@getcounter{\@glo@type}}% % \end{macrocode} +%\changes{1.17}{2008 December 26}{added see key} +% \begin{macrocode} +\def\@glo@see{}% +% \end{macrocode} +%\changes{1.17}{2008 December 26}{added parent key} +% \begin{macrocode} +\def\@glo@parent{}% +% \end{macrocode} +%\changes{1.17}{2008 December 26}{added nonumberlist key} +% \begin{macrocode} +\def\@glo@prefix{}% +% \end{macrocode} % Extract key-val information from third parameter: % \begin{macrocode} \setkeys{glossentry}{#2}% @@ -3768,6 +6125,72 @@ in it}}{% \expandafter\xdef\csname glolist@\@glo@type\endcsname{\@glolist@{#1},}% }% % \end{macrocode} +% Initialise level to 0. +% \begin{macrocode} +\gls@level=0\relax +% \end{macrocode} +% Has this entry been assigned a parent? +% \begin{macrocode} +\ifx\@glo@parent\@empty +% \end{macrocode} +% Doesn't have a parent. Set \cs{glo@}\meta{label}"@parent" to +% empty. +% \begin{macrocode} + \expandafter\gdef\csname glo@#1@parent\endcsname{}% +\else +% \end{macrocode} +% Has a parent. Check to ensure this entry isn't its own parent. +% \begin{macrocode} + \ifthenelse{\equal{#1}{\@glo@parent}}{% + \PackageError{glossaries}{Entry `#1' can't be its own parent}{}% + \def\@glo@parent{}% + \expandafter\gdef\csname glo@#1@parent\endcsname{}% + }{% +% \end{macrocode} +% Check the parent exists: +% \begin{macrocode} + \ifglsentryexists{\@glo@parent}{% +% \end{macrocode} +% Parent exists. Set \cs{glo@}\meta{label}"@parent". +% \begin{macrocode} + \expandafter\xdef\csname glo@#1@parent\endcsname{\@glo@parent}% +% \end{macrocode} +% Determine level. +% \begin{macrocode} + \gls@level=\csname glo@\@glo@parent @level\endcsname\relax + \advance\gls@level by 1\relax +% \end{macrocode} +% If name hasn't been specified, use same as the parent name +% \begin{macrocode} + \ifx\@glo@name\@glsnoname + \expandafter\let\expandafter\@glo@name + \csname glo@\@glo@parent @name\endcsname +% \end{macrocode} +% If name and plural haven't been specified, use same as the parent +% \begin{macrocode} + \ifx\@glo@plural\@glsdefaultplural + \expandafter\let\expandafter\@glo@plural + \csname glo@\@glo@parent @plural\endcsname + \fi + \fi + }{% +% \end{macrocode} +% Parent doesn't exist, so issue an error message and change this +% entry to have no parent +% \begin{macrocode} + \PackageError{glossaries}{Invalid parent `\@glo@parent' + for entry `#1' - parent doesn't exist}{Parent entries + must be defined before their children}% + \def\@glo@parent{}% + \expandafter\gdef\csname glo@#1@parent\endcsname{}% + }% + }% +\fi +% \end{macrocode} +% Set the level for this entry +% \begin{macrocode} +\expandafter\xdef\csname glo@#1@level\endcsname{\number\gls@level}% +% \end{macrocode} % Check if \gloskey{first} and \gloskey{firstplural} have been use. % If \gloskey{firstplural} hasn't been specified, but \gloskey{first} % has been specified, then form \gloskey{firstplural} by appending @@ -3835,11 +6258,139 @@ in it}}{% \expandafter\global\expandafter \let\csname ifglo@#1@flag\endcsname\iftrue}% \csname glo@#1@flagfalse\endcsname -}} % \end{macrocode} -%\end{macro} +% Sort out any cross-referencing if required. +% \begin{macrocode} +\ifx\@glo@see\@empty +\else + \protected@edef\@do@glssee{% + \noexpand\@gls@fixbraces\noexpand\@glo@list\@glo@see + \noexpand\@nil + \noexpand\expandafter\noexpand\@glssee\noexpand\@glo@list{#1}}% + \@do@glssee +\fi +}% +% \end{macrocode} +% Determine and store main part of the entry's index format. +%\changes{1.17}{2008 December 26}{Stored main part of entry +% format when entry +% is defined}% +% \begin{macrocode} + \@glo@storeentry{#1}% +} +% \end{macrocode} %\changes{1.13}{2008 May 10}{Removed restriction on only using % 'newglossaryentry in the preamble} +%\end{macro} +% +%\begin{macro}{\@glo@storeentry} +%\changes{1.17}{2008 December 26}{new} +% Determine the format to write the entry in the glossary +% output (\filetype{.glo}) file. +% The argument is the entry's label. +% The result is stored in \cs{glo@}\meta{label}"@entry", where +% \meta{label} is the entry's label. (This doesn't include +% any formatting or location information.) +% \begin{macrocode} +\newcommand{\@glo@storeentry}[1]{% +% \end{macrocode} +% Get the sort string and escape any special characters +% \begin{macrocode} +\protected@edef\@glo@sort{\csname glo@#1@sort\endcsname}% +\@gls@checkmkidxchars\@glo@sort +% \end{macrocode} +% Same again for the name string. +% \begin{macrocode} +\protected@edef\@@glo@name{\csname glo@#1@name\endcsname}% +\@gls@checkmkidxchars\@@glo@name +% \end{macrocode} +% Add the font command. (The backslash needs to be escaped for +% \appname{xindy}.) +% \begin{macrocode} +\ifglsxindy + \protected@edef\@glo@name{\string\\glsnamefont{\@@glo@name}}% +\else + \protected@edef\@glo@name{\string\glsnamefont{\@@glo@name}}% +\fi +% \end{macrocode} +% Get the description string and escape any special characters +% \begin{macrocode} +\protected@edef\@glo@desc{\csname glo@#1@desc\endcsname}% +\@gls@checkmkidxchars\@glo@desc +% \end{macrocode} +% Same again for the symbol +% \begin{macrocode} +\protected@edef\@glo@symbol{\csname glo@#1@symbol\endcsname}% +\@gls@checkmkidxchars\@glo@symbol +% \end{macrocode} +% Escape any special characters in the prefix +% \begin{macrocode} +\@gls@checkmkidxchars\@glo@prefix +% \end{macrocode} +% Get the parent, if one exists +% \begin{macrocode} +\edef\@glo@parent{\csname glo@#1@parent\endcsname}% +% \end{macrocode} +% Write the information to the glossary file. +% \begin{macrocode} +\ifglsxindy +% \end{macrocode} +% Store using \appname{xindy} syntax. +% \begin{macrocode} + \ifx\@glo@parent\@empty +% \end{macrocode} +% Entry doesn't have a parent +% \begin{macrocode} + \expandafter\protected@xdef\csname glo@#1@index\endcsname{% + (\string"\@glo@sort\string" % + \string"\@glo@prefix\string\\glossaryentryfield{#1}{\@glo@name + }{\@glo@desc}{\@glo@symbol}\string") % + }% + \else +% \end{macrocode} +% Entry has a parent +% \begin{macrocode} + \expandafter\protected@xdef\csname glo@#1@index\endcsname{% + \csname glo@\@glo@parent @index\endcsname + (\string"\@glo@sort\string" % + \string"\@glo@prefix\string\\glossarysubentryfield% + {\csname glo@#1@level\endcsname}{#1}{\@glo@name + }{\@glo@desc}{\@glo@symbol}\string") % + }% + \fi +\else +% \end{macrocode} +% Store using \appname{makeindex} syntax. +% \begin{macrocode} + \ifx\@glo@parent\@empty +% \end{macrocode} +% Sanitize \cs{@glo@prefix} +% \begin{macrocode} + \@onelevel@sanitize\@glo@prefix +% \end{macrocode} +% Entry doesn't have a parent +% \begin{macrocode} + \expandafter\protected@xdef\csname glo@#1@index\endcsname{% + \@glo@sort\@gls@actualchar\@glo@prefix + \string\glossaryentryfield{#1}{\@glo@name}{\@glo@desc + }{\@glo@symbol}% + }% + \else +% \end{macrocode} +% Entry has a parent +% \begin{macrocode} + \expandafter\protected@xdef\csname glo@#1@index\endcsname{% + \csname glo@\@glo@parent @index\endcsname\@gls@levelchar + \@glo@sort\@gls@actualchar\@glo@prefix + \string\glossarysubentryfield + {\csname glo@#1@level\endcsname}{#1}{\@glo@name}{\@glo@desc + }{\@glo@symbol}% + }% + \fi +\fi +} +% \end{macrocode} +%\end{macro} % %\subsection{Resetting and unsetting entry flags} % Each glossary entry is assigned a conditional of the form @@ -4115,32 +6666,23 @@ counter as its value}}{% \edef\@gls@counter{\csname glo@#2@counter\endcsname}% \KV@glslink@hypertrue \setkeys{glslink}{#1}% -\edef\theglsentrycounter{\expandafter\noexpand\csname the\@gls@counter\endcsname}% +\edef\theglsentrycounter{\expandafter\noexpand + \csname the\@gls@counter\endcsname}% \ifKV@glslink@hyper \@glslink{glo:#2}{\glstextformat{#3}}% \else \glstextformat{#3}\relax \fi -\protected@edef\@glo@sort{\csname glo@#2@sort\endcsname}% -\@gls@checkmkidxchars\@glo@sort -\protected@edef\@@glo@name{\csname glo@#2@name\endcsname}% -\@gls@checkmkidxchars\@@glo@name -\protected@edef\@glo@name{\string\glsnamefont{\@@glo@name}}% -\protected@edef\@glo@desc{\csname glo@#2@desc\endcsname}% -\@gls@checkmkidxchars\@glo@desc -\protected@edef\@glo@symbol{\csname glo@#2@symbol\endcsname}% -\@gls@checkmkidxchars\@glo@symbol -\@set@glo@numformat\@glo@numfmt\@gls@counter\@glsnumberformat -\glossary[\csname glo@#2@type\endcsname]{% -\@glo@sort\@gls@actualchar -\string\glossaryentryfield{#2}{\@glo@name}{\@glo@desc -}{\@glo@symbol}\@gls@encapchar\@glo@numfmt}% +\@do@wrglossary{#2}% }} % \end{macrocode} %\end{macro} %\changes{1.01}{2007 May 17}{Added range facility in format key}% % Set the formatting information in the format required by -% \appname{makeindex}: +% \appname{makeindex}. The first argument is the format specified +% by the user (via the format key), the second argument is the +% name of the counter used to indicate the location and the third +% argument is a control sequence which stores the required format. %\begin{macro}{\@set@glo@numformat} % \begin{macrocode} \def\@set@glo@numformat#1#2#3{% @@ -4178,31 +6720,57 @@ counter as its value}}{% \fi \fi} % \end{macrocode} -% Catch \appname{makeindex} special characters\mkidxspch: +% +%\begin{macro}{\@gls@escbsdq} +% Escape backslashes and double quote marks. The argument must be +% a control sequence. +% \begin{macrocode} +\newcommand*{\@gls@escbsdq}[1]{% + \def\@gls@checkedmkidx{}% + \let\gls@xdystring=#1\relax + \@onelevel@sanitize\gls@xdystring + \edef\do@gls@xdycheckbackslash{% + \noexpand\@gls@xdycheckbackslash\gls@xdystring\noexpand\@nil + \@backslashchar\@backslashchar\noexpand\null}% + \do@gls@xdycheckbackslash + \expandafter\@gls@updatechecked\@gls@checkedmkidx{\gls@xdystring}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@xdycheckquote\gls@xdystring\@nil""\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{\gls@xdystring}% + \let#1=\gls@xdystring +} +% \end{macrocode} +%\end{macro} +% Catch special characters\mkidxspch (argument must be a +% control sequence): %\begin{macro}{\@gls@checkmkidxchars} % \begin{macrocode} \newcommand{\@gls@checkmkidxchars}[1]{% -\def\@gls@checkedmkidx{}% -\expandafter\@gls@checkquote#1\@nil""\null% -\expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% -\def\@gls@checkedmkidx{}% -\expandafter\@gls@checkescquote#1\@nil\"\"\null% -\expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% -\def\@gls@checkedmkidx{}% -\expandafter\@gls@checkescactual#1\@nil\?\?\null% -\expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% -\def\@gls@checkedmkidx{}% -\expandafter\@gls@checkactual#1\@nil??\null% -\expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% -\def\@gls@checkedmkidx{}% -\expandafter\@gls@checkbar#1\@nil||\null% -\expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% -\def\@gls@checkedmkidx{}% -\expandafter\@gls@checkescbar#1\@nil\|\|\null% -\expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% -\def\@gls@checkedmkidx{}% -\expandafter\@gls@checklevel#1\@nil!!\null% -\expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% +\ifglsxindy + \@gls@escbsdq{#1}% +\else + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkquote#1\@nil""\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkescquote#1\@nil\"\"\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkescactual#1\@nil\?\?\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkactual#1\@nil??\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkbar#1\@nil||\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkescbar#1\@nil\|\|\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checklevel#1\@nil!!\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% +\fi } % \end{macrocode} %\end{macro} @@ -4226,7 +6794,7 @@ counter as its value}}{% \def\@gls@checkquote#1"#2"#3\null{% \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% \toks@={#1}% -\ifx\null#2\null% +\ifx\null#2\null \ifx\null#3\null \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% \def\@@gls@checkquote{\relax}% @@ -4253,7 +6821,7 @@ counter as its value}}{% \def\@gls@checkescquote#1\"#2\"#3\null{% \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% \toks@={#1}% -\ifx\null#2\null% +\ifx\null#2\null \ifx\null#3\null \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% \def\@@gls@checkescquote{\relax}% @@ -4282,7 +6850,7 @@ counter as its value}}{% \def\@gls@checkescactual#1\?#2\?#3\null{% \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% \toks@={#1}% -\ifx\null#2\null% +\ifx\null#2\null \ifx\null#3\null \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% \def\@@gls@checkescactual{\relax}% @@ -4310,7 +6878,7 @@ counter as its value}}{% \def\@gls@checkescbar#1\|#2\|#3\null{% \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% \toks@={#1}% -\ifx\null#2\null% +\ifx\null#2\null \ifx\null#3\null \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% \def\@@gls@checkescbar{\relax}% @@ -4338,7 +6906,7 @@ counter as its value}}{% \def\@gls@checkesclevel#1\!#2\!#3\null{% \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% \toks@={#1}% -\ifx\null#2\null% +\ifx\null#2\null \ifx\null#3\null \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% \def\@@gls@checkesclevel{\relax}% @@ -4366,7 +6934,7 @@ counter as its value}}{% \def\@gls@checkbar#1|#2|#3\null{% \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% \toks@={#1}% -\ifx\null#2\null% +\ifx\null#2\null \ifx\null#3\null \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% \def\@@gls@checkbar{\relax}% @@ -4393,7 +6961,7 @@ counter as its value}}{% \def\@gls@checklevel#1!#2!#3\null{% \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% \toks@={#1}% -\ifx\null#2\null% +\ifx\null#2\null \ifx\null#3\null \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% \def\@@gls@checklevel{\relax}% @@ -4420,7 +6988,7 @@ counter as its value}}{% \def\@gls@checkactual#1?#2?#3\null{% \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% \toks@={#1}% -\ifx\null#2\null% +\ifx\null#2\null \ifx\null#3\null \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% \def\@@gls@checkactual{\relax}% @@ -4442,6 +7010,81 @@ counter as its value}}{% % \end{macrocode} %\end{macro} % +%\begin{macro}{\@gls@xdycheckquote} +% As before but for use with \appname{xindy} +% \begin{macrocode} +\def\@gls@xdycheckquote#1"#2"#3\null{% +\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% +\toks@={#1}% +\ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@xdycheckquote{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \string\"\string\"}% + \def\@@gls@xdycheckquote{\@gls@xdycheckquote#3\null}% + \fi +\else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \string\"}% + \ifx\null#3\null + \def\@@gls@xdycheckquote{\@gls@xdycheckquote#2""\null}% + \else + \def\@@gls@xdycheckquote{\@gls@xdycheckquote#2"#3\null}% + \fi +\fi +\@@gls@xdycheckquote +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@gls@xdycheckbackslash} +% Need to escape all backslashes for \appname{xindy}. +% Define command that will define \cs{@gls@xdycheckbackslash} +% \begin{macrocode} +\edef\def@gls@xdycheckbackslash{% + \noexpand\def\noexpand\@gls@xdycheckbackslash##1\@backslashchar + ##2\@backslashchar##3\noexpand\null{% + \noexpand\@gls@tmpb=\noexpand\expandafter + {\noexpand\@gls@checkedmkidx}% + \noexpand\toks@={##1}% + \noexpand\ifx\noexpand\null##2\noexpand\null + \noexpand\ifx\noexpand\null##3\noexpand\null + \noexpand\edef\noexpand\@gls@checkedmkidx{% + \noexpand\the\noexpand\@gls@tmpb\noexpand\the\noexpand\toks@}% + \noexpand\def\noexpand\@@gls@xdycheckbackslash{\relax}% + \noexpand\else + \noexpand\edef\noexpand\@gls@checkedmkidx{% + \noexpand\the\noexpand\@gls@tmpb\noexpand\the\noexpand\toks@ + \@backslashchar\@backslashchar\@backslashchar\@backslashchar}% + \noexpand\def\noexpand\@@gls@xdycheckbackslash{% + \noexpand\@gls@xdycheckbackslash##3\noexpand\null}% + \noexpand\fi + \noexpand\else + \noexpand\edef\noexpand\@gls@checkedmkidx{% + \noexpand\the\noexpand\@gls@tmpb\noexpand\the\noexpand\toks@ + \@backslashchar\@backslashchar}% + \noexpand\ifx\noexpand\null##3\noexpand\null + \noexpand\def\noexpand\@@gls@xdycheckbackslash{% + \noexpand\@gls@xdycheckbackslash##2\@backslashchar + \@backslashchar\noexpand\null}% + \noexpand\else + \noexpand\def\noexpand\@@gls@xdycheckbackslash{% + \noexpand\@gls@xdycheckbackslash##2\@backslashchar + ##3\noexpand\null}% + \noexpand\fi + \noexpand\fi + \noexpand\@@gls@xdycheckbackslash + }% +} +% \end{macrocode} +% Now go ahead and define \cs{@gls@xdycheckbackslash} +% \begin{macrocode} +\def@gls@xdycheckbackslash +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\@glslink} % If \ics{hyperlink} is not defined \cs{@glslink} % ignores its first argument and just does the second argument, @@ -6081,6 +8724,21 @@ counter as its value}}{% % \end{macrocode} %\end{macro} % +%\begin{macro}{\glshyperlink} +% Provide a hyperlink to a glossary entry without adding information +% to the glossary file. The entry needs to be added using a +% command like \ics{glslink} or \ics{glsadd} to ensure that +% the target is defined. The first (optional) argument specifies +% the link text. The entry name is used by default. The second +% argument is the entry label. +%\changes{1.17}{2008 December 26}{new} +% \begin{macrocode} +\newcommand*{\glshyperlink}[2][\glsentryname{\@glo@label}]{% +\def\@glo@label{#2}% +\@glslink{glo:#2}{#1}} +% \end{macrocode} +%\end{macro} +% %\subsection{Adding an entry to the glossary without generating % text} % The following keys are provided for \cs{glsadd} and @@ -6105,24 +8763,12 @@ counter as its value}}{% % \begin{macrocode} \newcommand*{\glsadd}[2][]{% \glsdoifexists{#2}{% -\def\@glo@format{glsnumberformat}% -\edef\@glo@counter{\csname glo@#2@counter\endcsname}% +\def\@glsnumberformat{glsnumberformat}% +\edef\@gls@counter{\csname glo@#2@counter\endcsname}% \setkeys{glossadd}{#1}% -\edef\theglsentrycounter{\expandafter\noexpand\csname the\@glo@counter\endcsname}% -\protected@edef\@glo@sort{\csname glo@#2@sort\endcsname}% -\@gls@checkmkidxchars\@glo@sort -\protected@edef\@@glo@name{\csname glo@#2@name\endcsname}% -\@gls@checkmkidxchars\@@glo@name -\protected@edef\@glo@name{\string\glsnamefont{\@@glo@name}}% -\protected@edef\@glo@desc{\csname glo@#2@desc\endcsname}% -\@gls@checkmkidxchars\@glo@desc -\protected@edef\@glo@symbol{\csname glo@#2@symbol\endcsname}% -\@gls@checkmkidxchars\@glo@symbol -\@set@glo@numformat\@glo@numfmt\@glo@counter\@glo@format -\glossary[\csname glo@#2@type\endcsname]{% -\@glo@sort\@gls@actualchar\string\glossaryentryfield -{#2}{\@glo@name}{\@glo@desc}{\@glo@symbol}\@gls@encapchar -\@glo@numfmt}% +\edef\theglsentrycounter{\expandafter\noexpand + \csname the\@gls@counter\endcsname}% +\@do@wrglossary{#2}% }} % \end{macrocode} %\end{macro} @@ -6134,7 +8780,7 @@ counter as its value}}{% %\begin{macro}{\glsaddall} % \begin{macrocode} \newcommand*{\glsaddall}[1][]{% -\def\@glo@type{\@glo@types}% +\edef\@glo@type{\@glo@types}% \setkeys{glossadd}{#1}% \forallglsentries[\@glo@type]{\@glo@entry}{% \glsadd[#1]{\@glo@entry}}% @@ -6169,50 +8815,385 @@ counter as its value}}{% % any problem characters in \ics{glssymbolsgroupname} % and \ics{glsnumbersgroupname} from breaking hyperlinks. % -% Some of these lines are too long to fit on the page, but as I -% have temporarily disabled the comment character, I can't split -% the lines. If you want to see the code in full, have a look at -% \texttt{glossaries.sty}. -%\changes{1.01}{2007 May 17}{Added spaces after 'delimN and 'delimR in ist file}% +%\begin{macro}{\glsopenbrace} +% Define \cs{glsopenbrace} to make it easier to write an opening +% brace to a file. +% \begin{macrocode} +\edef\glsopenbrace{\expandafter\@gobble\string\{} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glsclosebrace} +% Define \cs{glsclosebrace} to make it easier to write an opening +% brace to a file. +% \begin{macrocode} +\edef\glsclosebrace{\expandafter\@gobble\string\}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glsquote} +% Define command that makes it easier to write quote marks to +% a file in the event that the double quote character has been +% made active. +% \begin{macrocode} +\edef\glsquote#1{\string"#1\string"} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@glsfirstletter} +% Define the first letter to come after the digits 0,\ldots,9. +% Only required for \appname{xindy}. +% \begin{macrocode} +\ifglsxindy + \newcommand*{\@glsfirstletter}{A} +\fi +% \end{macrocode} +%\end{macro} +%\begin{macro}{\GlsSetXdyFirstLetterAfterDigits} +% Sets the first letter to come after the digits 0,\ldots,9. +% \begin{macrocode} +\ifglsxindy + \newcommand*{\GlsSetXdyFirstLetterAfterDigits}[1]{% + \renewcommand*{\@glsfirstletter}{#1}} +\else + \newcommand*{\GlsSetXdyFirstLetterAfterDigits}[1]{% + \glsnoxindywarning\GlsSetXdyFirstLetterAfterDigits} +\fi +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@glsminrange} +% Define the minimum number of successive location references +% to merge into a range. +% \begin{macrocode} +\newcommand*{\@glsminrange}{2} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\GlsSetXdyMinRangeLength} +% Set the minimum range length. The value must either be "none" +% or a positive integer. The \sty{glossaries} package doesn't +% check if the argument is valid, that is left to \appname{xindy}. +% \begin{macrocode} +\ifglsxindy + \newcommand*{\GlsSetXdyMinRangeLength}[1]{% + \renewcommand*{\@glsminrange}{#1}} +\else + \newcommand*{\GlsSetXdyMinRangeLength}[1]{% + \glsnoxindywarning\GlsSetXdyMinRangeLength} +\fi +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\writeist} +%\changes{1.17}{2008 December 26}{added xindy support} +%\changes{1.01}{2007 May 17}{Added spaces after 'delimN and 'delimR in ist file}% % \begin{macrocode} \newwrite\istfile -\bgroup -\catcode`\%12\relax -\catcode`\"12\relax -\catcode`\|12\relax -\catcode`\!12\relax -\catcode`\?12\relax -\gdef\@gls@actualchar{?} -\gdef\@gls@encapchar{|} -\gdef\@gls@levelchar{!} -\gdef\@gls@quotechar{"} -\gdef\writeist{\relax -\protected@write\@auxout{}{\string\@istfilename{\istfilename}} -\openout\istfile=\istfilename -\write\istfile{% makeindex style file created by the glossaries package} -\write\istfile{% for document '\jobname' on \the\year-\the\month-\the\day} -\write\istfile{actual '\@gls@actualchar'} -\write\istfile{encap '\@gls@encapchar'} -\write\istfile{level '\@gls@levelchar'} -\write\istfile{quote '\@gls@quotechar'} -\write\istfile{keyword "\string\\glossaryentry"} -\write\istfile{preamble "\string\\glossarysection[\string\\glossarytoctitle]{\string\\glossarytitle}\string\\glossarypreamble\string\n\string\\begin{theglossary}\string\\glossaryheader\string\n"} -\write\istfile{postamble "\string\n\string\\end{theglossary}\string\n\string\\glossarypostamble\string\n"} -\write\istfile{group_skip "\string\\glsgroupskip\string\n"} -\write\istfile{item_0 "\string\n"} -\write\istfile{delim_0 "\{\string\\glossaryentrynumbers\{\string\\relax "} -\write\istfile{delim_t "\}\}"} -\write\istfile{delim_n "\string\\delimN "} -\write\istfile{delim_r "\string\\delimR "} -\write\istfile{headings_flag 1} -\write\istfile{heading_prefix "\string\\glsgroupheading\{"} -\write\istfile{heading_suffix "\}"} -\write\istfile{symhead_positive "glssymbols"} -\write\istfile{numhead_positive "glsnumbers"} -\write\istfile{page_compositor "\glscompositor"} -\noist} -\egroup +\ifglsxindy +% \end{macrocode} +% Code to use if \appname{xindy} is required. +% \begin{macrocode} + \def\writeist{% +% \end{macrocode} +% Open the style file +% \begin{macrocode} + \openout\istfile=\istfilename +% \end{macrocode} +% Write header comment at the start of the file +% \begin{macrocode} + \write\istfile{;; xindy style file created by the glossaries + package}% + \write\istfile{;; for document '\jobname' on + \the\year-\the\month-\the\day}% +% \end{macrocode} +% Specify the required styles +% \begin{macrocode} + \write\istfile{^^J; required styles^^J} + \@for\@xdystyle:=\@xdyrequiredstyles\do{% + \ifx\@xdystyle\@empty + \else + \protected@write\istfile{}{(require + \string"\@xdystyle.xdy\string")}% + \fi + }% +% \end{macrocode} +% List the allowed attributes (possible values used by the +% \gloskey{format} key) +% \begin{macrocode} + \write\istfile{^^J% + ; list of allowed attributes (number formats)^^J}% + \write\istfile{(define-attributes ((\@xdyattributes)))}% +% \end{macrocode} +% Define any additional alphabets +% \begin{macrocode} + \write\istfile{^^J; user defined alphabets^^J}% + \write\istfile{\@xdyuseralphabets}% +% \end{macrocode} +% Define location classes. +% \begin{macrocode} + \write\istfile{^^J; location class definitions^^J}% +% \end{macrocode} +% Lower case Roman numerals (i, ii, \ldots). In the event that +% \ics{roman} has been redefined to produce a fancy form of +% roman numerals, attempt to work out how it will be written +% to the output file. +% \begin{macrocode} + \protected@edef\@gls@roman{\@roman{0\string" + \string"roman-numbers-lowercase\string" :sep \string"}}% + \@onelevel@sanitize\@gls@roman + \edef\@tmp{\string" \string"roman-numbers-lowercase\string" + :sep \string"}% + \@onelevel@sanitize\@tmp + \ifx\@tmp\@gls@roman + \write\istfile{(define-location-class + \string"roman-page-numbers\string"^^J\space\space\space + (\string"roman-numbers-lowercase\string") + :min-range-length \@glsminrange)}% + \else + \write\istfile{(define-location-class + \string"roman-page-numbers\string"^^J\space\space\space + (:sep "\@gls@roman") + :min-range-length \@glsminrange)}% + \fi +% \end{macrocode} +% Upper case Roman numerals (I, II, \ldots) +% \begin{macrocode} + \write\istfile{(define-location-class + \string"Roman-page-numbers\string"^^J\space\space\space + (\string"roman-numbers-uppercase\string") + :min-range-length \@glsminrange)}% +% \end{macrocode} +% Arabic numbers (1, 2, \ldots) +% \begin{macrocode} + \write\istfile{(define-location-class + \string"arabic-page-numbers\string"^^J\space\space\space + (\string"arabic-numbers\string") + :min-range-length \@glsminrange)}% +% \end{macrocode} +% Lower case alphabetical locations (a, b, \ldots) +% \begin{macrocode} + \write\istfile{(define-location-class + \string"alpha-page-numbers\string"^^J\space\space\space + (\string"alpha\string") + :min-range-length \@glsminrange)}% +% \end{macrocode} +% Upper case alphabetical locations (A, B, \ldots) +% \begin{macrocode} + \write\istfile{(define-location-class + \string"Alpha-page-numbers\string"^^J\space\space\space + (\string"ALPHA\string") + :min-range-length \@glsminrange)}% +% \end{macrocode} +% Appendix style locations (e.g.\ A-1, A-2, \ldots, B-1, B-2, +% \ldots). The separator is given by \ics{@glsAlphacompositor}. +% \begin{macrocode} + \write\istfile{(define-location-class + \string"Appendix-page-numbers\string"^^J\space\space\space + (\string"ALPHA\string" + :sep \string"\@glsAlphacompositor\string" + \string"arabic-numbers\string") + :min-range-length \@glsminrange)}% +% \end{macrocode} +% Section number style locations (e.g.\ 1.1, 1.2, \ldots). The +% compositor is given by \ics{glscompositor}. +% \begin{macrocode} + \write\istfile{(define-location-class + \string"arabic-section-numbers\string"^^J\space\space\space + (\string"arabic-numbers\string" + :sep \string"\glscompositor\string" + \string"arabic-numbers\string") + :min-range-length \@glsminrange)}% +% \end{macrocode} +% User defined location classes. +% \begin{macrocode} + \write\istfile{^^J; user defined location classes}% + \write\istfile{\@xdyuserlocationdefs}% +% \end{macrocode} +% Cross-reference class. (The unverified option is used as the +% cross-references are supplied using the list of labels along with +% the optional argument for \ics{glsseeformat} which +% \appname{xindy} won't recognise.) +% \begin{macrocode} + \write\istfile{^^J; define cross-reference class^^J}% + \write\istfile{(define-crossref-class \string"see\string" + :unverified )}% +% \end{macrocode} +% Define how cross-references should be displayed. This adds an +% empty set of braces after the cross-referencing information +% allowing for the final argument of \cs{glsseeformat} which +% gets ignored. (When using \appname{makeindex} this final argument +% contains the location information which is not required.) +% \begin{macrocode} + \write\istfile{(markup-crossref-list + :class \string"see\string"^^J\space\space\space + :open \string"\string\glsseeformat\string" + :close \string"{}\string")}% +% \end{macrocode} +% List the order to sort the classes. +% \begin{macrocode} + \write\istfile{^^J; define the order of the location classes}% + \write\istfile{(define-location-class-order + (\@xdylocationclassorder))}% +% \end{macrocode} +% Specify what to write to the start and end of the glossary file. +% \begin{macrocode} + \write\istfile{^^J; define the glossary markup^^J}% + \write\istfile{(markup-index^^J\space\space\space + :open \string"\string + \glossarysection[\string\glossarytoctitle]{\string + \glossarytitle}\string\glossarypreamble\string~n\string\begin + {theglossary}\string\glossaryheader\string~n\string" ^^J\space + \space\space:close \string"\expandafter\@gobble + \string\%\string~n\string + \end{theglossary}\string\glossarypostamble + \string~n\string" ^^J\space\space\space + :tree)}% +% \end{macrocode} +% Specify what to put between letter groups +% \begin{macrocode} + \write\istfile{(markup-letter-group-list + :sep \string"\string\glsgroupskip\string~n\string")}% +% \end{macrocode} +% Specify what to put between entries +% \begin{macrocode} + \write\istfile{(markup-indexentry + :open \string"\string\relax \string\glsresetentrylist + \string~n\string")}% +% \end{macrocode} +% Specify how to format entries +% \begin{macrocode} + \write\istfile{(markup-locclass-list :open + \string"\glsopenbrace\string\glossaryentrynumbers + \glsopenbrace\string\relax\space \string"^^J\space\space\space + :sep \string", \string" + :close \string"\glsclosebrace\glsclosebrace\string")}% +% \end{macrocode} +% Specify how to separate location numbers +% \begin{macrocode} + \write\istfile{(markup-locref-list + :sep \string"\string\delimN\space\string")}% +% \end{macrocode} +% Specify how to indicate location ranges +% \begin{macrocode} + \write\istfile{(markup-range + :sep \string"\string\delimR\space\string")}% +% \end{macrocode} +% Specify 2-page and 3-page suffixes, if defined. +% First, the values must be sanitized to write them explicity. +% \begin{macrocode} + \@onelevel@sanitize\gls@suffixF + \@onelevel@sanitize\gls@suffixFF +% \end{macrocode} +% \begin{macrocode} + \ifx\gls@suffixF\@empty + \else + \write\istfile{(markup-range + :close "\gls@suffixF" :length 1 :ignore-end)}% + \fi + \ifx\gls@suffixFF\@empty + \else + \write\istfile{(markup-range + :close "\gls@suffixFF" :length 2 :ignore-end)}% + \fi +% \end{macrocode} +% Specify how to format locations. +% \begin{macrocode} + \write\istfile{^^J; define format to use for locations^^J}% + \write\istfile{\@xdylocref}% +% \end{macrocode} +% Specify how to separate letter groups. +% \begin{macrocode} + \write\istfile{^^J; define letter group list format^^J}% + \write\istfile{(markup-letter-group-list + :sep \string"\string\glsgroupskip\string~n\string")}% +% \end{macrocode} +% Define letter group headings. +% \begin{macrocode} + \write\istfile{^^J; letter group headings^^J}% + \write\istfile{(markup-letter-group + :open-head \string"\string\glsgroupheading + \glsopenbrace\string"^^J\space\space\space + :close-head \string"\glsclosebrace\string")}% +% \end{macrocode} +% Define additional letter groups. +% \begin{macrocode} + \write\istfile{^^J; additional letter groups^^J}% + \write\istfile{\@xdylettergroups}% +% \end{macrocode} +% Define additional sort rules +% \begin{macrocode} + \write\istfile{^^J; additional sort rules^^J} + \write\istfile{\@xdysortrules}% + \noist} +\else +% \end{macrocode} +% Code to use if \appname{makeindex} is required. +% \begin{macrocode} + \edef\@gls@actualchar{\string?} + \edef\@gls@encapchar{\string|} + \edef\@gls@levelchar{\string!} + \edef\@gls@quotechar{\string"} + \def\writeist{\relax + \openout\istfile=\istfilename + \write\istfile{\expandafter\@gobble\string\% makeindex style file + created by the glossaries package} + \write\istfile{\expandafter\@gobble\string\% for document + '\jobname' on \the\year-\the\month-\the\day} + \write\istfile{actual '\@gls@actualchar'} + \write\istfile{encap '\@gls@encapchar'} + \write\istfile{level '\@gls@levelchar'} + \write\istfile{quote '\@gls@quotechar'} + \write\istfile{keyword \string"\string\\glossaryentry\string"} + \write\istfile{preamble \string"\string\\glossarysection[\string + \\glossarytoctitle]{\string\\glossarytitle}\string + \\glossarypreamble\string\n\string\\begin{theglossary}\string + \\glossaryheader\string\n\string"} + \write\istfile{postamble \string"\string\%\string\n\string + \\end{theglossary}\string\\glossarypostamble\string\n + \string"} + \write\istfile{group_skip \string"\string\\glsgroupskip\string\n + \string"} + \write\istfile{item_0 \string"\string\%\string\n\string"} + \write\istfile{item_1 \string"\string\%\string\n\string"} + \write\istfile{item_2 \string"\string\%\string\n\string"} + \write\istfile{item_01 \string"\string\%\string\n\string"} + \write\istfile{item_x1 + \string"\string\\relax \string\\glsresetentrylist\string\n + \string"} + \write\istfile{item_02 \string"\string\%\string\n\string"} + \write\istfile{item_12 \string"\string\%\string\n\string"} + \write\istfile{item_x2 + \string"\string\\relax \string\\glsresetentrylist\string\n + \string"} + \write\istfile{delim_0 \string"\{\string + \\glossaryentrynumbers\{\string\\relax \string"} + \write\istfile{delim_1 \string"\{\string + \\glossaryentrynumbers\{\string\\relax \string"} + \write\istfile{delim_2 \string"\{\string + \\glossaryentrynumbers\{\string\\relax \string"} + \write\istfile{delim_t \string"\}\}\string"} + \write\istfile{delim_n \string"\string\\delimN \string"} + \write\istfile{delim_r \string"\string\\delimR \string"} + \write\istfile{headings_flag 1} + \write\istfile{heading_prefix + \string"\string\\glsgroupheading\{\string"} + \write\istfile{heading_suffix + \string"\}\string\\relax + \string\\glsresetentrylist \string"} + \write\istfile{symhead_positive \string"glssymbols\string"} + \write\istfile{numhead_positive \string"glsnumbers\string"} + \write\istfile{page_compositor \string"\glscompositor\string"} + \@gls@escbsdq\gls@suffixF + \@gls@escbsdq\gls@suffixFF + \ifx\gls@suffixF\@empty + \else + \write\istfile{suffix_2p \string"\gls@suffixF\string"} + \fi + \ifx\gls@suffixFF\@empty + \else + \write\istfile{suffix_3p \string"\gls@suffixFF\string"} + \fi + \noist + } +\fi % \end{macrocode} %\end{macro} % @@ -6268,16 +9249,38 @@ using \string\makeglossary}}} %\begin{macro}{\makeglossaries} % \begin{macrocode} \newcommand*{\makeglossaries}{% -\@for\@glo@type:=\@glo@types\do{% -\ifthenelse{\equal{\@glo@type}{}}{}{% -\@makeglossary{\@glo@type}}}% -\renewcommand*\newglossary[4][]{% -\PackageError{glossaries}{New glossaries -must be created before \string\makeglossaries}{You need -to move \string\makeglossaries\space after all your -\string\newglossary\space commands}}% -\let\@makeglossary\empty -\let\makeglossary\empty} +% Write the name of the style file to the aux file +% (needed by \appname{makeglossaries}) +% \begin{macrocode} + \protected@write\@auxout{}{\string\@istfilename{\istfilename}}% + \protected@write\@auxout{}{\string\@glsorder{\glsorder}} +% \end{macrocode} +% Iterate through each glossary type and activate it. +% \begin{macrocode} + \@for\@glo@type:=\@glo@types\do{% + \ifthenelse{\equal{\@glo@type}{}}{}{% + \@makeglossary{\@glo@type}}% + }% +% \end{macrocode} +% New glossaries must be created before \cs{makeglossaries} +% so disable \ics{newglossary}. +% \begin{macrocode} + \renewcommand*\newglossary[4][]{% + \PackageError{glossaries}{New glossaries + must be created before \string\makeglossaries}{You need + to move \string\makeglossaries\space after all your + \string\newglossary\space commands}}% +% \end{macrocode} +% Any subsequence instances of this command should have no effect +% \begin{macrocode} + \let\@makeglossary\relax + \let\makeglossary\relax + \let\makeglossaries\relax +% \end{macrocode} +% Disable all commands that have no effect after \cs{makeglossaries} +% \begin{macrocode} + \@disable@onlypremakeg +} % \end{macrocode} %\end{macro} % @@ -6292,6 +9295,19 @@ to move \string\makeglossaries\space after all your % \end{macrocode} %\end{macro} % +% If \ics{makeglossaries} hasn't been used, issue a warning. +% Also issue a warning if neither \ics{printglossaries} nor +% \ics{printglossary} have been used. +% \begin{macrocode} +\AtEndDocument{\ifx\makeglossaries\relax +\else + \PackageWarningNoLine{glossaries}{\string\makeglossaries\space + hasn't been used,^^Jthe glossaries will not be updated}% +\fi +\warn@noprintglossary +} +% \end{macrocode} +% %\subsection{Writing information to associated files} % The \cs{glossary} command is redefined so that it takes an % optional argument \meta{type} to specify the glossary type (use @@ -6308,10 +9324,13 @@ to move \string\makeglossaries\space after all your %\end{macro} % % Define internal \cs{@glossary} to ignore its argument. -% This gets redefined in \cs{@makeglossary}. +% This gets redefined in \cs{@makeglossary}. This is +% defined to just \cs{index} as \icls{memoir} changes the definition of +% \cs{@index}. (Thanks to Dan Luecking for pointing this out.) %\begin{macro}{\@glossary} +%\changes{1.17}{2008 December 26}{changed definition to use 'index instead of '@index} % \begin{macrocode} -\def\@glossary[#1]{\@bsphack\begingroup\@sanitize\@index} +\def\@glossary[#1]{\index} % \end{macrocode} %\end{macro} % This is a convenience command to set \cs{@glossary}. @@ -6330,10 +9349,187 @@ to move \string\makeglossaries\space after all your % the second argument is the glossary entry % (the format of which is set in \cs{glslink}). %\begin{macro}{\@wrglossary} +%\changes{1.17}{2008 December 26}{modified to allow for xindy support} % \begin{macrocode} \renewcommand*{\@wrglossary}[2]{% -\expandafter\protected@write\csname glo@#1@file\endcsname{}{% -\string\glossaryentry{#2}{\theglsentrycounter}}\endgroup\@esphack} + \expandafter\protected@write\csname glo@#1@file\endcsname{}{#2}% + \endgroup\@esphack +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@do@wrglossary} +%\changes{1.17}{2008 December 26}{new} +% Write the glossary entry in the appropriate format. +% (Need to set \@glsnumberformat and \@gls@counter prior to use.) +% The argument is the entry's label. +% \begin{macrocode} +\newcommand{\@do@wrglossary}[1]{% +% \end{macrocode} +% Determine whether to use \appname{xindy} or \appname{makeindex} +% syntax +% \begin{macrocode} +\ifglsxindy +% \end{macrocode} +% Need to determine if the formatting information starts with +% a ( or ) indicating a range. +% \begin{macrocode} + \expandafter\@glo@check@mkidxrangechar\@glsnumberformat\@nil + \def\@glo@range{}% + \expandafter\if\@glo@prefix(\relax + \def\@glo@range{:open-range}% + \else + \expandafter\if\@glo@prefix)\relax + \def\@glo@range{:close-range}% + \fi + \fi +% \end{macrocode} +% Get the location and escape any special characters +% \begin{macrocode} +\protected@edef\@glslocref{\theglsentrycounter}% +\@gls@checkmkidxchars\@glslocref +% \end{macrocode} +% Write to the glossary file using \appname{xindy} syntax. +% \begin{macrocode} + \glossary[\csname glo@#1@type\endcsname]{% + (indexentry :tkey (\csname glo@#1@index\endcsname) + :locref \string"\@glslocref\string" % + :attr \string"\@glo@suffix\string" \@glo@range + ) + }% +\else +% \end{macrocode} +% Convert the format information into the format required for +% \appname{makeindex} +% \begin{macrocode} + \@set@glo@numformat\@glo@numfmt\@gls@counter\@glsnumberformat +% \end{macrocode} +% Write to the glossary file using \appname{makeindex} syntax. +% \begin{macrocode} + \glossary[\csname glo@#1@type\endcsname]{% + \string\glossaryentry{\csname glo@#1@index\endcsname + \@gls@encapchar\@glo@numfmt}{\theglsentrycounter}}% +\fi +} +% \end{macrocode} +%\end{macro} +% +%\subsection{Glossary Entry Cross-References} +%\begin{macro}{\@do@seeglossary} +%\changes{1.17}{2008 December 26}{new} +% Write the glossary entry with a cross reference. +% The first argument is the entry's label, the second must be in +% the form \oarg{tag}\marg{list}, where \meta{tag} is a tag +% such as ``see'' and \meta{list} is a list of labels. +% \begin{macrocode} +\newcommand{\@do@seeglossary}[2]{% +\ifglsxindy + \glossary[\csname glo@#1@type\endcsname]{% + (indexentry + :tkey (\csname glo@#1@index\endcsname) + :xref (\string"#2\string") + :attr \string"see\string" + ) + }% +\else + \glossary[\csname glo@#1@type\endcsname]{% + \string\glossaryentry{\csname glo@#1@index\endcsname + \@gls@encapchar glsseeformat#2}{Z}}% +\fi +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@gls@fixbraces} +% If no optional argument is specified, list needs to be enclosed +% in a set of braces. +% \begin{macrocode} +\def\@gls@fixbraces#1#2#3\@nil{% + \ifx#2[\relax + \def#1{#2#3}% + \else + \def#1{{#2#3}}% + \fi +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glssee} +%\cs{glssee}\marg{label}\marg{cross-ref list} +%\changes{1.17}{2008 December 26}{new} +% \begin{macrocode} +\newcommand*{\glssee}[3][\seename]{% + \@do@seeglossary{#2}{[#1]{#3}}} +\newcommand*{\@glssee}[3][\seename]{% + \glssee[#1]{#3}{#2}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsseeformat} +%\changes{1.17}{2008 December 26}{new} +% The first argument specifies what tag to use (e.g.\ ``see''), +% the second argument is a comma-separated list of labels. +% The final argument (the location) is ignored. +% \begin{macrocode} +\newcommand*{\glsseeformat}[3][\seename]{\emph{#1} \glsseelist{#2}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glsseelist} +%\cs{glsseelist}\marg{list} formats list of entry labels. +% \begin{macrocode} +\newcommand*{\glsseelist}[1]{% +% \end{macrocode} +% If there is only one item in the list, set the last separator +% to do nothing. +% \begin{macrocode} + \let\@gls@dolast\relax +% \end{macrocode} +% Don't display separator on the first iteration of the loop +% \begin{macrocode} + \let\@gls@donext\relax +% \end{macrocode} +% Iterate through the labels +% \begin{macrocode} + \@for\@gls@thislabel:=#1\do{% +% \end{macrocode} +% Check if on last iteration of loop +% \begin{macrocode} + \ifx\@xfor@nextelement\@nnil + \@gls@dolast + \else + \@gls@donext + \fi +% \end{macrocode} +% display the entry for this label +% \begin{macrocode} + \glsseeitem{\@gls@thislabel}% +% \end{macrocode} +% Update separators +% \begin{macrocode} + \let\@gls@dolast\glsseelastsep + \let\@gls@donext\glsseesep + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsseelastsep} +% Separator to use between penultimate and ultimate entries in a +% cross-referencing list. +% \begin{macrocode} +\newcommand*{\glsseelastsep}{\space\andname\space} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glsseesep} +% Separator to use between entires in a cross-referencing list. +% \begin{macrocode} +\newcommand*{\glsseesep}{, } +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glsseeitem} +%\cs{glsseeitem}\marg{label} formats individual entry in a +% cross-referencing list. +% \begin{macrocode} +\newcommand*{\glsseeitem}[1]{\glshyperlink{#1}} % \end{macrocode} %\end{macro} % @@ -6345,24 +9541,117 @@ to move \string\makeglossaries\space after all your % 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}{\warn@noprintglossary} +% Warn the user if they have forgotten \ics{printglossaries} +% or \ics{printglossary}. (Will be suppressed if there is at +% least one occurance of \ics{printglossary}. There is no check +% to ensure that there is a \ics{printglossary} for each defined +% glossary.) +% \begin{macrocode} +\def\warn@noprintglossary{\PackageWarningNoLine{glossaries}{No +\string\printglossary\space or \string\printglossaries\space +found.^^JThis document will not have a glossary.}} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\printglossary} +%\changes{1.17}{2008 December 26}{added print language to aux file} %\changes{1.15}{2008 August 15}{changed the way the TOC title is set} +%\changes{1.17}{2008 December 26}{added check to determine if 'printglossary is already +% defined} % 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} +\@ifundefined{printglossary}{}{% +% \end{macrocode} +% If \cs{printglossary} is already defined, issue a warning +% and undefine it. +% \begin{macrocode} +\PackageWarning{glossaries}{Overriding \string\printglossary}% +\let\printglossary\undefined} +% \end{macrocode} +% \cs{printglossary} has an optional argument. The default +% value is to set the glossary type to the main glossary. +% \begin{macrocode} \newcommand*{\printglossary}[1][type=\glsdefaulttype]{% -\def\@glo@type{\glsdefaulttype}% -\def\glossarytitle{\csname @glotype@\@glo@type @title\endcsname}% -\def\@glossarystyle{}% -\def\gls@dotoctitle{\glssettoctitle{\@glo@type}}% -\bgroup -\setkeys{printgloss}{#1}% -\gls@dotoctitle -\@glossarystyle -\makeatletter -\@input@{\jobname.\csname @glotype@\@glo@type @in\endcsname}% -\egroup +% \end{macrocode} +% If \appname{xindy} is being used, need to find the root language +% for \appname{makeglossaries} to pass to \appname{xindy}. +% \begin{macrocode} + \ifglsxindy\findrootlanguage\fi +% \end{macrocode} +% Set up defaults. +% \begin{macrocode} + \def\@glo@type{\glsdefaulttype}% + \def\glossarytitle{\csname @glotype@\@glo@type @title\endcsname}% + \def\@glossarystyle{}% + \def\gls@dotoctitle{\glssettoctitle{\@glo@type}}% +% \end{macrocode} +% Store current value of \ics{glossaryentrynumbers}. (This may +% be changed via the optional argument) +% \begin{macrocode} + \let\@org@glossaryentrynumbers\glossaryentrynumbers +% \end{macrocode} +% Localise the effects of the optional argument +% \begin{macrocode} + \bgroup +% \end{macrocode} +% Determine settings specified in the optional argument. +% \begin{macrocode} + \setkeys{printgloss}{#1}% +% \end{macrocode} +%Enable individual number lists to be suppressed. +% \begin{macrocode} + \let\org@glossaryentrynumbers\glossaryentrynumbers + \let\glsnonextpages\@glsnonextpages +% \end{macrocode} +% Enable suppression of description terminators. +% \begin{macrocode} + \let\nopostdesc\@nopostdesc +% \end{macrocode} +% Set up the entry for the TOC +% \begin{macrocode} + \gls@dotoctitle +% \end{macrocode} +% Set the glossary style +% \begin{macrocode} + \@glossarystyle +% \end{macrocode} +% Some macros may end up being expanded into internals in the +% glossary, so need to make @ a letter. +% \begin{macrocode} + \makeatletter +% \end{macrocode} +% Input the glossary file, if it exists. +% \begin{macrocode} + \@input@{\jobname.\csname @glotype@\@glo@type @in\endcsname}% +% \end{macrocode} +% If \appname{xindy} is being used, need to write the language +% dependent information to the \filetype{.aux} file for +% \appname{makeglossaries}. +% \begin{macrocode} + \ifglsxindy + \@ifundefined{@xdy@\@glo@type @language}{% + \protected@write\@auxout{}{% + \string\@xdylanguage{\@glo@type}{\@xdy@main@language}}% + }{% + \protected@write\@auxout{}{% + \string\@xdylanguage{\@glo@type}{\csname @xdy@\@glo@type + @language\endcsname}}% + }% + \protected@write\@auxout{}{% + \string\@gls@codepage{\@glo@type}{\gls@codepage}}% + \fi + \egroup +% \end{macrocode} +% Reset \ics{glossaryentrynumbers} +% \begin{macrocode} + \global\let\glossaryentrynumbers\@org@glossaryentrynumbers +% \end{macrocode} +% Suppress warning about no \ics{printglossary} +% \begin{macrocode} +\let\warn@noprintglossary\relax } % \end{macrocode} %\end{macro} @@ -6439,6 +9728,37 @@ false,nolabel,autolabel}[nolabel]{% \fi} % \end{macrocode} % +%\begin{macro}{\@glsnonextpages} +%\changes{1.17}{2008 December 26}{new}% +% Suppresses the next number list only. Global assignments required +% as it may not occur in the same level of grouping as the +% next numberlist. (For example, if \cs{glsnonextpages} is place +% in the entry's description and 3 column tabular style glossary +% is used.) \cs{org@glossaryentrynumbers} needs to be set at +% the start of each glossary, in the event that +% \ics{glossaryentrynumber} is redefined. +% \begin{macrocode} +\newcommand*{\@glsnonextpages}{% + \gdef\glossaryentrynumbers##1{% + \glsresetentrylist}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glsresetentrylist} +% Resets \cs{glossaryentrynumbers} +% \begin{macrocode} +\newcommand*{\glsresetentrylist}{% + \global\let\glossaryentrynumbers\org@glossaryentrynumbers} +% \end{macrocode} +%\end{macro} +% +% +%\begin{macro}{\glsnonextpages} +% Outside of \cs{printglossary} this does nothing. +% \begin{macrocode} +\newcommand*{\glsnonextpages}{} +% \end{macrocode} +%\end{macro} +% %\DescribeEnv{theglossary} % If the \envname{theglossary} environment has % already been defined, a warning will be issued. @@ -6463,16 +9783,28 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} %\end{macro} %\vskip5pt +%\begin{macro}{\glossaryentryfield} % \cs{glossaryentryfield}\marg{label}\marg{name}\marg{description}\marg{symbol}\marg{page-list}\\[10pt] % This command governs how each entry row should be formatted % in the glossary. Glossary styles need to redefine this command. % Most of the predefined styles ignore \meta{symbol}. -%\begin{macro}{\glossaryentryfield} % \begin{macrocode} \newcommand*{\glossaryentryfield}[5]{% \@glstarget{glo:#1}{#2} #4 #3. #5\par} % \end{macrocode} %\end{macro} +%\begin{macro}{\glossaryentryfield} +% \cs{glossarysubentryfield}\marg{level}\marg{label}\marg{name}\marg{description}\marg{symbol}\marg{page-list}\\[10pt] +% This command governs how each subentry should be formatted +% in the glossary. Glossary styles need to redefine this command. +% Most of the predefined styles ignore \meta{symbol}. The first +% argument is a number indicating the level. (The level should +% be greater than or equal to 1.) +% \begin{macrocode} +\newcommand*{\glossarysubentryfield}[6]{% +\@glstarget{glo:#2}{}#4. #6\par} +% \end{macrocode} +%\end{macro} % % Within each glossary, the entries form 28 distinct groups % which are determined by the first character of the \gloskey{sort} @@ -6568,6 +9900,7 @@ style `#1' undefined}{}}{% % \end{macrocode} %\end{macro} % +%\begin{macro}{\newglossarystyle} % New glossary styles can be defined using:\\[10pt] % \cs{newglossarystyle}\marg{name}\marg{definition}\\[10pt] % The \meta{definition} argument should redefine @@ -6579,9 +9912,9 @@ style `#1' undefined}{}}{% % \ics{glossarypostamble}, as % the user should be able to switch between styles without affecting % the pre- and postambles. -%\begin{macro}{\newglossarystyle} +%\changes{1.17}{2008 December 26}{made 'newglossarystyle long} % \begin{macrocode} -\newcommand*{\newglossarystyle}[2]{% +\newcommand{\newglossarystyle}[2]{% \@ifundefined{@glsstyle@#1}{% \expandafter\def\csname @glsstyle@#1\endcsname{#2}}{% \PackageError{glossaries}{Glossary style `#1' is already defined}{}}} @@ -6622,11 +9955,35 @@ style `#1' undefined}{}}{% % to be more general. So I have adapted the code used in the % \isty{hyperref} package. %\begin{macro}{\glshypernumber} +%\changes{1.17}{2008 December 26}{modified to allow material +% to be attached to location} % \begin{macrocode} \@ifundefined{hyperlink}{% \def\glshypernumber#1{#1}}{% \def\glshypernumber#1{% -\@delimR#1\delimR\delimR\\}} + \@glshypernumber#1\nohyperpage{}\@nil}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@glshypernumber} +% This code was provided by Heiko~Oberdiek to allow material +% to be attached to the location. +%\changes{1.17}{2008 December 26}{new} +% \begin{macrocode} +\def\@glshypernumber#1\nohyperpage#2#3\@nil{% + \ifx\\#1\\% + \else + \@delimR#1\delimR\delimR\\% + \fi + \ifx\\#2\\% + \else + #2% + \fi + \ifx\\#3\\% + \else + \@glshypernumber#3\@nil + \fi +} % \end{macrocode} %\end{macro} % \cs{@delimR} displays a range of numbers for the counter @@ -6787,9 +10144,10 @@ first={#4 (#3)},plural={#3\acrpluralsuffix},% firstplural={\@glo@descplural\space (\@glo@plural)},% #1}} % \end{macrocode} -%\end{macro} %\changes{1.13}{2008 May 10}{Removed restriction on only using % 'newacronym in the preamble} +%\end{macro} +% % Set up some convenient short cuts. These need to be changed if % \cs{newacronym} is changed (or if the \gloskey{description} key % is changed). @@ -6998,13 +10356,23 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \newcommand{\firstacronymfont}[1]{\acronymfont{#1}} % \end{macrocode} %\end{macro} +%\begin{macro}{\acrnameformat} +% The styles that allow an additional description use +% \cs{acrnameformat}\marg{short}\marg{long} to determine what +% information is displayed in the name. +% \begin{macrocode} +\newcommand*{\acrnameformat}[2]{\acronymfont{#1}} +% \end{macrocode} +%\end{macro} % \begin{macrocode} \ifglsacrdescription % \end{macrocode} % % If a description and footnote are both required, store the long form % in the \gloskey{symbol} key. Store the short form in \gloskey{text} -% key. +% key. Note that since the long form is stored in the symbol key, +% if you want the long form to appear in the list of acronyms, you +% need to use a glossary style that displays the symbol key. % \begin{macrocode} \ifglsacrfootnote \renewcommand{\newacronym}[4][]{% @@ -7103,6 +10471,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \else % \end{macrocode} % Footnote not required. Should the acronym always be expanded? +% Note that the short form is stored in the \gloskey{symbol} key, +% so if the short form needs to be displayed in the glossary, +% use a style the displays the symbol. % \begin{macrocode} \ifglsacrdua \ifglsacrsmallcaps @@ -7116,7 +10487,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \fi \renewcommand{\newacronym}[4][]{% \newglossaryentry{#2}{type=\acronymtype,% - name={\acronymfont#4},% + name={#4},% sort={#4}, text={#4},% plural={#4\acrpluralsuffix},% @@ -7183,13 +10554,17 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \defglsdisplay[\acronymtype]{#1#4} \else % \end{macrocode} -% (dua is not set.) +% Option \pkgopt{description} is used, but not \pkgopt{dua} +% or \pkgopt{footnote}. % Store long form in \gloskey{first} key % and short form in \gloskey{text} and \gloskey{symbol} key. +% The name is stored using \ics{acrnameformat} to allow the +% user to override the way the name is displayed in the +% list of acronyms. % \begin{macrocode} \renewcommand{\newacronym}[4][]{% \newglossaryentry{#2}{type=\acronymtype,% - name={\acronymfont{#3}},% + name={\acrnameformat{#3}{#4}},% sort={#3},% first={#4},% firstplural={#4\acrpluralsuffix},% @@ -7661,6 +11036,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \RequirePackage{glossary-list} \RequirePackage{glossary-long} \RequirePackage{glossary-super} +\RequirePackage{glossary-tree} % \end{macrocode} % The default glossary style is set according to the \pkgopt{style} package % option, but can be overridden by \ics{glossarystyle}. @@ -7681,7 +11057,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% %\label{sec:code:mfirstuc} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{mfirstuc}[2008/06/18 v1.02 (NLCT)] +\ProvidesPackage{mfirstuc}[2008/12/22 v1.03 (NLCT)] % \end{macrocode} %\begin{macro}{\makefirstuc} % Syntax:\\ @@ -7700,7 +11076,10 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \def\gls@argi{#1}% \ifx\gls@argi\@empty \else - \protected@edef\@gls@tmp{\ #1}% +% \end{macrocode} +%\changes{1.03}{2008/12/22}{changed 'protected@edef to 'def} +% \begin{macrocode} + \def\@gls@tmp{\ #1}% \@onelevel@sanitize\@gls@tmp \expandafter\@gls@checkcs\@gls@tmp\relax\relax \if@glscs @@ -7790,12 +11169,11 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % by \meta{type}. %\begin{macro}{\glsnavhyperlink} %\changes{1.14}{2008 June 17}{changed 'edef to 'protected@edef} +%\changes{1.17}{2008 December 26}{replaced 'hyperlink to '@glslink} % \begin{macrocode} -\@ifundefined{hyperlink}{% -\newcommand*{\glsnavhyperlink}[3][]{#3}}{% \newcommand*{\glsnavhyperlink}[3][\@glo@type]{% -\edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}% -\hyperlink{glsn:#1@#2}{#3}}} + \edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}% + \@glslink{glsn:#1@#2}{#3}} % \end{macrocode} %\end{macro} %\vskip5pt @@ -7806,42 +11184,46 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% %\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} +%\changes{1.17}{2008 December 26}{replaced 'hypertarget to '@glstarget} % \begin{macrocode} -\@ifundefined{hypertarget}{% -\newcommand*{\glsnavhypertarget}[3][\@glo@type]{% -\protected@write\@auxout{}{\string\@gls@hypergroup{#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}}{% \newcommand*{\glsnavhypertarget}[3][\@glo@type]{% -\protected@write\@auxout{}{\string\@gls@hypergroup{#1}{#2}}% -\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{% +% \end{macrocode} +% Add this group to the aux file for re-run check. +% \begin{macrocode} + \protected@write\@auxout{}{\string\@gls@hypergroup{#1}{#2}}% +% \end{macrocode} +% Add the target. +% \begin{macrocode} + \@glstarget{glsn:#1@#2}{#3}% +% \end{macrocode} +% Check list of know groups to determine if a re-run is required. +% \begin{macrocode} + \expandafter\let + \expandafter\@gls@list\csname @gls@hypergrouplist@#1\endcsname +% \end{macrocode} +% Iterate through list and terminate loop if this group is found. +% \begin{macrocode} + \@for\@gls@elem:=\@gls@list\do{% + \ifthenelse{\equal{\@gls@elem}{#2}}{\@endfortrue}{}}% +% \end{macrocode} +% Check if list terminated prematurely. +% \begin{macrocode} + \if@endfor + \else +% \end{macrocode} +% This group was not included in the list, so issue a warning. +% \begin{macrocode} \PackageWarningNoLine{glossaries}{Navigation panel - has changed. Rerun LaTeX}}% -\fi}} + 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 +% Give a warning at the end if re-run required %\changes{1.15}{2008 August 15}{new} % \begin{macrocode} \let\gls@hypergrouprerun\relax @@ -7910,8 +11292,10 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% %\begin{macro}{\glssymbolnav} % \begin{macrocode} \newcommand*{\glssymbolnav}{% -\glsnavhyperlink{glssymbols}{\glsgetgrouptitle{glssymbols}} \textbar\ -\glsnavhyperlink{glsnumbers}{\glsgetgrouptitle{glsnumbers}} \textbar\ +\glsnavhyperlink{glssymbols}{\glsgetgrouptitle{glssymbols}}% +\glshypernavsep +\glsnavhyperlink{glsnumbers}{\glsgetgrouptitle{glsnumbers}}% +\glshypernavsep } % \end{macrocode} %\end{macro} @@ -7925,20 +11309,23 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% %<*glossary-list.sty> % \end{macrocode} %\fi -% \subsection{List Style (glossary-list package)} -% The \isty{glossary-list} package defines glossary styles +% \subsection{List Style (glossary-list.sty)} +% The \isty{glossary-list} style file defines glossary styles % that use the \envname{description} environment. Note that since % the entry name is placed in the optional argument to the % \ics{item} command, it will appear in a bold font by % default. % \begin{macrocode} -\ProvidesPackage{glossary-list}[2008/02/16 v1.03 (NLCT)] +\ProvidesPackage{glossary-list}[2008/12/11 v1.04 (NLCT)] % \end{macrocode} +%\begin{macro}{list} % The \glostyle{list} glossary style % uses the \envname{description} environment. The group separator % \ics{glsgroupskip} is redefined as \cs{indexspace} % which produces a gap between groups. The glossary heading -% and the group headings do nothing. This is used as the default +% and the group headings do nothing. Sub-entries immediately +% follow the main entry without the sub-entry name. This style +% does not use the entry's symbol. This is used as the default % style for the \sty{glossaries} package. % \begin{macrocode} \newglossarystyle{list}{% @@ -7947,8 +11334,13 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% \item[\@glstarget{glo:##1}{##2}] ##3\glspostdescription\space ##5}% +\renewcommand*{\glossarysubentryfield}[6]{% +\@glstarget{glo:##2}{\strut}##4\glspostdescription\space ##6.}% \renewcommand*{\glsgroupskip}{\indexspace}} % \end{macrocode} +%\end{macro} +% +%\begin{macro}{listgroup} % The \glostyle{listgroup} style is like the \glostyle{list} % style, but the glossary groups have headings. %\changes{1.08}{2007 Oct 13}{changed listgroup style to use \cs{glsgetgrouptitle}} @@ -7957,6 +11349,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \glossarystyle{list}% \renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}} % \end{macrocode} +%\end{macro} +% +%\begin{macro}{listhypergroup} % The \glostyle{listhypergroup} style is like the \glostyle{listgroup} % style, but has a set of links to the groups at the % start of the glossary. @@ -7968,15 +11363,24 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupheading}[1]{% \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}} % \end{macrocode} +%\end{macro} +% +%\begin{macro}{altlist} % The \glostyle{altlist} glossary style is like the \glostyle{list} -% style, but places the description on a new line. +% style, but places the description on a new line. Sub-entries +% follow in separate paragraphs without the sub-entry name. This +% style does not use the entry's symbol. % \begin{macrocode} \newglossarystyle{altlist}{% \glossarystyle{list}% \renewcommand*{\glossaryentryfield}[5]{% \item[\@glstarget{glo:##1}{##2}]\mbox{}\newline ##3\glspostdescription\space ##5}% +\renewcommand{\glossarysubentryfield}[6]{% +\par\@glstarget{glo:##2}{\strut}##4\glspostdescription\space ##6}% } % \end{macrocode} +%\end{macro} +%\begin{macro}{altlistgroup} % The \glostyle{altlistgroup} glossary style is like the % \glostyle{altlist} style, but the glossary groups have headings. %\changes{1.08}{2007 Oct 13}{changed altlistgroup style to use \cs{glsgetgrouptitle}} @@ -7985,6 +11389,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \glossarystyle{altlist}% \renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}} % \end{macrocode} +%\end{macro} +% +%\begin{macro}{altlisthypergroup} % The \glostyle{altlisthypergroup} glossary style is like the % \glostyle{altlistgroup} style, but has a % set of links to the groups at the start of the glossary. @@ -7996,25 +11403,35 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupheading}[1]{% \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}} % \end{macrocode} +%\end{macro} +% +%\begin{macro}{listdotted} % The \glostyle{listdotted} glossary style was supplied by % Axel~Menzel. I've modified it slightly so that the distance from -% the start of the name to the end of the dotted line is specified by -% \cs{glslistdottedwidth}. -%\begin{macro}{\glslistdottedwidth} -% \begin{macrocode} -\newlength\glslistdottedwidth -\setlength{\glslistdottedwidth}{.5\linewidth} -% \end{macrocode} -%\end{macro} +% the start of the name to the end of the dotted line is specified +% by \cs{glslistdottedwidth}. % Note that this style ignores the page numbers as well as the -% symbol. +% symbol. Sub-entries are displayed in the same way as top-level +% entries. % \begin{macrocode} \newglossarystyle{listdotted}{% \glossarystyle{list}% \renewcommand*{\glossaryentryfield}[5]{% \item[]\makebox[\glslistdottedwidth][l]{\@glstarget{glo:##1}{##2}% -\unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##3}} +\unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##3}% +\renewcommand*{\glossarysubentryfield}[6]{% +\item[]\makebox[\glslistdottedwidth][l]{\@glstarget{glo:##2}{##3}% +\unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##4}% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glslistdottedwidth} +% \begin{macrocode} +\newlength\glslistdottedwidth +\setlength{\glslistdottedwidth}{.5\linewidth} % \end{macrocode} +%\end{macro} +% %\iffalse % \begin{macrocode} %</glossary-list.sty> @@ -8030,7 +11447,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % The glossary styles defined in the \isty{glossary-long} package % used the \envname{longtable} environment in the glossary. % \begin{macrocode} -\ProvidesPackage{glossary-long}[2007/07/04 v1.01 (NLCT)] +\ProvidesPackage{glossary-long}[2008/12/11 v1.02 (NLCT)] % \end{macrocode} % Requires the \isty{longtable} package: % \begin{macrocode} @@ -8064,6 +11481,8 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% \@glstarget{glo:##1}{##2} & ##3\glspostdescription\space ##5\\}% +\renewcommand*{\glossarysubentryfield}[6]{% + & \@glstarget{glo:##2}{\strut}##4\glspostdescription\space ##6\\}% \renewcommand*{\glsgroupskip}{ & \\}} % \end{macrocode} % The \glostyle{longborder} style is like the above, but with horizontal and @@ -8104,6 +11523,8 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% \@glstarget{glo:##1}{##2} & ##3 & ##5\\}% +\renewcommand*{\glossarysubentryfield}[6]{% + & \@glstarget{glo:##2}{\strut}##4 & ##6\\}% \renewcommand*{\glsgroupskip}{ & &\\}} % \end{macrocode} % The \glostyle{long3colborder} style is like the @@ -8147,6 +11568,8 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% \@glstarget{glo:##1}{##2} & ##3 & ##4 & ##5\\}% +\renewcommand*{\glossarysubentryfield}[6]{% + & \@glstarget{glo:##2}{\strut}##4 & ##5 & ##6\\}% \renewcommand*{\glsgroupskip}{ & & &\\}} % \end{macrocode} % The \glostyle{long4colheader} style is like \glostyle{long4col} but with a header row. @@ -8236,7 +11659,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % The glossary styles defined in the \isty{glossary-super} package % use the \envname{supertabular} environment. % \begin{macrocode} -\ProvidesPackage{glossary-super}[2007/07/04 v1.01 (NLCT)] +\ProvidesPackage{glossary-super}[2008/12/11 v1.02 (NLCT)] % \end{macrocode} % Requires the \isty{supertabular} package: % \begin{macrocode} @@ -8255,6 +11678,8 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% \@glstarget{glo:##1}{##2} & ##3\glspostdescription\space ##5\\}% +\renewcommand*{\glossarysubentryfield}[6]{% + & \@glstarget{glo:##2}{\strut}##4\glspostdescription\space ##6\\}% \renewcommand*{\glsgroupskip}{ & \\}} % \end{macrocode} % The \glostyle{superborder} style is like the above, but with horizontal and @@ -8300,6 +11725,8 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% \@glstarget{glo:##1}{##2} & ##3 & ##5\\}% +\renewcommand*{\glossarysubentryfield}[6]{% + & \@glstarget{glo:##2}{\strut}##4 & ##6\\}% \renewcommand*{\glsgroupskip}{ & &\\}} % \end{macrocode} % The \glostyle{super3colborder} style is like the @@ -8353,6 +11780,8 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% \@glstarget{glo:##1}{##2} & ##3 & ##4 & ##5\\}% +\renewcommand*{\glossarysubentryfield}[6]{% + & \@glstarget{glo:##2}{\strut}##4 & ##5 & ##6\\}% \renewcommand*{\glsgroupskip}{ & & &\\}} % \end{macrocode} % The \glostyle{super4colheader} style is like @@ -8447,6 +11876,422 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% %\fi %\iffalse % \begin{macrocode} +%<*glossary-tree.sty> +% \end{macrocode} +%\fi +%\subsection{Tree Styles (glossary-tree.sty)} +% The \isty{glossary-tree} style file defines glossary styles +% that have a tree-like structure. These are designed for +% hierarchical glossaries. +% \begin{macrocode} +\ProvidesPackage{glossary-tree}[2008/12/11 v1.0 (NLCT)] +% \end{macrocode} +% +%\begin{macro}{index} +% The \glostyle{index} glossary style +% is similar in style to the way indices are usually typeset +% using \cs{item}, \cs{subitem} and \cs{subsubitem}. +% The entry name is +% set in bold. If an entry has a symbol, it is placed in +% brackets after the name. Then the description is displayed, +% followed by the number list. This style allows up to three +% levels. +% \begin{macrocode} +\newglossarystyle{index}{% +\renewenvironment{theglossary}{% +\setlength{\parindent}{0pt}% +\setlength{\parskip}{0pt plus 0.3pt}% +\let\item\@idxitem}{}% +\renewcommand*{\glossaryheader}{}% +\renewcommand*{\glsgroupheading}[1]{}% +\renewcommand*{\glossaryentryfield}[5]{% +\item\textbf{\@glstarget{glo:##1}{##2}}% + \ifx\relax##4\relax + \else + \space(##4)% + \fi + \space ##3\glspostdescription \space ##5}% +\renewcommand*{\glossarysubentryfield}[6]{% + \ifcase##1\relax + \item + \or + \subitem + \else + \subsubitem + \fi + \textbf{\@glstarget{glo:##2}{##3}}% + \ifx\relax##5\relax + \else + \space(##5)% + \fi + \space##4\glspostdescription\space ##6}% +\renewcommand*{\glsgroupskip}{\indexspace}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{indexgroup} +% The \glostyle{indexgroup} style is like the \glostyle{index} +% style but has headings. +% \begin{macrocode} +\newglossarystyle{indexgroup}{% +\glossarystyle{index}% +\renewcommand*{\glsgroupheading}[1]{% + \item\textbf{\glsgetgrouptitle{##1}}\indexspace}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{indexhypergroup} +% The \glostyle{indexhypergroup} style is like the +% \glostyle{indexgroup} style but has hyper navigation. +% \begin{macrocode} +\newglossarystyle{indexhypergroup}{% +\glossarystyle{index}% +\renewcommand*{\glossaryheader}{% +\item\textbf{\glsnavigation}\indexspace}% +\renewcommand*{\glsgroupheading}[1]{% +\item\textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}% +\indexspace}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{tree} +% The \glostyle{tree} glossary style +% is similar in style to the \glostyle{index} style, but +% can have arbitrary levels. +% \begin{macrocode} +\newglossarystyle{tree}{% +\renewenvironment{theglossary}{% +\setlength{\parindent}{0pt}% +\setlength{\parskip}{0pt plus 0.3pt}% +}{}% +\renewcommand*{\glossaryheader}{}% +\renewcommand*{\glsgroupheading}[1]{}% +\renewcommand{\glossaryentryfield}[5]{% + \hangindent0pt\relax + \parindent0pt\relax + \textbf{\@glstarget{glo:##1}{##2}}% + \ifx\relax##4\relax + \else + \space(##4)% + \fi + \space ##3\glspostdescription \space ##5\par}% +\renewcommand{\glossarysubentryfield}[6]{% + \hangindent##1\glstreeindent\relax + \parindent##1\glstreeindent\relax + \textbf{\@glstarget{glo:##2}{##3}}% + \ifx\relax##5\relax + \else + \space(##5)% + \fi + \space##4\glspostdescription\space ##6\par}% +\renewcommand*{\glsgroupskip}{\indexspace}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{treegroup} +% Like the \glostyle{tree} style but the glossary groups have +% headings. +% \begin{macrocode} +\newglossarystyle{treegroup}{% +\glossarystyle{tree}% +\renewcommand{\glsgroupheading}[1]{\par +\noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{treehypergroup} +% The \glostyle{treehypergroup} style is like the \glostyle{treegroup} +% style, but has a set of links to the groups at the +% start of the glossary. +% \begin{macrocode} +\newglossarystyle{treehypergroup}{% +\glossarystyle{tree}% +\renewcommand*{\glossaryheader}{% +\par\noindent\textbf{\glsnavigation}\par\indexspace}% +\renewcommand*{\glsgroupheading}[1]{% +\par\noindent +\textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par +\indexspace}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glstreeindent} +% Length governing left indent for each level of the \glostyle{tree} +% style. +% \begin{macrocode} +\newlength\glstreeindent +\setlength{\glstreeindent}{10pt} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{treenoname} +% The \glostyle{treenoname} glossary style +% is like the \glostyle{tree} style, but +% doesn't print the name or symbol for sub-levels. +% \begin{macrocode} +\newglossarystyle{treenoname}{% +\renewenvironment{theglossary}{% +\setlength{\parindent}{0pt}% +\setlength{\parskip}{0pt plus 0.3pt}% +}{}% +\renewcommand*{\glossaryheader}{}% +\renewcommand*{\glsgroupheading}[1]{}% +\renewcommand{\glossaryentryfield}[5]{% + \hangindent0pt\relax + \parindent0pt\relax + \textbf{\@glstarget{glo:##1}{##2}}% + \ifx\relax##4\relax + \else + \space(##4)% + \fi + \space ##3\glspostdescription \space ##5\par}% +\renewcommand{\glossarysubentryfield}[6]{% + \hangindent##1\glstreeindent\relax + \parindent##1\glstreeindent\relax + \textbf{\@glstarget{glo:##2}{\strut}}% + ##4\glspostdescription\space ##6\par}% +\renewcommand*{\glsgroupskip}{\indexspace}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{treenonamegroup} +% Like the \glostyle{treenoname} style but the glossary groups have +% headings. +% \begin{macrocode} +\newglossarystyle{treenonamegroup}{% +\glossarystyle{treenoname}% +\renewcommand{\glsgroupheading}[1]{\par +\noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{treenonamehypergroup} +% The \glostyle{treenonamehypergroup} style is like the \glostyle{treenonamegroup} +% style, but has a set of links to the groups at the +% start of the glossary. +% \begin{macrocode} +\newglossarystyle{treenonamehypergroup}{% +\glossarystyle{treenoname}% +\renewcommand*{\glossaryheader}{% +\par\noindent\textbf{\glsnavigation}\par\indexspace}% +\renewcommand*{\glsgroupheading}[1]{% +\par\noindent +\textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par +\indexspace}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glssetwidest} +% \cs{glssetwidest}\oarg{level}\marg{text} sets the widest +% text for the given level. It is used by the +% \glostyle{alttree} glossary styles to determine the +% indentation of each level. +% \begin{macrocode} +\newcommand*{\glssetwidest}[2][0]{% + \expandafter\def\csname @glswidestname\romannumeral#1\endcsname{% + #2}% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@glswidestname} +% Initialise \cs{@glswidestname}. +% \begin{macrocode} +\newcommand*{\@glswidestname}{} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{alttree} +% The \glostyle{alttree} glossary style +% is similar in style to the \glostyle{tree} style, but +% the indentation is obtained from the width of +% \cs{@glswidestname} which is set using \cs{glssetwidest}. +% \begin{macrocode} +\newglossarystyle{alttree}{% +% \end{macrocode} +% Redefine \envname{theglossary} environment. +% \begin{macrocode} +\renewenvironment{theglossary}{% +\def\@gls@prevlevel{-1}% +\mbox{}\par}{\par}% +% \end{macrocode} +% Set the header and group headers to nothing. +% \begin{macrocode} +\renewcommand*{\glossaryheader}{}% +\renewcommand*{\glsgroupheading}[1]{}% +% \end{macrocode} +% Redefine the way that the level~0 entries are displayed. +% \begin{macrocode} +\renewcommand{\glossaryentryfield}[5]{% +% \end{macrocode} +% If the level hasn't changed, keep the same settings, otherwise +% change \cs{glstreeindent} accordingly. +% \begin{macrocode} + \ifnum\@gls@prevlevel=0\relax + \else +% \end{macrocode} +% Find out how big the indentation should be by measuring the +% widest entry. +% \begin{macrocode} + \settowidth{\glstreeindent}{\textbf{\@glswidestname\space}}% +% \end{macrocode} +% Set the hangindent and paragraph indent. +% \begin{macrocode} + \hangindent\glstreeindent + \parindent\glstreeindent + \fi +% \end{macrocode} +% Put the name to the left of the paragraph block. +% \begin{macrocode} + \makebox[0pt][r]{\makebox[\glstreeindent][l]{% + \textbf{\@glstarget{glo:##1}{##2}}}}% +% \end{macrocode} +% If the symbol is missing, ignore it, otherwise put it in +% brackets. +% \begin{macrocode} + \ifx\relax##4\relax + \else + (##4)\space + \fi +% \end{macrocode} +% Do the description followed by the description terminator and +% location list. +% \begin{macrocode} + ##3\glspostdescription \space ##5\par +% \end{macrocode} +% Set the previous level to 0. +% \begin{macrocode} + \def\@gls@prevlevel{0}% +}% +% \end{macrocode} +% Redefine the way sub-entries are displayed. +% \begin{macrocode} +\renewcommand{\glossarysubentryfield}[6]{% +% \end{macrocode} +% If the level hasn't changed, keep the same settings, otherwise +% adjust \cs{glstreeindent} accordingly. +% \begin{macrocode} + \ifnum\@gls@prevlevel=##1\relax + \else +% \end{macrocode} +% Compute the widest entry for this level, or for level~0 if not +% defined for this level. Store in \cs{gls@tmplen} +% \begin{macrocode} + \@ifundefined{@glswidestname\romannumeral##1}{% + \settowidth{\gls@tmplen}{\textbf{\@glswidestname\space}}}{% + \settowidth{\gls@tmplen}{\textbf{% + \csname @glswidestname\romannumeral##1\endcsname\space}}}% +% \end{macrocode} +% Determine if going up or down a level +% \begin{macrocode} + \ifnum\@gls@prevlevel<##1\relax +% \end{macrocode} +% Depth has increased, so add the width of the widest entry to +% \cs{glstreeindent}. +% \begin{macrocode} + \setlength\glstreeindent\gls@tmplen + \addtolength\glstreeindent\parindent + \parindent\glstreeindent + \else +% \end{macrocode} +% Depth has decreased, so subtract width of the widest entry +% from the previous level to \cs{glstreeindent}. First +% determine the width of the widest entry for the previous level +% and store in \cs{glstreeindent}. +% \begin{macrocode} + \@ifundefined{@glswidestname\romannumeral\@gls@prevlevel}{% + \settowidth{\glstreeindent}{\textbf{% + \@glswidestname\space}}}{% + \settowidth{\glstreeindent}{\textbf{% + \csname @glswidestname\romannumeral\@gls@prevlevel + \endcsname\space}}}% +% \end{macrocode} +% Subtract this length from the previous level's paragraph indent +% and set to \cs{glstreeindent}. +% \begin{macrocode} + \addtolength\parindent{-\glstreeindent}% + \setlength\glstreeindent\parindent + \fi + \fi +% \end{macrocode} +% Set the hanging indentation. +% \begin{macrocode} + \hangindent\glstreeindent +% \end{macrocode} +% Put the name to the left of the paragraph block +% \begin{macrocode} + \makebox[0pt][r]{\makebox[\gls@tmplen][l]{% + \textbf{\@glstarget{glo:##2}{##3}}}}% +% \end{macrocode} +% If the symbol is missing, ignore it, otherwise put it in +% brackets. +% \begin{macrocode} + \ifx##5\relax\relax + \else + (##5)\space + \fi +% \end{macrocode} +% Do the description followed by the description terminator and +% location list. +% \begin{macrocode} + ##4\glspostdescription\space ##6\par +% \end{macrocode} +% Set the previous level macro to the current level. +% \begin{macrocode} + \def\@gls@prevlevel{##1}}% +\renewcommand*{\glsgroupskip}{\indexspace}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{alttreegroup} +% Like the \glostyle{alttree} style but the glossary groups have +% headings. +% \begin{macrocode} +\newglossarystyle{alttreegroup}{% +\glossarystyle{alttree}% +\renewcommand{\glsgroupheading}[1]{\par +\def\@gls@prevlevel{-1}% +\hangindent0pt\relax +\parindent0pt\relax +\textbf{\glsgetgrouptitle{##1}}\par\indexspace}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{alttreehypergroup} +% The \glostyle{alttreehypergroup} style is like the +% \glostyle{alttreegroup} style, but has a set of links to the +% groups at the start of the glossary. +% \begin{macrocode} +\newglossarystyle{alttreehypergroup}{% +\glossarystyle{alttree}% +% \end{macrocode} +% Put the navigation links in the header +% \begin{macrocode} + \renewcommand*{\glossaryheader}{% + \par + \def\@gls@prevlevel{-1}% + \hangindent0pt\relax + \parindent0pt\relax + \textbf{\glsnavigation}\par\indexspace}% +% \end{macrocode} +% Put a hypertarget at the start of each group +% \begin{macrocode} + \renewcommand*{\glsgroupheading}[1]{% + \par + \def\@gls@prevlevel{-1}% + \hangindent0pt\relax + \parindent0pt\relax + \textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par + \indexspace}} +% \end{macrocode} +%\end{macro} +% +%\iffalse +% \begin{macrocode} +%</glossary-tree.sty> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} %<*glossaries-babel.sty> % \end{macrocode} %\fi @@ -8458,151 +12303,306 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % support is required, but the \isty{translator} package is not loaded. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-babel}[2008/02/22 v1.0 (NLCT)] +\ProvidesPackage{glossaries-babel}[2008/12/11 v1.01 (NLCT)] % \end{macrocode} % English: % \begin{macrocode} -\addto\captionsenglish{% -\renewcommand*{\glossaryname}{Glossary}% -\renewcommand*{\acronymname}{Acronyms}% -\renewcommand*{\entryname}{Notation}% -\renewcommand*{\descriptionname}{Description}% -\renewcommand*{\symbolname}{Symbol}% -\renewcommand*{\pagelistname}{Page List}% -\renewcommand*{\glssymbolsgroupname}{Symbols}% -\renewcommand*{\glsnumbersgroupname}{Numbers}% +\@ifundefined{captionsenglish}{}{% + \addto\captionsenglish{% + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% +}% +} +\@ifundefined{captionsamerican}{}{% + \addto\captionsamerican{% + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% +}% +} +\@ifundefined{captionsaustralian}{}{% + \addto\captionsaustralian{% + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% }% +} +\@ifundefined{captionsbritish}{}{% + \addto\captionsbritish{% + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% +}% +\@ifundefined{captionscanadian}{}{% + \addto\captionscanadian{% + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% +}% +} +\@ifundefined{captionsnewzealand}{}{% + \addto\captionsnewzealand{% + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% +}% +} +\@ifundefined{captionsUKenglish}{}{% + \addto\captionsUKenglish{% + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% +}% +} +\@ifundefined{captionsUSenglish}{}{% + \addto\captionsUSenglish{% + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% +}% +} % \end{macrocode} % German (quite a few variations were suggested for German; % I settled on the following): % \begin{macrocode} -\addto\captionsgerman{% -\renewcommand*{\glossaryname}{Glossar}% -\renewcommand*{\acronymname}{Akronyme}% -\renewcommand*{\entryname}{Bezeichnung}% -\renewcommand*{\descriptionname}{Beschreibung}% -\renewcommand*{\symbolname}{Symbol}% -\renewcommand*{\pagelistname}{Seiten}% -\renewcommand*{\glssymbolsgroupname}{Symbole}% -\renewcommand*{\glsnumbersgroupname}{Zahlen}} +\@ifundefined{captionsgerman}{}{% + \addto\captionsgerman{% + \renewcommand*{\glossaryname}{Glossar}% + \renewcommand*{\acronymname}{Akronyme}% + \renewcommand*{\entryname}{Bezeichnung}% + \renewcommand*{\descriptionname}{Beschreibung}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Seiten}% + \renewcommand*{\glssymbolsgroupname}{Symbole}% + \renewcommand*{\glsnumbersgroupname}{Zahlen}} +} % \end{macrocode} % ngerman is identical to German: % \begin{macrocode} -\addto\captionsngerman{% -\renewcommand*{\glossaryname}{Glossar}% -\renewcommand*{\acronymname}{Akronyme}% -\renewcommand*{\entryname}{Bezeichnung}% -\renewcommand*{\descriptionname}{Beschreibung}% -\renewcommand*{\symbolname}{Symbol}% -\renewcommand*{\pagelistname}{Seiten}% -\renewcommand*{\glssymbolsgroupname}{Symbole}% -\renewcommand*{\glsnumbersgroupname}{Zahlen}} +\@ifundefined{captionsgerman}{}{% + \addto\captionsngerman{% + \renewcommand*{\glossaryname}{Glossar}% + \renewcommand*{\acronymname}{Akronyme}% + \renewcommand*{\entryname}{Bezeichnung}% + \renewcommand*{\descriptionname}{Beschreibung}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Seiten}% + \renewcommand*{\glssymbolsgroupname}{Symbole}% + \renewcommand*{\glsnumbersgroupname}{Zahlen}} +} % \end{macrocode} % Italian: % \begin{macrocode} -\addto\captionsitalian{% -\renewcommand*{\glossaryname}{Glossario}% -\renewcommand*{\acronymname}{Acronimi}% -\renewcommand*{\entryname}{Nomenclatura}% -\renewcommand*{\descriptionname}{Descrizione}% -\renewcommand*{\symbolname}{Simbolo}% -\renewcommand*{\pagelistname}{Elenco delle pagine}% -\renewcommand*{\glssymbolsgroupname}{Simboli}% -\renewcommand*{\glsnumbersgroupname}{Numeri}} +\@ifundefined{captionsitalian}{}{% + \addto\captionsitalian{% + \renewcommand*{\glossaryname}{Glossario}% + \renewcommand*{\acronymname}{Acronimi}% + \renewcommand*{\entryname}{Nomenclatura}% + \renewcommand*{\descriptionname}{Descrizione}% + \renewcommand*{\symbolname}{Simbolo}% + \renewcommand*{\pagelistname}{Elenco delle pagine}% + \renewcommand*{\glssymbolsgroupname}{Simboli}% + \renewcommand*{\glsnumbersgroupname}{Numeri}} +} % \end{macrocode} % Dutch: % \begin{macrocode} -\addto\captionsdutch{% -\renewcommand*{\glossaryname}{Woordenlijst}% -\renewcommand*{\acronymname}{Acroniemen}% -\renewcommand*{\entryname}{Benaming}% -\renewcommand*{\descriptionname}{Beschrijving}% -\renewcommand*{\symbolname}{Symbool}% -\renewcommand*{\pagelistname}{Pagina's}% -\renewcommand*{\glssymbolsgroupname}{Symbolen}% -\renewcommand*{\glsnumbersgroupname}{Cijfers}} +\@ifundefined{captionsdutch}{}{% + \addto\captionsdutch{% + \renewcommand*{\glossaryname}{Woordenlijst}% + \renewcommand*{\acronymname}{Acroniemen}% + \renewcommand*{\entryname}{Benaming}% + \renewcommand*{\descriptionname}{Beschrijving}% + \renewcommand*{\symbolname}{Symbool}% + \renewcommand*{\pagelistname}{Pagina's}% + \renewcommand*{\glssymbolsgroupname}{Symbolen}% + \renewcommand*{\glsnumbersgroupname}{Cijfers}} +} % \end{macrocode} % Spanish: % \begin{macrocode} -\addto\captionsspanish{% -\renewcommand*{\glossaryname}{Glosario}% -\renewcommand*{\acronymname}{Siglas}% -\renewcommand*{\entryname}{Entrada}% -\renewcommand*{\descriptionname}{Descripci\'on}% -\renewcommand*{\symbolname}{S\'{\i}mbolo}% -\renewcommand*{\pagelistname}{Lista de p\'aginas}% -\renewcommand*{\glssymbolsgroupname}{S\'{\i}mbolos}% -\renewcommand*{\glsnumbersgroupname}{N\'umeros}} +\@ifundefined{captionsspanish}{}{% + \addto\captionsspanish{% + \renewcommand*{\glossaryname}{Glosario}% + \renewcommand*{\acronymname}{Siglas}% + \renewcommand*{\entryname}{Entrada}% + \renewcommand*{\descriptionname}{Descripci\'on}% + \renewcommand*{\symbolname}{S\'{\i}mbolo}% + \renewcommand*{\pagelistname}{Lista de p\'aginas}% + \renewcommand*{\glssymbolsgroupname}{S\'{\i}mbolos}% + \renewcommand*{\glsnumbersgroupname}{N\'umeros}} +} % \end{macrocode} % French: % \begin{macrocode} -\addto\captionsfrench{% -\renewcommand*{\glossaryname}{Glossaire}% -\renewcommand*{\acronymname}{Acronymes}% -\renewcommand*{\entryname}{Terme}% -\renewcommand*{\descriptionname}{Description}% -\renewcommand*{\symbolname}{Symbole}% -\renewcommand*{\pagelistname}{Pages}% -\renewcommand*{\glssymbolsgroupname}{Symboles}% -\renewcommand*{\glsnumbersgroupname}{Nombres}} +\@ifundefined{captionsfrench}{}{% + \addto\captionsfrench{% + \renewcommand*{\glossaryname}{Glossaire}% + \renewcommand*{\acronymname}{Acronymes}% + \renewcommand*{\entryname}{Terme}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbole}% + \renewcommand*{\pagelistname}{Pages}% + \renewcommand*{\glssymbolsgroupname}{Symboles}% + \renewcommand*{\glsnumbersgroupname}{Nombres}} +} +\@ifundefined{captionsfrenchb}{}{% + \addto\captionsfrenchb{% + \renewcommand*{\glossaryname}{Glossaire}% + \renewcommand*{\acronymname}{Acronymes}% + \renewcommand*{\entryname}{Terme}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbole}% + \renewcommand*{\pagelistname}{Pages}% + \renewcommand*{\glssymbolsgroupname}{Symboles}% + \renewcommand*{\glsnumbersgroupname}{Nombres}} +} +\@ifundefined{captionsfrancais}{}{% + \addto\captionsfrancais{% + \renewcommand*{\glossaryname}{Glossaire}% + \renewcommand*{\acronymname}{Acronymes}% + \renewcommand*{\entryname}{Terme}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbole}% + \renewcommand*{\pagelistname}{Pages}% + \renewcommand*{\glssymbolsgroupname}{Symboles}% + \renewcommand*{\glsnumbersgroupname}{Nombres}} +} % \end{macrocode} % Danish: % \begin{macrocode} -\addto\captionsdanish{% -\renewcommand*{\glossaryname}{Ordliste}% -\renewcommand*{\acronymname}{Akronymer}% -\renewcommand*{\entryname}{Symbolforklaring}% -\renewcommand*{\descriptionname}{Beskrivelse}% -\renewcommand*{\symbolname}{Symbol}% -\renewcommand*{\pagelistname}{Side}% -\renewcommand*{\glssymbolsgroupname}{Symboler}% -\renewcommand*{\glsnumbersgroupname}{Tal}} +\@ifundefined{captionsdanish}{}{% + \addto\captionsdanish{% + \renewcommand*{\glossaryname}{Ordliste}% + \renewcommand*{\acronymname}{Akronymer}% + \renewcommand*{\entryname}{Symbolforklaring}% + \renewcommand*{\descriptionname}{Beskrivelse}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Side}% + \renewcommand*{\glssymbolsgroupname}{Symboler}% + \renewcommand*{\glsnumbersgroupname}{Tal}} +} % \end{macrocode} % Irish: % \begin{macrocode} -\addto\captionsirish{% -\renewcommand*{\glossaryname}{Gluais}% -\renewcommand*{\acronymname}{Acrainmneacha}% +\@ifundefined{captionsirish}{}{% + \addto\captionsirish{% + \renewcommand*{\glossaryname}{Gluais}% + \renewcommand*{\acronymname}{Acrainmneacha}% % \end{macrocode} % wasn't sure whether to go for N\'ota (Note), Ciall (`Meaning', % `sense') or Br\'{\i} (`Meaning'). In the end I chose Ciall. % \begin{macrocode} -\renewcommand*{\entryname}{Ciall}% -\renewcommand*{\descriptionname}{Tuairisc}% + \renewcommand*{\entryname}{Ciall}% + \renewcommand*{\descriptionname}{Tuairisc}% % \end{macrocode} % Again, not sure whether to use Comhartha/Comhartha\'{\i} or % Siombail/Siombaile, so have chosen the former. % \begin{macrocode} -\renewcommand*{\symbolname}{Comhartha}% -\renewcommand*{\glssymbolsgroupname}{Comhartha\'{\i}}% -\renewcommand*{\pagelistname}{Leathanaigh}% -\renewcommand*{\glsnumbersgroupname}{Uimhreacha}} + \renewcommand*{\symbolname}{Comhartha}% + \renewcommand*{\glssymbolsgroupname}{Comhartha\'{\i}}% + \renewcommand*{\pagelistname}{Leathanaigh}% + \renewcommand*{\glsnumbersgroupname}{Uimhreacha}} +} % \end{macrocode} % Hungarian: % \begin{macrocode} -\addto\captionsmagyar{% -\renewcommand*{\glossaryname}{Sz\'ojegyz\'ek}% -\renewcommand*{\acronymname}{Bet\H uszavak}% -\renewcommand*{\entryname}{Kifejez\'es}% -\renewcommand*{\descriptionname}{Magyar\'azat}% -\renewcommand*{\symbolname}{Jel\"ol\'es}% -\renewcommand*{\pagelistname}{Oldalsz\'am}% -\renewcommand*{\glssymbolsgroupname}{Jelek}% -\renewcommand*{\glsnumbersgroupname}{Sz\'amjegyek}% +\@ifundefined{captionsmagyar}{}{% + \addto\captionsmagyar{% + \renewcommand*{\glossaryname}{Sz\'ojegyz\'ek}% + \renewcommand*{\acronymname}{Bet\H uszavak}% + \renewcommand*{\entryname}{Kifejez\'es}% + \renewcommand*{\descriptionname}{Magyar\'azat}% + \renewcommand*{\symbolname}{Jel\"ol\'es}% + \renewcommand*{\pagelistname}{Oldalsz\'am}% + \renewcommand*{\glssymbolsgroupname}{Jelek}% + \renewcommand*{\glsnumbersgroupname}{Sz\'amjegyek}% + } +} +\@ifundefined{captionshungarian}{}{% + \addto\captionshungarian{% + \renewcommand*{\glossaryname}{Sz\'ojegyz\'ek}% + \renewcommand*{\acronymname}{Bet\H uszavak}% + \renewcommand*{\entryname}{Kifejez\'es}% + \renewcommand*{\descriptionname}{Magyar\'azat}% + \renewcommand*{\symbolname}{Jel\"ol\'es}% + \renewcommand*{\pagelistname}{Oldalsz\'am}% + \renewcommand*{\glssymbolsgroupname}{Jelek}% + \renewcommand*{\glsnumbersgroupname}{Sz\'amjegyek}% + } } % \end{macrocode} % Polish % \changes{1.13}{2008 May 10}{Add Polish support} % \begin{macrocode} -\addto\captionspolish{% -\renewcommand*{\glossaryname}{S{\l}ownik termin\'ow}% -\renewcommand*{\acronymname}{Skr\'ot}% -\renewcommand*{\entryname}{Termin}% -\renewcommand*{\descriptionname}{Opis}% -\renewcommand*{\symbolname}{Symbol}% -\renewcommand*{\pagelistname}{Strony}% -\renewcommand*{\glssymbolsgroupname}{Symbole}% -\renewcommand*{\glsnumbersgroupname}{Liczby}} +\@ifundefined{captionspolish}{}{% + \addto\captionspolish{% + \renewcommand*{\glossaryname}{S{\l}ownik termin\'ow}% + \renewcommand*{\acronymname}{Skr\'ot}% + \renewcommand*{\entryname}{Termin}% + \renewcommand*{\descriptionname}{Opis}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Strony}% + \renewcommand*{\glssymbolsgroupname}{Symbole}% + \renewcommand*{\glsnumbersgroupname}{Liczby}} +} +% \end{macrocode} +% Brazilian +%\changes{1.17}{2008 December 11}{Added Brazilian support} +% \begin{macrocode} +\@ifundefined{captionsbrazil}{}{% + \addto\captionsbrazil{% + \renewcommand*{\glossaryname}{Gloss\'ario}% + \renewcommand*{\acronymname}{Siglas}% + \renewcommand*{\entryname}{Nota\c c\~ao}% + \renewcommand*{\descriptionname}{Descri\c c\~ao}% + \renewcommand*{\symbolname}{S\'imbolo}% + \renewcommand*{\pagelistname}{Lista de P\'aginas}% + \renewcommand*{\glssymbolsgroupname}{S\'imbolos}% + \renewcommand*{\glsnumbersgroupname}{N\'umeros}% + }% +} % \end{macrocode} %\iffalse % \begin{macrocode} @@ -8611,11 +12611,39 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% %\fi %\iffalse % \begin{macrocode} +%<*glossaries-dictionary-Brazil.dict> +% \end{macrocode} +%\fi +%\subsection{Brazilian Dictionary} +% This is a dictionary file provided by Thiago de~Melo for +% use with the \isty{translator} package. +%\changes{1.17}{2008 November 17}{added Brazilian dictionary} +% \begin{macrocode} +\ProvidesDictionary{glossaries-dictionary}{Brazil} +% \end{macrocode} +% Provide Brazilian translations: +% \begin{macrocode} +\providetranslation{Glossary}{Gloss\'ario} +\providetranslation{Acronyms}{Siglas} +\providetranslation{Notation (glossaries)}{Nota\c c\~ao} +\providetranslation{Description (glossaries)}{Descri\c c\~ao} +\providetranslation{Symbol (glossaries)}{S\'imbolo} +\providetranslation{Page List (glossaries)}{Lista de P\'aginas} +\providetranslation{Symbols (glossaries)}{S\'imbolos} +\providetranslation{Numbers (glossaries)}{N\'umeros} +% \end{macrocode} +%\iffalse +% \begin{macrocode} +%</glossaries-dictionary-Brazil.dict> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} %<*glossaries-dictionary-Danish.dict> % \end{macrocode} %\fi %\subsection{Danish Dictionary} -% This is a dictonary file provided for use with the \isty{translator} +% This is a dictionary file provided for use with the \isty{translator} % package. % \begin{macrocode} \ProvidesDictionary{glossaries-dictionary}{Danish} @@ -8642,7 +12670,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \end{macrocode} %\fi %\subsection{Dutch Dictionary} -% This is a dictonary file provided for use with the \isty{translator} +% This is a dictionary file provided for use with the \isty{translator} % package. % \begin{macrocode} \ProvidesDictionary{glossaries-dictionary}{Dutch} @@ -8669,7 +12697,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \end{macrocode} %\fi %\subsection{English Dictionary} -% This is a dictonary file provided for use with the \isty{translator} +% This is a dictionary file provided for use with the \isty{translator} % package. % \begin{macrocode} \ProvidesDictionary{glossaries-dictionary}{English} @@ -8696,7 +12724,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \end{macrocode} %\fi %\subsection{French Dictionary} -% This is a dictonary file provided for use with the \isty{translator} +% This is a dictionary file provided for use with the \isty{translator} % package. % \begin{macrocode} \ProvidesDictionary{glossaries-dictionary}{French} @@ -8723,7 +12751,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \end{macrocode} %\fi %\subsection{German Dictionary} -% This is a dictonary file provided for use with the \isty{translator} +% This is a dictionary file provided for use with the \isty{translator} % package. % \begin{macrocode} \ProvidesDictionary{glossaries-dictionary}{German} @@ -8751,7 +12779,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \end{macrocode} %\fi %\subsection{Irish Dictionary} -% This is a dictonary file provided for use with the \isty{translator} +% This is a dictionary file provided for use with the \isty{translator} % package. % \begin{macrocode} \ProvidesDictionary{glossaries-dictionary}{Irish} @@ -8778,7 +12806,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \end{macrocode} %\fi %\subsection{Italian Dictionary} -% This is a dictonary file provided for use with the \isty{translator} +% This is a dictionary file provided for use with the \isty{translator} % package. % \begin{macrocode} \ProvidesDictionary{glossaries-dictionary}{Italian} @@ -8805,7 +12833,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \end{macrocode} %\fi %\subsection{Magyar Dictionary} -% This is a dictonary file provided for use with the \isty{translator} +% This is a dictionary file provided for use with the \isty{translator} % package. % \begin{macrocode} \ProvidesDictionary{glossaries-dictionary}{Magyar} @@ -8832,7 +12860,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \end{macrocode} %\fi %\subsection{Polish Dictionary} -% This is a dictonary file provided for use with the \isty{translator} +% This is a dictionary file provided for use with the \isty{translator} % package. % \begin{macrocode} \ProvidesDictionary{glossaries-dictionary}{Polish} @@ -8859,7 +12887,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% % \end{macrocode} %\fi %\subsection{Spanish Dictionary} -% This is a dictonary file provided for use with the \isty{translator} +% This is a dictionary file provided for use with the \isty{translator} % package. % \begin{macrocode} \ProvidesDictionary{glossaries-dictionary}{Spanish} @@ -8912,9 +12940,9 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \documentclass{article} \listfiles -\usepackage{hyperref} - %\usepackage{glossaries} % acronym will go in main glossary - \usepackage[acronym,footnote]{glossaries} % make a separate list of acronyms +\usepackage[colorlinks]{hyperref} + \usepackage{glossaries} % acronym will go in main glossary + %\usepackage[acronym]{glossaries} % make a separate list of acronyms \makeglossaries @@ -8951,15 +12979,24 @@ First use: \glspl{aca}. Second use: \glspl{aca}. \documentclass[a4paper]{report} \usepackage[plainpages=false,colorlinks]{hyperref} -\usepackage[style=altlist]{glossaries} +\usepackage[toc,style=treenoname,order=word]{glossaries} \makeglossaries \newglossaryentry{glossary}{name=glossary, -description={1) list of technical words, 2) collection of -glosses}, +description={\nopostdesc}, plural={glossaries}} +\newglossaryentry{glossarylist}{ +description={1) list of technical words}, +sort={1}, +parent={glossary}} + +\newglossaryentry{glossarycol}{ +description={2) collection of glosses}, +sort={2}, +parent={glossary}} + \newglossaryentry{Perl}{name=\texttt{Perl}, sort=Perl, % need a sort key because name contains a command description=A scripting language} @@ -8975,10 +13012,41 @@ description={rectangular array of quantities}, % plural is not simply obtained by appending an s, so specify plural=matrices} -\newcommand{\pardescription}{distinct section of piece of -writing.\par Beginning on new, usually indented, line} + % entry with a paragraph break in the description + \newglossaryentry{par}{name=paragraph, -description=\pardescription} +description={distinct section of piece of +writing.\glspar Beginning on new, usually indented, line}} + + % entry with two types of plural. Set the plural form to the + % form most likely to be used. If you want to use a different + % plural, you will need to explicity specify it in \glslink +\newglossaryentry{cow}{name=cow, + % this isn't necessary, as this form (appending an s) is + % the default +plural=cows, + % description: +description={(\emph{pl.}\ cows, \emph{archaic} kine) an adult +female of any bovine animal}} + +\newglossaryentry{bravo}{name={bravo}, +description={\nopostdesc}} + +\newglossaryentry{bravo1}{description={1) cry of approval (pl.\ bravos)}, +sort={1}, +plural={bravos}, +parent=bravo} + +\newglossaryentry{bravo2}{description={2) hired ruffian or killer (pl.\ bravoes)}, +sort={2}, +plural={bravoes}, +parent=bravo} + +\newglossaryentry{seal}{name=seal,description={sea mammal with +flippers that eats fish}} + +\newglossaryentry{sealion}{name={sea lion}, +description={large seal}} \begin{document} @@ -8993,11 +13061,11 @@ description=\pardescription} \chapter{Introduction} \pagenumbering{arabic} -A \gls{glossary} is a very useful addition to any -technical document, although a \gls{glossary} can +A \gls{glossarylist} is a very useful addition to any +technical document, although a \gls{glossarycol} can also simply be a collection of glosses, which is another thing entirely. Some documents have -multiple \glspl{glossary}. +multiple \glspl{glossarylist}. Once you have run your document through \LaTeX, you will then need to run the \texttt{.glo} file through @@ -9014,11 +13082,29 @@ wrapper. If a comma appears within the name or description, grouping must be used, e.g.\ in the description of \gls{pagelist}. -Plurals are assumed to have the letter s appended, but if -this is not the case, as in \glspl{mtrx}, then you need -to specify the plural when you define the entry. +\chapter{Plurals and Paragraphs} -\Glspl{par} can cause a problem in commands. +Plurals are assumed to have the letter s appended, but if this is +not the case, as in \glspl{mtrx}, then you need to specify the +plural when you define the entry. If a term may have multiple +plurals (for example \glspl{cow}/\glslink{cow}{kine}) then +define the entry with the plural form most likely to be used and +explicitly specify the alternative form using \verb|\glslink|. +\Glspl{seal} and \glspl{sealion} have regular plural forms. + +\Gls{bravo} is a homograph, but the plural forms are spelt +differently. The plural of \gls{bravo1}, a cry of approval, +is \glspl{bravo1}, whereas the plural of \gls{bravo2}, a hired +ruffian or killer, is \glspl{bravo2}. + +\Glspl{par} can cause a problem in commands, so care is needed +when having a paragraph break in a \gls{glossarylist} entry. + +\chapter{Ordering} + +There are two types of ordering: word ordering (which places +``\gls{sealion}'' before ``\gls{seal}'') and letter ordering +(which places ``\gls{seal}'' before ``\gls{sealion}''). \printglossaries @@ -9154,7 +13240,7 @@ name={Support vector machine (svm)}% change the default way of displaying the en ]{svm}{svm}{support vector machine} \newacronym[description={Statistical pattern recognition technique -using the ``kernel trick'' (see also SVM)},% acronym's description +using the ``kernel trick'' (see also \glshyperlink[SVM]{svm})},% acronym's description name={Kernel support vector machine (ksvm)}% change the default way of displaying the entry name in the list of acronyms ]{ksvm}{ksvm}{kernel support vector machine} @@ -9178,7 +13264,8 @@ This is the entry in uppercase: \GLS{svm}. \chapter{Kernel Support Vector Machines} The \gls{ksvm} is \ifglsused{svm}{an}{a} \gls{svm} that uses -the so called ``kernel trick''. +the so called ``kernel trick''. This is the entry's description without +a link: \glsentrydesc{ksvm}. \glsresetall Possessive: \gls{ksvm}['s]. @@ -9325,10 +13412,15 @@ one \gls[format=hyperbf]{svm}. \usepackage[colorlinks]{hyperref} \usepackage[style=long3colheader,counter=equation]{glossaries} +\makeglossaries + \newcommand{\erf}{\operatorname{erf}} \newcommand{\erfc}{\operatorname{erfc}} -\makeglossaries + % redefine the way hyperref creates the target for equations + % so that the glossary links to equation numbers work + +\renewcommand*\theHequation{\thechapter.\arabic{equation}} % Change the glossary headings @@ -9564,6 +13656,20 @@ Bessel functions $Z_\nu$ are solutions of %\fi %\iffalse % \begin{macrocode} + % To ensure that the page numbers are up-to-date: + % + % latex sampleEqPg + % makeglossaries sampleEqPg + % latex sampleEqPg + % makeglossaries sampleEqPg + % latex sampleEqPg + % + % The extra makeglossaries run is required because adding the + % glossary in the second LaTeX run shifts the page numbers on + % which means that the glossary needs to be updated again. + % (Note that this problem is avoided if the page numbering is + % reset after the glossary. For example, if the glossary has + % roman numbering and the subsequent pages have arabic numbering) \documentclass[a4paper,12pt]{report} \usepackage{amsmath} @@ -9574,6 +13680,11 @@ Bessel functions $Z_\nu$ are solutions of \newcommand{\erf}{\operatorname{erf}} \newcommand{\erfc}{\operatorname{erfc}} + % redefine the way hyperref creates the target for equations + % so that the glossary links to equation numbers work + +\renewcommand*\theHequation{\thechapter.\arabic{equation}} + \renewcommand{\glossaryname}{Index of Special Functions and Notations} \renewcommand{\glossarypreamble}{Numbers in italic indicate the equation number, @@ -9907,9 +14018,6 @@ doesn't have associated numbers. \tableofcontents \printglossaries - %\printglossary - %\setglossarysection{section} - %\printglossary[type=notation] \chapter{Introduction} \pagenumbering{arabic} @@ -10011,6 +14119,997 @@ Another \gls{ident} entry. %\fi %\iffalse % \begin{macrocode} +%<*sampletree.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +\documentclass{report} + +\usepackage[colorlinks]{hyperref} +\usepackage[style=alttreehypergroup]{glossaries} + + % The alttree type of glossary styles need to know the + % widest entry name for each level +\glssetwidest{Roman letters} % level 0 widest name +\glssetwidest[1]{Sigma} % level 1 widest name + +\makeglossaries + +\newglossaryentry{greekletter}{name={Greek letters}, +text={Greek letter}, +description={\nopostdesc}} + +\newglossaryentry{sigma}{name={Sigma}, +text={\ensuremath{\Sigma}}, +first={\ensuremath{\Sigma} (uppercase sigma)}, +symbol={\ensuremath{\Sigma}}, +description={Used to indicate summation}, +parent=greekletter} + +\newglossaryentry{pi}{name={pi}, +text={\ensuremath{\pi}}, +first={\ensuremath{\pi} (lowercase pi)}, +symbol={\ensuremath{\pi}}, +description={Transcendental number}, +parent=greekletter} + +\newglossaryentry{romanletter}{name={Roman letters}, +text={Roman letter}, +description={\nopostdesc}} + +\newglossaryentry{e}{name={e}, +description={Unique real number such that the derivative of +the function $e^x$ is the function itself}, +parent=romanletter} + +\newglossaryentry{C}{name={C}, +description={Euler's constant}, +parent=romanletter} + +\begin{document} +This is a sample document illustrating hierarchical glossary +entries. + +\chapter{Greek Letters Used in Mathematics} + +Some information about \glspl{greekletter}. +The letter \gls{pi} is used to represent the ratio of a circle's +circumference to its diameter. +The letter \gls{sigma} is used to represent summation. + +\chapter{Roman Letters Used in Mathematics} + +Some information about \glspl{romanletter}. +The letter \gls{e} is the unique real number such that +the derivative of the function $e^x$ is the function itself. +The letter \gls{C} represents Euler's constant. + +\printglossaries + +\end{document} +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</sampletree.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*sampleutf8.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +\documentclass{article} + +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +\usepackage[xindy,nonumberlist,style=listgroup]{glossaries} + +\makeglossaries + +% Note that because the é is the first letter of the +% name, it needs to be grouped or it will cause a +% problem for \makefirstuc due to expansion issues. +\newglossaryentry{elite}{name={{é}lite}, +description={select group or class}} + +\newglossaryentry{elephant}{name=elephant, +description={large animal with trunk and tusks}} + +\newglossaryentry{elk}{name=elk, +description=large deer} + +\newglossaryentry{mannerly}{name=mannerly, +description=polite} + +% The œ is not the first letter, so it doesn't need to +% be grouped. +\newglossaryentry{manoeuvre}{name={manœuvre}, +description=planned and controlled movement} + +\newglossaryentry{manor}{name=manor, +description=large landed estate or its house} + +\newglossaryentry{odometer}{name=odometer, +description=instrument for measuring distance travelled by +a wheeled vehicle} + +\newglossaryentry{oesophagus}{name={{œ}sophagus}, +description={canal from mouth to stomach}} + +\newglossaryentry{ogre}{name=ogre, +description=man-eating giant} + +\begin{document} +\null % ensure that the first run produces some output +\glsaddall + +\printglossaries + +\end{document} +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</sampleutf8.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*samplexdy.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} + % This is a sample document illustrating how to use the + % glossaries package with xindy. To create the document: + % + % latex samplexdy + % makeglossaries samplexdy + % latex samplexdy + % + % If you don't have Perl installed, then use one of the + % following instead of makeglossaries: + % + % If you want to have a separate "Mc" letter group do: + % + % xindy -I xindy -M samplexdy-mc -t samplexdy.glg -o samplexdy.gls samplexdy.glo + % + % Otherwise do: + % + % xindy -L english -C utf8 -I xindy -M samplexdy -t samplexdy.glg -o samplexdy.gls samplexdy.glo + % +\documentclass{article} + +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +\usepackage{fmtcount} + + % remove redefinition of \thepage below if you want to uncomment + % the following line: + % \usepackage[colorlinks]{hyperref} + +\usepackage[xindy,style=altlistgroup]{glossaries} + + % Define a new command to do bold italic (it uses \hyperbf + % rather than \textbf in case I later introduce hyperlinks + % - although I would have to remove the fancy page numbering + % if I wanted to do that): + +\newcommand*{\hyperbfit}[1]{\textit{\hyperbf{#1}}} + + % Need to add this to the list of attributes in order + % to use it with xindy: + % (This command will have no effect if \noist is used) + +\GlsAddXdyAttribute{hyperbfit} + + % Redefine the page numbers so that they appear as a word: + + \renewcommand*{\thepage}{\Numberstring{page}} + + % Need to add this to the list of location styles. + % \Numberstring{page} gets expanded to + % \protect \Numberstringnum {<n>} (where <n> is the page number) + % so need to define the location in that format: + % (This command will have no effect if \noist is used) + +\GlsAddXdyLocation{Numberstring}{:sep "\string\protect\space + \string\Numberstringnum\space\glsopenbrace" + "arabic-numbers" :sep "\glsclosebrace"} + + % To have Mc as a separate group uncomment the following three + % lines: + + %\setStyleFile{samplexdy-mc} % note no extension + %\noist + %\GlsSetXdyLanguage{} + + % The above three lines specify to use samplexdy-mc.xdy (supplied + % with this file) and don't overwrite it. The language is + % unset using \GlsSetXdyLanguage{} as all the language + % dependent information is contained in samplexdy-mc.xdy + % Note that using \noist means that commands like + % \GlsAddXdyAttribute and \GlsAddXdyLocation will no longer have + % an effect. + + % Write the style file (if \noist isn't used) + % and activate glossary entries + +\makeglossaries + + % Define glossary entries + % \glshyperlink is used instead of \gls to prevent the glossary + % page numbers also appear in the locations, however I need + % to ensure that the referenced entries are added to the + % glossary via commands that use \glslink, \glsadd or \glssee + +\newglossaryentry{mcadam}{name={McAdam, John Loudon}, +first={John Loudon McAdam},text={McAdam}, +description={Scottish engineer}} + +\newglossaryentry{maclaurin}{name={Maclaurin, Colin}, +first={Colin Maclaurin},text={Maclaurin}, +description={Scottish mathematician best known for the +\gls{maclaurinseries}}} + +\newglossaryentry{maclaurinseries}{name={Maclaurin series}, +description={Series expansion},see={taylorstheorem}} + +\newglossaryentry{taylorstheorem}{name={Taylor's theorem}, +description={Theorem expressing a function $f(x)$ as the sum of +a polynomial and a remainder: +\[f(x) = f(a)+f'(a)(x-a)+f''(a)(x-a^2)/2!+\cdots+R_n\] +If $n\to\infty$ the expansion is a \glshyperlink{taylorseries} +and if $a=0$, the series is called a +\gls{maclaurinseries}}} + +\newglossaryentry{taylorseries}{name={Taylor series}, +description={Series expansion},see={taylorstheorem}} + +\newglossaryentry{taylor}{name={Taylor, Brook}, +first={Brook Taylor},text={Taylor}, +description={English mathematician}} + +\newglossaryentry{mcnemar}{name={McNemar, Quinn}, +first={Quinn McNemar},text={McNemar}, +description={Mathematician who introduced +\gls{mcnemarstest}. This entry has the number list +suppressed},nonumberlist} + +\newglossaryentry{mcnemarstest}{name={McNemar's test}, +description={A nonparametric test introduced by +\gls{mcnemar} in 1947}} + +\newglossaryentry{mach}{name={Mach, Ernst}, +first={Ernst Mach},text={Mach}, + % if using samplexdy-mc.xdy, the following line is needed + % to prevent this entry being put in the "Mc" group +sort={mach, Ernst}, +description={Czech/Austrian physicist and philosopher}} + +\newglossaryentry{machnumber}{name={Mach number}, + % if using samplexdy-mc.xdy, the following line is needed + % to prevent this entry being put in the "Mc" group +sort={mach number}, +description={Ratio of the speed of a body in a fluid to the +speed of sound in that fluid named after \gls{mach}}} + +\newglossaryentry{malthus}{name={Malthus, Thomas Robert}, +first={Thomas Robert Malthus},text={Malthus}, +description={English mathematician, sociologist and classicist}} + +\newglossaryentry{ampereandre}{name={Ampère, André-Marie}, +first={André-Marie Ampère},text={Ampère}, +description={French mathematician and physicist}} + +\newglossaryentry{ampere}{name={ampere}, +description={SI unit of electric current named after +\gls{ampereandre}}} + +\newglossaryentry{archimedes}{name={Archimedes of Syracuse}, +first={Archimedes of Syracuse},text={Archimedes}, +description={Greek mathematician}} + +\newglossaryentry{archimedesprinciple}{name={Archemedes' principle}, +description={Principle that if a body is submerged in a fluid +it experiences upthrust equal to the weight of the displaced +fluid. Named after \gls{archimedes}}} + +\newglossaryentry{galton}{name={Galton, Sir Francis}, +first={Sir Francis Galton},text={Galton}, +description={English anthropologist}} + +\newglossaryentry{gauss}{name={Gauss, Karl Friedrich}, +first={Karl Friedrich Gauss},text={Gauss}, +description={German mathematician}} + +\newglossaryentry{gaussianint}{name={Gaussian integer}, +description={Complex number where both real and imaginary +parts are integers}} + +\newglossaryentry{peano}{name={Peano, Giuseppe}, +first={Giuseppe Peano},text={Peano}, +description={Italian mathematician}} + +\newglossaryentry{peanoscurve}{name={Peano's curve}, +description={A space-filling curve discovered by +\gls{peano}}} + +\newglossaryentry{pearson}{name={Pearson, Karl}, +first={Karl Pearson},text={Pearson}, +description={English mathematician}} + +\newglossaryentry{pearspmcc}{name={Pearson's product moment +correlation coefficient},description={Product moment correlation +coefficient named after \gls{pearson}}} + +\begin{document} +\title{Sample Document Using the Glossaries Package With Xindy} +\author{Nicola Talbot} +\maketitle + +\section{\glsentryfirst{gauss}} + +This is a section on \gls[format=(]{gauss}. This section spans +several pages. + +\newpage + +This page talks about \glspl[format=hyperbfit]{gaussianint}. Since +it's the principle definition, the user-defined hyperbfit format is +used. + +\newpage + +The section on \gls[format=)]{gauss} ends here. + +\section{Series Expansions} + +This section is about series expansions. It mentions +\gls{maclaurin} and \gls{taylor}. It also discusses +\gls{taylorstheorem} which is related to the \gls{taylorseries}. +The \gls{maclaurinseries} is a special case of the +\gls{taylorseries}. + +\section{\glsentryname{archimedesprinciple}} + +This section discusses \gls{archimedesprinciple} which was +introduced by \gls{archimedes}. + +\section{Another section} + +This section covers \gls{mach} who introduced the \gls{machnumber}. +It also mentions \gls{ampereandre} after whom the +SI unit \gls{ampere} is named. It then discusses \gls{galton} +and \gls{malthus}. Finally it mentions \gls{mcadam}. + +\newpage +This page discusses \gls{mcnemar} who introduced +\gls{mcnemarstest} and \gls{peano} who discovered \gls{peanoscurve}. + +\printglossaries +\end{document} +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</samplexdy.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*samplexdy-mc.xdy> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +;; xindy style file for samplexdy.tex that has Mc letter group + +(define-letter-group "A" :prefixes ("")) +(define-letter-group "B" :after "A" :prefixes ("")) +(define-letter-group "C" :after "B" :prefixes ("")) +(define-letter-group "D" :after "C" :prefixes ("")) +(define-letter-group "E" :after "D" :prefixes ("")) +(define-letter-group "F" :after "E" :prefixes ("")) +(define-letter-group "G" :after "F" :prefixes ("")) +(define-letter-group "H" :after "G" :prefixes ("¤")) +(define-letter-group "I" :after "H" :prefixes ("¨")) +(define-letter-group "J" :after "I" :prefixes ("¬")) +(define-letter-group "K" :after "J" :prefixes ("®")) +(define-letter-group "L" :after "K" :prefixes ("´")) +(define-letter-group "Mc" :after "L" :prefixes ("»")) +(define-letter-group "M" :after "Mc" :prefixes ("»")) +(define-letter-group "N" :after "M" :prefixes ("¼")) +(define-letter-group "O" :after "N" :prefixes ("Ã")) +(define-letter-group "P" :after "O" :prefixes ("È")) +(define-letter-group "Q" :after "P" :prefixes ("Ê")) +(define-letter-group "R" :after "Q" :prefixes ("Ë")) +(define-letter-group "S" :after "R" :prefixes ("Ð")) +(define-letter-group "T" :after "S" :prefixes ("Ú")) +(define-letter-group "U" :after "T" :prefixes ("à")) +(define-letter-group "V" :after "U" :prefixes ("å")) +(define-letter-group "W" :after "V" :prefixes ("æ")) +(define-letter-group "X" :after "W" :prefixes ("ë")) +(define-letter-group "Y" :after "X" :prefixes ("í")) +(define-letter-group "È" :after "Y" :prefixes ("ï")) +(define-letter-group "Z" :after "È" :prefixes ("ð")) +(define-letter-group "Ã" :after "Z" :prefixes ("ö")) +(define-letter-group "Æ¿" :after "Ã" :prefixes ("÷")) + +(define-rule-set "en-alphabetize" + + :rules (("à " "" :string) + ("Ã" "" :string) + ("Ã" "" :string) + ("æ" "" :string) + ("Ã" "" :string) + ("ç" "" :string) + ("ð" "" :string) + ("Ã" "" :string) + ("Ã" "" :string) + ("Ã" "" :string) + ("Ã" "" :string) + ("Ã" "" :string) + ("è" "" :string) + ("ë" "" :string) + ("ê" "" :string) + ("é" "" :string) + ("Ã" "¨" :string) + ("ï" "¨" :string) + ("Ã" "¼" :string) + ("ñ" "¼" :string) + ("Ã" "Ã" :string) + ("Ã" "Ã" :string) + ("ô" "Ã" :string) + ("ö" "Ã" :string) + ("Å" "Ã" :string) + ("Å" "Ã" :string) + ("È" "ï" :string) + ("È" "ï" :string) + ("þ" "ö" :string) + ("Ã" "ö" :string) + ("Ç·" "÷" :string) + ("Æ¿" "÷" :string) + ("a" "" :string) + ("A" "" :string) + ("b" "" :string) + ("B" "" :string) + ("C" "" :string) + ("c" "" :string) + ("d" "" :string) + ("D" "" :string) + ("E" "" :string) + ("e" "" :string) + ("F" "" :string) + ("f" "" :string) + ("g" "" :string) + ("G" "" :string) + ("H" "¤" :string) + ("h" "¤" :string) + ("I" "¨" :string) + ("i" "¨" :string) + ("J" "¬" :string) + ("j" "¬" :string) + ("K" "®" :string) + ("k" "®" :string) + ("L" "´" :string) + ("l" "´" :string) + ("Mc" "»" :string) + ("Mac" "»" :string) + ("M" "»" :string) + ("m" "»" :string) + ("N" "¼" :string) + ("n" "¼" :string) + ("O" "Ã" :string) + ("o" "Ã" :string) + ("P" "È" :string) + ("p" "È" :string) + ("q" "Ê" :string) + ("Q" "Ê" :string) + ("r" "Ë" :string) + ("R" "Ë" :string) + ("S" "Ð" :string) + ("s" "Ð" :string) + ("T" "Ú" :string) + ("t" "Ú" :string) + ("u" "à" :string) + ("U" "à" :string) + ("v" "å" :string) + ("V" "å" :string) + ("w" "æ" :string) + ("W" "æ" :string) + ("X" "ë" :string) + ("x" "ë" :string) + ("Y" "í" :string) + ("y" "í" :string) + ("z" "ð" :string) + ("Z" "ð" :string) + )) + +(define-rule-set "en-resolve-diacritics" + + :rules (("È" "¢" :string) + ("þ" "¢" :string) + ("Ç·" "¢" :string) + ("Ã" "¢" :string) + ("È" "¢" :string) + ("Æ¿" "¢" :string) + ("Ã" "£" :string) + ("Ã" "£" :string) + ("ð" "£" :string) + ("Ã" "£" :string) + ("Ã" "£" :string) + ("Ã" "£" :string) + ("ï" "£" :string) + ("ö" "£" :string) + ("ñ" "£" :string) + ("ç" "£" :string) + ("à " "£" :string) + ("Ã" "£" :string) + ("é" "£" :string) + ("Ã" "£" :string) + ("Ã" "¤" :string) + ("ô" "¤" :string) + ("Ã" "¤" :string) + ("è" "¤" :string) + ("Ã" "¥" :string) + ("ë" "¥" :string) + ("Ã" "¦" :string) + ("ê" "¦" :string) + ("Å" "ÿ" :string) + ("Ã" "ÿ" :string) + ("Å" "ÿ" :string) + ("æ" "ÿ" :string) + ("S" "¢" :string) + ("K" "¢" :string) + ("d" "¢" :string) + ("Y" "¢" :string) + ("E" "¢" :string) + ("y" "¢" :string) + ("g" "¢" :string) + ("e" "¢" :string) + ("J" "¢" :string) + ("q" "¢" :string) + ("D" "¢" :string) + ("b" "¢" :string) + ("z" "¢" :string) + ("w" "¢" :string) + ("Q" "¢" :string) + ("M" "¢" :string) + ("C" "¢" :string) + ("L" "¢" :string) + ("X" "¢" :string) + ("P" "¢" :string) + ("T" "¢" :string) + ("a" "¢" :string) + ("N" "¢" :string) + ("j" "¢" :string) + ("Z" "¢" :string) + ("u" "¢" :string) + ("k" "¢" :string) + ("t" "¢" :string) + ("W" "¢" :string) + ("v" "¢" :string) + ("s" "¢" :string) + ("B" "¢" :string) + ("H" "¢" :string) + ("c" "¢" :string) + ("I" "¢" :string) + ("G" "¢" :string) + ("U" "¢" :string) + ("F" "¢" :string) + ("r" "¢" :string) + ("x" "¢" :string) + ("V" "¢" :string) + ("h" "¢" :string) + ("f" "¢" :string) + ("i" "¢" :string) + ("A" "¢" :string) + ("O" "¢" :string) + ("n" "¢" :string) + ("m" "¢" :string) + ("l" "¢" :string) + ("p" "¢" :string) + ("R" "¢" :string) + ("o" "¢" :string) + )) + +(define-rule-set "en-resolve-case" + + :rules (("Ã" "8" :string) + ("Ã" "8" :string) + ("Ã" "8" :string) + ("Ã" "8" :string) + ("Ã" "8" :string) + ("Ã" "8" :string) + ("Ã" "8" :string) + ("Ã" "8" :string) + ("Ã" "8" :string) + ("Ç·" "8" :string) + ("Ã" "8" :string) + ("Ã" "8" :string) + ("È" "8" :string) + ("Ã" "8" :string) + ("Ã" "89" :string) + ("Å" "89" :string) + ("ð" "9" :string) + ("ô" "9" :string) + ("È" "9" :string) + ("ï" "9" :string) + ("ö" "9" :string) + ("ñ" "9" :string) + ("ç" "9" :string) + ("à " "9" :string) + ("þ" "9" :string) + ("è" "9" :string) + ("ë" "9" :string) + ("ê" "9" :string) + ("é" "9" :string) + ("Æ¿" "9" :string) + ("Å" "99" :string) + ("æ" "99" :string) + ("S" "8" :string) + ("K" "8" :string) + ("Y" "8" :string) + ("E" "8" :string) + ("J" "8" :string) + ("D" "8" :string) + ("Q" "8" :string) + ("M" "8" :string) + ("C" "8" :string) + ("L" "8" :string) + ("X" "8" :string) + ("P" "8" :string) + ("T" "8" :string) + ("N" "8" :string) + ("Z" "8" :string) + ("W" "8" :string) + ("B" "8" :string) + ("H" "8" :string) + ("I" "8" :string) + ("G" "8" :string) + ("U" "8" :string) + ("F" "8" :string) + ("V" "8" :string) + ("A" "8" :string) + ("O" "8" :string) + ("R" "8" :string) + ("d" "9" :string) + ("y" "9" :string) + ("g" "9" :string) + ("e" "9" :string) + ("q" "9" :string) + ("b" "9" :string) + ("z" "9" :string) + ("w" "9" :string) + ("a" "9" :string) + ("j" "9" :string) + ("u" "9" :string) + ("k" "9" :string) + ("t" "9" :string) + ("v" "9" :string) + ("s" "9" :string) + ("c" "9" :string) + ("r" "9" :string) + ("x" "9" :string) + ("h" "9" :string) + ("f" "9" :string) + ("i" "9" :string) + ("n" "9" :string) + ("m" "9" :string) + ("l" "9" :string) + ("p" "9" :string) + ("o" "9" :string) + )) + +(define-rule-set "en-ignore-special" + + :rules (("-" "" :string) + ("!" "" :string) + ("{" "" :string) + ("'" "" :string) + ("}" "" :string) + ("?" "" :string) + ("." "" :string) + )) + +(define-rule-set "en-resolve-special" + + :rules (("Ã" "¤" :string) + ("Ã" "¤" :string) + ("ð" "¤" :string) + ("Ã" "¤" :string) + ("Ã" "¤" :string) + ("Ã" "¤" :string) + ("ô" "¤" :string) + ("Ã" "¤" :string) + ("È" "¤" :string) + ("ï" "¤" :string) + ("Ã" "¤" :string) + ("ö" "¤" :string) + ("ñ" "¤" :string) + ("Ã" "¤" :string) + ("ç" "¤" :string) + ("Ã" "¤" :string) + ("à " "¤" :string) + ("þ" "¤" :string) + ("Ç·" "¤" :string) + ("è" "¤" :string) + ("Ã" "¤" :string) + ("ë" "¤" :string) + ("Ã" "¤" :string) + ("ê" "¤" :string) + ("é" "¤" :string) + ("È" "¤" :string) + ("Æ¿" "¤" :string) + ("Ã" "¤" :string) + ("Å" "¤¤" :string) + ("Ã" "¤¤" :string) + ("Å" "¤¤" :string) + ("æ" "¤¤" :string) + ("?" "¡" :string) + ("!" "¢" :string) + ("." "£" :string) + ("S" "¤" :string) + ("K" "¤" :string) + ("d" "¤" :string) + ("Y" "¤" :string) + ("E" "¤" :string) + ("y" "¤" :string) + ("g" "¤" :string) + ("e" "¤" :string) + ("J" "¤" :string) + ("q" "¤" :string) + ("D" "¤" :string) + ("b" "¤" :string) + ("z" "¤" :string) + ("w" "¤" :string) + ("Q" "¤" :string) + ("M" "¤" :string) + ("C" "¤" :string) + ("L" "¤" :string) + ("X" "¤" :string) + ("P" "¤" :string) + ("T" "¤" :string) + ("a" "¤" :string) + ("N" "¤" :string) + ("j" "¤" :string) + ("Z" "¤" :string) + ("u" "¤" :string) + ("k" "¤" :string) + ("t" "¤" :string) + ("W" "¤" :string) + ("v" "¤" :string) + ("s" "¤" :string) + ("B" "¤" :string) + ("H" "¤" :string) + ("c" "¤" :string) + ("I" "¤" :string) + ("G" "¤" :string) + ("U" "¤" :string) + ("F" "¤" :string) + ("r" "¤" :string) + ("x" "¤" :string) + ("V" "¤" :string) + ("h" "¤" :string) + ("f" "¤" :string) + ("i" "¤" :string) + ("A" "¤" :string) + ("O" "¤" :string) + ("n" "¤" :string) + ("m" "¤" :string) + ("l" "¤" :string) + ("p" "¤" :string) + ("R" "¤" :string) + ("o" "¤" :string) + ("-" "¥" :string) + ("'" "¦" :string) + ("{" "§" :string) + ("}" "¨" :string) + )) + +; The following section is customised for samplexdy.tex +; (copied from samplexdy.xdy automatically generated by +; samplexdy.tex) + +; required styles + +(require "tex.xdy") + +; list of allowed attributes (number formats) + +(define-attributes (("default" + "glsnumberformat" + "textrm" + "textsf" + "texttt" + "textbf" + "textmd" + "textit" + "textup" + "textsl" + "textsc" + "emph" + "glshypernumber" + "hyperrm" + "hypersf" + "hypertt" + "hyperbf" + "hypermd" + "hyperit" + "hyperup" + "hypersl" + "hypersc" + "hyperemph" + "hyperbfit"))) + +; user defined alphabets + + + +; location class definitions + +(define-location-class "roman-page-numbers" + ("roman-numbers-lowercase")) +(define-location-class "Roman-page-numbers" + ("roman-numbers-uppercase")) +(define-location-class "arabic-page-numbers" + ("arabic-numbers")) +(define-location-class "alpha-page-numbers" + ("alpha")) +(define-location-class "Alpha-page-numbers" + ("ALPHA")) +(define-location-class "Appendix-page-numbers" + ("ALPHA" :sep "." "arabic-numbers")) +(define-location-class "arabic-section-numbers" + ("arabic-numbers" :sep "." "arabic-numbers")) + +; user defined location classes + +(define-location-class "Numberstring" + (:sep "\protect \Numberstringnum {" "arabic-numbers" :sep "}")) + +; define cross-reference class + +(define-crossref-class "see" :unverified ) +(markup-crossref-list :class "see" + :open "\glsseeformat" :close "{}") + +; define the order of the location classes +(define-location-class-order ( + "roman-page-numbers" + "arabic-page-numbers" + "arabic-section-numbers" + "alpha-page-numbers" + "Roman-page-numbers" + "Alpha-page-numbers" + "Appendix-page-numbers" + "see" )) + +; define the glossary markup + +(markup-index + :open "\glossarysection[\glossarytoctitle]{\glossarytitle}\glossarypreamble~n\begin{theglossary}\glossaryheader~n" + :close "~n\end{theglossary}~n\glossarypostamble~n" + :tree) +(markup-letter-group-list :sep "\glsgroupskip~n") +(markup-indexentry :open "~n" :depth 0) +(markup-locclass-list :open "{\glossaryentrynumbers{\relax " + :sep ", " :close "}}") +(markup-locref-list :sep "\delimN ") +(markup-range :sep "\delimR ") + +; define format to use for locations + + +(markup-locref :open "~n\setentrycounter{page}\glsnumberformat{" + :close "}" + :attr "glsnumberformat") +(markup-locref :open "~n\setentrycounter{page}\textrm{" + :close "}" + :attr "textrm") +(markup-locref :open "~n\setentrycounter{page}\textsf{" + :close "}" + :attr "textsf") +(markup-locref :open "~n\setentrycounter{page}\texttt{" + :close "}" + :attr "texttt") +(markup-locref :open "~n\setentrycounter{page}\textbf{" + :close "}" + :attr "textbf") +(markup-locref :open "~n\setentrycounter{page}\textmd{" + :close "}" + :attr "textmd") +(markup-locref :open "~n\setentrycounter{page}\textit{" + :close "}" + :attr "textit") +(markup-locref :open "~n\setentrycounter{page}\textup{" + :close "}" + :attr "textup") +(markup-locref :open "~n\setentrycounter{page}\textsl{" + :close "}" + :attr "textsl") +(markup-locref :open "~n\setentrycounter{page}\textsc{" + :close "}" + :attr "textsc") +(markup-locref :open "~n\setentrycounter{page}\emph{" + :close "}" + :attr "emph") +(markup-locref :open "~n\setentrycounter{page}\glshypernumber{" + :close "}" + :attr "glshypernumber") +(markup-locref :open "~n\setentrycounter{page}\hyperrm{" + :close "}" + :attr "hyperrm") +(markup-locref :open "~n\setentrycounter{page}\hypersf{" + :close "}" + :attr "hypersf") +(markup-locref :open "~n\setentrycounter{page}\hypertt{" + :close "}" + :attr "hypertt") +(markup-locref :open "~n\setentrycounter{page}\hyperbf{" + :close "}" + :attr "hyperbf") +(markup-locref :open "~n\setentrycounter{page}\hypermd{" + :close "}" + :attr "hypermd") +(markup-locref :open "~n\setentrycounter{page}\hyperit{" + :close "}" + :attr "hyperit") +(markup-locref :open "~n\setentrycounter{page}\hyperup{" + :close "}" + :attr "hyperup") +(markup-locref :open "~n\setentrycounter{page}\hypersl{" + :close "}" + :attr "hypersl") +(markup-locref :open "~n\setentrycounter{page}\hypersc{" + :close "}" + :attr "hypersc") +(markup-locref :open "~n\setentrycounter{page}\hyperemph{" + :close "}" + :attr "hyperemph") +(markup-locref :open "~n\setentrycounter{page}\hyperbfit{" + :close "}" + :attr "hyperbfit") + +; define letter group list format + +(markup-letter-group-list :sep "\glsgroupskip~n") + +; letter group headings + +(markup-letter-group :open-head "\glsgroupheading{" + :close-head "}") + +(define-letter-group "glsnumbers" + :prefixes ("0" "1" "2" "3" "4" "5" "6" "7" "8" "9") + :before "A") + +; The following is copied from xindy/lang/english/utf8-lang.xdy + +(define-sort-rule-orientations (forward backward forward forward)) +(use-rule-set :run 0 + :rule-set ("en-alphabetize" "en-ignore-special")) +(use-rule-set :run 1 + :rule-set ("en-resolve-diacritics" "en-ignore-special")) +(use-rule-set :run 2 + :rule-set ("en-resolve-case" "en-ignore-special")) +(use-rule-set :run 3 + :rule-set ("en-resolve-special")) + +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</samplexdy-mc.xdy> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} %<*database1.tex> % \end{macrocode} %\fi diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins index 1fad698c1d4..681c7730697 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/8/27 12:55 +% glossaries.ins generated using makedtx version 0.94b 2008/12/26 16:49 \input docstrip \preamble @@ -18,7 +18,7 @@ The Current Maintainer of this work is Nicola Talbot. - This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. + This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. \endpreamble @@ -36,8 +36,12 @@ \usepostamble\defaultpostamble\from{glossaries.dtx}{glossary-long.sty,package}} \file{glossary-super.sty}{\usepreamble\defaultpreamble \usepostamble\defaultpostamble\from{glossaries.dtx}{glossary-super.sty,package}} +\file{glossary-tree.sty}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries.dtx}{glossary-tree.sty,package}} \file{glossaries-babel.sty}{\usepreamble\defaultpreamble \usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-babel.sty,package}} +\file{glossaries-dictionary-Brazil.dict}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-dictionary-Brazil.dict,package}} \file{glossaries-dictionary-Danish.dict}{\usepreamble\defaultpreamble \usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-dictionary-Danish.dict,package}} \file{glossaries-dictionary-Dutch.dict}{\usepreamble\defaultpreamble @@ -69,6 +73,10 @@ \file{sampleEqPg.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleEqPg.tex}} \file{sampleNtn.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleNtn.tex}} \file{sampleSec.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleSec.tex}} +\file{sampletree.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampletree.tex}} +\file{sampleutf8.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleutf8.tex}} +\file{samplexdy.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{samplexdy.tex}} +\file{samplexdy-mc.xdy}{\nopreamble\nopostamble\from{glossaries.dtx}{samplexdy-mc.xdy}} \file{database1.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{database1.tex}} \file{database2.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{database2.tex}} \file{glossaries.perl}{\nopreamble\nopostamble\from{glossaries.dtx}{glossaries.perl}} diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty index 656439ffc09..774682e3742 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -39,108 +39,259 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-babel}[2008/02/22 v1.0 (NLCT)] -\addto\captionsenglish{% -\renewcommand*{\glossaryname}{Glossary}% -\renewcommand*{\acronymname}{Acronyms}% -\renewcommand*{\entryname}{Notation}% -\renewcommand*{\descriptionname}{Description}% -\renewcommand*{\symbolname}{Symbol}% -\renewcommand*{\pagelistname}{Page List}% -\renewcommand*{\glssymbolsgroupname}{Symbols}% -\renewcommand*{\glsnumbersgroupname}{Numbers}% +\ProvidesPackage{glossaries-babel}[2008/12/11 v1.01 (NLCT)] +\@ifundefined{captionsenglish}{}{% + \addto\captionsenglish{% + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% }% -\addto\captionsgerman{% -\renewcommand*{\glossaryname}{Glossar}% -\renewcommand*{\acronymname}{Akronyme}% -\renewcommand*{\entryname}{Bezeichnung}% -\renewcommand*{\descriptionname}{Beschreibung}% -\renewcommand*{\symbolname}{Symbol}% -\renewcommand*{\pagelistname}{Seiten}% -\renewcommand*{\glssymbolsgroupname}{Symbole}% -\renewcommand*{\glsnumbersgroupname}{Zahlen}} -\addto\captionsngerman{% -\renewcommand*{\glossaryname}{Glossar}% -\renewcommand*{\acronymname}{Akronyme}% -\renewcommand*{\entryname}{Bezeichnung}% -\renewcommand*{\descriptionname}{Beschreibung}% -\renewcommand*{\symbolname}{Symbol}% -\renewcommand*{\pagelistname}{Seiten}% -\renewcommand*{\glssymbolsgroupname}{Symbole}% -\renewcommand*{\glsnumbersgroupname}{Zahlen}} -\addto\captionsitalian{% -\renewcommand*{\glossaryname}{Glossario}% -\renewcommand*{\acronymname}{Acronimi}% -\renewcommand*{\entryname}{Nomenclatura}% -\renewcommand*{\descriptionname}{Descrizione}% -\renewcommand*{\symbolname}{Simbolo}% -\renewcommand*{\pagelistname}{Elenco delle pagine}% -\renewcommand*{\glssymbolsgroupname}{Simboli}% -\renewcommand*{\glsnumbersgroupname}{Numeri}} -\addto\captionsdutch{% -\renewcommand*{\glossaryname}{Woordenlijst}% -\renewcommand*{\acronymname}{Acroniemen}% -\renewcommand*{\entryname}{Benaming}% -\renewcommand*{\descriptionname}{Beschrijving}% -\renewcommand*{\symbolname}{Symbool}% -\renewcommand*{\pagelistname}{Pagina's}% -\renewcommand*{\glssymbolsgroupname}{Symbolen}% -\renewcommand*{\glsnumbersgroupname}{Cijfers}} -\addto\captionsspanish{% -\renewcommand*{\glossaryname}{Glosario}% -\renewcommand*{\acronymname}{Siglas}% -\renewcommand*{\entryname}{Entrada}% -\renewcommand*{\descriptionname}{Descripci\'on}% -\renewcommand*{\symbolname}{S\'{\i}mbolo}% -\renewcommand*{\pagelistname}{Lista de p\'aginas}% -\renewcommand*{\glssymbolsgroupname}{S\'{\i}mbolos}% -\renewcommand*{\glsnumbersgroupname}{N\'umeros}} -\addto\captionsfrench{% -\renewcommand*{\glossaryname}{Glossaire}% -\renewcommand*{\acronymname}{Acronymes}% -\renewcommand*{\entryname}{Terme}% -\renewcommand*{\descriptionname}{Description}% -\renewcommand*{\symbolname}{Symbole}% -\renewcommand*{\pagelistname}{Pages}% -\renewcommand*{\glssymbolsgroupname}{Symboles}% -\renewcommand*{\glsnumbersgroupname}{Nombres}} -\addto\captionsdanish{% -\renewcommand*{\glossaryname}{Ordliste}% -\renewcommand*{\acronymname}{Akronymer}% -\renewcommand*{\entryname}{Symbolforklaring}% -\renewcommand*{\descriptionname}{Beskrivelse}% -\renewcommand*{\symbolname}{Symbol}% -\renewcommand*{\pagelistname}{Side}% -\renewcommand*{\glssymbolsgroupname}{Symboler}% -\renewcommand*{\glsnumbersgroupname}{Tal}} -\addto\captionsirish{% -\renewcommand*{\glossaryname}{Gluais}% -\renewcommand*{\acronymname}{Acrainmneacha}% -\renewcommand*{\entryname}{Ciall}% -\renewcommand*{\descriptionname}{Tuairisc}% -\renewcommand*{\symbolname}{Comhartha}% -\renewcommand*{\glssymbolsgroupname}{Comhartha\'{\i}}% -\renewcommand*{\pagelistname}{Leathanaigh}% -\renewcommand*{\glsnumbersgroupname}{Uimhreacha}} -\addto\captionsmagyar{% -\renewcommand*{\glossaryname}{Sz\'ojegyz\'ek}% -\renewcommand*{\acronymname}{Bet\H uszavak}% -\renewcommand*{\entryname}{Kifejez\'es}% -\renewcommand*{\descriptionname}{Magyar\'azat}% -\renewcommand*{\symbolname}{Jel\"ol\'es}% -\renewcommand*{\pagelistname}{Oldalsz\'am}% -\renewcommand*{\glssymbolsgroupname}{Jelek}% -\renewcommand*{\glsnumbersgroupname}{Sz\'amjegyek}% -} -\addto\captionspolish{% -\renewcommand*{\glossaryname}{S{\l}ownik termin\'ow}% -\renewcommand*{\acronymname}{Skr\'ot}% -\renewcommand*{\entryname}{Termin}% -\renewcommand*{\descriptionname}{Opis}% -\renewcommand*{\symbolname}{Symbol}% -\renewcommand*{\pagelistname}{Strony}% -\renewcommand*{\glssymbolsgroupname}{Symbole}% -\renewcommand*{\glsnumbersgroupname}{Liczby}} +} +\@ifundefined{captionsamerican}{}{% + \addto\captionsamerican{% + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% +}% +} +\@ifundefined{captionsaustralian}{}{% + \addto\captionsaustralian{% + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% +}% +} +\@ifundefined{captionsbritish}{}{% + \addto\captionsbritish{% + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% +}% +\@ifundefined{captionscanadian}{}{% + \addto\captionscanadian{% + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% +}% +} +\@ifundefined{captionsnewzealand}{}{% + \addto\captionsnewzealand{% + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% +}% +} +\@ifundefined{captionsUKenglish}{}{% + \addto\captionsUKenglish{% + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% +}% +} +\@ifundefined{captionsUSenglish}{}{% + \addto\captionsUSenglish{% + \renewcommand*{\glossaryname}{Glossary}% + \renewcommand*{\acronymname}{Acronyms}% + \renewcommand*{\entryname}{Notation}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Page List}% + \renewcommand*{\glssymbolsgroupname}{Symbols}% + \renewcommand*{\glsnumbersgroupname}{Numbers}% +}% +} +\@ifundefined{captionsgerman}{}{% + \addto\captionsgerman{% + \renewcommand*{\glossaryname}{Glossar}% + \renewcommand*{\acronymname}{Akronyme}% + \renewcommand*{\entryname}{Bezeichnung}% + \renewcommand*{\descriptionname}{Beschreibung}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Seiten}% + \renewcommand*{\glssymbolsgroupname}{Symbole}% + \renewcommand*{\glsnumbersgroupname}{Zahlen}} +} +\@ifundefined{captionsgerman}{}{% + \addto\captionsngerman{% + \renewcommand*{\glossaryname}{Glossar}% + \renewcommand*{\acronymname}{Akronyme}% + \renewcommand*{\entryname}{Bezeichnung}% + \renewcommand*{\descriptionname}{Beschreibung}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Seiten}% + \renewcommand*{\glssymbolsgroupname}{Symbole}% + \renewcommand*{\glsnumbersgroupname}{Zahlen}} +} +\@ifundefined{captionsitalian}{}{% + \addto\captionsitalian{% + \renewcommand*{\glossaryname}{Glossario}% + \renewcommand*{\acronymname}{Acronimi}% + \renewcommand*{\entryname}{Nomenclatura}% + \renewcommand*{\descriptionname}{Descrizione}% + \renewcommand*{\symbolname}{Simbolo}% + \renewcommand*{\pagelistname}{Elenco delle pagine}% + \renewcommand*{\glssymbolsgroupname}{Simboli}% + \renewcommand*{\glsnumbersgroupname}{Numeri}} +} +\@ifundefined{captionsdutch}{}{% + \addto\captionsdutch{% + \renewcommand*{\glossaryname}{Woordenlijst}% + \renewcommand*{\acronymname}{Acroniemen}% + \renewcommand*{\entryname}{Benaming}% + \renewcommand*{\descriptionname}{Beschrijving}% + \renewcommand*{\symbolname}{Symbool}% + \renewcommand*{\pagelistname}{Pagina's}% + \renewcommand*{\glssymbolsgroupname}{Symbolen}% + \renewcommand*{\glsnumbersgroupname}{Cijfers}} +} +\@ifundefined{captionsspanish}{}{% + \addto\captionsspanish{% + \renewcommand*{\glossaryname}{Glosario}% + \renewcommand*{\acronymname}{Siglas}% + \renewcommand*{\entryname}{Entrada}% + \renewcommand*{\descriptionname}{Descripci\'on}% + \renewcommand*{\symbolname}{S\'{\i}mbolo}% + \renewcommand*{\pagelistname}{Lista de p\'aginas}% + \renewcommand*{\glssymbolsgroupname}{S\'{\i}mbolos}% + \renewcommand*{\glsnumbersgroupname}{N\'umeros}} +} +\@ifundefined{captionsfrench}{}{% + \addto\captionsfrench{% + \renewcommand*{\glossaryname}{Glossaire}% + \renewcommand*{\acronymname}{Acronymes}% + \renewcommand*{\entryname}{Terme}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbole}% + \renewcommand*{\pagelistname}{Pages}% + \renewcommand*{\glssymbolsgroupname}{Symboles}% + \renewcommand*{\glsnumbersgroupname}{Nombres}} +} +\@ifundefined{captionsfrenchb}{}{% + \addto\captionsfrenchb{% + \renewcommand*{\glossaryname}{Glossaire}% + \renewcommand*{\acronymname}{Acronymes}% + \renewcommand*{\entryname}{Terme}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbole}% + \renewcommand*{\pagelistname}{Pages}% + \renewcommand*{\glssymbolsgroupname}{Symboles}% + \renewcommand*{\glsnumbersgroupname}{Nombres}} +} +\@ifundefined{captionsfrancais}{}{% + \addto\captionsfrancais{% + \renewcommand*{\glossaryname}{Glossaire}% + \renewcommand*{\acronymname}{Acronymes}% + \renewcommand*{\entryname}{Terme}% + \renewcommand*{\descriptionname}{Description}% + \renewcommand*{\symbolname}{Symbole}% + \renewcommand*{\pagelistname}{Pages}% + \renewcommand*{\glssymbolsgroupname}{Symboles}% + \renewcommand*{\glsnumbersgroupname}{Nombres}} +} +\@ifundefined{captionsdanish}{}{% + \addto\captionsdanish{% + \renewcommand*{\glossaryname}{Ordliste}% + \renewcommand*{\acronymname}{Akronymer}% + \renewcommand*{\entryname}{Symbolforklaring}% + \renewcommand*{\descriptionname}{Beskrivelse}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Side}% + \renewcommand*{\glssymbolsgroupname}{Symboler}% + \renewcommand*{\glsnumbersgroupname}{Tal}} +} +\@ifundefined{captionsirish}{}{% + \addto\captionsirish{% + \renewcommand*{\glossaryname}{Gluais}% + \renewcommand*{\acronymname}{Acrainmneacha}% + \renewcommand*{\entryname}{Ciall}% + \renewcommand*{\descriptionname}{Tuairisc}% + \renewcommand*{\symbolname}{Comhartha}% + \renewcommand*{\glssymbolsgroupname}{Comhartha\'{\i}}% + \renewcommand*{\pagelistname}{Leathanaigh}% + \renewcommand*{\glsnumbersgroupname}{Uimhreacha}} +} +\@ifundefined{captionsmagyar}{}{% + \addto\captionsmagyar{% + \renewcommand*{\glossaryname}{Sz\'ojegyz\'ek}% + \renewcommand*{\acronymname}{Bet\H uszavak}% + \renewcommand*{\entryname}{Kifejez\'es}% + \renewcommand*{\descriptionname}{Magyar\'azat}% + \renewcommand*{\symbolname}{Jel\"ol\'es}% + \renewcommand*{\pagelistname}{Oldalsz\'am}% + \renewcommand*{\glssymbolsgroupname}{Jelek}% + \renewcommand*{\glsnumbersgroupname}{Sz\'amjegyek}% + } +} +\@ifundefined{captionshungarian}{}{% + \addto\captionshungarian{% + \renewcommand*{\glossaryname}{Sz\'ojegyz\'ek}% + \renewcommand*{\acronymname}{Bet\H uszavak}% + \renewcommand*{\entryname}{Kifejez\'es}% + \renewcommand*{\descriptionname}{Magyar\'azat}% + \renewcommand*{\symbolname}{Jel\"ol\'es}% + \renewcommand*{\pagelistname}{Oldalsz\'am}% + \renewcommand*{\glssymbolsgroupname}{Jelek}% + \renewcommand*{\glsnumbersgroupname}{Sz\'amjegyek}% + } +} +\@ifundefined{captionspolish}{}{% + \addto\captionspolish{% + \renewcommand*{\glossaryname}{S{\l}ownik termin\'ow}% + \renewcommand*{\acronymname}{Skr\'ot}% + \renewcommand*{\entryname}{Termin}% + \renewcommand*{\descriptionname}{Opis}% + \renewcommand*{\symbolname}{Symbol}% + \renewcommand*{\pagelistname}{Strony}% + \renewcommand*{\glssymbolsgroupname}{Symbole}% + \renewcommand*{\glsnumbersgroupname}{Liczby}} +} +\@ifundefined{captionsbrazil}{}{% + \addto\captionsbrazil{% + \renewcommand*{\glossaryname}{Gloss\'ario}% + \renewcommand*{\acronymname}{Siglas}% + \renewcommand*{\entryname}{Nota\c c\~ao}% + \renewcommand*{\descriptionname}{Descri\c c\~ao}% + \renewcommand*{\symbolname}{S\'imbolo}% + \renewcommand*{\pagelistname}{Lista de P\'aginas}% + \renewcommand*{\glssymbolsgroupname}{S\'imbolos}% + \renewcommand*{\glsnumbersgroupname}{N\'umeros}% + }% +} \endinput %% %% End of file `glossaries-babel.sty'. diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty index 0209e843f0c..9c488642eef 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2008/08/27 v1.16 (NLCT)] +\ProvidesPackage{glossaries}[2008/12/26 v1.17 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} @@ -133,12 +133,49 @@ name=true]{% \renewcommand*{\@gls@sanitizesymbol}{}% } \define@boolkey{glossaries.sty}[glsacr]{shortcuts}[true]{} +\newcommand*{\glsorder}{word} +\newcommand*{\@glsorder}[1]{} +\define@choicekey{glossaries.sty}{order}{word,letter}{% + \def\glsorder{#1}} +\newif\ifglsxindy +\glsxindyfalse +\DeclareOptionX{makeindex}{\glsxindyfalse} +\define@boolkey[gls]{xindy}{glsnumbers}[true]{} +\gls@xindy@glsnumberstrue +\def\@xdy@main@language{\rootlanguagename}% +\define@key[gls]{xindy}{language}{\def\@xdy@main@language{#1}} +\@ifundefined{inputencodingname}{% + \def\gls@codepage{}}{% + \def\gls@codepage{\inputencodingname} +} +\define@key[gls]{xindy}{codepage}{\def\gls@codepage{#1}} +\define@key{glossaries.sty}{xindy}[]{% + \glsxindytrue + \setkeys[gls]{xindy}{#1}% +} \ProcessOptionsX \ifthenelse{\equal{\glscounter}{section}}{% \@ifundefined{chapter}{}{% \let\@gls@old@chapter\@chapter \def\@chapter[#1]#2{\@gls@old@chapter[{#1}]{#2}% \@ifundefined{hyperdef}{}{\hyperdef{section}{\thesection}{}}}}}{} +\newcommand*{\@gls@onlypremakeg}{} +\newcommand*{\@onlypremakeg}[1]{% +\ifx\@gls@onlypremakeg\@empty + \def\@gls@onlypremakeg{#1}% +\else + \expandafter\toks@\expandafter{\@gls@onlypremakeg}% + \edef\@gls@onlypremakeg{\the\toks@,\noexpand#1}% +\fi} +\newcommand*{\@disable@onlypremakeg}{% +\@for\@thiscs:=\@gls@onlypremakeg\do{% + \expandafter\@disable@premakecs\@thiscs% +}} +\newcommand*{\@disable@premakecs}[1]{% + \def#1{\PackageError{glossaries}{\string#1\space may only be + used before \string\makeglossaries}{You can't use + \string#1\space after \string\makeglossaries}}% +} \providecommand*{\glossaryname}{Glossary} \providecommand*{\acronymname}{Acronyms} \newcommand*{\glssettoctitle}[1]{% @@ -150,6 +187,8 @@ name=true]{% \providecommand*{\glssymbolsgroupname}{Symbols} \providecommand*{\glsnumbersgroupname}{Numbers} \newcommand*{\glspluralsuffix}{s} +\providecommand*{\seename}{see} +\providecommand*{\andname}{\&} \ifglstranslate \@ifpackageloaded{translator}{\usedictionary{glossaries-dictionary}% \renewcommand*{\glssettoctitle}[1]{% @@ -174,9 +213,47 @@ name=true]{% \@ifpackageloaded{babel}{\RequirePackage{glossaries-babel}}{}} \fi \newcommand*{\glspostdescription}{.} -\providecommand*{\istfilename}{\jobname.ist} +\newcommand*{\nopostdesc}{} +\newcommand*{\@nopostdesc}{% + \let\org@glspostdescription\glspostdescription + \def\glspostdescription{% + \let\glspostdescription\org@glspostdescription}% +} +\newcommand{\glspar}{\par} +\ifglsxindy + \newcommand{\setStyleFile}[1]{% + \renewcommand{\istfilename}{#1.xdy}} +\else + \newcommand{\setStyleFile}[1]{% + \renewcommand{\istfilename}{#1.ist}} +\fi +\@onlypremakeg\setStyleFile +\ifglsxindy + \def\istfilename{\jobname.xdy} +\else + \def\istfilename{\jobname.ist} +\fi \newcommand*{\@istfilename}[1]{} -\newcommand{\glscompositor}{.} +\newcommand*{\glscompositor}{.} +\newcommand*{\glsSetCompositor}[1]{% + \renewcommand*{\glscompositor}{#1}} +\@onlypremakeg\glsSetCompositor +\newcommand*{\@glsAlphacompositor}{\glscompositor} +\ifglsxindy + \newcommand*\glsSetAlphaCompositor[1]{% + \renewcommand*\@glsAlphacompositor{#1}} +\else + \newcommand*\glsSetAlphaCompositor[1]{% + \glsnoxindywarning\glsSetAlphaCompositor} +\fi +\@onlypremakeg\glsSetAlphaCompositor +\newcommand*{\gls@suffixF}{} +\newcommand*{\glsSetSuffixF}[1]{% + \renewcommand*{\gls@suffixF}{#1}} +\@onlypremakeg\glsSetSuffixF +\newcommand*{\gls@suffixFF}{} +\newcommand*{\glsSetSuffixFF}[1]{% + \renewcommand*{\gls@suffixFF}{#1}} \@ifundefined{hyperlink}{% \newcommand*{\glsnumberformat}[1]{#1}}{% \newcommand*{\glsnumberformat}[1]{\glshypernumber{#1}}} @@ -222,6 +299,204 @@ name=true]{% \addcontentsline{toc}{#2}{#1}% \fi \fi} +\newcommand*{\glsnoxindywarning}[1]{% + \PackageWarning{glossaries}{Not in xindy mode --- ignoring + \string#1}} +\ifglsxindy + \edef\@xdyattributes{\string"default\string"}% +\fi +\ifglsxindy + \def\@xdylocref{} +\fi +\ifglsxindy + \newcommand*\GlsAddXdyAttribute[1]{% + \edef\@xdyattributes{\@xdyattributes ^^J \string"#1\string"}% + \expandafter\toks@\expandafter{\@xdylocref}% + \edef\@xdylocref{\the\toks@ ^^J% + (markup-locref + :open \string"\string~n\string\setentrycounter + {\noexpand\glscounter}% + \expandafter\string\csname#1\endcsname + \expandafter\@gobble\string\{\string" ^^J + :close \string"\expandafter\@gobble\string\}\string" ^^J + :attr \string"#1\string")}} + \@onlypremakeg\GlsAddXdyAttribute +\else + \newcommand*\GlsAddXdyAttribute[1]{% + \glsnoxindywarning\GlsAddXdyAttribute} +\fi +\ifglsxindy + \GlsAddXdyAttribute{glsnumberformat} + \GlsAddXdyAttribute{textrm} + \GlsAddXdyAttribute{textsf} + \GlsAddXdyAttribute{texttt} + \GlsAddXdyAttribute{textbf} + \GlsAddXdyAttribute{textmd} + \GlsAddXdyAttribute{textit} + \GlsAddXdyAttribute{textup} + \GlsAddXdyAttribute{textsl} + \GlsAddXdyAttribute{textsc} + \GlsAddXdyAttribute{emph} + \GlsAddXdyAttribute{glshypernumber} + \GlsAddXdyAttribute{hyperrm} + \GlsAddXdyAttribute{hypersf} + \GlsAddXdyAttribute{hypertt} + \GlsAddXdyAttribute{hyperbf} + \GlsAddXdyAttribute{hypermd} + \GlsAddXdyAttribute{hyperit} + \GlsAddXdyAttribute{hyperup} + \GlsAddXdyAttribute{hypersl} + \GlsAddXdyAttribute{hypersc} + \GlsAddXdyAttribute{hyperemph} +\fi +\def\@xdyuseralphabets{} +\ifglsxindy + \newcommand*{\GlsAddXdyAlphabet}[2]{% + \edef\@xdyuseralphabets{% + \@xdyuseralphabets ^^J + (define-alphabet "#1" (#2))}} +\else + \newcommand*{\GlsAddXdyAlphabet}[2]{% + \glsnoxindywarning\GlsAddXdyAlphabet} +\fi +\def\@xdyuserlocationdefs{} +\def\@xdyuserlocationnames{} +\ifglsxindy + \newcommand*{\GlsAddXdyLocation}[2]{% + \edef\@xdyuserlocationdefs{% + \@xdyuserlocationdefs ^^J% + (define-location-class \string"#1\string"^^J\space\space + \space(#2)) + }% + \edef\@xdyuserlocationnames{% + \@xdyuserlocationnames^^J\space\space\space + \string"#1\string"}% + } + \@onlypremakeg\GlsAddXdyLocation +\else + \newcommand*{\GlsAddXdyLocation}[2]{% + \glsnoxindywarning\GlsAddXdyLocation} +\fi +\ifglsxindy + \edef\@xdylocationclassorder{^^J\space\space\space + \string"roman-page-numbers\string"^^J\space\space\space + \string"arabic-page-numbers\string"^^J\space\space\space + \string"arabic-section-numbers\string"^^J\space\space\space + \string"alpha-page-numbers\string"^^J\space\space\space + \string"Roman-page-numbers\string"^^J\space\space\space + \string"Alpha-page-numbers\string"^^J\space\space\space + \string"Appendix-page-numbers\string" + \@xdyuserlocationnames^^J\space\space\space + \string"see\string" + } +\fi +\ifglsxindy + \newcommand*\GlsSetXdyLocationClassOrder[1]{% + \def\@xdylocationclassorder{#1}} +\else + \newcommand*\GlsSetXdyLocationClassOrder[1]{% + \glsnoxindywarning\GlsSetXdyLocationClassOrder} +\fi +\ifglsxindy + \def\@xdysortrules{} +\fi +\ifglsxindy + \newcommand*\GlsAddSortRule[2]{% + \expandafter\toks@\expandafter{\@xdysortrules}% + \protected@edef\@xdysortrules{\the\toks@ ^^J + (sort-rule \string"#1\string" \string"#2\string")}% + } +\else + \newcommand*\GlsAddSortRule[2]{% + \glsnoxindywarning\GlsAddSortRule} +\fi +\ifglsxindy + \def\@xdyrequiredstyles{tex} +\fi +\ifglsxindy + \newcommand*\GlsAddXdyStyle[1]{% + \edef\@xdyrequiredstyles{\@xdyrequiredstyles,#1}}% +\else + \newcommand*\GlsAddXdyStyle[1]{% + \glsnoxindywarning\GlsAddXdyStyle} +\fi +\ifglsxindy + \newcommand*\GlsSetXdyStyles[1]{% + \edef\@xdyrequiredstyles{#1}} +\else + \newcommand*\GlsSetXdyStyles[1]{% + \glsnoxindywarning\GlsSetXdyStyles} +\fi +\ifglsxindy + \@ifpackageloaded{babel}{% + \def\findrootlanguage{\begingroup + \escapechar=-1\relax + \edef\languagename{% + \expandafter\string\csname\languagename\endcsname}% + \def\NeedsTeXFormat##1[##2]{}% + \def\ProvidesPackage##1[##2]{}% + \let\LdfInit\relax + \def\languageattribute##1##2{}% + \def\DeclareOption##1##2{% + \ifx##1*\expandafter\endinput\else + \edef\testlanguage{\expandafter\string\csname##1\endcsname}% + \ifx\testlanguage\languagename##2\fi + \fi} + \def\input##1{\stripldf##1}% + \def\stripldf##1.ldf{\gdef\rootlanguagename{##1}}% + \@@input babel.sty + \endgroup}% + }{% + \@ifpackageloaded{ngerman}{% + \def\findrootlanguage{% + \def\rootlanguagename{german}}% + }{% + \def\findrootlanguage{% + \def\rootlanguagename{english}}% + }% + }% +\fi +\def\rootlanguagename{english} +\def\@xdylanguage#1#2{} +\ifglsxindy + \newcommand*\GlsSetXdyLanguage[2][\glsdefaulttype]{% + \ifglossaryexists{#1}{% + \expandafter\def\csname @xdy@#1@language\endcsname{#2}% + }{% + \PackageError{glossaries}{Can't set language type for + glossary type `#1' --- no such glossary}{% + You have specified a glossary type that doesn't exist}}} +\else + \newcommand*\GlsSetXdyLanguage[2][]{% + \glsnoxindywarning\GlsSetXdyLanguage} +\fi +\def\@gls@codepage#1#2{} +\ifglsxindy + \newcommand*{\GlsSetXdyCodePage}[1]{% + \renewcommand*{\gls@codepage}{#1}% + } +\else + \newcommand*{\GlsSetXdyCodePage}[1]{% + \glsnoxindywarning\GlsSetXdyCodePage} +\fi +\ifglsxindy + \ifgls@xindy@glsnumbers + \def\@xdylettergroups{(define-letter-group + \string"glsnumbers\string"^^J\space\space\space + :prefixes (\string"0\string" \string"1\string" + \string"2\string" \string"3\string" \string"4\string" + \string"5\string" \string"6\string" \string"7\string" + \string"8\string" \string"9\string")^^J\space\space\space + :before \string"\@glsfirstletter\string")} + \else + \def\@xdylettergroups{} + \fi +\fi + \newcommand*\GlsAddLetterGroup[2]{% + \expandafter\toks@\expandafter{\@xdylettergroups}% + \protected@edef\@xdylettergroups{\the\toks@^^J% + (define-letter-group \string"#1\string"^^J\space\space\space#2)}% + }% \newcommand*{\forallglossaries}[3][\@glo@types]{% \@for#2:=#1\do{\ifthenelse{\equal{#2}{}}{}{#3}}} \newcommand*{\forglsentries}[3][\glsdefaulttype]{% @@ -262,6 +537,7 @@ exists}% \glsdisplayfirst}% \@ifnextchar[{\@gls@setcounter{#2}}{\@gls@setcounter{#2}[\glscounter]}}} \@onlypreamble{\newglossary} +\@onlypremakeg\newglossary \newcommand*{\@newglossary}[4]{} \def\@gls@setcounter#1[#2]{% \expandafter\def\csname @glotype@#1@counter\endcsname{#2}% @@ -306,10 +582,22 @@ exists}% called `#1'}{The counter key should have the name of a valid counter as its value}}{% \def\@glo@counter{#1}}} +\define@key{glossentry}{see}{% +\def\@glo@see{#1}} +\define@key{glossentry}{parent}{% +\def\@glo@parent{#1}} +\define@key{glossentry}{nonumberlist}[none]{% +\def\@glo@prefix{\glsnonextpages}} +\newcommand*{\@glsnoname}{% + \PackageError{glossaries}{name key required in + \string\newglossaryentry\space for entry `\@glo@label'}{You + haven't specified the entry name}} +\newcommand*{\@glsdefaultplural}{\@glo@text\glspluralsuffix} +\newcount\gls@level \DeclareRobustCommand{\newglossaryentry}[2]{% \glsdoifnoexists{#1}{% -\def\@glo@name{\PackageError{glossaries}{name key required in -\string\newglossaryentry}{You haven't specified the entry name}}% +\def\@glo@label{#1}% +\let\@glo@name\@glsnoname \def\@glo@desc{\PackageError{glossaries}{description key required in \string\newglossaryentry}{You haven't specified the entry description}}% \def\@glo@descplural{\@glo@desc}% @@ -317,11 +605,14 @@ counter as its value}}{% \def\@glo@symbol{\relax}% \def\@glo@symbolplural{\@glo@symbol}% \def\@glo@text{\@glo@name}% -\def\@glo@plural{\@glo@text\glspluralsuffix}% +\let\@glo@plural\@glsdefaultplural \let\@glo@first\relax \let\@glo@firstplural\relax \def\@glo@sort{\@glo@name}% \def\@glo@counter{\@gls@getcounter{\@glo@type}}% +\def\@glo@see{}% +\def\@glo@parent{}% +\def\@glo@prefix{}% \setkeys{glossentry}{#2}% \@ifundefined{glolist@\@glo@type}{\PackageError{glossaries}{% Glossary type '\@glo@type' has not been defined}{% @@ -330,6 +621,37 @@ in it}}{% \protected@edef\@glolist@{\csname glolist@\@glo@type\endcsname}% \expandafter\xdef\csname glolist@\@glo@type\endcsname{\@glolist@{#1},}% }% +\gls@level=0\relax +\ifx\@glo@parent\@empty + \expandafter\gdef\csname glo@#1@parent\endcsname{}% +\else + \ifthenelse{\equal{#1}{\@glo@parent}}{% + \PackageError{glossaries}{Entry `#1' can't be its own parent}{}% + \def\@glo@parent{}% + \expandafter\gdef\csname glo@#1@parent\endcsname{}% + }{% + \ifglsentryexists{\@glo@parent}{% + \expandafter\xdef\csname glo@#1@parent\endcsname{\@glo@parent}% + \gls@level=\csname glo@\@glo@parent @level\endcsname\relax + \advance\gls@level by 1\relax + \ifx\@glo@name\@glsnoname + \expandafter\let\expandafter\@glo@name + \csname glo@\@glo@parent @name\endcsname + \ifx\@glo@plural\@glsdefaultplural + \expandafter\let\expandafter\@glo@plural + \csname glo@\@glo@parent @plural\endcsname + \fi + \fi + }{% + \PackageError{glossaries}{Invalid parent `\@glo@parent' + for entry `#1' - parent doesn't exist}{Parent entries + must be defined before their children}% + \def\@glo@parent{}% + \expandafter\gdef\csname glo@#1@parent\endcsname{}% + }% + }% +\fi +\expandafter\xdef\csname glo@#1@level\endcsname{\number\gls@level}% \ifx\relax\@glo@firstplural \ifx\relax\@glo@first \def\@glo@firstplural{\@glo@plural}% @@ -372,7 +694,68 @@ in it}}{% \expandafter\global\expandafter \let\csname ifglo@#1@flag\endcsname\iftrue}% \csname glo@#1@flagfalse\endcsname -}} +\ifx\@glo@see\@empty +\else + \protected@edef\@do@glssee{% + \noexpand\@gls@fixbraces\noexpand\@glo@list\@glo@see + \noexpand\@nil + \noexpand\expandafter\noexpand\@glssee\noexpand\@glo@list{#1}}% + \@do@glssee +\fi +}% + \@glo@storeentry{#1}% +} +\newcommand{\@glo@storeentry}[1]{% +\protected@edef\@glo@sort{\csname glo@#1@sort\endcsname}% +\@gls@checkmkidxchars\@glo@sort +\protected@edef\@@glo@name{\csname glo@#1@name\endcsname}% +\@gls@checkmkidxchars\@@glo@name +\ifglsxindy + \protected@edef\@glo@name{\string\\glsnamefont{\@@glo@name}}% +\else + \protected@edef\@glo@name{\string\glsnamefont{\@@glo@name}}% +\fi +\protected@edef\@glo@desc{\csname glo@#1@desc\endcsname}% +\@gls@checkmkidxchars\@glo@desc +\protected@edef\@glo@symbol{\csname glo@#1@symbol\endcsname}% +\@gls@checkmkidxchars\@glo@symbol +\@gls@checkmkidxchars\@glo@prefix +\edef\@glo@parent{\csname glo@#1@parent\endcsname}% +\ifglsxindy + \ifx\@glo@parent\@empty + \expandafter\protected@xdef\csname glo@#1@index\endcsname{% + (\string"\@glo@sort\string" % + \string"\@glo@prefix\string\\glossaryentryfield{#1}{\@glo@name + }{\@glo@desc}{\@glo@symbol}\string") % + }% + \else + \expandafter\protected@xdef\csname glo@#1@index\endcsname{% + \csname glo@\@glo@parent @index\endcsname + (\string"\@glo@sort\string" % + \string"\@glo@prefix\string\\glossarysubentryfield% + {\csname glo@#1@level\endcsname}{#1}{\@glo@name + }{\@glo@desc}{\@glo@symbol}\string") % + }% + \fi +\else + \ifx\@glo@parent\@empty + \@onelevel@sanitize\@glo@prefix + \expandafter\protected@xdef\csname glo@#1@index\endcsname{% + \@glo@sort\@gls@actualchar\@glo@prefix + \string\glossaryentryfield{#1}{\@glo@name}{\@glo@desc + }{\@glo@symbol}% + }% + \else + \expandafter\protected@xdef\csname glo@#1@index\endcsname{% + \csname glo@\@glo@parent @index\endcsname\@gls@levelchar + \@glo@sort\@gls@actualchar\@glo@prefix + \string\glossarysubentryfield + {\csname glo@#1@level\endcsname}{#1}{\@glo@name}{\@glo@desc + }{\@glo@symbol}% + }% + \fi +\fi +} \newcommand*{\glsreset}[1]{% \glsdoifexists{#1}{% \expandafter\global\csname glo@#1@flagfalse\endcsname}} @@ -427,26 +810,14 @@ counter as its value}}{% \edef\@gls@counter{\csname glo@#2@counter\endcsname}% \KV@glslink@hypertrue \setkeys{glslink}{#1}% -\edef\theglsentrycounter{\expandafter\noexpand\csname the\@gls@counter\endcsname}% +\edef\theglsentrycounter{\expandafter\noexpand + \csname the\@gls@counter\endcsname}% \ifKV@glslink@hyper \@glslink{glo:#2}{\glstextformat{#3}}% \else \glstextformat{#3}\relax \fi -\protected@edef\@glo@sort{\csname glo@#2@sort\endcsname}% -\@gls@checkmkidxchars\@glo@sort -\protected@edef\@@glo@name{\csname glo@#2@name\endcsname}% -\@gls@checkmkidxchars\@@glo@name -\protected@edef\@glo@name{\string\glsnamefont{\@@glo@name}}% -\protected@edef\@glo@desc{\csname glo@#2@desc\endcsname}% -\@gls@checkmkidxchars\@glo@desc -\protected@edef\@glo@symbol{\csname glo@#2@symbol\endcsname}% -\@gls@checkmkidxchars\@glo@symbol -\@set@glo@numformat\@glo@numfmt\@gls@counter\@glsnumberformat -\glossary[\csname glo@#2@type\endcsname]{% -\@glo@sort\@gls@actualchar -\string\glossaryentryfield{#2}{\@glo@name}{\@glo@desc -}{\@glo@symbol}\@gls@encapchar\@glo@numfmt}% +\@do@wrglossary{#2}% }} \def\@set@glo@numformat#1#2#3{% \expandafter\@glo@check@mkidxrangechar#3\@nil @@ -473,35 +844,53 @@ counter as its value}}{% \def\@glo@prefix{}\def\@glo@suffix{#1#2}% \fi \fi} +\newcommand*{\@gls@escbsdq}[1]{% + \def\@gls@checkedmkidx{}% + \let\gls@xdystring=#1\relax + \@onelevel@sanitize\gls@xdystring + \edef\do@gls@xdycheckbackslash{% + \noexpand\@gls@xdycheckbackslash\gls@xdystring\noexpand\@nil + \@backslashchar\@backslashchar\noexpand\null}% + \do@gls@xdycheckbackslash + \expandafter\@gls@updatechecked\@gls@checkedmkidx{\gls@xdystring}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@xdycheckquote\gls@xdystring\@nil""\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{\gls@xdystring}% + \let#1=\gls@xdystring +} \newcommand{\@gls@checkmkidxchars}[1]{% -\def\@gls@checkedmkidx{}% -\expandafter\@gls@checkquote#1\@nil""\null% -\expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% -\def\@gls@checkedmkidx{}% -\expandafter\@gls@checkescquote#1\@nil\"\"\null% -\expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% -\def\@gls@checkedmkidx{}% -\expandafter\@gls@checkescactual#1\@nil\?\?\null% -\expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% -\def\@gls@checkedmkidx{}% -\expandafter\@gls@checkactual#1\@nil??\null% -\expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% -\def\@gls@checkedmkidx{}% -\expandafter\@gls@checkbar#1\@nil||\null% -\expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% -\def\@gls@checkedmkidx{}% -\expandafter\@gls@checkescbar#1\@nil\|\|\null% -\expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% -\def\@gls@checkedmkidx{}% -\expandafter\@gls@checklevel#1\@nil!!\null% -\expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% +\ifglsxindy + \@gls@escbsdq{#1}% +\else + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkquote#1\@nil""\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkescquote#1\@nil\"\"\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkescactual#1\@nil\?\?\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkactual#1\@nil??\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkbar#1\@nil||\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkescbar#1\@nil\|\|\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checklevel#1\@nil!!\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% +\fi } \def\@gls@updatechecked#1\@nil#2{\def#2{#1}} \newtoks\@gls@tmpb \def\@gls@checkquote#1"#2"#3\null{% \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% \toks@={#1}% -\ifx\null#2\null% +\ifx\null#2\null \ifx\null#3\null \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% \def\@@gls@checkquote{\relax}% @@ -523,7 +912,7 @@ counter as its value}}{% \def\@gls@checkescquote#1\"#2\"#3\null{% \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% \toks@={#1}% -\ifx\null#2\null% +\ifx\null#2\null \ifx\null#3\null \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% \def\@@gls@checkescquote{\relax}% @@ -546,7 +935,7 @@ counter as its value}}{% \def\@gls@checkescactual#1\?#2\?#3\null{% \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% \toks@={#1}% -\ifx\null#2\null% +\ifx\null#2\null \ifx\null#3\null \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% \def\@@gls@checkescactual{\relax}% @@ -569,7 +958,7 @@ counter as its value}}{% \def\@gls@checkescbar#1\|#2\|#3\null{% \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% \toks@={#1}% -\ifx\null#2\null% +\ifx\null#2\null \ifx\null#3\null \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% \def\@@gls@checkescbar{\relax}% @@ -592,7 +981,7 @@ counter as its value}}{% \def\@gls@checkesclevel#1\!#2\!#3\null{% \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% \toks@={#1}% -\ifx\null#2\null% +\ifx\null#2\null \ifx\null#3\null \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% \def\@@gls@checkesclevel{\relax}% @@ -615,7 +1004,7 @@ counter as its value}}{% \def\@gls@checkbar#1|#2|#3\null{% \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% \toks@={#1}% -\ifx\null#2\null% +\ifx\null#2\null \ifx\null#3\null \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% \def\@@gls@checkbar{\relax}% @@ -637,7 +1026,7 @@ counter as its value}}{% \def\@gls@checklevel#1!#2!#3\null{% \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% \toks@={#1}% -\ifx\null#2\null% +\ifx\null#2\null \ifx\null#3\null \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% \def\@@gls@checklevel{\relax}% @@ -659,7 +1048,7 @@ counter as its value}}{% \def\@gls@checkactual#1?#2?#3\null{% \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% \toks@={#1}% -\ifx\null#2\null% +\ifx\null#2\null \ifx\null#3\null \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% \def\@@gls@checkactual{\relax}% @@ -678,6 +1067,65 @@ counter as its value}}{% \fi \fi \@@gls@checkactual} +\def\@gls@xdycheckquote#1"#2"#3\null{% +\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% +\toks@={#1}% +\ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@xdycheckquote{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \string\"\string\"}% + \def\@@gls@xdycheckquote{\@gls@xdycheckquote#3\null}% + \fi +\else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \string\"}% + \ifx\null#3\null + \def\@@gls@xdycheckquote{\@gls@xdycheckquote#2""\null}% + \else + \def\@@gls@xdycheckquote{\@gls@xdycheckquote#2"#3\null}% + \fi +\fi +\@@gls@xdycheckquote +} +\edef\def@gls@xdycheckbackslash{% + \noexpand\def\noexpand\@gls@xdycheckbackslash##1\@backslashchar + ##2\@backslashchar##3\noexpand\null{% + \noexpand\@gls@tmpb=\noexpand\expandafter + {\noexpand\@gls@checkedmkidx}% + \noexpand\toks@={##1}% + \noexpand\ifx\noexpand\null##2\noexpand\null + \noexpand\ifx\noexpand\null##3\noexpand\null + \noexpand\edef\noexpand\@gls@checkedmkidx{% + \noexpand\the\noexpand\@gls@tmpb\noexpand\the\noexpand\toks@}% + \noexpand\def\noexpand\@@gls@xdycheckbackslash{\relax}% + \noexpand\else + \noexpand\edef\noexpand\@gls@checkedmkidx{% + \noexpand\the\noexpand\@gls@tmpb\noexpand\the\noexpand\toks@ + \@backslashchar\@backslashchar\@backslashchar\@backslashchar}% + \noexpand\def\noexpand\@@gls@xdycheckbackslash{% + \noexpand\@gls@xdycheckbackslash##3\noexpand\null}% + \noexpand\fi + \noexpand\else + \noexpand\edef\noexpand\@gls@checkedmkidx{% + \noexpand\the\noexpand\@gls@tmpb\noexpand\the\noexpand\toks@ + \@backslashchar\@backslashchar}% + \noexpand\ifx\noexpand\null##3\noexpand\null + \noexpand\def\noexpand\@@gls@xdycheckbackslash{% + \noexpand\@gls@xdycheckbackslash##2\@backslashchar + \@backslashchar\noexpand\null}% + \noexpand\else + \noexpand\def\noexpand\@@gls@xdycheckbackslash{% + \noexpand\@gls@xdycheckbackslash##2\@backslashchar + ##3\noexpand\null}% + \noexpand\fi + \noexpand\fi + \noexpand\@@gls@xdycheckbackslash + }% +} +\def@gls@xdycheckbackslash \@ifundefined{hyperlink}{% \gdef\@glslink#1#2{#2}% }{% @@ -1187,73 +1635,247 @@ counter as its value}}{% \expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentrytype}[1]{\csname glo@#1@type\endcsname} \newcommand*{\glsentrysort}[1]{\csname glo@#1@sort\endcsname} +\newcommand*{\glshyperlink}[2][\glsentryname{\@glo@label}]{% +\def\@glo@label{#2}% +\@glslink{glo:#2}{#1}} \define@key{glossadd}{counter}{\def\@glo@counter{#1}} \define@key{glossadd}{format}{\def\@glo@format{#1}} \define@key{glossadd}{types}{\def\@glo@type{#1}} \newcommand*{\glsadd}[2][]{% \glsdoifexists{#2}{% -\def\@glo@format{glsnumberformat}% -\edef\@glo@counter{\csname glo@#2@counter\endcsname}% +\def\@glsnumberformat{glsnumberformat}% +\edef\@gls@counter{\csname glo@#2@counter\endcsname}% \setkeys{glossadd}{#1}% -\edef\theglsentrycounter{\expandafter\noexpand\csname the\@glo@counter\endcsname}% -\protected@edef\@glo@sort{\csname glo@#2@sort\endcsname}% -\@gls@checkmkidxchars\@glo@sort -\protected@edef\@@glo@name{\csname glo@#2@name\endcsname}% -\@gls@checkmkidxchars\@@glo@name -\protected@edef\@glo@name{\string\glsnamefont{\@@glo@name}}% -\protected@edef\@glo@desc{\csname glo@#2@desc\endcsname}% -\@gls@checkmkidxchars\@glo@desc -\protected@edef\@glo@symbol{\csname glo@#2@symbol\endcsname}% -\@gls@checkmkidxchars\@glo@symbol -\@set@glo@numformat\@glo@numfmt\@glo@counter\@glo@format -\glossary[\csname glo@#2@type\endcsname]{% -\@glo@sort\@gls@actualchar\string\glossaryentryfield -{#2}{\@glo@name}{\@glo@desc}{\@glo@symbol}\@gls@encapchar -\@glo@numfmt}% +\edef\theglsentrycounter{\expandafter\noexpand + \csname the\@gls@counter\endcsname}% +\@do@wrglossary{#2}% }} \newcommand*{\glsaddall}[1][]{% -\def\@glo@type{\@glo@types}% +\edef\@glo@type{\@glo@types}% \setkeys{glossadd}{#1}% \forallglsentries[\@glo@type]{\@glo@entry}{% \glsadd[#1]{\@glo@entry}}% } +\edef\glsopenbrace{\expandafter\@gobble\string\{} +\edef\glsclosebrace{\expandafter\@gobble\string\}} +\edef\glsquote#1{\string"#1\string"} +\ifglsxindy + \newcommand*{\@glsfirstletter}{A} +\fi +\ifglsxindy + \newcommand*{\GlsSetXdyFirstLetterAfterDigits}[1]{% + \renewcommand*{\@glsfirstletter}{#1}} +\else + \newcommand*{\GlsSetXdyFirstLetterAfterDigits}[1]{% + \glsnoxindywarning\GlsSetXdyFirstLetterAfterDigits} +\fi +\newcommand*{\@glsminrange}{2} +\ifglsxindy + \newcommand*{\GlsSetXdyMinRangeLength}[1]{% + \renewcommand*{\@glsminrange}{#1}} +\else + \newcommand*{\GlsSetXdyMinRangeLength}[1]{% + \glsnoxindywarning\GlsSetXdyMinRangeLength} +\fi \newwrite\istfile -\bgroup -\catcode`\%12\relax -\catcode`\"12\relax -\catcode`\|12\relax -\catcode`\!12\relax -\catcode`\?12\relax -\gdef\@gls@actualchar{?} -\gdef\@gls@encapchar{|} -\gdef\@gls@levelchar{!} -\gdef\@gls@quotechar{"} -\gdef\writeist{\relax -\protected@write\@auxout{}{\string\@istfilename{\istfilename}} -\openout\istfile=\istfilename -\write\istfile{% makeindex style file created by the glossaries package} -\write\istfile{% for document '\jobname' on \the\year-\the\month-\the\day} -\write\istfile{actual '\@gls@actualchar'} -\write\istfile{encap '\@gls@encapchar'} -\write\istfile{level '\@gls@levelchar'} -\write\istfile{quote '\@gls@quotechar'} -\write\istfile{keyword "\string\\glossaryentry"} -\write\istfile{preamble "\string\\glossarysection[\string\\glossarytoctitle]{\string\\glossarytitle}\string\\glossarypreamble\string\n\string\\begin{theglossary}\string\\glossaryheader\string\n"} -\write\istfile{postamble "\string\n\string\\end{theglossary}\string\n\string\\glossarypostamble\string\n"} -\write\istfile{group_skip "\string\\glsgroupskip\string\n"} -\write\istfile{item_0 "\string\n"} -\write\istfile{delim_0 "\{\string\\glossaryentrynumbers\{\string\\relax "} -\write\istfile{delim_t "\}\}"} -\write\istfile{delim_n "\string\\delimN "} -\write\istfile{delim_r "\string\\delimR "} -\write\istfile{headings_flag 1} -\write\istfile{heading_prefix "\string\\glsgroupheading\{"} -\write\istfile{heading_suffix "\}"} -\write\istfile{symhead_positive "glssymbols"} -\write\istfile{numhead_positive "glsnumbers"} -\write\istfile{page_compositor "\glscompositor"} -\noist} -\egroup +\ifglsxindy + \def\writeist{% + \openout\istfile=\istfilename + \write\istfile{;; xindy style file created by the glossaries + package}% + \write\istfile{;; for document '\jobname' on + \the\year-\the\month-\the\day}% + \write\istfile{^^J; required styles^^J} + \@for\@xdystyle:=\@xdyrequiredstyles\do{% + \ifx\@xdystyle\@empty + \else + \protected@write\istfile{}{(require + \string"\@xdystyle.xdy\string")}% + \fi + }% + \write\istfile{^^J% + ; list of allowed attributes (number formats)^^J}% + \write\istfile{(define-attributes ((\@xdyattributes)))}% + \write\istfile{^^J; user defined alphabets^^J}% + \write\istfile{\@xdyuseralphabets}% + \write\istfile{^^J; location class definitions^^J}% + \protected@edef\@gls@roman{\@roman{0\string" + \string"roman-numbers-lowercase\string" :sep \string"}}% + \@onelevel@sanitize\@gls@roman + \edef\@tmp{\string" \string"roman-numbers-lowercase\string" + :sep \string"}% + \@onelevel@sanitize\@tmp + \ifx\@tmp\@gls@roman + \write\istfile{(define-location-class + \string"roman-page-numbers\string"^^J\space\space\space + (\string"roman-numbers-lowercase\string") + :min-range-length \@glsminrange)}% + \else + \write\istfile{(define-location-class + \string"roman-page-numbers\string"^^J\space\space\space + (:sep "\@gls@roman") + :min-range-length \@glsminrange)}% + \fi + \write\istfile{(define-location-class + \string"Roman-page-numbers\string"^^J\space\space\space + (\string"roman-numbers-uppercase\string") + :min-range-length \@glsminrange)}% + \write\istfile{(define-location-class + \string"arabic-page-numbers\string"^^J\space\space\space + (\string"arabic-numbers\string") + :min-range-length \@glsminrange)}% + \write\istfile{(define-location-class + \string"alpha-page-numbers\string"^^J\space\space\space + (\string"alpha\string") + :min-range-length \@glsminrange)}% + \write\istfile{(define-location-class + \string"Alpha-page-numbers\string"^^J\space\space\space + (\string"ALPHA\string") + :min-range-length \@glsminrange)}% + \write\istfile{(define-location-class + \string"Appendix-page-numbers\string"^^J\space\space\space + (\string"ALPHA\string" + :sep \string"\@glsAlphacompositor\string" + \string"arabic-numbers\string") + :min-range-length \@glsminrange)}% + \write\istfile{(define-location-class + \string"arabic-section-numbers\string"^^J\space\space\space + (\string"arabic-numbers\string" + :sep \string"\glscompositor\string" + \string"arabic-numbers\string") + :min-range-length \@glsminrange)}% + \write\istfile{^^J; user defined location classes}% + \write\istfile{\@xdyuserlocationdefs}% + \write\istfile{^^J; define cross-reference class^^J}% + \write\istfile{(define-crossref-class \string"see\string" + :unverified )}% + \write\istfile{(markup-crossref-list + :class \string"see\string"^^J\space\space\space + :open \string"\string\glsseeformat\string" + :close \string"{}\string")}% + \write\istfile{^^J; define the order of the location classes}% + \write\istfile{(define-location-class-order + (\@xdylocationclassorder))}% + \write\istfile{^^J; define the glossary markup^^J}% + \write\istfile{(markup-index^^J\space\space\space + :open \string"\string + \glossarysection[\string\glossarytoctitle]{\string + \glossarytitle}\string\glossarypreamble\string~n\string\begin + {theglossary}\string\glossaryheader\string~n\string" ^^J\space + \space\space:close \string"\expandafter\@gobble + \string\%\string~n\string + \end{theglossary}\string\glossarypostamble + \string~n\string" ^^J\space\space\space + :tree)}% + \write\istfile{(markup-letter-group-list + :sep \string"\string\glsgroupskip\string~n\string")}% + \write\istfile{(markup-indexentry + :open \string"\string\relax \string\glsresetentrylist + \string~n\string")}% + \write\istfile{(markup-locclass-list :open + \string"\glsopenbrace\string\glossaryentrynumbers + \glsopenbrace\string\relax\space \string"^^J\space\space\space + :sep \string", \string" + :close \string"\glsclosebrace\glsclosebrace\string")}% + \write\istfile{(markup-locref-list + :sep \string"\string\delimN\space\string")}% + \write\istfile{(markup-range + :sep \string"\string\delimR\space\string")}% + \@onelevel@sanitize\gls@suffixF + \@onelevel@sanitize\gls@suffixFF + \ifx\gls@suffixF\@empty + \else + \write\istfile{(markup-range + :close "\gls@suffixF" :length 1 :ignore-end)}% + \fi + \ifx\gls@suffixFF\@empty + \else + \write\istfile{(markup-range + :close "\gls@suffixFF" :length 2 :ignore-end)}% + \fi + \write\istfile{^^J; define format to use for locations^^J}% + \write\istfile{\@xdylocref}% + \write\istfile{^^J; define letter group list format^^J}% + \write\istfile{(markup-letter-group-list + :sep \string"\string\glsgroupskip\string~n\string")}% + \write\istfile{^^J; letter group headings^^J}% + \write\istfile{(markup-letter-group + :open-head \string"\string\glsgroupheading + \glsopenbrace\string"^^J\space\space\space + :close-head \string"\glsclosebrace\string")}% + \write\istfile{^^J; additional letter groups^^J}% + \write\istfile{\@xdylettergroups}% + \write\istfile{^^J; additional sort rules^^J} + \write\istfile{\@xdysortrules}% + \noist} +\else + \edef\@gls@actualchar{\string?} + \edef\@gls@encapchar{\string|} + \edef\@gls@levelchar{\string!} + \edef\@gls@quotechar{\string"} + \def\writeist{\relax + \openout\istfile=\istfilename + \write\istfile{\expandafter\@gobble\string\% makeindex style file + created by the glossaries package} + \write\istfile{\expandafter\@gobble\string\% for document + '\jobname' on \the\year-\the\month-\the\day} + \write\istfile{actual '\@gls@actualchar'} + \write\istfile{encap '\@gls@encapchar'} + \write\istfile{level '\@gls@levelchar'} + \write\istfile{quote '\@gls@quotechar'} + \write\istfile{keyword \string"\string\\glossaryentry\string"} + \write\istfile{preamble \string"\string\\glossarysection[\string + \\glossarytoctitle]{\string\\glossarytitle}\string + \\glossarypreamble\string\n\string\\begin{theglossary}\string + \\glossaryheader\string\n\string"} + \write\istfile{postamble \string"\string\%\string\n\string + \\end{theglossary}\string\\glossarypostamble\string\n + \string"} + \write\istfile{group_skip \string"\string\\glsgroupskip\string\n + \string"} + \write\istfile{item_0 \string"\string\%\string\n\string"} + \write\istfile{item_1 \string"\string\%\string\n\string"} + \write\istfile{item_2 \string"\string\%\string\n\string"} + \write\istfile{item_01 \string"\string\%\string\n\string"} + \write\istfile{item_x1 + \string"\string\\relax \string\\glsresetentrylist\string\n + \string"} + \write\istfile{item_02 \string"\string\%\string\n\string"} + \write\istfile{item_12 \string"\string\%\string\n\string"} + \write\istfile{item_x2 + \string"\string\\relax \string\\glsresetentrylist\string\n + \string"} + \write\istfile{delim_0 \string"\{\string + \\glossaryentrynumbers\{\string\\relax \string"} + \write\istfile{delim_1 \string"\{\string + \\glossaryentrynumbers\{\string\\relax \string"} + \write\istfile{delim_2 \string"\{\string + \\glossaryentrynumbers\{\string\\relax \string"} + \write\istfile{delim_t \string"\}\}\string"} + \write\istfile{delim_n \string"\string\\delimN \string"} + \write\istfile{delim_r \string"\string\\delimR \string"} + \write\istfile{headings_flag 1} + \write\istfile{heading_prefix + \string"\string\\glsgroupheading\{\string"} + \write\istfile{heading_suffix + \string"\}\string\\relax + \string\\glsresetentrylist \string"} + \write\istfile{symhead_positive \string"glssymbols\string"} + \write\istfile{numhead_positive \string"glsnumbers\string"} + \write\istfile{page_compositor \string"\glscompositor\string"} + \@gls@escbsdq\gls@suffixF + \@gls@escbsdq\gls@suffixFF + \ifx\gls@suffixF\@empty + \else + \write\istfile{suffix_2p \string"\gls@suffixF\string"} + \fi + \ifx\gls@suffixFF\@empty + \else + \write\istfile{suffix_3p \string"\gls@suffixFF\string"} + \fi + \noist + } +\fi \newcommand{\noist}{\let\writeist\relax} \newcommand*{\@makeglossary}[1]{% \ifglossaryexists{#1}{% @@ -1268,39 +1890,148 @@ counter as its value}}{% Glossary type `#1' not defined}{New glossaries must be defined before using \string\makeglossary}}} \newcommand*{\makeglossaries}{% -\@for\@glo@type:=\@glo@types\do{% -\ifthenelse{\equal{\@glo@type}{}}{}{% -\@makeglossary{\@glo@type}}}% -\renewcommand*\newglossary[4][]{% -\PackageError{glossaries}{New glossaries -must be created before \string\makeglossaries}{You need -to move \string\makeglossaries\space after all your -\string\newglossary\space commands}}% -\let\@makeglossary\empty -\let\makeglossary\empty} + \protected@write\@auxout{}{\string\@istfilename{\istfilename}}% + \protected@write\@auxout{}{\string\@glsorder{\glsorder}} + \@for\@glo@type:=\@glo@types\do{% + \ifthenelse{\equal{\@glo@type}{}}{}{% + \@makeglossary{\@glo@type}}% + }% + \renewcommand*\newglossary[4][]{% + \PackageError{glossaries}{New glossaries + must be created before \string\makeglossaries}{You need + to move \string\makeglossaries\space after all your + \string\newglossary\space commands}}% + \let\@makeglossary\relax + \let\makeglossary\relax + \let\makeglossaries\relax + \@disable@onlypremakeg +} \let\makeglossary\makeglossaries +\AtEndDocument{\ifx\makeglossaries\relax +\else + \PackageWarningNoLine{glossaries}{\string\makeglossaries\space + hasn't been used,^^Jthe glossaries will not be updated}% +\fi +\warn@noprintglossary +} \renewcommand*{\glossary}[1][\glsdefaulttype]{% \@glossary[#1]} -\def\@glossary[#1]{\@bsphack\begingroup\@sanitize\@index} +\def\@glossary[#1]{\index} \newcommand{\@gls@renewglossary}{% \gdef\@glossary[##1]{\@bsphack\begingroup\@wrglossary{##1}}% \let\@gls@renewglossary\@empty } \renewcommand*{\@wrglossary}[2]{% -\expandafter\protected@write\csname glo@#1@file\endcsname{}{% -\string\glossaryentry{#2}{\theglsentrycounter}}\endgroup\@esphack} + \expandafter\protected@write\csname glo@#1@file\endcsname{}{#2}% + \endgroup\@esphack +} +\newcommand{\@do@wrglossary}[1]{% +\ifglsxindy + \expandafter\@glo@check@mkidxrangechar\@glsnumberformat\@nil + \def\@glo@range{}% + \expandafter\if\@glo@prefix(\relax + \def\@glo@range{:open-range}% + \else + \expandafter\if\@glo@prefix)\relax + \def\@glo@range{:close-range}% + \fi + \fi +\protected@edef\@glslocref{\theglsentrycounter}% +\@gls@checkmkidxchars\@glslocref + \glossary[\csname glo@#1@type\endcsname]{% + (indexentry :tkey (\csname glo@#1@index\endcsname) + :locref \string"\@glslocref\string" % + :attr \string"\@glo@suffix\string" \@glo@range + ) + }% +\else + \@set@glo@numformat\@glo@numfmt\@gls@counter\@glsnumberformat + \glossary[\csname glo@#1@type\endcsname]{% + \string\glossaryentry{\csname glo@#1@index\endcsname + \@gls@encapchar\@glo@numfmt}{\theglsentrycounter}}% +\fi +} +\newcommand{\@do@seeglossary}[2]{% +\ifglsxindy + \glossary[\csname glo@#1@type\endcsname]{% + (indexentry + :tkey (\csname glo@#1@index\endcsname) + :xref (\string"#2\string") + :attr \string"see\string" + ) + }% +\else + \glossary[\csname glo@#1@type\endcsname]{% + \string\glossaryentry{\csname glo@#1@index\endcsname + \@gls@encapchar glsseeformat#2}{Z}}% +\fi +} +\def\@gls@fixbraces#1#2#3\@nil{% + \ifx#2[\relax + \def#1{#2#3}% + \else + \def#1{{#2#3}}% + \fi +} +\newcommand*{\glssee}[3][\seename]{% + \@do@seeglossary{#2}{[#1]{#3}}} +\newcommand*{\@glssee}[3][\seename]{% + \glssee[#1]{#3}{#2}} +\newcommand*{\glsseeformat}[3][\seename]{\emph{#1} \glsseelist{#2}} +\newcommand*{\glsseelist}[1]{% + \let\@gls@dolast\relax + \let\@gls@donext\relax + \@for\@gls@thislabel:=#1\do{% + \ifx\@xfor@nextelement\@nnil + \@gls@dolast + \else + \@gls@donext + \fi + \glsseeitem{\@gls@thislabel}% + \let\@gls@dolast\glsseelastsep + \let\@gls@donext\glsseesep + }% +} +\newcommand*{\glsseelastsep}{\space\andname\space} +\newcommand*{\glsseesep}{, } +\newcommand*{\glsseeitem}[1]{\glshyperlink{#1}} +\def\warn@noprintglossary{\PackageWarningNoLine{glossaries}{No +\string\printglossary\space or \string\printglossaries\space +found.^^JThis document will not have a glossary.}} +\@ifundefined{printglossary}{}{% +\PackageWarning{glossaries}{Overriding \string\printglossary}% +\let\printglossary\undefined} \newcommand*{\printglossary}[1][type=\glsdefaulttype]{% -\def\@glo@type{\glsdefaulttype}% -\def\glossarytitle{\csname @glotype@\@glo@type @title\endcsname}% -\def\@glossarystyle{}% -\def\gls@dotoctitle{\glssettoctitle{\@glo@type}}% -\bgroup -\setkeys{printgloss}{#1}% -\gls@dotoctitle -\@glossarystyle -\makeatletter -\@input@{\jobname.\csname @glotype@\@glo@type @in\endcsname}% -\egroup + \ifglsxindy\findrootlanguage\fi + \def\@glo@type{\glsdefaulttype}% + \def\glossarytitle{\csname @glotype@\@glo@type @title\endcsname}% + \def\@glossarystyle{}% + \def\gls@dotoctitle{\glssettoctitle{\@glo@type}}% + \let\@org@glossaryentrynumbers\glossaryentrynumbers + \bgroup + \setkeys{printgloss}{#1}% + \let\org@glossaryentrynumbers\glossaryentrynumbers + \let\glsnonextpages\@glsnonextpages + \let\nopostdesc\@nopostdesc + \gls@dotoctitle + \@glossarystyle + \makeatletter + \@input@{\jobname.\csname @glotype@\@glo@type @in\endcsname}% + \ifglsxindy + \@ifundefined{@xdy@\@glo@type @language}{% + \protected@write\@auxout{}{% + \string\@xdylanguage{\@glo@type}{\@xdy@main@language}}% + }{% + \protected@write\@auxout{}{% + \string\@xdylanguage{\@glo@type}{\csname @xdy@\@glo@type + @language\endcsname}}% + }% + \protected@write\@auxout{}{% + \string\@gls@codepage{\@glo@type}{\gls@codepage}}% + \fi + \egroup + \global\let\glossaryentrynumbers\@org@glossaryentrynumbers +\let\warn@noprintglossary\relax } \newcommand*{\printglossaries}{% \forallglossaries{\@@glo@type}{\printglossary[type=\@@glo@type]}} @@ -1331,6 +2062,12 @@ false,nolabel,autolabel}[nolabel]{% \else \def\glossaryentrynumbers##1{##1}% \fi} +\newcommand*{\@glsnonextpages}{% + \gdef\glossaryentrynumbers##1{% + \glsresetentrylist}} +\newcommand*{\glsresetentrylist}{% + \global\let\glossaryentrynumbers\org@glossaryentrynumbers} +\newcommand*{\glsnonextpages}{} \@ifundefined{theglossary}{% \newenvironment{theglossary}{}{}}{% \PackageWarning{glossaries}{overriding `theglossary' environment}% @@ -1338,6 +2075,8 @@ false,nolabel,autolabel}[nolabel]{% \newcommand*{\glossaryheader}{} \newcommand*{\glossaryentryfield}[5]{% \@glstarget{glo:#1}{#2} #4 #3. #5\par} +\newcommand*{\glossarysubentryfield}[6]{% +\@glstarget{glo:#2}{}#4. #6\par} \newcommand*{\glsgroupskip}{} \newcommand*{\glsgroupheading}[1]{} \newcommand*{\glsgetgrouptitle}[1]{% @@ -1350,7 +2089,7 @@ false,nolabel,autolabel}[nolabel]{% \@ifundefined{@glsstyle@#1}{\PackageError{glossaries}{Glossary style `#1' undefined}{}}{% \csname @glsstyle@#1\endcsname}} -\newcommand*{\newglossarystyle}[2]{% +\newcommand{\newglossarystyle}[2]{% \@ifundefined{@glsstyle@#1}{% \expandafter\def\csname @glsstyle@#1\endcsname{#2}}{% \PackageError{glossaries}{Glossary style `#1' is already defined}{}}} @@ -1358,7 +2097,21 @@ style `#1' undefined}{}}{% \@ifundefined{hyperlink}{% \def\glshypernumber#1{#1}}{% \def\glshypernumber#1{% -\@delimR#1\delimR\delimR\\}} + \@glshypernumber#1\nohyperpage{}\@nil}} +\def\@glshypernumber#1\nohyperpage#2#3\@nil{% + \ifx\\#1\\% + \else + \@delimR#1\delimR\delimR\\% + \fi + \ifx\\#2\\% + \else + #2% + \fi + \ifx\\#3\\% + \else + \@glshypernumber#3\@nil + \fi +} \def\@delimR#1\delimR #2\delimR #3\\{% \ifx\\#2\\% \@delimN{#1}% @@ -1477,6 +2230,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \def\@ACRfullpl#1#2[#3]{\@GLSfirstplural@{#1}{#2}[#3]} \newcommand{\acronymfont}[1]{#1} \newcommand{\firstacronymfont}[1]{\acronymfont{#1}} +\newcommand*{\acrnameformat}[2]{\acronymfont{#1}} \ifglsacrdescription \ifglsacrfootnote \renewcommand{\newacronym}[4][]{% @@ -1547,7 +2301,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \fi \renewcommand{\newacronym}[4][]{% \newglossaryentry{#2}{type=\acronymtype,% - name={\acronymfont#4},% + name={#4},% sort={#4}, text={#4},% plural={#4\acrpluralsuffix},% @@ -1590,7 +2344,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \else \renewcommand{\newacronym}[4][]{% \newglossaryentry{#2}{type=\acronymtype,% - name={\acronymfont{#3}},% + name={\acrnameformat{#3}{#4}},% sort={#3},% first={#4},% firstplural={#4\acrpluralsuffix},% @@ -1825,6 +2579,7 @@ firstplural={\@glo@descplural\space (\@glo@plural)},% \RequirePackage{glossary-list} \RequirePackage{glossary-long} \RequirePackage{glossary-super} +\RequirePackage{glossary-tree} \glossarystyle{\@glossary@default@style} \endinput %% diff --git a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty index 10832f723f1..38e43ddcee3 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -39,13 +39,13 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{mfirstuc}[2008/06/18 v1.02 (NLCT)] +\ProvidesPackage{mfirstuc}[2008/12/22 v1.03 (NLCT)] \newif\if@glscs \def\makefirstuc#1{% \def\gls@argi{#1}% \ifx\gls@argi\@empty \else - \protected@edef\@gls@tmp{\ #1}% + \def\@gls@tmp{\ #1}% \@onelevel@sanitize\@gls@tmp \expandafter\@gls@checkcs\@gls@tmp\relax\relax \if@glscs diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazil.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazil.dict new file mode 100644 index 00000000000..fe9008f5f05 --- /dev/null +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazil.dict @@ -0,0 +1,52 @@ +%% +%% This is file `glossaries-dictionary-Brazil.dict', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries.dtx (with options: `glossaries-dictionary-Brazil.dict,package') +%% +%% glossaries.dtx +%% Copyright 2008 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license of (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +\ProvidesDictionary{glossaries-dictionary}{Brazil} +\providetranslation{Glossary}{Gloss\'ario} +\providetranslation{Acronyms}{Siglas} +\providetranslation{Notation (glossaries)}{Nota\c c\~ao} +\providetranslation{Description (glossaries)}{Descri\c c\~ao} +\providetranslation{Symbol (glossaries)}{S\'imbolo} +\providetranslation{Page List (glossaries)}{Lista de P\'aginas} +\providetranslation{Symbols (glossaries)}{S\'imbolos} +\providetranslation{Numbers (glossaries)}{N\'umeros} +\endinput +%% +%% End of file `glossaries-dictionary-Brazil.dict'. diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict index d323f4fce54..af538e6577f 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict index 9260278bd44..4c3abfce2bc 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict index ae0176873f1..c593919b6c0 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict index fc569e4c615..a80e35203b1 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict index 451d3d63958..96219d71ce3 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict index 98d7fc6d95a..a470d25c4c2 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict index 68903c327e3..bfe5ad78d9e 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict index 02bc3d50ed9..6790d186312 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict index eb76529f778..b7fe8cca758 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict index 17c72044495..f529892e63d 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty index 9137a38056a..19b3363a804 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -39,42 +39,25 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \ProvidesPackage{glossary-hypernav}[2007/07/04 v1.01 (NLCT)] -\@ifundefined{hyperlink}{% -\newcommand*{\glsnavhyperlink}[3][]{#3}}{% \newcommand*{\glsnavhyperlink}[3][\@glo@type]{% -\edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}% -\hyperlink{glsn:#1@#2}{#3}}} -\@ifundefined{hypertarget}{% + \edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}% + \@glslink{glsn:#1@#2}{#3}} \newcommand*{\glsnavhypertarget}[3][\@glo@type]{% -\protected@write\@auxout{}{\string\@gls@hypergroup{#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{% + \protected@write\@auxout{}{\string\@gls@hypergroup{#1}{#2}}% + \@glstarget{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 - has changed. Rerun LaTeX}}% -\fi}}{% -\newcommand*{\glsnavhypertarget}[3][\@glo@type]{% -\protected@write\@auxout{}{\string\@gls@hypergroup{#1}{#2}}% -\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}} + 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]{% @@ -103,8 +86,10 @@ } \newcommand*{\glshypernavsep}{\space\textbar\space} \newcommand*{\glssymbolnav}{% -\glsnavhyperlink{glssymbols}{\glsgetgrouptitle{glssymbols}} \textbar\ -\glsnavhyperlink{glsnumbers}{\glsgetgrouptitle{glsnumbers}} \textbar\ +\glsnavhyperlink{glssymbols}{\glsgetgrouptitle{glssymbols}}% +\glshypernavsep +\glsnavhyperlink{glsnumbers}{\glsgetgrouptitle{glsnumbers}}% +\glshypernavsep } \endinput %% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty index 36b24637b95..91669b43672 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -38,13 +38,15 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-list}[2008/02/16 v1.03 (NLCT)] +\ProvidesPackage{glossary-list}[2008/12/11 v1.04 (NLCT)] \newglossarystyle{list}{% \renewenvironment{theglossary}{\begin{description}}{\end{description}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% \item[\@glstarget{glo:##1}{##2}] ##3\glspostdescription\space ##5}% +\renewcommand*{\glossarysubentryfield}[6]{% +\@glstarget{glo:##2}{\strut}##4\glspostdescription\space ##6.}% \renewcommand*{\glsgroupskip}{\indexspace}} \newglossarystyle{listgroup}{% \glossarystyle{list}% @@ -59,6 +61,8 @@ \glossarystyle{list}% \renewcommand*{\glossaryentryfield}[5]{% \item[\@glstarget{glo:##1}{##2}]\mbox{}\newline ##3\glspostdescription\space ##5}% +\renewcommand{\glossarysubentryfield}[6]{% +\par\@glstarget{glo:##2}{\strut}##4\glspostdescription\space ##6}% } \newglossarystyle{altlistgroup}{% \glossarystyle{altlist}% @@ -69,13 +73,17 @@ \item[\glsnavigation]}% \renewcommand*{\glsgroupheading}[1]{% \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}} -\newlength\glslistdottedwidth -\setlength{\glslistdottedwidth}{.5\linewidth} \newglossarystyle{listdotted}{% \glossarystyle{list}% \renewcommand*{\glossaryentryfield}[5]{% \item[]\makebox[\glslistdottedwidth][l]{\@glstarget{glo:##1}{##2}% -\unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##3}} +\unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##3}% +\renewcommand*{\glossarysubentryfield}[6]{% +\item[]\makebox[\glslistdottedwidth][l]{\@glstarget{glo:##2}{##3}% +\unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##4}% +} +\newlength\glslistdottedwidth +\setlength{\glslistdottedwidth}{.5\linewidth} \endinput %% %% End of file `glossary-list.sty'. 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 954d8e7074e..9cf3a012605 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-long}[2007/07/04 v1.01 (NLCT)] +\ProvidesPackage{glossary-long}[2008/12/11 v1.02 (NLCT)] \RequirePackage{longtable} \newlength\glsdescwidth \newlength\glspagelistwidth @@ -51,6 +51,8 @@ \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% \@glstarget{glo:##1}{##2} & ##3\glspostdescription\space ##5\\}% +\renewcommand*{\glossarysubentryfield}[6]{% + & \@glstarget{glo:##2}{\strut}##4\glspostdescription\space ##6\\}% \renewcommand*{\glsgroupskip}{ & \\}} \newglossarystyle{longborder}{% \glossarystyle{long}% @@ -76,6 +78,8 @@ \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% \@glstarget{glo:##1}{##2} & ##3 & ##5\\}% +\renewcommand*{\glossarysubentryfield}[6]{% + & \@glstarget{glo:##2}{\strut}##4 & ##6\\}% \renewcommand*{\glsgroupskip}{ & &\\}} \newglossarystyle{long3colborder}{% \glossarystyle{long3col}% @@ -106,6 +110,8 @@ \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% \@glstarget{glo:##1}{##2} & ##3 & ##4 & ##5\\}% +\renewcommand*{\glossarysubentryfield}[6]{% + & \@glstarget{glo:##2}{\strut}##4 & ##5 & ##6\\}% \renewcommand*{\glsgroupskip}{ & & &\\}} \newglossarystyle{long4colheader}{% \glossarystyle{long4col}% 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 9ee597674a9..cf7e19ccdd9 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossaries-babel.sty, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-super}[2007/07/04 v1.01 (NLCT)] +\ProvidesPackage{glossary-super}[2008/12/11 v1.02 (NLCT)] \RequirePackage{supertabular} \newglossarystyle{super}{% \renewenvironment{theglossary}{% @@ -49,6 +49,8 @@ \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% \@glstarget{glo:##1}{##2} & ##3\glspostdescription\space ##5\\}% +\renewcommand*{\glossarysubentryfield}[6]{% + & \@glstarget{glo:##2}{\strut}##4\glspostdescription\space ##6\\}% \renewcommand*{\glsgroupskip}{ & \\}} \newglossarystyle{superborder}{% \glossarystyle{super}% @@ -79,6 +81,8 @@ \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% \@glstarget{glo:##1}{##2} & ##3 & ##5\\}% +\renewcommand*{\glossarysubentryfield}[6]{% + & \@glstarget{glo:##2}{\strut}##4 & ##6\\}% \renewcommand*{\glsgroupskip}{ & &\\}} \newglossarystyle{super3colborder}{% \glossarystyle{super3col}% @@ -114,6 +118,8 @@ \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glossaryentryfield}[5]{% \@glstarget{glo:##1}{##2} & ##3 & ##4 & ##5\\}% +\renewcommand*{\glossarysubentryfield}[6]{% + & \@glstarget{glo:##2}{\strut}##4 & ##5 & ##6\\}% \renewcommand*{\glsgroupskip}{ & & &\\}} \newglossarystyle{super4colheader}{% \glossarystyle{super4col}% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty new file mode 100644 index 00000000000..e36055dce24 --- /dev/null +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty @@ -0,0 +1,239 @@ +%% +%% This is file `glossary-tree.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries.dtx (with options: `glossary-tree.sty,package') +%% +%% glossaries.dtx +%% Copyright 2008 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license of (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-super.sty, glossary-tree.sty, glossaries-babel.sty, glossaries-dictionary-Brazil.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample.tex, sample4col.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +\ProvidesPackage{glossary-tree}[2008/12/11 v1.0 (NLCT)] +\newglossarystyle{index}{% +\renewenvironment{theglossary}{% +\setlength{\parindent}{0pt}% +\setlength{\parskip}{0pt plus 0.3pt}% +\let\item\@idxitem}{}% +\renewcommand*{\glossaryheader}{}% +\renewcommand*{\glsgroupheading}[1]{}% +\renewcommand*{\glossaryentryfield}[5]{% +\item\textbf{\@glstarget{glo:##1}{##2}}% + \ifx\relax##4\relax + \else + \space(##4)% + \fi + \space ##3\glspostdescription \space ##5}% +\renewcommand*{\glossarysubentryfield}[6]{% + \ifcase##1\relax + \item + \or + \subitem + \else + \subsubitem + \fi + \textbf{\@glstarget{glo:##2}{##3}}% + \ifx\relax##5\relax + \else + \space(##5)% + \fi + \space##4\glspostdescription\space ##6}% +\renewcommand*{\glsgroupskip}{\indexspace}} +\newglossarystyle{indexgroup}{% +\glossarystyle{index}% +\renewcommand*{\glsgroupheading}[1]{% + \item\textbf{\glsgetgrouptitle{##1}}\indexspace}} +\newglossarystyle{indexhypergroup}{% +\glossarystyle{index}% +\renewcommand*{\glossaryheader}{% +\item\textbf{\glsnavigation}\indexspace}% +\renewcommand*{\glsgroupheading}[1]{% +\item\textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}% +\indexspace}} +\newglossarystyle{tree}{% +\renewenvironment{theglossary}{% +\setlength{\parindent}{0pt}% +\setlength{\parskip}{0pt plus 0.3pt}% +}{}% +\renewcommand*{\glossaryheader}{}% +\renewcommand*{\glsgroupheading}[1]{}% +\renewcommand{\glossaryentryfield}[5]{% + \hangindent0pt\relax + \parindent0pt\relax + \textbf{\@glstarget{glo:##1}{##2}}% + \ifx\relax##4\relax + \else + \space(##4)% + \fi + \space ##3\glspostdescription \space ##5\par}% +\renewcommand{\glossarysubentryfield}[6]{% + \hangindent##1\glstreeindent\relax + \parindent##1\glstreeindent\relax + \textbf{\@glstarget{glo:##2}{##3}}% + \ifx\relax##5\relax + \else + \space(##5)% + \fi + \space##4\glspostdescription\space ##6\par}% +\renewcommand*{\glsgroupskip}{\indexspace}} +\newglossarystyle{treegroup}{% +\glossarystyle{tree}% +\renewcommand{\glsgroupheading}[1]{\par +\noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}} +\newglossarystyle{treehypergroup}{% +\glossarystyle{tree}% +\renewcommand*{\glossaryheader}{% +\par\noindent\textbf{\glsnavigation}\par\indexspace}% +\renewcommand*{\glsgroupheading}[1]{% +\par\noindent +\textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par +\indexspace}} +\newlength\glstreeindent +\setlength{\glstreeindent}{10pt} +\newglossarystyle{treenoname}{% +\renewenvironment{theglossary}{% +\setlength{\parindent}{0pt}% +\setlength{\parskip}{0pt plus 0.3pt}% +}{}% +\renewcommand*{\glossaryheader}{}% +\renewcommand*{\glsgroupheading}[1]{}% +\renewcommand{\glossaryentryfield}[5]{% + \hangindent0pt\relax + \parindent0pt\relax + \textbf{\@glstarget{glo:##1}{##2}}% + \ifx\relax##4\relax + \else + \space(##4)% + \fi + \space ##3\glspostdescription \space ##5\par}% +\renewcommand{\glossarysubentryfield}[6]{% + \hangindent##1\glstreeindent\relax + \parindent##1\glstreeindent\relax + \textbf{\@glstarget{glo:##2}{\strut}}% + ##4\glspostdescription\space ##6\par}% +\renewcommand*{\glsgroupskip}{\indexspace}} +\newglossarystyle{treenonamegroup}{% +\glossarystyle{treenoname}% +\renewcommand{\glsgroupheading}[1]{\par +\noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}} +\newglossarystyle{treenonamehypergroup}{% +\glossarystyle{treenoname}% +\renewcommand*{\glossaryheader}{% +\par\noindent\textbf{\glsnavigation}\par\indexspace}% +\renewcommand*{\glsgroupheading}[1]{% +\par\noindent +\textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par +\indexspace}} +\newcommand*{\glssetwidest}[2][0]{% + \expandafter\def\csname @glswidestname\romannumeral#1\endcsname{% + #2}% +} +\newcommand*{\@glswidestname}{} +\newglossarystyle{alttree}{% +\renewenvironment{theglossary}{% +\def\@gls@prevlevel{-1}% +\mbox{}\par}{\par}% +\renewcommand*{\glossaryheader}{}% +\renewcommand*{\glsgroupheading}[1]{}% +\renewcommand{\glossaryentryfield}[5]{% + \ifnum\@gls@prevlevel=0\relax + \else + \settowidth{\glstreeindent}{\textbf{\@glswidestname\space}}% + \hangindent\glstreeindent + \parindent\glstreeindent + \fi + \makebox[0pt][r]{\makebox[\glstreeindent][l]{% + \textbf{\@glstarget{glo:##1}{##2}}}}% + \ifx\relax##4\relax + \else + (##4)\space + \fi + ##3\glspostdescription \space ##5\par + \def\@gls@prevlevel{0}% +}% +\renewcommand{\glossarysubentryfield}[6]{% + \ifnum\@gls@prevlevel=##1\relax + \else + \@ifundefined{@glswidestname\romannumeral##1}{% + \settowidth{\gls@tmplen}{\textbf{\@glswidestname\space}}}{% + \settowidth{\gls@tmplen}{\textbf{% + \csname @glswidestname\romannumeral##1\endcsname\space}}}% + \ifnum\@gls@prevlevel<##1\relax + \setlength\glstreeindent\gls@tmplen + \addtolength\glstreeindent\parindent + \parindent\glstreeindent + \else + \@ifundefined{@glswidestname\romannumeral\@gls@prevlevel}{% + \settowidth{\glstreeindent}{\textbf{% + \@glswidestname\space}}}{% + \settowidth{\glstreeindent}{\textbf{% + \csname @glswidestname\romannumeral\@gls@prevlevel + \endcsname\space}}}% + \addtolength\parindent{-\glstreeindent}% + \setlength\glstreeindent\parindent + \fi + \fi + \hangindent\glstreeindent + \makebox[0pt][r]{\makebox[\gls@tmplen][l]{% + \textbf{\@glstarget{glo:##2}{##3}}}}% + \ifx##5\relax\relax + \else + (##5)\space + \fi + ##4\glspostdescription\space ##6\par + \def\@gls@prevlevel{##1}}% +\renewcommand*{\glsgroupskip}{\indexspace}} +\newglossarystyle{alttreegroup}{% +\glossarystyle{alttree}% +\renewcommand{\glsgroupheading}[1]{\par +\def\@gls@prevlevel{-1}% +\hangindent0pt\relax +\parindent0pt\relax +\textbf{\glsgetgrouptitle{##1}}\par\indexspace}} +\newglossarystyle{alttreehypergroup}{% +\glossarystyle{alttree}% + \renewcommand*{\glossaryheader}{% + \par + \def\@gls@prevlevel{-1}% + \hangindent0pt\relax + \parindent0pt\relax + \textbf{\glsnavigation}\par\indexspace}% + \renewcommand*{\glsgroupheading}[1]{% + \par + \def\@gls@prevlevel{-1}% + \hangindent0pt\relax + \parindent0pt\relax + \textbf{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par + \indexspace}} +\endinput +%% +%% End of file `glossary-tree.sty'. |