diff options
author | Karl Berry <karl@freefriends.org> | 2016-04-20 21:52:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-04-20 21:52:18 +0000 |
commit | e155df94bcae899bce238a8b1bc2d6b7e7303cbb (patch) | |
tree | e300096ee2baf91633ad81125e449d3376fbd7c2 /Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty | |
parent | 55d513e3d3a10cd226794281bae3af49a4766f9d (diff) |
glossaries (20apr16)
git-svn-id: svn://tug.org/texlive/trunk@40635 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty index 71e5ff4bd5d..d50b0c384bc 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2016/01/24 v4.21 (NLCT)] +\ProvidesPackage{glossaries}[2016/04/19 v4.22 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} @@ -4297,6 +4297,21 @@ false,nolabel,autolabel,nameref}[nolabel]{% \newrobustcmd*{\Glsentryfirstplural}[1]{% \@Gls@entry@field{#1}{firstpl}% } +\newrobustcmd*{\@glsentrytitlecase}[2]{% + \glsfieldfetch{#1}{#2}{\@gls@value}% + \xcapitalisewords{\@gls@value}% +} +\ifdef\texorpdfstring +{ + \newcommand*{\glsentrytitlecase}[2]{% + \texorpdfstring + {\@glsentrytitlecase{#1}{#2}}% + {\@gls@entry@field{#1}{#2}}% + } +} +{ + \newcommand*{\glsentrytitlecase}[2]{\@glsentrytitlecase{#1}{#2}} +} \newcommand*{\glsentrytype}[1]{\@gls@entry@field{#1}{type}} \newcommand*{\glsentrysort}[1]{% \@gls@entry@field{#1}{sort}% @@ -5031,7 +5046,7 @@ you \fi } \newcommand{\gls@protected@pagefmts}{% - \gls@numberpage,\gls@alphpage,\gls@Alphpage,\gls@romanpage,\gls@Romanpage% + \gls@numberpage,\gls@alphpage,\gls@Alphpage,\gls@romanpage,\gls@Romanpage,\gls@arabicpage% } \newcommand*{\gls@disablepagerefexpansion}{% \@for\@gls@this:=\gls@protected@pagefmts\do @@ -5042,6 +5057,7 @@ you \newcommand*{\gls@alphpage}{\@alph\c@page} \newcommand*{\gls@Alphpage}{\@Alph\c@page} \newcommand*{\gls@numberpage}{\number\c@page} +\newcommand*{\gls@arabicpage}{\@arabic\c@page} \newcommand*{\gls@romanpage}{\romannumeral\c@page} \newcommand*{\gls@Romanpage}{\@Roman\c@page} \newcommand*{\glsaddprotectedpagefmt}[1]{% @@ -5061,18 +5077,25 @@ you \newcommand{\@wrglossary@pageformat}[3]{% \ifx#3\c@page #1\else #2#3\fi } +\newif\ifglswrallowprimitivemods +\glswrallowprimitivemodstrue \newcommand*{\@@do@wrglossary}[1]{% \begingroup \let\orgthe\the \let\orgnumber\number + \let\orgarabic\@arabic \let\orgromannumeral\romannumeral \let\orgalph\@alph \let\orgAlph\@Alph \let\orgRoman\@Roman - \def\the##1{% - \ifx##1\c@page \gls@numberpage\else\orgthe##1\fi}% - \def\number##1{% - \ifx##1\c@page \gls@numberpage\else\orgnumber##1\fi}% + \ifglswrallowprimitivemods + \def\the##1{% + \ifx##1\c@page \gls@numberpage\else\orgthe##1\fi}% + \def\number##1{% + \ifx##1\c@page \gls@numberpage\else\orgnumber##1\fi}% + \fi + \def\@arabic##1{% + \ifx##1\c@page \gls@arabicpage\else\orgarabic##1\fi}% \def\romannumeral##1{% \ifx##1\c@page \gls@romanpage\else\orgromannumeral##1\fi}% \def\@Roman##1{% |