aomart (10may17)

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

1 files changed, 28 insertions, 8 deletions

diff --git a/Master/texmf-dist/tex/latex/aomart/aomart.cls b/Master/texmf-dist/tex/latex/aomart/aomart.cls
index fb7546467ee..8e302ff6f69 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}
-[2017/04/12 v1.19 Typesetting articles for the Annals of Mathematics]
+[2017/05/09 v1.20 Typesetting articles for the Annals of Mathematics]
 \long\def\aom@size@warning#1{%
   \ClassWarning{aomart}{Size-changing option #1 will not be
     honored}}%
@@ -241,9 +241,14 @@
 }
 \def\keyword#1{\ifx\@keywords\@empty\gdef\@keywords{#1}\else
   \g@addto@macro\@keywords{, #1}\fi}
-\let\@subjects\@empty
-\def\subject#1#2#3{\ifx\@subjects\@empty\gdef\@subjects{#3}\else
-  \g@addto@macro\@subjects{, #3}\fi}
+\let\@primarysubjects\@empty
+\let\@secondarysubjects\@empty
+\def\subject#1#2#3{%
+  \expandafter\ifx\csname @#1subjects\endcsname\@empty\relax
+     \expandafter\gdef\csname @#1subjects\endcsname{#3}%
+  \else
+     \expandafter\g@addto@macro\csname @#1subjects\endcsname{, #3}%
+  \fi}
 \def\formatdate#1{\@formatdate#1\@endformatdate}
 \def\@formatdate#1-#2-#3\@endformatdate{%
   \@tempcnta=#3\relax
@@ -359,7 +364,8 @@
     {\@percentchar arxiv=\@arxivnumber}%
    \fi
    \protected@write\@mainrpi{}%
-    {\@percentchar subjects=\@subjects}%
+    {\@percentchar subjects=Primary \@primarysubjects; Secondary:
+      \@secondarysubjects}%
    \protected@write\@mainrpi{}%
     {\@percentchar keywords=\@keywords}%
    \protected@write\@mainrpi{}%
@@ -409,7 +415,10 @@
   \ifx\@empty\@date\else \@footnotetext{\@setdate}\fi
   \ifx\@empty\@subjclass\else \@footnotetext{\@setsubjclass}\fi
   \ifx\@empty\@keywords\else\@setkeywords\fi
-  \ifx\@empty\@subjects\else\@setsubjects\fi
+  \ifx\@empty\@primarysubjects
+     \ifx\@empty\@secondarysubjects
+     \else\@setsubjects\fi
+  \else\@setsubjects\fi
   \ifx\@empty\thankses\else \@footnotetext{%
     \def\par{\let\par\@par}\@setthanks}%
   \fi
@@ -426,11 +435,22 @@
     \fi
 }
 \def\@setsubjects{%
+  \let\@subjects\@empty
+   \ifx\@primarysubjects\@empty\else
+     \edef\@subjects{Primary: \@primarysubjects}%
+    \fi
+   \ifx\@secondarysubjects\@empty\else
+     \ifx\@primarysubjects\@empty
+       \edef\@subjects{Secondary: \@secondarysubjects}%
+     \else
+       \edef\@subjects{\@subjects; Secondary: \@secondarysubjects}%
+     \fi
+    \fi
     \ifpdf
       \hypersetup{pdfsubject=\@subjects}%
-    \if@aom@oldkeywords\else
-    \@footnotetext{AMS Classification: \@subjects}%
     \fi
+    \if@aom@oldkeywords\else
+    \@footnotetext{AMS Classification: \@subjects.}%
     \fi
 }
 \def\@@and{\MakeLowercase{\@aom@and}}