summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-01-17 20:55:56 +0000
committerKarl Berry <karl@freefriends.org>2008-01-17 20:55:56 +0000
commite4f6b6c0d6164dceee9cd08e5be85caf0ede6817 (patch)
tree1e8a2df569cfd8ca3da7650ddf84f80290faec26 /Master/texmf-dist/source
parent4811d8fca4fa9fbe5e84bb33ad805bd747c514b9 (diff)
achemso 2.2e (16jan08)
git-svn-id: svn://tug.org/texlive/trunk@6294 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/achemso/achemso.dtx37
-rw-r--r--Master/texmf-dist/source/latex/achemso/achemso.ins4
2 files changed, 12 insertions, 29 deletions
diff --git a/Master/texmf-dist/source/latex/achemso/achemso.dtx b/Master/texmf-dist/source/latex/achemso/achemso.dtx
index faa195544c9..2321f57b477 100644
--- a/Master/texmf-dist/source/latex/achemso/achemso.dtx
+++ b/Master/texmf-dist/source/latex/achemso/achemso.dtx
@@ -101,13 +101,9 @@
\file{achemso.bst}{\from{achemso.dtx}{bib}}
\file{achemsoM.bst}{\from{achemso.dtx}{bib,mcp}}
\file{achemnat.bst}{\from{achemso.dtx}{bib,nat}}
- \file{achemnatM.bst}{\from{achemso.dtx}{bib,nat,mcp}}
-}
-\generate{\usepostamble\bibtexable
\file{achemsol.bst}{\from{achemso.dtx}{bib,list}}
\file{achemsolM.bst}{\from{achemso.dtx}{bib,list,mcp}}
\file{achemlnt.bst}{\from{achemso.dtx}{bib,list,nat}}
- \file{achemlntM.bst}{\from{achemso.dtx}{bib,list,nat,mcp}}
}
\generate{\usepostamble\empty\usepreamble\empty
\file{achemso.bib}{\from{achemso.dtx}{database}}
@@ -136,7 +132,7 @@
%</driver>
% \fi
%
-%\CheckSum{134}
+%\CheckSum{128}
%
%\CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -178,8 +174,6 @@
%\changes{v2.2d}{2007/10/16}{Package design improved}
%\changes{v2.2e}{2008/01/16}{Added \pkg{mciteplus} support}
%\changes{v2.2e}{2008/01/16}{Documentation improvements}
-%\changes{v2.2f}{2008/01/16}{Combined \pkg{mciteplus} and
-% \pkg{natbib} support}
%
%\DoNotIndex{\@biblabel,\@eha,\@gobble,\@ifpackageloaded}
%\DoNotIndex{\@ifundefined,\citeform,\citeleft,\citeright}
@@ -483,7 +477,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{achemso}
- [2008/01/16 v2.2f LaTeX and BibTeX support for American
+ [2008/01/16 v2.2e LaTeX and BibTeX support for American
Chemical Society publications]
% \end{macrocode}
%\begin{macro}{\ifACS@sctnnmbr}
@@ -546,6 +540,13 @@
\RequirePackage[numbers,sort&compress,round]{natbib}
\newcommand*{\citenumfont}{\textit}
\fi
+% \end{macrocode}
+% A check is made as \pkg{mciteplus} is incompatible with \pkg{natbib}.
+% \begin{macrocode}
+ \ifACS@mcite
+ \PackageWarning{achemso}{mcite option incompatible with natbib}
+ \fi
+ \ACS@mcitefalse
\else
\ifACS@super
% \end{macrocode}
@@ -635,12 +636,7 @@
% \begin{macrocode}
\ifACS@list
\ifACS@natbib
- \ifACS@mcite
- \bibliographystyle{achemlntM}
- \RequirePackage{mciteplus}
- \else
- \bibliographystyle{achemlnt}
- \fi
+ \bibliographystyle{achemlnt}
\else
\ifACS@mcite
\bibliographystyle{achemsolM}
@@ -652,12 +648,7 @@
\RequirePackage[notcite]{showkeys}
\else
\ifACS@natbib
- \ifACS@mcite
- \bibliographystyle{achemnatM}
- \RequirePackage{mciteplus}
- \else
- \bibliographystyle{achemnat}
- \fi
+ \bibliographystyle{achemnat}
\else
\ifACS@mcite
\bibliographystyle{achemsoM}
@@ -2225,11 +2216,7 @@ FUNCTION {begin.bib}
write$ newline$
"{This bibstyle requires the use of the mciteplus package.}\fi"
write$ newline$
-%<!nat> "\begin{mcitethebibliography}{" longest.label * "}" * write$ newline$
-%<nat> "\begin{mcitethebibliography}{" number.label int.to.str$ * "}" *
-%<nat> write$ newline$
-%<nat> "\providecommand{\natexlab}[1]{#1}"
-%<nat> write$ newline$
+ "\begin{mcitethebibliography}{" longest.label * "}" * write$ newline$
"\mciteSetBstSublistMode{f}"
write$ newline$
"\mciteSetBstMaxWidthForm{subitem}{(\alph{mcitesubitemcount})}"
diff --git a/Master/texmf-dist/source/latex/achemso/achemso.ins b/Master/texmf-dist/source/latex/achemso/achemso.ins
index 710cdad443b..9a425137c91 100644
--- a/Master/texmf-dist/source/latex/achemso/achemso.ins
+++ b/Master/texmf-dist/source/latex/achemso/achemso.ins
@@ -41,13 +41,9 @@
\file{achemso.bst}{\from{achemso.dtx}{bib}}
\file{achemsoM.bst}{\from{achemso.dtx}{bib,mcp}}
\file{achemnat.bst}{\from{achemso.dtx}{bib,nat}}
- \file{achemnatM.bst}{\from{achemso.dtx}{bib,nat,mcp}}
-}
-\generate{\usepostamble\bibtexable
\file{achemsol.bst}{\from{achemso.dtx}{bib,list}}
\file{achemsolM.bst}{\from{achemso.dtx}{bib,list,mcp}}
\file{achemlnt.bst}{\from{achemso.dtx}{bib,list,nat}}
- \file{achemlntM.bst}{\from{achemso.dtx}{bib,list,nat,mcp}}
}
\generate{\usepostamble\empty\usepreamble\empty
\file{achemso.bib}{\from{achemso.dtx}{database}}