From 0c39f6183ef8d27bb4bd8dec75424a862f0aa62f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 25 Aug 2009 00:47:32 +0000 Subject: chemstyle update (24aug09) git-svn-id: svn://tug.org/texlive/trunk@14850 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/chemstyle/chemscheme.cdx | Bin 0 -> 6093 bytes .../source/latex/chemstyle/chemstyle.dtx | 78 +++++---- .../source/latex/chemstyle/chemstyle.ins | 178 ++++++++++----------- 3 files changed, 136 insertions(+), 120 deletions(-) create mode 100644 Master/texmf-dist/source/latex/chemstyle/chemscheme.cdx (limited to 'Master/texmf-dist/source/latex/chemstyle') diff --git a/Master/texmf-dist/source/latex/chemstyle/chemscheme.cdx b/Master/texmf-dist/source/latex/chemstyle/chemscheme.cdx new file mode 100644 index 00000000000..801f3037d6f Binary files /dev/null and b/Master/texmf-dist/source/latex/chemstyle/chemscheme.cdx differ diff --git a/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx b/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx index d212c772739..bf700c99c44 100644 --- a/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx +++ b/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx @@ -107,8 +107,6 @@ This work consists of the file chemstyle.dtx and \else \expandafter\endgroup \fi -\immediate\write18{makeindex -s gglo.ist -o chemstyle.gls chemstyle.glo} -\immediate\write18{makeindex -s gind.ist -o chemstyle.ind chemstyle.idx} % %<*package|chemscheme> \NeedsTeXFormat{LaTeX2e} @@ -374,13 +372,24 @@ This work consists of the file chemstyle.dtx and % \item either \pkg{siunitx} or \pkg{SIunits} (otherwise no % units are defined); % \item \pkg{psfrag}; -% \item \pkg{varioref} (part of the standard \pkg{tools} bundle); +% \item \pkg{varioref} (part of the standard \pkg{tools} bundle): +% only loaded if not turned off; % \item \pkg{xspace} (part of the standard \pkg{tools} bundle). %\end{itemize} % These are normally present in the current major \TeX\ distributions, % but are also available from \href{http://www.ctan.org}{The % Comprehensive TeX Archive Network}. % +%\DescribeOption{varioref} +%\changes{v2.0a}{2009/08/23}{New \opt{varioref} option} +% The option \opt{varioref} can be used to determine whether +% \pkg{chemstyle} loads the \pkg{varioref} package. For example, +% users of \pkg{cleveref} will want to turn off loading of +% \pkg{varioref} using: +%\begin{LaTeXdemo}[code only] +% \usepackage[varioref=false]{chemstyle} +%\end{LaTeXdemo} +% %\section{The \pkg{chemstyle} package: tools for chemistry} % % The package recognises a number of key--value options when loading. @@ -905,7 +914,7 @@ This work consists of the file chemstyle.dtx and % % \pkg{chemstyle} and \pkg{chemscheme} are designed to avoid, as far as % possible, clashes with other packages. The standard packages -% \pkg{graphicx} and \pkg{varioref} are used by the budnle. If you +% \pkg{graphicx} and \pkg{varioref} are used by the bundle. If you % need to load these with specific options, this needs to be done % \emph{before} loading \pkg{chemstyle} (or \pkg{chemscheme}). % @@ -978,8 +987,8 @@ This work consists of the file chemstyle.dtx and % \begin{macrocode} %<*package> \ProvidesPackage{chemstyle} - [2009/06/06 v2.0 Schemes and style for chemistry] -\RequirePackage{amstext,caption,chemscheme,varioref,xspace} + [2009/08/23 v2.0a Schemes and style for chemistry] +\RequirePackage{amstext,caption,chemscheme,xspace} \SetupKeyvalOptions{ family=cst, prefix=cst@ @@ -1001,6 +1010,7 @@ This work consists of the file chemstyle.dtx and %\begin{macro}{\ifcst@radhyphen} %\begin{macro}{\ifcst@radpreix} %\begin{macro}{\ifcst@radsuper} +%\begin{macro}{\ifcst@varioref} %\begin{macro}{\ifcst@xspace} % Some simple Boolean options. % \begin{macrocode} @@ -1013,9 +1023,11 @@ This work consists of the file chemstyle.dtx and \DeclareBoolOption[true]{radhyphen} \DeclareBoolOption[true]{radprefix} \DeclareBoolOption[false]{radsuper} +\DeclareBoolOption[true]{varioref} \DeclareBoolOption[true]{xspace} % \end{macrocode} %\end{macro} +%\end{macro} %\end{macro} %\end{macro} %\end{macro} @@ -1042,7 +1054,8 @@ This work consists of the file chemstyle.dtx and \DeclareStringOption{language} \setkeys{cst}{% journal = , - language = english + language = english, + varioref = true } % \end{macrocode} %\end{macro} @@ -1462,21 +1475,6 @@ This work consists of the file chemstyle.dtx and %\end{macro} %\end{macro} % -%\subsection{Cross-references} -% -% The naming for cross-references is sorted out properly using the -% \pkg{varioref} package. Schemes are done at the start of the document -% as the definition of \cs{schemename} may not exist yet. -% \begin{macrocode} -\labelformat{figure}{\figurename~#1} -\labelformat{table}{\tablename~#1} -\AtEndOfPackage{% - \AtBeginDocument{% - \labelformat{scheme}{\schemename~#1}% - }% -} -% \end{macrocode} -% % \subsection{Handling reference section naming} % %\begin{macro}{bibnote} @@ -1667,6 +1665,24 @@ This work consists of the file chemstyle.dtx and \ProcessKeyvalOptions{cst} % \end{macrocode} % +%\subsection{Cross-references} +% +% The naming for cross-references is sorted out properly using the +% \pkg{varioref} package. Schemes are done at the start of the document +% as the definition of \cs{schemename} may not exist yet. +% \begin{macrocode} +\ifcst@varioref + \RequirePackage{varioref} + \labelformat{figure}{\figurename~#1} + \labelformat{table}{\tablename~#1} + \AtEndOfPackage{% + \AtBeginDocument{% + \labelformat{scheme}{\schemename~#1}% + }% + } +\fi +% \end{macrocode} +% %\subsection{Float formatting} % %\begin{macro}{\cst@float@memoir@correct} @@ -1749,7 +1765,7 @@ This work consists of the file chemstyle.dtx and % \begin{macrocode} %<*chemscheme> \ProvidesPackage{chemscheme} - [2009/06/06 v2.0 Schemes for chemistry] + [2009/08/23 v2.0a Schemes for chemistry] \RequirePackage{kvoptions,psfrag} \SetupKeyvalOptions{ family=cst, @@ -2233,7 +2249,7 @@ This work consists of the file chemstyle.dtx and % \begin{macrocode} %<*angew> \ProvidesFile{angew.chemstyle.cfg} - [2009/06/06 v2.0 Angew. Chem. journal style] + [2009/08/23 v2.0a Angew. Chem. journal style] \setkeys{cst}{ abbremph = false, radhyphen = false @@ -2255,7 +2271,7 @@ This work consists of the file chemstyle.dtx and % \begin{macrocode} %<*ic> \ProvidesFile{ic.chemstyle.cfg} - [2009/06/06 v2.0 Inorg. Chem. journal style] + [2009/08/23 v2.0a Inorg. Chem. journal style] \DeclareCaptionLabelSeparator{perquad}{.\quad} \captionsetup{ labelfont = {bf,it,sf}, @@ -2288,7 +2304,7 @@ This work consists of the file chemstyle.dtx and % \begin{macrocode} %<*jacs> \ProvidesFile{jacs.chemstyle.cfg} - [2009/06/06 v2.0 J. Am. Chem. Soc. journal style] + [2009/08/23 v2.0a J. Am. Chem. Soc. journal style] \DeclareCaptionLabelSeparator{perquad}{.\quad} \captionsetup{ labelfont = {bf,it,sf}, @@ -2321,7 +2337,7 @@ This work consists of the file chemstyle.dtx and % \begin{macrocode} %<*jomc> \ProvidesFile{jomc.chemstyle.cfg} - [2009/06/06 v2.0 J. Organomet. Chem. journal style] + [2009/08/23 v2.0a J. Organomet. Chem. journal style] \setkeys{cst}{ abbremph = false, radhyphen = true, @@ -2345,7 +2361,7 @@ This work consists of the file chemstyle.dtx and % \begin{macrocode} %<*jpc> \ProvidesFile{jpc.chemstyle.cfg} - [2009/06/06 v2.0 J. Phys. Chem. journal style] + [2009/08/23 v2.0a J. Phys. Chem. journal style] \DeclareCaptionFormat{labelcaps}{\MakeUppercase{#1}#2#3} \captionsetup{ font = bf, @@ -2379,7 +2395,7 @@ This work consists of the file chemstyle.dtx and % \begin{macrocode} %<*orglett> \ProvidesFile{orglett.chemstyle.cfg} - [2009/06/06 v2.0 Org. Lett. journal style] + [2009/08/23 v2.0a Org. Lett. journal style] \DeclareCaptionLabelSeparator{perquad}{.\quad} \captionsetup{ labelfont = bf, @@ -2503,7 +2519,7 @@ This work consists of the file chemstyle.dtx and % \begin{macrocode} %<*rsc> \ProvidesFile{rsc.chemstyle.cfg} - [2009/06/06 v2.0 RSC journal style] + [2009/08/23 v2.0a RSC journal style] \captionsetup{ labelsep = quad, labelfont = bf @@ -2519,7 +2535,7 @@ This work consists of the file chemstyle.dtx and % \begin{macrocode} %<*tetlett> \ProvidesFile{tetlett.chemstyle.cfg} - [2009/06/06 v2.0 Tetrahedron Lett. journal style] + [2009/08/23 v2.0a Tetrahedron Lett. journal style] \captionsetup{ labelsep = period, labelfont = bf, diff --git a/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins b/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins index f382122097b..158c38b3976 100644 --- a/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins +++ b/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins @@ -1,89 +1,89 @@ -%% -%% This is file `chemstyle.ins', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% chemstyle.dtx (with options: `install') -%% ---------------------------------------------------------------- -%% The chemstyle bundle --- Schemes and style for chemistry -%% E-mail: joseph.wright@morningstar2.co.uk -%% Released under the LaTeX Project Public License v1.3c or later -%% See http://www.latex-project.org/lppl.txt -%% ---------------------------------------------------------------- -%% -\input docstrip.tex -\keepsilent -\askforoverwritefalse -\preamble ----------------------------------------------------------------- -The chemstyle bundle --- Schemes and style for chemistry -E-mail: joseph.wright@morningstar2.co.uk -Released under the LaTeX Project Public License v1.3c or later -See http://www.latex-project.org/lppl.txt ----------------------------------------------------------------- - -\endpreamble -\postamble - -Copyright (C) 2006-2009 by - Joseph Wright - -It may be distributed and/or modified under the conditions of -the LaTeX Project Public License (LPPL), either version 1.3c of -this license or (at your option) any later version. The latest -version of this license is in the file: - - http://www.latex-project.org/lppl.txt - -This work is "maintained" (as per LPPL maintenance status) by - Joseph Wright. - -This work consists of the file chemstyle.dtx and - chemstyle.cdx, - and the derived files chemstyle.pdf, - chemstyle.ins, - chemstyle.sty, - chemscheme.sty, - -\endpostamble -\usedir{tex/latex/chemstyle} -\generate{ - \file{chemstyle.sty}{\from{chemstyle.dtx}{package}} - \file{chemscheme.sty}{\from{chemstyle.dtx}{chemscheme}} -} -\usedir{tex/latex/chemstyle/config} -\generate{ - \file{angew.chemstyle.cfg}{\from{chemstyle.dtx}{angew}} - \file{ic.chemstyle.cfg}{\from{chemstyle.dtx}{ic}} - \file{jacs.chemstyle.cfg}{\from{chemstyle.dtx}{jacs}} - \file{jomc.chemstyle.cfg}{\from{chemstyle.dtx}{jomc}} - \file{rsc.chemstyle.cfg}{\from{chemstyle.dtx}{rsc}} - \file{orglett.chemstyle.cfg}{\from{chemstyle.dtx}{orglett}} - \file{tetlett.chemstyle.cfg}{\from{chemstyle.dtx}{tetlett}} -} -\endbatchfile - -%% -%% Copyright (C) 2006-2009 by -%% Joseph Wright -%% -%% It may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License (LPPL), either version 1.3c of -%% this license or (at your option) any later version. The latest -%% version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% This work is "maintained" (as per LPPL maintenance status) by -%% Joseph Wright. -%% -%% This work consists of the file chemstyle.dtx and -%% chemstyle.cdx, -%% and the derived files chemstyle.pdf, -%% chemstyle.ins, -%% chemstyle.sty, -%% chemscheme.sty, -%% -%% -%% End of file `chemstyle.ins'. +%% +%% This is file `chemstyle.ins', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% chemstyle.dtx (with options: `install') +%% ---------------------------------------------------------------- +%% The chemstyle bundle --- Schemes and style for chemistry +%% E-mail: joseph.wright@morningstar2.co.uk +%% Released under the LaTeX Project Public License v1.3c or later +%% See http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\input docstrip.tex +\keepsilent +\askforoverwritefalse +\preamble +---------------------------------------------------------------- +The chemstyle bundle --- Schemes and style for chemistry +E-mail: joseph.wright@morningstar2.co.uk +Released under the LaTeX Project Public License v1.3c or later +See http://www.latex-project.org/lppl.txt +---------------------------------------------------------------- + +\endpreamble +\postamble + +Copyright (C) 2006-2009 by + Joseph Wright + +It may be distributed and/or modified under the conditions of +the LaTeX Project Public License (LPPL), either version 1.3c of +this license or (at your option) any later version. The latest +version of this license is in the file: + + http://www.latex-project.org/lppl.txt + +This work is "maintained" (as per LPPL maintenance status) by + Joseph Wright. + +This work consists of the file chemstyle.dtx and + chemstyle.cdx, + and the derived files chemstyle.pdf, + chemstyle.ins, + chemstyle.sty, + chemscheme.sty, + +\endpostamble +\usedir{tex/latex/chemstyle} +\generate{ + \file{chemstyle.sty}{\from{chemstyle.dtx}{package}} + \file{chemscheme.sty}{\from{chemstyle.dtx}{chemscheme}} +} +\usedir{tex/latex/chemstyle/config} +\generate{ + \file{angew.chemstyle.cfg}{\from{chemstyle.dtx}{angew}} + \file{ic.chemstyle.cfg}{\from{chemstyle.dtx}{ic}} + \file{jacs.chemstyle.cfg}{\from{chemstyle.dtx}{jacs}} + \file{jomc.chemstyle.cfg}{\from{chemstyle.dtx}{jomc}} + \file{rsc.chemstyle.cfg}{\from{chemstyle.dtx}{rsc}} + \file{orglett.chemstyle.cfg}{\from{chemstyle.dtx}{orglett}} + \file{tetlett.chemstyle.cfg}{\from{chemstyle.dtx}{tetlett}} +} +\endbatchfile + +%% +%% Copyright (C) 2006-2009 by +%% Joseph Wright +%% +%% It may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License (LPPL), either version 1.3c of +%% this license or (at your option) any later version. The latest +%% version of this license is in the file: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% This work is "maintained" (as per LPPL maintenance status) by +%% Joseph Wright. +%% +%% This work consists of the file chemstyle.dtx and +%% chemstyle.cdx, +%% and the derived files chemstyle.pdf, +%% chemstyle.ins, +%% chemstyle.sty, +%% chemscheme.sty, +%% +%% +%% End of file `chemstyle.ins'. -- cgit v1.2.3