glossaries-extra (3feb16)

git-svn-id: svn://tug.org/texlive/trunk@39563 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 42 insertions, 17 deletions

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 79b243129a4..953ec51a6c9 100644
--- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
+++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
@@ -1,13 +1,13 @@
 %\iffalse
 % glossaries-extra.dtx generated using makedtx version 1.1 (c) Nicola Talbot
 % Command line args:
-%   -author "Nicola Talbot"
-%   -doc "glossaries-extra-codedoc.tex"
 %   -codetitle "Main Package Code"
-%   -src "glossaries-extra.sty\Z=>glossaries-extra.sty"
+%   -doc "glossaries-extra-codedoc.tex"
 %   -section "chapter"
+%   -src "glossaries-extra.sty\Z=>glossaries-extra.sty"
+%   -author "Nicola Talbot"
 %   glossaries-extra
-% Created on 2016/1/24 16:56
+% Created on 2016/2/2 12:31
 %\fi
 %\iffalse
 %<*package>
@@ -116,7 +116,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 
 \setcounter{IndexColumns}{2}
 
-\CheckSum{6805}
+\CheckSum{6812}
 
 \newcommand*{\ifirstuse}{\iterm{first use}}
 \newcommand*{\firstuse}{\gls{firstuse}}
@@ -152,13 +152,13 @@ styles (glossaries):>#1={\protect\ttfamily#1}|main}}
  \raggedright
 }
 
-\title{glossaries-extra.sty v1.0:
+\title{glossaries-extra.sty v1.01:
  documented code}
 \author{Nicola L.C. Talbot\\[10pt]
 Dickimaw Books\\
 \url{http://www.dickimaw-books.com/}}
 
-\date{2016-01-24}
+\date{2016-02-02}
 
 \begin{document}
 \DocInput{glossaries-extra.dtx}
@@ -203,7 +203,7 @@ Dickimaw Books\\
 %\section{Package Initialisation and Options}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2016/01/24 v1.0 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2016/02/02 v1.01 (NLCT)]
 %    \end{macrocode}
 % Requires \sty{xkeyval} to define package options.
 %    \begin{macrocode}
@@ -5882,7 +5882,7 @@ want
 %    \end{macrocode}
 % Do post-name hook:
 %    \begin{macrocode}
-      \glsxtrpostnamehook{#1}%
+    \glsxtrpostnamehook{#1}%
   }
 }
 %    \end{macrocode}
@@ -6568,21 +6568,44 @@ want
 % check if the plural form was used (which typically won't end with
 % a period).
 %\changes{0.3}{2015-12-02}{added check for plural}
+%\changes{1.01}{2016-02-02}{added check for first use}
 %    \begin{macrocode}
 \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}%
 }
 %    \end{macrocode}
 %\end{macro}
@@ -8376,11 +8399,13 @@ want
 % The user must supply the description in this style. The long form
 % is added to the name. The \abbrstyle{short} style (possibly with the
 % post-description hooks set) might be a better option.
+%\changes{1.01}{2016-02-02}{fixed typo in
+%\cs{glsxtrinlinefullformat} and added missing second argument}
 %    \begin{macrocode}
 \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}},
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 989d375febe..2e34c0e9868 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.1 2016/1/24 16:56
+% glossaries-extra.ins generated using makedtx version 1.1 2016/2/2 12:31
 \input docstrip
 
 \preamble