From 6f50f6bd304c69abef2c051ee1aa83b602027143 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 19 Apr 2010 22:50:53 +0000 Subject: memoir 3.6 (18apr10) git-svn-id: svn://tug.org/texlive/trunk@17927 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/memoir/memhfixc.sty | 72 +++++++++++-------------- Master/texmf-dist/tex/latex/memoir/memoir.cls | 23 +++++--- 2 files changed, 47 insertions(+), 48 deletions(-) (limited to 'Master/texmf-dist/tex/latex/memoir') diff --git a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty index b5e83239cd8..00d45aab0f6 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.13 2010/04/19 %% Version 1.12 2009/02/06 %% Version 1.11 2009/01/18 %% Version 1.10 2008/08/23 @@ -52,57 +53,44 @@ %% Version 1.1 2003/01/22 %% Version 1.0 2002/10/22 %% -\ProvidesPackage{memhfixc}[2009/02/06 v1.12 nameref/hyperref package fixes for memoir class] +\ProvidesPackage{memhfixc}[2010/04/19 v1.13 nameref/hyperref package fixes for memoir class] \let\M@hfixcfinish\relax \@ifclassloaded{memoir}{}% {\let\M@hfixcfinish\endinput \typeout{No memoir class: memhfixc does nothing}} \M@hfixcfinish -\AtBeginDocument{% - \@ifpackageloaded{nameref}{% nameref loaded - \@ifundefined{NR@sectm@m}{% haven't fiddled with \M@sect - \typeout{Redoing nameref's sectioning} - \let\NR@sectm@m\M@sect - \def\M@sect#1#2#3#4#5#6[#7][#8]#9{% - \setcounter{section@level}{#2}% - \def\@currentlabelname{#7}% - \NR@sectm@m{#1}{#2}{#3}{#4}{#5}{#6}[{#7}][{#8}]{\Sectionformat{#9}{#2}}}% - }% - {% \NR@sectm@m has already been defined - } - }% - {% no nameref - } -} % end of \AtBeginDocument +\AtEndPackage{nameref}{% -\AtBeginDocument{% - \@ifpackageloaded{nameref}{% nameref loaded - \@ifundefined{MNR@label}{% haven't fiddled with \label - \typeout{Redoing nameref's label} - \let\MNR@label\label - \def\label#1{\@bsphack\begingroup - \protected@edef\@currentlabel{\protect\M@TitleReference - {\@currentlabel}{\M@currentTitle}}% - \MNR@label{#1}% - \endgroup \@esphack}% - \let\MNR@old@caption\@caption - \long\def\@caption#1[#2]#3{% - \MNR@old@caption{#1}[{#2}]{#3}% - \def\@currentlabelname{#2}% - \M@gettitle{#2}% - }% + \@ifundefined{NR@sectm@m}{% haven't fiddled with \M@sect + \typeout{Redoing nameref's sectioning} + \let\NR@sectm@m\M@sect + \def\M@sect##1##2##3##4##5##6[##7][##8]##9{% + \setcounter{section@level}{##2}% + \def\@currentlabelname{##7}% + \NR@sectm@m{##1}{##2}{##3}{##4}{##5}{##6}[{##7}][{##8}]{\Sectionformat{##9}{##2}}}% + }% + {% \NR@sectm@m has already been defined + }% + \@ifundefined{MNR@label}{% haven't fiddled with \label + \typeout{Redoing nameref's label} + \let\MNR@label\label + \def\label##1{\@bsphack\begingroup + \protected@edef\@currentlabel{\protect\M@TitleReference + {\@currentlabel}{\M@currentTitle}}% + \MNR@label{##1}% + \endgroup \@esphack}% + \let\MNR@old@caption\@caption + \long\def\@caption##1[##2]##3{% + \MNR@old@caption{##1}[{##2}]{##3}% + \def\@currentlabelname{##2}% + \M@gettitle{##2}% }% - {% \MNR@label has already been defined - } }% - {% no nameref - } -} % end of \AtBeginDocument - -\AtBeginDocument{% - \@ifpackageloaded{nameref}{\let\nameref\titleref}{}% -} + {% \MNR@label has already been defined + }% +\DeclareRobustCommand\nameref{\@ifstar{\@mem@titlerefnolink}{\@mem@titleref}} +}% end of AtEndPackage %% We are done unless the hyperref package has been loaded \@ifpackageloaded{hyperref}{}{\let\M@hfixcfinish\endinput} diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls index 65f1ba4bdad..eb63021a2c9 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/02/20 v1.618033988c configurable book, report, article document class] + [2010/04/19 v3.6 configurable book, report, article document class] \newcommand*{\@ptsize}{} \newcommand*{\@memptsize}{} \newlength{\onelineskip} @@ -8242,11 +8242,22 @@ \if@twocolumn \if@firstcolumn \@tempcnta\m@ne \fi \else - \if@mparswitch - \ifoddpage \else \@tempcnta\m@ne \fi - \fi - \if@reversemargin \@tempcnta -\@tempcnta \fi - \fi + \ifm@msetmp% + % \@tempcnta > 0 => right side of page + % \@tempcnta < 0 => left side of page + \m@mwhich@margin{\m@mmpar@margin}% set left or right margin + \ifmemtortm% + \@tempcnta\@ne\relax% + \else% + \@tempcnta\m@ne\relax% + \fi% + \else% + \if@mparswitch + \ifoddpage \else \@tempcnta\m@ne \fi% + \fi% + \if@reversemargin \@tempcnta -\@tempcnta \fi% + \fi% + \fi% \ifnum\@tempcnta <\z@ \global\setbox\@marbox\box\@currbox \fi \@tempdima\@mparbottom \advance\@tempdima -\@pageht -- cgit v1.2.3