1 files changed, 59 insertions, 36 deletions
diff --git a/Master/texmf-dist/tex/latex/pracjourn/pracjourn.cls b/Master/texmf-dist/tex/latex/pracjourn/pracjourn.cls
index 26a81adab1d..245cfa66bd1 100644
--- a/Master/texmf-dist/tex/latex/pracjourn/pracjourn.cls
+++ b/Master/texmf-dist/tex/latex/pracjourn/pracjourn.cls
@@ -26,7 +26,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{pracjourn}
-    [2006/02/20 v0.4k PracTeX Journal Class]
+    [2007/08/25 v0.4n PracTeX Journal Class]
 \let\ExecuteOptions@ltx\ExecuteOptions
 \def\ExecuteOptions#1{%
  \ExecuteOptions@ltx{letterpaper,12pt,oneside,onecolumn,final}%
@@ -37,10 +37,14 @@
 \setlength\textwidth{432pt}
 \setlength\oddsidemargin{18pt}% xx depend on letter/a4
 \setlength\evensidemargin{18pt}
+\IfFileExists{lmodern.sty}{%
+  \RequirePackage{lmodern}
+  \usepackage[T1]{fontenc}}{}
 \IfFileExists{mathpazo.sty}
              {\RequirePackage[sc]{mathpazo}}
              {\renewcommand\rmdefault{ppl}}
-\IfFileExists{microtype.sty}{\RequirePackage[protrusion=true,expansion=false]{microtype}}{}
+\IfFileExists{microtype.sty}{%
+  \RequirePackage[protrusion=true,expansion=false]{microtype}}{}
 \RequirePackage{textcomp}
 \RequirePackage{color,hyperref,graphicx}
 \definecolor{linkcolour}{rgb}{0,0.2,0.6}
