diff options
author | Karl Berry <karl@freefriends.org> | 2019-11-15 21:40:34 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-11-15 21:40:34 +0000 |
commit | 7ebe75c756258ce417125e376f199df4fd5b47a9 (patch) | |
tree | 2c6cbc9b8b7146603554f7f38c2a29af214ec7cd /Master/texmf-dist/tex/latex/memoir | |
parent | 755661ec89a876b678d3f8ae0fb13206021b6fa9 (diff) |
memoir (15nov19)
git-svn-id: svn://tug.org/texlive/trunk@52807 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/memoir')
-rw-r--r-- | Master/texmf-dist/tex/latex/memoir/memhfixc.sty | 17 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/memoir/memoir.cls | 186 |
2 files changed, 153 insertions, 50 deletions
diff --git a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty index bb898d7d9ea..e4e37f64f63 100644 --- a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty +++ b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty @@ -41,6 +41,7 @@ %% With thanks to Heiko Oberdiek, if you use hyperref dated 2006/11/15 %% or later, memhfixc will be automatically loaded after hyperref. %% +%% Version 1.18 2019/10/24 %% Version 1.17 2013/05/30 %% Version 1.16 2013/05/16 %% Version 1.15 2010/08/17 @@ -60,7 +61,7 @@ %% Version 1.1 2003/01/22 %% Version 1.0 2002/10/22 %% -\ProvidesPackage{memhfixc}[2013/05/30 v1.17 nameref/hyperref package fixes for memoir class] +\ProvidesPackage{memhfixc}[2019/10/24 v1.18 nameref/hyperref package fixes for memoir class] \let\M@hfixcfinish\relax \@ifclassloaded{memoir}{}% {\let\M@hfixcfinish\endinput @@ -250,6 +251,7 @@ \setcounter{memhycontfloat}{0} \renewcommand{\contcaption}{% + \par% \refstepcounter{memhycontfloat}% \addtocounter{\@captype}{\m@ne}\H@refstepcounter{\@captype}% \@contcaption\@captype} @@ -350,6 +352,19 @@ \@namedef{mem@pnmm@end@hook}{\hyper@linkend} \fi +\AtEndPackage{hypcap}{% + \long\def\@@contcaption##1##2{% + \par + \begingroup + \@parboxrestore + \if@minipage + \@setminipage + \fi + \global\@capstartfalse% added + \normalsize + \@makecaption{\csname fnum@##1\endcsname}{\ignorespaces ##2}\par + \endgroup} +} \endinput %% %% End of file `memhfixc.sty'. diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls index 73adf32de65..ca0603a7bc7 100644 --- a/Master/texmf-dist/tex/latex/memoir/memoir.cls +++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls @@ -28,8 +28,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{memoir}% - [2018/12/12 v3.7h configurable book, report, article document class] -\newcommand\memversion{v3.7h, 2018/12/12} + [2019/11/15 v3.7i configurable book, report, article document class] +\newcommand\memversion{v3.7i, 2019/11/15} \newcommand*{\@ptsize}{} \newcommand*{\@memptsize}{} \newlength{\onelineskip} @@ -135,12 +135,26 @@ \@namelet{ver@#1.\@pkgextension}\relax} \@onlypreamble\DisemulatePackage +\ifcsname InputIfFileExists \endcsname% looking for an explicit space + % here aka the robust version + \DeclareRobustCommand \InputIfFileExists[2]{% + \IfFileExists{#1}% + {% + \expandafter\@swaptwoargs\expandafter + {\@filef@und\m@matendf{#1}\killm@matf{#1}}{% + #2\@addtofilelist{#1}\m@matbeginf{#1}\@@input% + }% + }% + } +\else + % Old definition \renewcommand{\InputIfFileExists}[2]{% \IfFileExists{#1}% {#2\@addtofilelist{#1}\m@matbeginf{#1}% \@@input \@filef@und \m@matendf{#1}% \killm@matf{#1}}} +\fi \newcommand{\m@matbeginf}[1]{\@ifundefined{#1-m@mfb}{}% {\@nameuse{#1-m@mfb}}} @@ -217,11 +231,7 @@ \newcommand{\cmd}[1]{\cmdprint{#1}% \index{\expandafter\@gobble\string#1?\string\cmdprint{\string#1}}} -\RequirePackage{ifpdf}[2017/03/15] -\RequirePackage{ifetex} -\RequirePackage{ifxetex}[2010/09/12] -\RequirePackage{ifluatex}[2016/05/16] - +\RequirePackage{iftex}[2019/11/07] \edef\wo@dmacro{% \string m\string a\string c\string r\string o\string :% } @@ -406,6 +416,7 @@ \newcommand*{\stockaiv} {\stockheight=297mm \stockwidth=210mm} \newcommand*{\stockav} {\stockheight=210mm \stockwidth=148mm} \newcommand*{\stockavi} {\stockheight=148mm \stockwidth=105mm} +\newcommand*{\stockavii}{\stockheight=105mm \stockwidth=74mm} \newcommand*{\stockbo} {\stockheight=1414mm \stockwidth=1000mm} \newcommand*{\stockbi} {\stockheight=1000mm \stockwidth=707mm} @@ -414,6 +425,7 @@ \newcommand*{\stockbiv} {\stockheight=353mm \stockwidth=250mm} \newcommand*{\stockbv} {\stockheight=250mm \stockwidth=176mm} \newcommand*{\stockbvi} {\stockheight=176mm \stockwidth=125mm} +\newcommand*{\stockbvii}{\stockheight=125mm \stockwidth=88mm} \newcommand*{\pagedbill} {\paperheight=7in \paperwidth=3in} \newcommand*{\pagestatement} {\paperheight=8.5in \paperwidth=5.5in} @@ -450,6 +462,7 @@ \newcommand*{\pageaiv} {\paperheight=297mm \paperwidth=210mm} \newcommand*{\pageav} {\paperheight=210mm \paperwidth=148mm} \newcommand*{\pageavi} {\paperheight=148mm \paperwidth=105mm} +\newcommand*{\pageavii}{\paperheight=105mm \paperwidth=74mm} \newcommand*{\pagebo} {\paperheight=1414mm \paperwidth=1000mm} \newcommand*{\pagebi} {\paperheight=1000mm \paperwidth=707mm} @@ -458,6 +471,7 @@ \newcommand*{\pagebiv} {\paperheight=353mm \paperwidth=250mm} \newcommand*{\pagebv} {\paperheight=250mm \paperwidth=176mm} \newcommand*{\pagebvi} {\paperheight=176mm \paperwidth=125mm} +\newcommand*{\pagebvii}{\paperheight=125mm \paperwidth=88mm} \DeclareOption{a0paper}{\stockao} \DeclareOption{a1paper}{\stockai} @@ -466,6 +480,7 @@ \DeclareOption{a4paper}{\stockaiv} \DeclareOption{a5paper}{\stockav} \DeclareOption{a6paper}{\stockavi} +\DeclareOption{a7paper}{\stockavii} \DeclareOption{b0paper}{\stockbo} \DeclareOption{b1paper}{\stockbi} \DeclareOption{b2paper}{\stockbii} @@ -473,6 +488,7 @@ \DeclareOption{b4paper}{\stockbiv} \DeclareOption{b5paper}{\stockbv} \DeclareOption{b6paper}{\stockbvi} +\DeclareOption{b7paper}{\stockbvii} \DeclareOption{mcrownvopaper}{\stockmcrownvo} \DeclareOption{mlargecrownvopaper}{\stockmlargecrownvo} \DeclareOption{mdemyvopaper}{\stockmdemyvo} @@ -1857,22 +1873,55 @@ \fi} \newcommand\createmark[5]{% - \def\@tempa{00} + % \def\@tempa{00} + % \nametest{#3}{nonumber}% + % \ifsamename + % \def\@tempa{01}% + % \else + % \nametest{#3}{shownumber} + % \ifsamename\else + % \@memerror{Unknown numbering value `#3' for #1mark}% + % {I expected `shownumber' or `nonumber'.\MessageBreak + % I will assume you meant `shownumber'}% + % \fi + % \fi + % \expandafter\if\@tempa% compares the two \@tempa digits + % \@namedef{#1marksn}##1{##1}% + % \else + % \@namedef{#1marksn}{\@gobble}% + % \fi + \def\@tempa{1} \nametest{#3}{nonumber}% \ifsamename - \def\@tempa{01}% + \def\@tempa{0} \else \nametest{#3}{shownumber} - \ifsamename\else - \@memerror{Unknown numbering value `#3' for #1mark}% - {I expected `shownumber' or `nonumber'.\MessageBreak - I will assume you meant `shownumber'}% + \ifsamename + \def\@tempa{1} + \else + \nametest{#3}{notitle} + \ifsamename + \def\@tempa{2} + \else + \@memerror{Unknown numbering value `#3' for + #1mark,\MessageBreak + please use one of 'shownumber', 'nonumber' or 'notitle'}% + {I expected `shownumber', `nonumber' or 'notitle'.\MessageBreak + I will assume you meant `shownumber'}% + \fi \fi \fi - \expandafter\if\@tempa% compares the two \@tempa digits - \@namedef{#1marksn}##1{##1}% - \else + \@namedef{#1markst}##1{##1} + \ifcase\@tempa\relax + % nonumber \@namedef{#1marksn}{\@gobble}% + \or % 1 + % shownumber + \@namedef{#1marksn}##1{##1} + \or % 2, 2 implies shownumber + % shownumber + \@namedef{#1marksn}##1{##1} + \@namedef{#1markst}{\@gobble} \fi \nametest{#2}{left}% \ifsamename @@ -1886,7 +1935,11 @@ \@nameuse{#1marksn}{#4\@nameuse{the#1}#5}% \fi \fi - ##1}}{}}% + \@nameuse{#1markst}{##1}% + }% + }% + {}% just left + }% \else \nametest{#2}{right} \ifsamename @@ -1900,7 +1953,10 @@ \@nameuse{#1marksn}{#4\@nameuse{the#1}#5}% \fi% \fi% - ##1}}}% + \@nameuse{#1markst}{##1}% + }% + }% + }% \else \nametest{#2}{both}% \ifsamename\else @@ -1919,16 +1975,22 @@ \@nameuse{#1marksn}{#4\@nameuse{the#1}#5}% \fi \fi - ##1}}{% + \@nameuse{#1markst}{##1}% + }% + }{% \memUChead{% \ifnum \c@secnumdepth > \c@@memmarkcntra \if@mainmatter \@nameuse{#1marksn}{#4\@nameuse{the#1}#5}% \fi \fi - ##1}}}% + \@nameuse{#1markst}{##1}% + }% + }% + }% \fi - \fi} + \fi +} \newcommand\addtopsmarks[3]{% \mem@ps@safe@change{#1}% @@ -5956,8 +6018,11 @@ \else\ifx\hline\LT@hline \let\@BTswitch\@BLTrule \else - \let\@BTswitch\@BTnormal - \fi\fi + \ifx\xltabular\undefined + \let\@BTswitch\@BTnormal + \else + \let\@BTswitch\@BLTrule + \fi\fi\fi \global\@thisrulewidth=#1\relax \ifnum\@thisruleclass=\tw@\vskip\@aboverulesep\else \ifnum\@lastruleclass=\z@\vskip\@aboverulesep\else @@ -6817,6 +6882,7 @@ \@contbotsubtrue \newcommand{\subcaption}{% + \par \bgroup \let\label=\memsub@label \ifdonemaincaption\else @@ -6859,6 +6925,9 @@ {\@memsubcap{sub\@captype}[\@empty]}} \newenvironment{subfloat}{}{} +\newcommand\mem@step@subcounter{% + \refstepcounter{sub\@captype}\@contkeep% +} \newcommand{\subbottom}{% \@contbotsubtrue \@memsubbody} @@ -6869,7 +6938,7 @@ \ifdonemaincaption\else \advance\csname c@\@captype\endcsname\@ne \fi - \refstepcounter{sub\@captype}\@contkeep% + % \refstepcounter{sub\@captype}\@contkeep% \leavevmode \@ifnextchar [% {\@memsubfig}% @@ -6883,7 +6952,7 @@ \bgroup \let\label=\memsub@label \@contset - \refstepcounter{sub\@captype}\@contkeep% + % \refstepcounter{sub\@captype}\@contkeep% \leavevmode \@ifnextchar [% {\@memsubfig}% @@ -6924,7 +6993,8 @@ \fi \setbox\@tempboxa \hbox{#4}% \@tempdima=\wd\@tempboxa - \vtop\bgroup + \vbox\bgroup% + \mem@step@subcounter% \vbox\bgroup \ifcase\@tempcnta \@minipagefalse @@ -7694,13 +7764,13 @@ \ensureonecol \par \begingroup - \@nameuse{@#2maketitle} + \phantomsection \if##1 \ifmem@em@starred@listof\else - \phantomsection \addcontentsline{toc}{chapter}{#3} \fi \fi + \@nameuse{@#2maketitle} \parskip\cftparskip \@nameuse{cft#2beforelisthook}% \@starttoc{#2}% @@ -8467,7 +8537,8 @@ \AtBeginDocument{% \def\@@@wrindexm@m#1#2{% \if@filesw - \immediate\write \@idxfile{\string\indexentry{#1}{#2}}% + %\immediate\write \@idxfile{\string\indexentry{#1}{#2}}% + \immediate@protected@write\@idxfile{}{\string\indexentry{#1}{#2}}% \fi \endgroup}% } @@ -9362,7 +9433,7 @@ \m@makefootfootmark{#1}% -> \footfootmark#1 \m@makemakefootmark{#1}% -> \makefootmark#1 \m@makefootmarkstyle{#1}% -> \footmarkstyle#1 - \@namedef{@makefntext#1}##1{\@nameuse{makefootmark#1} ##1}% + \@namelongdef{@makefntext#1}##1{\@nameuse{makefootmark#1} ##1}% \m@make@footstart{#1}% -> \@footstart#1 \m@make@footgroup{#1}% -> \@footgroup#1 \expandafter\newinsert\csname @mpfootins#1\endcsname% -> \@mpfootins#1 @@ -10473,17 +10544,19 @@ \typeout{Writing note file \jobname.ent}% \let\makepagenote\@empty} -\newcommand{\immediate@protected@write}[3]{% +\providecommand{\immediate@protected@write}[3]{% \begingroup #2% \let\protect\@unexpandable@protect - \edef\reserved@a{\immediate\write#1{#3}}% - \reserved@a + %\edef\reserved@a{\immediate\write#1{#3}}% + %\reserved@a + \immediate\write#1{#3}% \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi} + %\if@nobreak\ifvmode\nobreak\fi\fi% +} \newcommand{\m@m@pnwrite}[3]{\immediate\write#1{#3}} -\newcommand{\m@m@pnwrited}[3]{\immediate\write#1{\detokenize{#3}}} +\newcommand{\m@m@pnwrited}[3]{\immediate\write#1{\detokenize{#3}\@percentchar}} \newcommand*{\pnchap}{\f@rtoc} \newcommand*{\pnschap}{\f@rbdy} @@ -10514,7 +10587,7 @@ \m@mmf@prepare% rerun \fi% \mem@pn@multiple@marker{\notenumintext{\thepagenote}}% - }{}% + }{\m@mmf@prepare}% \fi% \ifm@mpn@new@chap% \global\m@mpn@new@chapfalse% @@ -12843,6 +12916,19 @@ \AtEndDocument{\@memensuresigpages} +\expandafter\let\csname MemOrigMakeUppercase \expandafter\endcsname + \csname MakeUppercase \endcsname +\expandafter\let\csname MemOrigMakeLowercase \expandafter\endcsname + \csname MakeLowercase \endcsname +\def\MemRestoreOrigMakecase{ + \expandafter\let\csname MakeUppercase \expandafter\endcsname + \csname MemOrigMakeUppercase \endcsname + \expandafter\let\csname MakeLowercase \expandafter\endcsname + \csname MemOrigMakeLowercase \endcsname +} +\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% @@ -12881,6 +12967,7 @@ \@uclcnotmath{}{##2##1}\lowercase} \protected@edef\MakeTextLowercase#1{\MakeTextLowercase{#1}} %%%% End copy from textcase.dtx +} % end of \IfFileExists \newcommand*{\abstractname}{Abstract} \newcommand*{\contentsname}{Contents} \newcommand*{\listfigurename}{List of Figures} @@ -12912,13 +12999,6 @@ \space\number\day, \number\year} \setlength\columnsep{10\p@} \setlength\columnseprule{0\p@} -\ifartopt -\pagestyle{plain} -\else -\pagestyle{headings} -\fi -\pagenumbering{arabic} - \setcounter{part}{0} \setcounter{chapter}{0} \setcounter{tocdepth}{1} @@ -13056,12 +13136,12 @@ %%% revert changes to captioning macros if the caption package is used. \AtBeginPackage{caption}{ \ClassWarningNoLine{memoir}{% - You are using the caption package with the memoir class. - To prepare we will now reset all captioning macros and - configurations to kernel defaults, and then let the - caption package take over. Please remember to use^^J - the caption package interfaces in order to^^J - configure your captions} + For the caption package to function properly with memoir, + we will now reset\string\caption\space and friends to + kernel defaults and then let the caption package take over. + Remember: all caption configuration now goves via the caption + package interface, not the interface from the memoir class. + } \long\def\@makecaption##1##2{% \vskip\abovecaptionskip @@ -13106,6 +13186,14 @@ \AtBeginPackage{float}{\let\newfloat\relax} +\ifartopt +\pagestyle{plain} +\else +\pagestyle{headings} +\fi +\pagenumbering{arabic} + + \endinput %% %% End of file `memoir.cls'. |