From 36b80ceae5584c0ba76c9df60e5126632fb23176 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 13 Jun 2010 21:40:57 +0000 Subject: chemstyle update (13jun10) git-svn-id: svn://tug.org/texlive/trunk@18945 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty | 2 +- Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty | 15 +++++++++++---- .../tex/latex/chemstyle/config/angew.chemstyle.cfg | 2 +- .../tex/latex/chemstyle/config/ic.chemstyle.cfg | 2 +- .../tex/latex/chemstyle/config/jacs.chemstyle.cfg | 2 +- .../tex/latex/chemstyle/config/jomc.chemstyle.cfg | 2 +- .../tex/latex/chemstyle/config/orglett.chemstyle.cfg | 2 +- .../tex/latex/chemstyle/config/rsc.chemstyle.cfg | 2 +- .../tex/latex/chemstyle/config/tetlett.chemstyle.cfg | 2 +- 9 files changed, 19 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex/latex/chemstyle') diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty b/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty index 26a20d39b22..a86d2204f96 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty +++ b/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty @@ -14,7 +14,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{chemscheme} - [2010/04/13 v2.0h Schemes for chemistry] + [2010/06/06 v2.0i Schemes for chemistry] \RequirePackage{kvoptions,psfrag} \SetupKeyvalOptions{ family=cst, diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty index b810230c4a3..70db3750fdb 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty +++ b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty @@ -14,7 +14,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{chemstyle} - [2010/04/13 v2.0h Schemes and style for chemistry] + [2010/06/06 v2.0i Schemes and style for chemistry] \RequirePackage{amstext,caption,chemscheme,xspace} \SetupKeyvalOptions{ family=cst, @@ -108,14 +108,12 @@ \expandafter\xspace \fi } -\@ifpackageloaded{siunitx}{ - \requiresiconfigs{synchem} +\@ifpackageloaded{siunitx}{% }{% \@ifpackageloaded{SIunits}{}{% \@ifpackageloaded{unitsdef}{}{% \IfFileExists{siunitx.sty}{% \RequirePackage{siunitx} - \AtBeginDocument{\requiresiconfigs{synchem}}% }{% \IfFileExists{SIunits.sty}{% \RequirePackage{SIunits} @@ -129,6 +127,15 @@ } } } +\@ifpackageloaded{siunitx}{% + \sisetup{load-configurations = abbreviations} + \DeclareSIUnit\cubiccentimeter{\cubic\centi\metre} + \DeclareSIUnit\cmc{\cubic\centi\metre} + \DeclareSIUnit\molar{\mole\per\cubic\deci\metre} + \DeclareSIUnit\Molar{\textsc{m}} + \DeclareSIUnit\torr{torr} + \sisetup{load-configurations = abbreviations} +}{} \@ifpackageloaded{SIunits}{% \newcommand*\cubiccentimeter{\centi\metre\cubed} \newcommand*\Molar{\textsc{m}} diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/angew.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/angew.chemstyle.cfg index f1b0e8e558f..1ed1e3c48ae 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/config/angew.chemstyle.cfg +++ b/Master/texmf-dist/tex/latex/chemstyle/config/angew.chemstyle.cfg @@ -13,7 +13,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{angew.chemstyle.cfg} - [2010/04/13 v2.0h Angew. Chem. journal style] + [2010/06/06 v2.0i Angew. Chem. journal style] \setkeys{cst}{ abbremph = false, radhyphen = false diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/ic.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/ic.chemstyle.cfg index f47074c57d6..59cc73909bd 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/config/ic.chemstyle.cfg +++ b/Master/texmf-dist/tex/latex/chemstyle/config/ic.chemstyle.cfg @@ -13,7 +13,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{ic.chemstyle.cfg} - [2010/04/13 v2.0h Inorg. Chem. journal style] + [2010/06/06 v2.0i Inorg. Chem. journal style] \DeclareCaptionLabelSeparator{perquad}{.\quad} \captionsetup{ labelfont = {bf,it,sf}, diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/jacs.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/jacs.chemstyle.cfg index 82d6bba79b1..4d2d192f5f6 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/config/jacs.chemstyle.cfg +++ b/Master/texmf-dist/tex/latex/chemstyle/config/jacs.chemstyle.cfg @@ -13,7 +13,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{jacs.chemstyle.cfg} - [2010/04/13 v2.0h J. Am. Chem. Soc. journal style] + [2010/06/06 v2.0i J. Am. Chem. Soc. journal style] \DeclareCaptionLabelSeparator{perquad}{.\quad} \captionsetup{ labelfont = {bf,it,sf}, diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/jomc.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/jomc.chemstyle.cfg index 46685f83569..0fb255e5024 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/config/jomc.chemstyle.cfg +++ b/Master/texmf-dist/tex/latex/chemstyle/config/jomc.chemstyle.cfg @@ -13,7 +13,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{jomc.chemstyle.cfg} - [2010/04/13 v2.0h J. Organomet. Chem. journal style] + [2010/06/06 v2.0i J. Organomet. Chem. journal style] \setkeys{cst}{ abbremph = false, radhyphen = true, diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/orglett.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/orglett.chemstyle.cfg index 2917a1d130b..2343bd911b6 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/config/orglett.chemstyle.cfg +++ b/Master/texmf-dist/tex/latex/chemstyle/config/orglett.chemstyle.cfg @@ -13,7 +13,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{orglett.chemstyle.cfg} - [2010/04/13 v2.0h Org. Lett. journal style] + [2010/06/06 v2.0i Org. Lett. journal style] \DeclareCaptionLabelSeparator{perquad}{.\quad} \captionsetup{ labelfont = bf, diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/rsc.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/rsc.chemstyle.cfg index e4f3e850935..d4d9b0011c7 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/config/rsc.chemstyle.cfg +++ b/Master/texmf-dist/tex/latex/chemstyle/config/rsc.chemstyle.cfg @@ -13,7 +13,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{rsc.chemstyle.cfg} - [2010/04/13 v2.0h RSC journal style] + [2010/06/06 v2.0i RSC journal style] \captionsetup{ labelsep = quad, labelfont = bf diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/tetlett.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/tetlett.chemstyle.cfg index fa5a820013a..3d1055a51a0 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/config/tetlett.chemstyle.cfg +++ b/Master/texmf-dist/tex/latex/chemstyle/config/tetlett.chemstyle.cfg @@ -13,7 +13,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{tetlett.chemstyle.cfg} - [2010/04/13 v2.0h Tetrahedron Lett. journal style] + [2010/06/06 v2.0i Tetrahedron Lett. journal style] \captionsetup{ labelsep = period, labelfont = bf, -- cgit v1.2.3