summaryrefslogtreecommitdiff
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
parent50fc710f4c615b0616b02fd75ff94db6a09687af (diff)
memoir v1.6180339c again (6feb09)
git-svn-id: svn://tug.org/texlive/trunk@12109 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/memoir/README11
-rw-r--r--Master/texmf-dist/source/latex/memoir/memoir.dtx34
-rw-r--r--Master/texmf-dist/source/latex/memoir/mempatch.dtx19
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memhfixc.sty8
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memoir.cls16
5 files changed, 61 insertions, 27 deletions
diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README
index c0164884cb8..ed9856912af 100644
--- a/Master/texmf-dist/doc/latex/memoir/README
+++ b/Master/texmf-dist/doc/latex/memoir/README
@@ -40,6 +40,17 @@ o Backmatter:
Command glossary ~ 40 pages
Bibliography, indexes ~ 50 pages
+
+Changes (2009/02/06)
+
+o Memoir v1.6180339d fixes a bug introduced by v1.6180339c
+
+-- \makeheadwidth, \makerunningheadwidth and \makerunningfootwidth no longer
+ support the '+' syntax from the calc package.
+
+-- under hyperref \nameref is now an alias for \titleref
+
+
Changes (2009/01/26)
o Memoir v1.6180339c released with minor bug fixes that could
not be done via the patch file, plus some new functionality. The
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx
index c53f51c29ed..2af74dfca56 100644
--- a/Master/texmf-dist/source/latex/memoir/memoir.dtx
+++ b/Master/texmf-dist/source/latex/memoir/memoir.dtx
@@ -71,6 +71,8 @@
% \changes{v1.6180339a}{2008/08/07}{Removed extra space in footnotes}
% \changes{v1.6180339c}{2009/01/21}{Minor bug fixes and extensions}
% \changes{v1.6180339c}{2009/01/25}{A few more}
+% \changes{v1.6180339d}{2009/02/04}{Fixed a bug in the running
+% head/foot widths}
%
% \def\dtxfile{memoir.dtx}
%
@@ -99,6 +101,7 @@
% \def\fileversion{v1.6180339a} \def\filedate{2008/08/07}
% \def\fileversion{v1.6180339c} \def\filedate{2009/01/21}
% \def\fileversion{v1.6180339c} \def\filedate{2009/01/25}
+% \def\fileversion{v1.6180339d} \def\filedate{2009/02/04}
% \title{The LaTeX \Lpack{memoir} class for configurable book
% typesetting: Source code\thanks{This
% file (\texttt{\dtxfile}) has version number \fileversion, last revised
@@ -319,7 +322,7 @@
% Announce the name, option files and version for LaTeX2e files:
% \begin{macrocode}
%<class>\ProvidesClass{memoir}%
-%<class> [2009/01/25 v1.6180339c configurable book, report, article document class]
+%<class> [2009/02/04 v1.6180339d configurable book, report, article document class]
%<9pt>\ProvidesFile{mem9.clo}%
%<9pt> [2008/01/30 v0.4 memoir class 9pt size option]
%<10pt>\ProvidesFile{mem10.clo}%
@@ -5180,31 +5183,32 @@
% (requested by Wilhelm M\"{u}ller).}
% \changes{v1.6180339c}{2009/01/13}{Added \cs{makerunningheadwidth}
% and \cs{makerunningfootwidth}}.
+% \changes{v1.6180339d}{2009/02/04}{Fixed a mental bug, /daleif}
% \begin{macrocode}
\newcommand*{\makerunningwidth}[1]{%
\def\m@mhfstyle{#1}%
\m@mopthfwidth}
\newcommand*{\m@mopthfwidth}[2][\@mpty]{%
- \setlength\@tempdima{#2}
-% \@namedef{\m@mhfstyle headrunwidth}{#2}%
- \expandafter\edef\csname \m@mhfstyle headrunwidth\endcsname{\the\@tempdima}
+% \setlength\@tempdima{#2}
+ \@namedef{\m@mhfstyle headrunwidth}{#2}%
+% \expandafter\edef\csname \m@mhfstyle headrunwidth\endcsname{\the\@tempdima}
\ifx\@mpty #1
-% \@namedef{\m@mhfstyle footrunwidth}{#2}%
- \expandafter\edef\csname \m@mhfstyle footrunwidth\endcsname{\the\@tempdima}
+ \@namedef{\m@mhfstyle footrunwidth}{#2}%
+% \expandafter\edef\csname \m@mhfstyle footrunwidth\endcsname{\the\@tempdima}
\else
-% \@namedef{\m@mhfstyle footrunwidth}{#1}%
- \setlength\@tempdima{#1}
- \expandafter\edef\csname \m@mhfstyle footrunwidth\endcsname{\the\@tempdima}
+ \@namedef{\m@mhfstyle footrunwidth}{#1}%
+% \setlength\@tempdima{#1}
+% \expandafter\edef\csname \m@mhfstyle footrunwidth\endcsname{\the\@tempdima}
\fi}
\newcommand*{\makerunningheadwidth}[2]{%
- \setlength\@tempdima{#2}%
- \expandafter\edef\csname \m@mhfstyle headrunwidth\endcsname{\the\@tempdima}%
-% \@namedef{#1headrunwidth}{#2}
+% \setlength\@tempdima{#2}%
+% \expandafter\edef\csname \m@mhfstyle headrunwidth\endcsname{\the\@tempdima}%
+ \@namedef{#1headrunwidth}{#2}%
}
\newcommand*{\makerunningfootwidth}[2]{%
- \setlength\@tempdima{#2}%
-% \@namedef{#1footrunwidth}{#2}
- \expandafter\edef\csname \m@mhfstyle footrunwidth\endcsname{\the\@tempdima}%
+% \setlength\@tempdima{#2}%
+ \@namedef{#1footrunwidth}{#2}%
+% \expandafter\edef\csname \m@mhfstyle footrunwidth\endcsname{\the\@tempdima}%
}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.dtx b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
index c2b79992fa8..12064cebf32 100644
--- a/Master/texmf-dist/source/latex/memoir/mempatch.dtx
+++ b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
@@ -65,6 +65,7 @@
% \def\fileversion{v6.0} \def\filedate{2008/07/23}
% \def\fileversion{v6.0a} \def\filedate{2008/08/23}
% \def\fileversion{v6.0b} \def\filedate{2009/01/18}
+% \def\fileversion{v6.0c} \def\filedate{2009/02/06}
%
% \title{The LaTeX \Lpack{memoir} class for configurable book
% typesetting: Code patches\thanks{This
@@ -303,6 +304,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
@@ -320,7 +322,7 @@
%
%
% \begin{macrocode}
-\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]
% \end{macrocode}
%
% \begin{macro}{\M@hfixcfinish}
@@ -400,6 +402,19 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\nameref}
+% We use \cs{titleref} to provide the same functionality as
+% \cs{nameref}, so as not to confuse users, we let \cs{nameref} be
+% an alias for \cs{titleref}.
+% \begin{macrocode}
+\AtBeginDocument{%
+ \@ifpackageloaded{nameref}{\let\nameref\titleref}{}%
+}
+
+% \end{macrocode}
+% \end{macro}
+%
+%
% We are done unless the \Lpack{hyperref} package has been loaded
% \begin{macrocode}
%% We are done unless the hyperref package has been loaded
@@ -736,9 +751,11 @@
\def\@mem@titlerefnolink#1{\begingroup \let\numberline\@gobble
\let\M@TitleReference\@mem@theTR % interrupt recursion of \ref
\ref*{#1}\endgroup}
+
% \end{macrocode}
% \end{macro}
%
+%
% The end of the \Lpack{hyperref} related patches.
%
% \begin{macrocode}
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}