summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/memoir
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-11-18 01:54:43 +0000
committerKarl Berry <karl@freefriends.org>2009-11-18 01:54:43 +0000
commitc0e6fdd751429d06c130e619a2040f846e20671a (patch)
tree94a7daf760f634f2d60ff5baa3af2ae06261332d /Master/texmf-dist/tex/latex/memoir
parent5355c862d986486a8c789909f03ba5de4069c0db (diff)
memoir v1.61803398c (16nov09)
git-svn-id: svn://tug.org/texlive/trunk@16056 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/memoir')
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memoir.cls42
1 files changed, 35 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index bc4356fdc00..b1c222f7702 100644
--- a/Master/texmf-dist/tex/latex/memoir/memoir.cls
+++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{memoir}%
- [2009/09/21 v1.61803398b configurable book, report, article document class]
+ [2009/11/17 v1.61803398c configurable book, report, article document class]
\newcommand*{\@ptsize}{}
\newcommand*{\@memptsize}{}
\newlength{\onelineskip}
@@ -2063,7 +2063,7 @@
{\@iiminipage{t}}{\@iiiminipage{t}\relax[s]}}
\newif\ifm@mnzpskip
\newcommand*{\traditionalparskip}{%
- \parskip \z@
+ \setlength\parskip{0\p@ \@plus \p@}
\m@mnzpskipfalse}
\newskip\m@mabparskip
\newcommand*{\abnormalparskip}[1]{%
@@ -2982,6 +2982,10 @@
\chapnamefont\bfseries\sffamily\thechapter}
}%
}%
+ \renewcommand*{\printchapternonum}{%
+ \chapnamefont \phantom{\printchaptername \chapternamenum \printchapternum}
+ \afterchapternum %
+ }%
\renewcommand*{\afterchapternum}{%
\par\hspace{1.5cm}\hrule\vskip\midchapskip}}
@@ -9530,10 +9534,30 @@
\newcommand*{\tmarkbl}{\trimmark}
\newcommand*{\tmarkbr}{\trimmark}
-\newcommand*{\tmarktm}{}
-\newcommand*{\tmarkml}{}
-\newcommand*{\tmarkmr}{}
-\newcommand*{\tmarkbm}{}
+\newcommand*{\tmarktm}{%
+ \begin{picture}(0,0)%
+ \unitlength 1mm
+ \thinlines
+ \put(0,2){\line(0,1){10}}
+ \end{picture}}
+\newcommand*{\tmarkml}{%
+ \begin{picture}(0,0)%
+ \unitlength 1mm
+ \thinlines
+ \put(-2,0){\line(-1,0){10}}
+ \end{picture}}
+\newcommand*{\tmarkmr}{%
+ \begin{picture}(0,0)%
+ \unitlength 1mm
+ \thinlines
+ \put(2,0){\line(1,0){10}}
+ \end{picture}}
+\newcommand*{\tmarkbm}{%
+ \begin{picture}(0,0)%
+ \unitlength 1mm
+ \thinlines
+ \put(0,-12){\line(0,1){10}}
+ \end{picture}}
\newcommand*{\trimXmarks}{%
\let\tmarktl\trimmark
@@ -9671,7 +9695,11 @@
\mem@oldshipout\box\@cclv
\else
\ifshowtrims
- \mem@oldshipout\vbox{\trimmarks \ifvbox \@cclv \unvbox \else \box \fi \@cclv}%
+ \mem@oldshipout\vbox{%
+ \trimmarks
+ \nointerlineskip
+ \box\@cclv
+ }%
\else
\mem@oldshipout\box\@cclv
\fi