aomart (8mar11)

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

10 files changed, 61 insertions, 29 deletions

diff --git a/Master/texmf-dist/bibtex/bst/aomart/aomalpha.bst b/Master/texmf-dist/bibtex/bst/aomart/aomalpha.bst
index 4a781e19693..9fa277d053f 100644
--- a/Master/texmf-dist/bibtex/bst/aomart/aomalpha.bst
+++ b/Master/texmf-dist/bibtex/bst/aomart/aomalpha.bst
@@ -20,7 +20,7 @@
 % This work consists of the file aomart.dtx the
 % derived file aomart.cls, and the file aomplain.bst
 %
-% Version 1.5, 2011/02/26
+% Version 1.6, 2011/03/06
 %
 %%%
 
@@ -1198,26 +1198,32 @@ FUNCTION {editor.key.organization.label}
 }
 
 FUNCTION {calc.label}
-{ type$ "book" =
-  type$ "inbook" =
-  or
-    'author.editor.key.label
-    { type$ "proceedings" =
-	'editor.key.organization.label
-	{ type$ "manual" =
-	    'author.key.organization.label
-	    'author.key.label
-	  if$
-	}
-      if$
-    }
+{key empty$
+  { type$ "book" =
+    type$ "inbook" =
+    or
+      'author.editor.key.label
+      { type$ "proceedings" =
+  	'editor.key.organization.label
+	  { type$ "manual" =
+	      'author.key.organization.label
+	      'author.key.label
+	    if$
+	  }
+        if$
+      }
+    if$
+    duplicate$
+    year field.or.null purify$ #-1 #2 substring$
+    *
+    'label :=
+    year field.or.null purify$ #-1 #4 substring$
+    *
+  }
+  { 
+    key duplicate$ 'label := 
+  }
   if$
-  duplicate$
-  year field.or.null purify$ #-1 #2 substring$
-  *
-  'label :=
-  year field.or.null purify$ #-1 #4 substring$
-  *
   sortify 'sort.label :=
 }
 
diff --git a/Master/texmf-dist/doc/latex/aomart/README b/Master/texmf-dist/doc/latex/aomart/README
index ebda3b70eb6..78772814c0d 100644
--- a/Master/texmf-dist/doc/latex/aomart/README
+++ b/Master/texmf-dist/doc/latex/aomart/README
@@ -1,12 +1,18 @@
 	      LaTeX Class for The Annals of Mathematics
 			    Boris Veytsman
-			     Version 1.5
+			     Version 1.6
 
 This package provides the class for typesetting articles for The Annals
 of Mathematics, http://annals.princeton.edu/.  
 
 Changes:
 
+    Version 1.6
+          Appendix letter is now upright in the refs, even inside
+            italics
+          Bibliography style change: aomalpha.bst now respects the 
+            key field
+
     Version 1.5
            Typo corrected: arXiV is now arXiv
            Bibliography style change: added sortyear field
diff --git a/Master/texmf-dist/doc/latex/aomart/aomart.pdf b/Master/texmf-dist/doc/latex/aomart/aomart.pdf
index 7a930b50fde..232337188ae 100644
--- a/Master/texmf-dist/doc/latex/aomart/aomart.pdf
+++ b/Master/texmf-dist/doc/latex/aomart/aomart.pdf
diff --git a/Master/texmf-dist/doc/latex/aomart/aomsample.bib b/Master/texmf-dist/doc/latex/aomart/aomsample.bib
index a9cef138cdf..7e996719449 100644
--- a/Master/texmf-dist/doc/latex/aomart/aomsample.bib
+++ b/Master/texmf-dist/doc/latex/aomart/aomsample.bib
@@ -198,6 +198,7 @@ url = {http://www.math.leidenuniv.nl/~hwl/PUBLICATIONS/1973a/art.pdf}
 }
 
 @Article{Zarhin92,
+  key  =         {Zarh92},
   author = 	 {Zarhin, Yuri G.},
   title = 	 {Abelian Varieties Having a Reduction of {K3} Type},
   journal = 	 {Duke Math J.},
diff --git a/Master/texmf-dist/doc/latex/aomart/aomsample.pdf b/Master/texmf-dist/doc/latex/aomart/aomsample.pdf
index 57ef367e24e..8228e420b59 100644
--- a/Master/texmf-dist/doc/latex/aomart/aomsample.pdf
+++ b/Master/texmf-dist/doc/latex/aomart/aomsample.pdf
diff --git a/Master/texmf-dist/doc/latex/aomart/aomsample.tex b/Master/texmf-dist/doc/latex/aomart/aomsample.tex
index 5c288bc375f..e60b0a60dda 100644
--- a/Master/texmf-dist/doc/latex/aomart/aomsample.tex
+++ b/Master/texmf-dist/doc/latex/aomart/aomsample.tex
@@ -239,6 +239,7 @@ this paper. All formulas can be extended to a digraph simply by
 multiplying $H_c$ by 2.  Some other discussion can be found
 in~\cite{fre:riesz,fre:cichon}.
 
+
 \section{Main theorem}
 \label{s:mt}
 
@@ -1723,7 +1724,7 @@ and now in \cn{Large} size:
 
 
 \bibliography{aomsample}
-\bibliographystyle{aomplain}
+\bibliographystyle{aomalpha}
 
 \end{document}
 \endinput
diff --git a/Master/texmf-dist/doc/latex/aomart/aomsample1.pdf b/Master/texmf-dist/doc/latex/aomart/aomsample1.pdf
index 2f609ba2378..816fa790a90 100644
--- a/Master/texmf-dist/doc/latex/aomart/aomsample1.pdf
+++ b/Master/texmf-dist/doc/latex/aomart/aomsample1.pdf
diff --git a/Master/texmf-dist/doc/latex/aomart/aomsample1.tex b/Master/texmf-dist/doc/latex/aomart/aomsample1.tex
index c6786dcb888..fd2e80b859c 100644
--- a/Master/texmf-dist/doc/latex/aomart/aomsample1.tex
+++ b/Master/texmf-dist/doc/latex/aomart/aomsample1.tex
@@ -239,6 +239,7 @@ this paper. All formulas can be extended to a digraph simply by
 multiplying $H_c$ by 2.  Some other discussion can be found
 in~\cite{fre:riesz,fre:cichon}.
 
+
 \section{Main theorem}
 \label{s:mt}
 
@@ -1716,7 +1717,7 @@ and now in \cn{Large} size:
 
 
 \bibliography{aomsample}
-\bibliographystyle{aomplain}
+\bibliographystyle{aomalpha}
 
 \end{document}
 \endinput
diff --git a/Master/texmf-dist/source/latex/aomart/aomart.dtx b/Master/texmf-dist/source/latex/aomart/aomart.dtx
index 06265c00812..0061436bdc6 100644
--- a/Master/texmf-dist/source/latex/aomart/aomart.dtx
+++ b/Master/texmf-dist/source/latex/aomart/aomart.dtx
@@ -1,5 +1,5 @@
 % \iffalse
-% $Id: aomart.dtx,v 1.48 2011-02-26 19:19:03 boris Exp $
+% $Id: aomart.dtx,v 1.50 2011-03-06 20:53:54 boris Exp $
 %
 % Copyright 2010-2011, Princeton University (Mathematics Department)
 % This work may be distributed and/or modified under the
@@ -23,7 +23,7 @@
 % public domain.
 %
 % \fi 
-% \CheckSum{1016}
+% \CheckSum{1031}
 %
 %
 %% \CharacterTable
@@ -93,9 +93,11 @@
 % \changes{v0.10}{2010/12/20}{Documentation update} 
 % \changes{v1.0}{2010/12/21}{Top matter macros are now only in preamble} 
 % \changes{v1.2}{2011/01/05}{Bibliography styles update} 
-% \changes{v1.6}{2011/02/26}{Added noopsort to the styles, corrected
+% \changes{v1.5}{2011/02/26}{Added noopsort to the styles, corrected
 % typo} 
-% \changes{v1.6}{2011/02/26}{Added sortyear to the styles} 
+% \changes{v1.5}{2011/02/26}{Added sortyear to the styles} 
+% \changes{v1.6}{2011/03/06}{Bibliography change: aomalpha now
+% respects key field in the bib file} 
 %
 % \clearpage
 %
@@ -673,7 +675,7 @@
 \ProvidesFile{aomart.dtx}
 %</gobble>
 %<class>\ProvidesClass{aomart}
-[2011/02/26 v1.5 Typesetting articles for the Annals of Mathematics]
+[2011/03/06 v1.6 Typesetting articles for the Annals of Mathematics]
 %    \end{macrocode}
 %
 %
@@ -1530,6 +1532,18 @@
 % \end{macro}
 %
 %
+% \begin{macro}{\appendix}
+% \changes{v1.6}{2011/03/06}{Redefined the macro} 
+%   We redefine appendix to ensure the letter in section number is
+%   always upright:
+%    \begin{macrocode}
+\def\appendix{\par\c@section\z@ \c@subsection\z@
+   \let\sectionname\appendixname
+   \def\thesection{{\upshape\@Alph\c@section}}}
+%    \end{macrocode}
+%   
+% \end{macro}
+%
 %\subsection{Figures and Tables}
 %\label{sec:figs}
 %
diff --git a/Master/texmf-dist/tex/latex/aomart/aomart.cls b/Master/texmf-dist/tex/latex/aomart/aomart.cls
index aea82f01e08..b3c5a1834b1 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}
-[2011/02/26 v1.5 Typesetting articles for the Annals of Mathematics]
+[2011/03/06 v1.6 Typesetting articles for the Annals of Mathematics]
 \long\def\aom@size@warning#1{%
   \ClassWarning{aomart}{Size-changing option #1 will not be
     honored}}%
@@ -351,6 +351,9 @@
 \def\subsubsection{\@startsection{subsubsection}{3}%
   {\parindent}{.5\linespacing}{-.5em}%
   {\normalfont\itshape}}
+\def\appendix{\par\c@section\z@ \c@subsection\z@
+   \let\sectionname\appendixname
+   \def\thesection{{\upshape\@Alph\c@section}}}
 \def\@captionheadfont{\normalfont}
 \newtheoremstyle{plain}{0.5\linespacing}{0.5\linespacing}{\sishape}%
    {\parindent}{\scshape}{.}{0.5em}%