summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/memoir/mem17.clo
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-06-02 14:38:57 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-06-02 14:38:57 +0000
commit82d52884d37b1a23afa751837ee5df24e03a99a4 (patch)
tree48ee8859c29f8239296f846b3b26a8d249ea5576 /Master/texmf-dist/tex/latex/memoir/mem17.clo
parent968c2c8410e2d768d324c6f06c6a92395b77cf16 (diff)
memoir v1.61803
git-svn-id: svn://tug.org/texlive/trunk@8483 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/memoir/mem17.clo')
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem17.clo51
1 files changed, 28 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/memoir/mem17.clo b/Master/texmf-dist/tex/latex/memoir/mem17.clo
index 7950e67dc83..4157a346a45 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem17.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem17.clo
@@ -8,7 +8,7 @@
%%
%% Author: Peter Wilson (herries dot press at earthlink dot net)
%% Herries Press
-%% Copyright 2001--2005 Peter R. Wilson
+%% Copyright 2001--2008 Peter R. Wilson
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -24,8 +24,7 @@
%% This work consists of the files listed in the README file.
%%
\ProvidesFile{mem17.clo}%
- [2004/03/12 v0.2 memoir class 17pt size option]
-
+ [2008/01/30 v0.3 memoir class 17pt size option]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xviipt{22}%
\abovedisplayskip 15\p@ \@plus4\p@ \@minus8\p@
@@ -60,36 +59,42 @@
}%
\belowdisplayskip \abovedisplayskip
}
-\newcommand{\miniscule}{\@setfontsize\miniscule\@ixpt{10}}
-\newcommand{\tiny}{\@setfontsize\tiny\@xpt{12}}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@xipt{13.6}}
-\newcommand{\large}{\@setfontsize\large\@xxpt{25}}
-\newcommand{\Large}{\@setfontsize\Large\@xxvpt{30}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xxvpt{30}}
-\let\LARGE=\Large
-\let\huge=\Large
-\let\Huge=\Large
-\let\HUGE=\Large
+\newcommand*{\miniscule}{\@setfontsize\miniscule\@ixpt{10}}
+\newcommand*{\tiny}{\@setfontsize\tiny\@xpt{12}}
+\newcommand*{\scriptsize}{\@setfontsize\scriptsize\@xipt{13.6}}
+\newcommand*{\large}{\@setfontsize\large\@xxpt{25}}
+\newcommand*{\Large}{\@setfontsize\Large\@xxvpt{30}}
+\ifextrafontsizes
+ \newcommand*{\LARGE}{\@setfontsize\LARGE\@xxxpt{37}}
+ \newcommand*{\huge}{\@setfontsize\huge\@xxxvipt{45}}
+ \newcommand*{\Huge}{\@setfontsize\Huge\@xlviiipt{60}}
+ \newcommand*{\HUGE}{\@setfontsize\HUGE\@lxpt{72}}
+\else
+ \let\LARGE=\Large
+ \let\huge=\Large
+ \let\Huge=\Large
+ \let\HUGE=\Large
+\fi
\setlength{\onelineskip}{22\p@}
\if@twocolumn
\setlength\parindent{1em}
\else
\setlength\parindent{1.5em}
\fi
-\setlength\smallskipamount{3\p@ \@plus 1\p@ \@minus 1\p@}
-\setlength\medskipamount{6\p@ \@plus 2\p@ \@minus 2\p@}
-\setlength\bigskipamount{12\p@ \@plus 4\p@ \@minus 4\p@}
+\setlength\smallskipamount{4\p@ \@plus1\p@ \@minus1\p@}
+\setlength\medskipamount{8\p@ \@plus2\p@ \@minus2\p@}
+\setlength\bigskipamount{17\p@ \@plus4\p@ \@minus4\p@}
\setlength\headheight{22\p@}
\setlength\headsep{.30in}
\setlength\topskip{14.4\p@}
\setlength\footskip{.4in}
\setlength\maxdepth{.5\topskip}
\setlength\@maxdepth\maxdepth
-\setlength\footnotesep{12\p@} %% ????????
-\setlength{\skip\footins}{14\p@ \@plus 5\p@ \@minus 3\p@}
+\setlength\footnotesep{10.15\p@}
+\setlength{\skip\footins}{16\p@ \@plus 5\p@ \@minus 3\p@}
\setlength\floatsep {15\p@ \@plus 4\p@ \@minus 4\p@}
-\setlength\textfloatsep{25\p@ \@plus 5\p@ \@minus 5\p@}
-\setlength\intextsep {16\p@ \@plus 5\p@ \@minus 5\p@}
+\setlength\textfloatsep{25\p@ \@plus 4\p@ \@minus 5\p@}
+\intextsep \floatsep
\setlength\dblfloatsep {15\p@ \@plus 4\p@ \@minus 4\p@}
\setlength\dbltextfloatsep{25\p@ \@plus 5\p@ \@minus 5\p@}
\setlength\@fptop{0\p@ \@plus 1fil}
@@ -101,11 +106,11 @@
\setlength\lxvchars{444\p@} %
\setlength\xlvchars{312\p@} %
\if@twocolumn
- \setlength\marginparsep{10\p@}
+ \setlength\marginparsep{1em}
\else
- \setlength\marginparsep{7\p@}
+ \setlength\marginparsep{0.7em}
\fi
-\setlength{\marginparpush}{10\p@}
+ \setlength\marginparpush{0.5em}
\endinput
%%
%% End of file `mem17.clo'.