@@ -53,7 +57,7 @@
              {\AtBeginDocument{\@ifx@undefined{\typesetemail}{\hyperlinkemail}{}}}
 \renewcommand\maketitle{\par
   \iftpj@noabstract\else
-    \@ifx@undefined{\tpj@info@Abstract}
+    \@ifx@undefined{\tpj@info@\string\abstract}
       {\ClassError{pracjourn}
         {Please specify an \string\abstract\space before \string\maketitle}
         {It is a PracTeX Journal requirement to include an abstract.   \MessageBreak
@@ -94,7 +98,7 @@
   \tpj@optional@author@info
   \iftpj@noabstract\else
     \vspace{2ex}%
-    \tpj@info@container{Abstract}
+    \tpj@info@container{\abstractname}{\abstract}
   \fi}
 \renewcommand\section{\@startsection {section}{1}{\z@}%
                                      {-3.5ex \@plus -1ex \@minus -.2ex}%
@@ -134,10 +138,9 @@
 \renewcommand\labelitemii{\normalfont\bfseries\textperiodcentered}
 \renewcommand*\descriptionlabel[1]{\hspace\labelsep
                                 \normalfont\itshape #1}
-\renewcommand\@makefntext[1]{%
-  \parindent 1.8em%
-  \noindent
-  \hb@xt@1.8em{\hbox{\strut\normalfont\small\@thefnmark.}\hss}#1}
+\def\@makefntext#1{%
+  \parindent 0em\relax
+  \makebox[1.5em][l]{\normalfont\footnotesize\@thefnmark.}#1}
 \def\@ifx@empty#1{% Implicit #2#3
   \ifx#1\@empty
     \expandafter\@firstoftwo
@@ -189,18 +192,34 @@
 \setcounter{totalnumber}{20}
 \setcounter{dbltopnumber}{9}
 \newcommand\addinfo[2][]{%
-  \tpj@define@info@block[#1]{#2}%
-  \g@addto@macro\tpj@optional@author@info{\tpj@info@container[#1]{#2}}}
+  \def\@tempa{\new@addinfo{#1}{#2}}%
+  \lowercase{\expandafter\@tempa\expandafter{\csname#2\endcsname}}}
+\newcommand\new@addinfo[3]{%
+  \tpj@define@info@block{#3}%
+  \expandafter\newcommand
+    \csname\expandafter\@gobble\string#3name\endcsname{#2}%
+  \g@addto@macro\tpj@optional@author@info{%
+    \tpj@info@container[#1]{\csname\expandafter\@gobble\string#3name\endcsname}{#3}}}
+\newcommand\newinfo[1]{%
+  \@ifnextchar[{\@newinfo{#1}}{\@newinfo{#1}[]}}
+\def\@newinfo#1[#2]#3{%
+  \tpj@define@info@block{#1}%
+  \expandafter\newcommand
+    \csname\expandafter\@gobble\string#1name\endcsname{#3}%
+  \g@addto@macro\tpj@optional@author@info{%
+    \tpj@info@container[#2]{%
+      \csname\expandafter\@gobble\string#1name\endcsname}{#1}}}
 \newcommand\addinfospace[1]{\g@addto@macro\tpj@optional@author@info{\vspace{#1}}}
-\newcommand\tpj@define@info@block[2][]{%
-  \lowercase{\expandafter\long\expandafter\def\csname#2\endcsname}%
-  ##1{\expandafter\def\csname tpj@info@#2\endcsname{##1}}}
+\newcommand\tpj@define@info@block[1]{%
+  \newcommand#1[1]{\expandafter\def\csname tpj@info@\string#1\endcsname{##1}}}
 \newcommand\clearinfo{\let\tpj@optional@author@info\@empty}
 \clearinfo
 \addinfo[\typesetemail]{Email}
 \addinfo[\url]{Website}
 \addinfo[\linespread{0.9}\selectfont]{Address}
-\tpj@define@info@block{Abstract}
+\let\abstract\relax
+\tpj@define@info@block\abstract
+\def\abstractname{Abstract}
 \newif\iftpj@noabstract
 \newcommand\noabstract{\tpj@noabstracttrue}
 \def\endabstract{%
@@ -218,19 +237,18 @@
 \let\@TPJrevision\@empty
 \let\@TPJcopyright\@empty
 \let\license\TPJcopyright
-\newcommand\tpj@info@container[2][]{%
-  \lowercase{\expandafter\gdef\csname#2\endcsname}%
-    {\ClassError{pracjourn}{#2 must be defined BEFORE \string\maketitle}{}}
-  \expandafter\ifx\csname tpj@info@#2\endcsname\relax\else
-    \noindent\null\hfill\small
-    \begin{minipage}[t]{0.1\textwidth}
+\newcommand\tpj@info@container[3][]{%
+  \gdef#3{\ClassError{pracjourn}{#2 must be defined BEFORE \string\maketitle}{}}
+  \expandafter\ifx\csname tpj@info@\string#3\endcsname\relax\else
+    \noindent\small
+    \begin{minipage}[t]{0.15\textwidth}
       \noindent\hfill\sffamily#2
     \end{minipage}\hfill
-    \begin{minipage}[t]{0.85\textwidth}
+    \begin{minipage}[t]{0.825\textwidth}
       \linespread{1.0}\selectfont
       \setlength\parindent{1.5em}%
       \noindent\ignorespaces
-      \expandafter#1\expandafter{\csname tpj@info@#2\endcsname}
+      \expandafter#1\expandafter{\csname tpj@info@\string#3\endcsname}
     \end{minipage}\par
   \fi}
 \newcommand\obfuscateemail{%
@@ -255,26 +273,31 @@
 \newcommand\ctanloc[1]{%
   \href{http://www.ctan.org/tex-archive/#1}
        {\path{CTAN:#1}}}
-\DeclareRobustCommand\TeX{T\kern-.15em\lower.5ex\hbox{E}\kern-.07em X\spacefactor1000\relax}
-\DeclareRobustCommand\LaTeX{L\kern-.32em\raise.37ex\hbox{\scalebox{0.76}{A}}\kern-.15em\TeX}
-\DeclareRobustCommand\LaTeXe{\LaTeX2$_{\textstyle\varepsilon}$}
-\DeclareRobustCommand\BibTeX{B{\textsc i\kern-.025em\textsc b}\kern-.08em\TeX}
+\newcommand\tpj@deflogo{\@dblarg\tpj@@deflogo}
+\newcommand\tpj@@deflogo[3][\@nil]{%
+  \expandafter\DeclareRobustCommand\csname#2\endcsname{#3}%
+  \pdfstringdefDisableCommands{%
+    \expandafter\def\csname#2\endcsname{#1}}}
+\tpj@deflogo{TeX}{T\kern-.15em\lower.5ex\hbox{E}\kern-.07em X\spacefactor1000\relax}
+\tpj@deflogo{LaTeX}{L\kern-.32em\raise.37ex\hbox{\scalebox{0.76}{A}}\kern-.15em\TeX}
+\tpj@deflogo{LaTeXe}{\LaTeX2$_{\textstyle\varepsilon}$}
+\tpj@deflogo{BibTeX}{B{\textsc i\kern-.025em\textsc b}\kern-.08em\TeX}
 \DeclareRobustCommand\logofamily{%
   \not@math@alphabet\logofamily\relax
   \fontencoding{U}\fontfamily{logo}\selectfont}
 \DeclareTextFontCommand{\textlogo}{\logofamily}
-\DeclareRobustCommand\MF{\textlogo{META}\@dischyph\textlogo{FONT}\@}
-\DeclareRobustCommand\MP{\textlogo{META}\@dischyph\textlogo{POST}\@}
-\DeclareRobustCommand\ConTeXt{C\kern-.03em on\-\kern-.10em\TeX\kern-0.04em t}%
-\DeclareRobustCommand\pdfTeX{pdf\/\TeX}
-\DeclareRobustCommand\pdfLaTeX{pdf\/\LaTeX}
-\DeclareRobustCommand\PS{PostScript}
-\DeclareRobustCommand\PracTeX{Prac\kern-0.07em\TeX}
-\DeclareRobustCommand\TPJ{The \PracTeX\ Journal}
-\DeclareRobustCommand\XeTeX{%
+\tpj@deflogo[MetaFont]{MF}{\textlogo{META}\@dischyph\textlogo{FONT}\@}
+\tpj@deflogo[MetaPost]{MP}{\textlogo{META}\@dischyph\textlogo{POST}\@}
+\tpj@deflogo{ConTeXt}{C\kern-.03em on\-\kern-.10em\TeX\kern-0.04em t}%
+\tpj@deflogo{pdfTeX}{pdf\/\TeX}
+\tpj@deflogo{pdfLaTeX}{pdf\/\LaTeX}
+\newcommand\PS{PostScript}
+\tpj@deflogo{PracTeX}{Prac\kern-0.07em\TeX}
+\newcommand\TPJ{The \PracTeX\ Journal}
+\tpj@deflogo{XeTeX}{%
       X\lower.5ex\hbox{\kern-.07em\reflectbox{E}}%
       \kern-.15em\TeX}
-\DeclareRobustCommand\ExTeX{\textrm{\relax
+\tpj@deflogo{ExTeX}{\textrm{\relax
  \ensuremath{\textstyle\varepsilon_{\kern-0.15em\mathcal{X}}}\relax
  \kern-.15em\TeX}}
 \def\write@ID@aux{%