octavo update (7mar07)

git-svn-id: svn://tug.org/texlive/trunk@4023 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 12 insertions, 18 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}
 %