From 4fa439e0226fee506c74cf2b08d8e666a1d497db Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 7 Mar 2018 21:47:52 +0000 Subject: glossaries-extra (7mar18) git-svn-id: svn://tug.org/texlive/trunk@46871 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/glossaries-extra/CHANGES | 11 + .../texmf-dist/doc/latex/glossaries-extra/README | 4 +- .../glossaries-extra/glossaries-extra-code.pdf | Bin 1109549 -> 1108112 bytes .../glossaries-extra/glossaries-extra-manual.html | 734 +++++++++++---------- .../glossaries-extra/glossaries-extra-manual.pdf | Bin 651390 -> 650993 bytes .../glossaries-extra/glossaries-extra-manual.tex | 7 +- .../latex/glossaries-extra/sample-abbr-styles.pdf | Bin 512950 -> 512950 bytes .../doc/latex/glossaries-extra/sample-abbrv.pdf | Bin 44749 -> 44749 bytes .../doc/latex/glossaries-extra/sample-accsupp.pdf | Bin 80745 -> 80745 bytes .../latex/glossaries-extra/sample-acronym-desc.pdf | Bin 50358 -> 50358 bytes .../doc/latex/glossaries-extra/sample-acronym.pdf | Bin 36734 -> 36734 bytes .../doc/latex/glossaries-extra/sample-alias.pdf | Bin 43863 -> 43863 bytes .../latex/glossaries-extra/sample-altmodifier.pdf | Bin 35296 -> 35296 bytes .../glossaries-extra/sample-alttree-marginpar.pdf | Bin 91049 -> 91118 bytes .../latex/glossaries-extra/sample-alttree-sym.pdf | Bin 69519 -> 69554 bytes .../doc/latex/glossaries-extra/sample-alttree.pdf | Bin 54855 -> 54855 bytes .../glossaries-extra/sample-autoindex-hyp.pdf | Bin 142288 -> 139473 bytes .../latex/glossaries-extra/sample-autoindex.pdf | Bin 161729 -> 161395 bytes .../doc/latex/glossaries-extra/sample-crossref.pdf | Bin 41281 -> 41281 bytes .../latex/glossaries-extra/sample-crossref2.pdf | Bin 41603 -> 41603 bytes .../doc/latex/glossaries-extra/sample-docdef.pdf | Bin 45245 -> 45245 bytes .../latex/glossaries-extra/sample-entrycount.pdf | Bin 54610 -> 54610 bytes .../doc/latex/glossaries-extra/sample-external.pdf | Bin 55773 -> 55773 bytes .../doc/latex/glossaries-extra/sample-fmt.pdf | Bin 97551 -> 97551 bytes .../doc/latex/glossaries-extra/sample-footnote.pdf | Bin 63220 -> 63220 bytes .../doc/latex/glossaries-extra/sample-header.pdf | Bin 125899 -> 125899 bytes .../latex/glossaries-extra/sample-indexhook.pdf | Bin 42711 -> 42711 bytes .../latex/glossaries-extra/sample-initialisms.pdf | Bin 81603 -> 81603 bytes .../latex/glossaries-extra/sample-linkcount.pdf | Bin 38222 -> 38222 bytes .../glossaries-extra/sample-mixed-abbrv-styles.pdf | Bin 57809 -> 57809 bytes .../latex/glossaries-extra/sample-mixedsort.pdf | Bin 45141 -> 45141 bytes .../doc/latex/glossaries-extra/sample-mixture.pdf | Bin 160173 -> 159826 bytes .../latex/glossaries-extra/sample-name-font.pdf | Bin 202082 -> 202082 bytes .../doc/latex/glossaries-extra/sample-nested.pdf | Bin 67724 -> 67675 bytes .../sample-noidx-restricteddocdefs.pdf | Bin 47572 -> 47572 bytes .../doc/latex/glossaries-extra/sample-onelink.pdf | Bin 44514 -> 25018 bytes .../glossaries-extra/sample-onthefly-utf8.pdf | Bin 106058 -> 106058 bytes .../glossaries-extra/sample-onthefly-xetex.pdf | Bin 19861 -> 19862 bytes .../doc/latex/glossaries-extra/sample-onthefly.pdf | Bin 43469 -> 43469 bytes .../doc/latex/glossaries-extra/sample-pages.pdf | Bin 38788 -> 38788 bytes .../doc/latex/glossaries-extra/sample-postdot.pdf | Bin 37047 -> 37047 bytes .../doc/latex/glossaries-extra/sample-postlink.pdf | Bin 67878 -> 67878 bytes .../doc/latex/glossaries-extra/sample-prefix.pdf | Bin 33107 -> 33107 bytes .../doc/latex/glossaries-extra/sample-record.pdf | Bin 48035 -> 48035 bytes .../glossaries-extra/sample-restricteddocdefs.pdf | Bin 47883 -> 47883 bytes .../latex/glossaries-extra/sample-suppl-hyp.pdf | Bin 34931 -> 34931 bytes .../glossaries-extra/sample-suppl-main-hyp.pdf | Bin 46388 -> 46388 bytes .../latex/glossaries-extra/sample-suppl-main.pdf | Bin 31596 -> 31596 bytes .../doc/latex/glossaries-extra/sample-suppl.pdf | Bin 13411 -> 13411 bytes .../doc/latex/glossaries-extra/sample-trans.pdf | Bin 49443 -> 49443 bytes .../doc/latex/glossaries-extra/sample-undef.pdf | Bin 33219 -> 33219 bytes .../glossaries-extra/sample-unitentrycount.pdf | Bin 61040 -> 60476 bytes .../doc/latex/glossaries-extra/sample.pdf | Bin 45734 -> 45734 bytes .../latex/glossaries-extra/glossaries-extra.dtx | 101 +-- .../latex/glossaries-extra/glossaries-extra.ins | 2 +- .../glossaries-extra/glossaries-extra-bib2gls.sty | 5 +- .../glossaries-extra-stylemods.sty | 2 +- .../latex/glossaries-extra/glossaries-extra.sty | 62 +- .../latex/glossaries-extra/glossary-bookindex.sty | 2 +- 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 index 81a79231f4b..6a32aee68af 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf differ 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;} >

