From 607682851f2a709e970de0672a2ea1e180352523 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 14 Feb 2020 22:27:37 +0000 Subject: glossaries (14feb20) git-svn-id: svn://tug.org/texlive/trunk@53777 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/glossaries/base/glossaries-babel.sty | 4 +- .../glossaries/base/glossaries-compatible-207.sty | 4 +- .../glossaries/base/glossaries-compatible-307.sty | 4 +- .../glossaries/base/glossaries-polyglossia.sty | 4 +- .../latex/glossaries/base/glossaries-prefix.sty | 55 ++- .../tex/latex/glossaries/base/glossaries.sty | 149 +++++-- .../latex/glossaries/expl/glossaries-accsupp.sty | 444 ++++++++++++++++++--- .../latex/glossaries/styles/glossary-hypernav.sty | 4 +- .../latex/glossaries/styles/glossary-inline.sty | 4 +- .../tex/latex/glossaries/styles/glossary-list.sty | 4 +- .../tex/latex/glossaries/styles/glossary-long.sty | 4 +- .../glossaries/styles/glossary-longbooktabs.sty | 4 +- .../glossaries/styles/glossary-longragged.sty | 4 +- .../tex/latex/glossaries/styles/glossary-mcols.sty | 4 +- .../tex/latex/glossaries/styles/glossary-super.sty | 4 +- .../glossaries/styles/glossary-superragged.sty | 4 +- .../tex/latex/glossaries/styles/glossary-tree.sty | 4 +- .../example-glossaries-acronym-desc.tex | 4 +- .../test-entries/example-glossaries-acronym.tex | 4 +- .../example-glossaries-acronyms-lang.tex | 6 +- .../test-entries/example-glossaries-brief.tex | 4 +- .../example-glossaries-childnoname.tex | 6 +- .../test-entries/example-glossaries-cite.tex | 8 +- .../test-entries/example-glossaries-images.tex | 8 +- .../test-entries/example-glossaries-long.tex | 4 +- .../test-entries/example-glossaries-multipar.tex | 4 +- .../test-entries/example-glossaries-parent.tex | 4 +- .../example-glossaries-symbolnames.tex | 4 +- .../test-entries/example-glossaries-symbols.tex | 4 +- .../test-entries/example-glossaries-url.tex | 6 +- 30 files changed, 609 insertions(+), 161 deletions(-) (limited to 'Master/texmf-dist/tex/latex/glossaries') diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty index dcb1dbb87a2..03bc229b1fe 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossaries-babel.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-babel}[2019/12/06 v4.44 (NLCT)] +\ProvidesPackage{glossaries-babel}[2020/02/13 v4.45 (NLCT)] \RequirePackage{tracklang} \let\glsifusetranslator\@secondoftwo \AnyTrackedLanguages diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty index 78b30697fb1..614165f88e3 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossaries-compatible-207.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-207}[2019/12/06 v4.44 (NLCT)] +\ProvidesPackage{glossaries-compatible-207}[2020/02/13 v4.45 (NLCT)] \ifglsxindy \renewcommand*\GlsAddXdyAttribute[1]{% \edef\@xdyattributes{\@xdyattributes ^^J \string"#1\string"}% diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty index cd148858c76..e3d5d786eaa 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossaries-compatible-307.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-307}[2019/12/06 v4.44 (NLCT)] +\ProvidesPackage{glossaries-compatible-307}[2020/02/13 v4.45 (NLCT)] \newcommand{\compatglossarystyle}[2]{% \ifcsundef{@glscompstyle@#1}% {% diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty index 2551d4d0748..a04ea1775da 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossaries-polyglossia.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-polyglossia}[2019/12/06 v4.44 (NLCT)] +\ProvidesPackage{glossaries-polyglossia}[2020/02/13 v4.45 (NLCT)] \RequirePackage{tracklang} \let\glsifusetranslator\@secondoftwo \AnyTrackedLanguages diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty index ee25f03bc4a..dbac71c219e 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossaries-prefix.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-prefix}[2019/12/06 v4.44 (NLCT)] +\ProvidesPackage{glossaries-prefix}[2020/02/13 v4.45 (NLCT)] \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}} \ProcessOptions \RequirePackage{glossaries} @@ -69,43 +69,44 @@ {\csname glo@\@glo@label @prefixplural\endcsname}{\@glo@label}% {prefixfirstplural}{\@glo@entryprefixfirstplural}% } -\newcommand*{\glsentryprefixfirst}[1]{\csuse{glo@#1@prefixfirst}} -\newcommand*{\glsentryprefixfirstplural}[1]{\csuse{glo@#1@prefixfirstplural}} -\newcommand*{\glsentryprefix}[1]{\csuse{glo@#1@prefix}} -\newcommand*{\glsentryprefixplural}[1]{\csuse{glo@#1@prefixplural}} +\newcommand*{\glsentryprefixfirst}[1]{\csuse{glo@\glsdetoklabel{#1}@prefixfirst}} +\newcommand*{\glsentryprefixfirstplural}[1]{% + \csuse{glo@\glsdetoklabel{#1}@prefixfirstplural}} +\newcommand*{\glsentryprefix}[1]{\csuse{glo@\glsdetoklabel{#1}@prefix}} +\newcommand*{\glsentryprefixplural}[1]{\csuse{glo@\glsdetoklabel{#1}@prefixplural}} \newrobustcmd*{\Glsentryprefixfirst}[1]{% - \protected@edef\@glo@text{\csname glo@#1@prefixfirst\endcsname}% + \protected@edef\@glo@text{\csname glo@\glsdetoklabel{#1}@prefixfirst\endcsname}% \xmakefirstuc\@glo@text } \newrobustcmd*{\Glsentryprefixfirstplural}[1]{% - \protected@edef\@glo@text{\csname glo@#1@prefixfirstplural\endcsname}% + \protected@edef\@glo@text{\csname glo@\glsdetoklabel{#1}@prefixfirstplural\endcsname}% \xmakefirstuc\@glo@text } \newrobustcmd*{\Glsentryprefix}[1]{% - \protected@edef\@glo@text{\csname glo@#1@prefix\endcsname}% + \protected@edef\@glo@text{\csname glo@\glsdetoklabel{#1}@prefix\endcsname}% \xmakefirstuc\@glo@text } \newrobustcmd*{\Glsentryprefixplural}[1]{% - \protected@edef\@glo@text{\csname glo@#1@prefixplural\endcsname}% + \protected@edef\@glo@text{\csname glo@\glsdetoklabel{#1}@prefixplural\endcsname}% \xmakefirstuc\@glo@text } \newcommand*{\ifglshasprefix}[3]{% - \ifcsempty{glo@#1@prefix}% + \ifcsempty{glo@\glsdetoklabel{#1}@prefix}% {#3}% {#2}% } \newcommand*{\ifglshasprefixplural}[3]{% - \ifcsempty{glo@#1@prefixplural}% + \ifcsempty{glo@\glsdetoklabel{#1}@prefixplural}% {#3}% {#2}% } \newcommand*{\ifglshasprefixfirst}[3]{% - \ifcsempty{glo@#1@prefixfirst}% + \ifcsempty{glo@\glsdetoklabel{#1}@prefixfirst}% {#3}% {#2}% } \newcommand*{\ifglshasprefixfirstplural}[3]{% - \ifcsempty{glo@#1@prefixfirstplural}% + \ifcsempty{glo@\glsdetoklabel{#1}@prefixfirstplural}% {#3}% {#2}% } @@ -114,6 +115,7 @@ {\@glsxtr@record{#1}{#2}{glslink}}% {}% } +\newcommand{\glsprefixsep}{} \newrobustcmd{\pgls}{\@gls@hyp@opt\@pgls} \newcommand*{\@pgls}[2][]{% \new@ifnextchar[% @@ -126,10 +128,10 @@ {% \ifglsused{#2}% {% - \glsentryprefix{#2}% + \ifglshasprefix{#2}{\glsentryprefix{#2}\glsprefixsep}{}% }% {% - \glsentryprefixfirst{#2}% + \ifglshasprefixfirst{#2}{\glsentryprefixfirst{#2}\glsprefixsep}{}% }% \@gls@{#1}{#2}[#3]% }% @@ -146,10 +148,11 @@ {% \ifglsused{#2}% {% - \glsentryprefixplural{#2}% + \ifglshasprefixplural{#2}{\glsentryprefixplural{#2}\glsprefixsep}{}% }% {% - \glsentryprefixfirstplural{#2}% + \ifglshasprefixfirstplural{#2}% + {\glsentryprefixfirstplural{#2}\glsprefixsep}{}% }% \@glspl@{#1}{#2}[#3]% }% @@ -169,6 +172,7 @@ \ifglshasprefix{#2}% {% \Glsentryprefix{#2}% + \glsprefixsep \@gls@{#1}{#2}[#3]% }% {\@Gls@{#1}{#2}[#3]}% @@ -177,6 +181,7 @@ \ifglshasprefixfirst{#2}% {% \Glsentryprefixfirst{#2}% + \glsprefixsep \@gls@{#1}{#2}[#3]% }% {\@Gls@{#1}{#2}[#3]}% @@ -198,6 +203,7 @@ \ifglshasprefixplural{#2}% {% \Glsentryprefixplural{#2}% + \glsprefixsep \@glspl@{#1}{#2}[#3]% }% {\@Glspl@{#1}{#2}[#3]}% @@ -206,6 +212,7 @@ \ifglshasprefixfirstplural{#2}% {% \Glsentryprefixfirstplural{#2}% + \glsprefixsep \@glspl@{#1}{#2}[#3]% }% {\@Glspl@{#1}{#2}[#3]}% @@ -224,10 +231,12 @@ {% \ifglsused{#2}% {% - \mfirstucMakeUppercase{\glsentryprefix{#2}}% + \ifglshasprefix{#2}% + {\mfirstucMakeUppercase{\glsentryprefix{#2}\glsprefixsep}}{}% }% {% - \mfirstucMakeUppercase{\glsentryprefixfirst{#2}}% + \ifglshasprefixfirst{#2}% + {\mfirstucMakeUppercase{\glsentryprefixfirst{#2}\glsprefixsep}}{}% }% \@GLS@{#1}{#2}[#3]% }% @@ -244,10 +253,12 @@ {% \ifglsused{#2}% {% - \mfirstucMakeUppercase{\glsentryprefixplural{#2}}% + \ifglshasprefixplural{#2}% + {\mfirstucMakeUppercase{\glsentryprefixplural{#2}\glsprefixsep}}{}% }% {% - \mfirstucMakeUppercase{\glsentryprefixfirstplural{#2}}% + \ifglshasprefixfirstplural{#2}% + {\mfirstucMakeUppercase{\glsentryprefixfirstplural{#2}\glsprefixsep}}{}% }% \@GLSpl@{#1}{#2}[#3]% }% diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty index c5500251e64..a4ac2be7ca5 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossaries.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2019/12/06 v4.44 (NLCT)] +\ProvidesPackage{glossaries}[2020/02/13 v4.45 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} @@ -71,8 +71,9 @@ \fi \newif\if@gls@debug \define@choicekey{glossaries.sty}{debug}[\gls@debug@val\gls@debug@nr]% - {true,false,showtargets}[true]{% + {true,false,showtargets,showaccsupp}[true]{% \ifcase\gls@debug@nr\relax + % debug=true \@gls@debugtrue \renewcommand*{\GlossariesWarning}[1]{% \PackageWarning{glossaries}{##1}% @@ -83,10 +84,13 @@ \let\@glsshowtarget\@gobble \PackageInfo{glossaries}{debug mode ON (nowarn option disabled)}% \or + % debug=false \@gls@debugfalse \let\@glsshowtarget\@gobble + \let\@glsshowaccsupp\@gobblethree \PackageInfo{glossaries}{debug mode OFF}% \or + % debug=showtargets \@gls@debugtrue \renewcommand*{\GlossariesWarning}[1]{% \PackageWarning{glossaries}{##1}% @@ -95,21 +99,49 @@ \PackageWarningNoLine{glossaries}{##1}% }% \PackageInfo{glossaries}{debug mode ON (nowarn option disabled)}% - \renewcommand{\@glsshowtarget}{\glsshowtarget}% + \renewcommand{\@glsshowtarget}{\@@glsshowtarget}% + \or + % debug=showaccsupp + \@gls@debugtrue + \renewcommand*{\GlossariesWarning}[1]{% + \PackageWarning{glossaries}{##1}% + }% + \renewcommand*{\GlossariesWarningNoLine}[1]{% + \PackageWarningNoLine{glossaries}{##1}% + }% + \PackageInfo{glossaries}{debug mode ON (nowarn option disabled)}% + \renewcommand{\@glsshowaccsupp}{\glsshowaccsupp}% \fi } \newcommand*{\glsshowtarget}[1]{% \ifmmode - \nfss@text{\ttfamily\small [#1]}% + \nfss@text{\glsshowtargetfont [#1]}% \else \ifinner - \texttt{\small [#1]}% + {\glsshowtargetfont [#1]}% \else - \marginpar{\texttt{\small #1}}% + \glsshowtargetouter{#1}% \fi \fi } +\newcommand*{\glsshowtargetouter}[1]{% + \glsshowtargetsymbol\marginpar{\glsshowtargetsymbol\glsshowtargetfont #1}} +\newcommand*{\glsshowtargetsymbol}{{\tiny$\triangleright$}} +\newcommand*{\glsshowtargetfont}{\ttfamily\footnotesize} \newcommand*{\@glsshowtarget}[1]{} +\newrobustcmd*{\@@glsshowtarget}[1]{% + \begingroup + \protected@edef\@gls@tmp{#1}% + \@onelevel@sanitize\@gls@tmp + \expandafter\glsshowtarget\expandafter{\@gls@tmp}% + \endgroup +} +\newcommand*{\@glsshowaccsupp}[3]{} +\newrobustcmd*{\glsshowaccsupp}[3]{% + \ifstrempty{#1}% + {\@@glsshowtarget{/#2 (#3)}}% + {\@@glsshowtarget{/#2 (#3) [#1]}}% +} \newcommand*{\@gls@see@noindex}{% \PackageError{glossaries}% {`\gls@xr@key' key may only be used after \string\makeglossaries\space @@ -409,7 +441,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \newcommand*{\@gls@do@acronymsdef}{} \@gls@declareoption{acronyms}{% \glsacronymtrue - \renewcommand{\@gls@do@acronymsdef}{% + \def\@gls@do@acronymsdef{% \DeclareAcronymList{acronym}% \newglossary[alg]{acronym}{acr}{acn}{\acronymname}% \renewcommand*{\acronymtype}{acronym}% @@ -436,9 +468,9 @@ false,nolabel,autolabel,nameref}[nolabel]{% } \newcommand{\@gls@islistofacronyms}[4]{% \def\gls@islistofacronyms##1,#1,##2\end@gls@islistofacronyms{% - \def\@before{##1}\def\@after{##2}}% + \def\@gls@before{##1}\def\@gls@after{##2}}% \gls@islistofacronyms,#2,#1,\@nil\end@gls@islistofacronyms - \ifx\@after\@nnil + \ifx\@gls@after\@nnil #4% \else #3% @@ -826,6 +858,58 @@ false,nolabel,autolabel,nameref}[nolabel]{% \glsxindytrue \gls@xindy@glsnumbersfalse } +\providecommand{\@domakeglossaries}[1]{#1} +\@gls@declareoption{disablemakegloss}{% + \ifdefequal\makeglossaries\@no@makeglossaries + {% + \GlossariesWarning{Option `disablemakegloss' has no effect + (\string\makenoidxglossaries\space has already been used)}% + }% + {% + \ifdefequal\@makeglossary\@gobble + {% + \GlossariesWarning{Option `disablemakegloss' has no effect + (\string\makeglossaries\space has already been used)}% + }% + {% + \renewcommand{\@domakeglossaries}[1]{% + \PackageInfo{glossaries}{\string\makeglossaries\space and + \string\makenoidxglossaries\space have been disabled}% + }% + }% + }% +} +\@gls@declareoption{restoremakegloss}{% + \ifdefequal\makeglossaries\@no@makeglossaries + {% + \GlossariesWarning{Option `restoremakegloss' has no effect + (\string\makenoidxglossaries\space has already been used)}% + }% + {% + \ifdefequal\@makeglossary\@gobble + {% + \GlossariesWarning{Option `restoremakegloss' has no effect + (\string\makeglossaries\space has already been used)}% + }% + {% + \PackageInfo{glossaries}{\string\makeglossaries\space and + \string\makenoidxglossaries\space have been restored}% + \let\@domakeglossaries\@firstofone + }% + }% +} +\newcommand*{\@do@write@glslabels}{% + \AtEndDocument{\@@do@write@glslabels}% + \let\@do@write@glslabels\relax +} +\newcommand*{\@@do@write@glslabels}{% + \newwrite\@gls@labelsfile + \immediate\openout\@gls@labelsfile=\jobname.glslabels + \forallglsentries[\@glo@types,\@ignored@glossaries]{\@glsentry}% + {\ifdefempty{\@glsentry}{}{\immediate\write\@gls@labelsfile{\@glsentry}}}% + \immediate\closeout\@gls@labelsfile +} +\@gls@declareoption{writeglslabels}{\@do@write@glslabels} \newif\ifglsautomake \newcommand{\gls@automake@nr}{1} \define@choicekey{glossaries.sty}{automake}% @@ -1671,7 +1755,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% }% {#2}% } -\newcommand{\ifglshaschildren}[3]{% +\newrobustcmd{\ifglshaschildren}[3]{% \glsdoifexists{#1}% {% \def\do@glshaschildren{#3}% @@ -1707,7 +1791,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% {#2}% {#3}% } -\newcommand*{\ifglshassymbol}[3]{% +\newrobustcmd*{\ifglshassymbol}[3]{% \letcs{\@glo@symbol}{glo@\glsdetoklabel{#1}@symbol}% \ifdefempty\@glo@symbol {#3}% @@ -1717,7 +1801,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% {#2}% }% } -\newcommand*{\ifglshaslong}[3]{% +\newrobustcmd*{\ifglshaslong}[3]{% \letcs{\@glo@long}{glo@\glsdetoklabel{#1}@long}% \ifdefempty\@glo@long {#3}% @@ -1727,7 +1811,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% {#2}% }% } -\newcommand*{\ifglshasshort}[3]{% +\newrobustcmd*{\ifglshasshort}[3]{% \letcs{\@glo@short}{glo@\glsdetoklabel{#1}@short}% \ifdefempty\@glo@short {#3}% @@ -1737,7 +1821,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% {#2}% }% } -\newcommand*{\ifglshasfield}[4]{% +\newrobustcmd*{\ifglshasfield}[4]{% \glsdoifexists{#2}% {% \letcs{\@glo@thisvalue}{glo@\glsdetoklabel{#2}@#1}% @@ -4560,7 +4644,14 @@ false,nolabel,autolabel,nameref}[nolabel]{% \@glo@text }% \else - \xmakefirstuc{\@glo@text}% + \expandafter\ifx\@gls@body\glsshortaccessdisplay\relax + {% + \let\glsentryshort\Glsentryshort + \@glo@text + }% + \else + \xmakefirstuc{\@glo@text}% + \fi \fi \fi \fi @@ -4614,8 +4705,11 @@ false,nolabel,autolabel,nameref}[nolabel]{% \@Gls@entry@field{#1}{firstpl}% } \newrobustcmd*{\@glsentrytitlecase}[2]{% - \glsfieldfetch{#1}{#2}{\@gls@value}% - \xcapitalisewords{\@gls@value}% + \glsdoifexists{#1}% + {% + \glsfieldfetch{#1}{#2}{\@gls@value}% + \xcapitalisewords{\@gls@value}% + }% } \ifdef\texorpdfstring { @@ -4632,6 +4726,9 @@ false,nolabel,autolabel,nameref}[nolabel]{% \newcommand*{\glsentrysort}[1]{% \@gls@entry@field{#1}{sort}% } +\newcommand*{\glsentryparent}[1]{% + \@gls@entry@field{#1}{parent}% +} \newcommand*{\glsentryuseri}[1]{% \@gls@entry@field{#1}{useri}% } @@ -5334,6 +5431,8 @@ false,nolabel,autolabel,nameref}[nolabel]{% \fi } \newcommand*{\makeglossaries}{% + \@domakeglossaries + {% \@gls@@automake@immediate \ifundef{\glswrite}{\newwrite\glswrite}{}% \protected@write\@auxout{}{\string\providecommand\string\@glsorder[1]{}} @@ -5357,7 +5456,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% must be created before \string\makeglossaries}{You need to move \string\makeglossaries\space after all your \string\newglossary\space commands}}% - \let\@makeglossary\relax + \let\@makeglossary\@gobble \let\makeglossaries\relax \@disable@onlypremakeg \let\gls@checkseeallowed\relax @@ -5393,6 +5492,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% }% \fi \@glo@check@sortallowed\makeglossaries + }% } \@onlypreamble{\makeglossaries} \AtEndDocument{% @@ -5400,6 +5500,8 @@ false,nolabel,autolabel,nameref}[nolabel]{% \warn@noprintglossary } \newcommand*{\makenoidxglossaries}{% + \@domakeglossaries + {% \renewcommand{\@gls@noref@warn}[1]{% \GlossariesWarning{Empty glossary for \string\printnoidxglossary[type={##1}]. @@ -5509,6 +5611,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \let\@@gls@nosanitizesort\@@gls@noidx@nosanitizesort \@gls@noidx@setsanitizesort \@glo@check@sortallowed\makenoidxglossaries + }% } \@onlypreamble{\makenoidxglossaries} \newcommand*{\glsnumberlistloop}[2]{% @@ -5792,13 +5895,13 @@ you \def\@@gls@fixbraces#1[#2]#3\@end@fixbraces{% \def#1{[#2]{#3}}% } -\DeclareRobustCommand*{\glssee}[3][\seename]{% +\newrobustcmd*{\glssee}[3][\seename]{% \@do@seeglossary{#2}{[#1]{#3}}} \newcommand*{\@glssee}[3][\seename]{% \glssee[#1]{#3}{#2}} -\DeclareRobustCommand*{\glsseeformat}[3][\seename]{% +\newrobustcmd*{\glsseeformat}[3][\seename]{% \emph{#1} \glsseelist{#2}} -\DeclareRobustCommand*{\glsseelist}[1]{% +\newrobustcmd*{\glsseelist}[1]{% \let\@gls@dolast\relax \let\@gls@donext\relax \@for\@gls@thislabel:=#1\do{% @@ -5814,7 +5917,7 @@ you } \newcommand*{\glsseelastsep}{\space\andname\space} \newcommand*{\glsseesep}{, } -\DeclareRobustCommand*{\glsseeitem}[1]{\glshyperlink[\glsseeitemformat{#1}]{#1}} +\newrobustcmd*{\glsseeitem}[1]{\glshyperlink[\glsseeitemformat{#1}]{#1}} \newcommand*{\glsseeitemformat}[1]{\glsentrytext{#1}} \newcommand*{\gls@save@numberlist}[1]{% \ifglssavenumberlist diff --git a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty index 4765f418963..5ccf51872c1 100644 --- a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty +++ b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossaries-accsupp.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-accsupp}[2019/12/06 v4.44 (NLCT) +\ProvidesPackage{glossaries-accsupp}[2020/02/13 v4.45 (NLCT) Experimental glossaries accessibility] \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}} \ProcessOptions @@ -82,7 +82,20 @@ \@do@subglossentry } \RequirePackage{glossaries} -\RequirePackage{accsupp} +\providecommand{\gls@accsupp@engine}{accsupp} +\providecommand{\gls@accessibility}[4]{#4} +\ifdefstring\gls@accsupp@engine{accsupp} +{ + \RequirePackage{accsupp} + \renewcommand{\gls@accessibility}[4]{% + \BeginAccSupp{#1,#2={#3}}#4\EndAccSupp{}% + } +} +{} +\newcommand{\glsaccessibility}[4][]{% + \@glsshowaccsupp{#1}{#2}{#3}% + \gls@accessibility{#1}{#2}{#3}{#4}% +} \define@key{glossentry}{access}{% \def\@glo@access{#1}% } @@ -122,6 +135,24 @@ \define@key{glossentry}{longpluralaccess}{% \def\@glo@longpluralaccess{#1}% } +\define@key{glossentry}{user1access}{% + \def\@glo@useriaccess{#1}% +} +\define@key{glossentry}{user2access}{% + \def\@glo@useriiaccess{#1}% +} +\define@key{glossentry}{user3access}{% + \def\@glo@useriiiaccess{#1}% +} +\define@key{glossentry}{user4access}{% + \def\@glo@userivaccess{#1}% +} +\define@key{glossentry}{user5access}{% + \def\@glo@uservaccess{#1}% +} +\define@key{glossentry}{user6access}{% + \def\@glo@userviaccess{#1}% +} \appto\@gls@keymap{,% {access}{access},% {textaccess}{textaccess},% @@ -135,13 +166,19 @@ {shortaccess}{shortaccess},% {shortpluralaccess}{shortpluralaccess},% {longaccess}{longaccess},% - {longpluralaccess}{longpluralaccess}% + {longpluralaccess}{longpluralaccess},% + {user1access}{useriaccess},% + {user2access}{useriiaccess},% + {user3access}{useriiiaccess},% + {user4access}{userivaccess},% + {user5access}{uservaccess},% + {user6access}{userviaccess}% } \def\@gls@noaccess{\relax} \let\@gls@oldnewglossaryentryprehook\@newglossaryentryprehook \renewcommand*{\@newglossaryentryprehook}{% \@gls@oldnewglossaryentryprehook - \def\@glo@access{\@glo@symbol}% + \def\@glo@access{\relax}% \def\@glo@textaccess{\@glo@access}% \def\@glo@firstaccess{\@glo@access}% \def\@glo@pluralaccess{\@glo@textaccess}% @@ -154,6 +191,12 @@ \def\@glo@shortpluralaccess{\@glo@shortaccess}% \def\@glo@longaccess{\relax}% \def\@glo@longpluralaccess{\@glo@longaccess}% + \def\@glo@useriaccess{\relax}% + \def\@glo@useriiaccess{\relax}% + \def\@glo@useriiiaccess{\relax}% + \def\@glo@userivaccess{\relax}% + \def\@glo@uservaccess{\relax}% + \def\@glo@userviaccess{\relax}% } \let\@gls@oldnewglossaryentryposthook\@newglossaryentryposthook \renewcommand*{\@newglossaryentryposthook}{% @@ -197,6 +240,24 @@ \expandafter \protected@xdef\csname glo@\@glo@label @longpluralaccess\endcsname{% \@glo@longpluralaccess}% + \expandafter + \protected@xdef\csname glo@\@glo@label @useriaccess\endcsname{% + \@glo@useriaccess}% + \expandafter + \protected@xdef\csname glo@\@glo@label @useriiaccess\endcsname{% + \@glo@useriiaccess}% + \expandafter + \protected@xdef\csname glo@\@glo@label @useriiiaccess\endcsname{% + \@glo@useriiiaccess}% + \expandafter + \protected@xdef\csname glo@\@glo@label @userivaccess\endcsname{% + \@glo@userivaccess}% + \expandafter + \protected@xdef\csname glo@\@glo@label @uservaccess\endcsname{% + \@glo@uservaccess}% + \expandafter + \protected@xdef\csname glo@\@glo@label @userviaccess\endcsname{% + \@glo@userviaccess}% } \newcommand*{\glsentryaccess}[1]{% \@gls@entry@field{#1}{access}% @@ -211,7 +272,7 @@ \@gls@entry@field{#1}{pluralaccess}% } \newcommand*{\glsentryfirstpluralaccess}[1]{% - \csname glo@#1@firstpluralaccess\endcsname + \@gls@entry@field{#1}{firstpluralaccess}% } \newcommand*{\glsentrysymbolaccess}[1]{% \@gls@entry@field{#1}{symbolaccess}% @@ -223,7 +284,7 @@ \@gls@entry@field{#1}{descaccess}% } \newcommand*{\glsentrydescpluralaccess}[1]{% - \@gls@entry@field{#1}{descaccess}% + \@gls@entry@field{#1}{descpluralaccess}% } \newcommand*{\glsentryshortaccess}[1]{% \@gls@entry@field{#1}{shortaccess}% @@ -237,9 +298,52 @@ \newcommand*{\glsentrylongpluralaccess}[1]{% \@gls@entry@field{#1}{longpluralaccess}% } -\newcommand*{\glsaccsupp}[2]{% - \BeginAccSupp{ActualText={#1}}#2\EndAccSupp{}% +\newcommand*{\glsentryuseriaccess}[1]{% + \@gls@entry@field{#1}{useriaccess}% +} +\newcommand*{\glsentryuseriiaccess}[1]{% + \@gls@entry@field{#1}{useriiaccess}% +} +\newcommand*{\glsentryuseriiiaccess}[1]{% + \@gls@entry@field{#1}{useriiiaccess}% } +\newcommand*{\glsentryuserivaccess}[1]{% + \@gls@entry@field{#1}{userivaccess}% +} +\newcommand*{\glsentryuservaccess}[1]{% + \@gls@entry@field{#1}{uservaccess}% +} +\newcommand*{\glsentryuserviaccess}[1]{% + \@gls@entry@field{#1}{userviaccess}% +} +\newcommand{\glsfieldaccsupp}[4]{% + \ifdef\glscategory + {% + \ifcsdef{glsxtr\glscategory{#4}#3accsupp}% + {\csname glsxtr\glscategory{#4}#3accsupp\endcsname{#1}{#2}}% + {% + \ifcsdef{glsxtr\glscategory{#4}accsupp}% + {\csname glsxtr\glscategory{#4}accsupp\endcsname{#1}{#2}}% + {% + \ifcsdef{gls#3accsupp}% + {\csname gls#3accsupp\endcsname{#1}{#2}}% + {\glsaccsupp{#1}{#2}}% + }% + }% + }% + {% + \ifcsdef{gls#3accsupp}% + {\csname gls#3accsupp\endcsname{#1}{#2}}% + {\glsaccsupp{#1}{#2}}% + }% +} +\newcommand{\xglsfieldaccsupp}[1]{% + \protected@edef\@gls@replacementtext{#1}% + \expandafter\glsfieldaccsupp\expandafter{\@gls@replacementtext}% +} +\newcommand*{\glsshortaccsupp}[2]{\glsaccessibility{E}{#1}{#2}} +\newcommand*{\glsshortplaccsupp}{\glsshortaccsupp} +\newcommand*{\glsaccsupp}[2]{\glsaccessibility{ActualText}{#1}{#2}} \newcommand*{\xglsaccsupp}[2]{% \protected@edef\@gls@replacementtext{#1}% \expandafter\glsaccsupp\expandafter{\@gls@replacementtext}{#2}% @@ -252,47 +356,109 @@ \xglsaccsupp{\@glo@access}{#1}% \fi } -\DeclareRobustCommand*{\glsnameaccessdisplay}[2]{% - \@gls@access@display{#1}{\glsentryaccess{#2}}% -} -\DeclareRobustCommand*{\glstextaccessdisplay}[2]{% - \@gls@access@display{#1}{\glsentrytextaccess{#2}}% -} -\DeclareRobustCommand*{\glspluralaccessdisplay}[2]{% - \@gls@access@display{#1}{\glsentrypluralaccess{#2}}% -} -\DeclareRobustCommand*{\glsfirstaccessdisplay}[2]{% - \@gls@access@display{#1}{\glsentryfirstaccess{#2}}% -} -\DeclareRobustCommand*{\glsfirstpluralaccessdisplay}[2]{% - \@gls@access@display{#1}{\glsentryfirstpluralaccess{#2}}% -} -\DeclareRobustCommand*{\glssymbolaccessdisplay}[2]{% - \@gls@access@display{#1}{\glsentrysymbolaccess{#2}}% -} -\DeclareRobustCommand*{\glssymbolpluralaccessdisplay}[2]{% - \@gls@access@display{#1}{\glsentrysymbolpluralaccess{#2}}% -} -\DeclareRobustCommand*{\glsdescriptionaccessdisplay}[2]{% - \@gls@access@display{#1}{\glsentrydescaccess{#2}}% -} -\DeclareRobustCommand*{\glsdescriptionpluralaccessdisplay}[2]{% - \@gls@access@display{#1}{\glsentrydescpluralaccess{#2}}% -} -\DeclareRobustCommand*{\glsshortaccessdisplay}[2]{% - \@gls@access@display{#1}{\glsentryshortaccess{#2}}% -} -\DeclareRobustCommand*{\glsshortpluralaccessdisplay}[2]{% - \@gls@access@display{#1}{\glsentryshortpluralaccess{#2}}% -} -\DeclareRobustCommand*{\glslongaccessdisplay}[2]{% - \@gls@access@display{#1}{\glsentrylongaccess{#2}}% -} -\DeclareRobustCommand*{\glslongpluralaccessdisplay}[2]{% - \@gls@access@display{#1}{\glsentrylongpluralaccess{#2}}% -} -\DeclareRobustCommand*{\glsaccessdisplay}[3]{% - \@ifundefined{gls#1accessdisplay}% +\newcommand*{\@gls@fieldaccess@display}[4]{% + \protected@edef\@glo@access{#4}% + \ifdefequal\@glo@access\@gls@noaccess + {#3}% + {\expandafter\glsfieldaccsupp\expandafter{\@glo@access}{#3}{#2}{#1}}% +} +\newrobustcmd*{\glsnameaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@access}% + {#1}% + {\@gls@fieldaccess@display{#2}{name}{#1}{\glsentryaccess{#2}}}% +} +\newrobustcmd*{\glstextaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@textaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{text}{#1}{\glsentrytextaccess{#2}}}% +} +\newrobustcmd*{\glspluralaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@pluralaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{plural}{#1}{\glsentrypluralaccess{#2}}}% +} +\newrobustcmd*{\glsfirstaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@firstaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{first}{#1}{\glsentryfirstaccess{#2}}}% +} +\newrobustcmd*{\glsfirstpluralaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@firstpluralaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{firstpl}{#1}{\glsentryfirstpluralaccess{#2}}}% +} +\newrobustcmd*{\glssymbolaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@symbolaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{symbol}{#1}{\glsentrysymbolaccess{#2}}}% +} +\newrobustcmd*{\glssymbolpluralaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@symbolpluralaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{symbolplural}{#1}{\glsentrysymbolpluralaccess{#2}}}% +} +\newrobustcmd*{\glsdescriptionaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@descaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{desc}{#1}{\glsentrydescaccess{#2}}}% +} +\newrobustcmd*{\glsdescriptionpluralaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@descpluralaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{descplural}{#1}{\glsentrydescpluralaccess{#2}}}% +} +\newrobustcmd*{\glsshortaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@shortaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{short}{#1}{\glsentryshortaccess{#2}}}% +} +\newrobustcmd*{\glsshortpluralaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@shortpluralaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{shortpl}{#1}{\glsentryshortpluralaccess{#2}}}% +} +\newrobustcmd*{\glslongaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@longaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{long}{#1}{\glsentrylongaccess{#2}}}% +} +\newrobustcmd*{\glslongpluralaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@longpluralaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{longpl}{#1}{\glsentrylongpluralaccess{#2}}}% +} +\newrobustcmd*{\glsuseriaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@useriaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{useri}{#1}{\glsentryuseriaccess{#2}}}% +} +\newrobustcmd*{\glsuseriiaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@useriiaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{userii}{#1}{\glsentryuseriiaccess{#2}}}% +} +\newrobustcmd*{\glsuseriiiaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@useriiiaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{useriii}{#1}{\glsentryuseriiiaccess{#2}}}% +} +\newrobustcmd*{\glsuserivaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@userivaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{useriv}{#1}{\glsentryuserivaccess{#2}}}% +} +\newrobustcmd*{\glsuservaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@uservaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{userv}{#1}{\glsentryuservaccess{#2}}}% +} +\newrobustcmd*{\glsuserviaccessdisplay}[2]{% + \ifcsundef{glo@\glsdetoklabel{#2}@userviaccess}% + {#1}% + {\@gls@fieldaccess@display{#2}{uservi}{#1}{\glsentryuserviaccess{#2}}}% +} +\newrobustcmd*{\glsaccessdisplay}[3]{% + \ifcsundef{gls#1accessdisplay}% {% \PackageError{glossaries-accsupp}{No accessibility support for key `#1'}{}% @@ -739,6 +905,171 @@ }% \glspostlinkhook } +\def\@glstext@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glstextaccessdisplay{\glsentrytext{#2}}{#2}#3}% +} +\def\@Glstext@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glstextaccessdisplay{\Glsentrytext{#2}}{#2}#3}% +} +\def\@GLStext@#1#2[#3]{% + \@gls@field@link{#1}{#2}% + {\glstextaccessdisplay{\mfirstucMakeUppercase{\glsentrytext{#2}}}{#2}% + \mfirstucMakeUppercase{#3}}% +} +\def\@glsfirst@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsfirstaccessdisplay{\glsentryfirst{#2}}{#2}#3}% +} +\def\@Glsfirst@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsfirstaccessdisplay{\Glsentryfirst{#2}}{#2}#3}% +} +\def\@GLSfirst@#1#2[#3]{% + \@gls@field@link{#1}{#2}% + {\glsfirstaccessdisplay{\mfirstucMakeUppercase{\glsentryfirst{#2}}}{#2}% + \mfirstucMakeUppercase{#3}}% +} +\def\@glsplural@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glspluralaccessdisplay{\glsentryplural{#2}}{#2}#3}% +} +\def\@Glsplural@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glspluralaccessdisplay{\Glsentryplural{#2}}{#2}#3}% +} +\def\@GLSplural@#1#2[#3]{% + \@gls@field@link{#1}{#2}% + {\glspluralaccessdisplay{\mfirstucMakeUppercase{\glsentryplural{#2}}}{#2}% + \mfirstucMakeUppercase{#3}}% +} +\def\@glsfirstplural@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsfirstpluralaccessdisplay{\glsentryfirstplural{#2}}{#2}#3}% +} +\def\@glsfirstplural@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsfirstpluralaccessdisplay{\Glsentryfirstplural{#2}}{#2}#3}% +} +\def\@GLSfirstplural@#1#2[#3]{% + \@gls@field@link{#1}{#2}% + {\glsfirstpluralaccessdisplay{\mfirstucMakeUppercase{\glsentryfirstplural{#2}}}{#2}% + \mfirstucMakeUppercase{#3}}% +} +\def\@glsname@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsnameaccessdisplay{\glsentryname{#2}}{#2}#3}% +} +\def\@Glsname@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsnameaccessdisplay{\Glsentryname{#2}}{#2}#3}% +} +\def\@GLSname@#1#2[#3]{% + \@gls@field@link{#1}{#2}% + {\glsnameaccessdisplay{\mfirstucMakeUppercase{\glsentryname{#2}}}{#2}% + \mfirstucMakeUppercase{#3}}% +} +\def\@glsdesc@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}#3}% +} +\def\@Glsdesc@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsdescriptionaccessdisplay{\Glsentrydesc{#2}}{#2}#3}% +} +\def\@GLSdesc@#1#2[#3]{% + \@gls@field@link{#1}{#2}% + {\glsdescriptionaccessdisplay{\mfirstucMakeUppercase{\glsentrydesc{#2}}}{#2}% + \mfirstucMakeUppercase{#3}}% +} +\def\@glsdescplural@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}#3}% +} +\def\@Glsdescplural@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsdescriptionpluralaccessdisplay{\Glsentrydescplural{#2}}{#2}#3}% +} +\def\@GLSdescplural@#1#2[#3]{% + \@gls@field@link{#1}{#2}% + {\glsdescriptionpluralaccessdisplay{\mfirstucMakeUppercase{\glsentrydescplural{#2}}}{#2}% + \mfirstucMakeUppercase{#3}}% +} +\def\@glssymbol@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}#3}% +} +\def\@Glssymbol@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glssymbolaccessdisplay{\Glsentrysymbol{#2}}{#2}#3}% +} +\def\@GLSsymbol@#1#2[#3]{% + \@gls@field@link{#1}{#2}% + {\glssymbolaccessdisplay{\mfirstucMakeUppercase{\glsentrysymbol{#2}}}{#2}% + \mfirstucMakeUppercase{#3}}% +} +\def\@glssymbolplural@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}#3}% +} +\def\@Glssymbolplural@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glssymbolpluralaccessdisplay{\Glsentrysymbolplural{#2}}{#2}#3}% +} +\def\@GLSsymbolplural@#1#2[#3]{% + \@gls@field@link{#1}{#2}% + {\glssymbolpluralaccessdisplay{\mfirstucMakeUppercase{\glsentrysymbolplural{#2}}}{#2}% + \mfirstucMakeUppercase{#3}}% +} +\def\@glsuseri@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsuseriaccessdisplay{\glsentryuseri{#2}}{#2}#3}% +} +\def\@Glsuser@i#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsuseriaccessdisplay{\Glsentryuseri{#2}}{#2}#3}% +} +\def\@GLSuseri@#1#2[#3]{% + \@gls@field@link{#1}{#2}% + {\glsuseriaccessdisplay{\mfirstucMakeUppercase{\glsentryuseri{#2}}}{#2}% + \mfirstucMakeUppercase{#3}}% +} +\def\@glsuserii@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsuseriiaccessdisplay{\glsentryuserii{#2}}{#2}#3}% +} +\def\@Glsuser@i#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsuseriiaccessdisplay{\Glsentryuserii{#2}}{#2}#3}% +} +\def\@GLSuserii@#1#2[#3]{% + \@gls@field@link{#1}{#2}% + {\glsuseriiaccessdisplay{\mfirstucMakeUppercase{\glsentryuserii{#2}}}{#2}% + \mfirstucMakeUppercase{#3}}% +} +\def\@glsuseriii@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsuseriiiaccessdisplay{\glsentryuseriii{#2}}{#2}#3}% +} +\def\@Glsuser@i#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsuseriiiaccessdisplay{\Glsentryuseriii{#2}}{#2}#3}% +} +\def\@GLSuseriii@#1#2[#3]{% + \@gls@field@link{#1}{#2}% + {\glsuseriiiaccessdisplay{\mfirstucMakeUppercase{\glsentryuseriii{#2}}}{#2}% + \mfirstucMakeUppercase{#3}}% +} +\def\@glsuseriv@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsuserivaccessdisplay{\glsentryuseriv{#2}}{#2}#3}% +} +\def\@Glsuser@i#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsuserivaccessdisplay{\Glsentryuseriv{#2}}{#2}#3}% +} +\def\@GLSuseriv@#1#2[#3]{% + \@gls@field@link{#1}{#2}% + {\glsuserivaccessdisplay{\mfirstucMakeUppercase{\glsentryuseriv{#2}}}{#2}% + \mfirstucMakeUppercase{#3}}% +} +\def\@glsuserv@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsuservaccessdisplay{\glsentryuserv{#2}}{#2}#3}% +} +\def\@Glsuser@i#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsuservaccessdisplay{\Glsentryuserv{#2}}{#2}#3}% +} +\def\@GLSuserv@#1#2[#3]{% + \@gls@field@link{#1}{#2}% + {\glsuservaccessdisplay{\mfirstucMakeUppercase{\glsentryuserv{#2}}}{#2}% + \mfirstucMakeUppercase{#3}}% +} +\def\@glsuservi@#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsuserviaccessdisplay{\glsentryuservi{#2}}{#2}#3}% +} +\def\@Glsuser@i#1#2[#3]{% + \@gls@field@link{#1}{#2}{\glsuserviaccessdisplay{\Glsentryuservi{#2}}{#2}#3}% +} +\def\@GLSuservi@#1#2[#3]{% + \@gls@field@link{#1}{#2}% + {\glsuserviaccessdisplay{\mfirstucMakeUppercase{\glsentryuservi{#2}}}{#2}% + \mfirstucMakeUppercase{#3}}% +} \renewcommand*{\glossentryname}[1]{% \glsdoifexists{#1}% {% @@ -1172,8 +1503,11 @@ \glslongaccessdisplay{\glsentrylong{##1}}{##1}\space (\glsshortaccessdisplay{\acronymfont{\glsentryshort{##1}}}{##1})}% } +\newcommand*{\glsdefaultshortaccess}[2]{#1} \renewcommand*{\newacronymhook}{% - \edef\@gls@keylist{shortaccess=\the\glslongtok,% + \edef\@gls@keylist{% + shortaccess={\glsdefaultshortaccess{\the\glslongtok}{\the\glsshorttok}},% + shortpluralaccess={\glsdefaultshortaccess{\the\glslongtok}{\the\glsshorttok}},% \the\glskeylisttok}% \expandafter\glskeylisttok\expandafter{\@gls@keylist}% } @@ -1190,7 +1524,7 @@ sort={\the\glsshorttok},% short={\the\glsshorttok},% shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},% - shortaccess={\the\glslongtok},% + shortaccess={\glsdefaultshortaccess{\the\glslongtok}{\the\glsshorttok}},% long={\the\glslongtok},% longplural={\the\glslongtok\noexpand\acrpluralsuffix},% descriptionplural={\the\glslongtok\noexpand\acrpluralsuffix},% @@ -1236,7 +1570,7 @@ text={\the\glsshorttok},% short={\the\glsshorttok},% shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},% - shortaccess={\the\glslongtok},% + shortaccess={\glsdefaultshortaccess{\the\glslongtok}{\the\glsshorttok}},% long={\the\glslongtok},% longplural={\the\glslongtok\noexpand\acrpluralsuffix},% access={\noexpand\@glo@textaccess},% @@ -1276,7 +1610,7 @@ sort={\the\glsshorttok},% short={\the\glsshorttok},% shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},% - shortaccess={\the\glslongtok},% + shortaccess={\glsdefaultshortaccess{\the\glslongtok}{\the\glsshorttok}},% long={\the\glslongtok},% longplural={\the\glslongtok\noexpand\acrpluralsuffix},% first={\the\glslongtok},% @@ -1356,7 +1690,7 @@ sort={\the\glsshorttok},% short={\the\glsshorttok},% shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},% - shortaccess={\the\glslongtok},% + shortaccess={\glsdefaultshortaccess{\the\glslongtok}{\the\glsshorttok}},% long={\the\glslongtok},% longplural={\the\glslongtok\noexpand\acrpluralsuffix},% text={\noexpand\@glo@short},% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty index 89fadde0732..aebdb238d1d 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossary-hypernav.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-hypernav}[2019/12/06 v4.44 (NLCT)] +\ProvidesPackage{glossary-hypernav}[2020/02/13 v4.45 (NLCT)] \newcommand*{\glsnavhyperlink}[3][\@glo@type]{% \edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}% \@glslink{\glsnavhyperlinkname{#1}{#2}}{#3}} diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty index 92a00f2d214..badcd235eff 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossary-inline.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-inline}[2019/12/06 v4.44 (NLCT)] +\ProvidesPackage{glossary-inline}[2020/02/13 v4.45 (NLCT)] \newglossarystyle{inline}{% \renewenvironment{theglossary}% {% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty index 42eb9f641c6..65fe13e9f5b 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossary-list.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-list}[2019/12/06 v4.44 (NLCT)] +\ProvidesPackage{glossary-list}[2020/02/13 v4.45 (NLCT)] \providecommand{\indexspace}{% \par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax } diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty index fd4b63f1313..ede9200f62a 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossary-long.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-long}[2019/12/06 v4.44 (NLCT)] +\ProvidesPackage{glossary-long}[2020/02/13 v4.45 (NLCT)] \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty index aa12eea602c..80f718310e9 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossary-longbooktabs.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-longbooktabs}[2019/12/06 v4.44 (NLCT)] +\ProvidesPackage{glossary-longbooktabs}[2020/02/13 v4.45 (NLCT)] \RequirePackage{booktabs} \RequirePackage{glossary-long} \RequirePackage{glossary-longragged} diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty index b0c317d530a..93100064b96 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossary-longragged.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-longragged}[2019/12/06 v4.44 (NLCT)] +\ProvidesPackage{glossary-longragged}[2020/02/13 v4.45 (NLCT)] \RequirePackage{array} \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty index 5de174d6f11..06e10d3d89c 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossary-mcols.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-mcols}[2019/12/06 v4.44 (NLCT)] +\ProvidesPackage{glossary-mcols}[2020/02/13 v4.45 (NLCT)] \RequirePackage{multicol} \RequirePackage{glossary-tree} \providecommand{\indexspace}{% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty index 2344cc084a9..41c9c4760b3 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossary-super.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-super}[2019/12/06 v4.44 (NLCT)] +\ProvidesPackage{glossary-super}[2020/02/13 v4.45 (NLCT)] \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty index 6388faf843b..885c2fb102f 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossary-superragged.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-superragged}[2019/12/06 v4.44 (NLCT)] +\ProvidesPackage{glossary-superragged}[2020/02/13 v4.45 (NLCT)] \RequirePackage{array} \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty index 5f27ad4dbf4..c07c54dc1f4 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossary-tree.sty,package') %% %% glossaries.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-tree}[2019/12/06 v4.44 (NLCT)] +\ProvidesPackage{glossary-tree}[2020/02/13 v4.45 (NLCT)] \providecommand{\indexspace}{% \par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax } diff --git a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-acronym-desc.tex b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-acronym-desc.tex index 4370863f6d4..67e553ca360 100644 --- a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-acronym-desc.tex +++ b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-acronym-desc.tex @@ -1,5 +1,5 @@ - % This file is part of the glossaries bundle - % These are test acronym entries with descriptions. +% This file is part of the glossaries bundle +% These are test acronym entries with descriptions. \newacronym[type=\glsdefaulttype,description={fringilla a, euismod sodales, sollicitudin vel, wisi}]{ndl}{NDL}{nam dui ligula} diff --git a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-acronym.tex b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-acronym.tex index 331c07fa623..8d5b6c5fba9 100644 --- a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-acronym.tex +++ b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-acronym.tex @@ -1,5 +1,5 @@ - % This file is part of the glossaries bundle - % These are test acronym entries +% This file is part of the glossaries bundle +% These are test acronym entries \newacronym[type=\glsdefaulttype]{lid}{LID}{lorem ipsum dolor} diff --git a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-acronyms-lang.tex b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-acronyms-lang.tex index 9b3192ebbf5..fd787a0ae8c 100644 --- a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-acronyms-lang.tex +++ b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-acronyms-lang.tex @@ -1,6 +1,6 @@ - % This file is part of the glossaries bundle - % These are test acronym entries where some are provided with - % "translations", which are stored in the user1 key. +% This file is part of the glossaries bundle +% These are test acronym entries where some are provided with +% "translations", which are stored in the user1 key. \newacronym[type=\glsdefaulttype,user1={love itself}]{li}{LI}{lorem ipsum} diff --git a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-brief.tex b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-brief.tex index 892d3edd30d..fbf2d47059e 100644 --- a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-brief.tex +++ b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-brief.tex @@ -1,5 +1,5 @@ - % This file is part of the glossaries bundle - % These are test glossary entries with brief descriptions. +% This file is part of the glossaries bundle +% These are test glossary entries with brief descriptions. \newglossaryentry{lorem}{name={lorem},description={ipsum}} diff --git a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-childnoname.tex b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-childnoname.tex index 53a9885d368..8c30c3e8832 100644 --- a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-childnoname.tex +++ b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-childnoname.tex @@ -1,6 +1,6 @@ - % This file is part of the glossaries bundle - % These are test glossary entries with child entries that don't have - % a name supplied. (The name is the same as the parent name.) +% This file is part of the glossaries bundle +% These are test glossary entries with child entries that don't have +% a name supplied. (The name is the same as the parent name.) \newglossaryentry{scelerisque}{name={scelerisque},description={at}} diff --git a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-cite.tex b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-cite.tex index f41e5d8cb30..be14677d049 100644 --- a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-cite.tex +++ b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-cite.tex @@ -1,7 +1,7 @@ - % This file is part of the glossaries bundle - % These are test glossary entries with citation labels stored in - % the user1 field. (The citations are defined in the xampl.bib file - % that should be available on modern TeX distributions.) +% This file is part of the glossaries bundle +% These are test glossary entries with citation labels stored in +% the user1 field. (The citations are defined in the xampl.bib file +% that should be available on modern TeX distributions.) \newglossaryentry{fusce}{name={fusce}, description={suscipit cursus sem},user1={article-minimal}} diff --git a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-images.tex b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-images.tex index 865f835e331..c7fc6d676e6 100644 --- a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-images.tex +++ b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-images.tex @@ -1,7 +1,7 @@ - % This file is part of the glossaries bundle - % These are test glossary entries with multi-paragraph descriptions - % that have an associated image file (stored in user1). - % The referenced image files are provided by the mwe package. +% This file is part of the glossaries bundle +% These are test glossary entries with multi-paragraph descriptions +% that have an associated image file (stored in user1). +% The referenced image files are provided by the mwe package. \longnewglossaryentry{sedfeugiat}{name={sed feugiat},user1={example-image}}% {% diff --git a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-long.tex b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-long.tex index 8be8e2cd6b8..98472be2bb9 100644 --- a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-long.tex +++ b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-long.tex @@ -1,5 +1,5 @@ - % This file is part of the glossaries bundle - % These are test glossary entries with long descriptions. +% This file is part of the glossaries bundle +% These are test glossary entries with long descriptions. \newglossaryentry{loremipsum}{name={lorem ipsum}, description={dolor sit amet, consectetuer adipiscing elit. Ut purus diff --git a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-multipar.tex b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-multipar.tex index f80aabaa4e0..9c4f1e2774a 100644 --- a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-multipar.tex +++ b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-multipar.tex @@ -1,5 +1,5 @@ - % This file is part of the glossaries bundle - % These are test glossary entries with multi-paragraph descriptions. +% This file is part of the glossaries bundle +% These are test glossary entries with multi-paragraph descriptions. \longnewglossaryentry{loremi-ii}{name={lorem 1--2}}% {% diff --git a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-parent.tex b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-parent.tex index b87b5b06609..aa72064842c 100644 --- a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-parent.tex +++ b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-parent.tex @@ -1,5 +1,5 @@ - % This file is part of the glossaries bundle - % These are test glossary entries with child entries. +% This file is part of the glossaries bundle +% These are test glossary entries with child entries. \newglossaryentry{sedmattis}{name={sed mattis},description={erat sit amet}} diff --git a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-symbolnames.tex b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-symbolnames.tex index f7265bc609c..81f6219f6a6 100644 --- a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-symbolnames.tex +++ b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-symbolnames.tex @@ -1,5 +1,5 @@ - % This file is part of the glossaries bundle - % These are test glossary entries with associated symbols. +% This file is part of the glossaries bundle +% These are test glossary entries with associated symbols. \newglossaryentry{sym.alpha}{sort={alpha},name={\ensuremath{\alpha}}, description={Quisque ullamcorper placerat ipsum.}} diff --git a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-symbols.tex b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-symbols.tex index 321f63dd578..da8999b5645 100644 --- a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-symbols.tex +++ b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-symbols.tex @@ -1,5 +1,5 @@ - % This file is part of the glossaries bundle - % These are test glossary entries with associated symbols. +% This file is part of the glossaries bundle +% These are test glossary entries with associated symbols. \newglossaryentry{alpha}{name={alpha},symbol={\ensuremath{\alpha}}, description={Quisque ullamcorper placerat ipsum.}} diff --git a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-url.tex b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-url.tex index ee82b7d2f7b..2181cedb598 100644 --- a/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-url.tex +++ b/Master/texmf-dist/tex/latex/glossaries/test-entries/example-glossaries-url.tex @@ -1,6 +1,6 @@ - % This file is part of the glossaries bundle - % These are test glossary entries with URLs stored in - % the user1 field. +% This file is part of the glossaries bundle +% These are test glossary entries with URLs stored in +% the user1 field. \newglossaryentry{aenean-url}{name={aenean}, description={adipiscing auctor est}, -- cgit v1.2.3