From e94d686213b25e06fdc7b227bcb3d7baaf67c06a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 9 Sep 2017 22:34:08 +0000 Subject: glossaries-extra (9sep17) git-svn-id: svn://tug.org/texlive/trunk@45251 c570f23f-e606-0410-a88d-b1316a301751 --- .../example-glossaries-acronym-desc.bib | 102 + .../example-glossaries-acronym.bib | 258 + .../example-glossaries-acronyms-lang.bib | 79 + .../glossaries-extra/example-glossaries-brief.bib | 308 + .../example-glossaries-childnoname.bib | 237 + .../glossaries-extra/example-glossaries-cite.bib | 162 + .../glossaries-extra/example-glossaries-images.bib | 333 + .../glossaries-extra/example-glossaries-long.bib | 133 + .../example-glossaries-multipar.bib | 171 + .../glossaries-extra/example-glossaries-parent.bib | 170 + .../example-glossaries-symbols.bib | 186 + .../glossaries-extra/example-glossaries-url.bib | 104 + .../bib/glossaries-extra/example-glossaries-xr.bib | 342 ++ .../texmf-dist/doc/latex/glossaries-extra/CHANGES | 14 + .../texmf-dist/doc/latex/glossaries-extra/README | 4 +- .../glossaries-extra/glossaries-extra-code.pdf | Bin 927537 -> 931301 bytes .../glossaries-extra/glossaries-extra-manual.html | 6372 ++++++++++---------- .../glossaries-extra/glossaries-extra-manual.pdf | Bin 736072 -> 741612 bytes .../glossaries-extra/glossaries-extra-manual.tex | 142 +- .../latex/glossaries-extra/sample-abbr-styles.pdf | Bin 500436 -> 500436 bytes .../doc/latex/glossaries-extra/sample-abbrv.pdf | Bin 44761 -> 44761 bytes .../doc/latex/glossaries-extra/sample-accsupp.pdf | Bin 80757 -> 80757 bytes .../latex/glossaries-extra/sample-acronym-desc.pdf | Bin 50368 -> 50368 bytes .../doc/latex/glossaries-extra/sample-acronym.pdf | Bin 36745 -> 36745 bytes .../doc/latex/glossaries-extra/sample-alias.pdf | Bin 43611 -> 43611 bytes .../latex/glossaries-extra/sample-altmodifier.pdf | Bin 35308 -> 35308 bytes .../glossaries-extra/sample-alttree-marginpar.pdf | Bin 91061 -> 91061 bytes .../latex/glossaries-extra/sample-alttree-sym.pdf | Bin 69532 -> 69532 bytes .../doc/latex/glossaries-extra/sample-alttree.pdf | Bin 54866 -> 54866 bytes .../glossaries-extra/sample-autoindex-hyp.pdf | Bin 142062 -> 142285 bytes .../latex/glossaries-extra/sample-autoindex.pdf | Bin 161540 -> 161788 bytes .../doc/latex/glossaries-extra/sample-crossref.pdf | Bin 41294 -> 41294 bytes .../latex/glossaries-extra/sample-crossref2.pdf | Bin 41613 -> 41613 bytes .../doc/latex/glossaries-extra/sample-docdef.pdf | Bin 45257 -> 45257 bytes .../latex/glossaries-extra/sample-entrycount.pdf | Bin 54623 -> 54623 bytes .../doc/latex/glossaries-extra/sample-external.pdf | Bin 55786 -> 55786 bytes .../doc/latex/glossaries-extra/sample-fmt.pdf | Bin 75272 -> 97564 bytes .../doc/latex/glossaries-extra/sample-footnote.pdf | Bin 63232 -> 63232 bytes .../doc/latex/glossaries-extra/sample-header.pdf | Bin 125199 -> 125199 bytes .../latex/glossaries-extra/sample-indexhook.pdf | Bin 42722 -> 42722 bytes .../latex/glossaries-extra/sample-initialisms.pdf | Bin 81618 -> 81618 bytes .../glossaries-extra/sample-mixed-abbrv-styles.pdf | Bin 57823 -> 57823 bytes .../latex/glossaries-extra/sample-mixedsort.pdf | Bin 45154 -> 45154 bytes .../doc/latex/glossaries-extra/sample-mixture.pdf | Bin 159971 -> 160222 bytes .../latex/glossaries-extra/sample-name-font.pdf | Bin 202102 -> 202102 bytes .../doc/latex/glossaries-extra/sample-nested.pdf | Bin 67736 -> 67736 bytes .../sample-noidx-restricteddocdefs.pdf | Bin 47582 -> 47582 bytes .../doc/latex/glossaries-extra/sample-onelink.pdf | Bin 44527 -> 44455 bytes .../glossaries-extra/sample-onthefly-utf8.pdf | Bin 106071 -> 106071 bytes .../glossaries-extra/sample-onthefly-xetex.pdf | Bin 19858 -> 19859 bytes .../doc/latex/glossaries-extra/sample-onthefly.pdf | Bin 43481 -> 43481 bytes .../doc/latex/glossaries-extra/sample-pages.pdf | Bin 38801 -> 38801 bytes .../doc/latex/glossaries-extra/sample-postdot.pdf | Bin 37059 -> 37059 bytes .../doc/latex/glossaries-extra/sample-postlink.pdf | Bin 67889 -> 67889 bytes .../doc/latex/glossaries-extra/sample-prefix.pdf | Bin 33119 -> 33119 bytes .../latex/glossaries-extra/sample-record.glstex | 46 + .../doc/latex/glossaries-extra/sample-record.pdf | Bin 49665 -> 49196 bytes .../doc/latex/glossaries-extra/sample-record.tex | 26 +- .../latex/glossaries-extra/sample-resource.glstex | 12 - .../glossaries-extra/sample-restricteddocdefs.pdf | Bin 47895 -> 47895 bytes .../latex/glossaries-extra/sample-suppl-hyp.pdf | Bin 34944 -> 34944 bytes .../latex/glossaries-extra/sample-suppl-hyp.tex | 6 +- .../glossaries-extra/sample-suppl-main-hyp.pdf | Bin 32971 -> 46402 bytes .../glossaries-extra/sample-suppl-main-hyp.tex | 6 + .../latex/glossaries-extra/sample-suppl-main.pdf | Bin 31607 -> 31607 bytes .../doc/latex/glossaries-extra/sample-suppl.pdf | Bin 13423 -> 13423 bytes .../doc/latex/glossaries-extra/sample-trans.pdf | Bin 49455 -> 49455 bytes .../doc/latex/glossaries-extra/sample-undef.pdf | Bin 33231 -> 33231 bytes .../glossaries-extra/sample-unitentrycount.pdf | Bin 61051 -> 61051 bytes .../doc/latex/glossaries-extra/sample.pdf | Bin 45747 -> 45747 bytes .../latex/glossaries-extra/glossaries-extra.dtx | 2459 +++++++- .../latex/glossaries-extra/glossaries-extra.ins | 30 +- .../glossaries-extra/example-glossaries-xr.tex | 2 +- .../glossaries-extra-stylemods.sty | 4 +- .../latex/glossaries-extra/glossaries-extra.sty | 118 +- 75 files changed, 8620 insertions(+), 3206 deletions(-) create mode 100644 Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-acronym-desc.bib create mode 100644 Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-acronym.bib create mode 100644 Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-acronyms-lang.bib create mode 100644 Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-brief.bib create mode 100644 Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-childnoname.bib create mode 100644 Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-cite.bib create mode 100644 Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-images.bib create mode 100644 Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-long.bib create mode 100644 Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-multipar.bib create mode 100644 Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-parent.bib create mode 100644 Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-symbols.bib create mode 100644 Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-url.bib create mode 100644 Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-xr.bib create mode 100644 Master/texmf-dist/doc/latex/glossaries-extra/sample-record.glstex delete mode 100644 Master/texmf-dist/doc/latex/glossaries-extra/sample-resource.glstex (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-acronym-desc.bib b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-acronym-desc.bib new file mode 100644 index 00000000000..20cadcf2a2d --- /dev/null +++ b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-acronym-desc.bib @@ -0,0 +1,102 @@ +%% +%% This is file `example-glossaries-acronym-desc.bib', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries-extra.dtx (with options: `example-glossaries-acronym-desc.bib,package') +%% +%% glossaries-extra.dtx +%% Copyright 2017 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +@acronym{ndl, + description = {fringilla a, euismod sodales, + sollicitudin vel, wisi}, + short = {NDL}, + long = {nam dui ligula} +} + +@acronym{mal, + description = {non justo}, + short = {MAL}, + long = {morbi auctor lorem} +} + +@acronym{nll, + description = {pretium at, lobortis vitae, ultricies et, +tellus}, + short = {NLL}, + long = {name lacus libero} +} + +@acronym{da, + description = {tortor sed accumsan bibendum, erat ligula +aliquet magna, vitae ornare odio metus a mi}, + short = {DA}, + long = {donec aliquet} +} + +@acronym{mao, + description = {et nisl hendrerit mollis}, + short = {MAO}, + long = {morbi ac orci} +} + +@acronym{sum, + description = {cras nec ante}, + short = {SUM}, + long = {suspendisse ut massa} +} + +@acronym{pan, + description = {cum sociis natoque penatibus et magnis dis +parturient montes, nascetur ridiculus mus}, + short = {PAN}, + long = {pellentesque a nulla} +} + +@acronym{atu, + description = {nulla ullamcorper vestibulum +turpis}, + short = {ATU}, + long = {aliquam tincidunt urna} +} + +@acronym{pclm, + description = {nulla malesuada porttitor diam}, + short = {PCLM}, + long = {pellentesque cursus luctus mauris} +} + +\endinput +%% +%% End of file `example-glossaries-acronym-desc.bib'. diff --git a/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-acronym.bib b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-acronym.bib new file mode 100644 index 00000000000..58eb6289d82 --- /dev/null +++ b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-acronym.bib @@ -0,0 +1,258 @@ +%% +%% This is file `example-glossaries-acronym.bib', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries-extra.dtx (with options: `example-glossaries-acronym.bib,package') +%% +%% glossaries-extra.dtx +%% Copyright 2017 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +@acronym{lid, + short = {LID}, + long = {lorem ipsum dolor} +} + +@acronym{stc, + short = {STC}, + long = {sit amet consectetuer} +} + +@acronym{aeu, + short = {AEU}, + long = {adipiscing elit ut} +} + +@acronym{pev, + short = {PEV}, + long = {purus elit vestibulum} +} + +@acronym{upa, + short = {UPA}, + long = {ut placerat ac} +} + +@acronym{avf, + short = {AVF}, + long = {adipiscing vitae felis} +} + +@acronym{cdg, + short = {CDG}, + long = {curabitur dictum gravida} +} + +@acronym{mna, + short = {MNA}, + long = {mauris nam arcu} +} + +@acronym{lne, + short = {LNE}, + long = {libero nonummy eget} +} + +@acronym{civ, + short = {CIV}, + long = {consectetuer id vulputate} +} + +@acronym{amd, + short = {AMD}, + long = {a magna donec} +} + +@acronym{vae, + short = {VAE}, + long = {vehicula augue eu} +} + +@acronym{nph, + short = {NPH}, + long = {neque pellentesque habitant} +} + +@acronym{mts, + short = {MTS}, + long = {morbi tristique senectus} +} + +@acronym{ene, + short = {ENE}, + long = {et netus et} +} + +@acronym{mfa, + short = {MFA}, + long = {malesuada fames ac} +} + +@acronym{tem, + short = {TEM}, + long = {turpis egestas mauris} +} + +@acronym{ulc, + short = {ULC}, + long = {ut leo cras} +} + +@acronym{vmr, + short = {VMR}, + long = {viverra metus rhoncus} +} + +@acronym{sne, + short = {SNE}, + long = {sem nulla et} +} + +@acronym{lvu, + short = {LVU}, + long = {lectus vestibulum urna} +} + +@acronym{fup, + short = {FUP}, + long = {fringilla ultrices phasellus} +} + +@acronym{ets, + short = {ETS}, + long = {eu tellus sit} +} + +@acronym{atg, + short = {ATG}, + long = {amet tortor gravida} +} + +@acronym{pis, + short = {PIS}, + long = {placerat integer sapien} +} + +@acronym{eii, + short = {EII}, + long = {est iaculis in} +} + +@acronym{pqv, + short = {PQV}, + long = {pretium quis viverra} +} + +@acronym{anp, + short = {ANP}, + long = {ac nunc praesent} +} + +@acronym{esv, + short = {ESV}, + long = {eget sem vel} +} + +@acronym{lub, + short = {LUB}, + long = {leo ultrices bibendum} +} + +@acronym{afm, + short = {AFM}, + long = {aenean faucibus morbi} +} + +@acronym{dnm, + short = {DNM}, + long = {dolor nulla malesuada} +} + +@acronym{epa, + short = {EPA}, + long = {eu pulvinar at} +} + +@acronym{man, + short = {MAC}, + long = {mollis ac nulla} +} + +@acronym{cas, + short = {CAS}, + long = {curabitur auctor semper} +} + +@acronym{ndv, + short = {NDV}, + long = {nulla donec varius} +} + +@acronym{oer, + short = {OER}, + long = {orci eget risus} +} + +@acronym{dnmc, + short = {DNMC}, + long = {duis nibh mi congue} +} + +@acronym{cea, + short = {CEA}, + long = {congue eu accumsan} +} + +@acronym{esq, + short = {ESQ}, + long = {eleifend sagittis quis} +} + +@acronym{dia, + short = {DIA}, + long = {duis eget orci} +} + +@acronym{sao, + short = {SAO}, + long = {sit amet orci} +} + +@acronym{drn, + short = {DRN}, + long = {dignissim rutrum nam} +} + +\endinput +%% +%% End of file `example-glossaries-acronym.bib'. diff --git a/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-acronyms-lang.bib b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-acronyms-lang.bib new file mode 100644 index 00000000000..221cbc1d19d --- /dev/null +++ b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-acronyms-lang.bib @@ -0,0 +1,79 @@ +%% +%% This is file `example-glossaries-acronyms-lang.bib', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries-extra.dtx (with options: `example-glossaries-acronyms-lang.bib,package') +%% +%% glossaries-extra.dtx +%% Copyright 2017 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +@acronym{li, + user1 = {love itself}, + short = {LI}, + long = {lorem ipsum} +} + +@acronym{np, + user1 = {produces none}, + short = {NP}, + long = {nulla pariatur} +} + +@acronym{sic, + user1 = {blame belongs}, + short = {SIC}, + long = {sunt in culpa} +} + +@acronym{esoc, + user1 = {blinded by +desire}, + short = {ESOC}, + long = {excepturi sint obcaecati cupiditat} +} + +@acronym{nmruu, + short = {NMRUU}, + long = {nulla malesuada +risus ut urna} +} + +@acronym{di, + short = {DI}, + long = {duis iaculi} +} + +\endinput +%% +%% End of file `example-glossaries-acronyms-lang.bib'. diff --git a/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-brief.bib b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-brief.bib new file mode 100644 index 00000000000..93e671e4935 --- /dev/null +++ b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-brief.bib @@ -0,0 +1,308 @@ +%% +%% This is file `example-glossaries-brief.bib', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries-extra.dtx (with options: `example-glossaries-brief.bib,package') +%% +%% glossaries-extra.dtx +%% Copyright 2017 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +@entry{lorem, + name = {lorem}, + description = {ipsum} +} + +@entry{dolor, + name = {dolor}, + description = {sit} +} + +@entry{amet, + name = {amet}, + description = {consectetuer} +} + +@entry{adipiscing, + name = {adipiscing}, + description = {elit} +} + +@entry{ut, + name = {ut}, + description = {purus} +} + +@entry{elit, + name = {elit}, + description = {vestibulum} +} + +@entry{placerat, + name = {placerat}, + description = {ac} +} + +@entry{vitae, + name = {vitae}, + description = {felis} +} + +@entry{curabitur, + name = {curabitur}, + description = {gravida} +} + +@entry{mauris, + name = {mauris}, + description = {nam} +} + +@entry{arcu, + name = {arcu}, + description = {libero} +} + +@entry{nonummy, + name = {nonummy}, + description = {eget} +} + +@entry{consectetuer, + name = {consectetuer}, + description = {id} +} + +@entry{vulputate, + name = {vulputate}, + description = {a magna} +} + +@entry{donec, + name = {donec}, + description = {vehicula} +} + +@entry{augue, + name = {augue}, + description = {eu neque} +} + +@entry{pellentesque, + name = {pellentesque}, + description = {habitant} +} + +@entry{morbi, + name = {morbi}, + description = {tristique} +} + +@entry{senectus, + name = {senectus}, + description = {et netus} +} + +@entry{et, + name = {et}, + description = {malesuada} +} + +@entry{fames, + name = {fames}, + description = {ac} +} + +@entry{turpis, + name = {turpis}, + description = {egestas} +} + +@entry{leo, + name = {leo}, + description = {cras} +} + +@entry{viverra, + name = {viverra}, + description = {metus} +} + +@entry{rhoncus, + name = {rhoncus}, + description = {sem} +} + +@entry{nulla, + name = {nulla}, + description = {et} +} + +@entry{lectus, + name = {lectus}, + description = {vestibulum} +} + +@entry{urna, + name = {urna}, + description = {fringilla} +} + +@entry{ultrices, + name = {ultrices}, + description = {phasellus} +} + +@entry{eu, + name = {eu}, + description = {tellus} +} + +@entry{sit, + name = {sit}, + description = {amet} +} + +@entry{tortor, + name = {tortor}, + description = {gravida} +} + +@entry{integer, + name = {integer}, + description = {sapien} +} + +@entry{est, + name = {est}, + description = {iaculis} +} + +@entry{in, + name = {in}, + description = {pretium} +} + +@entry{quis, + name = {quis}, + description = {viverra} +} + +@entry{ac, + name = {ac}, + description = {nunc} +} + +@entry{praesent, + name = {praesent}, + description = {eget} +} + +@entry{sem, + name = {sem}, + description = {vel leo} +} + +@entry{bibendum, + name = {bibendum}, + description = {ultrices} +} + +@entry{aenean, + name = {aenean}, + description = {faucibus} +} + +@entry{malesuada, + name = {malesuada}, + description = {eu} +} + +@entry{pulvinar, + name = {pulvinar}, + description = {at} +} + +@entry{mollis, + name = {mollis}, + description = {ac nulla} +} + +@entry{auctor, + name = {auctor}, + description = {semper} +} + +@entry{varius, + name = {varius}, + description = {orci} +} + +@entry{eget, + name = {eget}, + description = {risus} +} + +@entry{duis, + name = {duis}, + description = {nibh} +} + +@entry{mi, + name = {mi}, + description = {congue} +} + +@entry{accumsan, + name = {accumsan}, + description = {eleifend} +} + +@entry{sagittis, + name = {sagittis}, + description = {quis} +} + +@entry{diam, + name = {diam}, + description = {duis} +} + +@entry{orci, + name = {orci}, + description = {dignissim} +} + +\endinput +%% +%% End of file `example-glossaries-brief.bib'. diff --git a/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-childnoname.bib b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-childnoname.bib new file mode 100644 index 00000000000..16db4cdf17c --- /dev/null +++ b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-childnoname.bib @@ -0,0 +1,237 @@ +%% +%% This is file `example-glossaries-childnoname.bib', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries-extra.dtx (with options: `example-glossaries-childnoname.bib,package') +%% +%% glossaries-extra.dtx +%% Copyright 2017 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +@entry{scelerisque, + name = {scelerisque}, + description = {at} +} + +@entry{vestibulum, + parent = {scelerisque}, + description = {eu, nulla} +} + +@entry{utodionisl, + parent = {scelerisque}, + description = {facilisis id} +} + +@entry{molliset, + parent = {scelerisque}, + description = {nec, enim} +} + +@entry{aeneansem, + parent = {scelerisque}, + description = {sem leo} +} + +@entry{pellentesquesit, + parent = {scelerisque}, + description = {sit amet} +} + +@entry{sapien, + parent = {scelerisque}, + description = {vehicula +pellentesque} +} + +@entry{consequat, + parent = {scelerisque}, + description = {tellus +et tortor} +} + +@entry{uttempor, + name = {ut tempor}, + description = {laoreet +quam} +} + +@entry{nullamid, + parent = {uttempor}, + description = {wisi a +libero} +} + +@entry{tristique, + parent = {uttempor}, + description = {semper} +} + +@entry{nullamnislmassa, + parent = {uttempor}, + description = {rutrum +ut} +} + +@entry{eleifend, + name = {eleifend}, + description = {sit amet +faucibus} +} + +@entry{elementum, + parent = {eleifend}, + description = {elementum} +} + +@entry{urnasapien, + parent = {eleifend}, + description = {urna sapien} +} + +@entry{consectetuermauris, + name = {consectetuer}, + description = {mauris} +} + +@entry{quisegestas, + parent = {consectetuermauris}, + description = {quis egestas} +} + +@entry{leojusto, + parent = {consectetuermauris}, + description = {leo +justo} +} + +@entry{nonrisus, + name = {non risus}, + description = {morbi non +felis} +} + +@entry{aclibero, + parent = {nonrisus}, + description = {ac libero} +} + +@entry{vulputatefringilla, + parent = {nonrisus}, + description = {vulputate +fringilla} +} + +@entry{maurislibero, + name = {mauris}, + description = {libero eros} +} + +@entry{lacinia, + parent = {maurislibero}, + description = {lacinia +non} +} + +@entry{sodales, + parent = {maurislibero}, + description = {sodales +quis} +} + +@entry{dapibus, + parent = {maurislibero}, + description = {dapibus +porttitor, pede} +} + +@entry{class, + name = {class}, + description = {aptent taciti} +} + +@entry{sociosqu, + parent = {class}, + description = {sociosqu} +} + +@entry{adlitora, + parent = {class}, + description = {ad litora} +} + +@entry{torquent, + parent = {class}, + description = {torquent per +conubia} +} + +@entry{nostra, + name = {nostra}, + description = {per inceptos +hymenaeos} +} + +@entry{morbidapibus, + parent = {nostra}, + description = {morbi +dapibus} +} + +@entry{mauriscondimentum, + parent = {nostra}, + description = {mauris +condimentum nulla} +} + +@entry{cumsociis, + name = {cum sociis}, + description = {natoque +penatibus} +} + +@entry{etmagnis, + parent = {cumsociis}, + description = {et +magnis} +} + +@entry{disparturient, + parent = {cumsociis}, + description = {dis +parturient montes} +} + +\endinput +%% +%% End of file `example-glossaries-childnoname.bib'. diff --git a/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-cite.bib b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-cite.bib new file mode 100644 index 00000000000..c1c81f18b11 --- /dev/null +++ b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-cite.bib @@ -0,0 +1,162 @@ +%% +%% This is file `example-glossaries-cite.bib', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries-extra.dtx (with options: `example-glossaries-cite.bib,package') +%% +%% glossaries-extra.dtx +%% Copyright 2017 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +@entry{fusce, + user1 = {article-minimal}, + name = {fusce}, + description = {suscipit cursus sem} +} + +@entry{vivamus, + user1 = {article-full}, + name = {vivamus}, + description = {risus mi, egestas ac} +} + +@entry{imperdiet, + user1 = {whole-journal}, + name = {imperdiet}, + description = {varius, faucibus quis, leo} +} + +@entry{aenean2, + user1 = {inbook-minimal}, + name = {aenean}, + description = {tincidunt} +} + +@entry{crasid, + user1 = {inbook-full}, + name = {cras id}, + description = {justo quis nibh scelerisque dignissim} +} + +@entry{aliquam2, + user1 = {book-minimal}, + name = {aliquam}, + description = {sagittis elementum dolor} +} + +@entry{aeneanconsectetuer, + user1 = {book-full}, + name = {aenean consectetuer}, + description = {justo in pede} +} + +@entry{curabiturullamcorper, + user1 = {booklet-minimal}, + name = {curabitur ullamcorper}, + description = {ligula nec orci} +} + +@entry{aliquampurus, + user1 = {booklet-full}, + name = {aliquam purus}, + description = {turpis, aliquam id} +} + +@entry{ornarevitae, + user1 = {incollection-minimal}, + name = {ornare vitae}, + description = {porttitor non, wisi} +} + +@entry{maecenasluctus, + user1 = {incollection-full}, + name = {maecenas luctus}, + description = {porta lorem} +} + +@entry{donecvitae, + user1 = {manual-minimal}, + name = {donec vitae}, + description = {ligula eu ante pretium varius} +} + +@entry{proin, + user1 = {manual-full}, + name = {proin}, + description = {tortor metus, convallis et} +} + +@entry{hendrerit, + user1 = {mastersthesis-minimal}, + name = {hendrerit}, + description = {non, scelerisque in, urna} +} + +@entry{crasquis, + user1 = {mastersthesis-full}, + name = {cras qui}, + description = {libero eu ligula bibendum tempor} +} + +@entry{vivamustellus, + user1 = {misc-minimal}, + name = {vivamus tellus}, + description = {quam, malesuada eu, tempus sed, tempor sed, velit} +} + +@entry{doneclacinia, + user1 = {misc-full}, + name = {donec lacinia}, + description = {auctor libero} +} + +@entry{praesent2, + user1 = {inproceedings-minimal}, + name = {praesent}, + description = {sed neque id pede mollis rutrum} +} + +@entry{vestibulum2, + user1 = {inproceedings-minimal,phdthesis-minimal}, + name = {vestibulum}, + description = {iaculis risus} +} + +@entry{pellentesque2, + name = {pellentesque}, + description = {lacus} +} + +\endinput +%% +%% End of file `example-glossaries-cite.bib'. diff --git a/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-images.bib b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-images.bib new file mode 100644 index 00000000000..774aed565a5 --- /dev/null +++ b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-images.bib @@ -0,0 +1,333 @@ +%% +%% This is file `example-glossaries-images.bib', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries-extra.dtx (with options: `example-glossaries-images.bib,package') +%% +%% glossaries-extra.dtx +%% Copyright 2017 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +@entry{sedfeugiat, + user1 = {example-image}, + name = {sed feugiat}, + description = {Cum sociis natoque penatibus et magnis dis parturient montes, +nascetur ridiculus mus. Ut pellentesque augue sed urna. Vestibulum +diam eros, fringilla et, consectetuer eu, nonummy id, sapien. Nullam +at lectus. In sagittis ultrices mauris. Curabitur malesuada erat sit +amet massa. Fusce blandit. Aliquam erat volutpat. Aliquam euismod. +Aenean vel lectus. Nunc imperdiet justo nec dolor. + +Etiam euismod. Fusce facilisis lacinia dui. Suspendisse potenti. In +mi erat, cursus id, nonummy sed, ullamcorper eget, sapien. Praesent +pretium, magna in eleifend egestas, pede pede pretium lorem, quis +consectetuer tortor sapien facilisis magna. Mauris quis magna +varius nulla scelerisque imperdiet. Aliquam non quam. Aliquam +porttitor quam a lacus. Praesent vel arcu ut tortor cursus volutpat. +In vitae pede quis diam bibendum placerat. Fusce elementum convallis +neque. Sed dolor orci, scelerisque ac, dapibus nec, ultricies ut, +mi. Duis nec dui quis leo sagittis commodo. +} +} + +@entry{aliquamlectus, + user1 = {example-image-a}, + name = {aliquam lectus}, + description = {Vivamus leo. Quisque ornare tellus ullamcorper nulla. Mauris +porttitor pharetra tortor. Sed fringilla justo sed mauris. Mauris +tellus. Sed non leo. Nullam elementum, magna in cursus sodales, +augue est scelerisque sapien, venenatis congue nulla arcu et pede. +Ut suscipit enim vel sapien. Donec congue. Maecenas urna mi, +suscipit in, placerat ut, vestibulum ut, massa. Fusce ultrices nulla +et nisl. + +Etiam ac leo a risus tristique nonummy. Donec dignissim tincidunt +nulla. Vestibulum rhoncus molestie odio. Sed lobortis, justo et +pretium lobortis, mauris turpis condimentum augue, nec ultricies +nibh arcu pretium enim. Nunc purus neque, placerat id, imperdiet +sed, pellentesque nec, nisl. Vestibulum imperdiet neque non sem +accumsan laoreet. In hac habitasse platea dictumst. Etiam +condimentum facilisis libero. Suspendisse in elit quis nisl aliquam +dapibus. Pellentesque auctor sapien. Sed egestas sapien nec lectus. +Pellentesque vel dui vel neque bibendum viverra. Aliquam porttitor +nisl nec pede. Proin mattis libero vel turpis. Donec rutrum mauris +et libero. Proin euismod porta felis. Nam lobortis, metus quis +elementum commodo, nunc lectus elementum mauris, eget vulputate +ligula tellus eu neque. Vivamus eu dolor. +} +} + +@entry{nullainipsum, + user1 = {example-image-b}, + name = {nulla in ipsum}, + description = {Praesent eros nulla, congue vitae, euismod ut, commodo a, wisi. +Pellentesque habitant morbi tristique senectus et netus et malesuada +fames ac turpis egestas. Aenean nonummy magna non leo. Sed felis +erat, ullamcorper in, dictum non, ultricies ut, lectus. Proin vel +arcu a odio lobortis euismod. Vestibulum ante ipsum primis in +faucibus orci luctus et ultrices posuere cubilia Curae; Proin ut +est. Aliquam odio. Pellentesque massa turpis, cursus eu, euismod +nec, tempor congue, nulla. Duis viverra gravida mauris. Cras +tincidunt. Curabitur eros ligula, varius ut, pulvinar in, cursus +faucibus, augue. + +Nulla mattis luctus nulla. Duis commodo velit at leo. Aliquam +vulputate magna et leo. Nam vestibulum ullamcorper leo. Vestibulum +condimentum rutrum mauris. Donec id mauris. Morbi molestie justo et +pede. Vivamus eget turpis sed nisl cursus tempor. Curabitur mollis +sapien condimentum nunc. In wisi nisl, malesuada at, dignissim sit +amet, lobortis in, odio. Aenean consequat arcu a ante. Pellentesque +porta elit sit amet orci. Etiam at turpis nec elit ultricies +imperdiet. Nulla facilisi. In hac habitasse platea dictumst. +Suspendisse viverra aliquam risus. Nullam pede justo, molestie +nonummy, scelerisque eu, facilisis vel, arcu. +} +} + +@entry{curabiturtellusmagna, + user1 = {example-image-c}, + name = {curabitur tellus magna}, + description = {Donec interdum. Praesent scelerisque. Maecenas posuere sodales +odio. Vivamus metus lacus, varius quis, imperdiet quis, rhoncus a, +turpis. Etiam ligula arcu, elementum a, venenatis quis, sollicitudin +sed, metus. Donec nunc pede, tincidunt in, venenatis vitae, faucibus +vel, nibh. Pellentesque wisi. Nullam malesuada. Morbi ut tellus ut +pede tincidunt porta. Lorem ipsum dolor sit amet, consectetuer +adipiscing elit. Etiam congue neque id dolor. + +Donec et nisl at wisi luctus bibendum. Nam interdum tellus ac +libero. Sed sem justo, laoreet vitae, fringilla at, adipiscing ut, +nibh. Maecenas non sem quis tortor eleifend fermentum. Etiam id +tortor ac mauris porta vulputate. Integer porta neque vitae massa. +Maecenas tempus libero a libero posuere dictum. Vestibulum ante +ipsum primis in faucibus orci luctus et ultrices posuere cubilia +Curae; Aenean quis mauris sed elit commodo placerat. Class aptent +taciti sociosqu ad litora torquent per conubia nostra, per inceptos +hymenaeos. Vivamus rhoncus tincidunt libero. Etiam elementum pretium +justo. Vivamus est. Morbi a tellus eget pede tristique commodo. +Nulla nisl. Vestibulum sed nisl eu sapien cursus rutrum. +} +} + +@entry{nullanonmauris, + user1 = {example-image-16x10}, + name = {nulla non mauris}, + description = {Nullam varius. Etiam dignissim elementum metus. Vestibulum faucibus, +metus sit amet mattis rhoncus, sapien dui laoreet odio, nec +ultricies nibh augue a enim. Fusce in ligula. Quisque at magna et +nulla commodo consequat. Proin accumsan imperdiet sem. Nunc porta. +Donec feugiat mi at justo. Phasellus facilisis ipsum quis ante. In +ac elit eget ipsum pharetra faucibus. Maecenas viverra nulla in +massa. + +Nulla ac nisl. Nullam urna nulla, ullamcorper in, interdum sit amet, +gravida ut, risus. Aenean ac enim. In luctus. Phasellus eu quam +vitae turpis viverra pellentesque. Duis feugiat felis ut enim. +Phasellus pharetra, sem id porttitor sodales, magna nunc aliquet +nibh, nec blandit nisl mauris at pede. Suspendisse risus risus, +lobortis eget, semper at, imperdiet sit amet, quam. Quisque +scelerisque dapibus nibh. Nam enim. Lorem ipsum dolor sit amet, +consectetuer adipiscing elit. Nunc ut metus. Ut metus justo, auctor +at, ultrices eu, sagittis ut, purus. Aliquam aliquam. +} +} + +@entry{etiampedemassa, + user1 = {example-image-10x16}, + name = {etiam pede massa}, + description = {Vestibulum luctus commodo lacus. Morbi lacus dui, tempor sed, +euismod eget, condimentum at, tortor. Phasellus aliquet odio ac +lacus tempor faucibus. Praesent sed sem. Praesent iaculis. Cras +rhoncus tellus sed justo ullamcorper sagittis. Donec quis orci. +Sed ut tortor quis tellus euismod tincidunt. Suspendisse congue nisl +eu elit. Aliquam tortor diam, tempus id, tristique eget, sodales +vel, nulla. Praesent tellus mi, condimentum sed, viverra at, +consectetuer quis, lectus. In auctor vehicula orci. Sed pede sapien, +euismod in, suscipit in, pharetra placerat, metus. Vivamus commodo +dui non odio. Donec et felis. + +Etiam suscipit aliquam arcu. Aliquam sit amet est ac purus bibendum +congue. Sed in eros. Morbi non orci. Pellentesque mattis lacinia +elit. Fusce molestie velit in ligula. Nullam et orci vitae nibh +vulputate auctor. Aliquam eget purus. Nulla auctor wisi sed ipsum. +Morbi porttitor tellus ac enim. Fusce ornare. Proin ipsum enim, +tincidunt in, ornare venenatis, molestie a, augue. Donec vel pede in +lacus sagittis porta. Sed hendrerit ipsum quis nisl. Suspendisse +quis massa ac nibh pretium cursus. Sed sodales. Nam eu neque quis +pede dignissim ornare. Maecenas eu purus ac urna tincidunt congue. +} +} + +@entry{donecetnisl, + user1 = {example-image-16x9}, + name = {donec et nisl}, + description = {Aenean dictum odio sit amet risus. Morbi purus. Nulla a est sit amet +purus venenatis iaculis. Vivamus viverra purus vel magna. Donec in +justo sed odio malesuada dapibus. Nunc ultrices aliquam nunc. +Vivamus facilisis pellentesque velit. Nulla nunc velit, vulputate +dapibus, vulputate id, mattis ac, justo. Nam mattis elit dapibus +purus. Quisque enim risus, congue non, elementum ut, mattis quis, +sem. Quisque elit. + +Maecenas non massa. Vestibulum pharetra nulla at lorem. Duis quis +quam id lacus dapibus interdum. Nulla lorem. Donec ut ante quis +dolor bibendum condimentum. Etiam egestas tortor vitae lacus. +Praesent cursus. Mauris bibendum pede at elit. Morbi et felis a +lectus interdum facilisis. Sed suscipit gravida turpis. Nulla at +lectus. Vestibulum ante ipsum primis in faucibus orci luctus et +ultrices posuere cubilia Curae; Praesent nonummy luctus nibh. Proin +turpis nunc, congue eu, egestas ut, fringilla at, tellus. In hac +habitasse platea dictumst. +} +} + +@entry{vivamuseutellus, + user1 = {example-image-9x16}, + name = {vivamus eu tellus}, + description = {Nam orci orci, malesuada id, gravida nec, ultricies vitae, erat. +Donec risus turpis, luctus sit amet, interdum quis, porta sed, +ipsum. Suspendisse condimentum, tortor at egestas posuere, neque +metus tempor orci, et tincidunt urna nunc a purus. Sed facilisis +blandit tellus. Nunc risus sem, suscipit nec, eleifend quis, cursus +quis, libero. Curabitur et dolor. Sed vitae sem. Cum sociis natoque +penatibus et magnis dis parturient montes, nascetur ridiculus mus. +Maecenas ante. Duis ullamcorper enim. Donec tristique enim eu leo. +Nullam molestie elit eu dolor. Nullam bibendum, turpis vitae +tristique gravida, quam sapien tempor lectus, quis pretium tellus +purus ac quam. Nulla facilisi. + +Duis aliquet dui in est. Donec eget est. Nunc lectus odio, varius +at, fermentum in, accumsan non, enim. Aliquam erat volutpat. Proin +sit amet nulla ut eros consectetuer cursus. Phasellus dapibus +aliquam justo. Nunc laoreet. Donec consequat placerat magna. Duis +pretium tincidunt justo. Sed sollicitudin vestibulum quam. Nam quis +ligula. Vivamus at metus. Etiam imperdiet imperdiet pede. Aenean +turpis. Fusce augue velit, scelerisque sollicitudin, dictum vitae, +tempor et, pede. Donec wisi sapien, feugiat in, fermentum ut, +sollicitudin adipiscing, metus. +} +} + +@entry{donecvelnibh, + user1 = {example-image-golden}, + name = {donec vel nibh}, + description = {Donec pede. Sed id quam id wisi laoreet suscipit. Nulla lectus +dolor, aliquam ac, fringilla eget, mollis ut, orci. In pellentesque +justo in ligula. Maecenas turpis. Donec eleifend leo at felis +tincidunt consequat. Aenean turpis metus, malesuada sed, condimentum +sit amet, auctor a, wisi. Pellentesque sapien elit, bibendum ac, +posuere et, congue eu, felis. Vestibulum mattis libero quis metus +scelerisque ultrices. Sed purus. + +Donec molestie, magna ut luctus ultrices, tellus arcu nonummy velit, +sit amet pulvinar elit justo et mauris. In pede. Maecenas euismod +elit eu erat. Aliquam augue wisi, facilisis congue, suscipit in, +adipiscing et, ante. In justo. Cras lobortis neque ac ipsum. Nunc +fermentum massa at ante. Donec orci tortor, egestas sit amet, +ultrices eget, venenatis eget, mi. Maecenas vehicula leo semper +est. Mauris vel metus. Aliquam erat volutpat. In rhoncus sapien ac +tellus. Pellentesque ligula. +} +} + +@entry{crasdapibus, + user1 = {example-image-golden-upright}, + name = {cras dapibus}, + description = {Aenean interdum nibh sed wisi. Praesent sollicitudin vulputate dui. +Praesent iaculis viverra augue. Quisque in libero. Aenean gravida +lorem vitae sem ullamcorper cursus. Nunc adipiscing rutrum ante. +Nunc ipsum massa, faucibus sit amet, viverra vel, elementum semper, +orci. Cras eros sem, vulputate et, tincidunt id, ultrices eget, +magna. Nulla varius ornare odio. Donec accumsan mauris sit amet +augue. Sed ligula lacus, laoreet non, aliquam sit amet, iaculis +tempor, lorem. Suspendisse eros. Nam porta, leo sed congue tempor, +felis est ultrices eros, id mattis velit felis non metus. Curabitur +vitae elit non mauris varius pretium. Aenean lacus sem, tincidunt +ut, consequat quis, porta vitae, turpis. Nullam laoreet fermentum +urna. Proin iaculis lectus. + +Sed mattis, erat sit amet gravida malesuada, elit augue egestas +diam, tempus scelerisque nunc nisl vitae libero. Sed consequat +feugiat massa. Nunc porta, eros in eleifend varius, erat leo rutrum +dui, non convallis lectus orci ut nibh. Sed lorem massa, nonummy +quis, egestas id, condimentum at, nisl. Maecenas at nibh. Aliquam +et augue at nunc pellentesque ullamcorper. Duis nisl nibh, laoreet +suscipit, convallis ut, rutrum id, enim. Phasellus odio. Nulla +nulla elit, molestie non, scelerisque at, vestibulum eu, nulla. Ut +odio nisl, facilisis id, mollis et, scelerisque nec, enim. Aenean +sem leo, pellentesque sit amet, scelerisque sit amet, vehicula +pellentesque, sapien. +} +} + +@entry{sedconsequat, + user1 = {example-image-1x1}, + name = {sed consequat}, + description = {Ut tempor laoreet quam. Nullam id wisi a libero tristique semper. +Nullam nisl massa, rutrum ut, egestas semper, mollis id, leo. Nulla +ac massa eu risus blandit mattis. Mauris ut nunc. In hac habitasse +platea dictumst. Aliquam eget tortor. Quisque dapibus pede in erat. +Nunc enim. In dui nulla, commodo at, consectetuer nec, malesuada +nec, elit. Aliquam ornare tellus eu urna. Sed nec metus. Cum sociis +natoque penatibus et magnis dis parturient montes, nascetur +ridiculus mus. Pellentesque habitant morbi tristique senectus et +netus et malesuada fames ac turpis egestas. + +Phasellus id magna. Duis malesuada interdum arcu. Integer metus. +Morbi pulvinar pellentesque mi. Suspendisse sed est eu magna +molestie egestas. Quisque mi lorem, pulvinar eget, egestas quis, +luctus at, ante. Proin auctor vehicula purus. Fusce ac nisl aliquam +ante hendrerit pellentesque. Class aptent taciti sociosqu ad litora +torquent per conubia nostra, per inceptos hymenaeos. Morbi wisi. +Etiam arcu mauris, facilisis sed, eleifend non, nonummy ut, pede. +Cras ut lacus tempor metus mollis placerat. Vivamus eu tortor vel +metus interdum malesuada. +} +} + +@entry{sedeleifend, + name = {sed eleifend}, + description = {Morbi non felis ac libero vulputate fringilla. Mauris libero eros, +lacinia non, sodales quis, dapibus porttitor, pede. Class aptent +taciti sociosqu ad litora torquent per conubia nostra, per inceptos +hymenaeos. Morbi dapibus mauris condimentum nulla. Cum sociis +natoque penatibus et magnis dis parturient montes, nascetur +ridiculus mus. Etiam sit amet erat. Nulla varius. Etiam tincidunt +dui vitae turpis. Donec leo. Morbi vulputate convallis est. Integer +aliquet. Pellentesque aliquet sodales urna. +} +} + +\endinput +%% +%% End of file `example-glossaries-images.bib'. diff --git a/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-long.bib b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-long.bib new file mode 100644 index 00000000000..fbb42e28b1c --- /dev/null +++ b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-long.bib @@ -0,0 +1,133 @@ +%% +%% This is file `example-glossaries-long.bib', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries-extra.dtx (with options: `example-glossaries-long.bib,package') +%% +%% glossaries-extra.dtx +%% Copyright 2017 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +@entry{loremipsum, + name = {lorem ipsum}, + description = {dolor sit amet, consectetuer adipiscing elit. Ut purus +elit, vestibulum ut, placerat ac, adipiscing vitae, felis. Curabitur +dictum gravida mauris.} +} + +@entry{namearcu, + name = {name arcu}, + description = {libero, nonummy eget, consectetuer id, vulputate a, magna. Donec +vehicula augue eu neque. Pellentesque habitant morbi tristique +senectus et netus et malesuada fames ac turpis egestas. Mauris ut +leo.} +} + +@entry{crasviverra, + name = {cras viverra}, + description = {metus rhoncus sem. Nulla et lectus vestibulum +urna fringilla ultrices. Phasellus eu tellus sit amet tortor gravida +placerat.} +} + +@entry{integersapien, + name = {integer sapien}, + description = {est, iaculis in, pretium quis, viverra ac, +nunc. Praesent eget sem vel leo ultrices bibendum. Aenean +faucibus.} +} + +@entry{morbidolor, + name = {morbi dolor}, + description = {nulla, malesuada eu, pulvinar at, mollis ac, nulla. +Curabitur auctor semper nulla. Donec varius orci eget risus. Duis +nibh mi, congue eu, accumsan eleifend, sagittis quis, diam. Duis +eget orci sit amet orci dignissim rutrum.} +} + +@entry{namdui, + name = {nam dui}, + description = {ligula, fringilla a, euismod sodales, +sollicitudin vel, wisi. Morbi auctor lorem non justo.} +} + +@entry{namlacus, + name = {nam lacus}, + description = {libero, pretium at, lobortis vitae, ultricies et, +tellus. Donec aliquet, tortor sed accumsan bibendum, erat ligula aliquet magna, +vitae ornare odio metus a mi.} +} + +@entry{morbiac, + name = {morbi ac}, + description = {orci et nisl hendrerit mollis. Suspendisse ut massa. +Cras nec ante. Pellentesque a nulla. Cum sociis natoque penatibus +et magnis dis parturient montes, nascetur ridiculus mus.} +} + +@entry{aliquam, + name = {aliquam}, + description = {tincidunt urna. Nulla ullamcorper +vestibulum turpis. Pellentesque cursus luctus mauris.} +} + +@entry{nullamalesuada, + name = {nulla malesuada}, + description = {porttitor diam. Donec felis erat, congue non, volutpat at, +tincidunt tristique, libero. Vivamus viverra fermentum felis.} +} + +@entry{donecnonummy, + name = {donec nonummy}, + description = {pellentesque ante. Phasellus +adipiscing semper elit. Proin fermentum massa ac quam. Sed diam +turpis, molestie vitae, placerat a, molestie nec, leo.} +} + +@entry{maecenaslacinia, + name = {maecenas lacinia}, + description = {nam ipsum ligula, eleifend at, accumsan nec, suscipit +a, ipsum. Morbi blandit ligula feugiat magna. Nunc eleifend consequat +lorem.} +} + +@entry{sedlacinia, + name = {sed lacinia}, + description = {nulla vitae enim. Pellentesque tincidunt purus +vel magna. Integer non enim. Praesent euismod nunc eu purus. Donec +bibendum quam in tellus.} +} + +\endinput +%% +%% End of file `example-glossaries-long.bib'. diff --git a/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-multipar.bib b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-multipar.bib new file mode 100644 index 00000000000..823e5a6ba6d --- /dev/null +++ b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-multipar.bib @@ -0,0 +1,171 @@ +%% +%% This is file `example-glossaries-multipar.bib', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries-extra.dtx (with options: `example-glossaries-multipar.bib,package') +%% +%% glossaries-extra.dtx +%% Copyright 2017 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +@entry{loremi-ii, + name = {lorem 1--2}, + description = {Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Ut purus elit, +vestibulum ut, placerat ac, adipiscing vitae, felis. Curabitur +dictum gravida mauris. Nam arcu libero, nonummy eget, consectetuer +id, vulputate a, magna. Donec vehicula augue eu neque. Pellentesque +habitant morbi tristique senectus et netus et malesuada fames ac +turpis egestas. Mauris ut leo. Cras viverra metus rhoncus sem. Nulla +et lectus vestibulum urna fringilla ultrices. Phasellus eu tellus +sit amet tortor gravida placerat. Integer sapien est, iaculis in, +pretium quis, viverra ac, nunc. Praesent eget sem vel leo ultrices +bibendum. Aenean faucibus. Morbi dolor nulla, malesuada eu, pulvinar +at, mollis ac, nulla. Curabitur auctor semper nulla. Donec varius +orci eget risus. Duis nibh mi, congue eu, accumsan eleifend, +sagittis quis, diam. Duis eget orci sit amet orci dignissim rutrum. + +Nam dui ligula, fringilla a, euismod sodales, sollicitudin vel, +wisi. Morbi auctor lorem non justo. Nam lacus libero, pretium at, +lobortis vitae, ultricies et, tellus. Donec aliquet, tortor sed +accumsan bibendum, erat ligula aliquet magna, vitae ornare odio +metus a mi. Morbi ac orci et nisl hendrerit mollis. Suspendisse ut +massa. Cras nec ante. Pellentesque a nulla. Cum sociis natoque +penatibus et magnis dis parturient montes, nascetur ridiculus mus. +Aliquam tincidunt urna. Nulla ullamcorper vestibulum turpis. +Pellentesque cursus luctus mauris.} +} + +@entry{loremiii-iv, + name = {lorem 3--4}, + description = {Nulla malesuada porttitor diam. Donec felis erat, congue non, +volutpat at, tincidunt tristique, libero. Vivamus viverra fermentum +felis. Donec nonummy pellentesque ante. Phasellus adipiscing semper +elit. Proin fermentum massa ac quam. Sed diam turpis, molestie +vitae, placerat a, molestie nec, leo. Maecenas lacinia. Nam ipsum +ligula, eleifend at, accumsan nec, suscipit a, ipsum. Morbi blandit +ligula feugiat magna. Nunc eleifend consequat lorem. Sed lacinia +nulla vitae enim. Pellentesque tincidunt purus vel magna. Integer +non enim. Praesent euismod nunc eu purus. Donec bibendum quam in +tellus. Nullam cursus pulvinar lectus. Donec et mi. Nam vulputate +metus eu enim. Vestibulum pellentesque felis eu massa. + +Quisque ullamcorper placerat ipsum. Cras nibh. Morbi vel justo +vitae lacus tincidunt ultrices. Lorem ipsum dolor sit amet, +consectetuer adipiscing elit. In hac habitasse platea dictumst. +Integer tempus convallis augue. Etiam facilisis. Nunc elementum +fermentum wisi. Aenean placerat. Ut imperdiet, enim sed gravida +sollicitudin, felis odio placerat quam, ac pulvinar elit purus eget +enim. Nunc vitae tortor. Proin tempus nibh sit amet nisl. Vivamus +quis tortor vitae risus porta vehicula.} +} + +@entry{loremv-vi, + name = {lorem 5--6}, + description = {Fusce mauris. Vestibulum luctus nibh at lectus. Sed bibendum, nulla +a faucibus semper, leo velit ultricies tellus, ac venenatis arcu +wisi vel nisl. Vestibulum diam. Aliquam pellentesque, augue quis +sagittis posuere, turpis lacus congue quam, in hendrerit risus eros +eget felis. Maecenas eget erat in sapien mattis porttitor. +Vestibulum porttitor. Nulla facilisi. Sed a turpis eu lacus commodo +facilisis. Morbi fringilla, wisi in dignissim interdum, justo lectus +sagittis dui, et vehicula libero dui cursus dui. Mauris tempor +ligula sed lacus. Duis cursus enim ut augue. Cras ac magna. Cras +nulla. Nulla egestas. Curabitur a leo. Quisque egestas wisi eget +nunc. Nam feugiat lacus vel est. Curabitur consectetuer.% + +Suspendisse vel felis. Ut lorem lorem, interdum eu, tincidunt sit +amet, laoreet vitae, arcu. Aenean faucibus pede eu ante. Praesent +enim elit, rutrum at, molestie non, nonummy vel, nisl. Ut lectus +eros, malesuada sit amet, fermentum eu, sodales cursus, magna. Donec +eu purus. Quisque vehicula, urna sed ultricies auctor, pede lorem +egestas dui, et convallis elit erat sed nulla. Donec luctus. +Curabitur et nunc. Aliquam dolor odio, commodo pretium, ultricies +non, pharetra in, velit. Integer arcu est, nonummy in, fermentum +faucibus, egestas vel, odio.} +} + +@entry{loremvii-viii, + name = {lorem 7--8}, + description = {Sed commodo posuere pede. Mauris ut est. Ut quis purus. Sed ac odio. +Sed vehicula hendrerit sem. Duis non odio. Morbi ut dui. Sed +accumsan risus eget odio. In hac habitasse platea dictumst. +Pellentesque non elit. Fusce sed justo eu urna porta tincidunt. +Mauris felis odio, sollicitudin sed, volutpat a, ornare ac, erat. +Morbi quis dolor. Donec pellentesque, erat ac sagittis semper, nunc +dui lobortis purus, quis congue purus metus ultricies tellus. Proin +et quam. Class aptent taciti sociosqu ad litora torquent per conubia +nostra, per inceptos hymenaeos. Praesent sapien turpis, fermentum +vel, eleifend faucibus, vehicula eu, lacus. + +Pellentesque habitant morbi tristique senectus et netus et malesuada +fames ac turpis egestas. Donec odio elit, dictum in, hendrerit sit +amet, egestas sed, leo. Praesent feugiat sapien aliquet odio. +Integer vitae justo. Aliquam vestibulum fringilla lorem. Sed neque +lectus, consectetuer at, consectetuer sed, eleifend ac, lectus. +Nulla facilisi. Pellentesque eget lectus. Proin eu metus. Sed +porttitor. In hac habitasse platea dictumst. Suspendisse eu lectus. +Ut mi mi, lacinia sit amet, placerat et, mollis vitae, dui. Sed ante +tellus, tristique ut, iaculis eu, malesuada ac, dui. Mauris nibh +leo, facilisis non, adipiscing quis, ultrices a, dui.} +} + +@entry{loremix-x, + name = {lorem 9--10}, + description = {Morbi luctus, wisi viverra faucibus pretium, nibh est placerat odio, +nec commodo wisi enim eget quam. Quisque libero justo, consectetuer +a, feugiat vitae, porttitor eu, libero. Suspendisse sed mauris +vitae elit sollicitudin malesuada. Maecenas ultricies eros sit amet +ante. Ut venenatis velit. Maecenas sed mi eget dui varius euismod. +Phasellus aliquet volutpat odio. Vestibulum ante ipsum primis in +faucibus orci luctus et ultrices posuere cubilia Curae; Pellentesque +sit amet pede ac sem eleifend consectetuer. Nullam elementum, urna +vel imperdiet sodales, elit ipsum pharetra ligula, ac pretium ante +justo a nulla. Curabitur tristique arcu eu metus. Vestibulum lectus. +Proin mauris. Proin eu nunc eu urna hendrerit faucibus. Aliquam +auctor, pede consequat laoreet varius, eros tellus scelerisque quam, +pellentesque hendrerit ipsum dolor sed augue. Nulla nec lacus. + +Suspendisse vitae elit. Aliquam arcu neque, ornare in, ullamcorper +quis, commodo eu, libero. Fusce sagittis erat at erat tristique +mollis. Maecenas sapien libero, molestie et, lobortis in, sodales +eget, dui. Morbi ultrices rutrum lorem. Nam elementum ullamcorper +leo. Morbi dui. Aliquam sagittis. Nunc placerat. Pellentesque +tristique sodales est. Maecenas imperdiet lacinia velit. Cras non +urna. Morbi eros pede, suscipit ac, varius vel, egestas non, eros. +Praesent malesuada, diam id pretium elementum, eros sem dictum +tortor, vel consectetuer odio sem sed wisi.} +} + +\endinput +%% +%% End of file `example-glossaries-multipar.bib'. diff --git a/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-parent.bib b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-parent.bib new file mode 100644 index 00000000000..1ff7d2e9166 --- /dev/null +++ b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-parent.bib @@ -0,0 +1,170 @@ +%% +%% This is file `example-glossaries-parent.bib', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries-extra.dtx (with options: `example-glossaries-parent.bib,package') +%% +%% glossaries-extra.dtx +%% Copyright 2017 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +@entry{sedmattis, + name = {sed mattis}, + description = {erat sit amet} +} + +@entry{gravida, + parent = {sedmattis}, + name = {gravida}, + description = {malesuada} +} + +@entry{elitaugue, + parent = {sedmattis}, + name = {elit augue}, + description = {egestas diam} +} + +@entry{tempus, + parent = {sedmattis}, + name = {tempus}, + description = {scelerisque} +} + +@entry{nunc, + name = {nunc}, + description = {nisl vitae} +} + +@entry{libero, + parent = {nunc}, + name = {libero}, + description = {sed +consequat} +} + +@entry{feugiat, + parent = {nunc}, + name = {feugiat}, + description = {massa} +} + +@entry{porta, + parent = {nunc}, + name = {porta}, + description = {eros +in eleifend} +} + +@entry{variuserat, + parent = {nunc}, + name = {varius erat}, + description = {leo rutrum dui} +} + +@entry{nonconvallis, + name = {non +convallis}, + description = {lectus orci ut nibh} +} + +@entry{sedlorem, + parent = {nonconvallis}, + name = {sedlorem}, + description = {massa} +} + +@entry{nonummyquis, + parent = {nonconvallis}, + name = {nonummy +quis}, + description = {egestas id} +} + +@entry{condimentum, + name = {condimentum}, + description = {at +nisl} +} + +@entry{maecenas, + parent = {condimentum}, + name = {maecenas}, + description = {at nibh} +} + +@entry{aliquamet, + name = {aliquam et}, + description = {augue} +} + +@entry{atnunc, + parent = {aliquamet}, + name = {at nunc}, + description = {pellentesque +ullamcorper} +} + +@entry{duisnisl, + parent = {atnunc}, + name = {duisnisl}, + description = {laoreet +suscipit} +} + +@entry{duisnibh, + parent = {atnunc}, + name = {duisnibh}, + description = {convallis ut} +} + +@entry{rutrum, + name = {rutrum}, + description = {id, enim} +} + +@entry{phasellus, + parent = {rutrum}, + name = {phasellus}, + description = {odio} +} + +@entry{nullanulla, + parent = {rutrum}, + name = {nulla nulla}, + description = {elit, molestie non} +} + +\endinput +%% +%% End of file `example-glossaries-parent.bib'. diff --git a/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-symbols.bib b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-symbols.bib new file mode 100644 index 00000000000..7b813f3bca8 --- /dev/null +++ b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-symbols.bib @@ -0,0 +1,186 @@ +%% +%% This is file `example-glossaries-symbols.bib', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries-extra.dtx (with options: `example-glossaries-symbols.bib,package') +%% +%% glossaries-extra.dtx +%% Copyright 2017 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +@entry{alpha, + symbol = {\ensuremath{\alpha}}, + name = {alpha}, + description = {Quisque ullamcorper placerat ipsum.} +} + +@entry{beta, + symbol = {\ensuremath{\beta}}, + name = {beta}, + description = {Cras nibh.} +} + +@entry{gamma, + symbol = {\ensuremath{\gamma}}, + name = {gamma}, + description = {Morbi vel justo vitae lacus tincidunt ultrices.} +} + +@entry{delta, + symbol = {\ensuremath{\delta}}, + name = {delta}, + description = {Lorem ipsum dolor sit amet, consectetuer adipiscing +elit.} +} + +@entry{epsilon, + symbol = {\ensuremath{\epsilon}}, + name = {epsilon}, + description = {In hac habitasse platea dictumst.} +} + +@entry{zeta, + symbol = {\ensuremath{\zeta}}, + name = {zeta}, + description = {Integer tempus convallis augue.} +} + +@entry{eta, + symbol = {\ensuremath{\eta}}, + name = {eta}, + description = {Etiam facilisis.} +} + +@entry{theta, + symbol = {\ensuremath{\theta}}, + name = {theta}, + description = {Nunc elementum fermentum wisi.} +} + +@entry{iota, + symbol = {\ensuremath{i}}, + name = {iota}, + description = {Aenean placerat.} +} + +@entry{kappa, + symbol = {\ensuremath{\kappa}}, + name = {kappa}, + description = {Ut imperdiet, enim sed gravida sollicitudin, felis odio +placerat quam, ac pulvinar elit purus eget enim.} +} + +@entry{lambda, + symbol = {\ensuremath{\lambda}}, + name = {lambda}, + description = {Nunc vitae tortor.} +} + +@entry{mu, + symbol = {\ensuremath{\mu}}, + name = {mu}, + description = {Proin tempus nibh sit amet nisl.} +} + +@entry{nu, + symbol = {\ensuremath{\nu}}, + name = {nu}, + description = {Vivamus quis tortor vitae risus porta vehicula.} +} + +@entry{xi, + symbol = {\ensuremath{\xi}}, + name = {xi}, + description = {Fusce mauris.} +} + +@entry{pi, + symbol = {\ensuremath{\pi}}, + name = {pi}, + description = {Vestibulum luctus nibh at lectus.} +} + +@entry{rho, + symbol = {\ensuremath{\rho}}, + name = {rho}, + description = {Sed bibendum, nulla a faucibus semper, leo velit +ultricies tellus, ac venenatis arcu wisi vel nisl. Vestibulum diam.} +} + +@entry{sigma, + symbol = {\ensuremath{\sigma}}, + name = {sigma}, + description = {Aliquam pellentesque, augue quis sagittis posuere, +turpis lacus congue quam, in hendrerit risus eros eget felis.} +} + +@entry{tau, + symbol = {\ensuremath{\tau}}, + name = {tau}, + description = {Maecenas eget erat in sapien mattis porttitor.} +} + +@entry{upsilon, + symbol = {\ensuremath{\upsilon}}, + name = {upsilon}, + description = {Vestibulum porttitor.} +} + +@entry{phi, + symbol = {\ensuremath{\phi}}, + name = {phi}, + description = {Nulla facilisi.} +} + +@entry{chi, + symbol = {\ensuremath{\chi}}, + name = {chi}, + description = {Sed a turpis eu lacus commodo facilisis.} +} + +@entry{psi, + symbol = {\ensuremath{\psi}}, + name = {psi}, + description = {Morbi fringilla, wisi in dignissim interdum, justo +lectus sagittis dui, et vehicula libero dui cursus dui.} +} + +@entry{omega, + symbol = {\ensuremath{\omega}}, + name = {omega}, + description = {Mauris tempor ligula sed lacus.} +} + +\endinput +%% +%% End of file `example-glossaries-symbols.bib'. diff --git a/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-url.bib b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-url.bib new file mode 100644 index 00000000000..bbca8176846 --- /dev/null +++ b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-url.bib @@ -0,0 +1,104 @@ +%% +%% This is file `example-glossaries-url.bib', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries-extra.dtx (with options: `example-glossaries-url.bib,package') +%% +%% glossaries-extra.dtx +%% Copyright 2017 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +@entry{aenean-url, + user1 = {http://uk.tug.org/}, + name = {aenean}, + description = {adipiscing auctor est} +} + +@entry{morbi-url, + user1 = {http://www.ctan.org/}, + name = {morbi}, + description = {quam arcu, malesuada sed, volutpat et, elementum sit +amet, libero} +} + +@entry{duis-url, + user1 = {http://www.tug.org/}, + name = {duis}, + description = {mattis} +} + +@entry{sed-url, + user1 = {http://theoval.cmp.uea.ac.uk/\protect~nlct/}, + name = {sed}, + description = {cursus lectus quis odio (uses +\texttt{\string\protect\string~})} +} + +@entry{sed2-url, + user1 = {http://theoval.cmp.uea.ac.uk/\string~nlct/}, + name = {sed}, + description = {cursus lectus quis odio (uses +\texttt{\string\string\string~})} +} + +@entry{sed3-url, + user1 = {http://theoval.cmp.uea.ac.uk/\glstildechar nlct/}, + name = {sed}, + description = {cursus lectus quis odio (uses +\texttt{\string\glstildechar})} +} + +@entry{phasellus-url, + user1 = {http://theoval.cmp.uea.ac.uk/}, + name = {phasellus}, + description = {arcu (catcode change)} +} + +@entry{phasellus2-url, + user1 = {http://theoval.cmp.uea.ac.uk/\%7Enlct +}, + name = {phasellus}, + description = {arcu (uses \texttt{\string\%})} +} + +@entry{phasellus3-url, + user1 = {http://theoval.cmp.uea.ac.uk/\glspercentchar 7Enlct +}, + name = {phasellus}, + description = {arcu (uses + \texttt{\string\glspercentchar})} +} + +\endinput +%% +%% End of file `example-glossaries-url.bib'. diff --git a/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-xr.bib b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-xr.bib new file mode 100644 index 00000000000..7aacf223c3d --- /dev/null +++ b/Master/texmf-dist/bibtex/bib/glossaries-extra/example-glossaries-xr.bib @@ -0,0 +1,342 @@ +%% +%% This is file `example-glossaries-xr.bib', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries-extra.dtx (with options: `example-glossaries-xr.bib,package') +%% +%% glossaries-extra.dtx +%% Copyright 2017 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +@entry{lorem, + name = {lorem}, + description = {ipsum} +} + +@entry{alias-lorem, + name = {alias-lorem}, + description = {ipsum}, + alias = {lorem} +} + +@entry{dolor, + name = {dolor}, + description = {sit} +} + +@entry{amet, + see = {dolor}, + name = {amet}, + description = {consectetuer} +} + +@entry{adipiscing, + name = {adipiscing}, + description = {elit} +} + +@entry{ut, + name = {ut}, + description = {purus} +} + +@entry{elit, + name = {elit}, + description = {vestibulum}, + seealso = {adipiscing,ut} +} + +@entry{placerat, + name = {placerat}, + description = {ac} +} + +@entry{vitae, + name = {vitae}, + description = {felis} +} + +@entry{curabitur, + name = {curabitur}, + description = {gravida} +} + +@entry{mauris, + name = {mauris}, + description = {nam} +} + +@entry{arcu, + name = {arcu}, + description = {libero}, + seealso = {placerat,vitae,curabitur} +} + +@entry{nonummy, + name = {nonummy}, + description = {eget}, + seealso = {mauris} +} + +@entry{consectetuer, + parent = {nonummy}, + name = {consectetuer}, + description = {id} +} + +@entry{vulputate, + parent = {nonummy}, + name = {vulputate}, + description = {a magna} +} + +@entry{donec, + name = {donec}, + description = {vehicula} +} + +@entry{augue, + name = {augue}, + description = {eu neque} +} + +@entry{pellentesque, + see = {augue}, + name = {pellentesque}, + description = {habitant} +} + +@entry{morbi, + name = {morbi}, + description = {tristique} +} + +@entry{senectus, + name = {senectus}, + description = {et netus} +} + +@entry{et, + see = {vulputate}, + name = {et}, + description = {malesuada} +} + +@entry{fames, + name = {fames}, + description = {ac} +} + +@entry{turpis, + name = {turpis}, + description = {egestas}, + seealso = {consectetuer} +} + +@entry{leo, + name = {leo}, + description = {cras} +} + +@entry{viverra, + name = {viverra}, + description = {metus} +} + +@entry{rhoncus, + name = {rhoncus}, + description = {sem} +} + +@entry{nulla, + name = {nulla}, + description = {et} +} + +@entry{lectus, + name = {lectus}, + description = {vestibulum} +} + +@entry{urna, + parent = {lectus}, + see = {nulla}, + name = {urna}, + description = {fringilla} +} + +@entry{ultrices, + parent = {lectus}, + name = {ultrices}, + description = {phasellus} +} + +@entry{eu, + parent = {lectus}, + name = {eu}, + description = {tellus} +} + +@entry{alias-eu, + name = {alias-eu}, + description = {tellus}, + alias = {eu} +} + +@entry{sit, + name = {sit}, + description = {amet} +} + +@entry{tortor, + name = {tortor}, + description = {gravida} +} + +@entry{integer, + name = {integer}, + description = {sapien} +} + +@entry{est, + name = {est}, + description = {iaculis} +} + +@entry{in, + name = {in}, + description = {pretium}, + seealso = {sit,tortor,est} +} + +@entry{quis, + name = {quis}, + description = {viverra} +} + +@entry{ac, + name = {ac}, + description = {nunc} +} + +@entry{praesent, + name = {praesent}, + description = {eget \gls{ac}} +} + +@entry{sem, + name = {sem}, + description = {vel leo +\glshyperlink{quis}} +} + +@entry{bibendum, + name = {bibendum}, + description = {ultrices} +} + +@entry{aenean, + name = {aenean}, + description = {faucibus} +} + +@entry{malesuada, + parent = {aenean}, + name = {malesuada}, + description = {eu} +} + +@entry{pulvinar, + parent = {aenean}, + name = {pulvinar}, + description = {at} +} + +@entry{mollis, + parent = {aenean}, + name = {mollis}, + description = {ac nulla} +} + +@entry{auctor, + parent = {aenean}, + name = {auctor}, + description = {semper} +} + +@entry{varius, + parent = {aenean}, + name = {varius}, + description = {orci} +} + +@entry{eget, + name = {eget}, + description = {risus} +} + +@entry{duis, + name = {duis}, + description = {nibh} +} + +@entry{mi, + name = {mi}, + description = {congue} +} + +@entry{accumsan, + name = {accumsan}, + description = {eleifend} +} + +@entry{sagittis, + see = {eget}, + name = {sagittis}, + description = {quis} +} + +@entry{diam, + name = {diam}, + description = {duis} +} + +@entry{orci, + name = {orci}, + description = {dignissim}, + seealso = {diam} +} + +\endinput +%% +%% End of file `example-glossaries-xr.bib'. diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES b/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES index f22717721ae..363f5a52ab4 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES +++ b/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES @@ -1,3 +1,17 @@ +1.19 (2017-09-08): + + * New command: \GlsXtrSetDefaultNumberFormat + + * New command: \glsxtrhyperlink + + * New command: \glsxtrifhasfield + + * Added thevalue and theHvalue keys to \glslink etc + + * Bug fixes for record=only and record=alsoindex options + + * Added example .bib files for use with bib2gls + 1.18 (2017-08-10): * Fixed bug caused by missing argument of 'stylemods'. diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/README b/Master/texmf-dist/doc/latex/glossaries-extra/README index a73ae51b46a..d80be737d10 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.18 +LaTeX Package : glossaries-extra v1.19 -Last Modified : 2017-08-10 +Last Modified : 2017-09-08 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 a8a3b94011e..b300a1a6164 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 ada3a4c4ca0..527e2998ae1 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 @@ -202,22 +202,22 @@ a span.HoLogo-TeX span.HoLogo-e{text-decoration:none;} -

-

+

-

+

-

-

glossaries-extra.sty v1.18: an extension to the +

+

glossaries-extra.sty v1.19: an extension to the glossaries package

@@ -240,22 +240,22 @@ class="td11">http://www.dickimaw-books.com/
-

2017-08-10

+

2017-09-08

-

+

-

-

+

Abstract

-

The

The glossaries-extra package is an extension to the glossaries package, providing additional features. Some of the features provided by this package are only available @@ -263,20 +263,26 @@ with glossaries version 4.19 (or above). This document assumes familiarity with the glossaries package. -

The file

The file example-glossaries-xr.tex contains dummy entries with cross-references that may be used for creating minimal working examples for testing the glossaries-extra package. (The base glossaries package provides additional files, but this -one needs glossaries-extra.) +class="cmss-10">glossaries package provides additional files, but +this one needs glossaries-extra.) There are equivalent .bib files for use with +bib2gls.

-

Since

Since glossaries-extra internally loads the glossaries package, you also need to have glossaries installed and all the packages that glossaries depends on (including, but not limited to, tracklang, , mfirstuc, , etoolbox, , xkeyval (at least version dated 2006/11/18), + id="dx1-7"> (at least version dated 2006/11/18), textcase, , xfor, , datatool-base and and amsgen. These packages are all available in the + id="dx1-11">. These packages are all available in the current TEX Live and MikTEX distributions. If any of them are missing, please @@ -311,8 +317,8 @@ class="E">EX distribution? or Updating TEX on Linux.)
-

-

Additional resources:

+

+

Additional resources:

  • The glossaries-extra documented code glossaries-extra gallery. href="http://www.latex-community.org/know-how/latex/55-latex-general/263-glossaries-nomenclature-lists-of-symbols-and-acronyms" >Glossaries, Nomenclature, Lists of Symbols and Acronyms.
  • bib2gls
+href="http://www.dickimaw-books.com/software/bib2gls" >bib2gls @@ -419,15 +425,15 @@ href="#glossary">Glossary -

1.

1. Introduction

-

The

The glossaries package is a flexible package, but it’s also a heavy-weight package that uses a lot of resources. As package developer, I’m caught between those users who complain about the drawbacks of a heavy-weight package with a large user manual and those users who want more features (which necessarily adds to the package weight and manual size). -

The

The glossaries-extra package is an attempt to provide a compromise for this conflict. Version 4.22 of the glossaries package is the last version to incorporate new @@ -443,10 +449,10 @@ of package loading time and allocation of resources, but those users who do want extra features available will have more of a chance of getting their feature requests accepted.

-

Top

1.1 Package Defaults

-

I’m not happy with some of the default settings assumed by the

I’m not happy with some of the default settings assumed by the glossaries package, and, judging from code I’ve seen, other users also seem unhappy with them, as certain package options are often used in questions posted on various sites. I can’t @@ -456,7 +462,7 @@ but since glossaries-extra is a separate package, I have decided to implement some of these commonly-used options by default. You can switch them back if they’re not appropriate. -

The new defaults are:

+

The new defaults are:

-

This is like: +

This is like: @@ -541,7 +547,7 @@ Commands and Styles).  
\usepackage[toc,nopostdot]{glossaries}  
\usepackage{glossaries-extra}

-

+

  • @@ -553,7 +559,7 @@ Commands and Styles).  
    \usepackage{babel}  
    \usepackage{glossaries-extra}
    • -

    This is like: +

    This is like: @@ -564,7 +570,7 @@ Commands and Styles).  
    \usepackage[toc,nopostdot,translate=babel]{glossaries}  
    \usepackage{glossaries-extra} -

    +

  • @@ -575,7 +581,7 @@ Commands and Styles). \documentclass{memoir}  
    \usepackage{glossaries-extra} -

    This is like: +

    This is like: @@ -585,7 +591,7 @@ Commands and Styles).  
    \usepackage[toc,nopostdot,noredefwarn]{glossaries}  
    \usepackage{glossaries-extra} -

    However @@ -596,7 +602,7 @@ class="cmti-10">However  
    \usepackage{glossaries}  
    \usepackage{glossaries-extra} -

    This is like: +

    This is like: @@ -606,19 +612,19 @@ class="cmti-10">However  
    \usepackage[toc,nopostdot]{glossaries}  
    \usepackage{glossaries-extra} -

    Since by the time

    Since by the time glossaries-extra has been loaded, glossaries has already redefined memoir’s glossary-related commands.

    • -

    Another noticeable change is that by default

    Another noticeable change is that by default \printglossary will now display information text in the document if the external glossary file doesn’t exist. This is explanatory text to help new users who can’t work out what to do next to complete the document build. Once the document is set up correctly and the external files have been generated, this text will disappear. -

    This change is mostly likely to be noticed by users with one or more +

    This change is mostly likely to be noticed by users with one or more redundant empty glossaries who ignore transcript messages, explicitly use \printglossaries  
    \end{document} -

    The above document will only display the list of acronyms at the place where +

    The above document will only display the list of acronyms at the place where \printglossaries occurs. However it will also attempt to input the .gls file associated with the main glossary. -

    If you use

    If you use makeglossaries, you’ll get the warning message: @@ -669,7 +675,7 @@ Warning: File 'test.glo' is empty.  
    Remember to use package option 'nomain' if you  
    don't want to use the main glossary. -

    (where the original file is called

    (where the original file is called test.tex) but if you simply call No file test.gls. -

    This doesn’t occur with

    This doesn’t occur with makeglossaries as it will create the .gls file containing the single command \null. -

    If you simply change from

    If you simply change from glossaries to glossaries-extra in this document, you’ll find a change in the resulting PDF if you don’t use .acr file with makeindex. -

    The transcript file will still contain the message about the missing

    The transcript file will still contain the message about the missing .gls, but now you’ll also see information in the actual PDF document. The simplest remedy is to follow the advice inserted into the document at that point, which is to add the @@ -726,19 +732,19 @@ class="cmss-10">nomain\printglossaries  
    \end{document} -

    (Note the need to set the acronym style using

    (Note the need to set the acronym style using \setabbreviationstyle before \newacronym. See §3 Abbreviations for further details.) -

    +

    -

    Top

    1.2 New or Modified Package Options

    -

    If you haven’t already loaded

    If you haven’t already loaded glossaries, you can use any of the package options provided by glossaries when you load \setupglossariesglossaries package options may be used in that command. -

    This section only lists options that are either unrecognised by the

    This section only lists options that are either unrecognised by the glossaries package or are a modified version of options of the same name provided by glossaries. See the glossaries user manual for details about the unmodified options.
    -

    -

    The new and modified options provided by

    +

    The new and modified options provided by glossaries-extra are described below: @@ -784,7 +790,7 @@ class="cmssbx-10">accsuppLoad the glossaries-accsupp package (if not already loaded). -

    If you want to define styles that can interface with the accessibility support +

    If you want to define styles that can interface with the accessibility support provided by glossaries-accsupp use the §11.2 Accessibility Support for further details.) -

    Note that the

    Note that the accsupp option can only be used as a package option (not through glossaries). You can switch this to a warning message (and ?? appearing in the text) with undefaction=warn. -

    Undefined entries can’t be picked up by any commands that iterate +

    Undefined entries can’t be picked up by any commands that iterate over a glossary list. This includes \forglsentries and \glsaddall.
    -

    +

    false. -

    Note that

    Note that bib2gls\glsxtrusesee and \glsxtruseseealso) but cross-reference won’t be automatically indexed. -

    Note that the

    Note that the record=only option automatically implements autoseeindex=false. -

    For example, if an entry is defined as +

    For example, if an entry is defined as @@ -943,7 +949,7 @@ class="cmss-10">autoseeindex=false \newglossaryentry{foo}{name={foo},description={},see={bar,baz}}

    -

    then with

    then with autoseeindex=true, this is equivalent to @@ -955,7 +961,7 @@ class="cmtt-10">autoseeindex=true, this is equivalent to  
    \glossariesextrasetup{indexcrossrefs=true}  
    \GlsXtrSetField{foo}{see}{bar,baz}

    -

    but with

    but with autoseeindex=false, this is equivalent to @@ -965,7 +971,7 @@ class="cmtt-10">autoseeindex=false, this is equivalent to \newglossaryentry{foo}{name={foo},description={}}  
    \GlsXtrSetField{foo}{see}{bar,baz} -

    Note that

    Note that indexcrossrefs isn’t automatically implemented by the presence of the @@ -974,9 +980,9 @@ class="cmss-10">see key when autoseeindex is false. -

    It’s therefore possible to remove the cross-references from the location lists and +

    It’s therefore possible to remove the cross-references from the location lists and set their position within the glossary style. -

    Another method of preventing the automatic indexing is to define the entries +

    Another method of preventing the automatic indexing is to define the entries before the external indexing files have been opened with \makeglossaries. Since the appropriate file isn’t open, the information can’t be written to it. @@ -1006,8 +1012,8 @@ href="#sec:bib2gls">§9 bib2gls: Managing Reference Databases). -

    The option may only be set in the preamble. -

    The

    The option may only be set in the preamble. +

    The record=off option switches off the recording, as per the default behaviour. It implements undefaction=error. -

    The other values switch on the recording and also

    The other values switch on the recording and also undefaction=warnbib2glssee field was already set for that entry. -

    The

    The record=only option will automatically set the glossaries package’s sort=noneglossaries v4.30.) -

    With the recording on, any of the commands that would typically index the +

    With the recording on, any of the commands that would typically index the entry (such as \gls, \glstext or \newglossaryentry to class="cmtt-10">\makenoidxglossaries, but note that \longnewglossaryentry remains a preamble-only command. -

    With this option, if an entry appears in the glossary before it has been +

    With this option, if an entry appears in the glossary before it has been defined, an error will occur (or a warning if the undefaction.aux and .gls files).

    -

    The

    The glossaries package allows \newglossaryentry within the documentdocdef=true if document definitions are necessary and one or more of the glossaries occurs in the front matter. -

    This option affects commands that internally use

    This option affects commands that internally use \newglossaryentry, such as \newabbreviation, but not the “on-the-fly” commands described in abbreviations and redefines \glsxtrabbrvtype to this label. In addition, it defines a shortcut command -

    \printabbreviations  \printabbreviations[⟨options⟩]
    -

    +

    which is equivalent to

    options⟩]
    The title of the new glossary is given by -

    \abbreviationsname  \abbreviationsname
    -

    +

    If this command is already defined, it’s left unchanged. Otherwise it’s defined to “Abbreviations” if babel§13 Multi-Lingual Support for further details.) -

    If you don’t use the

    If you don’t use the abbreviations package option, the \abbreviationsname command won’t be defined (unless it’s defined by an included language file).
    -

    +

    -

    If the

    If the abbreviations option is used and the acronymmain:

    -

    -

    Note that there are no analogous options to the

    +

    Note that there are no analogous options to the glossaries package’s acronymlists @@ -1325,7 +1331,7 @@ class="cmssbx-10">symbols

    This is passed to glossaries but will additionally define -

    \glsxtrnewsymbol  }{⟨symbol⟩}
    -

    +

    which is equivalent to

    numbers
    This is passed to glossaries but will additionally define -

    \glsxtrnewnumber  options⟩]{⟨number⟩}
    -

    +

    which is equivalent to

    shortcuts=noneshortcuts=false): don’t define any of the shortcut commands (default). -

    Note that multiple invocations of the

    Note that multiple invocations of the shortcuts option within the same option list will override each other.

    -

    After the

    After the glossaries-extra package has been loaded, you can set available options using -

    \glossariesextrasetup  \glossariesextrasetup{⟨options⟩}
    -

    +

    The abbreviations\makenoidxglossaries -

    -

    +

    Top

    2. Modifications to Existing Commands and Styles

    -

    The commands used by

    The commands used by glossaries to automatically produce an error if an entry is undefined (such as \glsdoifexistsundefaction option into account. -

    The

    The \newignoredglossary{⟨Categories for furt check that the glossary doesn’t already exist. (The glossaries package omits this check.) -

    You can now provide an ignored glossary with: -

    You can now provide an ignored glossary with: +

    \provideignoredglossary  \provideignoredglossary{⟨type⟩}
    -

    +

    which will only define the glossary if it doesn’t already exist. This also has a starred version that doesn’t automatically switch off hyperlinks. -

    The individual glossary displaying commands

    The individual glossary displaying commands \printglossary, \glsdisablehyper this doesn’t switch off hyperlinks any cross-references within the glossary won’t be affected. This is a way of avoiding duplicate target warnings if a glossary needs to be displayed multiple times. -

    The

    The \newglossaryentry command has three new keys:

    -

    The test file

    The test file example-glossaries-xr.tex contains dummy entries with a mixture of seeseealias and seealso keys for use with minimal working examples. -

    The keys for use with minimal working examples. There are also +example-glossaries-*.bib files that correspond to each example-glossaries-*.tex +file for testing bib2gls. +

    The \longnewglossaryentry command now has a starred version (as from v1.12) that doesn’t automatically insert @@ -1629,11 +1643,11 @@ that doesn’t automatically insert

    \leavevmode\unskip\nopostdesc
    -

    at the end of the description field. -

    at the end of the description field. +

    \longnewglossaryentry  \longnewglossaryentry*{⟨label⟩}{⟨} class="cmtt-10">{⟨description⟩}
    -

    +

    The descriptionplural key is left unset unless explicitly set in ⟨ key is left unset unless explicitly set in ⟨options⟩. -

    The unstarred version no longer hard-codes the above code (which removes +

    The unstarred version no longer hard-codes the above code (which removes trailing space and suppresses the post-description hook) but instead uses: -

    \glsxtrpostlongdescription  \glsxtrpostlongdescription
    -

    +

    This can be redefined to allow the post-description hook to work but retain the \unskip part if required. For example: @@ -1666,56 +1680,56 @@ class="cmtt-10">\unskip part if required. For example:

    \renewcommand*{\glsxtrpostlongdescription}{\leavevmode\unskip}
    -

    This will discarded unwanted trailing space at the end of the description but won’t +

    This will discarded unwanted trailing space at the end of the description but won’t suppress the post-description hook. -

    The unstarred version also alters the base

    The unstarred version also alters the base glossaries package’s treatment of the + id="dx1-5021"> package’s treatment of the descriptionplural key. Since a plural description doesn’t make much sense for + id="dx1-5022"> key. Since a plural description doesn’t make much sense for multi-paragraph descriptions, the default behaviour with glossaries-extra’s + id="dx1-5023">’s \longnewglossaryentry is to simply leave the plural description unset unless explicitly set using the descriptionplural key. The key. The glossaries.sty version of this command sets the description’s plural form to the same as the singular.2.1 -

    Note that this modified unstarred version doesn’t append +

    Note that this modified unstarred version doesn’t append \glsxtrpostlongdescription to the description’s plural form. -

    The

    The \newterm command (defined through the command (defined through the index package option) is modified + id="dx1-5032"> package option) is modified so that the category defaults to index. The . The \newacronym command is modified + id="dx1-5034"> command is modified to use the new abbreviation interface provided by glossaries-extra. (See §3 Abbreviations.) -

    The

    The \makeglossaries command now has an optional argument. -

    \makeglossaries  \makeglossaries[⟨list⟩]
    -

    +

    If ⟨list⟩ is empty, \makeglossaries behaves as per its original definition in the @@ -1723,29 +1737,29 @@ class="cmtt-10">\makeglossaries behaves as per its original definition in class="cmss-10">glossaries package, otherwise ⟨list⟩ can be a comma-separated list of glossaries that need processing with an external indexing application. -

    It should then be possible to use

    It should then be possible to use \printglossary for those glossaries listed in ⟨list⟩ and \printnoidxglossary for the other glossaries. (See the accompanying file sample-mixedsort.tex for an example.) -

    If you use the optional argument ⟨

    If you use the optional argument ⟨list⟩, you can’t define entries in the document (even with the docdef option).
    -

    -

    You will need at least version 2.20 of option).

    +

    +

    You will need at least version 2.20 of makeglossaries or at least version 1.3 of the Lua alternative makeglossaries-lite.lua (both distributed with (both distributed with glossaries v4.27) to allow for this use of \makeglossaries[⟨list⟩]. Alternatively, use the automake option. + id="dx1-5040"> option.

    -

    Top

    2.1 Entry Indexing

    -

    The

    The glossaries-extra package provides extra keys for commands like \gls and wrgloss=after for specific instances. Note that this opti settings (such as noindex). -

    The default value is set up using -

    The default value is set up using +

    \glsxtrinitwrgloss  \glsxtrinitwrgloss
    -

    +

    which is defined as: @@ -1842,15 +1856,15 @@ class="cmtt-10">\glsxtrinitwrgloss

     
     }%  
    }
    -

    This sets the conditional -

    This sets the conditional +

    \ifglsxtrinitwrglossbefore  \ifglsxtrinitwrgloss
    -

    +

    which is used to determine where to perform the indexing. -

    This means you can set the

    This means you can set the wrgloss attribute to \GlsXtrSetDefaultGlsOpts\glsxtrinitwrgloss.)

    -

    There is a new hook that’s used each time indexing information is written to the +

    There is a new hook that’s used each time indexing information is written to the external glossary files: -

    \glsxtrdowrglossaryhook  \glsxtrdowrglossaryhook{⟨label⟩}
    -

    +

    where ⟨label⟩ is the entry’s label. This does nothing by default but may be redefined. (See, for example, the accompanying sample file sample-indexhook.tex, which uses this hook to determine which entries haven’t been indexed.) -

    As from version 1.14, there are two new keys for

    As from version 1.14, there are two new keys for \glsadd: thevalue and - and theHvalue. +These keys are designed for manually adding explicit locations rather than obtaining +the value from the associated counter. As from version 1.19, these two keys are also +available for commands like \gls and \glslink. The thevalue keys is intended +primarily for adding locations in supplementary material that can’t be obtained from +a counter. +

    The principle key thevalue is for the location value. The other key theHvalue. These keys are designed for manually adding explicit locations -rather than obtaining the value from the associated counter. (If you want an -automated method, you might want to investigate can +be used to extract a prefix value for the first argument of commands like +\glsnoidxdisplayloc. It’s value must be in the format ⟨prefix⟩⟨location⟩. In general, +there’s little need for this key as the prefix is typically associated with a counter that +can be used to form hypertargets. + + + +

    If you use thevalue, you must make sure that you use an indexing application +that will accept the given value.
    +

    +

    For example, makeindex will only accept locations in the form [⟨num⟩⟨sep⟩]*⟨num⟩ +where ⟨num⟩ is an arabic number (0, 1, …), roman numeral (i, ii, … or I, II, …) or a +character from a, …, z or A, …, Z, and [⟨num⟩⟨sep⟩]* indicates zero or more +instances of a number followed by the recognised separator character (set +with \glsSetCompositor). This means that makeindex won’t accept, for +example, + + + +

    +
    +\glsadd[thevalue={Supplementary Material}]{sample} +
    +

    This location value will be accepted by bib2gls.) This is intended -primarily for adding locations in supplementary material that can’t otherwise -be picked up by makeindex or xindy. They therefore aren’t available for -commands like \gls or \glslink. Remember that the value will still need to be a -valid location according to the rules of whichever indexing application you -use. -

    For example, suppose the file , since it will allow any location and +will only try forming ranges if the location matches any of its numerical patterns. +In the case of xindy, you’ll need to add a rule that can match the value. +If you’re using hyperref, you may need to use the format key to prevent a +hyperlink if one can’t naturally be formed from the prefix, counter and location +value. +

    For example, suppose the file suppl.tex contains:

    -
    +
    \documentclass{article}  
    \usepackage{glossaries-extra}  
    \newglossaryentry{sample}{name={sample},description={an example}} @@ -1923,17 +1987,17 @@ class="cmtt-10">suppl.tex contains:  
    \gls{sample}.  
    \end{document}
    -

    This has an entry on page S.2. Suppose another document wants to include this +

    This has an entry on page S.2. Suppose another document wants to include this location in the glossary. Then this can be done by setting thevalue to to S.2. For example:

    -
    +
    \documentclass{article}  
    \usepackage{glossaries-extra}  
    \makeglossaries @@ -1944,64 +2008,72 @@ example:  
    \glsadd[thevalue={S.2}]{sample}  
    \end{document}
    -

    (By placing \glsadd at the end of the document, it adds the supplementary location -to the end of the location list, although the ordering may be changed by the indexing -application depending on its location collation settings.) -

    If you want hyperlinks, things are more complicated. First you need to set the +

    This location value will be accepted by makeindex as it’s in the form ⟨num⟩⟨sep⟩⟨num⟩. +

    If you want hyperlinks, things are more complicated. First you need to set the externallocation to the location of the PDF file. For example: + id="dx1-6033"> to the location of the PDF file. For example:

    -
    +
    \glssetcategoryattribute{supplemental}{externallocation}{suppl.pdf}  
    \newglossaryentry{sample}{category=supplemental,  
     name={sample},description={an example}}
    -

    Next you need to add

    Next you need to add glsxtrsupphypernumber as the format:

    -
    +
    \glsadd[thevalue={S.2},format=glsxtrsupphypernumber]{sample}
    -

    Both documents will need to use the

    Both documents will need to use the hyperref package. Remember that the counter + id="dx1-6034"> package. Remember that the counter used for the location also needs to match. If \theH⟨counter⟩ is defined in the -other document and is not the same as \the⟨counter⟩, then you need to use +class="cmti-10">counter⟩ is defined in the other +document and doesn’t match in the referencing document, then you need to use theHvalue to set the appropriate value. See the accompanying sample files + id="dx1-6035"> to set the appropriate value. See the accompanying sample files sample-suppl-hyp.tex and sample-suppl-main-hyp.tex for an example that uses hyperref. -

    The hyperlink for the supplementary location may or . +

    The hyperlink for the supplementary location may or may not take you to the relevant place in the external PDF file depending on your PDF viewer. Some may not support external links, and some may take you to the first page or last visited page.
    -

    -

    +

    +

    For example, if both sample-suppl-hyp.pdf and sample-suppl-main-hyp.pdf +are in the same directory, then viewing sample-suppl-main-hyp.pdf in Evince will +take you to the correct location in the linked document (when you click on the S.2 +external link), but Okular will take you to the top of the first page of the linked +document. +

    -

    Top

    2.2 Cross-References (“see” and “see also”)

    -

    The value of the

    The value of the see key is now saved as a field. This isn’t the case with glossaries, @@ -2028,20 +2100,20 @@ class="cmss-10">document environment on the next run. -

    This modification allows

    This modification allows glossaries-extra to provide -

    \glsxtraddallcrossrefs  \glsxtraddallcrossrefs
    -

    +

    which is used at the end of the document to automatically add any unused cross-references unless the package option indexcrossrefs was set to false. -

    As a by-product of this enhancement, the

    As a by-product of this enhancement, the see key will now work for entries defined in the documentsee key still can’t perform any indexing before the file has been + + + opened by \makeglossaries. Note that glossaries v4.24 introduced the see value to be stored even though it may not be possible to index it at that point. - - - -

    As from version 1.06, you can display the cross-referenced information for a given +

    As from version 1.06, you can display the cross-referenced information for a given entry using -

    \glsxtrusesee  \glsxtrusesee{⟨label⟩}
    -

    +

    This internally uses -

    \glsxtruseseeformat  tag⟩}{⟨xr list⟩}
    -

    +

    where ⟨tag⟩ and ⟨xr list⟩ are obtained from the value of the entry’s see field hasn’t been set for the entry given by ⟨label⟩. -

    Suppose you want to suppress the

    Suppose you want to suppress the number list using nonumberlist. This @@ -2126,7 +2198,7 @@ class="cmss-10">see key set, but this will also show the rest of the number list. -

    Another approach in this situation is to use the post description hook +

    Another approach in this situation is to use the post description hook with \glsxtrusesee to append the cross-reference after the description. For example: @@ -2134,18 +2206,18 @@ example:

    -
    +
    \renewcommand*{\glsxtrpostdescgeneral}{%  
     \ifglshasfield{see}{\glscurrententrylabel}  
     {, \glsxtrusesee{\glscurrententrylabel}}%  
     {}%  
    }
    -

    Now the cross-references can appear even though the

    Now the cross-references can appear even though the number list has been suppressed. -

    As from v1.16, there’s a separate

    As from v1.16, there’s a separate seealso key. Unlike see\seealsoname or \glsxtruseseealsoformat, described below). -

    You can display the formatted list of cross-references stored in the

    You can display the formatted list of cross-references stored in the seealso key using: -

    \glsxtruseseealso  \glsxtruseseealso{⟨label⟩}
    -

    +

    This works in much the same way as \glsxtrusesee but it internally uses -

    \glsxtruseseeformat  \glsxtruseseealsoformat{⟨xr list⟩}
    -

    +

    For example:

    -
    +
    \renewcommand*{\glsxtrpostdescgeneral}{%  
     \ifglshasfield{see}{\glscurrententrylabel}  
     {, \glsxtrusesee{\glscurrententrylabel}}% @@ -2202,20 +2274,20 @@ For example:  
     {}%  
    }
    -

    -

    The actual unformatted comma-separated list ⟨

    +

    The actual unformatted comma-separated list ⟨xr-list⟩ stored in the seealso field can be accessed with: -

    \glsxtrseealsolabels  \glsxtrseealsolabels{⟨label⟩}
    -

    +

    This will just expand to the ⟨xr-labels⟩ provided in the value of the seealso[⟨tag⟩], so it can’t be automatically treated as a simple comma-separated list. -

    The base

    The base glossaries package provides \glsseelist, which requires a @@ -2241,20 +2313,20 @@ class="cmti-10">label⟩} as the argument. For convenience, glossaries-extra provides -

    \glsxtrseelist  \glsxtrseelist{⟨xr list⟩}
    -

    +

    which fully expands its argument and passes it to \glsseelist. -

    The

    The seealso key implements the automatic indexing using -

    \glsxtrindexseealso  label⟩}{⟨xr list⟩}
    -

    +

    which just does

    \glssee[⟨\seealsoname⟩]{⟨\glssee[\seealsoname]{⟨label⟩}{⟨xrglossaries v4.30+, in which case a distinct seealso cross-reference class is used instead. -

    +

    -

    Top

    2.3 Entry Display Style Modifications

    -

    Recall from the

    Recall from the glossaries package that commands such as \gls display text at that point in the document (optionally with a hyperlink to the relevant @@ -2302,7 +2372,7 @@ whether or not it actually has a hyperlink. The actual text and the way it’s displayed depends on the command used (such as \gls) and the entry format. -

    The default entry format (

    The default entry format (\glsentryfmt) used in the §3.2 Abbreviation Styles). -

    This means that entries with a short form can be treated as regular entries rather +

    This means that entries with a short form can be treated as regular entries rather than abbreviations if it’s more appropriate for the desired style. -

    As from version 1.04,

    As from version 1.04, \glsentryfmt now puts \glsgenentry in the argument of the new command -

    \glsxtrregularfont  \glsxtrregularfont{⟨text⟩}
    -

    +

    This just does its argument ⟨text⟩ by default. This means that if you want regular entries in a different font but don’t want that font to apply to abbreviations, then @@ -2409,41 +2479,41 @@ class="cmtt-10">\glsxtrregularfont. This is more precise than changing \glstextformat which will be applied to all linking commands for all entries. -

    For example: +

    For example:

    -
    +
    \renewcommand*{\glsxtrregularfont}[1]{\textsf{#1}}
    -

    You can access the label through

    You can access the label through \glslabel. For example, you can query the category:

    -
    +
    \renewcommand*{\glsxtrregularfont}[1]{%  
     \glsifcategory{\glslabel}{general}{\textsf{#1}}{#1}}
    -

    or query the category attribute: +

    or query the category attribute:

    -
    +
    \glssetcategoryattribute{general}{font}{sf}  
    \renewcommand*{\glsxtrregularfont}[1]{%  
     \glsifattribute{\glslabel}{font}{sf}{\textsf{#1}}{#1}}
    -

    or use the attribute to store the control sequence name: +

    or use the attribute to store the control sequence name:

    -
    +
    \glssetcategoryattribute{general}{font}{textsf}  
    \glssetcategoryattribute{acronym}{font}{emph}  
    \renewcommand*{\glsxtrregularfont}[1]{% @@ -2452,7 +2522,7 @@ category:  
      {#1}%  
    }
    -

    (Remember the category and attribute settings will only queried here for

    (Remember the category and attribute settings will only queried here for regular @@ -2462,7 +2532,7 @@ class="cmss-10">acronym\glsxtrregularfont will no longer apply.) -

    The

    The \glspostlinkhook provided by the glossaries package to insert information after the link-text produced by commands like \gls and \glstext is redefined to -

    \glsxtrpostlinkhook  \glsxtrpostlinkhook
    -

    +

    This command will discard a following full stop (period) if the discardperiod attribute is set to “true” for the current entry’s category. It will also do -

    \glsxtrpostlink  \glsxtrpostlink
    -

    +

    if a full stop hasn’t be discarded and -

    \glsxtrpostlinkendsentence  \glsxtrpostlinkendsentence
    -

    +

    if a full stop has been discarded. -

    Avoid the use of

    Avoid the use of \gls-like and \glstext-like commands within the post-link hook as they will cause interference. Consider using commands like @@ -2508,8 +2578,8 @@ href="#sec:nested">§2.6 Nested Links) instead.
    -

    -

    By default

    +

    By default \glsxtrpostlink just does \glsxtrpostlink⟨category⟩general category, \glsxtrpostlinkgeneral if it has been defined.) -

    The sentence-ending hook is slightly more complicated. If the command +

    The sentence-ending hook is slightly more complicated. If the command \glsxtrpostlink⟨category⟩

    There are some convenient commands you might want to use when customizing +

    There are some convenient commands you might want to use when customizing the post-link-text category hooks: -

    \glsxtrpostlinkAddDescOnFirstUse  \glsxtrpostlinkAddDescOnFirstUse
    -

    +

    This will add the description in parentheses on first use. -

    For example, suppose you want to append the description in parentheses on

    For example, suppose you want to append the description in parentheses on first use for entries in the symbolsymbol -

    +
    \newcommand*{\glsxtrpostlinksymbol}{%  
      \glsxtrpostlinkAddDescOnFirstUse  
    }
    -

    -

    +

    \glsxtrpostlinkAddSymbolOnFirstUse  \glsxtrpostlinkAddSymbolOnFirstUse
    -

    +

    This will append the symbol (if defined) in parentheses on first use. -

    If you want to provide your own custom format be aware that you can’t use +

    If you want to provide your own custom format be aware that you can’t use \ifglsused within the post-link-text hook as by this point the first use flag will have been unset. Instead you can use -

    \glsxtrifwasfirstuse  true⟩}{⟨false⟩}
    -

    +

    This will do ⟨true⟩ if the last used entry was the first use for that entry, otherwise it @@ -2607,7 +2677,7 @@ locally set by commands like \gls, so don’t rely on it outside of the post-link-text hook. -

    Note that commands like

    Note that commands like \glsfirst and \glsxtrfull\glsxtrfull so that it fakes non-first use otherwise the inline full format would include the footnote, which is inappropriate.
    -

    -

    For example, if you want to place the description in a footnote after the

    +

    For example, if you want to place the description in a footnote after the link-text on first use for the general -

    +
    \newcommand*{\glsxtrpostlinkgeneral}{%  
      \glsxtrifwasfirstuse{\footnote{\glsentrydesc{\glslabel}}}{}%  
    }
    -

    -

    The

    +

    The short-postfootnote abbreviation style uses the post-link-text hook to place the footnote after trailing punctuation characters. -

    You can set the default options used by

    You can set the default options used by \glslink, \gls etc with: -

    \GlsXtrSetDefaultGlsOpts  \GlsXtrSetDefaultGlsOpts{⟨options⟩}
    -

    +

    For example, if you mostly don’t want to index entries then you can do:

    -
    +
    \GlsXtrSetDefaultGlsOpts{noindex}
    -

    and then use, for example,

    and then use, for example, \gls[noindex=false]{sample} when you actually want the location added to the \glslink and \gls. -

    Note that if you don’t want

    Note that if you don’t want any indexing, just omit \makeglossaries and wrgloss\glsxtrinitwrgloss instead. -

    Commands like

    \GlsXtrSetDefaultGlsOpts doesn’t affect \glsadd.
    +

    +

    If you want to change the default value of format, you can instead use: +

    \GlsXtrSetDefaultNumberFormat{⟨format⟩}
    +

    +This has the advantage of also working for \glsadd. For example, if you +want all locations in the back matter to appear in italic (unless explicitly +overridden): + + + +

    +
    +\backmatter + 
    \GlsXtrSetDefaultNumberFormat{hyperit} +
    +

    +

    Commands like \gls have star ( have star (*) and plus (+) modifiers as a short cut for hyper=false and hyper=true. The glossaries-extra package provides a way to add a third modifier, if required, using -

    \GlsXtrSetAltModifier  \GlsXtrSetAltModifier{⟨char⟩}{⟨options⟩}
    -

    +

    where ⟨char⟩ is the character used as the modifier and ⟨options⟩ is the default set of options (which may be overridden). Note that ⟨char⟩ must be a single character (not a UTF-8 character, unless you are using XƎLATEX or LuaLATEX). -

    When choosing the character ⟨

    When choosing the character ⟨char⟩ take care of any changes in category code.
    -

    -

    Example: +

    +

    Example:

    -
    +
    \GlsXtrSetAltModifier{!}{noindex}
    -

    This means that

    This means that \gls!{sample} will be equivalent to \gls[noindex]{sample}. It’s not possible to mix modifiers. For example, if you want to do @@ -2742,23 +2837,23 @@ not possible to mix modifiers. For example, if you want to do

    -
    +
    \gls[noindex,hyper=false]{sample}
    -

    you can use

    you can use \gls*[noindex]{sample} or \gls![hyper=false]{sample} but you can’t combine the * and ! modifiers. -

    Location lists displayed with \printnoidxglossary internally use -

    \glsnoidxdisplayloc  \glsnoidxdisplayloc{⟨prefix⟩}{⟨} class="cmtt-10">{⟨location⟩}
    -

    +

    This command is provided by glossaries, but is modified by glossaries-extra to check @@ -2779,53 +2874,53 @@ class="cmtt-10">( and ) which are discarded to obtain the actual control sequence name that forms the location formatting command. -

    If the range identifiers aren’t present, this just uses -

    If the range identifiers aren’t present, this just uses +

    \glsxtrdisplaysingleloc  \glsxtrdisplaysingleloc{⟨format⟩}{⟨location⟩}
    -

    +

    otherwise it uses -

    \glsxtrdisplaystartloc  \glsxtrdisplaystartloc{⟨format⟩}{⟨location⟩}
    -

    +

    for the start of a range (where the identifier has been stripped from ⟨format⟩) or -

    \glsxtrdisplayendloc  \glsxtrdisplayendloc{⟨format⟩}{⟨location⟩}
    -

    +

    for the end of a range (where the identifier has been stripped from ⟨format⟩). -

    By default the start range command saves the format in -

    By default the start range command saves the format in +

    \glsxtrlocrangefmt  \glsxtrlocrangefmt
    -

    +

    and does
    \glsxtrdisplaysingleloc{⟨}
    (If the format is empty, it will be replaced with glsnumberformat.) -

    The end command checks that the format matches the start of the range, +

    The end command checks that the format matches the start of the range, does -

    \glsxtrdisplayendlochook  \glsxtrdisplayendlochook{⟨format⟩}{⟨location⟩}
    -

    +

    (which does nothing by default), followed by
    \glsxtrdisplaysingleloc{⟨\glsxtrlocrangefmt to empty. -

    This means that the list +

    This means that the list

    -
    +
    \glsnoidxdisplayloc{}{page}{(textbf}{1},  
    \glsnoidxdisplayloc{}{page}{textbf}{1},  
    \glsnoidxdisplayloc{}{page}{)textbf}{1}.
    -

    doesn’t display any differently from +

    doesn’t display any differently from

    -
    +
    \glsnoidxdisplayloc{}{page}{textbf}{1},  
    \glsnoidxdisplayloc{}{page}{textbf}{1},  
    \glsnoidxdisplayloc{}{page}{textbf}{1}.
    -

    but it does make it easier to define your own custom list handler that can +

    but it does make it easier to define your own custom list handler that can accommodate the ranges. -

    +

    -

    Top

    2.4 Entry Counting Modifications

    -

    The

    The \glsenableentrycount command is modified to allow for the §5 Categories). -

    For example, instead of just doing: +

    For example, instead of just doing:

    -
    +
    \glsenableentrycount
    -

    you now need to do: +

    you now need to do:

    -
    +
    \glsenableentrycount  
    \glssetcategoryattribute{abbreviation}{entrycount}{1}
    -

    This will enable the entry counting for entries in the

    This will enable the entry counting for entries in the abbreviation category, but any entries assigned to other categories will be unchanged. -

    Further information about entry counting, including the new per-unit feature, is +

    Further information about entry counting, including the new per-unit feature, is described in §6 Entry Counting. -

    +

    -

    Top

    2.5 Plurals

    -

    Some languages, such as English, have a general rule that plurals are formed from +

    Some languages, such as English, have a general rule that plurals are formed from the singular with a suffix appended. This isn’t an absolute rule. There are plenty of exceptions (for example, geese, children, churches, elves, fairies, sheep). The plural

    To make life easier for languages where the majority of plurals can simply be +

    To make life easier for languages where the majority of plurals can simply be formed by appending a suffix to the singular, the glossaries package sets lets the plural supplied as well, and you only need to use it for the exceptions. -

    For languages that don’t have this general rule, the

    For languages that don’t have this general rule, the plural field will always need to be supplied, where needed. -

    There are other plural fields, such as

    There are other plural fields, such as firstplural, longpluralshortplural

    If these fields are omitted, the

    If these fields are omitted, the glossaries package follows these rules:

      @@ -3038,7 +3133,7 @@ class="cmtt-10">\acrpluralsuffixshort field.
    -

    This

    This last case is changed with glossaries-extra. With this extension package, the \abbrvpluralsuffix is redefined. In most cases its redefined to use -

    \glsxtrabbrvpluralsuffix  \glsxtrabbrvpluralsuffix
    -

    +

    which defaults to just \glspluralsuffix. Some of the abbreviation styles have their own command for the plural suffix, such as \abbrvpluralsuffix, which changes with the style. Redefining \acrpluralsuffix will have no affect, since it’s not used by the new abbreviation mechanism. -

    If you require a mixture (for example, in a multilingual document), there are two +

    If you require a mixture (for example, in a multilingual document), there are two attributes that affect the short plural suffix formation. The first is aposplural -

    +
    '\abbrvpluralsuffix
    -

    That is, an apostrophe followed by

    That is, an apostrophe followed by \abbrvpluralsuffix is appended. The second attribute is shortpluralshort. -

    +

    -

    Top

    2.6 Nested Links

    -

    Complications arise when you use

    Complications arise when you use \gls in the value of the name

    Things can go wrong if we try the following with the

    Things can go wrong if we try the following with the glossaries package:

    -
    +
    \newacronym{ssi}{SSI}{Server Side Includes}  
    \newacronym{html}{HTML}{Hypertext Markup Language}  
    \newacronym{shtml}{S\gls{html}}{\gls{ssi} enabled \gls{html}}
    -

    -

    The main problems are: +

    +

    The main problems are:

    1. first use if the long form is displayed before the shor -
      +
      \gls{\uppercase ssi} enabled \gls{html}
      -

      which just doesn’t work. Grouping the

      which just doesn’t work. Grouping the \gls{ssi} doesn’t work either as this will effectively try to do

      -
      +
      \uppercase{\gls{ssi}} enabled \gls{html}
      -

      This will upper case the label

      This will upper case the label ssi so the entry won’t be recognised. This problem will also occur if you use the all capitals version, such as shtml. For example: -

      +
      This section discusses \gls{ssi}, \gls{html} and \gls{shtml}.
      -

      This produces: +

      This produces:

      -

      This section discusses server side includes (SSI), hypertext +

      This section discusses server side includes (SSI), hypertext markup language (HTML) and SSI enabled HTML (SHTML).

      -

      So the

      So the first use of the shtml entry produces “SSI enabled HTML (SHTML)”. -

      Now let’s suppose the

      Now let’s suppose the html entry is used before the shtml but the ssi entry is @@ -3213,41 +3308,41 @@ class="cmtt-10">shtml entry, for example:

      -
      +
      The sample files are either \gls{html} or \gls{shtml}, but let's  
      first discuss \gls{ssi}.
      -

      This produces: +

      This produces:

      -

      The sample files are either hypertext markup language (HTML) +

      The sample files are either hypertext markup language (HTML) or server side includes (SSI) enabled HTML (SHTML), but let’s first discuss SSI.

      -

      So the

      So the first use of the shtml entry now produces “server side includes (SSI) enabled HTML (SHTML)”, which looks a bit strange. -

      Now let’s suppose the

      Now let’s suppose the shtml entry is used before (or without) the other two entries:

      -
      +
      This article is an introduction to \gls{shtml}.
      -

      This produces: +

      This produces:

      -

      This article is an introduction to server side includes (SSI) +

      This article is an introduction to server side includes (SSI) enabled hypertext markup language (HTML) (SHTML).

      -

      So the

      So the first use of the shtml entry now produces “server side includes (SSI) enabled hypertext markup language (HTML) (SHTML)”, which is even more strange. -

      This is all aggravated by setting the style using the

      This is all aggravated by setting the style using the glossaries package’s \setacronymstyle. For example: @@ -3255,10 +3350,10 @@ class="cmtt-10">\setacronymstyle. For example:

      -
      +
      \setacronymstyle{long-short}
      -

      as this references the label through the use of

      as this references the label through the use of \glslabel when displaying the long and short forms, but this value changes with each use of \gls, so @@ -3270,7 +3365,7 @@ class="cmtt-10">\glslabel has been changed to html by \gls{html}. -

      Another oddity occurs if you reset the

      Another oddity occurs if you reset the html entry between uses of the shtml entry. For example: @@ -3278,13 +3373,13 @@ class="cmtt-10">shtml

      -
      +
      \gls{shtml} ... \glsreset{html}\gls{shtml}
      -

      The next use of

      The next use of shtml produces “Shypertext markup language (HTML)”, which is downright weird. -

      Even without this, the short form has nested formatting commands, which +

      Even without this, the short form has nested formatting commands, which amount to \acronymfont{S\acronymfont{HTML}}. This may not be a problem for some styles, but if you use one of the “sm” styles (that use hyperref

    -

    For these reasons it’s better to use the simple expandable commands +

    For these reasons it’s better to use the simple expandable commands like \glsentrytext or -

    +
    \newacronym  
     [description={\acrshort{ssi} enabled \acrshort{html}}]  
     {shtml}{SHTML}{SSI enabled HTML}
    -

    with

    with glossaries or:

    -
    +
    \newabbreviation  
     [description={\glsxtrshort{ssi} enabled \glsxtrshort{html}}]  
     {shtml}{SHTML}{SSI enabled HTML}
    -

    with

    with glossaries-extra. This fixes all the above listed problems (as long as you don’t use \glsdescfirst use issue, but it doesn’t fix any of the other problems listed above. -

    If it’s simply that you want to use the abbreviation font, you can use +

    If it’s simply that you want to use the abbreviation font, you can use \glsabbrvfont:

    -
    +
    \setabbreviationstyle{long-short-sc}  
    \newabbreviation{ssi}{ssi}{server-side includes}  
    \newabbreviation{html}{html}{hypertext markup language}  
    \newabbreviation{shtml}{shtml}{\glsabbrvfont{ssi} enabled  
    \glsabbrvfont{html}}
    -

    This will pick up the font style setting of the outer entry (shtml, in the above case). +

    This will pick up the font style setting of the outer entry (shtml, in the above case). This isn’t a problem in the above example as all the abbreviations use the same style. -

    However if you’re really determined to use

    However if you’re really determined to use \gls in a field that may be included within some -

    +
    \gls{ssi} enabled \gls{html}
    -

    is treated as +

    is treated as

    -
    +
    {\glstext[hyper=false,noindex]{ssi}} enabled  
    {\glstext[hyper=false,noindex]{html}}
    -

    This overcomes problems 

    This overcomes problems 4, 5 and 6 listed above, but still doesn’t fix problems long-noshort-desc). -

    Additionally, any instance of the long form commands, such as

    Additionally, any instance of the long form commands, such as \glsxtrlong or shtml entry had instead been defined as: -

    +
    \newacronym{shtml}{SHTML}{\acrshort{ssi} enabled \acrshort{html}}
    -

    then (using the

    then (using the long-short style) the first use will be like

    -
    +
    {\acronymfont{\glsentryshort{ssi}}} enabled  
    {\acronymfont{\glsentryshort{html}}} (SHTML)
    -

    whereas if the entry is defined as: +

    whereas if the entry is defined as:

    -
    +
    \newabbreviation{shtml}{SHTML}{\glsxtrshort{ssi} enabled  
    \glsxtrshort{html}}
    -

    then the

    then the first use will be like:

    -
    +
    {\glsabbrvfont{\glsentryshort{ssi}}} enabled  
    {\glsabbrvfont{\glsentryshort{html}}} (SHTML)
    -

    Note that the first optional argument of

    Note that the first optional argument of \acrshort or \glsxtrshort is ignored in this context. (The final optional argument will be inserted, if present.) The @@ -3505,8 +3600,8 @@ class="cmtt-10">\glsxtrshort. Note that \acrshort doesn’t set the abbreviation style. -

    Alternatively you can use: -

    Alternatively you can use: +

    \glsxtrp  field⟩}{⟨label⟩}
    -

    +

    where ⟨field⟩ is the field label and corresponds to a command in the form \gls⟨\glstext) or in the form \glsxtr⟨field⟩ (e.g. \glsxtrshort). -

    There’s a shortcut command for the most common fields: -

    There’s a shortcut command for the most common fields: +

    \glsps  \glsps{⟨label⟩}
    -

    +

    which is equivalent to \glsxtrp{short}{⟨label⟩}, and -

    \glspt  \glspt{⟨label⟩}
    -

    +

    which is equivalent to \glsxtrp{text}{⟨label⟩}. -

    The

    The \glsxtrp command behaves much like the \glsfmt⟨field⟩ commands described @@ -3569,104 +3664,104 @@ class="cmss-10">noindex to true. If you want to change this, you can use -

    \glsxtrsetpopts  \glsxtrsetpopts{⟨options⟩}
    -

    +

    For example:

    -
    +
    \glsxtrsetpopts{hyper=false}
    -

    will just switch off the hyperlinks but not the indexing. Be careful using +

    will just switch off the hyperlinks but not the indexing. Be careful using this command or you can end up back to the original problem of nested links. -

    The hyper link is re-enabled within glossaries. This is done through the +

    The hyper link is re-enabled within glossaries. This is done through the command: -

    \glossxtrsetpopts  \glossxtrsetpopts
    -

    +

    which by default just does

    -
    +
    \glsxtrsetpopts{noindex}
    -

    You can redefine this if you want to adjust the setting when

    You can redefine this if you want to adjust the setting when \glsxtrp is used in the glossary. For example:

    -
    +
    \renewcommand{\glossxtrsetpopts}{\glsxtrsetpopts{noindex=false}}
    -

    -

    For example, +

    +

    For example,

    -
    +
    \glsxtrp{short}{ssi}
    -

    is equivalent to +

    is equivalent to

    -
    +
    {\let\glspostlinkhook\relax  
     \glsxtrshort[hyper=false,noindex]{ssi}[]%  
    }
    -

    in the main body of the document or +

    in the main body of the document or

    -
    +
    {\let\glspostlinkhook\relax  
     \glsxtrshort[noindex]{ssi}[]%  
    }
    -

    inside the glossary. (Note the post-link hook is locally disabled.) -

    If

    inside the glossary. (Note the post-link hook is locally disabled.) +

    If \glsxtrp{short}{ssi} occurs in a sectioning mark, it’s equivalent to

    -
    +
    {\glsxtrheadshort{ssi}}
    -

    (which recognises the

    (which recognises the headuc attribute.) -

    If

    If hyperref has been loaded, then the bookmark will use \glsentry⟨field⟩ (\glsentryshort{ssi} in the above example). -

    There are similar commands -

    There are similar commands +

    \Glsxtrp  field⟩}{⟨label⟩}
    -

    +

    for first letter upper case and -

    \Glsxtrp  field⟩}{⟨label⟩}
    -

    +

    for all upper case. -

    If you use any of the case-changing commands, such as

    If you use any of the case-changing commands, such as \Gls or \Glstext\gls\glstext, in the definition of entries for any of the fields that may be used by those case-changing commands.
    -

    -

    You can, with care, protect against issue 

    +

    You can, with care, protect against issue 1 by inserting an empty group at the start if the long form starts with a command that breaks the first letter uppercasing commands like \Gls, but you still won’t be able to use the all caps commands, such as \GLS. -

    If you

    If you really need nested commands, the safest method is

    -
    +
    \newabbreviation{shtml}{shtml}{{}\glsxtrp{short}{ssi} enabled  
    \glsxtrp{short}{html}}
    -

    but be aware that it may have some unexpected results occasionally. -

    Example document: +

    but be aware that it may have some unexpected results occasionally. +

    Example document:

    -
    +
    \documentclass{report}  
    \usepackage[utf8]{inputenc}  
    \usepackage[T1]{fontenc} @@ -3749,16 +3844,16 @@ class="cmti-10">really need nested commands, the safest method is  
    \printglossaries  
    \end{document}
    -

    -

    +

    +

    -

    Top

    2.7 Acronym Style Modifications

    -

    The

    The glossaries-extra package provides a new way of dealing with abbreviations and redefines \newacronymglossaries-extra is do just add

    -
    +
    \setabbreviationstyle[acronym]{long-short}
    -

    before you define any entries. For example, the following document using just +

    before you define any entries. For example, the following document using just glossaries

    -
    +
    \documentclass{article}  
    \usepackage[acronym,nopostdot,toc]{glossaries}  
    \makeglossaries @@ -3797,13 +3892,13 @@ class="cmss-10">glossaries  
    \printglossaries  
    \end{document}
    -

    can be easily adapted to use

    can be easily adapted to use glossaries-extra:

    -
    +
    \documentclass{article}  
    \usepackage[acronym]{glossaries-extra}  
    \makeglossaries @@ -3814,7 +3909,7 @@ class="cmss-10">glossaries-extra:  
    \printglossaries  
    \end{document}
    -

    Table 

    Table 2.1 lists the nearest equivalent glossaries-extra abbreviation styles for the predefined acronym styles provided by

    @@ -3853,34 +3948,34 @@ cellspacing="0" cellpadding="0" id="TBL-2-1" />

    Old Style Name

    New Style Name

    long-sc-short

    long-short-sc

    long-sm-short

    long-short-sm

    long-sp-short

    long-short
    #1}}

    short-long

    short-long

    sc-short-long

    short-sc-long

    sm-short-long

    short-sm-long

    long-short-desc

    long-short-desc

    long-sc-short-desc

    long-short-sc-desc

    long-sm-short-desc

    long-short-sm-desc

    long-sp-short-desc

    long-short-desc
    #1}}

    short-long-desc

    short-long-desc

    sc-short-long-desc

    short-sc-long-desc

    sm-short-long-desc

    short-sm-long-desc

    dua

    long-noshort

    dua-desc

    long-noshort-desc

    footnote

    short-footnote

    footnote-sc

    short-sc-footnote

    footnote-sm

    short-sm-footnote

    footnote-desc

    short-footnote-desc

    footnote-sc-desc

    short-sc-footnote-desc

    footnote-sm-desc

    short-sm-footnote-desc

    @@ -4073,7 +4168,7 @@ class="cmss-10">short-sm-footnote-desc
    -

    The reason for introducing the new style of abbreviation commands provided by +

    The reason for introducing the new style of abbreviation commands provided by glossaries-extra is because the original acronym commands provided by glossaries are @@ -4082,15 +4177,15 @@ class="cmss-10">glossaries-extra. However, if you really want to restore the generic acronym function provided by glossaries you can use -

    \RestoreAcronyms  \RestoreAcronyms
    -

    +

    (before any use of \newacronym). -

    \RestoreAcronyms should not be used in combination with the newer glossaries-extra abbreviations. Don’t combine old and new style entries with the same @@ -4100,7 +4195,7 @@ class="cmss-10">typeglossaries acronym mechanism doesn’t work well with the newer glossaries-extra commands. -

    If you use

    If you use \RestoreAcronyms, don’t use any of the commands provided by glossaries-extra intended for abbreviations (such as \newacronym as it will cause unexpected results.
    -

    -

    In general, there’s rarely any need for

    +

    In general, there’s rarely any need for \RestoreAcronyms. If you have a document that uses \newacronymstyle§3.5 Defining New Abbreviation Styles for further details.) -

    \glsacspace  \glsacspace{⟨label⟩}
    -

    +

    The space command \glsacspace used by the long-sp-short acronym style provided by glossaries is modified so that it uses -

    \glsacspacemax  \glsacspacemax
    -

    +

    instead of the hard-coded 3em. This is a command not a length and so can be changed using \renewcommand. -

    Any of the new abbreviation styles that use

    Any of the new abbreviation styles that use \glsxtrfullsep (such as \glsacspace with

    -
    +
    \renewcommand*{\glsxtrfullsep}[1]{\glsacspace{#1}}
    -

    -

    The

    +

    The first use acronym font command -

    \firstacronymfont{⟨text⟩}
    -

    +

    is redefined to use the first use abbreviation font command \glsfirstabbrvfont. This will be reset if you use \RestoreAcronyms. -

    The subsequent use acronym font command -

    The subsequent use acronym font command +

    \acronymfont{⟨text⟩}
    -

    +

    is redefined to use the subsequent use abbreviation font command \glsabbrvfont. This will be reset if you use \RestoreAcronyms.

    -

    Top

    2.8 Glossary Style Modifications

    -

    The default value of

    The default value of \glslistdottedwidth is changed so that it’s set at the start of the document (if it hasn’t been changed in the preamble). This should take into account situations where \hsize isn’t set until the start of the document. -

    The

    The glossaries package tries to determine the group title from its label by first checking if \glsxtr@grouptitle@⟨label⟩ which shouldn’t clash with another package. You can set the group title using -

    \glsxtrsetgrouptitle  label⟩}{⟨title⟩}
    -

    +

    For example:

    -
    +
    \glsxtrsetgrouptitle{A}{A (a)}
    -

    -

    +

    +

    -

    Top

    2.8.1 Style Hooks

    -

    The commands

    The commands \glossentryname and \glossentrydesc§5 Categories). This means you can make simple case-changing modifications to the name and description without defining a new glossary style. -

    There is a hook after

    There is a hook after \glossentryname and \Glossentryname: -

    \glsxtrpostnamehook  \glsxtrpostnamehook{⟨label⟩}
    -

    +

    By default this checks the indexname attribute. If the attribute exists for the category to which the label belongs, then the name is automatically indexed using -

    \glsxtrdoautoindexname{⟨}{indexname}
    -

    +

    See §7 Auto-Indexing for further details. -

    As from version 1.04, the post-name hook

    As from version 1.04, the post-name hook \glsxtrpostnamehook will also use \glsxtrpostname⟨ -

    +
    \newcommand*{\glsxtrpostnamesymbol}{\space  
     (\glsentrysymbol{\glscurrententrylabel})}
    -

    -

    The post-description code used within the glossary is modified so that it also +

    +

    The post-description code used within the glossary is modified so that it also does -

    \glsxtrpostdescription  \glsxtrpostdescription
    -

    +

    This occurs before the original \glspostdescription, so if the nopostdot=false option is used, it will be inserted before the terminating full stop. -

    This new command will do

    This new command will do \glsxtrpostdesc⟨category⟩ if it exists, where ⟨general\glsxtrpostdescacronym for entries with the category set to acronym. -

    Since both

    Since both \glossentry and \subglossentry set -

    \glscurrententrylabel  \glscurrententrylabel
    -

    +

    to the label for the current entry, you can use this within the definition of these post-description hooks if you need to reference the label. -

    For example, suppose you want to insert the plural form in brackets after the +

    For example, suppose you want to insert the plural form in brackets after the description in the glossary, but only for entries in the general category, then you could @@ -4366,14 +4461,14 @@ do:

    -
    +
    \renewcommand{\glsxtrpostdescgeneral}{\space  
     (plural: \glsentryplural{\glscurrententrylabel})}
    -

    This means you don’t have to define a custom glossary style, which you may find +

    This means you don’t have to define a custom glossary style, which you may find more complicated. (It also allows more flexibility if you decide to change the underlying glossary style.) -

    This feature can’t be used for glossary styles that ignore

    This feature can’t be used for glossary styles that ignore \glspostdescription or if you redefine \glspostdescription without including glossaries-extra-stylemods Package

    -

    +

    +

    -

    Top

    2.8.2 Number List

    -

    The

    The number list is now placed inside the argument of -

    \GlsXtrFormatLocationList  \GlsXtrFormatLocationList{⟨number list⟩}
    -

    +

    This is internally used by \glossaryentrynumbers. The nonumberlist\glossaryentrynumbers so that it doesn’t display th id="dx1-15004">number list, but it still saves the number list in case it’s required. -

    If you want to suppress the

    If you want to suppress the number list always use the nonumberlist option instead of redefining \glossaryentrynumbers to do nothing.
    -

    -

    If you want to, for example, change the font for the entire

    +

    If you want to, for example, change the font for the entire number list then redefine \GlsXtrFormatLocationList as appropriate. Don’t modify \glossaryentrynumbers. -

    Sometimes users like to insert “page” or “pages” in front of the

    Sometimes users like to insert “page” or “pages” in front of the number list. This is quite fiddly to do with the base glossaries package, but glossaries-extra provides a way of doing this. First you need to enable this option and specify the text to display using: -

    \GlsXtrEnablePreLocationTag  }{⟨pages⟩}
    -

    +

    where ⟨page⟩ is the text to display if the number list only contains a single location and @@ -4458,31 +4553,31 @@ class="cmti-10">pages⟩ is the text to display otherwise. For examp

    -
    +
    \GlsXtrEnablePreLocationTag{Page: }{Pages: }
    -

    An extra run is required when using this command. -

    Use

    An extra run is required when using this command. +

    Use glsignore not @gobble as the format if you want to suppress the page number (and only index the entry once).
    -

    -

    See the accompanying sample file

    +

    See the accompanying sample file sample-pages.tex. -

    Note that

    Note that bib2gls can be instructed to insert a prefix at the start of non-empty location lists, which can be used as an alternative to \GlsXtrEnablePreLocationTag. -

    +

    -

    Top

    2.8.3 The glossaries-extra-stylemods Package

    -

    As from v1.02,

    As from v1.02, glossaries-extra now includes the package glossaries-extra-stylemods that @@ -4494,12 +4589,12 @@ class="cmss-10">glossaries-extra. For example:

    -
    +
    \usepackage{glossaries-extra}  
    \usepackage{glossary-longragged}  
    \usepackage{glossaries-extra-stylemods}
    -

    Alternatively you can load

    Alternatively you can load glossary-⟨name⟩.sty at the same time by passing ⟨glossaries-extra-stylemods -

    +
    \usepackage{glossaries-extra}  
    \usepackage[longragged]{glossaries-extra-stylemods}
    -

    Another option is to use the

    Another option is to use the stylemods key when you load long3col -

    +
    \usepackage[style=long3col,stylemods]{glossaries-extra}
    -

    Or the value of

    Or the value of stylemods may be a comma-separated list of the style package @@ -4541,19 +4636,19 @@ identifiers. For example:

    -
    +
    \usepackage[style=mcoltree,stylemods=mcols]{glossaries-extra}
    -

    Remember to group the value if it contains any commas: +

    Remember to group the value if it contains any commas:

    -
    +
    \usepackage[stylemods={mcols,longbooktabs}]{glossaries-extra}
    -

    -

    Note that the

    +

    Note that the inline style is dealt with slightly differently. The original definition provided by the inlinenopostdot option, but the post-description category hook can still be used. -

    As from version 1.05, the

    As from version 1.05, the glossaries-extra-stylemods package provides some additional commands for use with the alttreenotree option has been used when loading glossaries. -

    \eglssetwidest  level⟩]{⟨name⟩}
    -

    +

    This is like \glssetwidest (provided by glossary-tree) but performs a protected expansion on ⟨name⟩. This has a localised effect. For a global setting, use -

    \xglssetwidest  level⟩]{⟨name⟩}
    -

    +

    The widest entry value can later be retrieved using -

    \glsgetwidestname  \glsgetwidestname
    -

    +

    for the top-level entries and -

    \glsgetwidestsubname  \glsgetwidestsubname{⟨level⟩}
    -

    +

    for sub-entries, where ⟨level⟩ is the level number. -

    The command

    The command \glsfindwidesttoplevelname provided by glossary-tree has a CamelCase synonym: -

    \glsFindWidestTopLevelName  \glsFindWidestTopLevelName[⟨glossary list⟩]
    -

    +

    Similar commands are also provided: -

    \glsFindWidestUsedTopLevelName  glossary list⟩]
    -

    +

    This has an additional check that the entry has been used. Naturally this is only useful if the glossaries that use the alttree

    \glsFindWidestUsedAnyName  \glsFindWidestUsedAnyName[⟨glossary list⟩]
    -

    +

    This is like the previous command but if doesn’t check the parent key. This is useful if all levels should have the same width for the name. -

    \glsFindWidestAnyName  \glsFindWidestAnyName[⟨glossary list⟩]
    -

    +

    This is like the previous command but doesn’t check if the entry has been used. -

    \glsFindWidestUsedLevelTwo  \glsFindWidestUsedLevelTwo[⟨glossary list⟩]
    -

    +

    This is like \glsFindWidestUsedTopLevelName but also sets the first two sub-levels as well. Any entry that has a great-grandparent is ignored. -

    \glsFindWidestLevelTwo  \glsFindWidestLevelTwo[⟨glossary list⟩]
    -

    +

    This is like the previous command but doesn’t check if the entry has been used. -

    \glsFindWidestUsedAnyNameSymbol  glossary list⟩]{⟨register⟩}
    -

    +

    This is like \glsFindWidestUsedAnyName but also measures the symbol. The length of the widest symbol is stored in ⟨register⟩. -

    \glsFindWidestAnyNameSymbol  list⟩]{⟨register⟩}
    -

    +

    This is like the previous command but it doesn’t check if the entry has been used. -

    \glsFindWidestUsedAnyNameSymbolLocation  symbol register⟩}{⟨location register⟩}
    -

    +

    This is like \glsFindWidestUsedAnyNameSymbol but also measures the symbol register⟩ and the length of the widest number list is stored in ⟨location register⟩. -

    \glsFindWidestAnyNameSymbolLocation  symbol register⟩}{⟨location register⟩}
    -

    +

    This is like the previous command but it doesn’t check if the entry has been used. -

    \glsFindWidestUsedAnyNameLocation  }
    -

    +

    This is like \glsFindWidestUsedAnyNameSymbolLocation but doesn’t measure the symbol. The length of the widest number list is stored in ⟨register⟩. -

    \glsFindWidestAnyNameLocation  list⟩]{⟨register⟩}
    -

    +

    This is like the previous command but doesn’t check if the entry has been used. -

    The layout of the symbol, description and

    The layout of the symbol, description and number list is governed by -

    \glsxtralttreeSymbolDescLocation  label⟩}{⟨number list⟩}
    -

    +

    for top-level entries and -

    \glsxtralttreeSubSymbolDescLocation  label⟩}{⟨number list⟩}
    -

    +

    for sub-entries. -

    There is now a user level command that performs the initialisation for the

    There is now a user level command that performs the initialisation for the alttree style: -

    \glsxtralttreeInit  \glsxtralttreeInit
    -

    -

    The paragraph indent for subsequent paragraphs in multi-paragraph descriptions +

    +

    The paragraph indent for subsequent paragraphs in multi-paragraph descriptions is provided by the length -

    \glsxtrAltTreeIndent  \glsxtrAltTreeIndent
    -

    -

    For additional commands that are available with the

    +

    For additional commands that are available with the alttree style, see the documented code (sample-alttree-marginpar.tex.

    -

    -

    +

    Top

    3. Abbreviations

    -

    Abbreviations include acronyms (words formed from initial letters, such as +

    Abbreviations include acronyms (words formed from initial letters, such as “laser”), initialisms (initial letters of a phrase, such as “html”, that aren’t pronounced as words) and contractions (where parts of words are omitted, often replaced by an apostrophe, such as “don’t”). The “acronym” code provided by the @@ -4901,10 +4996,10 @@ to be described for readers unfamiliar with the term). They are therefore more like a regular term, which may or may not require a description in the glossary. -

    The

    The glossaries-extra package corrects this misnomer, and provides better abbreviation handling, with -

    \newabbreviation  }{⟨long⟩}
    -

    -

    This sets the

    +

    This sets the category key to abbreviation by default, but that value may be @@ -4942,7 +5037,7 @@ href="#sec:categories">§5 Categories for further details. -

    See

    See §2.6 Nested Links regarding the pitfalls of using commands like \glsxtrshort within ⟨short⟩ or ⟨long⟩. -

    Make sure that you set the category attributes before defining new abbreviations +

    Make sure that you set the category attributes before defining new abbreviations or they may not be correctly applied.
    -

    -

    The

    +

    The \newacronym command provided by the glossaries package is redefined by @@ -4970,7 +5065,7 @@ class="cmtt-10">acronym (see also href="#sec:acronymmods">§2.7 Acronym Style Modifications) so -

    \newacronym  short⟩}{⟨long⟩}
    -

    +

    is now equivalent @@ -5009,7 +5104,7 @@ class="cmtt-10">}
    -

    The

    The \newabbreviation command is superficially similar to the glossaries package’s abbreviationglossaries package, although they may produce similar results.) -

    The way the abbreviations are displayed by commands like

    The way the abbreviations are displayed by commands like \gls varies according to the abbreviation style. The styles are set according to the entry’s category so, unlike the base glossaries package, you can have different abbreviation styles within the same glossary. -

    There are two types of full forms. The display full form, which is used on +

    There are two types of full forms. The display full form, which is used on first use by commands like short-footnote, the display and inline full forms are different. -

    These formatting commands aren’t stored in the

    These formatting commands aren’t stored in the short, shortplural\glsxtrlong\glsfirstlongfont.

    -

    Top

    3.1 Tagging Initials

    -

    If you would like to tag the initial letters in the long form such that those letters are +

    If you would like to tag the initial letters in the long form such that those letters are underlined in the glossary but not in the main part of the document, you can use -

    \GlsXtrEnableInitialTagging  } class="cmtt-10">{⟨cs⟩}
    -

    +

    before you define your abbreviations. -

    This command (robustly) defines ⟨

    This command (robustly) defines ⟨cs⟩ (a control sequence) to accept a single argument, which is the letter (or letters) that needs to be tagged. The normal behaviour of this command within the document is to simply do its argument, but in @@ -5104,21 +5199,21 @@ href="#catattr.tagging">tagging attribute set to “true”. For those cases it will use -

    \glsxtrtagfont  \glsxtrtagfont{⟨text⟩}
    -

    +

    This command defaults to \underline{⟨text⟩} but may be redefined as required. -

    The control sequence ⟨

    The control sequence ⟨cs⟩ can’t already be defined when used with the unstarred version of \GlsXtrEnableInitialTagging for safety reasons. The starred @@ -5130,7 +5225,7 @@ commands, ensure that you don’t redefine something important. In fact, jus forget the existence of the starred version and let’s pretend I didn’t mention it. -

    The first argument of

    The first argument of \GlsXtrEnableInitialTagging is a comma-separated list of category names. The §5 Categories) but this must be done before the glossary is displayed. -

    The accompanying sample file

    The accompanying sample file sample-mixtures.tex uses initial tagging for both the acronymabbreviation -

    +
    \GlsXtrEnableInitialTagging{acronym,abbreviation}{\itag}
    -

    This defines the command

    This defines the command \itag which can be used in the definitions. For example:

    -
    +
    \newacronym  
     [description={a system for detecting the location and  
     speed of ships, aircraft, etc, through the use of radio @@ -5174,18 +5269,18 @@ example:  
    \newabbreviation{xml}{XML}  
     {e\itag{x}tensible \itag{m}arkup \itag{l}anguage}
    -

    The underlining of the tagged letters only occurs in the glossary and then only for +

    The underlining of the tagged letters only occurs in the glossary and then only for entries with the tagging attribute set. -

    +

    -

    Top

    3.2 Abbreviation Styles

    -

    The abbreviation style must be set before abbreviations are defined using: -

    The abbreviation style must be set before abbreviations are defined using: +

    \setabbreviationstyle  ]{⟨style-name⟩}
    -

    +

    where ⟨style-name⟩ is the name of the style and ⟨category⟩ is the category label @@ -5217,11 +5312,11 @@ class="cmss-10">regular attribute to true. -

    If you want to apply different styles to groups of abbreviations, assign a +

    If you want to apply different styles to groups of abbreviations, assign a different category to each group and set the style for the given category.
    -

    -

    Note that

    +

    Note that \setacronymstyle is disabled by glossaries-extra. Use

    @@ -5242,7 +5337,7 @@ href="#sec:acronymmods">§2.7 Acronym Style Modifications). However the original acronym interface is incompatible with all the commands described here. -

    Abbreviations can be used with the standard

    Abbreviations can be used with the standard glossaries commands, such as \gls, @@ -5252,7 +5347,7 @@ class="cmtt-10">\acrshort\acronymfont). The short form can be produced with: -

    \glsxtrshort  label⟩}[⟨insert⟩]
    -

    +

    (Use this instead of \acrshort.) -

    The long form can be produced with -

    The long form can be produced with +

    \glsxtrlong  label⟩}[⟨insert⟩]
    -

    +

    (Use this instead of \acrlong.) -

    The

    The inline full form can be produced with -

    \glsxtrfull  label⟩}[⟨insert⟩]
    -

    +

    (This this instead of \acrfull.) -

    In general, it’s best not to use commands like

    In general, it’s best not to use commands like \glsfirst for abbreviations, especially if you use the ⟨insert⟩ optional argument. Use either \gls (possibly with a reset) or \glsxtrfull.
    -

    -

    As mentioned earlier, the inline full form may not necessarily match the format +

    +

    As mentioned earlier, the inline full form may not necessarily match the format used on first use with short-nolongfirst use, but the full form will display the long form followed by the short form in parentheses. -

    If you want to use an abbreviation in a chapter or section title, use the +

    If you want to use an abbreviation in a chapter or section title, use the commands described in §4 Entries in Sectioning Titles, Headers, Captions and Contents instead.
    -

    -

    The arguments ⟨

    +

    The arguments ⟨options⟩, ⟨label⟩ and ⟨insert⟩ are the same as for commands such as \glstext. There are also analogous case-changing commands: -

    First letter upper case short form: -

    First letter upper case short form: +

    \Glsxtrshort  label⟩}[⟨insert⟩]
    -

    -

    First letter upper case long form: -

    +

    First letter upper case long form: +

    \Glsxtrlong  label⟩}[⟨insert⟩]
    -

    -

    First letter upper case inline full form: -

    +

    First letter upper case inline full form: +

    \Glsxtrfull  label⟩}[⟨insert⟩]
    -

    -

    All upper case short form: +

    +

    All upper case short form: -

    \Glsxtrshort  label⟩}[⟨insert⟩]
    -

    -

    All upper case long form: -

    +

    All upper case long form: +

    \Glsxtrlong  label⟩}[⟨insert⟩]
    -

    -

    All upper case inline full form: -

    +

    All upper case inline full form: +

    \GLSxtrfull  label⟩}[⟨insert⟩]
    -

    -

    Plural forms are also available. -

    Short form plurals: -

    +

    Plural forms are also available. +

    Short form plurals: +

    \glsxtrshortpl  label⟩}[⟨insert⟩]
    -

    -

    +

    \Glsxtrshortpl  label⟩}[⟨insert⟩]
    -

    -

    +

    \GLSxtrshortpl  label⟩}[⟨insert⟩]
    -

    -

    Long form plurals: -

    +

    Long form plurals: +

    \glsxtrlongpl  label⟩}[⟨insert⟩]
    -

    -

    +

    \Glsxtrlongpl  label⟩}[⟨insert⟩]
    -

    -

    +

    \GLSxtrlongpl  label⟩}[⟨insert⟩]
    -

    -

    Full form plurals: -

    +

    Full form plurals: +

    \glsxtrfullpl  label⟩}[⟨insert⟩]
    -

    -

    +

    \Glsxtrfullpl  label⟩}[⟨insert⟩]
    -

    -

    +

    \GLSxtrfullpl  label⟩}[⟨insert⟩]
    -

    -

    Be careful about using

    +

    Be careful about using \glsentryfull, \Glsentryfull, \glsentryfullpl and @@ -5541,13 +5636,13 @@ class="cmtt-10">\glsentryshort etc.
    -

    -

    +

    +

    -

    Top

    3.3 Shortcut Commands

    -

    The abbreviation shortcut commands can be enabled using the package option +

    The abbreviation shortcut commands can be enabled using the package option shortcutstable 3.1. -

    @@ -5883,10 +5978,10 @@ class="cmtt-10">\newabbreviation
    -

    Top

    3.4 Predefined Abbreviation Styles

    -

    There are two types of abbreviation styles: those that treat the abbreviation as a +

    There are two types of abbreviation styles: those that treat the abbreviation as a regular entry (so that \gls uses \gls uses \glsxtrgenabbrvfmt). -

    The regular entry abbreviation styles set the

    The regular entry abbreviation styles set the regular attribute to “true” for the @@ -5922,7 +6017,7 @@ class="cmss-10">long\glsxtrshort. -

    The other abbreviation styles don’t modify the

    The other abbreviation styles don’t modify the regular attribute. The \glsxtrfullformat that are defined by the style). -

    In both cases, the

    In both cases, the first use of \gls may not match the text produced by \glsfirst (and likewise for the plural and case-changing versions). -

    The sample file

    The sample file sample-abbr-styles.tex demonstrates all predefined styles described here. -

    For the “sc” styles that use

    For the “sc” styles that use \textsc, be careful about your choice of fonts as some only have limited support. For example, you may not be able to combine bold @@ -5961,52 +6056,52 @@ class="cmss-10">fontenc package with the T1 option or something similar.
    -

    -

    The parenthetical styles, such as

    +

    The parenthetical styles, such as long-short, use -

    \glsxtrparen  \glsxtrparen{⟨text⟩}
    -

    +

    to set the parenthetical material. This just puts parentheses around the text: (⟨text⟩). -

    The basic abbreviation styles, such as

    The basic abbreviation styles, such as long-short and short-long use -

    \glsabbrvdefaultfont  \glsabbrvdefaultfont{⟨text⟩}
    -

    +

    for the short form. This just does ⟨text⟩ by default. (That is, no font change is applied.) On first use, -

    \glsfirstabbrvdefaultfont  \glsfirstabbrvdefaultfont{⟨text⟩}
    -

    +

    is used instead. By default, this just does \glsabbrvdefaultfont. The long form is formatted according to -

    \glslongdefaultfont  }
    -

    +

    which again just does ⟨text⟩ (no font change). On first use, -

    \glsfirstlongdefaultfont  \glsfirstlongdefaultfont{⟨text⟩}
    -

    +

    is used instead. This just does \glslongdefaultfont. The plural suffix used for the short form is given by -

    \glsxtrabbrvpluralsuffix  \glsxtrabbrvpluralsuffix
    -

    +

    which defaults to \glspluralsuffix. -

    The small-cap styles, such as

    The small-cap styles, such as long-short-sc and short-sc-long, use -

    \glsabbrvscfont  \glsabbrvscfont{⟨text⟩}
    -

    +

    which uses \textsc.3.1 On first use -

    \glsabbrvdefaultfont  \glsfirstabbrvscfont{⟨text⟩}
    -

    +

    is used instead. This uses \glsabbrvscfont by default. So redefine, \glsabbrvscfont to change first and subsequent uses or \glsfirstabbrvscfont to change just the first use. -

    The long form for the small-cap styles uses

    The long form for the small-cap styles uses \glslongdefaultfont or \glsfirstlongdefaultfont, as with the basic style. The suffix is given by -

    \glsxtrscsuffix  \glsxtrscsuffix
    -

    +

    This is defined as

    -
    +
    \newcommand*{\glsxtrscsuffix}{\glstextup{\glsxtrabbrvpluralsuffix}}
    -

    The

    The \glstextup command is provided by glossaries and is used to switch off the @@ -6112,51 +6207,51 @@ attributes. See §5 Categories for further details.) -

    The small styles, such as

    The small styles, such as long-short-sm and short-sm-long, use -

    \glsabbrvsmfont  \glsabbrvsmfont{⟨text⟩}
    -

    +

    which uses \textsmaller. (This requires the relsizes package, which isn’t loaded by glossaries-extra, so must be loaded explicitly.) On first use -

    \glsfirstabbrvsmfont  \glsfirstabbrvsmfont{⟨text⟩}
    -

    +

    is used instead. This uses \glsabbrvsmfont by default. -

    The long form for the smaller styles uses

    The long form for the smaller styles uses \glslongdefaultfont or \glsfirstlongdefaultfont, as with the basic style. The suffix is given by -

    \glsxtrsmsuffix  \glsxtrsmsuffix
    -

    +

    which defaults to just \glsxtrabbrvpluralsuffix. -

    The “short-em” (emphasize short) styles, such as

    The “short-em” (emphasize short) styles, such as long-short-em or short-em-long, use -

    \glsabbrvemfont  \glsabbrvemfont{⟨text⟩}
    -

    +

    On first use -

    \glsfirstabbrvemfont  \glsfirstabbrvemfont{⟨text⟩}
    -

    +

    is used instead. This uses \glsabbrvemfont by default. The suffix is given by -

    \glsxtremsuffix  \glsxtremsuffix
    -

    +

    which defaults to just \glsxtrabbrvpluralsuffix. The long form is as for the basic style unless the style is a “long-em” style. -

    The “long-em” (emphasize long) styles, such as

    The “long-em” (emphasize long) styles, such as long-em-short-em or short-em-long-em, use -

    \glsfirstlongemfont  \glsfirstlongemfont{⟨long-form⟩}
    -

    +

    instead of \glsfirstlongdefaultfont{⟨long-form⟩} and -

    \glslongemfont  }
    -

    +

    instead of \glslongdefaultfont{⟨long-form⟩}. The first form \glsfirstlongemfont is initialised to use \glslongemfont. -

    The user styles have similar commands: -

    The user styles have similar commands: +

    \glsabbrvuserfont  \glsabbrvuserfont{⟨text⟩}
    -

    +

    for the short form, -

    \glsfirstabbrvuserfont  \glsfirstabbrvuserfont{⟨text⟩}
    -

    +

    for the first use short form, -

    \glslonguserfont  \glslonguserfont{⟨text⟩}
    -

    +

    for the long form, -

    \glsfirstlonguserfont  \glsfirstlonguserfont{⟨text⟩}
    -

    +

    for the first use long form, and -

    \glsxtrusersuffix  \glsxtrusersuffix
    -

    +

    for the short plural suffix. -

    Similarly for the hyphen styles: -

    Similarly for the hyphen styles: +

    \glsabbrvhyphenfont  \glsabbrvhyphenfont{⟨text⟩}
    -

    +

    for the short form, -

    \glsfirstabbrvhyphenfont  \glsfirstabbrvhyphenfont{⟨text⟩}
    -

    +

    for the first use short form, -

    \glslonghyphenfont  \glslonghyphenfont{⟨text⟩}
    -

    +

    for the long form, -

    \glsfirstlonghyphenfont  \glsfirstlonghyphenfont{⟨text⟩}
    -

    +

    for the first use long form, and -

    \glsxtrhyphensuffix  \glsxtrhyphensuffix
    -

    +

    for the short plural suffix. -

    Similarly for the “only” styles, such as

    Similarly for the “only” styles, such as long-only-short-only: -

    \glsabbrvonlyfont  \glsabbrvonlyfont{⟨text⟩}
    -

    +

    for the short form, -

    \glsfirstabbrvonlyfont  \glsfirstabbrvonlyfont{⟨text⟩}
    -

    +

    for the first use short form, -

    \glslongonlyfont  \glslongonlyfont{⟨text⟩}
    -

    +

    for the long form, -

    \glsfirstlongonlyfont  }
    -

    +

    for the first use long form, and -

    \glsxtronlysuffix  \glsxtronlysuffix
    -

    +

    for the short plural suffix. -

    Note that by default inserted material (provided in the final optional argument of +

    Note that by default inserted material (provided in the final optional argument of commands like \gls), is placed outside the font command in the predefined styles. To move it inside, use: -

    \glsxtrinsertinsidetrue  \glsxtrinsertinsidetrue
    -

    +

    This applies to all the predefined styles. For example:

    -
    +
    \setabbreviationstyle{long-short}  
    \renewcommand*{\glsfirstlongdefaultfont}[1]{\emph{#1}}  
    \glsxtrinsertinsidetrue
    -

    This will make the long form and the inserted text emphasized, whereas the default +

    This will make the long form and the inserted text emphasized, whereas the default (without \glsxtrinsertinsidetrue) would place the inserted text outside of the emphasized font. -

    Note that for some styles, such as the

    Note that for some styles, such as the short-long, the inserted text would be placed inside the font command for the short form (rather than the long form in the above example). -

    Remember that

    Remember that \textsc renders lowercase letters as small capitals. Uppercase letters are rendered as normal uppercase letters, so if you specify the short form in @@ -6410,49 +6505,49 @@ convert its argument to lowercase. For example:

    -
    +
    \renewcommand*{\glsabbrvscfont}[1]{\textsc{\MakeLowercase{#1}}}
    -

    -

    If you want to easily switch between the “sc” and “sm” styles, you may find it +

    +

    If you want to easily switch between the “sc” and “sm” styles, you may find it easier to redefine this command to convert case:

    -
    +
    \renewcommand*{\glsabbrvscfont}[1]{\textsc{\MakeTextLowercase{#1}}}  
    \renewcommand*{\glsabbrvsmfont}[1]{\textsmaller{\MakeTextUppercase{#1}}}
    -

    -

    Some of the styles use -

    +

    Some of the styles use +

    \glsxtrfullsep  \glsxtrfullsep{⟨label⟩}
    -

    +

    as a separator between the long and short forms. This is defined as a space by default, but may be changed as required. For example:

    -
    +
    \renewcommand*{\glsxtrfullsep}[1]{~}
    -

    or +

    or

    -
    +
    \renewcommand*{\glsxtrfullsep}[1]{\glsacspace{#1}}
    -

    -

    The new naming scheme for abbreviation styles is as follows:

    +

    +

    The new naming scheme for abbreviation styles is as follows:

    • ⟨field1⟩[field2⟩[-⟨modifier2⟩][-user] -

      This is for the parenthetical styles. The

      This is for the parenthetical styles. The -⟨modifier⟩ parts may be omitted. These styles display ⟨field2⟩ in parentheses. If ⟨field2⟩ starts with “no” then the parenthetical element is omitted from the display style but is included in the inline style. -

      If the

      If the -⟨modifier⟩ part is present, then the field has a font changing command applied to it. -

      If

      If post is present then ⟨field2⟩ is placed after the link-text using the post-link hook. -

      If the

      If the -user part is present, then the user1 value, if provided, is inserted into the parenthetical material . (The field used for the inserted material may be changed.) -

      Examples:

      +

      Examples:

      -

      Similar problems can also occur with captions (except for the page header and bookmark +

      Similar problems can also occur with captions (except for the page header and bookmark issues). -

      To get around all these problems, the

      To get around all these problems, the glossaries user manual recommends using the expandable non-hyperlink commands, such as \glsentrytext -

      +
      \chapter{A Chapter about \glsabbrvfont{\glsentryshort{html}}}
      -

      Or, if you are using

      Or, if you are using hyperref:

      -
      +
      \chapter{A Chapter about  
      \texorpdfstring{\glsabbrvfont{\glsentryshort{html}}}{\glsentryshort{html}}}
      -

      -

      Since this is a bit cumbersome, you might want to define a new command to do +

      +

      Since this is a bit cumbersome, you might want to define a new command to do this for you. However, if you have mixed styles this won’t work as commands like \gls and \MakeUppercase. -

      The

      The glossaries-extra package tries to resolve this by modifying \markright and @@ -9269,12 +9364,12 @@ class="cmtt-10">\markright\markboth. If you don’t like this change, you can restore their former definitions using -

      \glsxtrRevertMarks  \glsxtrRevertMarks
      -

      +

      In this case, you’ll have to use the glossaries manual’s recommendations of either simply using -

      +
      \chapter[A Chapter about \glsentryshort{html}]{A Chapter about \gls{html}}
      -

      -

      If you don’t revert the mark commands back with

      +

      If you don’t revert the mark commands back with \glsxtrRevertMarks, you can use the commands described below in the argument of sectioning commands. You can still use them even if the mark commands have been reverted, but only where they don’t conflict with the page style. -

      The commands listed below all use

      The commands listed below all use \texorpdfstring if hyperref

      These commands essentially behave as though you have used

      These commands essentially behave as though you have used \glsxtrshort (or equivalent) with the options noindexheaduc attribute to “true” for the appropriate category. -

      If you use one of the

      If you use one of the \textsc styles, be aware that the default fonts don’t provide bold small-caps or italic small-caps. This means that if the chapter @@ -9334,37 +9429,37 @@ class="cmtt-10">\glsabbrvfont. You may want to consider using the slantsc package in this case.
      -

      -

      Display the short form: -

      +

      Display the short form: +

      \glsfmtshort  \glsfmtshort{⟨label⟩}
      -

      -

      Display the plural short form: -

      +

      Display the plural short form: +

      \glsfmtshortpl  \glsfmtshortpl{⟨label⟩}
      -

      -

      First letter upper case singular short form: -

      +

      First letter upper case singular short form: +

      \Glsfmtshort  \Glsfmtshort{⟨label⟩}
      -

      +

      (No case-change applied to PDF bookmarks.) -

      First letter upper case plural short form: -

      First letter upper case plural short form: +

      \Glsfmtshortpl  }
      -

      +

      (No case-change applied to PDF bookmarks.) -

      Display the long form: -

      Display the long form: +

      \glsfmtlong  \glsfmtlong{⟨label⟩}
      -

      -

      Display the plural long form: -

      +

      Display the plural long form: +

      \glsfmtlongpl  \glsfmtlongpl{⟨label⟩}
      -

      -

      First letter upper case singular long form: -

      +

      First letter upper case singular long form: +

      \Glsfmtlong  \Glsfmtlong{⟨label⟩}
      -

      +

      (No case-change applied to PDF bookmarks.) -

      First letter upper case plural long form: -

      First letter upper case plural long form: +

      \Glsfmtlongpl  \Glsfmtlongpl{⟨label⟩}
      -

      +

      (No case-change applied to PDF bookmarks.) -

      There are similar commands for the full form, but note that these use the

      There are similar commands for the full form, but note that these use the inline full form, which may be different from the full form used by \gls. -

      Display the full form: -

      Display the full form: +

      \glsfmtfull  \glsfmtfull{⟨label⟩}
      -

      -

      Display the plural full form: -

      +

      Display the plural full form: +

      \glsfmtfullpl  \glsfmtfullpl{⟨label⟩}
      -

      -

      First letter upper case singular full form: -

      +

      First letter upper case singular full form: +

      \Glsfmtfull  \Glsfmtfull{⟨label⟩}
      -

      +

      (No case-change applied to PDF bookmarks.) -

      First letter upper case plural full form: -

      First letter upper case plural full form: +

      \Glsfmtfullpl  \Glsfmtfullpl{⟨label⟩}
      -

      +

      (No case-change applied to PDF bookmarks.) -

      There are also equivalent commands for the value of the

      There are also equivalent commands for the value of the text field: -

      \glsfmttext  \glsfmttext{⟨label⟩}
      -

      -

      First letter converted to upper case: -

      +

      First letter converted to upper case: +

      \Glsfmttext  \Glsfmttext{⟨label⟩}
      -

      +

      (No case-change applied to PDF bookmarks.) -

      The plural equivalents: -

      The plural equivalents: +

      \glsfmtplural  }
      -

      +

      and -

      \Glsfmtplural  \Glsfmtplural{⟨label⟩}
      -

      -

      Similarly for the value of the

      +

      Similarly for the value of the first field: -

      \glsfmtfirst  \glsfmtfirst{⟨label⟩}
      -

      -

      First letter converted to upper case: -

      +

      First letter converted to upper case: +

      \Glsfmtfirst  \Glsfmtfirst{⟨label⟩}
      -

      +

      (No case-change applied to PDF bookmarks.) -

      The plural equivalents: -

      The plural equivalents: +

      \glsfmtfirstpl  \glsfmtfirstpl{⟨label⟩}
      -

      +

      and -

      \Glsfmtfirstpl  \Glsfmtfirstpl{⟨label⟩}
      -

      +

      -

      -

      +

      Top

      5. Categories

      -

      Each entry defined by

      Each entry defined by \newglossaryentry (or commands that internally use it such as babel shorthands on that make some characters active.) -

      The use of categories can give you more control over the way entries are displayed +

      The use of categories can give you more control over the way entries are displayed in the text or glossary. Note that an entry’s category is independent of the glossary type. Be careful not to confuse category with type. -

      The default category assumed by

      The default category assumed by \newglossaryentry is labelled general. @@ -9579,7 +9674,7 @@ class="cmtt-10">\newacronym have the category set to acronym by default. -

      Additionally, if you have enabled

      Additionally, if you have enabled \newterm with the indexnumbersnumber. -

      You can obtain the category label for a given entry using -

      You can obtain the category label for a given entry using +

      \glscategory  \glscategory{⟨label⟩}
      -

      +

      This is equivalent to commands like \glsentryname and so may be used in an expandable context. No error is generated if the entry doesn’t exist. -

      You can test the category for a given entry using -

      You can test the category for a given entry using +

      \glsifcategory  part⟩}{⟨false part⟩}
      -

      +

      This is equivalent to

      }
      so any restrictions that apply to \ifglsfieldeq also apply to \glsifcategory. -

      Each category may have a set of attributes. For example, the

      Each category may have a set of attributes. For example, the general and acronym\glsentryfmt to determine whether to use \glsgenentryfmt or \glsxtrgenabbrvfmt. -

      Other attributes recognised by

      Other attributes recognised by glossaries-extra are:

      nohyperfirst attribute then just redefine -

      \glsxtrchecknohyperfirst  \glsxtrchecknohyperfirst{⟨label⟩}
      -

      +

      to do nothing.

      non-plural commands like \gls or \glstext. (Provided for entries such as abbreviations that end with a full stop.) -

      Note that this can cause a problem if you access a field that doesn’t end with a +

      Note that this can cause a problem if you access a field that doesn’t end with a full stop. For example:

      -
      +
      \newabbreviation  
       [user1={German Speaking \TeX\ User Group}]  
       {dante}{DANTE e.V.}{Deutschsprachige Anwendervereinigung \TeX\  
      e.V.}
      -

      Here the

      Here the short and longuser1 -

      +
      \glsuseri{dante}[.]
      -

      This will bring the punctuation character inside the

      This will bring the punctuation character inside the link-text and it won’t be discarded. @@ -9845,40 +9940,40 @@ class="description">If this attribute is set to “true” any entry def class="cmtt-10">\newabbreviation will automatically have spaces in the long form replaced with -

      \glsxtrwordsep  \glsxtrwordsep
      -

      +

      and each word is encapsulated with -

      \glsxtrword  \glsxtrword{⟨word⟩}
      -

      +

      For example:

      -
      +
      \glssetcategoryattribute{abbreviation}{markwords}{true}  
      \newabbreviation{ip}{IP}{Internet Protocol}
      -

      is essentially the same as +

      is essentially the same as

      -
      +
      \newabbreviation{ip}{IP}  
      {\glsxtrword{Internet}\glsxtrwordsep\glsxtrword{Protocol}}
      -

      The “hyphen” styles, such as

      The “hyphen” styles, such as long-hyphen-short-hyphen, take advantage of this @@ -9896,19 +9991,19 @@ class="cmtt-10">\glsxtrlong. You can provide your own

      -
      +
      \newcommand{\hyplong}[2][]{%  
       {\def\glsxtrwordsep{-}\glsxtrlong[#1]{#2}}}
      -

      -

      This setting will also adjust the long plural. -

      This setting may result in the

      +

      This setting will also adjust the long plural. +

      This setting may result in the \glsxtrword and \glsxtrwordsep markup ending up in the sort field, depending on the style in use.
      -

      +

      markwords but applies to the short form. (Only useful for abbreviations that contain spaces.) -

      This setting will only adjust the short plural if the

      This setting will only adjust the short plural if the shortplural key isn’t used. This setting will take precedence over insertdots. -

      This setting may result in the

      This setting may result in the \glsxtrword and \glsxtrwordsep markup ending up in the sort field, depending on the style in use.
      -

      +

      markshortwords. -

      If you explicitly override the short plural using the

      If you explicitly override the short plural using the shortplural key, you must explicitly insert the dots yourself (since there’s no way for the code to determine if the plural has a suffix that shouldn’t be followed by a dot).
      -

      -

      This attribute is best used with the

      +

      This attribute is best used with the discardperiod attribute set to “true”. @@ -10052,7 +10147,7 @@ class="cmtt-10">\glsxtrifcounttrigger\cgls should behave. -

      With

      With glossaries, commands like \cgls use \cglsformat only if the previous @@ -10090,7 +10185,7 @@ class="cmtt-10">\capitalisewordsmfirstuc). If you want to use a different command you can redefine: -

      \glsxtrfieldtitlecasecs  \glsxtrfieldtitlecasecs{⟨phrase cs⟩}
      -

      +

      For example:

      -
      +
      \newcommand*{\glsxtrfieldtitlecasecs}[1]{\xcapitalisefmtwords*{#1}}
      -

      (Note that the argument to

      (Note that the argument to \glsxtrfieldtitlecasecs will be a control sequence whose replacement text is the entry’s description, which is why \xcapitalisefmtwords is needed instead of \capitalisefmtwords.)

    -

    Any other values of this attribute are ignored. Remember that there are design +

    Any other values of this attribute are ignored. Remember that there are design limitations for both the first letter uppercasing and the title casing commands. See the mfirstuc\glossentrydesc +

    -

    +

    \glossentryname +
    \glssetcategoryattribute{general}{glossnamefont}{emph}
    -

    Note that this overrides

    Note that this overrides \glsnamefont which will only be used if this attribute hasn’t been set. -

    Remember that glossary styles may additionally apply a font change, +

    Remember that glossary styles may additionally apply a font change, such as the list styles which put the name in the optional argument of \item. @@ -10221,10 +10316,10 @@ class="cmtt-10">\gls will be set to the -

    +
    \glssetcategoryattribute{general}{targeturl}{master-doc.pdf}
    -

    (See also the accompanying sample file

    (See also the accompanying sample file sample-external.tex.) If the URL contains awkward characters (such as % or \glspercentchar and \glstildechar that expand to literal characters. -

    If you want to a named anchor within the target URL (notionally adding +

    If you want to a named anchor within the target URL (notionally adding #⟨name⟩ to the URL), then you also need to set \glslabel within ⟨name⟩ which is set by commands like \gls to the entry’s label. -

    All the predefined glossary styles start each entry listing with

    All the predefined glossary styles start each entry listing with \glstarget which sets the anchor to \glolinkprefix\glslabel, so if you want @@ -10261,13 +10356,13 @@ class="cmss-10">targeturl -

    +
    \glssetcategoryattribute{general}{targetname}{\glolinkprefix\glslabel}
    -

    (If the target document changed

    (If the target document changed \glolinkprefix then you will need to adjust the above as appropriate.) -

    If the anchor is in the form ⟨

    If the anchor is in the form ⟨name1⟩.⟨name2⟩ then use targetcategory for the ⟨name1⟩ part. -

    For example: +

    For example:

    -
    +
    \glssetcategoryattribute{general}{targeturl}{master-doc.pdf}  
    \glssetcategoryattribute{general}{targetcategory}{page}  
    \glssetcategoryattribute{general}{targetname}{7}
    -

    will cause all link text for

    will cause all link text for general entries to link to master-doc.pdf#page.7 (page 7 of that PDF). -

    If you want a mixture in your document of entries that link to an internal +

    If you want a mixture in your document of entries that link to an internal glossary and entries that link to an external URL then you can use the starred form of \newignoredglossary\newignoredglossary -

    + -

    +

    -

    An attribute can be set using: -

    An attribute can be set using: +

    \glssetcategoryattribute  attribute-label⟩}{⟨value⟩}
    -

    +

    where ⟨category-label⟩ is the category label, ⟨attribute-label⟩ is the attribute label and ⟨value⟩ is the new value for the attribute. -

    There is a shortcut version to set the

    There is a shortcut version to set the regular attribute to “true”: -

    \glssetregularcategory  \glssetregularcategory{⟨category-label⟩}
    -

    -

    If you need to lookup the category label for a particular entry, you can use the +

    +

    If you need to lookup the category label for a particular entry, you can use the shortcut command: -

    \glssetattribute  } class="cmtt-10">{⟨value⟩}
    -

    +

    This uses \glssetcategoryattribute with \glscategory to set the attribute. Note that this will affect all other entries that share this entry’s category. -

    You can fetch the value of an attribute for a particular category using: -

    You can fetch the value of an attribute for a particular category using: +

    \glsgetcategoryattribute  } class="cmtt-10">{⟨attribute-label⟩}
    -

    +

    Again there is a shortcut if you need to lookup the category label for a given entry: -

    \glsgetattribute  } -

    -

    You can test if an attribute has been assigned to a given category using: -

    +

    You can test if an attribute has been assigned to a given category using: +

    \glshascategoryattribute  true code⟩}{⟨false code⟩}
    -

    +

    This uses etoolbox’s true code⟩ if the attribute has been set and isn’t blank and isn’t \relax. The shortcut if you need to lookup the category label from an entry is: -

    \glshasattribute  code⟩}{⟨false code⟩}
    -

    -

    You can test the value of an attribute for a particular category using: -

    +

    You can test the value of an attribute for a particular category using: +

    \glsifcategoryattribute  true-part⟩}{⟨false-part⟩}
    -

    +

    This tests if the attribute (given by ⟨attribute-label⟩) for the category (given by ⟨true-part⟩ is done. If the attribute isn’t set or is set but isn’t equal to ⟨value⟩, ⟨false part⟩ is done. -

    For example: +

    For example:

    -
    +
    \glsifcategoryattribute{general}{nohyper}{true}{NO HYPER}{HYPER}
    -

    This does “NO HYPER” if the

    This does “NO HYPER” if the general category has the nohyper attribute set to true otherwise if does “HYPER”. -

    With boolean-style attributes like

    With boolean-style attributes like nohyper, make sure you always test for true not false in case the attribute hasn’t been set. -

    Again there’s a shortcut if you need to lookup the category label from a particular +

    Again there’s a shortcut if you need to lookup the category label from a particular entry: -

    \glsifattribute  true-part⟩} {⟨false-part⟩}
    -

    -

    There’s also a shortcut to determine if a particular category has the

    +

    There’s also a shortcut to determine if a particular category has the regular attribute set to “true”: -

    \glsifregularcategory  true-part⟩}{⟨false-part⟩}
    -

    +

    Alternatively, if you need to lookup the category for a particular entry: -

    \glsifregular  }{⟨false-part⟩}
    -

    +

    Note that if the regularregular attribute has been set to “false”: -

    \glsifnotregularcategory  true-part⟩}{⟨false-part⟩}
    -

    +

    or for a particular entry: -

    \glsifnotregular  }{⟨false-part⟩}
    -

    +

    Again, if the regular attribute hasn’t been set, the above do ⟨false-part⟩, so these reverse commands aren’t logically opposite in the strict sense. -

    You can iterate through all entries with a given category using: -

    You can iterate through all entries with a given category using: +

    \glsforeachincategory[⟨glossary-labels⟩]{⟨label-cs⟩}{⟨body⟩}
    -

    +

    This iterates through all entries in the glossaries identified by the comma-separated list ⟨glossary-labels⟩ that have the category given by ⟨

    Similarly, you can iterate through all entries that have a category with a given +

    Similarly, you can iterate through all entries that have a category with a given attribute using: -

    \glsforeachwithattribute  }{⟨body⟩}
    -

    +

    This will do ⟨body⟩ for each entry that has a category with the attribute ⟨attribute-label⟩ set to ⟨attribute-value⟩. The remaining arguments are as the previous command. -

    You can change the category for a particular entry using the standard glossary +

    You can change the category for a particular entry using the standard glossary field changing commands, such as \glsfielddef. Alternatively, you can use -

    \glsxtrsetcategory  }{⟨category-label⟩}
    -

    +

    This will change the category to ⟨category-label⟩ for each entry listed in the comma-separated list ⟨\glsfieldxdef so it will expand ⟨category-label⟩ and make the change global. -

    You can also change the category for all entries with a glossary or glossaries +

    You can also change the category for all entries with a glossary or glossaries using: -

    \glsxtrsetcategoryforall  } class="cmtt-10">{⟨category-label⟩}
    -

    +

    where ⟨glossary-labels⟩ is a comma-separated list of glossary labels.

    -

    -

    +

    Top

    6. Entry Counting

    -

    As mentioned in

    As mentioned in §2.4 Entry Counting Modifications, §5 Categories). -

    Remember that entry counting only counts the number of times an entry is used +

    Remember that entry counting only counts the number of times an entry is used by commands that change the first use flag. (That is, all those commands that mark the entry as having been used.) There are many commands that don’t modify this flag and they won’t contribute to the entry use count.
    -

    -

    With

    +

    With glossaries-extra, you may use \cgls instead of shortcuts=ac). -

    All upper case versions (not provided by

    All upper case versions (not provided by glossaries) are also available: -

    \cGLS  label⟩}[⟨insert⟩]
    -

    +

    and -

    \cGLSpl  label⟩}[⟨insert⟩]
    -

    +

    These are analogous to \cgls and \cglspl but they use -

    \cGLSformat  label⟩}{⟨insert⟩}
    -

    +

    and -

    \cGLSplformat  label⟩}{⟨insert⟩}
    -

    +

    which convert the analogous \cglsformat and \cglsplformat to upper case. -

    Just using

    Just using glossaries:

    -
    +
    \documentclass{article}  
    \usepackage{glossaries}  
    \makeglossaries @@ -10828,8 +10923,8 @@ class="cmss-10">glossaries:  
    \printglossaries  
    \end{document}
    -

    -

    If you switch to

    +

    If you switch to glossaries-extra you must set the entrycountentrycount -

    + -

    -

    When activated with

    +

    When activated with \glsenableentrycount, commands such as \cgls now use -

    \glsxtrifcounttrigger  } class="cmtt-10">{⟨normal code⟩}
    -

    +

    to determine if the entry trips the entry count trigger. The ⟨trigger code⟩ uses commands like trigger code⟩ but the usual \gls behaviour in ⟨normal code⟩). -

    The default definition is: +

    The default definition is:

    -
    +
    \newcommand*{\glsxtrifcounttrigger}[3]{%  
     \glshasattribute{#1}{entrycount}%  
     {% @@ -10905,7 +11000,7 @@ class="cmti-10">normal code⟩).  
     {#3}%  
    }
    -

    This means that if an entry is assigned to a category that has the

    This means that if an entry is assigned to a category that has the entrycount @@ -10913,17 +11008,17 @@ attribute then the ⟨trigger code⟩ will be used if the previous count value (the number of times the entry was used on the last run) is greater than the value of the attribute. -

    For example, to trigger normal use if the previous count value is greater than +

    For example, to trigger normal use if the previous count value is greater than four:

    -
    +
    \glssetcategoryattribute{abbreviation}{entrycount}{4}
    -

    -

    There is a convenient command provided to enable entry counting, set the +

    +

    There is a convenient command provided to enable entry counting, set the entrycount\gls, etc to use \cgls etc: -

    \GlsXtrEnableEntryCounting  } class="cmtt-10">{⟨value⟩}
    -

    +

    The first argument ⟨categories⟩ is a comma-separated list of categories. For each category, the value⟩. In addition, this does:

    -
    +
    \renewcommand*{\gls}{\cgls}%  
    \renewcommand*{\Gls}{\cGls}%  
    \renewcommand*{\glspl}{\cglspl}% @@ -10963,19 +11058,19 @@ class="cmti-10">value⟩. In addition, this does:  
    \renewcommand*{\GLS}{\cGLS}%  
    \renewcommand*{\GLSpl}{\cGLSpl}%
    -

    This makes it easier to enable entry-counting on existing documents. -

    If you use

    This makes it easier to enable entry-counting on existing documents. +

    If you use \GlsXtrEnableEntryCounting more than once, subsequent uses will just set the entrycount attribute for each listed category. -

    The above example document can then become: +

    The above example document can then become:

    -
    +
    \documentclass{article}  
    \usepackage{glossaries-extra}  
    \makeglossaries @@ -10988,12 +11083,12 @@ class="cmss-10">entrycount\printglossaries  
    \end{document}
    -

    -

    The standard entry-counting function describe above counts the number of times +

    +

    The standard entry-counting function describe above counts the number of times an entry has been marked as used throughout the document. (The reset commands will reset the total back to zero.) If you prefer to count per sectional-unit, you can use -

    \GlsXtrEnableEntryUnitCounting  value⟩}{⟨counter-name⟩}
    -

    +

    where ⟨categories⟩ is a comma-separated list of categories to which this feature should be applied, ⟨value⟩ is the trigger value and ⟨counter-name⟩ is the name of the counter used by the sectional unit. -

    Due to the asynchronous nature of T

    Due to the asynchronous nature of TEX’s output routine, discrepancies will occur in page spanning paragraphs if you use the page counter.
    -

    -

    Note that you can’t use both the document-wide counting and the per-unit +

    +

    Note that you can’t use both the document-wide counting and the per-unit counting in the same document. -

    The counter value is used as part of a label, which means that

    The counter value is used as part of a label, which means that \the⟨counter-name⟩ needs to be expandable. Since \theH⟨counter-name⟩ if it exists otherwise it will use \the⟨counter-name⟩. -

    The per-unit counting function uses two attributes:

    The per-unit counting function uses two attributes: entrycount (as before) and @@ -11047,58 +11142,58 @@ class="cmss-10">unitcount

    Both the original document-wide counting mechanism and the per-unit counting +

    Both the original document-wide counting mechanism and the per-unit counting mechanism provide a command that can be used to access the current count value for this run: -

    \glsentrycurrcount  \glsentrycurrcount{⟨label⟩}
    -

    +

    and the final value from the previous run: -

    \glsentryprevcount  \glsentryprevcount{⟨label⟩}
    -

    +

    In the case of the per-unit counting, this is the final value for the current unit. In both commands ⟨label⟩ is the entry’s label. -

    The per-unit counting mechanism additionally provides: -

    The per-unit counting mechanism additionally provides: +

    \glsentryprevtotalcount  \glsentryprevtotalcount{⟨label⟩}
    -

    +

    which gives the sum of all the per-unit totals from the previous run for the entry given by ⟨label⟩, and -

    \glsentryprevmaxcount  \glsentryprevmaxcount{⟨label⟩}
    -

    +

    which gives the maximum per-unit total from the previous run. -

    The above two commands are unavailable for the document-wide counting. -

    Example of per-unit counting, where the unit is the chapter: +

    The above two commands are unavailable for the document-wide counting. +

    Example of per-unit counting, where the unit is the chapter:

    -
    +
    \documentclass{report}  
    \usepackage{glossaries-extra}  
    \GlsXtrEnableEntryUnitCounting{abbreviation}{2}{chapter} @@ -11117,7 +11212,7 @@ which gives the maximum per-unit total from the previous run.  
    \printglossaries  
    \end{document}
    -

    In this document, the

    In this document, the css entry is used three times in the first chapter. This is more than the trigger value of 2, so \gls{css} is expanded on \gls{css} doesn’t get a line added to the glossary file. -

    The

    The html is used a total of three times, but the expansion and indexing suppression trigger is tripped in both chapters because the per-unit total (1 for the first chapter and 2 for the second chapter) is less than or equal to the trigger value. -

    The

    The sample entry has only been used once, but it doesn’t trip the indexing suppression because it’s in the general category, which hasn’t been listed in \GlsXtrEnableEntryUnitCounting. -

    The per-unit entry counting can be used for other purposes. In the following +

    The per-unit entry counting can be used for other purposes. In the following @@ -11152,19 +11247,19 @@ won’t be triggered, but the unit entry count is used to automatically supp hyperlink for commands like \gls by modifying the hook -

    \glslinkcheckfirsthyperhook  \glslinkcheckfirsthyperhook
    -

    +

    which is used at the end of the macro the determines whether or not to suppress the hyperlink.

    -
    +
    \documentclass{article}  
    \usepackage[colorlinks]{hyperref}  
    \usepackage{glossaries-extra} @@ -11185,10 +11280,10 @@ hyperlink.  
    \printglossaries  
    \end{document}
    -

    This only produces a hyperlink for the first instance of

    This only produces a hyperlink for the first instance of \gls{sample} on each page. -

    The earlier warning about using the

    The earlier warning about using the page counter still applies. If the first instance of -

    -

    +

    Top

    7. Auto-Indexing

    -

    It’s possible that you may also want a normal index as well as the glossary, +

    It’s possible that you may also want a normal index as well as the glossary, and you may want entries to automatically be added to the index (as in this document). There are two attributes that govern this: indexnamedualindex. -

    The

    The \glsxtrpostnamehook macro, used at the end of \glossentrynamename key. -

    The internal macro used by the

    The internal macro used by the glossaries package to write the information to the external glossary file is modified to check for the dualindex attribute. -

    In both cases, the indexing is done through -

    In both cases, the indexing is done through +

    \glsxtrdoautoindexname  }{⟨attribute-label⟩}
    -

    +

    This uses the standard \index command with the sort value taken from the entry’s @@ -11260,30 +11355,30 @@ class="cmti-10">label⟩}. As from v1.16, there are user-level commands available to change the sort and actual value used by the automated index. -

    The actual value is given by -

    The actual value is given by +

    \glsxtrautoindexentry  \glsxtrautoindexentry{⟨label⟩}
    -

    +

    where ⟨label⟩ is the entry’s label. The default definition is:

    -
    +
    \newcommand*{\glsxtrautoindexentry}[1]{\string\glsentryname{#1}}
    -

    Note the use of

    Note the use of \string to prevent \glsentryname from being expanded as it’s written to the index file. -

    The sort value is assigned using: -

    The sort value is assigned using: +

    \glsxtrautoindexassignsort  }{⟨label⟩}
    -

    +

    where ⟨label⟩ is the entry label and ⟨cs⟩ is the command which needs to be set to the @@ -11302,36 +11397,36 @@ sort value. The default definition is:

    -
    +
    \newcommand*{\glsxtrautoindexassignsort}[2]{%  
      \glsletentryfield{#1}{#2}{sort}%  
    }
    -

    After this macro is called, ⟨

    After this macro is called, ⟨cs⟩ is then processed to escape any of makeindex’s special characters. Note that this escaping is only performed on the sort not on the actual value. -

    The command used to perform the actual indexing is: -

    The command used to perform the actual indexing is: +

    \glsxtrautoindex  \glsxtrautoindex{⟨text⟩}
    -

    +

    This just does \index{⟨text⟩} by default. -

    The entry’s

    The entry’s parent field isn’t referenced in this automated indexing.
    -

    -

    For example, to index the value of the

    +

    For example, to index the value of the first key, instead of the namename -

    +
    \renewcommand*{\glsxtrautoindexentry}[1]{\string\glsentryfirst{#1}}
    -

    and if the sort value also needs to be set to the

    and if the sort value also needs to be set to the long field, if present, otherwise the sort -

    +
    \renewcommand*{\glsxtrautoindexassignsort}[2]{%  
      \ifglshaslong{#2}%  
      {\glsletentryfield{#1}{#2}{long}}%  
      {\glsletentryfield{#1}{#2}{sort}}%  
    }
    -

    -

    If the value of the attribute given by ⟨

    +

    If the value of the attribute given by ⟨attribute-label⟩ is “true”, no encap will be added, otherwise the encap will be the attribute value. For example:

    -
    +
    \glssetcategoryattribute{general}{indexname}{textbf}
    -

    will set the encap to

    will set the encap to textbf which will display the relevant page number in bold whereas

    -
    +
    \glssetcategoryattribute{general}{dualindex}{true}
    -

    won’t apply any formatting to the page number in the index. -

    The location used in the index will always be the page number not the counter +

    won’t apply any formatting to the page number in the index. +

    The location used in the index will always be the page number not the counter used in the glossary. (Unless some other loaded package has modified the definition of \index to use some thing else.)
    -

    -

    By default the

    +

    By default the format key won’t be used with the format key to override the attribute value by using the preamble-only command: -

    \GlsXtrEnableIndexFormatOverride  \GlsXtrEnableIndexFormatOverride
    -

    +

    If you use this command and hyperref has been loaded, then the \glshypernumber to allow formats that use that command. -

    The

    The dualindex attribute will still be used on subsequent use even if the @@ -11430,8 +11525,8 @@ class="cmss-10">dualindexnoindex key.
    -

    -

    The

    +

    The \glsxtrdoautoindexname command will attempt to escape any of \makeindex\encapchar have been defined before glossaries-extra is loaded). -

    If this isn’t the case, you can use the following preamble-only commands to set +

    If this isn’t the case, you can use the following preamble-only commands to set the correct characters. -

    Be very careful of possible shifting category codes!
    -

    -

    Be very careful of possible shifting category codes!
    +

    +

    \GlsXtrSetActualChar  \GlsXtrSetActualChar{⟨char⟩}
    -

    +

    Set the actual character to ⟨char⟩. -

    \GlsXtrSetLevelChar  \GlsXtrSetLevelChar{⟨char⟩}
    -

    +

    Set the level character to ⟨char⟩. -

    \GlsXtrSetEscChar  \GlsXtrSetEscChar{⟨char⟩}
    -

    +

    Set the escape (quote) character to ⟨char⟩. -

    \GlsXtrSetEncapChar  }
    -

    +

    Set the encap character to ⟨char⟩.

    -

    -

    +

    Top

    8. On-the-Fly Document Definitions

    -

    The commands described here may superficially look like ⟨

    The commands described here may superficially look like ⟨word⟩\index{⟨word⟩\index then just use \index.
    -

    -

    The

    +

    The glossaries package advises against defining entries in the documentglossaries-extra but can be enabled using the href="#styopt.docdefs">docdefs package options. -

    Although this can be problematic, the

    Although this can be problematic, the glossaries-extra package provides a way of defining and using entries within the documentdocdefsThere are limitations with this approach, so take care with it. This function is disabled by default, but can be enabled using the preamble-only command: -

    \GlsXtrEnableOnTheFly  \GlsXtrEnableOnTheFly
    -

    +

    When used, this defines the commands described below. -

    The commands

    The commands \glsxtr, \glsxtrpl, \Glsxtr and \printglossary\gls or there may be unexpected results.
    -

    -

    +

    \glsxtr  dfn-options⟩]{⟨label⟩}
    -

    +

    If an entry with the label ⟨label⟩ has already been defined, this just does \gls @@ -11609,7 +11704,7 @@ class="cmitt-10">dfn-options⟩}

    -

    The ⟨

    The ⟨label⟩ must contain any non-expandable commands, such as formatting commands or problematic characters. If the term requires any of these, they must be omitted from the ⟨name key must be provided in the optional argument ⟨dfn-options⟩.
    -

    +

    -

    The second optional argument ⟨

    The second optional argument ⟨dfn-options⟩ should be empty if the entry has already been defined, since it’s too late for them. If it’s not empty, a warning will be generated with -

    \GlsXtrWarning  dfn-options⟩}{⟨label⟩}
    -

    -

    For example, this warning will be generated on the second instance of

    +

    For example, this warning will be generated on the second instance of \glsxtr below:

    -
    +
    \glsxtr[][plural=geese]{goose}  
     ... later  
    \glsxtr[][plural=geese]{goose}
    -

    -

    If you are considering doing something like: +

    +

    If you are considering doing something like:

    -
    +
    \newcommand*{\goose}{\glsxtr[][plural=geese]{goose}}  
    \renewcommand*{\GlsXtrWarning}[2]{}  
     ... later  
    \goose\ some more text here
    -

    then don’t bother. It’s simpler and less problematic to just define the entries in the +

    then don’t bother. It’s simpler and less problematic to just define the entries in the preamble with \newglossaryentry and then use \gls in the document. -

    There are plural and case-changing alternatives to

    There are plural and case-changing alternatives to \glsxtr: -

    \glsxtrpl  dfn-options⟩]{⟨label⟩}
    -

    +

    This is like \glsxtr but uses \glspl instead of \gls. -

    \Glsxtr  dfn-options⟩]{⟨label⟩}
    -

    +

    This is like \glsxtr but uses \Gls instead of \gls. -

    \Glsxtrpl  dfn-options⟩]{⟨label⟩}
    -

    +

    This is like \glsxtr but uses \Glspl instead of \gls. -

    If you use UTF-8 and don’t want the inconvenient of needing to use an +

    If you use UTF-8 and don’t want the inconvenient of needing to use an ASCII-only label, then it’s better to use XƎLATEX or LuaLATEX instead of LATEX (or pdfLATEX). If you really desperately want to use UTF-8 entry labels @@ -11724,70 +11819,76 @@ without switching to X\GlsXtrEnableOnTheFly that allows you to use UTF-8 characters in ⟨label⟩, but it’s experimental and may not work in some cases. -

    If you use the starred version of

    If you use the starred version of \GlsXtrEnableOnTheFly don’t use any commands in the ⟨label⟩, even if they expand to just text.
    -

    +

    -

    -

    +

    Top

    9. bib2gls: Managing Reference Databases

    -

    There is a new command line application under development called

    There is a new command line application called bib2gls, -which works in much the same way as a combination of , which works in much +the same way as a combination of bibtex and makeindex. -Instead of storing all your entry definitions in a makeindex/xindy. Instead of +storing all your entry definitions in a .tex and loading them using \input -or \input or +\loadglsentries, the entries can instead be stored in a .bib file and bib2gls -can selectively write the appropriate commands to a .glstex file which is loaded -using can +selectively write the appropriate commands to a .glstex file which is loaded using +\glsxtrresourcefile (or \GlsXtrLoadResources). -

    This means that you can use a reference managing system, such as JabRef, to +

    This means that you can use a reference managing system, such as JabRef, to maintain the database and it reduces the TEX overhead by only defining the entries that are actually required in the document. If you currently have a .tex file that -contains hundreds of definitions, but you only use a dozen or so in your document, -then the build time is needlessly slowed by the unrequired definitions that occur -when the file is input. -

    Although .tex file +containing glossary definitions to a .bib file using convertgls2bib, supplied with +bib2gls isn’t ready yet (at the time of writing this), there have been -some new commands and options added to glossaries-extra to help assist the -integration of .) +

    There are some new commands and options added to glossaries-extra to help assist +the integration of bib2gls into the document build process. -

    An example of the contents of into the document build process. +

    An example of the contents of .bib file that stores glossary entries that can be extracted with bib2gls: + id="dx1-30011">:

    -
    +
    @entry{bird,  
      name={bird},  
      description = {feathered animal}, @@ -11803,13 +11904,13 @@ class="cmtt-10">bib2gls  description={a waterbird with a long neck}  
    }
    -

    -

    The follow provides some abbreviations: +

    +

    The follow provides some abbreviations:

    -
    + -

    -

    Here are some symbols: +

    +

    Here are some symbols:

    -
    +
    preamble{"\providecommand{\mtx}[1]{\boldsymbol{#1}}"}  
    @symbol{M,  
      name={$\mtx{M}$}, @@ -11852,73 +11953,73 @@ preamble{"\providecommand{\mtx}[1]{\boldsymbol{#1}}"}  
      description={a set}  
    }
    -

    -

    To ensure that

    +

    To ensure that bib2gls can find out which entries have been used in the + id="dx1-30013"> can find out which entries have been used in the document, you need the record package option: + id="dx1-30014"> package option:

    -
    +
    \usepackage[record]{glossaries-extra}
    -

    If this option’s value is omitted (as above), the normal indexing will be switched off, +

    If this option’s value is omitted (as above), the normal indexing will be switched off, since bib2gls can also sort the entries and collate the locations. -

    If you still want to use an indexing application (for example, you need a custom + id="dx1-30016"> can also sort the entries and collate the locations. +

    If you still want to use an indexing application (for example, you need a custom xindy rule), then just use record=alsoindex and continue to use and continue to use \makeglossaries and \printglossary (or \printglossaries), but it’s a good idea to also instruct bib2gls to omit sorting to save time. -

    The to omit sorting to save time. +

    The .glstex file created by \bib2gls is loaded using: -

    \glsxtrresourcefile  \glsxtrresourcefile[⟨options⟩]{⟨filename⟩}
    -

    +

    (Don’t include the file extension in ⟨filename⟩.) There’s a shortcut version that sets -⟨filename⟩ filename⟩.) There’s a shortcut version +(recommended over the above) that sets ⟨filename⟩ to use \jobname: -

    \GlsXtrLoadResources  \GlsXtrLoadResources[⟨options⟩]
    -

    +

    On the first use, this command is a shortcut for

    }
    On subsequent use,9.1 this + id="x1-30023f1"> this command is a shortcut for
    }
    where ⟨n⟩ is the current value of -

    \glsxtrresourcecount
    -

    +

    which is incremented at the end of \GlsXtrLoadResources. Any advisory notes regarding \glsxtrresourcefile also apply to \GlsXtrLoadResources. -

    The

    The \glsxtrresourcefile command writes the line

    filename⟩.glstex if it exists.9.2 + id="x1-30024f2"> -

    The options are ignored by glossaries-extra but are picked up by bib2gls and are -used to supply various information, such as the name of the .bib files and any -changes to the default behaviour. -

    Since the

    Since the .glstex won’t exist on the first LATEX run, the record package option + id="dx1-30025"> package option additionally switches on undefaction=warn. Any use of commands like . Any use of commands like \gls or \glstext will produce ?? in the document, since they are undefined at this -point. Once \glstext will produce ?? in the document, since they are undefined at this point. +Once bib2gls has created the .glstex file the references should be -resolved. -

    Note that has created the .glstex file the references should be resolved. +This may cause a shift in the locations if the actual text produced once the +entry is defined is larger than the placeholder ?? (as can occur with long +citations). +

    Note that \glsaddall doesn’t work with bib2gls as the command has to iterate -over the glossary lists, which will be empty on the first run and on subsequent -runs will only contain those entries that have been selected by as the command has to iterate +over the internal lists of defined entry labels, which will be empty on the first run and +on subsequent runs will only contain those entries that have been selected by +bib2gls. -
    -

    -

    If you want to add all entries to the glossary, you need to tell .

    +

    +

    If you want to add all entries to the glossary, you need to tell bib2gls this in the + id="dx1-30034"> this in the options list. For example:

    -
    +
    \GlsXtrLoadResources[src={terms},selection={all}]
    -

    See the

    See the bib2gls user manual for more details of this and other available + id="dx1-30036"> user manual for more details of this and other available options. -

    Note that as from v1.12,

    Note that as from v1.12, \glsxtrresourcefile temporarily switches the category code of @ to 11 (letter) while it reads the file to allow for any internal commands stored in the location field. -

    Since the

    Since the .glstex file only defines those references used within the document and the definitions have been written in the order corresponding to bib2gls sorted + id="dx1-30038"> sorted list, the glossaries can simply be displayed using \printunsrtglossary (or §10.2 Display All Entries Without Sorting or Indexing. -

    Suppose the

    Suppose the .bib examples shown above have been stored in the files terms.bib, EX’s path. Then the document might look like:

    -
    +
    \documentclass{article}  
    \usepackage[record]{glossaries-extra}  
    \setabbreviationstyle{long-short-desc} @@ -12075,18 +12170,18 @@ class="E">EX’s path. Then the document might look like:  
    \printunsrtglossaries  
    \end{document}
    -

    The document build process (assuming the document is called

    The document build process (assuming the document is called mydoc) is:

    -
    +
    pdflatex mydoc  
    bib2gls mydoc  
    pdflatex mydoc
    -

    This creates a single glossary containing the entries:

    This creates a single glossary containing the entries: bird, duck, goose, bird, shtml and M entries were added because bib2gls detected (from the detected (from the .aux file) that they had been used in the document. The other entries were added because bib2gls detected (from the detected (from the .bib files) that they are referenced by the used entries. In the case of duck and goose, they are in the see field for field for bird. In the case of ssi and html, they are referenced in the description field of field of shtml. These cross-referenced entries won’t have a location list when the glossary is first displayed, but depending on how they are referenced, they may pick up a location list on the next document build. -

    The entries can be separated into different glossaries with different sort +

    The entries can be separated into different glossaries with different sort methods:

    -
    +
    \documentclass{article}  
    \usepackage[record,abbreviations,symbols]{glossaries-extra}  
    \setabbreviationstyle{long-short-desc} @@ -12149,7 +12244,7 @@ methods:  
    \printunsrtglossaries  
    \end{document}
    -

    (By default, entries are sorted according to the operating system’s locale. +

    (By default, entries are sorted according to the operating system’s locale. If this doesn’t match the document language, you need to set this in the option list, for example sort=de-CH-1996 for Swiss German using the new @@ -12158,11 +12253,11 @@ orthography.)

    -

    -

    +

    Top

    10. Miscellaneous New Commands

    -

    The

    The glossaries package provides \glsrefentry entry to cross-reference entries @@ -12173,21 +12268,21 @@ class="cmss-10">subentrycounter options. The glossaries-extra package provides a supplementary command -

    \glsxtrpageref  \glsxtrpageref{⟨label⟩}
    -

    +

    that works in the same way except that it uses \pageref instead of \ref. -

    You can copy an entry to another glossary using -

    You can copy an entry to another glossary using +

    \glsxtrcopytoglossary  }{⟨glossary-type⟩}
    -

    +

    This appends ⟨entry-label⟩ to the end of the internal list for the glossary given by ⟨ -

    +
    \printunsrtglossary[target=false]
    -

    -

    The

    +

    The glossaries package allows you to set preamble code for a given glossary type using \setglossarypreamble. This overrides any previous setting. With glossaries-extra (as from v1.12) you can instead append to the preamble using -

    \apptoglossarypreamble  type⟩]{⟨code⟩}
    -

    +

    or prepend using -

    \pretoglossarypreamble  type⟩]{⟨code⟩}
    -

    +

    -

    Top

    10.1 Entry Fields

    -

    A field may now be used to store the name of a text-block command that takes a +

    A field may now be used to store the name of a text-block command that takes a single argument. The field is given by -

    \GlsXtrFmtField  \GlsXtrFmtField
    -

    +

    The default value is useri. Note that the value must be the control sequence name without the initial backslash. -

    For example: +

    For example:

    -
    +
    \newcommand*{\mtx}[1]{\boldsymbol{#1}}  
    \newcommand*{\mtxinv}[1]{\mtx{#1}\sp{-1}}  
    \newglossaryentry{matrix}{% @@ -12292,10 +12387,10 @@ class="cmti-10">without the initial backslash.  
       $\mtx{M}\mtxinv{M}=\glssymbol{identitymatrix}$}  
    }
    -

    -

    There are two commands provided that allow you to apply the command to an +

    +

    There are two commands provided that allow you to apply the command to an argument: -

    \glsxtrfmt  label⟩}{⟨text⟩}
    -

    +

    This effectively does

    \glsxtrfmt will simply do ⟨text⟩. The default ⟨options⟩ are given by -

    \GlsXtrFmtDefaultOptions  \GlsXtrFmtDefaultOptions
    -

    +

    @@ -12343,12 +12438,12 @@ replacement text of \GlsXtrFmtDefaultOptions is prepended to the optional argument of \glslink. -

    For example: +

    For example:

    -
    +
    \[  
      \glsxtrfmt{matrix}{A}  
      \glsxtrfmt{matrixinv}{A} @@ -12356,7 +12451,7 @@ class="cmtt-10">\glslink.  
      \glssymbol{identitymatrix}  
    \]
    -

    If the default options are set to

    If the default options are set to noindex then \glsxtrfmt won’t index, but will create a hyperlink (if -

    +
    \renewcommand{\GlsXtrFmtDefaultOptions}{hyper=false,noindex}
    -

    -

    Note that

    +

    Note that \glsxtrfmt won’t work with PDF bookmarks. Instead you can use -

    \glsxtrentryfmt  label⟩}{⟨text⟩}
    -

    +

    This uses \texorpdfstring and will simply expand to ⟨text⟩ within the PDF @@ -12394,14 +12489,14 @@ class="cmti-10">text⟩} if a control sequence name has been provided or just ⟨text⟩ otherwise. -

    The

    The glossaries package provides \glsaddstoragekey to add new keys. This command will cause an error if the key has already been defined. The glossaries-extra package provides a supplementary command that will only define the key if it doesn’t already exist: -

    \glsxtrprovidestoragekey  }{⟨cs⟩}
    -

    +

    If the key has already been defined, it will still provide the command given in the third argument ⟨cs⟩ (if it hasn’t already been defined). Unlike cs⟩ may be left empty if you’re happy to just use \glsfieldfetch to fetch the value of this new key. -

    You can test if a key has been provided with: -

    You can test if a key has been provided with: +

    \glsxtrifkeydefined  true⟩}{⟨false⟩}
    -

    +

    This tests if ⟨key⟩ is available for use in the ⟨key⟩= list in the second argument of @@ -12443,7 +12538,7 @@ class="cmtt-10">\newglossaryentry (or the optional argument of commands l class="cmtt-10">\newabbreviation). The corresponding field may not have been set for any of the entries if no default was provided. -

    There are now commands provided to set individual fields. Note that +

    There are now commands provided to set individual fields. Note that these only change the specified field, not any related values. For example, changing the value of the textparent field). Unexpected results may occur if they are subsequently changed. -

    \GlsXtrSetField  field⟩}{⟨value⟩}
    -

    +

    Sets the field given by ⟨field⟩ to ⟨value⟩ for the entry given by ⟨

    \GlsXtrSetField uses -

    \glsxtrsetfieldifexists  }{⟨code⟩}
    -

    +

    where ⟨label⟩ is the entry label and ⟨code⟩ is the assignment code. -

    This command just uses

    This command just uses \glsdoifexists{⟨=warn\glsxtrsetfieldifexists to simply do ⟨code⟩ if you want to skip the existence check. Alternatively you can instead use -

    \glsxtrdeffield  replacement text⟩}
    -

    +

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

    \glsxtredeffield  replacement text⟩}
    -

    -

    +

    \gGlsXtrSetField  field⟩}{⟨value⟩}
    -

    +

    As \GlsXtrSetField but globally. -

    \eGlsXtrSetField  field⟩}{⟨value⟩}
    -

    +

    As \GlsXtrSetField but uses protected expansion. -

    \xGlsXtrSetField  field⟩}{⟨value⟩}
    -

    +

    As \gGlsXtrSetField but uses protected expansion. -

    \GlsXtrLetField  field⟩}{⟨cs⟩}
    -

    +

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

    \csGlsXtrLetField  }{⟨cs name⟩}
    -

    +

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

    \GlsXtrLetFieldToField  label-2⟩}{⟨field-2⟩}
    -

    +

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

    The

    The glossaries package provides \ifglshasfield to determine if a field has been +set. The glossaries-extra package provides a simpler version: + + + +

    \glsxtrifhasfield  \glsxtrifhasfield{⟨label⟩}{⟨field⟩}{⟨true⟩}{⟨false⟩} +
    +

    +(New to v1.19.) Unlike \ifglshasfield, this version doesn’t complain if the entry +(given by ⟨label⟩) or the field don’t exist and will simply do ⟨false⟩. If the field does exist +for the given entry and it’s not empty, the ⟨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*{⟨label⟩}{⟨field⟩}{⟨true⟩}{⟨false⟩} +
    +

    +omits the implicit grouping. +

    The glossaries package provides \glsfieldfetch which can be used to fetch the + id="dx1-32028"> 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-32030"> 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-32032"> 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-32042">’s user manual for further details of these commands, in particular the limitations of \ifinlist. -

    When using the

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

    -
    +
    \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 \makenoidxglossaries). -

    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:

    -
    +
    \documentclass{article}  
    \usepackage{glossaries-extra}  
    \newglossaryentry{zebra}{name={zebra},description={stripy animal}} @@ -13027,34 +13179,34 @@ 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⟩]. -

    The

    The \printunsrtglossary command internally uses -

    \printunsrtglossaryhandler  \printunsrtglossaryhandler{⟨label⟩}
    -

    +

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

    By default this just does -

    By default this just does +

    \glsxtrunsrtdo  \glsxtrunsrtdo{⟨label⟩}
    -

    +

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

    You can redefine the handler if required. -

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

    You can redefine the handler if required. +

    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:

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

    -
    +
    \renewcommand{\printunsrtglossaryhandler}[1]{%  
      \glsxtrfieldxifinlist{#1}{record.section}{\thesection}  
      {\glsxtrunsrtdo{#1}}%  
      {}%  
    }
    -

    -

    Alternatively you can use the starred form of

    +

    Alternatively you can use the starred form of \printunsrtglossary which will localise the change:

    -
    +
    \printunsrtglossary*{%  
      \renewcommand{\printunsrtglossaryhandler}[1]{%  
        \glsxtrfieldxifinlist{#1}{record.section}{\thesection} @@ -13128,8 +13280,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 -

    +
    \printunsrtglossary*{%  
      \renewcommand{\printunsrtglossaryhandler}[1]{%  
        \glsxtrfieldxifinlist{#1}{record.section}{\thesection} @@ -13155,13 +13307,13 @@ duplicate hypertarget names. For example:  
      }%  
    }
    -

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

    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:

    -
    +
    \printunsrtglossary*{%  
      \renewcommand{\printunsrtglossaryhandler}[1]{%  
        \glsxtrfieldxifinlist{#1}{record.section}{\thesection} @@ -13179,9 +13331,9 @@ glossary header and add some vertical space afterwards:  
      \appto\glossarypostamble{\glspar\medskip\glspar}%  
    }
    -

    -

    There’s a shortcut command that does this: -

    +

    There’s a shortcut command that does this: +

    \printunsrtglossaryunit  counter name⟩}
    -

    +

    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

    -
    +
    \printunsrtglossary*{\printunsrtglossaryunitsetup{section}%  
      \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 @@ -13236,7 +13388,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 @@ -13248,12 +13400,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 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 @@ -13264,7 +13416,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:

      @@ -13327,7 +13479,7 @@ class="cmtt-10">\glssee) unless it’s been explicitly class="cmtt-10">\glsadd or if the indexing has been explicitly set using noindex=false. -

      Note that with

      Note that with record=onlylocation list for aliased entries is controlled href="#glo:bib2gls">bib2gls’s settings.

    -

    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 @@ -13356,49 +13508,49 @@ 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:

    -
    +
    \renewcommand{\glsxtrsetaliasnoindex}{%  
     \glsxtrindexaliased  
     \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 @@ -13407,10 +13559,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 @@ -13419,7 +13571,7 @@ example:

    -
    +
    \documentclass{article}  
    \usepackage{glossaries-extra}  
    \usepackage{glossaries-prefix} @@ -13434,13 +13586,13 @@ example:  
    \printglossaries  
    \end{document}
    -

    -

    +

    +

    -

    Top

    11.2 Accessibility Support

    -

    The

    The glossaries-accsupp needs to be loaded before glossaries-extra or through the @@ -13452,10 +13604,10 @@ 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 \glsentry⟨xxx⟩ commands. -

    The following

    The following \glsaccess⟨xxx⟩ commands add accessibility information wrapped around the corresponding \glsentry⟨xxx⟩ 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:

    -
    +
    \newcommand*{\glsaccessname}[1]{\glsentryname{#1}}
    -

    otherwise it’s defined as: +

    otherwise it’s defined as:

    -
    +
    \newcommand*{\glsaccessname}[1]{%  
      \glsnameaccessdisplay  
      {% @@ -13511,20 +13663,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: @@ -13532,17 +13684,17 @@ class="cmss-10">glossaries-accsupp -

    +
    \newcommand*{\Glsaccessname}[1]{\Glsentryname{#1}}
    -

    With the

    With the glossaries-accsupp package this is defined as:

    -
    +
    \newcommand*{\Glsaccessname}[1]{%  
      \glsnameaccessdisplay  
      {% @@ -13551,112 +13703,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 @@ -13839,11 +13991,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

    13. Multi-Lingual Support

    -

    There’s only one command provided by

    There’s only one command provided by glossaries-extra that you’re likely to want to change in your document and that’s \abbreviationsname\acronymname (provided by glossaries). -

    You can redefine it in the usual way. For example: +

    You can redefine it in the usual way. For example:

    -
    +
    \renewcommand*{\abbreviationsname}{List of Abbreviations}
    -

    Or using

    Or using babel or polyglossiapolyglossia -

    +
    \appto\captionsenglish{%  
     \renewcommand*{\abbreviationsname}{List of Abbreviations}%  
    }
    -

    -

    Alternatively you can use the

    +

    Alternatively you can use the title key when you print the list of abbreviations. For example: @@ -14168,24 +14320,24 @@ For example:

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

    or +

    or

    -
    +
    \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 if they exist, but won’t warn if they don’t. -

    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-⟨lang⟩tracklang package). For example, glossariesxtr-french.ldf. -

    The simplest code for this file is: +

    The simplest code for this file is:

    -
    +
    \ProvidesGlossariesExtraLang{french}[2015/12/09 v1.0]  
    \newcommand*{\glossariesxtrcaptionsfrench}{%  
     \def\abbreviationsname{Abr\'eviations}% @@ -14226,8 +14378,8 @@ class="cmtt-10">glossariesxtr-french.ldf.  
      \glossariesxtrcaptionsfrench  
    }
    -

    -

    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. This EX’s path so that it can be found by class="cmss-10">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 @@ -14345,17 +14497,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 automake option is used, but the document @@ -14416,17 +14568,25 @@ href="#top">Top

    bib2gls

    A command line Java application that selects entries from a - .bib file and converts them to glossary definitions. At the time of - writing, this application is still under development. Further details at: - A command line Java application that selects entries from a .bib file + and converts them + to glossary definitions (like bibtex but also performs hierarchical sorting + and collation, thus omitting the need for xindy or makeindex). Further + details at: http://www.dickimaw-books.com/software/bib2gls/.
    entry location
    The location of the entry in the document. This defaults to the page number on which the entry appears. An entry may have multiple locations. @@ -14434,83 +14594,81 @@ class="description">The location of the entry in the document. This defaults to first use
    The first time a glossary entry is used (from the start of the document or after a reset) with one of the following commands: \gls, , \Gls, , \GLS, + id="dx1-40009">, \glspl, , \Glspl, , \GLSpl or or \glsdisp. + id="dx1-40013">.
    first use flag
    A conditional that determines whether or not the entry has been used according to the rules of first use.
    first use text
    The text that is displayed on first use, which is governed by the + id="dx1-40017">first use, which is governed by the first and and firstplural keys of keys of \newglossaryentry. (May be overridden by + id="dx1-40020">. (May be overridden by \glsdisp.) + id="dx1-40021">.)
    link-text
    The text produced by commands such as \gls. It may or may not + id="dx1-40023">. It may or may not have a hyperlink to the glossary.
    location list
    A list of entry locations. See number list.
    makeglossaries
    A custom designed Perl script interface provided with the glossaries package to run xindy or makeindex according to the document + id="dx1-40028">xindy or makeindex according to the document settings. @@ -14519,13 +14677,13 @@ class="cmtt-10">makeindex according to the document makeglossaries-lite.lua
    A custom designed Lua script interface to xindy and makeindex provided with the glossaries package. This is a cut-down alternative to the Perl makeglossaries-lite.lua script. makeindex
    An indexing application.
    number list
    A list of entry locations (also called a location list). The number list can be suppressed using the nonumberlist package option. + id="dx1-40037"> package option.
    xindy
    An flexible indexing application with multilingual support written in Perl.
    @@ -15121,7 +15279,7 @@ class="cmtt-10">sm-short-long-desc  289
    amsgen package  290
    +href="glossaries-extra-manual.html#dx1-11" >290
    \apptoglossarypreamble  298, 299
    bib2gls  300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 327
    +class="cmbx-10">328
    bib2gls  328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 355
    +class="cmbx-10">357

    C categories:
         abbreviation  356, 357, 358, 359
    +href="glossaries-extra-manual.html#dx1-9003" >358, 359, 360, 361
        acronym  360, 361, 362, 363, 364, 365
    +href="glossaries-extra-manual.html#dx1-8029" >362, 363, 364, 365, 366, 367
        general  366, 367, 368, 369, 370, 371, 372, 373
    +href="glossaries-extra-manual.html#dx1-8036" >368, 369, 370, 371, 372, 373, 374, 375
        index  374, 375
    +href="glossaries-extra-manual.html#dx1-5033" >376, 377
        number  376
    +href="glossaries-extra-manual.html#dx1-26018" >378
        symbol  377, 378
    +href="glossaries-extra-manual.html#dx1-8043" >379, 380
    category attributes:
         aposplural  379, 380, 381, 382
    +href="glossaries-extra-manual.html#dx1-10036" >381, 382, 383, 384
        discardperiod  383, 384, 385, 386, 387
    +href="glossaries-extra-manual.html#dx1-8032" >385, 386, 387, 388, 389
        dualindex  388, 389, 390, 391, 392, 393, 394
    +href="glossaries-extra-manual.html#dx1-26107" >390, 391, 392, 393, 394, 395, 396
        entrycount  395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405
    +href="glossaries-extra-manual.html#dx1-9002" >397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407
        externallocation  406
    +href="glossaries-extra-manual.html#dx1-6033" >408
        glossdesc  407, 408, 409
    +href="glossaries-extra-manual.html#dx1-14004" >409, 410, 411
        glossdescfont  410, 411
    +href="glossaries-extra-manual.html#dx1-14005" >412, 413
        glossname  412, 413
    +href="glossaries-extra-manual.html#dx1-14003" >414, 415
        glossnamefont  414
    +href="glossaries-extra-manual.html#dx1-26105" >416
        headuc  415, 416, 417, 418
    +href="glossaries-extra-manual.html#dx1-11059" >417, 418, 419, 420
        indexname  419, 420, 421, 422, 423
    +href="glossaries-extra-manual.html#dx1-14009" >421, 422, 423, 424, 425
        indexonlyfirst  424, 425, 426
    +href="glossaries-extra-manual.html#dx1-6005" >426, 427, 428
        insertdots  427, 428, 429
    +href="glossaries-extra-manual.html#dx1-17004" >429, 430, 431
        markshortwords  430, 431
    +href="glossaries-extra-manual.html#dx1-26061" >432, 433
        markwords  432, 433, 434, 435, 436, 437
    +href="glossaries-extra-manual.html#dx1-23188" >434, 435, 436, 437, 438, 439
        nohyper  438, 439, 440
    +href="glossaries-extra-manual.html#dx1-26034" >440, 441, 442
        nohyperfirst  441, 442, 443, 444, 445
    +href="glossaries-extra-manual.html#dx1-23129" >443, 444, 445, 446, 447
        noshortplural  446, 447, 448, 449, 450
    +href="glossaries-extra-manual.html#dx1-10037" >448, 449, 450, 451, 452
        pluraldiscardperiod  451, 452
    +href="glossaries-extra-manual.html#dx1-26048" >453, 454
        regular  453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483
    +href="glossaries-extra-manual.html#dx1-8010" >455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485
        retainfirstuseperiod  484
    +href="glossaries-extra-manual.html#dx1-26050" >486
        tagging  485, 486, 487, 488
    +href="glossaries-extra-manual.html#dx1-18002" >487, 488, 489, 490
        targetcategory  489
    +href="glossaries-extra-manual.html#dx1-26116" >491
        targetname  490, 491
    +href="glossaries-extra-manual.html#dx1-26113" >492, 493
        targeturl  492, 493, 494, 495, 496
    +href="glossaries-extra-manual.html#dx1-5004" >494, 495, 496, 497, 498
        unitcount  497
    +href="glossaries-extra-manual.html#dx1-27031" >499
        wrgloss  498, 499
    +href="glossaries-extra-manual.html#dx1-6013" >500, 501
    \cGLS  500
    +class="cmti-10">502
    \cGLSformat  501
    +class="cmti-10">503
    \cGLSpl  502
    +class="cmti-10">504
    \cGLSplformat  503
    +class="cmti-10">505
    +convertgls2bib  506
    \csGlsXtrLetField  504
    +class="cmti-10">507
    \CustomAbbreviationFields  505
    +class="cmti-10">508

    D datatool-base package  506
    +href="glossaries-extra-manual.html#dx1-10" >509

    E \eglssetwidest  507
    +class="cmti-10">510
    \eGlsXtrSetField  508
    +class="cmti-10">511
    entry location  509, 510, 511
    +href="glossaries-extra-manual.html#dx1-40005" >512, 513, 514
    etoolbox package  512, 513, 514, 515, 516, 517
    +href="glossaries-extra-manual.html#dx1-6" >515, 516, 517, 518, 519, 520

    F first use  518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569
    +href="glossaries-extra-manual.html#dx1-6003" >521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, 572
    first use flag  570, 571, 572, 573, 574
    -first use text  573, 574, 575, 576, 575, 576
    +class="cmbx-10">577
    +first use text  578, 579
    fontenc package  577
    +href="glossaries-extra-manual.html#dx1-21024" >580

    G \gGlsXtrSetField  578
    +class="cmti-10">581
    glossaries package  579, 580, 581, 582, 583, 584, 585, 586, 587, 588, 589
    +href="glossaries-extra-manual.html#dx1-5021" >582, 583, 584, 585, 586, 587, 588, 589, 590, 591, 592
    glossaries-accsupp package  590, 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, 604
    +href="glossaries-extra-manual.html#dx1-4005" >593, 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607
    glossaries-extra package  605, 606
    +href="glossaries-extra-manual.html#dx1-5023" >608, 609
    glossaries-extra-stylemods package  607, 608, 609, 610
    +href="glossaries-extra-manual.html#dx1-4014" >610, 611, 612, 613
    glossaries-prefix package  611, 612, 613
    +href="glossaries-extra-manual.html#dx1-35001" >614, 615, 616
    \glossariesextrasetup  614
    +class="cmti-10">617
    glossary styles:
         alttree  615, 616, 617, 618, 619, 620, 621
    +href="glossaries-extra-manual.html#dx1-16010" >618, 619, 620, 621, 622, 623, 624
        inline  622, 623
    +href="glossaries-extra-manual.html#dx1-16006" >625, 626
        long3col  624
    +href="glossaries-extra-manual.html#dx1-16004" >627
    glossary-inline package  625
    +href="glossaries-extra-manual.html#dx1-16007" >628
    glossary-tree package  626, 627, 628
    -\glossxtrsetpopts  629
    +href="glossaries-extra-manual.html#dx1-16011" >629, 630, 631
    +\glossxtrsetpopts  632
    \glsabbrvdefaultfont  630, 633, 631
    +class="cmti-10">634
    \glsabbrvemfont  632
    +class="cmti-10">635
    \glsabbrvfont  633
    +class="cmti-10">636
    \glsabbrvhyphenfont  634
    +class="cmti-10">637
    \glsabbrvonlyfont  635
    +class="cmti-10">638
    \glsabbrvscfont  636
    +class="cmti-10">639
    \glsabbrvsmfont  637
    +class="cmti-10">640
    \glsabbrvuserfont  638, 641, 639
    +class="cmti-10">642
    \Glsaccessdesc  640
    +class="cmti-10">643
    \glsaccessdesc  641
    +class="cmti-10">644
    \Glsaccessdescplural  642
    +class="cmti-10">645
    \glsaccessdescplural  643
    +class="cmti-10">646
    \Glsaccessfirst  644
    +class="cmti-10">647
    \glsaccessfirst  645
    +class="cmti-10">648
    \Glsaccessfirstplural  646
    +class="cmti-10">649
    \glsaccessfirstplural  647
    +class="cmti-10">650
    \Glsaccesslong  648
    +class="cmti-10">651
    \glsaccesslong  649
    +class="cmti-10">652
    \Glsaccesslongpl  650
    +class="cmti-10">653
    \glsaccesslongpl  651
    +class="cmti-10">654
    \Glsaccessname  652
    +class="cmti-10">655
    \glsaccessname  653
    +class="cmti-10">656
    \Glsaccessplural  654
    +class="cmti-10">657
    \glsaccessplural  655
    +class="cmti-10">658
    \Glsaccessshort  656
    +class="cmti-10">659
    \glsaccessshort  657
    +class="cmti-10">660
    \Glsaccessshortpl  658
    +class="cmti-10">661
    \glsaccessshortpl  659
    +class="cmti-10">662
    \Glsaccesssymbol  660
    +class="cmti-10">663
    \glsaccesssymbol  661
    +class="cmti-10">664
    \Glsaccesssymbolplural  662
    +class="cmti-10">665
    \glsaccesssymbolplural  663
    +class="cmti-10">666
    \Glsaccesstext  664
    +class="cmti-10">667
    \glsaccesstext  665
    +class="cmti-10">668
    \glsacspace  666
    +class="cmti-10">669
    \glsacspacemax  667
    +class="cmti-10">670
    \glsadd options
         format  671
    +    theHvalue  668, 669
    +href="glossaries-extra-manual.html#dx1-6018" >672, 673
        thevalue  670, 671, 672
    +href="glossaries-extra-manual.html#dx1-6017" >674, 675, 676, 677, 678
    \glscategory  673
    +class="cmti-10">679
    \glscategorylabel  674
    +class="cmti-10">680
    \glscurrententrylabel  675
    +class="cmti-10">681
    +\glscurrentfieldvalue  682
    \glsentrycurrcount  676
    +class="cmti-10">683
    + + + \glsentryprevcount  677
    +class="cmti-10">684
    \glsentryprevmaxcount  678
    +class="cmti-10">685
    \glsentryprevtotalcount  679
    - - - +class="cmti-10">686
    \glsFindWidestAnyName  680
    +class="cmti-10">687
    \glsFindWidestAnyNameLocation  681
    +class="cmti-10">688
    \glsFindWidestAnyNameSymbol  682
    +class="cmti-10">689
    \glsFindWidestAnyNameSymbolLocation  683
    +class="cmti-10">690
    \glsFindWidestLevelTwo  684
    +class="cmti-10">691
    \glsFindWidestTopLevelName  685
    +class="cmti-10">692
    \glsFindWidestUsedAnyName  686
    +class="cmti-10">693
    \glsFindWidestUsedAnyNameLocation  687
    +class="cmti-10">694
    \glsFindWidestUsedAnyNameSymbol  688
    +class="cmti-10">695
    \glsFindWidestUsedAnyNameSymbolLocation  689
    +class="cmti-10">696
    \glsFindWidestUsedLevelTwo  690
    +class="cmti-10">697
    \glsFindWidestUsedTopLevelName  691
    +class="cmti-10">698
    \glsfirstabbrvdefaultfont  692
    +class="cmti-10">699
    \glsfirstabbrvemfont  693
    +class="cmti-10">700
    \glsfirstabbrvfont  694
    +class="cmti-10">701
    \glsfirstabbrvhyphenfont  695
    +class="cmti-10">702
    \glsfirstabbrvonlyfont  696
    +class="cmti-10">703
    \glsfirstabbrvsmfont  697
    +class="cmti-10">704
    \glsfirstabbrvuserfont  698
    +class="cmti-10">705
    \glsfirstlongdefaultfont  699
    +class="cmti-10">706
    \glsfirstlongemfont  700
    +class="cmti-10">707
    \glsfirstlongfont  701
    +class="cmti-10">708
    \glsfirstlongfootnotefont  702
    +class="cmti-10">709
    \glsfirstlonghyphenfont  703
    +class="cmti-10">710
    \glsfirstlongonlyfont  704
    +class="cmti-10">711
    \glsfirstlonguserfont  705
    +class="cmti-10">712
    \Glsfmtfirst  706
    +class="cmti-10">713
    \glsfmtfirst  707
    +class="cmti-10">714
    \Glsfmtfirstpl  708
    +class="cmti-10">715
    \glsfmtfirstpl  709
    +class="cmti-10">716
    \Glsfmtfull  710
    +class="cmti-10">717
    \glsfmtfull  711
    +class="cmti-10">718
    \Glsfmtfullpl  712
    +class="cmti-10">719
    \glsfmtfullpl  713
    +class="cmti-10">720
    \Glsfmtlong  714
    +class="cmti-10">721
    \glsfmtlong  715
    +class="cmti-10">722
    \Glsfmtlongpl  716
    +class="cmti-10">723
    \glsfmtlongpl  717
    +class="cmti-10">724
    \Glsfmtplural  718
    +class="cmti-10">725
    \glsfmtplural  719
    +class="cmti-10">726
    \Glsfmtshort  720
    +class="cmti-10">727
    \glsfmtshort  721
    +class="cmti-10">728
    \Glsfmtshortpl  722
    +class="cmti-10">729
    + + + \glsfmtshortpl  723
    +class="cmti-10">730
    \Glsfmttext  724
    +class="cmti-10">731
    \glsfmttext  725
    - - - +class="cmti-10">732
    \glsforeachwithattribute  726
    +class="cmti-10">733
    \glsgetattribute  727
    +class="cmti-10">734
    \glsgetcategoryattribute  728
    +class="cmti-10">735
    \glsgetwidestname  729
    +class="cmti-10">736
    \glsgetwidestsubname  730
    +class="cmti-10">737
    \glshasattribute  731
    +class="cmti-10">738
    \glshascategoryattribute  732
    +class="cmti-10">739
    \glsifattribute  733
    +class="cmti-10">740
    \glsifcategory  734
    +class="cmti-10">741
    \glsifcategoryattribute  735
    +class="cmti-10">742
    \glsifnotregular  736
    +class="cmti-10">743
    \glsifnotregularcategory  737
    +class="cmti-10">744
    \glsifregular  738
    +class="cmti-10">745
    \glsifregularcategory  739
    +class="cmti-10">746
    \glskeylisttok  740
    +class="cmti-10">747
    \glslabeltok  741
    +class="cmti-10">748
    \glslink options
         format  742, 743
    +href="glossaries-extra-manual.html#dx1-6030" >749, 750, 751
        hyper  744, 745, 746
    +href="glossaries-extra-manual.html#dx1-11055" >752, 753, 754
        hyper=false  747
    +href="glossaries-extra-manual.html#dx1-25016" >755
        noindex  748, 749, 750, 751, 752, 753, 754
    +href="glossaries-extra-manual.html#dx1-6001" >756, 757, 758, 759, 760, 761, 762
    +    theHvalue  763
    +    thevalue  764
        wrgloss  755, 756, 757, 758
    +href="glossaries-extra-manual.html#dx1-6009" >765, 766, 767, 768
    \glslinkcheckfirsthyperhook  759
    +class="cmti-10">769
    \glslongdefaultfont  760
    +class="cmti-10">770
    \glslongemfont  761
    +class="cmti-10">771
    \glslongfont  762
    +class="cmti-10">772
    \glslongfootnotefont  763
    +class="cmti-10">773
    \glslonghyphenfont  764
    +class="cmti-10">774
    \glslongonlyfont  765
    +class="cmti-10">775
    \glslongpltok  766
    +class="cmti-10">776
    \glslongtok  767
    +class="cmti-10">777
    \glslonguserfont  768
    +class="cmti-10">778
    \glsnoidxdisplayloc  769
    +href="glossaries-extra-manual.html#dx1-8075" >779
    \glsps  770
    +class="cmti-10">780
    \glspt  771
    +class="cmti-10">781
    \glssetattribute  772
    +class="cmti-10">782
    \glssetcategoryattribute  773
    +class="cmti-10">783
    \glssetregularcategory  774
    +class="cmti-10">784
    \glsshortpltok  775
    +class="cmti-10">785
    \glsshorttok  776
    +class="cmti-10">786
    \Glsxtr  777
    +class="cmti-10">787
    + + + \glsxtr  778
    +class="cmti-10">788
    \glsxtrabbrvfootnote  779
    +class="cmti-10">789
    \glsxtrabbrvpluralsuffix  780, 790, 781
    +class="cmti-10">791
    \glsxtraddallcrossrefs  782
    +class="cmti-10">792
    \glsxtralias  783
    - - - +class="cmti-10">793
    \glsxtrAltTreeIndent  784
    +class="cmti-10">794
    \glsxtralttreeInit  785
    +class="cmti-10">795
    \glsxtralttreeSubSymbolDescLocation  786
    +class="cmti-10">796
    \glsxtralttreeSymbolDescLocation  787
    +class="cmti-10">797
    \glsxtrautoindex  788
    +class="cmti-10">798
    \glsxtrautoindexassignsort  789
    +class="cmti-10">799
    \glsxtrautoindexentry  790
    +class="cmti-10">800
    \glsxtrchecknohyperfirst  791
    +class="cmti-10">801
    \glsxtrcopytoglossary  792
    +class="cmti-10">802
    \glsxtrdeffield  793
    +class="cmti-10">803
    \glsxtrdisplayendloc  794
    +href="glossaries-extra-manual.html#dx1-8078" >804
    \glsxtrdisplayendlochook  795
    +href="glossaries-extra-manual.html#dx1-8080" >805
    \glsxtrdisplaysingleloc  796
    +href="glossaries-extra-manual.html#dx1-8076" >806
    \glsxtrdisplaystartloc  797
    +href="glossaries-extra-manual.html#dx1-8077" >807
    \glsxtrdoautoindexname  798
    +class="cmti-10">808
    \glsxtrdowrglossaryhook  799
    +class="cmti-10">809
    \glsxtredeffield  800
    +class="cmti-10">810
    \glsxtremsuffix  801
    +class="cmti-10">811
    \GlsXtrEnableEntryCounting  802
    +class="cmti-10">812
    \GlsXtrEnableEntryUnitCounting  803
    +class="cmti-10">813
    \GlsXtrEnableIndexFormatOverride  804
    +class="cmti-10">814
    \GlsXtrEnableInitialTagging  805
    +class="cmti-10">815
    \GlsXtrEnableOnTheFly  806
    +class="cmti-10">816
    \GlsXtrEnablePreLocationTag  807
    +class="cmti-10">817
    \glsxtrentryfmt  808
    +class="cmti-10">818
    \glsxtrfielddolistloop  809
    +href="glossaries-extra-manual.html#dx1-32038" >819
    \glsxtrfieldforlistloop  810
    +href="glossaries-extra-manual.html#dx1-32039" >820
    \glsxtrfieldifinlist  811
    +href="glossaries-extra-manual.html#dx1-32040" >821
    \glsxtrfieldlistadd  812
    +href="glossaries-extra-manual.html#dx1-32034" >822
    \glsxtrfieldlisteadd  813
    +href="glossaries-extra-manual.html#dx1-32036" >823
    \glsxtrfieldlistgadd  814
    +href="glossaries-extra-manual.html#dx1-32035" >824
    \glsxtrfieldlistxadd  815
    +href="glossaries-extra-manual.html#dx1-32037" >825
    \glsxtrfieldtitlecasecs  816
    +class="cmti-10">826
    \glsxtrfieldxifinlist  817
    +href="glossaries-extra-manual.html#dx1-32041" >827
    \glsxtrfmt  818
    +class="cmti-10">828
    \GlsXtrFmtDefaultOptions  819
    +class="cmti-10">829
    \GlsXtrFmtField  820
    +class="cmti-10">830
    \GlsXtrFormatLocationList  821
    +class="cmti-10">831
    \GLSxtrfull  822
    +class="cmti-10">832
    \Glsxtrfull  823
    +class="cmti-10">833
    \glsxtrfull  824
    +class="cmti-10">834
    + + + \Glsxtrfullformat  825
    +class="cmti-10">835
    \glsxtrfullformat  826
    +class="cmti-10">836
    \GLSxtrfullpl  827
    +class="cmti-10">837
    \Glsxtrfullpl  828
    +class="cmti-10">838
    \glsxtrfullpl  829
    - - - +class="cmti-10">839
    \Glsxtrfullplformat  830
    +class="cmti-10">840
    \glsxtrfullplformat  831
    +class="cmti-10">841
    \glsxtrfullsep  832
    +class="cmti-10">842
    \glsxtrhyphensuffix  833
    +class="cmti-10">843
    \glsxtrifcounttrigger  834
    +class="cmti-10">844
    +\glsxtrifhasfield  845
    +\glsxtrifhasfield*  846
    \glsxtrifkeydefined  835
    +class="cmti-10">847
    \glsxtrifwasfirstuse  836
    +class="cmti-10">848
    \glsxtrindexaliased  837
    +class="cmti-10">849
    \glsxtrindexseealso  838
    +class="cmti-10">850
    \glsxtrinitwrgloss  839
    +class="cmti-10">851
    \Glsxtrinlinefullformat  840
    +class="cmti-10">852
    \glsxtrinlinefullformat  841
    +class="cmti-10">853
    \Glsxtrinlinefullplformat  842
    +class="cmti-10">854
    \glsxtrinlinefullplformat  843
    +class="cmti-10">855
    \glsxtrinsertinsidetrue  844
    +class="cmti-10">856
    \GlsXtrLetField  845
    +class="cmti-10">857
    \GlsXtrLetFieldToField  846
    +class="cmti-10">858
    \GlsXtrLoadResources  847
    +href="glossaries-extra-manual.html#dx1-30022" >859
    \glsxtrlocrangefmt  848
    +href="glossaries-extra-manual.html#dx1-8079" >860
    \Glsxtrlong  849, 861, 850
    +class="cmti-10">862
    \glsxtrlong  851
    +class="cmti-10">863
    \glsxtrlonghyphen  852
    +class="cmti-10">864
    \glsxtrlonghyphenshort  853
    +class="cmti-10">865
    \GLSxtrlongpl  854
    +class="cmti-10">866
    \Glsxtrlongpl  855
    +class="cmti-10">867
    \glsxtrlongpl  856
    +class="cmti-10">868
    \glsxtrlongshortdescsort  857
    +class="cmti-10">869
    \glsxtrnewnumber  858
    +class="cmti-10">870
    \glsxtrnewsymbol  859
    +class="cmti-10">871
    \GlsXtrNoGlsWarningAutoMake  860
    +class="cmti-10">872
    \GlsXtrNoGlsWarningBuildInfo  861
    +class="cmti-10">873
    \GlsXtrNoGlsWarningCheckFile  862
    +class="cmti-10">874
    \GlsXtrNoGlsWarningEmptyMain  863
    +class="cmti-10">875
    \GlsXtrNoGlsWarningEmptyNotMain  864
    +class="cmti-10">876
    \GlsXtrNoGlsWarningEmptyStart  865
    +class="cmti-10">877
    \GlsXtrNoGlsWarningHead  866
    +class="cmti-10">878
    \GlsXtrNoGlsWarningMisMatch  867
    +class="cmti-10">879
    \GlsXtrNoGlsWarningNoOut  868
    +class="cmti-10">880
    \GlsXtrNoGlsWarningTail  869
    +class="cmti-10">881
    + + + \glsxtronlysuffix  870
    +class="cmti-10">882
    \glsxtrorglong  871
    +class="cmti-10">883
    \glsxtrorgshort  872
    +class="cmti-10">884
    \Glsxtrp  873, 885, 874
    +class="cmti-10">886
    \glsxtrp  875
    +class="cmti-10">887
    \glsxtrpageref  876
    +class="cmti-10">888
    \glsxtrparen  877
    - - - +class="cmti-10">889
    \Glsxtrpl  878
    +class="cmti-10">890
    \glsxtrpl  879
    +class="cmti-10">891
    \glsxtrpostdescription  880
    +class="cmti-10">892
    \glsxtrposthyphenlong  881
    +class="cmti-10">893
    \glsxtrposthyphenshort  882
    +class="cmti-10">894
    \glsxtrpostlink  883
    +class="cmti-10">895
    \glsxtrpostlinkAddDescOnFirstUse  884
    +class="cmti-10">896
    \glsxtrpostlinkAddSymbolOnFirstUse  885
    +class="cmti-10">897
    \glsxtrpostlinkendsentence  886
    +class="cmti-10">898
    \glsxtrpostlinkhook  887
    +class="cmti-10">899
    \glsxtrpostlongdescription  888
    +href="glossaries-extra-manual.html#dx1-5020" >900
    \glsxtrpostnamehook  889
    +class="cmti-10">901
    \GlsXtrPostNewAbbreviation  890
    +class="cmti-10">902
    \glsxtrprovidestoragekey  891
    +class="cmti-10">903
    \GlsXtrRecordCounter  892
    +href="glossaries-extra-manual.html#dx1-32044" >904
    \glsxtrregularfont  893
    +class="cmti-10">905
    \glsxtrresourcefile  894
    +href="glossaries-extra-manual.html#dx1-30021" >906
    \glsxtrRevertMarks  895
    +class="cmti-10">907
    \glsxtrscsuffix  896
    +class="cmti-10">908
    \glsxtrseealsolabels  897
    +class="cmti-10">909
    \glsxtrseelist  898
    +class="cmti-10">910
    \GlsXtrSetActualChar  899
    +class="cmti-10">911
    \glsxtrsetaliasnoindex  900
    +class="cmti-10">912
    \GlsXtrSetAltModifier  901
    +href="glossaries-extra-manual.html#dx1-8073" >913
    \glsxtrsetcategory  902
    +class="cmti-10">914
    \glsxtrsetcategoryforall  903
    +class="cmti-10">915
    \GlsXtrSetDefaultGlsOpts  904
    +class="cmti-10">916
    \GlsXtrSetEncapChar  905
    +class="cmti-10">917
    \GlsXtrSetEscChar  906
    +class="cmti-10">918
    \GlsXtrSetField  907
    +class="cmti-10">919
    \glsxtrsetfieldifexists  908
    +class="cmti-10">920
    \glsxtrsetgrouptitle  909
    +class="cmti-10">921
    \GlsXtrSetLevelChar  910
    +class="cmti-10">922
    \glsxtrsetpopts  911
    +class="cmti-10">923
    \Glsxtrshort  912, 924, 913
    +class="cmti-10">925
    \glsxtrshort  914
    +class="cmti-10">926
    \glsxtrshorthyphenlong  915
    +class="cmti-10">927
    \GLSxtrshortpl  916
    +class="cmti-10">928
    \Glsxtrshortpl  917
    +class="cmti-10">929
    + + + \glsxtrshortpl  918
    +class="cmti-10">930
    \glsxtrsmsuffix  919
    +class="cmti-10">931
    \Glsxtrsubsequentfmt  920
    +class="cmti-10">932
    \glsxtrsubsequentfmt  921
    +class="cmti-10">933
    \Glsxtrsubsequentplfmt  922
    +class="cmti-10">934
    \glsxtrsubsequentplfmt  923
    +class="cmti-10">935
    \glsxtrtagfont  924
    - - - +class="cmti-10">936
    \glsxtrunsrtdo  925
    +class="cmti-10">937
    \GlsXtrUseAbbrStyleFmts  926
    +class="cmti-10">938
    \GlsXtrUseAbbrStyleSetup  927
    +class="cmti-10">939
    \Glsxtrusefield  928
    +href="glossaries-extra-manual.html#dx1-32031" >940
    \glsxtrusefield  929
    +href="glossaries-extra-manual.html#dx1-32029" >941
    \glsxtruserfield  930
    +class="cmti-10">942
    \glsxtruserparen  931
    +class="cmti-10">943
    \glsxtrusersuffix  932, 944, 933
    +class="cmti-10">945
    \glsxtrusesee  934
    +class="cmti-10">946
    \glsxtruseseealso  935
    +class="cmti-10">947
    \glsxtruseseeformat  936, 948, 937
    +class="cmti-10">949
    \GlsXtrWarnDeprecatedAbbrStyle  938
    +class="cmti-10">950
    \GlsXtrWarning  939
    +class="cmti-10">951
    \glsxtrword  940
    +class="cmti-10">952
    \glsxtrwordsep  941
    +class="cmti-10">953

    H hyperref package  942, 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959
    +href="glossaries-extra-manual.html#dx1-6029" >954, 955, 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972

    I \ifglsxtrinitwrglossbefore  960
    +class="cmti-10">973

    L link-text  961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 975, 976, 977, 978, 979
    -location list  980, 981, 982, 983, 974, 975, 976, 977, 978, 979, 980, 981, 982, 983, 984, 985, 986, 987, 988, 989, 990, 991, 984
    +class="cmbx-10">992
    +location list  993, 994, 995, 996, 997
    \longnewglossaryentry  985
    +href="glossaries-extra-manual.html#dx1-5018" >998

    M makeglossaries  986, 987, 988, 989, 990
    +href="glossaries-extra-manual.html#dx1-3027" >999, 1000, 1001, 1002, 1003
    \makeglossaries  991
    +href="glossaries-extra-manual.html#dx1-5035" >1004
    makeglossaries-lite.lua  992, 993
    +href="glossaries-extra-manual.html#dx1-5038" >1005, 1006
    makeglossaries-lite.lua  994, 995
    +href="glossaries-extra-manual.html#dx1-5039" >1007, 1008
    makeindex  996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005
    +href="glossaries-extra-manual.html#dx1-3022" >1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018
    makeindex  1006
    +href="glossaries-extra-manual.html#dx1-6024" >1019, 1020, 1021, 1022
    memoir class  1007
    +href="glossaries-extra-manual.html#dx1-3021" >1023
    + + + mfirstuc package  1008, 1009, 1010
    +href="glossaries-extra-manual.html#dx1-5" >1024, 1025, 1026

    N \newabbreviation  1011
    +class="cmti-10">1027
    \newabbreviationstyle  1012
    +class="cmti-10">1028
    \newacronym  1013
    - - - +class="cmti-10">1029
    \newglossaryentry options
         alias  1014, 1015, 1016, 1017, 1018, 1019
    +href="glossaries-extra-manual.html#dx1-5010" >1030, 1031, 1032, 1033, 1034, 1035
        category  1020, 1021, 1022, 1023, 1024
    +href="glossaries-extra-manual.html#dx1-5009" >1036, 1037, 1038, 1039, 1040
        desc  1025, 1026
    +href="glossaries-extra-manual.html#dx1-37038" >1041, 1042
        descplural  1027, 1028
    +href="glossaries-extra-manual.html#dx1-37042" >1043, 1044
        description  1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047
    +href="glossaries-extra-manual.html#dx1-21098" >1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063
        descriptionplural  1048, 1049, 1050, 1051
    +href="glossaries-extra-manual.html#dx1-5019" >1064, 1065, 1066, 1067
        first  1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064
    +href="glossaries-extra-manual.html#dx1-8013" >1068, 1069, 1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080
        firstplural  1065, 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1073, 1074
    +href="glossaries-extra-manual.html#dx1-8014" >1081, 1082, 1083, 1084, 1085, 1086, 1087, 1088, 1089, 1090
        location  1075
    +href="glossaries-extra-manual.html#dx1-33016" >1091
        loclist  1076
    +href="glossaries-extra-manual.html#dx1-33017" >1092
        long  1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085
    +href="glossaries-extra-manual.html#dx1-10026" >1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100, 1101
        longplural  1086, 1087, 1088, 1089, 1090, 1091
    +href="glossaries-extra-manual.html#dx1-10010" >1102, 1103, 1104, 1105, 1106, 1107
        name  1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116
    +href="glossaries-extra-manual.html#dx1-10023" >1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132
        parent  1117, 1118, 1119
    +href="glossaries-extra-manual.html#dx1-16023" >1133, 1134, 1135
        plural  1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132
    +href="glossaries-extra-manual.html#dx1-8017" >1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, 1145, 1146, 1147, 1148
        see  1133, 1134, 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, 1145, 1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, 1158
    +href="glossaries-extra-manual.html#dx1-4021" >1149, 1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, 1158, 1159, 1160, 1161, 1162, 1163, 1164, 1165, 1166, 1167, 1168, 1169, 1170, 1171, 1172, 1173, 1174
        seealso  1159, 1160, 1161, 1162, 1163, 1164, 1165, 1166, 1167, 1168
    +href="glossaries-extra-manual.html#dx1-4022" >1175, 1176, 1177, 1178, 1179, 1180, 1181, 1182, 1183, 1184
        short  1169, 1170, 1171, 1172, 1173, 1174, 1175, 1176, 1177, 1178, 1179, 1180, 1181, 1182
    +href="glossaries-extra-manual.html#dx1-8011" >1185, 1186, 1187, 1188, 1189, 1190, 1191, 1192, 1193, 1194, 1195, 1196, 1197, 1198
        shortplural  1183, 1184, 1185, 1186, 1187, 1188, 1189, 1190, 1191, 1192, 1193, 1194, 1195, 1196, 1197
    +href="glossaries-extra-manual.html#dx1-10011" >1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, 1211, 1212, 1213
        sort  1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, 1211, 1212, 1213
    +href="glossaries-extra-manual.html#dx1-4075" >1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1225, 1226, 1227, 1228, 1229
        symbol  1214, 1215, 1216
    +href="glossaries-extra-manual.html#dx1-37030" >1230, 1231, 1232
        symbolplural  1217, 1218
    +href="glossaries-extra-manual.html#dx1-37034" >1233, 1234
        text  1219, 1220, 1221, 1222, 1223, 1224, 1225, 1226, 1227, 1228, 1229, 1230
    +href="glossaries-extra-manual.html#dx1-8016" >1235, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1245, 1246
        type  1231, 1232
    +href="glossaries-extra-manual.html#dx1-12046" >1247, 1248
        user1  1233, 1234, 1235
    +href="glossaries-extra-manual.html#dx1-21080" >1249, 1250, 1251
    number list  1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1245, 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257
    +href="glossaries-extra-manual.html#dx1-7023" >1252, 1253, 1254, 1255, 1256, 1257, 1258, 1259, 1260, 1261, 1262, 1263, 1264, 1265, 1266, 1267, 1268, 1269, 1270, 1271, 1272, 1273

    P package options:
         abbreviations  1258, 1259, 1260, 1261, 1262
    +href="glossaries-extra-manual.html#dx1-4087" >1274, 1275, 1276, 1277, 1278
        accsupp  1263, 1264, 1265
    +href="glossaries-extra-manual.html#dx1-4004" >1279, 1280, 1281
        acronym  1266
    +href="glossaries-extra-manual.html#dx1-4095" >1282
        acronymlists  1267
    +href="glossaries-extra-manual.html#dx1-4099" >1283
    + + +     automake  1268, 1269
    +href="glossaries-extra-manual.html#dx1-5040" >1284, 1285
        autoseeindex  1270, 1271
    +href="glossaries-extra-manual.html#dx1-4031" >1286, 1287
            false  1272, 1273
    +href="glossaries-extra-manual.html#dx1-4023" >1288, 1289
        docdef  1274, 1275, 1276, 1277
    +href="glossaries-extra-manual.html#dx1-4059" >1290, 1291, 1292, 1293
            restricted  1278
    +href="glossaries-extra-manual.html#dx1-4084" >1294
            true  1279, 1280
    +href="glossaries-extra-manual.html#dx1-4083" >1295, 1296
        docdefs  1281, 1282, 1283
    - - - +href="glossaries-extra-manual.html#dx1-29003" >1297, 1298, 1299
        entrycounter  1284
    +href="glossaries-extra-manual.html#dx1-31002" >1300
        hyperfirst
             false  1285
    +href="glossaries-extra-manual.html#dx1-26030" >1301
        index  1286, 1287
    +href="glossaries-extra-manual.html#dx1-5032" >1302, 1303
        indexcrossrefs  1288, 1289, 1290, 1291
    +href="glossaries-extra-manual.html#dx1-4020" >1304, 1305, 1306, 1307
            false  1292
    +href="glossaries-extra-manual.html#dx1-4030" >1308
        indexonlyfirst  1293, 1294, 1295, 1296
    +href="glossaries-extra-manual.html#dx1-6002" >1309, 1310, 1311, 1312
        nomain  1297
    +href="glossaries-extra-manual.html#dx1-3032" >1313
        nomissingglstext  1298
    +href="glossaries-extra-manual.html#dx1-4086" >1314
        nonumberlist  1299, 1300, 1301, 1302
    +href="glossaries-extra-manual.html#dx1-7026" >1315, 1316, 1317, 1318
        nopostdot  1303, 1304
    +href="glossaries-extra-manual.html#dx1-14018" >1319, 1320
            false  1305, 1306, 1307
    +href="glossaries-extra-manual.html#dx1-3004" >1321, 1322, 1323
            true  1308
    +href="glossaries-extra-manual.html#dx1-3003" >1324
        noredefwarn
             false  1309
    +href="glossaries-extra-manual.html#dx1-3009" >1325
            true  1310
    +href="glossaries-extra-manual.html#dx1-3006" >1326
        notree  1311
    +href="glossaries-extra-manual.html#dx1-16012" >1327
        numbers  1312, 1313, 1314
    +href="glossaries-extra-manual.html#dx1-4103" >1328, 1329, 1330
        postdot  1315, 1316
    +href="glossaries-extra-manual.html#dx1-3005" >1331, 1332
        record  1317, 1318, 1319, 1320, 1321, 1322
    +href="glossaries-extra-manual.html#dx1-4029" >1333, 1334, 1335, 1336, 1337, 1338
            alsoindex  1323, 1324, 1325, 1326
    +href="glossaries-extra-manual.html#dx1-4046" >1339, 1340, 1341, 1342
            off  1327, 1328
    +href="glossaries-extra-manual.html#dx1-4042" >1343, 1344
            only  1329, 1330, 1331, 1332, 1333, 1334, 1335
    +href="glossaries-extra-manual.html#dx1-4034" >1345, 1346, 1347, 1348, 1349, 1350, 1351
        seeautonumberlist  1336
    +href="glossaries-extra-manual.html#dx1-7027" >1352
        seenoindex  1337
    +href="glossaries-extra-manual.html#dx1-7016" >1353
            ignore  1338, 1339
    +href="glossaries-extra-manual.html#dx1-7018" >1354, 1355
            warn  1340
    +href="glossaries-extra-manual.html#dx1-33009" >1356
        shortcuts  1341, 1342
    +href="glossaries-extra-manual.html#dx1-4105" >1357, 1358
            abbr  1343, 1344
    +href="glossaries-extra-manual.html#dx1-4110" >1359, 1360
            abbreviation  1345, 1346
    +href="glossaries-extra-manual.html#dx1-20001" >1361, 1362
            abbreviations  1347
    +href="glossaries-extra-manual.html#dx1-4109" >1363
            ac  1348, 1349, 1350, 1351
    +href="glossaries-extra-manual.html#dx1-4108" >1364, 1365, 1366, 1367
            acro  1352
    +href="glossaries-extra-manual.html#dx1-4107" >1368
            acronyms  1353
    +href="glossaries-extra-manual.html#dx1-4106" >1369
            all  1354
    +href="glossaries-extra-manual.html#dx1-4120" >1370
            false  1355
    +href="glossaries-extra-manual.html#dx1-4123" >1371
            none  1356
    +href="glossaries-extra-manual.html#dx1-4122" >1372
            other  1357
    +href="glossaries-extra-manual.html#dx1-4111" >1373
            true  1358
    +href="glossaries-extra-manual.html#dx1-4121" >1374
    + + +     sort
             none  1359
    +href="glossaries-extra-manual.html#dx1-4056" >1375
        stylemods  1360, 1361, 1362
    +href="glossaries-extra-manual.html#dx1-4013" >1376, 1377, 1378
        subentrycounter  1363
    +href="glossaries-extra-manual.html#dx1-31003" >1379
        symbols  1364, 1365, 1366
    +href="glossaries-extra-manual.html#dx1-4100" >1380, 1381, 1382
        toc
             false  1367
    - - - +href="glossaries-extra-manual.html#dx1-3002" >1383
            true  1368
    +href="glossaries-extra-manual.html#dx1-3001" >1384
        translate
             babel  1369
    +href="glossaries-extra-manual.html#dx1-3011" >1385
            true  1370
    +href="glossaries-extra-manual.html#dx1-3013" >1386
        undefaction  1371, 1372
    +href="glossaries-extra-manual.html#dx1-4015" >1387, 1388
            error  1373, 1374
    +href="glossaries-extra-manual.html#dx1-4016" >1389, 1390
            warn  1375, 1376, 1377, 1378, 1379
    +href="glossaries-extra-manual.html#dx1-4017" >1391, 1392, 1393, 1394, 1395
        xindy  1380
    +href="glossaries-extra-manual.html#dx1-7046" >1396
    page (counter)  1381, 1382
    +href="glossaries-extra-manual.html#dx1-27028" >1397, 1398
    polyglossia package  1383
    +href="glossaries-extra-manual.html#dx1-39005" >1399
    \pretoglossarypreamble  1384
    +class="cmti-10">1400
    \printabbreviations  1385
    +class="cmti-10">1401
    \printglossary options
         target  1386, 1387
    +href="glossaries-extra-manual.html#dx1-5008" >1402, 1403
        title  1388
    +href="glossaries-extra-manual.html#dx1-39006" >1404
    \printnoidxglossary options
         sort  1389
    +href="glossaries-extra-manual.html#dx1-33012" >1405
    \printunsrtglossaries  1390
    +class="cmti-10">1406
    \printunsrtglossary  1391
    +class="cmti-10">1407
    \printunsrtglossary*  1392
    +class="cmti-10">1408
    \printunsrtglossaryhandler  1393
    +class="cmti-10">1409
    \printunsrtglossaryunit  1394
    +class="cmti-10">1410
    \printunsrtglossaryunitsetup  1395
    +class="cmti-10">1411
    \provideignoredglossary  1396
    +class="cmti-10">1412

    R relsizes package  1397
    +href="glossaries-extra-manual.html#dx1-21048" >1413
    \RestoreAcronyms  1398
    +class="cmti-10">1414

    S \setabbreviationstyle  1399
    +class="cmti-10">1415
    slantsc package  1400
    +href="glossaries-extra-manual.html#dx1-25020" >1416

    T textcase package  1401
    +href="glossaries-extra-manual.html#dx1-8" >1417
    tracklang package  1402, 1403
    +href="glossaries-extra-manual.html#dx1-4" >1418, 1419
    + + + translator package  1404
    +href="glossaries-extra-manual.html#dx1-3012" >1420

    X xfor package  1405
    +href="glossaries-extra-manual.html#dx1-9" >1421
    \xglssetwidest  1406
    +class="cmti-10">1422
    \xGlsXtrSetField  1407
    - - - +class="cmti-10">1423
    +xindy  1424, 1425, 1426, 1427, 1428, 1429, 1430, 1431
    xindy  1408, 1409, 1410, 1411, 1412, 1413, 1414, 1415
    +href="glossaries-extra-manual.html#dx1-6028" >1432
    xkeyval package  1416
    +href="glossaries-extra-manual.html#dx1-7" >1433

    1.14.21 was originally intended as the last release of glossaries to incorporate new features, but a few new minor features slipped in with some bug fixes in v4.21.

    -

    2.1The descriptionplural key is a throwback to the base package’s original acronym mechanism before the introduction of the long and short keys, where the long form was stored in the description + id="dx1-5029"> field and the short form was stored in the symbol field.

    -

    3.1For compatibility with earlier versions, \glsabbrvscfont \glsxtrscfont is now deprecated. Likewise for similar commands.

    -

    9.1Version 1.11 only allowed one use of \GlsXtrLoadResources per document.

    -

    9.2v1.08 assumed ⟨filename⟩#1={\protect\ttfamily#1}|main}} \DeleteShortVerb{\|} \MakeShortVerb{"} - \title{glossaries-extra.sty v1.18: + \title{glossaries-extra.sty v1.19: an extension to the glossaries package} \author{Nicola L.C. Talbot\\[10pt] Dickimaw Books\\ \url{http://www.dickimaw-books.com/}} - \date{2017-08-10} + \date{2017-09-08} \maketitle \begin{abstract} @@ -224,7 +225,8 @@ The file \texttt{example-glossaries-xr.tex} contains dummy entries with cross-references that may be used for creating minimal working examples for testing the \styfmt{glossaries-extra} package. (The base \styfmt{glossaries} package provides additional files, -but this one needs \styfmt{glossaries-extra}.) +but this one needs \styfmt{glossaries-extra}.) There are equivalent +\texttt{.bib} files for use with \gls{bib2gls}. \end{abstract} @@ -257,7 +259,7 @@ Additional resources: \href{http://www.latex-community.org/know-how/latex/55-latex-general/263-glossaries-nomenclature-lists-of-symbols-and-acronyms}{Glossaries, Nomenclature, Lists of Symbols and Acronyms}. -\item \href{https://github.com/nlct/bib2gls}{bib2gls} +\item \href{http://www.dickimaw-books.com/software/bib2gls}{bib2gls} \end{itemize} \tableofcontents @@ -876,6 +878,9 @@ See \sectionref{sec:see} for further details. The test file \texttt{example-glossaries-xr.tex} contains dummy entries with a mixture of \gloskey{see}, \gloskey{alias} and \gloskey{seealso} keys for use with minimal working examples. +There are also \texttt{example-glossaries-*.bib} files that +correspond to each \texttt{example-glossaries-*.tex} file +for testing \gls{bib2gls}. The \cs{longnewglossaryentry} command now has a starred version (as from v1.12) that doesn't automatically insert @@ -1031,14 +1036,43 @@ indexed.) As from version 1.14, there are two new keys for \cs{glsadd}: \gloskey[glsadd]{thevalue} and \gloskey[glsadd]{theHvalue}. These keys are designed for manually adding explicit locations -rather than obtaining the value from the associated counter. (If -you want an automated method, you might want to investigate \gls{bib2gls}.) This is +rather than obtaining the value from the associated counter. +As from version 1.19, these two keys are also available for commands +like \cs{gls} and \cs{glslink}. The \gloskey[glsadd]{thevalue} keys is intended primarily for adding locations in supplementary material -that can't otherwise be picked up by \gls{makeindex} or \gls{xindy}. -They therefore aren't available for commands like \cs{gls} or -\cs{glslink}. Remember that the value will still need to -be a valid location according to the rules of whichever indexing -application you use. +that can't be obtained from a counter. + +The principle key \gloskey[glslink]{thevalue} is for the location value. The +other key \gloskey[glslink]{theHvalue} can be used to +extract a prefix value for the first argument of commands like +\ics{glsnoidxdisplayloc}. It's value must be in the format +\meta{prefix}\meta{location}. In general, there's little need for +this key as the prefix is typically associated with a counter that can be +used to form hypertargets. + +\begin{important} +If you use \gloskey[glsadd]{thevalue}, you must make sure that you +use an indexing application that will accept the given value. +\end{important} + +For example, \app{makeindex} will only accept locations in the form +[\meta{num}\meta{sep}]*\meta{num} where \meta{num} is an arabic +number (0, 1, \ldots), roman numeral (i, ii, \ldots\ or I, II, +\ldots) or a character from a, \ldots, z or A, \ldots, Z, and +[\meta{num}\meta{sep}]* indicates zero or more instances of a number +followed by the recognised separator character (set with +\cs{glsSetCompositor}). This means that \app{makeindex} won't +accept, for example, +\begin{verbatim} +\glsadd[thevalue={Supplementary Material}]{sample} +\end{verbatim} +This location value will be accepted by \gls{bib2gls}, since it will +allow any location and will only try forming ranges if the location +matches any of its numerical patterns. +In the case of \app{xindy}, you'll need to add a rule that can match +the value. If you're using \sty{hyperref}, you may need to use the +\gloskey[glslink]{format} key to prevent a hyperlink if one can't +naturally be formed from the prefix, counter and location value. For example, suppose the file \texttt{suppl.tex} contains: \begin{verbatim} @@ -1075,10 +1109,8 @@ Some \gls{sample} text. \glsadd[thevalue={S.2}]{sample} \end{document} \end{verbatim} -(By placing \cs{glsadd} at the end of the document, it adds the -supplementary location to the end of the location list, although the -ordering may be changed by the indexing application depending on its -location collation settings.) +This location value will be accepted by \app{makeindex} as it's in +the form \meta{num}\meta{sep}\meta{num}. If you want hyperlinks, things are more complicated. First you need to set the \catattr{externallocation} to the location of @@ -1096,7 +1128,7 @@ Next you need to add \texttt{glsxtrsupphypernumber} as the format: Both documents will need to use the \sty{hyperref} package. Remember that the counter used for the location also needs to match. If \cs{theH}\meta{counter} is defined in the other document -and is not the same as \cs{the}\meta{counter}, then you need +and doesn't match in the referencing document, then you need to use \gloskey[glsadd]{theHvalue} to set the appropriate value. See the accompanying sample files \texttt{sample-suppl-hyp.tex} and \texttt{sample-suppl-main-hyp.tex} for an example that uses @@ -1109,6 +1141,13 @@ take you to the relevant place in the external PDF file links, and some may take you to the first page or last visited page. \end{important} +For example, if both \texttt{sample-suppl-hyp.pdf} +and \texttt{sample-suppl-main-hyp.pdf} are in the same directory, +then viewing \texttt{sample-suppl-main-hyp.pdf} in Evince will +take you to the correct location in the linked document (when you +click on the S.2 external link), but Okular will take you to the top +of the first page of the linked document. + \section{Cross-References (\qt{see} and \qt{see also})} \label{sec:see} @@ -1239,7 +1278,7 @@ The \gloskey{seealso} key implements the automatic indexing using \end{definition} which just does \begin{alltt} -\cs{glssee}\oarg{\cs{seealsoname}}\marg{label}\marg{xr list} +\cs{glssee}[\cs{seealsoname}]\marg{label}\marg{xr list} \end{alltt} unless the \pkgopt{xindy} option is used with \sty{glossaries} v4.30+, in which case a distinct \texttt{seealso} cross-reference @@ -1460,6 +1499,23 @@ commands). If you want to adjust the default for \gloskey[glslink]{wrgloss}, it's better to do this by redefining \ics{glsxtrinitwrgloss} instead. +\begin{important} +\cs{GlsXtrSetDefaultGlsOpts} doesn't affect \cs{glsadd}. +\end{important} + +If you want to change the default value of \gloskey[glsadd]{format}, +you can instead use: +\begin{definition}[\GlsXtrSetDefaultNumberFormat] +\cs{GlsXtrSetDefaultNumberFormat}\marg{format} +\end{definition} +This has the advantage of also working for \cs{glsadd}. +For example, if you want all locations in the back matter to appear +in italic (unless explicitly overridden): +\begin{verbatim} +\backmatter +\GlsXtrSetDefaultNumberFormat{hyperit} +\end{verbatim} + Commands like \ics{gls} have star (\texttt{*}) and plus (\texttt{+}) modifiers as a short cut for \texttt{hyper=false} and \texttt{hyper=true}. The \styfmt{glossaries-extra} package @@ -5772,9 +5828,10 @@ to just text. \chapter{bib2gls: Managing Reference Databases} \label{sec:bib2gls} -There is a new command line application under development called +There is a new command line application called \gls{bib2gls}, which works in much the same way as -a combination of \appfmt{bibtex} and \appfmt{makeindex}. +a combination of \appfmt{bibtex} and +\appfmt{makeindex}\slash\appfmt{xindy}. Instead of storing all your entry definitions in a \texttt{.tex} and loading them using \cs{input} or \cs{loadglsentries}, the entries can instead be stored in a \texttt{.bib} file and \gls{bib2gls} can @@ -5788,10 +5845,12 @@ by only defining the entries that are actually required in the document. If you currently have a \texttt{.tex} file that contains hundreds of definitions, but you only use a dozen or so in your document, then the build time is needlessly slowed by the unrequired -definitions that occur when the file is input. +definitions that occur when the file is input. (You can convert an +existing \texttt{.tex} file containing glossary definitions to a +\texttt{.bib} file using \app{convertgls2bib}, supplied with +\gls{bib2gls}.) -Although \gls{bib2gls} isn't ready yet (at the time of writing -this), there have been some new commands and options added to +There are some new commands and options added to \styfmt{glossaries-extra} to help assist the integration of \gls{bib2gls} into the document build process. @@ -5883,7 +5942,7 @@ The \texttt{.glstex} file created by \cs{bib2gls} is loaded using: \cs{glsxtrresourcefile}\oarg{options}\marg{filename} \end{definition} (Don't include the file extension in \meta{filename}.) -There's a shortcut version that sets \meta{filename} \cs{jobname}: +There's a shortcut version (recommended over the above) that sets \meta{filename} to use \cs{jobname}: \begin{definition}[\DescribeMacro\GlsXtrLoadResources] \cs{GlsXtrLoadResources}\oarg{options} \end{definition} @@ -5914,21 +5973,19 @@ to the \texttt{.aux} file and will input for example, \meta{filename} happens to be the same as \cs{jobname}. The \texttt{.glstex} extension was enforced by version 1.11.} -The options are ignored by \styfmt{glossaries-extra} but are picked -up by \gls{bib2gls} and are used to supply various information, such -as the name of the \texttt{.bib} files and any changes to the -default behaviour. - Since the \texttt{.glstex} won't exist on the first \LaTeX\ run, the \styopt{record} package option additionally switches on \styopt[warn]{undefaction}. Any use of commands like \cs{gls} or \cs{glstext} will produce ?? in the document, since they are undefined at this point. Once \gls{bib2gls} has created the \texttt{.glstex} file the references should be resolved. +This may cause a shift in the locations if the actual text produced +once the entry is defined is larger than the placeholder ?? (as can +occur with long citations). \begin{important} Note that \cs{glsaddall} doesn't work with \gls{bib2gls} as the command -has to iterate over the glossary lists, which will be empty on the first +has to iterate over the internal lists of defined entry labels, which will be empty on the first run and on subsequent runs will only contain those entries that have been selected by \gls{bib2gls}. \end{important} @@ -6269,6 +6326,29 @@ given by \meta{label-2}. There's no check for the existence of \cs{glsxtrsetfieldifexists}\marg{label-1}\marg{field-1}\marg{code} is still used, as for \cs{GlsXtrSetField}. +The \styfmt{glossaries} package provides \ics{ifglshasfield} +to determine if a field has been set. The \styfmt{glossaries-extra} +package provides a simpler version: +\begin{definition}[\DescribeMacro\glsxtrifhasfield] +\cs{glsxtrifhasfield}\marg{label}\marg{field}\marg{true}\marg{false} +\end{definition} +(New to v1.19.) +Unlike \cs{ifglshasfield}, this version doesn't complain if the +entry (given by \meta{label}) or the field don't exist and +will simply do \meta{false}. If the field does exist for the given +entry and it's not empty, the \meta{true} part is done otherwise it +does \meta{false}. Within \meta{true} you may use +\begin{definition}[\DescribeMacro\glscurrentfieldvalue] +\cs{glscurrentfieldvalue} +\end{definition} +to access the field value. This command includes grouping +which scopes the \meta{true} and \meta{false} parts. +The starred version +\begin{definition}[\DescribeMacro{\glsxtrifhasfield*}] +\cs{glsxtrifhasfield*}\marg{label}\marg{field}\marg{true}\marg{false} +\end{definition} +omits the implicit grouping. + The \styfmt{glossaries} package provides \ics{glsfieldfetch} which can be used to fetch the value of the given field and store it in a control sequence. The \styfmt{glossaries-extra} package provides 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 e2696786803..134b8b2fce5 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 bbd02e3b8f8..9bf1fef1aba 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 9cbc3298fd3..a1c57a95805 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 d109078735b..a7ef80fa2c1 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 ddb71e5e271..529aaef8db3 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 f8af2592568..94daab3981b 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 9155181c7b3..9dcf0dc5fd1 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 83588b5ef5f..81b8e15c62b 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 ecf399e8a01..eb96aba3139 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 81562fecc31..1f69d541840 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 e8f5a9cf6d7..f808bea5c03 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 5a57eff8bab..e22e241b0c8 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 13bccdc02c5..2daa552e219 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 95041935ad3..849f5567390 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 b52248c8d60..1773e729ccd 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 b305bf5a9d8..2da575a39e0 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 7aea7cd81c2..9dfb9e4058f 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 bde04e2811d..46ce0c5bf0a 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 3d062983e05..1f337d22000 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 1bac44a2469..04793152b95 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 decff143f61..1f733b650d4 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 073d6c9c090..a8de1aa901c 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-mixed-abbrv-styles.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf index 87e591e2861..bdb81ec7383 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 2b6265667a4..53396c9d7a9 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 52447cb88b5..1719d924ba2 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 c6144702f89..dc1302678ee 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 a8f948865b8..c9460679cee 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 80f27412727..279cf194350 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 4c9d5e4576f..4f9c1a8feb3 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 6b88da28940..bdc6a3e8efe 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 1a2ad43a1f9..706d3f98ea2 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 43622f24ed0..e92c7d3ce60 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 dbd71f18702..a5aaa30e4e4 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 63b77bd233e..63f60ed34c8 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 4f71acf500a..bfa4b989a6e 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 e232659f903..2c34b09d011 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.glstex b/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.glstex new file mode 100644 index 00000000000..3238f386e01 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.glstex @@ -0,0 +1,46 @@ +\providecommand{\bibglsrange}[1]{#1} +\providecommand{\bibglsinterloper}[1]{#1\delimN } +\providecommand{\bibglspassimname}{passim} +\providecommand{\bibglspassim}{ \bibglspassimname} + +\providecommand{\bibglsseesep}{, } + +\providecommand{\bibglsseealsosep}{, } + +\providecommand{\bibglspostlocprefix}{\ } +\appto\glossarypreamble{% + \providecommand{\bibglslocprefix}[1]{% + \ifcase#1 + \or \unskip , page\bibglspostlocprefix + \else \unskip , pages\bibglspostlocprefix + \fi + }% +} +\appto\glossarypreamble{% + \providecommand{\bibglslocsuffix}[1]{\@.}% +} +\providecommand{\bibglsnewentry}[4]{% + \longnewglossaryentry*{#1}{name={#3},#2}{#4}% +} + +\bibglsnewentry{amet}% +{location={\bibglslocprefix{1}\setentrycounter[]{page}\glsnumberformat{1}\bibglslocsuffix{1}}, +sort={amet}}% +{amet}% +{consectetuer} +\glsxtrfieldlistadd{amet}{loclist}{\glsnoidxdisplayloc{}{page}{glsnumberformat}{1}} + +\bibglsnewentry{dolor}% +{location={\bibglslocprefix{1}\setentrycounter[]{page}\glsnumberformat{1}\bibglslocsuffix{1}}, +sort={dolor}}% +{dolor}% +{sit} +\glsxtrfieldlistadd{dolor}{loclist}{\glsnoidxdisplayloc{}{page}{glsnumberformat}{1}} + +\bibglsnewentry{lorem}% +{location={\bibglslocprefix{1}\setentrycounter[]{page}\glsnumberformat{1}\bibglslocsuffix{1}}, +sort={lorem}}% +{lorem}% +{ipsum} +\glsxtrfieldlistadd{lorem}{loclist}{\glsnoidxdisplayloc{}{page}{glsnumberformat}{1}} + 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 54f3354c84d..918d466d15e 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-record.tex b/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.tex index 2639da2e3d4..760a866f0c4 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.tex +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.tex @@ -1,25 +1,25 @@ % arara: pdflatex +% arara: bib2gls % arara: pdflatex \documentclass{article} \usepackage[colorlinks]{hyperref} -\usepackage[record,style=index]{glossaries-extra} - - -% Use \loadglsentries (or \input) for .tex files: -% \loadglsentries{example-glossaries-brief} - -% Use \glsxtrresourcefile or \GlsXtrLoadResources for .glstex files: - -%\GlsXtrLoadResources % loads \jobname.glstex -\glsxtrresourcefile{sample-resource}% loads sample-resource.glstex +\usepackage[record,% use bib2gls + style=index]{glossaries-extra} \GlsXtrRecordCounter{section} +\GlsXtrLoadResources[ + src={example-glossaries-brief},% entries defined in example-glossaries-brief.bib + sort={en-GB},% sort according to en-GB locale + loc-prefix={{\unskip, page},{\unskip, pages}},% prefix for location list + loc-suffix% suffix for location list + ] + \begin{document} \section{Sample Section} -\printunsrtglossaryunit{section} +\printunsrtglossaryunit[nonumberlist]{section} % or: %\printunsrtglossary*{\printunsrtglossaryunitsetup{section}% % \renewcommand*{\glossarysection}[2][]{\subsection*{Summary}}% @@ -27,11 +27,11 @@ \gls{dolor}, \gls{amet}. -See \url{https://github.com/nlct/bib2gls} for converting +See \url{http://www.dickimaw-books.com/software/bib2gls} for converting .bib to .glstex files. \section{Another Section} -\printunsrtglossaryunit{section} +\printunsrtglossaryunit[nonumberlist]{section} \glspl{lorem}, \gls{amet}. diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-resource.glstex b/Master/texmf-dist/doc/latex/glossaries-extra/sample-resource.glstex deleted file mode 100644 index acd51fcef45..00000000000 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-resource.glstex +++ /dev/null @@ -1,12 +0,0 @@ -\newglossaryentry{lorem}{name={lorem},description={ipsum}} - -\newglossaryentry{dolor}{name={dolor},description={sit}} - -\newglossaryentry{amet}{name={amet},description={consectetuer}} - -\newglossaryentry{adipiscing}{name={adipiscing},description={elit}} - -\newglossaryentry{ut}{name={ut},description={purus}} - -\newglossaryentry{elit}{name={elit},description={vestibulum}} - 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 30b5864da64..0d2b2281b77 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 b5f8e65f25b..179a7b9ade2 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-hyp.tex b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.tex index 346496ec2fa..bb72a7ce1cd 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.tex +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.tex @@ -4,7 +4,11 @@ \documentclass{article} \usepackage[colorlinks]{hyperref} -\usepackage{glossaries-extra} +\usepackage + %[debug=showtargets]% requires glossaries.sty v4.32 + {glossaries-extra} + +%\renewcommand*{\glsshowtarget}[1]{\texttt{\small [#1]}} \makeglossaries 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 207f6a2efac..4d4eb48591e 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-hyp.tex b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.tex index 4f53fca2ddb..e2de8bfbefb 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.tex +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.tex @@ -14,10 +14,16 @@ name={sample},description={an example}} \begin{document} +\section{Sample} Some \gls{sample} text. Test link: \hyperref{sample-suppl-hyp.pdf}{}{section.II.S.2}{S.2}. +In this document, \verb|\theHsection| is in the form: \theHsection. + +In the other document, it's in the form II.S.2 so +\texttt{theHvalue} is needed to ensure the hyperlink is correct. + \printglossaries \glsadd[format=glsxtrsupphypernumber,thevalue={S.2},theHvalue={II.S.2},counter=section]{sample} \end{document} 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 b97053aa2a9..e4fd62e460c 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 0bacffea690..7143dcfc9be 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 d6780209870..200fc872127 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 d3db82bf88a..8e81707e688 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 8940776efdf..337b1dd4785 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 c06569ee24c..dadff3b0e91 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 7ae270bd46b..3ead78d314b 100644 --- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx +++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx @@ -1,17 +1,20 @@ %\iffalse % glossaries-extra.dtx generated using makedtx version 1.2 (c) Nicola Talbot % Command line args: -% -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})" +% -comment ".*\.tex" +% -comment ".*\.bib" % -author "Nicola Talbot" -% -doc "glossaries-extra-codedoc.tex" % -macrocode ".*\.tex" +% -macrocode ".*\.bib" +% -section "chapter" +% -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})" +% -doc "glossaries-extra-codedoc.tex" % -src "glossaries-extra.sty\Z=>glossaries-extra.sty" % -src "glossaries-extra-stylemods.sty\Z=>glossaries-extra-stylemods.sty" % -src "(example-glossaries-.+\.tex)\Z=>\1" -% -comment ".*\.tex" -% -section "chapter" +% -src "(example-glossaries-.+\.bib)\Z=>\1" % glossaries-extra -% Created on 2017/8/10 15:55 +% Created on 2017/9/8 22:43 %\fi %\iffalse %<*package> @@ -121,7 +124,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \setcounter{IndexColumns}{2} -\CheckSum{17436} +\CheckSum{17566} \newcommand*{\ifirstuse}{\iterm{first use}} \newcommand*{\firstuse}{\gls{firstuse}} @@ -161,13 +164,13 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \raggedright } -\title{glossaries-extra.sty v1.18: +\title{glossaries-extra.sty v1.19: documented code} \author{Nicola L.C. Talbot\\[10pt] Dickimaw Books\\ \url{http://www.dickimaw-books.com/}} -\date{2017-08-10} +\date{2017-09-08} \begin{document} \DocInput{glossaries-extra.dtx} @@ -212,7 +215,7 @@ Dickimaw Books\\ %\section{Package Initialisation and Options} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra}[2017/08/10 v1.18 (NLCT)] +\ProvidesPackage{glossaries-extra}[2017/09/08 v1.19 (NLCT)] % \end{macrocode} % Requires \sty{xkeyval} to define package options. % \begin{macrocode} @@ -389,6 +392,22 @@ Dickimaw Books\\ % \end{macrocode} %\end{macro} % +%\begin{macro}{\@glsxtr@defaultnumberformat} +%\changes{1.19}{2017-09-09}{new} +% \begin{macrocode} +\newcommand*{\@glsxtr@defaultnumberformat}{glsnumberformat}% +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\GlsXtrSetDefaultNumberFormat} +%\changes{1.19}{2017-09-09}{new} +% \begin{macrocode} +\newcommand*{\GlsXtrSetDefaultNumberFormat}[1]{% + \renewcommand*{\@glsxtr@defaultnumberformat}{#1}% +}% +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\@@glsxtr@record} %\changes{1.08}{2016-12-13}{new} %This is the actual code that does the recording @@ -399,9 +418,10 @@ Dickimaw Books\\ % \begin{macrocode} \newcommand*{\@@glsxtr@record}[3]{% \begingroup - \def\@glsnumberformat{glsnumberformat}% + \let\@glsnumberformat\@glsxtr@defaultnumberformat \def\@glsxtr@thevalue{}% \def\@glsxtr@theHvalue{\@glsxtr@thevalue}% + \let\@glsxtr@org@theHvalue\@glsxtr@theHvalue \ifcsdef{glo@#2@counter}% {% \edef\@gls@counter{\csname glo@#2@counter\endcsname}% @@ -424,11 +444,20 @@ Dickimaw Books\\ \ifdefempty{\@glsxtr@thevalue}% {% % \end{macrocode} +%Key \gloskey[glsadd]{thevalue} hasn't been set, but check if +%\gloskey[glsadd]{theHvalue} has been set. (Not particularly likely, +%but allow for it.) +% \begin{macrocode} + \ifx\@glsxtr@org@theHvalue\@glsxtr@theHvalue + \else + \let\theHglsentrycounter\@glsxtr@theHvalue + \fi +% \end{macrocode} %Save the entry counter. % \begin{macrocode} \glsxtr@saveentrycounter % \end{macrocode} -%Temporarily redefine \cs{@@do@@wrglossary} so we can use +%Temporarily redefine \cs{@@do@@wrglossary} for use with %\cs{glsxtr@@do@wrglossary}. % \begin{macrocode} \let\@@do@@wrglossary\@glsxtr@dorecord @@ -436,13 +465,22 @@ Dickimaw Books\\ {% % \end{macrocode} %\gloskey[glsadd]{thevalue} has been set, so there's no need to -%defer writing the location value. +%defer writing the location value. (If it's dependent on the page +%counter, the \gloskey[glslink]{counter} key should be set instead.) % \begin{macrocode} \let\theglsentrycounter\@glsxtr@thevalue - \def\theHglsentrycounter{\@glsxtr@theHvalue}% + \let\theHglsentrycounter\@glsxtr@theHvalue \let\@@do@@wrglossary\@glsxtr@dorecordnodefer }% - \glsxtr@@do@wrglossary{#2}% + \ifx\@glsxtr@record@setting\@glsxtr@record@setting@alsoindex + \glsxtr@@do@wrglossary{#2}% + \else +% \end{macrocode} +%No need to escape special characters, but need to save the label. +% \begin{macrocode} + \edef\@gls@label{\glsdetoklabel{#2}}% + \@@do@@wrglossary + \fi }% \fi \endgroup @@ -453,24 +491,53 @@ Dickimaw Books\\ %\begin{macro}{\@glsxtr@dorecord} %\changes{1.08}{2016-12-13}{new} %\changes{1.15}{2017-05-10}{corrected premature expansion of \cs{@glslocref}} +%If \pkgopt[alsoindex]{record} is used, then \cs{@glslocref} may +%have been escaped, but this isn't appropriate here. +%\changes{1.19}{2017-09-09}{Use \cs{@glsrecordlocref} instead of \cs{@glslocref}} % \begin{macrocode} \newcommand*\@glsxtr@dorecord{% - \protected@write\@auxout{\let\@glslocref\relax}{\string\glsxtr@record + \global\let\@glsrecordlocref\theglsentrycounter + \let\@glsxtr@orgprefix\@glo@counterprefix + \ifx\theglsentrycounter\theHglsentrycounter + \def\@glo@counterprefix{}% + \else + \edef\@do@gls@getcounterprefix{\noexpand\@gls@getcounterprefix + {\theglsentrycounter}{\theHglsentrycounter}% + }% + \@do@gls@getcounterprefix + \fi + \protected@write\@auxout{\let\@glsrecordlocref\relax}{\string\glsxtr@record {\@gls@label}{\@glo@counterprefix}{\@gls@counter}{\@glsnumberformat}% - {\@glslocref}}% + {\@glsrecordlocref}}% \@glsxtr@counterrecordhook + \let\@glo@counterprefix\@glsxtr@orgprefix } % \end{macrocode} %\end{macro} % %\begin{macro}{\@glsxtr@dorecordnodefer} %\changes{1.16}{2017-06-15}{new} -%As above, but don't defer expansion of location. +%As above, but don't defer expansion of location. This uses +%\cs{theglsentrycounter} directly for the location +%rather than \cs{@glslocref} since there's no need to guard against +%premature expansion of the page counter. +%\changes{1.19}{2017-09-09}{Use \cs{theglsentrycounter} for the location +%rather than \cs{@glslocref}} % \begin{macrocode} \newcommand*\@glsxtr@dorecordnodefer{% - \protected@write\@auxout{}{\string\glsxtr@record - {\@gls@label}{\@glo@counterprefix}{\@gls@counter}{\@glsnumberformat}% - {\@glslocref}}% + \ifx\theglsentrycounter\theHglsentrycounter + \protected@write\@auxout{}{\string\glsxtr@record + {\@gls@label}{}{\@gls@counter}{\@glsnumberformat}% + {\theglsentrycounter}}% + \else + \edef\@do@gls@getcounterprefix{\noexpand\@gls@getcounterprefix + {\theglsentrycounter}{\theHglsentrycounter}% + }% + \@do@gls@getcounterprefix + \protected@write\@auxout{}{\string\glsxtr@record + {\@gls@label}{\@glo@counterprefix}{\@gls@counter}{\@glsnumberformat}% + {\theglsentrycounter}}% + \fi \@glsxtr@counterrecordhook } % \end{macrocode} @@ -597,6 +664,21 @@ Dickimaw Books\\ % \end{macrocode} %\end{macro} % +%\begin{macro}{\@glsxtr@record@setting} +%\changes{1.19}{2017-09-09}{new} +%Keep track of the \pkgopt{record} package option. +% \begin{macrocode} +\newcommand*{\@glsxtr@record@setting}{off} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@glsxtr@record@setting@alsoindex} +%\changes{1.19}{2017-09-09}{new} +% \begin{macrocode} +\newcommand*{\@glsxtr@record@setting@alsoindex}{alsoindex} +% \end{macrocode} +%\end{macro} +% %Now define the \pkgopt{record} package option. %\changes{1.08}{2016-12-13}{added \pkgopt{record} package option} % \begin{macrocode} @@ -604,6 +686,7 @@ Dickimaw Books\\ {off,only,alsoindex}% [only]% {% + \let\@glsxtr@record@setting\val \ifcase\nr\relax % \end{macrocode} %Don't record. @@ -1562,6 +1645,43 @@ Dickimaw Books\\ % \end{macrocode} %\end{macro} % +%\begin{macro}{\glsxtrifhasfield} +%\changes{1.19}{2017-09-09}{new} +%A simpler alternative to \cs{ifglshasfield} that doesn't complain +%if the entry or the field doesn't exist. (No mapping is used.) +%Grouping is added to the unstarred version allow for nested use. +% \begin{macrocode} +\newrobustcmd{\glsxtrifhasfield}{% + \@ifstar{\s@glsxtrifhasfield}{\@glsxtrifhasfield}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@glsxtrifhasfield} +%\changes{1.19}{2017-09-09}{new} +%Unstarred version adds grouping. +% \begin{macrocode} +\newcommand{\@glsxtrifhasfield}[4]{% + {\s@glsxtrifhasfield{#1}{#2}{#3}{#4}}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\s@glsxtrifhasfield} +%\changes{1.19}{2017-09-09}{new} +% Starred version omits grouping. +% \begin{macrocode} +\newcommand{\s@glsxtrifhasfield}[4]{% + \letcs{\glscurrentfieldvalue}{glo@\glsdetoklabel{#2}@#1}% + \ifdef\glscurrentfieldvalue + {% + \ifdefempty\glscurrentfieldvalue{#4}{#3}% + }% + {#4}% +} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\glsxtrusefield} %\changes{1.12}{2017-02-03}{new} %Provide a user-level alternative to \cs{@gls@entry@field}. @@ -3320,6 +3440,16 @@ Dickimaw Books\\ \fi } % \end{macrocode} +%\changes{1.19}{2017-09-09}{added \cs{glslink} option \texttt{thevalue}} +% \begin{macrocode} +\define@key{glslink}{thevalue}{\def\@glsxtr@thevalue{#1}} +% \end{macrocode} +% +%\changes{1.19}{2017-09-09}{added \cs{glslink} option \texttt{theHvalue}} +% \begin{macrocode} +\define@key{glslink}{theHvalue}{\def\@glsxtr@theHvalue{#1}} +% \end{macrocode} +% % %\begin{macro}{\@gls@link} %\changes{1.14}{2017-04-18}{added redefinition} @@ -3334,11 +3464,16 @@ Dickimaw Books\\ \edef\glslabel{\glsdetoklabel{#2}}% \def\@gls@link@opts{#1}% \let\@gls@link@label\glslabel - \def\@glsnumberformat{glsnumberformat}% + \let\@glsnumberformat\@glsxtr@defaultnumberformat \edef\@gls@counter{\csname glo@\glslabel @counter\endcsname}% \edef\glstype{\csname glo@\glslabel @type\endcsname}% \let\org@ifKV@glslink@hyper\ifKV@glslink@hyper % \end{macrocode} +% Initialise thevalue and theHvalue (v1.19). +% \begin{macrocode} + \def\@glsxtr@thevalue{}% + \def\@glsxtr@theHvalue{\@glsxtr@thevalue}% +% \end{macrocode} % Initialise when indexing should occur (new to v1.14). % \begin{macrocode} \glsxtrinitwrgloss @@ -3351,7 +3486,18 @@ Dickimaw Books\\ \do@gls@link@checkfirsthyper \setkeys{glslink}{#1}% \glslinkpostsetkeys - \@gls@saveentrycounter +% \end{macrocode} +% Check \gloskey[glslink]{thevalue} and \gloskey[glslink]{theHvalue} +% before saving (v1.19). +% \begin{macrocode} + \ifdefempty{\@glsxtr@thevalue}% + {% + \@gls@saveentrycounter + }% + {% + \let\theglsentrycounter\@glsxtr@thevalue + \def\theHglsentrycounter{\@glsxtr@theHvalue}% + }% \@gls@setsort{\glslabel}% % \end{macrocode} % Do write if it should occur before the link text: @@ -3401,7 +3547,7 @@ Dickimaw Books\\ \@glsxtr@record{#1}{#2}{glossadd}% \glsdoifexists{#2}% {% - \def\@glsnumberformat{glsnumberformat}% + \let\@glsnumberformat\@glsxtr@defaultnumberformat \edef\@gls@counter{\csname glo@\glsdetoklabel{#2}@counter\endcsname}% \def\@glsxtr@thevalue{}% \def\@glsxtr@theHvalue{\@glsxtr@thevalue}% @@ -4597,7 +4743,7 @@ Dickimaw Books\\ \ifKV@glslink@noindex \else \begingroup - \def\@glsnumberformat{glsnumberformat}% + \let\@glsnumberformat\@glsxtr@defaultnumberformat \edef\@gls@counter{\csname glo@\glsdetoklabel{\glslabel}@counter\endcsname}% \glsxtr@saveentrycounter \@@do@wrglossary{\glsxtralias{\glslabel}}% @@ -4813,13 +4959,13 @@ Dickimaw Books\\ \glsfieldfetch{\glslabel}{alias}{\gloaliaslabel}% \ifdefvoid\gloaliaslabel {% - \hyperlink{#1}{{\glsxtrprotectlinks#2}}% + \glsxtrhyperlink{#1}{{\glsxtrprotectlinks#2}}% }% {% % \end{macrocode} %Redirect link to the alias target. % \begin{macrocode} - \hyperlink + \glsxtrhyperlink {\glolinkprefix\glsdetoklabel{\gloaliaslabel}}% {{\glsxtrprotectlinks#2}}% }% @@ -4827,6 +4973,24 @@ Dickimaw Books\\ } % \end{macrocode} %\end{macro} + +%\begin{macro}{\glsxtrhyperlink} +%\changes{1.19}{2017-09-09}{new} +%Allows integration with the base \styfmt{glossaries} package's +%\pkgopt[showtargets]{debug} option. +% \begin{macrocode} +\ifdef\@glsshowtarget +{ + \newcommand{\glsxtrhyperlink}[2]{% + \@glsshowtarget{#1}% + \hyperlink{#1}{#2}% + }% +} +{ + \newcommand{\glsxtrhyperlink}[2]{\hyperlink{#1}{#2}}% +} +% \end{macrocode} +%\end{macro} % %\begin{macro}{\glsdisablehyper} %\changes{1.14}{2017-04-18}{added redefinition} @@ -7227,7 +7391,7 @@ Dickimaw Books\\ \newcommand*{\glsxtrlocationhyperlink}[3]{% \ifdefvoid\glsxtrsupplocationurl {% - \hyperlink{#1#2#3}{#3}% + \glsxtrhyperlink{#1#2#3}{#3}% }% {% \hyperref{\glsxtrsupplocationurl}{}{#1#2#3}{#3}% @@ -7694,10 +7858,14 @@ Dickimaw Books\\ %If the \pkgopt{automake} option is on, try running bib2gls if %the aux file exists. %\changes{1.14}{2017-04-18}{added check for automake} +%\changes{1.19}{2017-09-09}{removed double-quotes around \cs{jobname}} +%The double-quotes around \cs{jobname} have been removed (v1.19) +%since \cs{jobname} will include double-quotes if the file name has +%spaces. % \begin{macrocode} \ifglsautomake \IfFileExists{\jobname.aux}% - {\immediate\write18{bib2gls "\jobname"}}{}% + {\immediate\write18{bib2gls \jobname}}{}% % \end{macrocode} %If \cs{makeglossaries} is also used, allow makeindex/xindy to %also be run, otherwise disable the error message about requiring @@ -9646,7 +9814,7 @@ Dickimaw Books\\ % The argument is the entry's label. % \begin{macrocode} \newcommand*{\glsxtrpostnamehook}[1]{% - \def\@glsnumberformat{glsnumberformat}% + \let\@glsnumberformat\@glsxtr@defaultnumberformat \glsxtrdoautoindexname{#1}{indexname}% % \end{macrocode} % Allow categories to hook in here. @@ -9717,8 +9885,13 @@ Dickimaw Books\\ % \begin{macrocode} \protected@edef\@glsxtr@attrval{\glsgetattribute{#1}{#2}}% \if@glsxtr@format@override - \ifdefstring{\@glsnumberformat}{glsnumberformat}{}% - {\let\@glsxtr@attrval\@glsnumberformat}% +% \end{macrocode} +%\changes{1.19}{2017-09-09}{changed format test} +% \begin{macrocode} + \ifx\@glsnumberformat\@glsxtr@defaultnumberformat + \else + \let\@glsxtr@attrval\@glsnumberformat + \fi \fi \ifdefstring{\@glsxtr@attrval}{true}% {}% @@ -18669,7 +18842,7 @@ Dickimaw Books\\ % First identify package: % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-stylemods}[2017/08/10 v1.18 (NLCT)] +\ProvidesPackage{glossaries-extra-stylemods}[2017/09/08 v1.19 (NLCT)] % \end{macrocode} % Provide package options to automatically load required predefined % styles. The simplest method is to just test for the existence of @@ -19830,5 +20003,2227 @@ Dickimaw Books\\ % % \end{macrocode} %\fi +%\iffalse +% \begin{macrocode} +%<*example-glossaries-acronym-desc.bib> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% Encoding: UTF-8 +@acronym{ndl, + description = {fringilla a, euismod sodales, + sollicitudin vel, wisi}, + short = {NDL}, + long = {nam dui ligula} +} + +@acronym{mal, + description = {non justo}, + short = {MAL}, + long = {morbi auctor lorem} +} + +@acronym{nll, + description = {pretium at, lobortis vitae, ultricies et, +tellus}, + short = {NLL}, + long = {name lacus libero} +} + +@acronym{da, + description = {tortor sed accumsan bibendum, erat ligula +aliquet magna, vitae ornare odio metus a mi}, + short = {DA}, + long = {donec aliquet} +} + +@acronym{mao, + description = {et nisl hendrerit mollis}, + short = {MAO}, + long = {morbi ac orci} +} + +@acronym{sum, + description = {cras nec ante}, + short = {SUM}, + long = {suspendisse ut massa} +} + +@acronym{pan, + description = {cum sociis natoque penatibus et magnis dis +parturient montes, nascetur ridiculus mus}, + short = {PAN}, + long = {pellentesque a nulla} +} + +@acronym{atu, + description = {nulla ullamcorper vestibulum +turpis}, + short = {ATU}, + long = {aliquam tincidunt urna} +} + +@acronym{pclm, + description = {nulla malesuada porttitor diam}, + short = {PCLM}, + long = {pellentesque cursus luctus mauris} +} + +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*example-glossaries-acronym.bib> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% Encoding: UTF-8 +@acronym{lid, + short = {LID}, + long = {lorem ipsum dolor} +} + +@acronym{stc, + short = {STC}, + long = {sit amet consectetuer} +} + +@acronym{aeu, + short = {AEU}, + long = {adipiscing elit ut} +} + +@acronym{pev, + short = {PEV}, + long = {purus elit vestibulum} +} + +@acronym{upa, + short = {UPA}, + long = {ut placerat ac} +} + +@acronym{avf, + short = {AVF}, + long = {adipiscing vitae felis} +} + +@acronym{cdg, + short = {CDG}, + long = {curabitur dictum gravida} +} + +@acronym{mna, + short = {MNA}, + long = {mauris nam arcu} +} + +@acronym{lne, + short = {LNE}, + long = {libero nonummy eget} +} + +@acronym{civ, + short = {CIV}, + long = {consectetuer id vulputate} +} + +@acronym{amd, + short = {AMD}, + long = {a magna donec} +} + +@acronym{vae, + short = {VAE}, + long = {vehicula augue eu} +} + +@acronym{nph, + short = {NPH}, + long = {neque pellentesque habitant} +} + +@acronym{mts, + short = {MTS}, + long = {morbi tristique senectus} +} + +@acronym{ene, + short = {ENE}, + long = {et netus et} +} + +@acronym{mfa, + short = {MFA}, + long = {malesuada fames ac} +} + +@acronym{tem, + short = {TEM}, + long = {turpis egestas mauris} +} + +@acronym{ulc, + short = {ULC}, + long = {ut leo cras} +} + +@acronym{vmr, + short = {VMR}, + long = {viverra metus rhoncus} +} + +@acronym{sne, + short = {SNE}, + long = {sem nulla et} +} + +@acronym{lvu, + short = {LVU}, + long = {lectus vestibulum urna} +} + +@acronym{fup, + short = {FUP}, + long = {fringilla ultrices phasellus} +} + +@acronym{ets, + short = {ETS}, + long = {eu tellus sit} +} + +@acronym{atg, + short = {ATG}, + long = {amet tortor gravida} +} + +@acronym{pis, + short = {PIS}, + long = {placerat integer sapien} +} + +@acronym{eii, + short = {EII}, + long = {est iaculis in} +} + +@acronym{pqv, + short = {PQV}, + long = {pretium quis viverra} +} + +@acronym{anp, + short = {ANP}, + long = {ac nunc praesent} +} + +@acronym{esv, + short = {ESV}, + long = {eget sem vel} +} + +@acronym{lub, + short = {LUB}, + long = {leo ultrices bibendum} +} + +@acronym{afm, + short = {AFM}, + long = {aenean faucibus morbi} +} + +@acronym{dnm, + short = {DNM}, + long = {dolor nulla malesuada} +} + +@acronym{epa, + short = {EPA}, + long = {eu pulvinar at} +} + +@acronym{man, + short = {MAC}, + long = {mollis ac nulla} +} + +@acronym{cas, + short = {CAS}, + long = {curabitur auctor semper} +} + +@acronym{ndv, + short = {NDV}, + long = {nulla donec varius} +} + +@acronym{oer, + short = {OER}, + long = {orci eget risus} +} + +@acronym{dnmc, + short = {DNMC}, + long = {duis nibh mi congue} +} + +@acronym{cea, + short = {CEA}, + long = {congue eu accumsan} +} + +@acronym{esq, + short = {ESQ}, + long = {eleifend sagittis quis} +} + +@acronym{dia, + short = {DIA}, + long = {duis eget orci} +} + +@acronym{sao, + short = {SAO}, + long = {sit amet orci} +} + +@acronym{drn, + short = {DRN}, + long = {dignissim rutrum nam} +} + +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*example-glossaries-acronyms-lang.bib> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% Encoding: UTF-8 +@acronym{li, + user1 = {love itself}, + short = {LI}, + long = {lorem ipsum} +} + +@acronym{np, + user1 = {produces none}, + short = {NP}, + long = {nulla pariatur} +} + +@acronym{sic, + user1 = {blame belongs}, + short = {SIC}, + long = {sunt in culpa} +} + +@acronym{esoc, + user1 = {blinded by +desire}, + short = {ESOC}, + long = {excepturi sint obcaecati cupiditat} +} + +@acronym{nmruu, + short = {NMRUU}, + long = {nulla malesuada +risus ut urna} +} + +@acronym{di, + short = {DI}, + long = {duis iaculi} +} + +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*example-glossaries-brief.bib> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% Encoding: UTF-8 +@entry{lorem, + name = {lorem}, + description = {ipsum} +} + +@entry{dolor, + name = {dolor}, + description = {sit} +} + +@entry{amet, + name = {amet}, + description = {consectetuer} +} + +@entry{adipiscing, + name = {adipiscing}, + description = {elit} +} + +@entry{ut, + name = {ut}, + description = {purus} +} + +@entry{elit, + name = {elit}, + description = {vestibulum} +} + +@entry{placerat, + name = {placerat}, + description = {ac} +} + +@entry{vitae, + name = {vitae}, + description = {felis} +} + +@entry{curabitur, + name = {curabitur}, + description = {gravida} +} + +@entry{mauris, + name = {mauris}, + description = {nam} +} + +@entry{arcu, + name = {arcu}, + description = {libero} +} + +@entry{nonummy, + name = {nonummy}, + description = {eget} +} + +@entry{consectetuer, + name = {consectetuer}, + description = {id} +} + +@entry{vulputate, + name = {vulputate}, + description = {a magna} +} + +@entry{donec, + name = {donec}, + description = {vehicula} +} + +@entry{augue, + name = {augue}, + description = {eu neque} +} + +@entry{pellentesque, + name = {pellentesque}, + description = {habitant} +} + +@entry{morbi, + name = {morbi}, + description = {tristique} +} + +@entry{senectus, + name = {senectus}, + description = {et netus} +} + +@entry{et, + name = {et}, + description = {malesuada} +} + +@entry{fames, + name = {fames}, + description = {ac} +} + +@entry{turpis, + name = {turpis}, + description = {egestas} +} + +@entry{leo, + name = {leo}, + description = {cras} +} + +@entry{viverra, + name = {viverra}, + description = {metus} +} + +@entry{rhoncus, + name = {rhoncus}, + description = {sem} +} + +@entry{nulla, + name = {nulla}, + description = {et} +} + +@entry{lectus, + name = {lectus}, + description = {vestibulum} +} + +@entry{urna, + name = {urna}, + description = {fringilla} +} + +@entry{ultrices, + name = {ultrices}, + description = {phasellus} +} + +@entry{eu, + name = {eu}, + description = {tellus} +} + +@entry{sit, + name = {sit}, + description = {amet} +} + +@entry{tortor, + name = {tortor}, + description = {gravida} +} + +@entry{integer, + name = {integer}, + description = {sapien} +} + +@entry{est, + name = {est}, + description = {iaculis} +} + +@entry{in, + name = {in}, + description = {pretium} +} + +@entry{quis, + name = {quis}, + description = {viverra} +} + +@entry{ac, + name = {ac}, + description = {nunc} +} + +@entry{praesent, + name = {praesent}, + description = {eget} +} + +@entry{sem, + name = {sem}, + description = {vel leo} +} + +@entry{bibendum, + name = {bibendum}, + description = {ultrices} +} + +@entry{aenean, + name = {aenean}, + description = {faucibus} +} + +@entry{malesuada, + name = {malesuada}, + description = {eu} +} + +@entry{pulvinar, + name = {pulvinar}, + description = {at} +} + +@entry{mollis, + name = {mollis}, + description = {ac nulla} +} + +@entry{auctor, + name = {auctor}, + description = {semper} +} + +@entry{varius, + name = {varius}, + description = {orci} +} + +@entry{eget, + name = {eget}, + description = {risus} +} + +@entry{duis, + name = {duis}, + description = {nibh} +} + +@entry{mi, + name = {mi}, + description = {congue} +} + +@entry{accumsan, + name = {accumsan}, + description = {eleifend} +} + +@entry{sagittis, + name = {sagittis}, + description = {quis} +} + +@entry{diam, + name = {diam}, + description = {duis} +} + +@entry{orci, + name = {orci}, + description = {dignissim} +} + +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*example-glossaries-childnoname.bib> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% Encoding: UTF-8 +@entry{scelerisque, + name = {scelerisque}, + description = {at} +} + +@entry{vestibulum, + parent = {scelerisque}, + description = {eu, nulla} +} + +@entry{utodionisl, + parent = {scelerisque}, + description = {facilisis id} +} + +@entry{molliset, + parent = {scelerisque}, + description = {nec, enim} +} + +@entry{aeneansem, + parent = {scelerisque}, + description = {sem leo} +} + +@entry{pellentesquesit, + parent = {scelerisque}, + description = {sit amet} +} + +@entry{sapien, + parent = {scelerisque}, + description = {vehicula +pellentesque} +} + +@entry{consequat, + parent = {scelerisque}, + description = {tellus +et tortor} +} + +@entry{uttempor, + name = {ut tempor}, + description = {laoreet +quam} +} + +@entry{nullamid, + parent = {uttempor}, + description = {wisi a +libero} +} + +@entry{tristique, + parent = {uttempor}, + description = {semper} +} + +@entry{nullamnislmassa, + parent = {uttempor}, + description = {rutrum +ut} +} + +@entry{eleifend, + name = {eleifend}, + description = {sit amet +faucibus} +} + +@entry{elementum, + parent = {eleifend}, + description = {elementum} +} + +@entry{urnasapien, + parent = {eleifend}, + description = {urna sapien} +} + +@entry{consectetuermauris, + name = {consectetuer}, + description = {mauris} +} + +@entry{quisegestas, + parent = {consectetuermauris}, + description = {quis egestas} +} + +@entry{leojusto, + parent = {consectetuermauris}, + description = {leo +justo} +} + +@entry{nonrisus, + name = {non risus}, + description = {morbi non +felis} +} + +@entry{aclibero, + parent = {nonrisus}, + description = {ac libero} +} + +@entry{vulputatefringilla, + parent = {nonrisus}, + description = {vulputate +fringilla} +} + +@entry{maurislibero, + name = {mauris}, + description = {libero eros} +} + +@entry{lacinia, + parent = {maurislibero}, + description = {lacinia +non} +} + +@entry{sodales, + parent = {maurislibero}, + description = {sodales +quis} +} + +@entry{dapibus, + parent = {maurislibero}, + description = {dapibus +porttitor, pede} +} + +@entry{class, + name = {class}, + description = {aptent taciti} +} + +@entry{sociosqu, + parent = {class}, + description = {sociosqu} +} + +@entry{adlitora, + parent = {class}, + description = {ad litora} +} + +@entry{torquent, + parent = {class}, + description = {torquent per +conubia} +} + +@entry{nostra, + name = {nostra}, + description = {per inceptos +hymenaeos} +} + +@entry{morbidapibus, + parent = {nostra}, + description = {morbi +dapibus} +} + +@entry{mauriscondimentum, + parent = {nostra}, + description = {mauris +condimentum nulla} +} + +@entry{cumsociis, + name = {cum sociis}, + description = {natoque +penatibus} +} + +@entry{etmagnis, + parent = {cumsociis}, + description = {et +magnis} +} + +@entry{disparturient, + parent = {cumsociis}, + description = {dis +parturient montes} +} + +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*example-glossaries-cite.bib> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% Encoding: UTF-8 +@entry{fusce, + user1 = {article-minimal}, + name = {fusce}, + description = {suscipit cursus sem} +} + +@entry{vivamus, + user1 = {article-full}, + name = {vivamus}, + description = {risus mi, egestas ac} +} + +@entry{imperdiet, + user1 = {whole-journal}, + name = {imperdiet}, + description = {varius, faucibus quis, leo} +} + +@entry{aenean2, + user1 = {inbook-minimal}, + name = {aenean}, + description = {tincidunt} +} + +@entry{crasid, + user1 = {inbook-full}, + name = {cras id}, + description = {justo quis nibh scelerisque dignissim} +} + +@entry{aliquam2, + user1 = {book-minimal}, + name = {aliquam}, + description = {sagittis elementum dolor} +} + +@entry{aeneanconsectetuer, + user1 = {book-full}, + name = {aenean consectetuer}, + description = {justo in pede} +} + +@entry{curabiturullamcorper, + user1 = {booklet-minimal}, + name = {curabitur ullamcorper}, + description = {ligula nec orci} +} + +@entry{aliquampurus, + user1 = {booklet-full}, + name = {aliquam purus}, + description = {turpis, aliquam id} +} + +@entry{ornarevitae, + user1 = {incollection-minimal}, + name = {ornare vitae}, + description = {porttitor non, wisi} +} + +@entry{maecenasluctus, + user1 = {incollection-full}, + name = {maecenas luctus}, + description = {porta lorem} +} + +@entry{donecvitae, + user1 = {manual-minimal}, + name = {donec vitae}, + description = {ligula eu ante pretium varius} +} + +@entry{proin, + user1 = {manual-full}, + name = {proin}, + description = {tortor metus, convallis et} +} + +@entry{hendrerit, + user1 = {mastersthesis-minimal}, + name = {hendrerit}, + description = {non, scelerisque in, urna} +} + +@entry{crasquis, + user1 = {mastersthesis-full}, + name = {cras qui}, + description = {libero eu ligula bibendum tempor} +} + +@entry{vivamustellus, + user1 = {misc-minimal}, + name = {vivamus tellus}, + description = {quam, malesuada eu, tempus sed, tempor sed, velit} +} + +@entry{doneclacinia, + user1 = {misc-full}, + name = {donec lacinia}, + description = {auctor libero} +} + +@entry{praesent2, + user1 = {inproceedings-minimal}, + name = {praesent}, + description = {sed neque id pede mollis rutrum} +} + +@entry{vestibulum2, + user1 = {inproceedings-minimal,phdthesis-minimal}, + name = {vestibulum}, + description = {iaculis risus} +} + +@entry{pellentesque2, + name = {pellentesque}, + description = {lacus} +} + +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*example-glossaries-images.bib> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% Encoding: UTF-8 +@entry{sedfeugiat, + user1 = {example-image}, + name = {sed feugiat}, + description = {Cum sociis natoque penatibus et magnis dis parturient montes, +nascetur ridiculus mus. Ut pellentesque augue sed urna. Vestibulum +diam eros, fringilla et, consectetuer eu, nonummy id, sapien. Nullam +at lectus. In sagittis ultrices mauris. Curabitur malesuada erat sit +amet massa. Fusce blandit. Aliquam erat volutpat. Aliquam euismod. +Aenean vel lectus. Nunc imperdiet justo nec dolor. + +Etiam euismod. Fusce facilisis lacinia dui. Suspendisse potenti. In +mi erat, cursus id, nonummy sed, ullamcorper eget, sapien. Praesent +pretium, magna in eleifend egestas, pede pede pretium lorem, quis +consectetuer tortor sapien facilisis magna. Mauris quis magna +varius nulla scelerisque imperdiet. Aliquam non quam. Aliquam +porttitor quam a lacus. Praesent vel arcu ut tortor cursus volutpat. +In vitae pede quis diam bibendum placerat. Fusce elementum convallis +neque. Sed dolor orci, scelerisque ac, dapibus nec, ultricies ut, +mi. Duis nec dui quis leo sagittis commodo. +} +} + +@entry{aliquamlectus, + user1 = {example-image-a}, + name = {aliquam lectus}, + description = {Vivamus leo. Quisque ornare tellus ullamcorper nulla. Mauris +porttitor pharetra tortor. Sed fringilla justo sed mauris. Mauris +tellus. Sed non leo. Nullam elementum, magna in cursus sodales, +augue est scelerisque sapien, venenatis congue nulla arcu et pede. +Ut suscipit enim vel sapien. Donec congue. Maecenas urna mi, +suscipit in, placerat ut, vestibulum ut, massa. Fusce ultrices nulla +et nisl. + +Etiam ac leo a risus tristique nonummy. Donec dignissim tincidunt +nulla. Vestibulum rhoncus molestie odio. Sed lobortis, justo et +pretium lobortis, mauris turpis condimentum augue, nec ultricies +nibh arcu pretium enim. Nunc purus neque, placerat id, imperdiet +sed, pellentesque nec, nisl. Vestibulum imperdiet neque non sem +accumsan laoreet. In hac habitasse platea dictumst. Etiam +condimentum facilisis libero. Suspendisse in elit quis nisl aliquam +dapibus. Pellentesque auctor sapien. Sed egestas sapien nec lectus. +Pellentesque vel dui vel neque bibendum viverra. Aliquam porttitor +nisl nec pede. Proin mattis libero vel turpis. Donec rutrum mauris +et libero. Proin euismod porta felis. Nam lobortis, metus quis +elementum commodo, nunc lectus elementum mauris, eget vulputate +ligula tellus eu neque. Vivamus eu dolor. +} +} + +@entry{nullainipsum, + user1 = {example-image-b}, + name = {nulla in ipsum}, + description = {Praesent eros nulla, congue vitae, euismod ut, commodo a, wisi. +Pellentesque habitant morbi tristique senectus et netus et malesuada +fames ac turpis egestas. Aenean nonummy magna non leo. Sed felis +erat, ullamcorper in, dictum non, ultricies ut, lectus. Proin vel +arcu a odio lobortis euismod. Vestibulum ante ipsum primis in +faucibus orci luctus et ultrices posuere cubilia Curae; Proin ut +est. Aliquam odio. Pellentesque massa turpis, cursus eu, euismod +nec, tempor congue, nulla. Duis viverra gravida mauris. Cras +tincidunt. Curabitur eros ligula, varius ut, pulvinar in, cursus +faucibus, augue. + +Nulla mattis luctus nulla. Duis commodo velit at leo. Aliquam +vulputate magna et leo. Nam vestibulum ullamcorper leo. Vestibulum +condimentum rutrum mauris. Donec id mauris. Morbi molestie justo et +pede. Vivamus eget turpis sed nisl cursus tempor. Curabitur mollis +sapien condimentum nunc. In wisi nisl, malesuada at, dignissim sit +amet, lobortis in, odio. Aenean consequat arcu a ante. Pellentesque +porta elit sit amet orci. Etiam at turpis nec elit ultricies +imperdiet. Nulla facilisi. In hac habitasse platea dictumst. +Suspendisse viverra aliquam risus. Nullam pede justo, molestie +nonummy, scelerisque eu, facilisis vel, arcu. +} +} + +@entry{curabiturtellusmagna, + user1 = {example-image-c}, + name = {curabitur tellus magna}, + description = {Donec interdum. Praesent scelerisque. Maecenas posuere sodales +odio. Vivamus metus lacus, varius quis, imperdiet quis, rhoncus a, +turpis. Etiam ligula arcu, elementum a, venenatis quis, sollicitudin +sed, metus. Donec nunc pede, tincidunt in, venenatis vitae, faucibus +vel, nibh. Pellentesque wisi. Nullam malesuada. Morbi ut tellus ut +pede tincidunt porta. Lorem ipsum dolor sit amet, consectetuer +adipiscing elit. Etiam congue neque id dolor. + +Donec et nisl at wisi luctus bibendum. Nam interdum tellus ac +libero. Sed sem justo, laoreet vitae, fringilla at, adipiscing ut, +nibh. Maecenas non sem quis tortor eleifend fermentum. Etiam id +tortor ac mauris porta vulputate. Integer porta neque vitae massa. +Maecenas tempus libero a libero posuere dictum. Vestibulum ante +ipsum primis in faucibus orci luctus et ultrices posuere cubilia +Curae; Aenean quis mauris sed elit commodo placerat. Class aptent +taciti sociosqu ad litora torquent per conubia nostra, per inceptos +hymenaeos. Vivamus rhoncus tincidunt libero. Etiam elementum pretium +justo. Vivamus est. Morbi a tellus eget pede tristique commodo. +Nulla nisl. Vestibulum sed nisl eu sapien cursus rutrum. +} +} + +@entry{nullanonmauris, + user1 = {example-image-16x10}, + name = {nulla non mauris}, + description = {Nullam varius. Etiam dignissim elementum metus. Vestibulum faucibus, +metus sit amet mattis rhoncus, sapien dui laoreet odio, nec +ultricies nibh augue a enim. Fusce in ligula. Quisque at magna et +nulla commodo consequat. Proin accumsan imperdiet sem. Nunc porta. +Donec feugiat mi at justo. Phasellus facilisis ipsum quis ante. In +ac elit eget ipsum pharetra faucibus. Maecenas viverra nulla in +massa. + +Nulla ac nisl. Nullam urna nulla, ullamcorper in, interdum sit amet, +gravida ut, risus. Aenean ac enim. In luctus. Phasellus eu quam +vitae turpis viverra pellentesque. Duis feugiat felis ut enim. +Phasellus pharetra, sem id porttitor sodales, magna nunc aliquet +nibh, nec blandit nisl mauris at pede. Suspendisse risus risus, +lobortis eget, semper at, imperdiet sit amet, quam. Quisque +scelerisque dapibus nibh. Nam enim. Lorem ipsum dolor sit amet, +consectetuer adipiscing elit. Nunc ut metus. Ut metus justo, auctor +at, ultrices eu, sagittis ut, purus. Aliquam aliquam. +} +} + +@entry{etiampedemassa, + user1 = {example-image-10x16}, + name = {etiam pede massa}, + description = {Vestibulum luctus commodo lacus. Morbi lacus dui, tempor sed, +euismod eget, condimentum at, tortor. Phasellus aliquet odio ac +lacus tempor faucibus. Praesent sed sem. Praesent iaculis. Cras +rhoncus tellus sed justo ullamcorper sagittis. Donec quis orci. +Sed ut tortor quis tellus euismod tincidunt. Suspendisse congue nisl +eu elit. Aliquam tortor diam, tempus id, tristique eget, sodales +vel, nulla. Praesent tellus mi, condimentum sed, viverra at, +consectetuer quis, lectus. In auctor vehicula orci. Sed pede sapien, +euismod in, suscipit in, pharetra placerat, metus. Vivamus commodo +dui non odio. Donec et felis. + +Etiam suscipit aliquam arcu. Aliquam sit amet est ac purus bibendum +congue. Sed in eros. Morbi non orci. Pellentesque mattis lacinia +elit. Fusce molestie velit in ligula. Nullam et orci vitae nibh +vulputate auctor. Aliquam eget purus. Nulla auctor wisi sed ipsum. +Morbi porttitor tellus ac enim. Fusce ornare. Proin ipsum enim, +tincidunt in, ornare venenatis, molestie a, augue. Donec vel pede in +lacus sagittis porta. Sed hendrerit ipsum quis nisl. Suspendisse +quis massa ac nibh pretium cursus. Sed sodales. Nam eu neque quis +pede dignissim ornare. Maecenas eu purus ac urna tincidunt congue. +} +} + +@entry{donecetnisl, + user1 = {example-image-16x9}, + name = {donec et nisl}, + description = {Aenean dictum odio sit amet risus. Morbi purus. Nulla a est sit amet +purus venenatis iaculis. Vivamus viverra purus vel magna. Donec in +justo sed odio malesuada dapibus. Nunc ultrices aliquam nunc. +Vivamus facilisis pellentesque velit. Nulla nunc velit, vulputate +dapibus, vulputate id, mattis ac, justo. Nam mattis elit dapibus +purus. Quisque enim risus, congue non, elementum ut, mattis quis, +sem. Quisque elit. + +Maecenas non massa. Vestibulum pharetra nulla at lorem. Duis quis +quam id lacus dapibus interdum. Nulla lorem. Donec ut ante quis +dolor bibendum condimentum. Etiam egestas tortor vitae lacus. +Praesent cursus. Mauris bibendum pede at elit. Morbi et felis a +lectus interdum facilisis. Sed suscipit gravida turpis. Nulla at +lectus. Vestibulum ante ipsum primis in faucibus orci luctus et +ultrices posuere cubilia Curae; Praesent nonummy luctus nibh. Proin +turpis nunc, congue eu, egestas ut, fringilla at, tellus. In hac +habitasse platea dictumst. +} +} + +@entry{vivamuseutellus, + user1 = {example-image-9x16}, + name = {vivamus eu tellus}, + description = {Nam orci orci, malesuada id, gravida nec, ultricies vitae, erat. +Donec risus turpis, luctus sit amet, interdum quis, porta sed, +ipsum. Suspendisse condimentum, tortor at egestas posuere, neque +metus tempor orci, et tincidunt urna nunc a purus. Sed facilisis +blandit tellus. Nunc risus sem, suscipit nec, eleifend quis, cursus +quis, libero. Curabitur et dolor. Sed vitae sem. Cum sociis natoque +penatibus et magnis dis parturient montes, nascetur ridiculus mus. +Maecenas ante. Duis ullamcorper enim. Donec tristique enim eu leo. +Nullam molestie elit eu dolor. Nullam bibendum, turpis vitae +tristique gravida, quam sapien tempor lectus, quis pretium tellus +purus ac quam. Nulla facilisi. + +Duis aliquet dui in est. Donec eget est. Nunc lectus odio, varius +at, fermentum in, accumsan non, enim. Aliquam erat volutpat. Proin +sit amet nulla ut eros consectetuer cursus. Phasellus dapibus +aliquam justo. Nunc laoreet. Donec consequat placerat magna. Duis +pretium tincidunt justo. Sed sollicitudin vestibulum quam. Nam quis +ligula. Vivamus at metus. Etiam imperdiet imperdiet pede. Aenean +turpis. Fusce augue velit, scelerisque sollicitudin, dictum vitae, +tempor et, pede. Donec wisi sapien, feugiat in, fermentum ut, +sollicitudin adipiscing, metus. +} +} + +@entry{donecvelnibh, + user1 = {example-image-golden}, + name = {donec vel nibh}, + description = {Donec pede. Sed id quam id wisi laoreet suscipit. Nulla lectus +dolor, aliquam ac, fringilla eget, mollis ut, orci. In pellentesque +justo in ligula. Maecenas turpis. Donec eleifend leo at felis +tincidunt consequat. Aenean turpis metus, malesuada sed, condimentum +sit amet, auctor a, wisi. Pellentesque sapien elit, bibendum ac, +posuere et, congue eu, felis. Vestibulum mattis libero quis metus +scelerisque ultrices. Sed purus. + +Donec molestie, magna ut luctus ultrices, tellus arcu nonummy velit, +sit amet pulvinar elit justo et mauris. In pede. Maecenas euismod +elit eu erat. Aliquam augue wisi, facilisis congue, suscipit in, +adipiscing et, ante. In justo. Cras lobortis neque ac ipsum. Nunc +fermentum massa at ante. Donec orci tortor, egestas sit amet, +ultrices eget, venenatis eget, mi. Maecenas vehicula leo semper +est. Mauris vel metus. Aliquam erat volutpat. In rhoncus sapien ac +tellus. Pellentesque ligula. +} +} + +@entry{crasdapibus, + user1 = {example-image-golden-upright}, + name = {cras dapibus}, + description = {Aenean interdum nibh sed wisi. Praesent sollicitudin vulputate dui. +Praesent iaculis viverra augue. Quisque in libero. Aenean gravida +lorem vitae sem ullamcorper cursus. Nunc adipiscing rutrum ante. +Nunc ipsum massa, faucibus sit amet, viverra vel, elementum semper, +orci. Cras eros sem, vulputate et, tincidunt id, ultrices eget, +magna. Nulla varius ornare odio. Donec accumsan mauris sit amet +augue. Sed ligula lacus, laoreet non, aliquam sit amet, iaculis +tempor, lorem. Suspendisse eros. Nam porta, leo sed congue tempor, +felis est ultrices eros, id mattis velit felis non metus. Curabitur +vitae elit non mauris varius pretium. Aenean lacus sem, tincidunt +ut, consequat quis, porta vitae, turpis. Nullam laoreet fermentum +urna. Proin iaculis lectus. + +Sed mattis, erat sit amet gravida malesuada, elit augue egestas +diam, tempus scelerisque nunc nisl vitae libero. Sed consequat +feugiat massa. Nunc porta, eros in eleifend varius, erat leo rutrum +dui, non convallis lectus orci ut nibh. Sed lorem massa, nonummy +quis, egestas id, condimentum at, nisl. Maecenas at nibh. Aliquam +et augue at nunc pellentesque ullamcorper. Duis nisl nibh, laoreet +suscipit, convallis ut, rutrum id, enim. Phasellus odio. Nulla +nulla elit, molestie non, scelerisque at, vestibulum eu, nulla. Ut +odio nisl, facilisis id, mollis et, scelerisque nec, enim. Aenean +sem leo, pellentesque sit amet, scelerisque sit amet, vehicula +pellentesque, sapien. +} +} + +@entry{sedconsequat, + user1 = {example-image-1x1}, + name = {sed consequat}, + description = {Ut tempor laoreet quam. Nullam id wisi a libero tristique semper. +Nullam nisl massa, rutrum ut, egestas semper, mollis id, leo. Nulla +ac massa eu risus blandit mattis. Mauris ut nunc. In hac habitasse +platea dictumst. Aliquam eget tortor. Quisque dapibus pede in erat. +Nunc enim. In dui nulla, commodo at, consectetuer nec, malesuada +nec, elit. Aliquam ornare tellus eu urna. Sed nec metus. Cum sociis +natoque penatibus et magnis dis parturient montes, nascetur +ridiculus mus. Pellentesque habitant morbi tristique senectus et +netus et malesuada fames ac turpis egestas. + +Phasellus id magna. Duis malesuada interdum arcu. Integer metus. +Morbi pulvinar pellentesque mi. Suspendisse sed est eu magna +molestie egestas. Quisque mi lorem, pulvinar eget, egestas quis, +luctus at, ante. Proin auctor vehicula purus. Fusce ac nisl aliquam +ante hendrerit pellentesque. Class aptent taciti sociosqu ad litora +torquent per conubia nostra, per inceptos hymenaeos. Morbi wisi. +Etiam arcu mauris, facilisis sed, eleifend non, nonummy ut, pede. +Cras ut lacus tempor metus mollis placerat. Vivamus eu tortor vel +metus interdum malesuada. +} +} + +@entry{sedeleifend, + name = {sed eleifend}, + description = {Morbi non felis ac libero vulputate fringilla. Mauris libero eros, +lacinia non, sodales quis, dapibus porttitor, pede. Class aptent +taciti sociosqu ad litora torquent per conubia nostra, per inceptos +hymenaeos. Morbi dapibus mauris condimentum nulla. Cum sociis +natoque penatibus et magnis dis parturient montes, nascetur +ridiculus mus. Etiam sit amet erat. Nulla varius. Etiam tincidunt +dui vitae turpis. Donec leo. Morbi vulputate convallis est. Integer +aliquet. Pellentesque aliquet sodales urna. +} +} + +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*example-glossaries-long.bib> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% Encoding: UTF-8 +@entry{loremipsum, + name = {lorem ipsum}, + description = {dolor sit amet, consectetuer adipiscing elit. Ut purus +elit, vestibulum ut, placerat ac, adipiscing vitae, felis. Curabitur +dictum gravida mauris.} +} + +@entry{namearcu, + name = {name arcu}, + description = {libero, nonummy eget, consectetuer id, vulputate a, magna. Donec +vehicula augue eu neque. Pellentesque habitant morbi tristique +senectus et netus et malesuada fames ac turpis egestas. Mauris ut +leo.} +} + +@entry{crasviverra, + name = {cras viverra}, + description = {metus rhoncus sem. Nulla et lectus vestibulum +urna fringilla ultrices. Phasellus eu tellus sit amet tortor gravida +placerat.} +} + +@entry{integersapien, + name = {integer sapien}, + description = {est, iaculis in, pretium quis, viverra ac, +nunc. Praesent eget sem vel leo ultrices bibendum. Aenean +faucibus.} +} + +@entry{morbidolor, + name = {morbi dolor}, + description = {nulla, malesuada eu, pulvinar at, mollis ac, nulla. +Curabitur auctor semper nulla. Donec varius orci eget risus. Duis +nibh mi, congue eu, accumsan eleifend, sagittis quis, diam. Duis +eget orci sit amet orci dignissim rutrum.} +} + +@entry{namdui, + name = {nam dui}, + description = {ligula, fringilla a, euismod sodales, +sollicitudin vel, wisi. Morbi auctor lorem non justo.} +} + +@entry{namlacus, + name = {nam lacus}, + description = {libero, pretium at, lobortis vitae, ultricies et, +tellus. Donec aliquet, tortor sed accumsan bibendum, erat ligula aliquet magna, +vitae ornare odio metus a mi.} +} + +@entry{morbiac, + name = {morbi ac}, + description = {orci et nisl hendrerit mollis. Suspendisse ut massa. +Cras nec ante. Pellentesque a nulla. Cum sociis natoque penatibus +et magnis dis parturient montes, nascetur ridiculus mus.} +} + +@entry{aliquam, + name = {aliquam}, + description = {tincidunt urna. Nulla ullamcorper +vestibulum turpis. Pellentesque cursus luctus mauris.} +} + +@entry{nullamalesuada, + name = {nulla malesuada}, + description = {porttitor diam. Donec felis erat, congue non, volutpat at, +tincidunt tristique, libero. Vivamus viverra fermentum felis.} +} + +@entry{donecnonummy, + name = {donec nonummy}, + description = {pellentesque ante. Phasellus +adipiscing semper elit. Proin fermentum massa ac quam. Sed diam +turpis, molestie vitae, placerat a, molestie nec, leo.} +} + +@entry{maecenaslacinia, + name = {maecenas lacinia}, + description = {nam ipsum ligula, eleifend at, accumsan nec, suscipit +a, ipsum. Morbi blandit ligula feugiat magna. Nunc eleifend consequat +lorem.} +} + +@entry{sedlacinia, + name = {sed lacinia}, + description = {nulla vitae enim. Pellentesque tincidunt purus +vel magna. Integer non enim. Praesent euismod nunc eu purus. Donec +bibendum quam in tellus.} +} + +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*example-glossaries-multipar.bib> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% Encoding: UTF-8 +@entry{loremi-ii, + name = {lorem 1--2}, + description = {Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Ut purus elit, +vestibulum ut, placerat ac, adipiscing vitae, felis. Curabitur +dictum gravida mauris. Nam arcu libero, nonummy eget, consectetuer +id, vulputate a, magna. Donec vehicula augue eu neque. Pellentesque +habitant morbi tristique senectus et netus et malesuada fames ac +turpis egestas. Mauris ut leo. Cras viverra metus rhoncus sem. Nulla +et lectus vestibulum urna fringilla ultrices. Phasellus eu tellus +sit amet tortor gravida placerat. Integer sapien est, iaculis in, +pretium quis, viverra ac, nunc. Praesent eget sem vel leo ultrices +bibendum. Aenean faucibus. Morbi dolor nulla, malesuada eu, pulvinar +at, mollis ac, nulla. Curabitur auctor semper nulla. Donec varius +orci eget risus. Duis nibh mi, congue eu, accumsan eleifend, +sagittis quis, diam. Duis eget orci sit amet orci dignissim rutrum. + +Nam dui ligula, fringilla a, euismod sodales, sollicitudin vel, +wisi. Morbi auctor lorem non justo. Nam lacus libero, pretium at, +lobortis vitae, ultricies et, tellus. Donec aliquet, tortor sed +accumsan bibendum, erat ligula aliquet magna, vitae ornare odio +metus a mi. Morbi ac orci et nisl hendrerit mollis. Suspendisse ut +massa. Cras nec ante. Pellentesque a nulla. Cum sociis natoque +penatibus et magnis dis parturient montes, nascetur ridiculus mus. +Aliquam tincidunt urna. Nulla ullamcorper vestibulum turpis. +Pellentesque cursus luctus mauris.} +} + +@entry{loremiii-iv, + name = {lorem 3--4}, + description = {Nulla malesuada porttitor diam. Donec felis erat, congue non, +volutpat at, tincidunt tristique, libero. Vivamus viverra fermentum +felis. Donec nonummy pellentesque ante. Phasellus adipiscing semper +elit. Proin fermentum massa ac quam. Sed diam turpis, molestie +vitae, placerat a, molestie nec, leo. Maecenas lacinia. Nam ipsum +ligula, eleifend at, accumsan nec, suscipit a, ipsum. Morbi blandit +ligula feugiat magna. Nunc eleifend consequat lorem. Sed lacinia +nulla vitae enim. Pellentesque tincidunt purus vel magna. Integer +non enim. Praesent euismod nunc eu purus. Donec bibendum quam in +tellus. Nullam cursus pulvinar lectus. Donec et mi. Nam vulputate +metus eu enim. Vestibulum pellentesque felis eu massa. + +Quisque ullamcorper placerat ipsum. Cras nibh. Morbi vel justo +vitae lacus tincidunt ultrices. Lorem ipsum dolor sit amet, +consectetuer adipiscing elit. In hac habitasse platea dictumst. +Integer tempus convallis augue. Etiam facilisis. Nunc elementum +fermentum wisi. Aenean placerat. Ut imperdiet, enim sed gravida +sollicitudin, felis odio placerat quam, ac pulvinar elit purus eget +enim. Nunc vitae tortor. Proin tempus nibh sit amet nisl. Vivamus +quis tortor vitae risus porta vehicula.} +} + +@entry{loremv-vi, + name = {lorem 5--6}, + description = {Fusce mauris. Vestibulum luctus nibh at lectus. Sed bibendum, nulla +a faucibus semper, leo velit ultricies tellus, ac venenatis arcu +wisi vel nisl. Vestibulum diam. Aliquam pellentesque, augue quis +sagittis posuere, turpis lacus congue quam, in hendrerit risus eros +eget felis. Maecenas eget erat in sapien mattis porttitor. +Vestibulum porttitor. Nulla facilisi. Sed a turpis eu lacus commodo +facilisis. Morbi fringilla, wisi in dignissim interdum, justo lectus +sagittis dui, et vehicula libero dui cursus dui. Mauris tempor +ligula sed lacus. Duis cursus enim ut augue. Cras ac magna. Cras +nulla. Nulla egestas. Curabitur a leo. Quisque egestas wisi eget +nunc. Nam feugiat lacus vel est. Curabitur consectetuer.% + + +Suspendisse vel felis. Ut lorem lorem, interdum eu, tincidunt sit +amet, laoreet vitae, arcu. Aenean faucibus pede eu ante. Praesent +enim elit, rutrum at, molestie non, nonummy vel, nisl. Ut lectus +eros, malesuada sit amet, fermentum eu, sodales cursus, magna. Donec +eu purus. Quisque vehicula, urna sed ultricies auctor, pede lorem +egestas dui, et convallis elit erat sed nulla. Donec luctus. +Curabitur et nunc. Aliquam dolor odio, commodo pretium, ultricies +non, pharetra in, velit. Integer arcu est, nonummy in, fermentum +faucibus, egestas vel, odio.} +} + +@entry{loremvii-viii, + name = {lorem 7--8}, + description = {Sed commodo posuere pede. Mauris ut est. Ut quis purus. Sed ac odio. +Sed vehicula hendrerit sem. Duis non odio. Morbi ut dui. Sed +accumsan risus eget odio. In hac habitasse platea dictumst. +Pellentesque non elit. Fusce sed justo eu urna porta tincidunt. +Mauris felis odio, sollicitudin sed, volutpat a, ornare ac, erat. +Morbi quis dolor. Donec pellentesque, erat ac sagittis semper, nunc +dui lobortis purus, quis congue purus metus ultricies tellus. Proin +et quam. Class aptent taciti sociosqu ad litora torquent per conubia +nostra, per inceptos hymenaeos. Praesent sapien turpis, fermentum +vel, eleifend faucibus, vehicula eu, lacus. + +Pellentesque habitant morbi tristique senectus et netus et malesuada +fames ac turpis egestas. Donec odio elit, dictum in, hendrerit sit +amet, egestas sed, leo. Praesent feugiat sapien aliquet odio. +Integer vitae justo. Aliquam vestibulum fringilla lorem. Sed neque +lectus, consectetuer at, consectetuer sed, eleifend ac, lectus. +Nulla facilisi. Pellentesque eget lectus. Proin eu metus. Sed +porttitor. In hac habitasse platea dictumst. Suspendisse eu lectus. +Ut mi mi, lacinia sit amet, placerat et, mollis vitae, dui. Sed ante +tellus, tristique ut, iaculis eu, malesuada ac, dui. Mauris nibh +leo, facilisis non, adipiscing quis, ultrices a, dui.} +} + +@entry{loremix-x, + name = {lorem 9--10}, + description = {Morbi luctus, wisi viverra faucibus pretium, nibh est placerat odio, +nec commodo wisi enim eget quam. Quisque libero justo, consectetuer +a, feugiat vitae, porttitor eu, libero. Suspendisse sed mauris +vitae elit sollicitudin malesuada. Maecenas ultricies eros sit amet +ante. Ut venenatis velit. Maecenas sed mi eget dui varius euismod. +Phasellus aliquet volutpat odio. Vestibulum ante ipsum primis in +faucibus orci luctus et ultrices posuere cubilia Curae; Pellentesque +sit amet pede ac sem eleifend consectetuer. Nullam elementum, urna +vel imperdiet sodales, elit ipsum pharetra ligula, ac pretium ante +justo a nulla. Curabitur tristique arcu eu metus. Vestibulum lectus. +Proin mauris. Proin eu nunc eu urna hendrerit faucibus. Aliquam +auctor, pede consequat laoreet varius, eros tellus scelerisque quam, +pellentesque hendrerit ipsum dolor sed augue. Nulla nec lacus. + +Suspendisse vitae elit. Aliquam arcu neque, ornare in, ullamcorper +quis, commodo eu, libero. Fusce sagittis erat at erat tristique +mollis. Maecenas sapien libero, molestie et, lobortis in, sodales +eget, dui. Morbi ultrices rutrum lorem. Nam elementum ullamcorper +leo. Morbi dui. Aliquam sagittis. Nunc placerat. Pellentesque +tristique sodales est. Maecenas imperdiet lacinia velit. Cras non +urna. Morbi eros pede, suscipit ac, varius vel, egestas non, eros. +Praesent malesuada, diam id pretium elementum, eros sem dictum +tortor, vel consectetuer odio sem sed wisi.} +} + +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*example-glossaries-parent.bib> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% Encoding: UTF-8 +@entry{sedmattis, + name = {sed mattis}, + description = {erat sit amet} +} + +@entry{gravida, + parent = {sedmattis}, + name = {gravida}, + description = {malesuada} +} + +@entry{elitaugue, + parent = {sedmattis}, + name = {elit augue}, + description = {egestas diam} +} + +@entry{tempus, + parent = {sedmattis}, + name = {tempus}, + description = {scelerisque} +} + +@entry{nunc, + name = {nunc}, + description = {nisl vitae} +} + +@entry{libero, + parent = {nunc}, + name = {libero}, + description = {sed +consequat} +} + +@entry{feugiat, + parent = {nunc}, + name = {feugiat}, + description = {massa} +} + +@entry{porta, + parent = {nunc}, + name = {porta}, + description = {eros +in eleifend} +} + +@entry{variuserat, + parent = {nunc}, + name = {varius erat}, + description = {leo rutrum dui} +} + +@entry{nonconvallis, + name = {non +convallis}, + description = {lectus orci ut nibh} +} + +@entry{sedlorem, + parent = {nonconvallis}, + name = {sedlorem}, + description = {massa} +} + +@entry{nonummyquis, + parent = {nonconvallis}, + name = {nonummy +quis}, + description = {egestas id} +} + +@entry{condimentum, + name = {condimentum}, + description = {at +nisl} +} + +@entry{maecenas, + parent = {condimentum}, + name = {maecenas}, + description = {at nibh} +} + +@entry{aliquamet, + name = {aliquam et}, + description = {augue} +} + +@entry{atnunc, + parent = {aliquamet}, + name = {at nunc}, + description = {pellentesque +ullamcorper} +} + +@entry{duisnisl, + parent = {atnunc}, + name = {duisnisl}, + description = {laoreet +suscipit} +} + +@entry{duisnibh, + parent = {atnunc}, + name = {duisnibh}, + description = {convallis ut} +} + +@entry{rutrum, + name = {rutrum}, + description = {id, enim} +} + +@entry{phasellus, + parent = {rutrum}, + name = {phasellus}, + description = {odio} +} + +@entry{nullanulla, + parent = {rutrum}, + name = {nulla nulla}, + description = {elit, molestie non} +} + +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*example-glossaries-symbols.bib> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% Encoding: UTF-8 +@entry{alpha, + symbol = {\ensuremath{\alpha}}, + name = {alpha}, + description = {Quisque ullamcorper placerat ipsum.} +} + +@entry{beta, + symbol = {\ensuremath{\beta}}, + name = {beta}, + description = {Cras nibh.} +} + +@entry{gamma, + symbol = {\ensuremath{\gamma}}, + name = {gamma}, + description = {Morbi vel justo vitae lacus tincidunt ultrices.} +} + +@entry{delta, + symbol = {\ensuremath{\delta}}, + name = {delta}, + description = {Lorem ipsum dolor sit amet, consectetuer adipiscing +elit.} +} + +@entry{epsilon, + symbol = {\ensuremath{\epsilon}}, + name = {epsilon}, + description = {In hac habitasse platea dictumst.} +} + +@entry{zeta, + symbol = {\ensuremath{\zeta}}, + name = {zeta}, + description = {Integer tempus convallis augue.} +} + +@entry{eta, + symbol = {\ensuremath{\eta}}, + name = {eta}, + description = {Etiam facilisis.} +} + +@entry{theta, + symbol = {\ensuremath{\theta}}, + name = {theta}, + description = {Nunc elementum fermentum wisi.} +} + +@entry{iota, + symbol = {\ensuremath{i}}, + name = {iota}, + description = {Aenean placerat.} +} + +@entry{kappa, + symbol = {\ensuremath{\kappa}}, + name = {kappa}, + description = {Ut imperdiet, enim sed gravida sollicitudin, felis odio +placerat quam, ac pulvinar elit purus eget enim.} +} + +@entry{lambda, + symbol = {\ensuremath{\lambda}}, + name = {lambda}, + description = {Nunc vitae tortor.} +} + +@entry{mu, + symbol = {\ensuremath{\mu}}, + name = {mu}, + description = {Proin tempus nibh sit amet nisl.} +} + +@entry{nu, + symbol = {\ensuremath{\nu}}, + name = {nu}, + description = {Vivamus quis tortor vitae risus porta vehicula.} +} + +@entry{xi, + symbol = {\ensuremath{\xi}}, + name = {xi}, + description = {Fusce mauris.} +} + +@entry{pi, + symbol = {\ensuremath{\pi}}, + name = {pi}, + description = {Vestibulum luctus nibh at lectus.} +} + +@entry{rho, + symbol = {\ensuremath{\rho}}, + name = {rho}, + description = {Sed bibendum, nulla a faucibus semper, leo velit +ultricies tellus, ac venenatis arcu wisi vel nisl. Vestibulum diam.} +} + +@entry{sigma, + symbol = {\ensuremath{\sigma}}, + name = {sigma}, + description = {Aliquam pellentesque, augue quis sagittis posuere, +turpis lacus congue quam, in hendrerit risus eros eget felis.} +} + +@entry{tau, + symbol = {\ensuremath{\tau}}, + name = {tau}, + description = {Maecenas eget erat in sapien mattis porttitor.} +} + +@entry{upsilon, + symbol = {\ensuremath{\upsilon}}, + name = {upsilon}, + description = {Vestibulum porttitor.} +} + +@entry{phi, + symbol = {\ensuremath{\phi}}, + name = {phi}, + description = {Nulla facilisi.} +} + +@entry{chi, + symbol = {\ensuremath{\chi}}, + name = {chi}, + description = {Sed a turpis eu lacus commodo facilisis.} +} + +@entry{psi, + symbol = {\ensuremath{\psi}}, + name = {psi}, + description = {Morbi fringilla, wisi in dignissim interdum, justo +lectus sagittis dui, et vehicula libero dui cursus dui.} +} + +@entry{omega, + symbol = {\ensuremath{\omega}}, + name = {omega}, + description = {Mauris tempor ligula sed lacus.} +} + +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*example-glossaries-url.bib> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% Encoding: UTF-8 +@entry{aenean-url, + user1 = {http://uk.tug.org/}, + name = {aenean}, + description = {adipiscing auctor est} +} + +@entry{morbi-url, + user1 = {http://www.ctan.org/}, + name = {morbi}, + description = {quam arcu, malesuada sed, volutpat et, elementum sit +amet, libero} +} + +@entry{duis-url, + user1 = {http://www.tug.org/}, + name = {duis}, + description = {mattis} +} + +@entry{sed-url, + user1 = {http://theoval.cmp.uea.ac.uk/\protect~nlct/}, + name = {sed}, + description = {cursus lectus quis odio (uses +\texttt{\string\protect\string~})} +} + +@entry{sed2-url, + user1 = {http://theoval.cmp.uea.ac.uk/\string~nlct/}, + name = {sed}, + description = {cursus lectus quis odio (uses +\texttt{\string\string\string~})} +} + +@entry{sed3-url, + user1 = {http://theoval.cmp.uea.ac.uk/\glstildechar nlct/}, + name = {sed}, + description = {cursus lectus quis odio (uses +\texttt{\string\glstildechar})} +} + +@entry{phasellus-url, + user1 = {http://theoval.cmp.uea.ac.uk/}, + name = {phasellus}, + description = {arcu (catcode change)} +} + +@entry{phasellus2-url, + user1 = {http://theoval.cmp.uea.ac.uk/\%7Enlct +}, + name = {phasellus}, + description = {arcu (uses \texttt{\string\%})} +} + +@entry{phasellus3-url, + user1 = {http://theoval.cmp.uea.ac.uk/\glspercentchar 7Enlct +}, + name = {phasellus}, + description = {arcu (uses + \texttt{\string\glspercentchar})} +} + +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*example-glossaries-xr.bib> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% Encoding: UTF-8 +@entry{lorem, + name = {lorem}, + description = {ipsum} +} + +@entry{alias-lorem, + name = {alias-lorem}, + description = {ipsum}, + alias = {lorem} +} + +@entry{dolor, + name = {dolor}, + description = {sit} +} + +@entry{amet, + see = {dolor}, + name = {amet}, + description = {consectetuer} +} + +@entry{adipiscing, + name = {adipiscing}, + description = {elit} +} + +@entry{ut, + name = {ut}, + description = {purus} +} + +@entry{elit, + name = {elit}, + description = {vestibulum}, + seealso = {adipiscing,ut} +} + +@entry{placerat, + name = {placerat}, + description = {ac} +} + +@entry{vitae, + name = {vitae}, + description = {felis} +} + +@entry{curabitur, + name = {curabitur}, + description = {gravida} +} + +@entry{mauris, + name = {mauris}, + description = {nam} +} + +@entry{arcu, + name = {arcu}, + description = {libero}, + seealso = {placerat,vitae,curabitur} +} + +@entry{nonummy, + name = {nonummy}, + description = {eget}, + seealso = {mauris} +} + +@entry{consectetuer, + parent = {nonummy}, + name = {consectetuer}, + description = {id} +} + +@entry{vulputate, + parent = {nonummy}, + name = {vulputate}, + description = {a magna} +} + +@entry{donec, + name = {donec}, + description = {vehicula} +} + +@entry{augue, + name = {augue}, + description = {eu neque} +} + +@entry{pellentesque, + see = {augue}, + name = {pellentesque}, + description = {habitant} +} + +@entry{morbi, + name = {morbi}, + description = {tristique} +} + +@entry{senectus, + name = {senectus}, + description = {et netus} +} + +@entry{et, + see = {vulputate}, + name = {et}, + description = {malesuada} +} + +@entry{fames, + name = {fames}, + description = {ac} +} + +@entry{turpis, + name = {turpis}, + description = {egestas}, + seealso = {consectetuer} +} + +@entry{leo, + name = {leo}, + description = {cras} +} + +@entry{viverra, + name = {viverra}, + description = {metus} +} + +@entry{rhoncus, + name = {rhoncus}, + description = {sem} +} + +@entry{nulla, + name = {nulla}, + description = {et} +} + +@entry{lectus, + name = {lectus}, + description = {vestibulum} +} + +@entry{urna, + parent = {lectus}, + see = {nulla}, + name = {urna}, + description = {fringilla} +} + +@entry{ultrices, + parent = {lectus}, + name = {ultrices}, + description = {phasellus} +} + +@entry{eu, + parent = {lectus}, + name = {eu}, + description = {tellus} +} + +@entry{alias-eu, + name = {alias-eu}, + description = {tellus}, + alias = {eu} +} + +@entry{sit, + name = {sit}, + description = {amet} +} + +@entry{tortor, + name = {tortor}, + description = {gravida} +} + +@entry{integer, + name = {integer}, + description = {sapien} +} + +@entry{est, + name = {est}, + description = {iaculis} +} + +@entry{in, + name = {in}, + description = {pretium}, + seealso = {sit,tortor,est} +} + +@entry{quis, + name = {quis}, + description = {viverra} +} + +@entry{ac, + name = {ac}, + description = {nunc} +} + +@entry{praesent, + name = {praesent}, + description = {eget \gls{ac}} +} + +@entry{sem, + name = {sem}, + description = {vel leo +\glshyperlink{quis}} +} + +@entry{bibendum, + name = {bibendum}, + description = {ultrices} +} + +@entry{aenean, + name = {aenean}, + description = {faucibus} +} + +@entry{malesuada, + parent = {aenean}, + name = {malesuada}, + description = {eu} +} + +@entry{pulvinar, + parent = {aenean}, + name = {pulvinar}, + description = {at} +} + +@entry{mollis, + parent = {aenean}, + name = {mollis}, + description = {ac nulla} +} + +@entry{auctor, + parent = {aenean}, + name = {auctor}, + description = {semper} +} + +@entry{varius, + parent = {aenean}, + name = {varius}, + description = {orci} +} + +@entry{eget, + name = {eget}, + description = {risus} +} + +@entry{duis, + name = {duis}, + description = {nibh} +} + +@entry{mi, + name = {mi}, + description = {congue} +} + +@entry{accumsan, + name = {accumsan}, + description = {eleifend} +} + +@entry{sagittis, + see = {eget}, + name = {sagittis}, + description = {quis} +} + +@entry{diam, + name = {diam}, + description = {duis} +} + +@entry{orci, + name = {orci}, + description = {dignissim}, + seealso = {diam} +} + +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +% +% \end{macrocode} +%\fi %\Finale \endinput 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 c316b184ac6..80c157f3f32 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 2017/8/10 15:55 +% glossaries-extra.ins generated using makedtx version 1.2 2017/9/8 22:43 \input docstrip \preamble @@ -18,7 +18,7 @@ The Current Maintainer of this work is Nicola Talbot. - This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex. + This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. \endpreamble @@ -30,6 +30,32 @@ \usepostamble\defaultpostamble\from{glossaries-extra.dtx}{glossaries-extra-stylemods.sty,package}} \file{example-glossaries-xr.tex}{\usepreamble\defaultpreamble \usepostamble\defaultpostamble\from{glossaries-extra.dtx}{example-glossaries-xr.tex,package}} +\file{example-glossaries-acronym-desc.bib}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{example-glossaries-acronym-desc.bib,package}} +\file{example-glossaries-acronym.bib}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{example-glossaries-acronym.bib,package}} +\file{example-glossaries-acronyms-lang.bib}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{example-glossaries-acronyms-lang.bib,package}} +\file{example-glossaries-brief.bib}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{example-glossaries-brief.bib,package}} +\file{example-glossaries-childnoname.bib}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{example-glossaries-childnoname.bib,package}} +\file{example-glossaries-cite.bib}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{example-glossaries-cite.bib,package}} +\file{example-glossaries-images.bib}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{example-glossaries-images.bib,package}} +\file{example-glossaries-long.bib}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{example-glossaries-long.bib,package}} +\file{example-glossaries-multipar.bib}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{example-glossaries-multipar.bib,package}} +\file{example-glossaries-parent.bib}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{example-glossaries-parent.bib,package}} +\file{example-glossaries-symbols.bib}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{example-glossaries-symbols.bib,package}} +\file{example-glossaries-url.bib}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{example-glossaries-url.bib,package}} +\file{example-glossaries-xr.bib}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{example-glossaries-xr.bib,package}} } \endbatchfile diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/example-glossaries-xr.tex b/Master/texmf-dist/tex/latex/glossaries-extra/example-glossaries-xr.tex index a2f10a7f858..d9e3d5b5806 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/example-glossaries-xr.tex +++ b/Master/texmf-dist/tex/latex/glossaries-extra/example-glossaries-xr.tex @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex. +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty index 4e74ca8418f..318598c2c28 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 @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex. +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-stylemods}[2017/08/10 v1.18 (NLCT)] +\ProvidesPackage{glossaries-extra-stylemods}[2017/09/08 v1.19 (NLCT)] \newcommand*{\@glsxtr@loadstyles}{} \DeclareOption*{% \IfFileExists{glossary-\CurrentOption.sty} 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 d0ac279264e..3302b6ed25d 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex. +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty, example-glossaries-xr.tex, example-glossaries-acronym-desc.bib, example-glossaries-acronym.bib, example-glossaries-acronyms-lang.bib, example-glossaries-brief.bib, example-glossaries-childnoname.bib, example-glossaries-cite.bib, example-glossaries-images.bib, example-glossaries-long.bib, example-glossaries-multipar.bib, example-glossaries-parent.bib, example-glossaries-symbols.bib, example-glossaries-url.bib, example-glossaries-xr.bib. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra}[2017/08/10 v1.18 (NLCT)] +\ProvidesPackage{glossaries-extra}[2017/09/08 v1.19 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{etoolbox} \@ifpackageloaded{glossaries} @@ -116,11 +116,16 @@ } \newcommand*{\@glsxtr@record}[3]{} \newcommand*{\glsxtr@recordsee}[2]{} +\newcommand*{\@glsxtr@defaultnumberformat}{glsnumberformat}% +\newcommand*{\GlsXtrSetDefaultNumberFormat}[1]{% + \renewcommand*{\@glsxtr@defaultnumberformat}{#1}% +}% \newcommand*{\@@glsxtr@record}[3]{% \begingroup - \def\@glsnumberformat{glsnumberformat}% + \let\@glsnumberformat\@glsxtr@defaultnumberformat \def\@glsxtr@thevalue{}% \def\@glsxtr@theHvalue{\@glsxtr@thevalue}% + \let\@glsxtr@org@theHvalue\@glsxtr@theHvalue \ifcsdef{glo@#2@counter}% {% \edef\@gls@counter{\csname glo@#2@counter\endcsname}% @@ -135,29 +140,59 @@ {% \ifdefempty{\@glsxtr@thevalue}% {% + \ifx\@glsxtr@org@theHvalue\@glsxtr@theHvalue + \else + \let\theHglsentrycounter\@glsxtr@theHvalue + \fi \glsxtr@saveentrycounter \let\@@do@@wrglossary\@glsxtr@dorecord }% {% \let\theglsentrycounter\@glsxtr@thevalue - \def\theHglsentrycounter{\@glsxtr@theHvalue}% + \let\theHglsentrycounter\@glsxtr@theHvalue \let\@@do@@wrglossary\@glsxtr@dorecordnodefer }% - \glsxtr@@do@wrglossary{#2}% + \ifx\@glsxtr@record@setting\@glsxtr@record@setting@alsoindex + \glsxtr@@do@wrglossary{#2}% + \else + \edef\@gls@label{\glsdetoklabel{#2}}% + \@@do@@wrglossary + \fi }% \fi \endgroup } \newcommand*\@glsxtr@dorecord{% - \protected@write\@auxout{\let\@glslocref\relax}{\string\glsxtr@record + \global\let\@glsrecordlocref\theglsentrycounter + \let\@glsxtr@orgprefix\@glo@counterprefix + \ifx\theglsentrycounter\theHglsentrycounter + \def\@glo@counterprefix{}% + \else + \edef\@do@gls@getcounterprefix{\noexpand\@gls@getcounterprefix + {\theglsentrycounter}{\theHglsentrycounter}% + }% + \@do@gls@getcounterprefix + \fi + \protected@write\@auxout{\let\@glsrecordlocref\relax}{\string\glsxtr@record {\@gls@label}{\@glo@counterprefix}{\@gls@counter}{\@glsnumberformat}% - {\@glslocref}}% + {\@glsrecordlocref}}% \@glsxtr@counterrecordhook + \let\@glo@counterprefix\@glsxtr@orgprefix } \newcommand*\@glsxtr@dorecordnodefer{% - \protected@write\@auxout{}{\string\glsxtr@record - {\@gls@label}{\@glo@counterprefix}{\@gls@counter}{\@glsnumberformat}% - {\@glslocref}}% + \ifx\theglsentrycounter\theHglsentrycounter + \protected@write\@auxout{}{\string\glsxtr@record + {\@gls@label}{}{\@gls@counter}{\@glsnumberformat}% + {\theglsentrycounter}}% + \else + \edef\@do@gls@getcounterprefix{\noexpand\@gls@getcounterprefix + {\theglsentrycounter}{\theHglsentrycounter}% + }% + \@do@gls@getcounterprefix + \protected@write\@auxout{}{\string\glsxtr@record + {\@gls@label}{\@glo@counterprefix}{\@gls@counter}{\@glsnumberformat}% + {\theglsentrycounter}}% + \fi \@glsxtr@counterrecordhook } \newcommand*{\@@glsxtr@recordcounter}{% @@ -220,10 +255,13 @@ }% {}% } +\newcommand*{\@glsxtr@record@setting}{off} +\newcommand*{\@glsxtr@record@setting@alsoindex}{alsoindex} \define@choicekey{glossaries-extra.sty}{record}[\val\nr]% {off,only,alsoindex}% [only]% {% + \let\@glsxtr@record@setting\val \ifcase\nr\relax \def\glsxtr@setup@record{% \renewcommand*{\@do@seeglossary}{\@glsxtr@org@doseeglossary}% @@ -653,6 +691,20 @@ \newcommand*{\glsxtrfieldxifinlist}[5]{% \xifinlistcs{#3}{glo@\glsdetoklabel{#1}@#2}{#4}{#5}% } +\newrobustcmd{\glsxtrifhasfield}{% + \@ifstar{\s@glsxtrifhasfield}{\@glsxtrifhasfield}% +} +\newcommand{\@glsxtrifhasfield}[4]{% + {\s@glsxtrifhasfield{#1}{#2}{#3}{#4}}% +} +\newcommand{\s@glsxtrifhasfield}[4]{% + \letcs{\glscurrentfieldvalue}{glo@\glsdetoklabel{#2}@#1}% + \ifdef\glscurrentfieldvalue + {% + \ifdefempty\glscurrentfieldvalue{#4}{#3}% + }% + {#4}% +} \newcommand*{\glsxtrusefield}[2]{% \@gls@entry@field{#1}{#2}% } @@ -1546,22 +1598,33 @@ \glsxtrinitwrglossbeforefalse \fi } +\define@key{glslink}{thevalue}{\def\@glsxtr@thevalue{#1}} +\define@key{glslink}{theHvalue}{\def\@glsxtr@theHvalue{#1}} \def\@gls@link[#1]#2#3{% \leavevmode \edef\glslabel{\glsdetoklabel{#2}}% \def\@gls@link@opts{#1}% \let\@gls@link@label\glslabel - \def\@glsnumberformat{glsnumberformat}% + \let\@glsnumberformat\@glsxtr@defaultnumberformat \edef\@gls@counter{\csname glo@\glslabel @counter\endcsname}% \edef\glstype{\csname glo@\glslabel @type\endcsname}% \let\org@ifKV@glslink@hyper\ifKV@glslink@hyper + \def\@glsxtr@thevalue{}% + \def\@glsxtr@theHvalue{\@glsxtr@thevalue}% \glsxtrinitwrgloss \@gls@setdefault@glslink@opts \do@glsdisablehyperinlist \do@gls@link@checkfirsthyper \setkeys{glslink}{#1}% \glslinkpostsetkeys - \@gls@saveentrycounter + \ifdefempty{\@glsxtr@thevalue}% + {% + \@gls@saveentrycounter + }% + {% + \let\theglsentrycounter\@glsxtr@thevalue + \def\theHglsentrycounter{\@glsxtr@theHvalue}% + }% \@gls@setsort{\glslabel}% \ifglsxtrinitwrglossbefore \@do@wrglossary{#2}% @@ -1584,7 +1647,7 @@ \@glsxtr@record{#1}{#2}{glossadd}% \glsdoifexists{#2}% {% - \def\@glsnumberformat{glsnumberformat}% + \let\@glsnumberformat\@glsxtr@defaultnumberformat \edef\@gls@counter{\csname glo@\glsdetoklabel{#2}@counter\endcsname}% \def\@glsxtr@thevalue{}% \def\@glsxtr@theHvalue{\@glsxtr@thevalue}% @@ -2197,7 +2260,7 @@ \ifKV@glslink@noindex \else \begingroup - \def\@glsnumberformat{glsnumberformat}% + \let\@glsnumberformat\@glsxtr@defaultnumberformat \edef\@gls@counter{\csname glo@\glsdetoklabel{\glslabel}@counter\endcsname}% \glsxtr@saveentrycounter \@@do@wrglossary{\glsxtralias{\glslabel}}% @@ -2297,15 +2360,26 @@ \glsfieldfetch{\glslabel}{alias}{\gloaliaslabel}% \ifdefvoid\gloaliaslabel {% - \hyperlink{#1}{{\glsxtrprotectlinks#2}}% + \glsxtrhyperlink{#1}{{\glsxtrprotectlinks#2}}% }% {% - \hyperlink + \glsxtrhyperlink {\glolinkprefix\glsdetoklabel{\gloaliaslabel}}% {{\glsxtrprotectlinks#2}}% }% }% } + +\ifdef\@glsshowtarget +{ + \newcommand{\glsxtrhyperlink}[2]{% + \@glsshowtarget{#1}% + \hyperlink{#1}{#2}% + }% +} +{ + \newcommand{\glsxtrhyperlink}[2]{\hyperlink{#1}{#2}}% +} \renewrobustcmd*{\glshyperlink}[2][\glsentrytext{\@glo@label}]{% \def\@glo@label{#2}% {\edef\glslabel{#2}% @@ -3628,7 +3702,7 @@ \newcommand*{\glsxtrlocationhyperlink}[3]{% \ifdefvoid\glsxtrsupplocationurl {% - \hyperlink{#1#2#3}{#3}% + \glsxtrhyperlink{#1#2#3}{#3}% }% {% \hyperref{\glsxtrsupplocationurl}{}{#1#2#3}{#3}% @@ -3906,7 +3980,7 @@ \let\glsxtr@writefields\relax \ifglsautomake \IfFileExists{\jobname.aux}% - {\immediate\write18{bib2gls "\jobname"}}{}% + {\immediate\write18{bib2gls \jobname}}{}% \ifx\@gls@doautomake\@gls@doautomake@err \let\@gls@doautomake\relax \fi @@ -4758,7 +4832,7 @@ } } \newcommand*{\glsxtrpostnamehook}[1]{% - \def\@glsnumberformat{glsnumberformat}% + \let\@glsnumberformat\@glsxtr@defaultnumberformat \glsxtrdoautoindexname{#1}{indexname}% \csuse{glsxtrpostname\glscategory{#1}}% } @@ -4790,8 +4864,10 @@ \@glsxtr@autoindex@setname{#1}% \protected@edef\@glsxtr@attrval{\glsgetattribute{#1}{#2}}% \if@glsxtr@format@override - \ifdefstring{\@glsnumberformat}{glsnumberformat}{}% - {\let\@glsxtr@attrval\@glsnumberformat}% + \ifx\@glsnumberformat\@glsxtr@defaultnumberformat + \else + \let\@glsxtr@attrval\@glsnumberformat + \fi \fi \ifdefstring{\@glsxtr@attrval}{true}% {}% -- cgit v1.2.3