glossaries-extra.sty v1.27: an extension to the +class="cmr-17">glossaries-extra.sty v1.28: an extension to the glossaries package

@@ -241,7 +241,7 @@ href="http://www.dickimaw-books.com/" class="url" >http://www.dickimaw-books.com/

2018-02-26

+class="cmr-12">2018-03-06

@@ -17237,13 +17237,16 @@ class="cmtt-10">}

This simply uses etoolbox’s \csdef without any checks. This command isn’t robust. -There is also a version that uses \csedef instead: -


\csdef without any checks. This command +isn’t robust. There is also a version that uses \protected@csedef +instead:10.1 +


\glsxtredeffield  \glsxtredeffield{label}{replacement text}

-

-


+


\gGlsXtrSetField  \gGlsXtrSetField{label}{field}{value}

-

+

As \GlsXtrSetField but globally. -



\eGlsXtrSetField  \eGlsXtrSetField{label}{field}{value}

-

+

As \GlsXtrSetField but uses protected expansion. -



\xGlsXtrSetField  \xGlsXtrSetField{label}{field}{value}

-

+

As \gGlsXtrSetField but uses protected expansion. -



\GlsXtrLetField  \GlsXtrLetField{label}{field}{cs}

-

+

Sets the field given by ⟨field⟩ to the replacement text of ⟨cs⟩ for the entry given by ⟨label⟩ (using \let). -



\csGlsXtrLetField  \csGlsXtrLetField{label}{}{cs name}

-

+

As \GlsXtrLetField but the control sequence name is supplied instead. -



\GlsXtrLetFieldToField  \GlsXtrLetFieldToField{label-1}{label-2}{field-2}

-

+

Sets the field given by ⟨field-1⟩ for the entry given by ⟨label-1⟩ to the field given by @@ -17364,19 +17367,19 @@ class="cmti-10">code⟩} is still used, as for \GlsXtrSetField. -

The

The glossaries package provides \ifglshasfield to determine if a field has been + id="dx1-40028"> to determine if a field has been set. The glossaries-extra package provides a simpler version: -



\glsxtrifhasfield  \glsxtrifhasfield{field}{}{false}

-

+

(New to v1.19.) Note that in this case the ⟨field⟩ must be the internal field label (for @@ -17404,20 +17407,20 @@ class="cmti-10">true⟩ part is done otherwise it does ⟨false⟩. Within ⟨true⟩ you may use -



\glscurrentfieldvalue  \glscurrentfieldvalue

-

+

to access the field value. This command includes grouping which scopes the ⟨true⟩ and ⟨false⟩ parts. The starred version -



\glsxtrifhasfield*  \glsxtrifhasfield*{field}{}{false}

-

+

omits the implicit grouping. -

Be careful of keys that use

Be careful of keys that use \relax as the default value (such as the symbol). Use + id="dx1-40032">). Use \ifglshassymbol instead.
-

-

There is also a version that simply uses

+

There is also a version that simply uses \ifcsundef. 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: -



\GlsXtrIfFieldUndef  \GlsXtrIfFieldUndef{field}{}{false}

-

-

There’s a difference between an undefined field and an unset field. An undefined +

+

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. \GlsXtrIfFieldUndef for fields that can only be defined through commands like \GlsXtrSetField.
-

-

You can test if a field value equals a string using -


+

You can test if a field value equals a string using +


\GlsXtrIfFieldEqStr  \GlsXtrIfFieldEqStr{field}{} class="cmtt-10">{false}

-

+

If the entry exists and has the given field set to the given text then this does ⟨true⟩ otherwise it does ⟨\glscurrentfieldvalue with ⟨text⟩ using etoolbox’s ’s \ifdefstring. -

