summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-03-14 00:24:17 +0000
committerKarl Berry <karl@freefriends.org>2008-03-14 00:24:17 +0000
commit9cc5e1545f61cc0ca4996b6fb98ce491ec5a4ce5 (patch)
tree8b4b5412ed02fa3b1581f68f03a56f0110953b7c
parent2d0760c2d539075994a651bbcbddb1c1f97bee4d (diff)
achemso 2.2h (12mar08)
git-svn-id: svn://tug.org/texlive/trunk@6960 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/achemso/achemso.pdfbin186212 -> 188849 bytes
-rw-r--r--Master/texmf-dist/source/latex/achemso/achemso.dtx93
-rw-r--r--Master/texmf-dist/source/latex/achemso/achemso.ins6
-rw-r--r--Master/texmf-dist/tex/latex/achemso/achemso.sty35
-rw-r--r--Master/texmf-dist/tex/latex/achemso/jawltxdoc.sty23
5 files changed, 100 insertions, 57 deletions
diff --git a/Master/texmf-dist/doc/latex/achemso/achemso.pdf b/Master/texmf-dist/doc/latex/achemso/achemso.pdf
index 3bc0a40cbcb..38589fb542d 100644
--- a/Master/texmf-dist/doc/latex/achemso/achemso.pdf
+++ b/Master/texmf-dist/doc/latex/achemso/achemso.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/achemso/achemso.dtx b/Master/texmf-dist/source/latex/achemso/achemso.dtx
index 7f847751801..1b9e486a9b5 100644
--- a/Master/texmf-dist/source/latex/achemso/achemso.dtx
+++ b/Master/texmf-dist/source/latex/achemso/achemso.dtx
@@ -93,10 +93,9 @@
\endpreamble
\Msg{Generating achemso files:}
-\usedir{tex/latex/contib/achemso}
+\usedir{tex/latex/achemso}
\generate{\file{\jobname.ins}{\from{\jobname.dtx}{install}}
\file{\jobname.sty}{\from{\jobname.dtx}{package}}
- \file{jawltxdoc.sty}{\from{\jobname.dtx}{jawltxdoc}}
}
\declarepostamble\bibtexable
\endpostamble
@@ -122,6 +121,9 @@
\generate{\usepostamble\empty\usepreamble\empty
\file{achemso.bib}{\from{achemso.dtx}{database}}
}
+\usedir{doc/latex/achemso}
+\generate{\file{jawltxdoc.sty}{\from{\jobname.dtx}{jawltxdoc}}
+}
\endbatchfile
%</install>
%<*ignore>
@@ -146,7 +148,7 @@
%</driver>
% \fi
%
-%\CheckSum{159}
+%\CheckSum{187}
%
%\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
@@ -451,13 +453,13 @@
%
%\DescribeMacro{\bibliographystyle}
% Loading the \currpkg package adds the appropriate
-% \cmd{\bibliographystyle} command to the LaTeX source. As a result,
-% subsequent \cmd{\bibliographystyle} statements will be ignored: a
-% suitable warning is given. The format of citations is altered
-% (using the \pkg{cite} or \pkg{natbib} package as appropriate), and
-% the package ensures that the bibliography will be named
-% ``References'' in all standard document types.\footnote{This only
-% works if the \pkg{babel} package is \emph{not} loaded. Users
+% \cmd{\bibliographystyle} command to the \LaTeX\ source. As a
+% result, subsequent \cmd{\bibliographystyle} statements will be
+% ignored: a suitable warning is given. The format of citations is
+% altered (using the \pkg{cite} or \pkg{natbib} package as
+% appropriate), and the package ensures that the bibliography will be
+% named ``References'' in all standard document types.\footnote{This
+% only works if the \pkg{babel} package is \emph{not} loaded. Users
% wanting a system which works with \pkg{babel} should look at the
% \pkg{chemstyle} package. }
%
@@ -500,7 +502,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{achemso}
- [2008/01/21 v2.2g LaTeX and BibTeX support for American
+ [2008/03/12 v2.2h LaTeX and BibTeX support for American
Chemical Society publications]
% \end{macrocode}
%\begin{macro}{\ifACS@sctnnmbr}
@@ -647,7 +649,13 @@
%\begin{macro}{\bibliographystyle}
%\changes{v2.0}{2007/01/17}{Replaced custom code with
% \pkg{showkeys} package}
+%\changes{v2.0}{2007/01/17}{Command ignored in document body}
%\changes{v2.2g}{2008/01/21}{Added \opt{iecr} code}
+%\changes{v2.2h}{2008/03/12}{Fixed problem with \pkg{chapterbib}}
+%\changes{v2.2h}{2008/03/12}{Style is re-applied by calling macro
+% in document body}
+%\begin{macro}{\acs@bibstyle}
+%\changes{v2.2h}{2008/03/12}{New macro}
% Depending on the package option, the bibliography style will either
% be \file{achemso} or \file{achemsol}. The later is intended for
% listing the entire database. The \opt{list} option of the package
@@ -662,51 +670,53 @@
\ifACS@iecr
\ifACS@natbib
\ifACS@mcite
- \bibliographystyle{iecrnatM}
+ \newcommand*{\acs@bibstyle}{iecrnatM}%
\else
- \bibliographystyle{iecrnat}
+ \newcommand*{\acs@bibstyle}{iecrnat}%
\fi
\else
\ifACS@mcite
- \bibliographystyle{iecrM}
+ \newcommand*{\acs@bibstyle}{iecrM}%
\else
- \bibliographystyle{iecr}
+ \newcommand*{\acs@bibstyle}{iecr}%
\fi
\fi
\else
\ifACS@list
\ifACS@natbib
\ifACS@mcite
- \bibliographystyle{achemlntM}
+ \newcommand*{\acs@bibstyle}{achemlntM}%
\else
- \bibliographystyle{achemlnt}
+ \newcommand*{\acs@bibstyle}{achemlnt}%
\fi
\else
\ifACS@mcite
- \bibliographystyle{achemsolM}
+ \newcommand*{\acs@bibstyle}{achemsolM}%
\else
- \bibliographystyle{achemsol}
+ \newcommand*{\acs@bibstyle}{achemsol}%
\fi
\fi
\RequirePackage[notcite]{showkeys}
\else
\ifACS@natbib
\ifACS@mcite
- \bibliographystyle{achemnatM}
+ \newcommand*{\acs@bibstyle}{achemnatM}%
\else
- \bibliographystyle{achemnat}
+ \newcommand*{\acs@bibstyle}{achemnat}%
\fi
\else
\ifACS@mcite
- \bibliographystyle{achemsoM}
+ \newcommand*{\acs@bibstyle}{achemsoM}%
\else
- \bibliographystyle{achemso}
+ \newcommand*{\acs@bibstyle}{achemso}%
\fi
\fi
\fi
\fi
+\expandafter\bibliographystyle\expandafter{\acs@bibstyle}
% \end{macrocode}
%\end{macro}
+%\end{macro}
%\begin{macro}{\@biblabel}
%\changes{v2.2g}{2008/01/21}{Added \opt{iecr} option to code}
% In order to re-format the bibliography labels, the easiest
@@ -719,20 +729,26 @@
\renewcommand*{\@biblabel}[1]{#1.}
\fi
% \end{macrocode}
-%\end{macro}
%\begin{macro}{\ACS@bibwarning}
-%\begin{macro}{\bibliographystyle}
+%\begin{macro}{\acs@bibliographystyle}
+%\changes{v2.2h}{2008/03/12}{New macro}
% To ensure that additional \cs{bibliographystyle} commands in the
% source are killed off. The \cs{ACS@bibwarning} provides a clean
% method of generating the warning message.
-%\changes{v2.0}{2007-01-17}{Command ignored in document body}
+
% \begin{macrocode}
+\let\acs@bibliographystyle\bibliographystyle
\newcommand*{\ACS@bibwarning}{\PackageWarning{achemso}%
{Additional bibliographystyle command ignored}}
-\renewcommand*{\bibliographystyle}{\ACS@bibwarning\@gobble}
+\AtBeginDocument{
+ \@ifpackageloaded{chapterbib}{\let\ACS@bibwarning\relax}{}}
+\renewcommand*{\bibliographystyle}{%
+ \expandafter\acs@bibliographystyle\expandafter{\acs@bibstyle}%
+ \ACS@bibwarning\@gobble}
% \end{macrocode}
%\end{macro}
%\end{macro}
+%\end{macro}
% The package is complete.
% \begin{macrocode}
%</package>
@@ -2334,7 +2350,9 @@ EXECUTE {end.bib}
\usepackage[final]{microtype}
\usepackage[osf]{mathpazo}
\usepackage{booktabs,array,url,graphicx,courier,xspace}
-\usepackage{upgreek,ifpdf,listings}
+\usepackage{upgreek,ifpdf,listings,float,caption,longtable}
+\floatstyle{plaintop}
+\restylefloat{table}
\ifpdf
\usepackage{embedfile}
\embedfile[%
@@ -2413,12 +2431,9 @@ EXECUTE {end.bib}
\let\typesetexample#1
\global\let\lst@intname\@empty
\setbox\lst@samplebox=\hbox\bgroup
- \setkeys{lst}{language=[LaTeX]{TeX},tabsize=4,gobble=3,%
- breakindent=0pt,basicstyle=\small\ttfamily,basewidth=0.51em,%
- keywordstyle=\color{blue},%
- morekeywords={% notes2bib
- niibsetup,bibnote,bibnotetext,bibnotemark,thebibnote,%
- flushnotestack,citenote,printbibnotes}}
+ \setkeys{lst}{tabsize=4,gobble=3,breakindent=0pt,%
+ basicstyle=\small\ttfamily,basewidth=0.51em,%
+ keywordstyle=\color{blue}}
\lst@BeginAlsoWriteFile{\LaTeXexamplefile}
}{%
\lst@EndWriteFile\egroup
@@ -2433,6 +2448,16 @@ EXECUTE {end.bib}
\leavevmode \input{\LaTeXexamplefile}}%
\MakePercentIgnore%
}
+\def\DescribeOption{\leavevmode\@bsphack\begingroup\MakePrivateLetters
+ \Describe@Option}
+\def\Describe@Option#1{\endgroup
+ \marginpar{\raggedleft\PrintDescribeEnv{#1}}%
+ \SpecialOptionIndex{#1}\@esphack\ignorespaces}
+\def\SpecialOptionIndex#1{\@bsphack
+ \index{#1\actualchar{\protect\ttfamily#1}
+ (option)\encapchar usage}%
+ \index{options:\levelchar#1\actualchar{\protect\ttfamily#1}\encapchar
+ usage}\@esphack}
\newcommand*{\pkg}[1]{\textsf{#1}}
\newcommand*{\currpkg}{\pkg{\jobname}\xspace}
\newcommand*{\opt}[1]{\texttt{#1}}
diff --git a/Master/texmf-dist/source/latex/achemso/achemso.ins b/Master/texmf-dist/source/latex/achemso/achemso.ins
index f67723648ae..0e006f4e1e8 100644
--- a/Master/texmf-dist/source/latex/achemso/achemso.ins
+++ b/Master/texmf-dist/source/latex/achemso/achemso.ins
@@ -29,10 +29,9 @@
\endpreamble
\Msg{Generating achemso files:}
-\usedir{tex/latex/contib/achemso}
+\usedir{tex/latex/achemso}
\generate{\file{\jobname.ins}{\from{\jobname.dtx}{install}}
\file{\jobname.sty}{\from{\jobname.dtx}{package}}
- \file{jawltxdoc.sty}{\from{\jobname.dtx}{jawltxdoc}}
}
\declarepostamble\bibtexable
\endpostamble
@@ -58,6 +57,9 @@
\generate{\usepostamble\empty\usepreamble\empty
\file{achemso.bib}{\from{achemso.dtx}{database}}
}
+\usedir{doc/latex/achemso}
+\generate{\file{jawltxdoc.sty}{\from{\jobname.dtx}{jawltxdoc}}
+}
\endbatchfile
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/achemso/achemso.sty b/Master/texmf-dist/tex/latex/achemso/achemso.sty
index bd4c5b4e9b3..acce6c1b08a 100644
--- a/Master/texmf-dist/tex/latex/achemso/achemso.sty
+++ b/Master/texmf-dist/tex/latex/achemso/achemso.sty
@@ -16,7 +16,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{achemso}
- [2008/01/21 v2.2g LaTeX and BibTeX support for American
+ [2008/03/12 v2.2h LaTeX and BibTeX support for American
Chemical Society publications]
\newif\ifACS@sctnnmbr\ACS@sctnnmbrfalse
\newif\ifACS@list\ACS@listfalse
@@ -85,57 +85,64 @@
\ifACS@iecr
\ifACS@natbib
\ifACS@mcite
- \bibliographystyle{iecrnatM}
+ \newcommand*{\acs@bibstyle}{iecrnatM}%
\else
- \bibliographystyle{iecrnat}
+ \newcommand*{\acs@bibstyle}{iecrnat}%
\fi
\else
\ifACS@mcite
- \bibliographystyle{iecrM}
+ \newcommand*{\acs@bibstyle}{iecrM}%
\else
- \bibliographystyle{iecr}
+ \newcommand*{\acs@bibstyle}{iecr}%
\fi
\fi
\else
\ifACS@list
\ifACS@natbib
\ifACS@mcite
- \bibliographystyle{achemlntM}
+ \newcommand*{\acs@bibstyle}{achemlntM}%
\else
- \bibliographystyle{achemlnt}
+ \newcommand*{\acs@bibstyle}{achemlnt}%
\fi
\else
\ifACS@mcite
- \bibliographystyle{achemsolM}
+ \newcommand*{\acs@bibstyle}{achemsolM}%
\else
- \bibliographystyle{achemsol}
+ \newcommand*{\acs@bibstyle}{achemsol}%
\fi
\fi
\RequirePackage[notcite]{showkeys}
\else
\ifACS@natbib
\ifACS@mcite
- \bibliographystyle{achemnatM}
+ \newcommand*{\acs@bibstyle}{achemnatM}%
\else
- \bibliographystyle{achemnat}
+ \newcommand*{\acs@bibstyle}{achemnat}%
\fi
\else
\ifACS@mcite
- \bibliographystyle{achemsoM}
+ \newcommand*{\acs@bibstyle}{achemsoM}%
\else
- \bibliographystyle{achemso}
+ \newcommand*{\acs@bibstyle}{achemso}%
\fi
\fi
\fi
\fi
+\expandafter\bibliographystyle\expandafter{\acs@bibstyle}
\ifACS@iecr
\renewcommand*{\@biblabel}[1]{(#1)}
\else
\renewcommand*{\@biblabel}[1]{#1.}
\fi
+
+\let\acs@bibliographystyle\bibliographystyle
\newcommand*{\ACS@bibwarning}{\PackageWarning{achemso}%
{Additional bibliographystyle command ignored}}
-\renewcommand*{\bibliographystyle}{\ACS@bibwarning\@gobble}
+\AtBeginDocument{
+ \@ifpackageloaded{chapterbib}{\let\ACS@bibwarning\relax}{}}
+\renewcommand*{\bibliographystyle}{%
+ \expandafter\acs@bibliographystyle\expandafter{\acs@bibstyle}%
+ \ACS@bibwarning\@gobble}
\endinput
%%
%% End of file `achemso.sty'.
diff --git a/Master/texmf-dist/tex/latex/achemso/jawltxdoc.sty b/Master/texmf-dist/tex/latex/achemso/jawltxdoc.sty
index 30d016315dd..d0326c014dc 100644
--- a/Master/texmf-dist/tex/latex/achemso/jawltxdoc.sty
+++ b/Master/texmf-dist/tex/latex/achemso/jawltxdoc.sty
@@ -23,7 +23,9 @@
\usepackage[final]{microtype}
\usepackage[osf]{mathpazo}
\usepackage{booktabs,array,url,graphicx,courier,xspace}
-\usepackage{upgreek,ifpdf,listings}
+\usepackage{upgreek,ifpdf,listings,float,caption,longtable}
+\floatstyle{plaintop}
+\restylefloat{table}
\ifpdf
\usepackage{embedfile}
\embedfile[%
@@ -102,12 +104,9 @@
\let\typesetexample#1
\global\let\lst@intname\@empty
\setbox\lst@samplebox=\hbox\bgroup
- \setkeys{lst}{language=[LaTeX]{TeX},tabsize=4,gobble=3,%
- breakindent=0pt,basicstyle=\small\ttfamily,basewidth=0.51em,%
- keywordstyle=\color{blue},%
- morekeywords={% notes2bib
- niibsetup,bibnote,bibnotetext,bibnotemark,thebibnote,%
- flushnotestack,citenote,printbibnotes}}
+ \setkeys{lst}{tabsize=4,gobble=3,breakindent=0pt,%
+ basicstyle=\small\ttfamily,basewidth=0.51em,%
+ keywordstyle=\color{blue}}
\lst@BeginAlsoWriteFile{\LaTeXexamplefile}
}{%
\lst@EndWriteFile\egroup
@@ -122,6 +121,16 @@
\leavevmode \input{\LaTeXexamplefile}}%
\MakePercentIgnore%
}
+\def\DescribeOption{\leavevmode\@bsphack\begingroup\MakePrivateLetters
+ \Describe@Option}
+\def\Describe@Option#1{\endgroup
+ \marginpar{\raggedleft\PrintDescribeEnv{#1}}%
+ \SpecialOptionIndex{#1}\@esphack\ignorespaces}
+\def\SpecialOptionIndex#1{\@bsphack
+ \index{#1\actualchar{\protect\ttfamily#1}
+ (option)\encapchar usage}%
+ \index{options:\levelchar#1\actualchar{\protect\ttfamily#1}\encapchar
+ usage}\@esphack}
\newcommand*{\pkg}[1]{\textsf{#1}}
\newcommand*{\currpkg}{\pkg{\jobname}\xspace}
\newcommand*{\opt}[1]{\texttt{#1}}