texlive[45803] Master/texmf-dist: mfirstuc (14nov17)
commits+karl at tug.org
commits+karl at tug.org
Tue Nov 14 22:08:13 CET 2017
Revision: 45803
http://tug.org/svn/texlive?view=revision&revision=45803
Author: karl
Date: 2017-11-14 22:08:13 +0100 (Tue, 14 Nov 2017)
Log Message:
-----------
mfirstuc (14nov17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/mfirstuc/CHANGES
trunk/Master/texmf-dist/doc/latex/mfirstuc/README
trunk/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-code.pdf
trunk/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.html
trunk/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.pdf
trunk/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.tex
trunk/Master/texmf-dist/doc/latex/mfirstuc/sample-mfirstuc.pdf
trunk/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.dtx
trunk/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.ins
trunk/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc-english.sty
trunk/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc.sty
Modified: trunk/Master/texmf-dist/doc/latex/mfirstuc/CHANGES
===================================================================
--- trunk/Master/texmf-dist/doc/latex/mfirstuc/CHANGES 2017-11-14 21:07:53 UTC (rev 45802)
+++ trunk/Master/texmf-dist/doc/latex/mfirstuc/CHANGES 2017-11-14 21:08:13 UTC (rev 45803)
@@ -1,5 +1,9 @@
mfirstuc change log:
+v2.06:
+
+ * \makefirstuc: added check for nested commands.
+
v2.05:
* bug fix in \@mfu at applytofirst (#1 must be grouped)
Modified: trunk/Master/texmf-dist/doc/latex/mfirstuc/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/mfirstuc/README 2017-11-14 21:07:53 UTC (rev 45802)
+++ trunk/Master/texmf-dist/doc/latex/mfirstuc/README 2017-11-14 21:08:13 UTC (rev 45803)
@@ -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
Modified: trunk/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-code.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.html 2017-11-14 21:07:53 UTC (rev 45802)
+++ trunk/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.html 2017-11-14 21:08:13 UTC (rev 45803)
@@ -174,7 +174,7 @@
>
<!--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 @@
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>
Modified: trunk/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.tex 2017-11-14 21:07:53 UTC (rev 45802)
+++ trunk/Master/texmf-dist/doc/latex/mfirstuc/mfirstuc-manual.tex 2017-11-14 21:08:13 UTC (rev 45803)
@@ -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
Modified: trunk/Master/texmf-dist/doc/latex/mfirstuc/sample-mfirstuc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.dtx 2017-11-14 21:07:53 UTC (rev 45802)
+++ trunk/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.dtx 2017-11-14 21:08:13 UTC (rev 45803)
@@ -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 @@
\setcounter{IndexColumns}{2}
\setlength\IndexMin{100pt}
-\CheckSum{664}
+\CheckSum{691}
\begin{document}
\DocInput{mfirstuc.dtx}
@@ -74,12 +74,12 @@
%\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 @@
%\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 @@
\ifx\@gls at first\@empty
\glsmakefirstuc{#1}%
\else
- \expandafter\@glsmfirst\expandafter{\@gls at first}%
- \expandafter\@glsmrest\expandafter{\@gls at rest}%
- \edef\@gls at domfirstuc{\noexpand\@gls at body
- {\noexpand\glsmakefirstuc\the\@glsmfirst}%
- \the\@glsmrest}%
+% \end{macrocode}
+%\changes{2.06}{2017-11-14}{check for inner control sequence}
+%Does \cs{@gls at first} start with a control sequence?
+% \begin{macrocode}
+ \edef\@gls at tmp\expandafter{\noexpand\ \expandonce\@gls at first}%
+ \@onelevel at sanitize\@gls at tmp
+ \expandafter\@gls at checkcs\@gls at tmp\relax\relax
+ \if at glscs
+ \edef\@gls at domfirstuc{\expandonce\@gls at body
+ {\noexpand\makefirstuc{\expandonce\@gls at first
+ \expandonce\@gls at rest}%
+ }%
+ }%
+ \else
+ \expandafter\@glsmfirst\expandafter{\@gls at first}%
+ \expandafter\@glsmrest\expandafter{\@gls at rest}%
+% \end{macrocode}
+%\changes{2.06}{2017-11-14}{added braces to \cs{glsmakefirstuc} argument}
+% \begin{macrocode}
+ \edef\@gls at domfirstuc{\noexpand\@gls at body
+ {\noexpand\glsmakefirstuc{\the\@glsmfirst}}%
+ \the\@glsmrest}%
+ \fi
\@gls at domfirstuc
\fi
\fi
@@ -926,7 +944,7 @@
%\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}
Modified: trunk/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.ins 2017-11-14 21:07:53 UTC (rev 45802)
+++ trunk/Master/texmf-dist/source/latex/mfirstuc/mfirstuc.ins 2017-11-14 21:08:13 UTC (rev 45803)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc-english.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc-english.sty 2017-11-14 21:07:53 UTC (rev 45802)
+++ trunk/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc-english.sty 2017-11-14 21:08:13 UTC (rev 45803)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc.sty 2017-11-14 21:07:53 UTC (rev 45802)
+++ trunk/Master/texmf-dist/tex/latex/mfirstuc/mfirstuc.sty 2017-11-14 21:08:13 UTC (rev 45803)
@@ -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 at glscs
\newtoks\@glsmfirst
@@ -79,11 +79,22 @@
\ifx\@gls at first\@empty
\glsmakefirstuc{#1}%
\else
- \expandafter\@glsmfirst\expandafter{\@gls at first}%
- \expandafter\@glsmrest\expandafter{\@gls at rest}%
- \edef\@gls at domfirstuc{\noexpand\@gls at body
- {\noexpand\glsmakefirstuc\the\@glsmfirst}%
- \the\@glsmrest}%
+ \edef\@gls at tmp\expandafter{\noexpand\ \expandonce\@gls at first}%
+ \@onelevel at sanitize\@gls at tmp
+ \expandafter\@gls at checkcs\@gls at tmp\relax\relax
+ \if at glscs
+ \edef\@gls at domfirstuc{\expandonce\@gls at body
+ {\noexpand\makefirstuc{\expandonce\@gls at first
+ \expandonce\@gls at rest}%
+ }%
+ }%
+ \else
+ \expandafter\@glsmfirst\expandafter{\@gls at first}%
+ \expandafter\@glsmrest\expandafter{\@gls at rest}%
+ \edef\@gls at domfirstuc{\noexpand\@gls at body
+ {\noexpand\glsmakefirstuc{\the\@glsmfirst}}%
+ \the\@glsmrest}%
+ \fi
\@gls at domfirstuc
\fi
\fi
More information about the tex-live-commits
mailing list