From 8c7b5e7122d9768a59bfe045ecc10a58553f375a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 8 Mar 2007 17:16:44 +0000 Subject: octavo update (7mar07) git-svn-id: svn://tug.org/texlive/trunk@4023 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/octavo/oct10.clo | 11 ++++---- Master/texmf-dist/tex/latex/octavo/oct11.clo | 11 ++++---- Master/texmf-dist/tex/latex/octavo/oct12.clo | 11 ++++---- Master/texmf-dist/tex/latex/octavo/octavo.cls | 36 ++++++++++++++++++++++++--- 4 files changed, 51 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/octavo/oct10.clo b/Master/texmf-dist/tex/latex/octavo/oct10.clo index 2f5c1658318..3cd7a956848 100644 --- a/Master/texmf-dist/tex/latex/octavo/oct10.clo +++ b/Master/texmf-dist/tex/latex/octavo/oct10.clo @@ -6,10 +6,10 @@ %% %% octavo.dtx (with options: `10pt') %% -%% Copyright 2003 Stefan A. Revets +%% Copyright 2003, 2007 Stefan A. Revets %% %% Author : Stefan A. Revets -%% s.revets@tiscali.be +%% s.revets@bigpond.com %% %% The program is provided under the terms of the LaTeX Project Public License %% distributed from CTAN archives in directory macros/latex/base/lppl.txt @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} %% \ProvidesFile{oct10.clo} - [2003/09/06 v1.1 + [2007/03/07 v1.2 a LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xpt\@xiipt @@ -77,8 +77,6 @@ \newcommand\Huge{\@setfontsize\Huge\@xxvpt{30}} \setlength\parskip{0\p@} \setlength\parindent{1em} -\setlength{\hoffset}{-1in} -\setlength{\voffset}{-1in} \setlength\headheight{12\p@} \setlength\headsep{6\p@} \setlength\topskip{10\p@} @@ -87,6 +85,7 @@ \setlength{\topmargin}{0.1\paperheight} \addtolength{\topmargin}{-\headheight} \addtolength{\topmargin}{-\headsep} + \addtolength{\topmargin}{-1in} \setlength{\textwidth}{0.7\paperwidth} \@settopoint\textwidth \setlength\@tempdima{0.7\paperheight} @@ -97,7 +96,9 @@ \setlength\textheight{\@tempcnta\baselineskip} \addtolength\textheight{\topskip} \setlength{\evensidemargin}{0.2\paperwidth} +\addtolength{\evensidemargin}{-1in} \setlength{\oddsidemargin}{0.1\paperwidth} +\addtolength{\oddsidemargin}{-1in} \if@twocolumn \setlength\marginparsep{10\p@} \else diff --git a/Master/texmf-dist/tex/latex/octavo/oct11.clo b/Master/texmf-dist/tex/latex/octavo/oct11.clo index fc9377d1d6e..4282d6bc437 100644 --- a/Master/texmf-dist/tex/latex/octavo/oct11.clo +++ b/Master/texmf-dist/tex/latex/octavo/oct11.clo @@ -6,10 +6,10 @@ %% %% octavo.dtx (with options: `11pt') %% -%% Copyright 2003 Stefan A. Revets +%% Copyright 2003, 2007 Stefan A. Revets %% %% Author : Stefan A. Revets -%% s.revets@tiscali.be +%% s.revets@bigpond.com %% %% The program is provided under the terms of the LaTeX Project Public License %% distributed from CTAN archives in directory macros/latex/base/lppl.txt @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} %% \ProvidesFile{oct11.clo} - [2003/09/06 v1.1 + [2007/03/07 v1.2 a LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xipt{13.2}% @@ -77,8 +77,6 @@ \newcommand\Huge{\@setfontsize\Huge\@xxvpt{30}} \setlength\parskip{0\p@} \setlength\parindent{1em} -\setlength{\hoffset}{-1in} -\setlength{\voffset}{-1in} \setlength\headheight{12\p@} \setlength\headsep{7\p@} \setlength\topskip{11\p@} @@ -87,6 +85,7 @@ \setlength{\topmargin}{0.1\paperheight} \addtolength{\topmargin}{-\headheight} \addtolength{\topmargin}{-\headsep} + \addtolength{\topmargin}{-1in} \setlength{\textwidth}{0.7\paperwidth} \@settopoint\textwidth \setlength\@tempdima{0.7\paperheight} @@ -97,7 +96,9 @@ \setlength\textheight{\@tempcnta\baselineskip} \addtolength\textheight{\topskip} \setlength{\evensidemargin}{0.2\paperwidth} +\addtolength{\evensidemargin}{-1in} \setlength{\oddsidemargin}{0.1\paperwidth} +\addtolength{\oddsidemargin}{-1in} \if@twocolumn \setlength\marginparsep{10\p@} \else diff --git a/Master/texmf-dist/tex/latex/octavo/oct12.clo b/Master/texmf-dist/tex/latex/octavo/oct12.clo index e8e4f9a5bd9..c42a52eba24 100644 --- a/Master/texmf-dist/tex/latex/octavo/oct12.clo +++ b/Master/texmf-dist/tex/latex/octavo/oct12.clo @@ -6,10 +6,10 @@ %% %% octavo.dtx (with options: `12pt') %% -%% Copyright 2003 Stefan A. Revets +%% Copyright 2003, 2007 Stefan A. Revets %% %% Author : Stefan A. Revets -%% s.revets@tiscali.be +%% s.revets@bigpond.com %% %% The program is provided under the terms of the LaTeX Project Public License %% distributed from CTAN archives in directory macros/latex/base/lppl.txt @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} %% \ProvidesFile{oct12.clo} - [2003/09/06 v1.1 + [2007/03/07 v1.2 a LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xiipt\@xivpt @@ -77,8 +77,6 @@ \let\Huge=\huge \setlength\parskip{0\p@} \setlength\parindent{1em} -\setlength{\hoffset}{-1in} -\setlength{\voffset}{-1in} \setlength\headheight{12\p@} \setlength\headsep{8\p@} \setlength\topskip{12\p@} @@ -87,6 +85,7 @@ \setlength{\topmargin}{0.1\paperheight} \addtolength{\topmargin}{-\headheight} \addtolength{\topmargin}{-\headsep} + \addtolength{\topmargin}{-1in} \setlength{\textwidth}{0.7\paperwidth} \@settopoint\textwidth \setlength\@tempdima{0.7\paperheight} @@ -97,7 +96,9 @@ \setlength\textheight{\@tempcnta\baselineskip} \addtolength\textheight{\topskip} \setlength{\evensidemargin}{0.2\paperwidth} +\addtolength{\evensidemargin}{-1in} \setlength{\oddsidemargin}{0.1\paperwidth} +\addtolength{\oddsidemargin}{-1in} \if@twocolumn \setlength\marginparsep{10\p@} \else diff --git a/Master/texmf-dist/tex/latex/octavo/octavo.cls b/Master/texmf-dist/tex/latex/octavo/octavo.cls index 9d13c612ff6..d95d3489362 100644 --- a/Master/texmf-dist/tex/latex/octavo/octavo.cls +++ b/Master/texmf-dist/tex/latex/octavo/octavo.cls @@ -6,10 +6,10 @@ %% %% octavo.dtx (with options: `octavo') %% -%% Copyright 2003 Stefan A. Revets +%% Copyright 2003, 2007 Stefan A. Revets %% %% Author : Stefan A. Revets -%% s.revets@tiscali.be +%% s.revets@bigpond.com %% %% The program is provided under the terms of the LaTeX Project Public License %% distributed from CTAN archives in directory macros/latex/base/lppl.txt @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{octavo} - [2003/09/06 v1.1 + [2007/03/07 v1.2 a LaTeX document class] \newcommand\@ptsize{} \newif\if@restonecol @@ -108,6 +108,36 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 +\setlength\headheight{12\p@} +\setlength\maxdepth{0.5\topskip} +\setlength{\topmargin}{0.1\paperheight} + \addtolength{\topmargin}{-\headheight} + \addtolength{\topmargin}{-\headsep} + \addtolength{\topmargin}{-1in} +\setlength{\textwidth}{0.7\paperwidth} + \@settopoint\textwidth +\setlength\@tempdima{0.7\paperheight} + \addtolength\@tempdima{-\topskip} + \addtolength\@tempdima{5\p@} + \divide\@tempdima\baselineskip + \@tempcnta=\@tempdima + \setlength\textheight{\@tempcnta\baselineskip} + \addtolength\textheight{\topskip} +\setlength{\evensidemargin}{0.2\paperwidth} +\addtolength{\evensidemargin}{-1in} +\setlength{\oddsidemargin}{0.1\paperwidth} +\addtolength{\oddsidemargin}{-1in} +\if@twocolumn + \setlength\marginparsep{10\p@} +\else +\fi +\setlength\@tempdima{\paperwidth} + \addtolength\@tempdima{-\textwidth} + \addtolength\@tempdima{-\oddsidemargin} + \addtolength\@tempdima{-\marginparsep} + \addtolength\@tempdima{-30\p@} + \setlength\marginparwidth{\@tempdima} + \@settopoint\marginparwidth \setcounter{topnumber}{2} \renewcommand\topfraction{.7} \setcounter{bottomnumber}{1} -- cgit v1.2.3