10 files changed, 60 insertions, 37 deletions
diff --git a/Master/texmf-dist/doc/latex/mfirstuc/CHANGES b/Master/texmf-dist/doc/latex/mfirstuc/CHANGES
index cc1d366c01a..18eef0ad0d5 100644
--- a/Master/texmf-dist/doc/latex/mfirstuc/CHANGES
+++ b/Master/texmf-dist/doc/latex/mfirstuc/CHANGES
@@ -1,5 +1,10 @@
 mfirstuc change log:
 
+v2.02:
+
+  * Fixed bug in \capitalisewords
+    http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=104
+
 v2.01:
 
   * Added check for initial \protect in \makefirstuc
diff --git a/Master/texmf-dist/doc/latex/mfirstuc/README b/Master/texmf-dist/doc/latex/mfirstuc/README
index d8fd1365b9a..bfbdf87e3d7 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.01
+LaTeX Package : mfirstuc v2.02
 
-Last Modified : 2015-12-08
+Last Modified : 2015-12-17
 
 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 d05041ea7b2..81c58cae4d5 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 f6706928f1f..8087203ae76 100644
--- a/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.html
+++ b/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.html
@@ -4,13 +4,13 @@
 <!--http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd-->  
 <html xmlns="http://www.w3.org/1999/xhtml"  
 > 
-<head><title>mfirstuc.sty v2.01: uppercasing first letter</title> 
+<head><title>mfirstuc.sty v2.02: uppercasing first letter</title> 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
 <meta name="generator" content="TeX4ht (http://www.tug.org/tex4ht/)" /> 
 <meta name="originator" content="TeX4ht (http://www.tug.org/tex4ht/)" /> 
 <!-- xhtml,fn-in,css-in,uni-html4,utf8 --> 
 <meta name="src" content="mfirstuc-manual.tex" /> 
-<meta name="date" content="2015-12-08 14:22:00" /> 
+<meta name="date" content="2015-12-17 12:46:00" /> 
  
 <style type="text/css"> 
 <!--  
@@ -165,7 +165,7 @@ div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; cle
 
                                                                     
 
-<h2 class="titleHead">mfirstuc.sty v2.01: uppercasing first letter</h2>
+<h2 class="titleHead">mfirstuc.sty v2.02: uppercasing first letter</h2>
          <div class="author" ><span 
 class="cmr-12">Nicola L.C. Talbot</span>
 <br />          <span 
@@ -174,7 +174,7 @@ class="cmr-12">Dickimaw Books</span>
 href="http://www.dickimaw-books.com/" class="url" ><span 
 class="cmtt-12">http://www.dickimaw-books.com/</span></a></div><br />
 <div class="date" ><span 
-class="cmr-12">2015-12-08</span></div>
+class="cmr-12">2015-12-17</span></div>
    </div>
    <h3 class="likesectionHead"><a 
  id="x1-1000"></a>Contents</h3>
diff --git a/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.pdf b/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.pdf
index 08a73b2a068..871632e2875 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 fd77deed5e9..8dc9701bfa9 100644
--- a/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.tex
+++ b/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.tex
@@ -20,13 +20,13 @@
             pdfkeywords={LaTeX,package,uppercase}]{hyperref}
 
 \begin{document}