The

The glossaries package provides \glsfieldfetch which can be used to fetch the + id="dx1-40036"> which can be used to fetch the value of the given field and store it in a control sequence. The glossaries-extra package provides another way of accessing the field value: -



\glsxtrusefield  \glsxtrusefield{entry-label}{field-label}

-

+

This works in the same way as commands like \glsentrytext but the field label is specified in the first argument. Note that the ⟨field-label⟩ corresponds to the internal field tag, which isn’t always the same as the key name. See Table 4.1 of the glossaries + id="dx1-40038"> manual. No error occurs if the entry or field haven’t been defined. This command is not robust. -

There is also a version that converts the first letter to uppercase (analogous to +

There is also a version that converts the first letter to uppercase (analogous to \Glsentrytext): -



\Glsxtrusefield  \Glsxtrusefield{entry-label}{field-label}

-

-

If you want to use a field to store a list that can be used as an

+

If you want to use a field to store a list that can be used as an etoolbox internal + id="dx1-40040"> internal list, you can use the following command that adds an item to the field using etoolbox’s ’s \listcsadd: -



\glsxtrfieldlistadd  \glsxtrfieldlistadd{label}{}{item}

-

+

where ⟨label⟩ is the entry’s label, ⟨field⟩ is the entry’s field and ⟨\listgadd, \listeadd and \listxadd: -



\glsxtrfieldlistgadd  \glsxtrfieldlistgadd{label}{}{item}

-

-


+


\glsxtrfieldlisteadd  \glsxtrfieldlisteadd{label}{}{item}

-

-


+


\glsxtrfieldlistxadd  \glsxtrfieldlistxadd{label}{}{item}

-

+

You can then iterate over the list using: -



\glsxtrfielddolistloop  \glsxtrfielddolistloop{label}{field}

-

+

or -



\glsxtrfieldforlistloop  \glsxtrfieldforlistloop{label}{} class="cmtt-10">{handler}

-

+

that internally use \dolistcsloop and \forlistloop, respectively. -

There are also commands that use

There are also commands that use \ifinlistcs: -



\glsxtrfieldifinlist  \glsxtrfieldifinlist{label}{} class="cmtt-10">{false}

-

+

and \xifinlistcs -



\glsxtrfieldxifinlist  \glsxtrfieldxifinlist{label}{true}{false}

-

-

See the

+

See the etoolbox’s user manual for further details of these commands, in particular + id="dx1-40050">’s user manual for further details of these commands, in particular the limitations of \ifinlist. -

If the field has a comma-separated list value instead, you can iterate over it +

If the field has a comma-separated list value instead, you can iterate over it using: -



\glsxtrforcsvfield  \glsxtrforcsvfield{label}{}{handler}

-

+

where again ⟨handler⟩ is a control sequence that takes a single argument. Unlike the etoolbox loops, this doesn’t ignore empty elements nor does it discard leading / + id="dx1-40052"> loops, this doesn’t ignore empty elements nor does it discard leading / trailing spaces. Internally it uses \@for (modified by xfor which is automatically + id="dx1-40053"> which is automatically loaded by glossaries). The ). The xfor package modifies the behaviour of package modifies the behaviour of \@for to allow the loop to be broken prematurely using \@endfortrue. The \glsxtrforcsvfield command locally defines a user level command: -



\glsxtrendfor  \glsxtrendfor

-

+

which is just a synonym for \@endfortrue. -

The loop is performed within the true part of

The loop is performed within the true part of \glsxtrifhasfield so scoping is automatically applied. -

When using the

When using the record option, in addition to recording the usual location, you can + id="dx1-40057"> 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: -



\GlsXtrRecordCounter  \GlsXtrRecordCounter{counter name}

-

+

For example: @@ -17763,7 +17766,7 @@ For example: \usepackage[record]{glossaries-extra}  
\GlsXtrRecordCounter{section}

-

Each time an entry is referenced with commands like

Each time an entry is referenced with commands like \gls or \glstext, the \gls{bird} is used in section 1.2 th

\glsxtrfieldlistgadd{bird}{record.section}{1.2}
-

Note that there’s no key corresponding to this new

Note that there’s no key corresponding to this new record.section field, but its value can be accessed with \glsxtrfielduse or the list can be iterated over with \glsxtrfielddolistloop etc. -

+

-

Top

10.2 Display All Entries Without Sorting or Indexing

-



\printunsrtglossary  \printunsrtglossary[options]

-

+

This behaves like \printnoidxglossary 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 \glsgroupskip to avoid the “Incomplete \iftrue” error that may otherwise occur. -

There’s also a starred form -


There’s also a starred form +


\printunsrtglossary*  options]{code}

-

+

which is equivalent to

\endgroup class="cmtt-10">\glossarypreamble, the supplied ⟨code⟩ is done before the glossary header. -

