diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/achemso/achemso.dtx')
| -rw-r--r-- | Master/texmf-dist/source/latex/achemso/achemso.dtx | 153 |
1 files changed, 93 insertions, 60 deletions
diff --git a/Master/texmf-dist/source/latex/achemso/achemso.dtx b/Master/texmf-dist/source/latex/achemso/achemso.dtx index 792b3c9c27d..bb7ae639e66 100644 --- a/Master/texmf-dist/source/latex/achemso/achemso.dtx +++ b/Master/texmf-dist/source/latex/achemso/achemso.dtx @@ -64,7 +64,7 @@ See http://www.latex-project.org/lppl.txt Originally developed by Mats Dahlgren Copyright (C) 1996-1998 by Mats Dahlgren -Copyright (C) 2008-2014 by +Copyright (C) 2008-2015 by Joseph Wright <joseph.wright@morningstar2.co.uk> Part of this bundle is derived from cite.sty, to which the @@ -393,6 +393,7 @@ This work consists of the file achemso.dtx % \changes{v3.8k}{2014/08/18}{Format date correctly for in press bibliography % entries} % \changes{v3.8l}{2014/08/23}{Fix printing of phone/fax numbers} +% \changes{v3.9}{2015/02/01}{New \texttt{doi} option} % %\begin{abstract} % The \pkg{achemso} bundle provides a \LaTeX\ class file and \BibTeX\ @@ -776,8 +777,15 @@ This work consists of the file achemso.dtx % \opt{articletitle=false} for the \file{achemso} style and % \opt{articletitle=true} for the \file{biochem} style. % +% \DescribeOption{doi} +% The boolean \opt{doi} option is provided to allow a \textsc{doi} +% (Digital Object Identifier) to be included for bibliography entries +% even where other identification such as page numbers is available. +% The standard setting is \opt{false}: setting it to \opt{true} will +% cause \textsc{doi} numbers to be printed if available. +% % \DescribeOption{chaptertitle} -% The option boolean \opt{chaptertitle} option is provided to allow flexibility +% The boolean \opt{chaptertitle} option is provided to allow flexibility % for the inclusion of chapter titles for \texttt{book} and % related entries. The standard setting is \opt{false}: setting % it to \opt{true} will cause chapter titles to be included. @@ -951,7 +959,7 @@ This work consists of the file achemso.dtx % \begin{macrocode} %<*class> \ProvidesClass{achemso} - [2015/01/18 v3.8n Submission to ACS journals] + [2015/02/01 v3.9 Submission to ACS journals] \LoadClass[12pt,letter]{article} % \end{macrocode} % @@ -971,7 +979,7 @@ This work consists of the file achemso.dtx % \begin{macrocode} %<*package> \ProvidesPackage{achemso} - [2015/01/18 v3.8n Support for ACS journals] + [2015/02/01 v3.9 Support for ACS journals] \@ifclassloaded{achemso}{% \PackageInfo{achemso}{% You have already loaded the `achemso' class:\MessageBreak @@ -1035,6 +1043,7 @@ This work consists of the file achemso.dtx %\begin{macro}{\ifacs@articletitle} %\begin{macro}{\ifacs@biochem} %\begin{macro}{\ifacs@chaptertitle} +%\begin{macro}{\ifacs@doi} %\begin{macro}{\ifacs@email} %\begin{macro}{\ifacs@hyperref} %\begin{macro}{\ifacs@keywords} @@ -1045,6 +1054,7 @@ This work consists of the file achemso.dtx \newif\ifacs@abbreviations \newif\ifacs@articletitle \newif\ifacs@biochem +\newif\ifacs@doi \newif\ifacs@chaptertitle \newif\ifacs@email \newif\ifacs@hyperref @@ -1059,6 +1069,9 @@ This work consists of the file achemso.dtx \define@key{acs}{biochem}[true]{% \acs@keyval@bool{biochem}{#1}% } +\define@key{acs}{doi}[true]{% + \acs@keyval@bool{doi}{#1}% +} \define@key{acs}{chaptertitle}[true]{% \acs@keyval@bool{chaptertitle}{#1}% } @@ -1086,6 +1099,7 @@ This work consists of the file achemso.dtx %\end{macro} %\end{macro} %\end{macro} +%\end{macro} %\begin{macro}{\acs@journal} %\begin{macro}{\acs@layout} %\begin{macro}{\acs@manuscript} @@ -1421,6 +1435,10 @@ This work consists of the file achemso.dtx \@tempa{ctrl-chapter-title\space}{% \ifacs@chaptertitle yes\else no\fi }% + \@tempa{ctrl-doi\space\space\space\space\space\space\space + \space\space\space\space}{% + \ifacs@doi yes\else no\fi + }% \@tempa{ctrl-etal-number\space\space\space}{\acs@maxauthors}% \@tempa{ctrl-etal-firstonly}{% \ifacs@etal@truncate no\else yes\fi @@ -1475,6 +1493,7 @@ This work consists of the file achemso.dtx articletitle = false, biblabel = brackets, biochem = false, + doi = false, etalmode = firstonly, keywords = false, maxauthors = 15, @@ -3499,7 +3518,7 @@ This work consists of the file achemso.dtx % \begin{macrocode} %<*aamick> \ProvidesFile{aamick.cfg} - [2015/01/18 v3.8n achemso configuration: ACS Appl. Mater. Interfaces] + [2015/02/01 v3.9 achemso configuration: ACS Appl. Mater. Interfaces] \def\acs@type@list{article,letter,suppinfo} \setkeys{acs}{ articletitle = true, @@ -3508,7 +3527,7 @@ This work consists of the file achemso.dtx %</aamick> %<*acbcct> \ProvidesFile{acbcct.cfg} - [2015/01/18 v3.8n achemso configuration: ACS Chem. Biol.] + [2015/02/01 v3.9 achemso configuration: ACS Chem. Biol.] \setkeys{acs}{ articletitle = true, biblabel = fullstop, @@ -3520,14 +3539,14 @@ This work consists of the file achemso.dtx %</acbcct> %<*acbcct> \ProvidesFile{accacs.cfg} - [2015/01/18 v3.8n achemso configuration: ACS Catal.] + [2015/02/01 v3.9 achemso configuration: ACS Catal.] \setkeys{acs}{keywords = true} \def\acs@type@list{article,letter,perspective,review,viewpoints,suppinfo} \SectionNumbersOff %</acbcct> %<*achre4> \ProvidesFile{achre4.cfg} - [2015/01/18 v3.8n achemso configuration: Acc. Chem. Res.] + [2015/02/01 v3.9 achemso configuration: Acc. Chem. Res.] \setkeys{acs}{ articletitle = true, biblabel = plain @@ -3537,7 +3556,7 @@ This work consists of the file achemso.dtx %</achre4> %<*acncdm> \ProvidesFile{acncdm.cfg} - [2015/01/18 v3.8n achemso configuration: ACS Chem. Neurosci.] + [2015/02/01 v3.9 achemso configuration: ACS Chem. Neurosci.] \def\acs@type@list{article,review,letter,suppinfo,viewpoint} \setkeys{acs}{ articletitle = true, @@ -3549,7 +3568,7 @@ This work consists of the file achemso.dtx %</acncdm> %<*acsccc> \ProvidesFile{acsccc.cfg} - [2015/01/18 v3.8n achemso configuration: ACS Combinatorial Sci.] + [2015/02/01 v3.9 achemso configuration: ACS Combinatorial Sci.] \def\acs@type@list{article,letter,review,perspective,account,note,suppinfo} \setkeys{acs}{ articletitle = true, @@ -3559,7 +3578,7 @@ This work consists of the file achemso.dtx %</acsccc> %<*acscii> \ProvidesFile{acscii.cfg} - [2015/01/18 v3.8n achemso configuration: ACS Central Sci.] + [2015/02/01 v3.9 achemso configuration: ACS Central Sci.] \def\acs@type@list{article,review,suppinfo} \setkeys{acs}{ articletitle = true, @@ -3569,7 +3588,7 @@ This work consists of the file achemso.dtx %</acscii> %<*amlccd> \ProvidesFile{amlccd.cfg} - [2015/01/18 v3.8n achemso configuration: ACS Macro Lett.] + [2015/02/01 v3.9 achemso configuration: ACS Macro Lett.] \def\acs@type@list{letter,suppinfo} \SectionsOff \setlength{\acs@tocentry@height}{8 cm} @@ -3577,7 +3596,7 @@ This work consists of the file achemso.dtx %</amlccd> %<*amclct> \ProvidesFile{amclct.cfg} - [2015/01/18 v3.8n achemso configuration: ACS Med. Chem. Lett.] + [2015/02/01 v3.9 achemso configuration: ACS Med. Chem. Lett.] \setkeys{acs}{ articletitle = true } @@ -3587,7 +3606,7 @@ This work consists of the file achemso.dtx % \changes{v3.8n}{2015/01/13}{\emph{ACS Nano} want abbreviations} %<*ancac3> \ProvidesFile{ancac3.cfg} - [2015/01/18 v3.8n achemso configuration: ACS Nano] + [2015/02/01 v3.9 achemso configuration: ACS Nano] \setkeys{acs}{ abbreviations = true, articletitle = true, @@ -3602,13 +3621,13 @@ This work consists of the file achemso.dtx %</ancac3> %<*ancham> \ProvidesFile{ancham.cfg} - [2015/01/18 v3.8n achemso configuration: Anal. Chem.] + [2015/02/01 v3.9 achemso configuration: Anal. Chem.] \def\acs@type@list{article,note,suppinfo} \SectionNumbersOff %</ancham> %<*apchd5> \ProvidesFile{apchd5.cfg} - [2015/01/18 v3.8n achemso configuration: ACS Photon.] + [2015/02/01 v3.9 achemso configuration: ACS Photon.] \def\acs@type@list{article,letter,perspective,review,suppinfo} \setkeys{acs}{ articletitle = true, @@ -3620,7 +3639,7 @@ This work consists of the file achemso.dtx %</apchd5> %<*ascecg> \ProvidesFile{ascecg.cfg} - [2015/01/18 v3.8n achemso configuration: ACS Sustainable Chem Eng.] + [2015/02/01 v3.9 achemso configuration: ACS Sustainable Chem Eng.] \setkeys{acs}{ articletitle = true, biblabel = fullstop, @@ -3631,7 +3650,7 @@ This work consists of the file achemso.dtx %</ascecg> %<*asbcd6> \ProvidesFile{asbcd6.cfg} - [2015/01/18 v3.8n achemso configuration: ACS Synth. Biol.] + [2015/02/01 v3.9 achemso configuration: ACS Synth. Biol.] \setkeys{acs}{ abbreviations = true, articletitle = true, @@ -3644,7 +3663,7 @@ This work consists of the file achemso.dtx %</asbcd6> %<*bichaw> \ProvidesFile{bichaw.cfg} - [2015/01/18 v3.8n achemso configuration: Biochemistry] + [2015/02/01 v3.9 achemso configuration: Biochemistry] \setkeys{acs}{ abbreviations = true, articletitle = true, @@ -3693,7 +3712,7 @@ This work consists of the file achemso.dtx %</bichaw> %<*bcches> \ProvidesFile{bcches.cfg} - [2015/01/18 v3.8n achemso configuration: Bioconjugate Chem.] + [2015/02/01 v3.9 achemso configuration: Bioconjugate Chem.] \setkeys{acs}{ articletitle = true, biochem = true, @@ -3703,14 +3722,14 @@ This work consists of the file achemso.dtx %</bcches> %<*bomaf6> \ProvidesFile{bomaf6.cfg} - [2015/01/18 v3.8n achemso configuration: Biomacromolecules] + [2015/02/01 v3.9 achemso configuration: Biomacromolecules] \def\acs@type@list{article,comment,communication,note,review,suppinfo} \SectionNumbersOff \AtEndOfClass{\SectionsOn} %</bomaf6> %<*crtoec> \ProvidesFile{crtoec.cfg} - [2015/01/18 v3.8n achemso configuration: Chem. Res. Toxicol.] + [2015/02/01 v3.9 achemso configuration: Chem. Res. Toxicol.] \setkeys{acs}{ abbreviations = true, articletitle = true, @@ -3728,7 +3747,7 @@ This work consists of the file achemso.dtx %</crtoec> %<*chreay> \ProvidesFile{chreay.cfg} - [2015/01/18 v3.8n achemso configuration: Chem. Rev.] + [2015/02/01 v3.9 achemso configuration: Chem. Rev.] \def\acs@type@default{review} \def\acs@type@list{review} % \end{macrocode} @@ -3739,7 +3758,7 @@ This work consists of the file achemso.dtx %<*cmatex> % \begin{macrocode} \ProvidesFile{cmatex.cfg} - [2015/01/18 v3.8n achemso configuration: Chem. Mater.] + [2015/02/01 v3.9 achemso configuration: Chem. Mater.] \setkeys{acs}{keywords = true} \SectionNumbersOff \ifx\acs@manuscript\acs@manuscript@communication @@ -3749,7 +3768,7 @@ This work consists of the file achemso.dtx %</cmatex> %<*cgdefu> \ProvidesFile{cgdefu.cfg} - [2015/01/18 v3.8n achemso configuration: Cryst. Growth Des.] + [2015/02/01 v3.9 achemso configuration: Cryst. Growth Des.] \setkeys{acs}{articletitle = true} \def\acs@type@list{% article,communication,perspective,suppinfo% @@ -3763,21 +3782,21 @@ This work consists of the file achemso.dtx %</cgdefu> %<*enfuem> \ProvidesFile{enfuem.cfg} - [2015/01/18 v3.8n achemso configuration: Energy Fuels] + [2015/02/01 v3.9 achemso configuration: Energy Fuels] \setkeys{acs}{articletitle = true} \def\acs@type@list{article,review,suppinfo} \SectionNumbersOff %</enfuem> %<*esthag> \ProvidesFile{esthag.cfg} - [2015/01/18 v3.8n achemso configuration: Environ. Sci. Technol.] + [2015/02/01 v3.9 achemso configuration: Environ. Sci. Technol.] \setkeys{acs}{articletitle = true} \def\acs@type@list{article,suppinfo} \SectionNumbersOff %</esthag> %<*estlcu> \ProvidesFile{estlcu.cfg} - [2015/01/18 v3.8n achemso configuration: Environ. Sci. Technol. Lett.] + [2015/02/01 v3.9 achemso configuration: Environ. Sci. Technol. Lett.] \setkeys{acs}{articletitle = true} \def\acs@type@list{letter,suppinfo} \SectionNumbersOff @@ -3785,7 +3804,7 @@ This work consists of the file achemso.dtx % \changes{v3.8m}{2014/11/24}{Fixes for \emph{Ind.\ Eng.\ Chem.\ Res.}\ style} %<*iecred> \ProvidesFile{iecred.cfg} - [2015/01/18 v3.8n achemso configuration: Ind. Eng. Chem. Res.] + [2015/02/01 v3.9 achemso configuration: Ind. Eng. Chem. Res.] \setkeys{acs}{ articletitle = true, biblabel = brackets @@ -3794,7 +3813,7 @@ This work consists of the file achemso.dtx %</iecred> %<*inoraj> \ProvidesFile{inoraj.cfg} - [2015/01/18 v3.8n achemso configuration: Inorg. Chem.] + [2015/02/01 v3.9 achemso configuration: Inorg. Chem.] \SectionNumbersOff \ifx\acs@manuscript\acs@manuscript@communication \AbstractOff @@ -3809,7 +3828,7 @@ This work consists of the file achemso.dtx % \begin{macrocode} %<*jacsat> \ProvidesFile{jacsat.cfg} - [2015/01/18 v3.8n achemso configuration: J. Am. Chem. Soc.] + [2015/02/01 v3.9 achemso configuration: J. Am. Chem. Soc.] \SectionNumbersOff \ifx\acs@manuscript\acs@manuscript@communication\else \expandafter\endinput @@ -4019,7 +4038,7 @@ This work consists of the file achemso.dtx % \begin{macrocode} %<*jafcau> \ProvidesFile{jafcau.cfg} - [2015/01/18 v3.8n achemso configuration: J. Agric. Food Chem.] + [2015/02/01 v3.9 achemso configuration: J. Agric. Food Chem.] \setkeys{acs}{ articletitle = true, keywords = true, @@ -4030,7 +4049,7 @@ This work consists of the file achemso.dtx %</jafcau> %<*jceaax> \ProvidesFile{jceaax.cfg} - [2015/01/18 v3.8n achemso configuration: J. Chem. Eng. Data] + [2015/02/01 v3.9 achemso configuration: J. Chem. Eng. Data] \setkeys{acs}{articletitle = true} \def\acs@type@list{article,suppinfo} \def\refname{Literature Cited} @@ -4038,7 +4057,7 @@ This work consists of the file achemso.dtx %</jceaax> %<*jceda8> \ProvidesFile{jceda8.cfg} - [2015/01/18 v3.8n achemso configuration: J. Chem. Ed.] + [2015/02/01 v3.9 achemso configuration: J. Chem. Ed.] \setkeys{acs}{ articletitle = true, keywords = true @@ -4049,14 +4068,14 @@ This work consists of the file achemso.dtx %</jceda8> %<*jcisd8> \ProvidesFile{jcisd8.cfg} - [2015/01/18 v3.8n achemso configuration: J. Chem. Inf. Model.] + [2015/02/01 v3.9 achemso configuration: J. Chem. Inf. Model.] \setkeys{acs}{articletitle = true} \def\acs@type@list{article,suppinfo} \SectionNumbersOff %</jcisd8> %<*jctcce> \ProvidesFile{jctcce.cfg} - [2015/01/18 v3.8n achemso configuration: J. Chem. Theory Comput.] + [2015/02/01 v3.9 achemso configuration: J. Chem. Theory Comput.] \def\acs@type@list{article,suppinfo} \setkeys{acs}{ maxauthors = 0 @@ -4064,7 +4083,7 @@ This work consists of the file achemso.dtx %</jctcce> %<*jmcmar> \ProvidesFile{jmcmar.cfg} - [2015/01/18 v3.8n achemso configuration: J. Med. Chem.] + [2015/02/01 v3.9 achemso configuration: J. Med. Chem.] \setkeys{acs}{articletitle = true} \def\acs@type@list{article,letter,perspective,suppinfo} \SectionNumbersOff @@ -4073,7 +4092,7 @@ This work consists of the file achemso.dtx %</jmcmar> %<*jnprdf> \ProvidesFile{jnprdf.cfg} - [2015/01/18 v3.8n achemso configuration: J. Nat. Prod.] + [2015/02/01 v3.9 achemso configuration: J. Nat. Prod.] \renewcommand*{\abstractname}{ABSTRACT} \renewcommand*{\acknowledgementname}{ACKNOWLEDGEMENT} \renewcommand*{\suppinfoname}{ASSOCIATED CONTENT} @@ -4106,7 +4125,7 @@ This work consists of the file achemso.dtx %</jnprdf> %<*joceah> \ProvidesFile{joceah.cfg} - [2015/01/18 v3.8n achemso configuration: J. Org. Chem.] + [2015/02/01 v3.9 achemso configuration: J. Org. Chem.] \ifx\acs@manuscript\acs@manuscript@communication \AbstractOff \SectionsOff @@ -4121,7 +4140,7 @@ This work consists of the file achemso.dtx % \begin{macrocode} %<*jpcafh> \ProvidesFile{jpcafh.cfg} - [2015/01/18 v3.8n achemso configuration: J. Phys. Chem. A] + [2015/02/01 v3.9 achemso configuration: J. Phys. Chem. A] \def\acs@type@list{article,suppinfo} \setkeys{acs}{ articletitle = true, @@ -4137,7 +4156,7 @@ This work consists of the file achemso.dtx %</jpcafh> %<*jpcbfk> \ProvidesFile{jpcbfk.cfg} - [2015/01/18 v3.8n achemso configuration: J. Phys. Chem. B] + [2015/02/01 v3.9 achemso configuration: J. Phys. Chem. B] \def\acs@type@list{article,suppinfo} \setkeys{acs}{ articletitle = true, @@ -4150,7 +4169,7 @@ This work consists of the file achemso.dtx %</jpcbfk> %<*jpccck> \ProvidesFile{jpccck.cfg} - [2015/01/18 v3.8n achemso configuration: J. Phys. Chem. C] + [2015/02/01 v3.9 achemso configuration: J. Phys. Chem. C] \def\acs@type@list{article,suppinfo} \setkeys{acs}{ articletitle = true, @@ -4167,7 +4186,7 @@ This work consists of the file achemso.dtx % \begin{macrocode} %<*jpclcd> \ProvidesFile{jpclcd.cfg} - [2015/01/18 v3.8n achemso configuration: J. Phys. Chem. Lett.] + [2015/02/01 v3.9 achemso configuration: J. Phys. Chem. Lett.] \setkeys{acs}{ articletitle = true, etalmode = truncate, @@ -4194,7 +4213,7 @@ This work consists of the file achemso.dtx %</jpclcd> %<*jprobs> \ProvidesFile{jprobs.cfg} - [2015/01/18 v3.8n achemso configuration: J. Proteome Res.] + [2015/02/01 v3.9 achemso configuration: J. Proteome Res.] \setkeys{acs}{ articletitle = true, keywords = true @@ -4204,19 +4223,19 @@ This work consists of the file achemso.dtx %</jprobs> %<*langd5> \ProvidesFile{langd5.cfg} - [2015/01/18 v3.8n achemso configuration: Langmuir] + [2015/02/01 v3.9 achemso configuration: Langmuir] \def\acs@type@list{article,letter,suppinfo} \setkeys{acs}{articletitle = true} \SectionNumbersOff %</langd5> %<*mamobx> \ProvidesFile{mamobx.cfg} - [2015/01/18 v3.8n achemso configuration: Macromolecules] + [2015/02/01 v3.9 achemso configuration: Macromolecules] \SectionNumbersOff %</mamobx> %<*mpohbp> \ProvidesFile{mamobx.cfg} - [2015/01/18 v3.8n achemso configuration: Mol. Pharm.] + [2015/02/01 v3.9 achemso configuration: Mol. Pharm.] \setkeys{acs}{ articletitle = true, keywords = true @@ -4226,7 +4245,7 @@ This work consists of the file achemso.dtx %</mpohbp> %<*nalefd> \ProvidesFile{nalefd.cfg} - [2015/01/18 v3.8n achemso configuration: Nano Lett.] + [2015/02/01 v3.9 achemso configuration: Nano Lett.] \setkeys{acs}{keywords = true} \def\acs@type@default{letter} \def\acs@type@list{letter} @@ -4234,7 +4253,7 @@ This work consists of the file achemso.dtx %</nalefd> %<*orlef7> \ProvidesFile{orlef7.cfg} - [2015/01/18 v3.8n achemso configuration: Org. Lett.] + [2015/02/01 v3.9 achemso configuration: Org. Lett.] \def\acs@type@default{letter} \def\acs@type@list{letter} \SectionsOff @@ -4244,13 +4263,13 @@ This work consists of the file achemso.dtx %</orlef7> %<*oprdfk> \ProvidesFile{oprdfk.cfg} - [2015/01/18 v3.8n achemso configuration: Org. Proc. Res. Dev.] + [2015/02/01 v3.9 achemso configuration: Org. Proc. Res. Dev.] \def\acs@type@list{article,highlight,review,suppinfo} \SectionNumbersOff %</oprdfk> %<*orgnd7> \ProvidesFile{orgnd7.cfg} - [2015/01/18 v3.8n achemso configuration: Organometallics] + [2015/02/01 v3.9 achemso configuration: Organometallics] \SectionNumbersOff \setkeys{acs}{articletitle = true} %</orgnd7> @@ -4642,6 +4661,7 @@ ENTRY chapter ctrl-article-title ctrl-chapter-title + ctrl-doi ctrl-etal-firstonly ctrl-etal-number ctrl-use-title @@ -5287,6 +5307,7 @@ FUNCTION { count.entries } { % Start and end of bibliography functions FUNCTION { begin.bib } { + "achemso 2015/02/01 v3.9" top$ preamble$ empty$ { } { @@ -5350,6 +5371,7 @@ FUNCTION { end.bib } { INTEGERS { ctrl.article.title.bool ctrl.chapter.title.bool + ctrl.doi.bool ctrl.etal.firstonly.bool ctrl.etal.number.int } @@ -5362,6 +5384,7 @@ FUNCTION { initialize.control.values } { #0 'ctrl.article.title.bool := %</!bio> #0 'ctrl.chapter.title.bool := + #0 'ctrl.doi.bool := #1 'ctrl.etal.firstonly.bool := #15 'ctrl.etal.number.int := } @@ -5369,6 +5392,7 @@ FUNCTION { initialize.control.values } { FUNCTION { control } { ctrl-article-title yes.no.to.bool 'ctrl.article.title.bool := ctrl-chapter-title yes.no.to.bool 'ctrl.chapter.title.bool := + ctrl-doi yes.no.to.bool 'ctrl.doi.bool := ctrl-etal-firstonly yes.no.to.bool 'ctrl.etal.firstonly.bool := ctrl-etal-number str.to.int 'ctrl.etal.number.int := ctrl-use-title empty$ @@ -5732,10 +5756,14 @@ FUNCTION { format.chapter } { } FUNCTION { format.doi } { - next.punct.comma 'next.punct.int := - bbl.doi add.space - doi * - output + doi empty$ + 'skip$ + { + bbl.doi add.space + doi * + output + } + if$ } FUNCTION { format.edition } { @@ -5848,6 +5876,10 @@ FUNCTION { format.pages } { output } if$ + ctrl.doi.bool + { format.doi } + 'skip$ + if$ } FUNCTION { format.pages.article } { @@ -5858,6 +5890,10 @@ FUNCTION { format.pages.article } { output } if$ + ctrl.doi.bool + { format.doi } + 'skip$ + if$ } FUNCTION { format.publisher.address } { @@ -5940,11 +5976,6 @@ FUNCTION { format.title.booktitle } { if$ } - -FUNCTION { format.chapter.title } { -} - - STRINGS { book.title chapter.title @@ -6163,6 +6194,7 @@ FUNCTION { inpress } { %<*!bio> format.year.article %</!bio> + next.punct.comma 'next.punct.int := format.doi } if$ @@ -6267,6 +6299,7 @@ FUNCTION { unpublished } { { format.howpublished } { format.year + next.punct.comma 'next.punct.int := format.doi } if$ |