diff options
author | Karl Berry <karl@freefriends.org> | 2008-03-14 00:24:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-03-14 00:24:17 +0000 |
commit | 9cc5e1545f61cc0ca4996b6fb98ce491ec5a4ce5 (patch) | |
tree | 8b4b5412ed02fa3b1581f68f03a56f0110953b7c /Master/texmf-dist/tex/latex/achemso | |
parent | 2d0760c2d539075994a651bbcbddb1c1f97bee4d (diff) |
achemso 2.2h (12mar08)
git-svn-id: svn://tug.org/texlive/trunk@6960 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/achemso')
-rw-r--r-- | Master/texmf-dist/tex/latex/achemso/achemso.sty | 35 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/achemso/jawltxdoc.sty | 23 |
2 files changed, 37 insertions, 21 deletions
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}} |