diff options
| author | Karl Berry <karl@freefriends.org> | 2018-03-07 21:47:52 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2018-03-07 21:47:52 +0000 |
| commit | 4fa439e0226fee506c74cf2b08d8e666a1d497db (patch) | |
| tree | 3213e86d25649bcab31024a692eec8c5e3a4e519 | |
| parent | c5ba7c59f808b748529b8c2addcff69f25fe522c (diff) | |
glossaries-extra (7mar18)
git-svn-id: svn://tug.org/texlive/trunk@46871 c570f23f-e606-0410-a88d-b1316a301751
59 files changed, 488 insertions, 442 deletions
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES b/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES index 9cb421f8b7a..1d44e5c75b6 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES +++ b/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES @@ -1,3 +1,14 @@ +1.28 (2018-03-06): + + * glossaries-extra.sty: + + - bug fix: \glsxtrsetgrouptitle and \glsxtrlocalsetgrouptitle + changed \csxdef/\csedef to \protected@csxdef and + \protected@csedef, respectively + + - \glsxtredeffield now uses \protected@csedef instead + of \csedef + 1.27 (2018-02-26): * added supplementary package glossaries-extra-bib2gls.sty diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/README b/Master/texmf-dist/doc/latex/glossaries-extra/README index 6577a2b8b65..56ede8326de 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/README +++ b/Master/texmf-dist/doc/latex/glossaries-extra/README @@ -1,6 +1,6 @@ -LaTeX Package : glossaries-extra v1.27 +LaTeX Package : glossaries-extra v1.28 -Last Modified : 2018-02-26 +Last Modified : 2018-03-06 Author : Nicola Talbot diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf Binary files differindex 81a79231f4b..6a32aee68af 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.html b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.html index febcbae4b1c..3782cd6f446 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.html +++ b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.html @@ -217,7 +217,7 @@ a span.HoLogo-TeX span.HoLogo-e{text-decoration:none;} > <!--l. 236--><p class="noindent" > </p><!--l. 236--><p class="noindent" ><span -class="cmr-17">glossaries-extra.sty v1.27: an extension to the</span> +class="cmr-17">glossaries-extra.sty v1.28: an extension to the</span> <span class="cmr-17">glossaries package</span> </p> @@ -241,7 +241,7 @@ href="http://www.dickimaw-books.com/" class="url" ><span class="cmtt-12">http://www.dickimaw-books.com/</span></a></td></tr></table> </div> <!--l. 236--><p class="noindent" ><span -class="cmr-12">2018-02-26</span></p></div> +class="cmr-12">2018-03-06</span></p></div> <div class="abstract" > @@ -17237,13 +17237,16 @@ class="cmtt-10">} </span></div><hr> This simply uses <span class="cmss-10">etoolbox</span><a id="dx1-40019"></a>’s <span -class="cmtt-10">\csdef </span>without any checks. This command isn’t robust. -There is also a version that uses <span -class="cmtt-10">\csedef </span>instead: -</p><!--l. 8600--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="cmtt-10">\csdef </span>without any checks. This command +isn’t robust. There is also a version that uses <span +class="cmtt-10">\protected@csedef</span> +instead:<span class="footnote-mark"><a +href="#fn1x10" id="fn1x10-bk"><sup class="textsuperscript">10.1</sup></a></span><a + id="x1-40020f1"></a> +</p><!--l. 8601--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtredeffield</span><span class="cmtt-9"> </span></span><a - id="dx1-40020"></a> <span + id="dx1-40021"></a> <span class="cmtt-10">\glsxtredeffield{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17255,11 +17258,11 @@ class="cmitt-10">replacement</span> <span class="cmitt-10">text</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8602--><p class="noindent" > -</p><!--l. 8604--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8603--><p class="noindent" > +</p><!--l. 8605--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\gGlsXtrSetField</span><span class="cmtt-9"> </span></span><a - id="dx1-40021"></a> <span + id="dx1-40022"></a> <span class="cmtt-10">\gGlsXtrSetField{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17267,13 +17270,13 @@ class="cmitt-10">field</span>⟩<span class="cmtt-10">}{</span>⟨<span class="cmitt-10">value</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8606--><p class="noindent" > +</p><!--l. 8607--><p class="noindent" > As <span class="cmtt-10">\GlsXtrSetField </span>but globally. -</p><!--l. 8609--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8610--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\eGlsXtrSetField</span><span class="cmtt-9"> </span></span><a - id="dx1-40022"></a> <span + id="dx1-40023"></a> <span class="cmtt-10">\eGlsXtrSetField{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17281,13 +17284,13 @@ class="cmitt-10">field</span>⟩<span class="cmtt-10">}{</span>⟨<span class="cmitt-10">value</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8611--><p class="noindent" > +</p><!--l. 8612--><p class="noindent" > As <span class="cmtt-10">\GlsXtrSetField </span>but uses protected expansion. -</p><!--l. 8614--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8615--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\xGlsXtrSetField</span><span class="cmtt-9"> </span></span><a - id="dx1-40023"></a> <span + id="dx1-40024"></a> <span class="cmtt-10">\xGlsXtrSetField{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17295,13 +17298,13 @@ class="cmitt-10">field</span>⟩<span class="cmtt-10">}{</span>⟨<span class="cmitt-10">value</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8616--><p class="noindent" > +</p><!--l. 8617--><p class="noindent" > As <span class="cmtt-10">\gGlsXtrSetField </span>but uses protected expansion. -</p><!--l. 8619--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8620--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\GlsXtrLetField</span><span class="cmtt-9"> </span></span><a - id="dx1-40024"></a> <span + id="dx1-40025"></a> <span class="cmtt-10">\GlsXtrLetField{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17309,17 +17312,17 @@ class="cmitt-10">field</span>⟩<span class="cmtt-10">}{</span>⟨<span class="cmitt-10">cs</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8621--><p class="noindent" > +</p><!--l. 8622--><p class="noindent" > Sets the field given by ⟨<span class="cmti-10">field</span>⟩ to the replacement text of ⟨<span class="cmti-10">cs</span>⟩ for the entry given by ⟨<span class="cmti-10">label</span>⟩ (using <span class="cmtt-10">\let</span>). -</p><!--l. 8625--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8626--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\csGlsXtrLetField</span><span class="cmtt-9"> </span></span><a - id="dx1-40025"></a> <span + id="dx1-40026"></a> <span class="cmtt-10">\csGlsXtrLetField{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17328,13 +17331,13 @@ class="cmtt-10">}{</span>⟨<span class="cmitt-10">cs name</span>⟩<span class="cmtt-10">}</span> </div><hr> -</p><!--l. 8627--><p class="noindent" > +</p><!--l. 8628--><p class="noindent" > As <span class="cmtt-10">\GlsXtrLetField </span>but the control sequence name is supplied instead. -</p><!--l. 8631--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8632--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\GlsXtrLetFieldToField</span><span class="cmtt-9"> </span></span><a - id="dx1-40026"></a> <span + id="dx1-40027"></a> <span class="cmtt-10">\GlsXtrLetFieldToField{</span>⟨<span class="cmitt-10">label-1</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17346,7 +17349,7 @@ class="cmitt-10">label-2</span>⟩<span class="cmtt-10">}{</span>⟨<span class="cmitt-10">field-2</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8633--><p class="noindent" > +</p><!--l. 8634--><p class="noindent" > Sets the field given by ⟨<span class="cmti-10">field-1</span>⟩ for the entry given by ⟨<span class="cmti-10">label-1</span>⟩ to the field given by @@ -17364,19 +17367,19 @@ class="cmti-10">code</span>⟩<span class="cmtt-10">} </span>is still used, as for <span class="cmtt-10">\GlsXtrSetField</span>. -</p><!--l. 8641--><p class="indent" > The <span +</p><!--l. 8642--><p class="indent" > The <span class="cmss-10">glossaries </span>package provides <span class="cmtt-10">\ifglshasfield</span><a - id="dx1-40027"></a> to determine if a field has been + id="dx1-40028"></a> to determine if a field has been set. The <span class="cmss-10">glossaries-extra </span>package provides a simpler version: -</p><!--l. 8644--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8645--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrifhasfield</span><span class="cmtt-9"> </span></span><a - id="dx1-40028"></a> <span + id="dx1-40029"></a> <span class="cmtt-10">\glsxtrifhasfield{</span>⟨<span class="cmitt-10">field</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17387,7 +17390,7 @@ class="cmtt-10">}{</span>⟨<span class="cmitt-10">false</span>⟩<span class="cmtt-10">}</span> </div><hr> -</p><!--l. 8646--><p class="noindent" > +</p><!--l. 8647--><p class="noindent" > (New to v1.19.) Note that in this case the ⟨<span class="cmti-10">field</span>⟩ must be the <span class="cmti-10">internal </span>field label (for @@ -17404,20 +17407,20 @@ class="cmti-10">true</span>⟩ part is done otherwise it does ⟨<span class="cmti-10">false</span>⟩. Within ⟨<span class="cmti-10">true</span>⟩ you may use -</p><!--l. 8655--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8656--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glscurrentfieldvalue</span><span class="cmtt-9"> </span></span><a - id="dx1-40029"></a> <span + id="dx1-40030"></a> <span class="cmtt-10">\glscurrentfieldvalue </span></div><hr> -</p><!--l. 8657--><p class="noindent" > +</p><!--l. 8658--><p class="noindent" > to access the field value. This command includes grouping which scopes the ⟨<span class="cmti-10">true</span>⟩ and ⟨<span class="cmti-10">false</span>⟩ parts. The starred version -</p><!--l. 8661--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8662--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrifhasfield*</span><span class="cmtt-9"> </span></span><a - id="dx1-40030"></a> <span + id="dx1-40031"></a> <span class="cmtt-10">\glsxtrifhasfield*{</span>⟨<span class="cmitt-10">field</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17428,23 +17431,23 @@ class="cmtt-10">}{</span>⟨<span class="cmitt-10">false</span>⟩<span class="cmtt-10">}</span> </div><hr> -</p><!--l. 8663--><p class="noindent" > +</p><!--l. 8664--><p class="noindent" > omits the implicit grouping. -</p><!--l. 8666--><p class="indent" > <div class="important" title="Important Note"> Be careful of keys that use <span +</p><!--l. 8667--><p class="indent" > <div class="important" title="Important Note"> Be careful of keys that use <span class="cmtt-10">\relax </span>as the default value (such as the <span class="cmss-10">symbol</span><a - id="dx1-40031"></a>). Use + id="dx1-40032"></a>). Use <span class="cmtt-10">\ifglshassymbol </span>instead. </div> -</p><!--l. 8669--><p class="noindent" > -</p><!--l. 8671--><p class="indent" > There is also a version that simply uses <span +</p><!--l. 8670--><p class="noindent" > +</p><!--l. 8672--><p class="indent" > There is also a version that simply uses <span class="cmtt-10">\ifcsundef</span>. It doesn’t save the field value, but can be used if you only need to check if the field is defined without accessing it: -</p><!--l. 8674--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8675--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\GlsXtrIfFieldUndef</span><span class="cmtt-9"> </span></span><a - id="dx1-40032"></a> <span + id="dx1-40033"></a> <span class="cmtt-10">\GlsXtrIfFieldUndef{</span>⟨<span class="cmitt-10">field</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17455,8 +17458,8 @@ class="cmtt-10">}{</span>⟨<span class="cmitt-10">false</span>⟩<span class="cmtt-10">}</span> </div><hr> -</p><!--l. 8676--><p class="noindent" > -</p><!--l. 8678--><p class="indent" > <div class="important" title="Important Note"> There’s a difference between an undefined field and an unset field. An undefined +</p><!--l. 8677--><p class="noindent" > +</p><!--l. 8679--><p class="indent" > <div class="important" title="Important Note"> There’s a difference between an undefined field and an unset field. An undefined field hasn’t been assigned any value (no associated internal control sequence has been defined). If a defined field has been defined to empty, then it’s considered unset. <span @@ -17474,12 +17477,12 @@ class="cmtt-10">\GlsXtrIfFieldUndef </span>for fields that can only be defined through commands like <span class="cmtt-10">\GlsXtrSetField</span>. </div> -</p><!--l. 8691--><p class="noindent" > -</p><!--l. 8693--><p class="indent" > You can test if a field value equals a string using -</p><!--l. 8694--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8692--><p class="noindent" > +</p><!--l. 8694--><p class="indent" > You can test if a field value equals a string using +</p><!--l. 8695--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\GlsXtrIfFieldEqStr</span><span class="cmtt-9"> </span></span><a - id="dx1-40033"></a> <span + id="dx1-40034"></a> <span class="cmtt-10">\GlsXtrIfFieldEqStr{</span>⟨<span class="cmitt-10">field</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17493,7 +17496,7 @@ class="cmtt-10">}</span> class="cmtt-10">{</span>⟨<span class="cmitt-10">false</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8696--><p class="noindent" > +</p><!--l. 8697--><p class="noindent" > If the entry exists and has the given field set to the given text then this does ⟨<span class="cmti-10">true</span>⟩ otherwise it does ⟨<span @@ -17507,59 +17510,59 @@ class="cmtt-10">\glscurrentfieldvalue</span> with ⟨<span class="cmti-10">text</span>⟩ using <span class="cmss-10">etoolbox</span><a - id="dx1-40034"></a>’s <span + id="dx1-40035"></a>’s <span class="cmtt-10">\ifdefstring</span>. -</p><!--l. 8706--><p class="indent" > The <span +</p><!--l. 8707--><p class="indent" > The <span class="cmss-10">glossaries </span>package provides <span class="cmtt-10">\glsfieldfetch</span><a - id="dx1-40035"></a> which can be used to fetch the + id="dx1-40036"></a> which can be used to fetch the value of the given field and store it in a control sequence. The <span class="cmss-10">glossaries-extra </span>package provides another way of accessing the field value: -</p><!--l. 8710--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8711--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrusefield</span><span class="cmtt-9"> </span></span><a - id="dx1-40036"></a> <span + id="dx1-40037"></a> <span class="cmtt-10">\glsxtrusefield{</span>⟨<span class="cmitt-10">entry-label</span>⟩<span class="cmtt-10">}{</span>⟨<span class="cmitt-10">field-label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8712--><p class="noindent" > +</p><!--l. 8713--><p class="noindent" > This works in the same way as commands like <span class="cmtt-10">\glsentrytext </span>but the field label is specified in the first argument. Note that the ⟨<span class="cmti-10">field-label</span>⟩ corresponds to the internal field tag, which isn’t always the same as the key name. See Table 4.1 of the <span class="cmss-10">glossaries</span><a - id="dx1-40037"></a> + id="dx1-40038"></a> manual. No error occurs if the entry or field haven’t been defined. This command is not robust. -</p><!--l. 8720--><p class="indent" > There is also a version that converts the first letter to uppercase (analogous to +</p><!--l. 8721--><p class="indent" > There is also a version that converts the first letter to uppercase (analogous to <span class="cmtt-10">\Glsentrytext</span>): -</p><!--l. 8722--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8723--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\Glsxtrusefield</span><span class="cmtt-9"> </span></span><a - id="dx1-40038"></a> <span + id="dx1-40039"></a> <span class="cmtt-10">\Glsxtrusefield{</span>⟨<span class="cmitt-10">entry-label</span>⟩<span class="cmtt-10">}{</span>⟨<span class="cmitt-10">field-label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8724--><p class="noindent" > -</p><!--l. 8726--><p class="indent" > If you want to use a field to store a list that can be used as an <span +</p><!--l. 8725--><p class="noindent" > +</p><!--l. 8727--><p class="indent" > If you want to use a field to store a list that can be used as an <span class="cmss-10">etoolbox</span><a - id="dx1-40039"></a> internal + id="dx1-40040"></a> internal list, you can use the following command that adds an item to the field using <span class="cmss-10">etoolbox</span><a - id="dx1-40040"></a>’s <span + id="dx1-40041"></a>’s <span class="cmtt-10">\listcsadd</span>: -</p><!--l. 8730--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8731--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrfieldlistadd</span><span class="cmtt-9"> </span></span><a - id="dx1-40041"></a> <span + id="dx1-40042"></a> <span class="cmtt-10">\glsxtrfieldlistadd{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17568,7 +17571,7 @@ class="cmtt-10">}{</span>⟨<span class="cmitt-10">item</span>⟩<span class="cmtt-10">}</span> </div><hr> -</p><!--l. 8732--><p class="noindent" > +</p><!--l. 8733--><p class="noindent" > where ⟨<span class="cmti-10">label</span>⟩ is the entry’s label, ⟨<span class="cmti-10">field</span>⟩ is the entry’s field and ⟨<span @@ -17578,10 +17581,10 @@ class="cmtt-10">\listgadd</span>, <span class="cmtt-10">\listeadd </span>and <span class="cmtt-10">\listxadd</span>: -</p><!--l. 8737--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8738--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrfieldlistgadd</span><span class="cmtt-9"> </span></span><a - id="dx1-40042"></a> <span + id="dx1-40043"></a> <span class="cmtt-10">\glsxtrfieldlistgadd{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17590,11 +17593,11 @@ class="cmtt-10">}{</span>⟨<span class="cmitt-10">item</span>⟩<span class="cmtt-10">}</span> </div><hr> -</p><!--l. 8739--><p class="noindent" > -</p><!--l. 8740--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8740--><p class="noindent" > +</p><!--l. 8741--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrfieldlisteadd</span><span class="cmtt-9"> </span></span><a - id="dx1-40043"></a> <span + id="dx1-40044"></a> <span class="cmtt-10">\glsxtrfieldlisteadd{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17603,11 +17606,11 @@ class="cmtt-10">}{</span>⟨<span class="cmitt-10">item</span>⟩<span class="cmtt-10">}</span> </div><hr> -</p><!--l. 8742--><p class="noindent" > -</p><!--l. 8743--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8743--><p class="noindent" > +</p><!--l. 8744--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrfieldlistxadd</span><span class="cmtt-9"> </span></span><a - id="dx1-40044"></a> <span + id="dx1-40045"></a> <span class="cmtt-10">\glsxtrfieldlistxadd{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17616,24 +17619,24 @@ class="cmtt-10">}{</span>⟨<span class="cmitt-10">item</span>⟩<span class="cmtt-10">}</span> </div><hr> -</p><!--l. 8745--><p class="noindent" > +</p><!--l. 8746--><p class="noindent" > You can then iterate over the list using: -</p><!--l. 8747--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8748--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrfielddolistloop</span><span class="cmtt-9"> </span></span><a - id="dx1-40045"></a> <span + id="dx1-40046"></a> <span class="cmtt-10">\glsxtrfielddolistloop{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}{</span>⟨<span class="cmitt-10">field</span>⟩<span class="cmtt-10">}</span> </div><hr> -</p><!--l. 8749--><p class="noindent" > +</p><!--l. 8750--><p class="noindent" > or -</p><!--l. 8751--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8752--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrfieldforlistloop</span><span class="cmtt-9"> </span></span><a - id="dx1-40046"></a> <span + id="dx1-40047"></a> <span class="cmtt-10">\glsxtrfieldforlistloop{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17643,19 +17646,19 @@ class="cmtt-10">}</span> class="cmtt-10">{</span>⟨<span class="cmitt-10">handler</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8753--><p class="noindent" > +</p><!--l. 8754--><p class="noindent" > that internally use <span class="cmtt-10">\dolistcsloop </span>and <span class="cmtt-10">\forlistloop</span>, respectively. -</p><!--l. 8757--><p class="indent" > There are also commands that use <span +</p><!--l. 8758--><p class="indent" > There are also commands that use <span class="cmtt-10">\ifinlistcs</span>: -</p><!--l. 8758--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8759--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrfieldifinlist</span><span class="cmtt-9"> </span></span><a - id="dx1-40047"></a> <span + id="dx1-40048"></a> <span class="cmtt-10">\glsxtrfieldifinlist{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17669,13 +17672,13 @@ class="cmtt-10">}</span> class="cmtt-10">{</span>⟨<span class="cmitt-10">false</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8760--><p class="noindent" > +</p><!--l. 8761--><p class="noindent" > and <span class="cmtt-10">\xifinlistcs</span> -</p><!--l. 8762--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8763--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrfieldxifinlist</span><span class="cmtt-9"> </span></span><a - id="dx1-40048"></a> <span + id="dx1-40049"></a> <span class="cmtt-10">\glsxtrfieldxifinlist{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17689,18 +17692,18 @@ class="cmitt-10">true</span>⟩<span class="cmtt-10">}{</span>⟨<span class="cmitt-10">false</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8764--><p class="noindent" > -</p><!--l. 8766--><p class="indent" > See the <span +</p><!--l. 8765--><p class="noindent" > +</p><!--l. 8767--><p class="indent" > See the <span class="cmss-10">etoolbox</span><a - id="dx1-40049"></a>’s user manual for further details of these commands, in particular + id="dx1-40050"></a>’s user manual for further details of these commands, in particular the limitations of <span class="cmtt-10">\ifinlist</span>. -</p><!--l. 8770--><p class="indent" > If the field has a comma-separated list value instead, you can iterate over it +</p><!--l. 8771--><p class="indent" > If the field has a comma-separated list value instead, you can iterate over it using: -</p><!--l. 8772--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8773--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrforcsvfield</span><span class="cmtt-9"> </span></span><a - id="dx1-40050"></a> <span + id="dx1-40051"></a> <span class="cmtt-10">\glsxtrforcsvfield{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}{</span>⟨<span @@ -17709,51 +17712,51 @@ class="cmtt-10">}{</span>⟨<span class="cmitt-10">handler</span>⟩<span class="cmtt-10">}</span> </div><hr> -</p><!--l. 8774--><p class="noindent" > +</p><!--l. 8775--><p class="noindent" > where again ⟨<span class="cmti-10">handler</span>⟩ is a control sequence that takes a single argument. Unlike the <span class="cmss-10">etoolbox</span><a - id="dx1-40051"></a> loops, this doesn’t ignore empty elements nor does it discard leading / + id="dx1-40052"></a> loops, this doesn’t ignore empty elements nor does it discard leading / trailing spaces. Internally it uses <span class="cmtt-10">\@for </span>(modified by <span class="cmss-10">xfor</span><a - id="dx1-40052"></a> which is automatically + id="dx1-40053"></a> which is automatically loaded by <span class="cmss-10">glossaries</span><a - id="dx1-40053"></a>). The <span + id="dx1-40054"></a>). The <span class="cmss-10">xfor</span><a - id="dx1-40054"></a> package modifies the behaviour of <span + id="dx1-40055"></a> package modifies the behaviour of <span class="cmtt-10">\@for </span>to allow the loop to be broken prematurely using <span class="cmtt-10">\@endfortrue</span>. The <span class="cmtt-10">\glsxtrforcsvfield</span> command locally defines a user level command: -</p><!--l. 8784--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8785--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrendfor</span><span class="cmtt-9"> </span></span><a - id="dx1-40055"></a> <span + id="dx1-40056"></a> <span class="cmtt-10">\glsxtrendfor </span></div><hr> -</p><!--l. 8786--><p class="noindent" > +</p><!--l. 8787--><p class="noindent" > which is just a synonym for <span class="cmtt-10">\@endfortrue</span>. -</p><!--l. 8789--><p class="indent" > The loop is performed within the true part of <span +</p><!--l. 8790--><p class="indent" > The loop is performed within the true part of <span class="cmtt-10">\glsxtrifhasfield </span>so scoping is automatically applied. -</p><!--l. 8792--><p class="indent" > When using the <a +</p><!--l. 8793--><p class="indent" > When using the <a href="#styopt.record"><span class="cmss-10">record</span></a><a - id="dx1-40056"></a> option, in addition to recording the usual location, you can + id="dx1-40057"></a> option, in addition to recording the usual location, you can also record the current value of another counter at the same time using the preamble-only command: -</p><!--l. 8795--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8796--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\GlsXtrRecordCounter</span><span class="cmtt-9"> </span></span><a - id="dx1-40057"></a> <span + id="dx1-40058"></a> <span class="cmtt-10">\GlsXtrRecordCounter{</span>⟨<span class="cmitt-10">counter name</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8797--><p class="noindent" > +</p><!--l. 8798--><p class="noindent" > For example: @@ -17763,7 +17766,7 @@ For example: \usepackage[record]{glossaries-extra}  <br />\GlsXtrRecordCounter{section} </div> -<!--l. 8802--><p class="nopar" > Each time an entry is referenced with commands like <span +<!--l. 8803--><p class="nopar" > Each time an entry is referenced with commands like <span class="cmtt-10">\gls </span>or <span class="cmtt-10">\glstext</span>, the <span @@ -17810,25 +17813,25 @@ class="cmtt-10">\gls{bird}</span></span></span> is used in section 1.2 th <div class="verbatim" id="verbatim-212"> \glsxtrfieldlistgadd{bird}{record.section}{1.2} </div> -<!--l. 8819--><p class="nopar" > Note that there’s no key corresponding to this new <span +<!--l. 8820--><p class="nopar" > Note that there’s no key corresponding to this new <span class="cmtt-10">record.section </span>field, but its value can be accessed with <span class="cmtt-10">\glsxtrfielduse </span>or the list can be iterated over with <span class="cmtt-10">\glsxtrfielddolistloop </span>etc. -</p><!--l. 8825--><p class="noindent" > +</p><!--l. 8826--><p class="noindent" > </p> -<!--l. 8825--><p class="noindent" ><a +<!--l. 8826--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">10.2 </span> <a id="sec:printunsrt"></a>Display All Entries Without Sorting or Indexing</h3> -<!--l. 8828--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +<!--l. 8829--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\printunsrtglossary</span><span class="cmtt-9"> </span></span><a id="dx1-41001"></a> <span class="cmtt-10">\printunsrtglossary[</span>⟨<span class="cmitt-10">options</span>⟩<span class="cmtt-10">] </span></div><hr> -</p><!--l. 8830--><p class="noindent" > +</p><!--l. 8831--><p class="noindent" > This behaves like <span class="cmtt-10">\printnoidxglossary </span>but never sorts the entries and always lists all the defined entries for the given glossary (and doesn’t require @@ -17845,8 +17848,8 @@ the definition of <span class="cmtt-10">\glsgroupskip </span>to avoid the “Incomplete <span class="cmtt-10">\iftrue</span>” error that may otherwise occur. -</p><!--l. 8840--><p class="noindent" >There’s also a starred form -</p><!--l. 8841--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8841--><p class="noindent" >There’s also a starred form +</p><!--l. 8842--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\printunsrtglossary*</span><span class="cmtt-9"> </span></span><a id="dx1-41005"></a> <span @@ -17855,7 +17858,7 @@ class="cmitt-10">options</span>⟩<span class="cmtt-10">]{</span>⟨<span class="cmitt-10">code</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8843--><p class="noindent" > +</p><!--l. 8844--><p class="noindent" > which is equivalent to </p><div class="alltt"> <div class="obeylines-v"> <span @@ -17873,7 +17876,7 @@ class="cmtt-10">\endgroup</span> class="cmtt-10">\glossarypreamble</span>, the supplied ⟨<span class="cmti-10">code</span>⟩ is done before the glossary header. -<!--l. 8853--><p class="indent" > This means you now have the option to simply list all entries on the first +<!--l. 8854--><p class="indent" > This means you now have the option to simply list all entries on the first <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> run without the need for a post-processor, however there will be no <a id="dx1-41006"></a><a @@ -17887,15 +17890,15 @@ href="#sec:bib2gls"><span class="cmsy-10">§</span>9 </a><a href="#sec:bib2gls">bib2gls: Managing Reference Databases<!--tex4ht:ref: sec:bib2gls --></a>). -</p><!--l. 8859--><p class="indent" > <div class="important" title="Important Note"> No attempt is made to gather hierarchical elements. If child entries aren’t defined +</p><!--l. 8860--><p class="indent" > <div class="important" title="Important Note"> No attempt is made to gather hierarchical elements. If child entries aren’t defined immediately after their parent entry, they won’t be together in the glossary when using <span class="cmtt-10">\printunsrtglossary</span>. </div> -</p><!--l. 8864--><p class="noindent" > +</p><!--l. 8865--><p class="noindent" > -</p><!--l. 8866--><p class="indent" > If you have any entries with the <span +</p><!--l. 8867--><p class="indent" > If you have any entries with the <span class="cmss-10">see</span><a id="dx1-41009"></a> key set, you will need the <span class="cmss-10">glossaries</span><a @@ -17916,7 +17919,7 @@ class="cmss-10">record</span></a><span class="cmss-10">=only</span><a id="dx1-41013"></a> package option will automatically deal with this. -</p><!--l. 8873--><p class="indent" > For example: +</p><!--l. 8874--><p class="indent" > For example: @@ -17931,32 +17934,32 @@ will automatically deal with this.  <br />\printunsrtglossaries  <br />\end{document} </div> -<!--l. 8887--><p class="nopar" > In the above, zebra will be listed before ant as it was defined first. -</p><!--l. 8891--><p class="indent" > If you allow document definitions with the <a +<!--l. 8888--><p class="nopar" > In the above, zebra will be listed before ant as it was defined first. +</p><!--l. 8892--><p class="indent" > If you allow document definitions with the <a href="#styopt.docdefs"><span class="cmss-10">docdefs</span></a><a id="dx1-41014"></a> option, the document will require a second <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> run if the entries are defined after <span class="cmtt-10">\printunsrtglossary</span>. -</p><!--l. 8895--><p class="indent" > The optional argument is as for <span +</p><!--l. 8896--><p class="indent" > The optional argument is as for <span class="cmtt-10">\printnoidxglossary </span>(except for the <span class="cmss-10">sort</span><a id="dx1-41015"></a> key, which isn’t available). -</p><!--l. 8898--><p class="indent" > All glossaries may be displayed in the order of their definition using: -</p><!--l. 8900--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8899--><p class="indent" > All glossaries may be displayed in the order of their definition using: +</p><!--l. 8901--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\printunsrtglossaries</span><span class="cmtt-9"> </span></span><a id="dx1-41016"></a> <span class="cmtt-10">\printunsrtglossaries </span></div><hr> -</p><!--l. 8902--><p class="noindent" > +</p><!--l. 8903--><p class="noindent" > which is analogous to <span class="cmtt-10">\printnoidxglossaries</span>. This just iterates over all defined glossaries (that aren’t on the ignored list) and does <span class="cmtt-10">\printunsrtglossary</span>[type=⟨<span class="cmti-10">type</span>⟩]. -</p><!--l. 8907--><p class="indent" > To avoid complications caused by <span +</p><!--l. 8908--><p class="indent" > To avoid complications caused by <span class="cmss-10">tabular</span><a id="dx1-41017"></a><a id="dx1-41018"></a>-like glossary styles, <span @@ -17965,7 +17968,7 @@ iterates over all entries in the selected glossary and appends the appropriate c an internal command. Once the construction of this command is complete, then it’s performed to display the glossary. This puts the loop outside the style code. For convenience, there’s a hook used within the loop: -</p><!--l. 8914--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8915--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\printunsrtglossaryentryprocesshook</span><span class="cmtt-9"> </span></span><a id="dx1-41019"></a> <span @@ -17974,31 +17977,31 @@ class="cmtt-10">\printunsrtglossaryentryprocesshook</span> class="cmtt-10">{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8916--><p class="noindent" > +</p><!--l. 8917--><p class="noindent" > This hook should not display any content, but may be used to perform calculations. For example, to calculate widths. Within this hook you can use: -</p><!--l. 8920--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8921--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\printunsrtglossaryskipentry</span><span class="cmtt-9"> </span></span><a id="dx1-41020"></a> <span class="cmtt-10">\printunsrtglossaryskipentry </span></div><hr> -</p><!--l. 8922--><p class="noindent" > +</p><!--l. 8923--><p class="noindent" > to skip the current entry. This will prevent the entry from being added to the internal command. -</p><!--l. 8926--><p class="indent" > There’s another hook immediately before the internal command containing the +</p><!--l. 8927--><p class="indent" > There’s another hook immediately before the internal command containing the glossary code is performed: -</p><!--l. 8928--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8929--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\printunsrtglossarypredoglossary</span><span class="cmtt-9"> </span></span><a id="dx1-41021"></a> <span class="cmtt-10">\printunsrtglossarypredoglossary</span> </div><hr> -</p><!--l. 8930--><p class="noindent" > +</p><!--l. 8931--><p class="noindent" > -</p><!--l. 8932--><p class="indent" > The internal command uses -</p><!--l. 8933--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8933--><p class="indent" > The internal command uses +</p><!--l. 8934--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\printunsrtglossaryhandler</span><span class="cmtt-9"> </span></span><a id="dx1-41022"></a> <span @@ -18006,18 +18009,18 @@ class="cmtt-10">\printunsrtglossaryhandler{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}</span> </div><hr> -</p><!--l. 8935--><p class="noindent" > +</p><!--l. 8936--><p class="noindent" > to display each item in the list, where ⟨<span class="cmti-10">label</span>⟩ is the current label. -</p><!--l. 8938--><p class="indent" > By default the handler just does -</p><!--l. 8939--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8939--><p class="indent" > By default the handler just does +</p><!--l. 8940--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrunsrtdo</span><span class="cmtt-9"> </span></span><a id="dx1-41023"></a> <span class="cmtt-10">\glsxtrunsrtdo{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8941--><p class="noindent" > +</p><!--l. 8942--><p class="noindent" > which determines whether to use <span class="cmtt-10">\glossentry </span>or <span class="cmtt-10">\subglossentry </span>and checks the @@ -18028,10 +18031,10 @@ class="cmss-10">loclist</span><a id="dx1-41025"></a> fields for the <a id="dx1-41026"></a><a href="#glo:numberlist">number list</a>. -</p><!--l. 8946--><p class="indent" > You can redefine the handler if required. For example, you may want to filter +</p><!--l. 8947--><p class="indent" > You can redefine the handler if required. For example, you may want to filter entries according to the category label. You can test if a label is contained in a comma-separated list of labels using: -</p><!--l. 8950--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8951--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtriflabelinlist</span><span class="cmtt-9"> </span></span><a id="dx1-41027"></a> <span @@ -18046,14 +18049,14 @@ class="cmtt-10">}</span> class="cmtt-10">{</span>⟨<span class="cmitt-10">false</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 8952--><p class="noindent" > +</p><!--l. 8953--><p class="noindent" > The ⟨<span class="cmti-10">label</span>⟩ and ⟨<span class="cmti-10">label list</span>⟩ will be fully expanded. -</p><!--l. 8955--><p class="indent" > <div class="important" title="Important Note"> If you redefine the handler to exclude entries, you may end up with an empty +</p><!--l. 8956--><p class="indent" > <div class="important" title="Important Note"> If you redefine the handler to exclude entries, you may end up with an empty glossary. This could cause a problem for the list-based styles. </div> -</p><!--l. 8959--><p class="noindent" > -</p><!--l. 8961--><p class="indent" > For example, if the preamble includes: +</p><!--l. 8960--><p class="noindent" > +</p><!--l. 8962--><p class="indent" > For example, if the preamble includes: @@ -18062,7 +18065,7 @@ glossary. This could cause a problem for the list-based styles. </div> \usepackage[record,style=index]{glossaries-extra}  <br />\GlsXtrRecordCounter{section} </div> -<!--l. 8965--><p class="nopar" > then you can print the glossary but first redefine the handler to only select entries +<!--l. 8966--><p class="nopar" > then you can print the glossary but first redefine the handler to only select entries that include the current section number in the <span class="cmtt-10">record.section </span>field: @@ -18076,8 +18079,8 @@ class="cmtt-10">record.section </span>field:  <br />  {}%  <br />} </div> -<!--l. 8975--><p class="nopar" > -</p><!--l. 8977--><p class="indent" > Alternatively you can use the starred form of <span +<!--l. 8976--><p class="nopar" > +</p><!--l. 8978--><p class="indent" > Alternatively you can use the starred form of <span class="cmtt-10">\printunsrtglossary </span>which will localise the change: @@ -18093,8 +18096,8 @@ localise the change:  <br />  }%  <br />} </div> -<!--l. 8988--><p class="nopar" > -</p><!--l. 8990--><p class="indent" > If you are using the <span +<!--l. 8989--><p class="nopar" > +</p><!--l. 8991--><p class="indent" > If you are using the <span class="cmss-10">hyperref</span><a id="dx1-41028"></a> package and want to display the same glossary more than once, you can also add a temporary redefinition of <span @@ -18120,7 +18123,7 @@ duplicate hypertarget names. For example:  <br />  }%  <br />} </div> -<!--l. 9010--><p class="nopar" > Note that this will cause a problem if your descriptions contain commands like <span +<!--l. 9011--><p class="nopar" > Note that this will cause a problem if your descriptions contain commands like <span class="cmtt-10">\gls</span> that need to link an entry that doesn’t appear in the summary. In this case, it’s a better approach to use: @@ -18144,8 +18147,8 @@ better approach to use:  <br />  }%  <br />} </div> -<!--l. 9030--><p class="nopar" > -</p><!--l. 9032--><p class="indent" > If it’s a short summary at the start of a section, you might also want to suppress +<!--l. 9031--><p class="nopar" > +</p><!--l. 9033--><p class="indent" > If it’s a short summary at the start of a section, you might also want to suppress the glossary header and add some vertical space afterwards: @@ -18169,9 +18172,9 @@ the glossary header and add some vertical space afterwards:  <br />  \appto\glossarypostamble{\glspar\medskip\glspar}%  <br />} </div> -<!--l. 9052--><p class="nopar" > -</p><!--l. 9054--><p class="indent" > There’s a shortcut command that essentially does this: -</p><!--l. 9055--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 9053--><p class="nopar" > +</p><!--l. 9055--><p class="indent" > There’s a shortcut command that essentially does this: +</p><!--l. 9056--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\printunsrtglossaryunit</span><span class="cmtt-9"> </span></span><a id="dx1-41029"></a> <span @@ -18182,7 +18185,7 @@ class="cmitt-10">counter</span> <span class="cmitt-10">name</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9057--><p class="noindent" > +</p><!--l. 9058--><p class="noindent" > The above example can simply be replaced with: @@ -18191,11 +18194,11 @@ The above example can simply be replaced with: <div class="verbatim" id="verbatim-220"> \printunsrtglossaryunit{section} </div> -<!--l. 9061--><p class="nopar" > -</p><!--l. 9063--><p class="indent" > This shortcut command is actually defined to use <span +<!--l. 9062--><p class="nopar" > +</p><!--l. 9064--><p class="indent" > This shortcut command is actually defined to use <span class="cmtt-10">\printunsrtglossary*</span> with -</p><!--l. 9064--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9065--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\printunsrtglossaryunitsetup</span><span class="cmtt-9"> </span></span><a id="dx1-41030"></a> <span @@ -18204,7 +18207,7 @@ class="cmitt-10">counter</span> <span class="cmitt-10">name</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9066--><p class="noindent" > +</p><!--l. 9067--><p class="noindent" > so if you want to just make some minor modifications you can do @@ -18215,9 +18218,9 @@ so if you want to just make some minor modifications you can do  <br />  \renewcommand*{\glossarysection}[2][]{\subsection*{Summary}}%  <br />} </div> -<!--l. 9073--><p class="nopar" > which will start the list with a subsection header with the title “Summary” +<!--l. 9074--><p class="nopar" > which will start the list with a subsection header with the title “Summary” (overriding the glossary’s title). -</p><!--l. 9077--><p class="indent" > Note that this shortcut command is only available with the <a +</p><!--l. 9078--><p class="indent" > Note that this shortcut command is only available with the <a href="#styopt.record"><span class="cmss-10">record</span></a><a id="dx1-41031"></a> (or @@ -18226,7 +18229,7 @@ href="#styopt.record"><span class="cmss-10">record</span></a><span class="cmss-10">=alsoindex</span><a id="dx1-41032"></a>) package option. -</p><!--l. 9080--><p class="indent" > This temporary change in the hypertarget prefix means you need to explicitly use +</p><!--l. 9081--><p class="indent" > This temporary change in the hypertarget prefix means you need to explicitly use <span class="cmtt-10">\hyperlink </span>to create a link to it as commands like <span class="cmtt-10">\gls </span>will try to link to the target @@ -18238,12 +18241,12 @@ the front or back matter) which can be the target for all glossary references an just use <span class="cmtt-10">\printunsrtglossaryunit </span>for a quick summary at the start of a section etc. -</p><!--l. 9090--><p class="noindent" > +</p><!--l. 9091--><p class="noindent" > </p> -<!--l. 9090--><p class="noindent" ><a +<!--l. 9091--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">10.3 </span> <a id="sec:glossentry"></a>Standalone Entry Items</h3> -<!--l. 9093--><p class="noindent" >It may be that you don’t want a list but would rather display entry details +<!--l. 9094--><p class="noindent" >It may be that you don’t want a list but would rather display entry details throughout the document. You can simply do <span class="cmtt-10">\glsentryname </span>followed by <span @@ -18268,7 +18271,7 @@ custom command:  <br /> \par\medskip  <br />} </div> -<!--l. 9107--><p class="nopar" > define your entries +<!--l. 9108--><p class="nopar" > define your entries @@ -18278,7 +18281,7 @@ custom command:  <br />  description={a relation or expression involving variables}  <br />} </div> -<!--l. 9113--><p class="nopar" > and then later in the text: +<!--l. 9114--><p class="nopar" > and then later in the text: @@ -18286,25 +18289,25 @@ custom command: <div class="verbatim" id="verbatim-224"> \displayterm{function} </div> -<!--l. 9117--><p class="nopar" > -</p><!--l. 9119--><p class="indent" > However, if may be that you want to use <span +<!--l. 9118--><p class="nopar" > +</p><!--l. 9120--><p class="indent" > However, if may be that you want to use <span class="cmss-10">hyperref</span><a id="dx1-42003"></a> and have commands like <span class="cmtt-10">\gls</span> link back to the place where the term is described. Instead of using <span class="cmtt-10">\glsentryname</span> use -</p><!--l. 9123--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9124--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrglossentry</span><span class="cmtt-9"> </span></span><a id="dx1-42004"></a> <span class="cmtt-10">\glsxtrglossentry{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9125--><p class="noindent" > +</p><!--l. 9126--><p class="noindent" > where ⟨<span class="cmti-10">label</span>⟩ is the entry’s label. -</p><!--l. 9128--><p class="indent" > This is designed to behave much like the way the name is displayed in the +</p><!--l. 9129--><p class="indent" > This is designed to behave much like the way the name is displayed in the glossary. It performs the following: </p> <ul class="itemize1"> <li class="itemize">Defines <span @@ -18339,7 +18342,7 @@ class="cmss-10">subentrycounter</span></a><a class="cmtt-10">\glssubentryitem{</span>⟨<span class="cmti-10">label</span>⟩<span class="cmtt-10">}</span></li></ul> - <!--l. 9150--><p class="noindent" >otherwise it does </p> + <!--l. 9151--><p class="noindent" >otherwise it does </p> <ul class="itemize2"> <li class="itemize"><span class="cmtt-10">\glsentryitem{</span>⟨<span @@ -18362,18 +18365,18 @@ class="cmss-10">glossnamefont</span></a><a -<!--l. 9163--><p class="noindent" >If you have used <span +<!--l. 9164--><p class="noindent" >If you have used <span class="cmtt-10">\nopostdesc</span><a id="dx1-42008"></a> or <span class="cmtt-10">\glsxtrnopostpunc</span><a id="dx1-42009"></a> in any of your description fields, you can use -</p><!--l. 9165--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9166--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtractivatenopost</span><span class="cmtt-9"> </span></span><a id="dx1-42010"></a> <span class="cmtt-10">\glsxtractivatenopost </span></div><hr> -</p><!--l. 9167--><p class="noindent" > +</p><!--l. 9168--><p class="noindent" > to make these commands behave as they normally do within a glossary. This needs to be placed before </p><div class="alltt"> <div class="obeylines-v"> @@ -18386,10 +18389,10 @@ class="cmtt-10">}\glspostdescription</span> class="cmtt-10">\glsnonextpages </span>and <span class="cmtt-10">\glsnextpages </span>have no effect outside of the glossary and are not intended for use in a standalone context. -<!--l. 9177--><p class="indent" > It’s also possible to select a different field (rather than using <span +<!--l. 9178--><p class="indent" > It’s also possible to select a different field (rather than using <span class="cmss-10">name</span><a id="dx1-42011"></a>): -</p><!--l. 9179--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9180--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrglossentryother</span><span class="cmtt-9"> </span></span><a id="dx1-42012"></a> <span @@ -18401,7 +18404,7 @@ class="cmtt-10">}{</span>⟨<span class="cmitt-10">field</span>⟩<span class="cmtt-10">}</span> </div><hr> -</p><!--l. 9181--><p class="noindent" > +</p><!--l. 9182--><p class="noindent" > The ⟨<span class="cmti-10">field</span>⟩ must be given using its internal field label which may not be the same as the key used to set the field. See the key to field mappings table in the <span @@ -18425,7 +18428,7 @@ class="cmtt-10">}</span>. </li> <li class="itemize">Otherwise ⟨<span class="cmti-10">header</span>⟩ is simply the field value.</li></ul> -<!--l. 9193--><p class="noindent" >The <span +<!--l. 9194--><p class="noindent" >The <span class="cmtt-10">\glsxtrglossentryother </span>command internally uses <span class="cmtt-10">\glossentrynameother{</span>⟨<span class="cmti-10">label</span>⟩<span @@ -18456,7 +18459,7 @@ class="cmtt-10">}</span> </div> </div> (for example, <span class="cmtt-10">\glssymbolaccessdisplay</span>). -<!--l. 9204--><p class="indent" > This means that my custom command can be changed to: +<!--l. 9205--><p class="indent" > This means that my custom command can be changed to: @@ -18469,7 +18472,7 @@ class="cmtt-10">\glssymbolaccessdisplay</span>).  <br /> \par\medskip  <br />} </div> -<!--l. 9212--><p class="nopar" > If I want numbered definitions, then I can use the package options <span +<!--l. 9213--><p class="nopar" > If I want numbered definitions, then I can use the package options <span class="cmss-10">entrycounter</span><a id="dx1-42015"></a> or <span @@ -18487,7 +18490,7 @@ class="cmss-10">subentrycounter</span><a  <br /> \par\medskip  <br />} </div> -<!--l. 9223--><p class="nopar" > The counter label uses a dot after the number by default but this can be changed to +<!--l. 9224--><p class="nopar" > The counter label uses a dot after the number by default but this can be changed to a colon: @@ -18496,13 +18499,13 @@ a colon: <div class="verbatim" id="verbatim-227"> \renewcommand*{\glsentrycounterlabel}{\theglossaryentry:\space} </div> -<!--l. 9228--><p class="nopar" > It’s now possible to not only use <span +<!--l. 9229--><p class="nopar" > It’s now possible to not only use <span class="cmtt-10">\gls </span>to link back to the definition but also use <span class="cmtt-10">\glsrefentry </span>to reference the counter and <span class="cmtt-10">\glsxtrpageref </span>to reference the page number. -</p><!--l. 9233--><p class="indent" > If I want the description to behave more like it does in a glossary in need to make +</p><!--l. 9234--><p class="indent" > If I want the description to behave more like it does in a glossary in need to make the following modification: @@ -18519,9 +18522,9 @@ the following modification:  <br /> \par\medskip  <br />} </div> -<!--l. 9245--><p class="nopar" > (Note the grouping to localise <span +<!--l. 9246--><p class="nopar" > (Note the grouping to localise <span class="cmtt-10">\glsxtractivatenopost</span>.) -</p><!--l. 9248--><p class="indent" > You can also use <span +</p><!--l. 9249--><p class="indent" > You can also use <span class="cmtt-10">\glsxtrglossentry </span>within section headings. For example: @@ -18530,7 +18533,7 @@ class="cmtt-10">\glsxtrglossentry </span>within section headings. For example: <div class="verbatim" id="verbatim-229"> \section{\glsxtrglossentry{function}} </div> -<!--l. 9252--><p class="nopar" > This will use <span +<!--l. 9253--><p class="nopar" > This will use <span class="cmtt-10">\glsentryname </span>in PDF bookmarks (if <span class="cmtt-10">\texorpdfstring </span>is defined) and will use <span @@ -18546,12 +18549,12 @@ start of the header or table of contents either scoped or afterwards cancelled w <span class="cmtt-10">\@glsxtrnotinmark </span>and <span class="cmtt-10">\glsxtrrestoremarkhook</span>.) -</p><!--l. 9262--><p class="noindent" > +</p><!--l. 9263--><p class="noindent" > </p> -<!--l. 9262--><p class="noindent" ><a +<!--l. 9263--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">10.4 </span> <a id="sec:alias"></a>Entry Aliases</h3> -<!--l. 9265--><p class="noindent" >An entry can be made an alias of another entry using the <span +<!--l. 9266--><p class="noindent" >An entry can be made an alias of another entry using the <span class="cmss-10">alias</span><a id="dx1-43001"></a> key. The value should be the label of the other term. There’s no check for the other’s @@ -18562,7 +18565,7 @@ defining the other entry after the aliased entry. (For example, when used with href="#glo:bib2gls"><span class="cmtt-10">bib2gls</span><a id="dx1-43003"></a></a>.) -</p><!--l. 9272--><p class="indent" > If an entry ⟨<span +</p><!--l. 9273--><p class="indent" > If an entry ⟨<span class="cmti-10">entry-1</span>⟩ is made an alias of ⟨<span class="cmti-10">entry-2</span>⟩ then: </p> <ul class="itemize1"> @@ -18625,7 +18628,7 @@ class="cmtt-10">noindex=false</span>. - <!--l. 9291--><p class="noindent" >Note that with <a + <!--l. 9292--><p class="noindent" >Note that with <a href="#styopt.record"><span class="cmss-10">record</span></a><span class="cmss-10">=only</span><a @@ -18635,13 +18638,13 @@ class="cmss-10">=only</span><a id="dx1-43014"></a><span class="cmtt-10">bib2gls</span><a id="dx1-43015"></a>’s settings.</p></li></ul> -<!--l. 9295--><p class="indent" > The index suppression trigger is performed by -</p><!--l. 9296--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 9296--><p class="indent" > The index suppression trigger is performed by +</p><!--l. 9297--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrsetaliasnoindex</span><span class="cmtt-9"> </span></span><a id="dx1-43016"></a> <span class="cmtt-10">\glsxtrsetaliasnoindex </span></div><hr> -</p><!--l. 9298--><p class="noindent" > +</p><!--l. 9299--><p class="noindent" > This is performed after the default options provided by <span class="cmtt-10">\GlsXtrSetDefaultGlsOpts</span><a id="dx1-43017"></a> @@ -18652,17 +18655,17 @@ class="cmss-10">=only</span><a id="dx1-43018"></a>, <span class="cmtt-10">\glsxtrsetaliasnoindex </span>will default to do nothing. -</p><!--l. 9304--><p class="indent" > Within the definition of <span +</p><!--l. 9305--><p class="indent" > Within the definition of <span class="cmtt-10">\glsxtrsetaliasnoindex </span>you can use -</p><!--l. 9305--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9306--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtrindexaliased</span><span class="cmtt-9"> </span></span><a id="dx1-43019"></a> <span class="cmtt-10">\glsxtrindexaliased </span></div><hr> -</p><!--l. 9307--><p class="noindent" > +</p><!--l. 9308--><p class="noindent" > to index ⟨<span class="cmti-10">entry-2</span>⟩. -</p><!--l. 9310--><p class="indent" > The index suppression command can be redefined to index the main term instead. +</p><!--l. 9311--><p class="indent" > The index suppression command can be redefined to index the main term instead. For example: @@ -18674,27 +18677,27 @@ For example:  <br /> \setkeys{glslink}{noindex}%  <br />} </div> -<!--l. 9317--><p class="nopar" > -</p><!--l. 9319--><p class="indent" > The value of the <span +<!--l. 9318--><p class="nopar" > +</p><!--l. 9320--><p class="indent" > The value of the <span class="cmss-10">alias</span><a id="dx1-43020"></a> field can be accessed using -</p><!--l. 9320--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9321--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsxtralias</span><span class="cmtt-9"> </span></span><a id="dx1-43021"></a> <span class="cmtt-10">\glsxtralias{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9322--><p class="noindent" > +</p><!--l. 9323--><p class="noindent" > </p> -<!--l. 9324--><p class="indent" > </div> -</p><!--l. 9324--><p class="noindent" ><a +<!--l. 9325--><p class="indent" > </div> +</p><!--l. 9325--><p class="noindent" ><a href="#top">Top</a><div class="chapter"><h2 class="chapterHead">11. <a id="sec:supplemental"></a>Supplemental Packages</h2> -</p><!--l. 9327--><p class="indent" > The <span +</p><!--l. 9328--><p class="indent" > The <span class="cmss-10">glossaries </span>bundle provides additional support packages <span class="cmss-10">glossaries-prefix</span><a id="dx1-44001"></a> (for @@ -18703,10 +18706,10 @@ class="cmss-10">glossaries-accsupp</span><a id="dx1-44002"></a> (for accessibility support). These packages aren’t automatically loaded. </p> -<!--l. 9332--><p class="noindent" ><a +<!--l. 9333--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">11.1 </span> <a id="sec:prefix"></a>Prefixes or Determiners</h3> -<!--l. 9335--><p class="noindent" >If prefixing is required, you can simply load <span +<!--l. 9336--><p class="noindent" >If prefixing is required, you can simply load <span class="cmss-10">glossaries-prefix</span><a id="dx1-45001"></a> after <span class="cmss-10">glossaries-extra</span>. For @@ -18730,13 +18733,13 @@ example:  <br />\printglossaries  <br />\end{document} </div> -<!--l. 9358--><p class="nopar" > -</p><!--l. 9360--><p class="noindent" > +<!--l. 9359--><p class="nopar" > +</p><!--l. 9361--><p class="noindent" > </p> -<!--l. 9360--><p class="noindent" ><a +<!--l. 9361--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">11.2 </span> <a id="sec:accsupp"></a>Accessibility Support</h3> -<!--l. 9363--><p class="noindent" >The <span +<!--l. 9364--><p class="noindent" >The <span class="cmss-10">glossaries-accsupp</span><a id="dx1-46001"></a> package needs to be loaded before <span class="cmss-10">glossaries-extra </span>or through @@ -18751,7 +18754,7 @@ class="cmss-10">accsupp</span></a><a <div class="verbatim" id="verbatim-232"> \usepackage[accsupp]{glossaries-extra} </div> -<!--l. 9368--><p class="nopar" > If you don’t load <span +<!--l. 9369--><p class="nopar" > If you don’t load <span class="cmss-10">glossaries-accsupp</span><a id="dx1-46003"></a> or you load <span class="cmss-10">glossaries-accsupp</span><a @@ -18763,7 +18766,7 @@ class="cmti-10">xxx</span>⟩ commands described below will simply be equiv corresponding <span class="cmtt-10">\glsentry</span>⟨<span class="cmti-10">xxx</span>⟩ commands. -</p><!--l. 9375--><p class="indent" > The following <span +</p><!--l. 9376--><p class="indent" > The following <span class="cmtt-10">\glsaccess</span>⟨<span class="cmti-10">xxx</span>⟩ commands add accessibility information wrapped around the corresponding <span @@ -18771,19 +18774,19 @@ class="cmtt-10">\glsentry</span>⟨<span class="cmti-10">xxx</span>⟩ commands. There is no check for existence of the entry nor do any of these commands add formatting, hyperlinks or indexing information. -</p><!--l. 9380--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9381--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsaccessname</span><span class="cmtt-9"> </span></span><a id="dx1-46005"></a> <span class="cmtt-10">\glsaccessname{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9382--><p class="noindent" > +</p><!--l. 9383--><p class="noindent" > This displays the value of the <span class="cmss-10">name</span><a id="dx1-46006"></a> field for the entry identified by ⟨<span class="cmti-10">label</span>⟩. -</p><!--l. 9386--><p class="indent" > If the <span +</p><!--l. 9387--><p class="indent" > If the <span class="cmss-10">glossaries-accsupp</span><a id="dx1-46007"></a> package isn’t loaded, this is simply defined as: @@ -18793,7 +18796,7 @@ class="cmss-10">glossaries-accsupp</span><a <div class="verbatim" id="verbatim-233"> \newcommand*{\glsaccessname}[1]{\glsentryname{#1}} </div> -<!--l. 9390--><p class="nopar" > otherwise it’s defined as: +<!--l. 9391--><p class="nopar" > otherwise it’s defined as: @@ -18807,20 +18810,20 @@ class="cmss-10">glossaries-accsupp</span><a  <br />  {#1}%  <br />} </div> -<!--l. 9400--><p class="nopar" > (<span +<!--l. 9401--><p class="nopar" > (<span class="cmtt-10">\glsnameaccessdisplay</span><a id="dx1-46008"></a> is defined by the <span class="cmss-10">glossaries-accsupp</span><a id="dx1-46009"></a> package.) The first letter upper case version is: -</p><!--l. 9404--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9405--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\Glsaccessname</span><span class="cmtt-9"> </span></span><a id="dx1-46010"></a> <span class="cmtt-10">\Glsaccessname{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9406--><p class="noindent" > +</p><!--l. 9407--><p class="noindent" > Without the <span class="cmss-10">glossaries-accsupp</span><a id="dx1-46011"></a> package this is just defined as: @@ -18831,7 +18834,7 @@ class="cmss-10">glossaries-accsupp</span><a <div class="verbatim" id="verbatim-235"> \newcommand*{\Glsaccessname}[1]{\Glsentryname{#1}} </div> -<!--l. 9411--><p class="nopar" > With the <span +<!--l. 9412--><p class="nopar" > With the <span class="cmss-10">glossaries-accsupp</span><a id="dx1-46012"></a> package this is defined as: @@ -18847,112 +18850,112 @@ class="cmss-10">glossaries-accsupp</span><a  <br />  {#1}%  <br />} </div> -<!--l. 9421--><p class="nopar" > -</p><!--l. 9423--><p class="indent" > The following commands are all defined in an analogous manner. -</p><!--l. 9424--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 9422--><p class="nopar" > +</p><!--l. 9424--><p class="indent" > The following commands are all defined in an analogous manner. +</p><!--l. 9425--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsaccesstext</span><span class="cmtt-9"> </span></span><a id="dx1-46013"></a> <span class="cmtt-10">\glsaccesstext{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9426--><p class="noindent" > +</p><!--l. 9427--><p class="noindent" > This displays the value of the <span class="cmss-10">text</span><a id="dx1-46014"></a> field. -</p><!--l. 9429--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9430--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\Glsaccesstext</span><span class="cmtt-9"> </span></span><a id="dx1-46015"></a> <span class="cmtt-10">\Glsaccesstext{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9431--><p class="noindent" > +</p><!--l. 9432--><p class="noindent" > This displays the value of the <span class="cmss-10">text</span><a id="dx1-46016"></a> field with the first letter converted to upper case. -</p><!--l. 9435--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9436--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsaccessplural</span><span class="cmtt-9"> </span></span><a id="dx1-46017"></a> <span class="cmtt-10">\glsaccessplural{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9437--><p class="noindent" > +</p><!--l. 9438--><p class="noindent" > This displays the value of the <span class="cmss-10">plural</span><a id="dx1-46018"></a> field. -</p><!--l. 9440--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9441--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\Glsaccessplural</span><span class="cmtt-9"> </span></span><a id="dx1-46019"></a> <span class="cmtt-10">\Glsaccessplural{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9442--><p class="noindent" > +</p><!--l. 9443--><p class="noindent" > This displays the value of the <span class="cmss-10">plural</span><a id="dx1-46020"></a> field with the first letter converted to upper case. -</p><!--l. 9446--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9447--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsaccessfirst</span><span class="cmtt-9"> </span></span><a id="dx1-46021"></a> <span class="cmtt-10">\glsaccessfirst{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9448--><p class="noindent" > +</p><!--l. 9449--><p class="noindent" > This displays the value of the <span class="cmss-10">first</span><a id="dx1-46022"></a> field. -</p><!--l. 9451--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9452--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\Glsaccessfirst</span><span class="cmtt-9"> </span></span><a id="dx1-46023"></a> <span class="cmtt-10">\Glsaccessfirst{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9453--><p class="noindent" > +</p><!--l. 9454--><p class="noindent" > This displays the value of the <span class="cmss-10">first</span><a id="dx1-46024"></a> field with the first letter converted to upper case. -</p><!--l. 9457--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9458--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsaccessfirstplural</span><span class="cmtt-9"> </span></span><a id="dx1-46025"></a> <span class="cmtt-10">\glsaccessfirstplural{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9459--><p class="noindent" > +</p><!--l. 9460--><p class="noindent" > This displays the value of the <span class="cmss-10">firstplural</span><a id="dx1-46026"></a> field. -</p><!--l. 9462--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9463--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\Glsaccessfirstplural</span><span class="cmtt-9"> </span></span><a id="dx1-46027"></a> <span class="cmtt-10">\Glsaccessfirstplural{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9464--><p class="noindent" > +</p><!--l. 9465--><p class="noindent" > This displays the value of the <span class="cmss-10">firstplural</span><a id="dx1-46028"></a> field with the first letter converted to upper case. -</p><!--l. 9468--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9469--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsaccesssymbol</span><span class="cmtt-9"> </span></span><a id="dx1-46029"></a> <span class="cmtt-10">\glsaccesssymbol{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9470--><p class="noindent" > +</p><!--l. 9471--><p class="noindent" > This displays the value of the <span class="cmss-10">symbol</span><a id="dx1-46030"></a> field. -</p><!--l. 9473--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9474--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\Glsaccesssymbol</span><span class="cmtt-9"> </span></span><a id="dx1-46031"></a> <span @@ -18962,150 +18965,150 @@ class="cmtt-10">} </span></div><hr> -</p><!--l. 9475--><p class="noindent" > +</p><!--l. 9476--><p class="noindent" > This displays the value of the <span class="cmss-10">symbol</span><a id="dx1-46032"></a> field with the first letter converted to upper case. -</p><!--l. 9479--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9480--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsaccesssymbolplural</span><span class="cmtt-9"> </span></span><a id="dx1-46033"></a> <span class="cmtt-10">\glsaccesssymbolplural{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9481--><p class="noindent" > +</p><!--l. 9482--><p class="noindent" > This displays the value of the <span class="cmss-10">symbolplural</span><a id="dx1-46034"></a> field. -</p><!--l. 9484--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9485--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\Glsaccesssymbolplural</span><span class="cmtt-9"> </span></span><a id="dx1-46035"></a> <span class="cmtt-10">\Glsaccesssymbolplural{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9486--><p class="noindent" > +</p><!--l. 9487--><p class="noindent" > This displays the value of the <span class="cmss-10">symbolplural</span><a id="dx1-46036"></a> field with the first letter converted to upper case. -</p><!--l. 9490--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9491--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsaccessdesc</span><span class="cmtt-9"> </span></span><a id="dx1-46037"></a> <span class="cmtt-10">\glsaccessdesc{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9492--><p class="noindent" > +</p><!--l. 9493--><p class="noindent" > This displays the value of the <span class="cmss-10">desc</span><a id="dx1-46038"></a> field. -</p><!--l. 9495--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9496--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\Glsaccessdesc</span><span class="cmtt-9"> </span></span><a id="dx1-46039"></a> <span class="cmtt-10">\Glsaccessdesc{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9497--><p class="noindent" > +</p><!--l. 9498--><p class="noindent" > This displays the value of the <span class="cmss-10">desc</span><a id="dx1-46040"></a> field with the first letter converted to upper case. -</p><!--l. 9501--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9502--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsaccessdescplural</span><span class="cmtt-9"> </span></span><a id="dx1-46041"></a> <span class="cmtt-10">\glsaccessdescplural{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9503--><p class="noindent" > +</p><!--l. 9504--><p class="noindent" > This displays the value of the <span class="cmss-10">descplural</span><a id="dx1-46042"></a> field. -</p><!--l. 9506--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9507--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\Glsaccessdescplural</span><span class="cmtt-9"> </span></span><a id="dx1-46043"></a> <span class="cmtt-10">\Glsaccessdescplural{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9508--><p class="noindent" > +</p><!--l. 9509--><p class="noindent" > This displays the value of the <span class="cmss-10">descplural</span><a id="dx1-46044"></a> field with the first letter converted to upper case. -</p><!--l. 9512--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9513--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsaccessshort</span><span class="cmtt-9"> </span></span><a id="dx1-46045"></a> <span class="cmtt-10">\glsaccessshort{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9514--><p class="noindent" > +</p><!--l. 9515--><p class="noindent" > This displays the value of the <span class="cmss-10">short</span><a id="dx1-46046"></a> field. -</p><!--l. 9517--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9518--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\Glsaccessshort</span><span class="cmtt-9"> </span></span><a id="dx1-46047"></a> <span class="cmtt-10">\Glsaccessshort{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9519--><p class="noindent" > +</p><!--l. 9520--><p class="noindent" > This displays the value of the <span class="cmss-10">short</span><a id="dx1-46048"></a> field with the first letter converted to upper case. -</p><!--l. 9523--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9524--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsaccessshortpl</span><span class="cmtt-9"> </span></span><a id="dx1-46049"></a> <span class="cmtt-10">\glsaccessshortpl{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9525--><p class="noindent" > +</p><!--l. 9526--><p class="noindent" > This displays the value of the <span class="cmss-10">shortplural</span><a id="dx1-46050"></a> field. -</p><!--l. 9528--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9529--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\Glsaccessshortpl</span><span class="cmtt-9"> </span></span><a id="dx1-46051"></a> <span class="cmtt-10">\Glsaccessshortpl{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9530--><p class="noindent" > +</p><!--l. 9531--><p class="noindent" > This displays the value of the <span class="cmss-10">shortplural</span><a id="dx1-46052"></a> field with the first letter converted to upper case. -</p><!--l. 9534--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9535--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsaccesslong</span><span class="cmtt-9"> </span></span><a id="dx1-46053"></a> <span class="cmtt-10">\glsaccesslong{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9536--><p class="noindent" > +</p><!--l. 9537--><p class="noindent" > This displays the value of the <span class="cmss-10">long</span><a id="dx1-46054"></a> field. -</p><!--l. 9539--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9540--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\Glsaccesslong</span><span class="cmtt-9"> </span></span><a id="dx1-46055"></a> <span class="cmtt-10">\Glsaccesslong{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9541--><p class="noindent" > +</p><!--l. 9542--><p class="noindent" > This displays the value of the <span class="cmss-10">long</span><a id="dx1-46056"></a> field with the first letter converted to upper case. -</p><!--l. 9545--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9546--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\glsaccesslongpl</span><span class="cmtt-9"> </span></span><a id="dx1-46057"></a> <span @@ -19115,18 +19118,18 @@ class="cmtt-10">} </span></div><hr> -</p><!--l. 9547--><p class="noindent" > +</p><!--l. 9548--><p class="noindent" > This displays the value of the <span class="cmss-10">longplural</span><a id="dx1-46058"></a> field. -</p><!--l. 9550--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9551--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\Glsaccesslongpl</span><span class="cmtt-9"> </span></span><a id="dx1-46059"></a> <span class="cmtt-10">\Glsaccesslongpl{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9552--><p class="noindent" > +</p><!--l. 9553--><p class="noindent" > This displays the value of the <span class="cmss-10">longplural</span><a id="dx1-46060"></a> field with the first letter converted to upper @@ -19135,11 +19138,11 @@ case. </p> -<!--l. 9556--><p class="indent" > </div> -</p><!--l. 9556--><p class="noindent" ><a +<!--l. 9557--><p class="indent" > </div> +</p><!--l. 9557--><p class="noindent" ><a href="#top">Top</a><div class="chapter"><h2 class="chapterHead">12. <a id="sec:samples"></a>Sample Files</h2> -</p><!--l. 9559--><p class="indent" > The following sample files are provided with this package: +</p><!--l. 9560--><p class="indent" > The following sample files are provided with this package: </p><dl class="description"><dt class="description"> <span class="cmbx-10">sample.tex</span> </dt><dd @@ -19426,11 +19429,11 @@ class="cmtt-10">sample-suppl-hyp.tex</span>. -<!--l. 9691--><p class="indent" > </div> -</p><!--l. 9691--><p class="noindent" ><a +<!--l. 9692--><p class="indent" > </div> +</p><!--l. 9692--><p class="noindent" ><a href="#top">Top</a><div class="chapter"><h2 class="chapterHead">13. <a id="sec:lang"></a>Multi-Lingual Support</h2> -</p><!--l. 9694--><p class="indent" > There’s only one command provided by <span +</p><!--l. 9695--><p class="indent" > There’s only one command provided by <span class="cmss-10">glossaries-extra </span>that you’re likely to want to change in your document and that’s <span class="cmtt-10">\abbreviationsname</span><a @@ -19451,7 +19454,7 @@ been loaded, otherwise it will be defined as <span class="cmtt-10">\acronymname </span>(provided by <span class="cmss-10">glossaries</span>). -</p><!--l. 9704--><p class="indent" > You can redefine it in the usual way. For example: +</p><!--l. 9705--><p class="indent" > You can redefine it in the usual way. For example: @@ -19459,7 +19462,7 @@ class="cmss-10">glossaries</span>). <div class="verbatim" id="verbatim-237"> \renewcommand*{\abbreviationsname}{List of Abbreviations} </div> -<!--l. 9707--><p class="nopar" > Or using <span +<!--l. 9708--><p class="nopar" > Or using <span class="cmss-10">babel</span><a id="dx1-48004"></a> or <span class="cmss-10">polyglossia</span><a @@ -19473,8 +19476,8 @@ class="cmss-10">polyglossia</span><a  <br /> \renewcommand*{\abbreviationsname}{List of Abbreviations}%  <br />} </div> -<!--l. 9713--><p class="nopar" > -</p><!--l. 9715--><p class="indent" > Alternatively you can use the <span +<!--l. 9714--><p class="nopar" > +</p><!--l. 9716--><p class="indent" > Alternatively you can use the <span class="cmss-10">title</span><a id="dx1-48006"></a> key when you print the list of abbreviations. For example: @@ -19485,7 +19488,7 @@ For example: <div class="verbatim" id="verbatim-239"> \printabbreviations[title={List of Abbreviations}] </div> -<!--l. 9719--><p class="nopar" > or +<!--l. 9720--><p class="nopar" > or @@ -19493,10 +19496,10 @@ For example: <div class="verbatim" id="verbatim-240"> \printglossary[type=abbreviations,title={List of Abbreviations}] </div> -<!--l. 9723--><p class="nopar" > -</p><!--l. 9725--><p class="indent" > The other fixed text commands are the diagnostic messages, which shouldn’t +<!--l. 9724--><p class="nopar" > +</p><!--l. 9726--><p class="indent" > The other fixed text commands are the diagnostic messages, which shouldn’t appear in the final draft of your document. -</p><!--l. 9728--><p class="indent" > The <span +</p><!--l. 9729--><p class="indent" > The <span class="cmss-10">glossaries-extra </span>package has the facility to load language modules (whose filename is in the form <span class="cmtt-10">glossariesxtr-</span>⟨<span @@ -19518,7 +19521,7 @@ identifier, such as <span class="cmtt-10">Latn</span>, associated with the given dialect. There’s no warning if the associated file isn’t found. The script file is loaded after the dialect file. -</p><!--l. 9741--><p class="indent" > If you want to write your own language module, you just need to create a file +</p><!--l. 9742--><p class="indent" > If you want to write your own language module, you just need to create a file called <span class="cmtt-10">glossariesxtr-</span>⟨<span class="cmti-10">lang</span>⟩<span @@ -19528,7 +19531,7 @@ the <span class="cmss-10">tracklang</span><a id="dx1-48009"></a> package). For example, <span class="cmtt-10">glossariesxtr-french.ldf</span>. -</p><!--l. 9747--><p class="indent" > The simplest code for this file is: +</p><!--l. 9748--><p class="indent" > The simplest code for this file is: @@ -19557,8 +19560,8 @@ class="cmtt-10">glossariesxtr-french.ldf</span>.  <br />  {}%  <br />} </div> -<!--l. 9773--><p class="nopar" > -</p><!--l. 9775--><p class="indent" > You can adapt this for other languages by replacing all instances of the language +<!--l. 9774--><p class="nopar" > +</p><!--l. 9776--><p class="indent" > You can adapt this for other languages by replacing all instances of the language identifier <span class="cmtt-10">french </span>and the translated text <span class="obeylines-h"><span class="verb"><span class="cmtt-10">Abr\’eviations</span></span></span> as appropriate. You can @@ -19574,16 +19577,16 @@ class="cmsy-10">§</span>9.3 </a><a href="#x1-360009.3">The <span class="cmss-10">glossaries-extra-bib2gls </span>package<!--tex4ht:ref: sec:bib2glssty --></a> for further details. -</p><!--l. 9782--><p class="indent" > This <span +</p><!--l. 9783--><p class="indent" > This <span class="cmtt-10">.ldf </span>file then needs to be put somewhere on <span class="TEX">T<span class="E">E</span>X</span>’s path so that it can be found by <span class="cmss-10">glossaries-extra</span>. You might also want to consider uploading it to CTAN so that it can be useful to others. (Please don’t send it to me. I already have more packages than I am able to maintain.) -</p><!--l. 9788--><p class="indent" > If you additionally want to provide translations for the diagnostic messages used +</p><!--l. 9789--><p class="indent" > If you additionally want to provide translations for the diagnostic messages used when a glossary is missing, you need to redefine the following commands: -</p><!--l. 9791--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9792--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\GlsXtrNoGlsWarningHead</span><span class="cmtt-9"> </span></span><a id="dx1-48012"></a> <span @@ -19593,39 +19596,39 @@ class="cmtt-10">}{</span>⟨<span class="cmitt-10">file</span>⟩<span class="cmtt-10">}</span> </div><hr> -</p><!--l. 9793--><p class="noindent" > +</p><!--l. 9794--><p class="noindent" > This produces the following text in English: </p><div class="quote"> - <!--l. 9796--><p class="noindent" >This document is incomplete. The external file associated with the + <!--l. 9797--><p class="noindent" >This document is incomplete. The external file associated with the glossary ‘⟨<span class="cmti-10">label</span>⟩’ (which should be called ⟨<span class="cmitt-10">file</span>⟩) hasn’t been created.</p></div> -<!--l. 9799--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 9800--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\GlsXtrNoGlsWarningEmptyStart</span><span class="cmtt-9"> </span></span><a id="dx1-48013"></a> <span class="cmtt-10">\GlsXtrNoGlsWarningEmptyStart </span></div><hr> -</p><!--l. 9801--><p class="noindent" > +</p><!--l. 9802--><p class="noindent" > This produces the following text in English: </p><div class="quote"> - <!--l. 9804--><p class="noindent" >This has probably happened because there are no entries defined in + <!--l. 9805--><p class="noindent" >This has probably happened because there are no entries defined in this glossary.</p></div> -<!--l. 9807--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 9808--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\GlsXtrNoGlsWarningEmptyMain</span><span class="cmtt-9"> </span></span><a id="dx1-48014"></a> <span class="cmtt-10">\GlsXtrNoGlsWarningEmptyMain </span></div><hr> -</p><!--l. 9809--><p class="noindent" > +</p><!--l. 9810--><p class="noindent" > This produces the following text in English: </p><div class="quote"> - <!--l. 9812--><p class="noindent" >If you don’t want this glossary, add <span + <!--l. 9813--><p class="noindent" >If you don’t want this glossary, add <span class="cmtt-10">nomain </span>to your package option list when you load <span class="cmtt-10">glossaries-extra.sty</span>. For example:</p></div> -<!--l. 9815--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 9816--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\GlsXtrNoGlsWarningEmptyNotMain</span><span class="cmtt-9"> </span></span><a id="dx1-48015"></a> <span @@ -19633,10 +19636,10 @@ class="cmtt-10">\GlsXtrNoGlsWarningEmptyNotMain{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}</span> </div><hr> -</p><!--l. 9817--><p class="noindent" > +</p><!--l. 9818--><p class="noindent" > This produces the following text in English: </p><div class="quote"> - <!--l. 9820--><p class="noindent" >Did you forget to use <span + <!--l. 9821--><p class="noindent" >Did you forget to use <span class="cmtt-10">type=</span>⟨<span class="cmitt-10">label</span>⟩ when you defined your entries? If you tried to load entries into this glossary with <span @@ -19648,7 +19651,7 @@ class="cmtt-10">] </span>as the optional argument? If you did, check that the definitions in the file you loaded all had the type set to <span class="cmtt-10">\glsdefaulttype</span>.</p></div> -<!--l. 9823--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 9824--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\GlsXtrNoGlsWarningCheckFile</span><span class="cmtt-9"> </span></span><a id="dx1-48016"></a> <span @@ -19656,28 +19659,28 @@ class="cmtt-10">\GlsXtrNoGlsWarningCheckFile{</span>⟨<span class="cmitt-10">file</span>⟩<span class="cmtt-10">}</span> </div><hr> -</p><!--l. 9825--><p class="noindent" > +</p><!--l. 9826--><p class="noindent" > This produces the following text in English: </p><div class="quote"> - <!--l. 9828--><p class="noindent" >Check the contents of the file ⟨<span + <!--l. 9829--><p class="noindent" >Check the contents of the file ⟨<span class="cmitt-10">file</span>⟩. If it’s empty, that means you haven’t indexed any of your entries in this glossary (using commands like <span class="cmtt-10">\gls </span>or <span class="cmtt-10">\glsadd</span>) so this list can’t be generated. If the file isn’t empty, the document build process hasn’t been completed.</p></div> -<!--l. 9831--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 9832--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\GlsXtrNoGlsWarningMisMatch</span><span class="cmtt-9"> </span></span><a id="dx1-48017"></a> <span class="cmtt-10">\GlsXtrNoGlsWarningMisMatch </span></div><hr> -</p><!--l. 9833--><p class="noindent" > +</p><!--l. 9834--><p class="noindent" > This produces the following text in English: </p><div class="quote"> - <!--l. 9836--><p class="noindent" >You need + <!--l. 9837--><p class="noindent" >You need to either replace <span class="cmtt-10">\makenoidxglossaries </span>with <span class="cmtt-10">\makeglossaries </span>or @@ -19688,17 +19691,17 @@ class="cmtt-10">\printglossaries</span>) class="cmtt-10">\printnoidxglossary </span>(or <span class="cmtt-10">\printnoidxglossaries</span>) and then rebuild this document.</p></div> -<!--l. 9839--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 9840--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\GlsXtrNoGlsWarningNoOut</span><span class="cmtt-9"> </span></span><a id="dx1-48018"></a> <span class="cmtt-10">\GlsXtrNoGlsWarningNoOut{</span>⟨<span class="cmitt-10">file</span>⟩<span class="cmtt-10">} </span></div><hr> -</p><!--l. 9841--><p class="noindent" > +</p><!--l. 9842--><p class="noindent" > This produces the following text in English: </p><div class="quote"> - <!--l. 9844--><p class="noindent" >The file ⟨<span + <!--l. 9845--><p class="noindent" >The file ⟨<span class="cmitt-10">file</span>⟩ doesn’t exist. This most likely means you haven’t used <span class="cmtt-10">\makeglossaries </span>or you have used <span @@ -19706,25 +19709,25 @@ class="cmtt-10">\nofiles</span>. If this is just a draft version of the document, you can suppress this message using the <span class="cmtt-10">nomissingglstext </span>package option.</p></div> -<!--l. 9847--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 9848--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\GlsXtrNoGlsWarningTail</span><span class="cmtt-9"> </span></span><a id="dx1-48019"></a> <span class="cmtt-10">\GlsXtrNoGlsWarningTail </span></div><hr> -</p><!--l. 9849--><p class="noindent" > +</p><!--l. 9850--><p class="noindent" > This produces the following text in English: </p><div class="quote"> - <!--l. 9852--><p class="noindent" >This message will be removed once the problem has been fixed.</p></div> -<!--l. 9855--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + <!--l. 9853--><p class="noindent" >This message will be removed once the problem has been fixed.</p></div> +<!--l. 9856--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\GlsXtrNoGlsWarningBuildInfo</span><span class="cmtt-9"> </span></span><a id="dx1-48020"></a> <span class="cmtt-10">\GlsXtrNoGlsWarningBuildInfo </span></div><hr> -</p><!--l. 9857--><p class="noindent" > +</p><!--l. 9858--><p class="noindent" > This is advice on how to generate the glossary files. See the documented code (<span class="cmtt-10">glossaries-extra-code.pdf</span>) for further details. -</p><!--l. 9862--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9863--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="cmtt-9">\GlsXtrNoGlsWarningAutoMake</span><span class="cmtt-9"> </span></span><a id="dx1-48021"></a> <span @@ -19732,7 +19735,7 @@ class="cmtt-10">\GlsXtrNoGlsWarningAutoMake{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}</span> </div><hr> -</p><!--l. 9864--><p class="noindent" > +</p><!--l. 9865--><p class="noindent" > This is the message produced when the <a href="#styopt.automake"><span class="cmss-10">automake</span></a><a @@ -20923,7 +20926,7 @@ class="cmtt-10">convertgls2bib</span>  <a href="glossaries-extra-manual.html#dx1-33005" >612</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\csGlsXtrLetField</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40025" ><span +href="glossaries-extra-manual.html#dx1-40026" ><span class="cmti-10">613</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\CustomAbbreviationFields</span></span></span>  <a @@ -20946,7 +20949,7 @@ href="glossaries-extra-manual.html#dx1-17041" ><span class="cmti-10">617</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\eGlsXtrSetField</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40022" ><span +href="glossaries-extra-manual.html#dx1-40023" ><span class="cmti-10">618</span></a> <br /></span> <span class="index-item">entry location  <a href="glossaries-extra-manual.html#dx1-49005" ><span @@ -20962,11 +20965,11 @@ href="glossaries-extra-manual.html#dx1-6" >623</a>, <a href="glossaries-extra-manual.html#dx1-27132" >624</a>, <a href="glossaries-extra-manual.html#dx1-30010" >625</a>, <a href="glossaries-extra-manual.html#dx1-40019" >626</a>, <a -href="glossaries-extra-manual.html#dx1-40034" >627</a>, <a -href="glossaries-extra-manual.html#dx1-40039" >628</a>, <a -href="glossaries-extra-manual.html#dx1-40040" >629</a>, <a -href="glossaries-extra-manual.html#dx1-40049" >630</a>, <a -href="glossaries-extra-manual.html#dx1-40051" >631</a> <br /></span> +href="glossaries-extra-manual.html#dx1-40035" >627</a>, <a +href="glossaries-extra-manual.html#dx1-40040" >628</a>, <a +href="glossaries-extra-manual.html#dx1-40041" >629</a>, <a +href="glossaries-extra-manual.html#dx1-40050" >630</a>, <a +href="glossaries-extra-manual.html#dx1-40052" >631</a> <br /></span> </p><p class="theindex"> <span class="cmbx-10">F</span> <span class="index-item"><span @@ -21056,7 +21059,7 @@ href="glossaries-extra-manual.html#dx1-17040" ><span class="cmti-10">695</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\gGlsXtrSetField</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40021" ><span +href="glossaries-extra-manual.html#dx1-40022" ><span class="cmti-10">696</span></a> <br /></span> <span class="index-item"><span class="cmss-10">glossaries </span>package  <a @@ -21070,8 +21073,8 @@ href="glossaries-extra-manual.html#dx1-14003" >703</a>, <a href="glossaries-extra-manual.html#dx1-14004" >704</a>, <a href="glossaries-extra-manual.html#dx1-27031" >705</a>, <a href="glossaries-extra-manual.html#dx1-36044" >706</a>, <a -href="glossaries-extra-manual.html#dx1-40037" >707</a>, <a -href="glossaries-extra-manual.html#dx1-40053" >708</a>, <a +href="glossaries-extra-manual.html#dx1-40038" >707</a>, <a +href="glossaries-extra-manual.html#dx1-40054" >708</a>, <a href="glossaries-extra-manual.html#dx1-41010" >709</a> <br /></span> <span class="index-item"><span class="cmss-10">glossaries-accsupp </span>package  <a @@ -21372,7 +21375,7 @@ href="glossaries-extra-manual.html#dx1-15022" ><span class="cmti-10">828</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glscurrentfieldvalue</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40029" ><span +href="glossaries-extra-manual.html#dx1-40030" ><span class="cmti-10">829</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsentrycurrcount</span></span></span>  <a @@ -22043,7 +22046,7 @@ href="glossaries-extra-manual.html#dx1-6020" ><span class="cmti-10">1006</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtredeffield</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40020" ><span +href="glossaries-extra-manual.html#dx1-40021" ><span class="cmti-10">1007</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtremsuffix</span></span></span>  <a @@ -22083,7 +22086,7 @@ href="glossaries-extra-manual.html#dx1-38037" ><span class="cmti-10">1016</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrendfor</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40055" ><span +href="glossaries-extra-manual.html#dx1-40056" ><span class="cmti-10">1017</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrentryfmt</span></span></span>  <a @@ -22091,31 +22094,31 @@ href="glossaries-extra-manual.html#dx1-40008" ><span class="cmti-10">1018</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrfielddolistloop</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40045" ><span +href="glossaries-extra-manual.html#dx1-40046" ><span class="cmti-10">1019</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrfieldforlistloop</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40046" ><span +href="glossaries-extra-manual.html#dx1-40047" ><span class="cmti-10">1020</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrfieldifinlist</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40047" ><span +href="glossaries-extra-manual.html#dx1-40048" ><span class="cmti-10">1021</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrfieldlistadd</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40041" ><span +href="glossaries-extra-manual.html#dx1-40042" ><span class="cmti-10">1022</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrfieldlisteadd</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40043" ><span +href="glossaries-extra-manual.html#dx1-40044" ><span class="cmti-10">1023</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrfieldlistgadd</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40042" ><span +href="glossaries-extra-manual.html#dx1-40043" ><span class="cmti-10">1024</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrfieldlistxadd</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40044" ><span +href="glossaries-extra-manual.html#dx1-40045" ><span class="cmti-10">1025</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrfieldtitlecasecs</span></span></span>  <a @@ -22123,7 +22126,7 @@ href="glossaries-extra-manual.html#dx1-27099" ><span class="cmti-10">1026</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrfieldxifinlist</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40048" ><span +href="glossaries-extra-manual.html#dx1-40049" ><span class="cmti-10">1027</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrfmt</span></span></span>  <a @@ -22151,7 +22154,7 @@ href="glossaries-extra-manual.html#dx1-24151" ><span class="cmti-10">1033</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrforcsvfield</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40050" ><span +href="glossaries-extra-manual.html#dx1-40051" ><span class="cmti-10">1034</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\GlsXtrFormatLocationList</span></span></span>  <a @@ -22278,19 +22281,19 @@ href="glossaries-extra-manual.html#dx1-8034" ><span class="cmti-10">1064</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\GlsXtrIfFieldEqStr</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40033" ><span +href="glossaries-extra-manual.html#dx1-40034" ><span class="cmti-10">1065</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\GlsXtrIfFieldUndef</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40032" ><span +href="glossaries-extra-manual.html#dx1-40033" ><span class="cmti-10">1066</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrifhasfield</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40028" ><span +href="glossaries-extra-manual.html#dx1-40029" ><span class="cmti-10">1067</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrifhasfield*</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40030" ><span +href="glossaries-extra-manual.html#dx1-40031" ><span class="cmti-10">1068</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrifkeydefined</span></span></span>  <a @@ -22453,11 +22456,11 @@ href="glossaries-extra-manual.html#dx1-36093" ><span class="cmti-10">1107</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\GlsXtrLetField</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40024" ><span +href="glossaries-extra-manual.html#dx1-40025" ><span class="cmti-10">1108</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\GlsXtrLetFieldToField</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40026" ><span +href="glossaries-extra-manual.html#dx1-40027" ><span class="cmti-10">1109</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\GlsXtrLinkCounterName</span></span></span>  <a @@ -22779,7 +22782,7 @@ href="glossaries-extra-manual.html#dx1-38011" ><span class="cmti-10">1188</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\GlsXtrRecordCounter</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40057" ><span +href="glossaries-extra-manual.html#dx1-40058" ><span class="cmti-10">1189</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrrecordtriggervalue</span></span></span>  <a @@ -22982,11 +22985,11 @@ href="glossaries-extra-manual.html#dx1-25040" ><span class="cmti-10">1239</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\Glsxtrusefield</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40038" ><span +href="glossaries-extra-manual.html#dx1-40039" ><span class="cmti-10">1240</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtrusefield</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40036" ><span +href="glossaries-extra-manual.html#dx1-40037" ><span class="cmti-10">1241</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsxtruserfield</span></span></span>  <a @@ -23454,7 +23457,7 @@ href="glossaries-extra-manual.html#dx1-33025" >1568</a>, <a href="glossaries-extra-manual.html#dx1-42002" >1569</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">symbol</span>  <a -href="glossaries-extra-manual.html#dx1-40031" >1570</a>, <a +href="glossaries-extra-manual.html#dx1-40032" >1570</a>, <a href="glossaries-extra-manual.html#dx1-46030" >1571</a>, <a href="glossaries-extra-manual.html#dx1-46032" >1572</a>, <a href="glossaries-extra-manual.html#dx1-5041" >1573</a> <br /></span> @@ -23695,7 +23698,7 @@ href="glossaries-extra-manual.html#dx1-33018" >1707</a>, <a href="glossaries-extra-manual.html#dx1-33032" >1708</a>, <a href="glossaries-extra-manual.html#dx1-36002" >1709</a>, <a href="glossaries-extra-manual.html#dx1-36010" >1710</a>, <a -href="glossaries-extra-manual.html#dx1-40056" >1711</a>, <a +href="glossaries-extra-manual.html#dx1-40057" >1711</a>, <a href="glossaries-extra-manual.html#dx1-41031" >1712</a>, <a href="glossaries-extra-manual.html#dx1-48008" >1713</a> <br /></span> <span class="index-subsubitem">        <span @@ -24037,8 +24040,8 @@ class="cmbx-10">X</span> <span class="index-item"><span class="cmss-10">xfor </span>package  <a href="glossaries-extra-manual.html#dx1-9" >1846</a>, <a -href="glossaries-extra-manual.html#dx1-40052" >1847</a>, <a -href="glossaries-extra-manual.html#dx1-40054" >1848</a> <br /></span> +href="glossaries-extra-manual.html#dx1-40053" >1847</a>, <a +href="glossaries-extra-manual.html#dx1-40055" >1848</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\xglssetwidest</span></span></span>  <a href="glossaries-extra-manual.html#dx1-17038" ><span @@ -24049,7 +24052,7 @@ href="glossaries-extra-manual.html#dx1-17042" ><span class="cmti-10">1850</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\xGlsXtrSetField</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-40023" ><span +href="glossaries-extra-manual.html#dx1-40024" ><span class="cmti-10">1851</span></a> <br /></span> <span class="index-item"><span class="cmtt-10">xindy</span>  <a @@ -24139,7 +24142,12 @@ class="cmr-8">. The </span><span class="cmtt-8">.glstex </span><span class="cmr-8">extension was enforced by version</span> <span -class="cmr-8">1.11.</span></p> </div> +class="cmr-8">1.11.</span></p> +<!--l. 8600--><p class="indent" > <span class="footnote-mark"><a +href="#fn1x10-bk" id="fn1x10"><sup class="textsuperscript">10.1</sup></a></span><span +class="cmr-8">Pre version 1.28 used </span><span +class="cmtt-8">\csedef</span><span +class="cmr-8">.</span></p> </div> </body></html> diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf Binary files differindex 689f44b2d8d..40fcabfe0d2 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex index d78e8c13ec8..45bded9ecae 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex +++ b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex @@ -226,13 +226,13 @@ styles (glossaries):>#1={\protect\ttfamily#1}|main}} \DeleteShortVerb{\|} \MakeShortVerb{"} - \title{glossaries-extra.sty v1.27: + \title{glossaries-extra.sty v1.28: an extension to the glossaries package} \author{Nicola L.C. Talbot\\[10pt] Dickimaw Books\\ \url{http://www.dickimaw-books.com/}} - \date{2018-02-26} + \date{2018-03-06} \maketitle \begin{abstract} @@ -8596,7 +8596,8 @@ skip the existence check. Alternatively you can instead use \end{definition} This simply uses \sty{etoolbox}'s \cs{csdef} without any checks. This command isn't robust. There is also a version that uses -\cs{csedef} instead: +\cs{protected@csedef} instead:\footnote{Pre version 1.28 used +\cs{csedef}.} \begin{definition}[\DescribeMacro\glsxtredeffield] \cs{glsxtredeffield}\marg{label}\marg{field}\meta{arguments}\marg{replacement text} \end{definition} diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.pdf Binary files differindex 7dc070f43f0..867ecb71713 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf Binary files differindex 361c8f9700d..c7a8b2721f8 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf Binary files differindex 2f09fc38c90..5dcbd0c4d6d 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf Binary files differindex cec39031e77..06901082274 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf Binary files differindex b0e711e7538..213ffd39bb4 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf Binary files differindex 8fdca527bb4..59b00a0d0d9 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf Binary files differindex af3ce4c5d9d..70b09b2d8bb 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf Binary files differindex a1aa7e9be4b..87051b155a8 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf Binary files differindex 03e51d6f110..9746ec1c040 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf Binary files differindex e4643a65631..0dcd4f8a094 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf Binary files differindex 54d3dae2009..cc96e40d71f 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf Binary files differindex 3c54d472a2c..75780c4cae2 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf Binary files differindex 0e9a8e32829..32d28fa5f4c 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf Binary files differindex 5f359585fed..9469f87ed1a 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf Binary files differindex d489f5b50c8..87080463116 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf Binary files differindex fd9e2dbdc8a..73262de2d25 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf Binary files differindex 36080627aa8..26e79c423e0 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf Binary files differindex 96127853953..221c9a5b575 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf Binary files differindex f7af3d46e02..627e767e786 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf Binary files differindex 5583a41597a..f323c512021 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf Binary files differindex 5648d56ca69..98dbb49f60f 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf Binary files differindex 5153e29e32c..d52d106a4eb 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-linkcount.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-linkcount.pdf Binary files differindex 1557ba3f891..dce08bb0bb0 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-linkcount.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-linkcount.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf Binary files differindex 93cb1f906b1..86f0977aaed 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf Binary files differindex ea320eb1c6f..d77c71071f2 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf Binary files differindex b409b288b9f..e5c38b80218 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf Binary files differindex 2c718ce18c9..c00c1741b2a 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf Binary files differindex f0972aa0514..33fdf57f994 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.pdf Binary files differindex 07c413d4656..5507c4f3f0e 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf Binary files differindex 794fd623d0c..07c3e13367e 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf Binary files differindex dc21acc922a..f6ebe4dca69 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf Binary files differindex a6b2e59753b..3b24715da63 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf Binary files differindex 8e4d0d44020..19d96be327e 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf Binary files differindex 0daa36c292d..5994859697f 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf Binary files differindex 45680004149..49ba4ad4021 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf Binary files differindex 70654fb0264..ad36d01931a 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf Binary files differindex a1b3ebfed3e..09d8c596966 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf Binary files differindex 2ec4937d86c..b01764df7f2 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf Binary files differindex 4ed49ae3bd1..d9a53b8b396 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf Binary files differindex a1624b4c071..8ff3079f8cf 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf Binary files differindex 7a3bff8a6f1..b49b2ecbe79 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf Binary files differindex 3c118866908..13e2138473c 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf Binary files differindex 439ef6f3f44..85476ddbd1e 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf Binary files differindex 16af2e2dbd2..eed8cb0a6e6 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf Binary files differindex b8bc6dc0279..e8d474aee7b 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf Binary files differindex 042e9d664cf..e865d4ad1f8 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf Binary files differindex e0ed483900c..22489bca87c 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf diff --git a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx index aeebd5cc020..bdcc4aed7e8 100644 --- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx +++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx @@ -1,10 +1,8 @@ %\iffalse % glossaries-extra.dtx generated using makedtx version 1.2 (c) Nicola Talbot % Command line args: -% -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})" -% -doc "glossaries-extra-codedoc.tex" -% -section "chapter" -% -author "Nicola Talbot" +% -macrocode ".*\.tex" +% -macrocode ".*\.bib" % -src "glossaries-extra.sty\Z=>glossaries-extra.sty" % -src "glossaries-extra-bib2gls.sty\Z=>glossaries-extra-bib2gls.sty" % -src "glossaries-extra-stylemods.sty\Z=>glossaries-extra-stylemods.sty" @@ -12,12 +10,14 @@ % -src "(example-glossaries-.+\.tex)\Z=>\1" % -src "(example-glossaries-.+\.bib)\Z=>\1" % -setambles ".*\.bib=>\nopreamble\nopostamble" -% -macrocode ".*\.tex" -% -macrocode ".*\.bib" % -comment ".*\.tex" % -comment ".*\.bib" +% -doc "glossaries-extra-codedoc.tex" +% -author "Nicola Talbot" +% -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})" +% -section "chapter" % glossaries-extra -% Created on 2018/2/26 21:37 +% Created on 2018/3/6 23:39 %\fi %\iffalse %<*package> @@ -127,7 +127,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \setcounter{IndexColumns}{2} -\CheckSum{22518} +\CheckSum{22519} \newcommand*{\ifirstuse}{\iterm{first use}} \newcommand*{\firstuse}{\gls{firstuse}} @@ -167,13 +167,13 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \raggedright } -\title{glossaries-extra.sty v1.27: +\title{glossaries-extra.sty v1.28: documented code} \author{Nicola L.C. Talbot\\[10pt] Dickimaw Books\\ \url{http://www.dickimaw-books.com/}} -\date{2018-02-26} +\date{2018-03-06} \begin{document} \DocInput{glossaries-extra.dtx} @@ -218,7 +218,7 @@ Dickimaw Books\\ %\section{Package Initialisation and Options} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra}[2018/02/26 v1.27 (NLCT)] +\ProvidesPackage{glossaries-extra}[2018/03/06 v1.28 (NLCT)] % \end{macrocode} % Requires \sty{xkeyval} to define package options. % \begin{macrocode} @@ -360,10 +360,11 @@ Dickimaw Books\\ %\end{macro} % % \begin{macrocode} -\define@choicekey{glossaries-extra.sty}{undefaction}[\val\nr]% +\define@choicekey{glossaries-extra.sty}{undefaction}% + [\glsxtr@undefaction@val\glsxtr@undefaction@nr]% {warn,error}% {% - \ifcase\nr\relax + \ifcase\glsxtr@undefaction@nr\relax \let\glsxtrundefaction\@glsxtr@warn@undefaction \let\glsxtr@warnonexistsordo\@glsxtr@warn@onexistsordo \let\@glsxtr@redef@forglsentries\@glsxtr@do@redef@forglsentries @@ -776,12 +777,12 @@ Dickimaw Books\\ %Now define the \pkgopt{record} package option. %\changes{1.08}{2016-12-13}{added \pkgopt{record} package option} % \begin{macrocode} -\define@choicekey{glossaries-extra.sty}{record}[\val\nr]% +\define@choicekey{glossaries-extra.sty}{record} + [\@glsxtr@record@setting\glsxtr@record@nr]% {off,only,alsoindex}% [only]% {% - \let\@glsxtr@record@setting\val - \ifcase\nr\relax + \ifcase\glsxtr@record@nr\relax % \end{macrocode} %Don't record. % \begin{macrocode} @@ -862,8 +863,9 @@ Dickimaw Books\\ %\changes{1.06}{2016-06-18}{new} %The \pkgopt{docdef} value is stored as an integer: 0 (false), 1 %(true) and 2 (restricted). +%\changes{1.28}{2018-03-06}{changed from count register to macro} % \begin{macrocode} -\newcount\@glsxtr@docdefval +\newcommand*{\@glsxtr@docdefval}{0} % \end{macrocode} %\end{macro} % @@ -875,12 +877,12 @@ Dickimaw Books\\ %\end{macro} %\begin{macro}{\@glsxtrdocdeftrue} % \begin{macrocode} -\newcommand*{\@glsxtrdocdeftrue}{\@glsxtr@docdefval=1 } +\newcommand*{\@glsxtrdocdeftrue}{\def\@glsxtr@docdefval{1}} % \end{macrocode} %\end{macro} %\begin{macro}{\@glsxtrdocdeffalse} % \begin{macrocode} -\newcommand*{\@glsxtrdocdeffalse}{\@glsxtr@docdefval=0 } +\newcommand*{\@glsxtrdocdeffalse}{\def\@glsxtr@docdefval{0}} % \end{macrocode} %\end{macro} % @@ -890,10 +892,10 @@ Dickimaw Books\\ % is really determined to define them in the document allow them to % request this. % \begin{macrocode} -\define@choicekey{glossaries-extra.sty}{docdef}[\val\nr]% +\define@choicekey{glossaries-extra.sty}{docdef} + [\@glsxtr@docdefsetting\@glsxtr@docdefval]% {false,true,restricted}[true]% {% - \@glsxtr@docdefval=\nr\relax \ifnum\@glsxtr@docdefval=2\relax \renewcommand*{\@glsdoifexistsorwarn}{\glsdoifexists}% \fi @@ -1235,10 +1237,10 @@ Dickimaw Books\\ %\cs{GlsXtrDefineAcShortcuts} (not included in %\pkgopt[all]{shortcuts} as it conflicts with other shortcuts). % \begin{macrocode} -\define@choicekey{glossaries-extra.sty}{shortcuts}[\val\nr]% +\define@choicekey{glossaries-extra.sty}{shortcuts}% + [\@glsxtr@shortcutsval\@glsxtr@shortcutsnr]% {acronyms,acro,abbreviations,abbr,other,all,true,ac,none,false}[true]{% - \let\@glsxtr@shortcutsval\val - \ifcase\nr\relax % acronyms + \ifcase\@glsxtr@shortcutsnr\relax % acronyms \renewcommand*{\@glsxtr@setupshortcuts}{% \glsacrshortcutstrue \DefineAcronymSynonyms @@ -1329,12 +1331,11 @@ Dickimaw Books\\ % If true, suppress the text produced if the external glossary file % is missing. % \begin{macrocode} -\define@choicekey{glossaries-extra.sty}{nomissingglstext}[\val\nr]% +\define@choicekey{glossaries-extra.sty}{nomissingglstext} + [\@glsxtr@nomissingglstextval\@glsxtr@nomissingglstextnr]% {true,false}[true]{% - \ifcase\nr\relax % true - \renewcommand{\glsxtrNoGlossaryWarning}[1]{% - \null - }% + \ifcase\@glsxtr@nomissingglstextnr\relax % true + \renewcommand{\glsxtrNoGlossaryWarning}[1]{\null}% \else % false \renewcommand{\glsxtrNoGlossaryWarning}[1]{% \@glsxtr@defaultnoglossarywarning{#1}% @@ -1456,9 +1457,10 @@ Dickimaw Books\\ %\changes{1.21}{2017-11-03}{new} % Provide extra debug options. % \begin{macrocode} -\define@choicekey{glossaries-extra.sty}{debug}[\val\nr]% +\define@choicekey{glossaries-extra.sty}{debug} + [\@glsxtr@debugval\@glsxtr@debugnr]% {true,false,showtargets,showwrgloss,all}[true]{% - \ifcase\nr\relax % true + \ifcase\@glsxtr@debugnr\relax % true \glsxtr@dooption{debug=true}% \renewcommand*{\@glsxtrwrglossmark}{}% \or % false @@ -2131,8 +2133,10 @@ Dickimaw Books\\ %\begin{macro}{\glsxtredeffield} %\changes{1.12}{2017-02-03}{new} %Just use \cs{csedef} to provide a field value for the given entry. +%\changes{1.28}{2018-03-06}{changed \cs{csedef} to +%\cs{protected@csedef}} % \begin{macrocode} -\newcommand*{\glsxtredeffield}[2]{\csedef{glo@\glsdetoklabel{#1}@#2}} +\newcommand*{\glsxtredeffield}[2]{\protected@csedef{glo@\glsdetoklabel{#1}@#2}} % \end{macrocode} %\end{macro} % @@ -3915,9 +3919,11 @@ Dickimaw Books\\ % Define a \gloskey[glslink]{wrgloss} key to determine whether to % write the glossary information before or after the link text. % \begin{macrocode} -\define@choicekey{glslink}{wrgloss}[\val\nr]{before,after}% +\define@choicekey{glslink}{wrgloss}% +[\@glsxtr@wrglossval\@glsxtr@wrglossnr]% +{before,after}% {% - \ifcase\nr\relax + \ifcase\@glsxtr@wrglossnr\relax \glsxtrinitwrglossbeforetrue \or \glsxtrinitwrglossbeforefalse @@ -7722,8 +7728,11 @@ Dickimaw Books\\ %Add a key that switches off the entry targets: %\changes{1.12}{2017-02-03}{added target key to printgloss family} % \begin{macrocode} -\define@choicekey{printgloss}{target}[\val\nr]{true,false}[true]{% - \ifcase\nr +\define@choicekey{printgloss}{target} +[\@glsxtr@printglossval\@glsxtr@printglossnr]% +{true,false}[true]% +{% + \ifcase\@glsxtr@printglossnr \let\@glstarget\glsdohypertarget \else \let\@glstarget\@secondoftwo @@ -7964,11 +7973,12 @@ Dickimaw Books\\ %\begin{macro}{\glsxtrsetgrouptitle} %\changes{1.14}{2017-04-18}{new} %Sets the title for the given group label. +%\changes{1.28}{2018-03-06}{changed \cs{csxdef} \cs{protected@csxdef}} % \begin{macrocode} \newcommand{\glsxtrsetgrouptitle}[2]{% \protected@edef\@glsxtr@titlelabel{glsxtr@grouptitle@#1}% \@onelevel@sanitize\@glsxtr@titlelabel - \csxdef{\@glsxtr@titlelabel}{#2}% + \protected@csxdef{\@glsxtr@titlelabel}{#2}% } % \end{macrocode} %\end{macro} @@ -7976,11 +7986,12 @@ Dickimaw Books\\ %\begin{macro}{\glsxtrlocalsetgrouptitle} %\changes{1.24}{2017-11-14}{new} %As above put only locally defines the title. +%\changes{1.28}{2018-03-06}{changed \cs{csedef} \cs{protected@csedef}} % \begin{macrocode} \newcommand{\glsxtrlocalsetgrouptitle}[2]{% \protected@edef\@glsxtr@titlelabel{glsxtr@grouptitle@#1}% \@onelevel@sanitize\@glsxtr@titlelabel - \csedef{\@glsxtr@titlelabel}{#2}% + \protected@csedef{\@glsxtr@titlelabel}{#2}% } % \end{macrocode} %\end{macro} @@ -11741,7 +11752,7 @@ defined}{}% % \end{macrocode} %\end{macro} % -%\begin{macro}{\glsxtrautoindexsort} +%\begin{macro}{\glsxtrautoindexassignsort} %\changes{1.16}{2017-06-15}{new} %Used to assign the sort value when auto-indexing. % \begin{macrocode} @@ -21120,7 +21131,7 @@ defined}{}% %automatically loaded by the record option. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-bib2gls}[2018/02/26 v1.27 (NLCT)] +\ProvidesPackage{glossaries-extra-bib2gls}[2018/03/06 v1.28 (NLCT)] % \end{macrocode} % %These are some convenient macros for use with custom rules. @@ -23301,7 +23312,9 @@ defined}{}% % \end{macrocode} %\end{macro} % +%\begin{macro}{\@glsxtrdialecthook} %Check for scripts associated with the document dialects. +%\changes{1.28}{2018-03-06}{save and restore \cs{TrackLangRequireDialectPrefix}} % \begin{macrocode} \renewcommand{\@glsxtrdialecthook}{% \ifundef\CurrentTrackedScript @@ -23316,14 +23329,18 @@ defined}{}% {}% \ifdef\CurrentTrackedScript {% + \let\gls@orgTrackLangRequireDialectPrefix\TrackLangRequireDialectPrefix + \def\TrackLangRequireDialectPrefix{glossariesxtr-}% \let\CurrentTrackedTag\CurrentTrackedScript \IfFileExists{\TrackLangRequireDialectPrefix\CurrentTrackedTag.ldf} {\RequireGlossariesExtraLang{\CurrentTrackedTag}}% {}% + \let\TrackLangRequireDialectPrefix\gls@orgTrackLangRequireDialectPrefix }% {}% } % \end{macrocode} +%\end{macro} %If \cs{glsxtr@loaddialect} has been defined, then %\sty{glossaries-extra-bib2gls} has been loaded after %\sty{glossaries-extra}. (For example, through @@ -23363,7 +23380,7 @@ defined}{}% % First identify package: % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-stylemods}[2018/02/26 v1.27 (NLCT)] +\ProvidesPackage{glossaries-extra-stylemods}[2018/03/06 v1.28 (NLCT)] % \end{macrocode} % Provide package options to automatically load required predefined % styles. The simplest method is to just test for the existence of @@ -25420,7 +25437,7 @@ defined}{}% %\section{Package Initialisation and Options} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-bookindex}[2018/02/26 v1.27 (NLCT)] +\ProvidesPackage{glossary-bookindex}[2018/03/06 v1.28 (NLCT)] % \end{macrocode} %Load required packages. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins index 5be521b6253..aca8e50b65c 100644 --- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins +++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins @@ -1,4 +1,4 @@ -% glossaries-extra.ins generated using makedtx version 1.2 2018/2/26 21:37 +% glossaries-extra.ins generated using makedtx version 1.2 2018/3/6 23:39 \input docstrip \preamble diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty index 508f3d9a557..25caee9c2f5 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-bib2gls}[2018/02/26 v1.27 (NLCT)] +\ProvidesPackage{glossaries-extra-bib2gls}[2018/03/06 v1.28 (NLCT)] \newcommand*{\glshex}{\string\u} \newcommand*{\glsxtrprovidecommand}{\providecommand} \providecommand*{\Alpha}{\mathrm{A}} @@ -1269,10 +1269,13 @@ {}% \ifdef\CurrentTrackedScript {% + \let\gls@orgTrackLangRequireDialectPrefix\TrackLangRequireDialectPrefix + \def\TrackLangRequireDialectPrefix{glossariesxtr-}% \let\CurrentTrackedTag\CurrentTrackedScript \IfFileExists{\TrackLangRequireDialectPrefix\CurrentTrackedTag.ldf} {\RequireGlossariesExtraLang{\CurrentTrackedTag}}% {}% + \let\TrackLangRequireDialectPrefix\gls@orgTrackLangRequireDialectPrefix }% {}% } diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty index cc1a9518e1b..934ebf19961 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-stylemods}[2018/02/26 v1.27 (NLCT)] +\ProvidesPackage{glossaries-extra-stylemods}[2018/03/06 v1.28 (NLCT)] \newcommand*{\@glsxtr@loadstyles}{} \DeclareOption{all}{% \appto\@glsxtr@loadstyles{% diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty index c7dd6d4acaa..4e62d174a71 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra}[2018/02/26 v1.27 (NLCT)] +\ProvidesPackage{glossaries-extra}[2018/03/06 v1.28 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{etoolbox} \@ifpackageloaded{glossaries} @@ -101,10 +101,11 @@ }% }% }% -\define@choicekey{glossaries-extra.sty}{undefaction}[\val\nr]% +\define@choicekey{glossaries-extra.sty}{undefaction}% + [\glsxtr@undefaction@val\glsxtr@undefaction@nr]% {warn,error}% {% - \ifcase\nr\relax + \ifcase\glsxtr@undefaction@nr\relax \let\glsxtrundefaction\@glsxtr@warn@undefaction \let\glsxtr@warnonexistsordo\@glsxtr@warn@onexistsordo \let\@glsxtr@redef@forglsentries\@glsxtr@do@redef@forglsentries @@ -296,12 +297,12 @@ \newcommand*{\@glsxtr@record@setting@alsoindex}{alsoindex} \newcommand*{\@glsxtr@record@setting@only}{only} \newcommand*{\@glsxtr@record@setting@off}{off} -\define@choicekey{glossaries-extra.sty}{record}[\val\nr]% +\define@choicekey{glossaries-extra.sty}{record} + [\@glsxtr@record@setting\glsxtr@record@nr]% {off,only,alsoindex}% [only]% {% - \let\@glsxtr@record@setting\val - \ifcase\nr\relax + \ifcase\glsxtr@record@nr\relax \def\glsxtr@setup@record{% \renewcommand*{\@do@seeglossary}{\@glsxtr@doseeglossary}% \renewcommand*{\@glsxtr@record}[3]{}% @@ -345,14 +346,14 @@ }% \fi } -\newcount\@glsxtr@docdefval +\newcommand*{\@glsxtr@docdefval}{0} \newcommand*{\if@glsxtrdocdef}{\ifnum\@glsxtr@docdefval>0 } -\newcommand*{\@glsxtrdocdeftrue}{\@glsxtr@docdefval=1 } -\newcommand*{\@glsxtrdocdeffalse}{\@glsxtr@docdefval=0 } -\define@choicekey{glossaries-extra.sty}{docdef}[\val\nr]% +\newcommand*{\@glsxtrdocdeftrue}{\def\@glsxtr@docdefval{1}} +\newcommand*{\@glsxtrdocdeffalse}{\def\@glsxtr@docdefval{0}} +\define@choicekey{glossaries-extra.sty}{docdef} + [\@glsxtr@docdefsetting\@glsxtr@docdefval]% {false,true,restricted}[true]% {% - \@glsxtr@docdefval=\nr\relax \ifnum\@glsxtr@docdefval=2\relax \renewcommand*{\@glsdoifexistsorwarn}{\glsdoifexists}% \fi @@ -516,10 +517,10 @@ } \newcommand*{\@glsxtr@setupshortcuts}{} \newcommand*{\@glsxtr@shortcutsval}{\ifglsacrshortcuts acro\else none\fi}% -\define@choicekey{glossaries-extra.sty}{shortcuts}[\val\nr]% +\define@choicekey{glossaries-extra.sty}{shortcuts}% + [\@glsxtr@shortcutsval\@glsxtr@shortcutsnr]% {acronyms,acro,abbreviations,abbr,other,all,true,ac,none,false}[true]{% - \let\@glsxtr@shortcutsval\val - \ifcase\nr\relax % acronyms + \ifcase\@glsxtr@shortcutsnr\relax % acronyms \renewcommand*{\@glsxtr@setupshortcuts}{% \glsacrshortcutstrue \DefineAcronymSynonyms @@ -570,12 +571,11 @@ \newcommand{\glsxtrNoGlossaryWarning}[1]{% \@glsxtr@defaultnoglossarywarning{#1}% } -\define@choicekey{glossaries-extra.sty}{nomissingglstext}[\val\nr]% +\define@choicekey{glossaries-extra.sty}{nomissingglstext} + [\@glsxtr@nomissingglstextval\@glsxtr@nomissingglstextnr]% {true,false}[true]{% - \ifcase\nr\relax % true - \renewcommand{\glsxtrNoGlossaryWarning}[1]{% - \null - }% + \ifcase\@glsxtr@nomissingglstextnr\relax % true + \renewcommand{\glsxtrNoGlossaryWarning}[1]{\null}% \else % false \renewcommand{\glsxtrNoGlossaryWarning}[1]{% \@glsxtr@defaultnoglossarywarning{#1}% @@ -629,9 +629,10 @@ \newcommand*{\@@glsxtrwrglossmark}{} \AtBeginDocument{\renewcommand*{\@@glsxtrwrglossmark}{\@glsxtrwrglossmark}} \newcommand*{\glsxtrwrglossmark}{\ensuremath{\cdot}} -\define@choicekey{glossaries-extra.sty}{debug}[\val\nr]% +\define@choicekey{glossaries-extra.sty}{debug} + [\@glsxtr@debugval\@glsxtr@debugnr]% {true,false,showtargets,showwrgloss,all}[true]{% - \ifcase\nr\relax % true + \ifcase\@glsxtr@debugnr\relax % true \glsxtr@dooption{debug=true}% \renewcommand*{\@glsxtrwrglossmark}{}% \or % false @@ -889,7 +890,7 @@ \@gls@entry@field{#1}{#2}% } \newcommand*{\glsxtrdeffield}[2]{\csdef{glo@\glsdetoklabel{#1}@#2}} -\newcommand*{\glsxtredeffield}[2]{\csedef{glo@\glsdetoklabel{#1}@#2}} +\newcommand*{\glsxtredeffield}[2]{\protected@csedef{glo@\glsdetoklabel{#1}@#2}} \newcommand*{\glsxtrsetfieldifexists}[3]{\glsdoifexists{#1}{#3}} \newrobustcmd*{\GlsXtrSetField}[3]{% \glsxtrsetfieldifexists{#1}{#2}% @@ -1806,9 +1807,11 @@ } \newif\ifglsxtrinitwrglossbefore \glsxtrinitwrglossbeforetrue -\define@choicekey{glslink}{wrgloss}[\val\nr]{before,after}% +\define@choicekey{glslink}{wrgloss}% +[\@glsxtr@wrglossval\@glsxtr@wrglossnr]% +{before,after}% {% - \ifcase\nr\relax + \ifcase\@glsxtr@wrglossnr\relax \glsxtrinitwrglossbeforetrue \or \glsxtrinitwrglossbeforefalse @@ -3800,8 +3803,11 @@ \def\@glsxtr@printglossopts{#1}% \@glsxtr@orgprintglossary{#1}{#2}% } -\define@choicekey{printgloss}{target}[\val\nr]{true,false}[true]{% - \ifcase\nr +\define@choicekey{printgloss}{target} +[\@glsxtr@printglossval\@glsxtr@printglossnr]% +{true,false}[true]% +{% + \ifcase\@glsxtr@printglossnr \let\@glstarget\glsdohypertarget \else \let\@glstarget\@secondoftwo @@ -3934,12 +3940,12 @@ \newcommand{\glsxtrsetgrouptitle}[2]{% \protected@edef\@glsxtr@titlelabel{glsxtr@grouptitle@#1}% \@onelevel@sanitize\@glsxtr@titlelabel - \csxdef{\@glsxtr@titlelabel}{#2}% + \protected@csxdef{\@glsxtr@titlelabel}{#2}% } \newcommand{\glsxtrlocalsetgrouptitle}[2]{% \protected@edef\@glsxtr@titlelabel{glsxtr@grouptitle@#1}% \@onelevel@sanitize\@glsxtr@titlelabel - \csedef{\@glsxtr@titlelabel}{#2}% + \protected@csedef{\@glsxtr@titlelabel}{#2}% } \renewcommand*{\glsnavigation}{% \def\@gls@between{}% diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty index c19a916f187..0269a636744 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-bookindex}[2018/02/26 v1.27 (NLCT)] +\ProvidesPackage{glossary-bookindex}[2018/03/06 v1.28 (NLCT)] \RequirePackage{multicol} \RequirePackage{glossary-tree} \newcommand{\glsxtrbookindexcols}{2} |