summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-11-19 01:21:22 +0000
committerKarl Berry <karl@freefriends.org>2009-11-19 01:21:22 +0000
commit01d93d3639c9411877c1fcb7034fa3d4d36e3afe (patch)
tree9f920abc7e314b37e0716774796c69df3abdf88b
parent645b78066f77342d312a8ecd43069de9e4cfc031 (diff)
chemstyle update (18nov09)
git-svn-id: svn://tug.org/texlive/trunk@16070 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/chemstyle/chemscheme.cdx (renamed from Master/texmf-dist/source/latex/chemstyle/chemscheme.cdx)bin6093 -> 6093 bytes
-rw-r--r--Master/texmf-dist/doc/latex/chemstyle/chemstyle-demo.tex11
-rw-r--r--Master/texmf-dist/doc/latex/chemstyle/chemstyle.pdfbin302977 -> 334829 bytes
-rw-r--r--Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx44
-rw-r--r--Master/texmf-dist/source/latex/chemstyle/chemstyle.ins2
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty5
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty6
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/config/angew.chemstyle.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/config/ic.chemstyle.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/config/jacs.chemstyle.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/config/jomc.chemstyle.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/config/orglett.chemstyle.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/config/rsc.chemstyle.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/config/tetlett.chemstyle.cfg3
14 files changed, 52 insertions, 37 deletions
diff --git a/Master/texmf-dist/source/latex/chemstyle/chemscheme.cdx b/Master/texmf-dist/doc/latex/chemstyle/chemscheme.cdx
index 801f3037d6f..801f3037d6f 100644
--- a/Master/texmf-dist/source/latex/chemstyle/chemscheme.cdx
+++ b/Master/texmf-dist/doc/latex/chemstyle/chemscheme.cdx
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemstyle/chemstyle-demo.tex b/Master/texmf-dist/doc/latex/chemstyle/chemstyle-demo.tex
deleted file mode 100644
index c40223711e5..00000000000
--- a/Master/texmf-dist/doc/latex/chemstyle/chemstyle-demo.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\documentclass[a4paper]{article}
-\usepackage[T1]{fontenc} % Modern font encoding
-\usepackage[runs=2]{auto-pst-pdf} % Use EPS graphics with pdfLaTeX
-\usepackage{booktabs} % Better table layouts
-\usepackage[journal=rsc]{chemstyle} % Of course!
-\usepackage{geometry} % Easy page laout
-\usepackage{lmodern} % Use Latin Modern fonts
-\usepackage[version=3]{mhchem} % Formula subscripts using \ce{}
-\begin{document}
-\end{document}
-
diff --git a/Master/texmf-dist/doc/latex/chemstyle/chemstyle.pdf b/Master/texmf-dist/doc/latex/chemstyle/chemstyle.pdf
index 6f40d215ecb..f4301ba1725 100644
--- a/Master/texmf-dist/doc/latex/chemstyle/chemstyle.pdf
+++ b/Master/texmf-dist/doc/latex/chemstyle/chemstyle.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx b/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
index bf700c99c44..ec9684fd4c0 100644
--- a/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
+++ b/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
@@ -1,6 +1,5 @@
% \iffalse meta-comment
% !TEX program = pdflatex
-% !TEX encoding = ISO-8859-1
%<*internal>
\iffalse
%</internal>
@@ -70,6 +69,7 @@ This work consists of the file chemstyle.dtx and
chemstyle.ins,
chemstyle.sty,
chemscheme.sty,
+ and a number of .cfg files.
\endpostamble
\usedir{tex/latex/chemstyle}
@@ -119,7 +119,15 @@ This work consists of the file chemstyle.dtx and
\usepackage[final]{listings,microtype}
\usepackage[osf]{mathpazo}
\usepackage[version=3]{mhchem}
-\usepackage[crop=off,ext=dtx,final,runs=2]{auto-pst-pdf}
+\IfFileExists{auto-pst-pdf.sty}{
+ \usepackage[crop=off,ext=dtx,final,runs=2]{auto-pst-pdf}
+}{
+ \PackageWarning{chemstyle}{%
+ No auto-pst-pdf found:\MessageBreak
+ Compile documentation with latex \MessageBreak
+ (and not pdflatex)%
+ }
+}
\usepackage[numbered]{hypdoc}
\EnableCrossrefs
\CodelineIndex
@@ -987,7 +995,7 @@ This work consists of the file chemstyle.dtx and
% \begin{macrocode}
%<*package>
\ProvidesPackage{chemstyle}
- [2009/08/23 v2.0a Schemes and style for chemistry]
+ [2009/11/18 v2.0c Schemes and style for chemistry]
\RequirePackage{amstext,caption,chemscheme,xspace}
\SetupKeyvalOptions{
family=cst,
@@ -1161,7 +1169,8 @@ This work consists of the file chemstyle.dtx and
\@ifpackageloaded{SIunits}{}{%
\@ifpackageloaded{unitsdef}{}{%
\IfFileExists{siunitx.sty}{%
- \RequirePackage[alsoload=synchem]{siunitx}
+ \RequirePackage{siunitx}
+ \requiresiconfigs{synchem}
}{%
\IfFileExists{SIunits.sty}{%
\RequirePackage{SIunits}
@@ -1765,7 +1774,7 @@ This work consists of the file chemstyle.dtx and
% \begin{macrocode}
%<*chemscheme>
\ProvidesPackage{chemscheme}
- [2009/08/23 v2.0a Schemes for chemistry]
+ [2009/11/18 v2.0c Schemes for chemistry]
\RequirePackage{kvoptions,psfrag}
\SetupKeyvalOptions{
family=cst,
@@ -2038,7 +2047,12 @@ This work consists of the file chemstyle.dtx and
}%
}%
}
-\ifx\cst@float@pkg\cst@opt@memoir\else
+% \end{macrocode}
+%\changes{v2.0b}{2009/10/26}{logic for undefining \cs{newfloat}
+% corrected}
+% If \pkg{memoir} is in use, delete the \cs{newfloat} macro.
+% \begin{macrocode}
+\ifx\cst@float@pkg\cst@opt@memoir
\let\newfloat\@undefined
\fi
\@ifpackageloaded{chemstyle}{}{%
@@ -2249,7 +2263,7 @@ This work consists of the file chemstyle.dtx and
% \begin{macrocode}
%<*angew>
\ProvidesFile{angew.chemstyle.cfg}
- [2009/08/23 v2.0a Angew. Chem. journal style]
+ [2009/11/18 v2.0c Angew. Chem. journal style]
\setkeys{cst}{
abbremph = false,
radhyphen = false
@@ -2271,7 +2285,7 @@ This work consists of the file chemstyle.dtx and
% \begin{macrocode}
%<*ic>
\ProvidesFile{ic.chemstyle.cfg}
- [2009/08/23 v2.0a Inorg. Chem. journal style]
+ [2009/11/18 v2.0c Inorg. Chem. journal style]
\DeclareCaptionLabelSeparator{perquad}{.\quad}
\captionsetup{
labelfont = {bf,it,sf},
@@ -2304,7 +2318,7 @@ This work consists of the file chemstyle.dtx and
% \begin{macrocode}
%<*jacs>
\ProvidesFile{jacs.chemstyle.cfg}
- [2009/08/23 v2.0a J. Am. Chem. Soc. journal style]
+ [2009/11/18 v2.0c J. Am. Chem. Soc. journal style]
\DeclareCaptionLabelSeparator{perquad}{.\quad}
\captionsetup{
labelfont = {bf,it,sf},
@@ -2337,7 +2351,7 @@ This work consists of the file chemstyle.dtx and
% \begin{macrocode}
%<*jomc>
\ProvidesFile{jomc.chemstyle.cfg}
- [2009/08/23 v2.0a J. Organomet. Chem. journal style]
+ [2009/11/18 v2.0c J. Organomet. Chem. journal style]
\setkeys{cst}{
abbremph = false,
radhyphen = true,
@@ -2361,7 +2375,7 @@ This work consists of the file chemstyle.dtx and
% \begin{macrocode}
%<*jpc>
\ProvidesFile{jpc.chemstyle.cfg}
- [2009/08/23 v2.0a J. Phys. Chem. journal style]
+ [2009/11/18 v2.0c J. Phys. Chem. journal style]
\DeclareCaptionFormat{labelcaps}{\MakeUppercase{#1}#2#3}
\captionsetup{
font = bf,
@@ -2395,7 +2409,7 @@ This work consists of the file chemstyle.dtx and
% \begin{macrocode}
%<*orglett>
\ProvidesFile{orglett.chemstyle.cfg}
- [2009/08/23 v2.0a Org. Lett. journal style]
+ [2009/11/18 v2.0c Org. Lett. journal style]
\DeclareCaptionLabelSeparator{perquad}{.\quad}
\captionsetup{
labelfont = bf,
@@ -2519,7 +2533,7 @@ This work consists of the file chemstyle.dtx and
% \begin{macrocode}
%<*rsc>
\ProvidesFile{rsc.chemstyle.cfg}
- [2009/08/23 v2.0a RSC journal style]
+ [2009/11/18 v2.0c RSC journal style]
\captionsetup{
labelsep = quad,
labelfont = bf
@@ -2535,7 +2549,7 @@ This work consists of the file chemstyle.dtx and
% \begin{macrocode}
%<*tetlett>
\ProvidesFile{tetlett.chemstyle.cfg}
- [2009/08/23 v2.0a Tetrahedron Lett. journal style]
+ [2009/11/18 v2.0c Tetrahedron Lett. journal style]
\captionsetup{
labelsep = period,
labelfont = bf,
@@ -2565,7 +2579,7 @@ This work consists of the file chemstyle.dtx and
%%EndComments
%%BeginProcSet: chemdict30 24 13
% ChemDraw Laser Prep
-% Copyright © 1985-2005 CambridgeSoft Corp., All Rights Reserved
+% Copyright � 1985-2005 CambridgeSoft Corp., All Rights Reserved
userdict/chemdict30 210 dict put
chemdict30 begin/version 24 def/sv 13 def
/b{bind def}bind def/L{load def}b/R{null def}b/d/def L/a/add L/al/aload L
diff --git a/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins b/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins
index 158c38b3976..89766404fa0 100644
--- a/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins
+++ b/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins
@@ -45,6 +45,7 @@ This work consists of the file chemstyle.dtx and
chemstyle.ins,
chemstyle.sty,
chemscheme.sty,
+ and a number of .cfg files.
\endpostamble
\usedir{tex/latex/chemstyle}
@@ -84,6 +85,7 @@ This work consists of the file chemstyle.dtx and
%% chemstyle.ins,
%% chemstyle.sty,
%% chemscheme.sty,
+%% and a number of .cfg files.
%%
%%
%% End of file `chemstyle.ins'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty b/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty
index 4b2103be04c..a9504b17fd1 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}
- [2009/08/23 v2.0a Schemes for chemistry]
+ [2009/11/18 v2.0c Schemes for chemistry]
\RequirePackage{kvoptions,psfrag}
\SetupKeyvalOptions{
family=cst,
@@ -196,7 +196,7 @@
}%
}%
}
-\ifx\cst@float@pkg\cst@opt@memoir\else
+\ifx\cst@float@pkg\cst@opt@memoir
\let\newfloat\@undefined
\fi
\@ifpackageloaded{chemstyle}{}{%
@@ -322,6 +322,7 @@
%% chemstyle.ins,
%% chemstyle.sty,
%% chemscheme.sty,
+%% and a number of .cfg files.
%%
%%
%% End of file `chemscheme.sty'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
index f8d2999cd85..3bf0672e441 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}
- [2009/08/23 v2.0a Schemes and style for chemistry]
+ [2009/11/18 v2.0c Schemes and style for chemistry]
\RequirePackage{amstext,caption,chemscheme,xspace}
\SetupKeyvalOptions{
family=cst,
@@ -103,7 +103,8 @@
\@ifpackageloaded{SIunits}{}{%
\@ifpackageloaded{unitsdef}{}{%
\IfFileExists{siunitx.sty}{%
- \RequirePackage[alsoload=synchem]{siunitx}
+ \RequirePackage{siunitx}
+ \requiresiconfigs{synchem}
}{%
\IfFileExists{SIunits.sty}{%
\RequirePackage{SIunits}
@@ -481,6 +482,7 @@
%% chemstyle.ins,
%% chemstyle.sty,
%% chemscheme.sty,
+%% and a number of .cfg files.
%%
%%
%% End of file `chemstyle.sty'.
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 4934a660409..71d410c74d7 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}
- [2009/08/23 v2.0a Angew. Chem. journal style]
+ [2009/11/18 v2.0c Angew. Chem. journal style]
\setkeys{cst}{
abbremph = false,
radhyphen = false
@@ -48,6 +48,7 @@
%% chemstyle.ins,
%% chemstyle.sty,
%% chemscheme.sty,
+%% and a number of .cfg files.
%%
%%
%% End of file `angew.chemstyle.cfg'.
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 1bfc131f7af..bacacc17089 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}
- [2009/08/23 v2.0a Inorg. Chem. journal style]
+ [2009/11/18 v2.0c Inorg. Chem. journal style]
\DeclareCaptionLabelSeparator{perquad}{.\quad}
\captionsetup{
labelfont = {bf,it,sf},
@@ -59,6 +59,7 @@
%% chemstyle.ins,
%% chemstyle.sty,
%% chemscheme.sty,
+%% and a number of .cfg files.
%%
%%
%% End of file `ic.chemstyle.cfg'.
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 0c2d40f84ac..43ed6b129d0 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}
- [2009/08/23 v2.0a J. Am. Chem. Soc. journal style]
+ [2009/11/18 v2.0c J. Am. Chem. Soc. journal style]
\DeclareCaptionLabelSeparator{perquad}{.\quad}
\captionsetup{
labelfont = {bf,it,sf},
@@ -59,6 +59,7 @@
%% chemstyle.ins,
%% chemstyle.sty,
%% chemscheme.sty,
+%% and a number of .cfg files.
%%
%%
%% End of file `jacs.chemstyle.cfg'.
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 8072fcf193d..23de7b46408 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}
- [2009/08/23 v2.0a J. Organomet. Chem. journal style]
+ [2009/11/18 v2.0c J. Organomet. Chem. journal style]
\setkeys{cst}{
abbremph = false,
radhyphen = true,
@@ -50,6 +50,7 @@
%% chemstyle.ins,
%% chemstyle.sty,
%% chemscheme.sty,
+%% and a number of .cfg files.
%%
%%
%% End of file `jomc.chemstyle.cfg'.
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 5270d89f26d..df8123011d7 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}
- [2009/08/23 v2.0a Org. Lett. journal style]
+ [2009/11/18 v2.0c Org. Lett. journal style]
\DeclareCaptionLabelSeparator{perquad}{.\quad}
\captionsetup{
labelfont = bf,
@@ -131,6 +131,7 @@
%% chemstyle.ins,
%% chemstyle.sty,
%% chemscheme.sty,
+%% and a number of .cfg files.
%%
%%
%% End of file `orglett.chemstyle.cfg'.
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 29ef60e86c2..50b81bc4a3c 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}
- [2009/08/23 v2.0a RSC journal style]
+ [2009/11/18 v2.0c RSC journal style]
\captionsetup{
labelsep = quad,
labelfont = bf
@@ -42,6 +42,7 @@
%% chemstyle.ins,
%% chemstyle.sty,
%% chemscheme.sty,
+%% and a number of .cfg files.
%%
%%
%% End of file `rsc.chemstyle.cfg'.
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 066cb6dc9fe..cafc22d14d8 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}
- [2009/08/23 v2.0a Tetrahedron Lett. journal style]
+ [2009/11/18 v2.0c Tetrahedron Lett. journal style]
\captionsetup{
labelsep = period,
labelfont = bf,
@@ -44,6 +44,7 @@
%% chemstyle.ins,
%% chemstyle.sty,
%% chemscheme.sty,
+%% and a number of .cfg files.
%%
%%
%% End of file `tetlett.chemstyle.cfg'.