This means you now have the option to simply list all entries on the first +

This means you now have the option to simply list all entries on the first LATEX run without the need for a post-processor, however there will be no §9 bib2gls: Managing Reference Databases). -

No attempt is made to gather hierarchical elements. If child entries aren’t defined +

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 \printunsrtglossary.
-

+

-

If you have any entries with the

If you have any entries with the see key set, you will need the glossariesrecord=only package option will automatically deal with this. -

For example: +

For example: @@ -17931,32 +17934,32 @@ will automatically deal with this.  
\printunsrtglossaries  
\end{document}

-

In the above, zebra will be listed before ant as it was defined first. -

If you allow document definitions with the

In the above, zebra will be listed before ant as it was defined first. +

If you allow document definitions with the docdefs option, the document will require a second LATEX run if the entries are defined after \printunsrtglossary. -

The optional argument is as for

The optional argument is as for \printnoidxglossary (except for the sort key, which isn’t available). -

All glossaries may be displayed in the order of their definition using: -


All glossaries may be displayed in the order of their definition using: +


\printunsrtglossaries  \printunsrtglossaries

-

+

which is analogous to \printnoidxglossaries. This just iterates over all defined glossaries (that aren’t on the ignored list) and does \printunsrtglossary[type=⟨type⟩]. -

To avoid complications caused by

To avoid complications caused by tabular-like glossary styles,



\printunsrtglossaryentryprocesshook  \printunsrtglossaryentryprocesshook class="cmtt-10">{⟨label}

-

+

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: -



\printunsrtglossaryskipentry  \printunsrtglossaryskipentry

-

+

to skip the current entry. This will prevent the entry from being added to the internal command. -

There’s another hook immediately before the internal command containing the +

There’s another hook immediately before the internal command containing the glossary code is performed: -



\printunsrtglossarypredoglossary  \printunsrtglossarypredoglossary

-

+

-

The internal command uses -


The internal command uses +


\printunsrtglossaryhandler  \printunsrtglossaryhandler{label}

-

+

to display each item in the list, where ⟨label⟩ is the current label. -

By default the handler just does -


By default the handler just does +


\glsxtrunsrtdo  \glsxtrunsrtdo{label}

-

+

which determines whether to use \glossentry or \subglossentry and checks the @@ -18028,10 +18031,10 @@ class="cmss-10">loclist fields for the number list. -

You can redefine the handler if required. For example, you may want to filter +

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: -



\glsxtriflabelinlist  } class="cmtt-10">{⟨false}

-

+

The ⟨label⟩ and ⟨label list⟩ will be fully expanded. -

If you redefine the handler to exclude entries, you may end up with an empty +

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.
-

-

For example, if the preamble includes: +

+

For example, if the preamble includes: @@ -18062,7 +18065,7 @@ glossary. This could cause a problem for the list-based styles.

\usepackage[record,style=index]{glossaries-extra}  
\GlsXtrRecordCounter{section}
-

then you can print the glossary but first redefine the handler to only select entries +

then you can print the glossary but first redefine the handler to only select entries that include the current section number in the record.section field: @@ -18076,8 +18079,8 @@ class="cmtt-10">record.section field:  
  {}%  
}

-

-

Alternatively you can use the starred form of

+

Alternatively you can use the starred form of \printunsrtglossary which will localise the change: @@ -18093,8 +18096,8 @@ localise the change:  
  }%  
}

-

-

If you are using the

+

If you are using the hyperref package and want to display the same glossary more than once, you can also add a temporary redefinition of   }%  
}

-

Note that this will cause a problem if your descriptions contain commands like

Note that this will cause a problem if your descriptions contain commands like \gls 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:  
  }%  
}

-

-

If it’s a short summary at the start of a section, you might also want to suppress +

+

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:  
  \appto\glossarypostamble{\glspar\medskip\glspar}%  
}

-

-

There’s a shortcut command that essentially does this: -


+

There’s a shortcut command that essentially does this: +


\printunsrtglossaryunit  counter name}

-

+

The above example can simply be replaced with: @@ -18191,11 +18194,11 @@ The above example can simply be replaced with:

\printunsrtglossaryunit{section}
-

-

This shortcut command is actually defined to use

+

This shortcut command is actually defined to use \printunsrtglossary* with -



\printunsrtglossaryunitsetup  counter name}

-

+

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  
  \renewcommand*{\glossarysection}[2][]{\subsection*{Summary}}%  
}

-

which will start the list with a subsection header with the title “Summary” +

which will start the list with a subsection header with the title “Summary” (overriding the glossary’s title). -

Note that this shortcut command is only available with the

Note that this shortcut command is only available with the record (or @@ -18226,7 +18229,7 @@ href="#styopt.record">record=alsoindex) package option. -

This temporary change in the hypertarget prefix means you need to explicitly use +

This temporary change in the hypertarget prefix means you need to explicitly use \hyperlink to create a link to it as commands like \gls 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 \printunsrtglossaryunit for a quick summary at the start of a section etc. -

