diff options
author | Karl Berry <karl@freefriends.org> | 2015-04-07 21:06:00 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-04-07 21:06:00 +0000 |
commit | fb723a8e279c933c3637de299936c8ada7323f5c (patch) | |
tree | 31d886d89e67f0f430be8382f2df459d93d35f6e /Master/texmf-dist/tex/latex/achemso/achemso.cls | |
parent | 738afd2e21df370d73858aa075cb36df0155046d (diff) |
achemso (7apr15)
git-svn-id: svn://tug.org/texlive/trunk@36733 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/achemso/achemso.cls')
-rw-r--r-- | Master/texmf-dist/tex/latex/achemso/achemso.cls | 156 |
1 files changed, 84 insertions, 72 deletions
diff --git a/Master/texmf-dist/tex/latex/achemso/achemso.cls b/Master/texmf-dist/tex/latex/achemso/achemso.cls index 1834642cbbc..f7039c7ce82 100644 --- a/Master/texmf-dist/tex/latex/achemso/achemso.cls +++ b/Master/texmf-dist/tex/latex/achemso/achemso.cls @@ -16,7 +16,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{achemso} - [2015/03/23 v3.9b Submission to ACS journals] + [2015/04/07 v3.10 Submission to ACS journals] \LoadClass[12pt,letter]{article} \newcommand*\acs@warning{\ClassWarning{achemso}} \newcommand*\acs@ifundefined[1]{% @@ -601,7 +601,7 @@ \let\footnote\acs@title@footnote \acs@maketitle@suppinfo \@title \acs@title@footnote@check - \global\acs@footnote@cnt\c@footnote\relax + \global\acs@footnote@cnt\c@footnote \@maketitle@title@hook \par }% @@ -641,48 +641,32 @@ } \newcommand*\acs@title@footnote[1]{% \footnotemark - \g@addto@macro\@thanks@hook{% - \footnotetext{#1}% - }% + \g@addto@macro\@thanks{\footnotetext{#1}}% } \newcommand\acs@title@footnote@check{% - \ifx\@thanks@hook\@empty\else - \expandafter\gdef\expandafter\@thanks@hook\expandafter{% - \expandafter\begingroup - \expandafter\let\expandafter\@fnsymbol\expandafter - \acs@author@fnsymbol - \@thanks@hook - \endgroup - }% + \ifx\@thanks\@empty + \else + \begingroup + \toks@=\expandafter{\@thanks}% + \xdef\@thanks{% + \begingroup + \let\noexpand\@fnsymbol\noexpand\acs@author@fnsymbol + \the\toks@ + \endgroup + }% + \endgroup \fi } \newcommand*\acs@contact@details{% { \sffamily E-mail: \acs@email@list }% \acs@number@list } -\def\@thanks{% - \@thanks@hook - \ifnum\acs@affil@cnt>\@ne\relax - \expandafter\acs@affil@list - \else - \ifnum\acs@affil@alt@cnt>\z@\relax - \expandafter\expandafter\expandafter\acs@affil@list - \fi - \fi -} -\newcommand*\@thanks@hook{} +\let\@thanks\@empty \newcommand*\acs@author@list{% \@tempcnta\z@\relax \ifnum\acs@author@cnt=\z@\relax\else \expandafter\acs@author@list@main \fi - \acs@author@list@star -} -\newcommand*\acs@author@list@star{% - \g@addto@macro\@thanks@hook{% - \setcounter{footnote}{1}% - \footnotetext{To whom correspondence should be addressed}% - }% } \newcommand*\acs@author@footnotes{} \newcommand*\acs@author@list@main{% @@ -842,28 +826,43 @@ \fi } \newcommand*\acs@address@list{% - \@tempcnta\z@\relax - \ifnum\acs@affil@cnt>\z@\relax - \acs@address@list@aux + \ifnum\acs@affil@cnt>\z@ + \expandafter\acs@address@list@auxi \else - \acs@warning{% - No affiliations: at least one affiliation is needed% - }% + \acs@warning{No affiliations: at least one affiliation is needed}% \fi } -\newcommand*\acs@address@list@aux{% - \advance\@tempcnta\@ne\relax - \ifnum\acs@affil@cnt>\@ne\relax - \ifnum\@tempcnta=\acs@affil@cnt\relax - and - \fi - \fi - \@nameuse{@address@\@roman\@tempcnta}% - \ifnum\@tempcnta<\acs@affil@cnt\relax - , - \expandafter\acs@address@list@aux +\newcommand*\acs@address@list@auxi{% + \ifnum0% + \ifnum\acs@affil@cnt>\@ne 1\fi + \ifnum\acs@affil@alt@cnt>\z@ 1\fi + >\z@ + \expandafter\acs@address@list@auxii + \else + \@address@i\par \fi } +\newcommand*\acs@address@list@auxii{% + \@tempcnta\z@ + \acs@affil@marker@cnt\acs@footnote@cnt + \loop\ifnum\@tempcnta<\acs@affil@cnt + \advance\@tempcnta\@ne + \advance\acs@affil@marker@cnt\@ne + \acs@author@fnsymbol{\acs@affil@marker@cnt}% + \@nameuse{@address@\@roman\@tempcnta}\par + \repeat + \@tempcnta\z@ + \loop\ifnum\@tempcnta<\acs@affil@cnt + \advance\@tempcnta\@ne + \advance\acs@affil@marker@cnt\@ne + \acs@ifundefined{@altaffil@\@roman\@tempcnta} + {} + {% + \acs@author@fnsymbol{\acs@affil@marker@cnt}% + \@nameuse{@altaffil@\@roman\@tempcnta}\par + }% + \repeat +} \newcommand*\acs@fnsymbol@org{} \newcommand*\acs@affil@list{% \let\acs@fnsymbol@org\@fnsymbol @@ -1041,27 +1040,28 @@ \let\acs@subsection\subsection \newcommand*\acs@subsubsection{} \let\acs@subsubsection\subsubsection -\newcommand*\acs@startsection{} -\let\acs@startsection\@startsection +\newcommand*\acs@startsection@orig{} +\let\acs@startsection@orig\@startsection +\newcommand\acs@startsection[6]{% + \if@noskipsec \leavevmode \fi + \par \@tempskipa #4\relax + \@afterindenttrue + \ifdim \@tempskipa <\z@ \@tempskipa -\@tempskipa \@afterindentfalse\fi + \if@nobreak \everypar{}\else + \addpenalty\@secpenalty\addvspace\@tempskipa\fi + \@ifstar{\@dblarg{\@sect{#1}{\@m}{#3}{#4}{#5}{#6}}}% + {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}% +} +\let\@startsection\acs@startsection \newcommand*\acs@startsection@alt[6]{% \if@noskipsec \leavevmode \fi - \par - \@tempskipa #4\relax + \par \@tempskipa #4\relax \@afterindenttrue - \ifdim\@tempskipa<\z@\relax - \@tempskipa -\@tempskipa \@afterindentfalse - \fi - \if@nobreak - \everypar{}% - \else - \addpenalty\@secpenalty - \addvspace\@tempskipa - \fi - \@ifstar{% - \@ssect{#3}{#4}{#5}{#6}% - }{% - \@ssect{#3}{#4}{#5}{#6}% - }% + \ifdim \@tempskipa <\z@ \@tempskipa -\@tempskipa \@afterindentfalse\fi + \if@nobreak \everypar{}\else + \addpenalty\@secpenalty\addvspace\@tempskipa\fi + \@ifstar{\@ssect{#3}{#4}{#5}{#6}} + {\@ssect{#3}{#4}{#5}{#6}}% } \newcommand*\acs@sections@none{% \@ifstar{% @@ -1095,11 +1095,20 @@ \let\subsubsection\acs@subsubsection } \@onlypreamble\SectionsOn +\begingroup + \toks@=\expandafter{\tableofcontents} + \xdef\tableofcontents{% + \begingroup + \let\noexpand\@startsection\noexpand\acs@startsection@orig + \the\toks@ + \endgroup + } +\endgroup \newenvironment{acknowledgement}{% - \acs@subsection*{\acknowledgementname}% + \acs@section*{\acknowledgementname}% }{} \newenvironment{suppinfo}{% - \acs@subsection*{\suppinfoname}% + \acs@section*{\suppinfoname}% \acs@collect\acs@suppinfo@print }{} \newcommand\acs@suppinfo@print[1]{% @@ -1110,7 +1119,7 @@ \newcommand*\acknowledgementname{Acknowledgement} \AtEndOfClass{% \def\bibsection{% - \acs@subsection*{\refname}% + \acs@section*{\refname}% }% } \newcommand*\suppinfoname{Supporting Information Available} @@ -1238,6 +1247,8 @@ }% } \newcommand*{\acs@tocentry@print@aux}{% + \begingroup + \let\@startsection\acs@startsection@orig \acs@section*{\tocentryname}% \tocsize \sffamily @@ -1250,7 +1261,8 @@ \end{minipage}% }% \end{center}% - } + \endgroup +} \newlength{\acs@tocentry@height} \newlength{\acs@tocentry@width} \setlength{\acs@tocentry@height}{9 cm} @@ -1314,7 +1326,7 @@ \vspace{6pt}% \textbf{\acknowledgementname}% \else - \acs@subsection*{\acknowledgementname}% + \acs@section*{\acknowledgementname}% \fi }{% \acs@par @@ -1324,7 +1336,7 @@ \ifx\@currenvir\@tempa \expandafter\acs@suppinfo@aux \else - \acs@subsection*{\suppinfoname}% + \acs@section*{\suppinfoname}% \fi }{% \acs@par |