summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-25 21:12:10 +0000
committerKarl Berry <karl@freefriends.org>2020-03-25 21:12:10 +0000
commitfcb69d608481cdc29dc44bf1f5f7a7e63e7701fd (patch)
tree5572026074c10238859283a0ccd56c4ed8a2dede /Master/texmf-dist/source
parentfb614302a25a53c1f2c6e878c9f1787552aa7c53 (diff)
memoir (25mar20)
git-svn-id: svn://tug.org/texlive/trunk@54548 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/memoir/memoir.dtx78
-rw-r--r--Master/texmf-dist/source/latex/memoir/memoir.ins28
-rw-r--r--Master/texmf-dist/source/latex/memoir/mempatch.ins2
3 files changed, 61 insertions, 47 deletions
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx
index 0139b5c4bd3..1d45b947278 100644
--- a/Master/texmf-dist/source/latex/memoir/memoir.dtx
+++ b/Master/texmf-dist/source/latex/memoir/memoir.dtx
@@ -20,7 +20,7 @@
% This work consists of the files listed in the README file.
%
% \fi
-% \CheckSum{31140}
+% \CheckSum{31149}
%
% \changes{v0.1}{2001/05/20}{First public alpha release}
% \changes{v0.2}{2001/06/03}{First beta release}
@@ -120,7 +120,8 @@
% \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}
-%
+% \changes{v3.7k}{2020/03/25}{Maintenance}
+%
% \def\dtxfile{memoir.dtx}
%
% \def\fileversion{v0.1} \def\filedate{2001/05/20}
@@ -178,6 +179,7 @@
% \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}
+% \def\fileversion{v3.7k} \def\filedate{2020/03/25}
% \title{The LaTeX \Lpack{memoir} class for configurable book
% typesetting: Source code\thanks{This
% file (\texttt{\dtxfile}) has version number \fileversion, last revised
@@ -408,11 +410,11 @@
% Announce the name, option files and version for LaTeX2e files:
% \begin{macrocode}
%<class>\ProvidesClass{memoir}%
-%<class> [2019/11/21 v3.7j configurable book, report, article document class]
+%<class> [2020/03/25 v3.7k 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.7j, 2019/11/21}
+%<class>\newcommand\memversion{v3.7k, 2020/03/25}
%<9pt>\ProvidesFile{mem9.clo}%
%<9pt> [2008/01/30 v0.4 memoir class 9pt size option]
%<10pt>\ProvidesFile{mem10.clo}%
@@ -5245,6 +5247,11 @@
}
\AtBeginDocument{\mem@fixpagelayout}
+% \end{macrocode}
+%
+% \changes{v3.7k}{2020/03/25}{Added a link to \cs{mem@fixpagelayout}}
+% \begin{macrocode}
+\let\refixpagelayout\mem@fixpagelayout
% \end{macrocode}
% \end{macro}
@@ -5474,6 +5481,7 @@
% at the top right, middle right, bottom right, bottom middle, and centered.
% \changes{v1.6180339c}{2008/12/26}{Added \cs{setpagetr}, \cs{setpagemr}, \cs{setpagebr},
% \cs{setpagebm} and \cs{setpagecc}}
+% \changes{v3.7k}{2020/03/15}{Added \cs{setpagemm} as an alias to \cs{setpagecc}}
% \begin{macrocode}
\newcommand*{\setpagetr}[3]{%
\settrimmedsize{#1}{#2}{#3}%
@@ -5499,7 +5507,8 @@
\advance\trimtop -0.5\trimtop
\trimedge=\stockwidth \advance\trimedge -\paperwidth
\advance\trimedge -0.5\trimedge}
-
+\let\setpagemm\setpagecc
+
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -18316,39 +18325,34 @@
%
% \changes{v3.7f}{2016/05/16}{changed the order so the \cs{ifx} lines
% come first. From booktabs 2016/04/27 v1.618033}
-% Now we work out, by a very nasty hack, if we're within a
-% \texttt{longtable}. It's easy if \cs{longtable} isn't even defined: then we
-% can't be. But it is not enough just to check if \texttt{longtable} is
+% \changes{v3.7k}{2020/02/06}{changed to be in sync with booktabs
+% datad 2020/01/12. The comments are a carbon copy from booktabs.dtx}
+% Now we work out, by a very nasty hack, if we're within a
+% \verb|longtable|. It's easy if \verb=\longtable= isn't even defined: then we
+% can't be. But it is not enough just to check if \verb=longtable= is
% loaded --- we might be within an ordinary table rather than a
-% longtable. So we look to see if \cs{hline} has been re-defined
+% longtable. So we look to see if \verb=\hline= has been re-defined
% from its \LaTeX\ definition to be the same as
-% \cs{LT@hline}. (Longtable currently does this redefinition when it opens a
-% \texttt{longtable} environment, but not globally, so it is
+% \verb=\LT@hline=. (Longtable currently does this redefinition when it opens a
+% \verb=longtable= environment, but not globally, so it is
% cleared it when the environment closes.) Another
-% package could potentially do this! And \texttt{longtable} might change the
+% package could potentially do this! And \verb=longtable= might change the
% way it implements this! So, it is not entirely safe, but I have
% found no better way so far.
%
-% We set up \cs{@BTswitch} to call \cs{@BTnormal} or \cs{@BLTrule}, as
+% We set up \verb=\@BTswitch= to call \verb=\@BTnormal= or \verb=\@BLTrule=, as
% appropriate, then call it.
% \begin{macrocode}
- \ifx\longtable\undefined
+ \ifx\longtable\undefined
\let\@BTswitch\@BTnormal
\else\ifx\hline\LT@hline
+ \nobreak
\let\@BTswitch\@BLTrule
\else
+ \let\@BTswitch\@BTnormal
+ \fi\fi
% \end{macrocode}
-% \changes{v3.7i}{2019/10/21}{Added this extra if construction to
-% bring the class back into line with the latest booktabs changes, now
-% matching booktabs v1.6180339}
-% \begin{macrocode}
- \ifx\xltabular\undefined
- \let\@BTswitch\@BTnormal
- \else
- \let\@BTswitch\@BLTrule
- \fi\fi\fi
-% \end{macrocode}
-% On with the code
+% Call \verb=\@BTswitch= at end of macro
% \begin{macrocode}
\global\@thisrulewidth=#1\relax
% \end{macrocode}
@@ -21080,11 +21084,15 @@
% note that the placement of the \Lpack{showkeys} label, might be a
% little strange.
% \changes{v3.7g}{2018/02/28}{added}
+% \changes{v3.7k}{2020/02/06}{Added a check on \cs{SK@}, if not
+% defined showkeys is running under final mode}
% \begin{macrocode}
- \@ifpackageloaded{showkeys}{%
- \renewcommand\sf@@memsub@label@hook[1]{%
- \SK@\SK@@label{#1}%
- }
+ \@ifpackageloaded{showkeys}{%
+ \ifdefined\SK@\relax
+ \renewcommand\sf@@memsub@label@hook[1]{%
+ \SK@\SK@@label{#1}%
+ }
+ \fi
}{}
} % end AtBeginDocument
@@ -25575,12 +25583,18 @@
% \verb?\glosaryentry{key@{data}}{num}? \\
% (note where all the braces are).
%
+%
+% \changes{v3.7k}{2020/02/24}{Rewritten to use
+% \cs{immediate@protected@write} instead, otherwise UTF8 may get
+% written as latin1}
% \begin{macrocode}
\newcommand{\memwritetoglo}[5]{\endgroup}
\newcommand{\@ctualm@mwritetoglo}[5]{%
- \immediate\write \memglofile{\string\glossaryentry{#1\@nameuse{memglsact\m@mgf}
- {\string\memgloterm{#2}}{\string\memglodesc{#3}}
- {\string\memgloref{#4}}\@nameuse{memglsnf\m@mgf}}{#5}}%
+ %\immediate\write \memglofile%
+ \immediate@protected@write\memglofile{}%
+ {\string\glossaryentry{#1\@nameuse{memglsact\m@mgf}
+ {\string\memgloterm{#2}}{\string\memglodesc{#3}}
+ {\string\memgloref{#4}}\@nameuse{memglsnf\m@mgf}}{#5}}%
\endgroup}
\AtBeginDocument{%
\let\memwritetoglo\@ctualm@mwritetoglo}
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.ins b/Master/texmf-dist/source/latex/memoir/memoir.ins
index 9ab38716105..51d5199da70 100644
--- a/Master/texmf-dist/source/latex/memoir/memoir.ins
+++ b/Master/texmf-dist/source/latex/memoir/memoir.ins
@@ -58,29 +58,29 @@
\Msg{*** Generating the LaTeX2e document class files ***}
-\generateFile{memoir.cls}{t}{\from{memoir.dtx}{class}}
+\generateFile{memoir.cls}{n}{\from{memoir.dtx}{class}}
\Msg{*** Generating the LaTeX2e document class option files ***}
-\generateFile{mem9.clo}{t}{\from{memoir.dtx}{9pt}}
-\generateFile{mem10.clo}{t}{\from{memoir.dtx}{10pt}}
-\generateFile{mem11.clo}{t}{\from{memoir.dtx}{11pt}}
-\generateFile{mem12.clo}{t}{\from{memoir.dtx}{12pt}}
-\generateFile{mem14.clo}{t}{\from{memoir.dtx}{14pt}}
-\generateFile{mem17.clo}{t}{\from{memoir.dtx}{17pt}}
-\generateFile{mem20.clo}{t}{\from{memoir.dtx}{20pt}}
-\generateFile{mem25.clo}{t}{\from{memoir.dtx}{25pt}}
-\generateFile{mem30.clo}{t}{\from{memoir.dtx}{30pt}}
-\generateFile{mem36.clo}{t}{\from{memoir.dtx}{36pt}}
-\generateFile{mem48.clo}{t}{\from{memoir.dtx}{48pt}}
-\generateFile{mem60.clo}{t}{\from{memoir.dtx}{60pt}}
+\generateFile{mem9.clo}{n}{\from{memoir.dtx}{9pt}}
+\generateFile{mem10.clo}{n}{\from{memoir.dtx}{10pt}}
+\generateFile{mem11.clo}{n}{\from{memoir.dtx}{11pt}}
+\generateFile{mem12.clo}{n}{\from{memoir.dtx}{12pt}}
+\generateFile{mem14.clo}{n}{\from{memoir.dtx}{14pt}}
+\generateFile{mem17.clo}{n}{\from{memoir.dtx}{17pt}}
+\generateFile{mem20.clo}{n}{\from{memoir.dtx}{20pt}}
+\generateFile{mem25.clo}{n}{\from{memoir.dtx}{25pt}}
+\generateFile{mem30.clo}{n}{\from{memoir.dtx}{30pt}}
+\generateFile{mem36.clo}{n}{\from{memoir.dtx}{36pt}}
+\generateFile{mem48.clo}{n}{\from{memoir.dtx}{48pt}}
+\generateFile{mem60.clo}{n}{\from{memoir.dtx}{60pt}}
\Msg{*** Generating the MakeIndex configuration files ***}
%%%%\usepreamble\empty
\usepostamble\empty
-\generateFile{basic.gst}{t}{\from{memoir.dtx}{gst}}
+\generateFile{basic.gst}{n}{\from{memoir.dtx}{gst}}
\Msg{***********************************************************}
\Msg{*}
diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.ins b/Master/texmf-dist/source/latex/memoir/mempatch.ins
index 39c858e3d78..a42ac89c6cd 100644
--- a/Master/texmf-dist/source/latex/memoir/mempatch.ins
+++ b/Master/texmf-dist/source/latex/memoir/mempatch.ins
@@ -58,7 +58,7 @@
\Msg{*** Generating the LaTeX2e package files ***}
-\generateFile{memhfixc.sty}{t}{\from{mempatch.dtx}{hyper}}
+\generateFile{memhfixc.sty}{n}{\from{mempatch.dtx}{hyper}}
%\generateFile{mempatch.sty}{t}{\from{mempatch.dtx}{patch}}
\Msg{***********************************************************}