From d2bbc374debd067a6653722ff8c069db5d150a9b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 29 Jun 2013 15:41:41 +0000 Subject: memoir (30may13) git-svn-id: svn://tug.org/texlive/trunk@31044 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/memoir/README | 11 +++++++++++ Master/texmf-dist/doc/latex/memoir/memman.pdf | Bin 2729160 -> 2728670 bytes Master/texmf-dist/source/latex/memoir/memoir.dtx | 12 +++++++++--- Master/texmf-dist/source/latex/memoir/mempatch.dtx | 13 +++++++++++-- Master/texmf-dist/tex/latex/memoir/memhfixc.sty | 5 ++++- Master/texmf-dist/tex/latex/memoir/memoir.cls | 5 +++-- 6 files changed, 38 insertions(+), 8 deletions(-) diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README index b4f5fb13ccd..f78f10918b6 100644 --- a/Master/texmf-dist/doc/latex/memoir/README +++ b/Master/texmf-dist/doc/latex/memoir/README @@ -36,6 +36,17 @@ o Backmatter: Bibliography, indexes ~ 50 pages +Changed (2013/05/30) + +o memoir v3.7b + +-- bugfix sidecontcaption + +o memhfixc v1.17 + +-- bugfix sidecaption and sidecontcaption + + Changed (2013/05/22) o memoir v3.7 diff --git a/Master/texmf-dist/doc/latex/memoir/memman.pdf b/Master/texmf-dist/doc/latex/memoir/memman.pdf index 39f03cdbd39..f47c6536976 100644 Binary files a/Master/texmf-dist/doc/latex/memoir/memman.pdf and b/Master/texmf-dist/doc/latex/memoir/memman.pdf differ diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx index 037a064042d..875187fdaf0 100644 --- a/Master/texmf-dist/source/latex/memoir/memoir.dtx +++ b/Master/texmf-dist/source/latex/memoir/memoir.dtx @@ -20,7 +20,7 @@ % This work consists of the files listed in the README file. % % \fi -% \CheckSum{30566} +% \CheckSum{30567} % % \changes{v0.1}{2001/05/20}{First public alpha release} % \changes{v0.2}{2001/06/03}{First beta release} @@ -109,6 +109,7 @@ % \changes{v3.6j}{2011/03/06}{Bug fixes} % \changes{v3.6k}{2013/05/17}{Various fixes and long overdue maintenance} % \changes{v3.7}{2013/05/22}{Bumped version} +% \changes{v3.7b}{2013/05/30}{Bugfix, sidecaption} % % \def\dtxfile{memoir.dtx} % @@ -158,6 +159,7 @@ % \def\fileversion{v3.6j} \def\filedate{2011/03/06} % \def\fileversion{v3.6k} \def\filedate{2013/05/17} % \def\fileversion{v3.7} \def\filedate{2013/05/22} +% \def\fileversion{v3.7b} \def\filedate{2013/05/30} % \title{The LaTeX \Lpack{memoir} class for configurable book % typesetting: Source code\thanks{This % file (\texttt{\dtxfile}) has version number \fileversion, last revised @@ -387,11 +389,11 @@ % Announce the name, option files and version for LaTeX2e files: % \begin{macrocode} %\ProvidesClass{memoir}% -% [2013/05/22 v3.7 configurable book, report, article document class] +% [2013/05/30 v3.7b configurable book, report, article document class] % \end{macrocode} % In the manual it is useful to know the current version. % \begin{macrocode} -%\newcommand\memversion{v3.7, 2013/05/22} +%\newcommand\memversion{v3.7b, 2013/05/30} %<9pt>\ProvidesFile{mem9.clo}% %<9pt> [2008/01/30 v0.4 memoir class 9pt size option] %<10pt>\ProvidesFile{mem10.clo}% @@ -20775,6 +20777,10 @@ \m@mscapend@fbox \addtocounter{\@captype}{\m@ne}\refstepcounter\@captype \m@mscaplabel +% \end{macrocode} +% \changes{v3.7b}{2013/05/30}{Forgot the side check} +% \begin{macrocode} + \m@mscapcheckside %<--- added 2013/05/30 \begin{lrbox}{\m@mscap@capbox}% \begin{minipage}[c]{\sidecapwidth}% \sidecapstyle diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.dtx b/Master/texmf-dist/source/latex/memoir/mempatch.dtx index 9af83830b3e..62c730d0c29 100644 --- a/Master/texmf-dist/source/latex/memoir/mempatch.dtx +++ b/Master/texmf-dist/source/latex/memoir/mempatch.dtx @@ -20,7 +20,7 @@ % % % \fi -% \CheckSum{612} +% \CheckSum{614} % % \def\dtxfile{\texttt{mempatch.dtx}} % \def\fileversion{v1.0} \def\filedate{2003/10/04} @@ -309,6 +309,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.17 2013/05/30 %% Version 1.16 2013/05/16 %% Version 1.15 2010/08/17 %% Version 1.14 2010/06/10 @@ -331,7 +332,7 @@ % % % \begin{macrocode} -\ProvidesPackage{memhfixc}[2013/05/16 v1.16 nameref/hyperref package fixes for memoir class] +\ProvidesPackage{memhfixc}[2013/05/30 v1.17 nameref/hyperref package fixes for memoir class] % \end{macrocode} % % \begin{macro}{\M@hfixcfinish} @@ -739,6 +740,10 @@ \H@refstepcounter{\@captype}% \hyper@makecurrent{\@captype}% \m@mscaplabel +% \end{macrocode} +% \changes{v1.17}{2013/05/30}{Forgot to add \cs{m@mscapcheckside}} +% \begin{macrocode} + \m@mscapcheckside %<--- added 2013/05/30 \begin{lrbox}{\m@mscap@capbox}% \begin{minipage}[c]{\sidecapwidth}% \sidecapstyle @@ -764,6 +769,10 @@ \addtocounter{\@captype}{\m@ne}\H@refstepcounter{\@captype}% \hyper@makecurrent{memhycontfloat}% \m@mscaplabel +% \end{macrocode} +% \changes{v1.17}{2013/05/30}{Forgot to add \cs{m@mscapcheckside}} +% \begin{macrocode} + \m@mscapcheckside %<--- added 2013/05/30 \begin{lrbox}{\m@mscap@capbox}% \begin{minipage}[c]{\sidecapwidth}% \sidecapstyle diff --git a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty index 122c994c50a..9d4e090f079 100644 --- a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty +++ b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty @@ -40,6 +40,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.17 2013/05/30 %% Version 1.16 2013/05/16 %% Version 1.15 2010/08/17 %% Version 1.14 2010/06/10 @@ -58,7 +59,7 @@ %% Version 1.1 2003/01/22 %% Version 1.0 2002/10/22 %% -\ProvidesPackage{memhfixc}[2013/05/16 v1.16 nameref/hyperref package fixes for memoir class] +\ProvidesPackage{memhfixc}[2013/05/30 v1.17 nameref/hyperref package fixes for memoir class] \let\M@hfixcfinish\relax \@ifclassloaded{memoir}{}% {\let\M@hfixcfinish\endinput @@ -257,6 +258,7 @@ \H@refstepcounter{\@captype}% \hyper@makecurrent{\@captype}% \m@mscaplabel + \m@mscapcheckside %<--- added 2013/05/30 \begin{lrbox}{\m@mscap@capbox}% \begin{minipage}[c]{\sidecapwidth}% \sidecapstyle @@ -273,6 +275,7 @@ \addtocounter{\@captype}{\m@ne}\H@refstepcounter{\@captype}% \hyper@makecurrent{memhycontfloat}% \m@mscaplabel + \m@mscapcheckside %<--- added 2013/05/30 \begin{lrbox}{\m@mscap@capbox}% \begin{minipage}[c]{\sidecapwidth}% \sidecapstyle diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls index c984946c539..a0be2433cbc 100644 --- a/Master/texmf-dist/tex/latex/memoir/memoir.cls +++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls @@ -28,8 +28,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{memoir}% - [2013/05/22 v3.7 configurable book, report, article document class] -\newcommand\memversion{v3.7, 2013/05/22} + [2013/05/30 v3.7b configurable book, report, article document class] +\newcommand\memversion{v3.7b, 2013/05/30} \newcommand*{\@ptsize}{} \newcommand*{\@memptsize}{} \newlength{\onelineskip} @@ -7220,6 +7220,7 @@ \m@mscapend@fbox \addtocounter{\@captype}{\m@ne}\refstepcounter\@captype \m@mscaplabel + \m@mscapcheckside %<--- added 2013/05/30 \begin{lrbox}{\m@mscap@capbox}% \begin{minipage}[c]{\sidecapwidth}% \sidecapstyle -- cgit v1.2.3