summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/memoir/mempatch.dtx
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/source/latex/memoir/mempatch.dtx
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/source/latex/memoir/mempatch.dtx')
-rw-r--r--Master/texmf-dist/source/latex/memoir/mempatch.dtx19
1 files changed, 18 insertions, 1 deletions
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}