summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-02-28 14:28:16 +0000
committerKarl Berry <karl@freefriends.org>2007-02-28 14:28:16 +0000
commit212d001e0925acbb935bb1c844c6ec7ec5ca831f (patch)
tree0b7bb182e480994d82c296e3fa38144e562aaec6
parentcc45371f572bd45d740b48c56b97a77614294e0b (diff)
papertex update (27feb07)
git-svn-id: svn://tug.org/texlive/trunk@3999 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/papertex/CHANGES20
-rw-r--r--Master/texmf-dist/doc/latex/papertex/README2
-rw-r--r--Master/texmf-dist/doc/latex/papertex/example/example.pdfbin228332 -> 225690 bytes
-rw-r--r--Master/texmf-dist/doc/latex/papertex/example/example.tex6
-rw-r--r--Master/texmf-dist/doc/latex/papertex/example/img/firefox.pngbin0 -> 27965 bytes
-rw-r--r--Master/texmf-dist/doc/latex/papertex/papertex.pdfbin165401 -> 172962 bytes
-rw-r--r--Master/texmf-dist/source/latex/papertex/papertex.dtx98
-rw-r--r--Master/texmf-dist/tex/latex/papertex/papertex.cls45
-rw-r--r--Master/texmf-dist/tpm/papertex.tpm9
-rw-r--r--Master/texmf/lists/papertex1
10 files changed, 147 insertions, 34 deletions
diff --git a/Master/texmf-dist/doc/latex/papertex/CHANGES b/Master/texmf-dist/doc/latex/papertex/CHANGES
index 07933b79d9e..ae0db6adc74 100644
--- a/Master/texmf-dist/doc/latex/papertex/CHANGES
+++ b/Master/texmf-dist/doc/latex/papertex/CHANGES
@@ -4,6 +4,26 @@ paperTeX: class change history
Copyright (C) 2007 by Ignacio Llopis <lloptor@gmail.com>
-------------------------------------------------------
+v.1.2a (27 February 2007)
+-------------------------
+- anysize package is replaced by geometry
+- new ``a3paper'' option
+- 12pt can now be used (it did not work before)
+- fixed some documentation bugs
+- \authorandplace default alignment = left
+
+v.1.2 (25 January 2007)
+-------------------------
+- \minraggedcols counter added
+- \raggedFormat style command added
+- thanks to Will Henney & Donald Arseneau for the idea
+
+v.1.1c (20 January 2007)
+-------------------------
+- specification of ``a4paper'' option when loading ``article'' class.
+- \makeindex command removed (it produced an empty .idx file).
+- very thanks to Dan
+
v.1.1b (18 January 2007)
-------------------------
- solved problem with hyperlinks in the main index. added \phantomsection (s).
diff --git a/Master/texmf-dist/doc/latex/papertex/README b/Master/texmf-dist/doc/latex/papertex/README
index 6b8e58b458d..8e552766bcc 100644
--- a/Master/texmf-dist/doc/latex/papertex/README
+++ b/Master/texmf-dist/doc/latex/papertex/README
@@ -4,7 +4,7 @@ paperTeX: creating newspapers using LaTeX2e
Copyright (C) 2007 by Ignacio Llopis <lloptor@gmail.com>
-------------------------------------------------------
-{Version 1.1b}
+{Version 1.2a}
This class allows LaTeX users to create a newspaper using LaTeX.
This class was created together with a Perl script in order to create
diff --git a/Master/texmf-dist/doc/latex/papertex/example/example.pdf b/Master/texmf-dist/doc/latex/papertex/example/example.pdf
index 1fb3aef20eb..f497a7deb20 100644
--- a/Master/texmf-dist/doc/latex/papertex/example/example.pdf
+++ b/Master/texmf-dist/doc/latex/papertex/example/example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/papertex/example/example.tex b/Master/texmf-dist/doc/latex/papertex/example/example.tex
index ad6678bd801..8f82c378f75 100644
--- a/Master/texmf-dist/doc/latex/papertex/example/example.tex
+++ b/Master/texmf-dist/doc/latex/papertex/example/example.tex
@@ -41,7 +41,9 @@
\author{Ignacio Llopis}
\title{my first paperTeX}
\edition{my papertex edition}
-%\tolerance=300
+
+%new "ragged text" feature
+\minraggedcols=3
\begin{document}
@@ -176,7 +178,7 @@ Proin sollicitudin volutpat quam. Duis pulvinar nulla id lorem. Curabitur ac nul
Donec ultrices sem non ante. Curabitur non ante vitae mauris eleifend convallis. Integer lectus lorem, scelerisque et, dictum sollicitudin, aliquam a, eros. Ut ultrices metus eu augue. Cras sit amet odio sit amet dolor sagittis venenatis. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aliquam erat volutpat. Sed justo velit, accumsan sed, vulputate nec, nonummy sed, tellus. Phasellus sit amet odio sed erat placerat posuere. Sed a magna. Cras dolor turpis, consequat sollicitudin, viverra eget, convallis eu, nibh.
-Ut convallis consectetuer odio. Fusce posuere eleifend arcu. Nullam libero turpis, porttitor pellentesque, dictum vulputate, varius ut, turpis. Sed facilisis, nisi nec commodo commodo, enim risus ultrices leo, non tristique nibh dolor a dolor. Etiam placerat justo non felis. Suspendisse pulvinar nisl a magna. Vivamus dapibus nulla quis felis. Nulla luctus dignissim nisi. Curabitur sit amet nibh. Etiam pulvinar. Suspendisse ut lorem hendrerit libero aliquet egestas. Praesent varius tristique libero. Etiam metus lectus, consequat at, dignissim vel, posuere non, arcu. Morbi non lectus quis est laoreet hendrerit. Cras quis nunc. Curabitur mauris dui, fringilla et, viverra at, pharetra vitae, nunc. Maecenas interdum elementum risus.
+Ut convallis consectetuer odio. Fusce posuere eleifend arcu. Nullam libero turpis, porttitor pellentesque, dictum vulputate, varius ut, turpis. Sed facilisis, nisi nec commodo commodo, enim risus ultrices leo, non tristique nibh dolor a dolor. Etiam placerat justo non felis. Suspendisse pulvinar nisl a magna. Vivamus dapibus nulla quis felis. Nulla luctus dignissim nisi. Curabitur sit amet nibh. Etiam pulvinar.
\end{editorial}
\newssep
diff --git a/Master/texmf-dist/doc/latex/papertex/example/img/firefox.png b/Master/texmf-dist/doc/latex/papertex/example/img/firefox.png
new file mode 100644
index 00000000000..3f8a32c6c7d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/papertex/example/img/firefox.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/papertex/papertex.pdf b/Master/texmf-dist/doc/latex/papertex/papertex.pdf
index 7e7db954b3e..a0c2754140d 100644
--- a/Master/texmf-dist/doc/latex/papertex/papertex.pdf
+++ b/Master/texmf-dist/doc/latex/papertex/papertex.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/papertex/papertex.dtx b/Master/texmf-dist/source/latex/papertex/papertex.dtx
index f9505158291..f589dae7ac9 100644
--- a/Master/texmf-dist/source/latex/papertex/papertex.dtx
+++ b/Master/texmf-dist/source/latex/papertex/papertex.dtx
@@ -22,7 +22,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<class>\ProvidesClass{papertex}
%<*class>
- [2007/01/18 v1.1b paperTeX class]
+ [2007/02/27 v1.2a paperTeX class]
%</class>
%
%<*driver>
@@ -59,6 +59,9 @@
% \changes{v1.1}{2007/01/10}{Some minor changes}
% \changes{v1.1a}{2007/01/15}{Changes in documentation}
% \changes{v1.1b}{2007/01/18}{Short news have label. They could not be referenced before. Phantomsections added.}
+% \changes{v1.1c}{2007/01/20}{Makeindex removed.}
+% \changes{v1.2}{2007/01/25}{New counter minraggedcols and raggedFormat command. They allow users to have ragged texts in news.}
+% \changes{v1.2a}{2007/02/27}{Anysize package replaced by geometry. Option `12pt' is now sent to standard article class. Authorandplace aligns on the left now. Bugs in documentation. New `a3paper' option.}
%
% \GetFileInfo{papertex.dtx}
%
@@ -69,6 +72,10 @@
% \newcommand{\papertex}[0]{paper\TeX{}}
%
%
+% \newcommand*{\NEWfeature}[1]{%
+% \hskip 1sp \marginpar{\small\sffamily\raggedright
+% New feature\\#1}}
+%
% \title{\papertex{} class: creating newspapers using \LaTeX{}}
%
% \author{Ignacio Llopis \\ \texttt{lloptor@gmail.com}\\{\large Polytechnic University of Valencia}}
@@ -89,7 +96,7 @@
%
% This manual is typeset according to the conventions of the \LaTeX{} \textsc{docstrip} utility which enables the automatic extraction of the \LaTeX{} macro source files.
%
-% Section~\ref{sec:usage} describes the usage of the package.
+% Section~\ref{sec:usage} describes the usage of the class.
%
%
%
@@ -277,6 +284,17 @@
% Most of the newspaper in my country (Spain) finish the news text with a black square (\blackbox{}). As I wanted to create a highly customizable \LaTeX{} class I added the macro |\innerTextFinalMark| to change this black square. This item will appear always following the last character of the text with the $\sim$ character.
%
%
+% \DescribeMacro{\minraggedcols} \DescribeMacro{\raggedFormat}
+% \NEWfeature{v1.2}
+% The |\minraggedcols| counter is used to tell \papertex{} when news text should be ragged instead of justified.
+% The counter represents the minimum number of columns that are needed in order to use ragged texts. For example,
+%if |\minraggedcols| is set to $3$, all news with $3$ columns or more will be ragged.
+% News with $1$, $2$ columns will have justified text.
+% By default, |\minraggedcols| is set to $4$.
+%
+% The |\raggedFormat| macro can be redefined to fit user ragged style. Default value is |\RaggedRight|.
+%
+%
% \DescribeMacro{\heading} \DescribeMacro{\foot}
% \papertex{} includes package \texttt{fancyhdr} for changing headings and footers. Although it is possible to use its own commands to modify \papertex{} style, there are two commands to change headings and foot appearance. Place them in the preamble of your \papertex{} document.
% \begin{quote}
@@ -291,11 +309,12 @@
%
% \section{Class options} \label{sec:options}
%
-% The \papertex{} class is in itself an alteration of the standard \texttt{article} class, thus it inherits most of its class options but |twoside|, |twocolumn| and |notitlepage|. If you find problems when loading other \texttt{article} features, please let me know to fix it.
-%
-% There are also four own options that \papertex{} implements.\\
+% The \papertex{} class is in itself an alteration of the standard \texttt{article} class, thus it inherits most of its class options but |twoside|, |twocolumn|, |notitlepage| and |a4paper|. If you find problems when loading other \texttt{article} features, please let me know to fix it.
%
+% There are also five own options that \papertex{} implements.\\
+% \NEWfeature{v1.2a}
% \begin{description}
+% \item[a3paper] (\textit{false}) This option makes \papertex{} $297mm$ width by $420mm$ height. This option is implemented because the standard \texttt{article} class does not allow this document size.
% \item[9pt] (\textit{false}) Allows the $9pt$ font size that \texttt{article} class does not include (default is $10pt$).
% \item[hyphenatedtitles] (\textit{false}) Forces heading titles to be hyphenated. This feature is off by default because most of newspapers prefer not to hyphenate them.
% \item[columnlines] (\textit{false}) Adds lines between columns in the entire \papertex{}. The default line width is $0.1pt$ but it is possible to change this by setting length |\columnlines| in the preamble.
@@ -351,6 +370,8 @@
\setboolean{papertex@ninepoints}{false}
\newboolean{papertex@showgrid}
\setboolean{papertex@showgrid}{false}
+\newboolean{papertex@a3paper}
+\setboolean{papertex@a3paper}{false}
% \end{macrocode}
%
% Some booleans to keep track of where we are.
@@ -372,11 +393,21 @@
\papertex@gridcolumns=50
% \end{macrocode}
%
+% \NEWfeature{v1.2}
+% The following count defines when \papertex{} should use ragged text instead
+% of justified text. It represents the maximum number of columns not ragged.
+% Default value is $5$.
+% \begin{macrocode}
+\newcount\minraggedcols
+\minraggedcols=5
+% \end{macrocode}
+%
% Now, we declare the class options.
-% First, options \papertex{} inherit from ``article.cls''.
+% First, all the options which \papertex{} inherits from ``article.cls'' standard class.
% \begin{macrocode}
\DeclareOption{10pt}{\PassOptionsToClass{10pt}{article}}
\DeclareOption{11pt}{\PassOptionsToClass{11pt}{article}}
+\DeclareOption{12pt}{\PassOptionsToClass{12pt}{article}}
% \end{macrocode}
%
% Second, options \papertex{} does not inherit from ``article.cls''.
@@ -395,13 +426,14 @@
\DeclareOption{hyphenatedtitles}{\setboolean{papertex@hyphenatedtitles}{false}}
\DeclareOption{columnlines}{\setlength{\columnlines}{0.1 pt}}
\DeclareOption{showgrid}{\setboolean{papertex@showgrid}{true}}
+\DeclareOption{a3paper}{\setboolean{papertex@a3paper}{true}}
% \end{macrocode}
%
% As \papertex{} is based in the \LaTeX{} ``article'' class,
% we load this class with default \papertex{} options.
% \begin{macrocode}
-\ProcessOptions
-\LoadClass[10pt, onecolumn, titlepage]{article}
+\ProcessOptions\relax
+\LoadClass[10pt, onecolumn, titlepage, a4paper]{article}
% \end{macrocode}
%
% From this point, \papertex{} requires all packages needed.
@@ -412,12 +444,16 @@
\RequirePackage{multicol}
\RequirePackage{fancyhdr}
\RequirePackage{fancybox}
-\RequirePackage{anysize}
% \end{macrocode}
%
-% Define margins to get as much as possible from the page layout.
+% \NEWfeature{v1.2a}
+% Define margins using \texttt{geometry} package to get as much as possible from the page layout. It is also time to check if ``a3paper'' option is requested.
% \begin{macrocode}
-\marginsize{1.5cm}{1.5cm}{0.5cm}{0.5cm}
+\ifthenelse{\boolean{papertex@a3paper}}{%
+ \RequirePackage[a3paper,headsep=0.5cm,vmargin={2cm,2cm},hmargin={1.5cm,1.5cm}]{geometry}
+}{
+ \RequirePackage[headsep=0.5cm,vmargin={2cm,2cm},hmargin={1.5cm,1.5cm}]{geometry}
+}
% \end{macrocode}
%
% Some requirements whether we compile using PDF\LaTeX{} or just \LaTeX{}.
@@ -441,14 +477,28 @@
\RequirePackage{setspace} % set space between lines
% \end{macrocode}
%
-% When the whole class is loaded, draw the front page grid. Draw lines if requested by using \textbf{showgrid} option.
+% \NEWfeature{2007/01/25}
+% We, now, load \texttt{ragged2e} package in order to provide \papertex{} with
+% nicely ragged texts. A new command called |\raggedFormat| is defined to control
+% which kind of ragged format should be used.
+% \begin{macrocode}
+\RequirePackage{ragged2e}
+\newcommand{\raggedFormat}{\RaggedRight}
+% \end{macrocode}
+%
+% When the whole class is loaded, draw the front page grid. Draw lines if requested by using \textbf{showgrid} option.
+% There is also a substraction from |\minraggedcols| counter by one in order to match is definition.
% \begin{macrocode}
\AtEndOfClass{\papertexInit}
\ifthenelse{\boolean{papertex@showgrid}}{%
- \AtBeginDocument{\grid[show]{\papertex@gridrows}{\papertex@gridcolumns}}
-}{%
- \AtBeginDocument{\grid[]{\papertex@gridrows}{\papertex@gridcolumns}}
-}
+ \AtBeginDocument{
+ \grid[show]{\papertex@gridrows}{\papertex@gridcolumns}}
+ \advance\minraggedcols by -1
+ }{%
+ \AtBeginDocument{
+ \grid[]{\papertex@gridrows}{\papertex@gridcolumns}}
+ \advance\minraggedcols by -1
+ }
% \end{macrocode}
%
% Definition of \textbf{ninepoints} class option.
@@ -931,7 +981,6 @@
\setlength{\columnseprule}{\columnlines}
\setlength{\fboxrule}{0.1 pt}
- \makeindex
}
% \end{macrocode}
%
@@ -1368,6 +1417,9 @@
\end{center}
\begin{multicols}{\papertex@ncolumns{}}
+ \ifnum \papertex@ncolumns > \minraggedcols
+ \raggedFormat
+ \fi
}
% \end{macrocode}
%
@@ -1435,7 +1487,7 @@
% The next macro types out the author and the place of the news. It is just a format command.
% \begin{macrocode}
\newcommand{\authorandplace}[2]{%
- \rightline{%
+ \leftline{%
{\innerAuthorFormat #1},\space{}{\innerPlaceFormat #2}%
}%
\par %
@@ -1474,6 +1526,9 @@
\phantomsection
\pdfbookmark[1]{#2}{\thepage}
\label{#5}
+ \ifnum #1 > \minraggedcols
+ \raggedFormat
+ \fi
}
{~\innerTextFinalMark{}
\end{multicols}
@@ -1538,6 +1593,9 @@
\phantomsection
\pdfbookmark[1]{#2}{\thepage}
\label{#4}
+\ifnum #1 > \minraggedcols
+\raggedFormat
+\fi
}
{
\end{multicols}
@@ -1572,6 +1630,9 @@
\pdfbookmark[1]{#2}{\thepage}
\label{#4}
\par %
+ \ifnum #1 > \minraggedcols
+ \raggedFormat
+ \fi
}
{
\end{multicols}
@@ -1583,6 +1644,7 @@
% \begin{macrocode}
\newcommand{\shortnewsitem}[2]{
\goodbreak
+ \vspace{5pt plus 3pt minus 3pt}
{\vbox{\noindent\papertex@shortnewsItemTitle{#1}}}
\vspace{5pt plus 3pt minus 3pt}
{\noindent #2}\\
diff --git a/Master/texmf-dist/tex/latex/papertex/papertex.cls b/Master/texmf-dist/tex/latex/papertex/papertex.cls
index 47b518627cd..d695a04ba53 100644
--- a/Master/texmf-dist/tex/latex/papertex/papertex.cls
+++ b/Master/texmf-dist/tex/latex/papertex/papertex.cls
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{papertex}
- [2007/01/18 v1.1b paperTeX class]
+ [2007/02/27 v1.2a paperTeX class]
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{papertex}[2006/07/06 paperTeX class]
\RequirePackage{ifthen}
@@ -40,6 +40,8 @@
\setboolean{papertex@ninepoints}{false}
\newboolean{papertex@showgrid}
\setboolean{papertex@showgrid}{false}
+\newboolean{papertex@a3paper}
+\setboolean{papertex@a3paper}{false}
\newboolean{papertex@insidefrontpage}
\setboolean{papertex@insidefrontpage}{false}
\newboolean{papertex@insideweather}
@@ -50,8 +52,11 @@
\newcount\papertex@gridcolumns
\papertex@gridrows=40
\papertex@gridcolumns=50
+\newcount\minraggedcols
+\minraggedcols=5
\DeclareOption{10pt}{\PassOptionsToClass{10pt}{article}}
\DeclareOption{11pt}{\PassOptionsToClass{11pt}{article}}
+\DeclareOption{12pt}{\PassOptionsToClass{12pt}{article}}
\DeclareOption{twocolumn}%
{\ClassWarning{paperTeX}{Option 'twocolumn' not available for paperTeX.}}
\DeclareOption{notitlepage}%
@@ -62,16 +67,20 @@
\DeclareOption{hyphenatedtitles}{\setboolean{papertex@hyphenatedtitles}{false}}
\DeclareOption{columnlines}{\setlength{\columnlines}{0.1 pt}}
\DeclareOption{showgrid}{\setboolean{papertex@showgrid}{true}}
-\ProcessOptions
-\LoadClass[10pt, onecolumn, titlepage]{article}
+\DeclareOption{a3paper}{\setboolean{papertex@a3paper}{true}}
+\ProcessOptions\relax
+\LoadClass[10pt, onecolumn, titlepage, a4paper]{article}
\RequirePackage{ifpdf}
\RequirePackage{multido}
\RequirePackage{datetime}
\RequirePackage{multicol}
\RequirePackage{fancyhdr}
\RequirePackage{fancybox}
-\RequirePackage{anysize}
-\marginsize{1.5cm}{1.5cm}{0.5cm}{0.5cm}
+\ifthenelse{\boolean{papertex@a3paper}}{%
+\RequirePackage[a3paper,headsep=0.5cm,vmargin={2cm,2cm},hmargin={1.5cm,1.5cm}]{geometry}
+}{
+\RequirePackage[headsep=0.5cm,vmargin={2cm,2cm},hmargin={1.5cm,1.5cm}]{geometry}
+}
\ifpdf
\RequirePackage[pdftex]{graphicx,color}
\RequirePackage[pdftex]{hyperref}
@@ -85,11 +94,17 @@
\RequirePackage{wrapfig}
\RequirePackage{lastpage} % to know the last page number
\RequirePackage{setspace} % set space between lines
+\RequirePackage{ragged2e}
+\newcommand{\raggedFormat}{\RaggedRight}
\AtEndOfClass{\papertexInit}
\ifthenelse{\boolean{papertex@showgrid}}{%
-\AtBeginDocument{\grid[show]{\papertex@gridrows}{\papertex@gridcolumns}}
+\AtBeginDocument{
+\grid[show]{\papertex@gridrows}{\papertex@gridcolumns}}
+\advance\minraggedcols by -1
}{%
-\AtBeginDocument{\grid[]{\papertex@gridrows}{\papertex@gridcolumns}}
+\AtBeginDocument{
+\grid[]{\papertex@gridrows}{\papertex@gridcolumns}}
+\advance\minraggedcols by -1
}
\ifthenelse{\boolean{papertex@ninepoints}}{
\renewcommand{\normalsize}{%
@@ -395,7 +410,6 @@ keepaspectratio ]{#1}}}
\setlength{\columnseprule}{\columnlines}
\setlength{\fboxrule}{0.1 pt}
-\makeindex
}
\newcommand{\logo}[0]{
%% Heading %%
@@ -739,6 +753,9 @@ indexblock environment may only appear inside frontpage environment.
\end{center}
\begin{multicols}{\papertex@ncolumns{}}
+\ifnum \papertex@ncolumns > \minraggedcols
+\raggedFormat
+\fi
}
\newcommand{\papertex@incolumntitle}[2]{
\begin{minipage}{#1}
@@ -792,7 +809,7 @@ indexblock environment may only appear inside frontpage environment.
\longdate{\today}%
}
\newcommand{\authorandplace}[2]{%
-\rightline{%
+\leftline{%
{\innerAuthorFormat #1},\space{}{\innerPlaceFormat #2}%
}%
\par %
@@ -813,6 +830,9 @@ indexblock environment may only appear inside frontpage environment.
\phantomsection
\pdfbookmark[1]{#2}{\thepage}
\label{#5}
+\ifnum #1 > \minraggedcols
+\raggedFormat
+\fi
}
{~\innerTextFinalMark{}
\end{multicols}
@@ -858,6 +878,9 @@ indexblock environment may only appear inside frontpage environment.
\phantomsection
\pdfbookmark[1]{#2}{\thepage}
\label{#4}
+\ifnum #1 > \minraggedcols
+\raggedFormat
+\fi
}
{
\end{multicols}
@@ -882,12 +905,16 @@ indexblock environment may only appear inside frontpage environment.
\pdfbookmark[1]{#2}{\thepage}
\label{#4}
\par %
+\ifnum #1 > \minraggedcols
+\raggedFormat
+\fi
}
{
\end{multicols}
}
\newcommand{\shortnewsitem}[2]{
\goodbreak
+\vspace{5pt plus 3pt minus 3pt}
{\vbox{\noindent\papertex@shortnewsItemTitle{#1}}}
\vspace{5pt plus 3pt minus 3pt}
{\noindent #2}\\
diff --git a/Master/texmf-dist/tpm/papertex.tpm b/Master/texmf-dist/tpm/papertex.tpm
index 952bfdbd9dd..52d98b77cf1 100644
--- a/Master/texmf-dist/tpm/papertex.tpm
+++ b/Master/texmf-dist/tpm/papertex.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/papertex.zip">
<TPM:Name>papertex</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2007/01/19 01:15:25</TPM:Date>
+ <TPM:Date>2007/02/27 23:30:00</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>karl</TPM:Creator>
<TPM:Title>The papertex package.</TPM:Title>
@@ -12,22 +12,23 @@
<TPM:Size>555969</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="24949">
+ <TPM:RunFiles size="25685">
texmf-dist/tex/latex/papertex/papertex.cls
texmf-dist/tpm/papertex.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="474648">
+ <TPM:DocFiles size="507664">
texmf-dist/doc/latex/papertex/CHANGES
texmf-dist/doc/latex/papertex/README
texmf-dist/doc/latex/papertex/example/example.pdf
texmf-dist/doc/latex/papertex/example/example.tex
+texmf-dist/doc/latex/papertex/example/img/firefox.png
texmf-dist/doc/latex/papertex/example/img/ireland.jpg
texmf-dist/doc/latex/papertex/example/img/weather/clouds.jpg
texmf-dist/doc/latex/papertex/example/img/weather/rain.jpg
texmf-dist/doc/latex/papertex/example/img/weather/sun.jpg
texmf-dist/doc/latex/papertex/papertex.pdf
</TPM:DocFiles>
- <TPM:SourceFiles size="56372">
+ <TPM:SourceFiles size="59246">
texmf-dist/source/latex/papertex/papertex.dtx
texmf-dist/source/latex/papertex/papertex.ins
</TPM:SourceFiles>
diff --git a/Master/texmf/lists/papertex b/Master/texmf/lists/papertex
index 49fd0bf47de..daee8d41d99 100644
--- a/Master/texmf/lists/papertex
+++ b/Master/texmf/lists/papertex
@@ -2,6 +2,7 @@ texmf-dist/doc/latex/papertex/CHANGES
texmf-dist/doc/latex/papertex/README
texmf-dist/doc/latex/papertex/example/example.pdf
texmf-dist/doc/latex/papertex/example/example.tex
+texmf-dist/doc/latex/papertex/example/img/firefox.png
texmf-dist/doc/latex/papertex/example/img/ireland.jpg
texmf-dist/doc/latex/papertex/example/img/weather/clouds.jpg
texmf-dist/doc/latex/papertex/example/img/weather/rain.jpg