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 --- .../texmf-dist/source/latex/mfirstuc/mfirstuc.dtx | 52 +++++++++++++++------- .../texmf-dist/source/latex/mfirstuc/mfirstuc.ins | 2 +- 2 files changed, 36 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/source/latex/mfirstuc') 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 -- cgit v1.2.3