summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-11-04 19:11:29 +0000
committerKarl Berry <karl@freefriends.org>2007-11-04 19:11:29 +0000
commit66efebfdc9173de21a31bd1d7ecb7ea2cfca1f7e (patch)
tree76226ebc6f6370628e0d6b2f4d13f028a426f7ee /Master
parentedf047bb79fdc9021502961e102ef79d103c6a6e (diff)
chemstyle update (1nov07)
git-svn-id: svn://tug.org/texlive/trunk@5334 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/chemstyle/chemstyle.pdfbin240562 -> 247731 bytes
-rw-r--r--Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx90
-rw-r--r--Master/texmf-dist/source/latex/chemstyle/chemstyle.ins4
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/angew.jdf2
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty2
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/ic.jdf2
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/jacs.jdf2
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/jomc.jdf2
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/jpc.jdf2
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/none.jdf2
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/orglett.jdf2
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/rsc.jdf2
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/tetlett.jdf26
13 files changed, 108 insertions, 30 deletions
diff --git a/Master/texmf-dist/doc/latex/chemstyle/chemstyle.pdf b/Master/texmf-dist/doc/latex/chemstyle/chemstyle.pdf
index 34d0416de54..3657ad962be 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 fa620bc9023..f78c0fc6f74 100644
--- a/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
+++ b/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
@@ -21,6 +21,7 @@
% chemstyle.pdf,
% rsc.jdf,
% angew.jdf,
+% tetlett.jdf,
% jomc.jdf,
% jacs.jdf,
% ic.jdf,
@@ -91,12 +92,14 @@
}
\generate{\file{rsc.jdf}{\from{chemstyle.dtx}{rsc}}
\file{angew.jdf}{\from{chemstyle.dtx}{angew}}
+ \file{tetlett.jdf}{\from{chemstyle.dtx}{tetlett}}
\file{jomc.jdf}{\from{chemstyle.dtx}{jomc}}
\file{jacs.jdf}{\from{chemstyle.dtx}{jacs}}
\file{ic.jdf}{\from{chemstyle.dtx}{ic}}
\file{jpc.jdf}{\from{chemstyle.dtx}{jpc}}
\file{orglett.jdf}{\from{chemstyle.dtx}{orglett}}
- \file{none.jdf}{\from{chemstyle.dtx}{none}}
+}
+\generate{\file{none.jdf}{\from{chemstyle.dtx}{none}}
}
\endbatchfile
%</install>
@@ -122,7 +125,7 @@
%</driver>
% \fi
%
-%\CheckSum{645}
+%\CheckSum{658}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -250,6 +253,7 @@
% orglett & \emph{Org.~Lett.}\\
% rsc & \emph{Chem.\ Commun.}, \emph{Org.\ Biomol.\ Chem.} \\
% & \emph{Dalton Trans.} \\
+% tetlett & \emph{Tetrahedron}, \emph{Tetrahedron Lett.} \\
% \bottomrule
% \end{tabular}
% \caption{Styles provided by \texttt{chemstyle}}\label{styles}
@@ -305,7 +309,7 @@
% \cmd{\bibname} or \cmd{\refname} (as appropriate) to the form of
% words chosen by the target journal for the ``\refname'' section.
%
-% The `\refname'' naming commands are language-aware, \emph{via} the
+% The ``\refname'' naming commands are language-aware, \emph{via} the
% |babel| interface. Currently, |chemstyle| includes appropriate
% labels for babel languages |english|, |UKenglish|, |ngerman| and
% |french|.\footnote{The \texttt{french} option for \texttt{babel}
@@ -436,6 +440,29 @@
% is also needed, as it provides the floating |scheme| environment
% essential in synthetic chemistry documents.
%
+%\subsection{Captions above floats}
+% The |scheme| float type is generated using the |float| package.
+% This has the side-effect that the placement of captions for floats
+% does not depended on where the \cmd{\caption} command comes inside
+% the floating environment.\footnote{Normally this is a good thing.}
+% If you wish to alter the placement of captions, the mechanism of
+% the underlying |float| package will be needed. This requires the
+% use of \cmd{\floatstyle} to load the desired settings, followed by
+% \cmd{\restylefloat} to apply the settings. This is most usually
+% done with tables.
+%\begin{LaTeXexample}[\typesetfloatexample]
+% \begin{table}[h]
+% \caption{A caption above the float contents}
+% The float contents
+% \end{table}
+% \floatstyle{plaintop}
+% \restylefloat{table}
+% \begin{table}[h]
+% \caption{A second caption above the float contents}
+% The second float contents
+% \end{table}
+%\end{LaTeXexample}
+%
% \iffalse
%<*template>
% \fi
@@ -465,8 +492,10 @@
% \end{macrocode}
% Load |chemstyle| (of course) to give not only some easy formatting,
% but also to automatically provide a float type for schemes, thanks
-% to the |chemscheme| package. This also loads either |bpchem| or
-% (optionally) |chemcompounds| to track compound numbers.
+% to the |chemscheme| package. This also loads either
+% |chemcompounds| or (optionally) |bpchem| to track compound numbers.
+% Using the |xspace| option automatically adds space after the
+% various abbreviations.
% \begin{macrocode}
\usepackage[rsc,xspace]{chemstyle}
% \end{macrocode}
@@ -488,12 +517,13 @@
% The default LaTeX table formatting is not very good. The
% |booktabs| package does things properly, and has good
% advice in the manual. A highly-recommended package for
-% those interested in formatting (\ie all (La)TeX users!).
+% those interested in formatting (\ie\ all (La)TeX users!).
% \begin{macrocode}
\usepackage{booktabs}
% \end{macrocode}
% The |microtype| package improves formatting when used with the
-% pdfTeX engine.
+% pdfTeX engine. By giving the |final| option, it is active even
+% when using |draft| as a global option.
% \begin{macrocode}
\usepackage[final]{microtype}
% \end{macrocode}
@@ -533,7 +563,7 @@
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{chemstyle}
- [2007/10/19 v1.1g Writing chemistry with style]
+ [2007/10/31 v1.1h Writing chemistry with style]
% \end{macrocode}
%\changes{v1.1d}{2007/10/04}{Require caption in all cases}
%\changes{v1.0a}{2007/08/23}{No longer load \texttt{fixltx2e}
@@ -659,7 +689,7 @@
% \end{macrocode}
% The \cmd{\fg} macro is defined in French as a \emph{guillemet} sign,
% and so to avoid a clash a bit of patching is needed. A check to see
-% if |babel| has already defined \cmd{\fg}. If it has, the definition
+% if |babel| has already defined \cmd{\fg}\@. If it has, the definition
% is saved and deleted.
% \begin{macrocode}
\ifx\fg\@undefined
@@ -1149,7 +1179,7 @@
%\changes{v1.0b}{2007/09/04}{Fixed formatting of alkyls}
%\changes{v1.1}{2007/09/17}{Fixed (another) error in alkyl formatting}
% \begin{macrocode}
-\ProvidesFile{rsc.jdf}[2007/10/19 v1.1g]
+\ProvidesFile{rsc.jdf}[2007/10/31 v1.1h]
\AtBeginDocument{%
\renewcommand{\figurename}{Fig.}}
\captionsetup{labelsep=quad,labelfont=bf}
@@ -1169,7 +1199,7 @@
%\changes{v1.0a}{2007/08/23}{Fixed incorrect Latin formatting for
% \texttt{angew} option}
% \begin{macrocode}
-\ProvidesFile{angew.def}[2007/10/19 v1.1g]
+\ProvidesFile{angew.def}[2007/10/31 v1.1h]
\captionsetup{labelsep=period,labelfont={bf,it},font=sf,singlelinecheck=off}
\captionsetup[table]{labelsep=colon}
\let\cst@emph\emph
@@ -1187,7 +1217,7 @@
%\subsection{\emph{J.~Organomet.~Chem.}~style}
%\changes{v1.1g}{2007/10/19}{Added \texttt{jomc} style}
% \begin{macrocode}
-\ProvidesFile{jomc.def}[2007/10/19 v1.1g]
+\ProvidesFile{jomc.def}[2007/10/31 v1.1h]
\captionsetup{labelsep=period}
\captionsetup[table]{labelsep=newline,singlelinecheck=off}
\AtBeginDocument{%
@@ -1201,12 +1231,29 @@
% \end{macrocode}
% \iffalse
%</jomc>
+%<*tetlett>
+% \fi
+%
+%\subsection{\emph{Tetrahedron Lett.}~style}
+%\changes{v1.1h}{2007/10/31}{Added \texttt{tetlett} style}
+% \begin{macrocode}
+\ProvidesFile{tetlett.def}[2007/10/31 v1.1h]
+\captionsetup{labelsep=period,singlelinecheck=off,labelfont=bf}
+\let\cst@emph\emph
+\def\cst@hyph{-}
+\let\cst@super\relax
+\cst@prefixtrue
+\latinemphoff
+\cst@commatrue
+% \end{macrocode}
+% \iffalse
+%</tetlett>
%<*jacs>
% \fi
%
%\subsection{\emph{J.~Am.~Chem.~Soc.}~style}
% \begin{macrocode}
-\ProvidesFile{jacs.jdf}[2007/10/19 v1.1g]
+\ProvidesFile{jacs.jdf}[2007/10/31 v1.1h]
\DeclareCaptionLabelSeparator{perquad}{.\quad}
\captionsetup{labelfont={bf,it,sf},textfont=sf,labelsep=perquad}
\captionsetup[figure]{textfont=rm}
@@ -1231,7 +1278,7 @@
% Almost exactly the same as for \emph{J.~Am.~Chem.~Soc.}, so most of
% the work is left to |jacs.jdf|.
% \begin{macrocode}
-\ProvidesFile{ic.jdf}[2007/10/19 v1.1g]
+\ProvidesFile{ic.jdf}[2007/10/31 v1.1h]
\input {jacs.jdf}
\captionsetup{textfont=rm}
% \end{macrocode}
@@ -1243,7 +1290,7 @@
%\subsection{\emph{J.~Phys.~Chem.}~style}
%\changes{v1.0a}{2007/08/23}{Added \emph{J.~Phys.~Chem.}~style}
% \begin{macrocode}
-\ProvidesFile{jpc.jdf}[2007/10/19 v1.1g]
+\ProvidesFile{jpc.jdf}[2007/10/31 v1.1h]
\DeclareCaptionFormat{labelcaps}{\MakeUppercase{#1}#2#3}
\captionsetup{font=bf,labelsep=colon,format=labelcaps}
\captionsetup[figure]{format=plain,textfont=md,labelsep=period}
@@ -1267,7 +1314,7 @@
%\subsection{\emph{Org.~Lett.}~style}
%\changes{v1.0a}{2007/08/23}{Added \emph{Org.~Lett.}~style}
% \begin{macrocode}
-\ProvidesFile{orglett.jdf}[2007/10/19 v1.1g]
+\ProvidesFile{orglett.jdf}[2007/10/31 v1.1h]
\RequirePackage{xcolor}
% \end{macrocode}
%\begin{macro}{\OrgLettColour}
@@ -1337,13 +1384,16 @@
%\subsection{The empty style --- none}
% To allow the user to load the extra macros provided here without
% any style changes, a ``do nothing'' style is provided. It simply
-% makes sure that nothing changes compared to the LaTeX kernel.
+% makes sure that very little changes compared to the LaTeX kernel.
% This requires undoing the defaults provided above. For commands
-% where a default is needed (\eg\ the \cmd{\latin} command) the
-% style of the RSC is followed.
+% where a default is needed (\eg\ the \cmd{\latin} command) the style
+% of the RSC is followed. As the |float| package has been loaded,
+% notice that captions will be placed below floats even if the
+% \cmd{\caption} command appears above the contents of the floating
+% environment.
%
% \begin{macrocode}
-\ProvidesFile{none.jdf}[2007/10/19 v1.1g]
+\ProvidesFile{none.jdf}[2007/10/31 v1.1h]
\floatstyle{plain}
\restylefloat{table}
\labelformat{scheme}{#1}
diff --git a/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins b/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins
index c2a5f5c5877..6e2a49e598c 100644
--- a/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins
+++ b/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins
@@ -34,12 +34,14 @@
}
\generate{\file{rsc.jdf}{\from{chemstyle.dtx}{rsc}}
\file{angew.jdf}{\from{chemstyle.dtx}{angew}}
+ \file{tetlett.jdf}{\from{chemstyle.dtx}{tetlett}}
\file{jomc.jdf}{\from{chemstyle.dtx}{jomc}}
\file{jacs.jdf}{\from{chemstyle.dtx}{jacs}}
\file{ic.jdf}{\from{chemstyle.dtx}{ic}}
\file{jpc.jdf}{\from{chemstyle.dtx}{jpc}}
\file{orglett.jdf}{\from{chemstyle.dtx}{orglett}}
- \file{none.jdf}{\from{chemstyle.dtx}{none}}
+}
+\generate{\file{none.jdf}{\from{chemstyle.dtx}{none}}
}
\endbatchfile
\endinput
diff --git a/Master/texmf-dist/tex/latex/chemstyle/angew.jdf b/Master/texmf-dist/tex/latex/chemstyle/angew.jdf
index 9579f2c9805..4fa70535899 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/angew.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/angew.jdf
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\ProvidesFile{angew.def}[2007/10/19 v1.1g]
+\ProvidesFile{angew.def}[2007/10/31 v1.1h]
\captionsetup{labelsep=period,labelfont={bf,it},font=sf,singlelinecheck=off}
\captionsetup[table]{labelsep=colon}
\let\cst@emph\emph
diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
index 0e996cd8909..adeb3d60a91 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
+++ b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
@@ -15,7 +15,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{chemstyle}
- [2007/10/19 v1.1g Writing chemistry with style]
+ [2007/10/31 v1.1h Writing chemistry with style]
\RequirePackage{graphicx,varioref,caption}
\let\cst@emph\relax
\def\cst@hyph{}
diff --git a/Master/texmf-dist/tex/latex/chemstyle/ic.jdf b/Master/texmf-dist/tex/latex/chemstyle/ic.jdf
index 1972d96398e..3d0fdc361f7 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/ic.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/ic.jdf
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\ProvidesFile{ic.jdf}[2007/10/19 v1.1g]
+\ProvidesFile{ic.jdf}[2007/10/31 v1.1h]
\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 2af1f1b9933..a70a8629004 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/jacs.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/jacs.jdf
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\ProvidesFile{jacs.jdf}[2007/10/19 v1.1g]
+\ProvidesFile{jacs.jdf}[2007/10/31 v1.1h]
\DeclareCaptionLabelSeparator{perquad}{.\quad}
\captionsetup{labelfont={bf,it,sf},textfont=sf,labelsep=perquad}
\captionsetup[figure]{textfont=rm}
diff --git a/Master/texmf-dist/tex/latex/chemstyle/jomc.jdf b/Master/texmf-dist/tex/latex/chemstyle/jomc.jdf
index f358034cfc2..9985dc79340 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/jomc.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/jomc.jdf
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\ProvidesFile{jomc.def}[2007/10/19 v1.1g]
+\ProvidesFile{jomc.def}[2007/10/31 v1.1h]
\captionsetup{labelsep=period}
\captionsetup[table]{labelsep=newline,singlelinecheck=off}
\AtBeginDocument{%
diff --git a/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf b/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf
index f6f5097b20e..5d82a728a9e 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\ProvidesFile{jpc.jdf}[2007/10/19 v1.1g]
+\ProvidesFile{jpc.jdf}[2007/10/31 v1.1h]
\DeclareCaptionFormat{labelcaps}{\MakeUppercase{#1}#2#3}
\captionsetup{font=bf,labelsep=colon,format=labelcaps}
\captionsetup[figure]{format=plain,textfont=md,labelsep=period}
diff --git a/Master/texmf-dist/tex/latex/chemstyle/none.jdf b/Master/texmf-dist/tex/latex/chemstyle/none.jdf
index 0a0b810989d..97835030753 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/none.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/none.jdf
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\ProvidesFile{none.jdf}[2007/10/19 v1.1g]
+\ProvidesFile{none.jdf}[2007/10/31 v1.1h]
\floatstyle{plain}
\restylefloat{table}
\labelformat{scheme}{#1}
diff --git a/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf b/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf
index 8dd149a0547..bd315db3813 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\ProvidesFile{orglett.jdf}[2007/10/19 v1.1g]
+\ProvidesFile{orglett.jdf}[2007/10/31 v1.1h]
\RequirePackage{xcolor}
\newcommand*{\OrgLettColour}{purple}
\newcommand\fs@orglett{\def\@fs@cfont{\bfseries}
diff --git a/Master/texmf-dist/tex/latex/chemstyle/rsc.jdf b/Master/texmf-dist/tex/latex/chemstyle/rsc.jdf
index 8992099530e..aa9cd1e448f 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/rsc.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/rsc.jdf
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\ProvidesFile{rsc.jdf}[2007/10/19 v1.1g]
+\ProvidesFile{rsc.jdf}[2007/10/31 v1.1h]
\AtBeginDocument{%
\renewcommand{\figurename}{Fig.}}
\captionsetup{labelsep=quad,labelfont=bf}
diff --git a/Master/texmf-dist/tex/latex/chemstyle/tetlett.jdf b/Master/texmf-dist/tex/latex/chemstyle/tetlett.jdf
new file mode 100644
index 00000000000..f0e2fe0acb3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemstyle/tetlett.jdf
@@ -0,0 +1,26 @@
+%%
+%% This is file `tetlett.jdf',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% chemstyle.dtx (with options: `tetlett')
+%% ----------------------------------------------------------------
+%% The chemstyle package --- Writing chemistry with style
+%% Maintained by Joseph Wright
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3 or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
+%%
+\ProvidesFile{tetlett.def}[2007/10/31 v1.1h]
+\captionsetup{labelsep=period,singlelinecheck=off,labelfont=bf}
+\let\cst@emph\emph
+\def\cst@hyph{-}
+\let\cst@super\relax
+\cst@prefixtrue
+\latinemphoff
+\cst@commatrue
+\endinput
+%%
+%% End of file `tetlett.jdf'.