summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/glossaries.sty43
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/glossary-hypernav.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/glossary-list.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/glossary-long.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/glossary-super.sty2
5 files changed, 41 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/glossaries.sty
index 8d0023a00f3..2f89ef952ba 100644
--- a/Master/texmf-dist/tex/latex/glossaries/glossaries.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/glossaries.sty
@@ -26,8 +26,10 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
+%% lots of text omitted
+%% lots of text omitted
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2007/05/16 v1.0 (NLCT)]
+\ProvidesPackage{glossaries}[2007/05/25 v1.02 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}[2006/11/18]
\RequirePackage{xspace}
@@ -311,14 +313,37 @@ counter as its value}}{%
\@gls@checkmkidxchars\@glo@desc
\protected@edef\@glo@symbol{\csname glo@#2@symbol\endcsname}%
\@gls@checkmkidxchars\@glo@symbol
-\protected@edef\@glo@numfmt{setentrycounter{\@gls@counter}%
-\expandafter\string\csname\@glsnumberformat\endcsname}%
-\@gls@checkmkidxchars\@glo@numfmt
+\@set@glo@numformat\@glo@numfmt\@gls@counter\@glsnumberformat
\glossary[\csname glo@#2@type\endcsname]{%
\@glo@sort\@gls@actualchar
\string\glossaryentryfield{#2}{\@glo@name}{\@glo@desc
}{\@glo@symbol}\@gls@encapchar\@glo@numfmt}%
}}
+\def\@set@glo@numformat#1#2#3{%
+\expandafter\@glo@check@mkidxrangechar#3\@nil
+\protected@edef#1{\@glo@prefix setentrycounter{#2}%
+\expandafter\string\csname\@glo@suffix\endcsname}%
+\@gls@checkmkidxchars#1}
+\def\@glo@check@mkidxrangechar#1#2\@nil{%
+\if#1(\relax
+ \def\@glo@prefix{(}%
+ \if\relax#2\relax
+ \def\@glo@suffix{glsnumberformat}%
+ \else
+ \def\@glo@suffix{#2}%
+ \fi
+\else
+ \if#1)\relax
+ \def\@glo@prefix{)}%
+ \if\relax#2\relax
+ \def\@glo@suffix{glsnumberformat}%
+ \else
+ \def\@glo@suffix{#2}%
+ \fi
+ \else
+ \def\@glo@prefix{}\def\@glo@suffix{#1#2}%
+ \fi
+\fi}
\newcommand{\@gls@checkmkidxchars}[1]{%
\def\@gls@checkedmkidx{}%
\expandafter\@gls@checkquote#1\@nil""\null%
@@ -666,9 +691,7 @@ counter as its value}}{%
\@gls@checkmkidxchars\@glo@desc
\protected@edef\@glo@symbol{\csname glo@#2@symbol\endcsname}%
\@gls@checkmkidxchars\@glo@symbol
-\protected@edef\@glo@numfmt{setentrycounter{\@glo@counter}%
-\expandafter\string\csname\@glo@format\endcsname}%
-\@gls@checkmkidxchars\@glo@numfmt
+\@set@glo@numformat\@glo@numfmt\@glo@counter\@glo@format
\glossary[\csname glo@#2@type\endcsname]{%
\@glo@sort\@gls@actualchar\string\glossaryentryfield
{#2}{\@glo@name}{\@glo@desc}{\@glo@symbol}\@gls@encapchar
@@ -705,10 +728,10 @@ counter as its value}}{%
\write\istfile{postamble "\string\n\string\\end{theglossary}\string\n\string\\glossarypostamble\string\n"}
\write\istfile{group_skip "\string\\glsgroupskip\string\n"}
\write\istfile{item_0 "\string\n"}
-\write\istfile{delim_0 "\{\string\\glossaryentrynumbers\{\string\\relax"}
+\write\istfile{delim_0 "\{\string\\glossaryentrynumbers\{\string\\relax "}
\write\istfile{delim_t "\}\}"}
-\write\istfile{delim_n "\string\\delimN"}
-\write\istfile{delim_r "\string\\delimR"}
+\write\istfile{delim_n "\string\\delimN "}
+\write\istfile{delim_r "\string\\delimR "}
\write\istfile{headings_flag 1}
\write\istfile{heading_prefix "\string\\glsgroupheading\{"}
\write\istfile{heading_suffix "\}"}
diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-hypernav.sty b/Master/texmf-dist/tex/latex/glossaries/glossary-hypernav.sty
index 3b61b9c3880..eb4f96f7edc 100644
--- a/Master/texmf-dist/tex/latex/glossaries/glossary-hypernav.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/glossary-hypernav.sty
@@ -26,6 +26,8 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
+%% lots of text omitted
+%% lots of text omitted
\ProvidesPackage{glossary-hypernav}[2007/05/16 v1.0 (NLCT)]
\@ifundefined{hyperlink}{%
\newcommand*{\glsnavhyperlink}[3][]{#3}}{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty
index f175c92300f..35839fb3237 100644
--- a/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty
@@ -26,6 +26,8 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
+%% lots of text omitted
+%% lots of text omitted
\ProvidesPackage{glossary-list}[2007/05/16 v1.0 (NLCT)]
\newglossarystyle{list}{%
\renewenvironment{theglossary}{\begin{description}}{\end{description}}%
diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-long.sty b/Master/texmf-dist/tex/latex/glossaries/glossary-long.sty
index 0800c24419d..ba96cc2c677 100644
--- a/Master/texmf-dist/tex/latex/glossaries/glossary-long.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/glossary-long.sty
@@ -26,6 +26,8 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
+%% lots of text omitted
+%% lots of text omitted
\ProvidesPackage{glossary-long}[2007/05/16 v1.0 (NLCT)]
\RequirePackage{longtable}
\newlength\glsdescwidth
diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-super.sty b/Master/texmf-dist/tex/latex/glossaries/glossary-super.sty
index 95143f9be2b..2feb98d910d 100644
--- a/Master/texmf-dist/tex/latex/glossaries/glossary-super.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/glossary-super.sty
@@ -26,6 +26,8 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
+%% lots of text omitted
+%% lots of text omitted
\ProvidesPackage{glossary-super}[2007/05/16 v1.0 (NLCT)]
\RequirePackage{supertabular}
\newglossarystyle{super}{%