+

-

Top

10.3 Standalone Entry Items

-

It may be that you don’t want a list but would rather display entry details +

It may be that you don’t want a list but would rather display entry details throughout the document. You can simply do \glsentryname followed by  \par\medskip  
}

-

define your entries +

define your entries @@ -18278,7 +18281,7 @@ custom command:  
  description={a relation or expression involving variables}  
}

-

and then later in the text: +

and then later in the text: @@ -18286,25 +18289,25 @@ custom command:

\displayterm{function}
-

-

However, if may be that you want to use

+

However, if may be that you want to use hyperref and have commands like \gls link back to the place where the term is described. Instead of using \glsentryname use -



\glsxtrglossentry  \glsxtrglossentry{label}

-

+

where ⟨label⟩ is the entry’s label. -

This is designed to behave much like the way the name is displayed in the +

This is designed to behave much like the way the name is displayed in the glossary. It performs the following:

-

otherwise it does

+

otherwise it does

  • \glsentryitem{glossnamefont

    If you have used

    If you have used \nopostdesc or \glsxtrnopostpunc in any of your description fields, you can use -



    \glsxtractivatenopost  \glsxtractivatenopost

    -

    +

    to make these commands behave as they normally do within a glossary. This needs to be placed before

    @@ -18386,10 +18389,10 @@ class="cmtt-10">}\glspostdescription class="cmtt-10">\glsnonextpages and \glsnextpages have no effect outside of the glossary and are not intended for use in a standalone context. -

    It’s also possible to select a different field (rather than using

    It’s also possible to select a different field (rather than using name): -



    \glsxtrglossentryother  }{field}

    -

    +

    The ⟨field⟩ 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 }.

  • Otherwise ⟨header⟩ is simply the field value.
-

The

The \glsxtrglossentryother command internally uses \glossentrynameother{label}

(for example, \glssymbolaccessdisplay). -

This means that my custom command can be changed to: +

This means that my custom command can be changed to: @@ -18469,7 +18472,7 @@ class="cmtt-10">\glssymbolaccessdisplay).  
 \par\medskip  
}

-

If I want numbered definitions, then I can use the package options

If I want numbered definitions, then I can use the package options entrycounter or subentrycounter \par\medskip  
}

-

The counter label uses a dot after the number by default but this can be changed to +

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:

\renewcommand*{\glsentrycounterlabel}{\theglossaryentry:\space}
-

It’s now possible to not only use

It’s now possible to not only use \gls to link back to the definition but also use \glsrefentry to reference the counter and \glsxtrpageref to reference the page number. -

If I want the description to behave more like it does in a glossary in need to make +

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:  
 \par\medskip  
}

-

(Note the grouping to localise

(Note the grouping to localise \glsxtractivatenopost.) -

You can also use

You can also use \glsxtrglossentry within section headings. For example: @@ -18530,7 +18533,7 @@ class="cmtt-10">\glsxtrglossentry within section headings. For example:

\section{\glsxtrglossentry{function}}
-

This will use

This will use \glsentryname in PDF bookmarks (if \texorpdfstring is defined) and will use \@glsxtrnotinmark and \glsxtrrestoremarkhook.) -

+

-

Top

10.4 Entry Aliases

-

An entry can be made an alias of another entry using the

An entry can be made an alias of another entry using the alias 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">bib2gls.) -

If an entry ⟨

If an entry ⟨entry-1⟩ is made an alias of ⟨entry-2⟩ then:

-

The index suppression trigger is performed by -


The index suppression trigger is performed by +


\glsxtrsetaliasnoindex  \glsxtrsetaliasnoindex

-

+

This is performed after the default options provided by \GlsXtrSetDefaultGlsOpts @@ -18652,17 +18655,17 @@ class="cmss-10">=only, \glsxtrsetaliasnoindex will default to do nothing. -

Within the definition of

Within the definition of \glsxtrsetaliasnoindex you can use -



\glsxtrindexaliased  \glsxtrindexaliased

-

+

to index ⟨entry-2⟩. -

The index suppression command can be redefined to index the main term instead. +

The index suppression command can be redefined to index the main term instead. For example: @@ -18674,27 +18677,27 @@ For example:  
 \setkeys{glslink}{noindex}%  
}

-

-

The value of the

+

The value of the alias field can be accessed using -



\glsxtralias  \glsxtralias{label}

-

+

-

-

+

Top

11. Supplemental Packages

-

The

