From 9f71ce5e4a152fcf746126b48a4492176b7a2294 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 14 Nov 2017 21:08:13 +0000 Subject: mfirstuc (14nov17) git-svn-id: svn://tug.org/texlive/trunk@45803 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/mfirstuc/mfirstuc-english.sty | 2 +- Master/texmf-dist/tex/latex/mfirstuc/mfirstuc.sty | 23 ++++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex/mfirstuc') diff --git a/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc-english.sty b/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc-english.sty index 7f9a6733f04..bbf5226af48 100644 --- a/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc-english.sty +++ b/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc-english.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{mfirstuc-english}[2017/11/10 v2.05 (NLCT)] +\ProvidesPackage{mfirstuc-english}[2017/11/14 v2.06 (NLCT)] \RequirePackage{mfirstuc} \MFUnocap{a} \MFUnocap{an} diff --git a/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc.sty b/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc.sty index 545863ee944..1a8dbf3298e 100644 --- a/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc.sty +++ b/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{mfirstuc}[2017/11/10 v2.05 (NLCT)] +\ProvidesPackage{mfirstuc}[2017/11/14 v2.06 (NLCT)] \RequirePackage{etoolbox} \newif\if@glscs \newtoks\@glsmfirst @@ -79,11 +79,22 @@ \ifx\@gls@first\@empty \glsmakefirstuc{#1}% \else - \expandafter\@glsmfirst\expandafter{\@gls@first}% - \expandafter\@glsmrest\expandafter{\@gls@rest}% - \edef\@gls@domfirstuc{\noexpand\@gls@body - {\noexpand\glsmakefirstuc\the\@glsmfirst}% - \the\@glsmrest}% + \edef\@gls@tmp\expandafter{\noexpand\ \expandonce\@gls@first}% + \@onelevel@sanitize\@gls@tmp + \expandafter\@gls@checkcs\@gls@tmp\relax\relax + \if@glscs + \edef\@gls@domfirstuc{\expandonce\@gls@body + {\noexpand\makefirstuc{\expandonce\@gls@first + \expandonce\@gls@rest}% + }% + }% + \else + \expandafter\@glsmfirst\expandafter{\@gls@first}% + \expandafter\@glsmrest\expandafter{\@gls@rest}% + \edef\@gls@domfirstuc{\noexpand\@gls@body + {\noexpand\glsmakefirstuc{\the\@glsmfirst}}% + \the\@glsmrest}% + \fi \@gls@domfirstuc \fi \fi -- cgit v1.2.3