summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/memoir
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-02-07 00:48:55 +0000
committerKarl Berry <karl@freefriends.org>2009-02-07 00:48:55 +0000
commitf960d764a22c7d401357dbcf0f9b0dba0e517f1b (patch)
tree1cf55ee9eb2de62672cc628959105057df58af76 /Master/texmf-dist/tex/latex/memoir
parent50fc710f4c615b0616b02fd75ff94db6a09687af (diff)
memoir v1.6180339c again (6feb09)
git-svn-id: svn://tug.org/texlive/trunk@12109 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/memoir')
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memhfixc.sty8
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memoir.cls16
2 files changed, 13 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
index 6488626bfb1..b5e83239cd8 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.12 2009/02/06
%% Version 1.11 2009/01/18
%% Version 1.10 2008/08/23
%% Version 1.9 2006/11/22
@@ -51,7 +52,7 @@
%% Version 1.1 2003/01/22
%% Version 1.0 2002/10/22
%%
-\ProvidesPackage{memhfixc}[2009/01/18 v1.11 nameref/hyperref package fixes for memoir class]
+\ProvidesPackage{memhfixc}[2009/02/06 v1.12 nameref/hyperref package fixes for memoir class]
\let\M@hfixcfinish\relax
\@ifclassloaded{memoir}{}%
{\let\M@hfixcfinish\endinput
@@ -99,6 +100,10 @@
}
} % end of \AtBeginDocument
+\AtBeginDocument{%
+ \@ifpackageloaded{nameref}{\let\nameref\titleref}{}%
+}
+
%% We are done unless the hyperref package has been loaded
\@ifpackageloaded{hyperref}{}{\let\M@hfixcfinish\endinput}
\M@hfixcfinish
@@ -273,6 +278,7 @@
\def\@mem@titlerefnolink#1{\begingroup \let\numberline\@gobble
\let\M@TitleReference\@mem@theTR % interrupt recursion of \ref
\ref*{#1}\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 cdde4cba8d1..0cdbc0c5398 100644
--- a/Master/texmf-dist/tex/latex/memoir/memoir.cls
+++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls
@@ -25,7 +25,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{memoir}%
- [2009/01/25 v1.6180339c configurable book, report, article document class]
+ [2009/02/04 v1.6180339d configurable book, report, article document class]
\newcommand*{\@ptsize}{}
\newcommand*{\@memptsize}{}
\newlength{\onelineskip}
@@ -1392,21 +1392,17 @@
\def\m@mhfstyle{#1}%
\m@mopthfwidth}
\newcommand*{\m@mopthfwidth}[2][\@mpty]{%
- \setlength\@tempdima{#2}
- \expandafter\edef\csname \m@mhfstyle headrunwidth\endcsname{\the\@tempdima}
+ \@namedef{\m@mhfstyle headrunwidth}{#2}%
\ifx\@mpty #1
- \expandafter\edef\csname \m@mhfstyle footrunwidth\endcsname{\the\@tempdima}
+ \@namedef{\m@mhfstyle footrunwidth}{#2}%
\else
- \setlength\@tempdima{#1}
- \expandafter\edef\csname \m@mhfstyle footrunwidth\endcsname{\the\@tempdima}
+ \@namedef{\m@mhfstyle footrunwidth}{#1}%
\fi}
\newcommand*{\makerunningheadwidth}[2]{%
- \setlength\@tempdima{#2}%
- \expandafter\edef\csname \m@mhfstyle headrunwidth\endcsname{\the\@tempdima}%
+ \@namedef{#1headrunwidth}{#2}%
}
\newcommand*{\makerunningfootwidth}[2]{%
- \setlength\@tempdima{#2}%
- \expandafter\edef\csname \m@mhfstyle footrunwidth\endcsname{\the\@tempdima}%
+ \@namedef{#1footrunwidth}{#2}%
}
\newlength{\normalrulethickness}