summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/achemso
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-01-17 07:13:47 +0000
committerNorbert Preining <preining@logic.at>2008-01-17 07:13:47 +0000
commit1ff881bb9b27e1bfc797ed8ce04608954c87548b (patch)
tree46b616b85c5e768ebe22b7b737f1da8012bd88fb /Master/texmf-dist/tex/latex/achemso
parentaa80b5c425682a0606de9a0417852bd38bb74f53 (diff)
achemso update 09-01-17
git-svn-id: svn://tug.org/texlive/trunk@6273 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/achemso')
-rw-r--r--Master/texmf-dist/tex/latex/achemso/achemso.sty66
-rw-r--r--Master/texmf-dist/tex/latex/achemso/jawltxdoc.sty56
2 files changed, 84 insertions, 38 deletions
diff --git a/Master/texmf-dist/tex/latex/achemso/achemso.sty b/Master/texmf-dist/tex/latex/achemso/achemso.sty
index ae552de1612..182ee56e843 100644
--- a/Master/texmf-dist/tex/latex/achemso/achemso.sty
+++ b/Master/texmf-dist/tex/latex/achemso/achemso.sty
@@ -10,19 +10,20 @@
%% Chemical Society publications
%% Maintained by Joseph Wright
%% E-mail: joseph.wright@morningstar2.co.uk
-%% Released under the LaTeX Project Public License v1.3 or later
+%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{achemso}
- [2007/10/16 v2.2d LaTeX and BibTeX support for American
+ [2008/01/16 v2.2f LaTeX and BibTeX support for American
Chemical Society publications]
-\newif \ifACS@sctnnmbr \ACS@sctnnmbrfalse
-\newif \ifACS@list \ACS@listfalse
-\newif \ifACS@note \ACS@notefalse
-\newif \ifACS@super \ACS@supertrue
-\newif \ifACS@natbib \ACS@natbibfalse
+\newif\ifACS@sctnnmbr\ACS@sctnnmbrfalse
+\newif\ifACS@list\ACS@listfalse
+\newif\ifACS@note\ACS@notefalse
+\newif\ifACS@super\ACS@supertrue
+\newif\ifACS@natbib\ACS@natbibfalse
+\newif\ifACS@mcite\ACS@mcitefalse
\DeclareOption{note}{\ExecuteOptions{notes}}
\DeclareOption{notes}{\ACS@notetrue}
\DeclareOption{number}{\ACS@sctnnmbrtrue}
@@ -30,8 +31,9 @@
\DeclareOption{list}{\ACS@listtrue}
\DeclareOption{notsuper}{\ACS@superfalse}
\DeclareOption{natbib}{\ACS@natbibtrue}
+\DeclareOption{mcite}{\ACS@mcitetrue}
\DeclareOption*{\OptionNotUsed}
-\ProcessOptions
+\ProcessOptions\relax
\ifACS@natbib
\ifACS@super
\RequirePackage[numbers,sort&compress,super]{natbib}
@@ -44,17 +46,19 @@
\RequirePackage[nospace]{overcite}
\else
\RequirePackage{cite}
- \renewcommand\citeleft{(}
- \renewcommand\citeright{)}
- \renewcommand\citeform[1]{\emph{#1}}
+ \renewcommand{\citeleft}{(}
+ \renewcommand{\citeright}{)}
+ \renewcommand{\citeform}[1]{\emph{#1}}
\fi
\fi
\@ifpackageloaded{babel}
{\ACS@notefalse\PackageWarning{achemso}%
{babel package loaded - note option disabled}}
- {\relax}
-\def\ACS@biberror{\PackageError{achemso}%
- {No bibliography name command defined}\@eha}
+ {}
+\newcommand*{\ACS@biberror}{\PackageError{achemso}%
+ {No bibliography name command defined}
+ {The document class you have used does not define
+ \string\refname\MessageBreak or \string\bibname}}
\@ifundefined{refname}{%
\@ifundefined{bibname}{%
\ACS@biberror
@@ -75,22 +79,42 @@
\fi
\ifACS@list
\ifACS@natbib
- \bibliographystyle{achemlnt}
+ \ifACS@mcite
+ \bibliographystyle{achemlntM}
+ \RequirePackage{mciteplus}
+ \else
+ \bibliographystyle{achemlnt}
+ \fi
\else
- \bibliographystyle{achemsol}
+ \ifACS@mcite
+ \bibliographystyle{achemsolM}
+ \RequirePackage{mciteplus}
+ \else
+ \bibliographystyle{achemsol}
+ \fi
\fi
\RequirePackage[notcite]{showkeys}
\else
\ifACS@natbib
- \bibliographystyle{achemnat}
+ \ifACS@mcite
+ \bibliographystyle{achemnatM}
+ \RequirePackage{mciteplus}
+ \else
+ \bibliographystyle{achemnat}
+ \fi
\else
- \bibliographystyle{achemso}
+ \ifACS@mcite
+ \bibliographystyle{achemsoM}
+ \RequirePackage{mciteplus}
+ \else
+ \bibliographystyle{achemso}
+ \fi
\fi
\fi
-\def\@biblabel#1{#1.}
-\def\ACS@bibwarning{\PackageWarning{achemso}%
+\renewcommand*{\@biblabel}[1]{#1.}
+\newcommand*{\ACS@bibwarning}{\PackageWarning{achemso}%
{Additional bibliographystyle command ignored}}
-\def\bibliographystyle{\ACS@bibwarning\@gobble}
+\renewcommand*{\bibliographystyle}{\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 86e4549d433..30d016315dd 100644
--- a/Master/texmf-dist/tex/latex/achemso/jawltxdoc.sty
+++ b/Master/texmf-dist/tex/latex/achemso/jawltxdoc.sty
@@ -10,20 +10,19 @@
%% Chemical Society publications
%% Maintained by Joseph Wright
%% E-mail: joseph.wright@morningstar2.co.uk
-%% Released under the LaTeX Project Public License v1.3 or later
+%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{jawltxdoc}
- [2007/10/14 v1.0b]
\usepackage[T1]{fontenc}
\usepackage[english,UKenglish]{babel}
\usepackage[scaled=0.95]{helvet}
\usepackage[version=3]{mhchem}
\usepackage[final]{microtype}
\usepackage[osf]{mathpazo}
-\usepackage{booktabs,array,url,graphicx,courier,unitsdef}
+\usepackage{booktabs,array,url,graphicx,courier,xspace}
\usepackage{upgreek,ifpdf,listings}
\ifpdf
\usepackage{embedfile}
@@ -33,14 +32,15 @@
desc={LaTeX docstrip source archive for package `\jobname'}%
]{\jobname.dtx}
\fi
-\usepackage{\jobname}
+\IfFileExists{\jobname.sty}
+ {\usepackage{\jobname}}{}
\usepackage[numbered]{hypdoc}
\newlength\LaTeXwidth
\newlength\LaTeXoutdent
\newlength\LaTeXgap
\setlength\LaTeXgap{1em}
\setlength\LaTeXoutdent{-0.15\textwidth}
-\def\typesetexampleandcode{%
+\newcommand*{\typesetexampleandcode}{%
\begin{list}{}{%
\setlength\itemindent{0pt}
\setlength\leftmargin\LaTeXoutdent
@@ -57,7 +57,7 @@
\end{minipage}%
\end{list}
}
-\def\typesetcodeandexample{%
+\newcommand*{\typesetcodeandexample}{%
\begin{list}{}{%
\setlength\itemindent{0pt}
\setlength\leftmargin{0pt}
@@ -70,7 +70,7 @@
\lst@sampleInput
\end{list}
}
-\def\typesetfloatexample{%
+\newcommand*{\typesetfloatexample}{%
\begin{list}{}{%
\setlength\itemindent{0pt}
\setlength\leftmargin{0pt}
@@ -83,7 +83,7 @@
\end{minipage}%
\end{list}
}
-\def\typesetcodeonly{%
+\newcommand*{\typesetcodeonly}{%
\begin{list}{}{%
\setlength\itemindent{0pt}
\setlength\leftmargin{0pt}
@@ -102,22 +102,19 @@
\let\typesetexample#1
\global\let\lst@intname\@empty
\setbox\lst@samplebox=\hbox\bgroup
- \setkeys{lst}{language=[LaTeX]{TeX},tabsize=4,gobble=2,%
+ \setkeys{lst}{language=[LaTeX]{TeX},tabsize=4,gobble=3,%
breakindent=0pt,basicstyle=\small\ttfamily,basewidth=0.51em,%
keywordstyle=\color{blue},%
- morekeywords={bibnote,citenote,bibnotetext,bibnotemark,%
- thebibnote,bibnotename,includegraphics,schemeref,%
- floatcontentsleft,floatcontentsright,floatcontentscentre,%
- schemerefmarker,compound,schemerefformat,color,%
- startchemical,stopchemical,chemical,setupchemical,bottext,%
- listofschemes}}
+ morekeywords={% notes2bib
+ niibsetup,bibnote,bibnotetext,bibnotemark,thebibnote,%
+ flushnotestack,citenote,printbibnotes}}
\lst@BeginAlsoWriteFile{\LaTeXexamplefile}
}{%
\lst@EndWriteFile\egroup
\setlength\LaTeXwidth{\wd\lst@samplebox}
\typesetexample%
}
-\def\lst@sampleInput{%
+\newcommand*{\lst@sampleInput}{%
\MakePercentComment\catcode`\^^M=10\relax
\small%
{\setkeys{lst}{SelectCharTable=\lst@ReplaceInput{\^\^I}%
@@ -125,7 +122,32 @@
\leavevmode \input{\LaTeXexamplefile}}%
\MakePercentIgnore%
}
-\hyphenation{PDF-LaTeX}
+\newcommand*{\pkg}[1]{\textsf{#1}}
+\newcommand*{\currpkg}{\pkg{\jobname}\xspace}
+\newcommand*{\opt}[1]{\texttt{#1}}
+\newcommand*{\file}[1]{\texttt{#1}}
+\newcommand*{\ext}[1]{\file{.#1}}
+\newcommand*{\latin}[1]{\emph{#1}}
+\newcommand*{\etc}{%
+ \@ifnextchar.
+ {\latin{etc}}
+ {\latin{etc.}}
+ \xspace}
+\newcommand*{\eg}{%
+ \@ifnextchar.
+ {\latin{e.g}}
+ {\latin{e.g.}}
+ \xspace}
+\newcommand*{\ie}{%
+ \@ifnextchar.
+ {\latin{i.e}}
+ {\latin{i.e.}}
+ \xspace}
+\newcommand*{\AMS}{{\protect\usefont{OMS}{cmsy}{m}{n}%
+ A\kern-.1667em\lower.5ex\hbox{M}\kern-.125emS}}
+\providecommand*{\eTeX}{\ensuremath{\varepsilon}-\TeX}
+\newcommand*{\XeTeX}
+ {X\kern-.125em\lower.5ex\hbox{\reflectbox{E}}\kern-.1667em\TeX}
\endinput
%%
%% End of file `jawltxdoc.sty'.