chemstyle update (5sep07)

git-svn-id: svn://tug.org/texlive/trunk@4900 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 82 insertions, 40 deletions

diff --git a/Master/texmf-dist/doc/latex/chemstyle/chemstyle.pdf b/Master/texmf-dist/doc/latex/chemstyle/chemstyle.pdf
index 698ab8a7f48..eb9009301b6 100644
--- a/Master/texmf-dist/doc/latex/chemstyle/chemstyle.pdf
+++ b/Master/texmf-dist/doc/latex/chemstyle/chemstyle.pdf
diff --git a/Master/texmf-dist/doc/latex/chemstyle/template.tex b/Master/texmf-dist/doc/latex/chemstyle/template.tex
index c8933ef018f..f05346886c4 100644
--- a/Master/texmf-dist/doc/latex/chemstyle/template.tex
+++ b/Master/texmf-dist/doc/latex/chemstyle/template.tex
@@ -13,11 +13,15 @@
 %%  See http://www.gnu.org/licenses/gpl.txt
 %%  ----------------------------------------------------------------
 \documentclass[fontsize=10pt,paper=a4]{scrreprt}
+\usepackage{geometry}
 \usepackage[english,UKenglish]{babel}
 \usepackage[rsc]{chemstyle}
 \usepackage[version=3]{mhchem}
 \usepackage{upgreek}
 \usepackage{booktabs}
+\usepackage[final]{microtype}
+\usepackage[footnotes]{notes2bib}
+\usepackage[colorlinks]{hyperref}
 \begin{document}
 \end{document}
 \endinput
diff --git a/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx b/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
index fe5208c5469..7a151502327 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{481}
+% \CheckSum{485}
 %
 % \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
@@ -50,6 +50,8 @@
 % \GetFileInfo{\jobname.sty}
 %
 %\changes{v1.0}{2006/08/06}{Initial release of package}
+%\changes{v1.0b}{2007/09/04}{Added |microtype| and |notes2bib| to
+%  template}
 %
 %\DoNotIndex{\@fs@capt,\@fs@cfont,\@fs@iftopcapt,\@fs@mid,\@fs@post}
 %\DoNotIndex{\@fs@pre,\@ifclassloaded,\@ifnextchar,\@ifpackageloaded}
@@ -262,6 +264,11 @@
 %    \begin{macrocode}
 \documentclass[fontsize=10pt,paper=a4]{scrreprt}
 %    \end{macrocode}
+% The |geometry| package allows the sers to alter page layout
+% with ease; much better than trying to hack the raw LaTeX system.
+%    \begin{macrocode}
+\usepackage{geometry}
+%    \end{macrocode}
 % The |babel| system is loaded to sort out hyphenation and so on,
 % and could be useful if there are any foreign-language quotes.
 %    \begin{macrocode}
@@ -296,6 +303,24 @@
 %    \begin{macrocode}
 \usepackage{booktabs}
 %    \end{macrocode}
+% The |microtype| package improves formatting when used with the
+% pdfTeX engine.
+%    \begin{macrocode}
+\usepackage[final]{microtype}
+%    \end{macrocode}
+% Using |notes2bib| allows the user to automatically add notes to the
+% bibliography from within the document body.  So you can put
+% |\bibnote{A note}| in the source, and this will move into the
+% References section without any further effort.  The |footnotes|
+% option means that footnotes do the same.
+%    \begin{macrocode}
+\usepackage[footnotes]{notes2bib}
+%    \end{macrocode}
+% Finally, the |hyperref| package makes headings, citations and so on into
+% hyperlinks.
+%    \begin{macrocode}
+\usepackage[colorlinks]{hyperref}
+%    \end{macrocode}
 % The bulk of the document can then start.
 %    \begin{macrocode}
 \begin{document}
@@ -330,7 +355,7 @@
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{chemstyle}
-  [2007/08/23 v1.0a Writing chemistry with style]
+  [2007/09/04 v1.0b 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
@@ -370,14 +395,16 @@
 }
 %    \end{macrocode}
 %
-% \subsection{Extra units and related commands}
+%\subsection{Extra units and related commands}
 %
-% \begin{macro}{\cubiccentimeter}
-% \begin{macro}{\cmc}
-% \begin{macro}{\Hz}
-% \begin{macro}{\Molar}
-% \begin{macro}{\molar}
-% \begin{macro}{\mmHg}
+%\begin{macro}{\cubiccentimeter}
+%\begin{macro}{\cmc}
+%\begin{macro}{\Hz}
+%\begin{macro}{\Molar}
+%\begin{macro}{\molar}
+%\begin{macro}{\mmHg}
+%\begin{macro}{\mol}
+%\changes{v1.0b}{2007/09/04}{New macro}
 % A few additional unit types are provides, which the |unitsdef|
 % package omits for some reason.  These do not change with different
 % journal styles, and so are declared directly.
