paper doc update (1jun08)

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

18 files changed, 202 insertions, 175 deletions

diff --git a/Master/texmf-dist/doc/latex/paper/README b/Master/texmf-dist/doc/latex/paper/README
new file mode 100644
index 00000000000..9618e6f498e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/paper/README
@@ -0,0 +1,24 @@
+The files in the archive paper??.zip include the following
+supported macros and files for LaTeX2e:
+
+        paper.dtx      latex-style files paper and journal 
+                       in doc option format
+        paper.pdf      documentation in pdf format 
+        install        driver for installing the package
+        local.tex      input to the local latex-guide "`local.tex"'
+        testp.tex      example input text for paper
+        testj.tex      example input text for journal
+        journal1.tex   example input text for journal
+        journal2.tex   example input text for journal
+        README         this file
+
+Run `latex install' to generate the class files paper.cls and 
+journal.cls (as well as paper.sty and journal.sty, for compatibility). 
+This needs the `docstrip' utility. Then run `latex paper.drv' to generate 
+the documentation.
+
+Written by Wenzel Matiaske. See paper.dtx for licensing information.
+
+Updates are available from CTAN. This package lives at:
+  http://tug.ctan.org/tex-archive/macros/latex/contrib/paper/
+and at similar locations on CTAN mirrors.
diff --git a/Master/texmf-dist/source/latex/paper/install.02 b/Master/texmf-dist/doc/latex/paper/install
index c86901542c1..d9f99def7ed 100644
--- a/Master/texmf-dist/source/latex/paper/install.02
+++ b/Master/texmf-dist/doc/latex/paper/install
@@ -1,4 +1,4 @@
-\def\batchfile{install.02}
+\def\batchfile{install}
 \def\filename{paper}
 
 {\immediate\openin15 docstrip.tex
@@ -13,7 +13,7 @@
 
 \preamble
 
-Copyright (C) 1993, 1996 by Wenzel Matiaske, mati1831@perform.ww.tu-berlin.de
+Copyright (C) 1993, 1998 by wenzel_matiaske@notes.uni-paderborn.de
 
 You are not allowed to distribute this file without the
 original source \filename.dtx. For distribution of the 
diff --git a/Master/texmf-dist/doc/latex/paper/journal1.tex b/Master/texmf-dist/doc/latex/paper/journal1.tex
index 61d142d935c..f1e6fc80f1c 100644
--- a/Master/texmf-dist/doc/latex/paper/journal1.tex
+++ b/Master/texmf-dist/doc/latex/paper/journal1.tex
@@ -1,8 +1,8 @@
 
 \shortauthor{Aamport}
 %%\shorttitle{The Gnats and Gnus}
-\author{Leslie A. Aamport\thanks{to Peter}}
-\title{The Gnats and Gnus\thanks{to Paul}}
+\author{Leslie A. Aamport}
+\title{The Gnats and Gnus}
 \subtitle{A Document Preparation System\thanks{to Mary}}
 
 \maketitle
@@ -47,6 +47,12 @@ According to \cite{book-full}\footnote{Note} \dots
   Even fonts are changing.
 \end{change}
 
+  And even equation numbers change.
+
+\begin{equation}
+  \label{eq:1in1}
+   c_{ij}^{\ast}\, v_{j} = x_{ji}\, r_{i}. 
+\end{equation}
 
 \begin{figure}[htbp]
   \begin{center}
@@ -64,3 +70,8 @@ According to \cite{book-full}\footnote{Note} \dots
 
 
 
+
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: t
+%%% End: 
diff --git a/Master/texmf-dist/doc/latex/paper/journal2.tex b/Master/texmf-dist/doc/latex/paper/journal2.tex
index b4b50fadbd2..11f6e6512a3 100644
--- a/Master/texmf-dist/doc/latex/paper/journal2.tex
+++ b/Master/texmf-dist/doc/latex/paper/journal2.tex
@@ -1,10 +1,12 @@
 
 \shortauthor{Oz, Yannakakis}
 \shorttitle{An Sorting Algorithm}
-\author{Wizard V. Oz\thanks{Fanstord University}
-       \and Mihalis Yannakakis\thanks{University of Provence}}
+\author{Wizard V. Oz \and Mihalis Yannakakis}
+\institution{Fanstord University\and University of Provence}
+
 \title{An Sorting Algorithm\thanks{to bubble.}}
 
+
 \maketitle
 
 \begin{keywords}
@@ -12,17 +14,23 @@ Bubble, Sort
 \end{keywords}
 
 
+
 \begin{abstract}
 The joy of sorting \dots
 \end{abstract}
 
-
 \smalltableofcontents
 
 \section{$O(n \log n / \! \log\log n)$}
 
  See\footnote{Some gnu!}
 
+
+ \begin{equation}
+   \label{eq:1in2}
+    |\mathtt{yucca} -\mathtt{abuzz}| = \sqrt{2415}
+ \end{equation}
+
 \section{Conclusions}
 
 \cite{phdthesis-full} \dots
@@ -42,3 +50,8 @@ The golden oldies \dots
 
 
 
+
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: t
+%%% End: 
diff --git a/Master/texmf-dist/doc/latex/paper/local02.tex b/Master/texmf-dist/doc/latex/paper/local.tex
index 600e272f1d2..692f1ca7046 100644
--- a/Master/texmf-dist/doc/latex/paper/local02.tex
+++ b/Master/texmf-dist/doc/latex/paper/local.tex
@@ -1,13 +1,14 @@
-% local02.tex -- updated for LaTeX2e 16 May 1996
-%                first released 1 Sept 1993
+% \iffalse
+% local.tex -- updated for LaTeX2e 16 May 1996
+%              first released 1 Sept 1993
 %
-% Copyright (C) 1993, 1996 by Wenzel Matiaske, mati1831@perform.ww.tu-berlin.de
+% Copyright (C) 1993, 1998 by wenzel_matiaske@notes.uni-paderborn.de
 %
 % As input to the local LaTeX-guide "`local.tex"'.
 %
 % For distribution of this document see the copyright notice in the
 % original sources mentioned below.
-%
+% \fi
 
 \makeatletter
 \newif\iflocalin
diff --git a/Master/texmf-dist/doc/latex/paper/paper.dvi b/Master/texmf-dist/doc/latex/paper/paper.dvi
deleted file mode 100644
index 39945c31d08..00000000000
--- a/Master/texmf-dist/doc/latex/paper/paper.dvi
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/paper/paper.pdf b/Master/texmf-dist/doc/latex/paper/paper.pdf
new file mode 100644
index 00000000000..283197f51e7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/paper/paper.pdf
diff --git a/Master/texmf-dist/doc/latex/paper/test02j.tex b/Master/texmf-dist/doc/latex/paper/testj.tex
index 91185192a2e..237705cfa50 100644
--- a/Master/texmf-dist/doc/latex/paper/test02j.tex
+++ b/Master/texmf-dist/doc/latex/paper/testj.tex
@@ -1,4 +1,4 @@
-\documentclass[12pt,sfbold]{journal}
+\documentclass[12pt,sfbold,twoside,center]{journal}
 
 \begin{document}
 
@@ -21,4 +21,5 @@
 \include{journal1}
 \include{journal2}
 
+
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/paper/test02p.tex b/Master/texmf-dist/doc/latex/paper/testp.tex
index b13c9d07bf3..701fa326e44 100644
--- a/Master/texmf-dist/doc/latex/paper/test02p.tex
+++ b/Master/texmf-dist/doc/latex/paper/testp.tex
@@ -1,14 +1,14 @@
-\documentclass[%%%titlepage,
-]{journal}
+\documentclass[sfbold,]{paper}
+
 
 \begin{document}
 
 %\begin{titlepage}
+ \author{Leslie A. Aamport\thanks{to Peter}}
+ \title{The Gnats and Gnus\thanks{to Paul}}
+ \subtitle{A Document Preparation System\thanks{to Mary}}
  \shortauthor{Aamport}
  \shorttitle{The Gnats and Gnus}
- \author{Leslie A. Aamport\thanks{to Peter}}
- \title{The Gnats and Gnus}\thanks{to Gnu}
- \subtitle{A Document Preparation System\thanks{to Barbara}}
 
 \maketitle
 
@@ -22,7 +22,6 @@
  
 %\end{titlepage}
 
-\tableofcontents
 
 \section{Why Gnu}
 
diff --git a/Master/texmf-dist/source/latex/paper/paper.drv b/Master/texmf-dist/source/latex/paper/paper.drv
index d057d87aa9c..93f5d013896 100644
--- a/Master/texmf-dist/source/latex/paper/paper.drv
+++ b/Master/texmf-dist/source/latex/paper/paper.drv
@@ -1,20 +1,20 @@
-%% 
+%%
 %% This is file `paper.drv',
 %% generated with the docstrip utility.
-%% 
+%%
 %% The original source files were:
-%% 
+%%
 %% paper.dtx  (with options: `driver')
 %% 
-%% Copyright (C) 1993, 1996 by Wenzel Matiaske, mati1831@perform.ww.tu-berlin.de 
+%% Copyright (C) 1993, 1998 by wenzel_matiaske@notes.uni-paderborn.de
 %% 
-%% You are not allowed to distribute this file without the 
-%% original source paper.dtx. For distribution of the 
-%% sources see the copyright notice in the file paper.dtx. 
+%% You are not allowed to distribute this file without the
+%% original source paper.dtx. For distribution of the
+%% sources see the copyright notice in the file paper.dtx.
 %% 
-\def\fileversion{1.0i}
-\def\filedate{1996/07/25}
-\def\docdate{1996/07/25}
+\def\fileversion{1.0l}
+\def\filedate{2008/05/30}
+\def\docdate{1996/11/02}
 \typeout{*******************************************************}
 \typeout{* Documentation for LaTeX styles `paper' & `journal'  *}
 \typeout{*******************************************************}
@@ -47,5 +47,5 @@
 \DocInput{paper.dtx} \newpage \PrintChanges % \newpage \PrintIndex
 \end{document}
 \endinput
-%% 
+%%
 %% End of file `paper.drv'.
diff --git a/Master/texmf-dist/source/latex/paper/paper.dtx b/Master/texmf-dist/source/latex/paper/paper.dtx
index d5033ac3e1c..270390cd2ac 100644
--- a/Master/texmf-dist/source/latex/paper/paper.dtx
+++ b/Master/texmf-dist/source/latex/paper/paper.dtx
@@ -2,14 +2,14 @@
 %<+paper>\def\filename{paper}
 %<+journal>\def\filename{journal}
 %\fi
-\def\fileversion{1.0i}
-\def\filedate{1996/07/25}
-\def\docdate{1996/07/25}
-% \CheckSum{2707}
+\def\fileversion{1.0l}
+\def\filedate{2008/05/30}
+\def\docdate{1996/11/02}
+% \CheckSum{2732}
 %
 % \iffalse    This is a META-COMMENT
 %
-% Copyright (C) 1992, 1996 by Wenzel Matiaske, mati1831@perform.ww.tu-berlin.de
+% Copyright (C) 1992, 1998 by wenzel_matiaske@notes.uni-paderborn.de
 %
 % This file is to be used with the LaTeX2e system.
 % ------------------------------------------------
@@ -28,38 +28,23 @@
 % along with this program; if not, write to the Free Software
 % Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %
-% There are undoubtably bugs in the macros or the documentation. Should
-% you make improvements, bug fixes, etc., however, I ask you to send 
-% improvements back to me for incorporation into the macro for the 
-% rest of us. 
-%
-% Updates are available via anonymous ftp to host `perform.ww.tu-berlin.de'.
-%
-%                                ___      
-%   wenzel matiaske  |           / /_/-Berlin
-%                    |  mail:   Technical University Berlin
-%                    |          Dept. of Economics, WW6
-%                    |          Uhlandstr. 4-5, D-10623 Berlin
-%                    |  phone:  +49 30 314-22574
-%                    |  email:  mati1831@perform.ww.tu-berlin.de
-%
-%  \fi
-%
+% Updates are available via ctan.org. This package lives at:
+% http://tug.ctan.org/tex-archive/macros/latex/contrib/paper/
 %
+% \fi
+% 
 % \MakeShortVerb{\|}
 %
 %    \ifsolodoc
 %      \title{Die \LaTeX-Stile \texttt{paper} und \texttt{journal}}
-%      \author{Wenzel Matiaske\thanks{TU-Berlin, FB 14, WW 6,
-%      Uhlandstr. 4--5, 10623~Berlin, Tel.~030-314\,225\,74, email:
-%      mati1831@perform.ww.tu-berlin.de.}} 
+%      \author{Wenzel Matiaske}
 %      \date{\docdate}
 %      \maketitle
 %      \selectlanguage{\english}
 %      \def\localin{\par}
 %      \begin{small}
 %      \begin{center}\small\textbf{Abstract}\end{center}
-%      \MakePercentComment \input{local02} \MakePercentIgnore
+%      \MakePercentComment \input{local} \MakePercentIgnore
 %      \end{small}
 %      \newpage
 %      \section{Einleitung}
@@ -106,7 +91,8 @@
 %    erweitern die Titelei. Der Untertitel wird unterhalb der
 %    eigentlichen Titels in kleineren Typen gesetzt. Die Institution
 %    wird ggf. als letzte Zeile der Titelei im Anschlu\ss{} an den Autor
-%    ausgegeben. In diesem Zusammenhang ist daraufhinzuweisen, da\ss{} die
+%    ausgegeben. Mehrere Institutionen werden durch \verb+\and+ getrennt.
+%    In diesem Zusammenhang ist daraufhinzuweisen, da\ss{} die
 %    Ausgabe des Datums entf\"allt. 
 %
 % \DescribeMacro{\smalltableofcontents}
@@ -221,7 +207,8 @@
 %    beispielsweise der Name der Zeitschrift, wird dies durch die 
 %    Kommandos |\oddrunhead{|\emph{text}|}| und 
 %    |\evenrunhead{|\emph{text}|}| erm\"oglicht, wie
-%    das Anwendungsbeispiel \ref{jourtest} zeigt. Die Kommandos \"uberschreiben 
+%    das Anwendungsbeispiel \ref{jourtest} zeigt. Die Kommandos
+%    \"uberschreiben  
 %    alle anderweitig eingestellten Markierungen. Wird lediglich 
 %    eines der Kommandos benutzt, erscheinen im Zusammenhang
 %    mit den Befehlen 
@@ -284,6 +271,15 @@
 % \changes{paper~1.0i}{1996/07/25}{%
 %          \texttt{shortitle} wird in das Inhaltsverzeichnis
 %          aufgenommen (Michael P Urban).}
+% \changes{paper~1.0j}{1996/06/08}{%
+%          Kopfzeile bei doppelseitigem \texttt{journal} gekl\"art
+%          (Luiz Henrique de Figueiredo).}
+% \changes{paper~1.0k}{1998/10/30}{%
+%          \texttt{thanks} verbessert
+%          (Benjamin Bayart), \texttt{institution} erweitert,
+%          \texttt{equatation}-Z\"uhler zur\"uckgesetzt (Daniel H. Rossi).}
+% \changes{paper~1.0l}{2008/05/30}{%
+%          Fix bug in abstract definition. (Richard G Heck).}
 %
 %    Die Implementation enth\"alt den Code f\"ur die Klassen \texttt{paper}
 %    und \texttt{journal} und die kompatibles Style-Files.
@@ -529,26 +525,26 @@
 %    Voreinstellungen erfolgen in Optionen.
 %
 %    \begin{macrocode}
-\def\partfont#1{\def\p@font{#1}}             \def\p@font{}          
-\def\sectionfont#1{\def\s@font{#1}}          \def\s@font{}         
-\def\subsectionfont#1{\def\ss@font{#1}}      \def\ss@font{}        
-\def\subsubsectionfont#1{\def\sss@font{#1}}  \def\sss@font{}       
-\def\paragraphfont#1{\def\pg@font{#1}}       \def\pg@font{}        
-\def\subparagraphfont#1{\def\spg@font{#1}}   \def\spg@font{}       
-\def\titlefont#1{\def\t@font{#1}}            \def\t@font{}          
-\def\subtitlefont#1{\def\st@font{#1}}        \def\st@font{}          
-\def\authorfont#1{\def\a@font{#1}}           \def\a@font{}          
-\def\institutionfont#1{\def\in@font{#1}}     \def\in@font{}          
+\def\partfont#1{\def\p@font{#1}}             \def\p@font{}
+\def\sectionfont#1{\def\s@font{#1}}          \def\s@font{}
+\def\subsectionfont#1{\def\ss@font{#1}}      \def\ss@font{}
+\def\subsubsectionfont#1{\def\sss@font{#1}}  \def\sss@font{}
+\def\paragraphfont#1{\def\pg@font{#1}}       \def\pg@font{}
+\def\subparagraphfont#1{\def\spg@font{#1}}   \def\spg@font{}
+\def\titlefont#1{\def\t@font{#1}}            \def\t@font{}
+\def\subtitlefont#1{\def\st@font{#1}}        \def\st@font{}
+\def\authorfont#1{\def\a@font{#1}}           \def\a@font{}
+\def\institutionfont#1{\def\in@font{#1}}     \def\in@font{}
 \def\theoremheaderfont#1{\def\thh@font{#1}}  \def\thh@font{}
-\def\theorembodyfont#1{\def\thb@font{#1}}    \def\thb@font{}       
-\def\itemfont#1{\def\item@font{#1}}          \def\item@font{}       
-\def\examplefont#1{\def\ex@font{#1}}         \def\ex@font{}        
+\def\theorembodyfont#1{\def\thb@font{#1}}    \def\thb@font{}
+\def\itemfont#1{\def\item@font{#1}}          \def\item@font{}
+\def\examplefont#1{\def\ex@font{#1}}         \def\ex@font{}
 \def\headingstextfont#1{\def\h@font{#1}}     \def\h@font{}
 \def\pagenumberfont#1{\def\pn@font{#1}}      \def\pn@font{}
 \def\captionheaderfont#1{\def\cph@font{#1}}  \def\cph@font{}
-\def\captionbodyfont#1{\def\cpb@font{#1}}    \def\cpb@font{}        
-\def\figurefont#1{\def\fig@font{#1}}         \def\fig@font{}        
-\def\tablefont#1{\def\tab@font{#1}}          \def\tab@font{}        
+\def\captionbodyfont#1{\def\cpb@font{#1}}    \def\cpb@font{}
+\def\figurefont#1{\def\fig@font{#1}}         \def\fig@font{}
+\def\tablefont#1{\def\tab@font{#1}}          \def\tab@font{}
 %    \end{macrocode}
 %
 %    Die Option definiert die Schriften der \texttt{slanted} Variante.
@@ -879,6 +875,8 @@
   \newcommand\maketitle{\begin{titlepage}%
   \let\footnotesize\small
   \let\footnoterule\relax
+  \let\real@thanks\thanks
+  \DeclareRobustCommand\thanks{\real@thanks}
   \let \footnote \thanks
   \null\vfil
   \vskip 60\p@
@@ -891,9 +889,11 @@
       \vskip 1.5em             
      {\a@font \lineskip .75em
         \if@center\begin{tabular}[t]{c}\else\begin{tabular}[t]{@{}l@{}}\fi
-         \@author \end{tabular} \par}
-     {\ifx\@institution\@empty\else
-                  \vskip.5em \in@font \@institution \par \fi}
+         \@institution \end{tabular} \par }
+     {\ifx\@institution\@empty\else\vskip.5em  
+        \in@font\bf \lineskip .75em
+        \if@center\begin{tabular}[t]{c}\else\begin{tabular}[t]{@{}l@{}}\fi
+         \@institution \end{tabular} \par\fi}
       \vskip 1.5em%
     {\large \@date \par}%       % Set date in \large size.
   \if@center \end{center} \else \end{raggedright} \fi
@@ -941,14 +941,15 @@
     \setcounter{subparagraph}{0}%
     \setcounter{figure}{0}%
     \setcounter{table}{0}%
+    \setcounter{equation}{0}%
     \addcontentsline{jou}{titles}{%
       {\sss@font\@shortauthor}\hfill\mbox{}\vskip\normallineskip%
        \ifx\@shorttitle\@empty\@title\else\@shorttitle\fi}
       \if@twoside
         \ifx\@oddrunhead\@empty\ifx\@evenrunhead\@empty
-        \@mkboth{\@shortauthor}{\@shorttitle}\else
-        \@mkboth{}{\@shortauthor, \@shorttitle}\fi \else
-        \@mkboth{\@shortauthor, \@shorttitle}{}\fi
+        \markboth{\@shortauthor}{\@shorttitle}\else
+        \markboth{}{\@shortauthor, \@shorttitle}\fi \else
+        \markboth{\@shortauthor, \@shorttitle}{}\fi
       \else
         \markright{\@shortauthor, \@shorttitle}
       \fi
@@ -978,8 +979,10 @@
      {\a@font \lineskip .5em
         \if@center\begin{tabular}[t]{c}\else\begin{tabular}[t]{@{}l@{}}\fi
          \@author \end{tabular} \par}
-     {\ifx\@institution\@empty\else
-                  \vskip.5em \in@font \@institution \par \fi}
+     {\ifx\@institution\@empty\else\vskip.5em  
+        \in@font\bf \lineskip .75em
+        \if@center\begin{tabular}[t]{c}\else\begin{tabular}[t]{@{}l@{}}\fi
+         \@institution \end{tabular} \par\fi}
   \if@center \end{center} \else \end{raggedright} \fi
   \par \vskip 1.5em
 } 
@@ -1012,7 +1015,7 @@
 \renewcommand\thepart          {\Roman{part}}
 \renewcommand\thesection       {\arabic{section}}
 \renewcommand\thesubsection    {\thesection.\arabic{subsection}}
-\renewcommand\thesubsubsection {\thesubsection .\arabic{subsubsection}}
+\renewcommand\thesubsubsection {\thesubsection.\arabic{subsubsection}}
 \renewcommand\theparagraph     {\thesubsubsection.\arabic{paragraph}}
 \renewcommand\thesubparagraph  {\theparagraph.\arabic{subparagraph}}
 %    \end{macrocode}
@@ -1236,10 +1239,10 @@
       \fi}
     \def\endabstract{\if@twocolumn\else\endquotation\fi}
     \def\keywords{\small\paragraph*{\keywordname:}}
-    \let\endkeywords=\bigskip
+    \def\endkeywords{\par\bigskip}
    \else
      \def\abstract{\small\subsubsection*{\abstractname}}
-     \let\endabstract=\bigskip
+     \def\endabstract{\par\bigskip}
      \def\keywords{\small\paragraph*{\keywordname: }}
      \let\endkeywords\endabstract
   \fi
diff --git a/Master/texmf-dist/source/latex/paper/readme.02 b/Master/texmf-dist/source/latex/paper/readme.02
deleted file mode 100644
index 3f17b11f0c5..00000000000
--- a/Master/texmf-dist/source/latex/paper/readme.02
+++ /dev/null
@@ -1,33 +0,0 @@
-The files in the archive PAPER1h.ZIP include the following
-supported macros and files for LaTeX2e:
-
-	PAPER.DTX      LaTeX-style files PAPER and JOURNAL 
-                       in DOC option format
-        PAPER.CLS      LaTeX-class file PAPER
-        JOURNAL.CLS    LaTeX-class file JOURNAL
-        PAPER.STY      Compatibility mode.
-        JOURNAL.STY    dto.
-	PAPER.DVI      Documentation in dvi format 
-        INSTALL.02     Driver for Installing the package
-	LOCAL.02       Input to the local LaTeX-guide "`local.tex"'
-	TEST02P.TEX    Example input text for PAPER
-	TEST02J.TEX    Example input text for JOURNAL
-        JOURNAL1.TEX   Example input text for JOURNAL
-        JOURNAL2.TEX   Example input text for JOURNAL
-	README.02      this file
-
-Run `LaTeX install.02' for installing the package. Needs the 
-`docstrip' utility. 
-
-Updates are available via anonymous ftp to host
-`perform.ww.tu-berlin.de' or from CTAN.
-                             ___      
-wenzel matiaske  |           / /_/-Berlin
-                 |  mail:   Technical University Berlin
-                 |          Dept. of Economics, WW6
-                 |          Uhlandstr. 4-5, D-10623 Berlin
-                 |  phone:  +49 30 314-22574
-                 |  email:  mati1831@perform.ww.tu-berlin.de
-
-
-
diff --git a/Master/texmf-dist/tex/latex/paper/journal.cls b/Master/texmf-dist/tex/latex/paper/journal.cls
index ffa8562420a..99cda5d6543 100644
--- a/Master/texmf-dist/tex/latex/paper/journal.cls
+++ b/Master/texmf-dist/tex/latex/paper/journal.cls
@@ -1,21 +1,21 @@
-%% 
+%%
 %% This is file `journal.cls',
 %% generated with the docstrip utility.
-%% 
+%%
 %% The original source files were:
-%% 
+%%
 %% paper.dtx  (with options: `journal')
 %% 
-%% Copyright (C) 1993, 1996 by Wenzel Matiaske, mati1831@perform.ww.tu-berlin.de 
+%% Copyright (C) 1993, 1998 by wenzel_matiaske@notes.uni-paderborn.de
 %% 
-%% You are not allowed to distribute this file without the 
-%% original source paper.dtx. For distribution of the 
-%% sources see the copyright notice in the file paper.dtx. 
+%% You are not allowed to distribute this file without the
+%% original source paper.dtx. For distribution of the
+%% sources see the copyright notice in the file paper.dtx.
 %% 
 \def\filename{journal}
-\def\fileversion{1.0i}
-\def\filedate{1996/07/25}
-\def\docdate{1996/07/25}
+\def\fileversion{1.0l}
+\def\filedate{2008/05/30}
+\def\docdate{1996/11/02}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{journal}[\filedate\space\fileversion\space%
        LaTeX document class (wm).]
@@ -23,5 +23,5 @@
 \ProcessOptions
 \LoadClass[journal]{paper}
 \endinput
-%% 
+%%
 %% End of file `journal.cls'.
diff --git a/Master/texmf-dist/tex/latex/paper/journal.sty b/Master/texmf-dist/tex/latex/paper/journal.sty
index f6e55e61d45..c77e7ac861f 100644
--- a/Master/texmf-dist/tex/latex/paper/journal.sty
+++ b/Master/texmf-dist/tex/latex/paper/journal.sty
@@ -1,23 +1,23 @@
-%% 
+%%
 %% This is file `journal.sty',
 %% generated with the docstrip utility.
-%% 
+%%
 %% The original source files were:
-%% 
+%%
 %% paper.dtx  (with options: `journal.sty')
 %% 
-%% Copyright (C) 1993, 1996 by Wenzel Matiaske, mati1831@perform.ww.tu-berlin.de 
+%% Copyright (C) 1993, 1998 by wenzel_matiaske@notes.uni-paderborn.de
 %% 
-%% You are not allowed to distribute this file without the 
-%% original source paper.dtx. For distribution of the 
-%% sources see the copyright notice in the file paper.dtx. 
+%% You are not allowed to distribute this file without the
+%% original source paper.dtx. For distribution of the
+%% sources see the copyright notice in the file paper.dtx.
 %% 
-\def\fileversion{1.0i}
-\def\filedate{1996/07/25}
-\def\docdate{1996/07/25}
+\def\fileversion{1.0l}
+\def\filedate{2008/05/30}
+\def\docdate{1996/11/02}
 \NeedsTeXFormat{LaTeX2e}
 \@obsoletefile{journal.cls}{journal.sty}
 \LoadClass{journal}
 \endinput
-%% 
+%%
 %% End of file `journal.sty'.
diff --git a/Master/texmf-dist/tex/latex/paper/paper.cls b/Master/texmf-dist/tex/latex/paper/paper.cls
index 0a9b062c6b1..a09c34885c8 100644
--- a/Master/texmf-dist/tex/latex/paper/paper.cls
+++ b/Master/texmf-dist/tex/latex/paper/paper.cls
@@ -1,21 +1,21 @@
-%% 
+%%
 %% This is file `paper.cls',
 %% generated with the docstrip utility.
-%% 
+%%
 %% The original source files were:
-%% 
+%%
 %% paper.dtx  (with options: `paper')
 %% 
-%% Copyright (C) 1993, 1996 by Wenzel Matiaske, mati1831@perform.ww.tu-berlin.de 
+%% Copyright (C) 1993, 1998 by wenzel_matiaske@notes.uni-paderborn.de
 %% 
-%% You are not allowed to distribute this file without the 
-%% original source paper.dtx. For distribution of the 
-%% sources see the copyright notice in the file paper.dtx. 
+%% You are not allowed to distribute this file without the
+%% original source paper.dtx. For distribution of the
+%% sources see the copyright notice in the file paper.dtx.
 %% 
 \def\filename{paper}
-\def\fileversion{1.0i}
-\def\filedate{1996/07/25}
-\def\docdate{1996/07/25}
+\def\fileversion{1.0l}
+\def\filedate{2008/05/30}
+\def\docdate{1996/11/02}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{paper}[\filedate\space\fileversion\space%
        LaTeX document class (wm).]
@@ -331,6 +331,8 @@
   \newcommand\maketitle{\begin{titlepage}%
   \let\footnotesize\small
   \let\footnoterule\relax
+  \let\real@thanks\thanks
+  \DeclareRobustCommand\thanks{\real@thanks}
   \let \footnote \thanks
   \null\vfil
   \vskip 60\p@
@@ -343,9 +345,11 @@
       \vskip 1.5em
      {\a@font \lineskip .75em
         \if@center\begin{tabular}[t]{c}\else\begin{tabular}[t]{@{}l@{}}\fi
-         \@author \end{tabular} \par}
-     {\ifx\@institution\@empty\else
-                  \vskip.5em \in@font \@institution \par \fi}
+         \@institution \end{tabular} \par }
+     {\ifx\@institution\@empty\else\vskip.5em
+        \in@font\bf \lineskip .75em
+        \if@center\begin{tabular}[t]{c}\else\begin{tabular}[t]{@{}l@{}}\fi
+         \@institution \end{tabular} \par\fi}
       \vskip 1.5em%
     {\large \@date \par}%       % Set date in \large size.
   \if@center \end{center} \else \end{raggedright} \fi
@@ -387,14 +391,15 @@
     \setcounter{subparagraph}{0}%
     \setcounter{figure}{0}%
     \setcounter{table}{0}%
+    \setcounter{equation}{0}%
     \addcontentsline{jou}{titles}{%
       {\sss@font\@shortauthor}\hfill\mbox{}\vskip\normallineskip%
        \ifx\@shorttitle\@empty\@title\else\@shorttitle\fi}
       \if@twoside
         \ifx\@oddrunhead\@empty\ifx\@evenrunhead\@empty
-        \@mkboth{\@shortauthor}{\@shorttitle}\else
-        \@mkboth{}{\@shortauthor, \@shorttitle}\fi \else
-        \@mkboth{\@shortauthor, \@shorttitle}{}\fi
+        \markboth{\@shortauthor}{\@shorttitle}\else
+        \markboth{}{\@shortauthor, \@shorttitle}\fi \else
+        \markboth{\@shortauthor, \@shorttitle}{}\fi
       \else
         \markright{\@shortauthor, \@shorttitle}
       \fi
@@ -417,8 +422,10 @@
      {\a@font \lineskip .5em
         \if@center\begin{tabular}[t]{c}\else\begin{tabular}[t]{@{}l@{}}\fi
          \@author \end{tabular} \par}
-     {\ifx\@institution\@empty\else
-                  \vskip.5em \in@font \@institution \par \fi}
+     {\ifx\@institution\@empty\else\vskip.5em
+        \in@font\bf \lineskip .75em
+        \if@center\begin{tabular}[t]{c}\else\begin{tabular}[t]{@{}l@{}}\fi
+         \@institution \end{tabular} \par\fi}
   \if@center \end{center} \else \end{raggedright} \fi
   \par \vskip 1.5em
 }
@@ -433,7 +440,7 @@
 \renewcommand\thepart          {\Roman{part}}
 \renewcommand\thesection       {\arabic{section}}
 \renewcommand\thesubsection    {\thesection.\arabic{subsection}}
-\renewcommand\thesubsubsection {\thesubsection .\arabic{subsubsection}}
+\renewcommand\thesubsubsection {\thesubsection.\arabic{subsubsection}}
 \renewcommand\theparagraph     {\thesubsubsection.\arabic{paragraph}}
 \renewcommand\thesubparagraph  {\theparagraph.\arabic{subparagraph}}
 \newcommand\part{\par
@@ -612,10 +619,10 @@
       \fi}
     \def\endabstract{\if@twocolumn\else\endquotation\fi}
     \def\keywords{\small\paragraph*{\keywordname:}}
-    \let\endkeywords=\bigskip
+    \def\endkeywords{\par\bigskip}
    \else
      \def\abstract{\small\subsubsection*{\abstractname}}
-     \let\endabstract=\bigskip
+     \def\endabstract{\par\bigskip}
      \def\keywords{\small\paragraph*{\keywordname: }}
      \let\endkeywords\endabstract
   \fi
@@ -1022,5 +1029,5 @@
   \onecolumn
 \fi
 \endinput
-%% 
+%%
 %% End of file `paper.cls'.
diff --git a/Master/texmf-dist/tex/latex/paper/paper.sty b/Master/texmf-dist/tex/latex/paper/paper.sty
index 547cc50facf..7316261a0ba 100644
--- a/Master/texmf-dist/tex/latex/paper/paper.sty
+++ b/Master/texmf-dist/tex/latex/paper/paper.sty
@@ -1,23 +1,23 @@
-%% 
+%%
 %% This is file `paper.sty',
 %% generated with the docstrip utility.
-%% 
+%%
 %% The original source files were:
-%% 
+%%
 %% paper.dtx  (with options: `paper.sty')
 %% 
-%% Copyright (C) 1993, 1996 by Wenzel Matiaske, mati1831@perform.ww.tu-berlin.de 
+%% Copyright (C) 1993, 1998 by wenzel_matiaske@notes.uni-paderborn.de
 %% 
-%% You are not allowed to distribute this file without the 
-%% original source paper.dtx. For distribution of the 
-%% sources see the copyright notice in the file paper.dtx. 
+%% You are not allowed to distribute this file without the
+%% original source paper.dtx. For distribution of the
+%% sources see the copyright notice in the file paper.dtx.
 %% 
-\def\fileversion{1.0i}
-\def\filedate{1996/07/25}
-\def\docdate{1996/07/25}
+\def\fileversion{1.0l}
+\def\filedate{2008/05/30}
+\def\docdate{1996/11/02}
 \NeedsTeXFormat{LaTeX2e}
 \@obsoletefile{paper.cls}{paper.sty}
 \LoadClass{paper}
 \endinput
-%% 
+%%
 %% End of file `paper.sty'.
diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index c380ad2783f..57bad5578e0 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -776,7 +776,7 @@ $standarddocfmt='latex';
  'makecell',	'makecell.dtx',
  'mh',		'.*\.dtx',
  'namespc',	'namespc.dtx',
- 'paper',	'install.02',
+ 'paper',	'install',
  'parrun',	'parrun.ins',
  'stmaryrd',	'stmaryrd.dtx',
  'tablists',	'tablists.dtx',
@@ -1163,6 +1163,7 @@ $standardxmt='\.xmt';
 # packages which have executable scripts
 %specialscripts = (
  'a2ping'	=> '\.pl$',
+ 'dviasm'	=> '\.py$',
  'epstopdf'	=> 'epstopdf',
  'mkjobtexmf'	=> '\.pl$',
  'pdfcrop'	=> '\.pl$',
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index cd1f6205003..9c0dad81f64 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -59,7 +59,7 @@ my @WorkingTLP = qw(
           dotarrow dottex
           doublestroke dpfloat dprogress draftcopy
           draftwatermark dramatist dtxgallery
-          dtxtut duerer-latex dvdcoll dviincl dvipsconfig dyntree
+          dtxtut duerer-latex dvdcoll dviasm dviincl dvipsconfig dyntree
         easy ebong ebsthesis eCards ecc ecclesiastic economic
           ecv ed edmac edmargin ednotes eemeir egameps
           egplot eijkhout
@@ -133,7 +133,7 @@ my @WorkingTLP = qw(
           ntgclass ntheorem-vn numline numname numprint
         oberdiek ocr-latex octavo ofs ogham oldstyle onlyamsmath opcit
           ordinalpt
-        papercdcase papertex parallel paresse parrun pauldoc pbox
+        paper papercdcase papertex parallel paresse parrun pauldoc pbox
           pdf-forms-tutorial-de pdf-forms-tutorial-en pdf-trans pdfcprot
           pdfcrop
           pdfpages pdfscreen pdfsync pdftex-def perception perltex permute