diff options
62 files changed, 66 insertions, 36 deletions
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES b/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES index 3972b207c4b..ea884160d64 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES +++ b/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES @@ -1,3 +1,12 @@ +1.45 (2020-04-01): + + * glossaries-extra-stylemods.sty: + + - Bug fix: removed duplication of description in treenoname style + + - New command: \glstreenonameChildDescLoc + + 1.44 (2020-03-23): * glossaries-extra.sty: diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/README b/Master/texmf-dist/doc/latex/glossaries-extra/README index 6710e081c8f..8c1893e3352 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/README +++ b/Master/texmf-dist/doc/latex/glossaries-extra/README @@ -1,4 +1,4 @@ -LaTeX Package : glossaries-extra v1.44 (2020-03-23) +LaTeX Package : glossaries-extra v1.45 (2020-04-01) Author : Nicola Talbot https://www.dickimaw-books.com/contact diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf Binary files differindex 48d6bff21ea..a7bac16a1da 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.html b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.html index d0813adde42..a01186aa3d5 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 @@ -219,7 +219,7 @@ a span.HoLogo-TeX span.HoLogo-e{text-decoration:none;} > <!--l. 235--><p class="noindent" > </p><!--l. 235--><p class="noindent" ><span -class="cmr-17">glossaries-extra.sty v1.44: an extension to the</span> +class="cmr-17">glossaries-extra.sty v1.45: an extension to the</span> <span class="cmr-17">glossaries package</span> </p> @@ -243,7 +243,7 @@ href="http://www.dickimaw-books.com/" class="url" ><span class="cmtt-12">http://www.dickimaw-books.com/</span></a></td></tr></table> </div> <!--l. 235--><p class="noindent" ><span -class="cmr-12">2020-03-23</span></p></div> +class="cmr-12">2020-04-01</span></p></div> <div class="abstract" > diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf Binary files differindex c0a595de521..e72737a6dd6 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex index b720b1aaa01..0920f2ff4cd 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex +++ b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex @@ -225,13 +225,13 @@ styles (glossaries):>#1={\protect\ttfamily#1}|main}} \DeleteShortVerb{\|} \MakeShortVerb{"} - \title{glossaries-extra.sty v1.44: + \title{glossaries-extra.sty v1.45: an extension to the glossaries package} \author{Nicola L.C. Talbot\\[10pt] Dickimaw Books\\ \url{http://www.dickimaw-books.com/}} - \date{2020-03-23} + \date{2020-04-01} \maketitle \begin{abstract} diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.pdf Binary files differindex 067fefffb09..f90e2bf9e0a 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf Binary files differindex 75dbbba4ead..3ba4c0d2c30 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf Binary files differindex dcfa99bf2a0..c070b1a1c10 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf Binary files differindex c2475f08955..b1ca94ef988 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf Binary files differindex 92405490910..e5d3aabee06 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf Binary files differindex af769c2904b..5f95e8c10df 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf Binary files differindex fea63723599..4bf0cfc14bd 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf Binary files differindex e1b1b380e71..d87c56c0282 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf Binary files differindex 0a15892f046..6b2326755eb 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf Binary files differindex 0b4c4eb9bfe..5ace7e5e2eb 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf Binary files differindex 5ffe8cdc19d..cf75773e800 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf Binary files differindex a6659eb0ab0..44d3c2df331 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf Binary files differindex 8807a83295a..6656a68b925 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf Binary files differindex ca7017a576e..0dc9e3931c4 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf Binary files differindex 3ba1d7d8041..1b88b47f31b 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf Binary files differindex da5ad2f50c7..f376f4b6e87 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf Binary files differindex bc6c45aee09..cdcf6be76a5 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf Binary files differindex 2fad6052c90..9d57d9290ae 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf Binary files differindex 8f6cb1c9a39..4b0605157ca 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf Binary files differindex a84fa9e5057..f48bb2ab242 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf Binary files differindex 6e7bee80381..78849f09e42 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf Binary files differindex 138c930a141..3ccebde9f11 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-linkcount.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-linkcount.pdf Binary files differindex 9cf9ba11ffb..d0bd830ca08 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-linkcount.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-linkcount.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf Binary files differindex 4398fabf496..ead60a83b43 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf Binary files differindex 800e23fc95d..6aedfbfd3b3 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf Binary files differindex 1ab4d05a3bb..642c20dbf77 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf Binary files differindex 148f025b1ed..32a0b980947 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf Binary files differindex 73ae97a0e1a..5da7a933d6d 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.pdf Binary files differindex b85e9628db5..28bdb492a3e 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf Binary files differindex 84b11de45bc..3a408d73d1e 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf Binary files differindex 7b66ce90693..e381014d44c 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf Binary files differindex a4ddbadfecc..5c4220a1852 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf Binary files differindex c4ec898bace..eee065e89ad 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf Binary files differindex c8f28cd6c33..e86ecc0201d 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf Binary files differindex b3338a5a3db..8d4c7cdc2ee 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf Binary files differindex 9f41dfa0652..a4c0b17bda1 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf Binary files differindex 8831ce5d7a6..3eede737cf0 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-record-nameref.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-record-nameref.pdf Binary files differindex b0cc53ec5a1..e37e644536c 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-record-nameref.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-record-nameref.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf Binary files differindex c4b42d17911..d003fbd686a 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf Binary files differindex ac6c68db0af..4b702408d21 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf Binary files differindex da9bf5b1c0b..2b624456f42 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf Binary files differindex 724d7d4fd7c..f4123f65619 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf Binary files differindex 307d4ba2c9a..63142c9f263 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf Binary files differindex f50bc9cacba..b3978b8883f 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf Binary files differindex 8f0b50a01fe..f2f72597259 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf Binary files differindex 50be7ebdf4f..82d972fd7d1 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf Binary files differindex d8f7ce0b59e..ad37602acd4 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf Binary files differindex 0896f120ef9..61564941cd9 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf diff --git a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx index c2dcfe0ecb8..b9f90f6ca85 100644 --- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx +++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx @@ -1,6 +1,12 @@ %\iffalse % glossaries-extra.dtx generated using makedtx version 1.2 (c) Nicola Talbot % Command line args: +% -setambles ".*\.bib=>\nopreamble\nopostamble" +% -section "chapter" +% -doc "glossaries-extra-codedoc.tex" +% -author "Nicola Talbot" +% -macrocode ".*\.tex" +% -macrocode ".*\.bib" % -src "glossaries-extra.sty\Z=>glossaries-extra.sty" % -src "glossaries-extra-bib2gls.sty\Z=>glossaries-extra-bib2gls.sty" % -src "glossaries-extra-stylemods.sty\Z=>glossaries-extra-stylemods.sty" @@ -9,17 +15,11 @@ % -src "glossary-topic.sty\Z=>glossary-topic.sty" % -src "(example-glossaries-.+\.tex)\Z=>\1" % -src "(example-glossaries-.+\.bib)\Z=>\1" -% -doc "glossaries-extra-codedoc.tex" -% -section "chapter" -% -setambles ".*\.bib=>\nopreamble\nopostamble" % -comment ".*\.tex" % -comment ".*\.bib" % -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})" -% -author "Nicola Talbot" -% -macrocode ".*\.tex" -% -macrocode ".*\.bib" % glossaries-extra -% Created on 2020/3/23 20:29 +% Created on 2020/4/1 13:56 %\fi %\iffalse %<*package> @@ -142,7 +142,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \setcounter{IndexColumns}{2} -\CheckSum{27175} +\CheckSum{27181} \newcommand*{\ifirstuse}{\iterm{first use}} \newcommand*{\firstuse}{\gls{firstuse}} @@ -182,13 +182,13 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \raggedright } -\title{glossaries-extra.sty v1.44: +\title{glossaries-extra.sty v1.45: documented code} \author{Nicola L.C. Talbot\\[10pt] Dickimaw Books\\ \url{http://www.dickimaw-books.com/}} -\date{2020-03-23} +\date{2020-04-01} \begin{document} \DocInput{glossaries-extra.dtx} @@ -233,7 +233,7 @@ Dickimaw Books\\ %\section{Package Initialisation and Options} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossaries-extra}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} % Requires \sty{xkeyval} to define package options. % \begin{macrocode} @@ -25645,7 +25645,7 @@ defined}{}% %automatically loaded by the record option. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-bib2gls}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossaries-extra-bib2gls}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} %Provide convenient shortcut commands for predefined glossary types. %\begin{macro}{\printunsrtacronyms} @@ -28730,7 +28730,7 @@ defined}{}% % First identify package: % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-stylemods}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossaries-extra-stylemods}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} % Provide package options to automatically load required predefined % styles. The simplest method is to just test for the existence of @@ -29800,6 +29800,14 @@ defined}{}% }% % \end{macrocode} %\end{macro} +%\begin{macro}{\glstreenonameDescLoc} +%\changes{1.45}{2020-04-01}{new} +% \begin{macrocode} + \newcommand{\glstreenonameDescLoc}[2]{% + \glstreenonamedesc{#1}\glstreeprelocation#2% + } +% \end{macrocode} +%\end{macro} %\begin{macro}{\glstreenonamechilddesc} %\changes{1.31}{2018-05-09}{new} %The child entry doesn't have the pre-description separator as the @@ -29810,6 +29818,14 @@ defined}{}% }% % \end{macrocode} %\end{macro} +%\begin{macro}{\glstreenonameChildDescLoc} +%\changes{1.45}{2020-04-01}{new} +% \begin{macrocode} + \newcommand{\glstreenonameChildDescLoc}[2]{% + \glstreenonamechilddesc{#1}\glstreechildprelocation#2% + } +% \end{macrocode} +%\end{macro} % \begin{macrocode} \renewglossarystyle{treenoname}{% \renewenvironment{theglossary}% @@ -29823,8 +29839,10 @@ defined}{}% \parindent0pt\relax \glsentryitem{##1}\glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}% \glstreenonamesymbol{##1}% - \glstreenonamedesc{##1}% - \glstreeDescLoc{##1}{##2}\par +% \end{macrocode} +%\changes{1.45}{2020-04-01}{removed duplicate description} +% \begin{macrocode} + \glstreenonameDescLoc{##1}{##2}\par }% \renewcommand{\subglossentry}[3]{% \hangindent##1\glstreeindent\relax @@ -29833,8 +29851,7 @@ defined}{}% \glssubentryitem{##2}% \fi \glstarget{##2}{\strut}% - \glstreenonamechilddesc{##2}% - \glstreechildprelocation##3\par + \glstreenonameChildDescLoc{##2}{##3}\par }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\glstreegroupskip\fi}% } @@ -31036,7 +31053,7 @@ defined}{}% %\section{Package Initialisation and Options} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-bookindex}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossary-bookindex}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} %Load required packages. % \begin{macrocode} @@ -31532,7 +31549,7 @@ defined}{}% %Provides additional long styles. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-longextra}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossary-longextra}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} %Load required packages. % \begin{macrocode} @@ -32961,7 +32978,7 @@ defined}{}% %topic. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-topic}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossary-topic}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} %Load required package. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins index f1a3cb82b09..cc2f94010cb 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 2020/3/23 20:29 +% glossaries-extra.ins generated using makedtx version 1.2 2020/4/1 13:56 \input docstrip \preamble diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty index eb6fcda06d5..9098bed7dc0 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-bib2gls}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossaries-extra-bib2gls}[2020/04/01 v1.45 (NLCT)] \ifglsacronym \providecommand*{\printunsrtacronyms}[1][]{% \printunsrtglossary[type=\acronymtype,#1]}% 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 586470575fe..f9fff6d26d3 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-stylemods}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossaries-extra-stylemods}[2020/04/01 v1.45 (NLCT)] \newcommand*{\@glsxtr@loadstyles}{} \DeclareOption{all}{% \appto\@glsxtr@loadstyles{% @@ -705,9 +705,15 @@ \newcommand{\glstreenonamesymbol}[1]{% \ifglshassymbol{#1}{\space(\glossentrysymbol{#1})}{}% }% + \newcommand{\glstreenonameDescLoc}[2]{% + \glstreenonamedesc{#1}\glstreeprelocation#2% + } \newcommand{\glstreenonamechilddesc}[1]{% \glossentrydesc{#1}\glspostdescription }% + \newcommand{\glstreenonameChildDescLoc}[2]{% + \glstreenonamechilddesc{#1}\glstreechildprelocation#2% + } \renewglossarystyle{treenoname}{% \renewenvironment{theglossary}% {\setlength{\parindent}{0pt}% @@ -720,8 +726,7 @@ \parindent0pt\relax \glsentryitem{##1}\glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}% \glstreenonamesymbol{##1}% - \glstreenonamedesc{##1}% - \glstreeDescLoc{##1}{##2}\par + \glstreenonameDescLoc{##1}{##2}\par }% \renewcommand{\subglossentry}[3]{% \hangindent##1\glstreeindent\relax @@ -730,8 +735,7 @@ \glssubentryitem{##2}% \fi \glstarget{##2}{\strut}% - \glstreenonamechilddesc{##2}% - \glstreechildprelocation##3\par + \glstreenonameChildDescLoc{##2}{##3}\par }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\glstreegroupskip\fi}% } 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 1b905fc93a8..cb1b1cded9a 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossaries-extra}[2020/04/01 v1.45 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{etoolbox} \@ifpackageloaded{glossaries} diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty index 0349f32c57b..db0c97bc566 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-bookindex}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossary-bookindex}[2020/04/01 v1.45 (NLCT)] \RequirePackage{multicol} \RequirePackage{glossary-tree} \newcommand{\glsxtrbookindexcols}{2} diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty index 637a2b69ed7..9c3e6fbad5c 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-longextra.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-longextra}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossary-longextra}[2020/04/01 v1.45 (NLCT)] \RequirePackage{glossary-longbooktabs} \newcommand{\glslongextraNameFmt}[1]{% \glsentryitem{#1}\glstarget{#1}{\glossentryname{#1}}% diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty index aa6c9ecc012..041e54d8d06 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-topic.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-topic}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossary-topic}[2020/04/01 v1.45 (NLCT)] \RequirePackage{multicol} \newglossarystyle{topic}{% \renewenvironment{theglossary}% |