texlive[52879] Master/texmf-dist: memoir (21nov19)
commits+karl at tug.org
commits+karl at tug.org
Thu Nov 21 22:48:59 CET 2019
Revision: 52879
http://tug.org/svn/texlive?view=revision&revision=52879
Author: karl
Date: 2019-11-21 22:48:59 +0100 (Thu, 21 Nov 2019)
Log Message:
-----------
memoir (21nov19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/memoir/README
trunk/Master/texmf-dist/doc/latex/memoir/memman.pdf
trunk/Master/texmf-dist/source/latex/memoir/memoir.dtx
trunk/Master/texmf-dist/tex/latex/memoir/mem9.clo
trunk/Master/texmf-dist/tex/latex/memoir/memoir.cls
Modified: trunk/Master/texmf-dist/doc/latex/memoir/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/memoir/README 2019-11-21 21:48:42 UTC (rev 52878)
+++ trunk/Master/texmf-dist/doc/latex/memoir/README 2019-11-21 21:48:59 UTC (rev 52879)
@@ -27,7 +27,13 @@
Command glossary ~ 40 pages
Bibliography, indexes ~ 50 pages
+Changed (2019/11/21)
+o memoir v3.7j
+
+-- Typo when textcase.sty is not found. The embedded fallback
+ (textcase v0.07, 2004) nedded # doubling, now fixed.
+
Changed (2019/11/15)
o memoir v3.7i
Modified: trunk/Master/texmf-dist/doc/latex/memoir/memman.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/memoir/memoir.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/memoir/memoir.dtx 2019-11-21 21:48:42 UTC (rev 52878)
+++ trunk/Master/texmf-dist/source/latex/memoir/memoir.dtx 2019-11-21 21:48:59 UTC (rev 52879)
@@ -113,11 +113,13 @@
% \changes{v3.7c}{2015/03/05}{Bugfix}
% \changes{v3.7d}{2015/04/23}{Misc. bugfixes}
% \changes{v3.7e}{2015/07/08}{Per request from LaTeX Team, etex is not
-% autoloaded on newer kernels}
+% autoloaded on newer kernels}
% \changes{v3.7f}{2016/05/16}{Maintenance, luatex85 and booktabs update}
%
% \changes{v3.7h}{2018/12/12}{Maintenance, removing some emulated packages}
% \changes{v3.7i}{2019/11/15}{Maintenance, various edits}
+% \changes{v3.7j}{2019/11/21}{Typo in embeded textcase, now that it is
+% inside \cs{IfFileExists} \# needs to be doubled}
%
% \def\dtxfile{memoir.dtx}
%
@@ -175,6 +177,7 @@
% \def\fileversion{v3.7g} \def\filedate{2018/04/04}
% \def\fileversion{v3.7h} \def\filedate{2018/12/12}
% \def\fileversion{v3.7i} \def\filedate{2019/11/15}
+% \def\fileversion{v3.7j} \def\filedate{2019/11/21}
% \title{The LaTeX \Lpack{memoir} class for configurable book
% typesetting: Source code\thanks{This
% file (\texttt{\dtxfile}) has version number \fileversion, last revised
@@ -405,13 +408,13 @@
% Announce the name, option files and version for LaTeX2e files:
% \begin{macrocode}
%<class>\ProvidesClass{memoir}%
-%<class> [2019/11/15 v3.7i configurable book, report, article document class]
+%<class> [2019/11/21 v3.7j configurable book, report, article document class]
% \end{macrocode}
% In the manual it is useful to know the current version.
% \begin{macrocode}
-%<class>\newcommand\memversion{v3.7i, 2019/11/15}
+%<class>\newcommand\memversion{v3.7j, 2019/11/21}
%<9pt>\ProvidesFile{mem9.clo}%
-%<9pt> [2008/01/30 v0.4 memoir class 9pt size option]
+%<9pt> [2008/01/30 v0.4 memoir class 9pt size option]
%<10pt>\ProvidesFile{mem10.clo}%
%<10pt> [2008/01/30 v0.3 memoir class 10pt size option]
%<11pt>\ProvidesFile{mem11.clo}%
@@ -35761,8 +35764,14 @@
% \end{macrocode}
%
% \MakeShortVerb{\|}
+% \changes{v3.7j}{2019/11/21}{Forgot to double the \# inside
+% \cs{IfFileExists}, also added a warning if textcase if not found on
+% the system}
% \begin{macrocode}
-%%%% Nearly a carbon copy from textcase.dtx by David Carlisle
+ \@memwarn{Haven't found the textcase package,\MessageBreak resorting to embedded
+ copy of v0.07 (2004/10/07),\MessageBreak consider installing the textcase package}
+%%%% Nearly a carbon copy from textcase.dtx by David Carlisle
+%%%% Since we are inside a \IfFileExists we need to double the #/daleif
% \end{macrocode}
% \begin{macro}{\@uclcnotmath}
% This is the main macro from \texttt{textcase}. It is basically
@@ -35781,11 +35790,11 @@
% |#3|: |\uppercase| or |\lowercase|.\\
% |#4|: The text to be upper (or lower) cased.
% \begin{macrocode}
-\def\@uclcnotmath#1#2#3#4{\begingroup
+\def\@uclcnotmath##1##2##3##4{\begingroup
% \end{macrocode}
% Run extra commands (currently just to redefine |\i| and |\j|).
% \begin{macrocode}
- #1%
+ ##1%
% \end{macrocode}
%
% Locally set |\( \)| to be just |$ $|, so that the math skipping
@@ -35796,7 +35805,7 @@
%
% Set up the `non-math' things that also have to be skipped.
% \begin{macrocode}
- \def\NoCaseChange##1{\noexpand\NoCaseChange{\noexpand##1}}%
+ \def\NoCaseChange####1{\noexpand\NoCaseChange{\noexpand####1}}%
\@nonchangecase\label
\@nonchangecase\ref
\@nonchangecase\ensuremath
@@ -35813,8 +35822,8 @@
% \uppercase{ more text}
%\end{verbatim}
% \begin{macrocode}
- \def\cite##1##{\toks@{\noexpand\cite##1}\@citex}%
- \def\@citex##1{\NoCaseChange{\the\toks@{##1}}}%
+ \def\cite####1####{\toks@{\noexpand\cite####1}\@citex}%
+ \def\@citex####1{\NoCaseChange{\the\toks@{####1}}}%
% \end{macrocode}
% (|\@citex| is a scratch macro here, not a redefinition of the existing
% |\@citex|.)
@@ -35829,7 +35838,7 @@
% (a) this code is essentially a copy from the kernel, and
% (b) I'm allowed to break the rules, so there.
% \begin{macrocode}
- \def\reserved at a##1##2{\let#2\reserved at a}%
+ \def\reserved at a####1####2{\let##2\reserved at a}%
\expandafter\reserved at a\@uclclist\reserved at b{\reserved at b\@gobble}%
% \end{macrocode}
%
@@ -35840,7 +35849,7 @@
% the parsing done by |\@skipmath|.
% \begin{macrocode}
\protected at edef\reserved at a{\endgroup
- \noexpand\@skipmath#3#4$\valign$}%
+ \noexpand\@skipmath##3##4$\valign$}%
% \end{macrocode}
%
% \begin{macrocode}
@@ -35850,7 +35859,7 @@
%
% \begin{macro}{\@nonchangecase}
% \begin{macrocode}
-\def\@nonchangecase#1{\def#1##1{\NoCaseChange{#1{##1}}}}
+\def\@nonchangecase##1{\def##1####1{\NoCaseChange{##1{####1}}}}
% \end{macrocode}
% \end{macro}
%
@@ -35872,12 +35881,12 @@
% |#2|: text up to first (next) |$|\\
% |#3|: first math mode material (or |\valign| sentinel)
% \begin{macrocode}
-\def\@skipmath#1#2$#3${%
- \@skip at nonchangecase#1#2\NoCaseChange\valign
- \ifx\valign#3%
+\def\@skipmath##1##2$##3${%
+ \@skip at nonchangecase##1##2\NoCaseChange\valign
+ \ifx\valign##3%
\else
- $#3$%
- \expandafter\@skipmath\expandafter#1%
+ $##3$%
+ \expandafter\@skipmath\expandafter##1%
\fi}
% \end{macrocode}
% \end{macro}
@@ -35887,12 +35896,12 @@
% |#2|: Text up to the first command (such as |\cite|) made `safe'.
% or the first use of |\NoCaseChange|.
% \begin{macrocode}
-\def\@skip at nonchangecase#1#2\NoCaseChange#3{%
- #1{#2}%
- \ifx\valign#3%
+\def\@skip at nonchangecase##1##2\NoCaseChange##3{%
+ ##1{##2}%
+ \ifx\valign##3%
\else
- #3%
- \expandafter\@skip at nonchangecase\expandafter#1%
+ ##3%
+ \expandafter\@skip at nonchangecase\expandafter##1%
\fi}
% \end{macrocode}
% \end{macro}
@@ -35902,11 +35911,11 @@
% to read the pairs in the ucase list `forwards'.
% \begin{macrocode}
\DeclareRobustCommand\MakeTextUppercase{%
- \@uclcnotmath{\def\i{I}\def\j{J}}{##1##2}\uppercase}
+ \@uclcnotmath{\def\i{I}\def\j{J}}{####1####2}\uppercase}
% \end{macrocode}
%
% \begin{macrocode}
-\protected at edef\MakeTextUppercase#1{\MakeTextUppercase{#1}}
+\protected at edef\MakeTextUppercase##1{\MakeTextUppercase{##1}}
% \end{macrocode}
% \end{macro}
%
@@ -35914,11 +35923,11 @@
% Use |\lowercase| and read the pairs in the uppercase list `backwards'.
% \begin{macrocode}
\DeclareRobustCommand\MakeTextLowercase{%
- \@uclcnotmath{}{##2##1}\lowercase}
+ \@uclcnotmath{}{####2####1}\lowercase}
% \end{macrocode}
%
% \begin{macrocode}
-\protected at edef\MakeTextLowercase#1{\MakeTextLowercase{#1}}
+\protected at edef\MakeTextLowercase##1{\MakeTextLowercase{##1}}
% \end{macrocode}
% \end{macro}
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/memoir/mem9.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/memoir/mem9.clo 2019-11-21 21:48:42 UTC (rev 52878)
+++ trunk/Master/texmf-dist/tex/latex/memoir/mem9.clo 2019-11-21 21:48:59 UTC (rev 52879)
@@ -27,7 +27,7 @@
%% This work consists of the files listed in the README file.
%%
\ProvidesFile{mem9.clo}%
- [2008/01/30 v0.4 memoir class 9pt size option]
+ [2008/01/30 v0.4 memoir class 9pt size option]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@ixpt\@xpt
\abovedisplayskip 9\p@ \@plus 2\p@ \@minus 4.5\p@
Modified: trunk/Master/texmf-dist/tex/latex/memoir/memoir.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/memoir/memoir.cls 2019-11-21 21:48:42 UTC (rev 52878)
+++ trunk/Master/texmf-dist/tex/latex/memoir/memoir.cls 2019-11-21 21:48:59 UTC (rev 52879)
@@ -28,8 +28,8 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{memoir}%
- [2019/11/15 v3.7i configurable book, report, article document class]
-\newcommand\memversion{v3.7i, 2019/11/15}
+ [2019/11/21 v3.7j configurable book, report, article document class]
+\newcommand\memversion{v3.7j, 2019/11/21}
\newcommand*{\@ptsize}{}
\newcommand*{\@memptsize}{}
\newlength{\onelineskip}
@@ -12929,43 +12929,46 @@
\IfFileExists{textcase.sty}{
\RequirePackage[overload]{textcase}
}{% resort to the
-%%%% Nearly a carbon copy from textcase.dtx by David Carlisle
-\def\@uclcnotmath#1#2#3#4{\begingroup
- #1%
+ \@memwarn{Haven't found the textcase package,\MessageBreak resorting to embedded
+ copy of v0.07 (2004/10/07),\MessageBreak consider installing the textcase package}
+%%%% Nearly a carbon copy from textcase.dtx by David Carlisle
+%%%% Since we are inside a \IfFileExists we need to double the #/daleif
+\def\@uclcnotmath##1##2##3##4{\begingroup
+ ##1%
\def\({$}\let\)\(% $ for emacs :-)
- \def\NoCaseChange##1{\noexpand\NoCaseChange{\noexpand##1}}%
+ \def\NoCaseChange####1{\noexpand\NoCaseChange{\noexpand####1}}%
\@nonchangecase\label
\@nonchangecase\ref
\@nonchangecase\ensuremath
- \def\cite##1##{\toks@{\noexpand\cite##1}\@citex}%
- \def\@citex##1{\NoCaseChange{\the\toks@{##1}}}%
- \def\reserved at a##1##2{\let#2\reserved at a}%
+ \def\cite####1####{\toks@{\noexpand\cite####1}\@citex}%
+ \def\@citex####1{\NoCaseChange{\the\toks@{####1}}}%
+ \def\reserved at a####1####2{\let##2\reserved at a}%
\expandafter\reserved at a\@uclclist\reserved at b{\reserved at b\@gobble}%
\protected at edef\reserved at a{\endgroup
- \noexpand\@skipmath#3#4$\valign$}%
+ \noexpand\@skipmath##3##4$\valign$}%
\reserved at a}
-\def\@nonchangecase#1{\def#1##1{\NoCaseChange{#1{##1}}}}
+\def\@nonchangecase##1{\def##1####1{\NoCaseChange{##1{####1}}}}
\let\NoCaseChange\@firstofone
-\def\@skipmath#1#2$#3${%
- \@skip at nonchangecase#1#2\NoCaseChange\valign
- \ifx\valign#3%
+\def\@skipmath##1##2$##3${%
+ \@skip at nonchangecase##1##2\NoCaseChange\valign
+ \ifx\valign##3%
\else
- $#3$%
- \expandafter\@skipmath\expandafter#1%
+ $##3$%
+ \expandafter\@skipmath\expandafter##1%
\fi}
-\def\@skip at nonchangecase#1#2\NoCaseChange#3{%
- #1{#2}%
- \ifx\valign#3%
+\def\@skip at nonchangecase##1##2\NoCaseChange##3{%
+ ##1{##2}%
+ \ifx\valign##3%
\else
- #3%
- \expandafter\@skip at nonchangecase\expandafter#1%
+ ##3%
+ \expandafter\@skip at nonchangecase\expandafter##1%
\fi}
\DeclareRobustCommand\MakeTextUppercase{%
- \@uclcnotmath{\def\i{I}\def\j{J}}{##1##2}\uppercase}
-\protected at edef\MakeTextUppercase#1{\MakeTextUppercase{#1}}
+ \@uclcnotmath{\def\i{I}\def\j{J}}{####1####2}\uppercase}
+\protected at edef\MakeTextUppercase##1{\MakeTextUppercase{##1}}
\DeclareRobustCommand\MakeTextLowercase{%
- \@uclcnotmath{}{##2##1}\lowercase}
-\protected at edef\MakeTextLowercase#1{\MakeTextLowercase{#1}}
+ \@uclcnotmath{}{####2####1}\lowercase}
+\protected at edef\MakeTextLowercase##1{\MakeTextLowercase{##1}}
%%%% End copy from textcase.dtx
} % end of \IfFileExists
\newcommand*{\abstractname}{Abstract}
More information about the tex-live-commits
mailing list