1 files changed, 144 insertions, 34 deletions
diff --git a/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx b/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
index 5fd549067dd..fe5208c5469 100644
--- a/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
+++ b/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
@@ -29,7 +29,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{371}
+% \CheckSum{481}
 %
 % \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
@@ -49,26 +49,30 @@
 %
 % \GetFileInfo{\jobname.sty}
 %
-% \changes{v1.0}{2006/08/06}{Initial release of package}
-
-% \DoNotIndex{\',\@ifclassloaded,\@ifnextchar,\@ifundefined}
-% \DoNotIndex{\@ifpackageloaded,\@undefined,\ ,\begin}
-% \DoNotIndex{\AtBeginDocument,\captionsetup,\csname,\CurrentOption}
-% \DoNotIndex{\DeclareCaptionLabelSeparator,\DeclareOption}
-% \DoNotIndex{\DeclareRobustCommand,\def,\documentclass,\edef}
-% \DoNotIndex{\else,\emph,\end,\endcsname,\ensuremath}
-% \DoNotIndex{\ExecuteOptions,\expandafter,\fi,\figurename}
-% \DoNotIndex{\floatcontentscentre,\floatplacement,\floatstyle}
-% \DoNotIndex{\ifx,\input,\InputIfFileExists,\labelformat}
-% \DoNotIndex{\languagename,\let,\MessageBreak,\NeedsTeXFormat}
-% \DoNotIndex{\newcommand,\newfloat,\newif,\newunit,\PackageInfo}
-% \DoNotIndex{\PackageInfo,\PackageWarning,\PassOptionsToPackage}
-% \DoNotIndex{\ProcessOptions,\providecommand,\ProvidesFile}
-% \DoNotIndex{\ProvidesPackage,\quad,\relax,\renewcommand}
-% \DoNotIndex{\RequirePackage,\restylefloat,\rotatebox}
-% \DoNotIndex{\selectlanguage,\schemename,\space,\tablename}
-% \DoNotIndex{\textsc,\textsuperscript,\unitsep,\unitsuperscript}
-% \DoNotIndex{\usepackage,\varnothing,\xspace}
+%\changes{v1.0}{2006/08/06}{Initial release of package}
+%
+%\DoNotIndex{\@fs@capt,\@fs@cfont,\@fs@iftopcapt,\@fs@mid,\@fs@post}
+%\DoNotIndex{\@fs@pre,\@ifclassloaded,\@ifnextchar,\@ifpackageloaded}
+%\DoNotIndex{\@undefined,\abovecaptionskip,\addto,\AtBeginDocument}
+%\DoNotIndex{\begin,\begingroup,\belowcaptionskip,\bfseries,\bibname}
+%\DoNotIndex{\captionsetup,\cm,\color,\csname,\CurrentOption}
+%\DoNotIndex{\DeclareCaptionFormat,\DeclareCaptionLabelSeparator}
+%\DoNotIndex{\DeclareOption,\DeclareRobustCommand,\def}
+%\DoNotIndex{\documentclass,\edef,\else,\emph,\end,\endcsname}
+%\DoNotIndex{\endgroup,\ensuremath,\ExecuteOptions,\expandafter}
+%\DoNotIndex{\femtogram,\fg,\fi,\figurename,\floatc@plain}
+%\DoNotIndex{\floatc@ruled,\floatcontentscentre,\floatplacement}
+%\DoNotIndex{\floatstyle,\hertz,\hrule,\iffalse,\iftrue,\ifx,\input}
+%\DoNotIndex{\InputIfFileExists,\kern,\labelformat,\languagename}
+%\DoNotIndex{\let,\MakeUppercase,\MessageBreak,\NeedsTeXFormat}
+%\DoNotIndex{\newcommand,\newfloat,\newif,\newunit,\PackageInfo}
+%\DoNotIndex{\PackageWarning,\PassOptionsToPackage,\ProcessOptions}
+%\DoNotIndex{\providecommand,\ProvidesFile,\ProvidesPackage,\quad}
+%\DoNotIndex{\refname,\relax\renewcommand,\RequirePackage}
+%\DoNotIndex{\restylefloat,\rotatebox,\selectlanguage,\space}
+%\DoNotIndex{\tablename,\textsc,\textsuperscript,\unitsep}
+%\DoNotIndex{\unitsuperscript,\usepackage,\varnothing,\vspace}
+%\DoNotIndex{\xspace}
 %
 % \title{\texttt{chemstyle} --- Writing chemistry with style%
 %   \thanks{This file describes version \fileversion, last revised
@@ -132,6 +136,8 @@
 %     angew & \emph{Angew.\ Chem.}, \emph{Chem.\ Eur.\ J.} \\
 %     ic & \emph{Inorg.\ Chem.} \\
 %     jacs & \emph{J.\ Am.\ Chem.\ Soc.} \\
+%     jcp & \emph{J.\ Phys.\ Chem.\ A}, \emph{J.\ Phys.\ Chem.\ B} \\
+%     orglett & \emph{Org.~Lett.}\\
 %     rsc & \emph{Chem.\ Commun.}, \emph{Org.\ Biomol.\ Chem.} \\
 %      & \emph{Dalton Trans.} \\
 %     \bottomrule
@@ -324,7 +330,7 @@
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{chemstyle}
-  [2007/08/13 v1.0 Writing chemistry with style]
+  [2007/08/23 v1.0a Writing chemistry with style]
 %    \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
@@ -341,8 +347,10 @@
 \fi
 %    \end{macrocode}
 % Now package loading can take place.
+%\changes{v1.0a}{2007/08/23}{No longer load \texttt{fixltx2e}
+%  package}
 %    \begin{macrocode}
-\RequirePackage{graphicx,amssymb,fixltx2e,varioref,xspace,unitsdef}
+\RequirePackage{graphicx,amssymb,varioref,xspace,unitsdef}
 %    \end{macrocode}
 % If \cmd{\cst@fg} exists, it is restored here, otherwise \cmd{\fg}
 % is undefined.  At the beginning of the document, \cmd{\fg} is
@@ -724,7 +732,7 @@
 % \subsection{RSC style}
 %
 %    \begin{macrocode}
-\ProvidesFile{rsc.jdf}[2007/08/13 v1.0]
+\ProvidesFile{rsc.jdf}[2007/08/23 v1.0a]
 \renewcommand{\figurename}{Fig.}
 \RequirePackage[labelsep=quad,labelfont=bf]{caption}
 \let\cst@emph\relax
@@ -737,10 +745,11 @@
 %<*angew>
 % \fi
 %
-% \subsection{\emph{Angew.~Chem.}~style}
-%
+%\subsection{\emph{Angew.~Chem.}~style}
+%\changes{v1.0a}{2007/08/23}{Fixed incorrect Latin formatting for
+%  \texttt{angew} option}
 %    \begin{macrocode}
-\ProvidesFile{cst-angew.def}[2007/08/113 v1.0]
+\ProvidesFile{cst-angew.def}[2007/08/23 v1.0a]
 \RequirePackage[labelsep=period,labelfont={bf,it},font=sf]{caption}
 \captionsetup[table]{labelsep=colon}
 \captionsetup{singlelinecheck=off}
@@ -748,6 +757,7 @@
 \def\cst@hyph{}
 \let\cst@super\relax
 \cst@prefixtrue
+\latinemphoff
 %    \end{macrocode}
 % \iffalse
 %</angew>
@@ -757,7 +767,7 @@
 % \subsection{\emph{J.~Am.~Chem.~Soc.}~style}
 %
 %    \begin{macrocode}
-\ProvidesFile{jacs.jdf}[2007/08/13 v1.0]
+\ProvidesFile{jacs.jdf}[2007/08/23 v1.0a]
 \RequirePackage[labelfont={bf,it,sf},textfont=sf]{caption}
 \DeclareCaptionLabelSeparator{perquad}{.\quad}
 \captionsetup{labelsep=perquad}
@@ -766,8 +776,12 @@
 \let\cst@emph\emph
 \def\cst@hyph{}
 \let\cst@super\textsuperscript
-\cst@prefixtrue \floatstyle{plaintop} \restylefloat{scheme}
-\floatstyle{plain} \latinemphoff \cst@notesbeforefalse
+\cst@prefixtrue
+\floatstyle{plaintop}
+\restylefloat{scheme}
+\floatstyle{plain}
+\latinemphoff
+\cst@notesbeforefalse
 %    \end{macrocode}
 % \iffalse
 %</jacs>
@@ -779,15 +793,111 @@
 % 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/08/13 v1.0]
+\ProvidesFile{ic.jdf}[2007/08/23 v1.0a]
 \input {jacs.jdf}
 \captionsetup{textfont=rm}
 %    \end{macrocode}
-% \iffalse
+%\iffalse
 %</ic>
-%<*none>
+%<*jpc>
+%\fi
+%
+%\subsection{\emph{J.~Phys.~Chem.}~style}
+%\changes{v1.0a}{2007/08/23}{Added \emph{J.~Phys.~Chem.}~style}
+%
+%    \begin{macrocode}
+\ProvidesFile{jpc.jdf}[2007/08/23 v1.0a]
+\RequirePackage[font=bf,labelsep=colon]{caption}
+\DeclareCaptionFormat{labelcaps}{\MakeUppercase{#1}#2#3}
+\captionsetup{format=labelcaps}
+\captionsetup[figure]{format=plain,textfont=md,labelsep=period}
+\captionsetup{singlelinecheck=off}
+\let\cst@emph\emph
+\def\cst@hyph{}
+\let\cst@super\textsuperscript
+\cst@prefixtrue
+\floatstyle{plaintop}
+\restylefloat{scheme}
+\floatstyle{plain}
+\latinemphoff
+\cst@notesbeforefalse
+%    \end{macrocode}
+%\iffalse
+%</jpc>
+%<*orglett>
 % \fi
 %
+% \subsection{\emph{Org.~Lett.}~style}
+%\changes{v1.0a}{2007/08/23}{Added \emph{Org.~Lett.}~style}
+%
+%    \begin{macrocode}
+\ProvidesFile{orglett.jdf}[2007/08/23 v1.0a]
+\RequirePackage{xcolor}
+%    \end{macrocode}
+%\begin{macro}{\OrgLettColour}
+% To allow the user to control the colour of the ``bars'' in this
+% style, an additional macro is provided.  The |purple| colour looks
+% about right for matching the printed journal, but if anyone has a
+% better suggestion please let the package author know.
+%    \begin{macrocode}
+\newcommand*{\OrgLettColour}{purple}
+%    \end{macrocode}
+%\end{macro}
+% In order to get the distinctive coloured bars used by
+% \emph{Org.~Lett.}, a new style for floats is needed.  This is based
+% on the |ruled| style from the |float| package.
+%    \begin{macrocode}
+\newcommand\fs@orglett{\def\@fs@cfont{\bfseries}
+  \let\@fs@capt\floatc@ruled
+  \def\@fs@pre{\begingroup\color{\OrgLettColour}
+    \hrule height12pt depth0pt \kern2pt\endgroup}%
+%    \end{macrocode}
+% This is the same \cmd{\@fs@mid} as is used in the |float| package
+% for |plaintop| floats.
+%    \begin{macrocode}
+  \def\@fs@mid{\vspace\belowcaptionskip\relax}%
+  \def\@fs@post{\begingroup\color{\OrgLettColour}\kern2pt
+    \hrule height1.5pt depth0pt\endgroup}%
+  \let\@fs@iftopcapt\iftrue}
+%    \end{macrocode}
+% Figures need to be slightly different, so an almost identical
+% command is needed.
+%    \begin{macrocode}
+\newcommand\fs@orglettfig{\def\@fs@cfont{\bfseries}
+  \let\@fs@capt\floatc@plain
+  \def\@fs@pre{\begingroup\color{\OrgLettColour}
+    \hrule height12pt depth0pt \kern2pt\endgroup}%
+  \def\@fs@mid{\vspace\abovecaptionskip\relax}%
+  \def\@fs@post{\begingroup\color{\OrgLettColour}\kern2pt
+    \hrule height1.5pt depth0pt\endgroup}%
+  \let\@fs@iftopcapt\iffalse}
+%    \end{macrocode}
+% The new style is now applied.  Users can change back to normal
+% floats by changing back to the |plain| style.
+%    \begin{macrocode}
+\floatstyle{orglettfig}
+\restylefloat{figure}
+\floatstyle{orglett}
+\restylefloat{scheme}
+\restylefloat{table}
+%    \end{macrocode}
+% The more usual style commands now occur.
+%    \begin{macrocode}
+\RequirePackage[labelfont=bf]{caption}
+\DeclareCaptionLabelSeparator{perquad}{.\quad}
+\captionsetup{labelsep=perquad}
+\let\cst@emph\emph
+\def\cst@hyph{}
+\let\cst@super\textsuperscript
+\cst@prefixtrue
+\latinemphoff
+\cst@notesbeforefalse
+%    \end{macrocode}
+% \iffalse
+%</orglett>
+%<*none>
+%\fi
+%
 % \subsection{The empty style --- none}
 %
 % To allow the user to load the extra macros provided here without
@@ -797,7 +907,7 @@
 % where a default is needed (\eg the \cmd{\latin} command) the
 % style of the RSC is followed.
 %    \begin{macrocode}
-\ProvidesFile{none.jdf}[2007/08/13 v1.0]
+\ProvidesFile{none.jdf}[2007/08/23 v1.0a]
 \RequirePackage{caption}
 \floatstyle{plain}
 \restylefloat{table}