memoir/memhfix (23aug08)

git-svn-id: svn://tug.org/texlive/trunk@10447 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 21 insertions, 9 deletions

diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README
index 8075e86f42d..4ffba1fa0cf 100644
--- a/Master/texmf-dist/doc/latex/memoir/README
+++ b/Master/texmf-dist/doc/latex/memoir/README
@@ -40,6 +40,10 @@ o Backmatter:
     Command glossary                                    ~  40 pages
     Bibliography, indexes                               ~  50 pages
 
+Changes (2008/08/23)
+o memhfixc v1.10 released to fix problem with tex4ht
+o NO CHANGES TO ANYTHING ELSE
+
 Changes (2008/08/07)
 o Memoir v1.6180339a released to fix extraneous spaces in footnotes
 o NO CHANGES TO ANYTHING ELSE
@@ -379,6 +383,6 @@ o Print the manual
   
 
 
-2008/08/07
+2008/08/23
 Peter Wilson
 herries dot press at earthlink dot net
diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.dtx b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
index c6a4dc25f3a..74779475cea 100755
--- a/Master/texmf-dist/source/latex/memoir/mempatch.dtx
+++ b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
@@ -19,7 +19,7 @@
 %
 % 
 % \fi
-% \CheckSum{482}
+% \CheckSum{484}
 %
 % \def\dtxfile{\texttt{mempatch.dtx}}
 % \def\fileversion{v1.0} \def\filedate{2003/10/04}
@@ -63,6 +63,7 @@
 % \def\fileversion{v5.0} \def\filedate{2008/06/02}
 % \def\fileversion{v5.1} \def\filedate{2008/07/11}
 % \def\fileversion{v6.0} \def\filedate{2008/07/23}
+% \def\fileversion{v6.0a} \def\filedate{2008/08/23}
 %
 % \title{The LaTeX \Lpack{memoir} class for configurable book 
 %        typesetting: Code patches\thanks{This
@@ -287,7 +288,7 @@
 %    \begin{macrocode}
 %%
 %% The memhfixc package provides hyperref related temporary 
-%% fixes and extensions for version v1.3a of the memoir class.
+%% fixes and extensions for versions v1.618 and later of the memoir class.
 %%     o hyperref fix for part and chapter entries in the ToC (v1.0)
 %%     o Other fixes as and when
 %% 
@@ -301,6 +302,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.10  2008/08/23
 %% Version 1.9  2006/11/22
 %% Version 1.8  2006/01/21
 %% Version 1.7  2005/11/15
@@ -316,7 +318,7 @@
 % 
 %
 %    \begin{macrocode}
-\ProvidesPackage{memhfixc}[2006/11/22 v1.9 nameref/hyperref package fixes for memoir class]
+\ProvidesPackage{memhfixc}[2008/08/23 v1.10 nameref/hyperref package fixes for memoir class]
 %    \end{macrocode}
 %
 % \begin{macro}{\M@hfixcfinish}
@@ -642,7 +644,8 @@
 % The need for these discovered by 
 % \v{Z}arko F \v{C}u\v{c}ej\footnote{\texttt{zarko.cucej@uni-mb.si}}
 % (for \cs{contcaption}) and by 
-% J{\o}rgen Larsen\footnote{\texttt{jl@ruc.dk}} (for \cs{sidecaption}).
+% J{\o}rgen Larsen\footnote{\texttt{jl@ruc.dk}} (for \cs{sidecaption}),
+% and by Eitan Gurari (for \texttt{tex4ht}).
 % \changes{v1.7}{2005/11/15}{Added tweaks for \cs{contcaption},
 %                \cs{sidecaption} and \cs{sidecontcaption}}
 %
@@ -651,10 +654,13 @@
 % \begin{macro}{\theHmemhycontfloat}
 % We need an extra marker for continued captions.
 % \changes{v1.7}{2005/11/15}{Added extra counter for continued captions}
+% \changes{v1.10}{2008/08/23}{Fixed \cs{theHmemhycontfloat} undefined
+%          problem (courtsesy Eitan Gurari)}
 %    \begin{macrocode}
 \newcounter{memhycontfloat}
 \renewcommand*{\thememhycontfloat}{\arabic{memhycontfloat}}
-\renewcommand{\theHmemhycontfloat}{\arabic{memhycontfloat}}
+\providecommand*{\theHmemhycontfloat}{}
+\renewcommand*{\theHmemhycontfloat}{\arabic{memhycontfloat}}
 \setcounter{memhycontfloat}{0}
 
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
index b88f00c052c..1ee23cf5f29 100644
--- a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
+++ b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
@@ -24,7 +24,7 @@
 %% 
 %%
 %% The memhfixc package provides hyperref related temporary
-%% fixes and extensions for version v1.3a of the memoir class.
+%% fixes and extensions for versions v1.618 and later of the memoir class.
 %%     o hyperref fix for part and chapter entries in the ToC (v1.0)
 %%     o Other fixes as and when
 %%
@@ -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.10  2008/08/23
 %% Version 1.9  2006/11/22
 %% Version 1.8  2006/01/21
 %% Version 1.7  2005/11/15
@@ -49,7 +50,7 @@
 %% Version 1.1  2003/01/22
 %% Version 1.0  2002/10/22
 %%
-\ProvidesPackage{memhfixc}[2006/11/22 v1.9 nameref/hyperref package fixes for memoir class]
+\ProvidesPackage{memhfixc}[2008/08/23 v1.10 nameref/hyperref package fixes for memoir class]
 \let\M@hfixcfinish\relax
 \@ifclassloaded{memoir}{}%
                        {\let\M@hfixcfinish\endinput
@@ -230,7 +231,8 @@
 
 \newcounter{memhycontfloat}
 \renewcommand*{\thememhycontfloat}{\arabic{memhycontfloat}}
-\renewcommand{\theHmemhycontfloat}{\arabic{memhycontfloat}}
+\providecommand*{\theHmemhycontfloat}{}
+\renewcommand*{\theHmemhycontfloat}{\arabic{memhycontfloat}}
 \setcounter{memhycontfloat}{0}
 
 \renewcommand{\contcaption}{%