12 files changed, 191 insertions, 148 deletions
diff --git a/Master/texmf-dist/doc/latex/octavo/read.me b/Master/texmf-dist/doc/latex/octavo/README
index e37b493c91b..41e995f55ff 100644
--- a/Master/texmf-dist/doc/latex/octavo/read.me
+++ b/Master/texmf-dist/doc/latex/octavo/README
@@ -1,43 +1,43 @@
-=====================================================================
-
-Readme file for the class Octavo v. 1.1.  
-
-=====================================================================
-
-The octavo class is a modification of the standard LaTeX book 
-class. Its purpose is to typeset books following classical 
-design and layout principles, with the express intention of 
-encouraging the making of beautiful books by anyone with access
-to a good printer and with an inclination towards venerable 
-crafts, in casu, bookbinding.
-
-The octavo class differs from the book class by implementing 
-many of the proposals and insights of especially Jan Tschichold 
-and Hugh Williamson.
-
-In particular, the class implements classical formats (foolscap,
-crown, post, largepost, demy, medium, royal, superroyal and imperial), 
-a harmonious definition of margins (following the studies by 
-Tschichold and Rosarivo), and attempts to maintain a uniform grid 
-of printed lines across the entire text. The main page style is 
-modified to a more discrete form (following Hugh Williamson).
-
-The documentation includes methods to organise and print out 
-any text into signatures, which can then be gathered, folded 
-and sewn into a book.
-
-Install the octavo class, written in doctex format, by running the
-octavo.ins file through LaTeX and moving the class and class option
-files to a directory where LaTeX can find them. The documentation,
-and documented code, is generated by running octavo.dtx through
-LaTeX (and MakeIndex)
-
-If problems or difficulties crop up or if you wish to make suggestions,
-you can contact me either through UseNet's comp.text.tex, or by sending
-me an e-mail at
-
-     s.revets@tiscali.be
-
-Stefan A. Revets
-10 October 2003
-
+=====================================================================
+
+Readme file for the class Octavo v. 1.2.  
+
+=====================================================================
+
+The octavo class is a modification of the standard LaTeX book 
+class. Its purpose is to typeset books following classical 
+design and layout principles, with the express intention of 
+encouraging the making of beautiful books by anyone with access
+to a good printer and with an inclination towards venerable 
+crafts, in casu, bookbinding.
+
+The octavo class differs from the book class by implementing 
+many of the proposals and insights of especially Jan Tschichold 
+and Hugh Williamson.
+
+In particular, the class implements classical formats (foolscap,
+crown, post, largepost, demy, medium, royal, superroyal and imperial), 
+a harmonious definition of margins (following the studies by 
+Tschichold and Rosarivo), and attempts to maintain a uniform grid 
+of printed lines across the entire text. The main page style is 
+modified to a more discrete form (following Hugh Williamson).
+
+The documentation includes methods to organise and print out 
+any text into signatures, which can then be gathered, folded 
+and sewn into a book.
+
+Install the octavo class, written in doctex format, by running the
+octavo.ins file through LaTeX and moving the class and class option
+files to a directory where LaTeX can find them. The documentation,
+and documented code, is generated by running octavo.dtx through
+LaTeX (and MakeIndex)
+
+If problems or difficulties crop up or if you wish to make suggestions,
+you can contact me either through UseNet's comp.text.tex, or by sending
+me an e-mail at
+
+     s.revets@bigpond.com
+
+Stefan A. Revets
+7 March 2007
+
diff --git a/Master/texmf-dist/doc/latex/octavo/changes b/Master/texmf-dist/doc/latex/octavo/changes
new file mode 100644
index 00000000000..25bacec01cb
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/octavo/changes
@@ -0,0 +1,14 @@
+Octavo, a documentclass for LaTeX
+
+2 July 2003. Version 1.0.
+	First release
+
+10 October 2004. Version 1.1.
+	Changed the equation numbering so that it runs continuously
+	throughout the entire text.
+
+7 March 2007. Version 1.2.
+	Changed positioning of the textblock by returning hoffset and
+	voffset to their standard values, and by subtracting the 1 inch
+	from topmargin, oddsidemargin and evensidemargin. This ensures
+	compatibility with the crop package.
+\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/octavo/octavo.pdf b/Master/texmf-dist/doc/latex/octavo/octavo.pdf
deleted file mode 100644
index 7afdacc1e6f..00000000000
--- a/Master/texmf-dist/doc/latex/octavo/octavo.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/octavo/tub-octavo.pdf b/Master/texmf-dist/doc/latex/octavo/tub-octavo.pdf
new file mode 100644
index 00000000000..9e1206306dc
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/octavo/tub-octavo.pdf
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
+
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}
diff --git a/Master/texmf-dist/tpm/octavo.tpm b/Master/texmf-dist/tpm/octavo.tpm
index 7516f22bd79..08e731b6f5e 100644
--- a/Master/texmf-dist/tpm/octavo.tpm
+++ b/Master/texmf-dist/tpm/octavo.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/octavo.zip">
     <TPM:Name>octavo</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/01/11 23:55:44</TPM:Date>
+    <TPM:Date>2007/03/07 04:59:05</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>karl</TPM:Creator>
     <TPM:Title>The octavo package.</TPM:Title>
@@ -12,18 +12,19 @@
     <TPM:Size>420044</TPM:Size>
     <TPM:License></TPM:License>
     <TPM:Build/>
-    <TPM:RunFiles size="37381">
+    <TPM:RunFiles size="38597">
 texmf-dist/tex/latex/octavo/oct10.clo
 texmf-dist/tex/latex/octavo/oct11.clo
 texmf-dist/tex/latex/octavo/oct12.clo
 texmf-dist/tex/latex/octavo/octavo.cls
 texmf-dist/tpm/octavo.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="277945">
-texmf-dist/doc/latex/octavo/octavo.pdf
-texmf-dist/doc/latex/octavo/read.me
+    <TPM:DocFiles size="190115">
+texmf-dist/doc/latex/octavo/README
+texmf-dist/doc/latex/octavo/changes
+texmf-dist/doc/latex/octavo/tub-octavo.pdf
     </TPM:DocFiles>
-    <TPM:SourceFiles size="104718">
+    <TPM:SourceFiles size="107617">
 texmf-dist/source/latex/octavo/octavo.dtx
 texmf-dist/source/latex/octavo/octavo.ins
     </TPM:SourceFiles>
diff --git a/Master/texmf/lists/octavo b/Master/texmf/lists/octavo
index c414c63f460..adb81d2387a 100644
--- a/Master/texmf/lists/octavo
+++ b/Master/texmf/lists/octavo
@@ -1,5 +1,6 @@
-texmf-dist/doc/latex/octavo/octavo.pdf
-texmf-dist/doc/latex/octavo/read.me
+texmf-dist/doc/latex/octavo/README
+texmf-dist/doc/latex/octavo/changes
+texmf-dist/doc/latex/octavo/tub-octavo.pdf
 texmf-dist/source/latex/octavo/octavo.dtx
 texmf-dist/source/latex/octavo/octavo.ins
 texmf-dist/tex/latex/octavo/oct10.clo