diff options
| author | Karl Berry <karl@freefriends.org> | 2012-09-21 22:42:52 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2012-09-21 22:42:52 +0000 |
| commit | e6f44970632b8e625130b6c035361aa447dbc398 (patch) | |
| tree | 55d1125bff28a4eb2cb16ccd778d319ef6c12569 | |
| parent | 001ce1425d9a3d1dcf6d3eade95e7dcd53c5be9b (diff) | |
glossaries (21sep12)
git-svn-id: svn://tug.org/texlive/trunk@27766 c570f23f-e606-0410-a88d-b1316a301751
66 files changed, 7202 insertions, 3163 deletions
diff --git a/Master/texmf-dist/doc/latex/glossaries/CHANGES b/Master/texmf-dist/doc/latex/glossaries/CHANGES index 6e91aa9e806..b557af22c62 100644 --- a/Master/texmf-dist/doc/latex/glossaries/CHANGES +++ b/Master/texmf-dist/doc/latex/glossaries/CHANGES @@ -1,5 +1,25 @@ glossaries change log: +v3.03: + + * fixed bug in \printglossary options: title now also sets + toctitle if toctitle missing (as per documentation). + + * added sanitize={sort=false} option + + * added nopostdot package option + + * added nogroupskip package option + + glossary-inline.sty added: + + - \glsinlinenameformat + - \glsinlinedescformat + - \glsinlineemptydescformat + - \glsinlinesubnameformat + - \glsinlinesubdescformat + - \glsinlinepostchild + v3.02: * new package options: diff --git a/Master/texmf-dist/doc/latex/glossaries/README b/Master/texmf-dist/doc/latex/glossaries/README index 52a04280724..a35c1fa0a2b 100644 --- a/Master/texmf-dist/doc/latex/glossaries/README +++ b/Master/texmf-dist/doc/latex/glossaries/README @@ -1,6 +1,6 @@ -LaTeX Package : glossaries v3.02 +LaTeX Package : glossaries v3.03 -Last Modified : 2012-05-21 +Last Modified : 2012-09-21 Author : Nicola Talbot @@ -62,11 +62,12 @@ you will also need the accsupp package. LaTeX2HTML -This package comes with a LaTeX2HTML style file glossaries.perl -which should be placed in the relevant LaTeX2HTML styles directory, but -note that glossaries.perl only supplies a sub-set of the commands -provided by glossaries.sty, so some commands may not be implemented or -may be implemented in a different way. +This package comes with a LaTeX2HTML style files glossaries.perl and +mfirstuc.perl which should be placed in the relevant LaTeX2HTML +styles directory, but note that these styles only supplies a sub-set +of the commands provided by glossaries.sty and mfirstuc.sty, so some +commands may not be implemented or may be implemented in a different +way. LICENCE @@ -74,5 +75,5 @@ This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license. -Author's home page: http://theoval.cmp.uea.ac.uk/~nlct/ +Author's home page: http://www.dickimaw-books.com/ diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html index d2bfbd760d1..1928698561c 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html @@ -4,13 +4,13 @@ <!--http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd--> <html xmlns="http://www.w3.org/1999/xhtml" > -<head><title>User Manual for glossaries.sty v3.02</title> +<head><title>User Manual for glossaries.sty v3.03</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="generator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" /> <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" /> <!-- xhtml,fn-in,css-in,uni-html4,utf8 --> <meta name="src" content="glossaries-user.tex" /> -<meta name="date" content="2012-05-21 14:22:00" /> +<meta name="date" content="2012-09-21 14:48:00" /> <style type="text/css"> <!-- @@ -359,27 +359,19 @@ div.important { background-color:red; } </div> <h2 class="titleHead">User Manual for glossaries.sty -v3.02</h2> - <div class="author" ><span +v3.03</h2> + <div class="author" ><span class="ec-lmr-12x-x-120">Nicola L.C. Talbot</span> -<br /> <span -class="ec-lmr-12x-x-120">School of Computing Sciences</span> -<br /> <span -class="ec-lmr-12x-x-120">University of East Anglia</span> -<br /> <span -class="ec-lmr-12x-x-120">Norwich. Norfolk</span> -<br /> <span -class="ec-lmr-12x-x-120">NR4 7TJ. United Kingdom.</span> <br /> <a -href="http://theoval.cmp.uea.ac.uk/~nlct/" class="url" ><span -class="ec-lmtt-12x-x-120">http://theoval.cmp.uea.ac.uk/~nlct/</span></a></div><br /> +href="http://www.dickimaw-books.com/" class="url" ><span +class="ec-lmtt-12x-x-120">http://www.dickimaw-books.com/</span></a></div><br /> <div class="date" ><span -class="ec-lmr-12x-x-120">2012-05-21</span></div> +class="ec-lmr-12x-x-120">2012-09-21</span></div> </div> </div> -<!--l. 247--><p class="noindent" >The <span +<!--l. 243--><p class="noindent" >The <span class="ec-lmss-10x-x-109">glossaries </span>bundle comes with the following documentation: </p><dl class="description"><dt class="description"> <a @@ -421,7 +413,7 @@ class="ec-lmtk-10x-x-109">glossaries.pdf</span></a> </dt><dd class="description">Advanced users wishing to know more about the inner workings of all the packages provided in the <span class="ec-lmss-10x-x-109">glossaries</span> - bundle should read “Documented Code for glossaries v3.02”. This + bundle should read “Documented Code for glossaries v3.03”. This includes the documented code for the <span class="ec-lmss-10x-x-109">mfirstuc</span><a id="dx1-4"></a> package. @@ -438,7 +430,7 @@ class="description">Change log. class="ec-lmssbx-10x-x-109">README</span> </dt><dd class="description">Package summary. </dd></dl> -<!--l. 283--><p class="indent" > <div class="important" title="Important Note"> If you use <span +<!--l. 279--><p class="indent" > <div class="important" title="Important Note"> If you use <span class="ec-lmss-10x-x-109">hyperref</span><a id="dx1-5"></a> and <span class="ec-lmss-10x-x-109">glossaries</span>, you must load <span @@ -446,7 +438,7 @@ class="ec-lmss-10x-x-109">hyperref</span><a id="dx1-6"></a> <span class="ec-lmri-10x-x-109">first</span>. </div> -</p><!--l. 286--><p class="noindent" > +</p><!--l. 282--><p class="noindent" > @@ -460,130 +452,130 @@ class="ec-lmri-10x-x-109">first</span>. <span class="chapterToc" >  <a href="#Q1-1-2">Glossary</a></span> <br /> <span class="chapterToc" >1  <a -href="#sec:intro" id="QQ2-1-4">Introduction</a></span> +href="#x1-30001" id="QQ2-1-4">Introduction</a></span> <br />  <span class="sectionToc" >1.1  <a -href="#sec:samples" id="QQ2-1-5">Sample Documents</a></span> +href="#x1-40001.1" id="QQ2-1-5">Sample Documents</a></span> <br />  <span class="sectionToc" >1.2  <a -href="#sec:languages" id="QQ2-1-6">Multi-Lingual Support</a></span> +href="#x1-50001.2" id="QQ2-1-6">Multi-Lingual Support</a></span> <br />   <span class="subsectionToc" >1.2.1  <a -href="#sec:fixednames" id="QQ2-1-7">Changing the Fixed Names</a></span> +href="#x1-60001.2.1" id="QQ2-1-7">Changing the Fixed Names</a></span> <br />  <span class="sectionToc" >1.3  <a -href="#sec:makeglossaries" id="QQ2-1-10">Generating the Associated Glossary Files</a></span> +href="#x1-70001.3" id="QQ2-1-10">Generating the Associated Glossary Files</a></span> <br />   <span class="subsectionToc" >1.3.1  <a -href="#sec:makeglossariesapp" id="QQ2-1-12">Using the makeglossaries Perl Script</a></span> +href="#x1-80001.3.1" id="QQ2-1-12">Using the makeglossaries Perl Script</a></span> <br />   <span class="subsectionToc" >1.3.2  <a -href="#sec:xindyapp" id="QQ2-1-13">Using xindy explicitly</a></span> +href="#x1-90001.3.2" id="QQ2-1-13">Using xindy explicitly</a></span> <br />   <span class="subsectionToc" >1.3.3  <a -href="#sec:makeindexapp" id="QQ2-1-14">Using makeindex explicitly</a></span> +href="#x1-100001.3.3" id="QQ2-1-14">Using makeindex explicitly</a></span> <br />   <span class="subsectionToc" >1.3.4  <a -href="#sec:notedev" id="QQ2-1-15">Note to Front-End and Script Developers</a></span> +href="#x1-110001.3.4" id="QQ2-1-15">Note to Front-End and Script Developers</a></span> <br /> <span class="chapterToc" >2  <a -href="#sec:pkgopts" id="QQ2-1-16">Package Options</a></span> +href="#x1-120002" id="QQ2-1-16">Package Options</a></span> <br />  <span class="sectionToc" >2.1  <a -href="#sec:pkgopts-general" id="QQ2-1-17">General Options</a></span> +href="#x1-130002.1" id="QQ2-1-17">General Options</a></span> <br />  <span class="sectionToc" >2.2  <a -href="#sec:pkgopts-sec" id="QQ2-1-18">Sectioning, Headings and TOC Options</a></span> +href="#x1-140002.2" id="QQ2-1-18">Sectioning, Headings and TOC Options</a></span> <br />  <span class="sectionToc" >2.3  <a -href="#sec:pkgopts-printglos" id="QQ2-1-19">Glossary Appearance Options</a></span> +href="#x1-150002.3" id="QQ2-1-19">Glossary Appearance Options</a></span> <br />  <span class="sectionToc" >2.4  <a -href="#sec:pkgopts-sort" id="QQ2-1-20">Sorting Options</a></span> +href="#x1-160002.4" id="QQ2-1-20">Sorting Options</a></span> <br />  <span class="sectionToc" >2.5  <a -href="#sec:pkgopts-acronym" id="QQ2-1-21">Acronym Options</a></span> +href="#x1-170002.5" id="QQ2-1-21">Acronym Options</a></span> <br /> <span class="chapterToc" >3  <a -href="#sec:setup" id="QQ2-1-22">Setting Up</a></span> +href="#x1-180003" id="QQ2-1-22">Setting Up</a></span> <br /> <span class="chapterToc" >4  <a -href="#sec:newglosentry" id="QQ2-1-23">Defining Glossary Entries</a></span> +href="#x1-190004" id="QQ2-1-23">Defining Glossary Entries</a></span> <br />  <span class="sectionToc" >4.1  <a -href="#sec:plurals" id="QQ2-1-24">Plurals</a></span> +href="#x1-200004.1" id="QQ2-1-24">Plurals</a></span> <br />  <span class="sectionToc" >4.2  <a -href="#sec:grammar" id="QQ2-1-25">Other Grammatical Constructs</a></span> +href="#x1-210004.2" id="QQ2-1-25">Other Grammatical Constructs</a></span> <br />  <span class="sectionToc" >4.3  <a -href="#sec:subentries" id="QQ2-1-26">Sub-Entries</a></span> +href="#x1-220004.3" id="QQ2-1-26">Sub-Entries</a></span> <br />   <span class="subsectionToc" >4.3.1  <a -href="#sec:hierarchical" id="QQ2-1-27">Hierarchical Categories</a></span> +href="#x1-230004.3.1" id="QQ2-1-27">Hierarchical Categories</a></span> <br />   <span class="subsectionToc" >4.3.2  <a -href="#sec:homographs" id="QQ2-1-28">Homographs</a></span> +href="#x1-240004.3.2" id="QQ2-1-28">Homographs</a></span> <br />  <span class="sectionToc" >4.4  <a -href="#sec:loadglsentries" id="QQ2-1-29">Loading Entries From a File</a></span> +href="#x1-250004.4" id="QQ2-1-29">Loading Entries From a File</a></span> <br />  <span class="sectionToc" >4.5  <a -href="#sec:moveentry" id="QQ2-1-30">Moving Entries to Another Glossary</a></span> +href="#x1-260004.5" id="QQ2-1-30">Moving Entries to Another Glossary</a></span> <br /> <span class="chapterToc" >5  <a -href="#sec:numberlists" id="QQ2-1-31">Number lists</a></span> +href="#x1-270005" id="QQ2-1-31">Number lists</a></span> <br /> <span class="chapterToc" >6  <a -href="#sec:glslink" id="QQ2-1-32">Links to Glossary Entries</a></span> +href="#x1-280006" id="QQ2-1-32">Links to Glossary Entries</a></span> <br />  <span class="sectionToc" >6.1  <a -href="#sec:glsdisplay" id="QQ2-1-34">Changing the format of the link text</a></span> +href="#x1-290006.1" id="QQ2-1-34">Changing the format of the link text</a></span> <br />  <span class="sectionToc" >6.2  <a -href="#sec:disablehyperlinks" id="QQ2-1-35">Enabling and disabling hyperlinks to glossary entries</a></span> +href="#x1-300006.2" id="QQ2-1-35">Enabling and disabling hyperlinks to glossary entries</a></span> <br /> <span class="chapterToc" >7  <a -href="#sec:glsadd" id="QQ2-1-36">Adding an Entry to the Glossary Without Generating Text</a></span> +href="#x1-310007" id="QQ2-1-36">Adding an Entry to the Glossary Without Generating Text</a></span> <br /> <span class="chapterToc" >8  <a -href="#sec:crossref" id="QQ2-1-37">Cross-Referencing Entries</a></span> +href="#x1-320008" id="QQ2-1-37">Cross-Referencing Entries</a></span> <br />  <span class="sectionToc" >8.1  <a -href="#sec:customxr" id="QQ2-1-38">Customising Cross-reference Text</a></span> +href="#x1-330008.1" id="QQ2-1-38">Customising Cross-reference Text</a></span> <br /> <span class="chapterToc" >9  <a -href="#sec:glsnolink" id="QQ2-1-39">Using Glossary Terms Without Links</a></span> +href="#x1-340009" id="QQ2-1-39">Using Glossary Terms Without Links</a></span> <br /> <span class="chapterToc" >10  <a -href="#sec:printglossary" id="QQ2-1-40">Displaying a glossary</a></span> +href="#x1-3500010" id="QQ2-1-40">Displaying a glossary</a></span> <br /> <span class="chapterToc" >11  <a -href="#sec:xindy" id="QQ2-1-41">Xindy</a></span> +href="#x1-3600011" id="QQ2-1-41">Xindy</a></span> <br />  <span class="sectionToc" >11.1  <a -href="#sec:langenc" id="QQ2-1-42">Language and Encodings</a></span> +href="#x1-3700011.1" id="QQ2-1-42">Language and Encodings</a></span> <br />  <span class="sectionToc" >11.2  <a -href="#sec:xindyloc" id="QQ2-1-43">Locations and Number lists</a></span> +href="#x1-3800011.2" id="QQ2-1-43">Locations and Number lists</a></span> <br />  <span class="sectionToc" >11.3  <a -href="#sec:groups" id="QQ2-1-44">Glossary Groups</a></span> +href="#x1-3900011.3" id="QQ2-1-44">Glossary Groups</a></span> <br /> <span class="chapterToc" >12  <a -href="#sec:newglossary" id="QQ2-1-45">Defining New Glossaries</a></span> +href="#x1-4000012" id="QQ2-1-45">Defining New Glossaries</a></span> <br /> <span class="chapterToc" >13  <a -href="#sec:acronyms" id="QQ2-1-46">Acronyms</a></span> +href="#x1-4100013" id="QQ2-1-46">Acronyms</a></span> <br />  <span class="sectionToc" >13.1  <a -href="#sec:predefinedacrstyles" id="QQ2-1-48">Predefined Acronym Styles</a></span> +href="#x1-4200013.1" id="QQ2-1-48">Predefined Acronym Styles</a></span> <br />  <span class="sectionToc" >13.2  <a -href="#sec:disploa" id="QQ2-1-49">Displaying the List of Acronyms</a></span> +href="#x1-4300013.2" id="QQ2-1-49">Displaying the List of Acronyms</a></span> <br />  <span class="sectionToc" >13.3  <a -href="#sec:customacronym" id="QQ2-1-51">Defining A Custom Acronym Style</a></span> +href="#x1-4400013.3" id="QQ2-1-51">Defining A Custom Acronym Style</a></span> <br />  <span class="sectionToc" >13.4  <a -href="#sec:oldacronym" id="QQ2-1-52">Upgrading From the glossary Package</a></span> +href="#x1-4500013.4" id="QQ2-1-52">Upgrading From the glossary Package</a></span> <br /> <span class="chapterToc" >14  <a -href="#sec:glsunset" id="QQ2-1-54">Unsetting and Resetting Entry Flags</a></span> +href="#x1-4600014" id="QQ2-1-54">Unsetting and Resetting Entry Flags</a></span> <br /> <span class="chapterToc" >15  <a -href="#sec:styles" id="QQ2-1-55">Glossary Styles</a></span> +href="#x1-4700015" id="QQ2-1-55">Glossary Styles</a></span> <br />  <span class="sectionToc" >15.1  <a -href="#sec:liststyles" id="QQ2-1-57">List Styles</a></span> +href="#x1-4800015.1" id="QQ2-1-57">List Styles</a></span> <br />  <span class="sectionToc" >15.2  <a -href="#sec:longstyles" id="QQ2-1-58">Longtable Styles</a></span> +href="#x1-4900015.2" id="QQ2-1-58">Longtable Styles</a></span> <br />  <span class="sectionToc" >15.3  <a -href="#sec:longraggedstyles" id="QQ2-1-59">Longtable Styles (Ragged Right)</a></span> +href="#x1-5000015.3" id="QQ2-1-59">Longtable Styles (Ragged Right)</a></span> <br />  <span class="sectionToc" >15.4  <a -href="#sec:superstyles" id="QQ2-1-60">Supertabular Styles</a></span> +href="#x1-5100015.4" id="QQ2-1-60">Supertabular Styles</a></span> <br />  <span class="sectionToc" >15.5  <a -href="#sec:superraggedstyles" id="QQ2-1-61">Supertabular Styles (Ragged Right)</a></span> +href="#x1-5200015.5" id="QQ2-1-61">Supertabular Styles (Ragged Right)</a></span> <br />  <span class="sectionToc" >15.6  <a -href="#sec:treestyles" id="QQ2-1-62">Tree-Like Styles</a></span> +href="#x1-5300015.6" id="QQ2-1-62">Tree-Like Styles</a></span> <br />  <span class="sectionToc" >15.7  <a -href="#sec:mcolstyles" id="QQ2-1-63">Multicols Style</a></span> +href="#x1-5400015.7" id="QQ2-1-63">Multicols Style</a></span> <br />  <span class="sectionToc" >15.8  <a -href="#sec:inline" id="QQ2-1-65">In-Line Style</a></span> +href="#x1-5500015.8" id="QQ2-1-65">In-Line Style</a></span> <br /> <span class="chapterToc" >16  <a -href="#sec:newglossarystyle" id="QQ2-1-66">Defining your own glossary style</a></span> +href="#x1-5600016" id="QQ2-1-66">Defining your own glossary style</a></span> <br />  <span class="sectionToc" >16.1  <a -href="#sec:exnewstyle" id="QQ2-1-67">Example: creating a completely new style</a></span> +href="#x1-5700016.1" id="QQ2-1-67">Example: creating a completely new style</a></span> <br />  <span class="sectionToc" >16.2  <a -href="#sec:exadaptstyle" id="QQ2-1-68">Example: creating a new glossary style based on an existing style</a></span> +href="#x1-5800016.2" id="QQ2-1-68">Example: creating a new glossary style based on an existing style</a></span> <br />  <span class="sectionToc" >16.3  <a -href="#sec:exuserstyle" id="QQ2-1-69">Example: creating a glossary style that uses the <span +href="#x1-5900016.3" id="QQ2-1-69">Example: creating a glossary style that uses the <span class="ec-lmss-10x-x-109">user1</span>, …, <span class="ec-lmss-10x-x-109">user6 </span>keys</a></span> <br /> <span class="chapterToc" >17  <a -href="#sec:utilities" id="QQ2-1-70">Utilities</a></span> +href="#x1-6000017" id="QQ2-1-70">Utilities</a></span> <br /> <span class="chapterToc" >18  <a -href="#sec:accsupp" id="QQ2-1-71">Accessibility Support</a></span> +href="#x1-6100018" id="QQ2-1-71">Accessibility Support</a></span> <br /> <span class="chapterToc" >19  <a -href="#sec:trouble" id="QQ2-1-72">Troubleshooting</a></span> +href="#x1-6200019" id="QQ2-1-72">Troubleshooting</a></span> <br /> <span class="chapterToc" >  <a href="#Q1-1-73">Index</a></span> </div> @@ -709,8 +701,8 @@ class="newline" />A conditional that determines whether or not the entry has bee id="dx1-2016"></a><a href="#glo:firstuse">first use</a>. Commands to unset or reset this conditional are described in <a -href="#sec:glsunset">§14 </a><a -href="#sec:glsunset">Unsetting and +href="#x1-4600014">§14 </a><a +href="#x1-4600014">Unsetting and Resetting Entry Flags<!--tex4ht:ref: sec:glsunset --></a>. <br class="newline" /> </dd><dt class="description"> @@ -833,35 +825,37 @@ class="ec-lmtt-10x-x-109">o</span>. Depending on the font, the backslash character may appear as a dash when used in the main document text, so <span class="ec-lmtt-10x-x-109">\foo </span>will appear as: —foo. - <!--l. 157--><p class="noindent" >When <span class="TEX">T<span + <!--l. 154--><p class="noindent" >When <span class="TEX">T<span class="E">E</span>X</span> writes information to a file, fragile commands must be protected. The <span class="ec-lmss-10x-x-109">name</span><a id="dx1-2040"></a>, <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-2041"></a> and <span + id="dx1-2041"></a>, <span class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-2042"></a> keys all have + id="dx1-2042"></a> and <span +class="ec-lmss-10x-x-109">sort</span><a + id="dx1-2043"></a> keys all have their values written to a file, which means that care must be taken if those values contain fragile commands. There are two approaches: 1) the fragile commands must be protected using <span class="ec-lmtt-10x-x-109">\protect</span><a - id="dx1-2043"></a>; 2) the values are sanitized. Sanitizing the values gets + id="dx1-2044"></a>; 2) the values are sanitized. Sanitizing the values gets rid of the inconvenience of having to protect fragile commands, but at the expense of no longer being able to use those values in the document. Sanitization is governed by the package option <span class="ec-lmss-10x-x-109">sanitize</span><a - id="dx1-2044"></a> described in <a -href="#sec:pkgopts-general">§2.1 </a><a -href="#sec:pkgopts-general">General Options<!--tex4ht:ref: sec:pkgopts-general --></a>. <br + id="dx1-2045"></a> described in <a +href="#x1-130002.1">§2.1 </a><a +href="#x1-130002.1">General Options<!--tex4ht:ref: sec:pkgopts-general --></a>. <br class="newline" /> </p></dd><dt class="description"> <a id="glo:xindy"></a><span class="ec-lmtk-10x-x-109">xindy</span><a - id="dx1-2045"></a> </dt><dd + id="dx1-2046"></a> </dt><dd class="description"><br class="newline" />An flexible indexing application with multilingual support written in Perl. <br @@ -870,8 +864,8 @@ class="newline" /></dd></dl> <h2 class="chapterHead"><span class="titlemark">1</span>  <a - id="sec:intro"></a>Introduction</h2> -<!--l. 297--><p class="noindent" >The <span + id="x1-30001"></a>Introduction</h2> +<!--l. 293--><p class="noindent" >The <span class="ec-lmss-10x-x-109">glossaries </span>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 @@ -882,7 +876,7 @@ used<span class="footnote-mark"><a href="#fn1x3" id="fn1x3-bk"><sup class="textsuperscript">1</sup></a></span><a id="x1-3001f1"></a> in the document will be added to the glossary. -</p><!--l. 310--><p class="indent" > <span +</p><!--l. 306--><p class="indent" > <span class="ec-lmbx-10x-x-109">This package replaces the </span><span class="ec-lmssbx-10x-x-109">glossary</span><a id="dx1-3005"></a> <span @@ -891,12 +885,12 @@ class="ec-lmbx-10x-x-109">package which is now</span> class="ec-lmbx-10x-x-109">obsolete. </span>Please see the document <a href="glossary2glossaries.html" >“Upgrading from the glossary package to the glossaries package”</a> for assistance in upgrading. -</p><!--l. 314--><p class="indent" > One of the strengths of this package is its flexibility, however the +</p><!--l. 310--><p class="indent" > 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. If you are daunted by the size of the manual, try starting off with the much shorter <a href="glossariesbegin.html" >guide for beginners</a>. -</p><!--l. 320--><p class="indent" > <div class="important" title="Important Note"> The <span +</p><!--l. 316--><p class="indent" > <div class="important" title="Important Note"> The <span class="ec-lmss-10x-x-109">glossaries </span>package comes with a <a href="http://www.perl.org/about.html" >Perl</a> script called <a id="dx1-3006"></a><a @@ -926,35 +920,35 @@ class="ec-lmtt-10x-x-109">makeindex</span><a class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-3017"></a> explicitly. See <a -href="#sec:makeglossaries">§1.3 </a><a -href="#sec:makeglossaries">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a> for further details. +href="#x1-70001.3">§1.3 </a><a +href="#x1-70001.3">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a> for further details. </div> -</p><!--l. 330--><p class="noindent" > -</p><!--l. 332--><p class="indent" > The remainder of this introductory section covers the following: +</p><!--l. 326--><p class="noindent" > +</p><!--l. 328--><p class="indent" > The remainder of this introductory section covers the following: </p> <ul class="itemize1"> <li class="itemize"><a -href="#sec:samples">§1.1 </a><a -href="#sec:samples">Sample Documents<!--tex4ht:ref: sec:samples --></a> lists the sample documents provided +href="#x1-40001.1">§1.1 </a><a +href="#x1-40001.1">Sample Documents<!--tex4ht:ref: sec:samples --></a> lists the sample documents provided with this package. </li> <li class="itemize"><a -href="#sec:languages">§1.2 </a><a -href="#sec:languages">Multi-Lingual Support<!--tex4ht:ref: sec:languages --></a> provides information for users who +href="#x1-50001.2">§1.2 </a><a +href="#x1-50001.2">Multi-Lingual Support<!--tex4ht:ref: sec:languages --></a> provides information for users who wish to write in a language other than English. </li> <li class="itemize"><a -href="#sec:makeglossaries">§1.3 </a><a -href="#sec:makeglossaries">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a> describes how +href="#x1-70001.3">§1.3 </a><a +href="#x1-70001.3">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a> describes how to use a post-processor to create the sorted glossaries for your document. </li></ul> <h3 class="sectionHead"><span class="titlemark">1.1</span>  <a - id="sec:samples"></a>Sample Documents</h3> + id="x1-40001.1"></a>Sample Documents</h3> -<!--l. 349--><p class="noindent" >The <span +<!--l. 345--><p class="noindent" >The <span class="ec-lmss-10x-x-109">glossaries </span>package is provided with some sample documents that illustrate the various functions. These should be located in the <span @@ -968,19 +962,19 @@ documentation. For example, in a terminal or command prompt, type: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">texdoc -l glossaries</span></span> -</p><!--l. 358--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 354--><p class="indent" > <spacer type=vertical size=10> This should display the full pathname of the file <span class="ec-lmtt-10x-x-109">glossaries.pdf</span>. View the contents of that directory and see if it contains the <span class="ec-lmtt-10x-x-109">samples</span> subdirectory. -</p><!--l. 363--><p class="indent" > If you can’t find the sample files, they are available in the subdirectory +</p><!--l. 359--><p class="indent" > If you can’t find the sample files, they are available in the subdirectory <span class="ec-lmtt-10x-x-109">doc/latex/glossaries/samples/ </span>in the <span class="ec-lmtt-10x-x-109">glossaries.tds.zip </span>archive which can be downloaded from <a href="http://tug.ctan.org/tex-archive/macros/latex/contrib/glossaries/" >CTAN</a>. -</p><!--l. 369--><p class="indent" > The sample documents are as follows: +</p><!--l. 365--><p class="indent" > The sample documents are as follows: </p><dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">minimalgls.tex</span> </dt><dd @@ -995,7 +989,7 @@ class="E">E</span>X</span></span> either by typing <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">latex minimalgls</span></span> - <!--l. 380--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 376--><p class="noindent" ><spacer type=vertical size=10> 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 @@ -1003,7 +997,7 @@ class="ec-lmtt-10x-x-109">latex minimalgls</span></span> class="E">E</span>X</span></span> you will also get warnings about non-existent references. These warnings may be ignored on the first run. - </p><!--l. 387--><p class="noindent" >If you get a <span class="obeylines-h"><span class="verb"><span + </p><!--l. 383--><p class="noindent" >If you get a <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">Missing</span><span class="ec-lmtt-10x-x-109"> \begin{document}</span></span></span> error, then it’s most likely that your version of <span @@ -1022,14 +1016,14 @@ class="ec-lmtt-10x-x-109">makeglossaries</span><a terminal either by typing <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">makeglossaries minimalgls</span></span> - <!--l. 397--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 393--><p class="noindent" ><spacer type=vertical size=10> or by typing <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">perl makeglossaries minimalgls</span></span> - </p><!--l. 401--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 397--><p class="noindent" ><spacer type=vertical size=10> If your system doesn’t recognise the command <span class="ec-lmtt-10x-x-109">perl </span>then it’s likely you don’t have Perl installed. In which case you will need @@ -1043,15 +1037,15 @@ class="ec-lmtt-10x-x-109">makeindex</span><a class="ec-lmtt-10x-x-109">makeindex -s minimalgls.ist -t minimalgls.glg -o</span> <span class="ec-lmtt-10x-x-109">minimalgls.gls minimalgls.glo</span></span> - </p><!--l. 408--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 404--><p class="noindent" ><spacer type=vertical size=10> (See <a -href="#sec:makeindexapp">§1.3.3 </a><a -href="#sec:makeindexapp">Using makeindex explicitly<!--tex4ht:ref: sec:makeindexapp --></a> for further details on +href="#x1-100001.3.3">§1.3.3 </a><a +href="#x1-100001.3.3">Using makeindex explicitly<!--tex4ht:ref: sec:makeindexapp --></a> for further details on using <a id="dx1-4010"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a id="dx1-4011"></a> explicitly.) - </p><!--l. 412--><p class="noindent" >Note that if you need to specify the full path and the path + </p><!--l. 408--><p class="noindent" >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> @@ -1059,7 +1053,7 @@ class="ec-lmtt-10x-x-109">makeindex</span><a class="enumerate" id="x1-4013x3">Run <span class="ec-lmtt-10x-x-109">minimalgls.tex </span>through <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> again (as step 1)</li></ol> - <!--l. 418--><p class="noindent" >You should now have a complete document. The number following + <!--l. 414--><p class="noindent" >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 class="description"> @@ -1075,7 +1069,7 @@ class="ec-lmtt-10x-x-109">latex sample4col</span> class="ec-lmtt-10x-x-109">makeglossaries sample4col</span> <br /><span class="ec-lmtt-10x-x-109">latex sample4col</span></span> - <!--l. 430--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 426--><p class="noindent" ><spacer type=vertical size=10> As before, if you don’t have Perl installed, you will need to use <a id="dx1-4014"></a><a @@ -1086,19 +1080,11 @@ class="ec-lmtt-10x-x-109">makeindex</span><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a id="dx1-4017"></a></a>. The vertical - gap between entries is the gap created at the start of each group. - This can be suppressed by redefining <span -class="ec-lmtt-10x-x-109">\glsgroupskip</span><a - id="dx1-4018"></a> after the - glossary style has been set: - - - -</p> - <div class="verbatim" id="verbatim-1"> - \renewcommand*{\glsgroupskip}{} -</div> - <!--l. 438--><p class="nopar" > + gap between entries is the gap created at the start of each + group. This can be suppressed using the <span +class="ec-lmss-10x-x-109">nogroupskip</span><a + id="dx1-4018"></a> package + option. </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sampleAcr.tex</span> </dt><dd @@ -1109,13 +1095,16 @@ class="E">E</span>X</span></span> is required to ensure the document is u <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">latex sampleAcr</span> + + + <br /><span class="ec-lmtt-10x-x-109">makeglossaries sampleAcr</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleAcr</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleAcr</span></span> - <!--l. 449--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 442--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sampleAcrDesc.tex</span> </dt><dd @@ -1132,7 +1121,7 @@ class="ec-lmtt-10x-x-109">makeglossaries sampleAcrDesc</span> class="ec-lmtt-10x-x-109">latex sampleAcrDesc</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleAcrDesc</span></span> - <!--l. 460--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 453--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sampleDesc.tex</span> </dt><dd @@ -1148,16 +1137,13 @@ class="E">E</span>X</span></span> is required: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">latex sampleDesc</span> - - - <br /><span class="ec-lmtt-10x-x-109">makeglossaries sampleDesc</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleDesc</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleDesc</span></span> - <!--l. 472--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 465--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sample-custom-acronym.tex</span> </dt><dd @@ -1170,7 +1156,10 @@ class="ec-lmtt-10x-x-109">latex sample-custom-acronym</span> class="ec-lmtt-10x-x-109">makeglossaries sample-custom-acronym</span> <br /><span class="ec-lmtt-10x-x-109">latex sample-custom-acronym</span></span> - <!--l. 481--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 474--><p class="noindent" ><spacer type=vertical size=10> + + + </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sample-crossref.tex</span> </dt><dd @@ -1182,7 +1171,7 @@ class="ec-lmtt-10x-x-109">latex sample-crossref</span> class="ec-lmtt-10x-x-109">makeglossaries sample-crossref</span> <br /><span class="ec-lmtt-10x-x-109">latex sample-crossref</span></span> - <!--l. 490--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 483--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sampleDB.tex</span> </dt><dd @@ -1203,7 +1192,7 @@ class="ec-lmtt-10x-x-109">latex sampleDB</span> class="ec-lmtt-10x-x-109">makeglossaries sampleDB</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleDB</span></span> - <!--l. 502--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 495--><p class="noindent" ><spacer type=vertical size=10> The glossary definitions are stored in the accompanying files <span class="ec-lmtt-10x-x-109">database1.tex </span>and <span @@ -1218,9 +1207,6 @@ class="ec-lmtt-10x-x-109">makeindex</span><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a id="dx1-4027"></a></a>: - - - </p><ol class="enumerate1" > <li class="enumerate" id="x1-4029x1">Create the main glossary: <spacer type=vertical size=10><span class="obeylines-h"> @@ -1228,7 +1214,7 @@ class="ec-lmtt-10x-x-109">makeglossaries</span><a class="ec-lmtt-10x-x-109">makeindex -s sampleDB.ist -t sampleDB.glg -o</span> <span class="ec-lmtt-10x-x-109">sampleDB.gls sampleDB.glo</span></span> - <!--l. 511--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 504--><p class="noindent" ><spacer type=vertical size=10> </p></li> <li class="enumerate" id="x1-4031x2">Create the secondary glossary: <spacer type=vertical size=10><span class="obeylines-h"> @@ -1236,13 +1222,16 @@ class="ec-lmtt-10x-x-109">sampleDB.gls sampleDB.glo</span></span> class="ec-lmtt-10x-x-109">makeindex -s sampleDB.ist -t sampleDB.nlg -o</span> <span class="ec-lmtt-10x-x-109">sampleDB.not sampleDB.ntn</span></span> - <!--l. 515--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 508--><p class="noindent" ><spacer type=vertical size=10> </p></li></ol> </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sampleEq.tex</span> </dt><dd class="description"> This document illustrates how to change the location to something other than the page number. In this case, the + + + <span class="ec-lmtt-10x-x-109">equation </span>counter is used since all glossary entries appear inside an <span @@ -1256,7 +1245,7 @@ class="ec-lmtt-10x-x-109">latex sampleEq</span> class="ec-lmtt-10x-x-109">makeglossaries sampleEq</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleEq</span></span> - <!--l. 527--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 520--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sampleEqPg.tex</span> </dt><dd @@ -1276,15 +1265,12 @@ class="ec-lmtt-10x-x-109">makeglossaries sampleEqPg</span> class="ec-lmtt-10x-x-109">latex sampleEqPg</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleEqPg</span></span> - <!--l. 539--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 532--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sampleSec.tex</span> </dt><dd class="description"> This document also illustrates how to change the location to something other than the page number. In this case, the - - - <span class="ec-lmtt-10x-x-109">section </span>counter is used. This example adds the glossary to the table of contents, so an extra <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span @@ -1298,7 +1284,7 @@ class="ec-lmtt-10x-x-109">makeglossaries sampleSec</span> class="ec-lmtt-10x-x-109">latex sampleSec</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleSec</span></span> - <!--l. 551--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 544--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sampleNtn.tex</span> </dt><dd @@ -1308,13 +1294,16 @@ class="description"> This document illustrates how to create an additional class="E">E</span>X</span></span> run is required: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">latex sampleNtn</span> + + + <br /><span class="ec-lmtt-10x-x-109">makeglossaries sampleNtn</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleNtn</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleNtn</span></span> - <!--l. 562--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 555--><p class="noindent" ><spacer type=vertical size=10> Note that if you don’t have Perl installed, you will need to use <a id="dx1-4036"></a><a @@ -1332,7 +1321,7 @@ class="ec-lmtt-10x-x-109">makeglossaries</span><a class="ec-lmtt-10x-x-109">makeindex -s sampleNtn.ist -t sampleNtn.glg -o</span> <span class="ec-lmtt-10x-x-109">sampleNtn.gls sampleNtn.glo</span></span> - <!--l. 570--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 563--><p class="noindent" ><spacer type=vertical size=10> </p></li> <li class="enumerate" id="x1-4043x2">Create the secondary glossary: <spacer type=vertical size=10><span class="obeylines-h"> @@ -1340,7 +1329,7 @@ class="ec-lmtt-10x-x-109">sampleNtn.gls sampleNtn.glo</span></span> class="ec-lmtt-10x-x-109">makeindex -s sampleNtn.ist -t sampleNtn.nlg -o</span> <span class="ec-lmtt-10x-x-109">sampleNtn.not sampleNtn.ntn</span></span> - <!--l. 574--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 567--><p class="noindent" ><spacer type=vertical size=10> </p></li></ol> </dd><dt class="description"> <span @@ -1353,9 +1342,6 @@ class="ec-lmtt-10x-x-109">\glsrefentry</span><a id="dx1-4044"></a>, so an extra <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> run is required: <spacer type=vertical size=10><span class="obeylines-h"> - - - <br /><span class="ec-lmtt-10x-x-109">latex sample</span> <br /><span @@ -1364,7 +1350,7 @@ class="ec-lmtt-10x-x-109">makeglossaries sample</span> class="ec-lmtt-10x-x-109">latex sample</span> <br /><span class="ec-lmtt-10x-x-109">latex sample</span></span> - <!--l. 587--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 580--><p class="noindent" ><spacer type=vertical size=10> You can see the difference between word and letter ordering if you substitute <span class="ec-lmss-10x-x-109">order=word</span><a @@ -1391,6 +1377,9 @@ class="ec-lmtt-10x-x-109">sample.tex</span>, above, but uses the <span class="ec-lmss-10x-x-109">inline</span><a id="dx1-4051"></a> glossary style to put the glossary in a footnote. + + + </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sampletree.tex</span> </dt><dd @@ -1403,7 +1392,7 @@ class="ec-lmtt-10x-x-109">latex sampletree</span> class="ec-lmtt-10x-x-109">makeglossaries sampletree</span> <br /><span class="ec-lmtt-10x-x-109">latex sampletree</span></span> - <!--l. 607--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 600--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sample-dual.tex</span> </dt><dd @@ -1416,7 +1405,7 @@ class="ec-lmtt-10x-x-109">latex sample-dual</span> class="ec-lmtt-10x-x-109">makeglossaries sample-dual</span> <br /><span class="ec-lmtt-10x-x-109">latex sample-dual</span></span> - <!--l. 616--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 609--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sample-langdict</span> </dt><dd @@ -1425,14 +1414,11 @@ class="description"> This document illustrates how to use the glossaries dictionaries. To create the document do: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">latex sample-langdict</span> - - - <br /><span class="ec-lmtt-10x-x-109">makeglossaries sample-langdict</span> <br /><span class="ec-lmtt-10x-x-109">latex sample-langdict</span></span> - <!--l. 626--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 619--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">samplexdy.tex</span> </dt><dd @@ -1465,12 +1451,12 @@ class="ec-lmtt-10x-x-109">samplexdy.xdy</span>, but if you uncomment the - <div class="verbatim" id="verbatim-2"> + <div class="verbatim" id="verbatim-1"> \setStyleFile{samplexdy-mc}  <br />\noist  <br />\GlsSetXdyLanguage{} </div> - <!--l. 639--><p class="nopar" > it will set the style file to <span + <!--l. 632--><p class="nopar" > it will set the style file to <span class="ec-lmtt-10x-x-109">samplexdy-mc.xdy </span>instead. This provides an additional letter group for entries starting with “Mc” or “Mac”. If you use <a @@ -1491,14 +1477,14 @@ class="ec-lmtt-10x-x-109">\noist</span><a class="ec-lmss-10x-x-109">glossaries </span>package will overwrite <span class="ec-lmtt-10x-x-109">samplexdy-mc.xdy </span>and you will lose the “Mc” letter group. - </p><!--l. 651--><p class="noindent" >To create the document do: <spacer type=vertical size=10><span class="obeylines-h"> + </p><!--l. 644--><p class="noindent" >To create the document do: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">latex samplexdy</span> <br /><span class="ec-lmtt-10x-x-109">makeglossaries samplexdy</span> <br /><span class="ec-lmtt-10x-x-109">latex samplexdy</span></span> - </p><!--l. 656--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 649--><p class="noindent" ><spacer type=vertical size=10> If you don’t have Perl installed, you will have to call <a id="dx1-4066"></a><a href="#glo:xindy"><span @@ -1516,7 +1502,7 @@ class="ec-lmtt-10x-x-109">samplexdy.xdy</span>, then do (no line breaks): class="ec-lmtt-10x-x-109">xindy -L english -C utf8 -I xindy -M samplexdy -t</span> <span class="ec-lmtt-10x-x-109">samplexdy.glg -o samplexdy.gls samplexdy.glo</span></span> - </p><!--l. 663--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 656--><p class="noindent" ><spacer type=vertical size=10> otherwise, if you are using <span class="ec-lmtt-10x-x-109">samplexdy-mc.xdy</span>, then do (no line breaks): <spacer type=vertical size=10><span class="obeylines-h"> @@ -1524,7 +1510,7 @@ class="ec-lmtt-10x-x-109">samplexdy-mc.xdy</span>, then do (no line class="ec-lmtt-10x-x-109">xindy -I xindy -M samplexdy-mc -t samplexdy.glg -o</span> <span class="ec-lmtt-10x-x-109">samplexdy.gls samplexdy.glo</span></span> - </p><!--l. 668--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 661--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">samplexdy2.tex</span> </dt><dd @@ -1546,7 +1532,7 @@ class="ec-lmtt-10x-x-109">pdflatex samplexdy2</span> class="ec-lmtt-10x-x-109">makeglossaries samplexdy2</span> <br /><span class="ec-lmtt-10x-x-109">pdflatex samplexdy2</span></span> - <!--l. 678--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 671--><p class="noindent" ><spacer type=vertical size=10> If you can’t use <a id="dx1-4072"></a><a href="#glo:makeglossaries"><span @@ -1556,10 +1542,10 @@ class="ec-lmtt-10x-x-109">makeglossaries</span><a class="ec-lmtt-10x-x-109">xindy -L english -C utf8 -I xindy -M samplexdy2 -t</span> <span class="ec-lmtt-10x-x-109">samplexdy2.glg -o samplexdy2.gls samplexdy2.glo</span></span> - </p><!--l. 682--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 675--><p class="noindent" ><spacer type=vertical size=10> See <a -href="#sec:xindyloc">§11.2 </a><a -href="#sec:xindyloc">Locations and Number lists<!--tex4ht:ref: sec:xindyloc --></a> for further details. +href="#x1-3800011.2">§11.2 </a><a +href="#x1-3800011.2">Locations and Number lists<!--tex4ht:ref: sec:xindyloc --></a> for further details. </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sampleutf8.tex</span> </dt><dd @@ -1585,7 +1571,7 @@ class="ec-lmtt-10x-x-109">latex sampleutf8</span> class="ec-lmtt-10x-x-109">makeglossaries sampleutf8</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleutf8</span></span> - <!--l. 693--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 686--><p class="noindent" ><spacer type=vertical size=10> If you don’t have Perl installed, you will have to call <a id="dx1-4080"></a><a href="#glo:xindy"><span @@ -1601,8 +1587,8 @@ class="ec-lmtt-10x-x-109">makeglossaries</span><a class="ec-lmtt-10x-x-109">xindy -L english -C utf8 -I xindy -M sampleutf8 -t</span> <span class="ec-lmtt-10x-x-109">sampleutf8.glg -o sampleutf8.gls sampleutf8.glo</span></span> - </p><!--l. 699--><p class="noindent" ><spacer type=vertical size=10> - </p><!--l. 701--><p class="noindent" >If you remove the <span + </p><!--l. 692--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 694--><p class="noindent" >If you remove the <span class="ec-lmss-10x-x-109">xindy</span><a id="dx1-4084"></a> option from <span class="ec-lmtt-10x-x-109">sampleutf8.tex </span>and do: @@ -1613,7 +1599,7 @@ class="ec-lmtt-10x-x-109">latex sampleutf8</span> class="ec-lmtt-10x-x-109">makeglossaries sampleutf8</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleutf8</span></span> - </p><!--l. 707--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 700--><p class="noindent" ><spacer type=vertical size=10> 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 @@ -1634,7 +1620,7 @@ class="ec-lmtt-10x-x-109">sampleutf8.gls sampleutf8.glo</span></span> - </p><!--l. 715--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 708--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sampleaccsupp.tex</span> </dt><dd @@ -1645,16 +1631,16 @@ class="ec-lmss-10x-x-109">glossaries-accsupp</span><a PDF viewers don’t use the accessibility support. Information about the <span class="ec-lmss-10x-x-109">glossaries-accsupp </span>package can be found in <a -href="#sec:accsupp">§18 </a><a -href="#sec:accsupp">Accessibility +href="#x1-6100018">§18 </a><a +href="#x1-6100018">Accessibility Support<!--tex4ht:ref: sec:accsupp --></a>. </dd></dl> -<!--l. 727--><p class="noindent" > +<!--l. 720--><p class="noindent" > </p> -<!--l. 727--><p class="noindent" ><a +<!--l. 720--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">1.2</span>  <a - id="sec:languages"></a>Multi-Lingual Support</h3> -<!--l. 730--><p class="noindent" >As from version 1.17, the <span + id="x1-50001.2"></a>Multi-Lingual Support</h3> +<!--l. 723--><p class="noindent" >As from version 1.17, the <span class="ec-lmss-10x-x-109">glossaries </span>package can now be used with <a id="dx1-5001"></a><a href="#glo:xindy"><span @@ -1685,18 +1671,18 @@ example: </p> - <div class="verbatim" id="verbatim-3"> + <div class="verbatim" id="verbatim-2"> \documentclass[frenchb]{article}  <br />\usepackage[utf8]{inputenc}  <br />\usepackage[T1]{fontenc}  <br />\usepackage{babel}  <br />\usepackage[xindy]{glossaries} </div> -<!--l. 744--><p class="nopar" > -</p><!--l. 746--><p class="indent" > <div class="important" title="Important Note"> Note that although an accented character, such as é, looks like a plain +<!--l. 737--><p class="nopar" > +</p><!--l. 739--><p class="indent" > <div class="important" title="Important Note"> Note that although an accented character, such as é, looks like a plain character in your tex file, it’s actually a macro and can therefore cause problems. -</p><!--l. 751--><p class="indent" > +</p><!--l. 744--><p class="indent" > </p><ol class="enumerate1" > <li class="enumerate" id="x1-5013x1">If you use an accented (or other expandable) character at @@ -1709,11 +1695,11 @@ class="ec-lmtt-10x-x-109">\Gls</span><a - <div class="verbatim" id="verbatim-4"> - \newglossaryentry{elite}{name={{é}lite}, + <div class="verbatim" id="verbatim-3"> + \newglossaryentry{elite}{name={{é}lite},  <br />description={select group or class}} </div> - <!--l. 760--><p class="nopar" > + <!--l. 753--><p class="nopar" > </p></li> <li class="enumerate" id="x1-5016x2">If you use an accented (or other expandable) character in an entry @@ -1736,8 +1722,8 @@ class="ec-lmtt-10x-x-109">\glsname</span><a characters in your document. </li></ol> </div> -<!--l. 770--><p class="noindent" > -</p><!--l. 772--><p class="indent" > If you use the <span +<!--l. 763--><p class="noindent" > +</p><!--l. 765--><p class="indent" > If you use the <span class="ec-lmss-10x-x-109">inputenc</span><a id="dx1-5024"></a> package, <a id="dx1-5025"></a><a @@ -1758,12 +1744,12 @@ option. Read the <a id="dx1-5031"></a><span class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-5032"></a> manual for further details. -</p><!--l. 778--><p class="noindent" > +</p><!--l. 771--><p class="noindent" > </p> -<!--l. 778--><p class="noindent" ><a +<!--l. 771--><p class="noindent" ><a href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">1.2.1</span>  <a - id="sec:fixednames"></a>Changing the Fixed Names</h4> -<!--l. 781--><p class="noindent" >As from version 1.08, the <span + id="x1-60001.2.1"></a>Changing the Fixed Names</h4> +<!--l. 774--><p class="noindent" >As from version 1.08, the <span class="ec-lmss-10x-x-109">glossaries </span>package now has limited multi-lingual support, thanks to all the people who have sent me the relevant translations either via email or via <span @@ -1793,24 +1779,24 @@ languages. For example: </p> - <div class="verbatim" id="verbatim-5"> + <div class="verbatim" id="verbatim-4"> \usepackage[spanish]{babel}  <br />\usepackage[spanish]{translator}  <br />\usepackage{glossaries} </div> -<!--l. 796--><p class="nopar" > Alternatively, specify the language as a class option rather than a package +<!--l. 789--><p class="nopar" > Alternatively, specify the language as a class option rather than a package option. For example: </p> - <div class="verbatim" id="verbatim-6"> + <div class="verbatim" id="verbatim-5"> \documentclass[spanish]{report}  <br />\usepackage{babel}  <br />\usepackage{glossaries} </div> -<!--l. 804--><p class="nopar" > -</p><!--l. 806--><p class="indent" > If you want to use <span +<!--l. 797--><p class="nopar" > +</p><!--l. 799--><p class="indent" > If you want to use <span class="ec-lmss-10x-x-109">ngerman</span><a id="dx1-6007"></a> or <span class="ec-lmss-10x-x-109">german</span><a @@ -1825,14 +1811,14 @@ example: </p> - <div class="verbatim" id="verbatim-7"> + <div class="verbatim" id="verbatim-6"> \documentclass[ngerman]{article}  <br />\usepackage{ngerman}  <br />\usepackage{translator}  <br />\usepackage{glossaries} </div> -<!--l. 814--><p class="nopar" > -</p><!--l. 816--><p class="indent" > The languages are currently supported by the <span +<!--l. 807--><p class="nopar" > +</p><!--l. 809--><p class="indent" > The languages are currently supported by the <span class="ec-lmss-10x-x-109">glossaries </span>package are listed in <a href="#x1-60111">table 1.1</a>. Please note that (apart from spelling mistakes) I don’t @@ -1841,7 +1827,7 @@ problems. -</p><!--l. 822--><p class="indent" > <a +</p><!--l. 815--><p class="indent" > <a id="x1-60111"></a></p><hr class="float" /><div class="float" > @@ -1852,7 +1838,7 @@ problems. class="content">Supported Languages</td></tr></table></div><!--tex4ht:label?: x1-60111 --> <div class="center" > -<!--l. 825--><p class="noindent" > +<!--l. 818--><p class="noindent" > </p> <div class="tabular"> <table id="TBL-2" class="tabular" cellspacing="0" cellpadding="0" @@ -1915,7 +1901,7 @@ class="td11"> 1.08 </td></tr></table></div></div> </div><hr class="endfloat" /> -<!--l. 844--><p class="indent" > The language dependent commands and <span +<!--l. 837--><p class="indent" > The language dependent commands and <span class="ec-lmss-10x-x-109">translator</span><a id="dx1-6012"></a> keys used by the glossaries package are listed in <a @@ -1923,7 +1909,7 @@ href="#x1-60132">table 1.2</a>. -</p><!--l. 847--><p class="indent" > <a +</p><!--l. 840--><p class="indent" > <a id="x1-60132"></a></p><hr class="float" /><div class="float" > @@ -1944,22 +1930,22 @@ id="TBL-3-3" /></colgroup><tr style="vertical-align:baseline;" id="TBL-3-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-1-1" class="td01"><span class="ec-lmbx-10x-x-109">Command Name </span></td><td style="white-space:wrap; text-align:left;" id="TBL-3-1-2" -class="td11"> <!--l. 853--><p class="noindent" ><span +class="td11"> <!--l. 846--><p class="noindent" ><span class="ec-lmbx-10x-x-109">Translator</span> <span class="ec-lmbx-10x-x-109">Key</span> <span class="ec-lmbx-10x-x-109">Word</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-1-3" -class="td10"> <!--l. 854--><p class="noindent" ><span +class="td10"> <!--l. 847--><p class="noindent" ><span class="ec-lmbx-10x-x-109">Purpose</span> </p></td> </tr><tr style="vertical-align:baseline;" id="TBL-3-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-2-1" class="td01"><span class="ec-lmtt-10x-x-109">\glossaryname</span><a id="dx1-6014"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-2-2" -class="td11"> <!--l. 855--><p class="noindent" ><span +class="td11"> <!--l. 848--><p class="noindent" ><span class="ec-lmtt-10x-x-109">Glossary</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-2-3" -class="td10"> <!--l. 855--><p class="noindent" >Title +class="td10"> <!--l. 848--><p class="noindent" >Title of the main @@ -1969,9 +1955,9 @@ class="td10"> <!--l. 855--><p class="noindent" >Title class="td01"><span class="ec-lmtt-10x-x-109">\acronymname</span><a id="dx1-6015"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-3-2" -class="td11"> <!--l. 856--><p class="noindent" ><span +class="td11"> <!--l. 849--><p class="noindent" ><span class="ec-lmtt-10x-x-109">Acronyms</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-3-3" -class="td10"> <!--l. 856--><p class="noindent" >Title +class="td10"> <!--l. 849--><p class="noindent" >Title of the list @@ -1990,11 +1976,11 @@ class="ec-lmss-10x-x-109">acronym</span><a class="td01"><span class="ec-lmtt-10x-x-109">\entryname</span><a id="dx1-6017"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-4-2" -class="td11"> <!--l. 858--><p class="noindent" ><span +class="td11"> <!--l. 851--><p class="noindent" ><span class="ec-lmtt-10x-x-109">Notation</span> <span class="ec-lmtt-10x-x-109">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-4-3" -class="td10"> <!--l. 859--><p class="noindent" >Header +class="td10"> <!--l. 852--><p class="noindent" >Header for first column @@ -2016,11 +2002,11 @@ class="td10"> <!--l. 859--><p class="noindent" >Header class="td01"><span class="ec-lmtt-10x-x-109">\descriptionname</span><a id="dx1-6018"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-5-2" -class="td11"> <!--l. 861--><p class="noindent" ><span +class="td11"> <!--l. 854--><p class="noindent" ><span class="ec-lmtt-10x-x-109">Description</span> <span class="ec-lmtt-10x-x-109">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-5-3" -class="td10"> <!--l. 862--><p class="noindent" >Header +class="td10"> <!--l. 855--><p class="noindent" >Header for second column @@ -2042,11 +2028,11 @@ class="td10"> <!--l. 862--><p class="noindent" >Header class="td01"><span class="ec-lmtt-10x-x-109">\symbolname</span><a id="dx1-6019"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-6-2" -class="td11"> <!--l. 864--><p class="noindent" ><span +class="td11"> <!--l. 857--><p class="noindent" ><span class="ec-lmtt-10x-x-109">Symbol</span> <span class="ec-lmtt-10x-x-109">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-6-3" -class="td10"> <!--l. 864--><p class="noindent" >Header +class="td10"> <!--l. 857--><p class="noindent" >Header for symbol column @@ -2065,13 +2051,13 @@ class="td10"> <!--l. 864--><p class="noindent" >Header class="td01"><span class="ec-lmtt-10x-x-109">\pagelistname</span><a id="dx1-6020"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-7-2" -class="td11"> <!--l. 866--><p class="noindent" ><span +class="td11"> <!--l. 859--><p class="noindent" ><span class="ec-lmtt-10x-x-109">Page</span> <span class="ec-lmtt-10x-x-109">List</span> <span class="ec-lmtt-10x-x-109">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-7-3" -class="td10"> <!--l. 867--><p class="noindent" >Header +class="td10"> <!--l. 860--><p class="noindent" >Header for page list @@ -2090,11 +2076,11 @@ class="td10"> <!--l. 867--><p class="noindent" >Header class="td01"><span class="ec-lmtt-10x-x-109">\glssymbolsgroupname</span><a id="dx1-6021"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-8-2" -class="td11"> <!--l. 869--><p class="noindent" ><span +class="td11"> <!--l. 862--><p class="noindent" ><span class="ec-lmtt-10x-x-109">Symbols</span> <span class="ec-lmtt-10x-x-109">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-8-3" -class="td10"> <!--l. 870--><p class="noindent" >Header +class="td10"> <!--l. 863--><p class="noindent" >Header for symbols section @@ -2113,11 +2099,11 @@ class="td10"> <!--l. 870--><p class="noindent" >Header class="td01"><span class="ec-lmtt-10x-x-109">\glsnumbersgroupname</span><a id="dx1-6022"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-9-2" -class="td11"> <!--l. 872--><p class="noindent" ><span +class="td11"> <!--l. 865--><p class="noindent" ><span class="ec-lmtt-10x-x-109">Numbers</span> <span class="ec-lmtt-10x-x-109">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-9-3" -class="td10"> <!--l. 872--><p class="noindent" >Header +class="td10"> <!--l. 865--><p class="noindent" >Header for numbers section @@ -2139,7 +2125,7 @@ class="td10"> <!--l. 872--><p class="noindent" >Header </div><hr class="endfloat" /> -<!--l. 878--><p class="indent" > Due to the varied nature of glossaries, it’s likely that the predefined +<!--l. 871--><p class="indent" > Due to the varied nature of glossaries, it’s likely that the predefined translations may not be appropriate. If you are using the <span class="ec-lmss-10x-x-109">babel</span><a id="dx1-6023"></a> package @@ -2155,7 +2141,7 @@ the necessary modifications (using <span class="ec-lmtt-10x-x-109">\deftranslation</span>) and load it using <span class="ec-lmtt-10x-x-109">\usedictionary</span>. -</p><!--l. 888--><p class="indent" > <div class="important" title="Important Note"> Note that the dictionaries are loaded at the beginning of the document, +</p><!--l. 881--><p class="indent" > <div class="important" title="Important Note"> Note that the dictionaries are loaded at the beginning of the document, so it won’t have any effect if you put <span class="ec-lmtt-10x-x-109">\deftranslation </span>in the preamble. It should be put in your personal dictionary instead (as in the example @@ -2165,8 +2151,8 @@ class="ec-lmss-10x-x-109">translator</span><a <span class="ec-lmss-10x-x-109">beamer</span><a id="dx1-6027"></a> documentation.) </div> -</p><!--l. 895--><p class="noindent" > -</p><!--l. 897--><p class="indent" > Your custom dictionary doesn’t have to be just a translation from +</p><!--l. 888--><p class="noindent" > +</p><!--l. 890--><p class="indent" > Your custom dictionary doesn’t have to be just a translation from English to another language. You may prefer to have a dictionary for a particular type of document. For example, suppose your institution’s in-house reports have to have the glossary labelled as “Nomenclature” and @@ -2176,34 +2162,34 @@ called, say, </p> - <div class="verbatim" id="verbatim-8"> + <div class="verbatim" id="verbatim-7"> myinstitute-glossaries-dictionary-English.dict </div> -<!--l. 905--><p class="nopar" > that contains the following: +<!--l. 898--><p class="nopar" > that contains the following: </p> - <div class="verbatim" id="verbatim-9"> + <div class="verbatim" id="verbatim-8"> \ProvidesDictionary{myinstitute-glossaries-dictionary}{English}  <br />\deftranslation{Glossary}{Nomenclature}  <br />\deftranslation{Page List (glossaries)}{Location} </div> -<!--l. 911--><p class="nopar" > You can now load it using: +<!--l. 904--><p class="nopar" > You can now load it using: </p> - <div class="verbatim" id="verbatim-10"> + <div class="verbatim" id="verbatim-9"> \usedictionary{myinstitute-glossaries-dictionary} </div> -<!--l. 915--><p class="nopar" > (Make sure that <span +<!--l. 908--><p class="nopar" > (Make sure that <span class="ec-lmtt-10x-x-109">myinstitute-glossaries-dictionary-English.dict</span> can be found by <span class="TEX">T<span class="E">E</span>X</span>.) If you want to share your custom dictionary, you can upload it to <a href="http://www.ctan.org/" >CTAN</a>. -</p><!--l. 920--><p class="indent" > If you are using <span +</p><!--l. 913--><p class="indent" > If you are using <span class="ec-lmss-10x-x-109">babel</span><a id="dx1-6028"></a> and don’t want to use the <span class="ec-lmss-10x-x-109">translator</span><a @@ -2220,18 +2206,18 @@ example: </p> - <div class="verbatim" id="verbatim-11"> + <div class="verbatim" id="verbatim-10"> \documentclass[british]{article}  <br />\usepackage{babel}  <br />\usepackage[translate=false]{glossaries}  <br />\usepackage{glossaries-babel} </div> -<!--l. 931--><p class="nopar" > or: +<!--l. 924--><p class="nopar" > or: </p> - <div class="verbatim" id="verbatim-12"> + <div class="verbatim" id="verbatim-11"> \documentclass[british]{article}  <br />\usepackage{babel}  <br />\usepackage[translate=false]{glossaries} @@ -2246,8 +2232,8 @@ example:  <br />    \renewcommand*{\glsnumbersgroupname}{Numbers}%  <br />} </div> -<!--l. 949--><p class="nopar" > -</p><!--l. 951--><p class="indent" > If you are using <span +<!--l. 942--><p class="nopar" > +</p><!--l. 944--><p class="indent" > If you are using <span class="ec-lmss-10x-x-109">polyglossia</span><a id="dx1-6032"></a> instead of <span class="ec-lmss-10x-x-109">babel</span><a @@ -2258,7 +2244,7 @@ will automatically be loaded unless you specify the package option <span class="ec-lmss-10x-x-109">translate=false</span><a id="dx1-6035"></a>. -</p><!--l. 955--><p class="indent" > Note that <a +</p><!--l. 948--><p class="indent" > Note that <a id="dx1-6036"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a @@ -2272,14 +2258,14 @@ class="ec-lmtt-10x-x-109">makeindex</span><a class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-6041"></a> if you have glossary entries that contain diacritics or non-Roman letters. See <a -href="#sec:xindy">§11 </a><a -href="#sec:xindy">Xindy<!--tex4ht:ref: sec:xindy --></a> for +href="#x1-3600011">§11 </a><a +href="#x1-3600011">Xindy<!--tex4ht:ref: sec:xindy --></a> for further details. </p> -<!--l. 961--><p class="noindent" ><a +<!--l. 954--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">1.3</span>  <a - id="sec:makeglossaries"></a>Generating the Associated Glossary Files</h3> -<!--l. 964--><p class="noindent" >In order to generate a sorted glossary with compact <a + id="x1-70001.3"></a>Generating the Associated Glossary Files</h3> +<!--l. 957--><p class="noindent" >In order to generate a sorted glossary with compact <a id="dx1-7001"></a><a href="#glo:locationlist">location lists</a>, it is necessary to use an external indexing application as an intermediate step. @@ -2317,13 +2303,13 @@ that only have an effect when <a id="dx1-7014"></a><span class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-7015"></a> is used are described in <a -href="#sec:xindy">§11 +href="#x1-3600011">§11 </a><a -href="#sec:xindy">Xindy<!--tex4ht:ref: sec:xindy --></a>. +href="#x1-3600011">Xindy<!--tex4ht:ref: sec:xindy --></a>. -</p><!--l. 979--><p class="indent" > The <span +</p><!--l. 972--><p class="indent" > The <span class="ec-lmss-10x-x-109">glossaries </span>package comes with the Perl script <a id="dx1-7016"></a><a href="#glo:makeglossaries"><span @@ -2342,8 +2328,8 @@ customized style file (which is created by <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a id="dx1-7022"></a>). See <a -href="#sec:makeglossariesapp">§1.3.1 </a><a -href="#sec:makeglossariesapp">Using the makeglossaries Perl Script<!--tex4ht:ref: sec:makeglossariesapp --></a> for further details. Perl +href="#x1-80001.3.1">§1.3.1 </a><a +href="#x1-80001.3.1">Using the makeglossaries Perl Script<!--tex4ht:ref: sec:makeglossariesapp --></a> for further details. Perl is stable, cross-platform, open source software that is used by a number of <span class="TEX">T<span class="E">E</span>X</span>-related applications. Further information is available @@ -2402,13 +2388,13 @@ class="ec-lmtt-10x-x-109">makeindex</span><a class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-7044"></a> messages. </li></ul> -<!--l. 1005--><p class="indent" > There is also a Java GUI alternative called <a +<!--l. 998--><p class="indent" > There is also a Java GUI alternative called <a id="dx1-7045"></a><a href="#glo:makeglossariesgui"><span class="ec-lmtt-10x-x-109">makeglossariesgui</span><a id="dx1-7046"></a></a>, distributed separately, that has diagnostic tools. -</p><!--l. 1008--><p class="indent" > Whilst it is strongly recommended that you use the <a +</p><!--l. 1001--><p class="indent" > Whilst it is strongly recommended that you use the <a id="dx1-7047"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a @@ -2429,7 +2415,7 @@ class="ec-lmtt-10x-x-109">makeglossaries</span><a class="ec-lmtt-10x-x-109">makeglossariesgui</span><a id="dx1-7054"></a>. These are listed in <a href="#x1-70873">table 1.3</a>. -</p><!--l. 1016--><p class="indent" > <div class="important" title="Important Note"> If you are choosing not to use <a +</p><!--l. 1009--><p class="indent" > <div class="important" title="Important Note"> If you are choosing not to use <a id="dx1-7055"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a id="dx1-7056"></a> because you don’t want @@ -2441,8 +2427,8 @@ class="ec-lmtt-10x-x-109">makeindex</span><a class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-7060"></a> also requires Perl. </div> -</p><!--l. 1020--><p class="noindent" > -</p><!--l. 1022--><p class="indent" > Note that if any of your entries use an entry that is not referenced outside +</p><!--l. 1013--><p class="noindent" > +</p><!--l. 1015--><p class="indent" > Note that if any of your entries use an entry that is not referenced outside the glossary, you will need to do an additional <a id="dx1-7061"></a><a href="#glo:makeglossaries"><span @@ -2464,14 +2450,14 @@ href="#fn2x3" id="fn2x3-bk"><sup class="textsuperscript">2</sup></a></span><a </p> - <div class="verbatim" id="verbatim-13"> + <div class="verbatim" id="verbatim-12"> \newglossaryentry{citrusfruit}{name={citrus fruit},  <br />description={fruit of any citrus tree. (See also  <br />\gls{orange})}}  <br />\newglossaryentry{orange}{name={orange},  <br />description={an orange coloured fruit.}} </div> -<!--l. 1035--><p class="nopar" > and suppose you have <span class="obeylines-h"><span class="verb"><span +<!--l. 1028--><p class="nopar" > and suppose you have <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls{citrusfruit}</span></span></span> in your document but don’t reference the <span class="ec-lmtt-10x-x-109">orange </span>entry, then the <span @@ -2502,8 +2488,8 @@ class="ec-lmtt-10x-x-109">latex myDoc</span> class="ec-lmtt-10x-x-109">makeglossaries myDoc</span> <br /><span class="ec-lmtt-10x-x-109">latex myDoc</span></span> -</p><!--l. 1049--><p class="indent" > <spacer type=vertical size=10> -</p><!--l. 1051--><p class="indent" > Likewise, an additional <a +</p><!--l. 1042--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1044--><p class="indent" > Likewise, an additional <a id="dx1-7075"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a @@ -2518,7 +2504,7 @@ page boundaries, which means that the <a href="#glo:numberlist">number list<a id="dx1-7078"></a>s</a> in the glossary may need updating. -</p><!--l. 1059--><p class="indent" > The examples in this document assume that you are accessing +</p><!--l. 1052--><p class="indent" > The examples in this document assume that you are accessing <a id="dx1-7079"></a><a href="#glo:makeglossaries"><span @@ -2537,7 +2523,7 @@ the <span class="ec-lmss-10x-x-109">Start->All Programs </span>menu or <span class="ec-lmss-10x-x-109">Start->All Programs->Accessories</span> menu. -</p><!--l. 1065--><p class="indent" > Alternatively, your text editor may have the facility to create +</p><!--l. 1058--><p class="indent" > Alternatively, your text editor may have the facility to create a function that will call the required application. The article <a href="http://www.latex-community.org/index.php?option=com_content&view=article&id=263:glossaries-nomenclature-lists-of-symbols-and-acronyms&catid=55:latex-general&Itemid=114" >“Glossaries, Nomenclature, List of Symbols and Acronyms”</a> in the @@ -2550,7 +2536,7 @@ WinEdt macro”</a> on the <span class="ec-lmtt-10x-x-109">comp.text.tex </span>newsgroup describes how to do it for WinEdt. For other editors see the editor’s user manual for further details. -</p><!--l. 1077--><p class="indent" > If any problems occur, remember to check the transcript files (e.g. <span +</p><!--l. 1070--><p class="indent" > If any problems occur, remember to check the transcript files (e.g. <span class="ec-lmtt-10x-x-109">.glg</span><a id="dx1-7085"></a> or <span @@ -2562,7 +2548,7 @@ class="ec-lmtt-10x-x-109">.alg</span><a -</p><!--l. 1080--><p class="indent" > <a +</p><!--l. 1073--><p class="indent" > <a id="x1-70873"></a></p><hr class="float" /><div class="float" > @@ -2669,10 +2655,10 @@ class="lmsy-10x-x-109">⟩ </span></td></tr></table> </div><hr class="endfloat" /> -<!--l. 1102--><p class="noindent" ><a +<!--l. 1095--><p class="noindent" ><a href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">1.3.1</span>  <a - id="sec:makeglossariesapp"></a>Using the makeglossaries Perl Script</h4> -<!--l. 1105--><p class="noindent" >The <a + id="x1-80001.3.1"></a>Using the makeglossaries Perl Script</h4> +<!--l. 1098--><p class="noindent" >The <a id="dx1-8001"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a @@ -2702,7 +2688,7 @@ class="ec-lmtt-10x-x-109">latex myDoc</span> class="ec-lmtt-10x-x-109">makeglossaries myDoc</span> <br /><span class="ec-lmtt-10x-x-109">latex myDoc</span></span> -</p><!--l. 1116--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1109--><p class="indent" > <spacer type=vertical size=10> You may need to explicitly load <a id="dx1-8010"></a><a href="#glo:makeglossaries"><span @@ -2710,12 +2696,12 @@ class="ec-lmtt-10x-x-109">makeglossaries</span><a id="dx1-8011"></a></a> into Perl: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">perl makeglossaries myDoc</span></span> -</p><!--l. 1120--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1113--><p class="indent" > <spacer type=vertical size=10> There is a batch file called <span class="ec-lmtt-10x-x-109">makeglossaries.bat </span>which does this for Windows users, but you must have Perl installed to be able to use it. -</p><!--l. 1125--><p class="indent" > The <a +</p><!--l. 1118--><p class="indent" > The <a id="dx1-8012"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a @@ -2732,20 +2718,20 @@ class="ec-lmtt-10x-x-109">makeglossaries --help </span>for a list of all options class="ec-lmtt-10x-x-109">makeglossaries</span> <span class="ec-lmtt-10x-x-109">--version </span>for the version number. -</p><!--l. 1132--><p class="indent" > <div class="important" title="Important Note"> When upgrading the <span +</p><!--l. 1125--><p class="indent" > <div class="important" title="Important Note"> When upgrading the <span class="ec-lmss-10x-x-109">glossaries </span>package, make sure you also upgrade your version of <a id="dx1-8017"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a id="dx1-8018"></a></a>. The current version is 2.04. </div> -</p><!--l. 1136--><p class="noindent" > -</p><!--l. 1138--><p class="noindent" > +</p><!--l. 1129--><p class="noindent" > +</p><!--l. 1131--><p class="noindent" > </p> -<!--l. 1138--><p class="noindent" ><a +<!--l. 1131--><p class="noindent" ><a href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">1.3.2</span>  <a - id="sec:xindyapp"></a>Using xindy explicitly</h4> -<!--l. 1141--><p class="noindent" ><a + id="x1-90001.3.2"></a>Using xindy explicitly</h4> +<!--l. 1134--><p class="noindent" ><a id="dx1-9001"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">Xindy</span><a @@ -2755,7 +2741,7 @@ href="http://www.latex-community.org/forum/viewtopic.php?f=51&t=5383" >a thread< <a href="http://www.latex-community.org/" ><span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> Community</a> that describes how to do this. -</p><!--l. 1148--><p class="indent" > If you want to use <a +</p><!--l. 1141--><p class="indent" > If you want to use <a id="dx1-9003"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a @@ -2767,10 +2753,10 @@ class="ec-lmss-10x-x-109">xindy</span><a </p> - <div class="verbatim" id="verbatim-14"> + <div class="verbatim" id="verbatim-13"> \usepackage[xindy]{glossaries} </div> -<!--l. 1153--><p class="nopar" > This is required regardless of whether you use <a +<!--l. 1146--><p class="nopar" > This is required regardless of whether you use <a id="dx1-9006"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a @@ -2792,7 +2778,7 @@ to use <span class="ec-lmtt-10x-x-109">-I xindy </span><span class="ec-lmri-10x-x-109">not </span><span class="ec-lmtt-10x-x-109">-I tex</span>. -</p><!--l. 1160--><p class="indent" > To run <a +</p><!--l. 1153--><p class="indent" > To run <a id="dx1-9014"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a @@ -2825,7 +2811,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">base</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">.glo</span></span> -</p><!--l. 1164--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1157--><p class="indent" > <spacer type=vertical size=10> where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">language</span><span @@ -2866,7 +2852,7 @@ class="ec-lmtt-10x-x-109">}</span>. You may need to specify the full path name depending on the current working directory. If any of the file names contain spaces, you must delimit them using double-quotes. -</p><!--l. 1175--><p class="indent" > For example, if your document is called <span +</p><!--l. 1168--><p class="indent" > For example, if your document is called <span class="ec-lmtt-10x-x-109">myDoc.tex </span>and you are using UTF8 encoding in English, then type the following in your terminal: <spacer type=vertical size=10><span class="obeylines-h"> @@ -2874,8 +2860,8 @@ UTF8 encoding in English, then type the following in your terminal: class="ec-lmtt-10x-x-109">xindy -L english -C utf8 -I xindy -M myDoc -t myDoc.glg -o</span> <span class="ec-lmtt-10x-x-109">myDoc.gls myDoc.glo</span></span> -</p><!--l. 1180--><p class="indent" > <spacer type=vertical size=10> -</p><!--l. 1182--><p class="indent" > Note that this just creates the main glossary. You need to do the same +</p><!--l. 1173--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1175--><p class="indent" > 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 <span class="ec-lmss-10x-x-109">acronym</span><a @@ -2895,12 +2881,12 @@ class="ec-lmss-10x-x-109">acronym</span><a class="ec-lmtt-10x-x-109">xindy -L english -C utf8 -I xindy -M myDoc -t myDoc.alg -o</span> <span class="ec-lmtt-10x-x-109">myDoc.acr myDoc.acn</span></span> -</p><!--l. 1191--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1184--><p class="indent" > <spacer type=vertical size=10> For additional glossaries, the extensions are those supplied when you created the glossary with <span class="ec-lmtt-10x-x-109">\newglossary</span><a id="dx1-9027"></a>. -</p><!--l. 1195--><p class="indent" > Note that if you use <a +</p><!--l. 1188--><p class="indent" > Note that if you use <a id="dx1-9028"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a @@ -2918,7 +2904,7 @@ class="ec-lmtt-10x-x-109">makeglossaries</span><a <br /><span class="ec-lmtt-10x-x-109">makeglossaries myDoc</span></span> -</p><!--l. 1200--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1193--><p class="indent" > <spacer type=vertical size=10> Note also that some commands and package options have no effect if you use <a id="dx1-9034"></a><a @@ -2930,12 +2916,12 @@ class="ec-lmtt-10x-x-109">makeglossaries</span><a id="dx1-9037"></a>. These are listed in <a href="#x1-70873">table 1.3</a>. -</p><!--l. 1207--><p class="noindent" > +</p><!--l. 1200--><p class="noindent" > </p> -<!--l. 1207--><p class="noindent" ><a +<!--l. 1200--><p class="noindent" ><a href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">1.3.3</span>  <a - id="sec:makeindexapp"></a>Using makeindex explicitly</h4> -<!--l. 1210--><p class="noindent" >If you want to use <a + id="x1-100001.3.3"></a>Using makeindex explicitly</h4> +<!--l. 1203--><p class="noindent" >If you want to use <a id="dx1-10001"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a @@ -2966,7 +2952,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">base</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">.glo</span></span> -</p><!--l. 1217--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1210--><p class="indent" > <spacer type=vertical size=10> where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">base</span><span @@ -3002,12 +2988,12 @@ class="ec-lmtt-10x-x-109">-l </span>(letter ordering). See the <a class="ec-lmtt-10x-x-109">makeindex</span><a id="dx1-10013"></a> manual for further details. -</p><!--l. 1226--><p class="indent" > For example, if your document is called <span +</p><!--l. 1219--><p class="indent" > For example, if your document is called <span class="ec-lmtt-10x-x-109">myDoc.tex</span>, then type the following at the terminal: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">makeindex -s myDoc.ist -t myDoc.glg -o myDoc.gls myDoc.glo</span></span> -</p><!--l. 1230--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1223--><p class="indent" > <spacer type=vertical size=10> Note that this only creates the main glossary. If you have additional glossaries (for example, if you have used the <span class="ec-lmss-10x-x-109">acronym</span><a @@ -3030,12 +3016,12 @@ class="ec-lmss-10x-x-109">acronym</span><a terminal: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">makeindex -s myDoc.ist -t myDoc.alg -o myDoc.acr myDoc.acn</span></span> -</p><!--l. 1241--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1234--><p class="indent" > <spacer type=vertical size=10> For additional glossaries, the extensions are those supplied when you created the glossary with <span class="ec-lmtt-10x-x-109">\newglossary</span><a id="dx1-10021"></a>. -</p><!--l. 1245--><p class="indent" > Note that if you use <a +</p><!--l. 1238--><p class="indent" > Note that if you use <a id="dx1-10022"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a @@ -3051,7 +3037,7 @@ class="ec-lmtt-10x-x-109">makeglossaries</span><a <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">makeglossaries myDoc</span></span> -</p><!--l. 1250--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1243--><p class="indent" > <spacer type=vertical size=10> Note also that some commands and package options have no effect if you use <a id="dx1-10028"></a><span @@ -3066,12 +3052,12 @@ class="ec-lmtt-10x-x-109">makeglossaries</span><a listed in <a href="#x1-70873">table 1.3</a>. -</p><!--l. 1257--><p class="noindent" > +</p><!--l. 1250--><p class="noindent" > </p> -<!--l. 1257--><p class="noindent" ><a +<!--l. 1250--><p class="noindent" ><a href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">1.3.4</span>  <a - id="sec:notedev"></a>Note to Front-End and Script Developers</h4> -<!--l. 1260--><p class="noindent" >The information needed to determine whether to use <a + id="x1-110001.3.4"></a>Note to Front-End and Script Developers</h4> +<!--l. 1253--><p class="noindent" >The information needed to determine whether to use <a id="dx1-11001"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a @@ -3084,8 +3070,8 @@ and the information needed to call those applications is stored in the auxiliary file. This information can be gathered by a front-end, editor or script to make the glossaries where appropriate. This section describes how the information is stored in the auxiliary file. -</p><!--l. 1267--><p class="indent" > The file extensions used by each defined glossary are given by -</p><!--l. 1268--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1260--><p class="indent" > The file extensions used by each defined glossary are given by +</p><!--l. 1261--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\@newglossary</span><span class="ec-lmtt-10"> </span></span><a id="dx1-11005"></a> <span @@ -3107,7 +3093,7 @@ class="ec-lmri-10x-x-109">in-ext</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 1270--><p class="noindent" > +</p><!--l. 1263--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">in-ext</span><span @@ -3133,12 +3119,12 @@ as: </p> - <div class="verbatim" id="verbatim-15"> + <div class="verbatim" id="verbatim-14"> \@newglossary{main}{glg}{gls}{glo} </div> -<!--l. 1282--><p class="nopar" > -</p><!--l. 1284--><p class="indent" > The indexing application’s style file is specified by -</p><!--l. 1285--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 1275--><p class="nopar" > +</p><!--l. 1277--><p class="indent" > The indexing application’s style file is specified by +</p><!--l. 1278--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\@istfilename</span><span class="ec-lmtt-10"> </span></span><a id="dx1-11006"></a> <span @@ -3147,7 +3133,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">filename</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 1287--><p class="noindent" > +</p><!--l. 1280--><p class="noindent" > The file extension indicates whether to use <a id="dx1-11007"></a><a href="#glo:makeindex"><span @@ -3164,8 +3150,8 @@ class="ec-lmtt-10x-x-109">.xdy</span><a id="dx1-11012"></a>). Note that the glossary information is formatted differently depending on which indexing application is supposed to be used, so it’s important to call the correct one. -</p><!--l. 1294--><p class="indent" > Word or letter ordering is specified by: -</p><!--l. 1295--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1287--><p class="indent" > Word or letter ordering is specified by: +</p><!--l. 1288--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\@glsorder</span><span class="ec-lmtt-10"> </span></span><a id="dx1-11013"></a> <span @@ -3174,20 +3160,20 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">order</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 1297--><p class="noindent" > +</p><!--l. 1290--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">order</span><span class="lmsy-10x-x-109">⟩ </span>can be either <span class="ec-lmtt-10x-x-109">word </span>or <span class="ec-lmtt-10x-x-109">letter</span>. -</p><!--l. 1300--><p class="indent" > If <a +</p><!--l. 1293--><p class="indent" > If <a id="dx1-11014"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-11015"></a></a> should be used, the language and code page for each glossary is specified by -</p><!--l. 1302--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1295--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\@xdylanguage</span><span class="ec-lmtt-10"> </span></span><a id="dx1-11016"></a><span class="marginpar"><span @@ -3213,7 +3199,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">code</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 1305--><p class="noindent" > +</p><!--l. 1298--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -3236,13 +3222,13 @@ class="ec-lmtt-10x-x-109">makeindex</span><a </p> -<!--l. 1312--><p class="noindent" ><a +<!--l. 1305--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">2</span>  <a - id="sec:pkgopts"></a>Package Options</h2> + id="x1-120002"></a>Package Options</h2> This section describes the available <span class="ec-lmss-10x-x-109">glossaries </span>package options. <h3 class="sectionHead"><span class="titlemark">2.1</span>  <a - id="sec:pkgopts-general"></a>General Options</h3> + id="x1-130002.1"></a>General Options</h3> <dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">nowarn</span><a @@ -3260,13 +3246,13 @@ class="description">This suppresses the creation of the main glossary. Note that class="ec-lmss-10x-x-109">acronym</span><a id="dx1-13003"></a> package option described in <a -href="#sec:pkgopts-acronym">§2.5 </a><a -href="#sec:pkgopts-acronym">Acronym Options<!--tex4ht:ref: sec:pkgopts-acronym --></a> or via <span +href="#x1-170002.5">§2.5 </a><a +href="#x1-170002.5">Acronym Options<!--tex4ht:ref: sec:pkgopts-acronym --></a> or via <span class="ec-lmtt-10x-x-109">\newglossary</span><a id="dx1-13004"></a> described in <a -href="#sec:newglossary">§12 </a><a -href="#sec:newglossary">Defining New Glossaries<!--tex4ht:ref: sec:newglossary --></a>). +href="#x1-4000012">§12 </a><a +href="#x1-4000012">Defining New Glossaries<!--tex4ht:ref: sec:newglossary --></a>). </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sanitize</span><a @@ -3293,112 +3279,120 @@ href="#glo:sanitize">sanitize<a class="ec-lmss-10x-x-109">name</span><a id="dx1-13008"></a>, <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-13009"></a> and <span + id="dx1-13009"></a>, <span class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-13010"></a> keys used when defining a new glossary - entry. This means that you can use fragile commands in those keys, - but it may lead to unexpected results if you try to display these - values within the document text. This sanitization can be switched - off using the <span + id="dx1-13010"></a> and <span +class="ec-lmss-10x-x-109">sort</span><a + id="dx1-13011"></a> keys used when defining a new + glossary entry. This means that you can use fragile commands in + those keys, but it may lead to unexpected results if you try to display + these values within the document text. This sanitization can be + switched off using the <span class="ec-lmss-10x-x-109">sanitize</span><a - id="dx1-13011"></a> package option. For example, to switch off the - sanitization for the <span + id="dx1-13012"></a> package option. For example, to switch + off the sanitization for the <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-13012"></a> and <span + id="dx1-13013"></a> and <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-13013"></a> keys, but not for the <span + id="dx1-13014"></a> keys, but not for the + <span class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-13014"></a> - key, do: + id="dx1-13015"></a> key, do: - <div class="verbatim" id="verbatim-16"> + <div class="verbatim" id="verbatim-15"> \usepackage[sanitize={name=false,description=false,%  <br />symbol=true}]{glossaries} </div> - <!--l. 1346--><p class="nopar" > You can use <span + <!--l. 1339--><p class="nopar" > You can use <span class="ec-lmss-10x-x-109">sanitize=none</span><a - id="dx1-13015"></a> as a shortcut for<br + id="dx1-13016"></a> as a shortcut for<br class="newline" /><span -class="ec-lmss-10x-x-109">sanitize={name=false,description=false,symbol=false}</span>. - </p><!--l. 1350--><p class="noindent" ><div class="important" title="Important Note"><span +class="ec-lmss-10x-x-109">sanitize={name=false,description=false,symbol=false}</span>. Note that this + shortcut doesn’t change the <span +class="ec-lmss-10x-x-109">sort</span><a + id="dx1-13017"></a> sanitization. That one needs to be + switched off explicitly: + + + +</p> + <div class="verbatim" id="verbatim-16"> + \usepackage{sanitize=none,sanitize={sort=false}} +</div> + <!--l. 1346--><p class="nopar" > + </p><!--l. 1348--><p class="noindent" ><div class="important" title="Important Note"><span class="ec-lmbx-10x-x-109">Note</span>: this sanitization only applies to the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-13016"></a>, <span + id="dx1-13018"></a>, <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-13017"></a> and - <span + id="dx1-13019"></a>, <span class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-13018"></a> keys. It doesn’t apply to any of the other keys (except the <span + id="dx1-13020"></a> + and <span class="ec-lmss-10x-x-109">sort</span><a - id="dx1-13019"></a> - key which is always <a - id="dx1-13020"></a><a -href="#glo:sanitize">sanitized<a - id="dx1-13021"></a></a> if <span -class="ec-lmss-10x-x-109">sort=standard</span><a - id="dx1-13022"></a> is in effect) so fragile + id="dx1-13021"></a> keys. It doesn’t apply to any of the other keys so fragile commands contained in the value of the other keys must always be protected using <span class="ec-lmtt-10x-x-109">\protect</span>. Since the value of the <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-13023"></a> key is + id="dx1-13022"></a> key is obtained from the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-13024"></a> key, you will still need to protect + id="dx1-13023"></a> key, you will still need to protect fragile commands in the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-13025"></a> key if you don’t use the <span + id="dx1-13024"></a> key if you don’t use the <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-13026"></a> key. + id="dx1-13025"></a> key. </div> - </p><!--l. 1359--><p class="noindent" > + </p><!--l. 1356--><p class="noindent" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">savewrites</span><a - id="dx1-13027"></a> </dt><dd + id="dx1-13026"></a> </dt><dd class="description">This is a boolean option to minimises the number of write registers used by the <span class="ec-lmss-10x-x-109">glossaries </span>package. (Default is <span class="ec-lmss-10x-x-109">savewrites=false</span><a - id="dx1-13028"></a>.) + id="dx1-13027"></a>.) There are only a limited number of write registers, and if you have a large number of glossaries or if you are using a class or other packages that create a lot of external files, you may exceed the maximum number of available registers. If <span class="ec-lmss-10x-x-109">savewrites</span><a - id="dx1-13029"></a> is set, the + id="dx1-13028"></a> is set, the glossary information will be stored in token registers until the end of the document when they will be written to the external files. If you run out of token registers, you can use <span class="ec-lmss-10x-x-109">etex</span><a - id="dx1-13030"></a>. - <!--l. 1372--><p class="noindent" ><div class="important" title="Important Note"> If you want to use <span class="TEX">T<span + id="dx1-13029"></a>. + <!--l. 1369--><p class="noindent" ><div class="important" title="Important Note"> If you want to use <span class="TEX">T<span class="E">E</span>X</span>’s <span class="ec-lmtt-10x-x-109">\write18</span><a - id="dx1-13031"></a> mechanism to call <a - id="dx1-13032"></a><a + id="dx1-13030"></a> mechanism to call <a + id="dx1-13031"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-13033"></a></a> + id="dx1-13032"></a></a> or <a - id="dx1-13034"></a><a + id="dx1-13033"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-13035"></a></a> from your document and use <span + id="dx1-13034"></a></a> from your document and use <span class="ec-lmss-10x-x-109">savewrites</span><a - id="dx1-13036"></a>, you must + id="dx1-13035"></a>, you must create the external files with <span class="ec-lmtt-10x-x-109">\glswritefiles </span>before you call <a - id="dx1-13037"></a><span + id="dx1-13036"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-13038"></a>/<a - id="dx1-13039"></a><span + id="dx1-13037"></a>/<a + id="dx1-13038"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-13040"></a>. Also set <span + id="dx1-13039"></a>. Also set <span class="ec-lmtt-10x-x-109">\glswritefiles </span>to nothing or <span class="ec-lmtt-10x-x-109">\relax</span> before the end of the document to avoid rewriting the files. For @@ -3413,49 +3407,49 @@ class="ec-lmtt-10x-x-109">\relax</span>  <br />-t \jobname.glg -o \jobname.gls \jobname}  <br />\let\glswritefiles\relax </div> - <!--l. 1384--><p class="nopar" > </div> - </p><!--l. 1385--><p class="noindent" > + <!--l. 1381--><p class="nopar" > </div> + </p><!--l. 1382--><p class="noindent" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">translate</span><a - id="dx1-13041"></a> </dt><dd + id="dx1-13040"></a> </dt><dd class="description">This is a boolean option. The default is <span class="ec-lmss-10x-x-109">true</span><a - id="dx1-13042"></a> if <span + id="dx1-13041"></a> if <span class="ec-lmss-10x-x-109">babel</span><a - id="dx1-13043"></a>, <span + id="dx1-13042"></a>, <span class="ec-lmss-10x-x-109">polyglossia</span><a - id="dx1-13044"></a> + id="dx1-13043"></a> or <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-13045"></a> have been loaded, otherwise the default value is + id="dx1-13044"></a> have been loaded, otherwise the default value is <span class="ec-lmss-10x-x-109">false</span><a - id="dx1-13046"></a>. + id="dx1-13045"></a>. <dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">translate=true</span><a - id="dx1-13047"></a> </dt><dd + id="dx1-13046"></a> </dt><dd class="description">If <span class="ec-lmss-10x-x-109">babel</span><a - id="dx1-13048"></a> has been loaded and the <span + id="dx1-13047"></a> has been loaded and the <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-13049"></a> + id="dx1-13048"></a> package is installed, <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-13050"></a> will be loaded and the + id="dx1-13049"></a> will be loaded and the translations will be provided by the <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-13051"></a> package + id="dx1-13050"></a> package interface. You can modify the translations by providing your own dictionary. If the <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-13052"></a> package isn’t installed + id="dx1-13051"></a> package isn’t installed and <span class="ec-lmss-10x-x-109">babel</span><a - id="dx1-13053"></a> is loaded, the <span + id="dx1-13052"></a> is loaded, the <span class="ec-lmss-10x-x-109">glossaries-babel</span><a - id="dx1-13054"></a> package will be + id="dx1-13053"></a> package will be loaded and the translations will be provided using <span class="ec-lmss-10x-x-109">babel</span>’s <span @@ -3464,74 +3458,74 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">language</span><span class="lmsy-10x-x-109">⟩ </span>mechanism. If <span class="ec-lmss-10x-x-109">polyglossia</span><a - id="dx1-13055"></a> has + id="dx1-13054"></a> has been loaded, <span class="ec-lmss-10x-x-109">glossaries-polyglossia</span><a - id="dx1-13056"></a> will be loaded. + id="dx1-13055"></a> will be loaded. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">translate=false</span><a - id="dx1-13057"></a> </dt><dd + id="dx1-13056"></a> </dt><dd class="description">Don’t provide translations, even if <span class="ec-lmss-10x-x-109">babel</span><a - id="dx1-13058"></a> or + id="dx1-13057"></a> or <span class="ec-lmss-10x-x-109">polyglossia</span><a - id="dx1-13059"></a> has been loaded. You can then provide you’re + id="dx1-13058"></a> has been loaded. You can then provide you’re own translations or explicitly load <span class="ec-lmss-10x-x-109">glossaries-babel</span><a - id="dx1-13060"></a> or + id="dx1-13059"></a> or <span class="ec-lmss-10x-x-109">glossaries-polyglossia</span><a - id="dx1-13061"></a>.</dd></dl> - <!--l. 1411--><p class="noindent" >See <a -href="#sec:fixednames">§1.2.1 </a><a -href="#sec:fixednames">Changing the Fixed Names<!--tex4ht:ref: sec:fixednames --></a> for further details. + id="dx1-13060"></a>.</dd></dl> + <!--l. 1408--><p class="noindent" >See <a +href="#x1-60001.2.1">§1.2.1 </a><a +href="#x1-60001.2.1">Changing the Fixed Names<!--tex4ht:ref: sec:fixednames --></a> for further details. </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">hyperfirst</span><a - id="dx1-13062"></a> </dt><dd + id="dx1-13061"></a> </dt><dd class="description">This is a boolean option that specifies whether each term has a hyperlink on <a - id="dx1-13063"></a><a + id="dx1-13062"></a><a href="#glo:firstuse">first use</a>. The default is <span class="ec-lmss-10x-x-109">hyperfirst=true</span><a - id="dx1-13064"></a> (terms on <a - id="dx1-13065"></a><a + id="dx1-13063"></a> (terms on <a + id="dx1-13064"></a><a href="#glo:firstuse">first use</a> have a hyperlink, unless explicitly suppressed using starred versions of commands such as <span class="ec-lmtt-10x-x-109">\gls*</span><a - id="dx1-13066"></a>). + id="dx1-13065"></a>). </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">savenumberlist</span><a - id="dx1-13067"></a> </dt><dd + id="dx1-13066"></a> </dt><dd class="description">This is a boolean option that specifies whether or not to gather and store the <a - id="dx1-13068"></a><a + id="dx1-13067"></a><a href="#glo:numberlist">number list<a - id="dx1-13069"></a></a> for each entry. The + id="dx1-13068"></a></a> for each entry. The default is <span class="ec-lmss-10x-x-109">savenumberlist=false</span><a - id="dx1-13070"></a>. (See <span + id="dx1-13069"></a>. (See <span class="ec-lmtt-10x-x-109">\glsentrynumberlist</span><a - id="dx1-13071"></a> and + id="dx1-13070"></a> and <span class="ec-lmtt-10x-x-109">\glsdisplaynumberlist</span><a - id="dx1-13072"></a> in <a -href="#sec:glsnolink">§9 </a><a -href="#sec:glsnolink">Using Glossary Terms Without + id="dx1-13071"></a> in <a +href="#x1-340009">§9 </a><a +href="#x1-340009">Using Glossary Terms Without Links<!--tex4ht:ref: sec:glsnolink --></a>.) </dd></dl> -<!--l. 1427--><p class="noindent" > +<!--l. 1424--><p class="noindent" > </p> -<!--l. 1427--><p class="noindent" ><a +<!--l. 1424--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">2.2</span>  <a - id="sec:pkgopts-sec"></a>Sectioning, Headings and TOC Options</h3> + id="x1-140002.2"></a>Sectioning, Headings and TOC Options</h3> <dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">toc</span><a @@ -3540,19 +3534,19 @@ class="description">Add the glossaries to the table of contents. Note that an ex <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> run is required with this option. Alternatively, you can switch this function on and off using - <!--l. 1434--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 1431--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glstoctrue</span><span class="ec-lmtt-10"> </span></span><a id="dx1-14002"></a> <span class="ec-lmtt-10x-x-109">\glstoctrue </span></div><hr> - </p><!--l. 1436--><p class="noindent" > + </p><!--l. 1433--><p class="noindent" > and - </p><!--l. 1438--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 1435--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glstocfalse</span><span class="ec-lmtt-10"> </span></span><a id="dx1-14003"></a> <span class="ec-lmtt-10x-x-109">\glstocfalse </span></div><hr> - </p><!--l. 1440--><p class="noindent" > + </p><!--l. 1437--><p class="noindent" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">numberline</span><a @@ -3598,7 +3592,7 @@ class="lmsy-10x-x-109">⟩ </span>option. Its value should be the <div class="verbatim" id="verbatim-18"> \usepackage[section=subsection]{glossaries} </div> - <!--l. 1458--><p class="nopar" > You can omit the value if you want to use sections, i.e.  + <!--l. 1455--><p class="nopar" > You can omit the value if you want to use sections, i.e.  @@ -3606,7 +3600,7 @@ class="lmsy-10x-x-109">⟩ </span>option. Its value should be the <div class="verbatim" id="verbatim-19"> \usepackage[section]{glossaries} </div> - <!--l. 1462--><p class="nopar" > is equivalent to + <!--l. 1459--><p class="nopar" > is equivalent to @@ -3614,8 +3608,8 @@ class="lmsy-10x-x-109">⟩ </span>option. Its value should be the <div class="verbatim" id="verbatim-20"> \usepackage[section=section]{glossaries} </div> - <!--l. 1466--><p class="nopar" > You can change this value later in the document using - </p><!--l. 1468--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 1463--><p class="nopar" > You can change this value later in the document using + </p><!--l. 1465--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\setglossarysection</span><span class="ec-lmtt-10"> </span></span><a id="dx1-14012"></a> <span @@ -3624,14 +3618,14 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> - </p><!--l. 1470--><p class="noindent" > + </p><!--l. 1467--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span class="lmsy-10x-x-109">⟩ </span>is the sectional unit. - </p><!--l. 1473--><p class="noindent" >The start of each glossary adds information to the page header + </p><!--l. 1470--><p class="noindent" >The start of each glossary adds information to the page header via - </p><!--l. 1474--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 1471--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glossarymark</span><span class="ec-lmtt-10"> </span></span><a id="dx1-14013"></a> <span @@ -3640,7 +3634,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary title</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> - </p><!--l. 1476--><p class="noindent" > + </p><!--l. 1473--><p class="noindent" > This defaults to <span class="ec-lmtt-10x-x-109">\@mkboth </span>unless <span class="ec-lmss-10x-x-109">memoir</span><a @@ -3654,7 +3648,7 @@ class="ec-lmss-10x-x-109">memoir</span><a <div class="verbatim" id="verbatim-21"> \renewcommand{\glossarymark}[1]{\markright{#1}} </div> - <!--l. 1482--><p class="nopar" > or to prevent it from changing the headers: + <!--l. 1479--><p class="nopar" > or to prevent it from changing the headers: @@ -3662,13 +3656,13 @@ class="ec-lmss-10x-x-109">memoir</span><a <div class="verbatim" id="verbatim-22"> \renewcommand{\glossarymark}[1]{} </div> - <!--l. 1486--><p class="nopar" > If you want <span + <!--l. 1483--><p class="nopar" > If you want <span class="ec-lmtt-10x-x-109">\glossarymark </span>to use <span class="ec-lmtt-10x-x-109">\MakeUppercase </span>in the header, use the <span class="ec-lmss-10x-x-109">ucmark</span><a id="dx1-14015"></a> option described below. - </p><!--l. 1490--><p class="noindent" >Occasionally you may find that another package defines + </p><!--l. 1487--><p class="noindent" >Occasionally you may find that another package defines <span class="ec-lmtt-10x-x-109">\cleardoublepage </span>when it is not required. This may cause an unwanted blank page to appear before each glossary. This can be @@ -3682,7 +3676,7 @@ class="ec-lmtt-10x-x-109">\glsclearpage</span><a <div class="verbatim" id="verbatim-23"> \renewcommand*{\glsclearpage}{\clearpage} </div> - <!--l. 1496--><p class="nopar" > + <!--l. 1493--><p class="nopar" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">ucmark</span><a @@ -3733,7 +3727,7 @@ class="ec-lmss-10x-x-109">glossaries </span>using: <div class="verbatim" id="verbatim-24"> \usepackage[section,numberedsection=autolabel]{glossaries} </div> - <!--l. 1519--><p class="nopar" > then each glossary will appear in a numbered section, and can be + <!--l. 1516--><p class="nopar" > then each glossary will appear in a numbered section, and can be referenced using something like: @@ -3743,7 +3737,7 @@ class="ec-lmss-10x-x-109">glossaries </span>using: The main glossary is in section~\ref{main} and the list of  <br />acronyms is in section~\ref{acronym}. </div> - <!--l. 1525--><p class="nopar" > If you can’t decide whether to have the acronyms in the main + <!--l. 1522--><p class="nopar" > If you can’t decide whether to have the acronyms in the main glossary or a separate list of acronyms, you can use <span class="ec-lmtt-10x-x-109">\acronymtype</span><a id="dx1-14029"></a> @@ -3762,15 +3756,15 @@ class="ec-lmss-10x-x-109">acronym</span><a <div class="verbatim" id="verbatim-26"> The list of acronyms is in section~\ref{\acronymtype}. </div> - <!--l. 1533--><p class="nopar" > - </p><!--l. 1535--><p class="noindent" >As from version 1.14, you can add a prefix to the label by + <!--l. 1530--><p class="nopar" > + </p><!--l. 1532--><p class="noindent" >As from version 1.14, you can add a prefix to the label by redefining - </p><!--l. 1537--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 1534--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsautoprefix</span><span class="ec-lmtt-10"> </span></span><a id="dx1-14032"></a> <span class="ec-lmtt-10x-x-109">\glsautoprefix </span></div><hr> - </p><!--l. 1539--><p class="noindent" > + </p><!--l. 1536--><p class="noindent" > For example: @@ -3779,7 +3773,7 @@ class="ec-lmtt-10x-x-109">\glsautoprefix </span></div><hr> <div class="verbatim" id="verbatim-27"> \renewcommand*{\glsautoprefix}{glo:} </div> - <!--l. 1543--><p class="nopar" > will add <span + <!--l. 1540--><p class="nopar" > will add <span class="ec-lmtt-10x-x-109">glo: </span>to the automatically generated label, so you can then, for example, refer to the list of acronyms as follows: @@ -3790,7 +3784,7 @@ class="ec-lmtt-10x-x-109">glo: </span>to the automatically generated label, so y The list of acronyms is in  <br />section~\ref{glo:\acronymtype}. </div> - <!--l. 1549--><p class="nopar" > Or, if you are undecided on a prefix: + <!--l. 1546--><p class="nopar" > Or, if you are undecided on a prefix: @@ -3799,14 +3793,14 @@ class="ec-lmtt-10x-x-109">glo: </span>to the automatically generated label, so y The list of acronyms is in  <br />section~\ref{\glsautoprefix\acronymtype}. </div> - <!--l. 1554--><p class="nopar" > + <!--l. 1551--><p class="nopar" > </p> </dd></dl> -<!--l. 1558--><p class="noindent" > +<!--l. 1555--><p class="noindent" > </p> -<!--l. 1558--><p class="noindent" ><a +<!--l. 1555--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">2.3</span>  <a - id="sec:pkgopts-printglos"></a>Glossary Appearance Options</h3> + id="x1-150002.3"></a>Glossary Appearance Options</h3> <dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">entrycounter</span><a @@ -3822,9 +3816,9 @@ class="ec-lmtt-10"> </span></span><a id="dx1-15003"></a><a id="dx1-15004"></a><span class="ec-lmss-10x-x-109">glossaryentry</span>. - <!--l. 1568--><p class="noindent" >If you use this option, you can reference the entry number within the + <!--l. 1565--><p class="noindent" >If you use this option, you can reference the entry number within the document using - </p><!--l. 1570--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 1567--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsrefentry</span><span class="ec-lmtt-10"> </span></span><a id="dx1-15005"></a> <span @@ -3833,12 +3827,12 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> - </p><!--l. 1572--><p class="noindent" > + </p><!--l. 1569--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩ </span>is the label associated with that glossary entry. - </p><!--l. 1575--><p class="noindent" ><div class="important" title="Important Note"> If you use <span + </p><!--l. 1572--><p class="noindent" ><div class="important" title="Important Note"> If you use <span class="ec-lmtt-10x-x-109">\glsrefentry</span>, you must run <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> twice after creating the glossary files using <a @@ -3855,7 +3849,7 @@ href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-15011"></a></a> to ensure the cross-references are up-to-date. </div> - </p><!--l. 1580--><p class="noindent" > + </p><!--l. 1577--><p class="noindent" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">counterwithin</span><a @@ -3883,11 +3877,11 @@ class="lmsy-10x-x-109">⟩ </span>is incremented. - <!--l. 1588--><p class="noindent" ><span class="marginpar"><span + <!--l. 1585--><p class="noindent" ><span class="marginpar"><span class="ec-lmtt-10">\glsresetentrycounter</span><span class="ec-lmtt-10"> </span></span><a id="dx1-15015"></a> - </p><!--l. 1589--><p class="noindent" ><div class="important" title="Important Note"> The <span + </p><!--l. 1586--><p class="noindent" ><div class="important" title="Important Note"> The <span class="ec-lmss-10x-x-109">glossaryentry</span><a id="dx1-15016"></a> counter isn’t automatically reset at the start of each glossary, except when glossary section numbering is on and the @@ -3912,8 +3906,8 @@ class="ec-lmss-10x-x-109">glossaryentry</span><a  <br />  \glsresetentrycounter  <br />} </div> - <!--l. 1601--><p class="nopar" > </div> - </p><!--l. 1602--><p class="noindent" > + <!--l. 1598--><p class="nopar" > </div> + </p><!--l. 1599--><p class="noindent" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">subentrycounter</span><a @@ -3969,8 +3963,8 @@ class="ec-lmss-10x-x-109">glossary-super</span><a <span class="ec-lmss-10x-x-109">glossary-tree</span><a id="dx1-15031"></a>. (See <a -href="#sec:styles">§15 </a><a -href="#sec:styles">Glossary Styles<!--tex4ht:ref: sec:styles --></a>.) +href="#x1-4700015">§15 </a><a +href="#x1-4700015">Glossary Styles<!--tex4ht:ref: sec:styles --></a>.) </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">nolong</span><a @@ -4070,7 +4064,7 @@ class="ec-lmtt-10x-x-109">\printglossary</span><a  <br />\usepackage{glossary-mcols}  <br />\glossarystyle{mcoltree} </div> - <!--l. 1662--><p class="nopar" > + <!--l. 1659--><p class="nopar" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">nonumberlist</span><a @@ -4080,8 +4074,8 @@ class="description">This option will suppress the associated <a href="#glo:numberlist">number list<a id="dx1-15052"></a>s</a> in the glossaries (see also <a -href="#sec:numberlists">§5 </a><a -href="#sec:numberlists">Number lists<!--tex4ht:ref: sec:numberlists --></a>). +href="#x1-270005">§5 </a><a +href="#x1-270005">Number lists<!--tex4ht:ref: sec:numberlists --></a>). </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">seeautonumberlist</span><a @@ -4110,8 +4104,8 @@ class="ec-lmss-10x-x-109">nonumberlist=false</span><a id="dx1-15062"></a> for that entry. (Note this doesn’t affect <span class="ec-lmtt-10x-x-109">\glssee</span>.) For further details see <a -href="#sec:crossref">§8 </a><a -href="#sec:crossref">Cross-Referencing +href="#x1-320008">§8 </a><a +href="#x1-320008">Cross-Referencing Entries<!--tex4ht:ref: sec:crossref --></a>. </dd><dt class="description"> <span @@ -4131,14 +4125,41 @@ class="ec-lmss-10x-x-109">counter=page</span><a href="#glo:numberlist">number list<a id="dx1-15066"></a>s</a> (see <a -href="#sec:numberlists">§5 </a><a -href="#sec:numberlists">Number lists<!--tex4ht:ref: sec:numberlists --></a>). +href="#x1-270005">§5 </a><a +href="#x1-270005">Number lists<!--tex4ht:ref: sec:numberlists --></a>). + </dd><dt class="description"> +<span +class="ec-lmssbx-10x-x-109">nopostdot</span><a + id="dx1-15067"></a> </dt><dd +class="description">This is a boolean option. If no value is specified, <span +class="ec-lmtt-10x-x-109">true </span>is + assumed. When set to <span +class="ec-lmtt-10x-x-109">true</span>, this option suppresses the default post + description dot used by some of the predefined styles. The default + setting is <span +class="ec-lmss-10x-x-109">nopostdot=false</span><a + id="dx1-15068"></a>. + </dd><dt class="description"> +<span +class="ec-lmssbx-10x-x-109">nogroupskip</span><a + id="dx1-15069"></a> </dt><dd +class="description">This is a boolean option. If no value is specified, <span +class="ec-lmtt-10x-x-109">true </span>is + assumed. When set to <span +class="ec-lmtt-10x-x-109">true</span>, this option suppresses the default + vertical gap between groups used by some of the predefined styles. + The default setting is <span +class="ec-lmss-10x-x-109">nogroupskip=false</span><a + id="dx1-15070"></a>. </dd></dl> -<!--l. 1684--><p class="noindent" > + + + +<!--l. 1693--><p class="noindent" > </p> -<!--l. 1684--><p class="noindent" ><a +<!--l. 1693--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">2.4</span>  <a - id="sec:pkgopts-sort"></a>Sorting Options</h3> + id="x1-160002.4"></a>Sorting Options</h3> <dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">sort</span><a @@ -4165,9 +4186,6 @@ class="ec-lmss-10x-x-109">name</span><a key (if <span class="ec-lmss-10x-x-109">sort</span><a id="dx1-16006"></a> key is missing); - - - </li> <li class="itemize"><span class="ec-lmss-10x-x-109">def</span><a @@ -4185,7 +4203,7 @@ class="ec-lmss-10x-x-109">sort</span><a id="dx1-16010"></a> key in <span class="ec-lmtt-10x-x-109">\newglossaryentry </span>is ignored).</li></ul> - <!--l. 1706--><p class="noindent" >The default is <span + <!--l. 1715--><p class="noindent" >The default is <span class="ec-lmss-10x-x-109">sort=standard</span><a id="dx1-16011"></a>. </p></dd><dt class="description"> @@ -4198,7 +4216,7 @@ class="ec-lmss-10x-x-109">word</span><a class="ec-lmss-10x-x-109">letter</span><a id="dx1-16014"></a>. The default is word ordering. - <!--l. 1712--><p class="noindent" ><div class="important" title="Important Note"> Note that the <span + <!--l. 1721--><p class="noindent" ><div class="important" title="Important Note"> Note that the <span class="ec-lmss-10x-x-109">order</span><a id="dx1-16015"></a> option has no effect if you don’t use <a @@ -4206,7 +4224,7 @@ class="ec-lmss-10x-x-109">order</span><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a id="dx1-16017"></a></a>. </div> - </p><!--l. 1715--><p class="noindent" > + </p><!--l. 1724--><p class="noindent" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">makeindex</span><a @@ -4254,6 +4272,9 @@ class="ec-lmtt-10x-x-109">xindy</span><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a id="dx1-16036"></a></a>, it will automatically + + + detect that it needs to call <a id="dx1-16037"></a><span class="ec-lmtt-10x-x-109">xindy</span><a @@ -4272,7 +4293,7 @@ class="ec-lmtt-10x-x-109">makeindex</span><a style file will been given a <span class="ec-lmtt-10x-x-109">.xdy</span><a id="dx1-16045"></a> extension. - <!--l. 1732--><p class="noindent" >The <span + <!--l. 1741--><p class="noindent" >The <span class="ec-lmss-10x-x-109">xindy</span><a id="dx1-16046"></a> package option may additionally have a value that is a <span @@ -4290,7 +4311,7 @@ class="lmsy-10x-x-109">⟩ </span>comma-separated list to override the lang <div class="verbatim" id="verbatim-32"> \usepackage[xindy={language=english,codepage=utf8}]{glossaries} </div> - <!--l. 1737--><p class="nopar" > You can also specify whether you want a number group in the + <!--l. 1746--><p class="nopar" > You can also specify whether you want a number group in the glossary. This defaults to true, but can be suppressed. For example: @@ -4300,9 +4321,9 @@ class="lmsy-10x-x-109">⟩ </span>comma-separated list to override the lang <div class="verbatim" id="verbatim-33"> \usepackage[xindy={glsnumbers=false}]{glossaries} </div> - <!--l. 1742--><p class="nopar" > See <a -href="#sec:xindy">§11 </a><a -href="#sec:xindy">Xindy<!--tex4ht:ref: sec:xindy --></a> for further details on using <a + <!--l. 1751--><p class="nopar" > See <a +href="#x1-3600011">§11 </a><a +href="#x1-3600011">Xindy<!--tex4ht:ref: sec:xindy --></a> for further details on using <a id="dx1-16047"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a @@ -4311,11 +4332,11 @@ class="ec-lmss-10x-x-109">glossaries</span> package. </p> </dd></dl> -<!--l. 1748--><p class="noindent" > +<!--l. 1757--><p class="noindent" > </p> -<!--l. 1748--><p class="noindent" ><a +<!--l. 1757--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">2.5</span>  <a - id="sec:pkgopts-acronym"></a>Acronym Options</h3> + id="x1-170002.5"></a>Acronym Options</h3> <dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">acronym</span><a @@ -4329,7 +4350,7 @@ class="ec-lmtt-10x-x-109">acronym</span>. This is <div class="verbatim" id="verbatim-34"> \newglossary[alg]{acronym}{acr}{acn}{\acronymname} </div> - <!--l. 1756--><p class="nopar" > If the <span + <!--l. 1765--><p class="nopar" > If the <span class="ec-lmss-10x-x-109">acronym</span><a id="dx1-17002"></a> package option is used, <span class="ec-lmtt-10x-x-109">\acronymtype</span><a @@ -4368,7 +4389,7 @@ class="ec-lmtt-10x-x-109">main </span>glossary to also contain a list of acronym <div class="verbatim" id="verbatim-35"> \usepackage[acronym,acronymlists={main}]{glossaries} </div> - <!--l. 1775--><p class="nopar" > No check is performed to determine if the listed glossaries + <!--l. 1784--><p class="nopar" > No check is performed to determine if the listed glossaries exist, so you can add glossaries you haven’t defined yet. For example: @@ -4379,7 +4400,7 @@ class="ec-lmtt-10x-x-109">main </span>glossary to also contain a list of acronym \usepackage[acronym,acronymlists={main,acronym2}]{glossaries}  <br />\newglossary[alg2]{acronym2}{acr2}{acn2}{Statistical Acronyms} </div> - <!--l. 1781--><p class="nopar" > + <!--l. 1790--><p class="nopar" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">description</span><a @@ -4389,8 +4410,8 @@ class="ec-lmtt-10x-x-109">\newacronym</span><a id="dx1-17015"></a> to allow a description. This option has no effect if you defined your own custom acronym style. See <a -href="#sec:acronyms">§13 </a><a -href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further +href="#x1-4100013">§13 </a><a +href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further details. </dd><dt class="description"> <span @@ -4401,8 +4422,8 @@ class="ec-lmtt-10x-x-109">\newacronym</span><a id="dx1-17017"></a> and the way that acronyms are displayed. This option has no effect if you defined your own custom acronym style. See <a -href="#sec:acronyms">§13 </a><a -href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further +href="#x1-4100013">§13 </a><a +href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further details. </dd><dt class="description"> <span @@ -4413,8 +4434,8 @@ class="ec-lmtt-10x-x-109">\newacronym</span><a id="dx1-17019"></a> and the way that acronyms are displayed. This option may have no effect if you defined your own custom acronym style. See <a -href="#sec:acronyms">§13 </a><a -href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for +href="#x1-4100013">§13 </a><a +href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further details. </dd><dt class="description"> <span @@ -4433,8 +4454,8 @@ class="ec-lmtt-10x-x-109">\textsmaller</span><a class="ec-lmtt-10x-x-109">\acronymfont</span><a id="dx1-17024"></a>. This option may have no effect if you defined your own custom acronym style. See <a -href="#sec:acronyms">§13 </a><a -href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further +href="#x1-4100013">§13 </a><a +href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further details. </dd><dt class="description"> <span @@ -4445,17 +4466,17 @@ class="ec-lmtt-10x-x-109">\newacronym</span><a id="dx1-17026"></a> so that acronyms are always expanded. This option has no effect if you defined your own custom acronym style. See <a -href="#sec:acronyms">§13 </a><a -href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further +href="#x1-4100013">§13 </a><a +href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further details. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">shortcuts</span><a id="dx1-17027"></a> </dt><dd class="description">This option provides shortcut commands for acronyms. See <a -href="#sec:acronyms">§13 +href="#x1-4100013">§13 </a><a -href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further details. +href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further details. </dd></dl> @@ -4463,16 +4484,16 @@ href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further de -<!--l. 1815--><p class="noindent" ><a +<!--l. 1824--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">3</span>  <a - id="sec:setup"></a>Setting Up</h2> + id="x1-180003"></a>Setting Up</h2> The command -<!--l. 1819--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 1828--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\makeglossaries</span><span class="ec-lmtt-10"> </span></span><a id="dx1-18001"></a> <span class="ec-lmtt-10x-x-109">\makeglossaries </span></div><hr> -</p><!--l. 1821--><p class="noindent" > +</p><!--l. 1830--><p class="noindent" > must be placed in the preamble in order to create the customised <a id="dx1-18002"></a><a @@ -4490,15 +4511,15 @@ class="ec-lmtt-10x-x-109">.xdy</span><a glossary entries are written to the appropriate output files. If you omit <span class="ec-lmtt-10x-x-109">\makeglossaries </span>none of the glossaries will be created. -</p><!--l. 1828--><p class="indent" > <div class="important" title="Important Note"> Note that some of the commands provided by the <span +</p><!--l. 1837--><p class="indent" > <div class="important" title="Important Note"> Note that some of the commands provided by the <span class="ec-lmss-10x-x-109">glossaries </span>package must be placed before <span class="ec-lmtt-10x-x-109">\makeglossaries </span>as they are required when creating the customised style file. If you attempt to use those commands after <span class="ec-lmtt-10x-x-109">\makeglossaries </span>you will generate an error. </div> -</p><!--l. 1834--><p class="noindent" > -</p><!--l. 1836--><p class="indent" > You can suppress the creation of the customised <a +</p><!--l. 1843--><p class="noindent" > +</p><!--l. 1845--><p class="indent" > You can suppress the creation of the customised <a id="dx1-18008"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a @@ -4508,15 +4529,15 @@ href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a id="dx1-18011"></a></a> style file using -</p><!--l. 1838--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1847--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\noist</span><span class="ec-lmtt-10"> </span></span><a id="dx1-18012"></a> <span class="ec-lmtt-10x-x-109">\noist </span></div><hr> -</p><!--l. 1840--><p class="noindent" > +</p><!--l. 1849--><p class="noindent" > Note that this command must be used before <span class="ec-lmtt-10x-x-109">\makeglossaries</span>. -</p><!--l. 1842--><p class="indent" > <div class="important" title="Important Note"> Note that if you have a custom <span +</p><!--l. 1851--><p class="indent" > <div class="important" title="Important Note"> Note that if you have a custom <span class="ec-lmtt-10x-x-109">.xdy</span><a id="dx1-18013"></a> file created when using <span class="ec-lmss-10x-x-109">glossaries</span> @@ -4524,8 +4545,8 @@ version 2.07 or below, you will need to use the <span class="ec-lmss-10x-x-109">compatible-2.07</span><a id="dx1-18014"></a> package option with it. </div> -</p><!--l. 1846--><p class="noindent" > -</p><!--l. 1848--><p class="indent" > The default name for the customised style file is given by <span +</p><!--l. 1855--><p class="noindent" > +</p><!--l. 1857--><p class="indent" > The default name for the customised style file is given by <span class="ec-lmtt-10x-x-109">\jobname</span><a id="dx1-18015"></a><span class="ec-lmtt-10x-x-109">.ist</span><a @@ -4544,7 +4565,7 @@ href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-18022"></a></a>). This name may be changed using: -</p><!--l. 1852--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1861--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\setStyleFile</span><span class="ec-lmtt-10"> </span></span><a id="dx1-18023"></a> <span @@ -4553,14 +4574,14 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 1854--><p class="noindent" > +</p><!--l. 1863--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span class="lmsy-10x-x-109">⟩ </span>is the name of the style file without the extension. Note that this command must be used before <span class="ec-lmtt-10x-x-109">\makeglossaries</span>. -</p><!--l. 1859--><p class="indent" > Each glossary entry is assigned a <a +</p><!--l. 1868--><p class="indent" > Each glossary entry is assigned a <a id="dx1-18024"></a><a href="#glo:numberlist">number list<a id="dx1-18025"></a></a> that lists all the @@ -4572,7 +4593,7 @@ class="ec-lmss-10x-x-109">counter</span><a 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 -</p><!--l. 1866--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1875--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsSetCompositor</span><span class="ec-lmtt-10"> </span></span><a id="dx1-18027"></a> <span @@ -4581,7 +4602,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">symbol</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 1868--><p class="noindent" > +</p><!--l. 1877--><p class="noindent" > For example: @@ -4590,15 +4611,15 @@ For example: <div class="verbatim" id="verbatim-37"> \glsSetCompositor{-} </div> -<!--l. 1872--><p class="nopar" > Note that this command must be used before <span +<!--l. 1881--><p class="nopar" > Note that this command must be used before <span class="ec-lmtt-10x-x-109">\makeglossaries</span>. -</p><!--l. 1875--><p class="indent" > If you use <a +</p><!--l. 1884--><p class="indent" > If you use <a id="dx1-18028"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-18029"></a></a>, you can have a different compositor for page numbers starting with an uppercase alphabetical character using: -</p><!--l. 1877--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1886--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsSetAlphaCompositor</span><span class="ec-lmtt-10"> </span></span><a id="dx1-18030"></a> <span @@ -4608,7 +4629,7 @@ class="ec-lmri-10x-x-109">symbol</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 1879--><p class="noindent" > +</p><!--l. 1888--><p class="noindent" > Note that this command has no effect if you haven’t used the <span class="ec-lmss-10x-x-109">xindy</span><a id="dx1-18031"></a> package @@ -4624,9 +4645,9 @@ and 2.3 style formats, then do: <div class="verbatim" id="verbatim-38"> \glsSetCompositor{.}\glsSetAlphaCompositor{-} </div> -<!--l. 1886--><p class="nopar" > See <a -href="#sec:numberlists">§5 </a><a -href="#sec:numberlists">Number lists<!--tex4ht:ref: sec:numberlists --></a> for further information about <a +<!--l. 1895--><p class="nopar" > See <a +href="#x1-270005">§5 </a><a +href="#x1-270005">Number lists<!--tex4ht:ref: sec:numberlists --></a> for further information about <a id="dx1-18034"></a><a href="#glo:numberlist">number list<a id="dx1-18035"></a>s</a>. @@ -4635,21 +4656,21 @@ href="#glo:numberlist">number list<a </p> <h2 class="chapterHead"><span class="titlemark">4</span>  <a - id="sec:newglosentry"></a>Defining Glossary Entries</h2> -<!--l. 1893--><p class="noindent" >All glossary entries must be defined before they are used, + id="x1-190004"></a>Defining Glossary Entries</h2> +<!--l. 1902--><p class="noindent" >All glossary entries must be defined before they are used, so it is better to define them in the preamble to ensure this.<span class="footnote-mark"><a href="#fn1x6" id="fn1x6-bk"><sup class="textsuperscript">1</sup></a></span><a id="x1-19001f1"></a> However only those entries that occur in the document (using any of the commands described in <a -href="#sec:glslink">§6 </a><a -href="#sec:glslink">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a>, <a -href="#sec:glsadd">§7 </a><a -href="#sec:glsadd">Adding an Entry +href="#x1-280006">§6 </a><a +href="#x1-280006">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a>, <a +href="#x1-310007">§7 </a><a +href="#x1-310007">Adding an Entry to the Glossary Without Generating Text<!--tex4ht:ref: sec:glsadd --></a> or <a -href="#sec:crossref">§8 </a><a -href="#sec:crossref">Cross-Referencing Entries<!--tex4ht:ref: sec:crossref --></a>) +href="#x1-320008">§8 </a><a +href="#x1-320008">Cross-Referencing Entries<!--tex4ht:ref: sec:crossref --></a>) will appear in the glossary. Each time an entry is used in this way, a line is added to an associated glossary file (<span class="ec-lmtt-10x-x-109">.glo</span><a @@ -4685,10 +4706,10 @@ class="ec-lmbx-10x-x-109">files.</span><span class="footnote-mark"><a href="#fn2x6" id="fn2x6-bk"><sup class="textsuperscript">2</sup></a></span><a id="x1-19015f2"></a> See <a -href="#sec:makeglossaries">§1.3 </a><a -href="#sec:makeglossaries">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a> for further details. -</p><!--l. 1915--><p class="indent" > New glossary entries are defined using the command: -</p><!--l. 1916--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +href="#x1-70001.3">§1.3 </a><a +href="#x1-70001.3">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a> for further details. +</p><!--l. 1924--><p class="indent" > New glossary entries are defined using the command: +</p><!--l. 1925--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\newglossaryentry</span><span class="ec-lmtt-10"> </span></span><a id="dx1-19017"></a> <span @@ -4702,7 +4723,7 @@ class="ec-lmri-10x-x-109">key-val list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 1918--><p class="noindent" > +</p><!--l. 1927--><p class="noindent" > The first argument, <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -4741,18 +4762,18 @@ class="ec-lmssbx-10x-x-109">description</span><a id="dx1-19023"></a> </dt><dd class="description">A brief description of this term (to appear in the glossary). Within this value, you can use - <!--l. 1933--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 1942--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\nopostdesc</span><span class="ec-lmtt-10"> </span></span><a id="dx1-19024"></a> <span class="ec-lmtt-10x-x-109">\nopostdesc </span></div><hr> - </p><!--l. 1935--><p class="noindent" > + </p><!--l. 1944--><p class="noindent" > 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 <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">description={\nopostdesc}</span></span></span>. If you want a paragraph break in the description use - </p><!--l. 1941--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 1950--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glspar</span><span class="ec-lmtt-10"> </span></span><a id="dx1-19025"></a> <span @@ -4760,7 +4781,7 @@ class="ec-lmtt-10x-x-109">\glspar </span></div><hr> - </p><!--l. 1943--><p class="noindent" > + </p><!--l. 1952--><p class="noindent" > However, note that not all glossary styles support multi-line descriptions. If you are using one of the tabular-like glossary styles that permit multi-line descriptions, use <span @@ -4774,8 +4795,8 @@ class="ec-lmssbx-10x-x-109">parent</span><a id="dx1-19027"></a> </dt><dd class="description">The label of the parent entry. Note that the parent entry must be defined before its sub-entries. See <a -href="#sec:subentries">§4.3 </a><a -href="#sec:subentries">Sub-Entries<!--tex4ht:ref: sec:subentries --></a> for further +href="#x1-220004.3">§4.3 </a><a +href="#x1-220004.3">Sub-Entries<!--tex4ht:ref: sec:subentries --></a> for further details. </dd><dt class="description"> <span @@ -4804,9 +4825,9 @@ href="#glo:sanitize">sanitization<a id="dx1-19036"></a></a> using the <span class="ec-lmss-10x-x-109">sanitize</span><a id="dx1-19037"></a> package option described in <a -href="#sec:pkgopts-general">§2.1 +href="#x1-130002.1">§2.1 </a><a -href="#sec:pkgopts-general">General Options<!--tex4ht:ref: sec:pkgopts-general --></a>.) +href="#x1-130002.1">General Options<!--tex4ht:ref: sec:pkgopts-general --></a>.) </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">text</span><a @@ -4905,7 +4926,7 @@ class="ec-lmss-10x-x-109">firstplural</span><a used with <span class="ec-lmtt-10x-x-109">\glspl</span><a id="dx1-19070"></a>. - <!--l. 1989--><p class="noindent" ><span + <!--l. 1998--><p class="noindent" ><span class="ec-lmbx-10x-x-109">Note: </span>prior to version 1.13, the default value of <span class="ec-lmss-10x-x-109">firstplural</span><a id="dx1-19071"></a> was always @@ -4935,9 +4956,9 @@ href="#glo:sanitize">sanitization<a id="dx1-19078"></a></a> using the <span class="ec-lmss-10x-x-109">sanitize</span><a id="dx1-19079"></a> package option described in <a -href="#sec:pkgopts-general">§2.1 +href="#x1-130002.1">§2.1 </a><a -href="#sec:pkgopts-general">General Options<!--tex4ht:ref: sec:pkgopts-general --></a>.) +href="#x1-130002.1">General Options<!--tex4ht:ref: sec:pkgopts-general --></a>.) </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">symbolplural</span><a @@ -4991,8 +5012,8 @@ class="ec-lmss-10x-x-109">sort</span><a class="ec-lmtt-10x-x-109">\newglossaryentry</span><a id="dx1-19098"></a> (see <a -href="#sec:pkgopts-sort">§2.4 </a><a -href="#sec:pkgopts-sort">Sorting Options<!--tex4ht:ref: sec:pkgopts-sort --></a>). +href="#x1-160002.4">§2.4 </a><a +href="#x1-160002.4">Sorting Options<!--tex4ht:ref: sec:pkgopts-sort --></a>). </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">type</span><a @@ -5002,8 +5023,8 @@ class="description">This specifies the label of the glossary in which this entry class="ec-lmtt-10x-x-109">\newacronym</span><a id="dx1-19100"></a> is used (see <a -href="#sec:acronyms">§13 </a><a -href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a>). +href="#x1-4100013">§13 </a><a +href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a>). </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">user1</span><a @@ -5037,8 +5058,8 @@ class="ec-lmss-10x-x-109">nonumberlist</span><a id="dx1-19112"></a> just for this entry with <span class="ec-lmss-10x-x-109">nonumberlist=false</span><a id="dx1-19113"></a>. (See <a -href="#sec:numberlists">§5 </a><a -href="#sec:numberlists">Number +href="#x1-270005">§5 </a><a +href="#x1-270005">Number lists<!--tex4ht:ref: sec:numberlists --></a>.) @@ -5069,15 +5090,15 @@ class="ec-lmss-10x-x-109">nonumberlist=false</span><a class="ec-lmss-10x-x-109">seeautonumberlist</span><a id="dx1-19119"></a> package option. For further details, see <a -href="#sec:crossref">§8 </a><a -href="#sec:crossref">Cross-Referencing +href="#x1-320008">§8 </a><a +href="#x1-320008">Cross-Referencing Entries<!--tex4ht:ref: sec:crossref --></a>. </dd></dl> -<!--l. 2050--><p class="indent" > The following keys are reserved for <span +<!--l. 2059--><p class="indent" > The following keys are reserved for <span class="ec-lmtt-10x-x-109">\newacronym</span><a id="dx1-19120"></a> (see <a -href="#sec:acronyms">§13 </a><a -href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a>): +href="#x1-4100013">§13 </a><a +href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a>): <span class="ec-lmss-10x-x-109">long</span><a id="dx1-19121"></a>, <span @@ -5087,7 +5108,7 @@ class="ec-lmss-10x-x-109">short</span><a id="dx1-19123"></a> and <span class="ec-lmss-10x-x-109">shortplural</span><a id="dx1-19124"></a>. -</p><!--l. 2054--><p class="indent" > Note that if the name starts with an accented letter or non-Roman +</p><!--l. 2063--><p class="indent" > Note that if the name starts with an accented letter or non-Roman character, you must group the character, otherwise it will cause a problem for commands like <span class="ec-lmtt-10x-x-109">\Gls</span><a @@ -5102,7 +5123,7 @@ class="ec-lmtt-10x-x-109">\Glspl</span><a \newglossaryentry{elite}{name={{\’e}lite},  <br />description={select group or class}} </div> -<!--l. 2061--><p class="nopar" > Note that the same applies if you are using the <span +<!--l. 2070--><p class="nopar" > Note that the same applies if you are using the <span class="ec-lmss-10x-x-109">inputenc</span><a id="dx1-19127"></a> package: @@ -5110,10 +5131,10 @@ class="ec-lmss-10x-x-109">inputenc</span><a </p> <div class="verbatim" id="verbatim-40"> -\newglossaryentry{elite}{name={{é}lite}, +\newglossaryentry{elite}{name={{é}lite},  <br />description={select group or class}} </div> -<!--l. 2067--><p class="nopar" > Note that in both of the above examples, you will also need to supply the +<!--l. 2076--><p class="nopar" > Note that in both of the above examples, you will also need to supply the <span class="ec-lmss-10x-x-109">sort</span><a id="dx1-19128"></a> key if you are using <a @@ -5128,16 +5149,16 @@ class="ec-lmtt-10x-x-109">xindy</span><a accented letters correctly. </p> <h3 class="sectionHead"><span class="titlemark">4.1</span>  <a - id="sec:plurals"></a>Plurals</h3> -<!--l. 2076--><p class="noindent" >You may have noticed from above that you can specify the plural form + id="x1-200004.1"></a>Plurals</h3> +<!--l. 2085--><p class="noindent" >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 -</p><!--l. 2079--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2088--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glspluralsuffix</span><span class="ec-lmtt-10"> </span></span><a id="dx1-20001"></a> <span class="ec-lmtt-10x-x-109">\glspluralsuffix </span></div><hr> -</p><!--l. 2081--><p class="noindent" > +</p><!--l. 2090--><p class="noindent" > to the singular form. This command defaults to the letter “s”. For example: @@ -5148,7 +5169,7 @@ example: \newglossaryentry{cow}{name=cow,description={a fully grown  <br />female of any bovine animal}} </div> -<!--l. 2087--><p class="nopar" > defines a new entry whose singular form is “cow” and plural form is +<!--l. 2096--><p class="nopar" > 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: @@ -5160,8 +5181,8 @@ do: \newglossaryentry{cow}{name=cow,plural=kine,  <br />description={a fully grown female of any bovine animal}} </div> -<!--l. 2095--><p class="nopar" > -</p><!--l. 2097--><p class="indent" > If you are writing in a language that supports multiple plurals (for a +<!--l. 2104--><p class="nopar" > +</p><!--l. 2106--><p class="indent" > If you are writing in a language that supports multiple plurals (for a given term) then use the <span class="ec-lmss-10x-x-109">plural</span><a id="dx1-20002"></a> key for one of them and one of the user keys @@ -5175,7 +5196,7 @@ to specify the other plural form. For example:  <br />female of any bovine animal (plural cows, archaic plural kine)},  <br />user1={kine}} </div> -<!--l. 2105--><p class="nopar" > You can then use <span class="obeylines-h"><span class="verb"><span +<!--l. 2114--><p class="nopar" > You can then use <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glspl{cow}</span></span></span> to produce “cows” and <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsuseri{cow}</span></span></span> to produce “kine”. You can, of course, define an easy to remember synonym. @@ -5187,9 +5208,9 @@ For example: <div class="verbatim" id="verbatim-44"> \let\glsaltpl\glsuseri </div> -<!--l. 2111--><p class="nopar" > Then you don’t have to remember which key you used to store the +<!--l. 2120--><p class="nopar" > Then you don’t have to remember which key you used to store the alternative plural. -</p><!--l. 2115--><p class="indent" > If you are using a language that usually forms plurals by appending a +</p><!--l. 2124--><p class="indent" > If you are using a language that usually forms plurals by appending a different letter, or sequence of letters, you can redefine <span class="ec-lmtt-10x-x-109">\glspluralsuffix</span> as required. However, this must be done <span @@ -5201,12 +5222,12 @@ class="ec-lmss-10x-x-109">plural</span><a class="ec-lmss-10x-x-109">firstplural</span><a id="dx1-20004"></a> key where necessary). -</p><!--l. 2123--><p class="noindent" > +</p><!--l. 2132--><p class="noindent" > </p> -<!--l. 2123--><p class="noindent" ><a +<!--l. 2132--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">4.2</span>  <a - id="sec:grammar"></a>Other Grammatical Constructs</h3> -<!--l. 2126--><p class="noindent" >You can use the six user keys to provide alternatives, such as participles. + id="x1-210004.2"></a>Other Grammatical Constructs</h3> +<!--l. 2135--><p class="noindent" >You can use the six user keys to provide alternatives, such as participles. For example: @@ -5226,7 +5247,7 @@ For example:  <br />  }%  <br />} </div> -<!--l. 2143--><p class="nopar" > With the above definitions, I can now define terms like this: +<!--l. 2152--><p class="nopar" > With the above definitions, I can now define terms like this: @@ -5236,7 +5257,7 @@ For example:  <br />\newterm[\edkey={ran},\ingkey={running}]{run}{to move fast using  <br />the legs} </div> -<!--l. 2149--><p class="nopar" > and use them in the text: +<!--l. 2158--><p class="nopar" > and use them in the text: @@ -5246,13 +5267,13 @@ Peter is \glsing{play} in the park tod  <br />Jane \glsd{play} in the park yesterday.  <br />Peter and Jane \glsd{run} in the park last week. </div> -<!--l. 2157--><p class="nopar" > -</p><!--l. 2159--><p class="noindent" > +<!--l. 2166--><p class="nopar" > +</p><!--l. 2168--><p class="noindent" > </p> -<!--l. 2159--><p class="noindent" ><a +<!--l. 2168--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">4.3</span>  <a - id="sec:subentries"></a>Sub-Entries</h3> -<!--l. 2162--><p class="noindent" >As from version 1.17, it is possible to specify sub-entries. These may be + id="x1-220004.3"></a>Sub-Entries</h3> +<!--l. 2171--><p class="noindent" >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 @@ -5261,17 +5282,17 @@ 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="#sec:styles">§15 </a><a -href="#sec:styles">Glossary Styles<!--tex4ht:ref: sec:styles --></a> for a list of predefined +href="#x1-4700015">§15 </a><a +href="#x1-4700015">Glossary Styles<!--tex4ht:ref: sec:styles --></a> for a list of predefined styles.) As from version 3.0, level 1 sub-entries are automatically numbered in the predefined styles if you use the <span class="ec-lmss-10x-x-109">subentrycounter</span><a id="dx1-22001"></a> package option (see <a -href="#sec:pkgopts-printglos">§2.3 </a><a -href="#sec:pkgopts-printglos">Glossary Appearance Options<!--tex4ht:ref: sec:pkgopts-printglos --></a> for further +href="#x1-150002.3">§2.3 </a><a +href="#x1-150002.3">Glossary Appearance Options<!--tex4ht:ref: sec:pkgopts-printglos --></a> for further details). -</p><!--l. 2177--><p class="indent" > Note that the parent entry will automatically be added to the glossary if +</p><!--l. 2186--><p class="indent" > 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 <a id="dx1-22002"></a><a @@ -5283,12 +5304,12 @@ href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a id="dx1-22005"></a></a> has a restriction on the maximum sub-entry depth. -</p><!--l. 2183--><p class="noindent" > +</p><!--l. 2192--><p class="noindent" > </p> -<!--l. 2183--><p class="noindent" ><a +<!--l. 2192--><p class="noindent" ><a href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">4.3.1</span>  <a - id="sec:hierarchical"></a>Hierarchical Categories</h4> -<!--l. 2186--><p class="noindent" >To arrange a glossary with hierarchical categories, you need to first + id="x1-230004.3.1"></a>Hierarchical Categories</h4> +<!--l. 2195--><p class="noindent" >To arrange a glossary with hierarchical categories, you need to first define the category and then define the sub-entries using the relevant @@ -5309,13 +5330,13 @@ follows:  <br />\newglossaryentry{romanletter}{name={Roman letters},  <br />description={\nopostdesc}} </div> -<!--l. 2198--><p class="nopar" > -</p><!--l. 2200--><p class="indent" > Note that in this example, the category entries don’t need a description +<!--l. 2207--><p class="nopar" > +</p><!--l. 2209--><p class="indent" > Note that in this example, the category entries don’t need a description so I have set the descriptions to <span class="ec-lmtt-10x-x-109">\nopostdesc</span><a id="dx1-23002"></a>. This gives a blank description and suppresses the description terminator. -</p><!--l. 2205--><p class="indent" > I can now define my sub-entries as follows: +</p><!--l. 2214--><p class="indent" > I can now define my sub-entries as follows: @@ -5329,13 +5350,13 @@ description and suppresses the description terminator.  <br />description={Euler’s constant},  <br />parent=romanletter} </div> -<!--l. 2215--><p class="nopar" > -</p><!--l. 2218--><p class="noindent" > +<!--l. 2224--><p class="nopar" > +</p><!--l. 2227--><p class="noindent" > </p> -<!--l. 2218--><p class="noindent" ><a +<!--l. 2227--><p class="noindent" ><a href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">4.3.2</span>  <a - id="sec:homographs"></a>Homographs</h4> -<!--l. 2221--><p class="noindent" >Sub-entries that have the same name as the parent entry, don’t need to + id="x1-240004.3.2"></a>Homographs</h4> +<!--l. 2230--><p class="noindent" >Sub-entries that have the same name as the parent entry, don’t need to have the <span class="ec-lmss-10x-x-109">name</span><a id="dx1-24001"></a> key. For example, the word “glossary” can mean a list of @@ -5350,11 +5371,11 @@ technical words or a collection of glosses. In both cases the plural is  <br />description={\nopostdesc},  <br />plural={glossaries}} </div> -<!--l. 2230--><p class="nopar" > Again, the parent entry has no description, so the description terminator +<!--l. 2239--><p class="nopar" > Again, the parent entry has no description, so the description terminator needs to be suppressed using <span class="ec-lmtt-10x-x-109">\nopostdesc</span><a id="dx1-24002"></a>. -</p><!--l. 2234--><p class="indent" > Now define the two different meanings of the word: +</p><!--l. 2243--><p class="indent" > Now define the two different meanings of the word: @@ -5369,7 +5390,7 @@ class="ec-lmtt-10x-x-109">\nopostdesc</span><a  <br />sort={2},  <br />parent={glossary}} </div> -<!--l. 2245--><p class="nopar" > Note that if I reference the parent entry, the location will be added to the +<!--l. 2254--><p class="nopar" > Note that if I reference the parent entry, the location will be added to the parent’s <a id="dx1-24003"></a><a href="#glo:numberlist">number list<a @@ -5387,10 +5408,10 @@ class="ec-lmss-10x-x-109">sort=def</span><a class="ec-lmss-10x-x-109">subentrycounter</span><a id="dx1-24008"></a> package option to automatically number the first-level child entries. See <a -href="#sec:pkgopts-printglos">§2.3 </a><a -href="#sec:pkgopts-printglos">Glossary Appearance Options<!--tex4ht:ref: sec:pkgopts-printglos --></a> for further +href="#x1-150002.3">§2.3 </a><a +href="#x1-150002.3">Glossary Appearance Options<!--tex4ht:ref: sec:pkgopts-printglos --></a> for further details. -</p><!--l. 2256--><p class="indent" > In the above example, the plural form for both of the child entries is the +</p><!--l. 2265--><p class="indent" > In the above example, the plural form for both of the child entries is the same as the parent entry, so the <span class="ec-lmss-10x-x-109">plural</span><a id="dx1-24009"></a> key was not required for the child @@ -5414,15 +5435,15 @@ be specified. For example:  <br />plural={bravoes},  <br />parent=bravo} </div> -<!--l. 2275--><p class="nopar" > -</p><!--l. 2278--><p class="noindent" > +<!--l. 2284--><p class="nopar" > +</p><!--l. 2287--><p class="noindent" > </p> -<!--l. 2278--><p class="noindent" ><a +<!--l. 2287--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">4.4</span>  <a - id="sec:loadglsentries"></a>Loading Entries From a File</h3> -<!--l. 2281--><p class="noindent" >You can store all your glossary entry definitions in another file and + id="x1-250004.4"></a>Loading Entries From a File</h3> +<!--l. 2290--><p class="noindent" >You can store all your glossary entry definitions in another file and use: -</p><!--l. 2283--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2292--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\loadglsentries</span><span class="ec-lmtt-10"> </span></span><a id="dx1-25001"></a> <span @@ -5435,7 +5456,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">filename</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 2285--><p class="noindent" > +</p><!--l. 2294--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">filename</span><span @@ -5472,7 +5493,7 @@ contains:  <br />name={html},  <br />description={A mark up language}} </div> -<!--l. 2305--><p class="nopar" > and suppose in my document preamble I use the command: +<!--l. 2314--><p class="nopar" > and suppose in my document preamble I use the command: @@ -5480,7 +5501,7 @@ contains: <div class="verbatim" id="verbatim-54"> \loadglsentries[languages]{myentries} </div> -<!--l. 2309--><p class="nopar" > then this will add the entries <span +<!--l. 2318--><p class="nopar" > then this will add the entries <span class="ec-lmtt-10x-x-109">tex </span>and <span class="ec-lmtt-10x-x-109">html </span>to the glossary whose type is given by <span @@ -5488,12 +5509,12 @@ class="ec-lmtt-10x-x-109">languages</span>, but the entry <span class="ec-lmtt-10x-x-109">perl </span>will be added to the main glossary, since it explicitly sets the type to <span class="ec-lmtt-10x-x-109">main</span>. -</p><!--l. 2315--><p class="indent" > <span +</p><!--l. 2324--><p class="indent" > <span class="ec-lmbx-10x-x-109">Note: </span>if you use <span class="ec-lmtt-10x-x-109">\newacronym</span><a id="dx1-25006"></a> (see <a -href="#sec:acronyms">§13 </a><a -href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a>) the type is set as +href="#x1-4100013">§13 </a><a +href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a>) the type is set as <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">type=\acronymtype</span></span></span> unless you explicitly override it. For example, if my file <span @@ -5505,7 +5526,7 @@ class="ec-lmtt-10x-x-109">myacronyms.tex </span>contains: <div class="verbatim" id="verbatim-55"> \newacronym{aca}{aca}{a contrived acronym} </div> -<!--l. 2321--><p class="nopar" > then (supposing I have defined a new glossary type called <span +<!--l. 2330--><p class="nopar" > then (supposing I have defined a new glossary type called <span class="ec-lmtt-10x-x-109">altacronym</span>) @@ -5514,7 +5535,7 @@ class="ec-lmtt-10x-x-109">altacronym</span>) <div class="verbatim" id="verbatim-56"> \loadglsentries[altacronym]{myacronyms} </div> -<!--l. 2326--><p class="nopar" > will add <span +<!--l. 2335--><p class="nopar" > will add <span class="ec-lmtt-10x-x-109">aca </span>to the glossary type <span class="ec-lmtt-10x-x-109">acronym</span>, if the package option <span @@ -5528,7 +5549,7 @@ class="ec-lmss-10x-x-109">acronym</span><a specified.<span class="footnote-mark"><a href="#fn3x6" id="fn3x6-bk"><sup class="textsuperscript">3</sup></a></span><a id="x1-25009f3"></a> -</p><!--l. 2334--><p class="indent" > If you have used the <span +</p><!--l. 2343--><p class="indent" > If you have used the <span class="ec-lmss-10x-x-109">acronym</span><a id="dx1-25013"></a> package option, there are two possible solutions to this problem: @@ -5544,7 +5565,7 @@ class="ec-lmtt-10x-x-109">myacronyms.tex </span>so that entries are defined in t \newacronym[type=\glsdefaulttype]{aca}{aca}{a  <br />contrived acronym} </div> - <!--l. 2342--><p class="nopar" > and do: + <!--l. 2351--><p class="nopar" > and do: @@ -5552,7 +5573,7 @@ class="ec-lmtt-10x-x-109">myacronyms.tex </span>so that entries are defined in t <div class="verbatim" id="verbatim-58"> \loadglsentries[altacronym]{myacronyms} </div> - <!--l. 2346--><p class="nopar" > + <!--l. 2355--><p class="nopar" > </p></li> <li class="enumerate" id="x1-25017x2">Temporarily change <span @@ -5566,19 +5587,19 @@ class="ec-lmtt-10x-x-109">\acronymtype </span>to the target glossary:  <br />\loadglsentries{myacronyms}  <br />\let\acronymtype\orgacronymtype </div> - <!--l. 2354--><p class="nopar" ></p></li></ol> -<!--l. 2357--><p class="indent" > Note that only those entries that have been used in the text will appear + <!--l. 2363--><p class="nopar" ></p></li></ol> +<!--l. 2366--><p class="indent" > Note that only those entries that have been used in the text will appear in the relevant glossaries. Note also that <span class="ec-lmtt-10x-x-109">\loadglsentries </span>may only be used in the preamble. -</p><!--l. 2362--><p class="noindent" > +</p><!--l. 2371--><p class="noindent" > </p> -<!--l. 2362--><p class="noindent" ><a +<!--l. 2371--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">4.5</span>  <a - id="sec:moveentry"></a>Moving Entries to Another Glossary</h3> -<!--l. 2365--><p class="noindent" >As from version 3.02, you can move an entry from one glossary to another + id="x1-260004.5"></a>Moving Entries to Another Glossary</h3> +<!--l. 2374--><p class="noindent" >As from version 3.02, you can move an entry from one glossary to another using: -</p><!--l. 2367--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2376--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsmoveentry</span><span class="ec-lmtt-10"> </span></span><a id="dx1-26001"></a> <span @@ -5592,7 +5613,7 @@ class="ec-lmri-10x-x-109">target glossary label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 2369--><p class="noindent" > +</p><!--l. 2378--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -5603,12 +5624,12 @@ class="ec-lmri-10x-x-109">target</span> class="ec-lmri-10x-x-109">glossary label</span><span class="lmsy-10x-x-109">⟩ </span>is the unique label identifying the glossary in which to put the entry. -</p><!--l. 2374--><p class="indent" > Note that no check is performed to determine the existence of the target +</p><!--l. 2383--><p class="indent" > Note that no check is performed to determine the existence of the target glossary. This means that you can, for example, move an entry to an undefined glossary so you can use the entry in the document text but not have it listed in any of the glossaries. (Maybe you have an acronym so common it doesn’t need listing.) -</p><!--l. 2380--><p class="indent" > <div class="important" title="Important Note"> If you move an entry to an undefined glossary and you have hyperlinked +</p><!--l. 2389--><p class="indent" > <div class="important" title="Important Note"> If you move an entry to an undefined glossary and you have hyperlinked entries, the link will point to an undefined target. Also, you will get warnings about no file defined for that glossary (unless you use the <span @@ -5616,25 +5637,25 @@ class="ec-lmss-10x-x-109">nowarn</span><a id="dx1-26002"></a> package option). Unpredictable results may occur if you move an entry to a different glossary from its parent or children. </div> -</p><!--l. 2387--><p class="noindent" > +</p><!--l. 2396--><p class="noindent" > </p> -<!--l. 2389--><p class="noindent" ><a +<!--l. 2398--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">5</span>  <a - id="sec:numberlists"></a>Number lists</h2> + id="x1-270005"></a>Number lists</h2> Each entry in the glossary has an associated <a id="dx1-27001"></a><a href="#glo:numberlist">number list<a id="dx1-27002"></a></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="#sec:glslink">§6 </a><a -href="#sec:glslink">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a> and <a -href="#sec:glsadd">§7 +href="#x1-280006">§6 </a><a +href="#x1-280006">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a> and <a +href="#x1-310007">§7 </a><a -href="#sec:glsadd">Adding an Entry to the Glossary Without Generating Text<!--tex4ht:ref: sec:glsadd --></a>). The number +href="#x1-310007">Adding an Entry to the Glossary Without Generating Text<!--tex4ht:ref: sec:glsadd --></a>). The number list can be suppressed using the <span class="ec-lmss-10x-x-109">nonumberlist</span><a id="dx1-27003"></a> package option, or @@ -5644,7 +5665,7 @@ class="ec-lmss-10x-x-109">counter</span><a package option. The number list is also referred to as the location list<a id="dx1-27005"></a>. -<!--l. 2402--><p class="indent" > Both <a +<!--l. 2411--><p class="indent" > Both <a id="dx1-27006"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a @@ -5671,15 +5692,15 @@ class="lmsy-10x-x-109">⟩ </span>is either an integer or the keyword <span class="ec-lmtt-10x-x-109">none </span>which indicates that there should be no range formation. -</p><!--l. 2409--><p class="indent" > <div class="important" title="Important Note"> Note that <span +</p><!--l. 2418--><p class="indent" > <div class="important" title="Important Note"> Note that <span class="ec-lmtt-10x-x-109">\GlsSetXdyMinRangeLength </span>must be used before <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a id="dx1-27013"></a> and has no effect if <span class="ec-lmtt-10x-x-109">\noist</span><a id="dx1-27014"></a> is used. </div> -</p><!--l. 2412--><p class="noindent" > -</p><!--l. 2414--><p class="indent" > With both <a +</p><!--l. 2421--><p class="noindent" > +</p><!--l. 2423--><p class="indent" > With both <a id="dx1-27015"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a @@ -5689,7 +5710,7 @@ href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-27018"></a></a>, you can replace the separator and the closing number in the range using: -</p><!--l. 2416--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2425--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsSetSuffixF</span><span class="ec-lmtt-10"> </span></span><a id="dx1-27019"></a> <span @@ -5698,8 +5719,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">suffix</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 2418--><p class="noindent" > -</p><!--l. 2419--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2427--><p class="noindent" > +</p><!--l. 2428--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsSetSuffixFF</span><span class="ec-lmtt-10"> </span></span><a id="dx1-27020"></a> <span @@ -5708,7 +5729,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">suffix</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 2421--><p class="noindent" > +</p><!--l. 2430--><p class="noindent" > 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: @@ -5720,7 +5741,7 @@ example: \glsSetSuffixF{f.}  <br />\glsSetSuffixFF{ff.} </div> -<!--l. 2428--><p class="nopar" > Note that if you use <a +<!--l. 2437--><p class="nopar" > Note that if you use <a id="dx1-27021"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a @@ -5733,7 +5754,7 @@ length to 1 if you want to change these suffixes: <div class="verbatim" id="verbatim-61"> \GlsSetXdyMinRangeLength{1} </div> -<!--l. 2434--><p class="nopar" > Note that if you use the <span +<!--l. 2443--><p class="nopar" > Note that if you use the <span class="ec-lmss-10x-x-109">hyperref</span><a id="dx1-27023"></a> package, you will need to use <span @@ -5748,8 +5769,8 @@ For example: \glsSetSuffixF{\nohyperpage{f.}}  <br />\glsSetSuffixFF{\nohyperpage{ff.}} </div> -<!--l. 2441--><p class="nopar" > -</p><!--l. 2443--><p class="indent" > <div class="important" title="Important Note"> Note that <span +<!--l. 2450--><p class="nopar" > +</p><!--l. 2452--><p class="indent" > <div class="important" title="Important Note"> Note that <span class="ec-lmtt-10x-x-109">\glsSetSuffixF </span>and <span class="ec-lmtt-10x-x-109">\glsSetSuffixFF </span>must be used before <span @@ -5757,14 +5778,14 @@ class="ec-lmtt-10x-x-109">\makeglossaries</span><a id="dx1-27025"></a> and have no effect if <span class="ec-lmtt-10x-x-109">\noist</span><a id="dx1-27026"></a> is used. </div> -</p><!--l. 2447--><p class="noindent" > +</p><!--l. 2456--><p class="noindent" > </p> <h2 class="chapterHead"><span class="titlemark">6</span>  <a - id="sec:glslink"></a>Links to Glossary Entries</h2> -<!--l. 2453--><p class="noindent" >Once you have defined a glossary entry using <span + id="x1-280006"></a>Links to Glossary Entries</h2> +<!--l. 2462--><p class="noindent" >Once you have defined a glossary entry using <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a id="dx1-28001"></a>, you can refer to that entry in the document using one of the commands listed in @@ -5789,22 +5810,22 @@ is added to the <a href="#glo:numberlist">number list<a id="dx1-28009"></a></a> for that entry. By default, the location refers to the page number. For further information on number lists, see <a -href="#sec:numberlists">§5 </a><a -href="#sec:numberlists">Number +href="#x1-270005">§5 </a><a +href="#x1-270005">Number lists<!--tex4ht:ref: sec:numberlists --></a>. -</p><!--l. 2465--><p class="indent" > <div class="important" title="Important Note"> It is strongly recommended that you don’t use the commands +</p><!--l. 2474--><p class="indent" > <div class="important" title="Important Note"> It is strongly recommended that you don’t use the commands defined in this section in the arguments of sectioning or caption commands or any other command that has a moving argument. </div> -</p><!--l. 2469--><p class="noindent" > -</p><!--l. 2471--><p class="indent" > The above warning is particularly important if you are using the +</p><!--l. 2478--><p class="noindent" > +</p><!--l. 2480--><p class="indent" > The above warning is particularly important if you are using the <span class="ec-lmss-10x-x-109">glossaries </span>package in conjunction with the <span class="ec-lmss-10x-x-109">hyperref</span><a id="dx1-28010"></a> package. Instead, use one of the commands listed in <a -href="#sec:glsnolink">§9 </a><a -href="#sec:glsnolink">Using Glossary Terms Without Links<!--tex4ht:ref: sec:glsnolink --></a> +href="#x1-340009">§9 </a><a +href="#x1-340009">Using Glossary Terms Without Links<!--tex4ht:ref: sec:glsnolink --></a> (such as <span class="ec-lmtt-10x-x-109">\glsentrytext</span><a id="dx1-28011"></a>) or provide an alternative via the optional @@ -5817,12 +5838,12 @@ argument to the sectioning/caption command. Examples: \chapter{An overview of \glsentrytext{perl}}  <br />\chapter[An overview of Perl]{An overview of \gls{perl}} </div> -<!--l. 2480--><p class="nopar" > -</p><!--l. 2482--><p class="indent" > The way the <a +<!--l. 2489--><p class="nopar" > +</p><!--l. 2491--><p class="indent" > The way the <a id="dx1-28012"></a><a href="#glo:linktext">link text<a id="dx1-28013"></a></a> is displayed depends on -</p><!--l. 2483--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2492--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glstextformat</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28014"></a> <span @@ -5831,7 +5852,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 2485--><p class="noindent" > +</p><!--l. 2494--><p class="noindent" > For example, to make all <a id="dx1-28015"></a><a href="#glo:linktext">link text<a @@ -5843,8 +5864,8 @@ href="#glo:linktext">link text<a <div class="verbatim" id="verbatim-64"> \renewcommand*{\glstextformat}[1]{\textsf{#1}} </div> -<!--l. 2490--><p class="nopar" > -</p><!--l. 2492--><p class="indent" > Each entry has an associated conditional referred to as the <a +<!--l. 2499--><p class="nopar" > +</p><!--l. 2501--><p class="indent" > Each entry has an associated conditional referred to as the <a id="dx1-28017"></a><a href="#glo:firstuseflag">first use flag</a>. This determines whether <span @@ -5862,11 +5883,11 @@ used without affecting the <a href="#glo:firstuseflag">first use flag</a> (for example, when used with <span class="ec-lmtt-10x-x-109">\glslink</span>). See <a -href="#sec:glsunset">§14 </a><a -href="#sec:glsunset">Unsetting and Resetting Entry Flags<!--tex4ht:ref: sec:glsunset --></a> for commands +href="#x1-4600014">§14 </a><a +href="#x1-4600014">Unsetting and Resetting Entry Flags<!--tex4ht:ref: sec:glsunset --></a> for commands that unset or reset this conditional. -</p><!--l. 2500--><p class="indent" > The command: -</p><!--l. 2501--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2509--><p class="indent" > The command: +</p><!--l. 2510--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glslink</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28023"></a> <span @@ -5883,7 +5904,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 2503--><p class="noindent" > +</p><!--l. 2512--><p class="noindent" > will place <span class="ec-lmtt-10x-x-109">\glstextformat{</span><span class="lmsy-10x-x-109">⟨</span><span @@ -5956,8 +5977,8 @@ class="ec-lmri-10x-x-109">italic</span>) you <div class="verbatim" id="verbatim-65"> \newcommand*{\textbfem}[1]{\textbf{\emph{#1}}} </div> - <!--l. 2530--><p class="nopar" > and use that command. - </p><!--l. 2533--><p class="noindent" >In this document, the standard formats refer to the standard text + <!--l. 2539--><p class="nopar" > and use that command. + </p><!--l. 2542--><p class="noindent" >In this document, the standard formats refer to the standard text block commands such as <span class="ec-lmtt-10x-x-109">\textbf</span><a id="dx1-28032"></a> or <span @@ -5965,7 +5986,7 @@ class="ec-lmtt-10x-x-109">\emph</span><a id="dx1-28033"></a> or any of the commands listed in <a href="#x1-280471">table 6.1</a>. - </p><!--l. 2537--><p class="noindent" ><div class="important" title="Important Note"> If you use <a + </p><!--l. 2546--><p class="noindent" ><div class="important" title="Important Note"> If you use <a id="dx1-28034"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a @@ -5996,11 +6017,11 @@ class="ec-lmtt-10x-x-109">xindy</span><a <div class="verbatim" id="verbatim-66"> \GlsAddXdyAttribute{textbfem} </div> - <!--l. 2545--><p class="nopar" > See <a -href="#sec:xindy">§11 </a><a -href="#sec:xindy">Xindy<!--tex4ht:ref: sec:xindy --></a> for further details. </div> - </p><!--l. 2547--><p class="noindent" > - </p><!--l. 2549--><p class="noindent" >Note that unlike <span + <!--l. 2554--><p class="nopar" > See <a +href="#x1-3600011">§11 </a><a +href="#x1-3600011">Xindy<!--tex4ht:ref: sec:xindy --></a> for further details. </div> + </p><!--l. 2556--><p class="noindent" > + </p><!--l. 2558--><p class="noindent" >Note that unlike <span class="ec-lmtt-10x-x-109">\index</span><a id="dx1-28042"></a>, you can’t have anything following the command name, such as an asterisk or arguments. If you want to @@ -6010,10 +6031,10 @@ class="ec-lmss-10x-x-109">see</span><a the entry or use <span class="ec-lmtt-10x-x-109">\glssee</span><a id="dx1-28044"></a> (described in <a -href="#sec:crossref">§8 </a><a -href="#sec:crossref">Cross-Referencing +href="#x1-320008">§8 </a><a +href="#x1-320008">Cross-Referencing Entries<!--tex4ht:ref: sec:crossref --></a>). - </p><!--l. 2556--><p class="noindent" >If you are using hyperlinks and you want to change the font of the + </p><!--l. 2565--><p class="noindent" >If you are using hyperlinks and you want to change the font of the hyperlinked location, don’t use <span class="ec-lmtt-10x-x-109">\hyperpage</span><a id="dx1-28045"></a> (provided by the <span @@ -6024,7 +6045,7 @@ class="ec-lmss-10x-x-109">hyperref</span><a class="ec-lmss-10x-x-109">glossaries </span>package provides number formats listed in <a href="#x1-280471">table 6.1</a>. - </p><!--l. 2562--><p class="noindent" ><a + </p><!--l. 2571--><p class="noindent" ><a id="x1-280471"></a></p><hr class="float" /><div class="float" > <div class="caption"><table class="caption" @@ -6096,7 +6117,7 @@ class="ec-lmtt-10x-x-109">hyperemph</span><a class="td11"> emphasized hyperlink </td></tr></table> </div> </div><hr class="endfloat" /> - <!--l. 2582--><p class="noindent" >Note that if the <span + <!--l. 2591--><p class="noindent" >Note that if the <span class="ec-lmtt-10x-x-109">\hyperlink</span><a id="dx1-28058"></a> command hasn’t been defined, the <span @@ -6124,7 +6145,7 @@ class="ec-lmtt-10x-x-109">\hyperbsf</span><a <div class="verbatim" id="verbatim-67"> \newcommand{\hyperbsf}[1]{\textbf{\hypersf{#1}}} </div> - <!--l. 2592--><p class="nopar" > and then use <span + <!--l. 2601--><p class="nopar" > and then use <span class="ec-lmtt-10x-x-109">hyperbsf </span>as the value for the <span class="ec-lmss-10x-x-109">format</span><a id="dx1-28060"></a> key. (See also @@ -6143,15 +6164,15 @@ class="ec-lmtt-10x-x-109">xindy</span><a <div class="verbatim" id="verbatim-68"> \GlsAddXdyAttribute{hyperbsf} </div> - <!--l. 2600--><p class="nopar" > + <!--l. 2609--><p class="nopar" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">counter</span><a id="dx1-28063"></a> </dt><dd class="description">This specifies which counter to use for this location. This overrides the default counter used by this entry. (See also <a -href="#sec:numberlists">§5 </a><a -href="#sec:numberlists">Number +href="#x1-270005">§5 </a><a +href="#x1-270005">Number lists<!--tex4ht:ref: sec:numberlists --></a>.) </dd><dt class="description"> <span @@ -6166,8 +6187,8 @@ class="ec-lmtt-10x-x-109">\hyperlink</span><a The default value is <span class="ec-lmtt-10x-x-109">hyper=true</span>. </dd></dl> -<!--l. 2613--><p class="noindent" >There is also a starred version: -</p><!--l. 2614--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 2622--><p class="noindent" >There is also a starred version: +</p><!--l. 2623--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glslink*</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28066"></a> <span @@ -6184,13 +6205,13 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 2616--><p class="noindent" > +</p><!--l. 2625--><p class="noindent" > which is equivalent to <span class="ec-lmtt-10x-x-109">\glslink</span>, except it sets <span class="ec-lmtt-10x-x-109">hyper=false</span>. Similarly, all the following commands described in this section also have a starred version that disables the hyperlink. -</p><!--l. 2622--><p class="indent" > <div class="important" title="Important Note"> Don’t use commands like <span +</p><!--l. 2631--><p class="indent" > <div class="important" title="Important Note"> Don’t use commands like <span class="ec-lmtt-10x-x-109">\glslink </span>or <span class="ec-lmtt-10x-x-109">\gls </span>in the <span class="lmsy-10x-x-109">⟨</span><span @@ -6198,9 +6219,9 @@ class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩ </span>argument of <span class="ec-lmtt-10x-x-109">\glslink</span>. </div> -</p><!--l. 2625--><p class="noindent" > -</p><!--l. 2627--><p class="indent" > The command: -</p><!--l. 2628--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2634--><p class="noindent" > +</p><!--l. 2636--><p class="indent" > The command: +</p><!--l. 2637--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\gls</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28067"></a> <span @@ -6217,7 +6238,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2630--><p class="noindent" > +</p><!--l. 2639--><p class="noindent" > is the same as <span class="ec-lmtt-10x-x-109">\glslink</span>, except that the <a id="dx1-28068"></a><a @@ -6242,8 +6263,8 @@ class="ec-lmtt-10x-x-109">\gls </span>will mark the entry’s <a id="dx1-28076"></a><a href="#glo:firstuseflag">first use flag</a> as used. -</p><!--l. 2640--><p class="indent" > There are two uppercase variants: -</p><!--l. 2641--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2649--><p class="indent" > There are two uppercase variants: +</p><!--l. 2650--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Gls</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28077"></a> <span @@ -6260,12 +6281,12 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2643--><p class="noindent" > +</p><!--l. 2652--><p class="noindent" > and -</p><!--l. 2645--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2654--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLS</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28078"></a> <span @@ -6282,10 +6303,10 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2647--><p class="noindent" > +</p><!--l. 2656--><p class="noindent" > which make the first letter of the link text or all the link text uppercase, respectively. -</p><!--l. 2651--><p class="indent" > The final optional argument <span +</p><!--l. 2660--><p class="indent" > The final optional argument <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span>, allows you to insert some @@ -6294,10 +6315,10 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>at the end of the link text, but this can be changed (see <a -href="#sec:glsdisplay">§6.1 </a><a -href="#sec:glsdisplay">Changing the +href="#x1-290006.1">§6.1 </a><a +href="#x1-290006.1">Changing the format of the link text<!--tex4ht:ref: sec:glsdisplay --></a>). -</p><!--l. 2656--><p class="indent" > The first optional argument <span +</p><!--l. 2665--><p class="indent" > The first optional argument <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span class="lmsy-10x-x-109">⟩ </span>is the same as the optional @@ -6307,7 +6328,7 @@ class="ec-lmtt-10x-x-109">\glslink</span><a class="ec-lmtt-10x-x-109">\glslink</span><a id="dx1-28080"></a>, these commands also have a starred version that disable the hyperlink. -</p><!--l. 2660--><p class="indent" > <div class="important" title="Important Note"> Don’t use commands like <span +</p><!--l. 2669--><p class="indent" > <div class="important" title="Important Note"> Don’t use commands like <span class="ec-lmtt-10x-x-109">\glslink </span>or <span class="ec-lmtt-10x-x-109">\gls </span>in the <span class="lmsy-10x-x-109">⟨</span><span @@ -6315,9 +6336,9 @@ class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>argument of <span class="ec-lmtt-10x-x-109">\gls </span>and its variants. </div> -</p><!--l. 2663--><p class="noindent" > -</p><!--l. 2665--><p class="indent" > There are also analogous plural forms: -</p><!--l. 2666--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2672--><p class="noindent" > +</p><!--l. 2674--><p class="indent" > There are also analogous plural forms: +</p><!--l. 2675--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glspl</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28081"></a> <span @@ -6334,8 +6355,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2668--><p class="noindent" > -</p><!--l. 2669--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2677--><p class="noindent" > +</p><!--l. 2678--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glspl</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28082"></a> <span @@ -6352,8 +6373,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2671--><p class="noindent" > -</p><!--l. 2672--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2680--><p class="noindent" > +</p><!--l. 2681--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSpl</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28083"></a> <span @@ -6370,7 +6391,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2674--><p class="noindent" > +</p><!--l. 2683--><p class="noindent" > These determine the link text from the <span class="ec-lmss-10x-x-109">plural</span><a id="dx1-28084"></a> and <span @@ -6378,7 +6399,7 @@ class="ec-lmss-10x-x-109">firstplural</span><a id="dx1-28085"></a> keys supplied when the entry was first defined. As before, these commands also have a starred version that disable the hyperlink. -</p><!--l. 2680--><p class="indent" > <div class="important" title="Important Note"> Be careful when you use glossary entries in math mode especially if you +</p><!--l. 2689--><p class="indent" > <div class="important" title="Important Note"> Be careful when you use glossary entries in math mode especially if you are using <span class="ec-lmss-10x-x-109">hyperref</span><a id="dx1-28086"></a> as it can affect the spacing of subscripts and @@ -6392,7 +6413,7 @@ entry: \newglossaryentry{Falpha}{name={F_\alpha},  <br />description=sample} </div> -<!--l. 2688--><p class="nopar" > and later you use it in math mode: +<!--l. 2697--><p class="nopar" > and later you use it in math mode: @@ -6400,7 +6421,7 @@ entry: <div class="verbatim" id="verbatim-70"> $\gls{Falpha}^2$ </div> -<!--l. 2692--><p class="nopar" > This will result in <span +<!--l. 2701--><p class="nopar" > This will result in <span class="lmmi-10x-x-109">F</span><sub><span class="lmmi-8x-x-103">α</span></sub><sup><span class="rm-lmr-8x-x-103">2</span></sup> instead of <span @@ -6419,9 +6440,9 @@ argument: <div class="verbatim" id="verbatim-71"> $\gls{Falpha}[^2]$ </div> -<!--l. 2698--><p class="nopar" > </div> -</p><!--l. 2699--><p class="noindent" > -</p><!--l. 2701--><p class="indent" > Note that <span +<!--l. 2707--><p class="nopar" > </div> +</p><!--l. 2708--><p class="noindent" > +</p><!--l. 2710--><p class="indent" > Note that <span class="ec-lmtt-10x-x-109">\glslink</span><a id="dx1-28087"></a> doesn’t use or affect the <a id="dx1-28088"></a><a @@ -6431,10 +6452,10 @@ class="ec-lmtt-10x-x-109">\glsdisplay</span><a id="dx1-28089"></a> or <span class="ec-lmtt-10x-x-109">\glsdisplayfirst</span><a id="dx1-28090"></a> (see <a -href="#sec:glsdisplay">§6.1 </a><a -href="#sec:glsdisplay">Changing the format of +href="#x1-290006.1">§6.1 </a><a +href="#x1-290006.1">Changing the format of the link text<!--tex4ht:ref: sec:glsdisplay --></a>). Instead, you can use: -</p><!--l. 2704--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2713--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsdisp</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28091"></a> <span @@ -6451,7 +6472,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">link text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 2706--><p class="noindent" > +</p><!--l. 2715--><p class="noindent" > This behaves in the same way as <span class="ec-lmtt-10x-x-109">\gls</span><a id="dx1-28092"></a>, except that it uses <span @@ -6474,8 +6495,8 @@ class="ec-lmtt-10x-x-109">\glsdisplay</span><a id="dx1-28096"></a> or <span class="ec-lmtt-10x-x-109">\glsdisplayfirst</span><a id="dx1-28097"></a>. -</p><!--l. 2713--><p class="indent" > The command: -</p><!--l. 2714--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2722--><p class="indent" > The command: +</p><!--l. 2723--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glstext</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28098"></a> <span @@ -6492,7 +6513,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2716--><p class="noindent" > +</p><!--l. 2725--><p class="noindent" > is similar to <span class="ec-lmtt-10x-x-109">\gls</span><a id="dx1-28099"></a> except that it always uses the value of the <span @@ -6513,8 +6534,8 @@ or <span class="ec-lmtt-10x-x-109">\glsdisplayfirst</span><a id="dx1-28103"></a>. (The same is true for all the following commands described in this section.) -</p><!--l. 2725--><p class="indent" > There are also analogous commands: -</p><!--l. 2726--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2734--><p class="indent" > There are also analogous commands: +</p><!--l. 2735--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glstext</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28104"></a> <span @@ -6531,8 +6552,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2728--><p class="noindent" > -</p><!--l. 2729--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2737--><p class="noindent" > +</p><!--l. 2738--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLStext</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28105"></a> <span @@ -6549,11 +6570,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2731--><p class="noindent" > +</p><!--l. 2740--><p class="noindent" > As before, these commands also have a starred version that disable the hyperlink. -</p><!--l. 2735--><p class="indent" > The command: -</p><!--l. 2736--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2744--><p class="indent" > The command: +</p><!--l. 2745--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsfirst</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28106"></a> <span @@ -6570,7 +6591,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2738--><p class="noindent" > +</p><!--l. 2747--><p class="noindent" > is similar to <span class="ec-lmtt-10x-x-109">\glstext </span>except that it always uses the value of the <span class="ec-lmss-10x-x-109">first</span><a @@ -6582,8 +6603,8 @@ class="lmsy-10x-x-109">⟩ </span>is always appended to the end of the link affect the <a id="dx1-28108"></a><a href="#glo:firstuseflag">first use flag</a>. -</p><!--l. 2744--><p class="indent" > There are also analogous commands: -</p><!--l. 2745--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2753--><p class="indent" > There are also analogous commands: +</p><!--l. 2754--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsfirst</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28109"></a> <span @@ -6600,11 +6621,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2747--><p class="noindent" > +</p><!--l. 2756--><p class="noindent" > -</p><!--l. 2748--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2757--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSfirst</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28110"></a> <span @@ -6621,11 +6642,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2750--><p class="noindent" > +</p><!--l. 2759--><p class="noindent" > As before, these commands also have a starred version that disable the hyperlink. -</p><!--l. 2754--><p class="indent" > The command: -</p><!--l. 2755--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2763--><p class="indent" > The command: +</p><!--l. 2764--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsplural</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28111"></a> <span @@ -6642,7 +6663,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2757--><p class="noindent" > +</p><!--l. 2766--><p class="noindent" > is similar to <span class="ec-lmtt-10x-x-109">\glstext</span><a id="dx1-28112"></a> except that it always uses the value of the <span @@ -6653,8 +6674,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>is always appended to the end of the link text and does not mark the entry as having been used. -</p><!--l. 2763--><p class="indent" > There are also analogous commands: -</p><!--l. 2764--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2772--><p class="indent" > There are also analogous commands: +</p><!--l. 2773--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsplural</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28114"></a> <span @@ -6671,8 +6692,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2766--><p class="noindent" > -</p><!--l. 2767--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2775--><p class="noindent" > +</p><!--l. 2776--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSplural</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28115"></a> <span @@ -6689,11 +6710,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2769--><p class="noindent" > +</p><!--l. 2778--><p class="noindent" > As before, these commands also have a starred version that disable the hyperlink. -</p><!--l. 2773--><p class="indent" > The command: -</p><!--l. 2774--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2782--><p class="indent" > The command: +</p><!--l. 2783--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsfirstplural</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28116"></a> <span @@ -6711,7 +6732,7 @@ class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">]</span> </div><hr> -</p><!--l. 2776--><p class="noindent" > +</p><!--l. 2785--><p class="noindent" > is similar to <span class="ec-lmtt-10x-x-109">\glstext</span><a id="dx1-28117"></a> except that it always uses the value of the <span @@ -6722,8 +6743,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>is always appended to the end of the link text and does not mark the entry as having been used. -</p><!--l. 2782--><p class="indent" > There are also analogous commands: -</p><!--l. 2783--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2791--><p class="indent" > There are also analogous commands: +</p><!--l. 2792--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsfirstplural</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28119"></a> <span @@ -6741,8 +6762,8 @@ class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">]</span> </div><hr> -</p><!--l. 2785--><p class="noindent" > -</p><!--l. 2786--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2794--><p class="noindent" > +</p><!--l. 2795--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSfirstplural</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28120"></a> <span @@ -6760,11 +6781,11 @@ class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">]</span> </div><hr> -</p><!--l. 2788--><p class="noindent" > +</p><!--l. 2797--><p class="noindent" > As before, these commands also have a starred version that disable the hyperlink. -</p><!--l. 2792--><p class="indent" > The command: -</p><!--l. 2793--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2801--><p class="indent" > The command: +</p><!--l. 2802--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsname</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28121"></a> <span @@ -6781,7 +6802,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2795--><p class="noindent" > +</p><!--l. 2804--><p class="noindent" > is similar to <span class="ec-lmtt-10x-x-109">\glstext</span><a id="dx1-28122"></a> except that it always uses the value of the <span @@ -6805,8 +6826,8 @@ class="ec-lmss-10x-x-109">name</span><a commands. -</p><!--l. 2804--><p class="indent" > There are also analogous commands: -</p><!--l. 2805--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2813--><p class="indent" > There are also analogous commands: +</p><!--l. 2814--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsname</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28128"></a> <span @@ -6823,8 +6844,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2807--><p class="noindent" > -</p><!--l. 2808--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2816--><p class="noindent" > +</p><!--l. 2817--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSname</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28129"></a> <span @@ -6841,11 +6862,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2810--><p class="noindent" > +</p><!--l. 2819--><p class="noindent" > As before, these commands also have a starred version that disable the hyperlink. -</p><!--l. 2814--><p class="indent" > The command: -</p><!--l. 2815--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2823--><p class="indent" > The command: +</p><!--l. 2824--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glssymbol</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28130"></a> <span @@ -6862,7 +6883,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2817--><p class="noindent" > +</p><!--l. 2826--><p class="noindent" > is similar to <span class="ec-lmtt-10x-x-109">\glstext</span><a id="dx1-28131"></a> except that it always uses the value of the <span @@ -6883,8 +6904,8 @@ href="#glo:sanitize">sanitization<a class="ec-lmss-10x-x-109">symbol</span><a id="dx1-28136"></a> key and protect fragile commands. -</p><!--l. 2826--><p class="indent" > There are also analogous commands: -</p><!--l. 2827--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2835--><p class="indent" > There are also analogous commands: +</p><!--l. 2836--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glssymbol</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28137"></a> <span @@ -6901,8 +6922,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2829--><p class="noindent" > -</p><!--l. 2830--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2838--><p class="noindent" > +</p><!--l. 2839--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSsymbol</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28138"></a> <span @@ -6919,11 +6940,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2832--><p class="noindent" > +</p><!--l. 2841--><p class="noindent" > As before, these commands also have a starred version that disable the hyperlink. -</p><!--l. 2836--><p class="indent" > The command: -</p><!--l. 2837--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2845--><p class="indent" > The command: +</p><!--l. 2846--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsdesc</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28139"></a> <span @@ -6940,7 +6961,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2839--><p class="noindent" > +</p><!--l. 2848--><p class="noindent" > is similar to <span class="ec-lmtt-10x-x-109">\glstext</span><a id="dx1-28140"></a> except that it always uses the value of the @@ -6961,8 +6982,8 @@ href="#glo:sanitize">sanitization<a class="ec-lmss-10x-x-109">description</span><a id="dx1-28145"></a> key and protect fragile commands. -</p><!--l. 2848--><p class="indent" > There are also analogous commands: -</p><!--l. 2849--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2857--><p class="indent" > There are also analogous commands: +</p><!--l. 2858--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsdesc</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28146"></a> <span @@ -6979,8 +7000,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2851--><p class="noindent" > -</p><!--l. 2852--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2860--><p class="noindent" > +</p><!--l. 2861--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSdesc</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28147"></a> <span @@ -6997,14 +7018,14 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2854--><p class="noindent" > +</p><!--l. 2863--><p class="noindent" > As before, these commands also have a starred version that disable the hyperlink. -</p><!--l. 2858--><p class="indent" > The command: -</p><!--l. 2859--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2867--><p class="indent" > The command: +</p><!--l. 2868--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsuseri</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28148"></a> <span @@ -7021,7 +7042,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2861--><p class="noindent" > +</p><!--l. 2870--><p class="noindent" > is similar to <span class="ec-lmtt-10x-x-109">\glstext</span><a id="dx1-28149"></a> except that it always uses the value of the <span @@ -7032,8 +7053,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>is always appended to the end of the link text and does not mark the entry as having been used. -</p><!--l. 2867--><p class="indent" > There are also analogous commands: -</p><!--l. 2868--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2876--><p class="indent" > There are also analogous commands: +</p><!--l. 2877--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsuseri</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28151"></a> <span @@ -7050,8 +7071,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2870--><p class="noindent" > -</p><!--l. 2871--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2879--><p class="noindent" > +</p><!--l. 2880--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSuseri</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28152"></a> <span @@ -7068,10 +7089,10 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2873--><p class="noindent" > +</p><!--l. 2882--><p class="noindent" > As before, these commands also have a starred version that disable the hyperlink. Similarly for the other user keys: -</p><!--l. 2876--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2885--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsuserii</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28153"></a> <span @@ -7088,8 +7109,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2878--><p class="noindent" > -</p><!--l. 2879--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2887--><p class="noindent" > +</p><!--l. 2888--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsuserii</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28154"></a> <span @@ -7106,8 +7127,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2881--><p class="noindent" > -</p><!--l. 2882--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2890--><p class="noindent" > +</p><!--l. 2891--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSuserii</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28155"></a> <span @@ -7124,8 +7145,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2884--><p class="noindent" > -</p><!--l. 2885--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2893--><p class="noindent" > +</p><!--l. 2894--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsuseriii</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28156"></a> <span @@ -7142,8 +7163,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2887--><p class="noindent" > -</p><!--l. 2888--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2896--><p class="noindent" > +</p><!--l. 2897--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsuseriii</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28157"></a> <span @@ -7160,8 +7181,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2890--><p class="noindent" > -</p><!--l. 2891--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2899--><p class="noindent" > +</p><!--l. 2900--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSuseriii</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28158"></a> <span @@ -7178,8 +7199,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2893--><p class="noindent" > -</p><!--l. 2894--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2902--><p class="noindent" > +</p><!--l. 2903--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsuseriv</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28159"></a> <span @@ -7196,8 +7217,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2896--><p class="noindent" > -</p><!--l. 2897--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2905--><p class="noindent" > +</p><!--l. 2906--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsuseriv</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28160"></a> <span @@ -7214,8 +7235,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2899--><p class="noindent" > -</p><!--l. 2900--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2908--><p class="noindent" > +</p><!--l. 2909--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSuseriv</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28161"></a> <span @@ -7232,8 +7253,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2902--><p class="noindent" > -</p><!--l. 2903--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2911--><p class="noindent" > +</p><!--l. 2912--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsuserv</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28162"></a> <span @@ -7250,11 +7271,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2905--><p class="noindent" > +</p><!--l. 2914--><p class="noindent" > -</p><!--l. 2906--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2915--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsuserv</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28163"></a> <span @@ -7271,8 +7292,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2908--><p class="noindent" > -</p><!--l. 2909--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2917--><p class="noindent" > +</p><!--l. 2918--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSuserv</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28164"></a> <span @@ -7289,8 +7310,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2911--><p class="noindent" > -</p><!--l. 2912--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2920--><p class="noindent" > +</p><!--l. 2921--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsuservi</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28165"></a> <span @@ -7307,8 +7328,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2914--><p class="noindent" > -</p><!--l. 2915--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2923--><p class="noindent" > +</p><!--l. 2924--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsuservi</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28166"></a> <span @@ -7325,8 +7346,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2917--><p class="noindent" > -</p><!--l. 2918--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2926--><p class="noindent" > +</p><!--l. 2927--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSuservi</span><span class="ec-lmtt-10"> </span></span><a id="dx1-28167"></a> <span @@ -7343,11 +7364,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2920--><p class="noindent" > +</p><!--l. 2929--><p class="noindent" > </p> <h3 class="sectionHead"><span class="titlemark">6.1</span>  <a - id="sec:glsdisplay"></a>Changing the format of the link text</h3> -<!--l. 2925--><p class="noindent" >The format of the <a + id="x1-290006.1"></a>Changing the format of the link text</h3> +<!--l. 2934--><p class="noindent" >The format of the <a id="dx1-29001"></a><a href="#glo:linktext">link text<a id="dx1-29002"></a></a> for <span @@ -7356,7 +7377,7 @@ class="ec-lmtt-10x-x-109">\gls</span><a class="ec-lmtt-10x-x-109">\glspl</span><a id="dx1-29004"></a> and their uppercase variants is governed by two commands: -</p><!--l. 2927--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2936--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsdisplayfirst</span><span class="ec-lmtt-10"> </span></span><a id="dx1-29005"></a> <span @@ -7379,11 +7400,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 2929--><p class="noindent" > +</p><!--l. 2938--><p class="noindent" > which is used the <a id="dx1-29006"></a><a href="#glo:firstuse">first time</a> a glossary entry is used in the text and -</p><!--l. 2932--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2941--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsdisplay</span><span class="ec-lmtt-10"> </span></span><a id="dx1-29007"></a> <span @@ -7405,7 +7426,7 @@ class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 2934--><p class="noindent" > +</p><!--l. 2943--><p class="noindent" > which is used subsequently. Both commands take four arguments: the first is either the singular or plural form given by the <span class="ec-lmss-10x-x-109">text</span><a @@ -7440,7 +7461,7 @@ class="ec-lmtt-10x-x-109">\glsdisplay </span>and class="ec-lmtt-10x-x-109">\glsdisplayfirst </span>simply print the first argument immediately followed by the fourth argument. The remaining arguments are ignored. -</p><!--l. 2950--><p class="indent" > <div class="important" title="Important Note"> Care needs to be taken when redefining <span +</p><!--l. 2959--><p class="indent" > <div class="important" title="Important Note"> Care needs to be taken when redefining <span class="ec-lmtt-10x-x-109">\glsdisplay </span>and <span class="ec-lmtt-10x-x-109">\glsdisplayfirst </span>as commands like <span @@ -7464,29 +7485,29 @@ something like:  <br />#1}}  <br />\renewcommand{\glsdisplay}[4]{\textbfit{#1#4}} </div> -<!--l. 2961--><p class="nopar" > See the <span +<!--l. 2970--><p class="nopar" > See the <span class="ec-lmss-10x-x-109">mfirstuc</span><a id="dx1-29020"></a> documentation for further details on the limitations of <span class="ec-lmtt-10x-x-109">\makefirstuc</span><a id="dx1-29021"></a>. </div> -</p><!--l. 2964--><p class="noindent" > -</p><!--l. 2966--><p class="indent" > If required, you can access the label for the given entry via -</p><!--l. 2967--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2973--><p class="noindent" > +</p><!--l. 2975--><p class="indent" > If required, you can access the label for the given entry via +</p><!--l. 2976--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glslabel</span><span class="ec-lmtt-10"> </span></span><a id="dx1-29022"></a> <span class="ec-lmtt-10x-x-109">\glslabel </span></div><hr> -</p><!--l. 2969--><p class="noindent" > +</p><!--l. 2978--><p class="noindent" > so it is possible to use this label in the definition of <span class="ec-lmtt-10x-x-109">\glsdisplay </span>or <span class="ec-lmtt-10x-x-109">\glsdisplayfirst </span>to supply additional information using any of the commands described in <a -href="#sec:glsnolink">§9 </a><a -href="#sec:glsnolink">Using Glossary Terms Without Links<!--tex4ht:ref: sec:glsnolink --></a>, if +href="#x1-340009">§9 </a><a +href="#x1-340009">Using Glossary Terms Without Links<!--tex4ht:ref: sec:glsnolink --></a>, if required. -</p><!--l. 2975--><p class="indent" > Note that <span +</p><!--l. 2984--><p class="indent" > Note that <span class="ec-lmtt-10x-x-109">\glsdisplay </span>and <span class="ec-lmtt-10x-x-109">\glsdisplayfirst </span>are not used by <span @@ -7495,7 +7516,7 @@ class="ec-lmtt-10x-x-109">\glslink</span><a <span class="ec-lmtt-10x-x-109">\glsdisp</span><a id="dx1-29024"></a> instead. -</p><!--l. 2979--><p class="indent" > For example, suppose you want a glossary of measurements and units, +</p><!--l. 2988--><p class="indent" > For example, suppose you want a glossary of measurements and units, you can use the <span class="ec-lmss-10x-x-109">symbol</span><a id="dx1-29025"></a> key to store the unit: @@ -7508,7 +7529,7 @@ class="ec-lmss-10x-x-109">symbol</span><a  <br />description={The length between two points},  <br />symbol={km}} </div> -<!--l. 2985--><p class="nopar" > and now suppose you want <span class="obeylines-h"><span class="verb"><span +<!--l. 2994--><p class="nopar" > and now suppose you want <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls{distance}</span></span></span> to produce “distance (km)” on <a id="dx1-29026"></a><a @@ -7522,14 +7543,14 @@ follows: <div class="verbatim" id="verbatim-74"> \renewcommand{\glsdisplayfirst}[4]{#1#4 (#3)} </div> -<!--l. 2991--><p class="nopar" > Note that the additional text is placed after <span class="obeylines-h"><span class="verb"><span +<!--l. 3000--><p class="nopar" > Note that the additional text is placed after <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">#1</span></span></span>, so <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls{distance}[’s]</span></span></span> will produce “distance’s (km)” rather than “distance (km)’s” which looks a bit odd (even though it may be in the context of “the distance (km) is measured between the two points” — but in this instance it would be better not to use a contraction). -</p><!--l. 2999--><p class="indent" > Note also that all of the <a +</p><!--l. 3008--><p class="indent" > Note also that all of the <a id="dx1-29027"></a><a href="#glo:linktext">link text<a id="dx1-29028"></a></a> will be formatted according to @@ -7544,10 +7565,10 @@ class="ec-lmtt-10x-x-109">\glstextformat</span><a \renewcommand{\glstextformat}[1]{\textbf{#1}}  <br />\renewcommand{\glsdisplayfirst}[4]{#1#4 (#3)} </div> -<!--l. 3004--><p class="nopar" > then <span class="obeylines-h"><span class="verb"><span +<!--l. 3013--><p class="nopar" > then <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls{distance}</span></span></span> will produce “<span class="ec-lmbx-10x-x-109">distance (km)</span>”. -</p><!--l. 3007--><p class="indent" > If you have multiple glossaries, changing <span +</p><!--l. 3016--><p class="indent" > If you have multiple glossaries, changing <span class="ec-lmtt-10x-x-109">\glsdisplayfirst </span>and <span class="ec-lmtt-10x-x-109">\glsdisplay </span>will change the way entries for all of the glossaries appear @@ -7560,7 +7581,7 @@ class="ec-lmtt-10x-x-109">\glspl</span><a class="ec-lmtt-10x-x-109">\glsdisp</span><a id="dx1-29032"></a>. If you only want the change to affect entries for a given glossary, then you need to use -</p><!--l. 3013--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3022--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\defglsdisplay</span><span class="ec-lmtt-10"> </span></span><a id="dx1-29033"></a> <span @@ -7573,9 +7594,9 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">definition</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3015--><p class="noindent" > +</p><!--l. 3024--><p class="noindent" > and -</p><!--l. 3017--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3026--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\defglsdisplayfirst</span><span class="ec-lmtt-10"> </span></span><a id="dx1-29034"></a> <span @@ -7589,11 +7610,11 @@ class="ec-lmri-10x-x-109">definition</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 3019--><p class="noindent" > +</p><!--l. 3028--><p class="noindent" > instead of redefining <span class="ec-lmtt-10x-x-109">\glsdisplay </span>and <span class="ec-lmtt-10x-x-109">\glsdisplayfirst</span>. -</p><!--l. 3022--><p class="indent" > Both <span +</p><!--l. 3031--><p class="indent" > Both <span class="ec-lmtt-10x-x-109">\defglsdisplay </span>and <span class="ec-lmtt-10x-x-109">\defglsdisplayfirst </span>take two arguments: the first (which is optional) is the glossary’s @@ -7607,7 +7628,7 @@ class="ec-lmtt-10x-x-109">\glspl</span>, their uppercase variants and <span class="ec-lmtt-10x-x-109">\glsdisp</span>. This is similar to the way <span class="ec-lmtt-10x-x-109">\glsdisplayfirst </span>was redefined above. -</p><!--l. 3031--><p class="indent" > For example, suppose you have created a new glossary called <span +</p><!--l. 3040--><p class="indent" > For example, suppose you have created a new glossary called <span class="ec-lmtt-10x-x-109">notation</span> and you want to change the way the entry is displayed on <a id="dx1-29036"></a><a @@ -7620,7 +7641,7 @@ it includes the symbol, you can do: <div class="verbatim" id="verbatim-76"> \defglsdisplayfirst[notation]{#1#4 (denoted #3)} </div> -<!--l. 3036--><p class="nopar" > Now suppose you have defined an entry as follows: +<!--l. 3045--><p class="nopar" > Now suppose you have defined an entry as follows: @@ -7632,14 +7653,14 @@ it includes the symbol, you can do:  <br />  symbol={$S$}  <br />} </div> -<!--l. 3044--><p class="nopar" > The <a +<!--l. 3053--><p class="nopar" > The <a id="dx1-29037"></a><a href="#glo:firstuse">first time</a> you reference this entry it will be displayed as: “set (denoted <span class="lmmi-10x-x-109">S</span>)” (assuming <span class="ec-lmtt-10x-x-109">\gls</span><a id="dx1-29038"></a> was used). -</p><!--l. 3048--><p class="indent" > Remember that if you use the <span +</p><!--l. 3057--><p class="indent" > Remember that if you use the <span class="ec-lmss-10x-x-109">symbol</span><a id="dx1-29039"></a> key, you need to use a glossary style that displays the symbol, as many of the styles ignore it. In addition, @@ -7652,12 +7673,12 @@ will have to disable the <a href="#glo:sanitize">sanitization<a id="dx1-29043"></a></a> of these keys and protect fragile commands. -</p><!--l. 3055--><p class="noindent" > +</p><!--l. 3064--><p class="noindent" > </p> -<!--l. 3055--><p class="noindent" ><a +<!--l. 3064--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">6.2</span>  <a - id="sec:disablehyperlinks"></a>Enabling and disabling hyperlinks to glossary entries</h3> -<!--l. 3058--><p class="noindent" >If you load the <span + id="x1-300006.2"></a>Enabling and disabling hyperlinks to glossary entries</h3> +<!--l. 3067--><p class="noindent" >If you load the <span class="ec-lmss-10x-x-109">hyperref</span><a id="dx1-30001"></a> or <span class="ec-lmss-10x-x-109">html</span><a @@ -7674,19 +7695,19 @@ class="ec-lmss-10x-x-109">hyper</span><a id="dx1-30005"></a> option has been set to <span class="ec-lmtt-10x-x-109">false</span>. You can disable or enable links using: -</p><!--l. 3063--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3072--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsdisablehyper</span><span class="ec-lmtt-10"> </span></span><a id="dx1-30006"></a> <span class="ec-lmtt-10x-x-109">\glsdisablehyper </span></div><hr> -</p><!--l. 3065--><p class="noindent" > +</p><!--l. 3074--><p class="noindent" > and -</p><!--l. 3067--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3076--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsenablehyper</span><span class="ec-lmtt-10"> </span></span><a id="dx1-30007"></a> <span class="ec-lmtt-10x-x-109">\glsenablehyper </span></div><hr> -</p><!--l. 3069--><p class="noindent" > +</p><!--l. 3078--><p class="noindent" > respectively. The effect can be localised by placing the commands within a group. Note that you should only use <span class="ec-lmtt-10x-x-109">\glsenablehyper </span>if the commands @@ -7698,7 +7719,7 @@ class="ec-lmtt-10x-x-109">\hypertarget</span><a <span class="ec-lmss-10x-x-109">hyperref</span><a id="dx1-30010"></a> package). -</p><!--l. 3075--><p class="indent" > You can disable just the <a +</p><!--l. 3084--><p class="indent" > You can disable just the <a id="dx1-30011"></a><a href="#glo:firstuse">first use</a> links using the package option <span @@ -7720,12 +7741,12 @@ class="ec-lmtt-10x-x-109">\glslink</span><a </p> -<!--l. 3081--><p class="noindent" ><a +<!--l. 3090--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">7</span>  <a - id="sec:glsadd"></a>Adding an Entry to the Glossary Without Generating Text</h2> + id="x1-310007"></a>Adding an Entry to the Glossary Without Generating Text</h2> It is possible to add a line in the glossary file without generating any text at that point in the document using: -<!--l. 3086--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 3095--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsadd</span><span class="ec-lmtt-10"> </span></span><a id="dx1-31001"></a> <span @@ -7738,7 +7759,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3088--><p class="noindent" > +</p><!--l. 3097--><p class="noindent" > This is similar to <span class="ec-lmtt-10x-x-109">\glslink</span><a id="dx1-31002"></a>, only it doesn’t produce any text (so therefore, @@ -7764,9 +7785,9 @@ class="ec-lmtt-10x-x-109">set</span>:  <br />Lots of text about sets spanning many pages.  <br />\glsadd[format=)]{set} </div> -<!--l. 3099--><p class="nopar" > -</p><!--l. 3101--><p class="indent" > To add all entries that have been defined, use: -</p><!--l. 3102--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 3108--><p class="nopar" > +</p><!--l. 3110--><p class="indent" > To add all entries that have been defined, use: +</p><!--l. 3111--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsaddall</span><span class="ec-lmtt-10"> </span></span><a id="dx1-31005"></a> <span @@ -7775,7 +7796,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3104--><p class="noindent" > +</p><!--l. 3113--><p class="noindent" > The optional argument is the same as for <span class="ec-lmtt-10x-x-109">\glsadd</span>, except there is also a key <span @@ -7795,8 +7816,8 @@ class="ec-lmtt-10x-x-109">notation</span>) then you can do: <div class="verbatim" id="verbatim-79"> \glsaddall[types={\acronymtype,notation}] </div> -<!--l. 3115--><p class="nopar" > -</p><!--l. 3117--><p class="indent" > <div class="important" title="Important Note"> Note that <span +<!--l. 3124--><p class="nopar" > +</p><!--l. 3126--><p class="indent" > <div class="important" title="Important Note"> Note that <span class="ec-lmtt-10x-x-109">\glsadd </span>and <span class="ec-lmtt-10x-x-109">\glsaddall </span>add the current location to the number list. In the case of <span @@ -7807,11 +7828,11 @@ best to suppress the number list with the <span class="ec-lmss-10x-x-109">nonumberlist</span><a id="dx1-31008"></a> package option. (See sections <a -href="#sec:pkgopts-printglos">2.3<!--tex4ht:ref: sec:pkgopts-printglos --></a> and <a -href="#sec:numberlists">5<!--tex4ht:ref: sec:numberlists --></a>.) </div> -</p><!--l. 3124--><p class="noindent" > -</p><!--l. 3126--><p class="indent" > The sample file <a -href="#sec:samples"><span +href="#x1-150002.3">2.3<!--tex4ht:ref: sec:pkgopts-printglos --></a> and <a +href="#x1-270005">5<!--tex4ht:ref: sec:numberlists --></a>.) </div> +</p><!--l. 3133--><p class="noindent" > +</p><!--l. 3135--><p class="indent" > The sample file <a +href="#x1-40001.1"><span class="ec-lmtt-10x-x-109">sample-dual.tex</span></a> makes use of <span class="ec-lmtt-10x-x-109">\glsadd </span>to allow for an entry that should appear both in the main glossary and in the list of @@ -7826,7 +7847,7 @@ package option: <div class="verbatim" id="verbatim-80"> \usepackage[acronym]{glossaries} </div> -<!--l. 3132--><p class="nopar" > A new command is then defined to make it easier to define dual +<!--l. 3141--><p class="nopar" > A new command is then defined to make it easier to define dual entries: @@ -7842,8 +7863,8 @@ entries:  <br />  \newacronym{#2}{#3\protect\glsadd{main-#2}}{#4}  <br />} </div> -<!--l. 3144--><p class="nopar" > This has the following syntax: -</p><!--l. 3147--><p class="indent" > <hr><div title="Definition"><span +<!--l. 3153--><p class="nopar" > This has the following syntax: +</p><!--l. 3156--><p class="indent" > <hr><div title="Definition"><span class="ec-lmtt-10x-x-109">\newdualentry</span><a id="dx1-31010"></a><span class="ec-lmtt-10x-x-109">[</span><span @@ -7868,7 +7889,7 @@ class="ec-lmri-10x-x-109">description</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 3148--><p class="noindent" > +</p><!--l. 3157--><p class="noindent" > You can then define a new dual entry: @@ -7880,7 +7901,7 @@ You can then define a new dual entry:  <br />  {support vector machine}% long form  <br />  {Statistical pattern recognition technique}% description </div> -<!--l. 3155--><p class="nopar" > Now you can reference the acronym with <span class="obeylines-h"><span class="verb"><span +<!--l. 3164--><p class="nopar" > Now you can reference the acronym with <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls{svm}</span></span></span> or you can reference the entry in the main glossary with <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls{main-svm}</span></span></span>. @@ -7889,8 +7910,8 @@ class="ec-lmtt-10x-x-109">\gls{main-svm}</span></span></span>. </p> <h2 class="chapterHead"><span class="titlemark">8</span>  <a - id="sec:crossref"></a>Cross-Referencing Entries</h2> -<!--l. 3162--><p class="noindent" >There are several ways of cross-referencing entries in the glossary: + id="x1-320008"></a>Cross-Referencing Entries</h2> +<!--l. 3171--><p class="noindent" >There are several ways of cross-referencing entries in the glossary: </p><ol class="enumerate1" > <li class="enumerate" id="x1-32002x1">You can use commands such as <span @@ -7904,7 +7925,7 @@ class="ec-lmtt-10x-x-109">\gls</span><a \newglossaryentry{apple}{name=apple,  <br />description={firm, round fruit. See also \gls{pear}}} </div> - <!--l. 3171--><p class="nopar" > Note that with this method, if you don’t use the cross-referenced + <!--l. 3180--><p class="nopar" > Note that with this method, if you don’t use the cross-referenced term in the main part of the document, you will need two runs of <a id="dx1-32004"></a><a @@ -7922,8 +7943,8 @@ class="ec-lmtt-10x-x-109">makeglossaries</span><a  <br />makeglossaries filename  <br />latex filename </div> - <!--l. 3181--><p class="nopar" > - </p><!--l. 3183--><p class="noindent" ><div class="important" title="Important Note"> If you switch off the description <a + <!--l. 3190--><p class="nopar" > + </p><!--l. 3192--><p class="noindent" ><div class="important" title="Important Note"> If you switch off the description <a id="dx1-32006"></a><a href="#glo:sanitize">sanitization<a id="dx1-32007"></a></a>, you must protect fragile @@ -7939,13 +7960,13 @@ href="#fn1x10" id="fn1x10-bk"><sup class="textsuperscript">1</sup></a></span><a  <br />description={firm, round fruit. See also  <br />\protect\gls{pear}}} </div> - <!--l. 3191--><p class="nopar" > </div> - </p><!--l. 3192--><p class="noindent" > + <!--l. 3200--><p class="nopar" > </div> + </p><!--l. 3201--><p class="noindent" > </p></li> <li class="enumerate" id="x1-32011x2">As described in <a -href="#sec:newglosentry">§4 </a><a -href="#sec:newglosentry">Defining Glossary Entries<!--tex4ht:ref: sec:newglosentry --></a>, you can use the <span +href="#x1-190004">§4 </a><a +href="#x1-190004">Defining Glossary Entries<!--tex4ht:ref: sec:newglosentry --></a>, you can use the <span class="ec-lmss-10x-x-109">see</span><a id="dx1-32012"></a> key when you define the entry. For example: @@ -7958,19 +7979,19 @@ class="ec-lmss-10x-x-109">see</span><a  <br />description={Series expansion},  <br />see={TaylorsTheorem}} </div> - <!--l. 3201--><p class="nopar" > Note that in this case, the entry with the <span + <!--l. 3210--><p class="nopar" > Note that in this case, the entry with the <span class="ec-lmss-10x-x-109">see</span><a id="dx1-32013"></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 <a -href="#sec:glslink">§6 </a><a -href="#sec:glslink">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a> +href="#x1-280006">§6 </a><a +href="#x1-280006">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a> or <a -href="#sec:glsadd">§7 </a><a -href="#sec:glsadd">Adding an Entry to the Glossary Without Generating +href="#x1-310007">§7 </a><a +href="#x1-310007">Adding an Entry to the Glossary Without Generating Text<!--tex4ht:ref: sec:glsadd --></a>. - </p><!--l. 3208--><p class="noindent" >The “see” tag is produce using <span + </p><!--l. 3217--><p class="noindent" >The “see” tag is produce using <span class="ec-lmtt-10x-x-109">\seename</span><a id="dx1-32014"></a>, but can be overridden in specific instances using square brackets at the start of the <span @@ -7987,11 +8008,11 @@ class="ec-lmss-10x-x-109">see</span><a  <br />description={Series expansion},  <br />see=[see also]{TaylorsTheorem}} </div> - <!--l. 3216--><p class="nopar" > + <!--l. 3225--><p class="nopar" > </p></li> <li class="enumerate" id="x1-32017x3">After you have defined the entry, use - <!--l. 3219--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 3228--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glssee</span><span class="ec-lmtt-10"> </span></span><a id="dx1-32018"></a> <span @@ -8008,7 +8029,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">xr label list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> - </p><!--l. 3221--><p class="noindent" > + </p><!--l. 3230--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">xr label list</span><span @@ -8034,7 +8055,7 @@ class="ec-lmtt-10x-x-109">\seename</span><a <div class="verbatim" id="verbatim-88"> \glssee[see also]{series}{FourierSeries,TaylorsTheorem} </div> - <!--l. 3229--><p class="nopar" > Note that this automatically adds the entry given by <span + <!--l. 3238--><p class="nopar" > Note that this automatically adds the entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩ </span>to the @@ -8044,13 +8065,13 @@ class="ec-lmri-10x-x-109">xr</span> <span class="ec-lmri-10x-x-109">label list</span><span class="lmsy-10x-x-109">⟩</span>) to the glossary.</p></li></ol> -<!--l. 3235--><p class="indent" > In both cases 2 and 3 above, the cross-referenced information +<!--l. 3244--><p class="indent" > In both cases 2 and 3 above, the cross-referenced information appears in the <a id="dx1-32020"></a><a href="#glo:numberlist">number list<a id="dx1-32021"></a></a>, whereas in case 1, the cross-referenced information appears in the description. (See the <a -href="#sec:samples"><span +href="#x1-40001.1"><span class="ec-lmtt-10x-x-109">sample-crossref.tex</span></a> example file that comes with this package.) This means that in cases 2 and 3, the cross-referencing information won’t appear if @@ -8075,14 +8096,14 @@ class="ec-lmss-10x-x-109">seeautonumberlist</span><a option. </p> <h3 class="sectionHead"><span class="titlemark">8.1</span>  <a - id="sec:customxr"></a>Customising Cross-reference Text</h3> -<!--l. 3250--><p class="noindent" >When you use either the <span + id="x1-330008.1"></a>Customising Cross-reference Text</h3> +<!--l. 3259--><p class="noindent" >When you use either the <span class="ec-lmss-10x-x-109">see</span><a id="dx1-33001"></a> key or the command <span class="ec-lmtt-10x-x-109">\glssee</span>, the cross-referencing information will be typeset in the glossary according to: -</p><!--l. 3253--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3262--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsseeformat</span><span class="ec-lmtt-10"> </span></span><a id="dx1-33002"></a> <span @@ -8100,7 +8121,7 @@ class="ec-lmri-10x-x-109">location</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 3255--><p class="noindent" > +</p><!--l. 3264--><p class="noindent" > The default definition of <span class="ec-lmtt-10x-x-109">\glsseeformat </span>is: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span @@ -8130,31 +8151,31 @@ href="#fn3x10" id="fn3x10-bk"><sup class="textsuperscript">3</sup></a></span><a \renewcommand*{\glsseeformat}[3][\seename]{\textbf{#1}  <br /> \glsseelist{#2}} </div> -<!--l. 3271--><p class="nopar" > -</p><!--l. 3274--><p class="indent" > The list of labels is dealt with by <span +<!--l. 3280--><p class="nopar" > +</p><!--l. 3283--><p class="indent" > The list of labels is dealt with by <span class="ec-lmtt-10x-x-109">\glsseelist</span>, which iterates through the list and typesets each entry in the label. The entries are separated by -</p><!--l. 3277--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3286--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsseesep</span><span class="ec-lmtt-10"> </span></span><a id="dx1-33009"></a> <span class="ec-lmtt-10x-x-109">\glsseesep </span></div><hr> -</p><!--l. 3279--><p class="noindent" > +</p><!--l. 3288--><p class="noindent" > or (for the last pair) -</p><!--l. 3281--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3290--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsseelastsep</span><span class="ec-lmtt-10"> </span></span><a id="dx1-33010"></a> <span class="ec-lmtt-10x-x-109">\glsseelastsep </span></div><hr> -</p><!--l. 3283--><p class="noindent" > +</p><!--l. 3292--><p class="noindent" > These default to “<span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">,\space</span></span></span>” and “<span class="ec-lmtt-10x-x-109">\space\andname</span><a id="dx1-33011"></a><span class="ec-lmtt-10x-x-109">\space</span>” respectively. The list entry text is displayed using: -</p><!--l. 3287--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3296--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsseeitemformat</span><span class="ec-lmtt-10"> </span></span><a id="dx1-33012"></a> <span @@ -8163,7 +8184,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3289--><p class="noindent" > +</p><!--l. 3298--><p class="noindent" > This defaults to <span class="ec-lmtt-10x-x-109">\glsentrytext</span><a @@ -8184,8 +8205,8 @@ For example, to make the cross-referenced list use small caps: \renewcommand{\glsseeitemformat}[1]{%  <br />  \textsc{\glsentrytext{#1}}} </div> -<!--l. 3297--><p class="nopar" > -</p><!--l. 3299--><p class="indent" > <div class="important" title="Important Note"> You can use <span +<!--l. 3306--><p class="nopar" > +</p><!--l. 3308--><p class="indent" > <div class="important" title="Important Note"> You can use <span class="ec-lmtt-10x-x-109">\glsseeformat</span><a id="dx1-33018"></a> and <span class="ec-lmtt-10x-x-109">\glsseelist</span><a @@ -8202,15 +8223,15 @@ Some information (see also  <br />\glsseelist{FourierSeries,TaylorsTheorem}%  <br />\glsadd{FourierSeries}\glsadd{TaylorsTheorem}). </div> -<!--l. 3308--><p class="nopar" > </div> -</p><!--l. 3309--><p class="noindent" > +<!--l. 3317--><p class="nopar" > </div> +</p><!--l. 3318--><p class="noindent" > </p> -<!--l. 3311--><p class="noindent" ><a +<!--l. 3320--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">9</span>  <a - id="sec:glsnolink"></a>Using Glossary Terms Without Links</h2> + id="x1-340009"></a>Using Glossary Terms Without Links</h2> The commands described in this section display entry details without adding any information to the glossary. They don’t use <span @@ -8222,7 +8243,7 @@ href="#glo:firstuseflag">first use flag</a> and, apart from <span class="ec-lmtt-10x-x-109">\glshyperlink</span><a id="dx1-34003"></a>, they don’t produce hyperlinks. -<!--l. 3319--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 3328--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryname</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34004"></a> <span @@ -8231,8 +8252,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3321--><p class="noindent" > -</p><!--l. 3322--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3330--><p class="noindent" > +</p><!--l. 3331--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryname</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34005"></a> <span @@ -8241,7 +8262,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3324--><p class="noindent" > +</p><!--l. 3333--><p class="noindent" > These commands display the name of the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -8251,7 +8272,7 @@ class="ec-lmss-10x-x-109">name</span><a id="dx1-34006"></a> key. <span class="ec-lmtt-10x-x-109">\Glsentryname </span>makes the first letter uppercase. -</p><!--l. 3328--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3337--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrytext</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34007"></a> <span @@ -8260,8 +8281,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3330--><p class="noindent" > -</p><!--l. 3331--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3339--><p class="noindent" > +</p><!--l. 3340--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentrytext</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34008"></a> <span @@ -8270,7 +8291,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3333--><p class="noindent" > +</p><!--l. 3342--><p class="noindent" > These commands display the subsequent use text for the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span @@ -8280,7 +8301,7 @@ class="ec-lmss-10x-x-109">text</span><a id="dx1-34009"></a> key. <span class="ec-lmtt-10x-x-109">\Glsentrytext </span>makes the first letter uppercase. -</p><!--l. 3337--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3346--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryplural</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34010"></a> <span @@ -8289,8 +8310,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3339--><p class="noindent" > -</p><!--l. 3340--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3348--><p class="noindent" > +</p><!--l. 3349--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryplural</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34011"></a> <span @@ -8299,7 +8320,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3342--><p class="noindent" > +</p><!--l. 3351--><p class="noindent" > These commands display the subsequent use plural text for the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span @@ -8309,7 +8330,7 @@ class="ec-lmss-10x-x-109">plural</span><a id="dx1-34012"></a> key. <span class="ec-lmtt-10x-x-109">\Glsentryplural</span> makes the first letter uppercase. -</p><!--l. 3347--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3356--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryfirst</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34013"></a> <span @@ -8318,8 +8339,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3349--><p class="noindent" > -</p><!--l. 3350--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3358--><p class="noindent" > +</p><!--l. 3359--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryfirst</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34014"></a> <span @@ -8328,7 +8349,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3352--><p class="noindent" > +</p><!--l. 3361--><p class="noindent" > These commands display the <a id="dx1-34015"></a><a href="#glo:firstusetext">first use text</a> for the glossary entry given by @@ -8340,7 +8361,7 @@ class="ec-lmss-10x-x-109">first</span><a id="dx1-34016"></a> key. <span class="ec-lmtt-10x-x-109">\Glsentryfirst </span>makes the first letter uppercase. -</p><!--l. 3356--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3365--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryfirstplural</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34017"></a> <span @@ -8349,8 +8370,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3358--><p class="noindent" > -</p><!--l. 3359--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3367--><p class="noindent" > +</p><!--l. 3368--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryfirstplural</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34018"></a> <span @@ -8362,7 +8383,7 @@ class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3361--><p class="noindent" > +</p><!--l. 3370--><p class="noindent" > These commands display the plural form of the <a id="dx1-34019"></a><a href="#glo:firstusetext">first use text</a> for the @@ -8374,7 +8395,7 @@ class="ec-lmss-10x-x-109">firstplural</span><a id="dx1-34020"></a> key. <span class="ec-lmtt-10x-x-109">\Glsentryfirstplural </span>makes the first letter uppercase. -</p><!--l. 3366--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3375--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrydesc</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34021"></a> <span @@ -8383,8 +8404,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3368--><p class="noindent" > -</p><!--l. 3369--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3377--><p class="noindent" > +</p><!--l. 3378--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentrydesc</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34022"></a> <span @@ -8393,14 +8414,14 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3371--><p class="noindent" > +</p><!--l. 3380--><p class="noindent" > These commands display the description for the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>. <span class="ec-lmtt-10x-x-109">\Glsentrydesc </span>makes the first letter uppercase. -</p><!--l. 3374--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3383--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrydescplural</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34023"></a> <span @@ -8409,8 +8430,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3376--><p class="noindent" > -</p><!--l. 3377--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3385--><p class="noindent" > +</p><!--l. 3386--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentrydescplural</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34024"></a> <span @@ -8419,7 +8440,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3379--><p class="noindent" > +</p><!--l. 3388--><p class="noindent" > These commands display the plural description for the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span @@ -8427,7 +8448,7 @@ class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>. <span class="ec-lmtt-10x-x-109">\Glsentrydescplural </span>makes the first letter uppercase. -</p><!--l. 3383--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3392--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrysymbol</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34025"></a> <span @@ -8436,8 +8457,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3385--><p class="noindent" > -</p><!--l. 3386--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3394--><p class="noindent" > +</p><!--l. 3395--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentrysymbol</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34026"></a> <span @@ -8446,14 +8467,14 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3388--><p class="noindent" > +</p><!--l. 3397--><p class="noindent" > These commands display the symbol for the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>. <span class="ec-lmtt-10x-x-109">\Glsentrysymbol </span>makes the first letter uppercase. -</p><!--l. 3391--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3400--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrysymbolplural</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34027"></a> <span @@ -8462,8 +8483,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3393--><p class="noindent" > -</p><!--l. 3394--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3402--><p class="noindent" > +</p><!--l. 3403--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentrysymbolplural</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34028"></a> <span @@ -8472,7 +8493,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3396--><p class="noindent" > +</p><!--l. 3405--><p class="noindent" > These commands display the plural symbol for the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span @@ -8480,7 +8501,7 @@ class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>. <span class="ec-lmtt-10x-x-109">\Glsentrysymbolplural </span>makes the first letter uppercase. -</p><!--l. 3400--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3409--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryuseri</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34029"></a> <span @@ -8489,8 +8510,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3402--><p class="noindent" > -</p><!--l. 3403--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3411--><p class="noindent" > +</p><!--l. 3412--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryuseri</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34030"></a> <span @@ -8499,8 +8520,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3405--><p class="noindent" > -</p><!--l. 3406--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3414--><p class="noindent" > +</p><!--l. 3415--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryuserii</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34031"></a> <span @@ -8509,11 +8530,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3408--><p class="noindent" > +</p><!--l. 3417--><p class="noindent" > -</p><!--l. 3409--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3418--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryuserii</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34032"></a> <span @@ -8522,8 +8543,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3411--><p class="noindent" > -</p><!--l. 3412--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3420--><p class="noindent" > +</p><!--l. 3421--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryuseriii</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34033"></a> <span @@ -8532,8 +8553,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3414--><p class="noindent" > -</p><!--l. 3415--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3423--><p class="noindent" > +</p><!--l. 3424--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryuseriii</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34034"></a> <span @@ -8542,8 +8563,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3417--><p class="noindent" > -</p><!--l. 3418--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3426--><p class="noindent" > +</p><!--l. 3427--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryuseriv</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34035"></a> <span @@ -8552,8 +8573,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3420--><p class="noindent" > -</p><!--l. 3421--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3429--><p class="noindent" > +</p><!--l. 3430--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryuseriv</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34036"></a> <span @@ -8562,8 +8583,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3423--><p class="noindent" > -</p><!--l. 3424--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3432--><p class="noindent" > +</p><!--l. 3433--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryuserv</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34037"></a> <span @@ -8572,8 +8593,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3426--><p class="noindent" > -</p><!--l. 3427--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3435--><p class="noindent" > +</p><!--l. 3436--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryuserv</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34038"></a> <span @@ -8582,8 +8603,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3429--><p class="noindent" > -</p><!--l. 3430--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3438--><p class="noindent" > +</p><!--l. 3439--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryuservi</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34039"></a> <span @@ -8592,8 +8613,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3432--><p class="noindent" > -</p><!--l. 3433--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3441--><p class="noindent" > +</p><!--l. 3442--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryuservi</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34040"></a> <span @@ -8602,13 +8623,13 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3435--><p class="noindent" > +</p><!--l. 3444--><p class="noindent" > These commands display the value of the user keys for the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>. -</p><!--l. 3438--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3447--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glshyperlink</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34041"></a> <span @@ -8621,7 +8642,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3440--><p class="noindent" > +</p><!--l. 3449--><p class="noindent" > This command provides a hyperlink to the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span @@ -8641,25 +8662,25 @@ default<span class="footnote-mark"><a href="#fn1x11" id="fn1x11-bk"><sup class="textsuperscript">1</sup></a></span><a id="x1-34043f1"></a>, but can be overridden using the optional argument. -</p><!--l. 3448--><p class="indent" > <div class="important" title="Important Note"> If you use <span +</p><!--l. 3457--><p class="indent" > <div class="important" title="Important Note"> If you use <span class="ec-lmtt-10x-x-109">\glshyperlink</span>, you need to ensure that the relevant entry has been added to the glossary using any of the commands described in <a -href="#sec:glslink">§6 +href="#x1-280006">§6 </a><a -href="#sec:glslink">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a> or <a -href="#sec:glsadd">§7 </a><a -href="#sec:glsadd">Adding an Entry to the Glossary Without +href="#x1-280006">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a> or <a +href="#x1-310007">§7 </a><a +href="#x1-310007">Adding an Entry to the Glossary Without Generating Text<!--tex4ht:ref: sec:glsadd --></a> otherwise you will end up with an undefined link. </div> -</p><!--l. 3453--><p class="noindent" > -</p><!--l. 3455--><p class="indent" > The next two commands are only available with the <span +</p><!--l. 3462--><p class="noindent" > +</p><!--l. 3464--><p class="indent" > The next two commands are only available with the <span class="ec-lmss-10x-x-109">savenumberlist</span><a id="dx1-34048"></a> package option: -</p><!--l. 3457--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3466--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrynumberlist</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34049"></a> <span @@ -8668,8 +8689,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3459--><p class="noindent" > -</p><!--l. 3460--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3468--><p class="noindent" > +</p><!--l. 3469--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsdisplaynumberlist</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34050"></a> <span @@ -8678,7 +8699,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3462--><p class="noindent" > +</p><!--l. 3471--><p class="noindent" > Both display the <a id="dx1-34051"></a><a href="#glo:numberlist">number list<a @@ -8705,23 +8726,23 @@ class="ec-lmtt-10x-x-109">\glsentrynumberlist</span>, simply displays the number list as is. The second command, <span class="ec-lmtt-10x-x-109">\glsdisplaynumberlist</span>, formats the list using: -</p><!--l. 3469--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3478--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsnumlistsep</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34059"></a> <span class="ec-lmtt-10x-x-109">\glsnumlistsep </span></div><hr> -</p><!--l. 3471--><p class="noindent" > +</p><!--l. 3480--><p class="noindent" > as the separator between all but the last two elements and -</p><!--l. 3473--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3482--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsnumlistlastsep</span><span class="ec-lmtt-10"> </span></span><a id="dx1-34060"></a> <span class="ec-lmtt-10x-x-109">\glsnumlistlastsep </span></div><hr> -</p><!--l. 3475--><p class="noindent" > +</p><!--l. 3484--><p class="noindent" > between the final two elements. The defaults are <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">,␣</span></span></span> and <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">␣\&␣</span></span></span>, respectively. -</p><!--l. 3479--><p class="indent" > <div class="important" title="Important Note"> <span +</p><!--l. 3488--><p class="indent" > <div class="important" title="Important Note"> <span class="ec-lmtt-10x-x-109">\glsdisplaynumberlist </span>is fairly experimental. It only works when the default counter format is used (that is, when the <span class="ec-lmss-10x-x-109">format</span><a @@ -8733,8 +8754,8 @@ class="ec-lmss-10x-x-109">hyperref</span><a try using it with that package, <span class="ec-lmtt-10x-x-109">\glsentrynumberlist </span>will be used instead. </div> -</p><!--l. 3485--><p class="noindent" > -</p><!--l. 3487--><p class="indent" > For further information see “Displaying entry details without adding +</p><!--l. 3494--><p class="noindent" > +</p><!--l. 3496--><p class="indent" > For further information see “Displaying entry details without adding information to the glossary” in the documented code (<span class="ec-lmtt-10x-x-109">glossaries.pdf</span>). @@ -8742,14 +8763,14 @@ class="ec-lmtt-10x-x-109">glossaries.pdf</span>). </p> <h2 class="chapterHead"><span class="titlemark">10</span>  <a - id="sec:printglossary"></a>Displaying a glossary</h2> -<!--l. 3494--><p class="noindent" >The command -</p><!--l. 3495--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="x1-3500010"></a>Displaying a glossary</h2> +<!--l. 3503--><p class="noindent" >The command +</p><!--l. 3504--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\printglossaries</span><span class="ec-lmtt-10"> </span></span><a id="dx1-35001"></a> <span class="ec-lmtt-10x-x-109">\printglossaries </span></div><hr> -</p><!--l. 3497--><p class="noindent" > +</p><!--l. 3506--><p class="noindent" > 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 <a @@ -8766,8 +8787,8 @@ href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-35007"></a></a> (as described in <a -href="#sec:makeglossaries">§1.3 </a><a -href="#sec:makeglossaries">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a>). If the glossary still +href="#x1-70001.3">§1.3 </a><a +href="#x1-70001.3">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a>). If the glossary still does not appear after you re-<span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> your document, check the <a @@ -8781,8 +8802,8 @@ also need to use the command <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a id="dx1-35012"></a> in the preamble to enable the glossaries. -</p><!--l. 3508--><p class="indent" > An individual glossary can be displayed using: -</p><!--l. 3509--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3517--><p class="indent" > An individual glossary can be displayed using: +</p><!--l. 3518--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\printglossary</span><span class="ec-lmtt-10"> </span></span><a id="dx1-35013"></a> <span @@ -8791,7 +8812,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3511--><p class="noindent" > +</p><!--l. 3520--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -8816,7 +8837,7 @@ class="description">The value of this key specifies which glossary to print. If <div class="verbatim" id="verbatim-92"> \printglossary[type=\acronymtype] </div> - <!--l. 3520--><p class="nopar" > + <!--l. 3529--><p class="nopar" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">title</span><a @@ -8857,8 +8878,8 @@ class="ec-lmss-10x-x-109">numberedsection</span><a class="ec-lmss-10x-x-109">numberedsection</span><a id="dx1-35024"></a> package option, described in <a -href="#sec:pkgopts-sec">§2.2 </a><a -href="#sec:pkgopts-sec">Sectioning, Headings and TOC +href="#x1-140002.2">§2.2 </a><a +href="#x1-140002.2">Sectioning, Headings and TOC Options<!--tex4ht:ref: sec:pkgopts-sec --></a>. </dd><dt class="description"> <span @@ -8871,7 +8892,7 @@ class="ec-lmtt-10x-x-109">nonumberlist=true</span></span></span>) class="ec-lmtt-10x-x-109">nonumberlist=false</span></span></span>) the numberlist is displayed for this glossary. If no value is supplied, true is assumed. </dd></dl> -<!--l. 3550--><p class="indent" > By default, the glossary is started either by <span +<!--l. 3559--><p class="indent" > By default, the glossary is started either by <span class="ec-lmtt-10x-x-109">\chapter*</span><a id="dx1-35026"></a> or by <span @@ -8896,20 +8917,20 @@ need to redefine <span class="ec-lmtt-10x-x-109">\glossarymark</span><a id="dx1-35033"></a>. Further information about these options and commands is given in <a -href="#sec:pkgopts-sec">§2.2 </a><a -href="#sec:pkgopts-sec">Sectioning, Headings and TOC +href="#x1-140002.2">§2.2 </a><a +href="#x1-140002.2">Sectioning, Headings and TOC Options<!--tex4ht:ref: sec:pkgopts-sec --></a>. -</p><!--l. 3561--><p class="indent" > Information can be added to the start of the glossary (after the title and +</p><!--l. 3570--><p class="indent" > Information can be added to the start of the glossary (after the title and before the main body of the glossary) by redefining -</p><!--l. 3563--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3572--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glossarypreamble</span><span class="ec-lmtt-10"> </span></span><a id="dx1-35034"></a> <span class="ec-lmtt-10x-x-109">\glossarypreamble </span></div><hr> -</p><!--l. 3565--><p class="noindent" > +</p><!--l. 3574--><p class="noindent" > For example: @@ -8919,7 +8940,7 @@ For example: \renewcommand{\glossarypreamble}{Numbers in italic  <br />indicate primary definitions.} </div> -<!--l. 3570--><p class="nopar" > This needs to be done before the glossary is displayed using +<!--l. 3579--><p class="nopar" > This needs to be done before the glossary is displayed using <span class="ec-lmtt-10x-x-109">\printglossaries </span>or <span class="ec-lmtt-10x-x-109">\printglossary</span>. Note that if you want a different @@ -8939,7 +8960,7 @@ each glossary. For example:  <br />\renewcommand{\glossarypreamble}{}  <br />\printglossary[type=acronym] </div> -<!--l. 3583--><p class="nopar" > Alternatively, you can do something like: +<!--l. 3592--><p class="nopar" > Alternatively, you can do something like: @@ -8949,19 +8970,19 @@ each glossary. For example:  <br />indicate primary definitions.\gdef\glossarypreamble{}}  <br />\printglossaries </div> -<!--l. 3589--><p class="nopar" > which will print the preamble text for the first glossary and change the +<!--l. 3598--><p class="nopar" > which will print the preamble text for the first glossary and change the preamble to do nothing for subsequent glossaries. (Note that <span class="ec-lmtt-10x-x-109">\gdef </span>is required as the glossary is placed within a group.) -</p><!--l. 3595--><p class="indent" > There is an analogous command called -</p><!--l. 3596--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3604--><p class="indent" > There is an analogous command called +</p><!--l. 3605--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glossarypostamble</span><span class="ec-lmtt-10"> </span></span><a id="dx1-35035"></a> <span class="ec-lmtt-10x-x-109">\glossarypostamble </span></div><hr> -</p><!--l. 3598--><p class="noindent" > +</p><!--l. 3607--><p class="noindent" > which is placed at the end of each glossary. -</p><!--l. 3601--><p class="indent" > For example: suppose you are using the <span +</p><!--l. 3610--><p class="indent" > For example: suppose you are using the <span class="ec-lmss-10x-x-109">superheaderborder</span><a id="dx1-35036"></a> style<span class="footnote-mark"><a @@ -8981,10 +9002,10 @@ want to switch back to one column mode, you could do:  <br />}  <br />\renewcommand*{\glossarypostamble}{\onecolumn} </div> -<!--l. 3615--><p class="nopar" > -</p><!--l. 3617--><p class="indent" > Within each glossary, each entry name is formatted according +<!--l. 3624--><p class="nopar" > +</p><!--l. 3626--><p class="indent" > Within each glossary, each entry name is formatted according to -</p><!--l. 3618--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3627--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsnamefont</span><span class="ec-lmtt-10"> </span></span><a id="dx1-35041"></a> <span @@ -8993,7 +9014,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3620--><p class="noindent" > +</p><!--l. 3629--><p class="noindent" > which takes one argument: the entry name. This command is always used regardless of the glossary style. By default, <span class="ec-lmtt-10x-x-109">\glsnamefont </span>simply @@ -9014,7 +9035,7 @@ styles (defined in the <span class="ec-lmss-10x-x-109">glossary-tree</span><a id="dx1-35045"></a> style file) also set the name in bold. -</p><!--l. 3633--><p class="indent" > For example, suppose you want all the entry names to appear in medium +</p><!--l. 3642--><p class="indent" > For example, suppose you want all the entry names to appear in medium weight small caps, then you can do: @@ -9023,14 +9044,14 @@ weight small caps, then you can do: <div class="verbatim" id="verbatim-97"> \renewcommand{\glsnamefont}[1]{\textsc{\mdseries #1}} </div> -<!--l. 3637--><p class="nopar" > +<!--l. 3646--><p class="nopar" > </p> <h2 class="chapterHead"><span class="titlemark">11</span>  <a - id="sec:xindy"></a>Xindy</h2> -<!--l. 3643--><p class="noindent" >If you want to use <a + id="x1-3600011"></a>Xindy</h2> +<!--l. 3652--><p class="noindent" >If you want to use <a id="dx1-36001"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a @@ -9045,14 +9066,14 @@ class="ec-lmss-10x-x-109">xindy</span><a <div class="verbatim" id="verbatim-98"> \usepackage[xindy]{glossaries} </div> -<!--l. 3647--><p class="nopar" > This ensures that the glossary information is written in <a +<!--l. 3656--><p class="nopar" > This ensures that the glossary information is written in <a id="dx1-36004"></a><span class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-36005"></a> syntax. -</p><!--l. 3651--><p class="indent" > <a -href="#sec:makeglossaries">§1.3 </a><a -href="#sec:makeglossaries">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a> covers how to use the +</p><!--l. 3660--><p class="indent" > <a +href="#x1-70001.3">§1.3 </a><a +href="#x1-70001.3">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a> covers how to use the external indexing application. This section covers the commands provided by the <span class="ec-lmss-10x-x-109">glossaries </span>package that allow you to adjust the <a @@ -9063,35 +9084,35 @@ class="ec-lmtt-10x-x-109">xindy</span><a (<span class="ec-lmtt-10x-x-109">.xdy</span><a id="dx1-36008"></a>) and parameters. -</p><!--l. 3656--><p class="indent" > To assist writing information to the <a +</p><!--l. 3665--><p class="indent" > To assist writing information to the <a id="dx1-36009"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-36010"></a></a> style file, the <span class="ec-lmss-10x-x-109">glossaries</span> package provides the following commands: -</p><!--l. 3659--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3668--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsopenbrace</span><span class="ec-lmtt-10"> </span></span><a id="dx1-36011"></a> <span class="ec-lmtt-10x-x-109">\glsopenbrace </span></div><hr> -</p><!--l. 3661--><p class="noindent" > -</p><!--l. 3662--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3670--><p class="noindent" > +</p><!--l. 3671--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsclosebrace</span><span class="ec-lmtt-10"> </span></span><a id="dx1-36012"></a> <span class="ec-lmtt-10x-x-109">\glsclosebrace </span></div><hr> -</p><!--l. 3664--><p class="noindent" > +</p><!--l. 3673--><p class="noindent" > which produce an open and closing brace. (This is needed because <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\{</span></span></span> and <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\}</span></span></span> don’t expand to a simple brace character when written to a file.) -</p><!--l. 3669--><p class="indent" > In addition, if you are using a package that makes the double quote +</p><!--l. 3678--><p class="indent" > In addition, if you are using a package that makes the double quote character active (e.g. <span class="ec-lmss-10x-x-109">ngerman</span><a id="dx1-36013"></a>) you can use: -</p><!--l. 3671--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3680--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsquote</span><span class="ec-lmtt-10"> </span></span><a id="dx1-36014"></a> <span @@ -9100,7 +9121,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3673--><p class="noindent" > +</p><!--l. 3682--><p class="noindent" > which will produce <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">"</span></span></span><span class="lmsy-10x-x-109">⟨</span><span @@ -9112,7 +9133,7 @@ the double-quote character. This document assumes that the double quote character has not been made active, so the examples just use <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">"</span></span></span> for clarity. -</p><!--l. 3679--><p class="indent" > If you want greater control over the <a +</p><!--l. 3688--><p class="indent" > If you want greater control over the <a id="dx1-36015"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a @@ -9138,8 +9159,8 @@ class="ec-lmtt-10x-x-109">xindy</span><a documentation. </p> <h3 class="sectionHead"><span class="titlemark">11.1</span>  <a - id="sec:langenc"></a>Language and Encodings</h3> -<!--l. 3690--><p class="noindent" >When you use <a + id="x1-3700011.1"></a>Language and Encodings</h3> +<!--l. 3699--><p class="noindent" >When you use <a id="dx1-37001"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a @@ -9166,7 +9187,7 @@ it gets it wrong or if <a class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-37009"></a> doesn’t support that language, then you can specify the language using: -</p><!--l. 3699--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3708--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GlsSetXdyLanguage</span><span class="ec-lmtt-10"> </span></span><a id="dx1-37010"></a> <span @@ -9180,7 +9201,7 @@ class="ec-lmri-10x-x-109">language</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 3701--><p class="noindent" > +</p><!--l. 3710--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">language</span><span @@ -9197,14 +9218,14 @@ class="ec-lmri-10x-x-109">glossary</span> <span class="ec-lmri-10x-x-109">type</span><span class="lmsy-10x-x-109">⟩</span>. -</p><!--l. 3709--><p class="indent" > If the <span +</p><!--l. 3718--><p class="indent" > If the <span class="ec-lmss-10x-x-109">inputenc</span><a id="dx1-37011"></a> package is used, the encoding will be obtained from the value of <span class="ec-lmtt-10x-x-109">\inputencodingname</span><a id="dx1-37012"></a>. Alternatively, you can specify the encoding using: -</p><!--l. 3712--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3721--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GlsSetXdyCodePage</span><span class="ec-lmtt-10"> </span></span><a id="dx1-37013"></a> <span @@ -9213,7 +9234,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">code</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3714--><p class="noindent" > +</p><!--l. 3723--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">code</span><span @@ -9225,8 +9246,8 @@ class="lmsy-10x-x-109">⟩ </span>is the name of the encoding. For example: <div class="verbatim" id="verbatim-99"> \GlsSetXdyCodePage{utf8} </div> -<!--l. 3718--><p class="nopar" > -</p><!--l. 3720--><p class="indent" > Note that you can also specify the language and encoding using the +<!--l. 3727--><p class="nopar" > +</p><!--l. 3729--><p class="indent" > Note that you can also specify the language and encoding using the package option <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">xindy={language=</span></span></span><span class="lmsy-10x-x-109">⟨</span><span @@ -9245,8 +9266,8 @@ example: <div class="verbatim" id="verbatim-100"> \usepackage[xindy={language=english,codepage=utf8}]{glossaries} </div> -<!--l. 3726--><p class="nopar" > -</p><!--l. 3728--><p class="indent" > If you write your own custom <a +<!--l. 3735--><p class="nopar" > +</p><!--l. 3737--><p class="indent" > If you write your own custom <a id="dx1-37014"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a @@ -9259,11 +9280,11 @@ settings, you need to set the language to nothing: <div class="verbatim" id="verbatim-101"> \GlsSetXdyLanguage{} </div> -<!--l. 3733--><p class="nopar" > (and remember to use <span +<!--l. 3742--><p class="nopar" > (and remember to use <span class="ec-lmtt-10x-x-109">\noist</span><a id="dx1-37016"></a> to prevent the style file from being overwritten). -</p><!--l. 3737--><p class="indent" > <div class="important" title="Important Note"> The commands <span +</p><!--l. 3746--><p class="indent" > <div class="important" title="Important Note"> The commands <span class="ec-lmtt-10x-x-109">\GlsSetXdyLanguage </span>and <span class="ec-lmtt-10x-x-109">\GlsSetXdyCodePage </span>have no effect if you don’t use <a @@ -9282,13 +9303,13 @@ class="ec-lmtt-10x-x-109">makeglossaries</span><a using the <span class="ec-lmtt-10x-x-109">-L </span>and <span class="ec-lmtt-10x-x-109">-C </span>switches. </div> -</p><!--l. 3743--><p class="noindent" > -</p><!--l. 3746--><p class="noindent" > +</p><!--l. 3752--><p class="noindent" > +</p><!--l. 3755--><p class="noindent" > </p> -<!--l. 3746--><p class="noindent" ><a +<!--l. 3755--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">11.2</span>  <a - id="sec:xindyloc"></a>Locations and Number lists</h3> -<!--l. 3749--><p class="noindent" >If you use <span + id="x1-3800011.2"></a>Locations and Number lists</h3> +<!--l. 3758--><p class="noindent" >If you use <span class="ec-lmss-10x-x-109">xindy</span><a id="dx1-38001"></a>, the <span class="ec-lmss-10x-x-109">glossaries </span>package needs to know which counters you @@ -9319,7 +9340,7 @@ class="ec-lmri-10x-x-109">before </span><span class="ec-lmtt-10x-x-109">\makeglossaries</span><a id="dx1-38010"></a> using: -</p><!--l. 3757--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3766--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GlsAddXdyCounters</span><span class="ec-lmtt-10"> </span></span><a id="dx1-38011"></a> <span @@ -9328,12 +9349,12 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">counter list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3759--><p class="noindent" > +</p><!--l. 3768--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">counter list</span><span class="lmsy-10x-x-109">⟩ </span>is a comma-separated list of counter names. -</p><!--l. 3762--><p class="indent" > The most likely attributes used in the <span +</p><!--l. 3771--><p class="indent" > The most likely attributes used in the <span class="ec-lmss-10x-x-109">format</span><a id="dx1-38012"></a> key (<span class="ec-lmtt-10x-x-109">textrm</span><a @@ -9346,7 +9367,7 @@ href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-38016"></a></a> style file, but if you want to use another attribute, you need to add it using: -</p><!--l. 3766--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3775--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GlsAddXdyAttribute</span><span class="ec-lmtt-10"> </span></span><a id="dx1-38017"></a> <span @@ -9355,7 +9376,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3768--><p class="noindent" > +</p><!--l. 3777--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span @@ -9371,7 +9392,7 @@ define a command that will do this: <div class="verbatim" id="verbatim-102"> \newcommand*{\hyperbfit}[1]{\textit{\hyperbf{#1}}} </div> -<!--l. 3775--><p class="nopar" > but with <a +<!--l. 3784--><p class="nopar" > but with <a id="dx1-38019"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a @@ -9383,8 +9404,8 @@ class="ec-lmtt-10x-x-109">xindy</span><a <div class="verbatim" id="verbatim-103"> \GlsAddXdyAttribute{hyperbfit} </div> -<!--l. 3780--><p class="nopar" > -</p><!--l. 3782--><p class="indent" > <div class="important" title="Important Note"> Note that <span +<!--l. 3789--><p class="nopar" > +</p><!--l. 3791--><p class="indent" > <div class="important" title="Important Note"> Note that <span class="ec-lmtt-10x-x-109">\GlsAddXdyAttribute </span>has no effect if <span class="ec-lmtt-10x-x-109">\noist</span><a id="dx1-38021"></a> is used or if @@ -9398,11 +9419,11 @@ class="ec-lmtt-10x-x-109">\makeglossaries</span><a class="ec-lmtt-10x-x-109">\GlsAddXdyCounters </span>must come before <span class="ec-lmtt-10x-x-109">\GlsAddXdyAttribute</span>. </div> -</p><!--l. 3788--><p class="noindent" > -</p><!--l. 3790--><p class="indent" > If the location numbers don’t get expanded to a simple Arabic or Roman +</p><!--l. 3797--><p class="noindent" > +</p><!--l. 3799--><p class="indent" > 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 using -</p><!--l. 3793--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3802--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GlsAddXdyLocation</span><span class="ec-lmtt-10"> </span></span><a id="dx1-38024"></a> <span @@ -9420,7 +9441,7 @@ class="ec-lmri-10x-x-109">definition</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 3795--><p class="noindent" > +</p><!--l. 3804--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span @@ -9445,7 +9466,7 @@ class="ec-lmtt-10x-x-109">\the</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">counter</span><span class="lmsy-10x-x-109">⟩</span>. -</p><!--l. 3801--><p class="indent" > <div class="important" title="Important Note"> Note that <span +</p><!--l. 3810--><p class="indent" > <div class="important" title="Important Note"> Note that <span class="ec-lmtt-10x-x-109">\GlsAddXdyLocation </span>has no effect if <span class="ec-lmtt-10x-x-109">\noist</span><a id="dx1-38027"></a> is used or if @@ -9456,8 +9477,8 @@ class="ec-lmtt-10x-x-109">\GlsAddXdyLocation </span>must be used before <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a id="dx1-38029"></a>. </div> -</p><!--l. 3805--><p class="noindent" > -</p><!--l. 3807--><p class="indent" > For example, suppose I decide to use a somewhat eccentric numbering +</p><!--l. 3814--><p class="noindent" > +</p><!--l. 3816--><p class="indent" > For example, suppose I decide to use a somewhat eccentric numbering system for sections that redefines <span class="ec-lmtt-10x-x-109">\thesection </span>as follows: @@ -9467,7 +9488,7 @@ class="ec-lmtt-10x-x-109">\thesection </span>as follows: <div class="verbatim" id="verbatim-104"> \renewcommand*{\thesection}{[\thechapter]\arabic{section}} </div> -<!--l. 3811--><p class="nopar" > If I haven’t done <span class="obeylines-h"><span class="verb"><span +<!--l. 3820--><p class="nopar" > If I haven’t done <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">counter=section</span></span></span> in the package option, I need to specify that the counter will be used as a location number: @@ -9477,7 +9498,7 @@ specify that the counter will be used as a location number: <div class="verbatim" id="verbatim-105"> \GlsAddXdyCounters{section} </div> -<!--l. 3817--><p class="nopar" > Next I need to add the location style (<span +<!--l. 3826--><p class="nopar" > Next I need to add the location style (<span class="ec-lmtt-10x-x-109">\thechapter </span>is assumed to be the standard <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\arabic{chapter}</span></span></span>): @@ -9490,7 +9511,7 @@ class="ec-lmtt-10x-x-109">\arabic{chapter}</span></span></span>):  <br />  "arabic-numbers"  <br />} </div> -<!--l. 3824--><p class="nopar" > Note that if I have further decided to use the <span +<!--l. 3833--><p class="nopar" > Note that if I have further decided to use the <span class="ec-lmss-10x-x-109">hyperref</span><a id="dx1-38030"></a> package and want to redefine <span @@ -9503,7 +9524,7 @@ class="ec-lmtt-10x-x-109">\theHsection </span>as: \renewcommand*{\theHsection}{\thepart.\thesection}  <br />\renewcommand*{\thepart}{\Roman{part}} </div> -<!--l. 3830--><p class="nopar" > then I need to modify the <span +<!--l. 3839--><p class="nopar" > then I need to modify the <span class="ec-lmtt-10x-x-109">\GlsAddXdyLocation </span>code above to: @@ -9514,7 +9535,7 @@ class="ec-lmtt-10x-x-109">\GlsAddXdyLocation </span>code above to:  <br />  "arabic-numbers" :sep "]" "arabic-numbers"  <br />} </div> -<!--l. 3836--><p class="nopar" > Since <span +<!--l. 3845--><p class="nopar" > Since <span class="ec-lmtt-10x-x-109">\Roman</span><a id="dx1-38031"></a> will result in an empty string if the counter is zero, it’s a good idea to add an extra location to catch this: @@ -9527,11 +9548,11 @@ good idea to add an extra location to catch this:  <br />  "arabic-numbers" :sep "]" "arabic-numbers"  <br />} </div> -<!--l. 3843--><p class="nopar" > The above example is illustrated in the accompanying sample file +<!--l. 3852--><p class="nopar" > The above example is illustrated in the accompanying sample file <a -href="#sec:samples"><span +href="#x1-40001.1"><span class="ec-lmtt-10x-x-109">samplexdy2.tex</span></a>. -</p><!--l. 3847--><p class="indent" > Another example: suppose you want the page numbers written as words +</p><!--l. 3856--><p class="indent" > Another example: suppose you want the page numbers written as words rather than digits and you use the <span class="ec-lmss-10x-x-109">fmtcount</span><a id="dx1-38032"></a> package to do this. You can @@ -9545,7 +9566,7 @@ class="ec-lmtt-10x-x-109">\thepage</span><a <div class="verbatim" id="verbatim-110"> \renewcommand*{\thepage}{\Numberstring{page}} </div> -<!--l. 3852--><p class="nopar" > This gets expanded to <span class="obeylines-h"><span class="verb"><span +<!--l. 3861--><p class="nopar" > This gets expanded to <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\protect</span><span class="ec-lmtt-10x-x-109"> \Numberstringnum</span><span class="ec-lmtt-10x-x-109"> </span></span></span><span @@ -9568,7 +9589,7 @@ location that has that form:  <br />  \string\Numberstringnum\space\glsopenbrace"  <br />  "arabic-numbers" :sep "\glsclosebrace"} </div> -<!--l. 3860--><p class="nopar" > Note that it’s necessary to use <span +<!--l. 3869--><p class="nopar" > Note that it’s necessary to use <span class="ec-lmtt-10x-x-109">\space </span>to indicate that spaces also appear in the format, since, unlike <span class="TEX">T<span class="E">E</span>X</span>, <a @@ -9577,7 +9598,7 @@ href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-38035"></a></a> doesn’t ignore spaces after control sequences. -</p><!--l. 3865--><p class="indent" > <span +</p><!--l. 3874--><p class="indent" > <span class="ec-lmtt-10x-x-109">\GlsAddXdyLocation{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span @@ -9587,7 +9608,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">definition</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span>will define commands -</p><!--l. 3867--><p class="indent" > <hr><div title="Definition"><span +</p><!--l. 3876--><p class="indent" > <hr><div title="Definition"><span class="ec-lmtt-10x-x-109">\glsX</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">counter</span><span @@ -9605,7 +9626,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">location</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3868--><p class="noindent" > +</p><!--l. 3877--><p class="noindent" > for each counter that has been identified either by the <span class="ec-lmss-10x-x-109">counter</span><a id="dx1-38036"></a> package @@ -9618,7 +9639,7 @@ class="ec-lmtt-10x-x-109">\newglossary</span><a <span class="ec-lmtt-10x-x-109">\GlsAddXdyCounters</span><a id="dx1-38038"></a>. -</p><!--l. 3873--><p class="indent" > The first argument <span +</p><!--l. 3882--><p class="indent" > The first argument <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">Hprefix</span><span class="lmsy-10x-x-109">⟩ </span>is only relevant when used with the @@ -9636,7 +9657,7 @@ class="ec-lmtt-10x-x-109">\the</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">counter</span><span class="lmsy-10x-x-109">⟩</span>. The sample file <a -href="#sec:samples"><span +href="#x1-40001.1"><span class="ec-lmtt-10x-x-109">samplexdy.tex</span></a>, which comes with the <span class="ec-lmss-10x-x-109">glossaries </span>package, uses the default <span @@ -9677,8 +9698,8 @@ commands:  <br />}  <br />\newcommand{\linkpagenumber}[3]{\hyperlink{page.#3}{#1#2{#3}}} </div> -<!--l. 3894--><p class="nopar" > -</p><!--l. 3896--><p class="indent" > In the <a +<!--l. 3903--><p class="nopar" > +</p><!--l. 3905--><p class="indent" > In the <a id="dx1-38044"></a><a href="#glo:numberlist">number list<a id="dx1-38045"></a></a>, the locations are sorted according to @@ -9707,17 +9728,17 @@ class="ec-lmtt-10x-x-109">\GlsAddXdyLocation</span><a order in which they were defined), <span class="ec-lmtt-10x-x-109">see </span>(cross-referenced entries). This ordering can be changed using: -</p><!--l. 3912--><p class="indent" > <span class="marginpar"><span +</p><!--l. 3921--><p class="indent" > <span class="marginpar"><span class="ec-lmtt-10">\GlsSetXdyLocationClassOrder</span><span class="ec-lmtt-10"> </span></span><a id="dx1-38051"></a> -</p><!--l. 3914--><p class="indent" > <hr><div title="Definition"><span +</p><!--l. 3923--><p class="indent" > <hr><div title="Definition"><span class="ec-lmtt-10x-x-109">\GlsSetXdyLocationClassOrder{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">location names</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3915--><p class="noindent" > +</p><!--l. 3924--><p class="noindent" > where each location name is delimited by double quote marks and separated by white space. For example: @@ -9736,8 +9757,8 @@ separated by white space. For example:  <br />  "see"  <br />} </div> -<!--l. 3929--><p class="nopar" > -</p><!--l. 3931--><p class="indent" > +<!--l. 3938--><p class="nopar" > +</p><!--l. 3940--><p class="indent" > <div class="important" title="Important Note">Note that <span @@ -9768,8 +9789,8 @@ before class="ec-lmtt-10x-x-109">\makeglossaries</span><a id="dx1-38054"></a>. </div> -</p><!--l. 3936--><p class="noindent" > -</p><!--l. 3938--><p class="indent" > If a <a +</p><!--l. 3945--><p class="noindent" > +</p><!--l. 3947--><p class="indent" > If a <a id="dx1-38055"></a><a href="#glo:numberlist">number list<a id="dx1-38056"></a></a> consists of a sequence of consecutive numbers, the @@ -9779,7 +9800,7 @@ range will be concatenated. The number of consecutive locations that causes a range formation defaults to 2, but can be changed using: -</p><!--l. 3942--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3951--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GlsSetXdyMinRangeLength</span><span class="ec-lmtt-10"> </span></span><a id="dx1-38057"></a> <span @@ -9789,7 +9810,7 @@ class="ec-lmri-10x-x-109">n</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 3944--><p class="noindent" > +</p><!--l. 3953--><p class="noindent" > For example: @@ -9798,7 +9819,7 @@ For example: <div class="verbatim" id="verbatim-114"> \GlsSetXdyMinRangeLength{3} </div> -<!--l. 3948--><p class="nopar" > The argument may also be the keyword <span +<!--l. 3957--><p class="nopar" > The argument may also be the keyword <span class="ec-lmtt-10x-x-109">none</span>, to indicate that there should be no range formations. See the <a id="dx1-38058"></a><a @@ -9806,7 +9827,7 @@ href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-38059"></a></a> manual for further details on range formations. -</p><!--l. 3953--><p class="indent" > <div class="important" title="Important Note"> Note that <span +</p><!--l. 3962--><p class="indent" > <div class="important" title="Important Note"> Note that <span class="ec-lmtt-10x-x-109">\GlsSetXdyMinRangeLength </span>has no effect if <span class="ec-lmtt-10x-x-109">\noist</span><a id="dx1-38060"></a> is used @@ -9817,16 +9838,16 @@ class="ec-lmtt-10x-x-109">\GlsSetXdyMinRangeLength </span>must be used before <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a id="dx1-38062"></a>. </div> -</p><!--l. 3958--><p class="noindent" > -</p><!--l. 3960--><p class="indent" > See <a -href="#sec:numberlists">§5 </a><a -href="#sec:numberlists">Number lists<!--tex4ht:ref: sec:numberlists --></a> for further details. -</p><!--l. 3963--><p class="noindent" > +</p><!--l. 3967--><p class="noindent" > +</p><!--l. 3969--><p class="indent" > See <a +href="#x1-270005">§5 </a><a +href="#x1-270005">Number lists<!--tex4ht:ref: sec:numberlists --></a> for further details. +</p><!--l. 3972--><p class="noindent" > </p> -<!--l. 3963--><p class="noindent" ><a +<!--l. 3972--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">11.3</span>  <a - id="sec:groups"></a>Glossary Groups</h3> -<!--l. 3966--><p class="noindent" >The glossary is divided into groups according to the first letter of + id="x1-3900011.3"></a>Glossary Groups</h3> +<!--l. 3975--><p class="noindent" >The glossary is divided into groups according to the first letter of the sort key. The <span class="ec-lmss-10x-x-109">glossaries </span>package also adds a number group by default, unless you suppress it in the <span @@ -9840,23 +9861,23 @@ example: <div class="verbatim" id="verbatim-115"> \usepackage[xindy={glsnumbers=false}]{glossaries} </div> -<!--l. 3972--><p class="nopar" > Any entry that doesn’t go in one of the letter groups or the number group +<!--l. 3981--><p class="nopar" > Any entry that doesn’t go in one of the letter groups or the number group is placed in the default group. -</p><!--l. 3976--><p class="indent" > If you have a number group, the default behaviour is to locate it before +</p><!--l. 3985--><p class="indent" > 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: -</p><!--l. 3980--><p class="indent" > <span class="marginpar"><span +</p><!--l. 3989--><p class="indent" > <span class="marginpar"><span class="ec-lmtt-10">\GlsSetXdyFirstLetterAfterDigits</span><span class="ec-lmtt-10"> </span></span><a id="dx1-39002"></a> -</p><!--l. 3982--><p class="indent" > <hr><div title="Definition"><span +</p><!--l. 3991--><p class="indent" > <hr><div title="Definition"><span class="ec-lmtt-10x-x-109">\GlsSetXdyFirstLetterAfterDigits{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">letter</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3983--><p class="noindent" > -</p><!--l. 3985--><p class="indent" > +</p><!--l. 3992--><p class="noindent" > +</p><!--l. 3994--><p class="indent" > <div class="important" title="Important Note">Note that <span @@ -9887,16 +9908,16 @@ before class="ec-lmtt-10x-x-109">\makeglossaries</span><a id="dx1-39005"></a>. </div> -</p><!--l. 3990--><p class="noindent" > +</p><!--l. 3999--><p class="noindent" > </p> -<!--l. 3993--><p class="noindent" ><a +<!--l. 4002--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">12</span>  <a - id="sec:newglossary"></a>Defining New Glossaries</h2> + id="x1-4000012"></a>Defining New Glossaries</h2> A new glossary can be defined using: -<!--l. 3997--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 4006--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\newglossary</span><span class="ec-lmtt-10"> </span></span><a id="dx1-40001"></a> <span @@ -9927,7 +9948,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">counter</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3999--><p class="noindent" > +</p><!--l. 4008--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span @@ -9951,8 +9972,8 @@ counter to use for the associated <a id="dx1-40002"></a><a href="#glo:numberlist">number list<a id="dx1-40003"></a>s</a> (see also <a -href="#sec:numberlists">§5 </a><a -href="#sec:numberlists">Number +href="#x1-270005">§5 </a><a +href="#x1-270005">Number lists<!--tex4ht:ref: sec:numberlists --></a>). The first optional argument specifies the extension for the <a id="dx1-40004"></a><a @@ -9969,7 +9990,7 @@ href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a id="dx1-40009"></a></a> which picks up the information from the auxiliary file). -</p><!--l. 4011--><p class="indent" > Note that the main (default) glossary is automatically created +</p><!--l. 4020--><p class="indent" > Note that the main (default) glossary is automatically created as: @@ -9978,7 +9999,7 @@ as: <div class="verbatim" id="verbatim-116"> \newglossary{main}{gls}{glo}{\glossaryname} </div> -<!--l. 4014--><p class="nopar" > so it can be identified by the label <span +<!--l. 4023--><p class="nopar" > so it can be identified by the label <span class="ec-lmtt-10x-x-109">main </span>(unless the <span class="ec-lmss-10x-x-109">nomain</span><a id="dx1-40010"></a> package @@ -9993,7 +10014,7 @@ to: <div class="verbatim" id="verbatim-117"> \newglossary[alg]{acronym}{acr}{acn}{\acronymname} </div> -<!--l. 4020--><p class="nopar" > so it can be identified by the label <span +<!--l. 4029--><p class="nopar" > so it can be identified by the label <span class="ec-lmtt-10x-x-109">acronym</span>. If you are not sure whether the <span class="ec-lmss-10x-x-109">acronym</span><a @@ -10013,20 +10034,29 @@ need to declare it as a list of acronyms using the package option <span class="ec-lmss-10x-x-109">acronymlists</span><a id="dx1-40015"></a>. -</p><!--l. 4031--><p class="indent" > <div class="important" title="Important Note"> All glossaries must be defined before <span +</p><!--l. 4040--><p class="indent" > <div class="important" title="Important Note"> All glossaries must be defined before <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a id="dx1-40016"></a> to ensure that -the relevant output files are opened. </div> -</p><!--l. 4034--><p class="noindent" > +the relevant output files are opened. +</p><!--l. 4044--><p class="indent" > See <a +href="#x1-60001.2.1">§1.2.1 </a><a +href="#x1-60001.2.1">Changing the Fixed Names<!--tex4ht:ref: sec:fixednames --></a> if you want to redefine +<span +class="ec-lmtt-10x-x-109">\glossaryname</span>, especially if you are using <span +class="ec-lmss-10x-x-109">babel</span><a + id="dx1-40017"></a> or <span +class="ec-lmss-10x-x-109">translator</span><a + id="dx1-40018"></a>. </div> +</p><!--l. 4046--><p class="noindent" > </p> <h2 class="chapterHead"><span class="titlemark">13</span>  <a - id="sec:acronyms"></a>Acronyms</h2> -<!--l. 4040--><p class="noindent" >You may have noticed in <a -href="#sec:newglosentry">§4 </a><a -href="#sec:newglosentry">Defining Glossary Entries<!--tex4ht:ref: sec:newglosentry --></a> that when you + id="x1-4100013"></a>Acronyms</h2> +<!--l. 4052--><p class="noindent" >You may have noticed in <a +href="#x1-190004">§4 </a><a +href="#x1-190004">Defining Glossary Entries<!--tex4ht:ref: sec:newglosentry --></a> that when you specify a new entry, you can specify alternate text to use when the term is <a id="dx1-41001"></a><a @@ -10034,7 +10064,7 @@ href="#glo:firstuse">first used</a> in the document. This provides a useful mean define acronyms. For convenience, the <span class="ec-lmss-10x-x-109">glossaries </span>package defines the command: -</p><!--l. 4045--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4057--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\newacronym</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41002"></a> <span @@ -10056,8 +10086,8 @@ class="ec-lmri-10x-x-109">long</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 4048--><p class="noindent" > -</p><!--l. 4050--><p class="indent" > This uses <span +</p><!--l. 4060--><p class="noindent" > +</p><!--l. 4062--><p class="indent" > This uses <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a id="dx1-41003"></a> to create an entry with the given label in the glossary given by <span @@ -10073,10 +10103,10 @@ class="ec-lmtt-10x-x-109">\defdisplayfirst</span><a id="dx1-41007"></a> and <span class="ec-lmtt-10x-x-109">\defdisplay</span><a id="dx1-41008"></a> (see <a -href="#sec:glsdisplay">§6.1 </a><a -href="#sec:glsdisplay">Changing the format of the +href="#x1-290006.1">§6.1 </a><a +href="#x1-290006.1">Changing the format of the link text<!--tex4ht:ref: sec:glsdisplay --></a>). -</p><!--l. 4056--><p class="indent" > The optional argument <span +</p><!--l. 4068--><p class="indent" > The optional argument <span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">key-val list</span><span @@ -10107,12 +10137,12 @@ class="ec-lmss-10x-x-109">longplural</span><a \newacronym[longplural={diagonal matrices}]{dm}{DM}{diagonal  <br />matrix} </div> -<!--l. 4065--><p class="nopar" > If the <a +<!--l. 4077--><p class="nopar" > If the <a id="dx1-41013"></a><a href="#glo:firstuse">first use</a> uses the plural form, <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glspl{dm}</span></span></span> will display: diagonal matrices (DMs). -</p><!--l. 4070--><p class="indent" > The following package options are available to change the acronym +</p><!--l. 4082--><p class="indent" > The following package options are available to change the acronym style: </p><dl class="description"><dt class="description"> <span @@ -10152,7 +10182,7 @@ class="lmsy-10x-x-109">⟩ </span>is <div class="verbatim" id="verbatim-119"> \let\acrfootnote\acrnolinkfootnote </div> - <!--l. 4087--><p class="nopar" > + <!--l. 4099--><p class="nopar" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">smallcaps</span><a @@ -10206,24 +10236,24 @@ class="ec-lmss-10x-x-109">text</span><a class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span class="lmsy-10x-x-109">⟩</span>.</dd></dl> -<!--l. 4108--><p class="indent" > If you want to define your own custom acronym style, see <a -href="#sec:customacronym">§13.3 </a><a -href="#sec:customacronym">Defining +<!--l. 4120--><p class="indent" > If you want to define your own custom acronym style, see <a +href="#x1-4400013.3">§13.3 </a><a +href="#x1-4400013.3">Defining A Custom Acronym Style<!--tex4ht:ref: sec:customacronym --></a>. -</p><!--l. 4111--><p class="indent" > <div class="important" title="Important Note"> If you try using <span +</p><!--l. 4123--><p class="indent" > <div class="important" title="Important Note"> If you try using <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a id="dx1-41031"></a> for entries in a designated list of acronyms in combination with any of the above named package options you are likely to get unexpected results such as empty brackets or empty footnotes. -</p><!--l. 4117--><p class="indent" > If you don’t intend to use <span +</p><!--l. 4129--><p class="indent" > If you don’t intend to use <span class="ec-lmtt-10x-x-109">\newacronym</span><a id="dx1-41032"></a> you should skip this section] and not use the above package options. </div> -</p><!--l. 4119--><p class="noindent" > -</p><!--l. 4121--><p class="indent" > As mentioned in <a -href="#sec:pkgopts-sec">§2.2 </a><a -href="#sec:pkgopts-sec">Sectioning, Headings and TOC Options<!--tex4ht:ref: sec:pkgopts-sec --></a>, the +</p><!--l. 4131--><p class="noindent" > +</p><!--l. 4133--><p class="indent" > As mentioned in <a +href="#x1-140002.2">§2.2 </a><a +href="#x1-140002.2">Sectioning, Headings and TOC Options<!--tex4ht:ref: sec:pkgopts-sec --></a>, the command <span class="ec-lmtt-10x-x-109">\acronymtype</span><a id="dx1-41033"></a> is the name of the glossary in which the acronyms @@ -10247,7 +10277,7 @@ acronyms. -</p><!--l. 4131--><p class="indent" > +</p><!--l. 4143--><p class="indent" > <div class="important" title="Important Note">Since <span class="ec-lmtt-10x-x-109">\newacronym</span> @@ -10308,19 +10338,19 @@ class="ec-lmtt-10x-x-109">\newacronym</span><a id="dx1-41039"></a>. See <a -href="#sec:loadglsentries">§4.4 +href="#x1-250004.4">§4.4 </a><a -href="#sec:loadglsentries">Loading +href="#x1-250004.4">Loading Entries From a File<!--tex4ht:ref: sec:loadglsentries --></a>. </div> -</p><!--l. 4138--><p class="noindent" > -</p><!--l. 4140--><p class="indent" > Since <span +</p><!--l. 4150--><p class="noindent" > +</p><!--l. 4152--><p class="indent" > Since <span class="ec-lmtt-10x-x-109">\newacronym</span><a id="dx1-41040"></a> uses <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a @@ -10330,7 +10360,7 @@ class="ec-lmtt-10x-x-109">\gls</span><a id="dx1-41042"></a> and <span class="ec-lmtt-10x-x-109">\glsreset</span><a id="dx1-41043"></a> as with any other glossary entry. -</p><!--l. 4144--><p class="indent" > For example, the following defines the acronym IDN: +</p><!--l. 4156--><p class="indent" > For example, the following defines the acronym IDN: @@ -10338,7 +10368,7 @@ class="ec-lmtt-10x-x-109">\glsreset</span><a <div class="verbatim" id="verbatim-120"> \newacronym{idn}{IDN}{identification number} </div> -<!--l. 4147--><p class="nopar" > <span class="obeylines-h"><span class="verb"><span +<!--l. 4159--><p class="nopar" > <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls{idn}</span></span></span> will produce “identification number (IDN)” on <a id="dx1-41044"></a><a href="#glo:firstuse">first use</a> and @@ -10354,14 +10384,14 @@ form: <div class="verbatim" id="verbatim-121"> \newacronym{idn}{idn}{identification number} </div> -<!--l. 4154--><p class="nopar" > Now <span class="obeylines-h"><span class="verb"><span +<!--l. 4166--><p class="nopar" > Now <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls{idn}</span></span></span> will produce “identification number (<span class="ec-lmcsc-10x-x-109">idn</span>)” on <a id="dx1-41046"></a><a href="#glo:firstuse">first use</a> and “<span class="ec-lmcsc-10x-x-109">IDN</span>” on subsequent uses. -</p><!--l. 4159--><p class="indent" > If you use any of the package options <span +</p><!--l. 4171--><p class="indent" > If you use any of the package options <span class="ec-lmss-10x-x-109">smallcaps</span><a id="dx1-41047"></a>, <span class="ec-lmss-10x-x-109">smaller</span><a @@ -10375,7 +10405,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩ </span>will be displayed in the document using: -</p><!--l. 4162--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4174--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\acronymfont</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41051"></a> <span @@ -10384,9 +10414,9 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4164--><p class="noindent" > +</p><!--l. 4176--><p class="noindent" > and -</p><!--l. 4166--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4178--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\firstacronymfont</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41052"></a> <span @@ -10395,7 +10425,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4168--><p class="noindent" > +</p><!--l. 4180--><p class="noindent" > where <span class="ec-lmtt-10x-x-109">\firstacronymfont </span>is applied on <a id="dx1-41053"></a><a @@ -10435,17 +10465,17 @@ emphasized on subsequent use, do:  <br />\renewcommand*{\firstacronymfont}[1]{#1}  <br />\renewcommand*{\acronymfont}[1]{\emph{#1}} </div> -<!--l. 4185--><p class="nopar" > (Note that it is for this reason that the <span +<!--l. 4197--><p class="nopar" > (Note that it is for this reason that the <span class="ec-lmss-10x-x-109">relsize</span><a id="dx1-41060"></a> package is not automatically loaded when selecting the <span class="ec-lmss-10x-x-109">smaller</span><a id="dx1-41061"></a> package option.) -</p><!--l. 4190--><p class="indent" > There are commands analogous to <span +</p><!--l. 4202--><p class="indent" > There are commands analogous to <span class="ec-lmtt-10x-x-109">\glstext</span><a id="dx1-41062"></a> (described in <a -href="#sec:glslink">§6 </a><a -href="#sec:glslink">Links to +href="#x1-280006">§6 </a><a +href="#x1-280006">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a>) that allow you to access just the short form, just the long form or the full form, without affecting the <a id="dx1-41063"></a><a @@ -10454,7 +10484,7 @@ full form isn’t necessarily the same as the text produced on <a id="dx1-41064"></a><a href="#glo:firstuse">first use</a>.) -</p><!--l. 4196--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4208--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\acrshort</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41065"></a> <span @@ -10471,7 +10501,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4198--><p class="noindent" > +</p><!--l. 4210--><p class="noindent" > This displays the short form for the entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -10481,7 +10511,7 @@ class="ec-lmtt-10x-x-109">\glstext</span><a id="dx1-41066"></a>. There is also a starred version to suppress the hyperlink. There are also analogous upper case variants: -</p><!--l. 4203--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4215--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Acrshort</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41067"></a> <span @@ -10498,8 +10528,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4205--><p class="noindent" > -</p><!--l. 4206--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4217--><p class="noindent" > +</p><!--l. 4218--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ACRshort</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41068"></a> <span @@ -10516,8 +10546,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4208--><p class="noindent" > -</p><!--l. 4210--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4220--><p class="noindent" > +</p><!--l. 4222--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\acrlong</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41069"></a> <span @@ -10534,14 +10564,14 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4212--><p class="noindent" > +</p><!--l. 4224--><p class="noindent" > This displays the long form for the entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>. The optional arguments are the same as before. There is also a starred version to suppress the hyperlink. There are also analogous upper case variants: -</p><!--l. 4217--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4229--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Acrlong</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41070"></a> <span @@ -10558,8 +10588,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4219--><p class="noindent" > -</p><!--l. 4220--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4231--><p class="noindent" > +</p><!--l. 4232--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ACRlong</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41071"></a> <span @@ -10576,8 +10606,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4222--><p class="noindent" > -</p><!--l. 4224--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4234--><p class="noindent" > +</p><!--l. 4236--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\acrfull</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41072"></a> <span @@ -10594,7 +10624,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4226--><p class="noindent" > +</p><!--l. 4238--><p class="noindent" > This is equivalent to: <span class="marginpar"><span class="ec-lmtt-10">\acrfullformat</span><span class="ec-lmtt-10"> </span></span><a @@ -10619,7 +10649,7 @@ class="ec-lmri-10x-x-109">short</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span>) regardless of the package options. There are also analogous upper case variants: -</p><!--l. 4232--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4244--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Acrfull</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41077"></a> <span @@ -10639,8 +10669,8 @@ class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4234--><p class="noindent" > -</p><!--l. 4235--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4246--><p class="noindent" > +</p><!--l. 4247--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ACRfull</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41078"></a> <span @@ -10657,8 +10687,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4237--><p class="noindent" > -</p><!--l. 4239--><p class="indent" > If you find the above commands too cumbersome to write, you can use +</p><!--l. 4249--><p class="noindent" > +</p><!--l. 4251--><p class="indent" > If you find the above commands too cumbersome to write, you can use the <span class="ec-lmss-10x-x-109">shortcuts</span><a id="dx1-41079"></a> package option to activate the shorter command names listed @@ -10667,7 +10697,7 @@ href="#x1-410801">table 13.1</a>. -</p><!--l. 4243--><p class="indent" > <a +</p><!--l. 4255--><p class="indent" > <a id="x1-410801"></a></p><hr class="float" /><div class="float" > @@ -10821,16 +10851,16 @@ class="ec-lmtt-10x-x-109">\Glspl</span><a </div><hr class="endfloat" /> -<!--l. 4269--><p class="indent" > It is also possible to access the long and short forms without +<!--l. 4281--><p class="indent" > It is also possible to access the long and short forms without adding information to the glossary using commands analogous to <span class="ec-lmtt-10x-x-109">\glsentrytext</span><a id="dx1-41114"></a> (described in <a -href="#sec:glsnolink">§9 </a><a -href="#sec:glsnolink">Using Glossary Terms Without +href="#x1-340009">§9 </a><a +href="#x1-340009">Using Glossary Terms Without Links<!--tex4ht:ref: sec:glsnolink --></a>). -</p><!--l. 4273--><p class="indent" > The long form can be accessed using: -</p><!--l. 4274--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4285--><p class="indent" > The long form can be accessed using: +</p><!--l. 4286--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrylong</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41115"></a> <span @@ -10839,9 +10869,9 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4276--><p class="noindent" > +</p><!--l. 4288--><p class="noindent" > or, with the first letter converted to upper case: -</p><!--l. 4278--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4290--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentrylong</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41116"></a> <span @@ -10850,9 +10880,9 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4280--><p class="noindent" > +</p><!--l. 4292--><p class="noindent" > Plural forms: -</p><!--l. 4282--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4294--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrylongpl</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41117"></a> <span @@ -10861,8 +10891,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4284--><p class="noindent" > -</p><!--l. 4285--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4296--><p class="noindent" > +</p><!--l. 4297--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentrylongpl</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41118"></a> <span @@ -10871,9 +10901,9 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4287--><p class="noindent" > -</p><!--l. 4289--><p class="indent" > Similarly, to access the short form: -</p><!--l. 4290--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4299--><p class="noindent" > +</p><!--l. 4301--><p class="indent" > Similarly, to access the short form: +</p><!--l. 4302--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryshort</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41119"></a> <span @@ -10882,9 +10912,9 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4292--><p class="noindent" > +</p><!--l. 4304--><p class="noindent" > or, with the first letter converted to upper case: -</p><!--l. 4294--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4306--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryshort</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41120"></a> <span @@ -10893,9 +10923,9 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4296--><p class="noindent" > +</p><!--l. 4308--><p class="noindent" > Plural forms: -</p><!--l. 4298--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4310--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryshortpl</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41121"></a> <span @@ -10904,8 +10934,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4300--><p class="noindent" > -</p><!--l. 4301--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4312--><p class="noindent" > +</p><!--l. 4313--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryshortpl</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41122"></a> <span @@ -10914,15 +10944,15 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4303--><p class="noindent" > -</p><!--l. 4305--><p class="indent" > And the full form, <span +</p><!--l. 4315--><p class="noindent" > +</p><!--l. 4317--><p class="indent" > And the full form, <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span class="lmsy-10x-x-109">⟩ </span>(<span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">short</span><span class="lmsy-10x-x-109">⟩</span>), can be obtained using: -</p><!--l. 4307--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4319--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryfull</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41123"></a> <span @@ -10931,8 +10961,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4309--><p class="noindent" > -</p><!--l. 4310--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4321--><p class="noindent" > +</p><!--l. 4322--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryfull</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41124"></a> <span @@ -10941,8 +10971,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4312--><p class="noindent" > -</p><!--l. 4313--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4324--><p class="noindent" > +</p><!--l. 4325--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryfullpl</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41125"></a> <span @@ -10951,8 +10981,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4315--><p class="noindent" > -</p><!--l. 4316--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4327--><p class="noindent" > +</p><!--l. 4328--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryfullpl</span><span class="ec-lmtt-10"> </span></span><a id="dx1-41126"></a> <span @@ -10961,14 +10991,14 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4318--><p class="noindent" > +</p><!--l. 4330--><p class="noindent" > </p> <h3 class="sectionHead"><span class="titlemark">13.1</span>  <a - id="sec:predefinedacrstyles"></a>Predefined Acronym Styles</h3> -<!--l. 4323--><p class="noindent" >Some of the acronym-related package options may be combined. Listed + id="x1-4200013.1"></a>Predefined Acronym Styles</h3> +<!--l. 4335--><p class="noindent" >Some of the acronym-related package options may be combined. Listed below are the effects of different combinations. If you use an invalid combination, you’ll get an error message. </p><dl class="description"><dt class="description"> @@ -11083,7 +11113,7 @@ class="lmsy-10x-x-109">⟩</span> - <!--l. 4363--><p class="noindent" >Note that with this option, you need to specify the description using + <!--l. 4375--><p class="noindent" >Note that with this option, you need to specify the description using the <span class="ec-lmss-10x-x-109">description</span><a id="dx1-42017"></a> key in the optional argument of <span @@ -11124,7 +11154,7 @@ class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span> <br /><spacer type=vertical size=10></span> Acronyms will be sorted according to the short form. - <!--l. 4378--><p class="noindent" >Note that on <a + <!--l. 4390--><p class="noindent" >Note that on <a id="dx1-42021"></a><a href="#glo:firstuse">first use</a>, it is the long form in the footnote that links to the relevant glossary entry (where hyperlinks are enabled), whereas @@ -11137,7 +11167,7 @@ href="#glo:firstuse">first use</a>, it is the long form in the footnote that lin <div class="verbatim" id="verbatim-123"> \let\acrfootnote\acrnolinkfootnote </div> - <!--l. 4384--><p class="nopar" > + <!--l. 4396--><p class="nopar" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">smallcaps</span><a @@ -11179,7 +11209,7 @@ class="lmsy-10x-x-109">⟩</span> class="ec-lmtt-10x-x-109">\acronymfont</span><a id="dx1-42027"></a> is set to <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\textsc{#1}</span></span></span>. - <!--l. 4398--><p class="noindent" ><div class="important" title="Important Note"> Note that since the acronym is displayed using <span + <!--l. 4410--><p class="noindent" ><div class="important" title="Important Note"> Note that since the acronym is displayed using <span class="ec-lmtt-10x-x-109">\textsc</span><a id="dx1-42028"></a>, the short form, <span @@ -11187,7 +11217,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩</span>, should be specified in lower case. </div> - </p><!--l. 4403--><p class="noindent" > + </p><!--l. 4415--><p class="noindent" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">smaller</span><a @@ -11235,7 +11265,7 @@ class="ec-lmtt-10x-x-109">\textsmaller{#1}</span></span></span>.<span class="foo href="#fn1x15" id="fn1x15-bk"><sup class="textsuperscript">1</sup></a></span><a id="x1-42036f1"></a> The entries will be sorted according to the short form. - <!--l. 4421--><p class="noindent" ><div class="important" title="Important Note"> Remember to load a package that defines <span + <!--l. 4433--><p class="noindent" ><div class="important" title="Important Note"> Remember to load a package that defines <span class="ec-lmtt-10x-x-109">\textsmaller</span><a id="dx1-42040"></a> (such as <span @@ -11245,7 +11275,7 @@ class="ec-lmss-10x-x-109">relsize</span><a class="ec-lmtt-10x-x-109">\acronymfont</span><a id="dx1-42042"></a> to use some other formatting command. </div> - </p><!--l. 4425--><p class="noindent" > + </p><!--l. 4437--><p class="noindent" > @@ -11287,12 +11317,12 @@ class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span> <br /><spacer type=vertical size=10></span> Entries will be sorted according to the short form.</dd></dl> -<!--l. 4441--><p class="noindent" > +<!--l. 4453--><p class="noindent" > </p> -<!--l. 4441--><p class="noindent" ><a +<!--l. 4453--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">13.2</span>  <a - id="sec:disploa"></a>Displaying the List of Acronyms</h3> -<!--l. 4444--><p class="noindent" >The list of acronyms is just like any other type of glossary and can be + id="x1-4300013.2"></a>Displaying the List of Acronyms</h3> +<!--l. 4456--><p class="noindent" >The list of acronyms is just like any other type of glossary and can be displayed on its own using <span class="ec-lmtt-10x-x-109">\printglossary</span><a id="dx1-43001"></a><span class="obeylines-h"><span class="verb"><span @@ -11309,7 +11339,7 @@ class="ec-lmss-10x-x-109">description</span><a id="dx1-43004"></a> and <span class="ec-lmss-10x-x-109">symbol</span><a id="dx1-43005"></a> keys. -</p><!--l. 4453--><p class="indent" > <a +</p><!--l. 4465--><p class="indent" > <a href="#x1-430132">Table 13.2</a> lists the package options that govern the acronym styles and how the information is stored in the keys used when displaying the glossary. Note that the <span @@ -11318,7 +11348,7 @@ class="ec-lmss-10x-x-109">description</span><a command in the <span class="ec-lmss-10x-x-109">name</span><a id="dx1-43007"></a>: -</p><!--l. 4457--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4469--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\acrnameformat</span><span class="ec-lmtt-10"> </span></span><a id="dx1-43008"></a> <span @@ -11331,14 +11361,14 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4459--><p class="noindent" > +</p><!--l. 4471--><p class="noindent" > This defaults to just <span class="ec-lmtt-10x-x-109">\acronymfont{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span>. -</p><!--l. 4462--><p class="indent" > For example, if I use the package options <span +</p><!--l. 4474--><p class="indent" > For example, if I use the package options <span class="ec-lmss-10x-x-109">description</span><a id="dx1-43009"></a> and <span class="ec-lmss-10x-x-109">footnote</span><a @@ -11367,13 +11397,13 @@ class="ec-lmri-10x-x-109">location list</span><span class="lmsy-10x-x-109">⟩</span> <br /><spacer type=vertical size=10></span> Alternatively, you can define your own custom style (see <a -href="#sec:newglossarystyle">§16 </a><a -href="#sec:newglossarystyle">Defining your +href="#x1-5600016">§16 </a><a +href="#x1-5600016">Defining your own glossary style<!--tex4ht:ref: sec:newglossarystyle --></a> for further details). -</p><!--l. 4474--><p class="indent" > <a +</p><!--l. 4486--><p class="indent" > <a id="x1-430132"></a></p><hr class="float" /><div class="float" > @@ -11386,7 +11416,7 @@ class="ec-lmtt-10x-x-109">\newacronym </span>and how the information is stored</td></tr></table></div><!--tex4ht:label?: x1-430132 --> <div class="center" > -<!--l. 4478--><p class="noindent" > +<!--l. 4490--><p class="noindent" > </p> <div class="tabular"> <table id="TBL-7" class="tabular" cellspacing="0" cellpadding="0" @@ -11560,20 +11590,20 @@ class="td11"> </td></tr></table> </div><hr class="endfloat" /> -<!--l. 4519--><p class="noindent" ><a +<!--l. 4531--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">13.3</span>  <a - id="sec:customacronym"></a>Defining A Custom Acronym Style</h3> -<!--l. 4522--><p class="noindent" >You may find that the predefined acronyms styles that come with the + id="x1-4400013.3"></a>Defining A Custom Acronym Style</h3> +<!--l. 4534--><p class="noindent" >You may find that the predefined acronyms styles that come with the <span class="ec-lmss-10x-x-109">glossaries </span>package don’t suit your requirements. In this case you can define your own style. This is done by redefining the following commands: -</p><!--l. 4526--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4538--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\CustomAcronymFields</span><span class="ec-lmtt-10"> </span></span><a id="dx1-44001"></a> <span class="ec-lmtt-10x-x-109">\CustomAcronymFields </span></div><hr> -</p><!--l. 4528--><p class="noindent" > +</p><!--l. 4540--><p class="noindent" > This command sets up the keys for <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a id="dx1-44002"></a> when you @@ -11607,7 +11637,7 @@ class="ec-lmss-10x-x-109">symbol</span><a class="ec-lmss-10x-x-109">description</span><a id="dx1-44013"></a> keys depending on your requirements. -</p><!--l. 4539--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4551--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\SetCustomDisplayStyle</span><span class="ec-lmtt-10"> </span></span><a id="dx1-44014"></a> <span @@ -11616,7 +11646,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">type</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4541--><p class="noindent" > +</p><!--l. 4553--><p class="noindent" > This is used to set up the display style for the glossary given by <span class="lmsy-10x-x-109">⟨</span><span @@ -11627,21 +11657,21 @@ class="ec-lmtt-10x-x-109">\defglsdisplayfirst</span><a <span class="ec-lmtt-10x-x-109">\defglsdisplay</span><a id="dx1-44016"></a>. -</p><!--l. 4546--><p class="indent" > Once you have redefined <span +</p><!--l. 4558--><p class="indent" > Once you have redefined <span class="ec-lmtt-10x-x-109">\CustomAcronymFields </span>and <span class="ec-lmtt-10x-x-109">\SetCustomDisplayStyle</span>, you must then switch to this style using -</p><!--l. 4548--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4560--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\SetCustomStyle</span><span class="ec-lmtt-10"> </span></span><a id="dx1-44017"></a> <span class="ec-lmtt-10x-x-109">\SetCustomStyle </span></div><hr> -</p><!--l. 4550--><p class="noindent" > +</p><!--l. 4562--><p class="noindent" > Note that you may still use the <span class="ec-lmss-10x-x-109">shortcuts</span><a id="dx1-44018"></a> package option with your custom style. -</p><!--l. 4554--><p class="indent" > <div class="important" title="Important Note"> If you omit <span +</p><!--l. 4566--><p class="indent" > <div class="important" title="Important Note"> If you omit <span class="ec-lmtt-10x-x-109">\SetCustomStyle</span>, or use it before you redefine <span class="ec-lmtt-10x-x-109">\CustomAcronymFields </span>and <span @@ -11653,8 +11683,8 @@ class="ec-lmtt-10x-x-109">\newacronym</span><a not <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a id="dx1-44020"></a>. </div> -</p><!--l. 4560--><p class="noindent" > -</p><!--l. 4562--><p class="indent" > As an example, suppose I want my acronym on <a +</p><!--l. 4572--><p class="noindent" > +</p><!--l. 4574--><p class="indent" > As an example, suppose I want my acronym on <a id="dx1-44021"></a><a href="#glo:firstuse">first use</a> to have the short form in the text and the long form with the description in a footnote. @@ -11711,7 +11741,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">description</span><span class="lmsy-10x-x-109">⟩</span> <br /><spacer type=vertical size=10></span> -</p><!--l. 4583--><p class="indent" > First, I need to redefine <span +</p><!--l. 4595--><p class="indent" > First, I need to redefine <span class="ec-lmtt-10x-x-109">\CustomAcronymFields</span><a id="dx1-44026"></a> so that <span class="ec-lmtt-10x-x-109">\newacronym</span><a @@ -11744,8 +11774,8 @@ appear in the list of acronyms.  <br />  plural={\textsc{\the\glsshorttok}\noexpand\acrpluralsuffix}%  <br />} </div> -<!--l. 4598--><p class="nopar" > -</p><!--l. 4600--><p class="indent" > When using <span +<!--l. 4610--><p class="nopar" > +</p><!--l. 4612--><p class="indent" > When using <span class="ec-lmtt-10x-x-109">\newacronym</span><a id="dx1-44034"></a>, the short and long forms are stored in the <span @@ -11765,9 +11795,9 @@ class="ec-lmtt-10x-x-109">\defglsdisplay</span><a can use <span class="ec-lmtt-10x-x-109">\glsentrylong</span><a id="dx1-44041"></a> to access the long form. Recall from <a -href="#sec:glsdisplay">§6.1 +href="#x1-290006.1">§6.1 </a><a -href="#sec:glsdisplay">Changing the format of the link text<!--tex4ht:ref: sec:glsdisplay --></a>, that the optional argument to +href="#x1-290006.1">Changing the format of the link text<!--tex4ht:ref: sec:glsdisplay --></a>, that the optional argument to <span class="ec-lmtt-10x-x-109">\defglsdisplayfirst</span><a id="dx1-44042"></a> and <span @@ -11809,8 +11839,8 @@ the inserted text.  <br />  \defglsdisplay[#1]{##1##4}%  <br />} </div> -<!--l. 4623--><p class="nopar" > -</p><!--l. 4625--><p class="indent" > Since we have a definition inside a definition, <span class="obeylines-h"><span class="verb"><span +<!--l. 4635--><p class="nopar" > +</p><!--l. 4637--><p class="indent" > Since we have a definition inside a definition, <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">#1</span></span></span> refers to the argument of <span class="ec-lmtt-10x-x-109">\SetCustomDisplayStyle</span><a @@ -11822,7 +11852,7 @@ class="ec-lmtt-10x-x-109">\glsdisplayfirst</span><a id="dx1-44054"></a> and <span class="ec-lmtt-10x-x-109">\glsdisplay</span><a id="dx1-44055"></a>. -</p><!--l. 4630--><p class="indent" > Now that I’ve redefined <span +</p><!--l. 4642--><p class="indent" > Now that I’ve redefined <span class="ec-lmtt-10x-x-109">\CustomAcronymFields</span><a id="dx1-44056"></a> and <span @@ -11835,7 +11865,7 @@ class="ec-lmtt-10x-x-109">\SetCustomDisplayStyle</span><a <div class="verbatim" id="verbatim-126"> \SetCustomStyle </div> -<!--l. 4634--><p class="nopar" > and now I can define my acronyms: +<!--l. 4646--><p class="nopar" > and now I can define my acronyms: @@ -11848,8 +11878,8 @@ class="ec-lmtt-10x-x-109">\SetCustomDisplayStyle</span><a  <br />layout of a document written in a markup language}]{css}  <br />{css}{Cascading Style Sheet} </div> -<!--l. 4644--><p class="nopar" > -</p><!--l. 4646--><p class="indent" > Note that since I’ve used the description in the main body of the text, I +<!--l. 4656--><p class="nopar" > +</p><!--l. 4658--><p class="indent" > Note that since I’ve used the description in the main body of the text, I need to switch off the sanitization otherwise any commands within the description won’t get interpreted. Also I want to use the <span class="ec-lmss-10x-x-109">hyperref</span><a @@ -11877,18 +11907,18 @@ have:  <br />                   % will be used in the main text  <br /> ]{glossaries} </div> -<!--l. 4664--><p class="nopar" > -</p><!--l. 4666--><p class="indent" > Note that I haven’t used the <span +<!--l. 4676--><p class="nopar" > +</p><!--l. 4678--><p class="indent" > Note that I haven’t used the <span class="ec-lmss-10x-x-109">description</span><a id="dx1-44061"></a> or <span class="ec-lmss-10x-x-109">footnote</span><a id="dx1-44062"></a> package options. -</p><!--l. 4669--><p class="noindent" > +</p><!--l. 4681--><p class="noindent" > </p> -<!--l. 4669--><p class="noindent" ><a +<!--l. 4681--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">13.4</span>  <a - id="sec:oldacronym"></a>Upgrading From the glossary Package</h3> -<!--l. 4672--><p class="noindent" >Users of the obsolete <span + id="x1-4500013.4"></a>Upgrading From the glossary Package</h3> +<!--l. 4684--><p class="noindent" >Users of the obsolete <span class="ec-lmss-10x-x-109">glossary</span><a id="dx1-45001"></a> package may recall that the syntax used to define new acronyms has changed with the replacement <span @@ -11904,13 +11934,13 @@ when defining the acronym <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">acr-name</span><span class="lmsy-10x-x-109">⟩</span>. -</p><!--l. 4678--><p class="indent" > In order to facilitate migrating from the old package to the new one, the <span +</p><!--l. 4690--><p class="indent" > In order to facilitate migrating from the old package to the new one, the <span class="ec-lmss-10x-x-109">glossaries</span> package<span class="footnote-mark"><a href="#fn2x15" id="fn2x15-bk"><sup class="textsuperscript">2</sup></a></span><a id="x1-45003f2"></a> provides the command: -</p><!--l. 4681--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4693--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\oldacronym</span><span class="ec-lmtt-10"> </span></span><a id="dx1-45004"></a> <span @@ -11932,7 +11962,7 @@ class="ec-lmri-10x-x-109">key-val list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 4683--><p class="noindent" > +</p><!--l. 4695--><p class="noindent" > This uses the same syntax as the <span class="ec-lmss-10x-x-109">glossary</span><a id="dx1-45005"></a> package’s method of defining @@ -12013,7 +12043,7 @@ class="ec-lmtt-10x-x-109">\gls</span><a id="dx1-45012"></a> or <span class="ec-lmtt-10x-x-109">\Gls</span><a id="dx1-45013"></a> to change the settings. -</p><!--l. 4698--><p class="indent" > <div class="important" title="Important Note"> Recall that, in general, <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span +</p><!--l. 4710--><p class="indent" > <div class="important" title="Important Note"> Recall that, in general, <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> ignores spaces following command names consisting of alphabetical characters. This is also true for <span class="ec-lmtt-10x-x-109">\</span><span @@ -12023,8 +12053,8 @@ class="lmsy-10x-x-109">⟩</span> unless you additionally load the <span class="ec-lmss-10x-x-109">xspace</span><a id="dx1-45014"></a> package. </div> -</p><!--l. 4703--><p class="noindent" > -</p><!--l. 4705--><p class="indent" > The <span +</p><!--l. 4715--><p class="noindent" > +</p><!--l. 4717--><p class="indent" > The <span class="ec-lmss-10x-x-109">glossaries </span>package doesn’t load the <span class="ec-lmss-10x-x-109">xspace</span><a id="dx1-45015"></a> package since there are @@ -12054,7 +12084,7 @@ optional argument to insert text (you will have to explicitly use <span class="ec-lmtt-10x-x-109">\gls</span><a id="dx1-45020"></a>). -</p><!--l. 4716--><p class="indent" > To illustrate this, suppose I define the acronym “abc” as follows: +</p><!--l. 4728--><p class="indent" > To illustrate this, suppose I define the acronym “abc” as follows: @@ -12062,7 +12092,7 @@ class="ec-lmtt-10x-x-109">\gls</span><a <div class="verbatim" id="verbatim-129"> \oldacronym{abc}{example acronym}{} </div> -<!--l. 4720--><p class="nopar" > This will create the command <span +<!--l. 4732--><p class="nopar" > This will create the command <span class="ec-lmtt-10x-x-109">\abc </span>and its starred version <span class="ec-lmtt-10x-x-109">\abc*</span>. <a @@ -12078,7 +12108,7 @@ argument from being recognised. -</p><!--l. 4728--><p class="indent" > <a +</p><!--l. 4740--><p class="indent" > <a id="x1-450233"></a></p><hr class="float" /><div class="float" > @@ -12146,9 +12176,9 @@ class="td11"> abc’s xyz </td></tr></table> -<!--l. 4748--><p class="noindent" ><a +<!--l. 4760--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">14</span>  <a - id="sec:glsunset"></a>Unsetting and Resetting Entry Flags</h2> + id="x1-4600014"></a>Unsetting and Resetting Entry Flags</h2> When using <span class="ec-lmtt-10x-x-109">\gls</span><a id="dx1-46001"></a>, <span @@ -12165,7 +12195,7 @@ class="ec-lmss-10x-x-109">text</span><a id="dx1-46005"></a> key, even though you haven’t used the glossary entry. The former can be achieved by one of the following commands: -<!--l. 4757--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 4769--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsreset</span><span class="ec-lmtt-10"> </span></span><a id="dx1-46006"></a> <span @@ -12174,8 +12204,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4759--><p class="noindent" > -</p><!--l. 4760--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4771--><p class="noindent" > +</p><!--l. 4772--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glslocalreset</span><span class="ec-lmtt-10"> </span></span><a id="dx1-46007"></a> <span @@ -12184,9 +12214,9 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4762--><p class="noindent" > +</p><!--l. 4774--><p class="noindent" > while the latter can be achieved by one of the following commands: -</p><!--l. 4764--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4776--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsunset</span><span class="ec-lmtt-10"> </span></span><a id="dx1-46008"></a> <span @@ -12195,8 +12225,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4766--><p class="noindent" > -</p><!--l. 4767--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4778--><p class="noindent" > +</p><!--l. 4779--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glslocalunset</span><span class="ec-lmtt-10"> </span></span><a id="dx1-46009"></a> <span @@ -12205,10 +12235,10 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4769--><p class="noindent" > +</p><!--l. 4781--><p class="noindent" > You can also reset or unset all entries for a given glossary or list of glossaries using: -</p><!--l. 4772--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4784--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsresetall</span><span class="ec-lmtt-10"> </span></span><a id="dx1-46010"></a> <span @@ -12217,8 +12247,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4774--><p class="noindent" > -</p><!--l. 4775--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4786--><p class="noindent" > +</p><!--l. 4787--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glslocalresetall</span><span class="ec-lmtt-10"> </span></span><a id="dx1-46011"></a> <span @@ -12227,8 +12257,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4777--><p class="noindent" > -</p><!--l. 4778--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4789--><p class="noindent" > +</p><!--l. 4790--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsunsetall</span><span class="ec-lmtt-10"> </span></span><a id="dx1-46012"></a> <span @@ -12237,8 +12267,8 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4780--><p class="noindent" > -</p><!--l. 4781--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4792--><p class="noindent" > +</p><!--l. 4793--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glslocalunsetall</span><span class="ec-lmtt-10"> </span></span><a id="dx1-46013"></a> <span @@ -12247,7 +12277,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4783--><p class="noindent" > +</p><!--l. 4795--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary list</span><span @@ -12261,11 +12291,11 @@ in the main glossary and the list of acronyms: <div class="verbatim" id="verbatim-130"> \glsresetall[main,acronym] </div> -<!--l. 4790--><p class="nopar" > -</p><!--l. 4792--><p class="indent" > You can determine whether an entry’s <a +<!--l. 4802--><p class="nopar" > +</p><!--l. 4804--><p class="indent" > You can determine whether an entry’s <a id="dx1-46014"></a><a href="#glo:firstuseflag">first use flag</a> is set using: -</p><!--l. 4793--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4805--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ifglsused</span><span class="ec-lmtt-10"> </span></span><a id="dx1-46015"></a> <span @@ -12282,7 +12312,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4795--><p class="noindent" > +</p><!--l. 4807--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -12300,8 +12330,8 @@ done. </p> <h2 class="chapterHead"><span class="titlemark">15</span>  <a - id="sec:styles"></a>Glossary Styles</h2> -<!--l. 4803--><p class="noindent" >The <span + id="x1-4700015"></a>Glossary Styles</h2> +<!--l. 4815--><p class="noindent" >The <span class="ec-lmss-10x-x-109">glossaries </span>package comes with some pre-defined 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, @@ -12319,13 +12349,13 @@ class="ec-lmss-10x-x-109">counterwithin</span><a id="dx1-47002"></a> and <span class="ec-lmss-10x-x-109">subentrycounter</span><a id="dx1-47003"></a> described in <a -href="#sec:pkgopts-printglos">§2.3 </a><a -href="#sec:pkgopts-printglos">Glossary Appearance +href="#x1-150002.3">§2.3 </a><a +href="#x1-150002.3">Glossary Appearance Options<!--tex4ht:ref: sec:pkgopts-printglos --></a>. -</p><!--l. 4817--><p class="indent" > <a +</p><!--l. 4829--><p class="indent" > <a id="x1-470041"></a></p><hr class="float" /><div class="float" > @@ -12513,13 +12543,13 @@ class="td11"> </td></tr></table></div> </div><hr class="endfloat" /> -<!--l. 4857--><p class="indent" > The glossary style can be set using the <span +<!--l. 4869--><p class="indent" > The glossary style can be set using the <span class="ec-lmss-10x-x-109">style</span><a id="dx1-47011"></a> key in the optional argument to <span class="ec-lmtt-10x-x-109">\printglossary</span><a id="dx1-47012"></a> or using the command: -</p><!--l. 4859--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4871--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glossarystyle</span><span class="ec-lmtt-10"> </span></span><a id="dx1-47013"></a> <span @@ -12528,14 +12558,14 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">style-name</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4861--><p class="noindent" > +</p><!--l. 4873--><p class="noindent" > Some of the glossary styles may also be set using the <span class="ec-lmss-10x-x-109">style</span><a id="dx1-47014"></a> package option, it depends if the package in which they are defined is automatically loaded by the <span class="ec-lmss-10x-x-109">glossaries </span>package. -</p><!--l. 4866--><p class="indent" > The tabular-like styles that allow multi-line descriptions +</p><!--l. 4878--><p class="indent" > The tabular-like styles that allow multi-line descriptions and page lists use the length <span class="marginpar"><span class="ec-lmtt-10">\glsdescwidth</span><span class="ec-lmtt-10"> </span></span><a @@ -12569,7 +12599,7 @@ class="ec-lmtt-10x-x-109">\newline</span><a id="dx1-47025"></a> instead of <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\\</span></span></span>. -</p><!--l. 4884--><p class="indent" > Note that if you use the <span +</p><!--l. 4896--><p class="indent" > Note that if you use the <span class="ec-lmss-10x-x-109">style</span><a id="dx1-47026"></a> key in the optional argument to <span @@ -12584,7 +12614,7 @@ glossary, so if, for example, you do \renewcommand*{\glsgroupskip}{}  <br />\printglossary[style=long] </div> -<!--l. 4891--><p class="nopar" > then the new definition of <span +<!--l. 4903--><p class="nopar" > then the new definition of <span class="ec-lmtt-10x-x-109">\glsgroupskip</span><a id="dx1-47028"></a> will not have an affect for this glossary, as <span @@ -12602,7 +12632,7 @@ again \renewcommand*{\glsgroupskip}{}  <br />\glossarystyle{long} </div> -<!--l. 4899--><p class="nopar" > will reset <span +<!--l. 4911--><p class="nopar" > will reset <span class="ec-lmtt-10x-x-109">\glsgroupskip </span>back to its default definition for the named glossary style (<span class="ec-lmss-10x-x-109">long</span><a @@ -12621,17 +12651,20 @@ class="ec-lmtt-10x-x-109">\glossarystyle</span><a \glossarystyle{long}  <br />\renewcommand*{\glsgroupskip}{} </div> -<!--l. 4908--><p class="nopar" > -</p><!--l. 4910--><p class="indent" > All the styles except for the three- and four-column styles and the +<!--l. 4920--><p class="nopar" > As from version 3.03, you can now use the package option <span +class="ec-lmss-10x-x-109">nogroupskip</span><a + id="dx1-47033"></a> to +suppress the gap between groups for the default styles. +</p><!--l. 4925--><p class="indent" > All the styles except for the three- and four-column styles and the <span class="ec-lmss-10x-x-109">listdotted</span><a - id="dx1-47033"></a> style use the command -</p><!--l. 4912--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="dx1-47034"></a> style use the command +</p><!--l. 4927--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glspostdescription</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-47034"></a> <span + id="dx1-47035"></a> <span class="ec-lmtt-10x-x-109">\glspostdescription </span></div><hr> -</p><!--l. 4914--><p class="noindent" > +</p><!--l. 4929--><p class="noindent" > 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 <span @@ -12639,11 +12672,15 @@ class="ec-lmtt-10x-x-109">\glspostdescription </span>before the glossary is displayed. Alternatively, you can suppress it for a given entry by placing <span class="ec-lmtt-10x-x-109">\nopostdesc</span><a - id="dx1-47035"></a> in the entry’s description. + id="dx1-47036"></a> in the entry’s description. +</p><!--l. 4936--><p class="indent" > As from version 3.03 you can now use the package option <span +class="ec-lmss-10x-x-109">nopostdot</span><a + id="dx1-47037"></a> to +suppress this full stop. </p> <h3 class="sectionHead"><span class="titlemark">15.1</span>  <a - id="sec:liststyles"></a>List Styles</h3> -<!--l. 4924--><p class="noindent" >The styles described in this section are all defined in the package + id="x1-4800015.1"></a>List Styles</h3> +<!--l. 4942--><p class="noindent" >The styles described in this section are all defined in the package <span class="ec-lmss-10x-x-109">glossary-list</span><a id="dx1-48001"></a>. Since they all use the <span @@ -12688,6 +12725,9 @@ class="ec-lmss-10x-x-109">listgroup</span><a class="ec-lmss-10x-x-109">list</span><a id="dx1-48014"></a> but the glossary groups have headings. + + + </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">listhypergroup</span> </dt><dd @@ -12697,20 +12737,17 @@ class="ec-lmss-10x-x-109">listhypergroup</span><a class="ec-lmss-10x-x-109">listgroup</span><a id="dx1-48016"></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 <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> to ensure the group information is up to date. In the navigation line, each group is separated by - <!--l. 4949--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 4967--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glshypernavsep</span><span class="ec-lmtt-10"> </span></span><a id="dx1-48017"></a> <span class="ec-lmtt-10x-x-109">\glshypernavsep </span></div><hr> - </p><!--l. 4951--><p class="noindent" > + </p><!--l. 4969--><p class="noindent" > which defaults to a vertical bar with a space on either side. For example, to simply have a space separating each group, do: @@ -12721,8 +12758,8 @@ class="ec-lmtt-10x-x-109">\glshypernavsep </span></div><hr> <div class="verbatim" id="verbatim-134"> \renewcommand*{\glshypernavsep}{\space} </div> - <!--l. 4956--><p class="nopar" > - </p><!--l. 4958--><p class="noindent" >Note that the hyper-navigation line is now (as from version 1.14) set + <!--l. 4974--><p class="nopar" > + </p><!--l. 4976--><p class="noindent" >Note that the hyper-navigation line is now (as from version 1.14) set inside the optional argument to <span class="ec-lmtt-10x-x-109">\item</span><a id="dx1-48018"></a> instead of after it to prevent a @@ -12786,12 +12823,12 @@ class="ec-lmtt-10x-x-109">\item[]</span></span></span>, followed by the name fol id="dx1-48032"></a><a href="#glo:numberlist">number list<a id="dx1-48033"></a></a> and the symbol. The length - <!--l. 4983--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 5001--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glslistdottedwidth</span><span class="ec-lmtt-10"> </span></span><a id="dx1-48034"></a> <span class="ec-lmtt-10x-x-109">\glslistdottedwidth </span></div><hr> - </p><!--l. 4985--><p class="noindent" > + </p><!--l. 5003--><p class="noindent" > governs where the description should start. This is a flat style, so child entries are formatted in the same way as the parent entries. @@ -12809,12 +12846,12 @@ class="ec-lmss-10x-x-109">listdotted</span><a <span class="ec-lmss-10x-x-109">listdotted</span><a id="dx1-48036"></a>.</dd></dl> -<!--l. 4996--><p class="noindent" > +<!--l. 5014--><p class="noindent" > </p> -<!--l. 4996--><p class="noindent" ><a +<!--l. 5014--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">15.2</span>  <a - id="sec:longstyles"></a>Longtable Styles</h3> -<!--l. 4999--><p class="noindent" >The styles described in this section are all defined in the package + id="x1-4900015.2"></a>Longtable Styles</h3> +<!--l. 5017--><p class="noindent" >The styles described in this section are all defined in the package <span class="ec-lmss-10x-x-109">glossary-long</span><a id="dx1-49001"></a>. Since they all use the <span @@ -12830,8 +12867,8 @@ class="ec-lmss-10x-x-109">nostyles</span><a id="dx1-49005"></a> package options. These styles fully justify the description and page list columns. If you want ragged right formatting instead, use the analogous styles described in <a -href="#sec:longraggedstyles">§15.3 </a><a -href="#sec:longraggedstyles">Longtable Styles (Ragged +href="#x1-5000015.3">§15.3 </a><a +href="#x1-5000015.3">Longtable Styles (Ragged Right)<!--tex4ht:ref: sec:longraggedstyles --></a>. </p><dl class="description"><dt class="description"> <span @@ -13024,12 +13061,12 @@ class="ec-lmss-10x-x-109">altlong4colheaderborder</span><a class="ec-lmss-10x-x-109">long4colheaderborder</span><a id="dx1-49049"></a> but allows multi-line descriptions and page lists.</dd></dl> -<!--l. 5092--><p class="noindent" > +<!--l. 5110--><p class="noindent" > </p> -<!--l. 5092--><p class="noindent" ><a +<!--l. 5110--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">15.3</span>  <a - id="sec:longraggedstyles"></a>Longtable Styles (Ragged Right)</h3> -<!--l. 5095--><p class="noindent" >The styles described in this section are all defined in the package + id="x1-5000015.3"></a>Longtable Styles (Ragged Right)</h3> +<!--l. 5113--><p class="noindent" >The styles described in this section are all defined in the package <span class="ec-lmss-10x-x-109">glossary-longragged</span><a id="dx1-50001"></a>. These styles are analogous to those defined in @@ -13058,7 +13095,7 @@ class="ec-lmss-10x-x-109">glossary-longragged</span><a \usepackage{glossaries}  <br />\usepackage{glossary-longragged} </div> -<!--l. 5107--><p class="nopar" > Note that you can’t set these styles using the <span +<!--l. 5125--><p class="nopar" > Note that you can’t set these styles using the <span class="ec-lmss-10x-x-109">style</span><a id="dx1-50008"></a> package option since the styles aren’t defined until after the <span @@ -13210,15 +13247,15 @@ class="ec-lmss-10x-x-109">altlongragged4colheader</span><a id="dx1-50040"></a> but has horizontal and vertical lines around it. </dd></dl> -<!--l. 5179--><p class="noindent" > +<!--l. 5197--><p class="noindent" > </p> -<!--l. 5179--><p class="noindent" ><a +<!--l. 5197--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">15.4</span>  <a - id="sec:superstyles"></a>Supertabular Styles</h3> + id="x1-5100015.4"></a>Supertabular Styles</h3> -<!--l. 5182--><p class="noindent" >The styles described in this section are all defined in the package +<!--l. 5200--><p class="noindent" >The styles described in this section are all defined in the package <span class="ec-lmss-10x-x-109">glossary-super</span><a id="dx1-51001"></a>. Since they all use the <span @@ -13244,9 +13281,9 @@ href="#fn3x17" id="fn3x17-bk"><sup class="textsuperscript">3</sup></a></span><a id="x1-51010f3"></a> These styles fully justify the description and page list columns. If you want ragged right formatting instead, use the analogous styles described in <a -href="#sec:superraggedstyles">§15.5 +href="#x1-5200015.5">§15.5 </a><a -href="#sec:superraggedstyles">Supertabular Styles (Ragged Right)<!--tex4ht:ref: sec:superraggedstyles --></a>. +href="#x1-5200015.5">Supertabular Styles (Ragged Right)<!--tex4ht:ref: sec:superraggedstyles --></a>. </p><dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">super</span> </dt><dd @@ -13442,12 +13479,12 @@ class="ec-lmss-10x-x-109">altsuper4colheaderborder</span><a class="ec-lmss-10x-x-109">super4colheaderborder</span><a id="dx1-51055"></a> but allows multi-line descriptions and page lists.</dd></dl> -<!--l. 5278--><p class="noindent" > +<!--l. 5296--><p class="noindent" > </p> -<!--l. 5278--><p class="noindent" ><a +<!--l. 5296--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">15.5</span>  <a - id="sec:superraggedstyles"></a>Supertabular Styles (Ragged Right)</h3> -<!--l. 5281--><p class="noindent" >The styles described in this section are all defined in the package + id="x1-5200015.5"></a>Supertabular Styles (Ragged Right)</h3> +<!--l. 5299--><p class="noindent" >The styles described in this section are all defined in the package <span class="ec-lmss-10x-x-109">glossary-superragged</span><a id="dx1-52001"></a>. These styles are analogous to those defined in @@ -13476,7 +13513,7 @@ class="ec-lmss-10x-x-109">glossary-superragged</span><a \usepackage{glossaries}  <br />\usepackage{glossary-superragged} </div> -<!--l. 5293--><p class="nopar" > Note that you can’t set these styles using the <span +<!--l. 5311--><p class="nopar" > Note that you can’t set these styles using the <span class="ec-lmss-10x-x-109">style</span><a id="dx1-52008"></a> package option since the styles aren’t defined until after the <span @@ -13631,12 +13668,12 @@ class="ec-lmss-10x-x-109">altsuperragged4colheader</span><a id="dx1-52041"></a> but has horizontal and vertical lines around it. </dd></dl> -<!--l. 5366--><p class="noindent" > +<!--l. 5384--><p class="noindent" > </p> -<!--l. 5366--><p class="noindent" ><a +<!--l. 5384--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">15.6</span>  <a - id="sec:treestyles"></a>Tree-Like Styles</h3> -<!--l. 5369--><p class="noindent" >The styles described in this section are all defined in the package + id="x1-5300015.6"></a>Tree-Like Styles</h3> +<!--l. 5387--><p class="noindent" >The styles described in this section are all defined in the package <span class="ec-lmss-10x-x-109">glossary-tree</span><a id="dx1-53001"></a>. These styles are designed for hierarchical glossaries but can @@ -13780,7 +13817,7 @@ class="ec-lmss-10x-x-109">tree</span><a id="dx1-53032"></a> style except that the indentation for each level is determined by the width of the text specified by - <!--l. 5429--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 5447--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glssetwidest</span><span class="ec-lmtt-10"> </span></span><a id="dx1-53033"></a> <span @@ -13793,7 +13830,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> - </p><!--l. 5431--><p class="noindent" > + </p><!--l. 5449--><p class="noindent" > The optional argument <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">level</span><span @@ -13806,7 +13843,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">level</span><span class="lmsy-10x-x-109">⟩ </span>is omitted, 0 is assumed. - </p><!--l. 5438--><p class="noindent" >For each level, the name is placed to the left of the paragraph + </p><!--l. 5456--><p class="noindent" >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. @@ -13832,15 +13869,15 @@ class="ec-lmss-10x-x-109">alttreegroup</span><a class="ec-lmss-10x-x-109">listhypergroup</span><a id="dx1-53038"></a>, described above. </dd></dl> -<!--l. 5453--><p class="noindent" > +<!--l. 5471--><p class="noindent" > </p> -<!--l. 5453--><p class="noindent" ><a +<!--l. 5471--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">15.7</span>  <a - id="sec:mcolstyles"></a>Multicols Style</h3> + id="x1-5400015.7"></a>Multicols Style</h3> -<!--l. 5456--><p class="noindent" >The <span +<!--l. 5474--><p class="noindent" >The <span class="ec-lmss-10x-x-109">glossary-mcols</span><a id="dx1-54001"></a> package provides tree-like styles that are in the <span class="ec-lmss-10x-x-109">multicols</span><a @@ -13850,8 +13887,8 @@ environment (defined by the <span class="ec-lmss-10x-x-109">multicol</span><a id="dx1-54004"></a> package). The style names are as their analogous tree styles (as defined in <a -href="#sec:treestyles">§15.6 </a><a -href="#sec:treestyles">Tree-Like Styles<!--tex4ht:ref: sec:treestyles --></a>) but are prefixed +href="#x1-5300015.6">§15.6 </a><a +href="#x1-5300015.6">Tree-Like Styles<!--tex4ht:ref: sec:treestyles --></a>) but are prefixed with “mcol”. For example, the <span class="ec-lmss-10x-x-109">mcolindex</span><a id="dx1-54005"></a> style is essentially the <span @@ -13863,7 +13900,7 @@ class="ec-lmss-10x-x-109">multicols</span><a id="dx1-54008"></a> environment. For the complete list, see <a href="#x1-540122">table 15.2</a>. -</p><!--l. 5464--><p class="indent" > <div class="important" title="Important Note"> Note that <span +</p><!--l. 5482--><p class="indent" > <div class="important" title="Important Note"> Note that <span class="ec-lmss-10x-x-109">glossary-mcols</span><a id="dx1-54009"></a> is not loaded by <span class="ec-lmss-10x-x-109">glossaries</span>. If you want to @@ -13873,14 +13910,14 @@ class="ec-lmtt-10x-x-109">\usepackage </span>and set the required glossary style <span class="ec-lmtt-10x-x-109">\glossarystyle</span><a id="dx1-54010"></a>. </div> -</p><!--l. 5469--><p class="noindent" > -</p><!--l. 5471--><p class="indent" > The default number of columns is 2, but can be changed by redefining -</p><!--l. 5472--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5487--><p class="noindent" > +</p><!--l. 5489--><p class="indent" > The default number of columns is 2, but can be changed by redefining +</p><!--l. 5490--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsmcols</span><span class="ec-lmtt-10"> </span></span><a id="dx1-54011"></a> <span class="ec-lmtt-10x-x-109">\glsmcols </span></div><hr> -</p><!--l. 5474--><p class="noindent" > +</p><!--l. 5492--><p class="noindent" > to the required number. For example, for a three column glossary: @@ -13891,11 +13928,11 @@ to the required number. For example, for a three column glossary:  <br />\renewcommand*{\glsmcols}{3}  <br />\glossarystyle{mcolindex} </div> -<!--l. 5480--><p class="nopar" > +<!--l. 5498--><p class="nopar" > -</p><!--l. 5482--><p class="indent" > <a +</p><!--l. 5500--><p class="indent" > <a id="x1-540122"></a></p><hr class="float" /><div class="float" > @@ -14014,10 +14051,10 @@ class="ec-lmss-10x-x-109">alttreehypergroup</span><a </div><hr class="endfloat" /> -<!--l. 5506--><p class="noindent" ><a +<!--l. 5524--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">15.8</span>  <a - id="sec:inline"></a>In-Line Style</h3> -<!--l. 5509--><p class="noindent" >This section covers the <span + id="x1-5500015.8"></a>In-Line Style</h3> +<!--l. 5527--><p class="noindent" >This section covers the <span class="ec-lmss-10x-x-109">glossary-inline</span><a id="dx1-55001"></a> package that supplies the <span class="ec-lmss-10x-x-109">inline</span><a @@ -14028,7 +14065,7 @@ styles, such as lists or tables). This style doesn’t display the <a href="#glo:numberlist">number list<a id="dx1-55004"></a></a>. -</p><!--l. 5514--><p class="indent" > You will most likely need to redefine <span +</p><!--l. 5532--><p class="indent" > You will most likely need to redefine <span class="ec-lmtt-10x-x-109">\glossarysection</span><a id="dx1-55005"></a> with this style. For example, suppose you are required to have your glossaries and list of @@ -14042,8 +14079,8 @@ acronyms in a footnote, you can do:  <br /> \renewcommand*{\glossarysection}[2][]{\textbf{#1}: }  <br /> \glossarystyle{inline} </div> -<!--l. 5522--><p class="nopar" > -</p><!--l. 5524--><p class="indent" > <div class="important" title="Important Note"> Note that you need to include <span +<!--l. 5540--><p class="nopar" > +</p><!--l. 5542--><p class="indent" > <div class="important" title="Important Note"> Note that you need to include <span class="ec-lmss-10x-x-109">glossary-inline</span><a id="dx1-55006"></a> with <span class="ec-lmtt-10x-x-109">\usepackage </span>as it’s @@ -14052,8 +14089,8 @@ class="ec-lmss-10x-x-109">glossaries </span>package and then set the style using <span class="ec-lmtt-10x-x-109">\glossarystyle</span><a id="dx1-55007"></a>. </div> -</p><!--l. 5529--><p class="noindent" > -</p><!--l. 5531--><p class="indent" > Where you need to include your glossaries as a footnote you can +</p><!--l. 5547--><p class="noindent" > +</p><!--l. 5549--><p class="indent" > Where you need to include your glossaries as a footnote you can do: @@ -14062,58 +14099,58 @@ do: <div class="verbatim" id="verbatim-139"> \footnote{\printglossaries} </div> -<!--l. 5534--><p class="nopar" > -</p><!--l. 5536--><p class="indent" > The <span +<!--l. 5552--><p class="nopar" > +</p><!--l. 5554--><p class="indent" > The <span class="ec-lmss-10x-x-109">inline</span><a id="dx1-55008"></a> style is governed by the following: -</p><!--l. 5537--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5555--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsinlineseparator</span><span class="ec-lmtt-10"> </span></span><a id="dx1-55009"></a> <span class="ec-lmtt-10x-x-109">\glsinlineseparator</span><a id="dx1-55010"></a> </div><hr> -</p><!--l. 5539--><p class="noindent" > +</p><!--l. 5557--><p class="noindent" > This defaults to “<span class="ec-lmtt-10x-x-109">; </span>” and is used between main (i.e. level 0) entries. -</p><!--l. 5542--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5560--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsinlinesubseparator</span><span class="ec-lmtt-10"> </span></span><a id="dx1-55011"></a> <span class="ec-lmtt-10x-x-109">\glsinlinesubseparator</span><a id="dx1-55012"></a> </div><hr> -</p><!--l. 5544--><p class="noindent" > +</p><!--l. 5562--><p class="noindent" > This defaults to “<span class="ec-lmtt-10x-x-109">, </span>” and is used between sub-entries. -</p><!--l. 5547--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5565--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsinlineparentchildseparator</span><span class="ec-lmtt-10"> </span></span><a id="dx1-55013"></a> <span class="ec-lmtt-10x-x-109">\glsinlineparentchildseparator</span><a id="dx1-55014"></a> </div><hr> -</p><!--l. 5549--><p class="noindent" > +</p><!--l. 5567--><p class="noindent" > This defaults to “<span class="ec-lmtt-10x-x-109">: </span>” and is used between a parent main entry and its first sub-entry. -</p><!--l. 5552--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5570--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glspostinline</span><span class="ec-lmtt-10"> </span></span><a id="dx1-55015"></a> <span class="ec-lmtt-10x-x-109">\glspostinline</span><a id="dx1-55016"></a> </div><hr> -</p><!--l. 5554--><p class="noindent" > +</p><!--l. 5572--><p class="noindent" > This defaults to “<span class="ec-lmtt-10x-x-109">; </span>” and is used at the end of the glossary. </p> -<!--l. 5558--><p class="noindent" ><a +<!--l. 5576--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">16</span>  <a - id="sec:newglossarystyle"></a>Defining your own glossary style</h2> + id="x1-5600016"></a>Defining your own glossary style</h2> If the predefined styles don’t fit your requirements, you can define your own style using: -<!--l. 5563--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 5581--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\newglossarystyle</span><span class="ec-lmtt-10"> </span></span><a id="dx1-56001"></a> <span @@ -14127,7 +14164,7 @@ class="ec-lmri-10x-x-109">definitions</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 5565--><p class="noindent" > +</p><!--l. 5583--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span @@ -14138,7 +14175,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">definitions</span><span class="lmsy-10x-x-109">⟩ </span>needs to redefine all of the following: -</p><!--l. 5570--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5588--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">theglossary</span><span class="ec-lmtt-10"> </span></span><a id="dx1-56002"></a><a @@ -14146,7 +14183,7 @@ class="ec-lmtt-10"> </span></span><a class="ec-lmss-10x-x-109">theglossary</span><a id="dx1-56004"></a><a id="dx1-56005"></a> </div><hr> -</p><!--l. 5572--><p class="noindent" > +</p><!--l. 5590--><p class="noindent" > 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 <span @@ -14168,12 +14205,12 @@ to begin and end the <span class="ec-lmss-10x-x-109">description</span><a id="dx1-56013"></a><a id="dx1-56014"></a> environment. -</p><!--l. 5581--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5599--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glossaryheader</span><span class="ec-lmtt-10"> </span></span><a id="dx1-56015"></a> <span class="ec-lmtt-10x-x-109">\glossaryheader </span></div><hr> -</p><!--l. 5583--><p class="noindent" > +</p><!--l. 5601--><p class="noindent" > This macro indicates what to do at the start of the main body of the glossary. Note that this is not the same as <span class="ec-lmtt-10x-x-109">\glossarypreamble</span><a @@ -14189,7 +14226,7 @@ class="ec-lmss-10x-x-109">longheader</span><a id="dx1-56019"></a> glossary style redefines <span class="ec-lmtt-10x-x-109">\glossaryheader </span>to do a header row. -</p><!--l. 5591--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5609--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsgroupheading</span><span class="ec-lmtt-10"> </span></span><a id="dx1-56020"></a> <span @@ -14198,7 +14235,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 5593--><p class="noindent" > +</p><!--l. 5611--><p class="noindent" > This macro indicates what to do at the start of each logical block within the main body of the glossary. If you use <a id="dx1-56021"></a><a @@ -14220,11 +14257,11 @@ href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-56027"></a></a>, the sub-divisions depend on the language settings. -</p><!--l. 5604--><p class="indent" > Note that the argument to <span +</p><!--l. 5622--><p class="indent" > Note that the argument to <span class="ec-lmtt-10x-x-109">\glsgroupheading </span>is a label <span class="ec-lmri-10x-x-109">not </span>the group title. The group title can be obtained via -</p><!--l. 5607--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5625--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsgetgrouptitle</span><span class="ec-lmtt-10"> </span></span><a id="dx1-56028"></a> <span @@ -14233,7 +14270,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 5609--><p class="noindent" > +</p><!--l. 5627--><p class="noindent" > This obtains the title as follows: if <span class="ec-lmtt-10x-x-109">\</span><span class="lmsy-10x-x-109">⟨</span><span @@ -14244,8 +14281,8 @@ to be the title, otherwise the title is just <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>. -</p><!--l. 5614--><p class="indent" > A navigation hypertarget can be created using -</p><!--l. 5615--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5632--><p class="indent" > A navigation hypertarget can be created using +</p><!--l. 5633--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsnavhypertarget</span><span class="ec-lmtt-10"> </span></span><a id="dx1-56029"></a> <span @@ -14261,12 +14298,12 @@ class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 5617--><p class="noindent" > +</p><!--l. 5635--><p class="noindent" > For further details about <span class="ec-lmtt-10x-x-109">\glsnavhypertarget</span>, see the documented code (<span class="ec-lmtt-10x-x-109">glossaries.pdf</span>). -</p><!--l. 5622--><p class="indent" > Most of the predefined glossary styles redefine <span +</p><!--l. 5640--><p class="indent" > Most of the predefined glossary styles redefine <span class="ec-lmtt-10x-x-109">\glsgroupheading</span> to simply ignore its argument. The <span class="ec-lmss-10x-x-109">listhypergroup</span><a @@ -14281,19 +14318,19 @@ class="ec-lmtt-10x-x-109">\glsgroupheading </span>as follows: \renewcommand*{\glsgroupheading}[1]{%  <br />\item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]} </div> -<!--l. 5628--><p class="nopar" > See also <span +<!--l. 5646--><p class="nopar" > See also <span class="ec-lmtt-10x-x-109">\glsgroupskip </span>below. (Note that command definitions within <span class="ec-lmtt-10x-x-109">\newglossarystyle</span><a id="dx1-56031"></a> must use <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">##1</span></span></span> instead of <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">#1</span></span></span> etc.) -</p><!--l. 5632--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5650--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsgroupskip</span><span class="ec-lmtt-10"> </span></span><a id="dx1-56032"></a> <span class="ec-lmtt-10x-x-109">\glsgroupskip </span></div><hr> -</p><!--l. 5634--><p class="noindent" > +</p><!--l. 5652--><p class="noindent" > This macro determines what to do after one logical group but before the header for the next logical group. The <span class="ec-lmss-10x-x-109">list</span><a @@ -14304,10 +14341,14 @@ class="ec-lmtt-10x-x-109">\indexspace</span><a id="dx1-56034"></a>, whereas the tabular-like styles redefine <span class="ec-lmtt-10x-x-109">\glsgroupskip </span>to produce a blank row. -</p><!--l. 5641--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5659--><p class="indent" > As from version 3.03, the package option <span +class="ec-lmss-10x-x-109">nogroupskip</span><a + id="dx1-56035"></a> can be used to +suppress this default gap for the predefined styles. +</p><!--l. 5662--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glossaryentryfield</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56035"></a> <span + id="dx1-56036"></a> <span class="ec-lmtt-10x-x-109">\glossaryentryfield{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -14331,14 +14372,14 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">number list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 5644--><p class="noindent" > +</p><!--l. 5665--><p class="noindent" > This macro indicates what to do for a given glossary entry. Note that <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">formatted name</span><span class="lmsy-10x-x-109">⟩ </span>will always be in the form <span class="ec-lmtt-10x-x-109">\glsnamefont</span><a - id="dx1-56036"></a><span + id="dx1-56037"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span @@ -14351,46 +14392,46 @@ class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩ </span>is the label used when the glossary entry was defined via either <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-56037"></a> or + id="dx1-56038"></a> or <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-56038"></a>. -</p><!--l. 5652--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="dx1-56039"></a>. +</p><!--l. 5673--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryitem</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56039"></a> <span + id="dx1-56040"></a> <span class="ec-lmtt-10x-x-109">\glsentryitem{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 5654--><p class="noindent" > +</p><!--l. 5675--><p class="noindent" > This macro will increment and display the associated counter for the main (level 0) entries if the <span class="ec-lmss-10x-x-109">entrycounter</span><a - id="dx1-56040"></a> or <span + id="dx1-56041"></a> or <span class="ec-lmss-10x-x-109">counterwithin</span><a - id="dx1-56041"></a> package options have + id="dx1-56042"></a> package options have been used. This macro is typically called by <span class="ec-lmtt-10x-x-109">\glossaryentryfield</span> before <span class="ec-lmtt-10x-x-109">\glstarget</span>. The format of the counter is controlled by the macro -</p><!--l. 5660--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5681--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrycounterlabel</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56042"></a> <span + id="dx1-56043"></a> <span class="ec-lmtt-10x-x-109">\glsentrycounterlabel </span></div><hr> -</p><!--l. 5662--><p class="noindent" > -</p><!--l. 5664--><p class="indent" > Each time you use a glossary entry it creates a hyperlink (if hyperlinks +</p><!--l. 5683--><p class="noindent" > +</p><!--l. 5685--><p class="indent" > Each time you use a glossary entry it creates a hyperlink (if hyperlinks are enabled) to the relevant line in the glossary. Your new glossary style must therefore redefine <span class="ec-lmtt-10x-x-109">\glossaryentryfield </span>to set the appropriate target. This is done using -</p><!--l. 5669--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5690--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glstarget</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56043"></a> <span + id="dx1-56044"></a> <span class="ec-lmtt-10x-x-109">\glstarget{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -14400,20 +14441,23 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 5671--><p class="noindent" > +</p><!--l. 5692--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩ </span>is the entry’s label. Note that you don’t need to worry about whether the <span class="ec-lmss-10x-x-109">hyperref</span><a - id="dx1-56044"></a> package has been loaded, as <span + id="dx1-56045"></a> package has been loaded, as <span class="ec-lmtt-10x-x-109">\glstarget </span>won’t create + + + a target if <span class="ec-lmtt-10x-x-109">\hypertarget </span>hasn’t been defined. -</p><!--l. 5677--><p class="indent" > For example, the <span +</p><!--l. 5698--><p class="indent" > For example, the <span class="ec-lmss-10x-x-109">list</span><a - id="dx1-56045"></a> style defines <span + id="dx1-56046"></a> style defines <span class="ec-lmtt-10x-x-109">\glossaryentryfield </span>as follows: @@ -14424,19 +14468,19 @@ class="ec-lmtt-10x-x-109">\glossaryentryfield </span>as follows:  <br />\item[\glsentryitem{##1}\glstarget{##1}{##2}]  <br />  ##3\glspostdescription \space ##5} </div> -<!--l. 5683--><p class="nopar" > -</p><!--l. 5685--><p class="indent" > Note also that <span +<!--l. 5704--><p class="nopar" > +</p><!--l. 5706--><p class="indent" > Note also that <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">number list</span><span class="lmsy-10x-x-109">⟩ </span>will always be of the form<br class="newline" /> -</p><!--l. 5687--><p class="indent" > <hr><div title="Definition"><span +</p><!--l. 5708--><p class="indent" > <hr><div title="Definition"><span class="ec-lmtt-10x-x-109">\glossaryentrynumbers</span><a - id="dx1-56046"></a><span + id="dx1-56047"></a><span class="ec-lmtt-10x-x-109">{\relax</span><br class="newline" /><span class="ec-lmtt-10x-x-109">\setentrycounter</span><a - id="dx1-56047"></a><span + id="dx1-56048"></a><span class="ec-lmtt-10x-x-109">[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">Hprefix</span><span @@ -14455,19 +14499,19 @@ class="ec-lmri-10x-x-109">number(s)</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}}</span> </div><hr> -</p><!--l. 5689--><p class="noindent" > +</p><!--l. 5710--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">number(s)</span><span class="lmsy-10x-x-109">⟩ </span>may contain <span class="ec-lmtt-10x-x-109">\delimN</span><a - id="dx1-56048"></a> (to delimit individual numbers) and/or + id="dx1-56049"></a> (to delimit individual numbers) and/or <span class="ec-lmtt-10x-x-109">\delimR</span><a - id="dx1-56049"></a> (to indicate a range of numbers). There may be multiple occurrences + id="dx1-56050"></a> (to indicate a range of numbers). There may be multiple occurrences of <span class="ec-lmtt-10x-x-109">\setentrycounter</span><a - id="dx1-56050"></a><span + id="dx1-56051"></a><span class="ec-lmtt-10x-x-109">[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">Hprefix</span><span @@ -14488,26 +14532,26 @@ class="ec-lmtt-10x-x-109">}</span>, but note that the entire number list is enclosed within the argument of <span class="ec-lmtt-10x-x-109">\glossaryentrynumbers</span><a - id="dx1-56051"></a>. The user can redefine this to change the way the + id="dx1-56052"></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 <span class="ec-lmtt-10x-x-109">\glossaryentrynumbers</span><a - id="dx1-56052"></a> is to provide a means of + id="dx1-56053"></a> is to provide a means of suppressing the number list altogether. (In fact, the <span class="ec-lmss-10x-x-109">nonumberlist</span><a - id="dx1-56053"></a> + id="dx1-56054"></a> option redefines <span class="ec-lmtt-10x-x-109">\glossaryentrynumbers</span><a - id="dx1-56054"></a> to ignore its argument.) + id="dx1-56055"></a> 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 <span class="ec-lmss-10x-x-109">nonumberlist</span><a - id="dx1-56055"></a> package + id="dx1-56056"></a> package option. -</p><!--l. 5706--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5727--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glossarysubentryfield</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56056"></a> <span + id="dx1-56057"></a> <span class="ec-lmtt-10x-x-109">\glossarysubentryfield{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">level</span><span @@ -14535,7 +14579,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">number list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 5709--><p class="noindent" > +</p><!--l. 5730--><p class="noindent" > This is new to version 1.17, and is used to display sub-entries. The first argument, <span class="lmsy-10x-x-109">⟨</span><span @@ -14544,58 +14588,58 @@ class="lmsy-10x-x-109">⟩</span>, indicates the sub-entry level. This must from 1 (first sub-level) onwards. The remaining arguments are analogous to those for <span class="ec-lmtt-10x-x-109">\glossaryentryfield</span><a - id="dx1-56057"></a> described above. -</p><!--l. 5716--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="dx1-56058"></a> described above. +</p><!--l. 5737--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glssubentryitem</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56058"></a> <span + id="dx1-56059"></a> <span class="ec-lmtt-10x-x-109">\glssubentryitem{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 5718--><p class="noindent" > +</p><!--l. 5739--><p class="noindent" > This macro will increment and display the associated counter for the level 1 entries if the <span class="ec-lmss-10x-x-109">subentrycounter</span><a - id="dx1-56059"></a> package options have been + id="dx1-56060"></a> package options have been used. This macro is typically called by <span class="ec-lmtt-10x-x-109">\glossarysubentryfield</span> before <span class="ec-lmtt-10x-x-109">\glstarget</span><a - id="dx1-56060"></a>. The format of the counter is controlled by the + id="dx1-56061"></a>. The format of the counter is controlled by the macro -</p><!--l. 5724--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5745--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glssubentrycounterlabel</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56061"></a> <span + id="dx1-56062"></a> <span class="ec-lmtt-10x-x-109">\glssubentrycounterlabel </span></div><hr> -</p><!--l. 5726--><p class="noindent" > +</p><!--l. 5747--><p class="noindent" > -</p><!--l. 5728--><p class="indent" > Note that <span +</p><!--l. 5749--><p class="indent" > Note that <span class="ec-lmtt-10x-x-109">\printglossary</span><a - id="dx1-56062"></a> (which <span + id="dx1-56063"></a> (which <span class="ec-lmtt-10x-x-109">\printglossaries</span><a - id="dx1-56063"></a> calls) sets -</p><!--l. 5730--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="dx1-56064"></a> calls) sets +</p><!--l. 5751--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\currentglossary</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56064"></a> <span + id="dx1-56065"></a> <span class="ec-lmtt-10x-x-109">\currentglossary </span></div><hr> -</p><!--l. 5732--><p class="noindent" > +</p><!--l. 5753--><p class="noindent" > to the current glossary label, so it’s possible to create a glossary style that varies according to the glossary type. -</p><!--l. 5736--><p class="indent" > For further details of these commands, see “Displaying the glossary” in +</p><!--l. 5757--><p class="indent" > For further details of these commands, see “Displaying the glossary” in the documented code (<span class="ec-lmtt-10x-x-109">glossaries.pdf</span>). </p> <h3 class="sectionHead"><span class="titlemark">16.1</span>  <a - id="sec:exnewstyle"></a>Example: creating a completely new style</h3> -<!--l. 5743--><p class="noindent" >If you want a completely new style, you will need to redefine all of the + id="x1-5700016.1"></a>Example: creating a completely new style</h3> +<!--l. 5764--><p class="noindent" >If you want a completely new style, you will need to redefine all of the commands and the environment listed above. -</p><!--l. 5746--><p class="indent" > For example, suppose you want each entry to start with a bullet point. +</p><!--l. 5767--><p class="indent" > For example, suppose you want each entry to start with a bullet point. This means that the glossary should be placed in the <span class="ec-lmss-10x-x-109">itemize</span><a id="dx1-57001"></a><a @@ -14650,7 +14694,7 @@ class="ec-lmtt-10x-x-109">mylist</span>, as follows:  <br />   \glossaryentryfield{##2}{##3}{##4}{##5}{##6}}%  <br /> } </div> -<!--l. 5780--><p class="nopar" > Note that this style creates a flat glossary, where sub-entries are +<!--l. 5801--><p class="nopar" > Note that this style creates a flat glossary, where sub-entries are displayed in exactly the same way as the top level entries. It also hasn’t used <span class="ec-lmtt-10x-x-109">\glsentryitem</span><a @@ -14665,13 +14709,13 @@ class="ec-lmss-10x-x-109">counterwithin</span><a class="ec-lmss-10x-x-109">subentrycounter</span><a id="dx1-57014"></a> package options. -</p><!--l. 5788--><p class="noindent" > +</p><!--l. 5809--><p class="noindent" > </p> -<!--l. 5788--><p class="noindent" ><a +<!--l. 5809--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">16.2</span>  <a - id="sec:exadaptstyle"></a>Example: creating a new glossary style based on an existing + id="x1-5800016.2"></a>Example: creating a new glossary style based on an existing style</h3> -<!--l. 5791--><p class="noindent" >If you want to define a new style that is a slightly modified version of an +<!--l. 5812--><p class="noindent" >If you want to define a new style that is a slightly modified version of an existing style, you can use <span class="ec-lmtt-10x-x-109">\glossarystyle</span><a id="dx1-58001"></a> within the second argument of @@ -14698,16 +14742,16 @@ follows:  <br />                              % between groups  <br />} </div> -<!--l. 5805--><p class="nopar" > -</p><!--l. 5809--><p class="noindent" > +<!--l. 5826--><p class="nopar" > +</p><!--l. 5830--><p class="noindent" > </p> -<!--l. 5809--><p class="noindent" ><a +<!--l. 5830--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">16.3</span>  <a - id="sec:exuserstyle"></a>Example: creating a glossary style that uses the <span + id="x1-5900016.3"></a>Example: creating a glossary style that uses the <span class="ec-lmss-10x-x-109">user1</span>, …, <span class="ec-lmss-10x-x-109">user6</span> keys</h3> -<!--l. 5812--><p class="noindent" >Since <span +<!--l. 5833--><p class="noindent" >Since <span class="ec-lmtt-10x-x-109">\glossaryentryfield</span><a id="dx1-59001"></a> and <span class="ec-lmtt-10x-x-109">\glossarysubentryfield</span><a @@ -14769,17 +14813,17 @@ class="ec-lmss-10x-x-109">longtable</span><a  <br /> \renewcommand*{\glsgroupskip}{}%  <br />} </div> -<!--l. 5857--><p class="nopar" > +<!--l. 5878--><p class="nopar" > </p> -<!--l. 5859--><p class="noindent" ><a +<!--l. 5880--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">17</span>  <a - id="sec:utilities"></a>Utilities</h2> + id="x1-6000017"></a>Utilities</h2> This section describes some utility commands. Additional commands can be found in the documented code (glossaries.pdf). -<!--l. 5865--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 5886--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\forallglossaries</span><span class="ec-lmtt-10"> </span></span><a id="dx1-60001"></a> <span @@ -14797,7 +14841,7 @@ class="ec-lmri-10x-x-109">body</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 5867--><p class="noindent" > +</p><!--l. 5888--><p class="noindent" > This iterates through <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary list</span><span @@ -14815,7 +14859,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary list</span><span class="lmsy-10x-x-109">⟩ </span>is omitted, the default is to iterate over all glossaries. -</p><!--l. 5875--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5896--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\forglsentries</span><span class="ec-lmtt-10"> </span></span><a id="dx1-60002"></a> <span @@ -14833,7 +14877,7 @@ class="ec-lmri-10x-x-109">body</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 5877--><p class="noindent" > +</p><!--l. 5898--><p class="noindent" > This iterates through all entries in the glossary given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary label</span><span @@ -14854,7 +14898,7 @@ class="lmsy-10x-x-109">⟩ </span>is omitted, <span class="ec-lmtt-10x-x-109">\glsdefaulttype</span><a id="dx1-60003"></a> (usually the main glossary) is used. -</p><!--l. 5884--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5905--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\forallglsentries</span><span class="ec-lmtt-10"> </span></span><a id="dx1-60004"></a> <span @@ -14872,7 +14916,7 @@ class="ec-lmri-10x-x-109">body</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 5886--><p class="noindent" > +</p><!--l. 5907--><p class="noindent" > This is like <span class="ec-lmtt-10x-x-109">\forglsentries </span>but for each glossary in <span class="lmsy-10x-x-109">⟨</span><span @@ -14900,7 +14944,7 @@ class="ec-lmtt-10x-x-109">} </span>within class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">body</span><span class="lmsy-10x-x-109">⟩</span>.) -</p><!--l. 5894--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5915--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ifglossaryexists</span><span class="ec-lmtt-10"> </span></span><a id="dx1-60005"></a> <span @@ -14913,7 +14957,7 @@ class="lmsy-10x-x-109">⟩⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span> </div><hr> -</p><!--l. 5897--><p class="noindent" > +</p><!--l. 5918--><p class="noindent" > This checks if the glossary given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -14925,7 +14969,7 @@ performed, otherwise <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span>. -</p><!--l. 5901--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5922--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ifglsentryexists</span><span class="ec-lmtt-10"> </span></span><a id="dx1-60006"></a> <span @@ -14938,7 +14982,7 @@ class="lmsy-10x-x-109">⟩⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span> </div><hr> -</p><!--l. 5904--><p class="noindent" > +</p><!--l. 5925--><p class="noindent" > This checks if the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -14951,7 +14995,7 @@ class="lmsy-10x-x-109">⟩ </span>is performed, otherwise <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span>. -</p><!--l. 5908--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5929--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ifglsused</span><span class="ec-lmtt-10"> </span></span><a id="dx1-60007"></a> <span @@ -14964,14 +15008,14 @@ class="lmsy-10x-x-109">⟩⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span> </div><hr> -</p><!--l. 5911--><p class="noindent" > +</p><!--l. 5932--><p class="noindent" > See <a -href="#sec:glsunset">§14 </a><a -href="#sec:glsunset">Unsetting and Resetting Entry Flags<!--tex4ht:ref: sec:glsunset --></a>. +href="#x1-4600014">§14 </a><a +href="#x1-4600014">Unsetting and Resetting Entry Flags<!--tex4ht:ref: sec:glsunset --></a>. -</p><!--l. 5914--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5935--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ifglshaschildren</span><span class="ec-lmtt-10"> </span></span><a id="dx1-60008"></a> <span @@ -14984,7 +15028,7 @@ class="lmsy-10x-x-109">⟩⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span> </div><hr> -</p><!--l. 5917--><p class="noindent" > +</p><!--l. 5938--><p class="noindent" > This checks if the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -14996,7 +15040,7 @@ class="lmsy-10x-x-109">⟩ </span>is performed, otherwise <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span>. -</p><!--l. 5922--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5943--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ifglshasparent</span><span class="ec-lmtt-10"> </span></span><a id="dx1-60009"></a> <span @@ -15009,7 +15053,7 @@ class="lmsy-10x-x-109">⟩⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span> </div><hr> -</p><!--l. 5925--><p class="noindent" > +</p><!--l. 5946--><p class="noindent" > This checks if the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -15026,8 +15070,8 @@ class="lmsy-10x-x-109">⟩</span>. </p> <h2 class="chapterHead"><span class="titlemark">18</span>  <a - id="sec:accsupp"></a>Accessibility Support</h2> -<!--l. 5931--><p class="noindent" >Limited accessibility support is provided by the accompanying + id="x1-6100018"></a>Accessibility Support</h2> +<!--l. 5952--><p class="noindent" >Limited accessibility support is provided by the accompanying <span class="ec-lmss-10x-x-109">glossaries-accsupp</span><a id="dx1-61001"></a> package, but note that this package is experimental and @@ -15147,7 +15191,7 @@ class="ec-lmss-10x-x-109">shortplural</span><a class="ec-lmtt-10x-x-109">\newacronym</span><a id="dx1-61032"></a>). </dd></dl> -<!--l. 5978--><p class="noindent" >For example: +<!--l. 5999--><p class="noindent" >For example: @@ -15156,7 +15200,7 @@ class="ec-lmtt-10x-x-109">\newacronym</span><a \newglossaryentry{tex}{name={\TeX},description={Document  <br />preparation language},access={TeX}} </div> -<!--l. 5982--><p class="nopar" > Now <span class="obeylines-h"><span class="verb"><span +<!--l. 6003--><p class="nopar" > Now <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls{tex}</span></span></span> will be equivalent to @@ -15165,13 +15209,13 @@ class="ec-lmtt-10x-x-109">\gls{tex}</span></span></span> will be equivalent to <div class="verbatim" id="verbatim-146"> \BeginAccSupp{ActualText=TeX}\TeX\EndAccSupp{} </div> -<!--l. 5986--><p class="nopar" > The sample file <a -href="#sec:samples"><span +<!--l. 6007--><p class="nopar" > The sample file <a +href="#x1-40001.1"><span class="ec-lmtt-10x-x-109">sampleaccsupp.tex</span></a> illustrates the <span class="ec-lmss-10x-x-109">glossaries-accsupp</span><a id="dx1-61033"></a> package. -</p><!--l. 5990--><p class="indent" > See the documented code (<span +</p><!--l. 6011--><p class="indent" > See the documented code (<span class="ec-lmtt-10x-x-109">glossaries.pdf</span>) for further details. It is recommended that you also read the <span class="ec-lmss-10x-x-109">accsupp</span><a @@ -15181,8 +15225,8 @@ class="ec-lmss-10x-x-109">accsupp</span><a </p> <h2 class="chapterHead"><span class="titlemark">19</span>  <a - id="sec:trouble"></a>Troubleshooting</h2> -<!--l. 5997--><p class="noindent" >The <span + id="x1-6200019"></a>Troubleshooting</h2> +<!--l. 6018--><p class="noindent" >The <span class="ec-lmss-10x-x-109">glossaries </span>package comes with a minimal file called <span class="ec-lmtt-10x-x-109">minimalgls.tex </span>which can be used for testing. This should be located in the <span @@ -15199,12 +15243,24 @@ class="E">E</span>X</span></span> code is available at <a href="http://theoval.cmp.uea.ac.uk/~nlct/latex/minexample/" class="url" ><span class="ec-lmtt-10x-x-109">http://theoval.cmp.uea.ac.uk/~nlct/latex/minexample/</span></a>. -</p><!--l. 6007--><p class="indent" > Below is a list of the most frequently asked questions. +</p><!--l. 6028--><p class="indent" > Below is a list of the most frequently asked questions. For other queries, consult the <span class="ec-lmss-10x-x-109">glossaries </span>FAQ at <a href="http://theoval.cmp.uea.ac.uk/~nlct/latex/packages/faq/glossariesfaq.html" class="url" ><span class="ec-lmtt-10x-x-109">http://theoval.cmp.uea.ac.uk/~nlct/latex/packages/faq/glossariesfaq.html</span></a>. +Bug reports can be submitted at <a +href="http://www.dickimaw-books.com/bug-report.html" class="url" ><span +class="ec-lmtt-10x-x-109">http://www.dickimaw-books.com/bug-report.html</span></a>. +For general queries, you are more likely to get a faster response if +you post them to somewhere like the comp.text.tex newsgroup, the +<span class="LATEX">L<span class="A">A</span><span class="TEX">T<span +class="E">E</span>X</span></span> Community Forum (<a +href="http://www.latex-community.org/" class="url" ><span +class="ec-lmtt-10x-x-109">http://www.latex-community.org/</span></a>) or +Stack Exchange (<a +href="http://tex.stackexchange.com/" class="url" ><span +class="ec-lmtt-10x-x-109">http://tex.stackexchange.com/</span></a>). </p><ol class="enumerate1" > <li class="enumerate" id="x1-62002x1"><span @@ -15215,8 +15271,8 @@ class="ec-lmbx-10x-x-109">Q. </span>I get the error message: <div class="verbatim" id="verbatim-147"> Missing \begin{document} </div> - <!--l. 6015--><p class="nopar" > - </p><!--l. 6017--><p class="noindent" ><span + <!--l. 6042--><p class="nopar" > + </p><!--l. 6044--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>Check you are using an up to date version of the <span class="ec-lmss-10x-x-109">xkeyval</span><a id="dx1-62003"></a> @@ -15236,8 +15292,8 @@ class="ec-lmtt-10x-x-109">xindy</span><a ERROR: CHAR: index 0 should be less than the length of  <br />the string </div> - <!--l. 6025--><p class="nopar" > - </p><!--l. 6027--><p class="noindent" ><span + <!--l. 6052--><p class="nopar" > + </p><!--l. 6054--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A.</span> <a id="dx1-62008"></a><a href="#glo:xindy"><span @@ -15266,7 +15322,7 @@ class="ec-lmtt-10x-x-109">xindy</span><a \newglossaryentry{alpha}{name={\ensuremath{\alpha}},  <br />  description=alpha} </div> - <!--l. 6036--><p class="nopar" > Either use a different sort key for the entry, for example: + <!--l. 6063--><p class="nopar" > Either use a different sort key for the entry, for example: @@ -15276,14 +15332,14 @@ class="ec-lmtt-10x-x-109">xindy</span><a  <br />  name={\ensuremath{\alpha}},  <br />  description=alpha} </div> - <!--l. 6042--><p class="nopar" > or, if all entries are like this, you may prefer to use the <span + <!--l. 6069--><p class="nopar" > or, if all entries are like this, you may prefer to use the <span class="ec-lmss-10x-x-109">sort=use</span><a id="dx1-62016"></a> or <span class="ec-lmss-10x-x-109">sort=def</span><a id="dx1-62017"></a> package options. See <a -href="#sec:pkgopts-sort">§2.4 </a><a -href="#sec:pkgopts-sort">Sorting Options<!--tex4ht:ref: sec:pkgopts-sort --></a> for further details +href="#x1-160002.4">§2.4 </a><a +href="#x1-160002.4">Sorting Options<!--tex4ht:ref: sec:pkgopts-sort --></a> for further details of the <span class="ec-lmss-10x-x-109">sort</span><a id="dx1-62018"></a> option. @@ -15294,7 +15350,7 @@ class="ec-lmbx-10x-x-109">Q. </span>I’ve used the <span class="ec-lmss-10x-x-109">smallcaps</span><a id="dx1-62021"></a> option, but the acronyms are displayed in normal sized upper case letters. - <!--l. 6051--><p class="noindent" ><span + <!--l. 6078--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>The <span class="ec-lmss-10x-x-109">smallcaps</span><a id="dx1-62022"></a> package option uses <span @@ -15308,7 +15364,7 @@ class="ec-lmtt-10x-x-109">\textsc</span><a <li class="enumerate" id="x1-62025x4"><span class="ec-lmbx-10x-x-109">Q. </span>My acronyms won’t break across a line when they’re expanded. - <!--l. 6059--><p class="noindent" ><span + <!--l. 6086--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>PDF<span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> can break hyperlinks across a line, but <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> can’t. @@ -15324,7 +15380,7 @@ class="ec-lmss-10x-x-109">hyperfirst=false</span><a class="enumerate" id="x1-62029x5"><span class="ec-lmbx-10x-x-109">Q. </span>How do I change the font that the acronyms are displayed in? - <!--l. 6065--><p class="noindent" ><span + <!--l. 6092--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>The easiest way to do this is to specify the <span class="ec-lmss-10x-x-109">smaller</span><a id="dx1-62030"></a> package option @@ -15341,7 +15397,7 @@ class="ec-lmtt-10x-x-109">\acronymfont</span><a \usepackage[smaller]{glossaries}  <br />\renewcommand*{\acronymfont}[1]{\textsf{#1}} </div> - <!--l. 6072--><p class="nopar" > + <!--l. 6099--><p class="nopar" > </p></li> <li class="enumerate" id="x1-62033x6"><span @@ -15349,7 +15405,7 @@ class="ec-lmbx-10x-x-109">Q. </span>How do I change the font that the acronyms a <a id="dx1-62034"></a><a href="#glo:firstuse">first use</a>? - <!--l. 6077--><p class="noindent" ><span + <!--l. 6104--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>The easiest way to do this is to specify the <span class="ec-lmss-10x-x-109">smaller</span><a id="dx1-62035"></a> package option @@ -15376,7 +15432,7 @@ href="#glo:firstuse">first  <br />\renewcommand*{\firstacronymfont}[1]{\emph{#1}}  <br />\renewcommand*{\acronymfont}[1]{#1} </div> - <!--l. 6087--><p class="nopar" > + <!--l. 6114--><p class="nopar" > </p></li> <li class="enumerate" id="x1-62041x7"><span @@ -15385,7 +15441,7 @@ class="ec-lmbx-10x-x-109">Q. </span>I don’t have Perl installed, do I have href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a id="dx1-62043"></a></a>? - <!--l. 6092--><p class="noindent" ><span + <!--l. 6119--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>No. Although it is strongly recommended, you don’t have to use <a id="dx1-62044"></a><a @@ -15402,8 +15458,8 @@ class="ec-lmtt-10x-x-109">makeglossariesgui</span><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a id="dx1-62049"></a></a> explicitly (see <a -href="#sec:makeindexapp">§1.3.3 </a><a -href="#sec:makeindexapp">Using makeindex +href="#x1-100001.3.3">§1.3.3 </a><a +href="#x1-100001.3.3">Using makeindex explicitly<!--tex4ht:ref: sec:makeindexapp --></a>). Note that you can’t use <a id="dx1-62050"></a><a href="#glo:xindy"><span @@ -15419,7 +15475,7 @@ class="ec-lmss-10x-x-109">glossary </span>package: are there any instructions class="ec-lmss-10x-x-109">glossary</span><a id="dx1-62054"></a> package to the <span class="ec-lmss-10x-x-109">glossaries </span>package? - <!--l. 6103--><p class="noindent" ><span + <!--l. 6130--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>Read <a href="glossary2glossaries.html" >“Upgrading from the glossary package to the glossaries package”</a> which should be available from the same location as this @@ -15430,14 +15486,14 @@ href="glossary2glossaries.html" >“Upgrading from the glossary package to t class="ec-lmbx-10x-x-109">Q. </span>I’m using <span class="ec-lmss-10x-x-109">babel</span><a id="dx1-62057"></a> but the fixed names haven’t been translated. - <!--l. 6110--><p class="noindent" ><span + <!--l. 6137--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>The <span class="ec-lmss-10x-x-109">glossaries </span>package currently only supports the following languages: Brazilian Portuguese, Danish, Dutch, English, French, German, Irish, Italian, Hungarian, Polish, Serbian and Spanish. If you want to add another language, send me the translations, and I’ll add them to the next version. - </p><!--l. 6116--><p class="noindent" >If you are using one of the above languages, but the text hasn’t been + </p><!--l. 6143--><p class="noindent" >If you are using one of the above languages, but the text hasn’t been translated, try adding the <span class="ec-lmss-10x-x-109">translator</span><a id="dx1-62058"></a> package with the required @@ -15453,7 +15509,7 @@ class="ec-lmss-10x-x-109">glossaries </span>package). For  <br />\usepackage[ngerman]{translator}  <br />\usepackage{glossaries} </div> - <!--l. 6124--><p class="nopar" > Alternatively, you can add the language as a global option to the + <!--l. 6151--><p class="nopar" > Alternatively, you can add the language as a global option to the class file. Check the <span class="ec-lmss-10x-x-109">translator </span>package documentation for further details. @@ -15464,7 +15520,7 @@ class="ec-lmbx-10x-x-109">Q. </span>My acronyms contain strange characters when like <span class="ec-lmtt-10x-x-109">\acrlong</span><a id="dx1-62061"></a>. - <!--l. 6132--><p class="noindent" ><span + <!--l. 6159--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>Switch off the sanitization: @@ -15473,7 +15529,7 @@ class="ec-lmbx-10x-x-109">A. </span>Switch off the sanitization: <div class="verbatim" id="verbatim-154"> \usepackage[sanitize=none]{glossaries} </div> - <!--l. 6135--><p class="nopar" > and protect fragile commands. + <!--l. 6162--><p class="nopar" > and protect fragile commands. </p></li> <li class="enumerate" id="x1-62063x11"><span @@ -15483,7 +15539,7 @@ class="ec-lmtt-10x-x-109">\glsentryname</span><a <span class="ec-lmtt-10x-x-109">\glsname</span><a id="dx1-62065"></a>. - <!--l. 6141--><p class="noindent" ><span + <!--l. 6168--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>Either use <span class="ec-lmtt-10x-x-109">\glsentrytext</span><a id="dx1-62066"></a> or <span @@ -15499,13 +15555,13 @@ class="ec-lmss-10x-x-109">name</span><a <div class="verbatim" id="verbatim-155"> \usepackage[sanitize={name=false}]{glossaries} </div> - <!--l. 6146--><p class="nopar" > and protect fragile commands. + <!--l. 6173--><p class="nopar" > and protect fragile commands. </p></li> <li class="enumerate" id="x1-62070x12"><span class="ec-lmbx-10x-x-109">Q. </span>Weird characters appear when I try to display an entry’s description. - <!--l. 6152--><p class="noindent" ><span + <!--l. 6179--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>Switch off the sanitization for the <span class="ec-lmss-10x-x-109">description</span><a id="dx1-62071"></a> key: @@ -15516,12 +15572,12 @@ class="ec-lmss-10x-x-109">description</span><a <div class="verbatim" id="verbatim-156"> \usepackage[sanitize={description=false}]{glossaries} </div> - <!--l. 6156--><p class="nopar" > and protect fragile commands. + <!--l. 6183--><p class="nopar" > and protect fragile commands. </p></li> <li class="enumerate" id="x1-62073x13"><span class="ec-lmbx-10x-x-109">Q. </span>My glossaries haven’t appeared. - <!--l. 6161--><p class="noindent" ><span + <!--l. 6188--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>Remember to do the following: </p> <ul class="itemize1"> <li class="itemize">Add <span @@ -15536,14 +15592,14 @@ class="ec-lmtt-10x-x-109">\printglossaries</span><a id="dx1-62076"></a>. </li> <li class="itemize">Use the commands listed in <a -href="#sec:glslink">§6 </a><a -href="#sec:glslink">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a>, +href="#x1-280006">§6 </a><a +href="#x1-280006">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a>, <a -href="#sec:glsadd">§7 </a><a -href="#sec:glsadd">Adding an Entry to the Glossary Without Generating +href="#x1-310007">§7 </a><a +href="#x1-310007">Adding an Entry to the Glossary Without Generating Text<!--tex4ht:ref: sec:glsadd --></a> or <a -href="#sec:crossref">§8 </a><a -href="#sec:crossref">Cross-Referencing Entries<!--tex4ht:ref: sec:crossref --></a> for each entry that +href="#x1-320008">§8 </a><a +href="#x1-320008">Cross-Referencing Entries<!--tex4ht:ref: sec:crossref --></a> for each entry that you want to appear in the glossary. </li> <li class="itemize">Run <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span @@ -15563,13 +15619,13 @@ class="E">E</span>X</span></span> run. id="dx1-62079"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a id="dx1-62080"></a> (see <a -href="#sec:makeglossaries">§1.3 </a><a -href="#sec:makeglossaries">Generating the Associated +href="#x1-70001.3">§1.3 </a><a +href="#x1-70001.3">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a>) after the second <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> run, followed by another <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> run.</li></ul> - <!--l. 6181--><p class="noindent" >Check the log files (<span + <!--l. 6208--><p class="noindent" >Check the log files (<span class="ec-lmtt-10x-x-109">.log</span><a id="dx1-62081"></a>, <span class="ec-lmtt-10x-x-109">.glg</span><a @@ -15579,7 +15635,7 @@ class="ec-lmtt-10x-x-109">.glg</span><a class="enumerate" id="x1-62084x14"><span class="ec-lmbx-10x-x-109">Q. </span>It is possible to change the rules used to sort the glossary entries? - <!--l. 6187--><p class="noindent" ><span + <!--l. 6214--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>If it’s for an individual entry, then you can use the entry’s <span class="ec-lmss-10x-x-109">sort</span><a id="dx1-62085"></a> key @@ -15614,12 +15670,12 @@ href="http://xindy.sourceforge.net/" >Xindy Web class="ec-lmtt-10x-x-109">xindy</span><a id="dx1-62097"></a> mailing list from that site. - </p><!--l. 6197--><p class="noindent" >If you want to sort according to order of definition or order of + </p><!--l. 6224--><p class="noindent" >If you want to sort according to order of definition or order of use, use the <span class="ec-lmss-10x-x-109">sort</span><a id="dx1-62098"></a> package option described in <a -href="#sec:pkgopts-sort">§2.4 </a><a -href="#sec:pkgopts-sort">Sorting +href="#x1-160002.4">§2.4 </a><a +href="#x1-160002.4">Sorting Options<!--tex4ht:ref: sec:pkgopts-sort --></a>. </p></li> <li @@ -15627,7 +15683,7 @@ href="#sec:pkgopts-sort">Sorting class="ec-lmbx-10x-x-109">Q. </span>I get an error when using TeX4HT<a id="dx1-62101"></a> with <span class="ec-lmss-10x-x-109">glossaries</span>. - <!--l. 6204--><p class="noindent" ><span + <!--l. 6231--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>TeX4HT seems to have a problem with the glossary styles that use <span class="ec-lmtt-10x-x-109">\indexspace</span><a @@ -15645,7 +15701,7 @@ class="ec-lmss-10x-x-109">list</span><a <div class="verbatim" id="verbatim-157"> \renewcommand*{\glsgroupskip}{} </div> - <!--l. 6211--><p class="nopar" > or + <!--l. 6238--><p class="nopar" > or @@ -15653,13 +15709,13 @@ class="ec-lmss-10x-x-109">list</span><a <div class="verbatim" id="verbatim-158"> \renewcommand*{\glsgroupskip}{\item[]} </div> - <!--l. 6215--><p class="nopar" > + <!--l. 6242--><p class="nopar" > </p> </li></ol> -<!--l. 6220--><p class="indent" > <a +<!--l. 6247--><p class="indent" > <a id="likesection.2"></a><a id="Q1-1-73"></a> @@ -15877,1172 +15933,1172 @@ href="glossaries-user.html#dx1-6009" >84</a>, <a href="glossaries-user.html#dx1-6023" >85</a>, <a href="glossaries-user.html#dx1-6028" >86</a>, <a href="glossaries-user.html#dx1-6033" >87</a>, <a -href="glossaries-user.html#dx1-13043" >88</a>, <a -href="glossaries-user.html#dx1-13048" >89</a>, <a -href="glossaries-user.html#dx1-13053" >90</a>, <a -href="glossaries-user.html#dx1-13058" >91</a>, <a -href="glossaries-user.html#dx1-62057" >92</a> <br /></span> +href="glossaries-user.html#dx1-13042" >88</a>, <a +href="glossaries-user.html#dx1-13047" >89</a>, <a +href="glossaries-user.html#dx1-13052" >90</a>, <a +href="glossaries-user.html#dx1-13057" >91</a>, <a +href="glossaries-user.html#dx1-40017" >92</a>, <a +href="glossaries-user.html#dx1-62057" >93</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">beamer </span>package  <a -href="glossaries-user.html#dx1-6027" >93</a> <br /></span> +href="glossaries-user.html#dx1-6027" >94</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">C</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\chapter</span></span></span>  <a -href="glossaries-user.html#dx1-35028" >94</a> <br /></span> +href="glossaries-user.html#dx1-35028" >95</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\chapter*</span></span></span>  <a -href="glossaries-user.html#dx1-35026" >95</a> <br /></span> +href="glossaries-user.html#dx1-35026" >96</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\currentglossary</span></span></span>  <a -href="glossaries-user.html#dx1-56064" ><span -class="ec-lmri-10x-x-109">96</span></a> <br /></span> +href="glossaries-user.html#dx1-56065" ><span +class="ec-lmri-10x-x-109">97</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\CustomAcronymFields</span></span></span>  <a href="glossaries-user.html#dx1-44001" ><span -class="ec-lmri-10x-x-109">97</span></a>, <a -href="glossaries-user.html#dx1-44026" >98</a>, <a -href="glossaries-user.html#dx1-44056" >99</a> <br /></span> +class="ec-lmri-10x-x-109">98</span></a>, <a +href="glossaries-user.html#dx1-44026" >99</a>, <a +href="glossaries-user.html#dx1-44056" >100</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">D</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\defdisplay</span></span></span>  <a -href="glossaries-user.html#dx1-41008" >100</a> <br /></span> +href="glossaries-user.html#dx1-41008" >101</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\defdisplayfirst</span></span></span>  <a -href="glossaries-user.html#dx1-41007" >101</a> <br /></span> +href="glossaries-user.html#dx1-41007" >102</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\defglsdisplay</span></span></span>  <a href="glossaries-user.html#dx1-29033" ><span -class="ec-lmri-10x-x-109">102</span></a>, <a -href="glossaries-user.html#dx1-44016" >103</a>, <a -href="glossaries-user.html#dx1-44040" >104</a>, <a -href="glossaries-user.html#dx1-44043" >105</a> <br /></span> +class="ec-lmri-10x-x-109">103</span></a>, <a +href="glossaries-user.html#dx1-44016" >104</a>, <a +href="glossaries-user.html#dx1-44040" >105</a>, <a +href="glossaries-user.html#dx1-44043" >106</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\defglsdisplayfirst</span></span></span>  <a href="glossaries-user.html#dx1-29034" ><span -class="ec-lmri-10x-x-109">106</span></a>, <a -href="glossaries-user.html#dx1-44015" >107</a>, <a -href="glossaries-user.html#dx1-44039" >108</a>, <a -href="glossaries-user.html#dx1-44042" >109</a> <br /></span> +class="ec-lmri-10x-x-109">107</span></a>, <a +href="glossaries-user.html#dx1-44015" >108</a>, <a +href="glossaries-user.html#dx1-44039" >109</a>, <a +href="glossaries-user.html#dx1-44042" >110</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\delimN</span></span></span>  <a -href="glossaries-user.html#dx1-56048" >110</a> <br /></span> +href="glossaries-user.html#dx1-56049" >111</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\delimR</span></span></span>  <a -href="glossaries-user.html#dx1-56049" >111</a> <br /></span> +href="glossaries-user.html#dx1-56050" >112</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">description </span>(environment)  <a -href="glossaries-user.html#dx1-48002" >112</a>, <a -href="glossaries-user.html#dx1-48007" >113</a>, <a -href="glossaries-user.html#dx1-48029" >114</a>, <a -href="glossaries-user.html#dx1-56009" >115</a>, <a -href="glossaries-user.html#dx1-56013" >116</a> <br /></span> +href="glossaries-user.html#dx1-48002" >113</a>, <a +href="glossaries-user.html#dx1-48007" >114</a>, <a +href="glossaries-user.html#dx1-48029" >115</a>, <a +href="glossaries-user.html#dx1-56009" >116</a>, <a +href="glossaries-user.html#dx1-56013" >117</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\descriptionname</span></span></span>  <a -href="glossaries-user.html#dx1-6018" >117</a> <br /></span> +href="glossaries-user.html#dx1-6018" >118</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">E</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\emph</span></span></span>  <a -href="glossaries-user.html#dx1-28033" >118</a> <br /></span> +href="glossaries-user.html#dx1-28033" >119</a> <br /></span> <span class="index-item">entry location  <a href="glossaries-user.html#dx1-2006" ><span -class="ec-lmbx-10x-x-109">119</span></a> <br /></span> +class="ec-lmbx-10x-x-109">120</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\entryname</span></span></span>  <a -href="glossaries-user.html#dx1-6017" >120</a> <br /></span> +href="glossaries-user.html#dx1-6017" >121</a> <br /></span> <span class="index-item">environments:<br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">description</span>  <a -href="glossaries-user.html#dx1-48003" >121</a>, <a -href="glossaries-user.html#dx1-48008" >122</a>, <a -href="glossaries-user.html#dx1-48030" >123</a>, <a -href="glossaries-user.html#dx1-56010" >124</a>, <a -href="glossaries-user.html#dx1-56014" >125</a> <br /></span> +href="glossaries-user.html#dx1-48003" >122</a>, <a +href="glossaries-user.html#dx1-48008" >123</a>, <a +href="glossaries-user.html#dx1-48030" >124</a>, <a +href="glossaries-user.html#dx1-56010" >125</a>, <a +href="glossaries-user.html#dx1-56014" >126</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">equation</span>  <a -href="glossaries-user.html#dx1-4033" >126</a> <br /></span> +href="glossaries-user.html#dx1-4033" >127</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">itemize</span>  <a -href="glossaries-user.html#dx1-57002" >127</a> <br /></span> +href="glossaries-user.html#dx1-57002" >128</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longtable</span>  <a -href="glossaries-user.html#dx1-49003" >128</a>, <a -href="glossaries-user.html#dx1-49008" >129</a>, <a -href="glossaries-user.html#dx1-50004" >130</a>, <a -href="glossaries-user.html#dx1-51007" >131</a>, <a -href="glossaries-user.html#dx1-59007" >132</a>, <a -href="glossaries-user.html#dx1-35040" >133</a> <br /></span> +href="glossaries-user.html#dx1-49003" >129</a>, <a +href="glossaries-user.html#dx1-49008" >130</a>, <a +href="glossaries-user.html#dx1-50004" >131</a>, <a +href="glossaries-user.html#dx1-51007" >132</a>, <a +href="glossaries-user.html#dx1-59007" >133</a>, <a +href="glossaries-user.html#dx1-35040" >134</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">multicols</span>  <a -href="glossaries-user.html#dx1-54003" >134</a>, <a -href="glossaries-user.html#dx1-54008" >135</a> <br /></span> +href="glossaries-user.html#dx1-54003" >135</a>, <a +href="glossaries-user.html#dx1-54008" >136</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">supertabular</span>  <a -href="glossaries-user.html#dx1-51003" >136</a>, <a -href="glossaries-user.html#dx1-51009" >137</a>, <a -href="glossaries-user.html#dx1-51014" >138</a>, <a -href="glossaries-user.html#dx1-52004" >139</a>, <a -href="glossaries-user.html#dx1-52011" >140</a> <br /></span> +href="glossaries-user.html#dx1-51003" >137</a>, <a +href="glossaries-user.html#dx1-51009" >138</a>, <a +href="glossaries-user.html#dx1-51014" >139</a>, <a +href="glossaries-user.html#dx1-52004" >140</a>, <a +href="glossaries-user.html#dx1-52011" >141</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">theglossary</span>  <a href="glossaries-user.html#dx1-56003" ><span -class="ec-lmri-10x-x-109">141</span></a>, <a -href="glossaries-user.html#dx1-56005" >142</a>, <a -href="glossaries-user.html#dx1-56012" >143</a>, <a -href="glossaries-user.html#dx1-57004" >144</a> <br /></span> +class="ec-lmri-10x-x-109">142</span></a>, <a +href="glossaries-user.html#dx1-56005" >143</a>, <a +href="glossaries-user.html#dx1-56012" >144</a>, <a +href="glossaries-user.html#dx1-57004" >145</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">equation </span>(environment)  <a -href="glossaries-user.html#dx1-4032" >145</a> <br /></span> +href="glossaries-user.html#dx1-4032" >146</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">etex </span>package  <a -href="glossaries-user.html#dx1-13030" >146</a> <br /></span> +href="glossaries-user.html#dx1-13029" >147</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">F</span> <span class="index-item">file types<br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.alg</span>  <a -href="glossaries-user.html#dx1-7086" >147</a> <br /></span> +href="glossaries-user.html#dx1-7086" >148</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.aux</span>  <a -href="glossaries-user.html#dx1-8003" >148</a>, <a -href="glossaries-user.html#dx1-37007" >149</a> <br /></span> +href="glossaries-user.html#dx1-8003" >149</a>, <a +href="glossaries-user.html#dx1-37007" >150</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.glg</span>  <a -href="glossaries-user.html#dx1-7085" >150</a>, <a -href="glossaries-user.html#dx1-9023" >151</a>, <a -href="glossaries-user.html#dx1-10017" >152</a>, <a -href="glossaries-user.html#dx1-62082" >153</a> <br /></span> +href="glossaries-user.html#dx1-7085" >151</a>, <a +href="glossaries-user.html#dx1-9023" >152</a>, <a +href="glossaries-user.html#dx1-10017" >153</a>, <a +href="glossaries-user.html#dx1-62082" >154</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.glo</span>  <a -href="glossaries-user.html#dx1-9025" >154</a>, <a -href="glossaries-user.html#dx1-10019" >155</a>, <a -href="glossaries-user.html#dx1-19005" >156</a> <br /></span> +href="glossaries-user.html#dx1-9025" >155</a>, <a +href="glossaries-user.html#dx1-10019" >156</a>, <a +href="glossaries-user.html#dx1-19005" >157</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.gls</span>  <a -href="glossaries-user.html#dx1-9024" >157</a>, <a -href="glossaries-user.html#dx1-10018" >158</a>, <a -href="glossaries-user.html#dx1-19006" >159</a> <br /></span> +href="glossaries-user.html#dx1-9024" >158</a>, <a +href="glossaries-user.html#dx1-10018" >159</a>, <a +href="glossaries-user.html#dx1-19006" >160</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.ist</span>  <a -href="glossaries-user.html#dx1-10007" >160</a>, <a -href="glossaries-user.html#dx1-10010" >161</a>, <a -href="glossaries-user.html#dx1-11009" >162</a>, <a -href="glossaries-user.html#dx1-16031" >163</a>, <a -href="glossaries-user.html#dx1-18004" >164</a>, <a -href="glossaries-user.html#dx1-18016" >165</a> <br /></span> +href="glossaries-user.html#dx1-10007" >161</a>, <a +href="glossaries-user.html#dx1-10010" >162</a>, <a +href="glossaries-user.html#dx1-11009" >163</a>, <a +href="glossaries-user.html#dx1-16031" >164</a>, <a +href="glossaries-user.html#dx1-18004" >165</a>, <a +href="glossaries-user.html#dx1-18016" >166</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.log</span>  <a -href="glossaries-user.html#dx1-62081" >166</a> <br /></span> +href="glossaries-user.html#dx1-62081" >167</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.tex</span>  <a -href="glossaries-user.html#dx1-9016" >167</a>, <a -href="glossaries-user.html#dx1-10006" >168</a> <br /></span> +href="glossaries-user.html#dx1-9016" >168</a>, <a +href="glossaries-user.html#dx1-10006" >169</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.xdy</span>  <a -href="glossaries-user.html#dx1-9019" >169</a>, <a -href="glossaries-user.html#dx1-9020" >170</a>, <a -href="glossaries-user.html#dx1-11012" >171</a>, <a -href="glossaries-user.html#dx1-16045" >172</a>, <a -href="glossaries-user.html#dx1-18007" >173</a>, <a -href="glossaries-user.html#dx1-18013" >174</a>, <a -href="glossaries-user.html#dx1-18020" >175</a>, <a -href="glossaries-user.html#dx1-36008" >176</a> <br /></span> +href="glossaries-user.html#dx1-9019" >170</a>, <a +href="glossaries-user.html#dx1-9020" >171</a>, <a +href="glossaries-user.html#dx1-11012" >172</a>, <a +href="glossaries-user.html#dx1-16045" >173</a>, <a +href="glossaries-user.html#dx1-18007" >174</a>, <a +href="glossaries-user.html#dx1-18013" >175</a>, <a +href="glossaries-user.html#dx1-18020" >176</a>, <a +href="glossaries-user.html#dx1-36008" >177</a> <br /></span> <span class="index-item">first use  <a -href="glossaries-user.html#dx1-2007" >177</a> <br /></span> +href="glossaries-user.html#dx1-2007" >178</a> <br /></span> <span class="index-subitem">    flag  <a -href="glossaries-user.html#dx1-2015" >178</a>, <a -href="glossaries-user.html#dx1-28073" >179</a> <br /></span> +href="glossaries-user.html#dx1-2015" >179</a>, <a +href="glossaries-user.html#dx1-28073" >180</a> <br /></span> <span class="index-subitem">    text  <a -href="glossaries-user.html#dx1-2017" >180</a> <br /></span> +href="glossaries-user.html#dx1-2017" >181</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\firstacronymfont</span></span></span>  <a href="glossaries-user.html#dx1-41052" ><span -class="ec-lmri-10x-x-109">181</span></a>, <a -href="glossaries-user.html#dx1-42016" >182</a>, <a -href="glossaries-user.html#dx1-42026" >183</a>, <a -href="glossaries-user.html#dx1-42033" >184</a>, <a -href="glossaries-user.html#dx1-62036" >185</a> <br /></span> +class="ec-lmri-10x-x-109">182</span></a>, <a +href="glossaries-user.html#dx1-42016" >183</a>, <a +href="glossaries-user.html#dx1-42026" >184</a>, <a +href="glossaries-user.html#dx1-42033" >185</a>, <a +href="glossaries-user.html#dx1-62036" >186</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">flowfram </span>package  <a -href="glossaries-user.html#dx1-51011" >186</a> <br /></span> +href="glossaries-user.html#dx1-51011" >187</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">fmtcount </span>package  <a -href="glossaries-user.html#dx1-38032" >187</a> <br /></span> +href="glossaries-user.html#dx1-38032" >188</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\forallglossaries</span></span></span>  <a href="glossaries-user.html#dx1-60001" ><span -class="ec-lmri-10x-x-109">188</span></a> <br /></span> +class="ec-lmri-10x-x-109">189</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\forallglsentries</span></span></span>  <a href="glossaries-user.html#dx1-60004" ><span -class="ec-lmri-10x-x-109">189</span></a> <br /></span> +class="ec-lmri-10x-x-109">190</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\forglsentries</span></span></span>  <a href="glossaries-user.html#dx1-60002" ><span -class="ec-lmri-10x-x-109">190</span></a> <br /></span> +class="ec-lmri-10x-x-109">191</span></a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">G</span> <span class="index-item"><span class="ec-lmss-10x-x-109">german </span>package  <a -href="glossaries-user.html#dx1-6008" >191</a> <br /></span> +href="glossaries-user.html#dx1-6008" >192</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossaries-accsupp </span>package  <a -href="glossaries-user.html#dx1-4089" >192</a>, <a -href="glossaries-user.html#dx1-61001" >193</a>, <a -href="glossaries-user.html#dx1-61033" >194</a> <br /></span> +href="glossaries-user.html#dx1-4089" >193</a>, <a +href="glossaries-user.html#dx1-61001" >194</a>, <a +href="glossaries-user.html#dx1-61033" >195</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossaries-babel </span>package  <a -href="glossaries-user.html#dx1-6031" >195</a>, <a -href="glossaries-user.html#dx1-13054" >196</a>, <a -href="glossaries-user.html#dx1-13060" >197</a> <br /></span> +href="glossaries-user.html#dx1-6031" >196</a>, <a +href="glossaries-user.html#dx1-13053" >197</a>, <a +href="glossaries-user.html#dx1-13059" >198</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossaries-polyglossia </span>package  <a -href="glossaries-user.html#dx1-6034" >198</a>, <a -href="glossaries-user.html#dx1-13056" >199</a>, <a -href="glossaries-user.html#dx1-13061" >200</a> <br /></span> +href="glossaries-user.html#dx1-6034" >199</a>, <a +href="glossaries-user.html#dx1-13055" >200</a>, <a +href="glossaries-user.html#dx1-13060" >201</a> <br /></span> <span class="index-item">glossary counters:<br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">glossaryentry</span>  <a href="glossaries-user.html#dx1-15004" ><span -class="ec-lmri-10x-x-109">201</span></a> <br /></span> +class="ec-lmri-10x-x-109">202</span></a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">glossarysubentry</span>  <a href="glossaries-user.html#dx1-15023" ><span -class="ec-lmri-10x-x-109">202</span></a> <br /></span> +class="ec-lmri-10x-x-109">203</span></a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary </span>package  <a -href="glossaries-user.html#dx1-2" >203</a>, <a -href="glossaries-user.html#dx1-3005" >204</a>, <a -href="glossaries-user.html#dx1-45001" >205</a>, <a -href="glossaries-user.html#dx1-45002" >206</a>, <a -href="glossaries-user.html#dx1-45005" >207</a>, <a -href="glossaries-user.html#dx1-62054" >208</a> <br /></span> +href="glossaries-user.html#dx1-2" >204</a>, <a +href="glossaries-user.html#dx1-3005" >205</a>, <a +href="glossaries-user.html#dx1-45001" >206</a>, <a +href="glossaries-user.html#dx1-45002" >207</a>, <a +href="glossaries-user.html#dx1-45005" >208</a>, <a +href="glossaries-user.html#dx1-62054" >209</a> <br /></span> <span class="index-item">glossary styles:<br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlist</span>  <a -href="glossaries-user.html#dx1-48020" >209</a>, <a -href="glossaries-user.html#dx1-48025" >210</a> <br /></span> +href="glossaries-user.html#dx1-48020" >210</a>, <a +href="glossaries-user.html#dx1-48025" >211</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlistgroup</span>  <a -href="glossaries-user.html#dx1-48024" >211</a>, <a -href="glossaries-user.html#dx1-48027" >212</a> <br /></span> +href="glossaries-user.html#dx1-48024" >212</a>, <a +href="glossaries-user.html#dx1-48027" >213</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlisthypergroup</span>  <a -href="glossaries-user.html#dx1-48026" >213</a> <br /></span> +href="glossaries-user.html#dx1-48026" >214</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlong4col</span>  <a -href="glossaries-user.html#dx1-47023" >214</a>, <a -href="glossaries-user.html#dx1-49033" >215</a>, <a -href="glossaries-user.html#dx1-49040" >216</a> <br /></span> +href="glossaries-user.html#dx1-47023" >215</a>, <a +href="glossaries-user.html#dx1-49033" >216</a>, <a +href="glossaries-user.html#dx1-49040" >217</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlong4colborder</span>  <a -href="glossaries-user.html#dx1-49044" >217</a> <br /></span> +href="glossaries-user.html#dx1-49044" >218</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlong4colheader</span>  <a -href="glossaries-user.html#dx1-49046" >218</a> <br /></span> +href="glossaries-user.html#dx1-49046" >219</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlong4colheaderborder</span>  <a -href="glossaries-user.html#dx1-49048" >219</a> <br /></span> +href="glossaries-user.html#dx1-49048" >220</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlongragged4col</span>  <a -href="glossaries-user.html#dx1-50031" >220</a>, <a -href="glossaries-user.html#dx1-50036" >221</a>, <a -href="glossaries-user.html#dx1-50038" >222</a> <br /></span> +href="glossaries-user.html#dx1-50031" >221</a>, <a +href="glossaries-user.html#dx1-50036" >222</a>, <a +href="glossaries-user.html#dx1-50038" >223</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlongragged4colborder</span>  <a -href="glossaries-user.html#dx1-50035" >223</a> <br /></span> +href="glossaries-user.html#dx1-50035" >224</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlongragged4colheader</span>  <a -href="glossaries-user.html#dx1-50037" >224</a>, <a -href="glossaries-user.html#dx1-50040" >225</a> <br /></span> +href="glossaries-user.html#dx1-50037" >225</a>, <a +href="glossaries-user.html#dx1-50040" >226</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlongragged4colheaderborder</span>  <a -href="glossaries-user.html#dx1-50039" >226</a> <br /></span> +href="glossaries-user.html#dx1-50039" >227</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altsuper4col</span>  <a -href="glossaries-user.html#dx1-47024" >227</a>, <a -href="glossaries-user.html#dx1-51039" >228</a>, <a -href="glossaries-user.html#dx1-51046" >229</a> <br /></span> +href="glossaries-user.html#dx1-47024" >228</a>, <a +href="glossaries-user.html#dx1-51039" >229</a>, <a +href="glossaries-user.html#dx1-51046" >230</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altsuper4colborder</span>  <a -href="glossaries-user.html#dx1-51050" >230</a> <br /></span> +href="glossaries-user.html#dx1-51050" >231</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altsuper4colheader</span>  <a -href="glossaries-user.html#dx1-51052" >231</a> <br /></span> +href="glossaries-user.html#dx1-51052" >232</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altsuper4colheaderborder</span>  <a -href="glossaries-user.html#dx1-51054" >232</a> <br /></span> +href="glossaries-user.html#dx1-51054" >233</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altsuperragged4col</span>  <a -href="glossaries-user.html#dx1-52034" >233</a>, <a -href="glossaries-user.html#dx1-52037" >234</a>, <a -href="glossaries-user.html#dx1-52039" >235</a> <br /></span> +href="glossaries-user.html#dx1-52034" >234</a>, <a +href="glossaries-user.html#dx1-52037" >235</a>, <a +href="glossaries-user.html#dx1-52039" >236</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altsuperragged4colborder</span>  <a -href="glossaries-user.html#dx1-52036" >236</a> <br /></span> +href="glossaries-user.html#dx1-52036" >237</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altsuperragged4colheader</span>  <a -href="glossaries-user.html#dx1-52038" >237</a>, <a -href="glossaries-user.html#dx1-52041" >238</a> <br /></span> +href="glossaries-user.html#dx1-52038" >238</a>, <a +href="glossaries-user.html#dx1-52041" >239</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altsuperragged4colheaderborder</span>  <a -href="glossaries-user.html#dx1-52040" >239</a> <br /></span> +href="glossaries-user.html#dx1-52040" >240</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">alttree</span>  <a -href="glossaries-user.html#dx1-53018" >240</a>, <a -href="glossaries-user.html#dx1-53031" >241</a>, <a -href="glossaries-user.html#dx1-53035" >242</a>, <a -href="glossaries-user.html#dx1-54033" >243</a> <br /></span> +href="glossaries-user.html#dx1-53018" >241</a>, <a +href="glossaries-user.html#dx1-53031" >242</a>, <a +href="glossaries-user.html#dx1-53035" >243</a>, <a +href="glossaries-user.html#dx1-54033" >244</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">alttreegroup</span>  <a -href="glossaries-user.html#dx1-53034" >244</a>, <a -href="glossaries-user.html#dx1-53037" >245</a>, <a -href="glossaries-user.html#dx1-54035" >246</a> <br /></span> +href="glossaries-user.html#dx1-53034" >245</a>, <a +href="glossaries-user.html#dx1-53037" >246</a>, <a +href="glossaries-user.html#dx1-54035" >247</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">alttreehypergroup</span>  <a -href="glossaries-user.html#dx1-53036" >247</a>, <a -href="glossaries-user.html#dx1-54037" >248</a> <br /></span> +href="glossaries-user.html#dx1-53036" >248</a>, <a +href="glossaries-user.html#dx1-54037" >249</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">index</span>  <a -href="glossaries-user.html#dx1-53004" >249</a>, <a -href="glossaries-user.html#dx1-53007" >250</a>, <a -href="glossaries-user.html#dx1-53012" >251</a>, <a -href="glossaries-user.html#dx1-54006" >252</a>, <a -href="glossaries-user.html#dx1-54015" >253</a> <br /></span> +href="glossaries-user.html#dx1-53004" >250</a>, <a +href="glossaries-user.html#dx1-53007" >251</a>, <a +href="glossaries-user.html#dx1-53012" >252</a>, <a +href="glossaries-user.html#dx1-54006" >253</a>, <a +href="glossaries-user.html#dx1-54015" >254</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">indexgroup</span>  <a -href="glossaries-user.html#dx1-53006" >254</a>, <a -href="glossaries-user.html#dx1-53009" >255</a>, <a -href="glossaries-user.html#dx1-54017" >256</a> <br /></span> +href="glossaries-user.html#dx1-53006" >255</a>, <a +href="glossaries-user.html#dx1-53009" >256</a>, <a +href="glossaries-user.html#dx1-54017" >257</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">indexhypergroup</span>  <a -href="glossaries-user.html#dx1-53008" >257</a>, <a -href="glossaries-user.html#dx1-54019" >258</a> <br /></span> +href="glossaries-user.html#dx1-53008" >258</a>, <a +href="glossaries-user.html#dx1-54019" >259</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">inline</span>  <a -href="glossaries-user.html#dx1-4051" >259</a>, <a -href="glossaries-user.html#dx1-55002" >260</a>, <a -href="glossaries-user.html#dx1-55008" >261</a> <br /></span> +href="glossaries-user.html#dx1-4051" >260</a>, <a +href="glossaries-user.html#dx1-55002" >261</a>, <a +href="glossaries-user.html#dx1-55008" >262</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">list</span>  <a -href="glossaries-user.html#dx1-15040" >262</a>, <a -href="glossaries-user.html#dx1-48006" >263</a>, <a -href="glossaries-user.html#dx1-48014" >264</a>, <a -href="glossaries-user.html#dx1-48021" >265</a>, <a -href="glossaries-user.html#dx1-48022" >266</a>, <a -href="glossaries-user.html#dx1-48023" >267</a>, <a -href="glossaries-user.html#dx1-56008" >268</a>, <a -href="glossaries-user.html#dx1-56017" >269</a>, <a -href="glossaries-user.html#dx1-56033" >270</a>, <a -href="glossaries-user.html#dx1-56045" >271</a>, <a -href="glossaries-user.html#dx1-58003" >272</a>, <a -href="glossaries-user.html#dx1-62103" >273</a> <br /></span> +href="glossaries-user.html#dx1-15040" >263</a>, <a +href="glossaries-user.html#dx1-48006" >264</a>, <a +href="glossaries-user.html#dx1-48014" >265</a>, <a +href="glossaries-user.html#dx1-48021" >266</a>, <a +href="glossaries-user.html#dx1-48022" >267</a>, <a +href="glossaries-user.html#dx1-48023" >268</a>, <a +href="glossaries-user.html#dx1-56008" >269</a>, <a +href="glossaries-user.html#dx1-56017" >270</a>, <a +href="glossaries-user.html#dx1-56033" >271</a>, <a +href="glossaries-user.html#dx1-56046" >272</a>, <a +href="glossaries-user.html#dx1-58003" >273</a>, <a +href="glossaries-user.html#dx1-62103" >274</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">listdotted</span>  <a -href="glossaries-user.html#dx1-47033" >274</a>, <a -href="glossaries-user.html#dx1-48035" >275</a>, <a -href="glossaries-user.html#dx1-48036" >276</a> <br /></span> +href="glossaries-user.html#dx1-47034" >275</a>, <a +href="glossaries-user.html#dx1-48035" >276</a>, <a +href="glossaries-user.html#dx1-48036" >277</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">listgroup</span>  <a -href="glossaries-user.html#dx1-48013" >277</a>, <a -href="glossaries-user.html#dx1-48016" >278</a> <br /></span> +href="glossaries-user.html#dx1-48013" >278</a>, <a +href="glossaries-user.html#dx1-48016" >279</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">listhypergroup</span>  <a -href="glossaries-user.html#dx1-48015" >279</a>, <a -href="glossaries-user.html#dx1-48028" >280</a>, <a -href="glossaries-user.html#dx1-53010" >281</a>, <a -href="glossaries-user.html#dx1-53023" >282</a>, <a -href="glossaries-user.html#dx1-53030" >283</a>, <a -href="glossaries-user.html#dx1-53038" >284</a>, <a -href="glossaries-user.html#dx1-56030" >285</a> <br /></span> +href="glossaries-user.html#dx1-48015" >280</a>, <a +href="glossaries-user.html#dx1-48028" >281</a>, <a +href="glossaries-user.html#dx1-53010" >282</a>, <a +href="glossaries-user.html#dx1-53023" >283</a>, <a +href="glossaries-user.html#dx1-53030" >284</a>, <a +href="glossaries-user.html#dx1-53038" >285</a>, <a +href="glossaries-user.html#dx1-56030" >286</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long</span>  <a -href="glossaries-user.html#dx1-47030" >286</a>, <a -href="glossaries-user.html#dx1-49006" >287</a>, <a -href="glossaries-user.html#dx1-49014" >288</a>, <a -href="glossaries-user.html#dx1-49016" >289</a>, <a -href="glossaries-user.html#dx1-49020" >290</a> <br /></span> +href="glossaries-user.html#dx1-47030" >287</a>, <a +href="glossaries-user.html#dx1-49006" >288</a>, <a +href="glossaries-user.html#dx1-49014" >289</a>, <a +href="glossaries-user.html#dx1-49016" >290</a>, <a +href="glossaries-user.html#dx1-49020" >291</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long3col</span>  <a -href="glossaries-user.html#dx1-47005" >291</a>, <a -href="glossaries-user.html#dx1-49019" >292</a>, <a -href="glossaries-user.html#dx1-49026" >293</a>, <a -href="glossaries-user.html#dx1-49028" >294</a>, <a -href="glossaries-user.html#dx1-49032" >295</a> <br /></span> +href="glossaries-user.html#dx1-47005" >292</a>, <a +href="glossaries-user.html#dx1-49019" >293</a>, <a +href="glossaries-user.html#dx1-49026" >294</a>, <a +href="glossaries-user.html#dx1-49028" >295</a>, <a +href="glossaries-user.html#dx1-49032" >296</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long3colborder</span>  <a -href="glossaries-user.html#dx1-47007" >296</a>, <a -href="glossaries-user.html#dx1-49025" >297</a> <br /></span> +href="glossaries-user.html#dx1-47007" >297</a>, <a +href="glossaries-user.html#dx1-49025" >298</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long3colheader</span>  <a -href="glossaries-user.html#dx1-47006" >298</a>, <a -href="glossaries-user.html#dx1-49027" >299</a>, <a -href="glossaries-user.html#dx1-49030" >300</a> <br /></span> +href="glossaries-user.html#dx1-47006" >299</a>, <a +href="glossaries-user.html#dx1-49027" >300</a>, <a +href="glossaries-user.html#dx1-49030" >301</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long3colheaderborder</span>  <a -href="glossaries-user.html#dx1-47008" >301</a>, <a -href="glossaries-user.html#dx1-49029" >302</a> <br /></span> +href="glossaries-user.html#dx1-47008" >302</a>, <a +href="glossaries-user.html#dx1-49029" >303</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long4col</span>  <a -href="glossaries-user.html#dx1-43011" >303</a>, <a -href="glossaries-user.html#dx1-47021" >304</a>, <a -href="glossaries-user.html#dx1-49031" >305</a>, <a -href="glossaries-user.html#dx1-49035" >306</a>, <a -href="glossaries-user.html#dx1-49037" >307</a>, <a -href="glossaries-user.html#dx1-49041" >308</a> <br /></span> +href="glossaries-user.html#dx1-43011" >304</a>, <a +href="glossaries-user.html#dx1-47021" >305</a>, <a +href="glossaries-user.html#dx1-49031" >306</a>, <a +href="glossaries-user.html#dx1-49035" >307</a>, <a +href="glossaries-user.html#dx1-49037" >308</a>, <a +href="glossaries-user.html#dx1-49041" >309</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long4colborder</span>  <a -href="glossaries-user.html#dx1-49034" >309</a>, <a -href="glossaries-user.html#dx1-49045" >310</a> <br /></span> +href="glossaries-user.html#dx1-49034" >310</a>, <a +href="glossaries-user.html#dx1-49045" >311</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long4colheader</span>  <a -href="glossaries-user.html#dx1-49036" >311</a>, <a -href="glossaries-user.html#dx1-49039" >312</a>, <a -href="glossaries-user.html#dx1-49047" >313</a> <br /></span> +href="glossaries-user.html#dx1-49036" >312</a>, <a +href="glossaries-user.html#dx1-49039" >313</a>, <a +href="glossaries-user.html#dx1-49047" >314</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long4colheaderborder</span>  <a -href="glossaries-user.html#dx1-49038" >314</a>, <a -href="glossaries-user.html#dx1-49049" >315</a> <br /></span> +href="glossaries-user.html#dx1-49038" >315</a>, <a +href="glossaries-user.html#dx1-49049" >316</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longborder</span>  <a -href="glossaries-user.html#dx1-49013" >316</a> <br /></span> +href="glossaries-user.html#dx1-49013" >317</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longheader</span>  <a -href="glossaries-user.html#dx1-49015" >317</a>, <a -href="glossaries-user.html#dx1-49018" >318</a>, <a -href="glossaries-user.html#dx1-56019" >319</a> <br /></span> +href="glossaries-user.html#dx1-49015" >318</a>, <a +href="glossaries-user.html#dx1-49018" >319</a>, <a +href="glossaries-user.html#dx1-56019" >320</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longheaderborder</span>  <a -href="glossaries-user.html#dx1-49017" >320</a>, <a -href="glossaries-user.html#dx1-35038" >321</a> <br /></span> +href="glossaries-user.html#dx1-49017" >321</a>, <a +href="glossaries-user.html#dx1-35038" >322</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longragged</span>  <a -href="glossaries-user.html#dx1-50009" >322</a>, <a -href="glossaries-user.html#dx1-50014" >323</a>, <a -href="glossaries-user.html#dx1-50016" >324</a>, <a -href="glossaries-user.html#dx1-50020" >325</a> <br /></span> +href="glossaries-user.html#dx1-50009" >323</a>, <a +href="glossaries-user.html#dx1-50014" >324</a>, <a +href="glossaries-user.html#dx1-50016" >325</a>, <a +href="glossaries-user.html#dx1-50020" >326</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longragged3col</span>  <a -href="glossaries-user.html#dx1-50019" >326</a>, <a -href="glossaries-user.html#dx1-50026" >327</a>, <a -href="glossaries-user.html#dx1-50028" >328</a>, <a -href="glossaries-user.html#dx1-50032" >329</a> <br /></span> +href="glossaries-user.html#dx1-50019" >327</a>, <a +href="glossaries-user.html#dx1-50026" >328</a>, <a +href="glossaries-user.html#dx1-50028" >329</a>, <a +href="glossaries-user.html#dx1-50032" >330</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longragged3colborder</span>  <a -href="glossaries-user.html#dx1-50025" >330</a> <br /></span> +href="glossaries-user.html#dx1-50025" >331</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longragged3colheader</span>  <a -href="glossaries-user.html#dx1-50027" >331</a>, <a -href="glossaries-user.html#dx1-50030" >332</a> <br /></span> +href="glossaries-user.html#dx1-50027" >332</a>, <a +href="glossaries-user.html#dx1-50030" >333</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longragged3colheaderborder</span>  <a -href="glossaries-user.html#dx1-50029" >333</a> <br /></span> +href="glossaries-user.html#dx1-50029" >334</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longraggedborder</span>  <a -href="glossaries-user.html#dx1-50013" >334</a> <br /></span> +href="glossaries-user.html#dx1-50013" >335</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longraggedheader</span>  <a -href="glossaries-user.html#dx1-50015" >335</a>, <a -href="glossaries-user.html#dx1-50018" >336</a> <br /></span> +href="glossaries-user.html#dx1-50015" >336</a>, <a +href="glossaries-user.html#dx1-50018" >337</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longraggedheaderborder</span>  <a -href="glossaries-user.html#dx1-50017" >337</a> <br /></span> +href="glossaries-user.html#dx1-50017" >338</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcolalttree</span>  <a -href="glossaries-user.html#dx1-54032" >338</a> <br /></span> +href="glossaries-user.html#dx1-54032" >339</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcolalttreegroup</span>  <a -href="glossaries-user.html#dx1-54034" >339</a> <br /></span> +href="glossaries-user.html#dx1-54034" >340</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcolalttreehypergroup</span>  <a -href="glossaries-user.html#dx1-54036" >340</a> <br /></span> +href="glossaries-user.html#dx1-54036" >341</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcolindex</span>  <a -href="glossaries-user.html#dx1-54005" >341</a>, <a -href="glossaries-user.html#dx1-54014" >342</a> <br /></span> +href="glossaries-user.html#dx1-54005" >342</a>, <a +href="glossaries-user.html#dx1-54014" >343</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcolindexgroup</span>  <a -href="glossaries-user.html#dx1-54016" >343</a> <br /></span> +href="glossaries-user.html#dx1-54016" >344</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcolindexhypergroup</span>  <a -href="glossaries-user.html#dx1-54018" >344</a> <br /></span> +href="glossaries-user.html#dx1-54018" >345</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcoltree</span>  <a -href="glossaries-user.html#dx1-54020" >345</a> <br /></span> +href="glossaries-user.html#dx1-54020" >346</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcoltreegroup</span>  <a -href="glossaries-user.html#dx1-54022" >346</a> <br /></span> +href="glossaries-user.html#dx1-54022" >347</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcoltreehypergroup</span>  <a -href="glossaries-user.html#dx1-54024" >347</a> <br /></span> +href="glossaries-user.html#dx1-54024" >348</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcoltreenoname</span>  <a -href="glossaries-user.html#dx1-54026" >348</a> <br /></span> +href="glossaries-user.html#dx1-54026" >349</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcoltreenonamegroup</span>  <a -href="glossaries-user.html#dx1-54028" >349</a> <br /></span> +href="glossaries-user.html#dx1-54028" >350</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcoltreenonamehypergroup</span>  <a -href="glossaries-user.html#dx1-54030" >350</a> <br /></span> +href="glossaries-user.html#dx1-54030" >351</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super</span>  <a -href="glossaries-user.html#dx1-51012" >351</a>, <a -href="glossaries-user.html#dx1-51020" >352</a>, <a -href="glossaries-user.html#dx1-51022" >353</a>, <a -href="glossaries-user.html#dx1-51026" >354</a> <br /></span> +href="glossaries-user.html#dx1-51012" >352</a>, <a +href="glossaries-user.html#dx1-51020" >353</a>, <a +href="glossaries-user.html#dx1-51022" >354</a>, <a +href="glossaries-user.html#dx1-51026" >355</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super3col</span>  <a -href="glossaries-user.html#dx1-51025" >355</a>, <a -href="glossaries-user.html#dx1-51032" >356</a>, <a -href="glossaries-user.html#dx1-51034" >357</a>, <a -href="glossaries-user.html#dx1-51038" >358</a> <br /></span> +href="glossaries-user.html#dx1-51025" >356</a>, <a +href="glossaries-user.html#dx1-51032" >357</a>, <a +href="glossaries-user.html#dx1-51034" >358</a>, <a +href="glossaries-user.html#dx1-51038" >359</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super3colborder</span>  <a -href="glossaries-user.html#dx1-51031" >359</a> <br /></span> +href="glossaries-user.html#dx1-51031" >360</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super3colheader</span>  <a -href="glossaries-user.html#dx1-51033" >360</a>, <a -href="glossaries-user.html#dx1-51036" >361</a> <br /></span> +href="glossaries-user.html#dx1-51033" >361</a>, <a +href="glossaries-user.html#dx1-51036" >362</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super3colheaderborder</span>  <a -href="glossaries-user.html#dx1-51035" >362</a> <br /></span> +href="glossaries-user.html#dx1-51035" >363</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super4col</span>  <a -href="glossaries-user.html#dx1-47022" >363</a>, <a -href="glossaries-user.html#dx1-51037" >364</a>, <a -href="glossaries-user.html#dx1-51041" >365</a>, <a -href="glossaries-user.html#dx1-51043" >366</a>, <a -href="glossaries-user.html#dx1-51047" >367</a> <br /></span> +href="glossaries-user.html#dx1-47022" >364</a>, <a +href="glossaries-user.html#dx1-51037" >365</a>, <a +href="glossaries-user.html#dx1-51041" >366</a>, <a +href="glossaries-user.html#dx1-51043" >367</a>, <a +href="glossaries-user.html#dx1-51047" >368</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super4colborder</span>  <a -href="glossaries-user.html#dx1-51040" >368</a>, <a -href="glossaries-user.html#dx1-51051" >369</a> <br /></span> +href="glossaries-user.html#dx1-51040" >369</a>, <a +href="glossaries-user.html#dx1-51051" >370</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super4colheader</span>  <a -href="glossaries-user.html#dx1-51042" >370</a>, <a -href="glossaries-user.html#dx1-51045" >371</a>, <a -href="glossaries-user.html#dx1-51053" >372</a> <br /></span> +href="glossaries-user.html#dx1-51042" >371</a>, <a +href="glossaries-user.html#dx1-51045" >372</a>, <a +href="glossaries-user.html#dx1-51053" >373</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super4colheaderborder</span>  <a -href="glossaries-user.html#dx1-51044" >373</a>, <a -href="glossaries-user.html#dx1-51055" >374</a> <br /></span> +href="glossaries-user.html#dx1-51044" >374</a>, <a +href="glossaries-user.html#dx1-51055" >375</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superborder</span>  <a -href="glossaries-user.html#dx1-51019" >375</a> <br /></span> +href="glossaries-user.html#dx1-51019" >376</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superheader</span>  <a -href="glossaries-user.html#dx1-51021" >376</a>, <a -href="glossaries-user.html#dx1-51024" >377</a> <br /></span> +href="glossaries-user.html#dx1-51021" >377</a>, <a +href="glossaries-user.html#dx1-51024" >378</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superheaderborder</span>  <a -href="glossaries-user.html#dx1-35036" >378</a>, <a -href="glossaries-user.html#dx1-51023" >379</a> <br /></span> +href="glossaries-user.html#dx1-35036" >379</a>, <a +href="glossaries-user.html#dx1-51023" >380</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superragged</span>  <a -href="glossaries-user.html#dx1-52009" >380</a>, <a -href="glossaries-user.html#dx1-52017" >381</a>, <a -href="glossaries-user.html#dx1-52019" >382</a>, <a -href="glossaries-user.html#dx1-52023" >383</a> <br /></span> +href="glossaries-user.html#dx1-52009" >381</a>, <a +href="glossaries-user.html#dx1-52017" >382</a>, <a +href="glossaries-user.html#dx1-52019" >383</a>, <a +href="glossaries-user.html#dx1-52023" >384</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superragged3col</span>  <a -href="glossaries-user.html#dx1-52022" >384</a>, <a -href="glossaries-user.html#dx1-52029" >385</a>, <a -href="glossaries-user.html#dx1-52031" >386</a>, <a -href="glossaries-user.html#dx1-52035" >387</a> <br /></span> +href="glossaries-user.html#dx1-52022" >385</a>, <a +href="glossaries-user.html#dx1-52029" >386</a>, <a +href="glossaries-user.html#dx1-52031" >387</a>, <a +href="glossaries-user.html#dx1-52035" >388</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superragged3colborder</span>  <a -href="glossaries-user.html#dx1-52028" >388</a> <br /></span> +href="glossaries-user.html#dx1-52028" >389</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superragged3colheader</span>  <a -href="glossaries-user.html#dx1-52030" >389</a>, <a -href="glossaries-user.html#dx1-52033" >390</a> <br /></span> +href="glossaries-user.html#dx1-52030" >390</a>, <a +href="glossaries-user.html#dx1-52033" >391</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superragged3colheaderborder</span>  <a -href="glossaries-user.html#dx1-52032" >391</a> <br /></span> +href="glossaries-user.html#dx1-52032" >392</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superraggedborder</span>  <a -href="glossaries-user.html#dx1-52016" >392</a> <br /></span> +href="glossaries-user.html#dx1-52016" >393</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superraggedheader</span>  <a -href="glossaries-user.html#dx1-52018" >393</a>, <a -href="glossaries-user.html#dx1-52021" >394</a> <br /></span> +href="glossaries-user.html#dx1-52018" >394</a>, <a +href="glossaries-user.html#dx1-52021" >395</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superraggedheaderborder</span>  <a -href="glossaries-user.html#dx1-52020" >395</a> <br /></span> +href="glossaries-user.html#dx1-52020" >396</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">tree</span>  <a -href="glossaries-user.html#dx1-53011" >396</a>, <a -href="glossaries-user.html#dx1-53020" >397</a>, <a -href="glossaries-user.html#dx1-53025" >398</a>, <a -href="glossaries-user.html#dx1-53032" >399</a>, <a -href="glossaries-user.html#dx1-54021" >400</a> <br /></span> +href="glossaries-user.html#dx1-53011" >397</a>, <a +href="glossaries-user.html#dx1-53020" >398</a>, <a +href="glossaries-user.html#dx1-53025" >399</a>, <a +href="glossaries-user.html#dx1-53032" >400</a>, <a +href="glossaries-user.html#dx1-54021" >401</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">treegroup</span>  <a -href="glossaries-user.html#dx1-53019" >401</a>, <a -href="glossaries-user.html#dx1-53022" >402</a>, <a -href="glossaries-user.html#dx1-54023" >403</a> <br /></span> +href="glossaries-user.html#dx1-53019" >402</a>, <a +href="glossaries-user.html#dx1-53022" >403</a>, <a +href="glossaries-user.html#dx1-54023" >404</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">treehypergroup</span>  <a -href="glossaries-user.html#dx1-53021" >404</a>, <a -href="glossaries-user.html#dx1-54025" >405</a> <br /></span> +href="glossaries-user.html#dx1-53021" >405</a>, <a +href="glossaries-user.html#dx1-54025" >406</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">treenoname</span>  <a -href="glossaries-user.html#dx1-53024" >406</a>, <a -href="glossaries-user.html#dx1-53027" >407</a>, <a -href="glossaries-user.html#dx1-54027" >408</a> <br /></span> +href="glossaries-user.html#dx1-53024" >407</a>, <a +href="glossaries-user.html#dx1-53027" >408</a>, <a +href="glossaries-user.html#dx1-54027" >409</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">treenonamegroup</span>  <a -href="glossaries-user.html#dx1-53026" >409</a>, <a -href="glossaries-user.html#dx1-53029" >410</a>, <a -href="glossaries-user.html#dx1-54029" >411</a> <br /></span> +href="glossaries-user.html#dx1-53026" >410</a>, <a +href="glossaries-user.html#dx1-53029" >411</a>, <a +href="glossaries-user.html#dx1-54029" >412</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">treenonamehypergroup</span>  <a -href="glossaries-user.html#dx1-53028" >412</a>, <a -href="glossaries-user.html#dx1-54031" >413</a> <br /></span> +href="glossaries-user.html#dx1-53028" >413</a>, <a +href="glossaries-user.html#dx1-54031" >414</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary-inline </span>package  <a -href="glossaries-user.html#dx1-55001" >414</a>, <a -href="glossaries-user.html#dx1-55006" >415</a> <br /></span> +href="glossaries-user.html#dx1-55001" >415</a>, <a +href="glossaries-user.html#dx1-55006" >416</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary-list </span>package  <a -href="glossaries-user.html#dx1-15028" >416</a>, <a -href="glossaries-user.html#dx1-15039" >417</a>, <a -href="glossaries-user.html#dx1-35042" >418</a>, <a -href="glossaries-user.html#dx1-48001" >419</a> <br /></span> +href="glossaries-user.html#dx1-15028" >417</a>, <a +href="glossaries-user.html#dx1-15039" >418</a>, <a +href="glossaries-user.html#dx1-35042" >419</a>, <a +href="glossaries-user.html#dx1-48001" >420</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary-long </span>package  <a -href="glossaries-user.html#dx1-15029" >420</a>, <a -href="glossaries-user.html#dx1-15033" >421</a>, <a -href="glossaries-user.html#dx1-35043" >422</a>, <a -href="glossaries-user.html#dx1-49001" >423</a>, <a -href="glossaries-user.html#dx1-50002" >424</a> <br /></span> +href="glossaries-user.html#dx1-15029" >421</a>, <a +href="glossaries-user.html#dx1-15033" >422</a>, <a +href="glossaries-user.html#dx1-35043" >423</a>, <a +href="glossaries-user.html#dx1-49001" >424</a>, <a +href="glossaries-user.html#dx1-50002" >425</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary-longragged </span>package  <a -href="glossaries-user.html#dx1-50001" >425</a>, <a -href="glossaries-user.html#dx1-50005" >426</a>, <a -href="glossaries-user.html#dx1-50007" >427</a> <br /></span> +href="glossaries-user.html#dx1-50001" >426</a>, <a +href="glossaries-user.html#dx1-50005" >427</a>, <a +href="glossaries-user.html#dx1-50007" >428</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary-mcols </span>package  <a -href="glossaries-user.html#dx1-15045" >428</a>, <a -href="glossaries-user.html#dx1-54001" >429</a>, <a -href="glossaries-user.html#dx1-54009" >430</a>, <a -href="glossaries-user.html#dx1-54013" >431</a> <br /></span> +href="glossaries-user.html#dx1-15045" >429</a>, <a +href="glossaries-user.html#dx1-54001" >430</a>, <a +href="glossaries-user.html#dx1-54009" >431</a>, <a +href="glossaries-user.html#dx1-54013" >432</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary-super </span>package  <a -href="glossaries-user.html#dx1-15030" >432</a>, <a -href="glossaries-user.html#dx1-15036" >433</a>, <a -href="glossaries-user.html#dx1-35044" >434</a>, <a -href="glossaries-user.html#dx1-51001" >435</a>, <a -href="glossaries-user.html#dx1-52002" >436</a> <br /></span> +href="glossaries-user.html#dx1-15030" >433</a>, <a +href="glossaries-user.html#dx1-15036" >434</a>, <a +href="glossaries-user.html#dx1-35044" >435</a>, <a +href="glossaries-user.html#dx1-51001" >436</a>, <a +href="glossaries-user.html#dx1-52002" >437</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary-superragged </span>package  <a -href="glossaries-user.html#dx1-52001" >437</a>, <a -href="glossaries-user.html#dx1-52005" >438</a>, <a -href="glossaries-user.html#dx1-52007" >439</a> <br /></span> +href="glossaries-user.html#dx1-52001" >438</a>, <a +href="glossaries-user.html#dx1-52005" >439</a>, <a +href="glossaries-user.html#dx1-52007" >440</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary-tree </span>package  <a -href="glossaries-user.html#dx1-15031" >440</a>, <a -href="glossaries-user.html#dx1-15043" >441</a>, <a -href="glossaries-user.html#dx1-35045" >442</a>, <a -href="glossaries-user.html#dx1-53001" >443</a> <br /></span> +href="glossaries-user.html#dx1-15031" >441</a>, <a +href="glossaries-user.html#dx1-15043" >442</a>, <a +href="glossaries-user.html#dx1-35045" >443</a>, <a +href="glossaries-user.html#dx1-53001" >444</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">glossaryentry </span>(counter)  <a href="glossaries-user.html#dx1-15003" ><span -class="ec-lmri-10x-x-109">444</span></a> <br /></span> +class="ec-lmri-10x-x-109">445</span></a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossaryentry </span>counter  <a -href="glossaries-user.html#dx1-15014" >445</a>, <a -href="glossaries-user.html#dx1-15016" >446</a>, <a -href="glossaries-user.html#dx1-15019" >447</a> <br /></span> +href="glossaries-user.html#dx1-15014" >446</a>, <a +href="glossaries-user.html#dx1-15016" >447</a>, <a +href="glossaries-user.html#dx1-15019" >448</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossaryentryfield</span></span></span>  <a -href="glossaries-user.html#dx1-56035" ><span -class="ec-lmri-10x-x-109">448</span></a>, <a -href="glossaries-user.html#dx1-56057" >449</a>, <a -href="glossaries-user.html#dx1-59001" >450</a> <br /></span> +href="glossaries-user.html#dx1-56036" ><span +class="ec-lmri-10x-x-109">449</span></a>, <a +href="glossaries-user.html#dx1-56058" >450</a>, <a +href="glossaries-user.html#dx1-59001" >451</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossaryentrynumbers</span></span></span>  <a -href="glossaries-user.html#dx1-56046" >451</a>, <a -href="glossaries-user.html#dx1-56051" >452</a>, <a +href="glossaries-user.html#dx1-56047" >452</a>, <a href="glossaries-user.html#dx1-56052" >453</a>, <a -href="glossaries-user.html#dx1-56054" >454</a> <br /></span> +href="glossaries-user.html#dx1-56053" >454</a>, <a +href="glossaries-user.html#dx1-56055" >455</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossaryheader</span></span></span>  <a -href="glossaries-user.html#dx1-48019" >455</a>, <a +href="glossaries-user.html#dx1-48019" >456</a>, <a href="glossaries-user.html#dx1-56015" ><span -class="ec-lmri-10x-x-109">456</span></a>, <a -href="glossaries-user.html#dx1-56018" >457</a>, <a -href="glossaries-user.html#dx1-57007" >458</a> <br /></span> +class="ec-lmri-10x-x-109">457</span></a>, <a +href="glossaries-user.html#dx1-56018" >458</a>, <a +href="glossaries-user.html#dx1-57007" >459</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossarymark</span></span></span>  <a href="glossaries-user.html#dx1-14013" ><span -class="ec-lmri-10x-x-109">459</span></a>, <a -href="glossaries-user.html#dx1-14019" >460</a>, <a -href="glossaries-user.html#dx1-35032" >461</a>, <a -href="glossaries-user.html#dx1-35033" >462</a> <br /></span> +class="ec-lmri-10x-x-109">460</span></a>, <a +href="glossaries-user.html#dx1-14019" >461</a>, <a +href="glossaries-user.html#dx1-35032" >462</a>, <a +href="glossaries-user.html#dx1-35033" >463</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossaryname</span></span></span>  <a -href="glossaries-user.html#dx1-6014" >463</a> <br /></span> +href="glossaries-user.html#dx1-6014" >464</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossarypostamble</span></span></span>  <a href="glossaries-user.html#dx1-35035" ><span -class="ec-lmri-10x-x-109">464</span></a>, <a -href="glossaries-user.html#dx1-56007" >465</a> <br /></span> +class="ec-lmri-10x-x-109">465</span></a>, <a +href="glossaries-user.html#dx1-56007" >466</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossarypreamble</span></span></span>  <a -href="glossaries-user.html#dx1-15018" >466</a>, <a +href="glossaries-user.html#dx1-15018" >467</a>, <a href="glossaries-user.html#dx1-35034" ><span -class="ec-lmri-10x-x-109">467</span></a>, <a -href="glossaries-user.html#dx1-56006" >468</a>, <a -href="glossaries-user.html#dx1-56016" >469</a> <br /></span> +class="ec-lmri-10x-x-109">468</span></a>, <a +href="glossaries-user.html#dx1-56006" >469</a>, <a +href="glossaries-user.html#dx1-56016" >470</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossarysection</span></span></span>  <a -href="glossaries-user.html#dx1-55005" >470</a> <br /></span> +href="glossaries-user.html#dx1-55005" >471</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossarystyle</span></span></span>  <a -href="glossaries-user.html#dx1-15047" >471</a>, <a -href="glossaries-user.html#dx1-35021" >472</a>, <a +href="glossaries-user.html#dx1-15047" >472</a>, <a +href="glossaries-user.html#dx1-35021" >473</a>, <a href="glossaries-user.html#dx1-47013" ><span -class="ec-lmri-10x-x-109">473</span></a>, <a -href="glossaries-user.html#dx1-47029" >474</a>, <a -href="glossaries-user.html#dx1-47032" >475</a>, <a -href="glossaries-user.html#dx1-54010" >476</a>, <a -href="glossaries-user.html#dx1-55007" >477</a>, <a -href="glossaries-user.html#dx1-58001" >478</a> <br /></span> +class="ec-lmri-10x-x-109">474</span></a>, <a +href="glossaries-user.html#dx1-47029" >475</a>, <a +href="glossaries-user.html#dx1-47032" >476</a>, <a +href="glossaries-user.html#dx1-54010" >477</a>, <a +href="glossaries-user.html#dx1-55007" >478</a>, <a +href="glossaries-user.html#dx1-58001" >479</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">glossarysubentry </span>(counter)  <a href="glossaries-user.html#dx1-15022" ><span -class="ec-lmri-10x-x-109">479</span></a> <br /></span> +class="ec-lmri-10x-x-109">480</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossarysubentryfield</span></span></span>  <a -href="glossaries-user.html#dx1-56056" ><span -class="ec-lmri-10x-x-109">480</span></a>, <a -href="glossaries-user.html#dx1-59002" >481</a> <br /></span> +href="glossaries-user.html#dx1-56057" ><span +class="ec-lmri-10x-x-109">481</span></a>, <a +href="glossaries-user.html#dx1-59002" >482</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLS</span></span></span>  <a -href="glossaries-user.html#dx1-2010" >482</a>, <a -href="glossaries-user.html#dx1-19067" >483</a>, <a +href="glossaries-user.html#dx1-2010" >483</a>, <a +href="glossaries-user.html#dx1-19067" >484</a>, <a href="glossaries-user.html#dx1-28078" ><span -class="ec-lmri-10x-x-109">484</span></a> <br /></span> +class="ec-lmri-10x-x-109">485</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Gls</span></span></span>  <a -href="glossaries-user.html#dx1-2009" >485</a>, <a -href="glossaries-user.html#dx1-5014" >486</a>, <a -href="glossaries-user.html#dx1-19066" >487</a>, <a -href="glossaries-user.html#dx1-19125" >488</a>, <a +href="glossaries-user.html#dx1-2009" >486</a>, <a +href="glossaries-user.html#dx1-5014" >487</a>, <a +href="glossaries-user.html#dx1-19066" >488</a>, <a +href="glossaries-user.html#dx1-19125" >489</a>, <a href="glossaries-user.html#dx1-28077" ><span -class="ec-lmri-10x-x-109">489</span></a>, <a -href="glossaries-user.html#dx1-29018" >490</a>, <a -href="glossaries-user.html#dx1-41109" >491</a>, <a -href="glossaries-user.html#dx1-45009" >492</a>, <a -href="glossaries-user.html#dx1-45011" >493</a>, <a -href="glossaries-user.html#dx1-45013" >494</a> <br /></span> +class="ec-lmri-10x-x-109">490</span></a>, <a +href="glossaries-user.html#dx1-29018" >491</a>, <a +href="glossaries-user.html#dx1-41109" >492</a>, <a +href="glossaries-user.html#dx1-45009" >493</a>, <a +href="glossaries-user.html#dx1-45011" >494</a>, <a +href="glossaries-user.html#dx1-45013" >495</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls</span></span></span>  <a -href="glossaries-user.html#dx1-2008" >495</a>, <a -href="glossaries-user.html#dx1-2024" >496</a>, <a -href="glossaries-user.html#dx1-19039" >497</a>, <a -href="glossaries-user.html#dx1-19043" >498</a>, <a -href="glossaries-user.html#dx1-19049" >499</a>, <a -href="glossaries-user.html#dx1-19051" >500</a>, <a -href="glossaries-user.html#dx1-19065" >501</a>, <a -href="glossaries-user.html#dx1-28018" >502</a>, <a +href="glossaries-user.html#dx1-2008" >496</a>, <a +href="glossaries-user.html#dx1-2024" >497</a>, <a +href="glossaries-user.html#dx1-19039" >498</a>, <a +href="glossaries-user.html#dx1-19043" >499</a>, <a +href="glossaries-user.html#dx1-19049" >500</a>, <a +href="glossaries-user.html#dx1-19051" >501</a>, <a +href="glossaries-user.html#dx1-19065" >502</a>, <a +href="glossaries-user.html#dx1-28018" >503</a>, <a href="glossaries-user.html#dx1-28067" ><span -class="ec-lmri-10x-x-109">503</span></a>, <a -href="glossaries-user.html#dx1-28092" >504</a>, <a -href="glossaries-user.html#dx1-28099" >505</a>, <a -href="glossaries-user.html#dx1-29003" >506</a>, <a -href="glossaries-user.html#dx1-29016" >507</a>, <a -href="glossaries-user.html#dx1-29030" >508</a>, <a -href="glossaries-user.html#dx1-29038" >509</a>, <a -href="glossaries-user.html#dx1-30004" >510</a>, <a -href="glossaries-user.html#dx1-30014" >511</a>, <a -href="glossaries-user.html#dx1-32003" >512</a>, <a -href="glossaries-user.html#dx1-41042" >513</a>, <a -href="glossaries-user.html#dx1-41107" >514</a>, <a -href="glossaries-user.html#dx1-42004" >515</a>, <a -href="glossaries-user.html#dx1-42008" >516</a>, <a -href="glossaries-user.html#dx1-44022" >517</a>, <a -href="glossaries-user.html#dx1-45008" >518</a>, <a -href="glossaries-user.html#dx1-45010" >519</a>, <a -href="glossaries-user.html#dx1-45012" >520</a>, <a -href="glossaries-user.html#dx1-45018" >521</a>, <a -href="glossaries-user.html#dx1-45020" >522</a>, <a -href="glossaries-user.html#dx1-46001" >523</a>, <a -href="glossaries-user.html#dx1-7068" >524</a>, <a -href="glossaries-user.html#dx1-32009" >525</a> <br /></span> +class="ec-lmri-10x-x-109">504</span></a>, <a +href="glossaries-user.html#dx1-28092" >505</a>, <a +href="glossaries-user.html#dx1-28099" >506</a>, <a +href="glossaries-user.html#dx1-29003" >507</a>, <a +href="glossaries-user.html#dx1-29016" >508</a>, <a +href="glossaries-user.html#dx1-29030" >509</a>, <a +href="glossaries-user.html#dx1-29038" >510</a>, <a +href="glossaries-user.html#dx1-30004" >511</a>, <a +href="glossaries-user.html#dx1-30014" >512</a>, <a +href="glossaries-user.html#dx1-32003" >513</a>, <a +href="glossaries-user.html#dx1-41042" >514</a>, <a +href="glossaries-user.html#dx1-41107" >515</a>, <a +href="glossaries-user.html#dx1-42004" >516</a>, <a +href="glossaries-user.html#dx1-42008" >517</a>, <a +href="glossaries-user.html#dx1-44022" >518</a>, <a +href="glossaries-user.html#dx1-45008" >519</a>, <a +href="glossaries-user.html#dx1-45010" >520</a>, <a +href="glossaries-user.html#dx1-45012" >521</a>, <a +href="glossaries-user.html#dx1-45018" >522</a>, <a +href="glossaries-user.html#dx1-45020" >523</a>, <a +href="glossaries-user.html#dx1-46001" >524</a>, <a +href="glossaries-user.html#dx1-7068" >525</a>, <a +href="glossaries-user.html#dx1-32009" >526</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls*</span></span></span>  <a -href="glossaries-user.html#dx1-13066" >526</a> <br /></span> +href="glossaries-user.html#dx1-13065" >527</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsadd</span></span></span>  <a href="glossaries-user.html#dx1-31001" ><span -class="ec-lmri-10x-x-109">527</span></a> <br /></span> +class="ec-lmri-10x-x-109">528</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsaddall</span></span></span>  <a -href="glossaries-user.html#dx1-4023" >528</a>, <a +href="glossaries-user.html#dx1-4023" >529</a>, <a href="glossaries-user.html#dx1-31005" ><span -class="ec-lmri-10x-x-109">529</span></a> <br /></span> +class="ec-lmri-10x-x-109">530</span></a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">\glsaddall </span>options<br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">types</span>  <a -href="glossaries-user.html#dx1-31006" >530</a> <br /></span> +href="glossaries-user.html#dx1-31006" >531</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GlsAddXdyAttribute</span></span></span>  <a -href="glossaries-user.html#dx1-28039" >531</a>, <a +href="glossaries-user.html#dx1-28039" >532</a>, <a href="glossaries-user.html#dx1-38017" ><span -class="ec-lmri-10x-x-109">532</span></a> <br /></span> +class="ec-lmri-10x-x-109">533</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GlsAddXdyCounters</span></span></span>  <a href="glossaries-user.html#dx1-38011" ><span -class="ec-lmri-10x-x-109">533</span></a>, <a -href="glossaries-user.html#dx1-38038" >534</a> <br /></span> +class="ec-lmri-10x-x-109">534</span></a>, <a +href="glossaries-user.html#dx1-38038" >535</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GlsAddXdyLocation</span></span></span>  <a href="glossaries-user.html#dx1-38024" ><span -class="ec-lmri-10x-x-109">535</span></a>, <a -href="glossaries-user.html#dx1-38050" >536</a> <br /></span> +class="ec-lmri-10x-x-109">536</span></a>, <a +href="glossaries-user.html#dx1-38050" >537</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsautoprefix</span></span></span>  <a href="glossaries-user.html#dx1-14032" ><span -class="ec-lmri-10x-x-109">537</span></a> <br /></span> +class="ec-lmri-10x-x-109">538</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsclearpage</span></span></span>  <a -href="glossaries-user.html#dx1-14016" >538</a> <br /></span> +href="glossaries-user.html#dx1-14016" >539</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsclosebrace</span></span></span>  <a href="glossaries-user.html#dx1-36012" ><span -class="ec-lmri-10x-x-109">539</span></a> <br /></span> +class="ec-lmri-10x-x-109">540</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsdefaulttype</span></span></span>  <a -href="glossaries-user.html#dx1-25004" >540</a>, <a -href="glossaries-user.html#dx1-60003" >541</a>, <a -href="glossaries-user.html#dx1-17006" >542</a>, <a -href="glossaries-user.html#dx1-17008" >543</a>, <a -href="glossaries-user.html#dx1-25011" >544</a> <br /></span> +href="glossaries-user.html#dx1-25004" >541</a>, <a +href="glossaries-user.html#dx1-60003" >542</a>, <a +href="glossaries-user.html#dx1-17006" >543</a>, <a +href="glossaries-user.html#dx1-17008" >544</a>, <a +href="glossaries-user.html#dx1-25011" >545</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLSdesc</span></span></span>  <a href="glossaries-user.html#dx1-28147" ><span -class="ec-lmri-10x-x-109">545</span></a> <br /></span> +class="ec-lmri-10x-x-109">546</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsdesc</span></span></span>  <a href="glossaries-user.html#dx1-28146" ><span -class="ec-lmri-10x-x-109">546</span></a> <br /></span> +class="ec-lmri-10x-x-109">547</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsdesc</span></span></span>  <a href="glossaries-user.html#dx1-28139" ><span -class="ec-lmri-10x-x-109">547</span></a> <br /></span> +class="ec-lmri-10x-x-109">548</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsdescwidth</span></span></span>  <a href="glossaries-user.html#dx1-47015" ><span -class="ec-lmri-10x-x-109">548</span></a>, <a -href="glossaries-user.html#dx1-49012" >549</a>, <a -href="glossaries-user.html#dx1-49023" >550</a>, <a -href="glossaries-user.html#dx1-49042" >551</a>, <a -href="glossaries-user.html#dx1-50012" >552</a>, <a -href="glossaries-user.html#dx1-50023" >553</a>, <a -href="glossaries-user.html#dx1-50033" >554</a>, <a -href="glossaries-user.html#dx1-51018" >555</a>, <a -href="glossaries-user.html#dx1-51029" >556</a>, <a -href="glossaries-user.html#dx1-51048" >557</a>, <a -href="glossaries-user.html#dx1-52015" >558</a>, <a -href="glossaries-user.html#dx1-52026" >559</a> <br /></span> +class="ec-lmri-10x-x-109">549</span></a>, <a +href="glossaries-user.html#dx1-49012" >550</a>, <a +href="glossaries-user.html#dx1-49023" >551</a>, <a +href="glossaries-user.html#dx1-49042" >552</a>, <a +href="glossaries-user.html#dx1-50012" >553</a>, <a +href="glossaries-user.html#dx1-50023" >554</a>, <a +href="glossaries-user.html#dx1-50033" >555</a>, <a +href="glossaries-user.html#dx1-51018" >556</a>, <a +href="glossaries-user.html#dx1-51029" >557</a>, <a +href="glossaries-user.html#dx1-51048" >558</a>, <a +href="glossaries-user.html#dx1-52015" >559</a>, <a +href="glossaries-user.html#dx1-52026" >560</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsdisablehyper</span></span></span>  <a href="glossaries-user.html#dx1-30006" ><span -class="ec-lmri-10x-x-109">560</span></a> <br /></span> +class="ec-lmri-10x-x-109">561</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsdisp</span></span></span>  <a -href="glossaries-user.html#dx1-2014" >561</a>, <a -href="glossaries-user.html#dx1-2022" >562</a>, <a -href="glossaries-user.html#dx1-19048" >563</a>, <a -href="glossaries-user.html#dx1-28025" >564</a>, <a +href="glossaries-user.html#dx1-2014" >562</a>, <a +href="glossaries-user.html#dx1-2022" >563</a>, <a +href="glossaries-user.html#dx1-19048" >564</a>, <a +href="glossaries-user.html#dx1-28025" >565</a>, <a href="glossaries-user.html#dx1-28091" ><span -class="ec-lmri-10x-x-109">565</span></a>, <a -href="glossaries-user.html#dx1-29024" >566</a>, <a -href="glossaries-user.html#dx1-29032" >567</a>, <a -href="glossaries-user.html#dx1-30016" >568</a> <br /></span> +class="ec-lmri-10x-x-109">566</span></a>, <a +href="glossaries-user.html#dx1-29024" >567</a>, <a +href="glossaries-user.html#dx1-29032" >568</a>, <a +href="glossaries-user.html#dx1-30016" >569</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsdisplay</span></span></span>  <a -href="glossaries-user.html#dx1-19029" >569</a>, <a -href="glossaries-user.html#dx1-19081" >570</a>, <a -href="glossaries-user.html#dx1-28089" >571</a>, <a -href="glossaries-user.html#dx1-28096" >572</a>, <a -href="glossaries-user.html#dx1-28102" >573</a>, <a +href="glossaries-user.html#dx1-19029" >570</a>, <a +href="glossaries-user.html#dx1-19081" >571</a>, <a +href="glossaries-user.html#dx1-28089" >572</a>, <a +href="glossaries-user.html#dx1-28096" >573</a>, <a +href="glossaries-user.html#dx1-28102" >574</a>, <a href="glossaries-user.html#dx1-29007" ><span -class="ec-lmri-10x-x-109">574</span></a>, <a -href="glossaries-user.html#dx1-44046" >575</a>, <a -href="glossaries-user.html#dx1-44055" >576</a> <br /></span> +class="ec-lmri-10x-x-109">575</span></a>, <a +href="glossaries-user.html#dx1-44046" >576</a>, <a +href="glossaries-user.html#dx1-44055" >577</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsdisplayfirst</span></span></span>  <a -href="glossaries-user.html#dx1-19030" >577</a>, <a -href="glossaries-user.html#dx1-19082" >578</a>, <a -href="glossaries-user.html#dx1-28090" >579</a>, <a -href="glossaries-user.html#dx1-28097" >580</a>, <a -href="glossaries-user.html#dx1-28103" >581</a>, <a +href="glossaries-user.html#dx1-19030" >578</a>, <a +href="glossaries-user.html#dx1-19082" >579</a>, <a +href="glossaries-user.html#dx1-28090" >580</a>, <a +href="glossaries-user.html#dx1-28097" >581</a>, <a +href="glossaries-user.html#dx1-28103" >582</a>, <a href="glossaries-user.html#dx1-29005" ><span -class="ec-lmri-10x-x-109">582</span></a>, <a -href="glossaries-user.html#dx1-44045" >583</a>, <a -href="glossaries-user.html#dx1-44054" >584</a> <br /></span> +class="ec-lmri-10x-x-109">583</span></a>, <a +href="glossaries-user.html#dx1-44045" >584</a>, <a +href="glossaries-user.html#dx1-44054" >585</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsdisplaynumberlist</span></span></span>  <a -href="glossaries-user.html#dx1-13072" >585</a>, <a +href="glossaries-user.html#dx1-13071" >586</a>, <a href="glossaries-user.html#dx1-34050" ><span -class="ec-lmri-10x-x-109">586</span></a> <br /></span> +class="ec-lmri-10x-x-109">587</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsenablehyper</span></span></span>  <a href="glossaries-user.html#dx1-30007" ><span -class="ec-lmri-10x-x-109">587</span></a> <br /></span> +class="ec-lmri-10x-x-109">588</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrycounterlabel</span></span></span>  <a -href="glossaries-user.html#dx1-56042" ><span -class="ec-lmri-10x-x-109">588</span></a> <br /></span> +href="glossaries-user.html#dx1-56043" ><span +class="ec-lmri-10x-x-109">589</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentrydesc</span></span></span>  <a href="glossaries-user.html#dx1-34022" ><span -class="ec-lmri-10x-x-109">589</span></a> <br /></span> +class="ec-lmri-10x-x-109">590</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrydesc</span></span></span>  <a href="glossaries-user.html#dx1-34021" ><span -class="ec-lmri-10x-x-109">590</span></a> <br /></span> +class="ec-lmri-10x-x-109">591</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentrydescplural</span></span></span>  <a href="glossaries-user.html#dx1-34024" ><span -class="ec-lmri-10x-x-109">591</span></a> <br /></span> +class="ec-lmri-10x-x-109">592</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrydescplural</span></span></span>  <a href="glossaries-user.html#dx1-34023" ><span -class="ec-lmri-10x-x-109">592</span></a> <br /></span> +class="ec-lmri-10x-x-109">593</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryfirst</span></span></span>  <a href="glossaries-user.html#dx1-34014" ><span -class="ec-lmri-10x-x-109">593</span></a> <br /></span> +class="ec-lmri-10x-x-109">594</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryfirst</span></span></span>  <a href="glossaries-user.html#dx1-34013" ><span -class="ec-lmri-10x-x-109">594</span></a> <br /></span> +class="ec-lmri-10x-x-109">595</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryfirstplural</span></span></span>  <a href="glossaries-user.html#dx1-34018" ><span -class="ec-lmri-10x-x-109">595</span></a> <br /></span> +class="ec-lmri-10x-x-109">596</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryfirstplural</span></span></span>  <a href="glossaries-user.html#dx1-34017" ><span -class="ec-lmri-10x-x-109">596</span></a> <br /></span> +class="ec-lmri-10x-x-109">597</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryfull</span></span></span>  <a href="glossaries-user.html#dx1-41124" ><span -class="ec-lmri-10x-x-109">597</span></a> <br /></span> +class="ec-lmri-10x-x-109">598</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryfull</span></span></span>  <a href="glossaries-user.html#dx1-41123" ><span -class="ec-lmri-10x-x-109">598</span></a> <br /></span> +class="ec-lmri-10x-x-109">599</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryfullpl</span></span></span>  <a href="glossaries-user.html#dx1-41126" ><span -class="ec-lmri-10x-x-109">599</span></a> <br /></span> +class="ec-lmri-10x-x-109">600</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryfullpl</span></span></span>  <a href="glossaries-user.html#dx1-41125" ><span -class="ec-lmri-10x-x-109">600</span></a> <br /></span> +class="ec-lmri-10x-x-109">601</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryitem</span></span></span>  <a -href="glossaries-user.html#dx1-56039" ><span -class="ec-lmri-10x-x-109">601</span></a>, <a -href="glossaries-user.html#dx1-57010" >602</a> <br /></span> +href="glossaries-user.html#dx1-56040" ><span +class="ec-lmri-10x-x-109">602</span></a>, <a +href="glossaries-user.html#dx1-57010" >603</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentrylong</span></span></span>  <a href="glossaries-user.html#dx1-41116" ><span -class="ec-lmri-10x-x-109">603</span></a> <br /></span> +class="ec-lmri-10x-x-109">604</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrylong</span></span></span>  <a href="glossaries-user.html#dx1-41115" ><span -class="ec-lmri-10x-x-109">604</span></a>, <a -href="glossaries-user.html#dx1-44041" >605</a> <br /></span> +class="ec-lmri-10x-x-109">605</span></a>, <a +href="glossaries-user.html#dx1-44041" >606</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentrylongpl</span></span></span>  <a href="glossaries-user.html#dx1-41118" ><span -class="ec-lmri-10x-x-109">606</span></a> <br /></span> +class="ec-lmri-10x-x-109">607</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrylongpl</span></span></span>  <a href="glossaries-user.html#dx1-41117" ><span -class="ec-lmri-10x-x-109">607</span></a> <br /></span> +class="ec-lmri-10x-x-109">608</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryname</span></span></span>  <a href="glossaries-user.html#dx1-34005" ><span -class="ec-lmri-10x-x-109">608</span></a> <br /></span> +class="ec-lmri-10x-x-109">609</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryname</span></span></span>  <a -href="glossaries-user.html#dx1-5022" >609</a>, <a +href="glossaries-user.html#dx1-5022" >610</a>, <a href="glossaries-user.html#dx1-34004" ><span -class="ec-lmri-10x-x-109">610</span></a>, <a -href="glossaries-user.html#dx1-62064" >611</a>, <a -href="glossaries-user.html#dx1-34044" >612</a> <br /></span> +class="ec-lmri-10x-x-109">611</span></a>, <a +href="glossaries-user.html#dx1-62064" >612</a>, <a +href="glossaries-user.html#dx1-34044" >613</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrynumberlist</span></span></span>  <a -href="glossaries-user.html#dx1-13071" >613</a>, <a +href="glossaries-user.html#dx1-13070" >614</a>, <a href="glossaries-user.html#dx1-34049" ><span -class="ec-lmri-10x-x-109">614</span></a> <br /></span> +class="ec-lmri-10x-x-109">615</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryplural</span></span></span>  <a href="glossaries-user.html#dx1-34011" ><span -class="ec-lmri-10x-x-109">615</span></a> <br /></span> +class="ec-lmri-10x-x-109">616</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryplural</span></span></span>  <a href="glossaries-user.html#dx1-34010" ><span -class="ec-lmri-10x-x-109">616</span></a> <br /></span> +class="ec-lmri-10x-x-109">617</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryshort</span></span></span>  <a href="glossaries-user.html#dx1-41120" ><span -class="ec-lmri-10x-x-109">617</span></a> <br /></span> +class="ec-lmri-10x-x-109">618</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryshort</span></span></span>  <a href="glossaries-user.html#dx1-41119" ><span -class="ec-lmri-10x-x-109">618</span></a> <br /></span> +class="ec-lmri-10x-x-109">619</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryshortpl</span></span></span>  <a href="glossaries-user.html#dx1-41122" ><span -class="ec-lmri-10x-x-109">619</span></a> <br /></span> +class="ec-lmri-10x-x-109">620</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryshortpl</span></span></span>  <a href="glossaries-user.html#dx1-41121" ><span -class="ec-lmri-10x-x-109">620</span></a> <br /></span> +class="ec-lmri-10x-x-109">621</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentrysymbol</span></span></span>  <a href="glossaries-user.html#dx1-34026" ><span -class="ec-lmri-10x-x-109">621</span></a> <br /></span> +class="ec-lmri-10x-x-109">622</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrysymbol</span></span></span>  <a href="glossaries-user.html#dx1-34025" ><span -class="ec-lmri-10x-x-109">622</span></a> <br /></span> +class="ec-lmri-10x-x-109">623</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentrysymbolplural</span></span></span>  <a href="glossaries-user.html#dx1-34028" ><span -class="ec-lmri-10x-x-109">623</span></a> <br /></span> +class="ec-lmri-10x-x-109">624</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrysymbolplural</span></span></span>  <a href="glossaries-user.html#dx1-34027" ><span -class="ec-lmri-10x-x-109">624</span></a> <br /></span> +class="ec-lmri-10x-x-109">625</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentrytext</span></span></span>  <a href="glossaries-user.html#dx1-34008" ><span -class="ec-lmri-10x-x-109">625</span></a> <br /></span> +class="ec-lmri-10x-x-109">626</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrytext</span></span></span>  <a -href="glossaries-user.html#dx1-5020" >626</a>, <a -href="glossaries-user.html#dx1-28011" >627</a>, <a -href="glossaries-user.html#dx1-33013" >628</a>, <a +href="glossaries-user.html#dx1-5020" >627</a>, <a +href="glossaries-user.html#dx1-28011" >628</a>, <a +href="glossaries-user.html#dx1-33013" >629</a>, <a href="glossaries-user.html#dx1-34007" ><span -class="ec-lmri-10x-x-109">629</span></a>, <a -href="glossaries-user.html#dx1-34042" >630</a>, <a -href="glossaries-user.html#dx1-41114" >631</a>, <a -href="glossaries-user.html#dx1-62066" >632</a> <br /></span> +class="ec-lmri-10x-x-109">630</span></a>, <a +href="glossaries-user.html#dx1-34042" >631</a>, <a +href="glossaries-user.html#dx1-41114" >632</a>, <a +href="glossaries-user.html#dx1-62066" >633</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryuseri</span></span></span>  <a href="glossaries-user.html#dx1-34030" ><span -class="ec-lmri-10x-x-109">633</span></a> <br /></span> +class="ec-lmri-10x-x-109">634</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryuseri</span></span></span>  <a href="glossaries-user.html#dx1-34029" ><span -class="ec-lmri-10x-x-109">634</span></a> <br /></span> +class="ec-lmri-10x-x-109">635</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryuserii</span></span></span>  <a href="glossaries-user.html#dx1-34032" ><span -class="ec-lmri-10x-x-109">635</span></a> <br /></span> +class="ec-lmri-10x-x-109">636</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryuserii</span></span></span>  <a href="glossaries-user.html#dx1-34031" ><span -class="ec-lmri-10x-x-109">636</span></a> <br /></span> +class="ec-lmri-10x-x-109">637</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryuseriii</span></span></span>  <a href="glossaries-user.html#dx1-34034" ><span -class="ec-lmri-10x-x-109">637</span></a> <br /></span> +class="ec-lmri-10x-x-109">638</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryuseriii</span></span></span>  <a href="glossaries-user.html#dx1-34033" ><span -class="ec-lmri-10x-x-109">638</span></a> <br /></span> +class="ec-lmri-10x-x-109">639</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryuseriv</span></span></span>  <a href="glossaries-user.html#dx1-34036" ><span -class="ec-lmri-10x-x-109">639</span></a> <br /></span> +class="ec-lmri-10x-x-109">640</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryuseriv</span></span></span>  <a href="glossaries-user.html#dx1-34035" ><span -class="ec-lmri-10x-x-109">640</span></a> <br /></span> +class="ec-lmri-10x-x-109">641</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryuserv</span></span></span>  <a href="glossaries-user.html#dx1-34038" ><span -class="ec-lmri-10x-x-109">641</span></a> <br /></span> +class="ec-lmri-10x-x-109">642</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryuserv</span></span></span>  <a href="glossaries-user.html#dx1-34037" ><span -class="ec-lmri-10x-x-109">642</span></a> <br /></span> +class="ec-lmri-10x-x-109">643</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryuservi</span></span></span>  <a href="glossaries-user.html#dx1-34040" ><span -class="ec-lmri-10x-x-109">643</span></a> <br /></span> +class="ec-lmri-10x-x-109">644</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryuservi</span></span></span>  <a href="glossaries-user.html#dx1-34039" ><span -class="ec-lmri-10x-x-109">644</span></a> <br /></span> +class="ec-lmri-10x-x-109">645</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLSfirst</span></span></span>  <a href="glossaries-user.html#dx1-28110" ><span -class="ec-lmri-10x-x-109">645</span></a> <br /></span> +class="ec-lmri-10x-x-109">646</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsfirst</span></span></span>  <a href="glossaries-user.html#dx1-28109" ><span -class="ec-lmri-10x-x-109">646</span></a> <br /></span> +class="ec-lmri-10x-x-109">647</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsfirst</span></span></span>  <a href="glossaries-user.html#dx1-28106" ><span -class="ec-lmri-10x-x-109">647</span></a> <br /></span> +class="ec-lmri-10x-x-109">648</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLSfirstplural</span></span></span>  <a href="glossaries-user.html#dx1-28120" ><span -class="ec-lmri-10x-x-109">648</span></a> <br /></span> +class="ec-lmri-10x-x-109">649</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsfirstplural</span></span></span>  <a href="glossaries-user.html#dx1-28119" ><span -class="ec-lmri-10x-x-109">649</span></a> <br /></span> +class="ec-lmri-10x-x-109">650</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsfirstplural</span></span></span>  <a href="glossaries-user.html#dx1-28116" ><span -class="ec-lmri-10x-x-109">650</span></a> <br /></span> +class="ec-lmri-10x-x-109">651</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsgetgrouptitle</span></span></span>  <a href="glossaries-user.html#dx1-56028" ><span -class="ec-lmri-10x-x-109">651</span></a> <br /></span> +class="ec-lmri-10x-x-109">652</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsgroupheading</span></span></span>  <a href="glossaries-user.html#dx1-56020" ><span -class="ec-lmri-10x-x-109">652</span></a>, <a -href="glossaries-user.html#dx1-57005" >653</a> <br /></span> +class="ec-lmri-10x-x-109">653</span></a>, <a +href="glossaries-user.html#dx1-57005" >654</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsgroupskip</span></span></span>  <a -href="glossaries-user.html#dx1-2001" >654</a>, <a -href="glossaries-user.html#dx1-4018" >655</a>, <a +href="glossaries-user.html#dx1-2001" >655</a>, <a href="glossaries-user.html#dx1-47028" >656</a>, <a href="glossaries-user.html#dx1-56032" ><span class="ec-lmri-10x-x-109">657</span></a>, <a @@ -17165,7 +17221,7 @@ href="glossaries-user.html#dx1-62065" >703</a> <br /></span> class="ec-lmtt-10x-x-109">\glsnamefont</span></span></span>  <a href="glossaries-user.html#dx1-35041" ><span class="ec-lmri-10x-x-109">704</span></a>, <a -href="glossaries-user.html#dx1-56036" >705</a> <br /></span> +href="glossaries-user.html#dx1-56037" >705</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsnavhypertarget</span></span></span>  <a href="glossaries-user.html#dx1-56029" ><span @@ -17262,7 +17318,7 @@ href="glossaries-user.html#dx1-20001" ><span class="ec-lmri-10x-x-109">756</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glspostdescription</span></span></span>  <a -href="glossaries-user.html#dx1-47034" ><span +href="glossaries-user.html#dx1-47035" ><span class="ec-lmri-10x-x-109">757</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glspostinline</span></span></span>  <a @@ -17370,11 +17426,11 @@ class="ec-lmtt-10x-x-109">\glsshorttok</span></span></span>  <a href="glossaries-user.html#dx1-44005" >794</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glssubentrycounterlabel</span></span></span>  <a -href="glossaries-user.html#dx1-56061" ><span +href="glossaries-user.html#dx1-56062" ><span class="ec-lmri-10x-x-109">795</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glssubentryitem</span></span></span>  <a -href="glossaries-user.html#dx1-56058" ><span +href="glossaries-user.html#dx1-56059" ><span class="ec-lmri-10x-x-109">796</span></a>, <a href="glossaries-user.html#dx1-57011" >797</a> <br /></span> @@ -17397,9 +17453,9 @@ class="ec-lmtt-10x-x-109">\glssymbolsgroupname</span></span></span> � href="glossaries-user.html#dx1-6021" >801</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glstarget</span></span></span>  <a -href="glossaries-user.html#dx1-56043" ><span +href="glossaries-user.html#dx1-56044" ><span class="ec-lmri-10x-x-109">802</span></a>, <a -href="glossaries-user.html#dx1-56060" >803</a> <br /></span> +href="glossaries-user.html#dx1-56061" >803</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLStext</span></span></span>  <a href="glossaries-user.html#dx1-28105" ><span @@ -17565,7 +17621,7 @@ href="glossaries-user.html#dx1-34062" >861</a>, <a href="glossaries-user.html#dx1-38030" >862</a>, <a href="glossaries-user.html#dx1-38039" >863</a>, <a href="glossaries-user.html#dx1-44058" >864</a>, <a -href="glossaries-user.html#dx1-56044" >865</a> <br /></span> +href="glossaries-user.html#dx1-56045" >865</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\hyperrm</span></span></span>  <a href="glossaries-user.html#dx1-28048" >866</a>, <a @@ -17829,8 +17885,8 @@ href="glossaries-user.html#dx1-10029" >1042</a>, <a href="glossaries-user.html#dx1-11004" >1043</a>, <a href="glossaries-user.html#dx1-11008" >1044</a>, <a href="glossaries-user.html#dx1-11019" >1045</a>, <a -href="glossaries-user.html#dx1-13033" >1046</a>, <a -href="glossaries-user.html#dx1-13038" >1047</a>, <a +href="glossaries-user.html#dx1-13032" >1046</a>, <a +href="glossaries-user.html#dx1-13037" >1047</a>, <a href="glossaries-user.html#dx1-15009" >1048</a>, <a href="glossaries-user.html#dx1-16020" >1049</a>, <a href="glossaries-user.html#dx1-16024" >1050</a>, <a @@ -17901,7 +17957,7 @@ href="glossaries-user.html#dx1-44019" >1099</a>, <a href="glossaries-user.html#dx1-44027" >1100</a>, <a href="glossaries-user.html#dx1-44034" >1101</a>, <a href="glossaries-user.html#dx1-45006" >1102</a>, <a -href="glossaries-user.html#dx1-56038" >1103</a>, <a +href="glossaries-user.html#dx1-56039" >1103</a>, <a href="glossaries-user.html#dx1-61023" >1104</a>, <a href="glossaries-user.html#dx1-61026" >1105</a>, <a href="glossaries-user.html#dx1-61029" >1106</a>, <a @@ -17937,7 +17993,7 @@ href="glossaries-user.html#dx1-41031" >1127</a>, <a href="glossaries-user.html#dx1-41041" >1128</a>, <a href="glossaries-user.html#dx1-44002" >1129</a>, <a href="glossaries-user.html#dx1-44020" >1130</a>, <a -href="glossaries-user.html#dx1-56037" >1131</a>, <a +href="glossaries-user.html#dx1-56038" >1131</a>, <a href="glossaries-user.html#dx1-19002" >1132</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">\newglossaryentry </span>options<br /></span> @@ -17948,8 +18004,8 @@ href="glossaries-user.html#dx1-61003" >1133</a> <br /></span> class="ec-lmss-10x-x-109">description</span>  <a href="glossaries-user.html#dx1-2041" >1134</a>, <a href="glossaries-user.html#dx1-13009" >1135</a>, <a -href="glossaries-user.html#dx1-13012" >1136</a>, <a -href="glossaries-user.html#dx1-13017" >1137</a>, <a +href="glossaries-user.html#dx1-13013" >1136</a>, <a +href="glossaries-user.html#dx1-13019" >1137</a>, <a href="glossaries-user.html#dx1-19018" >1138</a>, <a href="glossaries-user.html#dx1-19023" >1139</a>, <a href="glossaries-user.html#dx1-19034" >1140</a>, <a @@ -18047,10 +18103,10 @@ class="ec-lmss-10x-x-109">name</span>  <a href="glossaries-user.html#dx1-2040" >1206</a>, <a href="glossaries-user.html#dx1-5017" >1207</a>, <a href="glossaries-user.html#dx1-13008" >1208</a>, <a -href="glossaries-user.html#dx1-13013" >1209</a>, <a -href="glossaries-user.html#dx1-13016" >1210</a>, <a -href="glossaries-user.html#dx1-13024" >1211</a>, <a -href="glossaries-user.html#dx1-13025" >1212</a>, <a +href="glossaries-user.html#dx1-13014" >1209</a>, <a +href="glossaries-user.html#dx1-13018" >1210</a>, <a +href="glossaries-user.html#dx1-13023" >1211</a>, <a +href="glossaries-user.html#dx1-13024" >1212</a>, <a href="glossaries-user.html#dx1-16005" >1213</a>, <a href="glossaries-user.html#dx1-19019" >1214</a>, <a href="glossaries-user.html#dx1-19021" >1215</a>, <a @@ -18138,916 +18194,934 @@ class="ec-lmss-10x-x-109">shortpluralaccess</span>  <a href="glossaries-user.html#dx1-61030" >1276</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">sort</span>  <a -href="glossaries-user.html#dx1-13019" >1277</a>, <a -href="glossaries-user.html#dx1-16003" >1278</a>, <a -href="glossaries-user.html#dx1-16006" >1279</a>, <a -href="glossaries-user.html#dx1-16008" >1280</a>, <a -href="glossaries-user.html#dx1-16010" >1281</a>, <a -href="glossaries-user.html#dx1-19087" >1282</a>, <a -href="glossaries-user.html#dx1-19093" >1283</a>, <a -href="glossaries-user.html#dx1-19097" >1284</a>, <a -href="glossaries-user.html#dx1-19128" >1285</a>, <a -href="glossaries-user.html#dx1-24005" >1286</a>, <a -href="glossaries-user.html#dx1-56023" >1287</a>, <a -href="glossaries-user.html#dx1-56025" >1288</a>, <a -href="glossaries-user.html#dx1-62010" >1289</a>, <a -href="glossaries-user.html#dx1-62085" >1290</a> <br /></span> +href="glossaries-user.html#dx1-2043" >1277</a>, <a +href="glossaries-user.html#dx1-13011" >1278</a>, <a +href="glossaries-user.html#dx1-13017" >1279</a>, <a +href="glossaries-user.html#dx1-13021" >1280</a>, <a +href="glossaries-user.html#dx1-16003" >1281</a>, <a +href="glossaries-user.html#dx1-16006" >1282</a>, <a +href="glossaries-user.html#dx1-16008" >1283</a>, <a +href="glossaries-user.html#dx1-16010" >1284</a>, <a +href="glossaries-user.html#dx1-19087" >1285</a>, <a +href="glossaries-user.html#dx1-19093" >1286</a>, <a +href="glossaries-user.html#dx1-19097" >1287</a>, <a +href="glossaries-user.html#dx1-19128" >1288</a>, <a +href="glossaries-user.html#dx1-24005" >1289</a>, <a +href="glossaries-user.html#dx1-56023" >1290</a>, <a +href="glossaries-user.html#dx1-56025" >1291</a>, <a +href="glossaries-user.html#dx1-62010" >1292</a>, <a +href="glossaries-user.html#dx1-62085" >1293</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">symbol</span>  <a -href="glossaries-user.html#dx1-2042" >1291</a>, <a -href="glossaries-user.html#dx1-13010" >1292</a>, <a -href="glossaries-user.html#dx1-13014" >1293</a>, <a -href="glossaries-user.html#dx1-13018" >1294</a>, <a -href="glossaries-user.html#dx1-19076" >1295</a>, <a -href="glossaries-user.html#dx1-19086" >1296</a>, <a -href="glossaries-user.html#dx1-28132" >1297</a>, <a -href="glossaries-user.html#dx1-28133" >1298</a>, <a -href="glossaries-user.html#dx1-28136" >1299</a>, <a -href="glossaries-user.html#dx1-29014" >1300</a>, <a -href="glossaries-user.html#dx1-29025" >1301</a>, <a -href="glossaries-user.html#dx1-29039" >1302</a>, <a -href="glossaries-user.html#dx1-43005" >1303</a>, <a -href="glossaries-user.html#dx1-43016" >1304</a>, <a -href="glossaries-user.html#dx1-44012" >1305</a>, <a -href="glossaries-user.html#dx1-44033" >1306</a>, <a -href="glossaries-user.html#dx1-44052" >1307</a>, <a -href="glossaries-user.html#dx1-61014" >1308</a> <br /></span> +href="glossaries-user.html#dx1-2042" >1294</a>, <a +href="glossaries-user.html#dx1-13010" >1295</a>, <a +href="glossaries-user.html#dx1-13015" >1296</a>, <a +href="glossaries-user.html#dx1-13020" >1297</a>, <a +href="glossaries-user.html#dx1-19076" >1298</a>, <a +href="glossaries-user.html#dx1-19086" >1299</a>, <a +href="glossaries-user.html#dx1-28132" >1300</a>, <a +href="glossaries-user.html#dx1-28133" >1301</a>, <a +href="glossaries-user.html#dx1-28136" >1302</a>, <a +href="glossaries-user.html#dx1-29014" >1303</a>, <a +href="glossaries-user.html#dx1-29025" >1304</a>, <a +href="glossaries-user.html#dx1-29039" >1305</a>, <a +href="glossaries-user.html#dx1-43005" >1306</a>, <a +href="glossaries-user.html#dx1-43016" >1307</a>, <a +href="glossaries-user.html#dx1-44012" >1308</a>, <a +href="glossaries-user.html#dx1-44033" >1309</a>, <a +href="glossaries-user.html#dx1-44052" >1310</a>, <a +href="glossaries-user.html#dx1-61014" >1311</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">symbolaccess</span>  <a -href="glossaries-user.html#dx1-61013" >1309</a> <br /></span> +href="glossaries-user.html#dx1-61013" >1312</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">symbolplural</span>  <a -href="glossaries-user.html#dx1-19080" >1310</a>, <a -href="glossaries-user.html#dx1-29015" >1311</a>, <a -href="glossaries-user.html#dx1-61016" >1312</a> <br /></span> +href="glossaries-user.html#dx1-19080" >1313</a>, <a +href="glossaries-user.html#dx1-29015" >1314</a>, <a +href="glossaries-user.html#dx1-61016" >1315</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">symbolpluralaccess</span>  <a -href="glossaries-user.html#dx1-61015" >1313</a> <br /></span> +href="glossaries-user.html#dx1-61015" >1316</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">text</span>  <a -href="glossaries-user.html#dx1-13023" >1314</a>, <a -href="glossaries-user.html#dx1-13026" >1315</a>, <a -href="glossaries-user.html#dx1-19038" >1316</a>, <a -href="glossaries-user.html#dx1-19044" >1317</a>, <a -href="glossaries-user.html#dx1-19055" >1318</a>, <a -href="glossaries-user.html#dx1-28021" >1319</a>, <a -href="glossaries-user.html#dx1-28070" >1320</a>, <a -href="glossaries-user.html#dx1-28074" >1321</a>, <a -href="glossaries-user.html#dx1-28094" >1322</a>, <a -href="glossaries-user.html#dx1-28100" >1323</a>, <a -href="glossaries-user.html#dx1-29008" >1324</a>, <a -href="glossaries-user.html#dx1-34009" >1325</a>, <a -href="glossaries-user.html#dx1-41006" >1326</a>, <a -href="glossaries-user.html#dx1-41030" >1327</a>, <a -href="glossaries-user.html#dx1-44010" >1328</a>, <a -href="glossaries-user.html#dx1-44029" >1329</a>, <a -href="glossaries-user.html#dx1-44032" >1330</a>, <a -href="glossaries-user.html#dx1-44049" >1331</a>, <a -href="glossaries-user.html#dx1-46005" >1332</a>, <a -href="glossaries-user.html#dx1-61006" >1333</a> <br /></span> +href="glossaries-user.html#dx1-13022" >1317</a>, <a +href="glossaries-user.html#dx1-13025" >1318</a>, <a +href="glossaries-user.html#dx1-19038" >1319</a>, <a +href="glossaries-user.html#dx1-19044" >1320</a>, <a +href="glossaries-user.html#dx1-19055" >1321</a>, <a +href="glossaries-user.html#dx1-28021" >1322</a>, <a +href="glossaries-user.html#dx1-28070" >1323</a>, <a +href="glossaries-user.html#dx1-28074" >1324</a>, <a +href="glossaries-user.html#dx1-28094" >1325</a>, <a +href="glossaries-user.html#dx1-28100" >1326</a>, <a +href="glossaries-user.html#dx1-29008" >1327</a>, <a +href="glossaries-user.html#dx1-34009" >1328</a>, <a +href="glossaries-user.html#dx1-41006" >1329</a>, <a +href="glossaries-user.html#dx1-41030" >1330</a>, <a +href="glossaries-user.html#dx1-44010" >1331</a>, <a +href="glossaries-user.html#dx1-44029" >1332</a>, <a +href="glossaries-user.html#dx1-44032" >1333</a>, <a +href="glossaries-user.html#dx1-44049" >1334</a>, <a +href="glossaries-user.html#dx1-46005" >1335</a>, <a +href="glossaries-user.html#dx1-61006" >1336</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">textaccess</span>  <a -href="glossaries-user.html#dx1-61005" >1334</a> <br /></span> +href="glossaries-user.html#dx1-61005" >1337</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">type</span>  <a -href="glossaries-user.html#dx1-19099" >1335</a>, <a -href="glossaries-user.html#dx1-25003" >1336</a> <br /></span> +href="glossaries-user.html#dx1-19099" >1338</a>, <a +href="glossaries-user.html#dx1-25003" >1339</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">user1</span>  <a -href="glossaries-user.html#dx1-1001" >1337</a>, <a -href="glossaries-user.html#dx1-19101" >1338</a>, <a -href="glossaries-user.html#dx1-28150" >1339</a>, <a -href="glossaries-user.html#sec:exuserstyle" >1340</a>, <a -href="glossaries-user.html#dx1-59003" >1341</a>, <a -href="glossaries-user.html#dx1-59004" >1342</a> <br /></span> +href="glossaries-user.html#dx1-1001" >1340</a>, <a +href="glossaries-user.html#dx1-19101" >1341</a>, <a +href="glossaries-user.html#dx1-28150" >1342</a>, <a +href="glossaries-user.html#x1-5900016.3" >1343</a>, <a +href="glossaries-user.html#dx1-59003" >1344</a>, <a +href="glossaries-user.html#dx1-59004" >1345</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">user2</span>  <a -href="glossaries-user.html#dx1-19103" >1343</a>, <a -href="glossaries-user.html#dx1-59005" >1344</a> <br /></span> +href="glossaries-user.html#dx1-19103" >1346</a>, <a +href="glossaries-user.html#dx1-59005" >1347</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">user3</span>  <a -href="glossaries-user.html#dx1-19104" >1345</a> <br /></span> +href="glossaries-user.html#dx1-19104" >1348</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">user4</span>  <a -href="glossaries-user.html#dx1-19105" >1346</a> <br /></span> +href="glossaries-user.html#dx1-19105" >1349</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">user5</span>  <a -href="glossaries-user.html#dx1-19106" >1347</a> <br /></span> +href="glossaries-user.html#dx1-19106" >1350</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">user6</span>  <a -href="glossaries-user.html#dx1-1002" >1348</a>, <a -href="glossaries-user.html#dx1-19102" >1349</a>, <a -href="glossaries-user.html#sec:exuserstyle" >1350</a> <br /></span> +href="glossaries-user.html#dx1-1002" >1351</a>, <a +href="glossaries-user.html#dx1-19102" >1352</a>, <a +href="glossaries-user.html#x1-5900016.3" >1353</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\newglossarystyle</span></span></span>  <a -href="glossaries-user.html#dx1-47031" >1351</a>, <a +href="glossaries-user.html#dx1-47031" >1354</a>, <a href="glossaries-user.html#dx1-56001" ><span -class="ec-lmri-10x-x-109">1352</span></a>, <a -href="glossaries-user.html#dx1-56031" >1353</a>, <a -href="glossaries-user.html#dx1-58002" >1354</a> <br /></span> +class="ec-lmri-10x-x-109">1355</span></a>, <a +href="glossaries-user.html#dx1-56031" >1356</a>, <a +href="glossaries-user.html#dx1-58002" >1357</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\newline</span></span></span>  <a -href="glossaries-user.html#dx1-19026" >1355</a>, <a -href="glossaries-user.html#dx1-47025" >1356</a> <br /></span> +href="glossaries-user.html#dx1-19026" >1358</a>, <a +href="glossaries-user.html#dx1-47025" >1359</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">ngerman </span>package  <a -href="glossaries-user.html#dx1-6007" >1357</a>, <a -href="glossaries-user.html#dx1-36013" >1358</a> <br /></span> +href="glossaries-user.html#dx1-6007" >1360</a>, <a +href="glossaries-user.html#dx1-36013" >1361</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\nohyperpage</span></span></span>  <a -href="glossaries-user.html#dx1-27024" >1359</a> <br /></span> +href="glossaries-user.html#dx1-27024" >1362</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\noist</span></span></span>  <a -href="glossaries-user.html#dx1-4065" >1360</a>, <a +href="glossaries-user.html#dx1-4065" >1363</a>, <a href="glossaries-user.html#dx1-18012" ><span -class="ec-lmri-10x-x-109">1361</span></a>, <a -href="glossaries-user.html#dx1-27014" >1362</a>, <a -href="glossaries-user.html#dx1-27026" >1363</a>, <a -href="glossaries-user.html#dx1-36019" >1364</a>, <a -href="glossaries-user.html#dx1-37016" >1365</a>, <a -href="glossaries-user.html#dx1-38021" >1366</a>, <a -href="glossaries-user.html#dx1-38027" >1367</a>, <a -href="glossaries-user.html#dx1-38052" >1368</a>, <a -href="glossaries-user.html#dx1-38060" >1369</a>, <a -href="glossaries-user.html#dx1-39003" >1370</a>, <a -href="glossaries-user.html#dx1-19016" >1371</a> <br /></span> +class="ec-lmri-10x-x-109">1364</span></a>, <a +href="glossaries-user.html#dx1-27014" >1365</a>, <a +href="glossaries-user.html#dx1-27026" >1366</a>, <a +href="glossaries-user.html#dx1-36019" >1367</a>, <a +href="glossaries-user.html#dx1-37016" >1368</a>, <a +href="glossaries-user.html#dx1-38021" >1369</a>, <a +href="glossaries-user.html#dx1-38027" >1370</a>, <a +href="glossaries-user.html#dx1-38052" >1371</a>, <a +href="glossaries-user.html#dx1-38060" >1372</a>, <a +href="glossaries-user.html#dx1-39003" >1373</a>, <a +href="glossaries-user.html#dx1-19016" >1374</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\nopostdesc</span></span></span>  <a href="glossaries-user.html#dx1-19024" ><span -class="ec-lmri-10x-x-109">1372</span></a>, <a -href="glossaries-user.html#dx1-23002" >1373</a>, <a -href="glossaries-user.html#dx1-24002" >1374</a>, <a -href="glossaries-user.html#dx1-47035" >1375</a> <br /></span> +class="ec-lmri-10x-x-109">1375</span></a>, <a +href="glossaries-user.html#dx1-23002" >1376</a>, <a +href="glossaries-user.html#dx1-24002" >1377</a>, <a +href="glossaries-user.html#dx1-47036" >1378</a> <br /></span> <span class="index-item">number list  <a -href="glossaries-user.html#dx1-2026" >1376</a>, <a +href="glossaries-user.html#dx1-2026" >1379</a>, <a href="glossaries-user.html#dx1-2036" ><span -class="ec-lmbx-10x-x-109">1377</span></a>, <a -href="glossaries-user.html#dx1-4022" >1378</a>, <a -href="glossaries-user.html#dx1-4035" >1379</a>, <a -href="glossaries-user.html#dx1-7078" >1380</a>, <a -href="glossaries-user.html#dx1-13069" >1381</a>, <a -href="glossaries-user.html#dx1-15052" >1382</a>, <a -href="glossaries-user.html#dx1-15055" >1383</a>, <a -href="glossaries-user.html#dx1-15066" >1384</a>, <a -href="glossaries-user.html#dx1-18025" >1385</a>, <a -href="glossaries-user.html#dx1-18033" >1386</a>, <a -href="glossaries-user.html#dx1-18035" >1387</a>, <a -href="glossaries-user.html#dx1-19109" >1388</a>, <a -href="glossaries-user.html#dx1-19112" >1389</a>, <a -href="glossaries-user.html#dx1-19117" >1390</a>, <a -href="glossaries-user.html#dx1-22003" >1391</a>, <a -href="glossaries-user.html#dx1-24004" >1392</a>, <a -href="glossaries-user.html#dx1-27002" >1393</a>, <a -href="glossaries-user.html#dx1-28009" >1394</a>, <a -href="glossaries-user.html#dx1-32021" >1395</a>, <a -href="glossaries-user.html#dx1-32023" >1396</a>, <a -href="glossaries-user.html#dx1-32025" >1397</a>, <a -href="glossaries-user.html#dx1-32030" >1398</a>, <a -href="glossaries-user.html#dx1-34052" >1399</a>, <a -href="glossaries-user.html#dx1-38003" >1400</a>, <a -href="glossaries-user.html#dx1-38045" >1401</a>, <a -href="glossaries-user.html#dx1-38056" >1402</a>, <a -href="glossaries-user.html#dx1-40003" >1403</a>, <a -href="glossaries-user.html#dx1-48011" >1404</a>, <a -href="glossaries-user.html#dx1-48033" >1405</a>, <a -href="glossaries-user.html#dx1-49011" >1406</a>, <a -href="glossaries-user.html#dx1-49022" >1407</a>, <a -href="glossaries-user.html#dx1-50011" >1408</a>, <a -href="glossaries-user.html#dx1-50022" >1409</a>, <a -href="glossaries-user.html#dx1-51017" >1410</a>, <a -href="glossaries-user.html#dx1-51028" >1411</a>, <a -href="glossaries-user.html#dx1-52014" >1412</a>, <a -href="glossaries-user.html#dx1-52025" >1413</a>, <a -href="glossaries-user.html#dx1-55004" >1414</a>, <a -href="glossaries-user.html#dx1-57009" >1415</a> <br /></span> +class="ec-lmbx-10x-x-109">1380</span></a>, <a +href="glossaries-user.html#dx1-4022" >1381</a>, <a +href="glossaries-user.html#dx1-4035" >1382</a>, <a +href="glossaries-user.html#dx1-7078" >1383</a>, <a +href="glossaries-user.html#dx1-13068" >1384</a>, <a +href="glossaries-user.html#dx1-15052" >1385</a>, <a +href="glossaries-user.html#dx1-15055" >1386</a>, <a +href="glossaries-user.html#dx1-15066" >1387</a>, <a +href="glossaries-user.html#dx1-18025" >1388</a>, <a +href="glossaries-user.html#dx1-18033" >1389</a>, <a +href="glossaries-user.html#dx1-18035" >1390</a>, <a +href="glossaries-user.html#dx1-19109" >1391</a>, <a +href="glossaries-user.html#dx1-19112" >1392</a>, <a +href="glossaries-user.html#dx1-19117" >1393</a>, <a +href="glossaries-user.html#dx1-22003" >1394</a>, <a +href="glossaries-user.html#dx1-24004" >1395</a>, <a +href="glossaries-user.html#dx1-27002" >1396</a>, <a +href="glossaries-user.html#dx1-28009" >1397</a>, <a +href="glossaries-user.html#dx1-32021" >1398</a>, <a +href="glossaries-user.html#dx1-32023" >1399</a>, <a +href="glossaries-user.html#dx1-32025" >1400</a>, <a +href="glossaries-user.html#dx1-32030" >1401</a>, <a +href="glossaries-user.html#dx1-34052" >1402</a>, <a +href="glossaries-user.html#dx1-38003" >1403</a>, <a +href="glossaries-user.html#dx1-38045" >1404</a>, <a +href="glossaries-user.html#dx1-38056" >1405</a>, <a +href="glossaries-user.html#dx1-40003" >1406</a>, <a +href="glossaries-user.html#dx1-48011" >1407</a>, <a +href="glossaries-user.html#dx1-48033" >1408</a>, <a +href="glossaries-user.html#dx1-49011" >1409</a>, <a +href="glossaries-user.html#dx1-49022" >1410</a>, <a +href="glossaries-user.html#dx1-50011" >1411</a>, <a +href="glossaries-user.html#dx1-50022" >1412</a>, <a +href="glossaries-user.html#dx1-51017" >1413</a>, <a +href="glossaries-user.html#dx1-51028" >1414</a>, <a +href="glossaries-user.html#dx1-52014" >1415</a>, <a +href="glossaries-user.html#dx1-52025" >1416</a>, <a +href="glossaries-user.html#dx1-55004" >1417</a>, <a +href="glossaries-user.html#dx1-57009" >1418</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\numberline</span></span></span>  <a -href="glossaries-user.html#dx1-14006" >1416</a> <br /></span> +href="glossaries-user.html#dx1-14006" >1419</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">O</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\oldacronym</span></span></span>  <a href="glossaries-user.html#dx1-45004" ><span -class="ec-lmri-10x-x-109">1417</span></a>, <a -href="glossaries-user.html#dx1-45007" >1418</a> <br /></span> +class="ec-lmri-10x-x-109">1420</span></a>, <a +href="glossaries-user.html#dx1-45007" >1421</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">P</span> <span class="index-item">package options:<br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">acronym</span>  <a -href="glossaries-user.html#dx1-6016" >1419</a>, <a -href="glossaries-user.html#dx1-9022" >1420</a>, <a -href="glossaries-user.html#dx1-9026" >1421</a>, <a -href="glossaries-user.html#dx1-10014" >1422</a>, <a -href="glossaries-user.html#dx1-10020" >1423</a>, <a -href="glossaries-user.html#dx1-13003" >1424</a>, <a -href="glossaries-user.html#dx1-14030" >1425</a>, <a -href="glossaries-user.html#dx1-14031" >1426</a>, <a -href="glossaries-user.html#dx1-17001" >1427</a>, <a -href="glossaries-user.html#dx1-17002" >1428</a>, <a -href="glossaries-user.html#dx1-17013" >1429</a>, <a -href="glossaries-user.html#dx1-25007" >1430</a>, <a -href="glossaries-user.html#dx1-25008" >1431</a>, <a -href="glossaries-user.html#dx1-25013" >1432</a>, <a -href="glossaries-user.html#dx1-31009" >1433</a>, <a -href="glossaries-user.html#dx1-40011" >1434</a>, <a -href="glossaries-user.html#dx1-40012" >1435</a>, <a -href="glossaries-user.html#dx1-40014" >1436</a>, <a -href="glossaries-user.html#dx1-41034" >1437</a>, <a -href="glossaries-user.html#dx1-14028" >1438</a>, <a -href="glossaries-user.html#dx1-17007" >1439</a>, <a -href="glossaries-user.html#dx1-25012" >1440</a> <br /></span> +href="glossaries-user.html#dx1-6016" >1422</a>, <a +href="glossaries-user.html#dx1-9022" >1423</a>, <a +href="glossaries-user.html#dx1-9026" >1424</a>, <a +href="glossaries-user.html#dx1-10014" >1425</a>, <a +href="glossaries-user.html#dx1-10020" >1426</a>, <a +href="glossaries-user.html#dx1-13003" >1427</a>, <a +href="glossaries-user.html#dx1-14030" >1428</a>, <a +href="glossaries-user.html#dx1-14031" >1429</a>, <a +href="glossaries-user.html#dx1-17001" >1430</a>, <a +href="glossaries-user.html#dx1-17002" >1431</a>, <a +href="glossaries-user.html#dx1-17013" >1432</a>, <a +href="glossaries-user.html#dx1-25007" >1433</a>, <a +href="glossaries-user.html#dx1-25008" >1434</a>, <a +href="glossaries-user.html#dx1-25013" >1435</a>, <a +href="glossaries-user.html#dx1-31009" >1436</a>, <a +href="glossaries-user.html#dx1-40011" >1437</a>, <a +href="glossaries-user.html#dx1-40012" >1438</a>, <a +href="glossaries-user.html#dx1-40014" >1439</a>, <a +href="glossaries-user.html#dx1-41034" >1440</a>, <a +href="glossaries-user.html#dx1-14028" >1441</a>, <a +href="glossaries-user.html#dx1-17007" >1442</a>, <a +href="glossaries-user.html#dx1-25012" >1443</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">acronymlists</span>  <a -href="glossaries-user.html#dx1-17011" >1441</a>, <a -href="glossaries-user.html#dx1-17012" >1442</a>, <a -href="glossaries-user.html#dx1-40015" >1443</a>, <a -href="glossaries-user.html#dx1-41035" >1444</a> <br /></span> +href="glossaries-user.html#dx1-17011" >1444</a>, <a +href="glossaries-user.html#dx1-17012" >1445</a>, <a +href="glossaries-user.html#dx1-40015" >1446</a>, <a +href="glossaries-user.html#dx1-41035" >1447</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">compatible-2.07</span>  <a -href="glossaries-user.html#dx1-18014" >1445</a> <br /></span> +href="glossaries-user.html#dx1-18014" >1448</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">counter</span>  <a -href="glossaries-user.html#dx1-15063" >1446</a>, <a -href="glossaries-user.html#dx1-18026" >1447</a>, <a -href="glossaries-user.html#dx1-27004" >1448</a>, <a -href="glossaries-user.html#dx1-38006" >1449</a>, <a -href="glossaries-user.html#dx1-38036" >1450</a> <br /></span> +href="glossaries-user.html#dx1-15063" >1449</a>, <a +href="glossaries-user.html#dx1-18026" >1450</a>, <a +href="glossaries-user.html#dx1-27004" >1451</a>, <a +href="glossaries-user.html#dx1-38006" >1452</a>, <a +href="glossaries-user.html#dx1-38036" >1453</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">page</span>  <a -href="glossaries-user.html#dx1-15064" >1451</a> <br /></span> -<span class="index-subitem">    <span -class="ec-lmss-10x-x-109">counterwithin</span>  <a -href="glossaries-user.html#dx1-15012" >1452</a>, <a -href="glossaries-user.html#dx1-15017" >1453</a>, <a -href="glossaries-user.html#dx1-47002" >1454</a>, <a -href="glossaries-user.html#dx1-56041" >1455</a>, <a -href="glossaries-user.html#dx1-57013" >1456</a> <br /></span> +href="glossaries-user.html#dx1-15064" >1454</a> <br /></span> <span class="index-subitem">    <span +class="ec-lmss-10x-x-109">counterwithin</span>  <a +href="glossaries-user.html#dx1-15012" >1455</a>, <a +href="glossaries-user.html#dx1-15017" >1456</a>, <a +href="glossaries-user.html#dx1-47002" >1457</a>, <a +href="glossaries-user.html#dx1-56042" >1458</a>, <a +href="glossaries-user.html#dx1-57013" >1459</a> <br /></span> +<span class="index-subitem">    <span class="ec-lmss-10x-x-109">description</span>  <a -href="glossaries-user.html#dx1-17014" >1457</a>, <a -href="glossaries-user.html#dx1-41010" >1458</a>, <a -href="glossaries-user.html#dx1-41014" >1459</a>, <a -href="glossaries-user.html#dx1-41049" >1460</a>, <a -href="glossaries-user.html#dx1-42001" >1461</a>, <a -href="glossaries-user.html#dx1-42014" >1462</a>, <a -href="glossaries-user.html#dx1-42024" >1463</a>, <a -href="glossaries-user.html#dx1-42031" >1464</a>, <a -href="glossaries-user.html#dx1-42047" >1465</a>, <a -href="glossaries-user.html#dx1-43006" >1466</a>, <a -href="glossaries-user.html#dx1-43009" >1467</a>, <a -href="glossaries-user.html#dx1-43017" >1468</a>, <a -href="glossaries-user.html#dx1-43020" >1469</a>, <a -href="glossaries-user.html#dx1-43022" >1470</a>, <a -href="glossaries-user.html#dx1-44061" >1471</a> <br /></span> +href="glossaries-user.html#dx1-17014" >1460</a>, <a +href="glossaries-user.html#dx1-41010" >1461</a>, <a +href="glossaries-user.html#dx1-41014" >1462</a>, <a +href="glossaries-user.html#dx1-41049" >1463</a>, <a +href="glossaries-user.html#dx1-42001" >1464</a>, <a +href="glossaries-user.html#dx1-42014" >1465</a>, <a +href="glossaries-user.html#dx1-42024" >1466</a>, <a +href="glossaries-user.html#dx1-42031" >1467</a>, <a +href="glossaries-user.html#dx1-42047" >1468</a>, <a +href="glossaries-user.html#dx1-43006" >1469</a>, <a +href="glossaries-user.html#dx1-43009" >1470</a>, <a +href="glossaries-user.html#dx1-43017" >1471</a>, <a +href="glossaries-user.html#dx1-43020" >1472</a>, <a +href="glossaries-user.html#dx1-43022" >1473</a>, <a +href="glossaries-user.html#dx1-44061" >1474</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">dua</span>  <a -href="glossaries-user.html#dx1-17025" >1472</a>, <a -href="glossaries-user.html#dx1-41028" >1473</a>, <a -href="glossaries-user.html#dx1-42006" >1474</a>, <a -href="glossaries-user.html#dx1-42007" >1475</a>, <a -href="glossaries-user.html#dx1-42046" >1476</a>, <a -href="glossaries-user.html#dx1-43021" >1477</a>, <a -href="glossaries-user.html#dx1-43030" >1478</a> <br /></span> +href="glossaries-user.html#dx1-17025" >1475</a>, <a +href="glossaries-user.html#dx1-41028" >1476</a>, <a +href="glossaries-user.html#dx1-42006" >1477</a>, <a +href="glossaries-user.html#dx1-42007" >1478</a>, <a +href="glossaries-user.html#dx1-42046" >1479</a>, <a +href="glossaries-user.html#dx1-43021" >1480</a>, <a +href="glossaries-user.html#dx1-43030" >1481</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">entrycounter</span>  <a -href="glossaries-user.html#dx1-15001" >1479</a>, <a -href="glossaries-user.html#dx1-15024" >1480</a>, <a -href="glossaries-user.html#dx1-47001" >1481</a>, <a -href="glossaries-user.html#dx1-56040" >1482</a>, <a -href="glossaries-user.html#dx1-57012" >1483</a> <br /></span> +href="glossaries-user.html#dx1-15001" >1482</a>, <a +href="glossaries-user.html#dx1-15024" >1483</a>, <a +href="glossaries-user.html#dx1-47001" >1484</a>, <a +href="glossaries-user.html#dx1-56041" >1485</a>, <a +href="glossaries-user.html#dx1-57012" >1486</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-15002" >1484</a> <br /></span> +href="glossaries-user.html#dx1-15002" >1487</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">true</span>  <a -href="glossaries-user.html#dx1-15013" >1485</a> <br /></span> +href="glossaries-user.html#dx1-15013" >1488</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">footnote</span>  <a -href="glossaries-user.html#dx1-17016" >1486</a>, <a -href="glossaries-user.html#dx1-41017" >1487</a>, <a -href="glossaries-user.html#dx1-41036" >1488</a>, <a -href="glossaries-user.html#dx1-41050" >1489</a>, <a -href="glossaries-user.html#dx1-42002" >1490</a>, <a -href="glossaries-user.html#dx1-42009" >1491</a>, <a -href="glossaries-user.html#dx1-42019" >1492</a>, <a -href="glossaries-user.html#dx1-42023" >1493</a>, <a -href="glossaries-user.html#dx1-42030" >1494</a>, <a -href="glossaries-user.html#dx1-42045" >1495</a>, <a -href="glossaries-user.html#dx1-43010" >1496</a>, <a -href="glossaries-user.html#dx1-43018" >1497</a>, <a -href="glossaries-user.html#dx1-43024" >1498</a>, <a -href="glossaries-user.html#dx1-44062" >1499</a> <br /></span> +href="glossaries-user.html#dx1-17016" >1489</a>, <a +href="glossaries-user.html#dx1-41017" >1490</a>, <a +href="glossaries-user.html#dx1-41036" >1491</a>, <a +href="glossaries-user.html#dx1-41050" >1492</a>, <a +href="glossaries-user.html#dx1-42002" >1493</a>, <a +href="glossaries-user.html#dx1-42009" >1494</a>, <a +href="glossaries-user.html#dx1-42019" >1495</a>, <a +href="glossaries-user.html#dx1-42023" >1496</a>, <a +href="glossaries-user.html#dx1-42030" >1497</a>, <a +href="glossaries-user.html#dx1-42045" >1498</a>, <a +href="glossaries-user.html#dx1-43010" >1499</a>, <a +href="glossaries-user.html#dx1-43018" >1500</a>, <a +href="glossaries-user.html#dx1-43024" >1501</a>, <a +href="glossaries-user.html#dx1-44062" >1502</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">hyperfirst</span>  <a -href="glossaries-user.html#dx1-13062" >1500</a> <br /></span> +href="glossaries-user.html#dx1-13061" >1503</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-30012" >1501</a>, <a -href="glossaries-user.html#dx1-62027" >1502</a> <br /></span> +href="glossaries-user.html#dx1-30012" >1504</a>, <a +href="glossaries-user.html#dx1-62027" >1505</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">true</span>  <a -href="glossaries-user.html#dx1-13064" >1503</a> <br /></span> +href="glossaries-user.html#dx1-13063" >1506</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">makeindex</span>  <a -href="glossaries-user.html#dx1-16018" >1504</a> <br /></span> +href="glossaries-user.html#dx1-16018" >1507</a> <br /></span> +<span class="index-subitem">    <span +class="ec-lmss-10x-x-109">nogroupskip</span>  <a +href="glossaries-user.html#dx1-4018" >1508</a>, <a +href="glossaries-user.html#dx1-15069" >1509</a>, <a +href="glossaries-user.html#dx1-47033" >1510</a>, <a +href="glossaries-user.html#dx1-56035" >1511</a> <br /></span> +<span class="index-subsubitem">        <span +class="ec-lmss-10x-x-109">false</span>  <a +href="glossaries-user.html#dx1-15070" >1512</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nolist</span>  <a -href="glossaries-user.html#dx1-15038" >1505</a>, <a -href="glossaries-user.html#dx1-48004" >1506</a> <br /></span> +href="glossaries-user.html#dx1-15038" >1513</a>, <a +href="glossaries-user.html#dx1-48004" >1514</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nolong</span>  <a -href="glossaries-user.html#dx1-15032" >1507</a>, <a -href="glossaries-user.html#dx1-49004" >1508</a>, <a -href="glossaries-user.html#dx1-47018" >1509</a> <br /></span> +href="glossaries-user.html#dx1-15032" >1515</a>, <a +href="glossaries-user.html#dx1-49004" >1516</a>, <a +href="glossaries-user.html#dx1-47018" >1517</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nomain</span>  <a -href="glossaries-user.html#dx1-13002" >1510</a>, <a -href="glossaries-user.html#dx1-40010" >1511</a> <br /></span> +href="glossaries-user.html#dx1-13002" >1518</a>, <a +href="glossaries-user.html#dx1-40010" >1519</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nonumberlist</span>  <a -href="glossaries-user.html#dx1-2038" >1512</a>, <a -href="glossaries-user.html#dx1-15050" >1513</a>, <a -href="glossaries-user.html#dx1-15056" >1514</a>, <a -href="glossaries-user.html#dx1-19110" >1515</a>, <a -href="glossaries-user.html#dx1-27003" >1516</a>, <a -href="glossaries-user.html#dx1-31008" >1517</a>, <a -href="glossaries-user.html#dx1-56053" >1518</a>, <a -href="glossaries-user.html#dx1-56055" >1519</a> <br /></span> +href="glossaries-user.html#dx1-2038" >1520</a>, <a +href="glossaries-user.html#dx1-15050" >1521</a>, <a +href="glossaries-user.html#dx1-15056" >1522</a>, <a +href="glossaries-user.html#dx1-19110" >1523</a>, <a +href="glossaries-user.html#dx1-27003" >1524</a>, <a +href="glossaries-user.html#dx1-31008" >1525</a>, <a +href="glossaries-user.html#dx1-56054" >1526</a>, <a +href="glossaries-user.html#dx1-56056" >1527</a> <br /></span> +<span class="index-subitem">    <span +class="ec-lmss-10x-x-109">nopostdot</span>  <a +href="glossaries-user.html#dx1-15067" >1528</a>, <a +href="glossaries-user.html#dx1-47037" >1529</a> <br /></span> +<span class="index-subsubitem">        <span +class="ec-lmss-10x-x-109">false</span>  <a +href="glossaries-user.html#dx1-15068" >1530</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nostyles</span>  <a -href="glossaries-user.html#dx1-15044" >1520</a>, <a -href="glossaries-user.html#dx1-48005" >1521</a>, <a -href="glossaries-user.html#dx1-49005" >1522</a>, <a -href="glossaries-user.html#dx1-51005" >1523</a>, <a -href="glossaries-user.html#dx1-53003" >1524</a>, <a -href="glossaries-user.html#dx1-47020" >1525</a> <br /></span> +href="glossaries-user.html#dx1-15044" >1531</a>, <a +href="glossaries-user.html#dx1-48005" >1532</a>, <a +href="glossaries-user.html#dx1-49005" >1533</a>, <a +href="glossaries-user.html#dx1-51005" >1534</a>, <a +href="glossaries-user.html#dx1-53003" >1535</a>, <a +href="glossaries-user.html#dx1-47020" >1536</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nosuper</span>  <a -href="glossaries-user.html#dx1-15035" >1526</a>, <a -href="glossaries-user.html#dx1-51004" >1527</a>, <a -href="glossaries-user.html#dx1-47019" >1528</a> <br /></span> +href="glossaries-user.html#dx1-15035" >1537</a>, <a +href="glossaries-user.html#dx1-51004" >1538</a>, <a +href="glossaries-user.html#dx1-47019" >1539</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">notree</span>  <a -href="glossaries-user.html#dx1-15042" >1529</a>, <a -href="glossaries-user.html#dx1-53002" >1530</a> <br /></span> +href="glossaries-user.html#dx1-15042" >1540</a>, <a +href="glossaries-user.html#dx1-53002" >1541</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nowarn</span>  <a -href="glossaries-user.html#dx1-13001" >1531</a>, <a -href="glossaries-user.html#dx1-26002" >1532</a> <br /></span> +href="glossaries-user.html#dx1-13001" >1542</a>, <a +href="glossaries-user.html#dx1-26002" >1543</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">numberedsection</span>  <a -href="glossaries-user.html#dx1-14021" >1533</a>, <a -href="glossaries-user.html#dx1-14022" >1534</a>, <a -href="glossaries-user.html#dx1-35023" >1535</a>, <a -href="glossaries-user.html#dx1-35024" >1536</a>, <a -href="glossaries-user.html#dx1-35031" >1537</a> <br /></span> +href="glossaries-user.html#dx1-14021" >1544</a>, <a +href="glossaries-user.html#dx1-14022" >1545</a>, <a +href="glossaries-user.html#dx1-35023" >1546</a>, <a +href="glossaries-user.html#dx1-35024" >1547</a>, <a +href="glossaries-user.html#dx1-35031" >1548</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">autolabel</span>  <a -href="glossaries-user.html#dx1-14025" >1538</a>, <a -href="glossaries-user.html#dx1-14026" >1539</a> <br /></span> +href="glossaries-user.html#dx1-14025" >1549</a>, <a +href="glossaries-user.html#dx1-14026" >1550</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-14023" >1540</a> <br /></span> +href="glossaries-user.html#dx1-14023" >1551</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">nolabel</span>  <a -href="glossaries-user.html#dx1-14024" >1541</a> <br /></span> +href="glossaries-user.html#dx1-14024" >1552</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">numberline</span>  <a -href="glossaries-user.html#dx1-14004" >1542</a>, <a -href="glossaries-user.html#dx1-14010" >1543</a> <br /></span> +href="glossaries-user.html#dx1-14004" >1553</a>, <a +href="glossaries-user.html#dx1-14010" >1554</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">order</span>  <a -href="glossaries-user.html#dx1-16012" >1544</a>, <a -href="glossaries-user.html#dx1-16015" >1545</a> <br /></span> +href="glossaries-user.html#dx1-16012" >1555</a>, <a +href="glossaries-user.html#dx1-16015" >1556</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">letter</span>  <a -href="glossaries-user.html#dx1-4046" >1546</a>, <a -href="glossaries-user.html#dx1-7092" >1547</a>, <a -href="glossaries-user.html#dx1-16014" >1548</a> <br /></span> +href="glossaries-user.html#dx1-4046" >1557</a>, <a +href="glossaries-user.html#dx1-7092" >1558</a>, <a +href="glossaries-user.html#dx1-16014" >1559</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">word</span>  <a -href="glossaries-user.html#dx1-4045" >1549</a>, <a -href="glossaries-user.html#dx1-7093" >1550</a>, <a -href="glossaries-user.html#dx1-16013" >1551</a> <br /></span> +href="glossaries-user.html#dx1-4045" >1560</a>, <a +href="glossaries-user.html#dx1-7093" >1561</a>, <a +href="glossaries-user.html#dx1-16013" >1562</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">sanitize</span>  <a -href="glossaries-user.html#dx1-2044" >1552</a>, <a -href="glossaries-user.html#dx1-13005" >1553</a>, <a -href="glossaries-user.html#dx1-13011" >1554</a>, <a -href="glossaries-user.html#dx1-19037" >1555</a>, <a -href="glossaries-user.html#dx1-19079" >1556</a> <br /></span> +href="glossaries-user.html#dx1-2045" >1563</a>, <a +href="glossaries-user.html#dx1-13005" >1564</a>, <a +href="glossaries-user.html#dx1-13012" >1565</a>, <a +href="glossaries-user.html#dx1-19037" >1566</a>, <a +href="glossaries-user.html#dx1-19079" >1567</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">none</span>  <a -href="glossaries-user.html#dx1-13015" >1557</a> <br /></span> +href="glossaries-user.html#dx1-13016" >1568</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">savenumberlist</span>  <a -href="glossaries-user.html#dx1-13067" >1558</a>, <a -href="glossaries-user.html#dx1-34048" >1559</a> <br /></span> +href="glossaries-user.html#dx1-13066" >1569</a>, <a +href="glossaries-user.html#dx1-34048" >1570</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-13070" >1560</a> <br /></span> +href="glossaries-user.html#dx1-13069" >1571</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">savewrites</span>  <a -href="glossaries-user.html#dx1-13027" >1561</a>, <a -href="glossaries-user.html#dx1-13029" >1562</a>, <a -href="glossaries-user.html#dx1-13036" >1563</a> <br /></span> +href="glossaries-user.html#dx1-13026" >1572</a>, <a +href="glossaries-user.html#dx1-13028" >1573</a>, <a +href="glossaries-user.html#dx1-13035" >1574</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-13028" >1564</a> <br /></span> +href="glossaries-user.html#dx1-13027" >1575</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">section</span>  <a -href="glossaries-user.html#dx1-14011" >1565</a>, <a -href="glossaries-user.html#dx1-35029" >1566</a> <br /></span> +href="glossaries-user.html#dx1-14011" >1576</a>, <a +href="glossaries-user.html#dx1-35029" >1577</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">seeautonumberlist</span>  <a -href="glossaries-user.html#dx1-15053" >1567</a>, <a -href="glossaries-user.html#dx1-15060" >1568</a>, <a -href="glossaries-user.html#dx1-19119" >1569</a>, <a -href="glossaries-user.html#dx1-32031" >1570</a> <br /></span> +href="glossaries-user.html#dx1-15053" >1578</a>, <a +href="glossaries-user.html#dx1-15060" >1579</a>, <a +href="glossaries-user.html#dx1-19119" >1580</a>, <a +href="glossaries-user.html#dx1-32031" >1581</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">shortcuts</span>  <a -href="glossaries-user.html#dx1-17027" >1571</a>, <a -href="glossaries-user.html#dx1-41079" >1572</a>, <a -href="glossaries-user.html#dx1-41081" >1573</a>, <a -href="glossaries-user.html#dx1-44018" >1574</a> <br /></span> +href="glossaries-user.html#dx1-17027" >1582</a>, <a +href="glossaries-user.html#dx1-41079" >1583</a>, <a +href="glossaries-user.html#dx1-41081" >1584</a>, <a +href="glossaries-user.html#dx1-44018" >1585</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">smallcaps</span>  <a -href="glossaries-user.html#dx1-17018" >1575</a>, <a -href="glossaries-user.html#dx1-41019" >1576</a>, <a -href="glossaries-user.html#dx1-41022" >1577</a>, <a -href="glossaries-user.html#dx1-41037" >1578</a>, <a -href="glossaries-user.html#dx1-41045" >1579</a>, <a -href="glossaries-user.html#dx1-41047" >1580</a>, <a -href="glossaries-user.html#dx1-41055" >1581</a>, <a -href="glossaries-user.html#dx1-41056" >1582</a>, <a -href="glossaries-user.html#dx1-42011" >1583</a>, <a -href="glossaries-user.html#dx1-42022" >1584</a>, <a -href="glossaries-user.html#dx1-42043" >1585</a>, <a -href="glossaries-user.html#dx1-43026" >1586</a>, <a -href="glossaries-user.html#dx1-62021" >1587</a>, <a -href="glossaries-user.html#dx1-62022" >1588</a> <br /></span> +href="glossaries-user.html#dx1-17018" >1586</a>, <a +href="glossaries-user.html#dx1-41019" >1587</a>, <a +href="glossaries-user.html#dx1-41022" >1588</a>, <a +href="glossaries-user.html#dx1-41037" >1589</a>, <a +href="glossaries-user.html#dx1-41045" >1590</a>, <a +href="glossaries-user.html#dx1-41047" >1591</a>, <a +href="glossaries-user.html#dx1-41055" >1592</a>, <a +href="glossaries-user.html#dx1-41056" >1593</a>, <a +href="glossaries-user.html#dx1-42011" >1594</a>, <a +href="glossaries-user.html#dx1-42022" >1595</a>, <a +href="glossaries-user.html#dx1-42043" >1596</a>, <a +href="glossaries-user.html#dx1-43026" >1597</a>, <a +href="glossaries-user.html#dx1-62021" >1598</a>, <a +href="glossaries-user.html#dx1-62022" >1599</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">smaller</span>  <a -href="glossaries-user.html#dx1-17020" >1589</a>, <a -href="glossaries-user.html#dx1-41021" >1590</a>, <a -href="glossaries-user.html#dx1-41048" >1591</a>, <a -href="glossaries-user.html#dx1-41054" >1592</a>, <a -href="glossaries-user.html#dx1-41058" >1593</a>, <a -href="glossaries-user.html#dx1-41061" >1594</a>, <a -href="glossaries-user.html#dx1-42010" >1595</a>, <a -href="glossaries-user.html#dx1-42029" >1596</a>, <a -href="glossaries-user.html#dx1-42044" >1597</a>, <a -href="glossaries-user.html#dx1-43028" >1598</a>, <a -href="glossaries-user.html#dx1-62030" >1599</a>, <a -href="glossaries-user.html#dx1-62035" >1600</a> <br /></span> +href="glossaries-user.html#dx1-17020" >1600</a>, <a +href="glossaries-user.html#dx1-41021" >1601</a>, <a +href="glossaries-user.html#dx1-41048" >1602</a>, <a +href="glossaries-user.html#dx1-41054" >1603</a>, <a +href="glossaries-user.html#dx1-41058" >1604</a>, <a +href="glossaries-user.html#dx1-41061" >1605</a>, <a +href="glossaries-user.html#dx1-42010" >1606</a>, <a +href="glossaries-user.html#dx1-42029" >1607</a>, <a +href="glossaries-user.html#dx1-42044" >1608</a>, <a +href="glossaries-user.html#dx1-43028" >1609</a>, <a +href="glossaries-user.html#dx1-62030" >1610</a>, <a +href="glossaries-user.html#dx1-62035" >1611</a> <br /></span> + + + <span class="index-subitem">    <span class="ec-lmss-10x-x-109">sort</span>  <a -href="glossaries-user.html#dx1-16001" >1601</a>, <a -href="glossaries-user.html#dx1-62018" >1602</a>, <a -href="glossaries-user.html#dx1-62098" >1603</a> <br /></span> +href="glossaries-user.html#dx1-16001" >1612</a>, <a +href="glossaries-user.html#dx1-62018" >1613</a>, <a +href="glossaries-user.html#dx1-62098" >1614</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">def</span>  <a -href="glossaries-user.html#dx1-16007" >1604</a>, <a -href="glossaries-user.html#dx1-19095" >1605</a>, <a -href="glossaries-user.html#dx1-24007" >1606</a>, <a -href="glossaries-user.html#dx1-62017" >1607</a> <br /></span> +href="glossaries-user.html#dx1-16007" >1615</a>, <a +href="glossaries-user.html#dx1-19095" >1616</a>, <a +href="glossaries-user.html#dx1-24007" >1617</a>, <a +href="glossaries-user.html#dx1-62017" >1618</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">standard</span>  <a -href="glossaries-user.html#dx1-13022" >1608</a>, <a -href="glossaries-user.html#dx1-16002" >1609</a>, <a -href="glossaries-user.html#dx1-16011" >1610</a> <br /></span> +href="glossaries-user.html#dx1-16002" >1619</a>, <a +href="glossaries-user.html#dx1-16011" >1620</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">use</span>  <a -href="glossaries-user.html#dx1-16009" >1611</a>, <a -href="glossaries-user.html#dx1-19096" >1612</a>, <a -href="glossaries-user.html#dx1-24006" >1613</a>, <a -href="glossaries-user.html#dx1-62016" >1614</a> <br /></span> +href="glossaries-user.html#dx1-16009" >1621</a>, <a +href="glossaries-user.html#dx1-19096" >1622</a>, <a +href="glossaries-user.html#dx1-24006" >1623</a>, <a +href="glossaries-user.html#dx1-62016" >1624</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">style</span>  <a -href="glossaries-user.html#dx1-15026" >1615</a>, <a -href="glossaries-user.html#dx1-15041" >1616</a>, <a -href="glossaries-user.html#dx1-15046" >1617</a>, <a -href="glossaries-user.html#dx1-35020" >1618</a>, <a -href="glossaries-user.html#dx1-47014" >1619</a>, <a -href="glossaries-user.html#dx1-50008" >1620</a>, <a -href="glossaries-user.html#dx1-52008" >1621</a> <br /></span> - - - +href="glossaries-user.html#dx1-15026" >1625</a>, <a +href="glossaries-user.html#dx1-15041" >1626</a>, <a +href="glossaries-user.html#dx1-15046" >1627</a>, <a +href="glossaries-user.html#dx1-35020" >1628</a>, <a +href="glossaries-user.html#dx1-47014" >1629</a>, <a +href="glossaries-user.html#dx1-50008" >1630</a>, <a +href="glossaries-user.html#dx1-52008" >1631</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">list</span>  <a -href="glossaries-user.html#dx1-15027" >1622</a> <br /></span> +href="glossaries-user.html#dx1-15027" >1632</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">subentrycounter</span>  <a -href="glossaries-user.html#dx1-15020" >1623</a>, <a -href="glossaries-user.html#dx1-22001" >1624</a>, <a -href="glossaries-user.html#dx1-24008" >1625</a>, <a -href="glossaries-user.html#dx1-47003" >1626</a>, <a -href="glossaries-user.html#dx1-56059" >1627</a>, <a -href="glossaries-user.html#dx1-57014" >1628</a> <br /></span> +href="glossaries-user.html#dx1-15020" >1633</a>, <a +href="glossaries-user.html#dx1-22001" >1634</a>, <a +href="glossaries-user.html#dx1-24008" >1635</a>, <a +href="glossaries-user.html#dx1-47003" >1636</a>, <a +href="glossaries-user.html#dx1-56060" >1637</a>, <a +href="glossaries-user.html#dx1-57014" >1638</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-15021" >1629</a> <br /></span> +href="glossaries-user.html#dx1-15021" >1639</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">toc</span>  <a -href="glossaries-user.html#dx1-14001" >1630</a>, <a -href="glossaries-user.html#dx1-14005" >1631</a>, <a -href="glossaries-user.html#dx1-14008" >1632</a>, <a -href="glossaries-user.html#dx1-14009" >1633</a>, <a -href="glossaries-user.html#dx1-35017" >1634</a> <br /></span> +href="glossaries-user.html#dx1-14001" >1640</a>, <a +href="glossaries-user.html#dx1-14005" >1641</a>, <a +href="glossaries-user.html#dx1-14008" >1642</a>, <a +href="glossaries-user.html#dx1-14009" >1643</a>, <a +href="glossaries-user.html#dx1-35017" >1644</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">translate</span>  <a -href="glossaries-user.html#dx1-13041" >1635</a> <br /></span> +href="glossaries-user.html#dx1-13040" >1645</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-6030" >1636</a>, <a -href="glossaries-user.html#dx1-6035" >1637</a>, <a -href="glossaries-user.html#dx1-13046" >1638</a>, <a -href="glossaries-user.html#dx1-13057" >1639</a> <br /></span> +href="glossaries-user.html#dx1-6030" >1646</a>, <a +href="glossaries-user.html#dx1-6035" >1647</a>, <a +href="glossaries-user.html#dx1-13045" >1648</a>, <a +href="glossaries-user.html#dx1-13056" >1649</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">true</span>  <a -href="glossaries-user.html#dx1-13042" >1640</a>, <a -href="glossaries-user.html#dx1-13047" >1641</a> <br /></span> +href="glossaries-user.html#dx1-13041" >1650</a>, <a +href="glossaries-user.html#dx1-13046" >1651</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">ucmark</span>  <a -href="glossaries-user.html#dx1-14015" >1642</a>, <a -href="glossaries-user.html#dx1-14017" >1643</a> <br /></span> +href="glossaries-user.html#dx1-14015" >1652</a>, <a +href="glossaries-user.html#dx1-14017" >1653</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-14018" >1644</a> <br /></span> +href="glossaries-user.html#dx1-14018" >1654</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">xindy</span>  <a -href="glossaries-user.html#dx1-4084" >1645</a>, <a -href="glossaries-user.html#dx1-5011" >1646</a>, <a -href="glossaries-user.html#dx1-7094" >1647</a>, <a -href="glossaries-user.html#dx1-9005" >1648</a>, <a -href="glossaries-user.html#dx1-10003" >1649</a>, <a -href="glossaries-user.html#dx1-16032" >1650</a>, <a -href="glossaries-user.html#dx1-16046" >1651</a>, <a -href="glossaries-user.html#dx1-18031" >1652</a>, <a -href="glossaries-user.html#dx1-36003" >1653</a>, <a -href="glossaries-user.html#dx1-38001" >1654</a>, <a -href="glossaries-user.html#dx1-39001" >1655</a> <br /></span> +href="glossaries-user.html#dx1-4084" >1655</a>, <a +href="glossaries-user.html#dx1-5011" >1656</a>, <a +href="glossaries-user.html#dx1-7094" >1657</a>, <a +href="glossaries-user.html#dx1-9005" >1658</a>, <a +href="glossaries-user.html#dx1-10003" >1659</a>, <a +href="glossaries-user.html#dx1-16032" >1660</a>, <a +href="glossaries-user.html#dx1-16046" >1661</a>, <a +href="glossaries-user.html#dx1-18031" >1662</a>, <a +href="glossaries-user.html#dx1-36003" >1663</a>, <a +href="glossaries-user.html#dx1-38001" >1664</a>, <a +href="glossaries-user.html#dx1-39001" >1665</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">page </span>counter  <a -href="glossaries-user.html#dx1-38040" >1656</a> <br /></span> +href="glossaries-user.html#dx1-38040" >1666</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\pagelistname</span></span></span>  <a -href="glossaries-user.html#dx1-6020" >1657</a> <br /></span> +href="glossaries-user.html#dx1-6020" >1667</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">pod2man</span>  <a -href="glossaries-user.html#dx1-8016" >1658</a> <br /></span> +href="glossaries-user.html#dx1-8016" >1668</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">polyglossia </span>package  <a -href="glossaries-user.html#dx1-6002" >1659</a>, <a -href="glossaries-user.html#dx1-6032" >1660</a>, <a -href="glossaries-user.html#dx1-13044" >1661</a>, <a -href="glossaries-user.html#dx1-13055" >1662</a>, <a -href="glossaries-user.html#dx1-13059" >1663</a> <br /></span> +href="glossaries-user.html#dx1-6002" >1669</a>, <a +href="glossaries-user.html#dx1-6032" >1670</a>, <a +href="glossaries-user.html#dx1-13043" >1671</a>, <a +href="glossaries-user.html#dx1-13054" >1672</a>, <a +href="glossaries-user.html#dx1-13058" >1673</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\printglossaries</span></span></span>  <a -href="glossaries-user.html#dx1-19008" >1664</a>, <a +href="glossaries-user.html#dx1-19008" >1674</a>, <a href="glossaries-user.html#dx1-35001" ><span -class="ec-lmri-10x-x-109">1665</span></a>, <a -href="glossaries-user.html#dx1-43002" >1666</a>, <a -href="glossaries-user.html#dx1-56063" >1667</a>, <a -href="glossaries-user.html#dx1-62076" >1668</a> <br /></span> +class="ec-lmri-10x-x-109">1675</span></a>, <a +href="glossaries-user.html#dx1-43002" >1676</a>, <a +href="glossaries-user.html#dx1-56064" >1677</a>, <a +href="glossaries-user.html#dx1-62076" >1678</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\printglossary</span></span></span>  <a -href="glossaries-user.html#dx1-15049" >1669</a>, <a -href="glossaries-user.html#dx1-19007" >1670</a>, <a +href="glossaries-user.html#dx1-15049" >1679</a>, <a +href="glossaries-user.html#dx1-19007" >1680</a>, <a href="glossaries-user.html#dx1-35013" ><span -class="ec-lmri-10x-x-109">1671</span></a>, <a -href="glossaries-user.html#dx1-43001" >1672</a>, <a -href="glossaries-user.html#dx1-47012" >1673</a>, <a -href="glossaries-user.html#dx1-47027" >1674</a>, <a -href="glossaries-user.html#dx1-56062" >1675</a>, <a -href="glossaries-user.html#dx1-62075" >1676</a> <br /></span> +class="ec-lmri-10x-x-109">1681</span></a>, <a +href="glossaries-user.html#dx1-43001" >1682</a>, <a +href="glossaries-user.html#dx1-47012" >1683</a>, <a +href="glossaries-user.html#dx1-47027" >1684</a>, <a +href="glossaries-user.html#dx1-56063" >1685</a>, <a +href="glossaries-user.html#dx1-62075" >1686</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">\printglossary </span>options<br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nonumberlist</span>  <a -href="glossaries-user.html#dx1-35025" >1677</a> <br /></span> +href="glossaries-user.html#dx1-35025" >1687</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">numberedsection</span>  <a -href="glossaries-user.html#dx1-35022" >1678</a> <br /></span> +href="glossaries-user.html#dx1-35022" >1688</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">style</span>  <a -href="glossaries-user.html#dx1-15048" >1679</a>, <a -href="glossaries-user.html#dx1-35019" >1680</a>, <a -href="glossaries-user.html#dx1-47011" >1681</a>, <a -href="glossaries-user.html#dx1-47026" >1682</a> <br /></span> +href="glossaries-user.html#dx1-15048" >1689</a>, <a +href="glossaries-user.html#dx1-35019" >1690</a>, <a +href="glossaries-user.html#dx1-47011" >1691</a>, <a +href="glossaries-user.html#dx1-47026" >1692</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">title</span>  <a -href="glossaries-user.html#dx1-35015" >1683</a>, <a -href="glossaries-user.html#dx1-35018" >1684</a> <br /></span> +href="glossaries-user.html#dx1-35015" >1693</a>, <a +href="glossaries-user.html#dx1-35018" >1694</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">toctitle</span>  <a -href="glossaries-user.html#dx1-35016" >1685</a> <br /></span> +href="glossaries-user.html#dx1-35016" >1695</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">type</span>  <a -href="glossaries-user.html#dx1-35014" >1686</a> <br /></span> +href="glossaries-user.html#dx1-35014" >1696</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\protect</span></span></span>  <a -href="glossaries-user.html#dx1-2043" >1687</a> <br /></span> +href="glossaries-user.html#dx1-2044" >1697</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">R</span> <span class="index-item"><span class="ec-lmss-10x-x-109">relsize </span>package  <a -href="glossaries-user.html#dx1-17022" >1688</a>, <a -href="glossaries-user.html#dx1-41027" >1689</a>, <a -href="glossaries-user.html#dx1-41060" >1690</a>, <a -href="glossaries-user.html#dx1-42041" >1691</a> <br /></span> +href="glossaries-user.html#dx1-17022" >1698</a>, <a +href="glossaries-user.html#dx1-41027" >1699</a>, <a +href="glossaries-user.html#dx1-41060" >1700</a>, <a +href="glossaries-user.html#dx1-42041" >1701</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Roman</span></span></span>  <a -href="glossaries-user.html#dx1-38031" >1692</a> <br /></span> +href="glossaries-user.html#dx1-38031" >1702</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">S</span> <span class="index-item">sanitize  <a href="glossaries-user.html#dx1-2039" ><span -class="ec-lmbx-10x-x-109">1693</span></a>, <a -href="glossaries-user.html#dx1-5019" >1694</a>, <a -href="glossaries-user.html#dx1-13007" >1695</a>, <a -href="glossaries-user.html#dx1-13021" >1696</a>, <a -href="glossaries-user.html#dx1-19036" >1697</a>, <a -href="glossaries-user.html#dx1-19078" >1698</a>, <a -href="glossaries-user.html#dx1-28126" >1699</a>, <a -href="glossaries-user.html#dx1-28135" >1700</a>, <a -href="glossaries-user.html#dx1-28144" >1701</a>, <a -href="glossaries-user.html#dx1-29043" >1702</a>, <a -href="glossaries-user.html#dx1-32007" >1703</a>, <a -href="glossaries-user.html#dx1-33017" >1704</a>, <a -href="glossaries-user.html#dx1-34047" >1705</a> <br /></span> +class="ec-lmbx-10x-x-109">1703</span></a>, <a +href="glossaries-user.html#dx1-5019" >1704</a>, <a +href="glossaries-user.html#dx1-13007" >1705</a>, <a +href="glossaries-user.html#dx1-19036" >1706</a>, <a +href="glossaries-user.html#dx1-19078" >1707</a>, <a +href="glossaries-user.html#dx1-28126" >1708</a>, <a +href="glossaries-user.html#dx1-28135" >1709</a>, <a +href="glossaries-user.html#dx1-28144" >1710</a>, <a +href="glossaries-user.html#dx1-29043" >1711</a>, <a +href="glossaries-user.html#dx1-32007" >1712</a>, <a +href="glossaries-user.html#dx1-33017" >1713</a>, <a +href="glossaries-user.html#dx1-34047" >1714</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\section*</span></span></span>  <a -href="glossaries-user.html#dx1-35027" >1706</a> <br /></span> +href="glossaries-user.html#dx1-35027" >1715</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\seename</span></span></span>  <a -href="glossaries-user.html#dx1-2003" >1707</a>, <a -href="glossaries-user.html#dx1-32014" >1708</a>, <a -href="glossaries-user.html#dx1-32019" >1709</a>, <a -href="glossaries-user.html#dx1-33007" >1710</a> <br /></span> +href="glossaries-user.html#dx1-2003" >1716</a>, <a +href="glossaries-user.html#dx1-32014" >1717</a>, <a +href="glossaries-user.html#dx1-32019" >1718</a>, <a +href="glossaries-user.html#dx1-33007" >1719</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\setAlphaCompositor</span></span></span>  <a -href="glossaries-user.html#dx1-38049" >1711</a> <br /></span> +href="glossaries-user.html#dx1-38049" >1720</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\setCompositor</span></span></span>  <a -href="glossaries-user.html#dx1-38047" >1712</a> <br /></span> +href="glossaries-user.html#dx1-38047" >1721</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\SetCustomDisplayStyle</span></span></span>  <a href="glossaries-user.html#dx1-44014" ><span -class="ec-lmri-10x-x-109">1713</span></a>, <a -href="glossaries-user.html#dx1-44044" >1714</a>, <a -href="glossaries-user.html#dx1-44053" >1715</a>, <a -href="glossaries-user.html#dx1-44057" >1716</a> <br /></span> +class="ec-lmri-10x-x-109">1722</span></a>, <a +href="glossaries-user.html#dx1-44044" >1723</a>, <a +href="glossaries-user.html#dx1-44053" >1724</a>, <a +href="glossaries-user.html#dx1-44057" >1725</a> <br /></span> + + + <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\SetCustomStyle</span></span></span>  <a href="glossaries-user.html#dx1-44017" ><span -class="ec-lmri-10x-x-109">1717</span></a> <br /></span> +class="ec-lmri-10x-x-109">1726</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\setentrycounter</span></span></span>  <a -href="glossaries-user.html#dx1-56047" >1718</a>, <a -href="glossaries-user.html#dx1-56050" >1719</a> <br /></span> +href="glossaries-user.html#dx1-56048" >1727</a>, <a +href="glossaries-user.html#dx1-56051" >1728</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\setglossarysection</span></span></span>  <a href="glossaries-user.html#dx1-14012" ><span -class="ec-lmri-10x-x-109">1720</span></a>, <a -href="glossaries-user.html#dx1-35030" >1721</a> <br /></span> +class="ec-lmri-10x-x-109">1729</span></a>, <a +href="glossaries-user.html#dx1-35030" >1730</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\setStyleFile</span></span></span>  <a -href="glossaries-user.html#dx1-9021" >1722</a>, <a -href="glossaries-user.html#dx1-10011" >1723</a>, <a +href="glossaries-user.html#dx1-9021" >1731</a>, <a +href="glossaries-user.html#dx1-10011" >1732</a>, <a href="glossaries-user.html#dx1-18023" ><span -class="ec-lmri-10x-x-109">1724</span></a> <br /></span> +class="ec-lmri-10x-x-109">1733</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\smaller</span></span></span>  <a -href="glossaries-user.html#dx1-42037" >1725</a> <br /></span> - - - +href="glossaries-user.html#dx1-42037" >1734</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">supertabular </span>(environment)  <a -href="glossaries-user.html#dx1-51002" >1726</a>, <a -href="glossaries-user.html#dx1-51008" >1727</a>, <a -href="glossaries-user.html#dx1-51013" >1728</a>, <a -href="glossaries-user.html#dx1-52003" >1729</a>, <a -href="glossaries-user.html#dx1-52010" >1730</a> <br /></span> +href="glossaries-user.html#dx1-51002" >1735</a>, <a +href="glossaries-user.html#dx1-51008" >1736</a>, <a +href="glossaries-user.html#dx1-51013" >1737</a>, <a +href="glossaries-user.html#dx1-52003" >1738</a>, <a +href="glossaries-user.html#dx1-52010" >1739</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">supertabular </span>package  <a -href="glossaries-user.html#dx1-15037" >1731</a>, <a -href="glossaries-user.html#dx1-51015" >1732</a>, <a -href="glossaries-user.html#dx1-52012" >1733</a> <br /></span> +href="glossaries-user.html#dx1-15037" >1740</a>, <a +href="glossaries-user.html#dx1-51015" >1741</a>, <a +href="glossaries-user.html#dx1-52012" >1742</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\symbolname</span></span></span>  <a -href="glossaries-user.html#dx1-6019" >1734</a> <br /></span> +href="glossaries-user.html#dx1-6019" >1743</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">T</span> <span class="index-item">TeX4HT  <a -href="glossaries-user.html#dx1-62101" >1735</a> <br /></span> +href="glossaries-user.html#dx1-62101" >1744</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\textbf</span></span></span>  <a -href="glossaries-user.html#dx1-28032" >1736</a> <br /></span> +href="glossaries-user.html#dx1-28032" >1745</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\textrm</span></span></span>  <a -href="glossaries-user.html#dx1-38013" >1737</a> <br /></span> +href="glossaries-user.html#dx1-38013" >1746</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\textsc</span></span></span>  <a -href="glossaries-user.html#dx1-41020" >1738</a>, <a -href="glossaries-user.html#dx1-41024" >1739</a>, <a -href="glossaries-user.html#dx1-41057" >1740</a>, <a -href="glossaries-user.html#dx1-42028" >1741</a>, <a -href="glossaries-user.html#dx1-44024" >1742</a>, <a -href="glossaries-user.html#dx1-44025" >1743</a>, <a -href="glossaries-user.html#dx1-62023" >1744</a> <br /></span> +href="glossaries-user.html#dx1-41020" >1747</a>, <a +href="glossaries-user.html#dx1-41024" >1748</a>, <a +href="glossaries-user.html#dx1-41057" >1749</a>, <a +href="glossaries-user.html#dx1-42028" >1750</a>, <a +href="glossaries-user.html#dx1-44024" >1751</a>, <a +href="glossaries-user.html#dx1-44025" >1752</a>, <a +href="glossaries-user.html#dx1-62023" >1753</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\textsmaller</span></span></span>  <a -href="glossaries-user.html#dx1-17023" >1745</a>, <a -href="glossaries-user.html#dx1-41023" >1746</a>, <a -href="glossaries-user.html#dx1-41025" >1747</a>, <a -href="glossaries-user.html#dx1-41026" >1748</a>, <a -href="glossaries-user.html#dx1-42040" >1749</a>, <a -href="glossaries-user.html#dx1-62037" >1750</a>, <a -href="glossaries-user.html#dx1-42038" >1751</a> <br /></span> +href="glossaries-user.html#dx1-17023" >1754</a>, <a +href="glossaries-user.html#dx1-41023" >1755</a>, <a +href="glossaries-user.html#dx1-41025" >1756</a>, <a +href="glossaries-user.html#dx1-41026" >1757</a>, <a +href="glossaries-user.html#dx1-42040" >1758</a>, <a +href="glossaries-user.html#dx1-62037" >1759</a>, <a +href="glossaries-user.html#dx1-42038" >1760</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">theglossary </span>(environment)  <a href="glossaries-user.html#dx1-56002" ><span -class="ec-lmri-10x-x-109">1752</span></a>, <a -href="glossaries-user.html#dx1-56004" >1753</a>, <a -href="glossaries-user.html#dx1-56011" >1754</a>, <a -href="glossaries-user.html#dx1-57003" >1755</a> <br /></span> +class="ec-lmri-10x-x-109">1761</span></a>, <a +href="glossaries-user.html#dx1-56004" >1762</a>, <a +href="glossaries-user.html#dx1-56011" >1763</a>, <a +href="glossaries-user.html#dx1-57003" >1764</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\thepage</span></span></span>  <a -href="glossaries-user.html#dx1-38033" >1756</a> <br /></span> +href="glossaries-user.html#dx1-38033" >1765</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">translator </span>package  <a -href="glossaries-user.html#dx1-6004" >1757</a>, <a -href="glossaries-user.html#dx1-6005" >1758</a>, <a -href="glossaries-user.html#dx1-6006" >1759</a>, <a -href="glossaries-user.html#dx1-6010" >1760</a>, <a -href="glossaries-user.html#dx1-6012" >1761</a>, <a -href="glossaries-user.html#dx1-6024" >1762</a>, <a -href="glossaries-user.html#dx1-6025" >1763</a>, <a -href="glossaries-user.html#dx1-6026" >1764</a>, <a -href="glossaries-user.html#dx1-6029" >1765</a>, <a -href="glossaries-user.html#dx1-13045" >1766</a>, <a -href="glossaries-user.html#dx1-13049" >1767</a>, <a -href="glossaries-user.html#dx1-13050" >1768</a>, <a -href="glossaries-user.html#dx1-13051" >1769</a>, <a -href="glossaries-user.html#dx1-13052" >1770</a>, <a -href="glossaries-user.html#dx1-62058" >1771</a> <br /></span> +href="glossaries-user.html#dx1-6004" >1766</a>, <a +href="glossaries-user.html#dx1-6005" >1767</a>, <a +href="glossaries-user.html#dx1-6006" >1768</a>, <a +href="glossaries-user.html#dx1-6010" >1769</a>, <a +href="glossaries-user.html#dx1-6012" >1770</a>, <a +href="glossaries-user.html#dx1-6024" >1771</a>, <a +href="glossaries-user.html#dx1-6025" >1772</a>, <a +href="glossaries-user.html#dx1-6026" >1773</a>, <a +href="glossaries-user.html#dx1-6029" >1774</a>, <a +href="glossaries-user.html#dx1-13044" >1775</a>, <a +href="glossaries-user.html#dx1-13048" >1776</a>, <a +href="glossaries-user.html#dx1-13049" >1777</a>, <a +href="glossaries-user.html#dx1-13050" >1778</a>, <a +href="glossaries-user.html#dx1-13051" >1779</a>, <a +href="glossaries-user.html#dx1-40018" >1780</a>, <a +href="glossaries-user.html#dx1-62058" >1781</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">W</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\write18</span></span></span>  <a -href="glossaries-user.html#dx1-13031" >1772</a> <br /></span> +href="glossaries-user.html#dx1-13030" >1782</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">X</span> <span class="index-item">xindy  <a -href="glossaries-user.html#dx1-2045" ><span -class="ec-lmbx-10x-x-109">1773</span></a> <br /></span> +href="glossaries-user.html#dx1-2046" ><span +class="ec-lmbx-10x-x-109">1783</span></a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">xindy</span>  <a -href="glossaries-user.html#dx1-2029" >1774</a>, <a -href="glossaries-user.html#dx1-3011" >1775</a>, <a -href="glossaries-user.html#dx1-3017" >1776</a>, <a -href="glossaries-user.html#dx1-4053" >1777</a>, <a -href="glossaries-user.html#dx1-4060" >1778</a>, <a -href="glossaries-user.html#dx1-4067" >1779</a>, <a -href="glossaries-user.html#dx1-4071" >1780</a>, <a -href="glossaries-user.html#dx1-4075" >1781</a>, <a -href="glossaries-user.html#dx1-4079" >1782</a>, <a -href="glossaries-user.html#dx1-4081" >1783</a>, <a -href="glossaries-user.html#dx1-5002" >1784</a>, <a -href="glossaries-user.html#dx1-5006" >1785</a>, <a -href="glossaries-user.html#dx1-5010" >1786</a>, <a -href="glossaries-user.html#dx1-5028" >1787</a>, <a -href="glossaries-user.html#dx1-5032" >1788</a>, <a -href="glossaries-user.html#dx1-6037" >1789</a>, <a -href="glossaries-user.html#dx1-6041" >1790</a>, <a -href="glossaries-user.html#dx1-7005" >1791</a>, <a -href="glossaries-user.html#dx1-7009" >1792</a>, <a -href="glossaries-user.html#dx1-7013" >1793</a>, <a -href="glossaries-user.html#dx1-7015" >1794</a>, <a -href="glossaries-user.html#dx1-7021" >1795</a>, <a -href="glossaries-user.html#dx1-7028" >1796</a>, <a -href="glossaries-user.html#dx1-7034" >1797</a>, <a -href="glossaries-user.html#dx1-7040" >1798</a>, <a -href="glossaries-user.html#dx1-7044" >1799</a>, <a -href="glossaries-user.html#dx1-7060" >1800</a>, <a -href="glossaries-user.html#dx1-7066" >1801</a>, <a -href="glossaries-user.html#dx1-7074" >1802</a>, <a -href="glossaries-user.html#dx1-7082" >1803</a>, <a -href="glossaries-user.html#dx1-7091" >1804</a>, <a -href="glossaries-user.html#dx1-8005" >1805</a>, <a -href="glossaries-user.html#dx1-9004" >1806</a>, <a -href="glossaries-user.html#dx1-9007" >1807</a>, <a -href="glossaries-user.html#dx1-9013" >1808</a>, <a -href="glossaries-user.html#dx1-9015" >1809</a>, <a -href="glossaries-user.html#dx1-9018" >1810</a>, <a -href="glossaries-user.html#dx1-9031" >1811</a>, <a -href="glossaries-user.html#dx1-9035" >1812</a>, <a -href="glossaries-user.html#dx1-11002" >1813</a>, <a -href="glossaries-user.html#dx1-11011" >1814</a>, <a -href="glossaries-user.html#dx1-11015" >1815</a>, <a -href="glossaries-user.html#dx1-13035" >1816</a>, <a -href="glossaries-user.html#dx1-13040" >1817</a>, <a -href="glossaries-user.html#dx1-15011" >1818</a>, <a -href="glossaries-user.html#dx1-16030" >1819</a>, <a -href="glossaries-user.html#dx1-16034" >1820</a>, <a -href="glossaries-user.html#dx1-16038" >1821</a>, <a -href="glossaries-user.html#dx1-16042" >1822</a>, <a -href="glossaries-user.html#dx1-16048" >1823</a>, <a -href="glossaries-user.html#dx1-18006" >1824</a>, <a -href="glossaries-user.html#dx1-18009" >1825</a>, <a -href="glossaries-user.html#dx1-18022" >1826</a>, <a -href="glossaries-user.html#dx1-18029" >1827</a>, <a -href="glossaries-user.html#dx1-19014" >1828</a>, <a -href="glossaries-user.html#dx1-19091" >1829</a>, <a -href="glossaries-user.html#dx1-19132" >1830</a>, <a -href="glossaries-user.html#dx1-27009" >1831</a>, <a -href="glossaries-user.html#dx1-27011" >1832</a>, <a -href="glossaries-user.html#dx1-27018" >1833</a>, <a -href="glossaries-user.html#dx1-27022" >1834</a>, <a -href="glossaries-user.html#dx1-28007" >1835</a>, <a -href="glossaries-user.html#dx1-28035" >1836</a>, <a -href="glossaries-user.html#dx1-28041" >1837</a>, <a -href="glossaries-user.html#dx1-28062" >1838</a>, <a -href="glossaries-user.html#dx1-34056" >1839</a>, <a -href="glossaries-user.html#dx1-35007" >1840</a>, <a -href="glossaries-user.html#dx1-35011" >1841</a>, <a -href="glossaries-user.html#dx1-36002" >1842</a>, <a -href="glossaries-user.html#dx1-36005" >1843</a>, <a -href="glossaries-user.html#dx1-36007" >1844</a>, <a -href="glossaries-user.html#dx1-36010" >1845</a>, <a -href="glossaries-user.html#dx1-36016" >1846</a>, <a -href="glossaries-user.html#dx1-36018" >1847</a>, <a -href="glossaries-user.html#dx1-36021" >1848</a>, <a -href="glossaries-user.html#dx1-36023" >1849</a>, <a -href="glossaries-user.html#dx1-37002" >1850</a>, <a -href="glossaries-user.html#dx1-37004" >1851</a>, <a -href="glossaries-user.html#dx1-37009" >1852</a>, <a -href="glossaries-user.html#dx1-37015" >1853</a>, <a -href="glossaries-user.html#dx1-37020" >1854</a>, <a -href="glossaries-user.html#dx1-38005" >1855</a>, <a -href="glossaries-user.html#dx1-38016" >1856</a>, <a -href="glossaries-user.html#dx1-38020" >1857</a>, <a -href="glossaries-user.html#dx1-38026" >1858</a>, <a -href="glossaries-user.html#dx1-38035" >1859</a>, <a -href="glossaries-user.html#dx1-38043" >1860</a>, <a -href="glossaries-user.html#dx1-38059" >1861</a>, <a -href="glossaries-user.html#dx1-40007" >1862</a>, <a -href="glossaries-user.html#dx1-53016" >1863</a>, <a -href="glossaries-user.html#dx1-56027" >1864</a>, <a -href="glossaries-user.html#dx1-62007" >1865</a>, <a -href="glossaries-user.html#dx1-62009" >1866</a>, <a -href="glossaries-user.html#dx1-62013" >1867</a>, <a -href="glossaries-user.html#dx1-62015" >1868</a>, <a -href="glossaries-user.html#dx1-62051" >1869</a>, <a -href="glossaries-user.html#dx1-62087" >1870</a>, <a -href="glossaries-user.html#dx1-62091" >1871</a>, <a -href="glossaries-user.html#dx1-62093" >1872</a>, <a -href="glossaries-user.html#dx1-62095" >1873</a>, <a -href="glossaries-user.html#dx1-62097" >1874</a> <br /></span> +href="glossaries-user.html#dx1-2029" >1784</a>, <a +href="glossaries-user.html#dx1-3011" >1785</a>, <a +href="glossaries-user.html#dx1-3017" >1786</a>, <a +href="glossaries-user.html#dx1-4053" >1787</a>, <a +href="glossaries-user.html#dx1-4060" >1788</a>, <a +href="glossaries-user.html#dx1-4067" >1789</a>, <a +href="glossaries-user.html#dx1-4071" >1790</a>, <a +href="glossaries-user.html#dx1-4075" >1791</a>, <a +href="glossaries-user.html#dx1-4079" >1792</a>, <a +href="glossaries-user.html#dx1-4081" >1793</a>, <a +href="glossaries-user.html#dx1-5002" >1794</a>, <a +href="glossaries-user.html#dx1-5006" >1795</a>, <a +href="glossaries-user.html#dx1-5010" >1796</a>, <a +href="glossaries-user.html#dx1-5028" >1797</a>, <a +href="glossaries-user.html#dx1-5032" >1798</a>, <a +href="glossaries-user.html#dx1-6037" >1799</a>, <a +href="glossaries-user.html#dx1-6041" >1800</a>, <a +href="glossaries-user.html#dx1-7005" >1801</a>, <a +href="glossaries-user.html#dx1-7009" >1802</a>, <a +href="glossaries-user.html#dx1-7013" >1803</a>, <a +href="glossaries-user.html#dx1-7015" >1804</a>, <a +href="glossaries-user.html#dx1-7021" >1805</a>, <a +href="glossaries-user.html#dx1-7028" >1806</a>, <a +href="glossaries-user.html#dx1-7034" >1807</a>, <a +href="glossaries-user.html#dx1-7040" >1808</a>, <a +href="glossaries-user.html#dx1-7044" >1809</a>, <a +href="glossaries-user.html#dx1-7060" >1810</a>, <a +href="glossaries-user.html#dx1-7066" >1811</a>, <a +href="glossaries-user.html#dx1-7074" >1812</a>, <a +href="glossaries-user.html#dx1-7082" >1813</a>, <a +href="glossaries-user.html#dx1-7091" >1814</a>, <a +href="glossaries-user.html#dx1-8005" >1815</a>, <a +href="glossaries-user.html#dx1-9004" >1816</a>, <a +href="glossaries-user.html#dx1-9007" >1817</a>, <a +href="glossaries-user.html#dx1-9013" >1818</a>, <a +href="glossaries-user.html#dx1-9015" >1819</a>, <a +href="glossaries-user.html#dx1-9018" >1820</a>, <a +href="glossaries-user.html#dx1-9031" >1821</a>, <a +href="glossaries-user.html#dx1-9035" >1822</a>, <a +href="glossaries-user.html#dx1-11002" >1823</a>, <a +href="glossaries-user.html#dx1-11011" >1824</a>, <a +href="glossaries-user.html#dx1-11015" >1825</a>, <a +href="glossaries-user.html#dx1-13034" >1826</a>, <a +href="glossaries-user.html#dx1-13039" >1827</a>, <a +href="glossaries-user.html#dx1-15011" >1828</a>, <a +href="glossaries-user.html#dx1-16030" >1829</a>, <a +href="glossaries-user.html#dx1-16034" >1830</a>, <a +href="glossaries-user.html#dx1-16038" >1831</a>, <a +href="glossaries-user.html#dx1-16042" >1832</a>, <a +href="glossaries-user.html#dx1-16048" >1833</a>, <a +href="glossaries-user.html#dx1-18006" >1834</a>, <a +href="glossaries-user.html#dx1-18009" >1835</a>, <a +href="glossaries-user.html#dx1-18022" >1836</a>, <a +href="glossaries-user.html#dx1-18029" >1837</a>, <a +href="glossaries-user.html#dx1-19014" >1838</a>, <a +href="glossaries-user.html#dx1-19091" >1839</a>, <a +href="glossaries-user.html#dx1-19132" >1840</a>, <a +href="glossaries-user.html#dx1-27009" >1841</a>, <a +href="glossaries-user.html#dx1-27011" >1842</a>, <a +href="glossaries-user.html#dx1-27018" >1843</a>, <a +href="glossaries-user.html#dx1-27022" >1844</a>, <a +href="glossaries-user.html#dx1-28007" >1845</a>, <a +href="glossaries-user.html#dx1-28035" >1846</a>, <a +href="glossaries-user.html#dx1-28041" >1847</a>, <a +href="glossaries-user.html#dx1-28062" >1848</a>, <a +href="glossaries-user.html#dx1-34056" >1849</a>, <a +href="glossaries-user.html#dx1-35007" >1850</a>, <a +href="glossaries-user.html#dx1-35011" >1851</a>, <a +href="glossaries-user.html#dx1-36002" >1852</a>, <a +href="glossaries-user.html#dx1-36005" >1853</a>, <a +href="glossaries-user.html#dx1-36007" >1854</a>, <a +href="glossaries-user.html#dx1-36010" >1855</a>, <a +href="glossaries-user.html#dx1-36016" >1856</a>, <a +href="glossaries-user.html#dx1-36018" >1857</a>, <a +href="glossaries-user.html#dx1-36021" >1858</a>, <a +href="glossaries-user.html#dx1-36023" >1859</a>, <a +href="glossaries-user.html#dx1-37002" >1860</a>, <a +href="glossaries-user.html#dx1-37004" >1861</a>, <a +href="glossaries-user.html#dx1-37009" >1862</a>, <a +href="glossaries-user.html#dx1-37015" >1863</a>, <a +href="glossaries-user.html#dx1-37020" >1864</a>, <a +href="glossaries-user.html#dx1-38005" >1865</a>, <a +href="glossaries-user.html#dx1-38016" >1866</a>, <a +href="glossaries-user.html#dx1-38020" >1867</a>, <a +href="glossaries-user.html#dx1-38026" >1868</a>, <a +href="glossaries-user.html#dx1-38035" >1869</a>, <a +href="glossaries-user.html#dx1-38043" >1870</a>, <a +href="glossaries-user.html#dx1-38059" >1871</a>, <a +href="glossaries-user.html#dx1-40007" >1872</a>, <a +href="glossaries-user.html#dx1-53016" >1873</a>, <a +href="glossaries-user.html#dx1-56027" >1874</a>, <a +href="glossaries-user.html#dx1-62007" >1875</a>, <a +href="glossaries-user.html#dx1-62009" >1876</a>, <a +href="glossaries-user.html#dx1-62013" >1877</a>, <a +href="glossaries-user.html#dx1-62015" >1878</a>, <a +href="glossaries-user.html#dx1-62051" >1879</a>, <a +href="glossaries-user.html#dx1-62087" >1880</a>, <a +href="glossaries-user.html#dx1-62091" >1881</a>, <a +href="glossaries-user.html#dx1-62093" >1882</a>, <a +href="glossaries-user.html#dx1-62095" >1883</a>, <a +href="glossaries-user.html#dx1-62097" >1884</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">xkeyval </span>package  <a -href="glossaries-user.html#dx1-4003" >1875</a>, <a -href="glossaries-user.html#dx1-62003" >1876</a> <br /></span> +href="glossaries-user.html#dx1-4003" >1885</a>, <a +href="glossaries-user.html#dx1-62003" >1886</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\xmakefirstuc</span></span></span>  <a -href="glossaries-user.html#dx1-2004" >1877</a> <br /></span> +href="glossaries-user.html#dx1-2004" >1887</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\xspace</span></span></span>  <a -href="glossaries-user.html#dx1-45016" >1878</a> <br /></span> +href="glossaries-user.html#dx1-45016" >1888</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">xspace </span>package  <a -href="glossaries-user.html#dx1-45014" >1879</a>, <a -href="glossaries-user.html#dx1-45015" >1880</a>, <a -href="glossaries-user.html#dx1-45017" >1881</a>, <a -href="glossaries-user.html#dx1-45019" >1882</a>, <a -href="glossaries-user.html#dx1-45021" >1883</a>, <a -href="glossaries-user.html#dx1-45022" >1884</a> <br /></span> +href="glossaries-user.html#dx1-45014" >1889</a>, <a +href="glossaries-user.html#dx1-45015" >1890</a>, <a +href="glossaries-user.html#dx1-45017" >1891</a>, <a +href="glossaries-user.html#dx1-45019" >1892</a>, <a +href="glossaries-user.html#dx1-45021" >1893</a>, <a +href="glossaries-user.html#dx1-45022" >1894</a> <br /></span> </p></div> - <div class="footnotes"><!--l. 307--><p class="indent" > <span class="footnote-mark"><a + <div class="footnotes"><!--l. 303--><p class="indent" > <span class="footnote-mark"><a href="#fn1x3-bk" id="fn1x3"> <sup class="textsuperscript">1</sup></a></span><span class="ec-lmr-9">That is, if the term has been referenced using any of the commands described</span> <span class="ec-lmr-9">in </span><a -href="#sec:glslink"><span -class="ec-lmr-9">§6 </span></a><a -href="#sec:glslink"><span +href="#x1-280006"><span +class="ec-lmr-9">§6 </span></a><a +href="#x1-280006"><span class="ec-lmr-9">Links to Glossary Entries</span><!--tex4ht:ref: sec:glslink --></a> <span class="ec-lmr-9">and </span><a -href="#sec:glsadd"><span -class="ec-lmr-9">§7 </span></a><a -href="#sec:glsadd"><span +href="#x1-310007"><span +class="ec-lmr-9">§7 </span></a><a +href="#x1-310007"><span class="ec-lmr-9">Adding an Entry to the Glossary</span> <span class="ec-lmr-9">Without Generating Text</span><!--tex4ht:ref: sec:glsadd --></a> <span @@ -19061,13 +19135,13 @@ class="ec-lmr-9">key) or commands such as</span> <span class="ec-lmtt-9">\acrshort</span><a id="dx1-3004"></a><span -class="ec-lmr-9">.</span></p><!--l. 1027--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9">.</span></p><!--l. 1020--><p class="indent" > <span class="footnote-mark"><a href="#fn2x3-bk" id="fn2x3"> <sup class="textsuperscript">2</sup></a></span><span class="ec-lmr-9">As from v3.01 </span><span class="ec-lmtt-9">\gls</span><a id="dx1-7068"></a> <span -class="ec-lmr-9">is no longer fragile and doesn’t need protecting.</span></p><!--l. 1513--><p class="noindent" ><span class="footnote-mark"><a +class="ec-lmr-9">is no longer fragile and doesn’t need protecting.</span></p><!--l. 1510--><p class="noindent" ><span class="footnote-mark"><a href="#fn1x4-bk" id="fn1x4"> <sup class="textsuperscript">1</sup></a></span><span class="ec-lmr-9">if the </span><span @@ -19075,7 +19149,7 @@ class="ec-lmss-9">acronym</span><a id="dx1-14028"></a> <span class="ec-lmr-9">option is used, otherwise the list of acronyms is the main</span> <span -class="ec-lmr-9">glossary</span></p><!--l. 1762--><p class="noindent" ><span class="footnote-mark"><a +class="ec-lmr-9">glossary</span></p><!--l. 1771--><p class="noindent" ><span class="footnote-mark"><a href="#fn2x4-bk" id="fn2x4"> <sup class="textsuperscript">2</sup></a></span><span class="ec-lmr-9">Actually it sets </span><span @@ -19094,7 +19168,7 @@ class="ec-lmtt-9">\glsdefaulttype</span><a id="dx1-17008"></a> <span class="ec-lmr-9">usually has the value </span><span class="ec-lmtt-9">main</span><span -class="ec-lmr-9">.</span></p><!--l. 1897--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9">.</span></p><!--l. 1906--><p class="indent" > <span class="footnote-mark"><a href="#fn1x6-bk" id="fn1x6"> <sup class="textsuperscript">1</sup></a></span><span class="ec-lmr-9">The only preamble restriction on </span><span @@ -19108,7 +19182,7 @@ class="ec-lmr-9">was</span> class="ec-lmr-9">removed in version 1.13, but the restriction remains for </span><span class="ec-lmtt-9">\loadglsentries</span><a id="dx1-19004"></a><span -class="ec-lmr-9">.</span></p><!--l. 1912--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9">.</span></p><!--l. 1921--><p class="indent" > <span class="footnote-mark"><a href="#fn2x6-bk" id="fn2x6"> <sup class="textsuperscript">2</sup></a></span><span class="ec-lmr-9">Except possibly the style file but then you’ll need to use </span><span @@ -19116,7 +19190,7 @@ class="ec-lmtt-9">\noist</span><a id="dx1-19016"></a> <span class="ec-lmr-9">to prevent your</span> <span -class="ec-lmr-9">changes from being overwritten.</span></p><!--l. 2332--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9">changes from being overwritten.</span></p><!--l. 2341--><p class="indent" > <span class="footnote-mark"><a href="#fn3x6-bk" id="fn3x6"> <sup class="textsuperscript">3</sup></a></span><span class="ec-lmr-9">This is because </span><span @@ -19130,7 +19204,7 @@ class="ec-lmss-9">acronym</span><a id="dx1-25012"></a> <span class="ec-lmr-9">package</span> <span -class="ec-lmr-9">option is not used.</span></p><!--l. 3026--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9">option is not used.</span></p><!--l. 3035--><p class="indent" > <span class="footnote-mark"><a href="#fn1x8-bk" id="fn1x8"> <sup class="textsuperscript">1</sup></a></span><span class="ec-lmtt-9">main </span><span @@ -19142,13 +19216,13 @@ class="ec-lmr-9">name supplied in the first mandatory argument to </span><span class="ec-lmtt-9">\newglossary </span><span class="ec-lmr-9">for additional</span> <span -class="ec-lmr-9">glossaries.</span></p><!--l. 3186--><p class="noindent" ><span class="footnote-mark"><a +class="ec-lmr-9">glossaries.</span></p><!--l. 3195--><p class="noindent" ><span class="footnote-mark"><a href="#fn1x10-bk" id="fn1x10"> <sup class="textsuperscript">1</sup></a></span><span class="ec-lmr-9">As from v3.01, </span><span class="ec-lmtt-9">\gls</span><a id="dx1-32009"></a> <span -class="ec-lmr-9">is no longer fragile.</span></p><!--l. 3262--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9">is no longer fragile.</span></p><!--l. 3271--><p class="indent" > <span class="footnote-mark"><a href="#fn2x10-bk" id="fn2x10"> <sup class="textsuperscript">2</sup></a></span><a id="dx1-33004"></a><a @@ -19157,7 +19231,7 @@ class="ec-lmtt-9">makeindex</span><a id="dx1-33005"></a></a> <span class="ec-lmr-9">will always assign a location number, even if it’s not needed, so it needs</span> <span -class="ec-lmr-9">to be discarded.</span></p><!--l. 3267--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9">to be discarded.</span></p><!--l. 3276--><p class="indent" > <span class="footnote-mark"><a href="#fn3x10-bk" id="fn3x10"> <sup class="textsuperscript">3</sup></a></span><span class="ec-lmr-9">If you redefine </span><span @@ -19175,7 +19249,7 @@ class="ec-lmr-9">explicitly write </span><span class="ec-lmtt-9">[\seename] </span><span class="ec-lmr-9">in the output file if no</span> <span -class="ec-lmr-9">optional argument is given.</span></p><!--l. 3292--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9">optional argument is given.</span></p><!--l. 3301--><p class="indent" > <span class="footnote-mark"><a href="#fn4x10-bk" id="fn4x10"> <sup class="textsuperscript">4</sup></a></span><span class="ec-lmr-9">In versions before 3.0, </span><span @@ -19190,7 +19264,7 @@ class="ec-lmr-9">key is</span> <a href="#glo:sanitize"><span class="ec-lmr-9">sanitized</span><a id="dx1-33017"></a></a><span -class="ec-lmr-9">.</span></p><!--l. 3446--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9">.</span></p><!--l. 3455--><p class="indent" > <span class="footnote-mark"><a href="#fn1x11-bk" id="fn1x11"> <sup class="textsuperscript">1</sup></a></span><span class="ec-lmr-9">versions before 3.0 used </span><span @@ -19206,7 +19280,7 @@ class="ec-lmr-9">has been</span> <a href="#glo:sanitize"><span class="ec-lmr-9">sanitized</span><a id="dx1-34047"></a></a><span -class="ec-lmr-9">.</span></p><!--l. 3604--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9">.</span></p><!--l. 3613--><p class="indent" > <span class="footnote-mark"><a href="#fn1x12-bk" id="fn1x12"> <sup class="textsuperscript">1</sup></a></span><span class="ec-lmr-9">you can’t use the </span><span @@ -19217,27 +19291,27 @@ class="ec-lmr-9">style for this example as you can’t use the</span> class="ec-lmss-9">longtable</span><a id="dx1-35039"></a><a id="dx1-35040"></a> <span -class="ec-lmr-9">environment in two column mode.</span></p><!--l. 3901--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9">environment in two column mode.</span></p><!--l. 3910--><p class="indent" > <span class="footnote-mark"><a href="#fn1x13-bk" id="fn1x13"> <sup class="textsuperscript">1</sup></a></span><span class="ec-lmr-9">see </span><span class="ec-lmtt-9">\setCompositor</span><a id="dx1-38047"></a> <span class="ec-lmr-9">described in </span><a -href="#sec:setup"><span -class="ec-lmr-9">§3 </span></a><a -href="#sec:setup"><span -class="ec-lmr-9">Setting Up</span><!--tex4ht:ref: sec:setup --></a></p><!--l. 3907--><p class="indent" > <span class="footnote-mark"><a +href="#x1-180003"><span +class="ec-lmr-9">§3 </span></a><a +href="#x1-180003"><span +class="ec-lmr-9">Setting Up</span><!--tex4ht:ref: sec:setup --></a></p><!--l. 3916--><p class="indent" > <span class="footnote-mark"><a href="#fn2x13-bk" id="fn2x13"> <sup class="textsuperscript">2</sup></a></span><span class="ec-lmr-9">see </span><span class="ec-lmtt-9">\setAlphaCompositor</span><a id="dx1-38049"></a> <span class="ec-lmr-9">described in </span><a -href="#sec:setup"><span -class="ec-lmr-9">§3 </span></a><a -href="#sec:setup"><span -class="ec-lmr-9">Setting Up</span><!--tex4ht:ref: sec:setup --></a></p><!--l. 4418--><p class="noindent" ><span class="footnote-mark"><a +href="#x1-180003"><span +class="ec-lmr-9">§3 </span></a><a +href="#x1-180003"><span +class="ec-lmr-9">Setting Up</span><!--tex4ht:ref: sec:setup --></a></p><!--l. 4430--><p class="noindent" ><span class="footnote-mark"><a href="#fn1x15-bk" id="fn1x15"> <sup class="textsuperscript">1</sup></a></span><span class="ec-lmr-9">not that this was change from using </span><span @@ -19251,10 +19325,10 @@ class="ec-lmr-9">as declarations</span> class="ec-lmr-9">cause a problem for </span><span class="ec-lmtt-9">\makefirstuc</span><a id="dx1-42039"></a><span -class="ec-lmr-9">.</span></p><!--l. 4679--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9">.</span></p><!--l. 4691--><p class="indent" > <span class="footnote-mark"><a href="#fn2x15-bk" id="fn2x15"> <sup class="textsuperscript">2</sup></a></span><span -class="ec-lmr-9">as from version 1.18</span></p><!--l. 4873--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9">as from version 1.18</span></p><!--l. 4885--><p class="indent" > <span class="footnote-mark"><a href="#fn1x17-bk" id="fn1x17"> <sup class="textsuperscript">1</sup></a></span><span class="ec-lmr-9">these lengths will not be available if you use both the </span><span @@ -19270,11 +19344,11 @@ class="ec-lmss-9">nostyles</span><a id="dx1-47020"></a> <span class="ec-lmr-9">package option unless you explicitly load the</span> <span -class="ec-lmr-9">relevant package.</span></p><!--l. 4979--><p class="noindent" ><span class="footnote-mark"><a +class="ec-lmr-9">relevant package.</span></p><!--l. 4997--><p class="noindent" ><span class="footnote-mark"><a href="#fn2x17-bk" id="fn2x17"> <sup class="textsuperscript">2</sup></a></span><span class="ec-lmr-9">This style was supplied by Axel</span><span -class="ec-lmr-9"> Menzel.</span></p><!--l. 5190--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9"> Menzel.</span></p><!--l. 5208--><p class="indent" > <span class="footnote-mark"><a href="#fn3x17-bk" id="fn3x17"> <sup class="textsuperscript">3</sup></a></span><span class="ec-lmr-9">e.g.</span><span diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf Binary files differindex 87983d9c124..4db3e8d9690 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex index ca79ac9bd84..a1288c3db33 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex @@ -179,8 +179,8 @@ the backslash character may appear as a dash when used in the main document text, so \cs{foo} will appear as: ---foo. \glspar When \TeX\ writes information to a file, fragile -commands must be protected. The \gloskey{name}, \gloskey{description} -and \gloskey{symbol} keys all have their values written to a file, +commands must be protected. The \gloskey{name}, \gloskey{description}, +\gloskey{symbol} and \gloskey{sort} keys all have their values written to a file, which means that care must be taken if those values contain fragile commands. There are two approaches: 1) the fragile commands must be protected using \ics{protect}; 2) the values are sanitized. @@ -233,15 +233,11 @@ package option \pkgopt{sanitize} described in \sectionref{sec:pkgopts-general}} \MakeShortVerb{"} \DeleteShortVerb{\|} - \title{User Manual for glossaries.sty v3.02} - \author{Nicola L.C. Talbot\\[10pt] -School of Computing Sciences\\ -University of East Anglia\\ -Norwich. Norfolk\\ -NR4 7TJ. United Kingdom.\\ -\url{http://theoval.cmp.uea.ac.uk/~nlct/}} + \title{User Manual for glossaries.sty v3.03} + \author{Nicola L.C. Talbot\\% + \url{http://www.dickimaw-books.com/}} - \date{2012-05-21} + \date{2012-09-21} \maketitle \noindent @@ -269,7 +265,7 @@ letter}{mfirstuc-manual}. \item[\url{glossaries.pdf}] Advanced users wishing to know more about the inner workings of all the packages provided in the \styfmt{glossaries} bundle should read -\qt{Documented Code for glossaries v3.02}. +\qt{Documented Code for glossaries v3.03}. This includes the documented code for the \sty{mfirstuc} package. \item[INSTALL] Installation instructions. @@ -431,11 +427,8 @@ latex sample4col As before, if you don't have Perl installed, you will need to use \gls{makeindex} directly instead of using \gls{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} +gap created at the start of each group. This can be suppressed +using the \pkgopt{nogroupskip} package option. \item[sampleAcr.tex]\label{ex:sampleAcr} This document has some sample acronyms. It also adds the glossary to the table of contents, @@ -1332,7 +1325,7 @@ in \sectionref{sec:newglossary}). \meta{key}=\meta{value} option whose value is also a \meta{key}=\meta{value} list. By default, the \styfmt{glossaries} package \glspl{sanitize} the values of the \gloskey{name}, -\gloskey{description} and \gloskey{symbol} keys used when defining a +\gloskey{description}, \gloskey{symbol} and \gloskey{sort} keys used when defining a new glossary entry. This means that you can use fragile commands in those keys, but it may lead to unexpected results if you try to display these values within the document text. This sanitization can @@ -1346,12 +1339,16 @@ symbol=true}]{glossaries} \end{verbatim} You can use \pkgopt[none]{sanitize} as a shortcut for\newline \pkgoptfmt{sanitize=\{name=false,description=false,symbol=false\}}. +Note that this shortcut doesn't change the \gloskey{sort} +sanitization. That one needs to be switched off explicitly: +\begin{verbatim} +\usepackage{sanitize=none,sanitize={sort=false}} +\end{verbatim} \begin{important}% \textbf{Note}: this sanitization only applies to the \gloskey{name}, -\gloskey{description} and \gloskey{symbol} keys. It doesn't apply -to any of the other keys (except the \gloskey{sort} key which is -always \glsd{sanitize} if \pkgopt[standard]{sort} is in effect) so fragile commands contained in the value of +\gloskey{description}, \gloskey{symbol} and \gloskey{sort} keys. It doesn't apply +to any of the other keys so fragile commands contained in the value of the other keys must always be protected using \cs{protect}. Since the value of the \gloskey{text} key is obtained from the \gloskey{name} key, you will still need to protect fragile commands @@ -1679,6 +1676,18 @@ automatically implement \gloskey{nonumberlist=false} for that entry. the default counter to use in the \glspl{numberlist} (see \sectionref{sec:numberlists}). +\item[\pkgopt{nopostdot}] This is a boolean option. If no value is +specified, \texttt{true} is assumed. When set to \texttt{true}, this +option suppresses the default post description dot used by some of +the predefined styles. The default setting is +\pkgopt[false]{nopostdot}. + +\item[\pkgopt{nogroupskip}] This is a boolean option. If no value is +specified, \texttt{true} is assumed. When set to \texttt{true}, this +option suppresses the default vertical gap between groups used by +some of the predefined styles. The default setting is +\pkgopt[false]{nogroupskip}. + \end{description} \section{Sorting Options} @@ -4031,6 +4040,9 @@ it as a list of acronyms using the package option \begin{important} All glossaries must be defined before \ics{makeglossaries} to ensure that the relevant output files are opened. + +See \sectionref{sec:fixednames} if you want to redefine \cs{glossaryname}, +especially if you are using \sty{babel} or \sty{translator}. \end{important} @@ -4906,6 +4918,9 @@ in the next section) or make the modifications after \glossarystyle{long} \renewcommand*{\glsgroupskip}{} \end{verbatim} +As from version 3.03, you can now use the package option +\pkgopt{nogroupskip} to suppress the gap between groups for the +default styles. All the styles except for the three- and four-column styles and the \glostyle{listdotted} style use the command @@ -4918,6 +4933,9 @@ a comma) you will need to redefine \cs{glspostdescription} before the glossary is displayed. Alternatively, you can suppress it for a given entry by placing \ics{nopostdesc} in the entry's description. +As from version 3.03 you can now use the package option +\pkgopt{nopostdot} to suppress this full stop. + \section{List Styles} \label{sec:liststyles} @@ -5638,6 +5656,9 @@ style simply redefines \cs{glsgroupskip} to be \ics{indexspace}, whereas the tabular-like styles redefine \cs{glsgroupskip} to produce a blank row. +As from version 3.03, the package option \pkgopt{nogroupskip} can be +used to suppress this default gap for the predefined styles. + \begin{definition}[\DescribeMacro{\glossaryentryfield}] \cs{glossaryentryfield}\marg{label}\marg{formatted name}\marg{description} \marg{symbol}\marg{number list} @@ -6007,6 +6028,12 @@ Further information on debugging \LaTeX\ code is available at Below is a list of the most frequently asked questions. For other queries, consult the \styfmt{glossaries} FAQ at \url{http://theoval.cmp.uea.ac.uk/~nlct/latex/packages/faq/glossariesfaq.html}. +Bug reports can be submitted at +\url{http://www.dickimaw-books.com/bug-report.html}. For general +queries, you are more likely to get a faster response if you post +them to somewhere like the comp.text.tex newsgroup, the \LaTeX\ +Community Forum (\url{http://www.latex-community.org/}) or +Stack Exchange (\url{http://tex.stackexchange.com/}). \begin{enumerate} \item \textbf{Q.} I get the error message: diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries.pdf b/Master/texmf-dist/doc/latex/glossaries/glossaries.pdf Binary files differindex 88533acf85d..45a57e88a60 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/glossariesbegin.html b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html index 6902c2084ef..75b9714b257 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html +++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html @@ -10,7 +10,7 @@ <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" /> <!-- xhtml,fn-in,css-in,uni-html4,utf8 --> <meta name="src" content="glossariesbegin.tex" /> -<meta name="date" content="2012-05-21 14:51:00" /> +<meta name="date" content="2012-09-21 14:48:00" /> <style type="text/css"> <!-- @@ -168,7 +168,7 @@ beginners</h2> <div class="author" ><span class="futr8t-x-x-144">Nicola L.C. Talbot</span></div><br /> <div class="date" ><span -class="futr8t-x-x-144">2012-05-21</span></div> +class="futr8t-x-x-144">2012-09-21</span></div> </div> <div class="abstract" diff --git a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf Binary files differindex 89554556337..7124691561c 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex index 05da3bd3001..c893adfdc95 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex +++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex @@ -13,7 +13,7 @@ \title{The glossaries package: a guide for beginners} \author{Nicola L.C. Talbot} -\date{2012-05-21} +\date{2012-09-21} \newcommand*{\igloskey}[2][newglossaryentry]{\icsopt{#1}{#2}} \newcommand*{\gloskey}[2][newglossaryentry]{\csopt{#1}{#2}} diff --git a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html index 7bc46a441a1..63c3ff72ace 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html +++ b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html @@ -10,7 +10,7 @@ <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" /> <!-- xhtml,fn-in,css-in,uni-html4,utf8 --> <meta name="src" content="glossary2glossaries.tex" /> -<meta name="date" content="2012-05-21 14:51:00" /> +<meta name="date" content="2012-09-21 14:48:00" /> <style type="text/css"> <!-- @@ -193,7 +193,7 @@ package to the glossaries package</h2> <div class="author" ><span class="futr8t-x-x-144">Nicola L.C. Talbot</span></div><br /> <div class="date" ><span -class="futr8t-x-x-144">2012-05-21</span></div> +class="futr8t-x-x-144">2012-09-21</span></div> </div> <div class="abstract" diff --git a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf Binary files differindex 1668a745f52..1e3e4be6c13 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/glossary2glossaries.tex b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex index 60d18b38360..2d76204e558 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex +++ b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex @@ -21,7 +21,7 @@ \title{Upgrading from the glossary package to the glossaries package} \author{Nicola L.C. Talbot} -\date{2012-05-21} +\date{2012-09-21} \newenvironment{oldway}{% \begin{labelledbox}{\styfmt{glossary}}\ttfamily\obeylines diff --git a/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.html b/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.html Binary files differindex d31003c0f56..ad09deaca89 100644 --- a/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.html +++ b/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.html diff --git a/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.pdf b/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.pdf Binary files differindex 1939739a0f2..720aad10d63 100644 --- a/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf Binary files differindex 241b748e430..2ea9b2c6643 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf Binary files differindex bf36438cc7b..ea55244c932 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf Binary files differindex 58c39506dd3..17074f7d9da 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf Binary files differindex b3571c0afb4..d500b9d8fb6 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf Binary files differindex 2b71c655fd0..2103f51a1a6 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf Binary files differindex 589475065e5..dddddeeb98a 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf Binary files differindex 1c77fb0c167..b00d8168234 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf Binary files differindex b9f4d756584..ff2b98614df 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf Binary files differindex 65b8dd1857f..70688b355cd 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf Binary files differindex 8d19afee2c7..2dedb592a7a 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf Binary files differindex 76c003b31d1..5c3728965ba 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf Binary files differindex 26ce7ad4228..c5d362c57cc 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf Binary files differindex dcffae44862..b20bd1049c0 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf Binary files differindex 35d002ea02a..6fb8a80ae06 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf Binary files differindex 964e0df5be8..1c40295d436 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf Binary files differindex 8c87013d84d..fc3d8b5dbba 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf Binary files differindex 5646b7fb7a5..ddfa5b1fcbc 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf Binary files differindex 2fbd57b9f99..2aee5b728ba 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf Binary files differindex e911938d771..2b2361919ef 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf Binary files differindex 442fac61dae..828bf52f947 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf Binary files differindex 9d12f1b8344..3fd8f384a4a 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx index 3c3f4e9abeb..d80ad0b707c 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx @@ -1,13 +1,13 @@ %\iffalse % glossaries.dtx generated using makedtx version 0.94b (c) Nicola Talbot % Command line args: -% -macrocode "glossaries\.perl" +% -macrocode ".*\.perl" % -macrocode ".*\.tex" % -macrocode ".*\.xdy" -% -setambles "glossaries\.perl=>\nopreamble\nopostamble" +% -setambles ".*\.perl=>\nopreamble\nopostamble" % -setambles ".*\.tex=>\nopreamble\nopostamble" % -setambles ".*\.xdy=>\nopreamble\nopostamble" -% -comment "glossaries\.perl" +% -comment ".*\.perl" % -comment ".*\.tex" % -comment ".*\.xdy" % -src "glossaries.sty\Z=>glossaries.sty" @@ -22,12 +22,12 @@ % -src "(sample.*\.tex)\Z=>\1" % -src "(samplexdy-mc.*\.xdy)\Z=>\1" % -src "(database.*\.tex)\Z=>\1" -% -src "(glossaries\.perl)\Z=>\1" +% -src "(.*\.perl)\Z=>\1" % -doc "glossaries-manual.tex" % -author "Nicola Talbot" % -codetitle "Main Package Code" % glossaries -% Created on 2012/5/21 14:06 +% Created on 2012/9/21 14:41 %\fi %\iffalse %<*package> @@ -79,7 +79,7 @@ glossaries.dtx \setcounter{IndexColumns}{2} -\CheckSum{13653} +\CheckSum{13761} \newcommand*{\ifirstuse}{\iterm{first use}} \newcommand*{\firstuse}{first use\ifirstuse} @@ -107,7 +107,7 @@ glossaries.dtx %\MakeShortVerb{"} %\DeleteShortVerb{\|} % -% \title{Documented Code For glossaries v3.02} +% \title{Documented Code For glossaries v3.03} % \author{Nicola L.C. Talbot\\[10pt] %School of Computing Sciences\\ %University of East Anglia\\ @@ -115,7 +115,7 @@ glossaries.dtx %NR4 7TJ. United Kingdom.\\ %\url{http://theoval.cmp.uea.ac.uk/~nlct/}} % -% \date{2012-05-21} +% \date{2012-09-21} % \maketitle % %This is the documented code for the \styfmt{glossaries} package. @@ -131,7 +131,7 @@ glossaries.dtx %glossaries package}. % %\item[\url{glossaries-user.pdf}] -%For the main user guide, read \qt{glossaries.sty v3.02: +%For the main user guide, read \qt{glossaries.sty v3.03: %\LaTeX2e\ Package to Assist Generating Glossaries}. % %\item[\url{mfirstuc-manual.pdf}] @@ -172,7 +172,7 @@ glossaries.dtx % This package requires \LaTeXe. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2012/05/21 v3.02 (NLCT)] +\ProvidesPackage{glossaries}[2012/09/21 v3.03 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -447,6 +447,32 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} %\end{option} % +%\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{macrocode} +\newcommand*{\glspostdescription}{\ifglsnopostdot\else.\fi} +% \end{macrocode} +%\end{macro} +%\begin{option}{nopostdot} +% Boolean option to suppress post description dot +%\changes{3.03}{2012/09/21}{new} +% \begin{macrocode} +\define@boolkey{glossaries.sty}[gls]{nopostdot}[true]{} +\glsnopostdotfalse +% \end{macrocode} +%\end{option} +%\begin{option}{nogroupskip} +% Boolean option to suppress vertical space between groups in the +% pre-defined styles. +%\changes{3.03}{2012/09/21}{new} +% \begin{macrocode} +\define@boolkey{glossaries.sty}[gls]{nogroupskip}[true]{} +\glsnogroupskipfalse +% \end{macrocode} +%\end{option} +% %\begin{option}{ucmark} % Boolean option to determine whether or not to use % \ics{MakeUppercase} in definition of \ics{glossarymark} @@ -531,7 +557,10 @@ false,nolabel,autolabel}[nolabel]{% \ifx\@glo@sort\@glsdefaultsort \let\@glo@sort\@glo@name \fi - \@onelevel@sanitize\@glo@sort +% \end{macrocode} +%\changes{3.03}{2012/09/21}{used \cs{@gls@sanitizesort}} +% \begin{macrocode} + \@gls@sanitizesort \expandafter\protected@xdef\csname glo@##2@sort\endcsname{\@glo@sort}% }% % \end{macrocode} @@ -871,9 +900,12 @@ false,nolabel,autolabel}[nolabel]{% \newcommand*{\@gls@sanitizesymbol}{\@onelevel@sanitize\@glo@symbol} % \end{macrocode} %\end{macro} -% (There is no equivalent for the \gloskey{sort} key, since that -% is only provided for the benefit of \app{makeindex} or -% \app{xindy}, and so will always be sanitized.) +%\begin{macro}{\@gls@sanitizesort} +%\changes{3.03}{2012/09/21}{new} +% \begin{macrocode} +\newcommand*{\@gls@sanitizesort}{\@onelevel@sanitize\@glo@sort} +% \end{macrocode} +%\end{macro} % % Before defining the \pkgopt{sanitize} package option, The % key-value list for the \pkgopt{sanitize} value needs to be defined. @@ -911,6 +943,17 @@ false,nolabel,autolabel}[nolabel]{% \renewcommand*{\@gls@sanitizesymbol}{}% \fi} % \end{macrocode} +% and for the \gloskey{sort} key: +% \begin{macrocode} +\define@boolkey[gls]{sanitize}{sort}[true]{% +\ifgls@sanitize@sort + \renewcommand*{\@gls@sanitizesort}{% +\@onelevel@sanitize\@glo@sort}% +\else + \renewcommand*{\@gls@sanitizesort}{}% +\fi} +% \end{macrocode} +% % %\begin{option}{sanitize} % Now define the \pkgopt{sanitize} option. It can either take @@ -920,11 +963,14 @@ false,nolabel,autolabel}[nolabel]{% % \begin{macrocode} \define@key{glossaries.sty}{sanitize}[description=true,symbol=true, name=true]{% -\ifthenelse{\equal{#1}{none}}{% -\renewcommand*{\@gls@sanitizedesc}{}% -\renewcommand*{\@gls@sanitizename}{}% -\renewcommand*{\@gls@sanitizesymbol}{}% -}{\setkeys[gls]{sanitize}{#1}}% +\ifthenelse{\equal{#1}{none}}% +{% + \renewcommand*{\@gls@sanitizedesc}{}% + \renewcommand*{\@gls@sanitizename}{}% + \renewcommand*{\@gls@sanitizesymbol}{}% +}% +{% + \setkeys[gls]{sanitize}{#1}}% } % \end{macrocode} %\end{option} @@ -1438,15 +1484,6 @@ name=true]{% }} \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{macrocode} -\newcommand*{\glspostdescription}{.} -% \end{macrocode} -%\end{macro} -% %\begin{macro}{\nopostdesc} % Provide a means to suppress description terminator for a given % entry. (Useful for entries with no description.) Has no @@ -7860,7 +7897,7 @@ name=true]{% % \end{macrocode} %\end{macro} %\vskip5pt -%\cs{glsaddall}\oarg{glossary list}\\[10pt] +%\cs{glsaddall}\oarg{option list}\\[10pt] % Add all terms defined for the listed glossaries (without displaying % any text). If \gloskey[glsaddall]{types} key is omitted, apply to all % glossary types. @@ -8930,6 +8967,10 @@ you % \begin{macrocode} \def\@glo@type{\glsdefaulttype}% \def\glossarytitle{\csname @glotype@\@glo@type @title\endcsname}% +% \end{macrocode} +%\changes{3.03}{2012/09/21}{allow title to override default toctitle} +% \begin{macrocode} + \def\glossarytoctitle{\glossarytitle}% \let\org@glossarytitle\glossarytitle \def\@glossarystyle{}% \def\gls@dotoctitle{\glssettoctitle{\@glo@type}}% @@ -9077,14 +9118,19 @@ you % \end{macrocode} % The \gloskey[printglossary]{title} key sets the title used in the glossary section % header. This overrides the title used in \ics{newglossary}. +%\changes{3.03}{2012/09/21}{allow title to set toctitle} % \begin{macrocode} -\define@key{printgloss}{title}{\def\glossarytitle{#1}} +\define@key{printgloss}{title}{% + \def\glossarytitle{#1}% + \let\gls@dotoctitle\relax +} % \end{macrocode} % The \gloskey[printglossary]{toctitle} sets the text used for the relevant entry % in the table of contents. % \begin{macrocode} -\define@key{printgloss}{toctitle}{\def\glossarytoctitle{#1}% -\let\gls@dotoctitle\relax +\define@key{printgloss}{toctitle}{% + \def\glossarytoctitle{#1}% + \let\gls@dotoctitle\relax } % \end{macrocode} % The \gloskey[printglossary]{style} key sets the glossary style (but only for @@ -11734,7 +11780,7 @@ false,nolabel,autolabel}[nolabel]{% % This defines an in-line style where the entries are % comma-separated with just the name and description displayed. % \begin{macrocode} -\ProvidesPackage{glossary-inline}[2012/05/21 v1.0 (NLCT)] +\ProvidesPackage{glossary-inline}[2012/09/21 v3.03 (NLCT)] % \end{macrocode} % %\begin{style}{inline} @@ -11749,6 +11795,7 @@ false,nolabel,autolabel}[nolabel]{% {% \def\gls@inlinesep{}% \def\gls@inlinesubsep{}% + \def\gls@inlinepostchild{}% }% {\glspostinline}% % \end{macrocode} @@ -11756,37 +11803,44 @@ false,nolabel,autolabel}[nolabel]{% % \begin{macrocode} \renewcommand*{\glossaryheader}{}% % \end{macrocode} -% No group headings: +% No group headings (if heading is required, add +% \ics{glsinlinedopostchild} to start definition in case heading +% follows a child entry): % \begin{macrocode} \renewcommand*{\glsgroupheading}[1]{}% % \end{macrocode} % Just display separator followed by name and description: % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% + \renewcommand{\glossaryentryfield}[5]{% + \glsinlinedopostchild \gls@inlinesep - \glsentryitem{##1}\glstarget{##1}{##2}% \def\glo@desc{##3}% \def\@no@post@desc{\nopostdesc}% + \glsentryitem{##1}\glsinlinenameformat{##1}{##2}% \ifx\glo@desc\@no@post@desc + \glsinlineemptydescformat{##4}{##5}% \else - \ifstrempty{##3}{}{\space##3}% + \ifstrempty{##3}% + {\glsinlineemptydescformat{##4}{##5}}% + {\glsinlinedescformat{##3}{##4}{##5}}% \fi \ifglshaschildren{##1}% {% \glsresetsubentrycounter \glsinlineparentchildseparator \def\gls@inlinesubsep{}% + \def\gls@inlinepostchild{\glsinlinepostchild}% }% {}% \def\gls@inlinesep{\glsinlineseparator}% }% % \end{macrocode} -% Sub-entries display description but no name: +% Sub-entries display description: % \begin{macrocode} - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossarysubentryfield}[6]{% \gls@inlinesubsep% - \glstarget{##2}{}% - \glssubentryitem{##2}##4% + \glsinlinesubnameformat{##2}{##3}% + \glssubentryitem{##2}\glsinlinesubdescformat{##4}{##5}{##6}% \def\gls@inlinesubsep{\glsinlinesubseparator}% }% % \end{macrocode} @@ -11797,6 +11851,15 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} %\end{style} % +%\begin{macro}{\glsinlinedopostchild} +% \begin{macrocode} +\newcommand*{\glsinlinedopostchild}{% + \gls@inlinepostchild + \def\gls@inlinepostchild{}% +} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\glsinlineseparator} % Separator to use between entries. % \begin{macrocode} @@ -11818,12 +11881,66 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} %\end{macro} % +%\begin{macro}{\glsinlinepostchild} +%\changes{}{}{new} +% Hook to use between child and next entry +% \begin{macrocode} +\newcommand*{\glsinlinepostchild}{} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\glspostinline} % Terminator for inline glossary. +%\changes{}{}{replaced ``.'' with \cs{glspostdescription}} +% \begin{macrocode} +\newcommand*{\glspostinline}{\glspostdescription\space} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsinlinenameformat} +%\changes{}{}{new} +% Formats the name of the entry (first argument label, second +% argument name): +% \begin{macrocode} +\newcommand*{\glsinlinenameformat}[2]{\glstarget{#1}{#2}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsinlinedescformat} +%\changes{}{}{new} +% Formats the entry's description, symbol and location list: +% \begin{macrocode} +\newcommand*{\glsinlinedescformat}[3]{\space#1} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsinlineemptydescformat} +%\changes{}{}{new} +% Formats the entry's symbol and location list when the description +% is empty: +% \begin{macrocode} +\newcommand*{\glsinlineemptydescformat}[2]{} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsinlinesubnameformat} +%\changes{}{}{new} +% Formats the name of the subentry (first argument label, second +% argument name): +% \begin{macrocode} +\newcommand*{\glsinlinesubnameformat}[2]{\glstarget{#1}{}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsinlinesubdescformat} +%\changes{}{}{new} +% Formats the subentry's description, symbol and location list: % \begin{macrocode} -\newcommand*{\glspostinline}{.\space} +\newcommand*{\glsinlinesubdescformat}[3]{#1} % \end{macrocode} %\end{macro} +% +% %\iffalse % \begin{macrocode} %</glossary-inline.sty> @@ -11841,7 +11958,7 @@ false,nolabel,autolabel}[nolabel]{% % \ics{item} command, it will appear in a bold font by % default. % \begin{macrocode} -\ProvidesPackage{glossary-list}[2011/03/28 v3.0 (NLCT)] +\ProvidesPackage{glossary-list}[2012/09/21 v3.03 (NLCT)] % \end{macrocode} %\begin{style}{list} % The \glostyle{list} glossary style @@ -11881,8 +11998,9 @@ false,nolabel,autolabel}[nolabel]{% \glstarget{##2}{\strut}##4\glspostdescription\space ##6.}% % \end{macrocode} % Add vertical space between groups: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{\indexspace}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}% } % \end{macrocode} %\end{style} @@ -12067,7 +12185,7 @@ false,nolabel,autolabel}[nolabel]{% % The glossary styles defined in the \isty{glossary-long} package % used the \env{longtable} environment in the glossary. % \begin{macrocode} -\ProvidesPackage{glossary-long}[2011/03/28 v3.0 (NLCT)] +\ProvidesPackage{glossary-long}[2012/09/21 v3.03 (NLCT)] % \end{macrocode} % Requires the \isty{longtable} package: % \begin{macrocode} @@ -12132,8 +12250,9 @@ false,nolabel,autolabel}[nolabel]{% \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}% % \end{macrocode} % Blank row between groups: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{ & \\}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \\\fi}% } % \end{macrocode} %\end{style} @@ -12233,8 +12352,9 @@ false,nolabel,autolabel}[nolabel]{% \glstarget{##2}{\strut}##4 & ##6\\}% % \end{macrocode} % Blank row between groups: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{ & &\\}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\\\fi}% } % \end{macrocode} %\end{style} @@ -12337,8 +12457,9 @@ false,nolabel,autolabel}[nolabel]{% \glstarget{##2}{\strut}##4 & ##5 & ##6\\}% % \end{macrocode} % Blank row between groups: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{ & & &\\}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\\\fi}% } % \end{macrocode} %\end{style} @@ -12509,7 +12630,7 @@ false,nolabel,autolabel}[nolabel]{% % used the \env{longtable} environment in the glossary and use % ragged right formatting for the multiline columns. % \begin{macrocode} -\ProvidesPackage{glossary-longragged}[2011/03/28 v3.0 (NLCT)] +\ProvidesPackage{glossary-longragged}[2012/09/21 v3.03 (NLCT)] % \end{macrocode} % Requires the \isty{array} package: % \begin{macrocode} @@ -12577,8 +12698,9 @@ false,nolabel,autolabel}[nolabel]{% \tabularnewline}% % \end{macrocode} % Blank row between groups: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{ & \tabularnewline}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \tabularnewline\fi}% } % \end{macrocode} %\end{style} @@ -12682,8 +12804,9 @@ false,nolabel,autolabel}[nolabel]{% \glstarget{##2}{\strut}##4 & ##6\tabularnewline}% % \end{macrocode} % Blank row between groups: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{ & &\tabularnewline}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\tabularnewline\fi}% } % \end{macrocode} %\end{style} @@ -12791,8 +12914,9 @@ false,nolabel,autolabel}[nolabel]{% \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}% % \end{macrocode} % Blank row between groups: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{ & & &\tabularnewline}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\tabularnewline\fi}% } % \end{macrocode} %\end{style} @@ -13178,7 +13302,7 @@ false,nolabel,autolabel}[nolabel]{% % The glossary styles defined in the \isty{glossary-super} package % use the \env{supertabular} environment. % \begin{macrocode} -\ProvidesPackage{glossary-super}[2011/03/28 v3.0 (NLCT)] +\ProvidesPackage{glossary-super}[2012/09/21 v3.03 (NLCT)] % \end{macrocode} % Requires the \isty{supertabular} package: % \begin{macrocode} @@ -13248,8 +13372,9 @@ false,nolabel,autolabel}[nolabel]{% \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}% % \end{macrocode} % Blank row between groups: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{ & \\}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \\\fi}% } % \end{macrocode} %\end{style} @@ -13358,8 +13483,9 @@ false,nolabel,autolabel}[nolabel]{% \glstarget{##2}{\strut}##4 & ##6\\}% % \end{macrocode} % Blank row between groups: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{ & &\\}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\\\fi}% } % \end{macrocode} %\end{style} @@ -13472,8 +13598,9 @@ false,nolabel,autolabel}[nolabel]{% \glstarget{##2}{\strut}##4 & ##5 & ##6\\}% % \end{macrocode} % Blank row between groups: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{ & & &\\}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\\\fi}% } % \end{macrocode} %\end{style} @@ -13656,7 +13783,7 @@ false,nolabel,autolabel}[nolabel]{% % are like those provided by the \isty{glossary-super} package, % except that the multiline columns have ragged right justification. % \begin{macrocode} -\ProvidesPackage{glossary-superragged}[2011/03/28 v3.0 (NLCT)] +\ProvidesPackage{glossary-superragged}[2012/09/21 v3.03 (NLCT)] % \end{macrocode} % Requires the \isty{array} package: % \begin{macrocode} @@ -13727,8 +13854,9 @@ false,nolabel,autolabel}[nolabel]{% \tabularnewline}% % \end{macrocode} % Blank row between groups: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{ & \tabularnewline}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \tabularnewline\fi}% } % \end{macrocode} %\end{style} @@ -13839,8 +13967,9 @@ false,nolabel,autolabel}[nolabel]{% \glstarget{##2}{\strut}##4 & ##6\tabularnewline}% % \end{macrocode} % Blank row between groups: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{ & &\tabularnewline}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\tabularnewline\fi}% } % \end{macrocode} %\end{style} @@ -13956,8 +14085,9 @@ false,nolabel,autolabel}[nolabel]{% \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}% % \end{macrocode} % Blank row between groups: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{ & & &\tabularnewline}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\tabularnewline\fi}% } % \end{macrocode} %\end{style} @@ -14052,7 +14182,7 @@ false,nolabel,autolabel}[nolabel]{% % that have a tree-like structure. These are designed for % hierarchical glossaries. % \begin{macrocode} -\ProvidesPackage{glossary-tree}[2011/03/28 v3.0 (NLCT)] +\ProvidesPackage{glossary-tree}[2012/09/21 v3.03 (NLCT)] % \end{macrocode} % %\begin{style}{index} @@ -14123,8 +14253,9 @@ false,nolabel,autolabel}[nolabel]{% \space##4\glspostdescription\space ##6}% % \end{macrocode} % Vertical gap between groups is the same as that used by indices: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{\indexspace}} + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}} % \end{macrocode} %\end{style} % @@ -14227,8 +14358,9 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Vertical gap between groups is the same as that used by % indices: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{\indexspace}} + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}} % \end{macrocode} %\end{style} % @@ -14337,8 +14469,9 @@ false,nolabel,autolabel}[nolabel]{% ##4\glspostdescription\space ##6\par}% % \end{macrocode} % Vertical gap between groups is the same as that used by indices: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{\indexspace}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}% } % \end{macrocode} %\end{style} @@ -14557,8 +14690,9 @@ false,nolabel,autolabel}[nolabel]{% }% % \end{macrocode} % Vertical gap between groups is the same as that used by indices: +%\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{\indexspace}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}% } % \end{macrocode} %\end{style} @@ -21338,8 +21472,8 @@ description={the hash symbol}} # File : glossaries.perl # Author : Nicola L.C. Talbot # Date : 14th June 2007 -# Last Modified : 25th July 2008 -# Version : 1.04 +# Last Modified : 2012-09-21 +# Version : 1.05 # Description : LaTeX2HTML (limited!) implementation of glossaries # package. Note that not all the glossaries.sty # macros have been implemented. @@ -21362,11 +21496,22 @@ description={the hash symbol}} # This work consists of the files glossaries.dtx and glossaries.ins # and the derived files glossaries.sty, glossary-hypernav.sty, # glossary-list.sty, glossary-long.sty, glossary-super.sty, -# glossaries.perl. Also makeglossaries and makeglossaries.bat +# glossaries.perl, mfrstuc.perl. Also makeglossaries and makeglossaries.bat package main; +&do_require_package("mfirstuc"); + + %glossary_style = (); + &set_glossarystyle('altlist');# default style + + $CURRENT_STYLE='altlist'; + +&process_commands_nowrap_in_tex( <<_RAW_ARG_CMDS_); +newglossarystyle # {} # {} +_RAW_ARG_CMDS_ + # These are the only package options implemented. sub do_glossaries_style_altlist{ @@ -21378,8 +21523,20 @@ sub do_glossaries_toc{ sub do_glossaries_toc_true{ } +$INDEXONLYFIRST=0; + +sub do_glossaries_indexonlyfirst{ + $INDEXONLYFIRST=1; +} + +$gls_nonumberlist{'main'} = 0; + +sub do_glossaries_nonumberlist{ + $gls_nonumberlist{'main'} = 1; +} + $GLSCURRENTFORMAT="textrm" if (!defined($GLSCURRENTFORMAT)); -$GLOSSARY_END_DESCRIPTION = '. ' if (!defined($GLOSSARY_END_DESCRIPTION)); +$GLOSSARY_END_DESCRIPTION = '.' if (!defined($GLOSSARY_END_DESCRIPTION)); sub do_cmd_glossaryname{ "Glossary$_[0]" @@ -21388,6 +21545,7 @@ sub do_cmd_glossaryname{ $gls_mark{'main'} = "<tex2html_gls_main_mark>"; $gls_file_mark{'main'} = "<tex2html_gls_main_file_mark>"; $gls_title{'main'} = "\\glossaryname"; +$gls_toctitle{'main'} = "\\glossaryname"; $delimN{'main'} = ", "; $glsnumformat{'main'} = $GLSCURRENTFORMAT; @{$gls_entries{'main'}} = (); @@ -21407,7 +21565,7 @@ sub do_glossaries_acronym_true{ $acronymtype = 'acronym'; } -sub do_glossary_acronym_false{ +sub do_glossaries_acronym_false{ $acronymtype = 'main'; } @@ -21419,6 +21577,63 @@ sub do_cmd_acronymtype{ join('', $acronymtype, $_[0]); } +$global{'glossaryentry'} = 0; +$global{'glossarysubentry'} = 0; + +sub do_cmd_theglossaryentry{ + join('', $global{'glossaryentry'}, $_[0]); +} + +sub do_cmd_theglossarysubentry{ + join('', $global{'glossarysubentry'}, $_[0]); +} + +sub do_glossaries_entrycounter{ + &do_glossaries_entrycounter_true +} + +sub do_glossaries_entrycounter_true{ + eval(<<'_END_DEF'); + sub do_cmd_glsresetentrycounter{ + $global{'entrycounter'} = 0; + $_[0]; + } +_END_DEF +} + +sub do_glossaries_entrycounter_false{ + eval(<<'_END_DEF'); + sub do_cmd_glsresetentrycounter{ + $_[0]; + } +_END_DEF +} + +sub do_cmd_glsresetentrycounter{$_[0];} + +sub do_glossaries_subentrycounter{ + &do_glossaries_subentrycounter_true +} + +sub do_glossaries_subentrycounter_true{ + eval(<<'_END_DEF'); + sub do_cmd_glsresetsubentrycounter{ + $global{'subentrycounter'} = 0; + $_[0]; + } +_END_DEF +} + +sub do_glossaries_subentrycounter_false{ + eval(<<'_END_DEF'); + sub do_cmd_glsresetsubentrycounter{ + $_[0]; + } +_END_DEF +} + +sub do_cmd_glsresetsubentrycounter{ $_[0]; } + # modify set_depth_levels so that glossary is added sub replace_glossary_markers{ @@ -21434,7 +21649,7 @@ sub replace_glossary_markers{ } # there must be a better way of doing this -# other than copying the orginal code and adding to it. +# other than copying the original code and adding to it. sub replace_general_markers { if (defined &replace_infopage_hook) {&replace_infopage_hook if (/$info_page_mark/);} else { &replace_infopage if (/$info_page_mark/); } @@ -21483,28 +21698,256 @@ local(@styles) = split(/\s*,\s*/,$INDEX_STYLES); &add_real_gls } +sub gls_compare{ + local($x, $y) = @_; + + if ($x eq '' or $y eq '') + { + if ($x ne '') + { + # y is the shorter string + return 1; + } + elsif ($y ne '') + { + # x is the shorter string + return -1; + } + else + { + # both empty + return 0; + } + } + + local($x0) = ''; + local($y0) = ''; + + if ($x=~s/^(&#(?:\d+|x[\da-f]+);)//) + { + $x0 = $1; + } + elsif ($x=~s/^(.)//) + { + $x0 = $1; + } + + if ($y=~s/^(&#(?:\d+|x[\da-f]+);)//) + { + $y0 = $1; + } + elsif ($y=~s/^(.)//) + { + $y0 = $1; + } + + local($numx); + + if ($x0=~/&#(\d+|x[\da-f]+);/) + { + $numx = $1; + + $numx = hex("0$numx") if $numx=~/^x/; + } + else + { + $numx = ord($x0); + } + + local($numy); + + if ($y0=~/&#(\d+|x[\da-f]+);/) + { + $numy = $1; + + $numy = hex("0$numy") if $numy=~/^x/; + } + else + { + $numy = ord($y0); + } + + if ($numx == $numy) + { + return &gls_compare($x, $y); + } + elsif ($numx >= 48 and $numx <= 57) # x in range '0' ... '9' + { + if ($numy >= 48 and $numy <= 57) # y in range '0' ... '9' + { + return $numx <=> $numy; + } + elsif (($numy >= 97 and $numy <= 122) or ($numy >= 65 and $numy <= 90)) # y a letter + { + # digits are less than letters + return -1; + } + else + { + # digits are greater than symbols + return 1; + } + } + elsif (($numx >= 97 and $numx <= 122) or ($numx >= 65 and $numx <= 90)) # x a letter + { + if (($numy >= 97 and $numy <= 122) or ($numy >= 65 and $numy <= 90)) # y a letter + { + if (($numx <= 90 and $numy <= 90) or ($numx >= 97 and $numy >= 97)) + { + # same case (already checked if they are equal) + + return $numx <=> $numy; + } + + # are they upper/lower case versions of each other? + + if (($numx >= 97 and $numy == $numx-32)) + { + # x is upper case version of y + + if ($x or $y) + { + return &gls_compare($x, $y); + } + else + { + return -1; + } + } + + if (($numy >= 97 and $numx == $numy-32)) + { + # y is upper case version of x + + if ($x or $y) + { + return &gls_compare($x, $y); + } + else + { + return 1; + } + } + + # compare lower case values + return lc(chr($numx)) cmp lc(chr($numy)); + } + else + { + # a-z greater than symbols and digits + return 1; + } + } + elsif ($numy >= 48 and $numy <= 57) # y in range '0' ... '9' + { + # already checked for '0' < x < '9' and '0' < y < '9' + # already checked for 'a' < x < 'z' and '0' < y < '9' + + # digits greater than symbols + return 1; + } + elsif (($numy >= 97 and $numy <= 122) or ($numy >= 65 and $numy <= 90)) # y is a letter + { + # already checked for x is digit and y a is letter + # already checked for x is letter and y a is letter + + # symbols and digits are less than letters + + return -1; + } + + $numx <=> $numy +} + sub gloskeysort{ - local($x, $y) = ($a, $b); - $x=~s/^(.*)###(\d+)$/\l\1/; - local($x_id) = $2; - $y=~s/^(.*)###(\d+)$/\l\1/; + + $a=~/^(.*)###(\d+)$/; + + local($labelx) = $1; + local($x_id) =$2; + + $b=~/^(.*)###(\d+)$/; + + local($labely) = $1; local($y_id) = $2; - local($n) = ($x cmp $y); + local($sortx) = &gls_get_sort($labelx); + local($sorty) = &gls_get_sort($labely); - if ($n == 0) + local($n); + + # are they case-insensitive equivalent? + + if (lc($sortx) eq lc($sorty)) + { + $n = ($sortx cmp $sorty); + } + else + { + $n = &gls_compare($sortx, $sorty); + } + + unless ($n) { $n = ($x_id <=> $y_id); } - $n; + $n +} + +sub add_parent_if_required{ + local($label) = @_; + + local($parent) = &gls_get_parent($label); + + if ($parent) + { + local($type) = &gls_get_type($parent); + + # does this parent have a backlink? + + for my $key (keys %{$glossary{$type}}) + { + return if $key=~/^$parent###\d+$/; + } + + # none found, so add empty one + + my $id = ++$global{'max_id'}; + + $glossary{$type}{"$parent###$id"} = ''; + $glossary_entry{$type}{"$parent###$id"} = $parent; + + # check if parent also has a parent + + &add_parent_if_required($parent); + } } sub add_real_gls{ local($type) = @_; print "\nDoing glossary '$type' ..."; - local($key, $str, @keys, $glossary, $level, $count, - @previous, @current, $id, $linktext, $delimN); + local($key, $str, @keys, $thisglsentry, $level, $count, + $previous, $current, $id, $linktext, $delimN); + + $TITLE = $gls_toctitle{$type}; + + local($oldstyle) = $CURRENT_STYLE; + + if ($gls_style{$type}) + { + &set_glossarystyle($gls_style{$type}); + } + + # add any parent entries that haven't been referenced + + for my $key (keys %{$glossary{$type}}) + { + my $label = $key; + $label =~ s/###\d+$//o; # Remove the unique id's + + &add_parent_if_required($label); + } @keys = keys %{$glossary{$type}}; @@ -21514,47 +21957,624 @@ sub add_real_gls{ $delimN = $delimN{$type}; + $previous = ''; + + local($previousentry) = ''; + + my $glossaryentryfield = ''; + + my $previouscat = ''; + + local ($entry); + foreach $key (@keys) { $current = $key; - $str = $current; - $str =~ s/\#\#\#\d+$//o; # Remove the unique id's - #$linktext = $cross_ref_visible_mark; - $id = ++$global{'max_id'}; - $linktext = "\\$glossary_format{$type}{$key}${OP}$id${CP}$glossary_linktext{$type}{$key}${OP}$id${CP}"; - $linktext = &translate_commands($linktext); + $current =~ s/\#\#\#\d+$//o; # Remove the unique id's - local($entry) = $glossary_entry{$type}{$key}; + my $issame = ($current eq $previous ? 1 : 0); - $id = ++$global{'max_id'}; - local($name) = &translate_commands( - "\\glsnamefont $OP$id$CP$glsentry{$entry}{name}$OP$id$CP"); - - local($symbol) = ($glsentry{$entry}{'symbol'} ? - " $glsentry{$entry}{symbol}" : ''); - - $glossary .= - # If it's the same string don't start a new line - (&index_key_eq($current, $previous) ? - $delimN - . $glossary{$type}{$key} - . $linktext - . "</A>" - : "<DT>" - . "<A NAME=\"gls:$entry\">$name</A>" - . "<DD>" - . $glsentry{$entry}{'description'} - . $symbol . $GLOSSARY_END_DESCRIPTION - . $glossary{$type}{$key} - . $linktext. "</A>"); $previous = $current; + + $entry = $glossary_entry{$type}{$key}; + + unless ($issame) + { + if ($glossaryentryfield) + { + $id = ++$global{'max_id'}; + + my $level = &gls_get_level($previousentry); + + if ($level > 0) + { + my $id2 = ++$global{'max_id'}; + + $thisglsentry .= + "\\glossarysubentryfield $OP$id2$CP$level$OP$id2$CP$glossaryentryfield$OP$id$CP$linktext$OP$id$CP"; + } + else + { + $thisglsentry .= + "\\glossaryentryfield $glossaryentryfield$OP$id$CP$linktext$OP$id$CP"; + } + + $glossaryentryfield = ''; + } + + $linktext = ''; + + my $currentcat = substr(&gls_get_sort($current), 0, 1); + + if ($currentcat=~/[a-zA-Z]/) + { + $currentcat = uc($currentcat); + } + elsif ($currentcat=~/[0-9]/) + { + $currentcat = 'glsnumbers'; + } + else + { + $currentcat = 'glssymbols'; + } + + unless ($previouscat eq $currentcat) + { + $id = ++$global{'max_id'}; + $thisglsentry .= "\\glsgroupheading$OP$id$CP$currentcat$OP$id$CP"; + + $previouscat = $currentcat; + } + } + + $previousentry = $entry; + + # Back ref + + if ($gls_nonumberlist{$type}) + { + $linktext = ''; + } + elsif ($glossary{$type}{$key}) + { + $id = ++$global{'max_id'}; + + $linktext .= $delimN if ($linktext); + + $linktext .= "$glossary{$type}{$key}\\$glossary_format{$type}{$key}${OP}$id${CP}$glossary_linktext{$type}{$key}${OP}$id${CP}</A>"; + + } + + unless ($issame) + { + $id = ++$global{'max_id'}; + local($name) = &translate_commands( + "\\glsnamefont $OP$id$CP$glsentry{$entry}{name}$OP$id$CP"); + + local($symbol) = ($glsentry{$entry}{'symbol'} ? + " $glsentry{$entry}{symbol}" : ''); + + $id = ++$global{'max_id'}; + my $id2 = ++$global{'max_id'}; + my $id3 = ++$global{'max_id'}; + my $id4 = ++$global{'max_id'}; + + $glossaryentryfield = "$OP$id$CP$entry$OP$id$CP" # label + . "$OP$id2$CP$name$OP$id2$CP" # name + . "$OP$id3$CP$glsentry{$entry}{description}$OP$id3$CP" # description + . "$OP$id4$CP$symbol$OP$id4$CP" # symbol + } + + } + + if ($glossaryentryfield and $entry) + { + my $level = &gls_get_level($entry); + + if ($level > 0) + { + my $id2 = ++$global{'max_id'}; + + $thisglsentry .= + "\\glossarysubentryfield $OP$id2$CP$level$OP$id2$CP$glossaryentryfield$OP$id$CP$linktext$OP$id$CP"; + } + else + { + $id = ++$global{'max_id'}; + $thisglsentry .= + "\\glossaryentryfield $glossaryentryfield$OP$id$CP$linktext$OP$id$CP"; + } + } + + $str = &do_env_theglossary($thisglsentry) . &translate_commands("\\glossarypostamble"); + + if ($gls_style{$type}) + { + &set_glossarystyle($oldstyle); + } + + s/$gls_mark{$type}/$preglossary\n$str\n/s; +} + +sub do_cmd_glstarget{ + local($_) = @_; + + local($id, $label, $text); + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$label=$2;''/eo; + + $text = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$text=$2;''/eo; + + "<A NAME=\"gls:$label\">$text</A>$_"; +} + +sub do_cmd_newglossarystyle{ + local($_) = @_; + + local($id,$style,$defs); + + $style = &missing_braces unless + s/$next_pair_rx/$id=$1;$style=$2;''/eo; + + $defs = &missing_braces unless + s/$next_pair_rx/$id=$1;$defs=$2;''/eo; + + $glossary_style{$style} = $defs; + + $_; +} + +sub do_cmd_glossarystyle{ + local($_) = @_; + + local($id,$style); + + $style = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$style=$2;''/eo; + + &set_glossarystyle($style); + + $_; +} + +sub set_glossarystyle{ + local($style) = @_; + + $CURRENT_STYLE = $style; + + if ($glossary_style{$style}) + { + local($_) = $glossary_style{$style}; + + s/$O(\d+)$C/$OP$1$CP/g; + + &translate_commands($_); + } + else + { + my $cmd_sub = "set_glossarystyle_$style"; + + if (defined(&$cmd_sub)) + { + &$cmd_sub(); + } + else + { + &write_warnings("Unknown glossary style '$style', defaulting to 'altlist'"); + &set_glossarystyle_altlist(); + + $CURRENT_STYLE = 'altlist'; + } } - $glossary = '<DD>'.$glossary unless ($glossary =~ /^\s*<D(T|D)>/); - $glossary =~ s/(<A [^>]*>)(<D(T|D)>)/$2$1/g; +} + +sub do_cmd_glspar{ "<P>".$_[0]; } + +sub do_cmd_glossaryheader{ + local($_) = @_; + $_ +} + +sub do_cmd_glsentryitem{ + local($_) = @_; + + local($id, $label); - $str = &translate_commands("\\glossarypostamble"); - s/$gls_mark{$type}/$preglossary\n<DL COMPACT>\n$glossary<\/DL>$str\n/s; + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$label=$2;''/eo; + + $_ +} + +sub do_cmd_glssubentryitem{ + local($_) = @_; + + local($id, $label); + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$label=$2;''/eo; + + $_ +} + +sub do_cmd_glsgroupheading{ + local($_) = @_; + + local($id, $heading); + + $heading = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$heading=$2;''/eo; + + $_; +} + +sub do_cmd_glossaryentryfield{ + local($_) = @_; + + local($id, $label, $name, $desc, $symbol, $backlink); + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$label=$2;''/eo; + + $name = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$name=$2;''/eo; + + $desc = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$desc=$2;''/eo; + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$symbol=$2;''/eo; + + $backlink = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$backlink=$2;''/eo; + + local($id2) = ++$global{'max_id'}; + + "\\glstarget $OP$id$CP$label$OP$id$CP$OP$id2$CP$name$OP$id2$CP\n$desc $backlink\n$_"; +} + +sub do_cmd_glossarysubentryfield{ + local($_) = @_; + + local($id, $level, $label, $name, $desc, $symbol, $backlink); + + $level = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$level=$2;''/eo; + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$label=$2;''/eo; + + $name = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$name=$2;''/eo; + + $desc = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$desc=$2;''/eo; + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$symbol=$2;''/eo; + + $backlink = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$backlink=$2;''/eo; + + local($id2) = ++$global{'max_id'}; + + "\\glstarget $OP$id$CP$label$OP$id$CP$OP$id2$CP$name$OP$id2$CP\n$desc $backlink\n$_"; +} + +sub do_env_theglossary{ + local($_) = @_; + + &translate_commands($_); +} + +sub set_glossarystyle_altlist{ + eval(<<'END_STYLE'); + sub do_cmd_glossaryheader{ + local($_) = @_; + $_ + } + + sub do_cmd_glsgroupheading{ + local($_) = @_; + + local($id, $heading); + + $heading = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$heading=$2;''/eo; + + $_ + } + + sub do_cmd_glossaryentryfield{ + local($_) = @_; + + local($id, $id2, $id3, $id4, $id5, $label, $name, $desc, $symbol, $backlink); + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$label=$2;''/eo; + + $name = &missing_braces unless + s/$next_pair_pr_rx/$id2=$1;$name=$2;''/eo; + + $desc = &missing_braces unless + s/$next_pair_pr_rx/$id3=$1;$desc=$2;''/eo; + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id4=$1;$symbol=$2;''/eo; + + $backlink = &missing_braces unless + s/$next_pair_pr_rx/$id5=$1;$backlink=$2;''/eo; + + "<DT>\\glstarget $OP$id$CP$label$OP$id$CP$OP$id2$CP$name$OP$id2$CP\n<DD>" + . "$desc\\glspostdescription\\space $backlink$_"; + } + + sub do_cmd_glossarysubentryfield{ + local($_) = @_; + + local($id, $id2, $id3, $id4, $id5, $id6, $level, + $label, $name, $desc, $symbol, $backlink); + + $level = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$level=$2;''/eo; + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id2=$1;$label=$2;''/eo; + + $name = &missing_braces unless + s/$next_pair_pr_rx/$id3=$1;$name=$2;''/eo; + + $desc = &missing_braces unless + s/$next_pair_pr_rx/$id4=$1;$desc=$2;''/eo; + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id5=$1;$symbol=$2;''/eo; + + $backlink = &missing_braces unless + s/$next_pair_pr_rx/$id6=$1;$backlink=$2;''/eo; + + "<P>\\glssubentryitem $OP$id$CP$label$OP$id$CP" + ."\\glstarget $OP$id2$CP$label$OP$id2$CP$OP$id3$CP$name$OP$id3$CP" + ."$desc\\glspostdescription\\space $backlink\n$_"; + } + + sub do_env_theglossary{ + local($_) = @_; + + "<DL>".&translate_commands("\\glossaryheader $_")."</DL>"; + } +END_STYLE +} + +sub set_glossarystyle_inline{ + eval(<<'END_STYLE'); + sub do_cmd_glossaryheader{ + local($_) = @_; + $_ + } + + sub do_cmd_glsgroupheading{ + local($_) = @_; + + local($id, $heading); + + $heading = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$heading=$2;''/eo; + + $_; + } + + sub do_cmd_glossaryentryfield{ + local($_) = @_; + + local($id, $id2, $id3, $id4, $id5, $label, $name, $desc, $symbol, $backlink); + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$label=$2;''/eo; + + $name = &missing_braces unless + s/$next_pair_pr_rx/$id2=$1;$name=$2;''/eo; + + $desc = &missing_braces unless + s/$next_pair_pr_rx/$id3=$1;$desc=$2;''/eo; + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id4=$1;$symbol=$2;''/eo; + + $backlink = &missing_braces unless + s/$next_pair_pr_rx/$id5=$1;$backlink=$2;''/eo; + + local($field) = "\\glsinlinedopostchild $glsinlinesep"; + + $field .= "\\glsentryitem $OP$id$CP$label$OP$id$CP" + . "\\glsinlinenameformat $OP$id2$CP$label$OP$id2$CP$OP$id3$CP$name$OP$id3$CP"; + + $id3 = ++$global{'max_id'}; + + if ($desc) + { + $field .= + "\\glsinlinedescformat $OP$id3$CP$desc$OP$id3$CP" + ."$OP$id4$CP$symbol$OP$id4$CP" + ."$OP$id5$CP$backlink$OP$id5$CP"; + } + else + { + $field .= + "\\glsinlineemptydescformat " + ."$OP$id4$CP$symbol$OP$id4$CP" + ."$OP$id5$CP$backlink$OP$id5$CP"; + } + +# TODO : check if has children + + local($haschildren) = 0; + + if ($haschildren) + { + $field .= "\\glsresetsubentrycounter " + . "\\glsinlineparentchildseparator " + . "\\glsinlinepostchild "; + } + + $glsinlinesep = &translate_commands("\\glsinlineseparator ") + unless $glsinlinesep; + + $field.$_; + } + + sub do_cmd_glossarysubentryfield{ + local($_) = @_; + + local($id, $id2, $id3, $id4,$id5,$id6,$level, + $label, $name, $desc, $symbol, $backlink); + + $level = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$level=$2;''/eo; + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id2=$1;$label=$2;''/eo; + + $name = &missing_braces unless + s/$next_pair_pr_rx/$id3=$1;$name=$2;''/eo; + + $desc = &missing_braces unless + s/$next_pair_pr_rx/$id4=$1;$desc=$2;''/eo; + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id5=$1;$symbol=$2;''/eo; + + $backlink = &missing_braces unless + s/$next_pair_pr_rx/$id6=$1;$backlink=$2;''/eo; + + "\\glsinlinesubnameformat $OP$id$CP$label$OP$id$CP$OP$id2$CP$name$OP$id2$CP" + ."\\glssubentryitem $OP$id3$CP$label$OP$id3$CP" + ."\\glsinlinesubdescformat $OP$id4$CP$desc$OP$id4$CP$OP$id5$CP$symbol$OP$id5$CP$OP$id6$CP$backlink$OP$id6$CP" + .$_; + } + + sub do_env_theglossary{ + local($_) = @_; + + $glsinlinesep = ''; + + &translate_commands("\\glossaryheader $_\\glspostinline "); + } +END_STYLE +} + +local($glsinlinesep,$glsinlinepostchild); + +sub do_cmd_glsinlineseparator{ + local($_) = @_; + + "; $_"; +} + +sub do_cmd_glsinlinedopostchild{ + local($_) = @_; + + $_; +} + +sub do_cmd_glspostdescription{ + local($_) = @_; + + $GLOSSARY_END_DESCRIPTION.$_; +} + +sub do_cmd_glspostinline{ + local($_) = @_; + + &translate_commands("\\glspostdescription\\space ").$_; +} + +sub do_cmd_glsinlinepostchild{ + local($_) = @_; + + $_; +} + +sub do_cmd_glsinlineparentchildseparator{ + local($_) = @_; + + ": $_"; +} + +sub do_cmd_glsinlinesubseparator{ + local($_) = @_; + + ", $_"; +} + +sub do_cmd_glsinlinenameformat{ + &do_cmd_glstarget(@_); +} + +sub do_cmd_glsinlinedescformat{ + local($_) = @_; + + local($id, $desc, $symbol, $backlinks); + + $desc = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$desc=$2;''/eo; + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$symbol=$2;''/eo; + + $backlinks = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$backlinks=$2;''/eo; + + "\\space $desc$_"; +} + +sub do_cmd_glsinlineemptydescformat{ + local($_) = @_; + + local($id, $symbol, $backlinks); + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$symbol=$2;''/eo; + + $backlinks = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$backlinks=$2;''/eo; + + $_; +} + +sub do_cmd_glsinlinesubnameformat{ + local($_) = @_; + + local($id, $id2, $label, $name); + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$label=$2;''/eo; + + $name = &missing_braces unless + s/$next_pair_pr_rx/$id2=$1,$name=$2;''/eo; + + "\\glstarget $OP$id$CP$label$OP$id$CP$OP$id2$CP$OP$id2$CP$_"; +} + +sub do_cmd_glsinlinesubdescformat{ + local($_) = @_; + + local($id, $desc, $symbol, $backlinks); + + $desc = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$desc=$2;''/eo; + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$symbol=$2;''/eo; + + $backlinks = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$backlinks=$2;''/eo; + + "$desc$_"; } sub set_depth_levels { @@ -21632,12 +22652,12 @@ sub get_firstkeyval{ } # need to get the value of the last key of a given name -# in the event of multiple occurences. +# in the event of multiple occurrences. sub get_keyval{ local($key,$_) = @_; local($value); - while (/\b$key\s*=/) + while (/\b$key\s*=/g) { ($value,$_) = &get_firstkeyval($key, $_); last unless defined($value); @@ -21646,6 +22666,18 @@ sub get_keyval{ ($value,$_); } +sub get_boolval{ + local($key,$_) = @_; + local($value); + + while (/\b$key\s*(?:=(true|false))?\b/g) + { + $value = ($1 ? $1 : 'true'); + } + + ($value eq 'true' ? 1 : 0, $_); +} + # This is modified from do_cmd_textohtmlindex sub do_cmd_textohtmlglossary{ @@ -21653,18 +22685,22 @@ sub do_cmd_textohtmlglossary{ local($keyval,$pat) = &get_next_optional_argument; - local($type,$title,$toctitle,$style); + local($type,$title,$toctitle,$style,$nonumberlist); + + $nonumberlist = 'default'; ($type,$keyval) = &get_keyval('type', $keyval); ($title,$keyval) = &get_keyval('title', $keyval); ($toctitle,$keyval) = &get_keyval('toctitle', $keyval); ($style,$keyval) = &get_keyval('style', $keyval); + ($nonumberlist,$keyval) = &get_boolval('nonumberlist', $keyval); - &make_textohtmlglossary($type,$toctitle,$title,$style).$_; + &make_textohtmlglossary($type,$toctitle,$title,$style,$nonumberlist).$_; } +# add_real_gls does the actual glossary sub make_textohtmlglossary{ - local($type,$toctitle,$title,$style) = @_; + local($type,$toctitle,$title,$style,$nonumberlist) = @_; unless (defined($type)) {$type = 'main';} @@ -21673,8 +22709,19 @@ sub make_textohtmlglossary{ &write_warnings("glossary type '$type' not implemented"); } - unless (defined($title) and $title) {$title = $gls_title{$type};} - unless (defined($toctitle) and $toctitle) {$toctitle = $title;} + if ($style) + { + $gls_style{$type} = $style; + } + + $toctitle = $gls_toctitle{$type} unless ($toctitle or $title); + + $title = $gls_title{$type} unless ($title); + $toctitle = $title unless ($toctitle); + + $gls_toctitle{$type} = $toctitle; + + $gls_nonumberlist{$type} = $nonumberlist unless ($nonumberlist eq 'default'); $toc_sec_title = $toctitle; $glsfile{$type} = $CURRENT_FILE; @@ -21702,6 +22749,7 @@ sub make_textohtmlglossary{ , &make_section_heading($title, $idx_head) , $gls_mark{$type} ); local($pre,$post) = &minimize_open_tags($heading); + join('',"<BR>\n" , $pre); } @@ -21766,13 +22814,8 @@ sub make_real_glossary_entry { $TITLE = $saved_title if (($saved_title)&&(!($TITLE)||($TITLE eq $default_title))); - local($sort) = $glsentry{$entry}{'sort'}; - # Save the reference - local($str) = "$sort###" . ++$global{'max_id'}; # Make unique - # concatenate multiple spaces into a single space - # otherwise keys won't sort properly - $str=~s/\s+/ /gs; + local($str) = "$label###" . ++$global{'max_id'}; # Make unique local($id) = ++$glsentry{$entry}{'maxid'}; local($glsanchor)="gls:$entry$id"; @@ -21789,13 +22832,46 @@ sub make_real_glossary_entry { $glossary_entry{$type}{$str} = $entry; $glossary_linktext{$type}{$str} = $TITLE; + local($mark) = $gls_file_mark{$type}; + + $mark = &get_gls_file_mark($type, $entry) if (defined(&get_gls_file_mark)); + + $text = &translate_commands($text); + if (defined($frame_foot_name)) { - "<A HREF=$gls_file_mark{$type}#gls:$entry NAME=\"$glsanchor\" TARGET=\"$frame_foot_name\">$text<\/A>"; + "<A HREF=\"$mark#gls:$entry\" NAME=\"$glsanchor\" TARGET=\"$frame_foot_name\">$text<\/A>"; } else { - "<A HREF=$gls_file_mark{$type}#gls:$entry NAME=\"$glsanchor\">$text<\/A>"; + "<A HREF=\"$mark#gls:$entry\" NAME=\"$glsanchor\">$text<\/A>"; + } +} + +sub make_real_glossary_entry_no_backlink { + local($entry,$text,$type) = @_; + local($this_file) = $CURRENT_FILE; + + local($target) = $frame_body_name; + + if (defined($frame_main_suffix)) + { + $this_file=~s/$frame_main_suffix/$frame_body_suffix/; + } + + local($mark) = $gls_file_mark{$type}; + + $mark = &get_gls_file_mark($type, $entry) if (defined(&get_gls_file_mark)); + + $text = &translate_commands($text); + + if (defined($frame_foot_name)) + { + "<A HREF=\"$mark#gls:$entry\" NAME=\"$glsanchor\" TARGET=\"$frame_foot_name\">$text<\/A>"; + } + else + { + "<A HREF=\"$mark#gls:$entry\" >$text<\/A>"; } } @@ -21827,11 +22903,13 @@ sub make_newglossarytype{ $gls_mark{$type} = "<tex2html_gls_${type}_mark>"; $gls_file_mark{$type} = "<tex2html_gls_${type}_file_mark>"; $gls_title{$type} = $title; + $gls_toctitle{$type} = $title; $delimN{$type} = ", "; $glsnumformat{$type} = $GLSCURRENTFORMAT; @{$gls_entries{$type}} = (); $gls_displayfirst{$type} = "glsdisplayfirst"; $gls_display{$type} = "glsdisplay"; + $gls_nonumberlist{$type} = $gls_nonumberlist{'main'}; } sub do_cmd_glsdisplay{ @@ -21969,15 +23047,21 @@ sub gls_entry_init{ ( type => $type, name => $name, 'sort' => $name, - description => $description, + description => $desc, text => $name, first => $name, plural => "${name}s", firstplural => "${name}s", symbol => '', flag => 0, - maxid=>0 + maxid => 0, + level => 0, + parent => '' ); + + $#{@{$glsentry{$label}{children}}} = -1; + + $glsentry{$label}; } sub gls_get_type{ @@ -22241,6 +23325,228 @@ sub gls_set_first{ } } +sub gls_get_parent{ + local($label) = @_; + + local($parent); + + if (&gls_entry_defined($label)) + { + $parent = $glsentry{$label}{'parent'}; + } + else + { + &write_warnings("gls_get_parent: glossary entry '$label' has not been defined"); + } + + $parent; +} + +sub gls_get_level{ + local($label) = @_; + + local($level) = 0; + + if (&gls_entry_defined($label)) + { + $level = $glsentry{$label}{'level'}; + } + else + { + &write_warnings("gls_get_level: glossary entry '$label' has not been defined"); + } + + $level; +} + +sub gls_set_parent{ + local ($label, $parent) = @_; + + if (&gls_entry_defined($label)) + { + if ($parent) + { + if (&gls_entry_defined($parent)) + { + $glsentry{$label}{'parent'} = $parent; + + push @{$glsentry{$parent}{'children'}}, $label; + + $glsentry{$label}{'level'} = $glsentry{$parent}{'level'}+1; + } + else + { + &write_warnings("gls_set_parent: parent '$parent' for glossary entry '$label' has not been defined"); + } + } + else + { + $glsentry{$label}{'parent'} = ''; + } + } + else + { + &write_warnings("gls_set_parent: glossary entry '$label' has not been defined"); + } +} + +sub gls_get_childcount{ + my($label) = @_; + + my($count) = 0; + + if (&gls_entry_defined($label)) + { + $count = scalar(@{$glsentry{$label}{'children'}}); + } + else + { + &write_warnings("gls_get_childcount: glossary entry '$label' has not been defined"); + } + + $count; +} + +sub gls_get_referenced_childcount{ + my($label) = @_; + + my($count) = 0; + + if (&gls_entry_defined($label)) + { + $count = scalar(grep(($glsentry{$_}{'maxid'} > 0), @{$glsentry{$label}{'children'}})); + } + else + { + &write_warnings("gls_get_childcount: glossary entry '$label' has not been defined"); + } + + $count; +} + +sub gls_set_userkeys{ + local($label, @user) = @_; + + if (&gls_entry_defined($label)) + { + for (my $idx = 0; $idx < 6; $idx++) + { + $glsentry{$label}{"user".($idx+1)} = $user[$idx]; + } + } + else + { + &write_warnings("gls_set_user: glossary entry '$label' has not been defined"); + } +} + +sub gls_set_user{ + local($label, $idx, $text) = @_; + + if (&gls_entry_defined($label)) + { + $glsentry{$label}{"user$idx"} = $text; + } + else + { + &write_warnings("gls_set_user: glossary entry '$label' has not been defined"); + } +} + +sub gls_set_useri{ + local($label, $text) = @_; + + if (&gls_entry_defined($label)) + { + $glsentry{$label}{'user1'} = $text; + } + else + { + &write_warnings("gls_set_useri: glossary entry '$label' has not been defined"); + } +} + +sub gls_set_userii{ + local($label, $text) = @_; + + if (&gls_entry_defined($label)) + { + $glsentry{$label}{'user2'} = $text; + } + else + { + &write_warnings("gls_set_userii: glossary entry '$label' has not been defined"); + } +} + +sub gls_set_useriii{ + local($label, $text) = @_; + + if (&gls_entry_defined($label)) + { + $glsentry{$label}{'user3'} = $text; + } + else + { + &write_warnings("gls_set_useriii: glossary entry '$label' has not been defined"); + } +} + +sub gls_set_useriv{ + local($label, $text) = @_; + + if (&gls_entry_defined($label)) + { + $glsentry{$label}{'user4'} = $text; + } + else + { + &write_warnings("gls_set_useriv: glossary entry '$label' has not been defined"); + } +} + +sub gls_set_userv{ + local($label, $text) = @_; + + if (&gls_entry_defined($label)) + { + $glsentry{$label}{'user5'} = $text; + } + else + { + &write_warnings("gls_set_userv: glossary entry '$label' has not been defined"); + } +} + +sub gls_set_uservi{ + local($label, $text) = @_; + + if (&gls_entry_defined($label)) + { + $glsentry{$label}{'user6'} = $text; + } + else + { + &write_warnings("gls_set_uservi: glossary entry '$label' has not been defined"); + } +} + +sub gls_get_user{ + local($label, $idx) = @_; + local($value) = ''; + + if (&gls_entry_defined($label)) + { + $value = $glsentry{$label}{"user".$idx}; + } + else + { + &write_warnings("gls_get_user[$idx]: glossary entry '$label' has not been defined"); + } + + $value; +} + sub gls_used{ local($label) = @_; local($flag) = 0; @@ -22260,13 +23566,13 @@ sub gls_used{ sub gls_entry_defined{ local($label) = @_; - defined(%{$glsentry{$label}}); + (%{$glsentry{$label}}) ? 1 : 0; } sub do_cmd_newglossaryentry{ local($_) = @_; local($label,$name,$description,$symbol,$sort,$text,$first, - $plural,$firstplural,$type,$keyval); + $plural,$firstplural,$type,$keyval,$parent,@user); $label = &missing_braces unless s/$next_pair_pr_rx/$label=$2;''/eo; @@ -22283,6 +23589,19 @@ sub do_cmd_newglossaryentry{ ($firstplural,$keyval) = &get_keyval('firstplural', $keyval); ($plural,$keyval) = &get_keyval('plural', $keyval); ($type,$keyval) = &get_keyval('type', $keyval); + ($parent,$keyval) = &get_keyval('parent', $keyval); + + if ($parent and not $name) + { + $name = &gls_get_name($parent); + } + + @user = (); + + for (my $idx = 0; $idx < 6; $idx++) + { + ($user[$idx],$keyval) = &get_keyval("user".($idx+1), $keyval); + } if (defined($type)) { @@ -22317,6 +23636,10 @@ sub do_cmd_newglossaryentry{ &gls_set_firstplural($label, $firstplural); + &gls_set_userkeys($label, @user); + + &gls_set_parent($label, $parent); + push @{$gls_entries{$type}}, $label; $_; @@ -22423,12 +23746,35 @@ sub do_cmd_glsadd{ $type = &gls_get_type($label); + local($dobacklink) = 1; + + if (&gls_used($label)) + { + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } + } + else + { + &unset_entry($label); + } + if (defined $type) { ($format,$optarg) = &get_keyval('format', $optarg); $format='' unless(defined($format)); - &gls_add_entry($type,$label,$format,""); + if ($dobacklink) + { + &gls_add_entry($type,$label,$format,""); + } + else + { + $glsentry{$label}{'maxid'} = ++$glsentry{$entry}{'maxid'}; + my $key = $label."###".$glsentry{$label}{'maxid'}; + $glossary{$type}{$key}=''; + } } else { @@ -22443,28 +23789,45 @@ sub do_cmd_glsaddall{ local($_) = @_; local($optarg,$pat) = &get_next_optional_argument; - local($format,$types); - - ($type,$optarg) = &get_keyval('types', $optarg); + local($format,$list); + ($list,$optarg) = &get_keyval('types', $optarg); ($format,$optarg) = &get_keyval('format', $optarg); + $format='' unless(defined($format)); local(@types) = keys(%gls_mark); - if (defined($types)) + if ($list) { - @types = split /,/, $types; + @types = split /\s*,\s*/, $list; } foreach $type (@types) { - # strip leasing and trailing spaces + # strip leading and trailing spaces $type=~s/^\s*([^\s]+)\s*$/\1/; foreach $label (@{$gls_entries{$type}}) { - &gls_add_entry($type,$label,$format,""); + local($dobacklink) = 1; + + if (&gls_used($label)) + { + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } + } + else + { + &unset_entry($label); + } + + if ($dobacklink) + { + &gls_add_entry($type,$label,$format,""); + } } } @@ -22588,6 +23951,64 @@ sub do_cmd_glslinkstar{ $text . $_; } +sub do_cmd_glsdisp{ + local($_) = @_; + local($optarg,$pat,$label,$text,$type,$format,$str); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + $text = &missing_braces unless + (s/$next_pair_pr_rx/$text=$2;''/eo); + + local($dobacklink) = 1; + + if (&gls_used($label)) + { + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } + } + else + { + &unset_entry($label); + } + + $type = &gls_get_type($label); + + if ($dobacklink) + { + &make_glslink($type, $label, $format, $text) .$space . $_; + } + else + { + &make_real_glossary_entry_no_backlink($label, $text, $type). $space . $_; + } +} + +sub do_cmd_glshyperlink{ + local($_) = @_; + + local($text,$pat) = &get_next_optional_argument; + + local($id, $label); + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$label=$2;''/eo; + + $text = &gls_get_text($label) unless $text; + + local($type) = &gls_get_type($label); + + "<A HREF=\"$gls_file_mark{$type}#gls:$label\">$text<\/A>" + .$_; +} + sub do_cmd_glsentrydesc{ local($_) = @_; @@ -22603,7 +24024,7 @@ sub do_cmd_Glsentrydesc{ $label = &missing_braces unless (s/$next_pair_pr_rx/$label=$2;''/eo); - ucfirst(&gls_get_description($label)).$_; + &do_real_makefirstuc(&gls_get_description($label)).$_; } sub do_cmd_glsentrytext{ @@ -22621,7 +24042,7 @@ sub do_cmd_Glsentrytext{ $label = &missing_braces unless (s/$next_pair_pr_rx/$label=$2;''/eo); - ucfirst(&gls_get_text($label)).$_; + &do_real_makefirstuc(&gls_get_text($label)).$_; } sub do_cmd_glsentryname{ @@ -22639,7 +24060,7 @@ sub do_cmd_Glsentryname{ $label = &missing_braces unless (s/$next_pair_pr_rx/$label=$2;''/eo); - ucfirst(&gls_get_name($label)).$_; + &do_real_makefirstuc(&gls_get_name($label)).$_; } sub do_cmd_glsentryfirst{ @@ -22657,7 +24078,7 @@ sub do_cmd_Glsentryfirst{ $label = &missing_braces unless (s/$next_pair_pr_rx/$label=$2;''/eo); - ucfirst(&gls_get_first($label)).$_; + &do_real_makefirstuc(&gls_get_first($label)).$_; } sub do_cmd_glsentryplural{ @@ -22675,7 +24096,7 @@ sub do_cmd_Glsentryplural{ $label = &missing_braces unless (s/$next_pair_pr_rx/$label=$2;''/eo); - ucfirst(&gls_get_plural($label)).$_; + &do_real_makefirstuc(&gls_get_plural($label)).$_; } sub do_cmd_glsentryfirstplural{ @@ -22702,7 +24123,7 @@ sub do_cmd_Glsentryfirstplural{ $label = &missing_braces unless (s/$next_pair_pr_rx/$label=$2;''/eo); - ucfirst(&gls_get_firstplural($label)).$_; + &do_real_makefirstuc(&gls_get_firstplural($label)).$_; } sub do_cmd_glsentrysymbol{ @@ -22720,7 +24141,61 @@ sub do_cmd_Glsentrysymbol{ $label = &missing_braces unless (s/$next_pair_pr_rx/$label=$2;''/eo); - ucfirst(&gls_get_symbol($label)).$_; + &do_real_makefirstuc(&gls_get_symbol($label)).$_; +} + +sub do_cmd_glsentryuseri{ + local($_) = @_; + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + &gls_get_user($label, 1).$_; +} + +sub do_cmd_glsentryuserii{ + local($_) = @_; + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + &gls_get_user($label, 2).$_; +} + +sub do_cmd_glsentryuseriii{ + local($_) = @_; + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + &gls_get_user($label, 3).$_; +} + +sub do_cmd_glsentryuseriv{ + local($_) = @_; + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + &gls_get_user($label, 4).$_; +} + +sub do_cmd_glsentryuserv{ + local($_) = @_; + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + &gls_get_user($label, 5).$_; +} + +sub do_cmd_glsentryuservi{ + local($_) = @_; + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + &gls_get_user($label, 6).$_; } sub do_cmd_gls{ @@ -22744,12 +24219,19 @@ sub do_cmd_gls{ local($type) = &gls_get_type($label); + local($dobacklink) = 1; + if (&gls_used($label)) { # entry has already been used $text = &gls_get_text($label); $display = &gls_get_display($type); + + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } } else { @@ -22777,7 +24259,14 @@ sub do_cmd_gls{ local($link_text) = &translate_commands("$display$args"); - &make_glslink($type, $label, $format, $link_text) .$space . $_; + if ($dobacklink) + { + &make_glslink($type, $label, $format, $link_text) .$space . $_; + } + else + { + &make_real_glossary_entry_no_backlink($label, $link_text, $type). $space . $_; + } } # added v1.04 @@ -22859,12 +24348,19 @@ sub do_cmd_glspl{ local($type) = $glsentry{$label}{'type'}; + local($dobacklink) = 1; + if (&gls_used($label)) { # entry has already been used $text = &gls_get_plural($label); $display = &gls_get_display($type);; + + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } } else { @@ -22892,7 +24388,14 @@ sub do_cmd_glspl{ local($link_text) = &translate_commands("$display$args"); - &make_glslink($type, $label, $format, $link_text) . $space . $_; + if ($dobacklink) + { + &make_glslink($type, $label, $format, $link_text) .$space . $_; + } + else + { + &make_real_glossary_entry_no_backlink($label, $link_text, $type). $space . $_; + } } # added v1.04 @@ -22974,12 +24477,19 @@ sub do_cmd_Gls{ local($type) = $glsentry{$label}{'type'}; + local($dobacklink) = 1; + if (&gls_used($label)) { # entry has already been used $text = &gls_get_text($label); $display = &gls_get_display($type);; + + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } } else { @@ -23005,9 +24515,16 @@ sub do_cmd_Gls{ $id = ++$global{'max_id'}; $args .= "$OP$id$CP$insert$OP$id$CP"; - local($link_text) = &translate_commands("$display$args"); + local($link_text) = &do_real_makefirstuc(&translate_commands("$display$args")); - &make_glslink($type, $label, $format, ucfirst($link_text)). $space . $_; + if ($dobacklink) + { + &make_glslink($type, $label, $format, $link_text) .$space . $_; + } + else + { + &make_real_glossary_entry_no_backlink($label, $link_text, $type). $space . $_; + } } # added v1.04 @@ -23065,7 +24582,7 @@ sub do_cmd_Glsstar{ local($link_text) = &translate_commands("$display$args"); - ucfirst($link_text). $space . $_; + &do_real_makefirstuc($link_text). $space . $_; } sub do_cmd_Glspl{ @@ -23089,12 +24606,19 @@ sub do_cmd_Glspl{ local($type) = $glsentry{$label}{'type'}; + local($dobacklink) = 1; + if (&gls_used($label)) { # entry has already been used $text = &gls_get_plural($label); $display = &gls_get_display($type);; + + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } } else { @@ -23120,9 +24644,16 @@ sub do_cmd_Glspl{ $id = ++$global{'max_id'}; $args .= "$OP$id$CP$insert$OP$id$CP"; - local($link_text) = &translate_commands("$display$args"); + local($link_text) = &do_real_makefirstuc(&translate_commands("$display$args")); - &make_glslink($type, $label, $format, ucfirst($link_text)).$space . $_; + if ($dobacklink) + { + &make_glslink($type, $label, $format, $link_text) .$space . $_; + } + else + { + &make_real_glossary_entry_no_backlink($label, $link_text, $type). $space . $_; + } } # added v1.04 @@ -23180,7 +24711,7 @@ sub do_cmd_Glsplstar{ local($link_text) = &translate_commands("$display$args"); - ucfirst($link_text).$space . $_; + &do_real_makefirstuc($link_text).$space . $_; } sub do_cmd_GLS{ @@ -23204,12 +24735,19 @@ sub do_cmd_GLS{ local($type) = $glsentry{$label}{'type'}; + local($dobacklink) = 1; + if (&gls_used($label)) { # entry has already been used $text = &gls_get_text($label); $display = &gls_get_display($type);; + + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } } else { @@ -23235,9 +24773,16 @@ sub do_cmd_GLS{ $id = ++$global{'max_id'}; $args .= "$OP$id$CP$insert$OP$id$CP"; - local($link_text) = &translate_commands("$display$args"); + local($link_text) = uc(&translate_commands("$display$args")); - &make_glslink($type, $label, $format, uc($link_text)).$space . $_; + if ($dobacklink) + { + &make_glslink($type, $label, $format, $link_text) .$space . $_; + } + else + { + &make_real_glossary_entry_no_backlink($label, $link_text, $type). $space . $_; + } } # added v1.04 @@ -23319,12 +24864,19 @@ sub do_cmd_GLSpl{ local($type) = $glsentry{$label}{'type'}; + local($dobacklink) = 1; + if (&gls_used($label)) { # entry has already been used $text = &gls_get_plural($label); $display = &gls_get_display($type);; + + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } } else { @@ -23350,9 +24902,16 @@ sub do_cmd_GLSpl{ $id = ++$global{'max_id'}; $args .= "$OP$id$CP$insert$OP$id$CP"; - local($link_text) = &translate_commands("$display$args"); + local($link_text) = uc(&translate_commands("$display$args")); - &make_glslink($type, $label, $format, uc($link_text)).$space . $_; + if ($dobacklink) + { + &make_glslink($type, $label, $format, $link_text) .$space . $_; + } + else + { + &make_real_glossary_entry_no_backlink($label, $link_text, $type). $space . $_; + } } # added v1.04 @@ -23464,7 +25023,7 @@ sub do_cmd_Glstext{ $text = &gls_get_text($label); - &make_glslink($type, $label, $format, ucfirst($text)) .$space . $_; + &make_glslink($type, $label, $format, &do_real_makefirstuc($text)) .$space . $_; } # added 22 Feb 2008 @@ -23545,7 +25104,7 @@ sub do_cmd_Glsname{ $text = &gls_get_name($label); - &make_glslink($type, $label, $format, ucfirst($text)) .$space . $_; + &make_glslink($type, $label, $format, &do_real_makefirstuc($text)) .$space . $_; } # added 22 Feb 2008 @@ -23626,7 +25185,7 @@ sub do_cmd_Glsfirst{ $text = &gls_get_first($label); - &make_glslink($type, $label, $format, ucfirst($text)) .$space . $_; + &make_glslink($type, $label, $format, &do_real_makefirstuc($text)) .$space . $_; } # added 22 Feb 2008 @@ -23707,7 +25266,7 @@ sub do_cmd_Glsfirstplural{ $text = &gls_get_firstplural($label); - &make_glslink($type, $label, $format, ucfirst($text)) .$space . $_; + &make_glslink($type, $label, $format, &do_real_makefirstuc($text)) .$space . $_; } # added 22 Feb 2008 @@ -23788,7 +25347,7 @@ sub do_cmd_Glsplural{ $text = &gls_get_plural($label); - &make_glslink($type, $label, $format, ucfirst($text)) .$space . $_; + &make_glslink($type, $label, $format, &do_real_makefirstuc($text)) .$space . $_; } # added 22 Feb 2008 @@ -23869,7 +25428,7 @@ sub do_cmd_Glsdesc{ $text = &gls_get_description($label); - &make_glslink($type, $label, $format, ucfirst($text)) .$space . $_; + &make_glslink($type, $label, $format, &do_real_makefirstuc($text)) .$space . $_; } # added 22 Feb 2008 @@ -23950,7 +25509,7 @@ sub do_cmd_Glssymbol{ $text = &gls_get_symbol($label); - &make_glslink($type, $label, $format, ucfirst($text)) .$space . $_; + &make_glslink($type, $label, $format, &do_real_makefirstuc($text)) .$space . $_; } # added 22 Feb 2008 @@ -23980,6 +25539,318 @@ sub do_cmd_GLSsymbol{ &make_glslink($type, $label, $format, uc($text)) .$space . $_; } +sub do_cmd_glsuseri{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &gls_get_user($label, 1); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_Glsuseri{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &do_real_makefirstuc(&gls_get_user($label, 1)); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_glsuserii{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &gls_get_user($label, 2); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_Glsuserii{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &do_real_makefirstuc(&gls_get_user($label, 2)); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_glsuseriii{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &gls_get_user($label, 3); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_Glsuseriii{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &do_real_makefirstuc(&gls_get_user($label, 3)); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_glsuseriv{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &gls_get_user($label, 4); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_Glsuseriv{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &do_real_makefirstuc(&gls_get_user($label, 4)); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_glsuserv{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &gls_get_user($label, 5); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_Glsuserv{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &do_real_makefirstuc(&gls_get_user($label, 5)); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_glsuservi{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &gls_get_user($label, 6); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_Glsuservi{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &do_real_makefirstuc(&gls_get_user($label, 6)); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + sub do_cmd_acrshort{ &do_cmd_glstext(@_) } @@ -24055,7 +25926,7 @@ sub do_cmd_hyperbf{ &ignore_commands( <<_IGNORED_CMDS_ ); makeglossary makeglossaries -glossarystyle {} +glossaryentrynumbers # {} _IGNORED_CMDS_ 1; @@ -24066,5 +25937,148 @@ _IGNORED_CMDS_ %</glossaries.perl> % \end{macrocode} %\fi +%\iffalse +% \begin{macrocode} +%<*mfirstuc.perl> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +# File : mfirstuc.perl +# Author : Nicola L. C. Talbot +# Date : 2012-09-21 +# Version : 1.0 +# Description : LaTeX2HTML (limited!) implementation of mfirstuc package + +# This is a LaTeX2HTML style implementing the mfirstuc package, and +# is distributed as part of the glossaries package. +# Copyright 2007 Nicola L.C. 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. + +use warnings; + +package main; + +sub do_cmd_makefirstuc{ + local($_) = @_; + + local($id,$text); + + $text = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$text=$2;''/eo; + + &translate_commands("\\glsmakefirstuc $text") . $_; +} + +sub do_cmd_xmakefirstuc{ + local($_) = @_; + + local($id,$text); + + $text = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$text=$2;''/eo; + + unless ($id) + { + $id = ++$global{'max_id'}; + } + + &translate_commands("\\expandafter \\makefirstuc $OP$id$CP$text$OP$id$CP") + . $_; +} + +sub do_cmd_glsmakefirstuc{ + local($_) = @_; + + local($id,$text); + + $text = &get_next_object unless + s/$next_pair_pr_rx/$id=$1;$text=$2;''/eo; + + &do_real_makefirstuc($text).$_; +} + +sub do_real_makefirstuc{ + local($text) = @_; + + if ($text=~/^((?:\s*<[^>]+>\s*)+)(.*)/) + { + $text = $1 . ucfirst($2); + } + else + { + $text = ucfirst($text); + } + + $text; +} + +sub do_cmd_capitalisewords{ + local($_) = @_; + + local($id,$text); + + $text = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$text=$2;''/eo; + + local($newtext) = ''; + + foreach my $word (split ' ', $text) + { + $id = ++$global{'max_id'}; + + $word = &translate_commands("\\makefirstuc $OP$id$CP$word$OP$id$CP"); + + if ($newtext) + { + $newtext .= ' ' . $word; + } + else + { + $newtext = $word; + } + } + + $newtext.$_; +} + +sub get_next_object{ + local($next, $revert, $thisline); + local($this_cmd) = $cmd; + $this_cmd =~ s/^\\// unless ($cmd eq "\\"); + if (/^[\s%]*([^\n]*)\n/ ) { + $thisline = &revert_to_raw_tex($1) + } else { + $thisline = &revert_to_raw_tex($_); + } + s/^\s*//; + if ($_ =~ s/$next_token_rx//) { $next = $& }; + $next =~ s/$comment_mark(\d+\n?)?//g; + if ($next =~ /^\\(\W|\d|[a-zA-z]*\b)/) { + $revert = $next = "\\".$1; + } elsif ($next =~ /\W/) { + $revert = &revert_to_raw_tex($next); + } else { $revert = $next }; + $next; +} + +1; +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</mfirstuc.perl> +% \end{macrocode} +%\fi %\Finale \endinput diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins index 91f62e20856..a9c1d0ce4e6 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 2012/5/21 14:06 +% glossaries.ins generated using makedtx version 0.94b 2012/9/21 14:41 \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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. + This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl. \endpreamble @@ -108,6 +108,7 @@ \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}} +\file{mfirstuc.perl}{\nopreamble\nopostamble\from{glossaries.dtx}{mfirstuc.perl}} } \endbatchfile diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.perl b/Master/texmf-dist/source/latex/glossaries/glossaries.perl index 9aa8f17e5bb..d615d83ab08 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.perl +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.perl @@ -1,8 +1,8 @@ # File : glossaries.perl # Author : Nicola L.C. Talbot # Date : 14th June 2007 -# Last Modified : 25th July 2008 -# Version : 1.04 +# Last Modified : 2012-09-21 +# Version : 1.05 # Description : LaTeX2HTML (limited!) implementation of glossaries # package. Note that not all the glossaries.sty # macros have been implemented. @@ -25,10 +25,21 @@ # This work consists of the files glossaries.dtx and glossaries.ins # and the derived files glossaries.sty, glossary-hypernav.sty, # glossary-list.sty, glossary-long.sty, glossary-super.sty, -# glossaries.perl. Also makeglossaries and makeglossaries.bat +# glossaries.perl, mfrstuc.perl. Also makeglossaries and makeglossaries.bat package main; +&do_require_package("mfirstuc"); + + %glossary_style = (); + &set_glossarystyle('altlist');# default style + + $CURRENT_STYLE='altlist'; + +&process_commands_nowrap_in_tex( <<_RAW_ARG_CMDS_); +newglossarystyle # {} # {} +_RAW_ARG_CMDS_ + # These are the only package options implemented. sub do_glossaries_style_altlist{ @@ -40,8 +51,20 @@ sub do_glossaries_toc{ sub do_glossaries_toc_true{ } +$INDEXONLYFIRST=0; + +sub do_glossaries_indexonlyfirst{ + $INDEXONLYFIRST=1; +} + +$gls_nonumberlist{'main'} = 0; + +sub do_glossaries_nonumberlist{ + $gls_nonumberlist{'main'} = 1; +} + $GLSCURRENTFORMAT="textrm" if (!defined($GLSCURRENTFORMAT)); -$GLOSSARY_END_DESCRIPTION = '. ' if (!defined($GLOSSARY_END_DESCRIPTION)); +$GLOSSARY_END_DESCRIPTION = '.' if (!defined($GLOSSARY_END_DESCRIPTION)); sub do_cmd_glossaryname{ "Glossary$_[0]" @@ -50,6 +73,7 @@ sub do_cmd_glossaryname{ $gls_mark{'main'} = "<tex2html_gls_main_mark>"; $gls_file_mark{'main'} = "<tex2html_gls_main_file_mark>"; $gls_title{'main'} = "\\glossaryname"; +$gls_toctitle{'main'} = "\\glossaryname"; $delimN{'main'} = ", "; $glsnumformat{'main'} = $GLSCURRENTFORMAT; @{$gls_entries{'main'}} = (); @@ -69,7 +93,7 @@ sub do_glossaries_acronym_true{ $acronymtype = 'acronym'; } -sub do_glossary_acronym_false{ +sub do_glossaries_acronym_false{ $acronymtype = 'main'; } @@ -81,6 +105,63 @@ sub do_cmd_acronymtype{ join('', $acronymtype, $_[0]); } +$global{'glossaryentry'} = 0; +$global{'glossarysubentry'} = 0; + +sub do_cmd_theglossaryentry{ + join('', $global{'glossaryentry'}, $_[0]); +} + +sub do_cmd_theglossarysubentry{ + join('', $global{'glossarysubentry'}, $_[0]); +} + +sub do_glossaries_entrycounter{ + &do_glossaries_entrycounter_true +} + +sub do_glossaries_entrycounter_true{ + eval(<<'_END_DEF'); + sub do_cmd_glsresetentrycounter{ + $global{'entrycounter'} = 0; + $_[0]; + } +_END_DEF +} + +sub do_glossaries_entrycounter_false{ + eval(<<'_END_DEF'); + sub do_cmd_glsresetentrycounter{ + $_[0]; + } +_END_DEF +} + +sub do_cmd_glsresetentrycounter{$_[0];} + +sub do_glossaries_subentrycounter{ + &do_glossaries_subentrycounter_true +} + +sub do_glossaries_subentrycounter_true{ + eval(<<'_END_DEF'); + sub do_cmd_glsresetsubentrycounter{ + $global{'subentrycounter'} = 0; + $_[0]; + } +_END_DEF +} + +sub do_glossaries_subentrycounter_false{ + eval(<<'_END_DEF'); + sub do_cmd_glsresetsubentrycounter{ + $_[0]; + } +_END_DEF +} + +sub do_cmd_glsresetsubentrycounter{ $_[0]; } + # modify set_depth_levels so that glossary is added sub replace_glossary_markers{ @@ -96,7 +177,7 @@ sub replace_glossary_markers{ } # there must be a better way of doing this -# other than copying the orginal code and adding to it. +# other than copying the original code and adding to it. sub replace_general_markers { if (defined &replace_infopage_hook) {&replace_infopage_hook if (/$info_page_mark/);} else { &replace_infopage if (/$info_page_mark/); } @@ -145,28 +226,256 @@ local(@styles) = split(/\s*,\s*/,$INDEX_STYLES); &add_real_gls } +sub gls_compare{ + local($x, $y) = @_; + + if ($x eq '' or $y eq '') + { + if ($x ne '') + { + # y is the shorter string + return 1; + } + elsif ($y ne '') + { + # x is the shorter string + return -1; + } + else + { + # both empty + return 0; + } + } + + local($x0) = ''; + local($y0) = ''; + + if ($x=~s/^(&#(?:\d+|x[\da-f]+);)//) + { + $x0 = $1; + } + elsif ($x=~s/^(.)//) + { + $x0 = $1; + } + + if ($y=~s/^(&#(?:\d+|x[\da-f]+);)//) + { + $y0 = $1; + } + elsif ($y=~s/^(.)//) + { + $y0 = $1; + } + + local($numx); + + if ($x0=~/&#(\d+|x[\da-f]+);/) + { + $numx = $1; + + $numx = hex("0$numx") if $numx=~/^x/; + } + else + { + $numx = ord($x0); + } + + local($numy); + + if ($y0=~/&#(\d+|x[\da-f]+);/) + { + $numy = $1; + + $numy = hex("0$numy") if $numy=~/^x/; + } + else + { + $numy = ord($y0); + } + + if ($numx == $numy) + { + return &gls_compare($x, $y); + } + elsif ($numx >= 48 and $numx <= 57) # x in range '0' ... '9' + { + if ($numy >= 48 and $numy <= 57) # y in range '0' ... '9' + { + return $numx <=> $numy; + } + elsif (($numy >= 97 and $numy <= 122) or ($numy >= 65 and $numy <= 90)) # y a letter + { + # digits are less than letters + return -1; + } + else + { + # digits are greater than symbols + return 1; + } + } + elsif (($numx >= 97 and $numx <= 122) or ($numx >= 65 and $numx <= 90)) # x a letter + { + if (($numy >= 97 and $numy <= 122) or ($numy >= 65 and $numy <= 90)) # y a letter + { + if (($numx <= 90 and $numy <= 90) or ($numx >= 97 and $numy >= 97)) + { + # same case (already checked if they are equal) + + return $numx <=> $numy; + } + + # are they upper/lower case versions of each other? + + if (($numx >= 97 and $numy == $numx-32)) + { + # x is upper case version of y + + if ($x or $y) + { + return &gls_compare($x, $y); + } + else + { + return -1; + } + } + + if (($numy >= 97 and $numx == $numy-32)) + { + # y is upper case version of x + + if ($x or $y) + { + return &gls_compare($x, $y); + } + else + { + return 1; + } + } + + # compare lower case values + return lc(chr($numx)) cmp lc(chr($numy)); + } + else + { + # a-z greater than symbols and digits + return 1; + } + } + elsif ($numy >= 48 and $numy <= 57) # y in range '0' ... '9' + { + # already checked for '0' < x < '9' and '0' < y < '9' + # already checked for 'a' < x < 'z' and '0' < y < '9' + + # digits greater than symbols + return 1; + } + elsif (($numy >= 97 and $numy <= 122) or ($numy >= 65 and $numy <= 90)) # y is a letter + { + # already checked for x is digit and y a is letter + # already checked for x is letter and y a is letter + + # symbols and digits are less than letters + + return -1; + } + + $numx <=> $numy +} + sub gloskeysort{ - local($x, $y) = ($a, $b); - $x=~s/^(.*)###(\d+)$/\l\1/; - local($x_id) = $2; - $y=~s/^(.*)###(\d+)$/\l\1/; + + $a=~/^(.*)###(\d+)$/; + + local($labelx) = $1; + local($x_id) =$2; + + $b=~/^(.*)###(\d+)$/; + + local($labely) = $1; local($y_id) = $2; - local($n) = ($x cmp $y); + local($sortx) = &gls_get_sort($labelx); + local($sorty) = &gls_get_sort($labely); + + local($n); + + # are they case-insensitive equivalent? + + if (lc($sortx) eq lc($sorty)) + { + $n = ($sortx cmp $sorty); + } + else + { + $n = &gls_compare($sortx, $sorty); + } - if ($n == 0) + unless ($n) { $n = ($x_id <=> $y_id); } - $n; + $n +} + +sub add_parent_if_required{ + local($label) = @_; + + local($parent) = &gls_get_parent($label); + + if ($parent) + { + local($type) = &gls_get_type($parent); + + # does this parent have a backlink? + + for my $key (keys %{$glossary{$type}}) + { + return if $key=~/^$parent###\d+$/; + } + + # none found, so add empty one + + my $id = ++$global{'max_id'}; + + $glossary{$type}{"$parent###$id"} = ''; + $glossary_entry{$type}{"$parent###$id"} = $parent; + + # check if parent also has a parent + + &add_parent_if_required($parent); + } } sub add_real_gls{ local($type) = @_; print "\nDoing glossary '$type' ..."; - local($key, $str, @keys, $glossary, $level, $count, - @previous, @current, $id, $linktext, $delimN); + local($key, $str, @keys, $thisglsentry, $level, $count, + $previous, $current, $id, $linktext, $delimN); + + $TITLE = $gls_toctitle{$type}; + + local($oldstyle) = $CURRENT_STYLE; + + if ($gls_style{$type}) + { + &set_glossarystyle($gls_style{$type}); + } + + # add any parent entries that haven't been referenced + + for my $key (keys %{$glossary{$type}}) + { + my $label = $key; + $label =~ s/###\d+$//o; # Remove the unique id's + + &add_parent_if_required($label); + } @keys = keys %{$glossary{$type}}; @@ -176,47 +485,624 @@ sub add_real_gls{ $delimN = $delimN{$type}; + $previous = ''; + + local($previousentry) = ''; + + my $glossaryentryfield = ''; + + my $previouscat = ''; + + local ($entry); + foreach $key (@keys) { $current = $key; - $str = $current; - $str =~ s/\#\#\#\d+$//o; # Remove the unique id's - #$linktext = $cross_ref_visible_mark; - $id = ++$global{'max_id'}; - $linktext = "\\$glossary_format{$type}{$key}${OP}$id${CP}$glossary_linktext{$type}{$key}${OP}$id${CP}"; - $linktext = &translate_commands($linktext); + $current =~ s/\#\#\#\d+$//o; # Remove the unique id's - local($entry) = $glossary_entry{$type}{$key}; + my $issame = ($current eq $previous ? 1 : 0); - $id = ++$global{'max_id'}; - local($name) = &translate_commands( - "\\glsnamefont $OP$id$CP$glsentry{$entry}{name}$OP$id$CP"); - - local($symbol) = ($glsentry{$entry}{'symbol'} ? - " $glsentry{$entry}{symbol}" : ''); - - $glossary .= - # If it's the same string don't start a new line - (&index_key_eq($current, $previous) ? - $delimN - . $glossary{$type}{$key} - . $linktext - . "</A>" - : "<DT>" - . "<A NAME=\"gls:$entry\">$name</A>" - . "<DD>" - . $glsentry{$entry}{'description'} - . $symbol . $GLOSSARY_END_DESCRIPTION - . $glossary{$type}{$key} - . $linktext. "</A>"); $previous = $current; + + $entry = $glossary_entry{$type}{$key}; + + unless ($issame) + { + if ($glossaryentryfield) + { + $id = ++$global{'max_id'}; + + my $level = &gls_get_level($previousentry); + + if ($level > 0) + { + my $id2 = ++$global{'max_id'}; + + $thisglsentry .= + "\\glossarysubentryfield $OP$id2$CP$level$OP$id2$CP$glossaryentryfield$OP$id$CP$linktext$OP$id$CP"; + } + else + { + $thisglsentry .= + "\\glossaryentryfield $glossaryentryfield$OP$id$CP$linktext$OP$id$CP"; + } + + $glossaryentryfield = ''; + } + + $linktext = ''; + + my $currentcat = substr(&gls_get_sort($current), 0, 1); + + if ($currentcat=~/[a-zA-Z]/) + { + $currentcat = uc($currentcat); + } + elsif ($currentcat=~/[0-9]/) + { + $currentcat = 'glsnumbers'; + } + else + { + $currentcat = 'glssymbols'; + } + + unless ($previouscat eq $currentcat) + { + $id = ++$global{'max_id'}; + $thisglsentry .= "\\glsgroupheading$OP$id$CP$currentcat$OP$id$CP"; + + $previouscat = $currentcat; + } + } + + $previousentry = $entry; + + # Back ref + + if ($gls_nonumberlist{$type}) + { + $linktext = ''; + } + elsif ($glossary{$type}{$key}) + { + $id = ++$global{'max_id'}; + + $linktext .= $delimN if ($linktext); + + $linktext .= "$glossary{$type}{$key}\\$glossary_format{$type}{$key}${OP}$id${CP}$glossary_linktext{$type}{$key}${OP}$id${CP}</A>"; + + } + + unless ($issame) + { + $id = ++$global{'max_id'}; + local($name) = &translate_commands( + "\\glsnamefont $OP$id$CP$glsentry{$entry}{name}$OP$id$CP"); + + local($symbol) = ($glsentry{$entry}{'symbol'} ? + " $glsentry{$entry}{symbol}" : ''); + + $id = ++$global{'max_id'}; + my $id2 = ++$global{'max_id'}; + my $id3 = ++$global{'max_id'}; + my $id4 = ++$global{'max_id'}; + + $glossaryentryfield = "$OP$id$CP$entry$OP$id$CP" # label + . "$OP$id2$CP$name$OP$id2$CP" # name + . "$OP$id3$CP$glsentry{$entry}{description}$OP$id3$CP" # description + . "$OP$id4$CP$symbol$OP$id4$CP" # symbol + } + + } + + if ($glossaryentryfield and $entry) + { + my $level = &gls_get_level($entry); + + if ($level > 0) + { + my $id2 = ++$global{'max_id'}; + + $thisglsentry .= + "\\glossarysubentryfield $OP$id2$CP$level$OP$id2$CP$glossaryentryfield$OP$id$CP$linktext$OP$id$CP"; + } + else + { + $id = ++$global{'max_id'}; + $thisglsentry .= + "\\glossaryentryfield $glossaryentryfield$OP$id$CP$linktext$OP$id$CP"; + } + } + + $str = &do_env_theglossary($thisglsentry) . &translate_commands("\\glossarypostamble"); + + if ($gls_style{$type}) + { + &set_glossarystyle($oldstyle); + } + + s/$gls_mark{$type}/$preglossary\n$str\n/s; +} + +sub do_cmd_glstarget{ + local($_) = @_; + + local($id, $label, $text); + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$label=$2;''/eo; + + $text = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$text=$2;''/eo; + + "<A NAME=\"gls:$label\">$text</A>$_"; +} + +sub do_cmd_newglossarystyle{ + local($_) = @_; + + local($id,$style,$defs); + + $style = &missing_braces unless + s/$next_pair_rx/$id=$1;$style=$2;''/eo; + + $defs = &missing_braces unless + s/$next_pair_rx/$id=$1;$defs=$2;''/eo; + + $glossary_style{$style} = $defs; + + $_; +} + +sub do_cmd_glossarystyle{ + local($_) = @_; + + local($id,$style); + + $style = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$style=$2;''/eo; + + &set_glossarystyle($style); + + $_; +} + +sub set_glossarystyle{ + local($style) = @_; + + $CURRENT_STYLE = $style; + + if ($glossary_style{$style}) + { + local($_) = $glossary_style{$style}; + + s/$O(\d+)$C/$OP$1$CP/g; + + &translate_commands($_); + } + else + { + my $cmd_sub = "set_glossarystyle_$style"; + + if (defined(&$cmd_sub)) + { + &$cmd_sub(); + } + else + { + &write_warnings("Unknown glossary style '$style', defaulting to 'altlist'"); + &set_glossarystyle_altlist(); + + $CURRENT_STYLE = 'altlist'; + } } - $glossary = '<DD>'.$glossary unless ($glossary =~ /^\s*<D(T|D)>/); - $glossary =~ s/(<A [^>]*>)(<D(T|D)>)/$2$1/g; +} + +sub do_cmd_glspar{ "<P>".$_[0]; } + +sub do_cmd_glossaryheader{ + local($_) = @_; + $_ +} + +sub do_cmd_glsentryitem{ + local($_) = @_; + + local($id, $label); + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$label=$2;''/eo; + + $_ +} + +sub do_cmd_glssubentryitem{ + local($_) = @_; + + local($id, $label); + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$label=$2;''/eo; + + $_ +} + +sub do_cmd_glsgroupheading{ + local($_) = @_; + + local($id, $heading); + + $heading = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$heading=$2;''/eo; + + $_; +} + +sub do_cmd_glossaryentryfield{ + local($_) = @_; + + local($id, $label, $name, $desc, $symbol, $backlink); + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$label=$2;''/eo; + + $name = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$name=$2;''/eo; + + $desc = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$desc=$2;''/eo; + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$symbol=$2;''/eo; + + $backlink = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$backlink=$2;''/eo; + + local($id2) = ++$global{'max_id'}; + + "\\glstarget $OP$id$CP$label$OP$id$CP$OP$id2$CP$name$OP$id2$CP\n$desc $backlink\n$_"; +} + +sub do_cmd_glossarysubentryfield{ + local($_) = @_; + + local($id, $level, $label, $name, $desc, $symbol, $backlink); + + $level = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$level=$2;''/eo; + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$label=$2;''/eo; + + $name = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$name=$2;''/eo; - $str = &translate_commands("\\glossarypostamble"); - s/$gls_mark{$type}/$preglossary\n<DL COMPACT>\n$glossary<\/DL>$str\n/s; + $desc = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$desc=$2;''/eo; + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$symbol=$2;''/eo; + + $backlink = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$backlink=$2;''/eo; + + local($id2) = ++$global{'max_id'}; + + "\\glstarget $OP$id$CP$label$OP$id$CP$OP$id2$CP$name$OP$id2$CP\n$desc $backlink\n$_"; +} + +sub do_env_theglossary{ + local($_) = @_; + + &translate_commands($_); +} + +sub set_glossarystyle_altlist{ + eval(<<'END_STYLE'); + sub do_cmd_glossaryheader{ + local($_) = @_; + $_ + } + + sub do_cmd_glsgroupheading{ + local($_) = @_; + + local($id, $heading); + + $heading = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$heading=$2;''/eo; + + $_ + } + + sub do_cmd_glossaryentryfield{ + local($_) = @_; + + local($id, $id2, $id3, $id4, $id5, $label, $name, $desc, $symbol, $backlink); + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$label=$2;''/eo; + + $name = &missing_braces unless + s/$next_pair_pr_rx/$id2=$1;$name=$2;''/eo; + + $desc = &missing_braces unless + s/$next_pair_pr_rx/$id3=$1;$desc=$2;''/eo; + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id4=$1;$symbol=$2;''/eo; + + $backlink = &missing_braces unless + s/$next_pair_pr_rx/$id5=$1;$backlink=$2;''/eo; + + "<DT>\\glstarget $OP$id$CP$label$OP$id$CP$OP$id2$CP$name$OP$id2$CP\n<DD>" + . "$desc\\glspostdescription\\space $backlink$_"; + } + + sub do_cmd_glossarysubentryfield{ + local($_) = @_; + + local($id, $id2, $id3, $id4, $id5, $id6, $level, + $label, $name, $desc, $symbol, $backlink); + + $level = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$level=$2;''/eo; + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id2=$1;$label=$2;''/eo; + + $name = &missing_braces unless + s/$next_pair_pr_rx/$id3=$1;$name=$2;''/eo; + + $desc = &missing_braces unless + s/$next_pair_pr_rx/$id4=$1;$desc=$2;''/eo; + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id5=$1;$symbol=$2;''/eo; + + $backlink = &missing_braces unless + s/$next_pair_pr_rx/$id6=$1;$backlink=$2;''/eo; + + "<P>\\glssubentryitem $OP$id$CP$label$OP$id$CP" + ."\\glstarget $OP$id2$CP$label$OP$id2$CP$OP$id3$CP$name$OP$id3$CP" + ."$desc\\glspostdescription\\space $backlink\n$_"; + } + + sub do_env_theglossary{ + local($_) = @_; + + "<DL>".&translate_commands("\\glossaryheader $_")."</DL>"; + } +END_STYLE +} + +sub set_glossarystyle_inline{ + eval(<<'END_STYLE'); + sub do_cmd_glossaryheader{ + local($_) = @_; + $_ + } + + sub do_cmd_glsgroupheading{ + local($_) = @_; + + local($id, $heading); + + $heading = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$heading=$2;''/eo; + + $_; + } + + sub do_cmd_glossaryentryfield{ + local($_) = @_; + + local($id, $id2, $id3, $id4, $id5, $label, $name, $desc, $symbol, $backlink); + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$label=$2;''/eo; + + $name = &missing_braces unless + s/$next_pair_pr_rx/$id2=$1;$name=$2;''/eo; + + $desc = &missing_braces unless + s/$next_pair_pr_rx/$id3=$1;$desc=$2;''/eo; + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id4=$1;$symbol=$2;''/eo; + + $backlink = &missing_braces unless + s/$next_pair_pr_rx/$id5=$1;$backlink=$2;''/eo; + + local($field) = "\\glsinlinedopostchild $glsinlinesep"; + + $field .= "\\glsentryitem $OP$id$CP$label$OP$id$CP" + . "\\glsinlinenameformat $OP$id2$CP$label$OP$id2$CP$OP$id3$CP$name$OP$id3$CP"; + + $id3 = ++$global{'max_id'}; + + if ($desc) + { + $field .= + "\\glsinlinedescformat $OP$id3$CP$desc$OP$id3$CP" + ."$OP$id4$CP$symbol$OP$id4$CP" + ."$OP$id5$CP$backlink$OP$id5$CP"; + } + else + { + $field .= + "\\glsinlineemptydescformat " + ."$OP$id4$CP$symbol$OP$id4$CP" + ."$OP$id5$CP$backlink$OP$id5$CP"; + } + +# TODO : check if has children + + local($haschildren) = 0; + + if ($haschildren) + { + $field .= "\\glsresetsubentrycounter " + . "\\glsinlineparentchildseparator " + . "\\glsinlinepostchild "; + } + + $glsinlinesep = &translate_commands("\\glsinlineseparator ") + unless $glsinlinesep; + + $field.$_; + } + + sub do_cmd_glossarysubentryfield{ + local($_) = @_; + + local($id, $id2, $id3, $id4,$id5,$id6,$level, + $label, $name, $desc, $symbol, $backlink); + + $level = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$level=$2;''/eo; + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id2=$1;$label=$2;''/eo; + + $name = &missing_braces unless + s/$next_pair_pr_rx/$id3=$1;$name=$2;''/eo; + + $desc = &missing_braces unless + s/$next_pair_pr_rx/$id4=$1;$desc=$2;''/eo; + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id5=$1;$symbol=$2;''/eo; + + $backlink = &missing_braces unless + s/$next_pair_pr_rx/$id6=$1;$backlink=$2;''/eo; + + "\\glsinlinesubnameformat $OP$id$CP$label$OP$id$CP$OP$id2$CP$name$OP$id2$CP" + ."\\glssubentryitem $OP$id3$CP$label$OP$id3$CP" + ."\\glsinlinesubdescformat $OP$id4$CP$desc$OP$id4$CP$OP$id5$CP$symbol$OP$id5$CP$OP$id6$CP$backlink$OP$id6$CP" + .$_; + } + + sub do_env_theglossary{ + local($_) = @_; + + $glsinlinesep = ''; + + &translate_commands("\\glossaryheader $_\\glspostinline "); + } +END_STYLE +} + +local($glsinlinesep,$glsinlinepostchild); + +sub do_cmd_glsinlineseparator{ + local($_) = @_; + + "; $_"; +} + +sub do_cmd_glsinlinedopostchild{ + local($_) = @_; + + $_; +} + +sub do_cmd_glspostdescription{ + local($_) = @_; + + $GLOSSARY_END_DESCRIPTION.$_; +} + +sub do_cmd_glspostinline{ + local($_) = @_; + + &translate_commands("\\glspostdescription\\space ").$_; +} + +sub do_cmd_glsinlinepostchild{ + local($_) = @_; + + $_; +} + +sub do_cmd_glsinlineparentchildseparator{ + local($_) = @_; + + ": $_"; +} + +sub do_cmd_glsinlinesubseparator{ + local($_) = @_; + + ", $_"; +} + +sub do_cmd_glsinlinenameformat{ + &do_cmd_glstarget(@_); +} + +sub do_cmd_glsinlinedescformat{ + local($_) = @_; + + local($id, $desc, $symbol, $backlinks); + + $desc = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$desc=$2;''/eo; + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$symbol=$2;''/eo; + + $backlinks = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$backlinks=$2;''/eo; + + "\\space $desc$_"; +} + +sub do_cmd_glsinlineemptydescformat{ + local($_) = @_; + + local($id, $symbol, $backlinks); + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$symbol=$2;''/eo; + + $backlinks = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$backlinks=$2;''/eo; + + $_; +} + +sub do_cmd_glsinlinesubnameformat{ + local($_) = @_; + + local($id, $id2, $label, $name); + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$label=$2;''/eo; + + $name = &missing_braces unless + s/$next_pair_pr_rx/$id2=$1,$name=$2;''/eo; + + "\\glstarget $OP$id$CP$label$OP$id$CP$OP$id2$CP$OP$id2$CP$_"; +} + +sub do_cmd_glsinlinesubdescformat{ + local($_) = @_; + + local($id, $desc, $symbol, $backlinks); + + $desc = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$desc=$2;''/eo; + + $symbol = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$symbol=$2;''/eo; + + $backlinks = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$backlinks=$2;''/eo; + + "$desc$_"; } sub set_depth_levels { @@ -294,12 +1180,12 @@ sub get_firstkeyval{ } # need to get the value of the last key of a given name -# in the event of multiple occurences. +# in the event of multiple occurrences. sub get_keyval{ local($key,$_) = @_; local($value); - while (/\b$key\s*=/) + while (/\b$key\s*=/g) { ($value,$_) = &get_firstkeyval($key, $_); last unless defined($value); @@ -308,6 +1194,18 @@ sub get_keyval{ ($value,$_); } +sub get_boolval{ + local($key,$_) = @_; + local($value); + + while (/\b$key\s*(?:=(true|false))?\b/g) + { + $value = ($1 ? $1 : 'true'); + } + + ($value eq 'true' ? 1 : 0, $_); +} + # This is modified from do_cmd_textohtmlindex sub do_cmd_textohtmlglossary{ @@ -315,18 +1213,22 @@ sub do_cmd_textohtmlglossary{ local($keyval,$pat) = &get_next_optional_argument; - local($type,$title,$toctitle,$style); + local($type,$title,$toctitle,$style,$nonumberlist); + + $nonumberlist = 'default'; ($type,$keyval) = &get_keyval('type', $keyval); ($title,$keyval) = &get_keyval('title', $keyval); ($toctitle,$keyval) = &get_keyval('toctitle', $keyval); ($style,$keyval) = &get_keyval('style', $keyval); + ($nonumberlist,$keyval) = &get_boolval('nonumberlist', $keyval); - &make_textohtmlglossary($type,$toctitle,$title,$style).$_; + &make_textohtmlglossary($type,$toctitle,$title,$style,$nonumberlist).$_; } +# add_real_gls does the actual glossary sub make_textohtmlglossary{ - local($type,$toctitle,$title,$style) = @_; + local($type,$toctitle,$title,$style,$nonumberlist) = @_; unless (defined($type)) {$type = 'main';} @@ -335,8 +1237,19 @@ sub make_textohtmlglossary{ &write_warnings("glossary type '$type' not implemented"); } - unless (defined($title) and $title) {$title = $gls_title{$type};} - unless (defined($toctitle) and $toctitle) {$toctitle = $title;} + if ($style) + { + $gls_style{$type} = $style; + } + + $toctitle = $gls_toctitle{$type} unless ($toctitle or $title); + + $title = $gls_title{$type} unless ($title); + $toctitle = $title unless ($toctitle); + + $gls_toctitle{$type} = $toctitle; + + $gls_nonumberlist{$type} = $nonumberlist unless ($nonumberlist eq 'default'); $toc_sec_title = $toctitle; $glsfile{$type} = $CURRENT_FILE; @@ -364,6 +1277,7 @@ sub make_textohtmlglossary{ , &make_section_heading($title, $idx_head) , $gls_mark{$type} ); local($pre,$post) = &minimize_open_tags($heading); + join('',"<BR>\n" , $pre); } @@ -428,13 +1342,8 @@ sub make_real_glossary_entry { $TITLE = $saved_title if (($saved_title)&&(!($TITLE)||($TITLE eq $default_title))); - local($sort) = $glsentry{$entry}{'sort'}; - # Save the reference - local($str) = "$sort###" . ++$global{'max_id'}; # Make unique - # concatenate multiple spaces into a single space - # otherwise keys won't sort properly - $str=~s/\s+/ /gs; + local($str) = "$label###" . ++$global{'max_id'}; # Make unique local($id) = ++$glsentry{$entry}{'maxid'}; local($glsanchor)="gls:$entry$id"; @@ -451,13 +1360,46 @@ sub make_real_glossary_entry { $glossary_entry{$type}{$str} = $entry; $glossary_linktext{$type}{$str} = $TITLE; + local($mark) = $gls_file_mark{$type}; + + $mark = &get_gls_file_mark($type, $entry) if (defined(&get_gls_file_mark)); + + $text = &translate_commands($text); + + if (defined($frame_foot_name)) + { + "<A HREF=\"$mark#gls:$entry\" NAME=\"$glsanchor\" TARGET=\"$frame_foot_name\">$text<\/A>"; + } + else + { + "<A HREF=\"$mark#gls:$entry\" NAME=\"$glsanchor\">$text<\/A>"; + } +} + +sub make_real_glossary_entry_no_backlink { + local($entry,$text,$type) = @_; + local($this_file) = $CURRENT_FILE; + + local($target) = $frame_body_name; + + if (defined($frame_main_suffix)) + { + $this_file=~s/$frame_main_suffix/$frame_body_suffix/; + } + + local($mark) = $gls_file_mark{$type}; + + $mark = &get_gls_file_mark($type, $entry) if (defined(&get_gls_file_mark)); + + $text = &translate_commands($text); + if (defined($frame_foot_name)) { - "<A HREF=$gls_file_mark{$type}#gls:$entry NAME=\"$glsanchor\" TARGET=\"$frame_foot_name\">$text<\/A>"; + "<A HREF=\"$mark#gls:$entry\" NAME=\"$glsanchor\" TARGET=\"$frame_foot_name\">$text<\/A>"; } else { - "<A HREF=$gls_file_mark{$type}#gls:$entry NAME=\"$glsanchor\">$text<\/A>"; + "<A HREF=\"$mark#gls:$entry\" >$text<\/A>"; } } @@ -489,11 +1431,13 @@ sub make_newglossarytype{ $gls_mark{$type} = "<tex2html_gls_${type}_mark>"; $gls_file_mark{$type} = "<tex2html_gls_${type}_file_mark>"; $gls_title{$type} = $title; + $gls_toctitle{$type} = $title; $delimN{$type} = ", "; $glsnumformat{$type} = $GLSCURRENTFORMAT; @{$gls_entries{$type}} = (); $gls_displayfirst{$type} = "glsdisplayfirst"; $gls_display{$type} = "glsdisplay"; + $gls_nonumberlist{$type} = $gls_nonumberlist{'main'}; } sub do_cmd_glsdisplay{ @@ -631,15 +1575,21 @@ sub gls_entry_init{ ( type => $type, name => $name, 'sort' => $name, - description => $description, + description => $desc, text => $name, first => $name, plural => "${name}s", firstplural => "${name}s", symbol => '', flag => 0, - maxid=>0 + maxid => 0, + level => 0, + parent => '' ); + + $#{@{$glsentry{$label}{children}}} = -1; + + $glsentry{$label}; } sub gls_get_type{ @@ -903,6 +1853,228 @@ sub gls_set_first{ } } +sub gls_get_parent{ + local($label) = @_; + + local($parent); + + if (&gls_entry_defined($label)) + { + $parent = $glsentry{$label}{'parent'}; + } + else + { + &write_warnings("gls_get_parent: glossary entry '$label' has not been defined"); + } + + $parent; +} + +sub gls_get_level{ + local($label) = @_; + + local($level) = 0; + + if (&gls_entry_defined($label)) + { + $level = $glsentry{$label}{'level'}; + } + else + { + &write_warnings("gls_get_level: glossary entry '$label' has not been defined"); + } + + $level; +} + +sub gls_set_parent{ + local ($label, $parent) = @_; + + if (&gls_entry_defined($label)) + { + if ($parent) + { + if (&gls_entry_defined($parent)) + { + $glsentry{$label}{'parent'} = $parent; + + push @{$glsentry{$parent}{'children'}}, $label; + + $glsentry{$label}{'level'} = $glsentry{$parent}{'level'}+1; + } + else + { + &write_warnings("gls_set_parent: parent '$parent' for glossary entry '$label' has not been defined"); + } + } + else + { + $glsentry{$label}{'parent'} = ''; + } + } + else + { + &write_warnings("gls_set_parent: glossary entry '$label' has not been defined"); + } +} + +sub gls_get_childcount{ + my($label) = @_; + + my($count) = 0; + + if (&gls_entry_defined($label)) + { + $count = scalar(@{$glsentry{$label}{'children'}}); + } + else + { + &write_warnings("gls_get_childcount: glossary entry '$label' has not been defined"); + } + + $count; +} + +sub gls_get_referenced_childcount{ + my($label) = @_; + + my($count) = 0; + + if (&gls_entry_defined($label)) + { + $count = scalar(grep(($glsentry{$_}{'maxid'} > 0), @{$glsentry{$label}{'children'}})); + } + else + { + &write_warnings("gls_get_childcount: glossary entry '$label' has not been defined"); + } + + $count; +} + +sub gls_set_userkeys{ + local($label, @user) = @_; + + if (&gls_entry_defined($label)) + { + for (my $idx = 0; $idx < 6; $idx++) + { + $glsentry{$label}{"user".($idx+1)} = $user[$idx]; + } + } + else + { + &write_warnings("gls_set_user: glossary entry '$label' has not been defined"); + } +} + +sub gls_set_user{ + local($label, $idx, $text) = @_; + + if (&gls_entry_defined($label)) + { + $glsentry{$label}{"user$idx"} = $text; + } + else + { + &write_warnings("gls_set_user: glossary entry '$label' has not been defined"); + } +} + +sub gls_set_useri{ + local($label, $text) = @_; + + if (&gls_entry_defined($label)) + { + $glsentry{$label}{'user1'} = $text; + } + else + { + &write_warnings("gls_set_useri: glossary entry '$label' has not been defined"); + } +} + +sub gls_set_userii{ + local($label, $text) = @_; + + if (&gls_entry_defined($label)) + { + $glsentry{$label}{'user2'} = $text; + } + else + { + &write_warnings("gls_set_userii: glossary entry '$label' has not been defined"); + } +} + +sub gls_set_useriii{ + local($label, $text) = @_; + + if (&gls_entry_defined($label)) + { + $glsentry{$label}{'user3'} = $text; + } + else + { + &write_warnings("gls_set_useriii: glossary entry '$label' has not been defined"); + } +} + +sub gls_set_useriv{ + local($label, $text) = @_; + + if (&gls_entry_defined($label)) + { + $glsentry{$label}{'user4'} = $text; + } + else + { + &write_warnings("gls_set_useriv: glossary entry '$label' has not been defined"); + } +} + +sub gls_set_userv{ + local($label, $text) = @_; + + if (&gls_entry_defined($label)) + { + $glsentry{$label}{'user5'} = $text; + } + else + { + &write_warnings("gls_set_userv: glossary entry '$label' has not been defined"); + } +} + +sub gls_set_uservi{ + local($label, $text) = @_; + + if (&gls_entry_defined($label)) + { + $glsentry{$label}{'user6'} = $text; + } + else + { + &write_warnings("gls_set_uservi: glossary entry '$label' has not been defined"); + } +} + +sub gls_get_user{ + local($label, $idx) = @_; + local($value) = ''; + + if (&gls_entry_defined($label)) + { + $value = $glsentry{$label}{"user".$idx}; + } + else + { + &write_warnings("gls_get_user[$idx]: glossary entry '$label' has not been defined"); + } + + $value; +} + sub gls_used{ local($label) = @_; local($flag) = 0; @@ -922,13 +2094,13 @@ sub gls_used{ sub gls_entry_defined{ local($label) = @_; - defined(%{$glsentry{$label}}); + (%{$glsentry{$label}}) ? 1 : 0; } sub do_cmd_newglossaryentry{ local($_) = @_; local($label,$name,$description,$symbol,$sort,$text,$first, - $plural,$firstplural,$type,$keyval); + $plural,$firstplural,$type,$keyval,$parent,@user); $label = &missing_braces unless s/$next_pair_pr_rx/$label=$2;''/eo; @@ -945,6 +2117,19 @@ sub do_cmd_newglossaryentry{ ($firstplural,$keyval) = &get_keyval('firstplural', $keyval); ($plural,$keyval) = &get_keyval('plural', $keyval); ($type,$keyval) = &get_keyval('type', $keyval); + ($parent,$keyval) = &get_keyval('parent', $keyval); + + if ($parent and not $name) + { + $name = &gls_get_name($parent); + } + + @user = (); + + for (my $idx = 0; $idx < 6; $idx++) + { + ($user[$idx],$keyval) = &get_keyval("user".($idx+1), $keyval); + } if (defined($type)) { @@ -979,6 +2164,10 @@ sub do_cmd_newglossaryentry{ &gls_set_firstplural($label, $firstplural); + &gls_set_userkeys($label, @user); + + &gls_set_parent($label, $parent); + push @{$gls_entries{$type}}, $label; $_; @@ -1085,12 +2274,35 @@ sub do_cmd_glsadd{ $type = &gls_get_type($label); + local($dobacklink) = 1; + + if (&gls_used($label)) + { + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } + } + else + { + &unset_entry($label); + } + if (defined $type) { ($format,$optarg) = &get_keyval('format', $optarg); $format='' unless(defined($format)); - &gls_add_entry($type,$label,$format,""); + if ($dobacklink) + { + &gls_add_entry($type,$label,$format,""); + } + else + { + $glsentry{$label}{'maxid'} = ++$glsentry{$entry}{'maxid'}; + my $key = $label."###".$glsentry{$label}{'maxid'}; + $glossary{$type}{$key}=''; + } } else { @@ -1105,28 +2317,45 @@ sub do_cmd_glsaddall{ local($_) = @_; local($optarg,$pat) = &get_next_optional_argument; - local($format,$types); - - ($type,$optarg) = &get_keyval('types', $optarg); + local($format,$list); + ($list,$optarg) = &get_keyval('types', $optarg); ($format,$optarg) = &get_keyval('format', $optarg); + $format='' unless(defined($format)); local(@types) = keys(%gls_mark); - if (defined($types)) + if ($list) { - @types = split /,/, $types; + @types = split /\s*,\s*/, $list; } foreach $type (@types) { - # strip leasing and trailing spaces + # strip leading and trailing spaces $type=~s/^\s*([^\s]+)\s*$/\1/; foreach $label (@{$gls_entries{$type}}) { - &gls_add_entry($type,$label,$format,""); + local($dobacklink) = 1; + + if (&gls_used($label)) + { + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } + } + else + { + &unset_entry($label); + } + + if ($dobacklink) + { + &gls_add_entry($type,$label,$format,""); + } } } @@ -1250,6 +2479,64 @@ sub do_cmd_glslinkstar{ $text . $_; } +sub do_cmd_glsdisp{ + local($_) = @_; + local($optarg,$pat,$label,$text,$type,$format,$str); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + $text = &missing_braces unless + (s/$next_pair_pr_rx/$text=$2;''/eo); + + local($dobacklink) = 1; + + if (&gls_used($label)) + { + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } + } + else + { + &unset_entry($label); + } + + $type = &gls_get_type($label); + + if ($dobacklink) + { + &make_glslink($type, $label, $format, $text) .$space . $_; + } + else + { + &make_real_glossary_entry_no_backlink($label, $text, $type). $space . $_; + } +} + +sub do_cmd_glshyperlink{ + local($_) = @_; + + local($text,$pat) = &get_next_optional_argument; + + local($id, $label); + + $label = &missing_braces unless + s/$next_pair_pr_rx/$id=$1,$label=$2;''/eo; + + $text = &gls_get_text($label) unless $text; + + local($type) = &gls_get_type($label); + + "<A HREF=\"$gls_file_mark{$type}#gls:$label\">$text<\/A>" + .$_; +} + sub do_cmd_glsentrydesc{ local($_) = @_; @@ -1265,7 +2552,7 @@ sub do_cmd_Glsentrydesc{ $label = &missing_braces unless (s/$next_pair_pr_rx/$label=$2;''/eo); - ucfirst(&gls_get_description($label)).$_; + &do_real_makefirstuc(&gls_get_description($label)).$_; } sub do_cmd_glsentrytext{ @@ -1283,7 +2570,7 @@ sub do_cmd_Glsentrytext{ $label = &missing_braces unless (s/$next_pair_pr_rx/$label=$2;''/eo); - ucfirst(&gls_get_text($label)).$_; + &do_real_makefirstuc(&gls_get_text($label)).$_; } sub do_cmd_glsentryname{ @@ -1301,7 +2588,7 @@ sub do_cmd_Glsentryname{ $label = &missing_braces unless (s/$next_pair_pr_rx/$label=$2;''/eo); - ucfirst(&gls_get_name($label)).$_; + &do_real_makefirstuc(&gls_get_name($label)).$_; } sub do_cmd_glsentryfirst{ @@ -1319,7 +2606,7 @@ sub do_cmd_Glsentryfirst{ $label = &missing_braces unless (s/$next_pair_pr_rx/$label=$2;''/eo); - ucfirst(&gls_get_first($label)).$_; + &do_real_makefirstuc(&gls_get_first($label)).$_; } sub do_cmd_glsentryplural{ @@ -1337,7 +2624,7 @@ sub do_cmd_Glsentryplural{ $label = &missing_braces unless (s/$next_pair_pr_rx/$label=$2;''/eo); - ucfirst(&gls_get_plural($label)).$_; + &do_real_makefirstuc(&gls_get_plural($label)).$_; } sub do_cmd_glsentryfirstplural{ @@ -1364,7 +2651,7 @@ sub do_cmd_Glsentryfirstplural{ $label = &missing_braces unless (s/$next_pair_pr_rx/$label=$2;''/eo); - ucfirst(&gls_get_firstplural($label)).$_; + &do_real_makefirstuc(&gls_get_firstplural($label)).$_; } sub do_cmd_glsentrysymbol{ @@ -1382,7 +2669,61 @@ sub do_cmd_Glsentrysymbol{ $label = &missing_braces unless (s/$next_pair_pr_rx/$label=$2;''/eo); - ucfirst(&gls_get_symbol($label)).$_; + &do_real_makefirstuc(&gls_get_symbol($label)).$_; +} + +sub do_cmd_glsentryuseri{ + local($_) = @_; + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + &gls_get_user($label, 1).$_; +} + +sub do_cmd_glsentryuserii{ + local($_) = @_; + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + &gls_get_user($label, 2).$_; +} + +sub do_cmd_glsentryuseriii{ + local($_) = @_; + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + &gls_get_user($label, 3).$_; +} + +sub do_cmd_glsentryuseriv{ + local($_) = @_; + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + &gls_get_user($label, 4).$_; +} + +sub do_cmd_glsentryuserv{ + local($_) = @_; + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + &gls_get_user($label, 5).$_; +} + +sub do_cmd_glsentryuservi{ + local($_) = @_; + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + &gls_get_user($label, 6).$_; } sub do_cmd_gls{ @@ -1406,12 +2747,19 @@ sub do_cmd_gls{ local($type) = &gls_get_type($label); + local($dobacklink) = 1; + if (&gls_used($label)) { # entry has already been used $text = &gls_get_text($label); $display = &gls_get_display($type); + + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } } else { @@ -1439,7 +2787,14 @@ sub do_cmd_gls{ local($link_text) = &translate_commands("$display$args"); - &make_glslink($type, $label, $format, $link_text) .$space . $_; + if ($dobacklink) + { + &make_glslink($type, $label, $format, $link_text) .$space . $_; + } + else + { + &make_real_glossary_entry_no_backlink($label, $link_text, $type). $space . $_; + } } # added v1.04 @@ -1521,12 +2876,19 @@ sub do_cmd_glspl{ local($type) = $glsentry{$label}{'type'}; + local($dobacklink) = 1; + if (&gls_used($label)) { # entry has already been used $text = &gls_get_plural($label); $display = &gls_get_display($type);; + + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } } else { @@ -1554,7 +2916,14 @@ sub do_cmd_glspl{ local($link_text) = &translate_commands("$display$args"); - &make_glslink($type, $label, $format, $link_text) . $space . $_; + if ($dobacklink) + { + &make_glslink($type, $label, $format, $link_text) .$space . $_; + } + else + { + &make_real_glossary_entry_no_backlink($label, $link_text, $type). $space . $_; + } } # added v1.04 @@ -1636,12 +3005,19 @@ sub do_cmd_Gls{ local($type) = $glsentry{$label}{'type'}; + local($dobacklink) = 1; + if (&gls_used($label)) { # entry has already been used $text = &gls_get_text($label); $display = &gls_get_display($type);; + + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } } else { @@ -1667,9 +3043,16 @@ sub do_cmd_Gls{ $id = ++$global{'max_id'}; $args .= "$OP$id$CP$insert$OP$id$CP"; - local($link_text) = &translate_commands("$display$args"); + local($link_text) = &do_real_makefirstuc(&translate_commands("$display$args")); - &make_glslink($type, $label, $format, ucfirst($link_text)). $space . $_; + if ($dobacklink) + { + &make_glslink($type, $label, $format, $link_text) .$space . $_; + } + else + { + &make_real_glossary_entry_no_backlink($label, $link_text, $type). $space . $_; + } } # added v1.04 @@ -1727,7 +3110,7 @@ sub do_cmd_Glsstar{ local($link_text) = &translate_commands("$display$args"); - ucfirst($link_text). $space . $_; + &do_real_makefirstuc($link_text). $space . $_; } sub do_cmd_Glspl{ @@ -1751,12 +3134,19 @@ sub do_cmd_Glspl{ local($type) = $glsentry{$label}{'type'}; + local($dobacklink) = 1; + if (&gls_used($label)) { # entry has already been used $text = &gls_get_plural($label); $display = &gls_get_display($type);; + + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } } else { @@ -1782,9 +3172,16 @@ sub do_cmd_Glspl{ $id = ++$global{'max_id'}; $args .= "$OP$id$CP$insert$OP$id$CP"; - local($link_text) = &translate_commands("$display$args"); + local($link_text) = &do_real_makefirstuc(&translate_commands("$display$args")); - &make_glslink($type, $label, $format, ucfirst($link_text)).$space . $_; + if ($dobacklink) + { + &make_glslink($type, $label, $format, $link_text) .$space . $_; + } + else + { + &make_real_glossary_entry_no_backlink($label, $link_text, $type). $space . $_; + } } # added v1.04 @@ -1842,7 +3239,7 @@ sub do_cmd_Glsplstar{ local($link_text) = &translate_commands("$display$args"); - ucfirst($link_text).$space . $_; + &do_real_makefirstuc($link_text).$space . $_; } sub do_cmd_GLS{ @@ -1866,12 +3263,19 @@ sub do_cmd_GLS{ local($type) = $glsentry{$label}{'type'}; + local($dobacklink) = 1; + if (&gls_used($label)) { # entry has already been used $text = &gls_get_text($label); $display = &gls_get_display($type);; + + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } } else { @@ -1897,9 +3301,16 @@ sub do_cmd_GLS{ $id = ++$global{'max_id'}; $args .= "$OP$id$CP$insert$OP$id$CP"; - local($link_text) = &translate_commands("$display$args"); + local($link_text) = uc(&translate_commands("$display$args")); - &make_glslink($type, $label, $format, uc($link_text)).$space . $_; + if ($dobacklink) + { + &make_glslink($type, $label, $format, $link_text) .$space . $_; + } + else + { + &make_real_glossary_entry_no_backlink($label, $link_text, $type). $space . $_; + } } # added v1.04 @@ -1981,12 +3392,19 @@ sub do_cmd_GLSpl{ local($type) = $glsentry{$label}{'type'}; + local($dobacklink) = 1; + if (&gls_used($label)) { # entry has already been used $text = &gls_get_plural($label); $display = &gls_get_display($type);; + + if ($INDEXONLYFIRST) + { + $dobacklink = 0; + } } else { @@ -2012,9 +3430,16 @@ sub do_cmd_GLSpl{ $id = ++$global{'max_id'}; $args .= "$OP$id$CP$insert$OP$id$CP"; - local($link_text) = &translate_commands("$display$args"); + local($link_text) = uc(&translate_commands("$display$args")); - &make_glslink($type, $label, $format, uc($link_text)).$space . $_; + if ($dobacklink) + { + &make_glslink($type, $label, $format, $link_text) .$space . $_; + } + else + { + &make_real_glossary_entry_no_backlink($label, $link_text, $type). $space . $_; + } } # added v1.04 @@ -2126,7 +3551,7 @@ sub do_cmd_Glstext{ $text = &gls_get_text($label); - &make_glslink($type, $label, $format, ucfirst($text)) .$space . $_; + &make_glslink($type, $label, $format, &do_real_makefirstuc($text)) .$space . $_; } # added 22 Feb 2008 @@ -2207,7 +3632,7 @@ sub do_cmd_Glsname{ $text = &gls_get_name($label); - &make_glslink($type, $label, $format, ucfirst($text)) .$space . $_; + &make_glslink($type, $label, $format, &do_real_makefirstuc($text)) .$space . $_; } # added 22 Feb 2008 @@ -2288,7 +3713,7 @@ sub do_cmd_Glsfirst{ $text = &gls_get_first($label); - &make_glslink($type, $label, $format, ucfirst($text)) .$space . $_; + &make_glslink($type, $label, $format, &do_real_makefirstuc($text)) .$space . $_; } # added 22 Feb 2008 @@ -2369,7 +3794,7 @@ sub do_cmd_Glsfirstplural{ $text = &gls_get_firstplural($label); - &make_glslink($type, $label, $format, ucfirst($text)) .$space . $_; + &make_glslink($type, $label, $format, &do_real_makefirstuc($text)) .$space . $_; } # added 22 Feb 2008 @@ -2450,7 +3875,7 @@ sub do_cmd_Glsplural{ $text = &gls_get_plural($label); - &make_glslink($type, $label, $format, ucfirst($text)) .$space . $_; + &make_glslink($type, $label, $format, &do_real_makefirstuc($text)) .$space . $_; } # added 22 Feb 2008 @@ -2531,7 +3956,7 @@ sub do_cmd_Glsdesc{ $text = &gls_get_description($label); - &make_glslink($type, $label, $format, ucfirst($text)) .$space . $_; + &make_glslink($type, $label, $format, &do_real_makefirstuc($text)) .$space . $_; } # added 22 Feb 2008 @@ -2612,7 +4037,7 @@ sub do_cmd_Glssymbol{ $text = &gls_get_symbol($label); - &make_glslink($type, $label, $format, ucfirst($text)) .$space . $_; + &make_glslink($type, $label, $format, &do_real_makefirstuc($text)) .$space . $_; } # added 22 Feb 2008 @@ -2642,6 +4067,318 @@ sub do_cmd_GLSsymbol{ &make_glslink($type, $label, $format, uc($text)) .$space . $_; } +sub do_cmd_glsuseri{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &gls_get_user($label, 1); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_Glsuseri{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &do_real_makefirstuc(&gls_get_user($label, 1)); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_glsuserii{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &gls_get_user($label, 2); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_Glsuserii{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &do_real_makefirstuc(&gls_get_user($label, 2)); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_glsuseriii{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &gls_get_user($label, 3); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_Glsuseriii{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &do_real_makefirstuc(&gls_get_user($label, 3)); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_glsuseriv{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &gls_get_user($label, 4); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_Glsuseriv{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &do_real_makefirstuc(&gls_get_user($label, 4)); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_glsuserv{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &gls_get_user($label, 5); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_Glsuserv{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &do_real_makefirstuc(&gls_get_user($label, 5)); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_glsuservi{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &gls_get_user($label, 6); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + +sub do_cmd_Glsuservi{ + local($_) = @_; + local($optarg,$pat,$label,$text, $format, $insert); + + ($optarg,$pat) = &get_next_optional_argument; + + ($format,$optarg) = &get_keyval('format', $optarg); + + $label = &missing_braces unless + (s/$next_pair_pr_rx/$label=$2;''/eo); + + local ($space) = ''; + if (/^\s+[^\[]/ or /^\s*\[.*\]\s/) {$space = ' ';} + + $insert = ''; + ($insert,$pat) = &get_next_optional_argument; + + local($display) = ''; + + local($type) = &gls_get_type($label); + + $text = &do_real_makefirstuc(&gls_get_user($label, 6)); + + &make_glslink($type, $label, $format, $text) .$space . $_; +} + sub do_cmd_acrshort{ &do_cmd_glstext(@_) } @@ -2717,7 +4454,7 @@ sub do_cmd_hyperbf{ &ignore_commands( <<_IGNORED_CMDS_ ); makeglossary makeglossaries -glossarystyle {} +glossaryentrynumbers # {} _IGNORED_CMDS_ 1; diff --git a/Master/texmf-dist/source/latex/glossaries/mfirstuc.perl b/Master/texmf-dist/source/latex/glossaries/mfirstuc.perl new file mode 100644 index 00000000000..7ab863d06f4 --- /dev/null +++ b/Master/texmf-dist/source/latex/glossaries/mfirstuc.perl @@ -0,0 +1,129 @@ +# File : mfirstuc.perl +# Author : Nicola L. C. Talbot +# Date : 2012-09-21 +# Version : 1.0 +# Description : LaTeX2HTML (limited!) implementation of mfirstuc package + +# This is a LaTeX2HTML style implementing the mfirstuc package, and +# is distributed as part of the glossaries package. +# Copyright 2007 Nicola L.C. 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. + +use warnings; + +package main; + +sub do_cmd_makefirstuc{ + local($_) = @_; + + local($id,$text); + + $text = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$text=$2;''/eo; + + &translate_commands("\\glsmakefirstuc $text") . $_; +} + +sub do_cmd_xmakefirstuc{ + local($_) = @_; + + local($id,$text); + + $text = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$text=$2;''/eo; + + unless ($id) + { + $id = ++$global{'max_id'}; + } + + &translate_commands("\\expandafter \\makefirstuc $OP$id$CP$text$OP$id$CP") + . $_; +} + +sub do_cmd_glsmakefirstuc{ + local($_) = @_; + + local($id,$text); + + $text = &get_next_object unless + s/$next_pair_pr_rx/$id=$1;$text=$2;''/eo; + + &do_real_makefirstuc($text).$_; +} + +sub do_real_makefirstuc{ + local($text) = @_; + + if ($text=~/^((?:\s*<[^>]+>\s*)+)(.*)/) + { + $text = $1 . ucfirst($2); + } + else + { + $text = ucfirst($text); + } + + $text; +} + +sub do_cmd_capitalisewords{ + local($_) = @_; + + local($id,$text); + + $text = &missing_braces unless + s/$next_pair_pr_rx/$id=$1;$text=$2;''/eo; + + local($newtext) = ''; + + foreach my $word (split ' ', $text) + { + $id = ++$global{'max_id'}; + + $word = &translate_commands("\\makefirstuc $OP$id$CP$word$OP$id$CP"); + + if ($newtext) + { + $newtext .= ' ' . $word; + } + else + { + $newtext = $word; + } + } + + $newtext.$_; +} + +sub get_next_object{ + local($next, $revert, $thisline); + local($this_cmd) = $cmd; + $this_cmd =~ s/^\\// unless ($cmd eq "\\"); + if (/^[\s%]*([^\n]*)\n/ ) { + $thisline = &revert_to_raw_tex($1) + } else { + $thisline = &revert_to_raw_tex($_); + } + s/^\s*//; + if ($_ =~ s/$next_token_rx//) { $next = $& }; + $next =~ s/$comment_mark(\d+\n?)?//g; + if ($next =~ /^\\(\W|\d|[a-zA-z]*\b)/) { + $revert = $next = "\\".$1; + } elsif ($next =~ /\W/) { + $revert = &revert_to_raw_tex($next); + } else { $revert = $next }; + $next; +} + +1; 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 0137acf05a2..ad101bfb9cc 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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/base/glossaries-compatible-207.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty index 86f59c1b1da..86ab2da9249 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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/base/glossaries-polyglossia.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty index da5a7b8b7a8..4d8c5fde1c3 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty index 6656ebafc85..fc83c81924c 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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}[2012/05/21 v3.02 (NLCT)] +\ProvidesPackage{glossaries}[2012/09/21 v3.03 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} @@ -103,6 +103,11 @@ false,nolabel,autolabel}[nolabel]{% \renewcommand*{\@gls@loadtree}{}% \let\@glossary@default@style\relax } +\newcommand*{\glspostdescription}{\ifglsnopostdot\else.\fi} +\define@boolkey{glossaries.sty}[gls]{nopostdot}[true]{} +\glsnopostdotfalse +\define@boolkey{glossaries.sty}[gls]{nogroupskip}[true]{} +\glsnogroupskipfalse \define@boolkey{glossaries.sty}[gls]{ucmark}[true]{} \glsucmarkfalse \define@boolkey{glossaries.sty}[gls]{entrycounter}[true]{} @@ -124,7 +129,7 @@ false,nolabel,autolabel}[nolabel]{% \ifx\@glo@sort\@glsdefaultsort \let\@glo@sort\@glo@name \fi - \@onelevel@sanitize\@glo@sort + \@gls@sanitizesort \expandafter\protected@xdef\csname glo@##2@sort\endcsname{\@glo@sort}% }% \def\@gls@setsort##1{}% @@ -236,6 +241,7 @@ false,nolabel,autolabel}[nolabel]{% \newcommand*{\@gls@sanitizedesc}{\@onelevel@sanitize\@glo@desc} \newcommand*{\@gls@sanitizename}{\@onelevel@sanitize\@glo@name} \newcommand*{\@gls@sanitizesymbol}{\@onelevel@sanitize\@glo@symbol} +\newcommand*{\@gls@sanitizesort}{\@onelevel@sanitize\@glo@sort} \define@boolkey[gls]{sanitize}{description}[true]{% \ifgls@sanitize@description \renewcommand*{\@gls@sanitizedesc}{\@onelevel@sanitize\@glo@desc}% @@ -256,13 +262,23 @@ false,nolabel,autolabel}[nolabel]{% \else \renewcommand*{\@gls@sanitizesymbol}{}% \fi} +\define@boolkey[gls]{sanitize}{sort}[true]{% +\ifgls@sanitize@sort + \renewcommand*{\@gls@sanitizesort}{% +\@onelevel@sanitize\@glo@sort}% +\else + \renewcommand*{\@gls@sanitizesort}{}% +\fi} \define@key{glossaries.sty}{sanitize}[description=true,symbol=true, name=true]{% -\ifthenelse{\equal{#1}{none}}{% -\renewcommand*{\@gls@sanitizedesc}{}% -\renewcommand*{\@gls@sanitizename}{}% -\renewcommand*{\@gls@sanitizesymbol}{}% -}{\setkeys[gls]{sanitize}{#1}}% +\ifthenelse{\equal{#1}{none}}% +{% + \renewcommand*{\@gls@sanitizedesc}{}% + \renewcommand*{\@gls@sanitizename}{}% + \renewcommand*{\@gls@sanitizesymbol}{}% +}% +{% + \setkeys[gls]{sanitize}{#1}}% } \define@boolkey{glossaries.sty}[gls]{translate}[true]{} \glstranslatefalse @@ -457,7 +473,6 @@ name=true]{% \RequirePackage{glossaries-babel}}{}% }} \fi -\newcommand*{\glspostdescription}{.} \newcommand*{\nopostdesc}{} \newcommand*{\@nopostdesc}{% \let\org@glspostdescription\glspostdescription @@ -3395,6 +3410,7 @@ you \ifglsxindy\findrootlanguage\fi \def\@glo@type{\glsdefaulttype}% \def\glossarytitle{\csname @glotype@\@glo@type @title\endcsname}% + \def\glossarytoctitle{\glossarytitle}% \let\org@glossarytitle\glossarytitle \def\@glossarystyle{}% \def\gls@dotoctitle{\glssettoctitle{\@glo@type}}% @@ -3450,9 +3466,13 @@ you \forallglossaries{\@@glo@type}{\printglossary[type=\@@glo@type]}% } \define@key{printgloss}{type}{\def\@glo@type{#1}} -\define@key{printgloss}{title}{\def\glossarytitle{#1}} -\define@key{printgloss}{toctitle}{\def\glossarytoctitle{#1}% -\let\gls@dotoctitle\relax +\define@key{printgloss}{title}{% + \def\glossarytitle{#1}% + \let\gls@dotoctitle\relax +} +\define@key{printgloss}{toctitle}{% + \def\glossarytoctitle{#1}% + \let\gls@dotoctitle\relax } \define@key{printgloss}{style}{% \ifcsundef{@glsstyle@#1}% diff --git a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty index d188ca13208..be90bf07d55 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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-Brazilian.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazilian.dict index 5e5f5b14bab..e70e7348f03 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazilian.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazilian.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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-Danish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict index ba780eb793f..23e7f2b161b 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 4feb8f0510f..f73e0d97cfe 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 c64178d9b40..ce1afd8e22d 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 c59fb6f8089..949ffbdef50 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 3314d65154f..6e5b53ad77c 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 d79575d1cb5..ea16e1947e2 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 aba2556387c..cdedbe7744a 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 9bcb6105c83..48388b822e3 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 5038e2b22b6..da63b941e83 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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-Serbian.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Serbian.dict index ba1ea82f9ff..e7d89e0e6a9 100644 --- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Serbian.dict +++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Serbian.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 9b1cf522607..de46b0629ad 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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/expl/glossaries-accsupp.sty b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty index 97a31c19fe8..cbfd682b0fe 100644 --- a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty +++ b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 36e77c46625..5250ca12ebd 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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-inline.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty index ace05107b11..fbfa74a2118 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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,46 +38,62 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-inline}[2012/05/21 v1.0 (NLCT)] +\ProvidesPackage{glossary-inline}[2012/09/21 v3.03 (NLCT)] \newglossarystyle{inline}{% \renewenvironment{theglossary}% {% \def\gls@inlinesep{}% \def\gls@inlinesubsep{}% + \def\gls@inlinepostchild{}% }% {\glspostinline}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% + \renewcommand{\glossaryentryfield}[5]{% + \glsinlinedopostchild \gls@inlinesep - \glsentryitem{##1}\glstarget{##1}{##2}% \def\glo@desc{##3}% \def\@no@post@desc{\nopostdesc}% + \glsentryitem{##1}\glsinlinenameformat{##1}{##2}% \ifx\glo@desc\@no@post@desc + \glsinlineemptydescformat{##4}{##5}% \else - \ifstrempty{##3}{}{\space##3}% + \ifstrempty{##3}% + {\glsinlineemptydescformat{##4}{##5}}% + {\glsinlinedescformat{##3}{##4}{##5}}% \fi \ifglshaschildren{##1}% {% \glsresetsubentrycounter \glsinlineparentchildseparator \def\gls@inlinesubsep{}% + \def\gls@inlinepostchild{\glsinlinepostchild}% }% {}% \def\gls@inlinesep{\glsinlineseparator}% }% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossarysubentryfield}[6]{% \gls@inlinesubsep% - \glstarget{##2}{}% - \glssubentryitem{##2}##4% + \glsinlinesubnameformat{##2}{##3}% + \glssubentryitem{##2}\glsinlinesubdescformat{##4}{##5}{##6}% \def\gls@inlinesubsep{\glsinlinesubseparator}% }% \renewcommand*{\glsgroupskip}{}% } +\newcommand*{\glsinlinedopostchild}{% + \gls@inlinepostchild + \def\gls@inlinepostchild{}% +} \newcommand*{\glsinlineseparator}{;\space} \newcommand*{\glsinlinesubseparator}{,\space} \newcommand*{\glsinlineparentchildseparator}{:\space} -\newcommand*{\glspostinline}{.\space} +\newcommand*{\glsinlinepostchild}{} +\newcommand*{\glspostinline}{\glspostdescription\space} +\newcommand*{\glsinlinenameformat}[2]{\glstarget{#1}{#2}} +\newcommand*{\glsinlinedescformat}[3]{\space#1} +\newcommand*{\glsinlineemptydescformat}[2]{} +\newcommand*{\glsinlinesubnameformat}[2]{\glstarget{#1}{}} +\newcommand*{\glsinlinesubdescformat}[3]{#1} \endinput %% %% End of file `glossary-inline.sty'. 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 4cf93957abd..2e9e660cba2 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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-list}[2011/03/28 v3.0 (NLCT)] +\ProvidesPackage{glossary-list}[2012/09/21 v3.03 (NLCT)] \newglossarystyle{list}{% \renewenvironment{theglossary}% {\begin{description}}{\end{description}}% @@ -50,7 +50,7 @@ \renewcommand*{\glossarysubentryfield}[6]{% \glssubentryitem{##2}% \glstarget{##2}{\strut}##4\glspostdescription\space ##6.}% - \renewcommand*{\glsgroupskip}{\indexspace}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}% } \newglossarystyle{listgroup}{% \glossarystyle{list}% 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 59ab300bb11..ae2406f0e03 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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}[2011/03/28 v3.0 (NLCT)] +\ProvidesPackage{glossary-long}[2012/09/21 v3.03 (NLCT)] \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth @@ -60,7 +60,7 @@ & \glssubentryitem{##2}% \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}% - \renewcommand*{\glsgroupskip}{ & \\}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \\\fi}% } \newglossarystyle{longborder}{% \glossarystyle{long}% @@ -92,7 +92,7 @@ & \glssubentryitem{##2}% \glstarget{##2}{\strut}##4 & ##6\\}% - \renewcommand*{\glsgroupskip}{ & &\\}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\\\fi}% } \newglossarystyle{long3colborder}{% \glossarystyle{long3col}% @@ -127,7 +127,7 @@ & \glssubentryitem{##2}% \glstarget{##2}{\strut}##4 & ##5 & ##6\\}% - \renewcommand*{\glsgroupskip}{ & & &\\}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\\\fi}% } \newglossarystyle{long4colheader}{% \glossarystyle{long4col}% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty index f62e597c976..dc05e4c11fc 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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-longragged}[2011/03/28 v3.0 (NLCT)] +\ProvidesPackage{glossary-longragged}[2012/09/21 v3.03 (NLCT)] \RequirePackage{array} \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% @@ -63,7 +63,7 @@ \glssubentryitem{##2}% \glstarget{##2}{\strut}##4\glspostdescription\space ##6% \tabularnewline}% - \renewcommand*{\glsgroupskip}{ & \tabularnewline}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \tabularnewline\fi}% } \newglossarystyle{longraggedborder}{% \glossarystyle{longragged}% @@ -99,7 +99,7 @@ & \glssubentryitem{##2}% \glstarget{##2}{\strut}##4 & ##6\tabularnewline}% - \renewcommand*{\glsgroupskip}{ & &\tabularnewline}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\tabularnewline\fi}% } \newglossarystyle{longragged3colborder}{% \glossarystyle{longragged3col}% @@ -136,7 +136,7 @@ & \glssubentryitem{##2}% \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}% - \renewcommand*{\glsgroupskip}{ & & &\tabularnewline}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\tabularnewline\fi}% } \newglossarystyle{altlongragged4colheader}{% \glossarystyle{altlongragged4col}% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty index e46f7f83b1e..ab576eb25c4 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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-super.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty index a1d66b9599a..8547f582a18 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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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}[2011/03/28 v3.0 (NLCT)] +\ProvidesPackage{glossary-super}[2012/09/21 v3.03 (NLCT)] \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth @@ -61,7 +61,7 @@ & \glssubentryitem{##2}% \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}% - \renewcommand*{\glsgroupskip}{ & \\}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \\\fi}% } \newglossarystyle{superborder}{% \glossarystyle{super}% @@ -100,7 +100,7 @@ & \glssubentryitem{##2}% \glstarget{##2}{\strut}##4 & ##6\\}% - \renewcommand*{\glsgroupskip}{ & &\\}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\\\fi}% } \newglossarystyle{super3colborder}{% \glossarystyle{super3col}% @@ -140,7 +140,7 @@ & \glssubentryitem{##2}% \glstarget{##2}{\strut}##4 & ##5 & ##6\\}% - \renewcommand*{\glsgroupskip}{ & & &\\}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\\\fi}% } \newglossarystyle{super4colheader}{% \glossarystyle{super4col}% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty index 92ec5eccdcf..71894b4abdd 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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-superragged}[2011/03/28 v3.0 (NLCT)] +\ProvidesPackage{glossary-superragged}[2012/09/21 v3.03 (NLCT)] \RequirePackage{array} \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% @@ -64,7 +64,7 @@ \glssubentryitem{##2}% \glstarget{##2}{\strut}##4\glspostdescription\space ##6% \tabularnewline}% - \renewcommand*{\glsgroupskip}{ & \tabularnewline}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \tabularnewline\fi}% } \newglossarystyle{superraggedborder}{% \glossarystyle{superragged}% @@ -105,7 +105,7 @@ & \glssubentryitem{##2}% \glstarget{##2}{\strut}##4 & ##6\tabularnewline}% - \renewcommand*{\glsgroupskip}{ & &\tabularnewline}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\tabularnewline\fi}% } \newglossarystyle{superragged3colborder}{% \glossarystyle{superragged3col}% @@ -149,7 +149,7 @@ & \glssubentryitem{##2}% \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}% - \renewcommand*{\glsgroupskip}{ & & &\tabularnewline}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\tabularnewline\fi}% } \newglossarystyle{altsuperragged4colheader}{% \glossarystyle{altsuperragged4col}% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty index cc3ddd86cb5..849097046ab 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.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-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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-tree}[2011/03/28 v3.0 (NLCT)] +\ProvidesPackage{glossary-tree}[2012/09/21 v3.03 (NLCT)] \newglossarystyle{index}{% \renewenvironment{theglossary}% {\setlength{\parindent}{0pt}% @@ -72,7 +72,7 @@ \space(##5)% \fi \space##4\glspostdescription\space ##6}% - \renewcommand*{\glsgroupskip}{\indexspace}} + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}} \newglossarystyle{indexgroup}{% \glossarystyle{index}% \renewcommand*{\glsgroupheading}[1]{% @@ -114,7 +114,7 @@ \space(##5)% \fi \space##4\glspostdescription\space ##6\par}% - \renewcommand*{\glsgroupskip}{\indexspace}} + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}} \newglossarystyle{treegroup}{% \glossarystyle{tree}% \renewcommand{\glsgroupheading}[1]{\par @@ -155,7 +155,7 @@ \fi \glstarget{##2}{\strut}% ##4\glspostdescription\space ##6\par}% - \renewcommand*{\glsgroupskip}{\indexspace}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}% } \newglossarystyle{treenonamegroup}{% \glossarystyle{treenoname}% @@ -234,7 +234,7 @@ ##4\glspostdescription\space ##6\par \def\@gls@prevlevel{##1}% }% - \renewcommand*{\glsgroupskip}{\indexspace}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}% } \newglossarystyle{alttreegroup}{% \glossarystyle{alttree}% |