- \title{mfirstuc.sty v2.01: 
+ \title{mfirstuc.sty v2.02: 
 uppercasing first letter}
  \author{Nicola L.C. Talbot\\[10pt]
 Dickimaw Books\\
 \url{http://www.dickimaw-books.com/}}
 
- \date{2015-12-08}
+ \date{2015-12-17}
  \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 4ceb5e9f93c..b625ae9f476 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 9b96044e2d6..5191f0d5787 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
 % Command line args:
-%   -author "Nicola Talbot"
+%   -src "mfirstuc.sty\Z=>mfirstuc.sty"
+%   -src "mfirstuc-english.sty\Z=>mfirstuc-english.sty"
+%   -src "(sample.*\.tex)\Z=>\1"
+%   -src "(.*\.perl)\Z=>\1"
+%   -doc "mfirstuc-codedoc.tex"
 %   -comment ".*\.perl"
 %   -comment ".*\.tex"
+%   -author "Nicola Talbot"
+%   -setambles ".*\.perl=>\nopreamble\nopostamble"
+%   -setambles ".*\.tex=>\nopreamble\nopostamble"
 %   -codetitle "Main Package Code"
 %   -macrocode ".*\.perl"
 %   -macrocode ".*\.tex"
-%   -setambles ".*\.perl=>\nopreamble\nopostamble"
-%   -setambles ".*\.tex=>\nopreamble\nopostamble"
-%   -doc "mfirstuc-codedoc.tex"
-%   -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 2015/12/8 14:22
+% Created on 2015/12/17 12:46
 %\fi
 %\iffalse
 %<*package>
@@ -63,7 +63,7 @@ mfirstuc.dtx
 
 \setcounter{IndexColumns}{2}
 
-\CheckSum{260}
+\CheckSum{268}
 
 \begin{document}
 \DocInput{mfirstuc.dtx}
@@ -73,12 +73,12 @@ mfirstuc.dtx
 %\MakeShortVerb{"}
 %\DeleteShortVerb{\|}
 %
-% \title{Documented Code For mfirstuc v2.01}
+% \title{Documented Code For mfirstuc v2.02}
 % \author{Nicola L.C. Talbot\\[10pt]
 %Dickimaw Books\\
 %\url{http://www.dickimaw-books.com/}}
 %
-% \date{2015-12-08}
+% \date{2015-12-17}
 % \maketitle
 %
 %\tableofcontents
@@ -110,7 +110,7 @@ mfirstuc.dtx
 %\changes{2.0}{2015/09/09}{package split from glossaries}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{mfirstuc}[2015/12/08 v2.01 (NLCT)]
+\ProvidesPackage{mfirstuc}[2015/12/17 v2.02 (NLCT)]
 %    \end{macrocode}
 % Requires \sty{etoolbox}:\changes{1.06}{2012/05/21}{now requires
 % etoolbox}
@@ -317,16 +317,30 @@ mfirstuc.dtx
 %
 %\begin{macro}{\mfu@checkword}
 % Check if word should be capitalised.
+% This originally used \sty{etoolbox}'s \ics{ifinlist} command
+% but this doesn't work if the word contains grouping.
 %\changes{1.09}{2017-07-30}{new}
+%\changes{2.02}{2015-12-17}{modified to use loop instead of \cs{ifinlist}}
 %    \begin{macrocode}
 \newcommand*\mfu@checkword[1]{%
-  \ifinlist{#1}{\@mfu@nocaplist}%
-  {%
-    \let\@mfu@domakefirstuc\@firstofone
-  }%
-  {%
-    \let\@mfu@domakefirstuc\makefirstuc
-  }%
+  \def\mfu@checkword@arg{#1}%
+  \let\@mfu@domakefirstuc\makefirstuc
+  \forlistloop\mfu@checkword@do\@mfu@nocaplist
+}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\mfu@checkword@do}
+% Handler for loop used by \cs{mfu@checkword}
+%\changes{2.02}{2015-12-17}{new}
+%    \begin{macrocode}
+\newcommand*{\mfu@checkword@do}[1]{%
+ \ifdefstring{\mfu@checkword@arg}{#1}%
+ {%
+   \let\@mfu@domakefirstuc\@firstofone
+   \listbreak
+ }%
+ {}%
 }
 %    \end{macrocode}
 %\end{macro}
diff --git a/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.ins b/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.ins
index 5082f4b97ba..4cc683f7cc2 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.1 2015/12/8 14:22
+% mfirstuc.ins generated using makedtx version 1.1 2015/12/17 12:46
 \input docstrip
 
 \preamble
diff --git a/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc.sty b/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc.sty
index 06fae7ea38d..472c831cc3d 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}[2015/12/08 v2.01 (NLCT)]
+\ProvidesPackage{mfirstuc}[2015/12/17 v2.02 (NLCT)]
 \RequirePackage{etoolbox}
 \newif\if@glscs
 \newtoks\@glsmfirst
@@ -135,13 +135,17 @@
 }
 \def\mfu@noop#1\mfu@endcap{}
 \newcommand*\mfu@checkword[1]{%
-  \ifinlist{#1}{\@mfu@nocaplist}%
-  {%
-    \let\@mfu@domakefirstuc\@firstofone
-  }%
-  {%
-    \let\@mfu@domakefirstuc\makefirstuc
-  }%
+  \def\mfu@checkword@arg{#1}%
+  \let\@mfu@domakefirstuc\makefirstuc
+  \forlistloop\mfu@checkword@do\@mfu@nocaplist
+}
+\newcommand*{\mfu@checkword@do}[1]{%
+ \ifdefstring{\mfu@checkword@arg}{#1}%
+ {%
+   \let\@mfu@domakefirstuc\@firstofone
+   \listbreak
+ }%
+ {}%
 }
 \newcommand*{\@mfu@nocaplist}{}
 \newcommand*{\MFUnocap}[1]{\listadd{\@mfu@nocaplist}{#1}}