From 73767cabef196827d926d0e3adce167a57f4a4b9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 3 Feb 2016 23:01:02 +0000 Subject: glossaries-extra (3feb16) git-svn-id: svn://tug.org/texlive/trunk@39563 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/glossaries-extra/glossaries-extra.sty | 40 +++++++++++++++++----- 1 file changed, 31 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/tex') 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 fc0517ef5de..3b1643d23f4 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}[2016/01/24 v1.0 (NLCT)] +\ProvidesPackage{glossaries-extra}[2016/02/02 v1.01 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{etoolbox} \@ifpackageloaded{glossaries} @@ -2785,7 +2785,7 @@ want }% }% }% - \glsxtrpostnamehook{#1}% + \glsxtrpostnamehook{#1}% } } \@ifpackageloaded{glossaries-accsupp} @@ -3104,19 +3104,41 @@ want {}% } \newcommand*{\glsxtrdiscardperiod}[3]{% - \glsifattribute{#1}{discardperiod}{true}% + \glsxtrifwasfirstuse {% - \glsifplural + \glsifattribute{#1}{retainfirstuseperiod}{true}% + {#3}% {% - \glsifattribute{#1}{pluraldiscardperiod}{true}% - {\glsxtrifperiod{#2}{#3}}% + \glsifattribute{#1}{discardperiod}{true}% + {% + \glsifplural + {% + \glsifattribute{#1}{pluraldiscardperiod}{true}% + {\glsxtrifperiod{#2}{#3}}% + {#3}% + }% + {% + \glsxtrifperiod{#2}{#3}% + }% + }% {#3}% }% + }% + {% + \glsifattribute{#1}{discardperiod}{true}% {% - \glsxtrifperiod{#2}{#3}% + \glsifplural + {% + \glsifattribute{#1}{pluraldiscardperiod}{true}% + {\glsxtrifperiod{#2}{#3}}% + {#3}% + }% + {% + \glsxtrifperiod{#2}{#3}% + }% }% + {#3}% }% - {#3}% } \newcommand*{\glsxtrifperiod}[1]{\new@ifnextchar.{\@firstoftwo{#1}}} \newcommand*{\glsxtr@punclist}{.,:;?!} @@ -4069,7 +4091,7 @@ want \newabbreviationstyle{short-desc}% {% \renewcommand*{\CustomAbbreviationFields}{% - name={\protect\glsextrinlinefullformat{\the\glslabeltok}}, + name={\protect\glsxtrinlinefullformat{\the\glslabeltok}{}}, sort={\the\glsshorttok}, first={\protect\glsfirstabbrvfont{\the\glsshorttok}}, firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}}, -- cgit v1.2.3