summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-01-14 00:14:59 +0000
committerKarl Berry <karl@freefriends.org>2009-01-14 00:14:59 +0000
commit1cf000674b16b9f15f3c5112f70c07a08e8bb5de (patch)
tree596418ba5a8a1d2c92c836a6a1aeb9945fed6be7 /Master
parentc49b4326cde7ef42ae8571be9f7e12dbdf1ec6ac (diff)
chemstyle 1.3d (10jan09)
git-svn-id: svn://tug.org/texlive/trunk@11860 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/chemstyle/README.txt (renamed from Master/texmf-dist/doc/latex/chemstyle/README)48
-rw-r--r--Master/texmf-dist/doc/latex/chemstyle/chemscheme-manual.pdfbin207151 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/chemstyle/chemscheme.pdfbin253004 -> 207151 bytes
-rw-r--r--Master/texmf-dist/doc/latex/chemstyle/chemstyle-manual.pdfbin191725 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/chemstyle/chemstyle.pdfbin292768 -> 192575 bytes
-rw-r--r--Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx62
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty2
-rw-r--r--Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty52
8 files changed, 90 insertions, 74 deletions
diff --git a/Master/texmf-dist/doc/latex/chemstyle/README b/Master/texmf-dist/doc/latex/chemstyle/README.txt
index 4352508c5c6..fc6c93528b8 100644
--- a/Master/texmf-dist/doc/latex/chemstyle/README
+++ b/Master/texmf-dist/doc/latex/chemstyle/README.txt
@@ -1,24 +1,24 @@
-----------------------------------------------------------------
-The chemstyle bundle --- Schemes and style for chemistry
-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
-----------------------------------------------------------------
-
-The chemstyle bundle provides two packages: chemstyle and
-chemscheme. Both are intended to help chemists create floating
-graphics and match published styles.
-
-The chemscheme package consists of two parts, both related to
-chemical schemes. The package adds a scheme float type to the
-LaTeX default types figure and table. The scheme float type
-acts in the same way as those defined by the LaTeX kernel, but
-is intended for chemical schemes. The package also provides a
-method for adding automatic chemical numbering to schemes.
-
-The chemstyle package provides a "one-stop shop" for setting up
-formatting of LaTeX documents following the editorial policies
-of various chemical journals. It provides a number of handy
-chemistry-related commands, and loads several support packages
-to aid the chemist.
+----------------------------------------------------------------
+The chemstyle bundle --- Schemes and style for chemistry
+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
+----------------------------------------------------------------
+
+The chemstyle bundle provides two packages: chemstyle and
+chemscheme. Both are intended to help chemists create floating
+graphics and match published styles.
+
+The chemscheme package consists of two parts, both related to
+chemical schemes. The package adds a scheme float type to the
+LaTeX default types figure and table. The scheme float type
+acts in the same way as those defined by the LaTeX kernel, but
+is intended for chemical schemes. The package also provides a
+method for adding automatic chemical numbering to schemes.
+
+The chemstyle package provides a "one-stop shop" for setting up
+formatting of LaTeX documents following the editorial policies
+of various chemical journals. It provides a number of handy
+chemistry-related commands, and loads several support packages
+to aid the chemist.
diff --git a/Master/texmf-dist/doc/latex/chemstyle/chemscheme-manual.pdf b/Master/texmf-dist/doc/latex/chemstyle/chemscheme-manual.pdf
deleted file mode 100644
index bb7ea8a854b..00000000000
--- a/Master/texmf-dist/doc/latex/chemstyle/chemscheme-manual.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemstyle/chemscheme.pdf b/Master/texmf-dist/doc/latex/chemstyle/chemscheme.pdf
index 719322ce713..bb7ea8a854b 100644
--- a/Master/texmf-dist/doc/latex/chemstyle/chemscheme.pdf
+++ b/Master/texmf-dist/doc/latex/chemstyle/chemscheme.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemstyle/chemstyle-manual.pdf b/Master/texmf-dist/doc/latex/chemstyle/chemstyle-manual.pdf
deleted file mode 100644
index 5ce59207574..00000000000
--- a/Master/texmf-dist/doc/latex/chemstyle/chemstyle-manual.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/chemstyle/chemstyle.pdf b/Master/texmf-dist/doc/latex/chemstyle/chemstyle.pdf
index 100c18f3003..9e691dabf87 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 90159332723..3bead4da261 100644
--- a/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
+++ b/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
@@ -1,4 +1,5 @@
% \iffalse meta-comment
+% !TEX encoding = ISO-8859-1
%
% Copyright (C) 2007-08 by
% Joseph Wright <joseph.wright@morningstar2.co.uk>
@@ -181,7 +182,7 @@ to aid the chemist.
%</driver>
% \fi
%
-%\CheckSum{645}
+%\CheckSum{646}
%
% \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
@@ -462,6 +463,7 @@ to aid the chemist.
%\end{LaTeXexample}
%
%\subsection{Alkyl radicals}
+%\changes{v1.3d}{2009/01/09}{Alkyl radicals work in \cs{ce} macro}
%\DescribeMacro{\nPr}
%\DescribeMacro{\iPr}
%\DescribeMacro{\nBu}
@@ -478,6 +480,11 @@ to aid the chemist.
% The alkyl group could be \nPr, \iPr\\
% or \nBu without affecting the selectivity.
%\end{LaTeXexample}
+% These should also work inside the \cs{ce} macro of \pkg{mhchem} when
+% if escaped mode:
+%\begin{LaTeXexample}
+% \ce{$\nBu$2CH-C($\iPr$)3}
+%\end{LaTeXexample}
%
%\DescribeOption{xspace}
% When \currpkg is loaded using the \opt{xspace} option, the
@@ -697,8 +704,8 @@ to aid the chemist.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\def\cst@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
- \def\cst@ver{#5/#6/#7\space v1.3c\space}}
-\cst@id $Id: chemstyle.dtx 50 2008-08-18 16:21:24Z joseph $
+ \def\cst@ver{#5/#6/#7\space v1.3d\space}}
+\cst@id $Id: chemstyle.dtx 51 2009-01-09 16:21:24Z joseph $
\ProvidesPackage{chemstyle}
[\cst@ver Writing chemistry with style]
% \end{macrocode}
@@ -708,11 +715,12 @@ to aid the chemist.
%\changes{v1.0a}{2007/08/23}{No longer load \texttt{fixltx2e}
% package}
%\changes{v1.2}{2008/03/05}{Added \pkg{xkeyval} interface}
+%\changes{v1.3d}{2009/01/09}{Require \pkg{amstext}}
% Packages that are needed under all circumstances are loaded here.
% There are some limitations on the age of \pkg{xkeyval}.
% \begin{macrocode}
\RequirePackage{xkeyval}[2005/05/07]
-\RequirePackage{graphicx,varioref,caption,xspace}
+\RequirePackage{amstext,graphicx,varioref,caption,xspace}
% \end{macrocode}
%\begin{macro}{\cst@tempa}
%\changes{v1.2}{2008/03/05}{New macro}
@@ -959,6 +967,7 @@ to aid the chemist.
\newcommand*{\cst@radical}[2]{%
\expandafter\DeclareRobustCommand\expandafter*\expandafter{%
\csname #1#2\endcsname}{%
+ \text{%
% \end{macrocode}
%\begin{macro}{\cst@emph}
%\begin{macro}{\cst@hyphen}
@@ -966,33 +975,36 @@ to aid the chemist.
% To allow redefinition while running, the various component parts of
% the system are defined each time an abbreviation is used.
% \begin{macrocode}
- \ifcst@radhyphen
- \def\cst@hyphen{-}%
- \else
- \let\cst@hyphen\relax
- \fi
- \ifcst@radsuper
- \let\cst@super\textsuperscript
- \else
- \let\cst@super\relax
- \fi
- \ifcst@rademph
- \let\cst@emph\emph
- \else
- \let\cst@emph\relax
- \fi
+ \ifcst@radhyphen
+ \def\cst@hyphen{-}%
+ \else
+ \let\cst@hyphen\relax
+ \fi
+ \ifcst@radsuper
+ \let\cst@super\textsuperscript
+ \else
+ \let\cst@super\relax
+ \fi
+ \ifcst@rademph
+ \let\cst@emph\emph
+ \else
+ \let\cst@emph\relax
+ \fi
% \end{macrocode}
%\end{macro}
%\end{macro}
%\end{macro}
% The final check is for a prefix, which is easiest to do here.
% \begin{macrocode}
- \ifcst@radprefix
- \cst@super{\cst@emph{#1}}\cst@hyphen#2%
- \else
- #2\cst@hyphen\cst@super{\cst@emph{#1}}%
- \fi
- \cst@xspace}}
+ \ifcst@radprefix
+ \cst@super{\cst@emph{#1}}\cst@hyphen#2%
+ \else
+ #2\cst@hyphen\cst@super{\cst@emph{#1}}%
+ \fi
+ \cst@xspace
+ }%
+ }%
+}
% \end{macrocode}
%\end{macro}
%\begin{macro}{\cst@xspace}
diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty b/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty
index 461cbe2cb76..6e6a9d43e7c 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty
+++ b/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty
@@ -9,7 +9,7 @@
%% The chemstyle bundle --- Schemes and style for chemistry
%% Maintained by Joseph Wright
%% E-mail: joseph.wright@morningstar2.co.uk
-%% Released under the LaTeX Project Public License v1.3c or later
+%% Released under the LaTeX Project Public License v1.3 or later
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
index 156c73038fe..7fa7d048d33 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
+++ b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
@@ -15,12 +15,12 @@
%%
\NeedsTeXFormat{LaTeX2e}
\def\cst@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
- \def\cst@ver{#5/#6/#7\space v1.3c\space}}
-\cst@id $Id: chemstyle.dtx 50 2008-08-18 16:21:24Z joseph $
+ \def\cst@ver{#5/#6/#7\space v1.3d\space}}
+\cst@id $Id: chemstyle.dtx 51 2009-01-09 16:21:24Z joseph $
\ProvidesPackage{chemstyle}
[\cst@ver Writing chemistry with style]
\RequirePackage{xkeyval}[2005/05/07]
-\RequirePackage{graphicx,varioref,caption,xspace}
+\RequirePackage{amstext,graphicx,varioref,caption,xspace}
\newcommand*{\cst@tempa}{}
\newcommand*{\cst@tempb}{}
\newcommand*{\cst@boolkey}[1]{
@@ -129,27 +129,31 @@
\newcommand*{\cst@radical}[2]{%
\expandafter\DeclareRobustCommand\expandafter*\expandafter{%
\csname #1#2\endcsname}{%
- \ifcst@radhyphen
- \def\cst@hyphen{-}%
- \else
- \let\cst@hyphen\relax
- \fi
- \ifcst@radsuper
- \let\cst@super\textsuperscript
- \else
- \let\cst@super\relax
- \fi
- \ifcst@rademph
- \let\cst@emph\emph
- \else
- \let\cst@emph\relax
- \fi
- \ifcst@radprefix
- \cst@super{\cst@emph{#1}}\cst@hyphen#2%
- \else
- #2\cst@hyphen\cst@super{\cst@emph{#1}}%
- \fi
- \cst@xspace}}
+ \text{%
+ \ifcst@radhyphen
+ \def\cst@hyphen{-}%
+ \else
+ \let\cst@hyphen\relax
+ \fi
+ \ifcst@radsuper
+ \let\cst@super\textsuperscript
+ \else
+ \let\cst@super\relax
+ \fi
+ \ifcst@rademph
+ \let\cst@emph\emph
+ \else
+ \let\cst@emph\relax
+ \fi
+ \ifcst@radprefix
+ \cst@super{\cst@emph{#1}}\cst@hyphen#2%
+ \else
+ #2\cst@hyphen\cst@super{\cst@emph{#1}}%
+ \fi
+ \cst@xspace
+ }%
+ }%
+}
\newcommand*{\cst@xspace}{%
\ifcst@xspace
\expandafter\xspace%