@@ -388,14 +415,16 @@
 \newunit{\Molar}{\textsc{m}}
 \newunit{\molar}{\mole\unitsep\dm\unitsuperscript{--3}}
 \newunit{\mmHg}{mm\unitsep{}Hg}
+\newunit{\mol}{mol}
 %    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{\standardstate}
+%\end{macro}
+%\end{macro}
+%\end{macro}
+%\end{macro}
+%\end{macro}
+%\end{macro}
+%\end{macro}
+%\begin{macro}{\standardstate}
 % In a very similar vein, the ``standard state'' symbol is handy. This
 % is produced by rotating a symbol from the \textsc{ams} symbol set.
 % Note that the rotation angle here has been carefully checked, but
@@ -730,14 +759,20 @@
 % \fi
 %
 % \subsection{RSC style}
-%
+%\changes{v1.0b}{2007/09/04}{Fixed formatting of alkyls}
 %    \begin{macrocode}
-\ProvidesFile{rsc.jdf}[2007/08/23 v1.0a]
-\renewcommand{\figurename}{Fig.}
+\ProvidesFile{rsc.jdf}[2007/09/04 v1.0b]
+%    \end{macrocode}
+%\changes{v1.0b}{2007/09/04}{Sorted a problem with \texttt{babel}
+% and figure name format}
+%    \begin{macrocode}
+\AtBeginDocument{
+  \renewcommand{\figurename}{Fig.}}
 \RequirePackage[labelsep=quad,labelfont=bf]{caption}
-\let\cst@emph\relax
-\def\cst@hyph{}
-\let\cst@super\textsuperscript
+\let\cst@emph\emph
+\def\cst@hyph{-}
+\let\cst@super\relax
+\cst@prefixtrue
 \cst@prefixfalse
 %    \end{macrocode}
 % \iffalse
@@ -749,7 +784,7 @@
 %\changes{v1.0a}{2007/08/23}{Fixed incorrect Latin formatting for
 %  \texttt{angew} option}
 %    \begin{macrocode}
-\ProvidesFile{cst-angew.def}[2007/08/23 v1.0a]
+\ProvidesFile{cst-angew.def}[2007/09/04 v1.0b]
 \RequirePackage[labelsep=period,labelfont={bf,it},font=sf]{caption}
 \captionsetup[table]{labelsep=colon}
 \captionsetup{singlelinecheck=off}
@@ -767,7 +802,7 @@
 % \subsection{\emph{J.~Am.~Chem.~Soc.}~style}
 %
 %    \begin{macrocode}
-\ProvidesFile{jacs.jdf}[2007/08/23 v1.0a]
+\ProvidesFile{jacs.jdf}[2007/09/04 v1.0b]
 \RequirePackage[labelfont={bf,it,sf},textfont=sf]{caption}
 \DeclareCaptionLabelSeparator{perquad}{.\quad}
 \captionsetup{labelsep=perquad}
@@ -793,7 +828,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/08/23 v1.0a]
+\ProvidesFile{ic.jdf}[2007/09/04 v1.0b]
 \input {jacs.jdf}
 \captionsetup{textfont=rm}
 %    \end{macrocode}
@@ -806,7 +841,7 @@
 %\changes{v1.0a}{2007/08/23}{Added \emph{J.~Phys.~Chem.}~style}
 %
 %    \begin{macrocode}
-\ProvidesFile{jpc.jdf}[2007/08/23 v1.0a]
+\ProvidesFile{jpc.jdf}[2007/09/04 v1.0b]
 \RequirePackage[font=bf,labelsep=colon]{caption}
 \DeclareCaptionFormat{labelcaps}{\MakeUppercase{#1}#2#3}
 \captionsetup{format=labelcaps}
@@ -831,7 +866,7 @@
 %\changes{v1.0a}{2007/08/23}{Added \emph{Org.~Lett.}~style}
 %
 %    \begin{macrocode}
-\ProvidesFile{orglett.jdf}[2007/08/23 v1.0a]
+\ProvidesFile{orglett.jdf}[2007/09/04 v1.0b]
 \RequirePackage{xcolor}
 %    \end{macrocode}
 %\begin{macro}{\OrgLettColour}
@@ -907,7 +942,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/23 v1.0a]
+\ProvidesFile{none.jdf}[2007/09/04 v1.0b]
 \RequirePackage{caption}
 \floatstyle{plain}
 \restylefloat{table}
diff --git a/Master/texmf-dist/tex/latex/chemstyle/angew.jdf b/Master/texmf-dist/tex/latex/chemstyle/angew.jdf
index 99a3550d440..e184e5c1542 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/angew.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/angew.jdf
@@ -12,7 +12,7 @@
 %%  Released under the GNU General Public License
 %%  See http://www.gnu.org/licenses/gpl.txt
 %%  ----------------------------------------------------------------
-\ProvidesFile{cst-angew.def}[2007/08/23 v1.0a]
+\ProvidesFile{cst-angew.def}[2007/09/04 v1.0b]
 \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 2c3bdce5ea9..ad1059ee255 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}
