summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-03-11 22:16:52 +0000
committerKarl Berry <karl@freefriends.org>2014-03-11 22:16:52 +0000
commitda1cdc98ee437aab0f962bae0e48a6b02a0b27c2 (patch)
tree3bf88c625d7db84ddd04e65213a9d3d5026da58e /Master/texmf-dist/source
parent3b25faeb2fe6b2ff7384da9a80e6c535103db004 (diff)
glossaries (9mar14)
git-svn-id: svn://tug.org/texlive/trunk@33153 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.dtx22
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.ins2
2 files changed, 15 insertions, 9 deletions
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
index b924ebf41da..1593189eb98 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
@@ -28,7 +28,7 @@
% -author "Nicola Talbot"
% -codetitle "Main Package Code"
% glossaries
-% Created on 2014/3/7 17:43
+% Created on 2014/3/11 9:29
%\fi
%\iffalse
%<*package>
@@ -166,12 +166,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
%\MakeShortVerb{"}
%\DeleteShortVerb{\|}
%
-% \title{Documented Code For glossaries v4.04}
+% \title{Documented Code For glossaries v4.05}
% \author{Nicola L.C. Talbot\\[10pt]
%Dickimaw Books\\
%\url{http://www.dickimaw-books.com/}}
%
-% \date{2014-03-06}
+% \date{2014-03-11}
% \maketitle
%
%This is the documented code for the \styfmt{glossaries} package.
@@ -187,7 +187,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
%glossaries package}.
%
%\item[\url{glossaries-user.pdf}]
-%For the main user guide, read \qt{glossaries.sty v4.04:
+%For the main user guide, read \qt{glossaries.sty v4.05:
%\LaTeX2e\ Package to Assist Generating Glossaries}.
%
%\item[\url{mfirstuc-manual.pdf}]
@@ -231,7 +231,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
% This package requires \LaTeXe.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2014/03/06 v4.04 (NLCT)]
+\ProvidesPackage{glossaries}[2014/03/11 v4.05 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -31273,7 +31273,7 @@ sub do_cmd_glsnamefont{
sub do_cmd_newacronym{
local($_) = @_;
- local($label,$abbrev,$long,$opt);
+ local($label,$abbrev,$long,$opt,$shortplural,$longplural);
($opt,$pat) = &get_next_optional_argument;
@@ -31284,6 +31284,12 @@ sub do_cmd_newacronym{
$long = &missing_braces unless
(s/$next_pair_pr_rx/$long=$2;''/eo);
+ ($longplural,$opt) = &get_keyval('longplural', $opt);
+ ($shortplural,$opt) = &get_keyval('shortplural', $opt);
+
+ $longplural = $long.'s' unless ($longplural);
+ $shortplural = $abbrv.'s' unless ($shortplural);
+
local($cmd) = "\\newglossaryentry";
local($id);
$id = ++$global{'max_id'};
@@ -31299,9 +31305,9 @@ sub do_cmd_newacronym{
$id = ++$global{'max_id'};
$entry .= "first=$OP$id$CP$long ($abbrv)$OP$id$CP,";
$id = ++$global{'max_id'};
- $entry .= "plural=$OP$id$CP${abbrv}s$OP$id$CP,";
+ $entry .= "plural=$OP$id$CP$shortplural$OP$id$CP,";
$id = ++$global{'max_id'};
- $entry .= "firstplural=$OP$id$CP${long}s (${abbrv}s)$OP$id$CP";
+ $entry .= "firstplural=$OP$id$CP$longplural ($shortplural)$OP$id$CP";
$id = ++$global{'max_id'};
$cmd .= "$OP$id$CP$entry,$opt$OP$id$CP";
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
index 45f2aa64784..b1ea64244b1 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.ins
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
@@ -1,4 +1,4 @@
-% glossaries.ins generated using makedtx version 1.1 2014/3/7 17:43
+% glossaries.ins generated using makedtx version 1.1 2014/3/11 9:29
\input docstrip
\preamble