summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-07-03 23:29:05 +0000
committerKarl Berry <karl@freefriends.org>2010-07-03 23:29:05 +0000
commitb01586837ca3abfe2028b61c24b2b7c0a048f358 (patch)
tree7e4125b14cfeebc91f9df5bbdb92b0808e8f32a6 /Master/texmf-dist/tex
parentb4c1a1eed2c9c758ec934a2085344fa9e5bcc9d3 (diff)
memoir update (1jul10)
git-svn-id: svn://tug.org/texlive/trunk@19217 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memhfixc.sty36
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memoir.cls160
2 files changed, 131 insertions, 65 deletions
diff --git a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
index 00d45aab0f6..58ebaf0827e 100644
--- a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
+++ b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
@@ -38,6 +38,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.14 2010/06/10
%% Version 1.13 2010/04/19
%% Version 1.12 2009/02/06
%% Version 1.11 2009/01/18
@@ -53,7 +54,7 @@
%% Version 1.1 2003/01/22
%% Version 1.0 2002/10/22
%%
-\ProvidesPackage{memhfixc}[2010/04/19 v1.13 nameref/hyperref package fixes for memoir class]
+\ProvidesPackage{memhfixc}[2010/06/10 v1.14 nameref/hyperref package fixes for memoir class]
\let\M@hfixcfinish\relax
\@ifclassloaded{memoir}{}%
{\let\M@hfixcfinish\endinput
@@ -192,17 +193,30 @@
\@ifundefined{H@old@sectm@m}{% haven't fiddled with \M@sect
\let\H@old@sectm@m\M@sect
\def\M@sect#1#2#3#4#5#6[#7][#8]#9{%
- \ifnum #2>\c@secnumdepth
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{section*.\the\Hy@linkcounter}%
- \fi
- \H@old@sectm@m{#1}{#2}{#3}{#4}{#5}{#6}[{#7}][{#8}]{#9}%
- \ifnum #2>\c@secnumdepth
- \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
- \fi}%
+ \ifnum #2>\c@secnumdepth%
+ \expandafter\@firstoftwo%
+ \else%
+ \expandafter\@secondoftwo%
+ \fi%
+ {%
+ \Hy@MakeCurrentHrefAuto{section*}%
+ \setlength{\Hy@SectionHShift}{#3}%
+ \begingroup
+ \toks@{\H@old@sectm@m{#1}{#2}{#3}{#4}{#5}{#6}[{#7}][{8}]}%
+ \toks\tw@\expandafter{%
+ \expandafter\Hy@SectionAnchorHref\expandafter{\@currentHref}%
+ #9%
+ }%
+ \edef\x{\endgroup%
+ \the\toks@{\the\toks\tw@}%
+ }\x%
+ }{%
+ \H@old@sectm@m{#1}{#2}{#3}{#4}{#5}{#6}[{#7}][{#8}]{#9}%
+ }%
}%
- {% already fiddled \M@sect
- }
+}%
+{% already fiddled \M@sect
+}
\let\MH@old@resets@pp\@resets@pp
\renewcommand*{\@resets@pp}{%
diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index eb63021a2c9..ff916f2dbdb 100644
--- a/Master/texmf-dist/tex/latex/memoir/memoir.cls
+++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{memoir}%
- [2010/04/19 v3.6 configurable book, report, article document class]
+ [2010/07/01 v3.6d configurable book, report, article document class]
\newcommand*{\@ptsize}{}
\newcommand*{\@memptsize}{}
\newlength{\onelineskip}
@@ -1530,54 +1530,92 @@
\mem@ps@safe@change{#1}%
\@namedef{#1headvplacement}{#2}\@namedef{#1footvplacement}{#3}}
+\newcommand\mem@ps@HLH[4]{%
+ % #1 ps name
+ % #2 type: head, foot
+ % #3 odd/even
+ % #4 odd/even short (o,e)
+ \@namedef{#1@#3#2}{%
+ \@nameuse{#1#3hpl}\hb@xt@\@nameuse{#1#2runwidth}{\m@mhe@dreset%
+ \vbox{\nametest{#2}{foot}\ifsamename\@nameuse{#1#2rule}\fi%
+ \hbox{%
+ \rlap{%
+ \parbox[\@nameuse{#1#2vplacement}]{\@nameuse{#1#2runwidth}}{%
+ \raggedright\@nameuse{#1ps#2strut}%
+ \@nameuse{#1#4#2l}%
+ \@nameuse{#1ps#2strut}}}\hfill
+ \parbox[\@nameuse{#1#2vplacement}]{\@nameuse{#1#2runwidth}}{%
+ \centering\@nameuse{#1ps#2strut}%
+ \@nameuse{#1#4#2c}%
+ \@nameuse{#1ps#2strut}}\hfill
+ \llap{%
+ \parbox[\@nameuse{#1#2vplacement}]{\@nameuse{#1#2runwidth}}{%
+ \raggedleft\@nameuse{#1ps#2strut}%
+ \@nameuse{#1#4#2r}%
+ \@nameuse{#1ps#2strut}}}%
+ }%
+ \nametest{#2}{head}\ifsamename\@nameuse{#1#2rule}\fi%
+ }}\@nameuse{#1#3hpr}}%
+ \@namedef{@#3#2}{\@nameuse{#1@#3#2}}%
+}
\newcommand{\makepagestyle}[1]{%
\mem@set@ps@xtra@info{#1}{}{01}%
\@namedef{ps@#1}{%
- \@namedef{#1@evenhead}{%
- \@nameuse{#1evenhpl}\hb@xt@\@nameuse{#1headrunwidth}{\m@mhe@dreset%
- \vbox{\hbox{%
- \rlap{\parbox[\@nameuse{#1headvplacement}]{\@nameuse{#1headrunwidth}}{%
- \raggedright\@nameuse{#1eheadl}\strut}}\hfill
- \parbox[\@nameuse{#1headvplacement}]{\@nameuse{#1headrunwidth}}{%
- \centering\@nameuse{#1eheadc}\strut}\hfill
- \llap{\parbox[\@nameuse{#1headvplacement}]{\@nameuse{#1headrunwidth}}{%
- \raggedleft\@nameuse{#1eheadr}\strut}}}%
- \@nameuse{#1headrule}}}\@nameuse{#1evenhpr}}%
- \@namedef{#1@oddhead}{%
- \@nameuse{#1oddhpl}\hb@xt@\@nameuse{#1headrunwidth}{\m@mhe@dreset%
- \vbox{\hbox{%
- \rlap{\parbox[\@nameuse{#1headvplacement}]{\@nameuse{#1headrunwidth}}{%
- \raggedright\@nameuse{#1oheadl}\strut}}\hfill
- \parbox[\@nameuse{#1headvplacement}]{\@nameuse{#1headrunwidth}}{%
- \centering\@nameuse{#1oheadc}\strut}\hfill
- \llap{\parbox[\@nameuse{#1headvplacement}]{\@nameuse{#1headrunwidth}}{%
- \raggedleft\@nameuse{#1oheadr}\strut}}}%
- \@nameuse{#1headrule}}}\@nameuse{#1oddhpr}}%
- \@namedef{#1@evenfoot}{%
- \@nameuse{#1evenfpl}\hb@xt@\@nameuse{#1footrunwidth}{\m@mhe@dreset%
- \vbox{\@nameuse{#1footrule}\hbox{%
- \rlap{\parbox[\@nameuse{#1footvplacement}]{\@nameuse{#1footrunwidth}}{%
- \raggedright\@nameuse{#1efootl}\strut}}\hfill
- \parbox[\@nameuse{#1footvplacement}]{\@nameuse{#1footrunwidth}}{%
- \centering\@nameuse{#1efootc}\strut}\hfill
- \llap{\parbox[\@nameuse{#1footvplacement}]{\@nameuse{#1footrunwidth}}{%
- \raggedleft\@nameuse{#1efootr}\strut}}}%
- }}\@nameuse{#1evenfpr}}%
- \@namedef{#1@oddfoot}{%
- \@nameuse{#1oddfpl}\hb@xt@\@nameuse{#1footrunwidth}{\m@mhe@dreset%
- \vbox{\@nameuse{#1footrule}\hbox{%
- \rlap{\parbox[\@nameuse{#1footvplacement}]{\@nameuse{#1footrunwidth}}{%
- \raggedright\@nameuse{#1ofootl}\strut}}\hfill
- \parbox[\@nameuse{#1footvplacement}]{\@nameuse{#1footrunwidth}}{%
- \centering\@nameuse{#1ofootc}\strut}\hfill
- \llap{\parbox[\@nameuse{#1footvplacement}]{\@nameuse{#1footrunwidth}}{%
- \raggedleft\@nameuse{#1ofootr}\strut}}}%
- }}\@nameuse{#1oddfpr}}%
- \def\@evenhead{\@nameuse{#1@evenhead}}%
- \def\@oddhead{\@nameuse{#1@oddhead}}%
- \def\@evenfoot{\@nameuse{#1@evenfoot}}%
- \def\@oddfoot{\@nameuse{#1@oddfoot}}%
+ \mem@ps@HLH{#1}{head}{even}{e}%
+ \mem@ps@HLH{#1}{head}{odd}{o}%
+ \mem@ps@HLH{#1}{foot}{even}{e}%
+ \mem@ps@HLH{#1}{foot}{odd}{o}%
+ % \@namedef{#1@evenhead}{%
+ % \@nameuse{#1evenhpl}\hb@xt@\@nameuse{#1headrunwidth}{\m@mhe@dreset%
+ % \vbox{\hbox{%
+ % \rlap{\parbox[\@nameuse{#1headvplacement}]{\@nameuse{#1headrunwidth}}{%
+ % \raggedright\@nameuse{#1eheadl}\strut}}\hfill
+ % \parbox[\@nameuse{#1headvplacement}]{\@nameuse{#1headrunwidth}}{%
+ % \centering\@nameuse{#1eheadc}\strut}\hfill
+ % \llap{\parbox[\@nameuse{#1headvplacement}]{\@nameuse{#1headrunwidth}}{%
+ % \raggedleft\@nameuse{#1eheadr}\strut}}}%
+ % \@nameuse{#1headrule}}}\@nameuse{#1evenhpr}}%
+ % \@namedef{#1@oddhead}{%
+ % \@nameuse{#1oddhpl}\hb@xt@\@nameuse{#1headrunwidth}{\m@mhe@dreset%
+ % \vbox{\hbox{%
+ % \rlap{\parbox[\@nameuse{#1headvplacement}]{\@nameuse{#1headrunwidth}}{%
+ % \raggedright\@nameuse{#1oheadl}\strut}}\hfill
+ % \parbox[\@nameuse{#1headvplacement}]{\@nameuse{#1headrunwidth}}{%
+ % \centering\@nameuse{#1oheadc}\strut}\hfill
+ % \llap{\parbox[\@nameuse{#1headvplacement}]{\@nameuse{#1headrunwidth}}{%
+ % \raggedleft\@nameuse{#1oheadr}\strut}}}%
+ % \@nameuse{#1headrule}}}\@nameuse{#1oddhpr}}%
+ % \@namedef{#1@evenfoot}{%
+ % \@nameuse{#1evenfpl}\hb@xt@\@nameuse{#1footrunwidth}{\m@mhe@dreset%
+ % \vbox{\@nameuse{#1footrule}\hbox{%
+ % \rlap{\parbox[\@nameuse{#1footvplacement}]{\@nameuse{#1footrunwidth}}{%
+ % \raggedright\@nameuse{#1efootl}\strut}}\hfill
+ % \parbox[\@nameuse{#1footvplacement}]{\@nameuse{#1footrunwidth}}{%
+ % \centering\@nameuse{#1efootc}\strut}\hfill
+ % \llap{\parbox[\@nameuse{#1footvplacement}]{\@nameuse{#1footrunwidth}}{%
+ % \raggedleft\@nameuse{#1efootr}\strut}}}%
+ % }}\@nameuse{#1evenfpr}}%
+ % \@namedef{#1@oddfoot}{%
+ % \@nameuse{#1oddfpl}\hb@xt@\@nameuse{#1footrunwidth}{\m@mhe@dreset%
+ % \vbox{\@nameuse{#1footrule}\hbox{%
+ % \rlap{\parbox[\@nameuse{#1footvplacement}]{\@nameuse{#1footrunwidth}}{%
+ % \raggedright\@nameuse{#1ofootl}\strut}}\hfill
+ % \parbox[\@nameuse{#1footvplacement}]{\@nameuse{#1footrunwidth}}{%
+ % \centering\@nameuse{#1ofootc}\strut}\hfill
+ % \llap{\parbox[\@nameuse{#1footvplacement}]{\@nameuse{#1footrunwidth}}{%
+ % \raggedleft\@nameuse{#1ofootr}\strut}}}%
+ % }}\@nameuse{#1oddfpr}}%
+ % \def\@evenhead{\@nameuse{#1@evenhead}}%
+ % \def\@oddhead{\@nameuse{#1@oddhead}}%
+ % \def\@evenfoot{\@nameuse{#1@evenfoot}}%
+ % \def\@oddfoot{\@nameuse{#1@oddfoot}}%
\@nameuse{#1pshook}}%
+ \nametest{#1}{empty}%
+ \ifsamename%
+ \@namedef{#1psheadstrut}{}\@namedef{#1psfootstrut}{}%
+ \else%
+ \@namedef{#1psheadstrut}{\strut}\@namedef{#1psfootstrut}{\strut}%
+ \fi%
\makeevenhead{#1}{}{}{}%
\makeoddhead{#1}{}{}{}%
\makeevenfoot{#1}{}{}{}%
@@ -1615,6 +1653,8 @@
\@namedef{#1oddfpr}{\@nameuse{#2oddfpr}}%
\@namedef{#1headrule}{\@nameuse{#2headrule}}%
\@namedef{#1footrule}{\@nameuse{#2footrule}}%
+ \@namedef{#1psheadstrut}{\@nameuse{#2psheadstrut}}
+ \@namedef{#1psfootstrut}{\@nameuse{#2psfootstrut}}
\makepsmarks{#1}{\@nameuse{#2pshook}}}
\newcommand{\ifonlyfloats}[2]{\if@fcolmade #1\else #2\fi}
@@ -1633,6 +1673,8 @@
\@namedef{#1pshook}{\@nameuse{#2pshook}}%
}}
+\newcommand*\makeheadfootstrut[3]{%
+ \@namedef{#1psheadstrut}{#2}\@namedef{#1psfootstrut}{#3}}
\makepagestyle{empty}
\makepagestyle{plain}
@@ -3019,13 +3061,18 @@
\normalfont\Huge\bfseries\sffamily\raggedleft}
\renewcommand*{\chapternamenum}{}
\renewcommand*{\printchapternum}{%
- \makebox[0pt][l]{\hspace{0.4em}
+ \makebox[0pt][l]{\hspace{0.4em}%
\resizebox{!}{4ex}{%
- \chapnamefont\bfseries\sffamily\thechapter}
+ \chapnamefont\bfseries\sffamily\thechapter}%
}%
}%
\renewcommand*{\printchapternonum}{%
- \chapnamefont \phantom{\printchaptername \chapternamenum \printchapternum}
+ \chapnamefont \phantom{\printchaptername \chapternamenum%
+ \makebox[0pt][l]{\hspace{0.4em}%
+ \resizebox{!}{4ex}{%
+ \chapnamefont\bfseries\sffamily 1}%
+ }%
+ }%
\afterchapternum %
}%
\renewcommand*{\afterchapternum}{%
@@ -7539,6 +7586,7 @@
\newcommand*{\postchapterprecis}{\end{quote}}
\newcommand{\precistocfont}{\normalfont\itshape}
+\newcommand{\precistocformat}{\noindent}
\newcommand{\chapterprecistoc}[1]{%
\addtocontents{toc}{\precistoctext{#1}}}
\DeclareRobustCommand{\precistoctext}[1]{%
@@ -7548,7 +7596,7 @@
\advance\memRTLleftskip \cftchapternumwidth\relax
%%% \rightskip \@tocrmarg\relax
\memRTLrightskip \@tocrmarg\relax
- \precistocfont #1\par}}
+ \precistocformat\precistocfont #1\par}}
\newcommand{\cftlocalchange}[3]{%
\addtocontents{#1}{\protect\setpnumwidth{#2} \protect\setrmarg{#3}}}
\newcommand{\cftaddtitleline}[4]{%
@@ -9499,11 +9547,11 @@
\newcommand{\feetbelowfloat}{\gdef\@makecol{\mem@makecolbf}}
\feetabovefloat
-\gdef\@reinserts{%
- \ifvoid\footins\else\insert\footins{\unvbox\footins}\fi
- \m@mdodoreinextrafeet
- \ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins}\fi
- \ifvoid\sideins\else\insert\sideins{\unvbox\sideins}\fi}
+ % \gdef\@reinserts{%
+ % \ifvoid\footins\else\insert\footins{\unvbox\footins}\fi
+ % \m@mdodoreinextrafeet
+ % \ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins}\fi
+ % \ifvoid\sideins\else\insert\sideins{\unvbox\sideins}\fi}
\newif\ifm@mfnmargin
\newcommand*{\footnotesatfoot}{\m@mfnmarginfalse}
@@ -12147,7 +12195,11 @@
\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}