mfirstuc (10nov17)

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

11 files changed, 54 insertions, 38 deletions

diff --git a/Master/texmf-dist/doc/latex/mfirstuc/CHANGES b/Master/texmf-dist/doc/latex/mfirstuc/CHANGES
index 30af7cc0c23..b30307fe891 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.05:
+
+  * bug fix in \@mfu@applytofirst (#1 must be grouped)
+
 v2.04:
 
   * bug fixes in \capitalisefmtwords and \@gls@split
diff --git a/Master/texmf-dist/doc/latex/mfirstuc/README b/Master/texmf-dist/doc/latex/mfirstuc/README
index 34fe2c97502..05220324c03 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.04
+LaTeX Package : mfirstuc v2.05
 
-Last Modified : 2016-07-31
+Last Modified : 2017-11-10
 
 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 c6b9d28275c..a6e54605db2 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 70ac173482c..64449702d9e 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.04: uppercasing first letter</span>
+class="cmr-17">mfirstuc.sty v2.05: uppercasing first letter</span>
 </p>
 <div class="tabular"> <table id="TBL-1" class="tabular" 
 cellspacing="0" cellpadding="0"  
@@ -196,12 +196,13 @@ 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">2016-07-31</span></p></div>
+class="cmr-12">2017-11-10</span></p></div>
                                                                          
 
                                                                          
    <h2 class="likechapterHead"><a 
- id="x1-1000"></a>Contents</h2> <div class="tableofcontents">
+ id="x1-1000"></a>Contents</h2>
+   <div class="tableofcontents">
    <span class="chapterToc" >1 <a 
 href="#sec:intro" id="QQ2-1-2">Introduction</a></span>
 <br />   <span class="chapterToc" >2 <a 
@@ -240,7 +241,7 @@ scoped declarations. </div>
 
                                                                          
      <div class="verbatim" id="verbatim-1">
-     \newcommand{\qt}[1]{&#8216;&#8216;#1&#8217;&#8217;}
+     \newcommand{\qt}[1]{``#1''}
 </div>
      <!--l. 60--><p class="nopar" > (or use the <span 
 class="cmss-10">csquotes </span>package). With this, the following works:
@@ -260,7 +261,7 @@ class="cmss-10">csquotes </span>package). With this, the following works:
                                                                          
 </p>
      <div class="verbatim" id="verbatim-3">
-     \makefirstuc{&#8216;&#8216;word&#8217;&#8217;}
+     \makefirstuc{``word''}
 </div>
      <!--l. 73--><p class="nopar" > fails (no case-change and double open quote becomes two single open quotes):
      <spacer type=vertical size=10><span class="obeylines-h">
@@ -1079,7 +1080,7 @@ like:
    <div class="verbatim" id="verbatim-39">
 Package&#x00A0;hyperref&#x00A0;Warning:&#x00A0;Token&#x00A0;not&#x00A0;allowed&#x00A0;in&#x00A0;a&#x00A0;PDF&#x00A0;string
 &#x00A0;<br />(PDFDocEncoding):
-&#x00A0;<br />(hyperref)&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;removing&#x00A0;&#8216;\capitalisewords&#8217;
+&#x00A0;<br />(hyperref)&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;removing&#x00A0;`\capitalisewords'
 </div>
 <!--l. 632--><p class="nopar" > </div>
 </p><!--l. 633--><p class="noindent" >
@@ -1516,7 +1517,8 @@ for further details.
 <!--l. 2--><p class="indent" >   </div>
 </p><!--l. 2--><p class="noindent" ><a 
 href="#top">Top</a></p><h2 class="likechapterHead"><a 
- id="x1-80004"></a>Index</h2>                                                                                                    <span 
+ id="x1-80004"></a>Index</h2>
+                                                                       <span 
 class="cmbx-10">C</span>
    <div class="theindex"><span class="index-item"><span class="obeylines-h"><span class="verb"><span 
 class="cmtt-10">\capitalisewords</span></span></span>&#x00A0;&#x00A0;<span 
@@ -1568,11 +1570,11 @@ class="cmtt-10">\makefirstuc</span></span></span>&#x00A0;&#x00A0;<span
 class="cmti-10">5 </span><br /></span>
 <span class="index-item"><span 
 class="cmss-10">mfirstuc </span>package&#x00A0;&#x00A0;6, 19 <br /></span>
-<span class="index-item"><span 
-class="cmss-10">mfirstuc-english </span>package&#x00A0;&#x00A0;15 <br /></span>
                                                                          
 
                                                                          
+<span class="index-item"><span 
+class="cmss-10">mfirstuc-english </span>package&#x00A0;&#x00A0;15 <br /></span>
 <span class="index-item"><span class="obeylines-h"><span class="verb"><span 
 class="cmtt-10">\MFUcapword</span></span></span>&#x00A0;&#x00A0;<span 
 class="cmti-10">8 </span><br /></span>
diff --git a/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.pdf b/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.pdf
index 02bb0409344..7907cd8af65 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 caaceb756ce..8ba6ccf659c 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.04: 
+ \title{mfirstuc.sty v2.05: 
 uppercasing first letter}
  \author{Nicola L.C. Talbot\\[10pt]
 Dickimaw Books\\
 \url{http://www.dickimaw-books.com/}}
 
- \date{2016-07-31}
+ \date{2017-11-10}
  \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 e39ab58cc34..2e13a918678 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 2c7299fba08..561b9070cb5 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.1 (c) Nicola Talbot
+% mfirstuc.dtx generated using makedtx version 1.2 (c) Nicola Talbot
 % Command line args:
 %   -doc "mfirstuc-codedoc.tex"
-%   -macrocode ".*\.perl"
-%   -macrocode ".*\.tex"
-%   -codetitle "Main Package Code"
-%   -comment ".*\.perl"
-%   -comment ".*\.tex"
 %   -setambles ".*\.perl=>\nopreamble\nopostamble"
 %   -setambles ".*\.tex=>\nopreamble\nopostamble"
 %   -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"
 %   mfirstuc
-% Created on 2016/7/31 20:20
+% Created on 2017/11/10 13:34
 %\fi
 %\iffalse
 %<*package>
@@ -38,7 +38,7 @@
 %\fi
 % \iffalse
 % Doc-Source file to use with LaTeX2e
-% Copyright (C) 2016 Nicola Talbot, all rights reserved.
+% Copyright (C) 2017 Nicola Talbot, all rights reserved.
 % \fi
 % \iffalse
 %<*driver>
@@ -74,12 +74,12 @@ mfirstuc.dtx
 %\MakeShortVerb{"}
 %\DeleteShortVerb{\|}
 %
-% \title{Documented Code For mfirstuc v2.04}
+% \title{Documented Code For mfirstuc v2.05}
 % \author{Nicola L.C. Talbot\\[10pt]
 %Dickimaw Books\\
 %\url{http://www.dickimaw-books.com/}}
 %
-% \date{2016-07-31}
+% \date{2017-11-10}
 % \maketitle
 %
 %\tableofcontents
@@ -111,7 +111,7 @@ mfirstuc.dtx
 %\changes{2.0}{2015/09/09}{package split from glossaries}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{mfirstuc}[2016/07/31 v2.04 (NLCT)]
+\ProvidesPackage{mfirstuc}[2017/11/10 v2.05 (NLCT)]
 %    \end{macrocode}
 % Requires \sty{etoolbox}:\changes{1.06}{2012/05/21}{now requires
 % etoolbox}
@@ -282,12 +282,22 @@ mfirstuc.dtx
        \expandafter#3\expandafter{\dtl@first}\dtl@rest
     }%
     {%
-      #3#1#2%
+%    \end{macrocode}
+%First argument needs to be grouped in case it consists of more than
+%one token.
+%\changes{2.05}{2017-11-10}{grouped first argument}
+%    \begin{macrocode}
+      #3{#1}#2%
     }%
   }%
 }%
 {%
-  \def\@mfu@applytofirst#1#2\@mfu@end@applytofirst#3{#3#1#2}
+%    \end{macrocode}
+%First argument needs to be grouped in case it consists of more than
+%one token.
+%\changes{2.05}{2017-11-10}{grouped first argument}
+%    \begin{macrocode}
+  \def\@mfu@applytofirst#1#2\@mfu@end@applytofirst#3{#3{#1}#2}
 }
 %    \end{macrocode}
 %\end{macro}
@@ -916,7 +926,7 @@ mfirstuc.dtx
 %\label{sec:code:mfirstuc-english}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{mfirstuc-english}[2016/07/31 v2.04 (NLCT)]
+\ProvidesPackage{mfirstuc-english}[2017/11/10 v2.05 (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 d7f2a4d372a..cb67404d04a 100644
--- a/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.ins
+++ b/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.ins
@@ -1,14 +1,14 @@
-% mfirstuc.ins generated using makedtx version 1.1 2016/7/31 20:20
+% mfirstuc.ins generated using makedtx version 1.2 2017/11/10 13:34
 \input docstrip
 
 \preamble
 
  mfirstuc.dtx
- Copyright 2016 Nicola Talbot
+ Copyright 2017 Nicola Talbot
 
  This work may be distributed and/or modified under the
  conditions of the LaTeX Project Public License, either version 1.3
- of this license of (at your option) any later version.
+ of this license or (at your option) any later version.
  The latest version of this license is in
    http://www.latex-project.org/lppl.txt
  and version 1.3 or later is part of all distributions of LaTeX
diff --git a/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc-english.sty b/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc-english.sty
index 7b05e12309d..7f9a6733f04 100644
--- a/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc-english.sty
+++ b/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc-english.sty
@@ -7,11 +7,11 @@
 %% mfirstuc.dtx  (with options: `mfirstuc-english.sty,package')
 %% 
 %%  mfirstuc.dtx
-%%  Copyright 2016 Nicola Talbot
+%%  Copyright 2017 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  of this license or (at your option) any later version.
 %%  The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
 %%  and version 1.3 or later is part of all distributions of LaTeX
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{mfirstuc-english}[2016/07/31 v2.04 (NLCT)]
+\ProvidesPackage{mfirstuc-english}[2017/11/10 v2.05 (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 e94ec242a2a..545863ee944 100644
--- a/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc.sty
+++ b/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc.sty
@@ -7,11 +7,11 @@
 %% mfirstuc.dtx  (with options: `mfirstuc.sty,package')
 %% 
 %%  mfirstuc.dtx
-%%  Copyright 2016 Nicola Talbot
+%%  Copyright 2017 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  of this license or (at your option) any later version.
 %%  The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
 %%  and version 1.3 or later is part of all distributions of LaTeX
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{mfirstuc}[2016/07/31 v2.04 (NLCT)]
+\ProvidesPackage{mfirstuc}[2017/11/10 v2.05 (NLCT)]
 \RequirePackage{etoolbox}
 \newif\if@glscs
 \newtoks\@glsmfirst
@@ -134,12 +134,12 @@
        \expandafter#3\expandafter{\dtl@first}\dtl@rest
     }%
     {%
-      #3#1#2%
+      #3{#1}#2%
     }%
   }%
 }%
 {%
-  \def\@mfu@applytofirst#1#2\@mfu@end@applytofirst#3{#3#1#2}
+  \def\@mfu@applytofirst#1#2\@mfu@end@applytofirst#3{#3{#1}#2}
 }
 \ifdef\dtl@getfirst@UTFviii
 {%