From e2f9c0f49df6e2b1aa60fff5ed97c2502fdb673d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 30 May 2022 20:03:22 +0000 Subject: aomart (30may22) git-svn-id: svn://tug.org/texlive/trunk@63442 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/aomart/README | 8 +- Master/texmf-dist/doc/latex/aomart/aomart.pdf | Bin 414567 -> 443455 bytes Master/texmf-dist/doc/latex/aomart/aomfrench.pdf | Bin 204681 -> 219930 bytes Master/texmf-dist/doc/latex/aomart/aomsample.pdf | Bin 479193 -> 507784 bytes Master/texmf-dist/doc/latex/aomart/aomsample.tex | 20 ++- Master/texmf-dist/doc/latex/aomart/aomsample1.pdf | Bin 479194 -> 507775 bytes Master/texmf-dist/doc/latex/aomart/aomsample1.tex | 20 ++- Master/texmf-dist/source/latex/aomart/aomart.dtx | 186 ++++++++++++++++++++-- Master/texmf-dist/tex/latex/aomart/aomart.cls | 72 ++++++++- 9 files changed, 286 insertions(+), 20 deletions(-) diff --git a/Master/texmf-dist/doc/latex/aomart/README b/Master/texmf-dist/doc/latex/aomart/README index 2fa8715ea8d..4bdab514073 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.25 + Version 1.27 This package provides the class for typesetting articles for The Annals of Mathematics, http://annals.princeton.edu/. Changes: + Version 1.27 + New command: \funding + + Version 1.26 + Interface for contributors + Version 1.25 New command: \fullpageref diff --git a/Master/texmf-dist/doc/latex/aomart/aomart.pdf b/Master/texmf-dist/doc/latex/aomart/aomart.pdf index 1ae47991e84..ec0a495c5dd 100644 Binary files a/Master/texmf-dist/doc/latex/aomart/aomart.pdf and b/Master/texmf-dist/doc/latex/aomart/aomart.pdf differ diff --git a/Master/texmf-dist/doc/latex/aomart/aomfrench.pdf b/Master/texmf-dist/doc/latex/aomart/aomfrench.pdf index 2412c929015..91b285a449a 100644 Binary files a/Master/texmf-dist/doc/latex/aomart/aomfrench.pdf and b/Master/texmf-dist/doc/latex/aomart/aomfrench.pdf differ diff --git a/Master/texmf-dist/doc/latex/aomart/aomsample.pdf b/Master/texmf-dist/doc/latex/aomart/aomsample.pdf index 1faf78a4e94..9b17f576a9a 100644 Binary files a/Master/texmf-dist/doc/latex/aomart/aomsample.pdf and b/Master/texmf-dist/doc/latex/aomart/aomsample.pdf differ diff --git a/Master/texmf-dist/doc/latex/aomart/aomsample.tex b/Master/texmf-dist/doc/latex/aomart/aomsample.tex index 2ecba3e18d7..f8279246704 100644 --- a/Master/texmf-dist/doc/latex/aomart/aomsample.tex +++ b/Master/texmf-dist/doc/latex/aomart/aomsample.tex @@ -113,7 +113,7 @@ Providence, Rhode Island} \author{Boris Veytsman} \address{George Mason University\\ Fairfax, Virginia} -\fulladdress{Computational Materials Science Center, MS 6A2\\ +\fulladdress{School of Systems Biology\\ George Mason University\\ Fairfax, VA 22030} \email{borisv@lk.net} @@ -122,6 +122,17 @@ Fairfax, VA 22030} \surname{Veytsman} \copyrightyear{2008--2020} \copyrightnote{\textcopyright~2008--2020 Boris Veytsman} +\contrib[with appendix by]{Frodo Baggins} +\givenname{Frodo} +\surname{Baggins} +\contrib{Bilbo Baggins} +\givenname{Bilbo} +\surname{Baggins} +\contrib[with afterword by]{Bilbo Baggins} +\givenname{Bilbo} +\surname{Baggins} +\address{The Unseen Univeresity} + \thanks{The class was commissioned by Annals of Mathematics} \keyword{Hamiltonian paths} @@ -1732,6 +1743,13 @@ and now in \cn{Large} size: \]} \end{verbatim} +\subsection{Acknowledgements} +\label{sec:acks} + +The authors are grateful to \funding{NASA}{123456} and +\funding{NIH}{}. They acknowledge \funding[the generous help of other +agencies]{Department of Defense}{Special project Secret Defense}. + \bibliography{aomsample} \bibliographystyle{aomplain} diff --git a/Master/texmf-dist/doc/latex/aomart/aomsample1.pdf b/Master/texmf-dist/doc/latex/aomart/aomsample1.pdf index da11f5c5743..c8a115f533f 100644 Binary files a/Master/texmf-dist/doc/latex/aomart/aomsample1.pdf and b/Master/texmf-dist/doc/latex/aomart/aomsample1.pdf differ diff --git a/Master/texmf-dist/doc/latex/aomart/aomsample1.tex b/Master/texmf-dist/doc/latex/aomart/aomsample1.tex index 30a52e5691f..920c6971ef5 100644 --- a/Master/texmf-dist/doc/latex/aomart/aomsample1.tex +++ b/Master/texmf-dist/doc/latex/aomart/aomsample1.tex @@ -113,7 +113,7 @@ Providence, Rhode Island} \author{Boris Veytsman} \address{George Mason University\\ Fairfax, Virginia} -\fulladdress{Computational Materials Science Center, MS 6A2\\ +\fulladdress{School of Systems Biology\\ George Mason University\\ Fairfax, VA 22030} \email{borisv@lk.net} @@ -122,6 +122,17 @@ Fairfax, VA 22030} \surname{Veytsman} \copyrightyear{2008--2020} \copyrightnote{\textcopyright~2008--2020 Boris Veytsman} +\contrib[with appendix by]{Frodo Baggins} +\givenname{Frodo} +\surname{Baggins} +\contrib{Bilbo Baggins} +\givenname{Bilbo} +\surname{Baggins} +\contrib[with afterword by]{Bilbo Baggins} +\givenname{Bilbo} +\surname{Baggins} +\address{The Unseen Univeresity} + \thanks{The class was commissioned by Annals of Mathematics} \keyword{Hamiltonian paths} @@ -1731,6 +1742,13 @@ and now in \cn{Large} size: \]} \end{verbatim} +\subsection{Acknowledgements} +\label{sec:acks} + +The authors are grateful to \funding{NASA}{123456} and +\funding{NIH}{}. They acknowledge \funding[the generous help of other +agencies]{Department of Defense}{Special project Secret Defense}. + \bibliography{aomsample} \bibliographystyle{aomplain} diff --git a/Master/texmf-dist/source/latex/aomart/aomart.dtx b/Master/texmf-dist/source/latex/aomart/aomart.dtx index f5e7e0d0252..0af4820992b 100644 --- a/Master/texmf-dist/source/latex/aomart/aomart.dtx +++ b/Master/texmf-dist/source/latex/aomart/aomart.dtx @@ -1,7 +1,7 @@ % \iffalse -% $Id: aomart.dtx,v 1.78 2021/04/11 00:14:37 boris Exp $ +% $Id: aomart.dtx,v 1.80 2022/05/01 03:07:24 boris Exp $ % -% Copyright 2010-2021, Princeton University (Mathematics Department) +% Copyright 2010-2022, Princeton University (Mathematics Department) % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either % version 1.3 of this license or (at your option) any @@ -23,7 +23,7 @@ % public domain. % % \fi -% \CheckSum{1536} +% \CheckSum{0} % % %% \CharacterTable @@ -66,7 +66,7 @@ % \GetFileInfo{aomart.dtx} % \newcommand{\progname}[1]{\textsf{#1}} % \title{\LaTeX{} Class for The \emph{Annals of -% Mathematics}\thanks{\copyright 2010--2021, Princeton University +% Mathematics}\thanks{\copyright 2010--2022, Princeton University % (Mathematics Department)}} % \author{Boris Veytsman\thanks{% % \href{mailto:borisv@lk.net}{\texttt{borisv@lk.net}}, @@ -341,6 +341,27 @@ % the author for the online version of the journal and various % databases. % +% \DescribeMacro{\contrib}% +% Sometimes there are contributors to a paper, who are not full authors: +% the person may write an appendix or other part of the paper. You +% can use the command \cs{contrib}\oarg{role}\marg{name} for +% indicating these persons. Note that \oarg{role} argument has a +% special meaning, indicating that the role of this person is the same +% as for the previous contributor, for example, +% \begin{verbatim} +% \contrib[with Appendix~A by]{A. U. Thor} +% \givenname{Alexandra}\surname{Thor} +% \contrib{A. N. Other} +% \givenname{Antony N.}\surname{Other} +% \contrib[with Appendix~B by]{Y. Etanother} +% \givenname{Yakov}\surname{Etanother} +% \end{verbatim} +% In this example Appendix~A is written by A.~U.~Thor and +% A. N. Another, and Appendix~B is written by Y.~Etanother. +% Commands \cs{orcid}, \cs{email}, \cs{address}, \cs{fulladdress}, +% \cs{givenname} and \cs{surname} can be used for contributors in the +% same way they are used for authors. +% % \DescribeMacro{\shortauthors} % In some cases the authors list may be too long for the running head, % even if the abbreviated forms are used for each author. In this @@ -351,7 +372,7 @@ % \begin{verbatim} % \renewcommand{\shortauthors}{A.~Smith et al} % \end{verbatim} -% +% % % \DescribeMacro{\thanks} % Like \progname{amsart} (and unlike standard \LaTeX{}), @@ -683,6 +704,32 @@ % discussion of \LaTeX{} graphics possibilities). % % +%\subsection{Funding} +%\label{sec:ug_funding} +% +% \DescribeMacro{\funding}% +% There is a special command for showing the support for the paper, +% \cs{funding}\oarg{text}\marg{sponsor}\marg{grantid}. Normally it +% prints the name of the sponsor and in parentheses the id of the +% grant, if it is not empty. However, you can override this using the +% optional argument of the command. For example, the following text +% \begin{verbatim} +% AB is grateful to \funding{NASA}{123GH456}, while MJ was supported +% by \funding{NIH}{}. Both authors acknowledge \funding[the generous +% help of other agencies]{Department of Defense}{Special project +% grant}. +% \end{verbatim} +% will expand to +% \begin{verbatim} +% % AB is grateful to NASA (123GH456), while MJ was supported +% by NIH. Both authors acknowledge the generous +% help of other agencies. +% \end{verbatim} +% +% The command will save the information about the grants in the form +% suitable for automatic processing. +% +% %\subsection{Bibliography} %\label{sec:biblio} % @@ -796,7 +843,7 @@ \ProvidesFile{aomart.dtx} % %\ProvidesClass{aomart} -[2021/04/10 v1.25 Typesetting articles for the Annals of Mathematics] +[2022/04/30 v1.27 Typesetting articles for the Annals of Mathematics] % \end{macrocode} % % @@ -1287,6 +1334,7 @@ % \begin{macrocode} \@onlypreamble{\title} \@onlypreamble{\author} +\@onlypreamble{\contrib} \@onlypreamble{\email} \@onlypreamble{\address} \@onlypreamble{\curraddr} @@ -1371,6 +1419,100 @@ % % \end{macro} % +% \begin{macro}{\@currentcontribution} +% \changes{v1.26}{2022/01/18}{Introduced macro} +% The current contribution +% \begin{macrocode} +\def\@currentcontribution{} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@currentcontributors} +% \changes{v1.26}{2022/01/18}{Introduced macro} +% The current contributors with the same contribution +% \begin{macrocode} +\def\@currentcontributors{} +% \end{macrocode} +% +% \end{macro} +% +% \begin{macro}{\contribs} +% \changes{v1.26}{2022/01/18}{Introduced macro} +% All contributors to the paper +% \begin{macrocode} +\def\contribs{} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\if@startcontribgroup} +% \changes{v1.26}{2022/01/19}{Introduced macro} +% A switch whether the new group is started +% \begin{macrocode} +\newif\if@startcontribgroup +\@startcontribgroupfalse +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@processcurrentcontribgroup} +% \changes{v1.26}{2022/01/19}{Introduced macro} +% Add current contributors to \cs{contributors} +% \begin{macrocode} +\def\@processcurrentcontribgroup{% + \ifx\@currentcontributors\@empty\else + \def\@@and{{\upshape \@aom@and}}% + \author@andify\@currentcontributors + \ifx\contribs\@empty\else + \g@addto@macro\contribs{\and}% + \fi + \expandafter\g@addto@macro\expandafter\contribs + \expandafter{\@currentcontribution}% + \g@addto@macro\contribs{\space}% + \expandafter\g@addto@macro\expandafter\contribs + \expandafter{\@currentcontributors}% + \fi +} +% \end{macrocode} +% +% \end{macro} +% +% \begin{macro}{\contrib} +% \changes{v1.26}{2022/01/19}{Redefined amsart macro} +% The processing of contributors. Contributors are separated into +% groups with the same contribution. Within the group one can omit +% the contribution. +% \begin{macrocode} +\renewcommand{\contrib}[2][]{% + \def\@tempa{#1}% + \@startcontribgrouptrue + \ifx\@tempa\@empty\relax + \ifx\@currentcontribution\@empty\relax + \ClassError{aomart}{You must define contribution for + contributors}{The first \contrib command must have the + optional argument indicating the contribution}% + \else + \@startcontribgroupfalse + \fi + \fi + \ifx\@currentcontribution\@tempa\relax + \@startcontribgroupfalse + \fi + \if@startcontribgroup + \@processcurrentcontribgroup + \gdef\@currentcontribution{#1}% + \gdef\@currentcontributors{#2}% + \else + \g@addto@macro\@currentcontributors{\and#2}% + \fi + \g@addto@macro\@names{\and contributor=#2;}% + \g@addto@macro\@names{role=}% + \expandafter\g@addto@macro\expandafter% + \@names\expandafter{\@currentcontribution}% + \g@addto@macro\@names{;}% +} +% \end{macrocode} +% +% \end{macro} +% % \begin{macro}{\email} % \changes{v1.16}{2016/12/03}{Redefined amsart definition} % We change amsart macro to output metadata @@ -1710,6 +1852,8 @@ % \changes{v1.20}{2017/05/09}{Make primary and secondary subjects % separated} % \changes{v1.21}{2017/12/13}{Added main language} +% \changes{v1.27}{2022/04/30}{Keep the .rpi file open till the end of +% document} % This writes the information about the paper into the file % |jobname.rpi|. Note that hyperref makes our life a little bit % more complex @@ -1769,7 +1913,7 @@ {\@percentchar abstract=\@aom@abstract}% \protected@write\@mainrpi{}% {\@percentchar articlelanguage=\languagename}% - \closeout\@mainrpi + \AtEndDocument{\closeout\@mainrpi}% \fi \egroup} % \end{macrocode} @@ -1816,17 +1960,17 @@ \centering\footnotesize \@topsep30\p@\relax \advance\@topsep by -\baselineskip \item\relax - \def\@@and{{\upshape \@aom@and}} + \def\@@and{{\upshape \@aom@and}}% \author@andify\authors \ifpdf \hypersetup{pdfauthor=\authors}% \fi \def\\{\protect\linebreak}% \small \@aom@by{} \scshape\authors% + \@processcurrentcontribgroup \ifx\@empty\contribs \else ,\penalty-3 \space \@setcontribs - \@closetoccontribs \fi \endtrivlist \endgroup @@ -1838,8 +1982,9 @@ % Contributors are set up in the same way as authors: % \begin{macrocode} \def\@setcontribs{% - \@xcontribs - {\scshape \xcontribs}% + \def\@@and{{\upshape \@aom@and}}% + \author@andify\contribs + \contribs } % \end{macrocode} % \end{macro} @@ -2374,6 +2519,25 @@ % % \end{macro} % +% \begin{macro}{\funding} +% \changes{v1.27}{2022/04/30}{Added macro} +% The macro to print grants. It adds to the rpi file the information +% about grants +% \begin{macrocode} +\newcommand\funding[3][]{% + \protected@write\@mainrpi{}% + {\@percentchar sponsor=#2, grantid=#3}% + \def\@tempa{#1}\relax% + \ifx\@tempa\@empty\relax + \def\@tempb{#3}% + #2% + \ifx\@tempb\@empty\relax\else\ (grant~#3)\fi + \else + #1 + \fi} +% \end{macrocode} +% +% \end{macro} % %\subsection{End of Class} %\label{end} diff --git a/Master/texmf-dist/tex/latex/aomart/aomart.cls b/Master/texmf-dist/tex/latex/aomart/aomart.cls index 539c9413def..b029c8af3cc 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} -[2021/04/10 v1.25 Typesetting articles for the Annals of Mathematics] +[2022/04/30 v1.27 Typesetting articles for the Annals of Mathematics] \long\def\aom@size@warning#1{% \ClassWarning{aomart}{Size-changing option #1 will not be honored}}% @@ -183,6 +183,7 @@ \annalsurl{http://annals.math.princeton.edu/about} \@onlypreamble{\title} \@onlypreamble{\author} +\@onlypreamble{\contrib} \@onlypreamble{\email} \@onlypreamble{\address} \@onlypreamble{\curraddr} @@ -239,6 +240,53 @@ } \edef\author{\@nx\@dblarg \@xp\@nx\csname\string\author\endcsname} +\def\@currentcontribution{} +\def\@currentcontributors{} +\def\contribs{} +\newif\if@startcontribgroup +\@startcontribgroupfalse +\def\@processcurrentcontribgroup{% + \ifx\@currentcontributors\@empty\else + \def\@@and{{\upshape \@aom@and}}% + \author@andify\@currentcontributors + \ifx\contribs\@empty\else + \g@addto@macro\contribs{\and}% + \fi + \expandafter\g@addto@macro\expandafter\contribs + \expandafter{\@currentcontribution}% + \g@addto@macro\contribs{\space}% + \expandafter\g@addto@macro\expandafter\contribs + \expandafter{\@currentcontributors}% + \fi +} +\renewcommand{\contrib}[2][]{% + \def\@tempa{#1}% + \@startcontribgrouptrue + \ifx\@tempa\@empty\relax + \ifx\@currentcontribution\@empty\relax + \ClassError{aomart}{You must define contribution for + contributors}{The first \contrib command must have the + optional argument indicating the contribution}% + \else + \@startcontribgroupfalse + \fi + \fi + \ifx\@currentcontribution\@tempa\relax + \@startcontribgroupfalse + \fi + \if@startcontribgroup + \@processcurrentcontribgroup + \gdef\@currentcontribution{#1}% + \gdef\@currentcontributors{#2}% + \else + \g@addto@macro\@currentcontributors{\and#2}% + \fi + \g@addto@macro\@names{\and contributor=#2;}% + \g@addto@macro\@names{role=}% + \expandafter\g@addto@macro\expandafter% + \@names\expandafter{\@currentcontribution}% + \g@addto@macro\@names{;}% +} \renewcommand{\email}[2][]{% \g@addto@macro\addresses{\email{#1}{#2}}% \g@addto@macro\@names{email=#2;}% @@ -404,7 +452,7 @@ {\@percentchar abstract=\@aom@abstract}% \protected@write\@mainrpi{}% {\@percentchar articlelanguage=\languagename}% - \closeout\@mainrpi + \AtEndDocument{\closeout\@mainrpi}% \fi \egroup} \def\@maketitle@hook{\aom@write@paper@info\global\let\@maketitle@hook\@empty} @@ -425,24 +473,25 @@ \centering\footnotesize \@topsep30\p@\relax \advance\@topsep by -\baselineskip \item\relax - \def\@@and{{\upshape \@aom@and}} + \def\@@and{{\upshape \@aom@and}}% \author@andify\authors \ifpdf \hypersetup{pdfauthor=\authors}% \fi \def\\{\protect\linebreak}% \small \@aom@by{} \scshape\authors% + \@processcurrentcontribgroup \ifx\@empty\contribs \else ,\penalty-3 \space \@setcontribs - \@closetoccontribs \fi \endtrivlist \endgroup \fi} \def\@setcontribs{% - \@xcontribs - {\scshape \xcontribs}% + \def\@@and{{\upshape \@aom@and}}% + \author@andify\contribs + \contribs } \def\@adminfootnotes{% \let\@makefnmark\relax \let\@thefnmark\relax @@ -629,6 +678,17 @@ \tabskip\z@skip \cr } +\newcommand\funding[3][]{% + \protected@write\@mainrpi{}% + {\@percentchar sponsor=#2, grantid=#3}% + \def\@tempa{#1}\relax% + \ifx\@tempa\@empty\relax + \def\@tempb{#3}% + #2% + \ifx\@tempb\@empty\relax\else\ (grant~#3)\fi + \else + #1 + \fi} \endinput %% %% End of file `aomart.cls'. -- cgit v1.2.3