-  [2007/08/23 v1.0a Writing chemistry with style]
+  [2007/09/04 v1.0b Writing chemistry with style]
 \ifx\fg\@undefined
 \else
   \ifx\fg\relax
@@ -40,6 +40,7 @@
 \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}}}}
diff --git a/Master/texmf-dist/tex/latex/chemstyle/ic.jdf b/Master/texmf-dist/tex/latex/chemstyle/ic.jdf
index cf77e50a6b8..13075c432df 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/ic.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/ic.jdf
@@ -12,7 +12,7 @@
 %%  Released under the GNU General Public License
 %%  See http://www.gnu.org/licenses/gpl.txt
 %%  ----------------------------------------------------------------
-\ProvidesFile{ic.jdf}[2007/08/23 v1.0a]
+\ProvidesFile{ic.jdf}[2007/09/04 v1.0b]
 \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 a6b80e57f4b..1d895e007e3 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/jacs.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/jacs.jdf
@@ -12,7 +12,7 @@
 %%  Released under the GNU General Public License
 %%  See http://www.gnu.org/licenses/gpl.txt
 %%  ----------------------------------------------------------------
-\ProvidesFile{jacs.jdf}[2007/08/23 v1.0a]
+\ProvidesFile{jacs.jdf}[2007/09/04 v1.0b]
 \RequirePackage[labelfont={bf,it,sf},textfont=sf]{caption}
 \DeclareCaptionLabelSeparator{perquad}{.\quad}
 \captionsetup{labelsep=perquad}
diff --git a/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf b/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf
index 52f358a8180..79e25ae70b9 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf
@@ -12,7 +12,7 @@
 %%  Released under the GNU General Public License
 %%  See http://www.gnu.org/licenses/gpl.txt
 %%  ----------------------------------------------------------------
-\ProvidesFile{jpc.jdf}[2007/08/23 v1.0a]
+\ProvidesFile{jpc.jdf}[2007/09/04 v1.0b]
 \RequirePackage[font=bf,labelsep=colon]{caption}
 \DeclareCaptionFormat{labelcaps}{\MakeUppercase{#1}#2#3}
 \captionsetup{format=labelcaps}
diff --git a/Master/texmf-dist/tex/latex/chemstyle/none.jdf b/Master/texmf-dist/tex/latex/chemstyle/none.jdf
index 7247fbd358c..0324f21c76a 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/none.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/none.jdf
@@ -12,7 +12,7 @@
 %%  Released under the GNU General Public License
 %%  See http://www.gnu.org/licenses/gpl.txt
 %%  ----------------------------------------------------------------
-\ProvidesFile{none.jdf}[2007/08/23 v1.0a]
+\ProvidesFile{none.jdf}[2007/09/04 v1.0b]
 \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 796959e8185..39c4f9691a9 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf
@@ -12,7 +12,7 @@
 %%  Released under the GNU General Public License
 %%  See http://www.gnu.org/licenses/gpl.txt
 %%  ----------------------------------------------------------------
-\ProvidesFile{orglett.jdf}[2007/08/23 v1.0a]
+\ProvidesFile{orglett.jdf}[2007/09/04 v1.0b]
 \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 acfaf1fcc01..78505951489 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/rsc.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/rsc.jdf
@@ -12,12 +12,14 @@
 %%  Released under the GNU General Public License
 %%  See http://www.gnu.org/licenses/gpl.txt
 %%  ----------------------------------------------------------------
-\ProvidesFile{rsc.jdf}[2007/08/23 v1.0a]
-\renewcommand{\figurename}{Fig.}
+\ProvidesFile{rsc.jdf}[2007/09/04 v1.0b]
+\AtBeginDocument{
+  \renewcommand{\figurename}{Fig.}}
 \RequirePackage[labelsep=quad,labelfont=bf]{caption}
-\let\cst@emph\relax
-\def\cst@hyph{}
-\let\cst@super\textsuperscript
+\let\cst@emph\emph
+\def\cst@hyph{-}
+\let\cst@super\relax
+\cst@prefixtrue
 \cst@prefixfalse
 \endinput
 %%