The glossaries bundle provides additional support packages glossaries-prefix (for @@ -18703,10 +18706,10 @@ class="cmss-10">glossaries-accsupp (for accessibility support). These packages aren’t automatically loaded.

-

Top

11.1 Prefixes or Determiners

-

If prefixing is required, you can simply load

If prefixing is required, you can simply load glossaries-prefix after glossaries-extra. For @@ -18730,13 +18733,13 @@ example:  
\printglossaries  
\end{document}

-

-

+

+

-

Top

11.2 Accessibility Support

-

The

The glossaries-accsupp package needs to be loaded before glossaries-extra or through @@ -18751,7 +18754,7 @@ class="cmss-10">accsupp \usepackage[accsupp]{glossaries-extra}

-

If you don’t load

If you don’t load glossaries-accsupp or you load glossaries-accsuppxxx⟩ commands described below will simply be equiv corresponding \glsentryxxx⟩ commands. -

The following

The following \glsaccessxxx⟩ commands add accessibility information wrapped around the corresponding \glsentryxxx⟩ commands. There is no check for existence of the entry nor do any of these commands add formatting, hyperlinks or indexing information. -



\glsaccessname  \glsaccessname{label}

-

+

This displays the value of the name field for the entry identified by ⟨label⟩. -

If the

If the glossaries-accsupp package isn’t loaded, this is simply defined as: @@ -18793,7 +18796,7 @@ class="cmss-10">glossaries-accsupp \newcommand*{\glsaccessname}[1]{\glsentryname{#1}}

-

otherwise it’s defined as: +

otherwise it’s defined as: @@ -18807,20 +18810,20 @@ class="cmss-10">glossaries-accsupp  {#1}%  
}

-

(

(\glsnameaccessdisplay is defined by the glossaries-accsupp package.) The first letter upper case version is: -



\Glsaccessname  \Glsaccessname{label}

-

+

Without the glossaries-accsupp package this is just defined as: @@ -18831,7 +18834,7 @@ class="cmss-10">glossaries-accsupp \newcommand*{\Glsaccessname}[1]{\Glsentryname{#1}}

-

With the

With the glossaries-accsupp package this is defined as: @@ -18847,112 +18850,112 @@ class="cmss-10">glossaries-accsupp  {#1}%  
}

-

-

The following commands are all defined in an analogous manner. -


+

The following commands are all defined in an analogous manner. +


\glsaccesstext  \glsaccesstext{label}

-

+

This displays the value of the text field. -



\Glsaccesstext  \Glsaccesstext{label}

-

+

This displays the value of the text field with the first letter converted to upper case. -



\glsaccessplural  \glsaccessplural{label}

-

+

This displays the value of the plural field. -



\Glsaccessplural  \Glsaccessplural{label}

-

+

This displays the value of the plural field with the first letter converted to upper case. -



\glsaccessfirst  \glsaccessfirst{label}

-

+

This displays the value of the first field. -



\Glsaccessfirst  \Glsaccessfirst{label}

-

+

This displays the value of the first field with the first letter converted to upper case. -



\glsaccessfirstplural  \glsaccessfirstplural{label}

-

+

This displays the value of the firstplural field. -



\Glsaccessfirstplural  \Glsaccessfirstplural{label}

-

+

This displays the value of the firstplural field with the first letter converted to upper case. -



\glsaccesssymbol  \glsaccesssymbol{label}

-

+

This displays the value of the symbol field. -



\Glsaccesssymbol  }

-

+

This displays the value of the symbol field with the first letter converted to upper case. -



\glsaccesssymbolplural  \glsaccesssymbolplural{label}

-

+

This displays the value of the symbolplural field. -



\Glsaccesssymbolplural  \Glsaccesssymbolplural{label}

-

+

This displays the value of the symbolplural field with the first letter converted to upper case. -



\glsaccessdesc  \glsaccessdesc{label}

-

+

This displays the value of the desc field. -



\Glsaccessdesc  \Glsaccessdesc{label}

-

+

This displays the value of the desc field with the first letter converted to upper case. -



\glsaccessdescplural  \glsaccessdescplural{label}

-

+

This displays the value of the descplural field. -



\Glsaccessdescplural  \Glsaccessdescplural{label}

-

+

This displays the value of the descplural field with the first letter converted to upper case. -



\glsaccessshort  \glsaccessshort{label}

-

+

This displays the value of the short field. -



\Glsaccessshort  \Glsaccessshort{label}

-

+

This displays the value of the short field with the first letter converted to upper case. -



\glsaccessshortpl  \glsaccessshortpl{label}

-

+

This displays the value of the shortplural field. -



\Glsaccessshortpl  \Glsaccessshortpl{label}

-

+

This displays the value of the shortplural field with the first letter converted to upper case. -



\glsaccesslong  \glsaccesslong{label}

-

+

This displays the value of the long field. -



\Glsaccesslong  \Glsaccesslong{label}

-

+

This displays the value of the long field with the first letter converted to upper case. -



\glsaccesslongpl  }

-

+

This displays the value of the longplural field. -



\Glsaccesslongpl  \Glsaccesslongpl{label}

-

+

This displays the value of the longplural field with the first letter converted to upper @@ -19135,11 +19138,11 @@ case.

-

-

+

Top

12. Sample Files

-

The following sample files are provided with this package: +

The following sample files are provided with this package:

sample.tex
sample-suppl-hyp.tex. -

-

+

Top

-

-

Alternatively you can use the

+

Alternatively you can use the title key when you print the list of abbreviations. For example: @@ -19485,7 +19488,7 @@ For example:

\printabbreviations[title={List of Abbreviations}]
-

or +

or @@ -19493,10 +19496,10 @@ For example:

\printglossary[type=abbreviations,title={List of Abbreviations}]
-

-

The other fixed text commands are the diagnostic messages, which shouldn’t +

+

The other fixed text commands are the diagnostic messages, which shouldn’t appear in the final draft of your document. -

The

The glossaries-extra package has the facility to load language modules (whose filename is in the form glossariesxtr-Latn, 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. -

If you want to write your own language module, you just need to create a file +

If you want to write your own language module, you just need to create a file called glossariesxtr-langtracklang package). For example, glossariesxtr-french.ldf. -

The simplest code for this file is: +

The simplest code for this file is: @@ -19557,8 +19560,8 @@ class="cmtt-10">glossariesxtr-french.ldf.  
  {}%  
}

-

-

You can adapt this for other languages by replacing all instances of the language +

+

You can adapt this for other languages by replacing all instances of the language identifier french and the translated text Abr\’eviations as appropriate. You can @@ -19574,16 +19577,16 @@ class="cmsy-10">§9.3 The glossaries-extra-bib2gls package for further details. -

This

This .ldf file then needs to be put somewhere on TEX’s path so that it can be found by glossaries-extra. 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.) -

If you additionally want to provide translations for the diagnostic messages used +

If you additionally want to provide translations for the diagnostic messages used when a glossary is missing, you need to redefine the following commands: -



\GlsXtrNoGlsWarningHead  }{file}

-

+

This produces the following text in English:

-

This document is incomplete. The external file associated with the +

This document is incomplete. The external file associated with the glossary ‘⟨label⟩’ (which should be called ⟨file⟩) hasn’t been created.

-



\GlsXtrNoGlsWarningEmptyStart  \GlsXtrNoGlsWarningEmptyStart

-

+

This produces the following text in English:

-

This has probably happened because there are no entries defined in +

This has probably happened because there are no entries defined in this glossary.

-



\GlsXtrNoGlsWarningEmptyMain  \GlsXtrNoGlsWarningEmptyMain

-

+

This produces the following text in English:

-

If you don’t want this glossary, add

If you don’t want this glossary, add nomain to your package option list when you load glossaries-extra.sty. For example:

-



\GlsXtrNoGlsWarningEmptyNotMain  \GlsXtrNoGlsWarningEmptyNotMain{label}

-

+

This produces the following text in English:

-

Did you forget to use

Did you forget to use type=label⟩ when you defined your entries? If you tried to load entries into this glossary with ] as the optional argument? If you did, check that the definitions in the file you loaded all had the type set to \glsdefaulttype.

