summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/papertex
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 /Master/texmf-dist/tex/latex/papertex
parentcc45371f572bd45d740b48c56b97a77614294e0b (diff)
papertex update (27feb07)
git-svn-id: svn://tug.org/texlive/trunk@3999 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/papertex')
-rw-r--r--Master/texmf-dist/tex/latex/papertex/papertex.cls45
1 files changed, 36 insertions, 9 deletions
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}\\