aomart 1.9, 2011/06/13

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

12 files changed, 140 insertions, 59 deletions

diff --git a/Master/texmf-dist/bibtex/bst/aomart/aomalpha.bst b/Master/texmf-dist/bibtex/bst/aomart/aomalpha.bst
index 9fa277d053f..b62ca7fa20a 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.6, 2011/03/06
+% Version 1.9, 2011/06/13
 %
 %%%
 
@@ -593,21 +593,6 @@ FUNCTION {format.inproc.title.venue.editors}
   if$
 }
 
-%% format.incoll.title.editors is similar to format.inproc... but
-%% omits the address. For collections that are not proceedings volumes.
-
-FUNCTION {format.incoll.title.editors}
-{ booktitle empty$
-    { "" }
-    { editor empty$
-        { " in \emph{"  booktitle * "}" * }
-        { " in \emph{"  booktitle * "}" *
-          add.space.if.necessary "(" * format.nonauthor.editors * ")" *
-        }
-      if$
-    }
-  if$
-}
 
 FUNCTION {format.edition}
 { edition empty$
@@ -888,7 +873,7 @@ FUNCTION {incollection}
   format.authors "author" output.check
   format.title "title" output.check
   crossref missing$
-    { format.incoll.title.editors "booktitle" output.check
+    { format.inproc.title.venue.editors "booktitle" output.check
       format.bookvolume.series.number output
       publisher "publisher" output.check
       address output
@@ -1238,7 +1223,7 @@ FUNCTION {sort.format.names}
 	{ "   " * }
 	'skip$
       if$
-      s nameptr "{vv{ } }{ll{ }}{  ff{ }}{  jj{ }}" format.name$ 't :=
+      s nameptr "{ll{ }}{  ff{ }}{  jj{ }}" format.name$ 't :=
       nameptr numnames = t "others" = and
 	{ "et al" * }
 	{ t sortify * }
@@ -1422,7 +1407,11 @@ ITERATE {forward.pass}
 REVERSE {reverse.pass}
 
 FUNCTION {begin.bib}
-{ preamble$ empty$
+{ et.al.char.used
+    { "\providecommand{\etalchar}[1]{$^{#1}$}" write$ newline$ }
+    'skip$
+  if$
+  preamble$ empty$
     'skip$
     { preamble$ write$ newline$ }
   if$
@@ -1438,7 +1427,7 @@ FUNCTION {begin.bib}
     write$ newline$
   "\providecommand{\arxiv}[1]{\href{http://www.arxiv.org/abs/#1}{arXiv~#1}}"
     write$ newline$
-  "\providecommand{\doi}[1]{\href{http://dx.doi.org/#1}{doi: #1}}"
+  "\providecommand{\doi}[1]{\url{http://dx.doi.org/#1}}"
     write$ newline$
   "\providecommand{\MR}{\relax\ifhmode\unskip\space\fi MR }"
     write$ newline$
diff --git a/Master/texmf-dist/bibtex/bst/aomart/aomplain.bst b/Master/texmf-dist/bibtex/bst/aomart/aomplain.bst
index e8777688815..332b0ba1efd 100644
--- a/Master/texmf-dist/bibtex/bst/aomart/aomplain.bst
+++ b/Master/texmf-dist/bibtex/bst/aomart/aomplain.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.9, 2011/06/13
 %
 %%%
 
@@ -587,21 +587,6 @@ FUNCTION {format.inproc.title.venue.editors}
   if$
 }
 
-%% format.incoll.title.editors is similar to format.inproc... but
-%% omits the address. For collections that are not proceedings volumes.
-
-FUNCTION {format.incoll.title.editors}
-{ booktitle empty$
-    { "" }
-    { editor empty$
-        { " in \emph{"  booktitle * "}" * }
-        { " in \emph{"  booktitle * "}" *
-          add.space.if.necessary "(" * format.nonauthor.editors * ")" *
-        }
-      if$
-    }
-  if$
-}
 
 FUNCTION {format.edition}
 { edition empty$
@@ -882,7 +867,7 @@ FUNCTION {incollection}
   format.authors "author" output.check
   format.title "title" output.check
   crossref missing$
-    { format.incoll.title.editors "booktitle" output.check
+    { format.inproc.title.venue.editors "booktitle" output.check
       format.bookvolume.series.number output
       publisher "publisher" output.check
       address output
@@ -1097,7 +1082,7 @@ FUNCTION {sort.format.names}
 	{ "   " * }
 	'skip$
       if$
-      s nameptr "{vv{ } }{ll{ }}{  ff{ }}{  jj{ }}" format.name$ 't :=
+      s nameptr "{ll{ }}{  ff{ }}{  jj{ }}" format.name$ 't :=
       nameptr numnames = t "others" = and
 	{ "et al" * }
 	{ t sortify * }
@@ -1287,7 +1272,7 @@ FUNCTION {begin.bib}
     write$ newline$
   "\providecommand{\arxiv}[1]{\href{http://www.arxiv.org/abs/#1}{arXiv~#1}}"
     write$ newline$
-  "\providecommand{\doi}[1]{\href{http://dx.doi.org/#1}{doi: #1}}"
+  "\providecommand{\doi}[1]{\url{http://dx.doi.org/#1}}"
     write$ newline$
   "\providecommand{\MR}{\relax\ifhmode\unskip\space\fi MR }"
     write$ newline$
diff --git a/Master/texmf-dist/doc/latex/aomart/README b/Master/texmf-dist/doc/latex/aomart/README
index cd4e62f3303..574dfd3eb80 100644
--- a/Master/texmf-dist/doc/latex/aomart/README
+++ b/Master/texmf-dist/doc/latex/aomart/README
@@ -1,11 +1,23 @@
 	      LaTeX Class for The Annals of Mathematics
 			    Boris Veytsman
-			     Version 1.7
+			     Version 1.10
 
 This package provides the class for typesetting articles for The Annals
 of Mathematics, http://annals.princeton.edu/.  
 
 Changes:
+    
+    Version 1.10
+          `Old' doi formatting can be set with the option olddoi
+          Support for French and German added
+
+    Version 1.9
+          Changed formatting of doi numbers
+
+    Version 1.8
+          Bibliography changes: 
+            @incollection now the uses venue field;
+            "von" part is not used when ordering entries.
 
     Version 1.7
           Suppressed end page number in the header for one-page 
diff --git a/Master/texmf-dist/doc/latex/aomart/aomart.bib b/Master/texmf-dist/doc/latex/aomart/aomart.bib
index 2746077e4a6..75db470db49 100644
--- a/Master/texmf-dist/doc/latex/aomart/aomart.bib
+++ b/Master/texmf-dist/doc/latex/aomart/aomart.bib
@@ -121,3 +121,11 @@ c.pdf}},
   year =          {1997},
 }
 
+@Manual{Braams05:Babel,
+  title = 	 {Babel, a Multilingual Package For Use With {\LaTeX}'s
+                  Standard Document Classes},
+  author =	 {Johannes Braams},
+  month =	 {April},
+  year =	 2005,
+  note =	 {\url{http://mirrors.ctan.org/macros/latex/required/babel}}
+}
diff --git a/Master/texmf-dist/doc/latex/aomart/aomart.pdf b/Master/texmf-dist/doc/latex/aomart/aomart.pdf
index b21ff6c33b4..8356a654958 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 7e996719449..daa6606d0f6 100644
--- a/Master/texmf-dist/doc/latex/aomart/aomsample.bib
+++ b/Master/texmf-dist/doc/latex/aomart/aomsample.bib
@@ -254,3 +254,16 @@ url = {http://www.math.leidenuniv.nl/~hwl/PUBLICATIONS/1973a/art.pdf}
   sortyear =     2100,
   note = 	 {Private Communication}
 }
+
+@incollection{degroot1992stochastic,
+ author = {C. de Groot and D. W{\"u}rtz  and M. Hanf and 
+           R. Peikert and T. Koller and K. H. Hoffmann},
+ title = {Stochastic Optimization---Efficient Algorithms to 
+          Solve Complex Problems},
+ booktitle = {System Modelling and Optimization, Proceedings of the Fifteenth IFIP Conference},
+ year = 1992,
+ editor = {P. Kall},
+ pages = {546--555},
+ venue = {Z{\"u}rich},
+ publisher = {Springer-Verlag},
+}
diff --git a/Master/texmf-dist/doc/latex/aomart/aomsample.pdf b/Master/texmf-dist/doc/latex/aomart/aomsample.pdf
index 3eab7012013..345d497dda5 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 e60b0a60dda..a5278aad3f3 100644
--- a/Master/texmf-dist/doc/latex/aomart/aomsample.tex
+++ b/Master/texmf-dist/doc/latex/aomart/aomsample.tex
@@ -14,6 +14,7 @@
 \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX)
 [1994/12/01]% LaTeX date must December 1994 or later
 \documentclass[manuscript]{aomart}
+%\usepackage[english]{babel}
 %\documentclass[screen]{aomart}
 %\documentclass{aomart}
 %    Some definitions useful in producing this sort of documentation:
@@ -169,7 +170,7 @@ on \texttt{testmath.tex} from  \AmS-\LaTeX{} distribution.  The text
 is (slightly) reformatted according to the requirements of the
 \texttt{aomart} style.  See also
 \cite{Lenstra74,Zarhin92,Minasyan08,Arnold89:MathMethodsMechanics,%
-Michal48,Michal38,Zarhin:AG,Zarhin:AC}.
+Michal48,Michal38,Zarhin:AG,Zarhin:AC,degroot1992stochastic}.
 \EditorialComment{Are these 
   quotations necessary?}
 
@@ -1724,7 +1725,7 @@ and now in \cn{Large} size:
 
 
 \bibliography{aomsample}
-\bibliographystyle{aomalpha}
+\bibliographystyle{aomplain}
 
 \end{document}
 \endinput
diff --git a/Master/texmf-dist/doc/latex/aomart/aomsample1.pdf b/Master/texmf-dist/doc/latex/aomart/aomsample1.pdf
index 96c974dde74..69a39af0919 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 fd2e80b859c..69bf2bf2f70 100644
--- a/Master/texmf-dist/doc/latex/aomart/aomsample1.tex
+++ b/Master/texmf-dist/doc/latex/aomart/aomsample1.tex
@@ -14,6 +14,7 @@
 \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX)
 [1994/12/01]% LaTeX date must December 1994 or later
 \documentclass[manuscript]{aomart}
+%\usepackage[english]{babel}
 %\documentclass[screen]{aomart}
 %\documentclass{aomart}
 %    Some definitions useful in producing this sort of documentation:
@@ -169,7 +170,7 @@ on \texttt{testmath.tex} from  \AmS-\LaTeX{} distribution.  The text
 is (slightly) reformatted according to the requirements of the
 \texttt{aomart} style.  See also
 \cite{Lenstra74,Zarhin92,Minasyan08,Arnold89:MathMethodsMechanics,%
-Michal48,Michal38,Zarhin:AG,Zarhin:AC}.
+Michal48,Michal38,Zarhin:AG,Zarhin:AC,degroot1992stochastic}.
 \EditorialComment{Are these 
   quotations necessary?}
 
@@ -1717,7 +1718,7 @@ and now in \cn{Large} size:
 
 
 \bibliography{aomsample}
-\bibliographystyle{aomalpha}
+\bibliographystyle{aomplain}
 
 \end{document}
 \endinput
diff --git a/Master/texmf-dist/source/latex/aomart/aomart.dtx b/Master/texmf-dist/source/latex/aomart/aomart.dtx
index df1ef074c70..155d99aa3f5 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.51 2011-03-09 03:42:59 boris Exp $
+% $Id: aomart.dtx,v 1.54 2011-06-21 21:34:22 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{1053}
+% \CheckSum{1089}
 %
 %
 %% \CharacterTable
@@ -183,7 +183,9 @@
 % \progname{amsart}~\cite{Graetzer00:MathIntoLaTeX, amsldoc} can be used in the
 % source.
 %
-% 
+%  The class should work with the
+%  \progname{Babel}~\cite{Braams05:Babel} package.  At present,
+%  English, French and German languages are fully supported.  
 % 
 % \DescribeOptions{draft,final}
 % The options |draft| and |final| work in the same way as for
@@ -221,6 +223,13 @@
 % acticle.  If this option is selected, the links are blue colored,
 % and the margins are reduced.
 %
+% \DescribeOption{olddoi}
+% Starting from version~1.9 the formatting of DOI numbers changed
+% according to the new recommendations from CrossRef.  The option
+% |olddoi| switches on the ``old'' formatting.  It is used for
+% compatibility reasons.
+%
+%
 % \DescribeOptions{8pt,9pt,10pt,11pt,12pt}
 % The size-changing options of \progname{amsart} class (|8pt|, |9pt|,
 % \dots, |12pt|) have no effect other than producing a warning in the
@@ -675,7 +684,7 @@
 \ProvidesFile{aomart.dtx}
 %</gobble>
 %<class>\ProvidesClass{aomart}
-[2011/03/08 v1.7 Typesetting articles for the Annals of Mathematics]
+[2011/06/21 v1.10 Typesetting articles for the Annals of Mathematics]
 %    \end{macrocode}
 %
 %
@@ -726,7 +735,6 @@
 \@aom@manuscript@modefalse
 \DeclareOption{manuscript}{\@aom@manuscript@modetrue}
 %    \end{macrocode}
-%   
 % \end{macro}
 %
 %
@@ -737,6 +745,16 @@
 \newif\if@aom@screen@mode
 \@aom@screen@modefalse
 \DeclareOption{screen}{\@aom@screen@modetrue}
+%    \end{macrocode}   
+% \end{macro}
+%
+% \begin{macro}{\if@aom@olddoi}
+% \changes{v1.10}{2011/06/21}{Added old DOI processing} 
+%   DOI processing is different in the ``old'' and new mode.
+%    \begin{macrocode}
+\newif\if@aom@olddoi
+\@aom@olddoifalse
+\DeclareOption{olddoi}{\@aom@olddoitrue}
 %    \end{macrocode}
 %   
 % \end{macro}
@@ -792,6 +810,44 @@
 %
 % \changes{v0.4}{2010/09/29}{Deleted lineno package dependence} 
 %
+%
+%
+%\subsection{Internationalization}
+%\label{sec:babel}
+% 
+% There are some papers published in languages other than English.
+% The \progname{Babel} is expected to be used for them.  Here we add some
+% macros extending captions for these languages.
+%
+%
+% First, let us define English defaults:
+%
+%
+% \begin{macro}{\@aom@by}
+% \changes{v1.10}{2011/06/21}{Added macro}
+%   This is just ``By'' in English:
+%    \begin{macrocode}
+\def\@aom@by{By}
+%    \end{macrocode}   
+% \end{macro}
+%
+% \begin{macro}{\@aom@and}
+% \changes{v1.10}{2011/06/21}{Added macro}
+%   This is ``and'' in English:
+%    \begin{macrocode}
+\def\@aom@and{and}
+%    \end{macrocode}
+% \end{macro}
+%
+% Now we can define internationalization:
+%    \begin{macrocode}
+\AtBeginDocument{\@ifpackageloaded{babel}{%
+  \addto\captionsfrench{\def\@aom@by{Par}\def\@aom@and{et}}%
+  \addto\captionsgerman{\def\@aom@by{Von}\def\@aom@and{und}}%
+  \addto\captionsenglish{\def\@aom@by{By}\def\@aom@and{and}}}{}}
+%    \end{macrocode}
+% 
+%
 %\subsection{Fonts}
 %\label{sec:fonts}
 % 
@@ -987,7 +1043,7 @@
 \fancyhead[CE]{\scriptsize\MakeUppercase\shortauthors}
 %    \end{macrocode}
 % 
-% \changes{v0.3}{2010/09/26}{Addec DOI number in headers} 
+% \changes{v0.3}{2010/09/26}{Added DOI number in headers} 
 % \changes{v0.9}{2010/12/04}{Changed font for the folio on the first
 % page} 
 % \changes{v1.3}{2011/01/07}{Corrected bug with doinumber} 
@@ -1320,8 +1376,10 @@
 %    \end{macrocode}
 % \end{macro}
 %
+%
 % \begin{macro}{\@setauthors}
 % \changes{v0.6}{2010/11/04}{'By' and 'and' are in Roman font now} 
+% \changes{v1.10}{2011/06/21}{Internationalization}
 %   Now we typeset authors according to our specs.  Again, we use this
 %   occasion to set some PDF information:
 %    \begin{macrocode}
@@ -1333,13 +1391,13 @@
     \centering\footnotesize \@topsep30\p@\relax
     \advance\@topsep by -\baselineskip
     \item\relax
-    \def\@@and{{\upshape and}}
+    \def\@@and{{\upshape \@aom@and}}
     \author@andify\authors
     \ifpdf
       \hypersetup{pdfauthor=\authors}%
     \fi
     \def\\{\protect\linebreak}%
-    \small By \scshape\authors%
+    \small \@aom@by{} \scshape\authors%
     \ifx\@empty\contribs
     \else
       ,\penalty-3 \space \@setcontribs
@@ -1404,10 +1462,11 @@
 %
 % \begin{macro}{\@@and}
 % \changes{v0.9}{2010/12/04}{Redefined macro} 
+% \changes{v1.10}{2011/06/21}{Added internationalization} 
 %   We want ``and'' in the footers to be lowercase.  Since there is
 %   some uppercase involved, we protect it:
 %    \begin{macrocode}
-\def\@@and{\MakeLowercase{and}}
+\def\@@and{\MakeLowercase{\@aom@and}}
 %    \end{macrocode}
 %   
 % \end{macro}
@@ -1676,9 +1735,12 @@
 %
 % \begin{macro}{\doi}
 % \changes{v1.2}{2011/01/05}{Now we properly treat numbers with underscores} 
+% \changes{v1.9}{2011/06/13}{Changed doi look} 
+% \changes{v1.10}{2011/06/21}{Introduced the logic for old doi formatting} 
 %   Typesetting doi\dots
 %    \begin{macrocode}
-\def\doi#1{\href{http://dx.doi.org/#1}{doi: \path{#1}}}
+\def\doi#1{\if@aom@olddoi\href{http://dx.doi.org/#1}{doi: \path{#1}}%
+\else\url{http://dx.doi.org/#1}\fi}
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/Master/texmf-dist/tex/latex/aomart/aomart.cls b/Master/texmf-dist/tex/latex/aomart/aomart.cls
index 44a58100229..35d5123e737 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/03/08 v1.7 Typesetting articles for the Annals of Mathematics]
+[2011/06/21 v1.10 Typesetting articles for the Annals of Mathematics]
 \long\def\aom@size@warning#1{%
   \ClassWarning{aomart}{Size-changing option #1 will not be
     honored}}%
@@ -52,6 +52,9 @@
 \newif\if@aom@screen@mode
 \@aom@screen@modefalse
 \DeclareOption{screen}{\@aom@screen@modetrue}
+\newif\if@aom@olddoi
+\@aom@olddoifalse
+\DeclareOption{olddoi}{\@aom@olddoitrue}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{amsart}}
 \InputIfFileExists{aomart.cfg}{%
   \ClassInfo{aomart}{%
@@ -73,6 +76,12 @@
   urlcolor=black}%
 \fi\fi
 \urlstyle{rm}
+\def\@aom@by{By}
+\def\@aom@and{and}
+\AtBeginDocument{\@ifpackageloaded{babel}{%
+  \addto\captionsfrench{\def\@aom@by{Par}\def\@aom@and{et}}%
+  \addto\captionsgerman{\def\@aom@by{Von}\def\@aom@and{und}}%
+  \addto\captionsenglish{\def\@aom@by{By}\def\@aom@and{and}}}{}}
 \RequirePackage{yhmath}
 \IfFileExists{cmtiup.sty}{%
   \RequirePackage{cmtiup}}{%
@@ -269,13 +278,13 @@
     \centering\footnotesize \@topsep30\p@\relax
     \advance\@topsep by -\baselineskip
     \item\relax
-    \def\@@and{{\upshape and}}
+    \def\@@and{{\upshape \@aom@and}}
     \author@andify\authors
     \ifpdf
       \hypersetup{pdfauthor=\authors}%
     \fi
     \def\\{\protect\linebreak}%
-    \small By \scshape\authors%
+    \small \@aom@by{} \scshape\authors%
     \ifx\@empty\contribs
     \else
       ,\penalty-3 \space \@setcontribs
@@ -308,7 +317,7 @@
       \hypersetup{pdfsubject=\@subjects}%
     \fi
 }
-\def\@@and{\MakeLowercase{and}}
+\def\@@and{\MakeLowercase{\@aom@and}}
 \def\enddoc@text{%
   \ifx\@empty\@translators \else\@settranslators\fi
   \ifx\@empty\@received \else\@setreceived\fi
@@ -390,7 +399,8 @@
   \popQED\endtrivlist\@endpefalse
 }
 \def\repeatedauthors#1{\bysame}
-\def\doi#1{\href{http://dx.doi.org/#1}{doi: \path{#1}}}
+\def\doi#1{\if@aom@olddoi\href{http://dx.doi.org/#1}{doi: \path{#1}}%
+\else\url{http://dx.doi.org/#1}\fi}
 \def\mr#1{\href{http://www.ams.org/mathscinet-getitem?mr=#1}{MR~\path{#1}}}
 \def\zbl#1{\href{http://www.zentralblatt-math.org/zmath/en/search/?q=an:#1}{Zbl~\path{#1}}}
 \def\arxiv#1{\href{http://www.arxiv.org/abs/#1}{arXiv~\path{#1}}}