mfirstuc (14nov17)

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

11 files changed, 64 insertions, 31 deletions

diff --git a/Master/texmf-dist/doc/latex/mfirstuc/CHANGES b/Master/texmf-dist/doc/latex/mfirstuc/CHANGES
index b30307fe891..77f20bd2ed0 100644
--- a/Master/texmf-dist/doc/latex/mfirstuc/CHANGES
+++ b/Master/texmf-dist/doc/latex/mfirstuc/CHANGES
@@ -1,5 +1,9 @@
 mfirstuc change log:
 
+v2.06:
+
+  * \makefirstuc: added check for nested commands.
+
 v2.05:
 
   * bug fix in \@mfu@applytofirst (#1 must be grouped)
diff --git a/Master/texmf-dist/doc/latex/mfirstuc/README b/Master/texmf-dist/doc/latex/mfirstuc/README
index 05220324c03..0f406a84a8b 100644
--- a/Master/texmf-dist/doc/latex/mfirstuc/README
+++ b/Master/texmf-dist/doc/latex/mfirstuc/README
@@ -1,6 +1,6 @@
-LaTeX Package : mfirstuc v2.05
+LaTeX Package : mfirstuc v2.06
 
-Last Modified : 2017-11-10
+Last Modified : 2017-11-14
 
 Author        : Nicola Talbot
 
diff --git a/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-code.pdf b/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-code.pdf
index a6e54605db2..50469d6193c 100644
--- a/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-code.pdf
+++ b/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-code.pdf
diff --git a/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.html b/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.html
index 64449702d9e..e94be007b6a 100644
--- a/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.html
+++ b/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.html
@@ -174,7 +174,7 @@ span#textcolor1{color:#FF0000}
 >
 <!--l. 36--><p class="noindent" >
 </p><!--l. 36--><p class="noindent" ><span 
-class="cmr-17">mfirstuc.sty v2.05: uppercasing first letter</span>
+class="cmr-17">mfirstuc.sty v2.06: uppercasing first letter</span>
 </p>
 <div class="tabular"> <table id="TBL-1" class="tabular" 
 cellspacing="0" cellpadding="0"  
@@ -196,7 +196,7 @@ href="http://www.dickimaw-books.com/" class="url" ><span
 class="cmtt-12">http://www.dickimaw-books.com/</span></a></td></tr></table>
 </div>
 <!--l. 36--><p class="noindent" ><span 
-class="cmr-12">2017-11-10</span></p></div>
+class="cmr-12">2017-11-14</span></p></div>
                                                                          
 
                                                                          
diff --git a/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.pdf b/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.pdf
index 7907cd8af65..6b5940eff84 100644
--- a/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.pdf
+++ b/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.pdf
diff --git a/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.tex b/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.tex
index 8ba6ccf659c..71430da10af 100644
--- a/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.tex
+++ b/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.tex
@@ -26,13 +26,13 @@
 
 \begin{document}
 \MakeShortVerb{|}
- \title{mfirstuc.sty v2.05: 
+ \title{mfirstuc.sty v2.06: 
 uppercasing first letter}
  \author{Nicola L.C. Talbot\\[10pt]
 Dickimaw Books\\
 \url{http://www.dickimaw-books.com/}}
 
- \date{2017-11-10}
+ \date{2017-11-14}
  \maketitle
  \tableofcontents
 
diff --git a/Master/texmf-dist/doc/latex/mfirstuc/sample-mfirstuc.pdf b/Master/texmf-dist/doc/latex/mfirstuc/sample-mfirstuc.pdf
index 2e13a918678..ce43ddad2bb 100644
--- a/Master/texmf-dist/doc/latex/mfirstuc/sample-mfirstuc.pdf
+++ b/Master/texmf-dist/doc/latex/mfirstuc/sample-mfirstuc.pdf
diff --git a/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.dtx b/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.dtx
index 561b9070cb5..708531ba486 100644
--- a/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.dtx
+++ b/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.dtx
@@ -1,21 +1,21 @@
 %\iffalse
 % mfirstuc.dtx generated using makedtx version 1.2 (c) Nicola Talbot
 % Command line args:
-%   -doc "mfirstuc-codedoc.tex"
-%   -setambles ".*\.perl=>\nopreamble\nopostamble"
-%   -setambles ".*\.tex=>\nopreamble\nopostamble"
+%   -codetitle "Main Package Code"
 %   -author "Nicola Talbot"
-%   -comment ".*\.perl"
-%   -comment ".*\.tex"
 %   -macrocode ".*\.perl"
 %   -macrocode ".*\.tex"
-%   -codetitle "Main Package Code"
 %   -src "mfirstuc.sty\Z=>mfirstuc.sty"
 %   -src "mfirstuc-english.sty\Z=>mfirstuc-english.sty"
 %   -src "(sample.*\.tex)\Z=>\1"
 %   -src "(.*\.perl)\Z=>\1"
+%   -setambles ".*\.perl=>\nopreamble\nopostamble"
+%   -setambles ".*\.tex=>\nopreamble\nopostamble"
+%   -comment ".*\.perl"
+%   -comment ".*\.tex"
+%   -doc "mfirstuc-codedoc.tex"
 %   mfirstuc
-% Created on 2017/11/10 13:34
+% Created on 2017/11/14 12:21
 %\fi
 %\iffalse
 %<*package>
@@ -64,7 +64,7 @@ mfirstuc.dtx
 \setcounter{IndexColumns}{2}
 \setlength\IndexMin{100pt}
 
-\CheckSum{664}
+\CheckSum{691}
 
 \begin{document}
 \DocInput{mfirstuc.dtx}
@@ -74,12 +74,12 @@ mfirstuc.dtx
 %\MakeShortVerb{"}
 %\DeleteShortVerb{\|}
 %
-% \title{Documented Code For mfirstuc v2.05}
+% \title{Documented Code For mfirstuc v2.06}
 % \author{Nicola L.C. Talbot\\[10pt]
 %Dickimaw Books\\
 %\url{http://www.dickimaw-books.com/}}
 %
-% \date{2017-11-10}
+% \date{2017-11-14}
 % \maketitle
 %
 %\tableofcontents
@@ -111,7 +111,7 @@ mfirstuc.dtx
 %\changes{2.0}{2015/09/09}{package split from glossaries}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{mfirstuc}[2017/11/10 v2.05 (NLCT)]
+\ProvidesPackage{mfirstuc}[2017/11/14 v2.06 (NLCT)]
 %    \end{macrocode}
 % Requires \sty{etoolbox}:\changes{1.06}{2012/05/21}{now requires
 % etoolbox}
@@ -208,11 +208,29 @@ mfirstuc.dtx
         \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}%
+%    \end{macrocode}
+%\changes{2.06}{2017-11-14}{check for inner control sequence}
+%Does \cs{@gls@first} start with a control sequence?
+%    \begin{macrocode}
+           \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}%
+%    \end{macrocode}
+%\changes{2.06}{2017-11-14}{added braces to \cs{glsmakefirstuc} argument}
+%    \begin{macrocode}
+             \edef\@gls@domfirstuc{\noexpand\@gls@body
+               {\noexpand\glsmakefirstuc{\the\@glsmfirst}}%
+               \the\@glsmrest}%
+           \fi
            \@gls@domfirstuc
         \fi
       \fi
@@ -926,7 +944,7 @@ mfirstuc.dtx
 %\label{sec:code:mfirstuc-english}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{mfirstuc-english}[2017/11/10 v2.05 (NLCT)]
+\ProvidesPackage{mfirstuc-english}[2017/11/14 v2.06 (NLCT)]
 %    \end{macrocode}
 % Load \sty{mfirstuc} if not already loaded:
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.ins b/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.ins
index cb67404d04a..59773096d47 100644
--- a/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.ins
+++ b/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.ins
@@ -1,4 +1,4 @@
-% mfirstuc.ins generated using makedtx version 1.2 2017/11/10 13:34
+% mfirstuc.ins generated using makedtx version 1.2 2017/11/14 12:21
 \input docstrip
 
 \preamble
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