summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-09-19 23:57:56 +0000
committerKarl Berry <karl@freefriends.org>2007-09-19 23:57:56 +0000
commite21894e0a7fb413d9ff97eb11284b1fcdfdd3e13 (patch)
treea446608d77296ddc1f9281215b416a6b33c393e9 /Master/texmf-dist/tex/latex
parent1f205e9f4560f8e24ec798c1b4a5da440c30f3b3 (diff)
chemstyle update (20sep07)
git-svn-id: svn://tug.org/texlive/trunk@4986 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/angew.jdf6
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty167
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/ic.jdf6
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/jacs.jdf7
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/jpc.jdf7
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/none.jdf6
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/orglett.jdf7
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/rsc.jdf10
8 files changed, 146 insertions, 70 deletions
diff --git a/Master/texmf-dist/tex/latex/chemstyle/angew.jdf b/Master/texmf-dist/tex/latex/chemstyle/angew.jdf
index e184e5c1542..24c2bb7f08c 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/angew.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/angew.jdf
@@ -9,10 +9,10 @@
%% chemstyle - Writing chemistry with style
%% Maintained by Joseph Wright
%% E-mail: joseph.wright@morningstar2.co.uk
-%% Released under the GNU General Public License
-%% See http://www.gnu.org/licenses/gpl.txt
+%% Released under the LaTeX Project Public License v1.3 or later
+%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
-\ProvidesFile{cst-angew.def}[2007/09/04 v1.0b]
+\ProvidesFile{cst-angew.def}[2007/09/18 v1.1a]
\RequirePackage[labelsep=period,labelfont={bf,it},font=sf]{caption}
\captionsetup[table]{labelsep=colon}
\captionsetup{singlelinecheck=off}
diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
index ad1059ee255..c9419381d96 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
+++ b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
@@ -9,41 +9,13 @@
%% chemstyle - Writing chemistry with style
%% Maintained by Joseph Wright
%% E-mail: joseph.wright@morningstar2.co.uk
-%% Released under the GNU General Public License
-%% See http://www.gnu.org/licenses/gpl.txt
+%% Released under the LaTeX Project Public License v1.3 or later
+%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{chemstyle}
- [2007/09/04 v1.0b Writing chemistry with style]
-\ifx\fg\@undefined
-\else
- \ifx\fg\relax
- \else
- \let\cst@fg\fg
- \let\fg\@undefined
- \fi
-\fi
-\RequirePackage{graphicx,amssymb,varioref,xspace,unitsdef}
-\ifx\cst@fg\@undefined
- \let\fg\@undefined
-\else
- \let\fg\cst@fg
-\fi
-\AtBeginDocument{%
- \ifx\fg\@undefined
- \newcommand{\fg}{\femtogram}
- \fi
-}
-\newunit{\cubiccentimeter}{\cm\unitsuperscript{3}}
-\newcommand{\cmc}{\cubiccentimeter}
-\newcommand{\Hz}{\hertz}
-\newunit{\Molar}{\textsc{m}}
-\newunit{\molar}{\mole\unitsep\dm\unitsuperscript{--3}}
-\newunit{\mmHg}{mm\unitsep{}Hg}
-\newunit{\mol}{mol}
-\newcommand*{\standardstate}%
- {\textsuperscript{\rotatebox[origin=c]{140.8}%
- {\ensuremath{\varnothing}}}}
+ [2007/09/18 v1.1a Writing chemistry with style]
+\RequirePackage{graphicx,varioref}
\let\cst@emph\relax
\def\cst@hyph{}
\let\cst@super\relax
@@ -57,7 +29,7 @@
\else
#2\cst@hyph\cst@super{\cst@emph{#1}}%
\fi%
- \xspace
+ \cst@xspace
}
}
\cst@radical{n}{Pr}%
@@ -67,12 +39,18 @@
\cst@radical{s}{Bu}%
\cst@radical{t}{Bu}%
\newif \ifcst@notes \cst@notestrue
+\newif \ifcst@phrases \cst@phrasestrue
+\newif \ifcst@si \cst@sifalse
+\newif \ifcst@xspace \cst@xspacefalse
\DeclareOption{ch}{\ExecuteOptions{chapter}}
\DeclareOption{chapter}%
{\PassOptionsToPackage{chapter}{chemscheme}}
\DeclareOption{chemcompounds}%
{\PassOptionsToPackage{chemcompounds}{chemscheme}}
\DeclareOption{nonotes}{\cst@notesfalse}
+\DeclareOption{nophrases}{\cst@phrasesfalse}
+\DeclareOption{siunits}{\cst@sitrue}
+\DeclareOption{xspace}{\cst@xspacetrue}
\let\cst@option\relax
\DeclareOption*{%
\ifx\cst@option\relax\else
@@ -81,8 +59,60 @@
\fi
\edef\cst@option{\CurrentOption}
}
+\@ifpackageloaded{siunits}
+ {\ExecuteOptions{siunits}}
+ {}
\ProcessOptions*
+\ifcst@si
+ \@ifpackageloaded{unitsdef}
+ {\PackageWarning{chemstyle}{%
+ You have set the siunits option,\MessageBreak
+ but have already loaded unitsdef!\MessageBreak
+ unitsdef will be used for extra unit macros}
+ \cst@sifalse}
+ {\RequirePackage{siunits}}
+\else
+ \ifx\fg\@undefined
+ \else
+ \ifx\fg\relax
+ \else
+ \let\cst@fg\fg
+ \let\fg\@undefined
+ \fi
+ \fi
+ \RequirePackage{unitsdef}
+ \ifx\cst@fg\@undefined
+ \let\fg\@undefined
+ \else
+ \let\fg\cst@fg
+ \fi
+ \AtBeginDocument{%
+ \ifx\fg\@undefined
+ \newcommand{\fg}{\femtogram}
+ \fi
+ }
+\fi
\RequirePackage{chemscheme}
+\ifcst@si
+ \newcommand{\cubiccentimeter}{\centi\metre\cubed}
+ \newcommand{\Molar}{\textsc{m}}
+ \newcommand{\molar}{\mole\usk\deci\metre\rpcubed}
+ \newcommand{\mmHg}{\milli\metre~Hg}
+ \newcommand{\mol}{\mole}
+\else
+ \newunit{\cubiccentimeter}{\cm\unitsuperscript{3}}
+ \newunit{\Molar}{\textsc{m}}
+ \newunit{\molar}{\mole\unitsep\dm\unitsuperscript{--3}}
+ \newunit{\mmHg}{mm\unitsep{}Hg}
+ \newunit{\mol}{\mole}
+\fi
+\newcommand{\cmc}{\cubiccentimeter}
+\newcommand{\Hz}{\hertz}
+\DeclareSymbolFont{CSTAMS}{U}{msb}{m}{n}
+\DeclareMathSymbol{\cst@varnothing} {\mathord}{CSTAMS}{"3F}
+\newcommand*{\standardstate}%
+ {\textsuperscript{\rotatebox[origin=c]{140.8}%
+ {\ensuremath{\cst@varnothing}}}}
\@ifclassloaded{memoir}
{\let\newfloat\@undefined
\RequirePackage{float}}
@@ -99,26 +129,69 @@
\labelformat{scheme}{\schemename~#1}
\labelformat{figure}{\figurename~#1}
\labelformat{table}{\tablename~#1}
-\ifx\latin\@undefined
- \newcommand{\latinemphon}{\let\latin\emph}
- \newcommand{\latinemphoff}{\let\latin\relax}
- \latinemphon
+\let\latinemphon\relax
+\let\latinemphoff\relax
+\let\cst@latin\relax
+\ifcst@phrases
+ \newcommand{\latinemphon}{\let\cst@latin\emph}
+ \newcommand{\latinemphoff}{\let\cst@latin\relax}
+ \AtBeginDocument{%
+ \providecommand\latin{\cst@latin}
+ }
+\fi
+\latinemphon
+\newif \ifcst@comma \cst@commafalse
+\AtBeginDocument{%
+ \ifcst@comma
+ \def\cst@punct{.,\cst@xspace}
+ \def\cst@addpunct{%
+ \cst@add@punct\relax%
+ }
+ \def\cst@add@punct#1{%
+ \futurelet\@tempa\cst@add@punct@%
+ }
+ \def\cst@add@punct@{%
+ \ifx\@tempa.%
+ \let\@tempb\cst@add@punct%
+ \else
+ \ifx\@tempa,%
+ \let\@tempb\cst@add@punct%
+ \else
+ \let\@tempb\cst@punct%
+ \fi
+ \fi
+ \@tempb%
+ }
+ \else
+ \def\cst@addpunct{\@ifnextchar.{}{\spacefactor999.\cst@xspace}}
+ \fi
+}
+\ifcst@xspace
+ \RequirePackage{xspace}
+ \let\cst@xspace\xspace
\else
- \let\latinemphon\relax
- \let\latinemphoff\relax
+ \let\cst@xspace\relax
+\fi
+\ifcst@phrases
+ \AtBeginDocument{
+ \providecommand{\etc}%
+ {\latin{etc}\@ifnextchar.{}{.\cst@xspace}}
+ \providecommand{\invacuo}%
+ {\latin{in vacuo}\cst@xspace}
+ \providecommand{\etal}%
+ {\latin{et~al}\@ifnextchar.{}{.\cst@xspace}}
+ \providecommand{\eg}%
+ {\latin{e.g}\cst@addpunct}
+ \providecommand{\ie}%
+ {\latin{i.e}\cst@addpunct}
+ }
\fi
-
-\providecommand{\etc}{\latin{etc}\@ifnextchar.{}{.\xspace}}
-\providecommand{\invacuo}{\latin{in vacuo}\xspace}
-\providecommand{\etal}{\latin{et~al}\@ifnextchar.{}{.\xspace}}
-\providecommand{\eg}{\latin{e.g}\@ifnextchar.{}{.\xspace}}
-\providecommand{\ie}{\latin{i.e}\@ifnextchar.{}{.\xspace}}
\newif \ifcst@notesbefore \cst@notesbeforetrue
\def\cst@name@refs#1#2#3{%
\ifcst@notesbefore
- #3\ #2\ #1%
+ #3\space#2\space#1%
\else
- #1\ #2\ #3%
+ #1\space#2\space#3%
\fi
}
\def\cst@language{english}
diff --git a/Master/texmf-dist/tex/latex/chemstyle/ic.jdf b/Master/texmf-dist/tex/latex/chemstyle/ic.jdf
index 13075c432df..92b1f683a59 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/ic.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/ic.jdf
@@ -9,10 +9,10 @@
%% chemstyle - Writing chemistry with style
%% Maintained by Joseph Wright
%% E-mail: joseph.wright@morningstar2.co.uk
-%% Released under the GNU General Public License
-%% See http://www.gnu.org/licenses/gpl.txt
+%% Released under the LaTeX Project Public License v1.3 or later
+%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
-\ProvidesFile{ic.jdf}[2007/09/04 v1.0b]
+\ProvidesFile{ic.jdf}[2007/09/18 v1.1a]
\input {jacs.jdf}
\captionsetup{textfont=rm}
\endinput
diff --git a/Master/texmf-dist/tex/latex/chemstyle/jacs.jdf b/Master/texmf-dist/tex/latex/chemstyle/jacs.jdf
index 1d895e007e3..74d2015fc65 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/jacs.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/jacs.jdf
@@ -9,10 +9,10 @@
%% chemstyle - Writing chemistry with style
%% Maintained by Joseph Wright
%% E-mail: joseph.wright@morningstar2.co.uk
-%% Released under the GNU General Public License
-%% See http://www.gnu.org/licenses/gpl.txt
+%% Released under the LaTeX Project Public License v1.3 or later
+%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
-\ProvidesFile{jacs.jdf}[2007/09/04 v1.0b]
+\ProvidesFile{jacs.jdf}[2007/09/18 v1.1a]
\RequirePackage[labelfont={bf,it,sf},textfont=sf]{caption}
\DeclareCaptionLabelSeparator{perquad}{.\quad}
\captionsetup{labelsep=perquad}
@@ -27,6 +27,7 @@
\floatstyle{plain}
\latinemphoff
\cst@notesbeforefalse
+\cst@commatrue
\endinput
%%
%% End of file `jacs.jdf'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf b/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf
index 79e25ae70b9..5a2d8de49d6 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf
@@ -9,10 +9,10 @@
%% chemstyle - Writing chemistry with style
%% Maintained by Joseph Wright
%% E-mail: joseph.wright@morningstar2.co.uk
-%% Released under the GNU General Public License
-%% See http://www.gnu.org/licenses/gpl.txt
+%% Released under the LaTeX Project Public License v1.3 or later
+%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
-\ProvidesFile{jpc.jdf}[2007/09/04 v1.0b]
+\ProvidesFile{jpc.jdf}[2007/09/18 v1.1a]
\RequirePackage[font=bf,labelsep=colon]{caption}
\DeclareCaptionFormat{labelcaps}{\MakeUppercase{#1}#2#3}
\captionsetup{format=labelcaps}
@@ -27,6 +27,7 @@
\floatstyle{plain}
\latinemphoff
\cst@notesbeforefalse
+\cst@commatrue
\endinput
%%
%% End of file `jpc.jdf'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/none.jdf b/Master/texmf-dist/tex/latex/chemstyle/none.jdf
index 0324f21c76a..bd319aa7a07 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/none.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/none.jdf
@@ -9,10 +9,10 @@
%% chemstyle - Writing chemistry with style
%% Maintained by Joseph Wright
%% E-mail: joseph.wright@morningstar2.co.uk
-%% Released under the GNU General Public License
-%% See http://www.gnu.org/licenses/gpl.txt
+%% Released under the LaTeX Project Public License v1.3 or later
+%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
-\ProvidesFile{none.jdf}[2007/09/04 v1.0b]
+\ProvidesFile{none.jdf}[2007/09/18 v1.1a]
\RequirePackage{caption}
\floatstyle{plain}
\restylefloat{table}
diff --git a/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf b/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf
index 39c4f9691a9..1d4f1fd68ad 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf
@@ -9,10 +9,10 @@
%% chemstyle - Writing chemistry with style
%% Maintained by Joseph Wright
%% E-mail: joseph.wright@morningstar2.co.uk
-%% Released under the GNU General Public License
-%% See http://www.gnu.org/licenses/gpl.txt
+%% Released under the LaTeX Project Public License v1.3 or later
+%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
-\ProvidesFile{orglett.jdf}[2007/09/04 v1.0b]
+\ProvidesFile{orglett.jdf}[2007/09/18 v1.1a]
\RequirePackage{xcolor}
\newcommand*{\OrgLettColour}{purple}
\newcommand\fs@orglett{\def\@fs@cfont{\bfseries}
@@ -45,6 +45,7 @@
\cst@prefixtrue
\latinemphoff
\cst@notesbeforefalse
+\cst@commatrue
\endinput
%%
%% End of file `orglett.jdf'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/rsc.jdf b/Master/texmf-dist/tex/latex/chemstyle/rsc.jdf
index 78505951489..4a6ab2c2cba 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/rsc.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/rsc.jdf
@@ -9,18 +9,18 @@
%% chemstyle - Writing chemistry with style
%% Maintained by Joseph Wright
%% E-mail: joseph.wright@morningstar2.co.uk
-%% Released under the GNU General Public License
-%% See http://www.gnu.org/licenses/gpl.txt
+%% Released under the LaTeX Project Public License v1.3 or later
+%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
-\ProvidesFile{rsc.jdf}[2007/09/04 v1.0b]
-\AtBeginDocument{
+\ProvidesFile{rsc.jdf}[2007/09/18 v1.1a]
+\AtBeginDocument{%
\renewcommand{\figurename}{Fig.}}
\RequirePackage[labelsep=quad,labelfont=bf]{caption}
\let\cst@emph\emph
\def\cst@hyph{-}
\let\cst@super\relax
\cst@prefixtrue
-\cst@prefixfalse
+\latinemphon
\endinput
%%
%% End of file `rsc.jdf'.