aomart (20jan17)

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

1 files changed, 69 insertions, 12 deletions

diff --git a/Master/texmf-dist/tex/latex/aomart/aomart.cls b/Master/texmf-dist/tex/latex/aomart/aomart.cls
index a5824a7ca9d..d856183b2b9 100644
--- a/Master/texmf-dist/tex/latex/aomart/aomart.cls
+++ b/Master/texmf-dist/tex/latex/aomart/aomart.cls
@@ -37,7 +37,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{aomart}
-[2016/11/18 v1.15 Typesetting articles for the Annals of Mathematics]
+[2016/12/03 v1.16 Typesetting articles for the Annals of Mathematics]
 \long\def\aom@size@warning#1{%
   \ClassWarning{aomart}{Size-changing option #1 will not be
     honored}}%
@@ -79,6 +79,7 @@
   urlcolor=black}%
 \fi\fi
 \urlstyle{rm}
+\RequirePackage{environ}
 \def\@aom@by{By}
 \def\@aom@and{and}
 \AtBeginDocument{\@ifpackageloaded{babel}{%
@@ -198,9 +199,38 @@
 \@onlypreamble{\doinumber}
 \@onlypreamble{\mrnumber}
 \@onlypreamble{\zblnumber}
-\let\givenname=\@gobble
-\let\surname=\@gobble
-\let\fulladdress=\@gobble
+\@onlypreamble{\arxivnumber}
+\def\@names{}
+\def\givenname#1{\g@addto@macro\@names{givenname=#1;}}
+\def\surname#1{\g@addto@macro\@names{surname=#1;}}
+\def\fulladdress#1{\g@addto@macro\@names{fulladdress=#1;}}
+\renewcommand{\author}[2][]{%
+  \ifx\@empty\authors
+    \gdef\authors{#2}%
+    \g@addto@macro\@names{author=#2;}%
+  \else
+    \g@addto@macro\authors{\and#2}%
+    \g@addto@macro\@names{\and author=#2;}%
+    \g@addto@macro\addresses{\author{}}%
+  \fi
+  \@ifnotempty{#1}{%
+    \ifx\@empty\shortauthors
+      \gdef\shortauthors{#1}%
+    \else
+      \g@addto@macro\shortauthors{\and#1}%
+    \fi
+  }%
+}
+\edef\author{\@nx\@dblarg
+  \@xp\@nx\csname\string\author\endcsname}
+\renewcommand{\email}[2][]{%
+  \g@addto@macro\addresses{\email{#1}{#2}}%
+  \g@addto@macro\@names{email=#2;}%
+}
+\renewcommand{\urladdr}[2][]{%
+  \g@addto@macro\addresses{\urladdr{#1}{#2}}%
+  \g@addto@macro\@names{urladdr=#2;}%
+}
 \def\keyword#1{\ifx\@keywords\@empty\gdef\@keywords{#1}\else
   \g@addto@macro\@keywords{, #1}\fi}
 \let\@subjects\@empty
@@ -238,7 +268,9 @@
   \else\def\end@page{#1}\fi}
 \def\pagespan#1#2{\startpage{#1}\endpage{#2}}
 \pagespan{1}{}
-\renewenvironment{abstract}{%
+\long\def\@aom@abstract{}
+\long\def\@getabstract#1{%
+  \long\gdef\@aom@abstract{#1}%
   \ifx\maketitle\relax
     \ClassWarning{aomart}{Abstract should precede
       \protect\maketitle\space in AMS derived classes}%
@@ -252,12 +284,10 @@
       \parsep\z@ \@plus\p@%
       \let\fullwidthdisplay\relax%
     }%
-    \item[]\normalfont\Small%
-}{%
-  \endlist\egroup%
-  \ifx\@setabstract\relax\@setabstracta\fi%
-}
-
+    \item[]\normalfont\Small#1
+  \endlist\egroup}
+\renewenvironment{abstract}{\Collect@Body\@getabstract}{%
+  \ifx\@setabstract\relax\@setabstracta\fi}
 \let\proposed\@gobble
 \let\seconded\@gobble
 \let\corresponding\@gobble
@@ -268,6 +298,8 @@
 \mrnumber{}
 \def\zblnumber#1{\gdef\@zblnumber{#1}}
 \zblnumber{}
+\def\arxivnumber#1{\gdef\@arxivnumber{#1}}
+\arxivnumber{}
 \def\copyrightyear#1{\def\@copyrightyear{#1}}
 \copyrightyear{}
 \def\copyrightnote#1{\def\@copyrightnote{#1}}
@@ -280,10 +312,17 @@
   \if@filesw
     \openout\@mainrpi\jobname.rpi%
     \def\and{\string\and\space}%
-    \def\pkg##1{ ##1 }%
+    \ifx\r@LastPage\@undefined
+       \edef\@tempa{\start@page}%
+    \else
+       \def\@tempc##1##2##3##4##5{##2}%
+       \edef\@tempa{\expandafter\@tempc\r@LastPage}%
+    \fi
    \protected@write\@mainrpi{}%
     {\@percentchar authors=\authors}%
    \protected@write\@mainrpi{}%
+    {\@percentchar authors.information={\@names}}%
+   \protected@write\@mainrpi{}%
     {\@percentchar title=\@title}%
    \protected@write\@mainrpi{}%
     {\@percentchar year=\currentyear}%
@@ -299,6 +338,24 @@
     {\@percentchar endpage=\@tempa}%
    \protected@write\@mainrpi{}%
     {\@percentchar doi=\@doinumber}%
+   \ifx\@zblnumber\@empty\else
+   \protected@write\@mainrpi{}%
+    {\@percentchar zbl=\@zblnumber}%
+   \fi
+   \ifx\@mrnumber\@empty\else
+   \protected@write\@mainrpi{}%
+    {\@percentchar mr=\@mrnumber}%
+   \fi
+   \ifx\@arxivnumber\@empty\else
+   \protected@write\@mainrpi{}%
+    {\@percentchar arxiv=\@arxivnumber}%
+   \fi
+   \protected@write\@mainrpi{}%
+    {\@percentchar subjects=\@subjects}%
+   \protected@write\@mainrpi{}%
+    {\@percentchar keywords=\@keywords}%
+   \protected@write\@mainrpi{}%
+    {\@percentchar abstract=\@aom@abstract}%
     \closeout\@mainrpi
     \fi
 \egroup}