-



\GlsXtrNoGlsWarningCheckFile  \GlsXtrNoGlsWarningCheckFile{file}

-

+

This produces the following text in English:

-

Check the contents of the file ⟨

Check the contents of the file ⟨file⟩. If it’s empty, that means you haven’t indexed any of your entries in this glossary (using commands like \gls or \glsadd) so this list can’t be generated. If the file isn’t empty, the document build process hasn’t been completed.

-



\GlsXtrNoGlsWarningMisMatch  \GlsXtrNoGlsWarningMisMatch

-

+

This produces the following text in English:

-

You need +

You need to either replace \makenoidxglossaries with \makeglossaries or @@ -19688,17 +19691,17 @@ class="cmtt-10">\printglossaries) class="cmtt-10">\printnoidxglossary (or \printnoidxglossaries) and then rebuild this document.

-



\GlsXtrNoGlsWarningNoOut  \GlsXtrNoGlsWarningNoOut{file}

-

+

This produces the following text in English:

-

The file ⟨

The file ⟨file⟩ doesn’t exist. This most likely means you haven’t used \makeglossaries or you have used \nofiles. If this is just a draft version of the document, you can suppress this message using the nomissingglstext package option.

-



\GlsXtrNoGlsWarningTail  \GlsXtrNoGlsWarningTail

-

+

This produces the following text in English:

-

This message will be removed once the problem has been fixed.

-


This message will be removed once the problem has been fixed.

+


\GlsXtrNoGlsWarningBuildInfo  \GlsXtrNoGlsWarningBuildInfo

-

+

This is advice on how to generate the glossary files. See the documented code (glossaries-extra-code.pdf) for further details. -



\GlsXtrNoGlsWarningAutoMake  \GlsXtrNoGlsWarningAutoMake{label}

-

+

This is the message produced when the automakeconvertgls2bib  612
\csGlsXtrLetField  613
\CustomAbbreviationFields  617
\eGlsXtrSetField  618
entry location  623, 624, 625, 626, 627, 628, 629, 630, 631
+href="glossaries-extra-manual.html#dx1-40035" >627, 628, 629, 630, 631

