summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/chemstyle
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-07-23 21:57:54 +0000
committerKarl Berry <karl@freefriends.org>2008-07-23 21:57:54 +0000
commit90b73a5ab3c59005dbeb8df00715344586c3a569 (patch)
tree5234e2c76846941fb384d32775bf12a1a0c1bff5 /Master/texmf-dist/source/latex/chemstyle
parenta7991eb18eb33113cb6573069448337452f53b77 (diff)
chemstyle 1.3b (23jul08)
git-svn-id: svn://tug.org/texlive/trunk@9727 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/chemstyle')
-rw-r--r--Master/texmf-dist/source/latex/chemstyle/chemscheme.dtx43
-rw-r--r--Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx133
2 files changed, 86 insertions, 90 deletions
diff --git a/Master/texmf-dist/source/latex/chemstyle/chemscheme.dtx b/Master/texmf-dist/source/latex/chemstyle/chemscheme.dtx
index d9a0a2c381d..fb90e48a8d7 100644
--- a/Master/texmf-dist/source/latex/chemstyle/chemscheme.dtx
+++ b/Master/texmf-dist/source/latex/chemstyle/chemscheme.dtx
@@ -289,7 +289,7 @@
% internal systems for generating new floats; for the standard
% classes, \pkg{floatrow} is used by default. The \opt{floats}
% package option can be used to control which method is employed.
-% This uses the key--value system, can can be given the values
+% This uses the key--value system, can be given the values
% \opt{float}, \opt{floatrow} or \opt{memoir}:
%\begin{LaTeXexample}[noexample]
% \usepackage[floats=float]{chemscheme}
@@ -334,7 +334,7 @@
%\DescribeMacro{\floatcontentsleft}
%\DescribeMacro{\floatcontentsright}
% The \LaTeX\ default is to position all float contents flush-left.
-% There is no ``hook'' provided to alter this. The \currpkg packages
+% There is no ``hook'' provided to alter this. The \currpkg package
% therefore provides commands to align all float contents
% automatically. As the macro names make clear,
% \cs{floatcontentscentre} will make all floats centred (for users
@@ -390,7 +390,7 @@
%\subsection{Usage}
% Getting automated numbers into schemes is a two step procedure. In
% the first step, schemes (or other graphics) should be prepared as
-% normal and saved as encapsulated postscript (EPS) files The most
+% normal and saved as encapsulated postscript (EPS) files. The most
% popular chemistry drawing package, \textsc{ChemDraw}, is able to do
% this from the \texttt{Save As \ldots} dialog.
%\DescribeMacro{\schemerefmarker}
@@ -413,7 +413,7 @@
% so for example to use \textsf{XXX} as the indicator for
% replacement in all graphics, you would execute:
%\begin{LaTeXexample}[noexample]
-% \renewcommand*{\chemeschemerefmarker}{XXX}
+% \renewcommand*{\schemerefmarker}{XXX}
%\end{LaTeXexample}
%
%\DescribeMacro{\schemeref}
@@ -649,7 +649,7 @@ An example file for PDFLaTeX use.
% plus the \pkg{babel} system means ensuring every possibility is
% covered is impossible. Users are asked to report any problems with
% compatibility with other packages or emulation of the standard
-% float types. Additional \pkg{babel} stings are also welcome, as
+% float types. Additional \pkg{babel} strings are also welcome, as
% are improvements to those already provided.
%
% \StopEventually{\bibliographystyle{unsrt}\bibliography{chemscheme}}
@@ -669,7 +669,7 @@ An example file for PDFLaTeX use.
\def\csh@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
#5/#6/#7\space v1.4\space}
\ProvidesPackage{chemscheme}
- [\csh@id $Id: chemscheme.dtx 36 2008-07-17 07:39:53Z joseph $
+ [\csh@id $Id: chemscheme.dtx 45 2008-07-23 11:27:13Z joseph $
Support for chemical schemes]
% \end{macrocode}
%\end{macro}
@@ -1821,8 +1821,14 @@ showpage
\usepackage[scaled=0.95]{helvet}
\usepackage[version=3]{mhchem}
\usepackage[osf]{mathpazo}
-\usepackage{booktabs,array,url,courier,xspace,etoolbox,varioref}
+\usepackage{booktabs,array,url,courier,xspace,varioref}
\usepackage{upgreek,ifpdf,float,caption,longtable,babel}
+\begingroup
+ \@ifundefined{eTeXversion}
+ {\aftergroup\@gobble}
+ {\aftergroup\@firstofone}
+\endgroup
+{\usepackage{etoolbox}}
\floatstyle{plaintop}
\restylefloat{table}
\labelformat{figure}{\figurename~#1}
@@ -1886,24 +1892,13 @@ showpage
\hbox to\linewidth{\box\lst@samplebox\hss}%
\end{minipage}%
\end{list}}
-\let\LaTeXcodenoexample\LaTeXcodeexample
-\newcommand*{\LaTeXcodenoexampleend}{%
- \egroup
- \setlength\LaTeXwidth{\wd\lst@samplebox}%
- \begin{list}{}{%
- \setlength\itemindent{0pt}
- \setlength\leftmargin{0pt}
- \setlength\rightmargin{0pt}}%
- \item
- \begin{minipage}[c]{\LaTeXwidth}
- \hbox to\linewidth{\box\lst@samplebox\hss}%
- \end{minipage}%
- \end{list}}
\newcommand*{\LaTeXcodefloat}{%
\setkeys{lst}{tabsize=4,gobble=3,breakindent=0pt,
basicstyle=\small\ttfamily,basewidth=0.51em,
keywordstyle=\color{blue}}%
\lst@BeginAlsoWriteFile{\LaTeXexamplefile}}
+\let\LaTeXcodenoexample\LaTeXcodefloat
+\let\LaTeXcodenoexampleend\@empty
\newcommand*{\LaTeXcodefloatend}{%
\MakePercentComment\catcode`\^^M=10\relax
\small
@@ -1978,9 +1973,11 @@ showpage
\DeclareRobustCommand*{\XeTeX}
{X\kern-.125em\lower.5ex\hbox{\reflectbox{E}}\kern-.1667em\TeX}
\providecommand*{\CTAN}{\textsc{ctan}}
-\patchcmd{\@addmarginpar}
- {\@latex@warning@no@line {Marginpar on page \thepage\space moved}}
- {\relax}{}{}
+\@ifpackageloaded{etoolbox}
+ {\patchcmd{\@addmarginpar}
+ {\@latex@warning@no@line {Marginpar on page \thepage\space moved}}
+ {\relax}{}{}}
+ {}
\newcounter{argument}
\g@addto@macro\endmacro{\setcounter{argument}{0}}
\newcommand*\darg[1]{%
diff --git a/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx b/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
index 2fc5a3c8253..b7bfb8a62ca 100644
--- a/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
+++ b/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
@@ -11,7 +11,7 @@
% and version 1.3c or later is part of all distributions of
% LaTeX version 2005/12/01 or later.
%
-% This work has the LPPL maintenance status `maintained.'
+% This work has the LPPL maintenance status `maintained'.
%
% The current maintainer of this work is Joseph Wright.
%
@@ -181,7 +181,7 @@ to aid the chemist.
%</driver>
% \fi
%
-%\CheckSum{636}
+%\CheckSum{644}
%
% \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
@@ -312,9 +312,9 @@ to aid the chemist.
%\DescribeOption{journal}
% \currpkg should be loaded with a package option specifying which
% journal style to follow. Currently, \currpkg is aware of a the
-% styles listed in Table~\ref{styles}. New styles can be developed
-% by creating a new file modelled on the existing definitions;
-% \currpkg will automatically search for correctly-named styles.
+% styles listed in \ref{styles}. New styles can be developed by
+% creating a new file modelled on the existing definitions; \currpkg
+% will automatically search for correctly-named styles.
%\begin{table}
% \begin{tabular}{ll}
% \toprule
@@ -384,7 +384,7 @@ to aid the chemist.
%\DescribeOption{chemcompounds}
%\DescribeOption{floatrow}
% \currpkg loads the \pkg{chemscheme} package, and therefore will
-% pass through the opt{chemcompounds} option. It can also request
+% pass through the \opt{chemcompounds} option. It can also request
% floats are created either by \pkg{float} or \pkg{floatrow}; this is
% controlled by the \opt{floatrow} option. Setting
% \opt{floatrow=false} means that \pkg{float} is used to generate
@@ -448,10 +448,17 @@ to aid the chemist.
% Related to the above, but not exactly a unit is the
% \cs{standardstate} command.\footnote{The \cs{standardstate} macro
% is only defined if the user does not have their own version.} This
-% generates the tricky \cs{standardstate} symbol.
+% generates the tricky \cs{standardstate} symbol. The symbol will
+% adapt to local sizing.
%\begin{LaTeXexample}
% the standard conditions are indicated: \standardstate\\
-% $\Delta S\standardstate$
+% Common but not correct:
+% $\Delta G_\mathrm{f}^\standardstate$ or
+% $\Delta G_\mathrm{f}{}^\standardstate$ \\
+% Better:
+% $\Delta_\mathrm{f}G^\standardstate$\\
+% Sizing:
+% $\int^{T_{\mathrm{out}}}_{T^\standardstate}$
%\end{LaTeXexample}
%
%\subsection{Alkyl radicals}
@@ -623,7 +630,7 @@ to aid the chemist.
\usepackage[version=3]{mhchem}
\usepackage[footnotes]{notes2bib}
\usepackage[final]{microtype}
-\usepackage[extrarun=on]{auto-pst-pdf}
+\usepackage[final,inactive]{pst-pdf}
\usepackage[colorlinks]{hyperref}
\begin{document}
Document contents go here
@@ -690,8 +697,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.3\space}}
-\cst@id $Id: chemstyle.dtx 36 2008-07-17 07:39:53Z joseph $
+ \def\cst@ver{#5/#6/#7\space v1.3b\space}}
+\cst@id $Id: chemstyle.dtx 46 2008-07-23 11:29:06Z joseph $
\ProvidesPackage{chemstyle}
[\cst@ver Writing chemistry with style]
% \end{macrocode}
@@ -878,7 +885,7 @@ to aid the chemist.
% package to \pkg{siunitx}}
%\changes{v1.2c}{2008/06/10}{Altered call to \pkg{siunitx}
% function}
-%\changes{v1.4}{2008/06/24}{Default to loading \pkg{siunitx}}
+%\changes{v1.3b}{2008/06/24}{Default to loading \pkg{siunitx}}
%\begin{macro}{\cmc}
%\begin{macro}{\Hz}
%\begin{macro}{\cubiccentimeter}
@@ -892,28 +899,27 @@ to aid the chemist.
% \pkg{SIunits} and \pkg{unitsdef}. If either of these are loaded,
% they are used; if not, then \pkg{siunitx} is loaded in any case.
% \begin{macrocode}
-\AtBeginDocument{
- \@ifpackageloaded{siunitx}
- {\requiresiconfigs{synchem}}
- {\@ifpackageloaded{SIunits}
- {\newcommand*{\cubiccentimeter}{\centi\metre\cubed}
- \newcommand*{\Molar}{\textsc{m}}
- \newcommand*{\molar}{\mole\usk\deci\metre\rpcubed}
- \newcommand*{\mmHg}{\milli\metre Hg}
- \newcommand*{\mol}{\mole}
- \newcommand*{\cmc}{\cubiccentimeter}
- \newcommand*{\Hz}{\hertz}}
- {\@ifpackageloaded{unitsdef}
- {\newunit{\cubiccentimeter}{%
- \cm\unitsuperscript{3}}
- \newunit{\Molar}{\textsc{m}}
- \newunit{\molar}{%
- \mole\unitsep\dm\unitsuperscript{--3}}
- \newunit{\mmHg}{mmHg}
- \newunit{\mol}{\mole}
- \newcommand*{\cmc}{\cubiccentimeter}
- \newcommand*{\Hz}{\hertz}}
- {\RequirePackage[alsoload=synchem]{siunitx}}}}}
+\@ifpackageloaded{siunitx}
+ {\requiresiconfigs{synchem}}
+ {\@ifpackageloaded{SIunits}
+ {\newcommand*{\cubiccentimeter}{\centi\metre\cubed}
+ \newcommand*{\Molar}{\textsc{m}}
+ \newcommand*{\molar}{\mole\usk\deci\metre\rpcubed}
+ \newcommand*{\mmHg}{\milli\metre Hg}
+ \newcommand*{\mol}{\mole}
+ \newcommand*{\cmc}{\cubiccentimeter}
+ \newcommand*{\Hz}{\hertz}}
+ {\@ifpackageloaded{unitsdef}
+ {\newunit{\cubiccentimeter}{%
+ \cm\unitsuperscript{3}}
+ \newunit{\Molar}{\textsc{m}}
+ \newunit{\molar}{%
+ \mole\unitsep\dm\unitsuperscript{--3}}
+ \newunit{\mmHg}{mmHg}
+ \newunit{\mol}{\mole}
+ \newcommand*{\cmc}{\cubiccentimeter}
+ \newcommand*{\Hz}{\hertz}}
+ {\RequirePackage[alsoload=synchem]{siunitx}}}}
% \end{macrocode}
%\end{macro}
%\end{macro}
@@ -924,27 +930,23 @@ to aid the chemist.
%\end{macro}
%
%\subsection{Standard state symbol}
-%\begin{macro}{\cst@varnothing}
-%\changes{v1.1}{2007/09/17}{New macro}
%\begin{macro}{\standardstate}
-% The ``standard state'' symbol is handy. This is produced by
-% rotating the ``varnothing'' symbol from the \textsc{ams} set. Note
-% that the rotation angle here has been carefully checked, but is set
-% by eye. The symbol is loaded directly here, rather than using the
-% \pkg{amssymb} package, to avoid any clashes.
-%\changes{v1.1c}{2007/09/23}{Definition only occurs if user does not
-% have own version}
-%\changes{v1.1c}{2007/09/23}{Altered angle of rotation for better
-% appearance}
+%\changes{v1.3a}{2008/07/21}{Completely new definition}
+%\begin{macro}{\cst@sstate}
+%\begin{macro}{\cst@s@state}
+% The ``standard state'' symbol is handy. This definition
+% is adapted from one posted several times to
+% \texttt{comp.text.tex} by Donald Arseneau.
% \begin{macrocode}
-\DeclareSymbolFont{CSTAMS}{U}{msb}{m}{n}
-\DeclareMathSymbol{\cst@varnothing}{\mathord}{CSTAMS}{"3F}
-\providecommand*{\standardstate}%
- {\textsuperscript{\rotatebox[origin=c]{138.8}%
- {\ensuremath{\cst@varnothing}}}}
+\providecommand*{\standardstate}{%
+ {\ensuremath{\protect\cst@sstate}}}
+\newcommand*{\cst@sstate}{\mathpalette\cst@s@state\circ}
+\newcommand*{\cst@s@state}[2]{%
+ \ooalign{\hfil$#1-$\hfil\cr\hfil$#1#2$\hfil\cr}}
% \end{macrocode}
%\end{macro}
%\end{macro}
+%\end{macro}
%
%\subsection{Alkyl radicals}
%\begin{macro}{\cst@radical}
@@ -1705,8 +1707,14 @@ to aid the chemist.
\usepackage[scaled=0.95]{helvet}
\usepackage[version=3]{mhchem}
\usepackage[osf]{mathpazo}
-\usepackage{booktabs,array,url,courier,xspace,etoolbox,varioref}
+\usepackage{booktabs,array,url,courier,xspace,varioref}
\usepackage{upgreek,ifpdf,float,caption,longtable,babel}
+\begingroup
+ \@ifundefined{eTeXversion}
+ {\aftergroup\@gobble}
+ {\aftergroup\@firstofone}
+\endgroup
+{\usepackage{etoolbox}}
\floatstyle{plaintop}
\restylefloat{table}
\labelformat{figure}{\figurename~#1}
@@ -1770,24 +1778,13 @@ to aid the chemist.
\hbox to\linewidth{\box\lst@samplebox\hss}%
\end{minipage}%
\end{list}}
-\let\LaTeXcodenoexample\LaTeXcodeexample
-\newcommand*{\LaTeXcodenoexampleend}{%
- \egroup
- \setlength\LaTeXwidth{\wd\lst@samplebox}%
- \begin{list}{}{%
- \setlength\itemindent{0pt}
- \setlength\leftmargin{0pt}
- \setlength\rightmargin{0pt}}%
- \item
- \begin{minipage}[c]{\LaTeXwidth}
- \hbox to\linewidth{\box\lst@samplebox\hss}%
- \end{minipage}%
- \end{list}}
\newcommand*{\LaTeXcodefloat}{%
\setkeys{lst}{tabsize=4,gobble=3,breakindent=0pt,
basicstyle=\small\ttfamily,basewidth=0.51em,
keywordstyle=\color{blue}}%
\lst@BeginAlsoWriteFile{\LaTeXexamplefile}}
+\let\LaTeXcodenoexample\LaTeXcodefloat
+\let\LaTeXcodenoexampleend\@empty
\newcommand*{\LaTeXcodefloatend}{%
\MakePercentComment\catcode`\^^M=10\relax
\small
@@ -1862,9 +1859,11 @@ to aid the chemist.
\DeclareRobustCommand*{\XeTeX}
{X\kern-.125em\lower.5ex\hbox{\reflectbox{E}}\kern-.1667em\TeX}
\providecommand*{\CTAN}{\textsc{ctan}}
-\patchcmd{\@addmarginpar}
- {\@latex@warning@no@line {Marginpar on page \thepage\space moved}}
- {\relax}{}{}
+\@ifpackageloaded{etoolbox}
+ {\patchcmd{\@addmarginpar}
+ {\@latex@warning@no@line {Marginpar on page \thepage\space moved}}
+ {\relax}{}{}}
+ {}
\newcounter{argument}
\g@addto@macro\endmacro{\setcounter{argument}{0}}
\newcommand*\darg[1]{%