From 5f004174ff5e0d73d78e2c5af7fb19f67997d3b0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 9 Sep 2010 00:06:02 +0000 Subject: memoir 3.6f (23aug10) git-svn-id: svn://tug.org/texlive/trunk@19620 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/memoir/memoir.dtx | 36 +++++++++++++++++++--- Master/texmf-dist/source/latex/memoir/mempatch.dtx | 8 +++-- 2 files changed, 36 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx index 2408ac87378..e30256880ba 100644 --- a/Master/texmf-dist/source/latex/memoir/memoir.dtx +++ b/Master/texmf-dist/source/latex/memoir/memoir.dtx @@ -18,7 +18,7 @@ % This work consists of the files listed in the README file. % % \fi -% \CheckSum{29487} +% \CheckSum{29497} % % \changes{v0.1}{2001/05/20}{First public alpha release} % \changes{v0.2}{2001/06/03}{First beta release} @@ -99,6 +99,7 @@ % % \changes{v3.6}{2010/04/19}{Reversioned memoir to a more suitable scheme} % \changes{v3.6d}{2010/07/01}{Various bug fixes} +% \changes{v3.6e}{2010/08/20}{Maintenance} % % \def\dtxfile{memoir.dtx} % @@ -140,6 +141,7 @@ % \def\fileversion{v1.618033988c} \def\filedate{2010/02/20} % \def\fileversion{v3.6} \def\filedate{2010/04/19} % \def\fileversion{v3.6d} \def\filedate{2010/07/01} +% \def\fileversion{v3.6e} \def\filedate{2010/08/20} % \title{The LaTeX \Lpack{memoir} class for configurable book % typesetting: Source code\thanks{This % file (\texttt{\dtxfile}) has version number \fileversion, last revised @@ -367,7 +369,7 @@ % Announce the name, option files and version for LaTeX2e files: % \begin{macrocode} %\ProvidesClass{memoir}% -% [2010/07/01 v3.6d configurable book, report, article document class] +% [2010/08/20 v3.6e 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}% @@ -8417,6 +8419,7 @@ % \changes{v1.0}{2001/10/24}{Changed chapter page clearing to \cs{clearforchapter}} % \changes{v1.2}{2002/07/27}{New optarg in \cs{chapter} for short heading} % \changes{v1.618}{2005/09/03}{Made article chapter start on a newline (mempatch v3.5)} +% \changes{v3.6e}{2010/07/16}{Factored out the \cs{@afterindentfalse}} % \begin{macrocode} \newcommand\chapter{% \ifartopt\par\else @@ -8424,12 +8427,35 @@ \thispagestyle{chapter} \global\@topnum\z@ \fi - \@afterindentfalse +% \@afterindentfalse + \m@mindentafterchapter \@ifstar{\@m@mschapter}{\@m@mchapter}} % \end{macrocode} % \end{macro} % +% \begin{macro}{\m@mindentafterchapter} +% \begin{macro}{\indentafterchapter} +% \begin{macro}{\noindentafterchapter} +% In order to make whether to indent the first paragraph after af +% chapter configurable, we store \verb?\@afterindenttrue/false? in +% \verb?\m@mindentafterchapter?, and provide +% \verb?\indentafterchapter? and \verb?\noindentafterchapter? to set +% it to a suitable value. +% \begin{macrocode} +\newcommand*\indentafterchapter{\def\m@mindentafterchapter{\@afterindenttrue}} +\newcommand*\noindentafterchapter{\def\m@mindentafterchapter{\@afterindentfalse}} +% \end{macrocode} +% Default is not to indent. +% \begin{macrocode} +\noindentafterchapter + +% \end{macrocode} +% +% \end{macro} +% \end{macro} +% \end{macro} +% % \begin{macro}{\@m@mchapter} % \begin{macro}{\ch@pt@c} % \begin{macro}{\m@m@empty} @@ -24012,9 +24038,9 @@ % % \changes{v1.6180339c}{2008/12/24}{Changed \cs{parnopar} to limit its effect % to a single instance} +% \changes{v3.6e}{2010/08/17}{made \cs{parnopar} sit inside a group} % \begin{macrocode} -\newcommand{\parnopar}{\parfillskip=0pt\par\parskip=0pt\noindent - \parfillskip\@flushglue} +\newcommand*{\parnopar}{{\parfillskip=0pt\par\parskip=0pt\noindent}} % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.dtx b/Master/texmf-dist/source/latex/memoir/mempatch.dtx index 8a279007fe4..b1e27f3a56e 100644 --- a/Master/texmf-dist/source/latex/memoir/mempatch.dtx +++ b/Master/texmf-dist/source/latex/memoir/mempatch.dtx @@ -308,6 +308,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.15 2010/08/17 %% Version 1.14 2010/06/10 %% Version 1.13 2010/04/19 %% Version 1.12 2009/02/06 @@ -328,7 +329,7 @@ % % % \begin{macrocode} -\ProvidesPackage{memhfixc}[2010/06/10 v1.14 nameref/hyperref package fixes for memoir class] +\ProvidesPackage{memhfixc}[2010/08/17 v1.15 nameref/hyperref package fixes for memoir class] % \end{macrocode} % % \begin{macro}{\M@hfixcfinish} @@ -595,11 +596,12 @@ % % \begin{macro}{\M@sect} % \Lpack{hyperref} fix for memoir's redefinition of \cs{@sect} -% \changes{v3.6d}{2010/06/10}{At some point hyperref changed the way +% \changes{v1.14}{2010/06/10}{At some point hyperref changed the way % it changed \cs{@sect} such that the link target goes above the % section title. Here we bring memoir back up to speed} % The change being made is quite simple. We use \cs{M@sect} and it % takes 9 args not the standard 8. +% \changes{v1.15}{2010/08/17}{Fixed typo, 8 -> \#8} % \begin{macrocode} \@ifundefined{H@old@sectm@m}{% haven't fiddled with \M@sect \let\H@old@sectm@m\M@sect @@ -613,7 +615,7 @@ \Hy@MakeCurrentHrefAuto{section*}% \setlength{\Hy@SectionHShift}{#3}% \begingroup - \toks@{\H@old@sectm@m{#1}{#2}{#3}{#4}{#5}{#6}[{#7}][{8}]}% + \toks@{\H@old@sectm@m{#1}{#2}{#3}{#4}{#5}{#6}[{#7}][{#8}]}% \toks\tw@\expandafter{% \expandafter\Hy@SectionAnchorHref\expandafter{\@currentHref}% #9% -- cgit v1.2.3