F 695
\gGlsXtrSetField  696
glossaries package  703, 704, 705, 706, 707, 708, 707, 708, 709
glossaries-accsupp package  828
\glscurrentfieldvalue  829
\glsentrycurrcount  1006
\glsxtredeffield  1007
\glsxtremsuffix  1016
\glsxtrendfor  1017
\glsxtrentryfmt  1018
\glsxtrfielddolistloop  1019
\glsxtrfieldforlistloop  1020
\glsxtrfieldifinlist  1021
\glsxtrfieldlistadd  1022
\glsxtrfieldlisteadd  1023
\glsxtrfieldlistgadd  1024
\glsxtrfieldlistxadd  1025
\glsxtrfieldtitlecasecs  1026
\glsxtrfieldxifinlist  1027
\glsxtrfmt  1033
\glsxtrforcsvfield  1034
\GlsXtrFormatLocationList  1064
\GlsXtrIfFieldEqStr  1065
\GlsXtrIfFieldUndef  1066
\glsxtrifhasfield  1067
\glsxtrifhasfield*  1068
\glsxtrifkeydefined  1107
\GlsXtrLetField  1108
\GlsXtrLetFieldToField  1109
\GlsXtrLinkCounterName  1188
\GlsXtrRecordCounter  1189
\glsxtrrecordtriggervalue  1239
\Glsxtrusefield  1240
\glsxtrusefield  1241
\glsxtruserfield  1568, 1569
    symbol  1570, 1570, 1571, 1572, 1573
@@ -23695,7 +23698,7 @@ href="glossaries-extra-manual.html#dx1-33018" >1707, 1708, 1709, 1710, 1711, 1711, 1712, 1713
        X xfor package  1846, 1847, 1848
+href="glossaries-extra-manual.html#dx1-40053" >1847, 1848
\xglssetwidest  1850
\xGlsXtrSetField  1851
xindy  . The .glstex extension was enforced by version 1.11.

+class="cmr-8">1.11.

+

10.1Pre version 1.28 used \csedef.

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 index 689f44b2d8d..40fcabfe0d2 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf differ 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 index 7dc070f43f0..867ecb71713 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf index 361c8f9700d..c7a8b2721f8 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf index 2f09fc38c90..5dcbd0c4d6d 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf differ 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 index cec39031e77..06901082274 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf index b0e711e7538..213ffd39bb4 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf index 8fdca527bb4..59b00a0d0d9 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf index af3ce4c5d9d..70b09b2d8bb 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf differ 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 index a1aa7e9be4b..87051b155a8 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf differ 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 index 03e51d6f110..9746ec1c040 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf index e4643a65631..0dcd4f8a094 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf differ 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 index 54d3dae2009..cc96e40d71f 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf index 3c54d472a2c..75780c4cae2 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf index 0e9a8e32829..32d28fa5f4c 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf index 5f359585fed..9469f87ed1a 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf index d489f5b50c8..87080463116 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf index fd9e2dbdc8a..73262de2d25 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf index 36080627aa8..26e79c423e0 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf index 96127853953..221c9a5b575 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf index f7af3d46e02..627e767e786 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf index 5583a41597a..f323c512021 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf index 5648d56ca69..98dbb49f60f 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf index 5153e29e32c..d52d106a4eb 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-linkcount.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-linkcount.pdf index 1557ba3f891..dce08bb0bb0 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-linkcount.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-linkcount.pdf differ 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 index 93cb1f906b1..86f0977aaed 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf index ea320eb1c6f..d77c71071f2 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf index b409b288b9f..e5c38b80218 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf differ 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 index 2c718ce18c9..c00c1741b2a 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf index f0972aa0514..33fdf57f994 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf differ 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 index 07c413d4656..5507c4f3f0e 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf index 794fd623d0c..07c3e13367e 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf differ 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 index dc21acc922a..f6ebe4dca69 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf differ 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 index a6b2e59753b..3b24715da63 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf index 8e4d0d44020..19d96be327e 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf index 0daa36c292d..5994859697f 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf index 45680004149..49ba4ad4021 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf index 70654fb0264..ad36d01931a 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf index a1b3ebfed3e..09d8c596966 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf index 2ec4937d86c..b01764df7f2 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf index 4ed49ae3bd1..d9a53b8b396 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf differ 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 index a1624b4c071..8ff3079f8cf 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf differ 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 index 7a3bff8a6f1..b49b2ecbe79 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf differ 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 index 3c118866908..13e2138473c 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf index 439ef6f3f44..85476ddbd1e 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf index 16af2e2dbd2..eed8cb0a6e6 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf index b8bc6dc0279..e8d474aee7b 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf index 042e9d664cf..e865d4ad1f8 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf differ diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf index e0ed483900c..22489bca87c 100644 Binary files a/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf and b/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf differ 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} -- cgit v1.2.3