summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-03-08 17:16:44 +0000
committerKarl Berry <karl@freefriends.org>2007-03-08 17:16:44 +0000
commit8c7b5e7122d9768a59bfe045ecc10a58553f375a (patch)
treea442fafe1db822a4d4a987bdb2aae49b29ccc5f7 /Master/texmf-dist/source
parent6650de3b1b197274a25cdb925f6d1f1407e04dfa (diff)
octavo update (7mar07)
git-svn-id: svn://tug.org/texlive/trunk@4023 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/octavo/octavo.dtx30
-rw-r--r--Master/texmf-dist/source/latex/octavo/octavo.ins122
2 files changed, 73 insertions, 79 deletions
diff --git a/Master/texmf-dist/source/latex/octavo/octavo.dtx b/Master/texmf-dist/source/latex/octavo/octavo.dtx
index 52eb888c464..1a1fc0a7398 100644
--- a/Master/texmf-dist/source/latex/octavo/octavo.dtx
+++ b/Master/texmf-dist/source/latex/octavo/octavo.dtx
@@ -15,13 +15,10 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
%%
-% \CheckSum{2046}
+% \CheckSum{2048}
% \iffalse
%
% \changes{1.0}{2003/07/02}{First release}
-% \changes{1.1}{2003/10/10}{Equations numbered continuously throughout
-% the text, in line with the numbering used for tables
-% and figures}
%
% \section{Identification}
% This is document class Octavo, which can be used with \LaTeX\ only,
@@ -39,7 +36,7 @@
%<*driver>
\ProvidesFile{octavo.drv}
%</driver>
- [2003/09/06 v1.1
+ [2007/03/07 v1.2
%<octavo> a LaTeX document class]
%<10pt|11pt|12pt> a LaTeX file (size option)]
% \end{macrocode}
@@ -277,7 +274,7 @@
% latter of course being too wide. What should happen is to have the inner
% margin of the even-numbered sheet coincide with the inner margins of the A5
% sheet. The simplest solution is to add a single line to the preamble of the
-% document: |\addtolength{\evensidemargin}{148.5mm-\textwidth}|, rather than
+% document: |\addtolength{\evensidemargin}{148.5mm-\paperwidth}|, rather than
% try and reposition only the even-numbered pages with dvidvi, dvips, and the
% like.
%
@@ -835,17 +832,8 @@
% of the page. Dimensions and placement of the text area is directly related
% to and determined as proportions of the dimensions of the page.
%
-% \begin{macro}{\hoffset}
-% \begin{macro}{\voffset}
-% First of all, the origin of the measurements is placed at the upper left
-% corner of the page, against the \TeX\ standard of having it 1 inch away.
-% \begin{macrocode}
-%<*10pt|11pt|12pt>
-\setlength{\hoffset}{-1in}
-\setlength{\voffset}{-1in}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
+% \changes{1.2a}{2007/03/07}{Removed changes to hoffset and voffset to maintain
+% compatibility with other class files, notably crop}
%
% \subsubsection{Vertical spacing}
%
@@ -901,10 +889,13 @@
% part of the text block, and it goes into the top margin. As |\topmargin|
% is measured from the top of the box, we have to correct for header height
% and header separation.
+% By subtracting 1 inch, the effect of voffset is overcome.
+% \changes{1.2b}{2007/03/07}{Subtract 1 inch from |topmargin| to move textblock}
% \begin{macrocode}
\setlength{\topmargin}{0.1\paperheight}
\addtolength{\topmargin}{-\headheight}
\addtolength{\topmargin}{-\headsep}
+ \addtolength{\topmargin}{-1in}
% \end{macrocode}
% \end{macro}
%
@@ -957,9 +948,13 @@
% \begin{macro}{\oddsidemargin}
% Since we are typesetting books, both even and odd side margins have to be
% set.
+% \changes{1.2c}{2007/03/07}{Subtract 1 inch from |oddsidemargin| and |evensidemargin|
+% to move textblock}
% \begin{macrocode}
\setlength{\evensidemargin}{0.2\paperwidth}
+\addtolength{\evensidemargin}{-1in}
\setlength{\oddsidemargin}{0.1\paperwidth}
+\addtolength{\oddsidemargin}{-1in}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1022,7 +1017,6 @@
%<10pt>\setlength{\skip\footins}{9\p@ \@plus 4\p@ \@minus 2\p@}
%<11pt>\setlength{\skip\footins}{10\p@ \@plus 4\p@ \@minus 2\p@}
%<12pt>\setlength{\skip\footins}{11\p@ \@plus 4\p@ \@minus 2\p@}
-%</10pt|11pt|12pt>
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/source/latex/octavo/octavo.ins b/Master/texmf-dist/source/latex/octavo/octavo.ins
index c466bc3008a..64b60359954 100644
--- a/Master/texmf-dist/source/latex/octavo/octavo.ins
+++ b/Master/texmf-dist/source/latex/octavo/octavo.ins
@@ -1,61 +1,61 @@
-%% octavo.ins
-%% Copyright 2003 Stefan A. Revets
-%%
-%% This program is provided under the terms of the LaTeX Project Public License
-%% distributed from CTAN archives in directory macros/latex/base/lppl.txt
-%%
-%% Author : Stefan A. Revets
-%% s.revets@tiscali.be
-%%
-%% This file will generate fast loadable files and documentation driver files
-%% from the doc files in this package when run through LaTeX.
-%%
-%% ---------- start of docstrip commands ----------
-%%
-\def\batchfile{octavo.ins}
-\input docstrip.tex
-
-\preamble
-
-Copyright 2003 Stefan A. Revets
-
-Author : Stefan A. Revets
- s.revets@tiscali.be
-
-The program is provided under the terms of the LaTeX Project Public License
-distributed from CTAN archives in directory macros/latex/base/lppl.txt
-
-This file is part of the Octavo Package, for the typesetting of books along
-classical layout and design ideas. It is a modification of the standard LaTeX
-book class, written by Lamport (1992), Mittelbach and Braams (1994-1997).
-
-The program consists of the files octavo.ins and octavo.dtx.
-
-\endpreamble
-
-\generate{\file{octavo.cls}{\from{octavo.dtx}{octavo}}
- \file{oct10.clo}{\from{octavo.dtx}{10pt}}
- \file{oct11.clo}{\from{octavo.dtx}{11pt}}
- \file{oct12.clo}{\from{octavo.dtx}{12pt}}
- }
-
-\ifToplevel{
-\Msg{*************************************************************************}
-\Msg{*}
-\Msg{* To finish the installation you should move the following files into}
-\Msg{* a directory searched by TeX:}
-\Msg{*}
-\Msg{* \space\space octavo.cls}
-\Msg{* \space\space oct10.clo}
-\Msg{* \space\space oct11.clo}
-\Msg{* \space\space oct12.clo}
-\Msg{*}
-\Msg{* To produce the documentation run the octavo.dtx file through LaTeX.}
-\Msg{* To add an index of macros and commands run octavo through MakeIndex.}
-\Msg{*}
-\Msg{* Happy TeXing}
-\Msg{*************************************************************************}
-}
-
-\endbatchfile
-
+%% octavo.ins
+%% Copyright 2003, 2007 Stefan A. Revets
+%%
+%% This program is provided under the terms of the LaTeX Project Public License
+%% distributed from CTAN archives in directory macros/latex/base/lppl.txt
+%%
+%% Author : Stefan A. Revets
+%% s.revets@bigpond.com
+%%
+%% This file will generate fast loadable files and documentation driver files
+%% from the doc files in this package when run through LaTeX.
+%%
+%% ---------- start of docstrip commands ----------
+%%
+\def\batchfile{octavo.ins}
+\input docstrip.tex
+
+\preamble
+
+Copyright 2003, 2007 Stefan A. Revets
+
+Author : Stefan A. Revets
+ 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
+
+This file is part of the Octavo Package, for the typesetting of books along
+classical layout and design ideas. It is a modification of the standard LaTeX
+book class, written by Lamport (1992), Mittelbach and Braams (1994-1997).
+
+The program consists of the files octavo.ins and octavo.dtx.
+
+\endpreamble
+
+\generate{\file{octavo.cls}{\from{octavo.dtx}{octavo}}
+ \file{oct10.clo}{\from{octavo.dtx}{10pt}}
+ \file{oct11.clo}{\from{octavo.dtx}{11pt}}
+ \file{oct12.clo}{\from{octavo.dtx}{12pt}}
+ }
+
+\ifToplevel{
+\Msg{*************************************************************************}
+\Msg{*}
+\Msg{* To finish the installation you should move the following files into}
+\Msg{* a directory searched by TeX:}
+\Msg{*}
+\Msg{* \space\space octavo.cls}
+\Msg{* \space\space oct10.clo}
+\Msg{* \space\space oct11.clo}
+\Msg{* \space\space oct12.clo}
+\Msg{*}
+\Msg{* To produce the documentation run the octavo.dtx file through LaTeX.}
+\Msg{* To add an index of macros and commands run octavo through MakeIndex.}
+\Msg{*}
+\Msg{* Happy TeXing}
+\Msg{*************************************************************************}
+}
+
+\endbatchfile
+