diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/chemstyle')
-rw-r--r-- | Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx | 151 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/chemstyle/chemstyle.ins | 6 |
2 files changed, 109 insertions, 48 deletions
diff --git a/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx b/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx index ccede179fad..fa620bc9023 100644 --- a/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx +++ b/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx @@ -21,6 +21,7 @@ % chemstyle.pdf, % rsc.jdf, % angew.jdf, +% jomc.jdf, % jacs.jdf, % ic.jdf, % jpc.jdf, @@ -86,14 +87,16 @@ \usedir{tex/latex/contib/chemstyle} \generate{\file{\jobname.ins}{\from{\jobname.dtx}{install}} \file{\jobname.sty}{\from{\jobname.dtx}{package}} - \file{rsc.jdf}{\from{chemstyle.dtx}{rsc}} + \file{jawltxdoc.sty}{\from{\jobname.dtx}{jawltxdoc}} +} +\generate{\file{rsc.jdf}{\from{chemstyle.dtx}{rsc}} \file{angew.jdf}{\from{chemstyle.dtx}{angew}} + \file{jomc.jdf}{\from{chemstyle.dtx}{jomc}} \file{jacs.jdf}{\from{chemstyle.dtx}{jacs}} \file{ic.jdf}{\from{chemstyle.dtx}{ic}} \file{jpc.jdf}{\from{chemstyle.dtx}{jpc}} \file{orglett.jdf}{\from{chemstyle.dtx}{orglett}} \file{none.jdf}{\from{chemstyle.dtx}{none}} - \file{jawltxdoc.sty}{\from{\jobname.dtx}{jawltxdoc}} } \endbatchfile %</install> @@ -119,7 +122,7 @@ %</driver> % \fi % -%\CheckSum{611} +%\CheckSum{645} % % \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 @@ -152,6 +155,7 @@ %\changes{v1.1c}{2007/09/23}{Fixed problems with capitalisation % of \texttt{SIunits}} %\changes{v1.1c}{2007/09/23}{Documentation improved} +%\changes{v1.1e}{2007/10/07}{Fixed packaging problem} % %\DoNotIndex{\@fs@capt,\@fs@cfont,\@fs@iftopcapt,\@fs@mid,\@fs@post} %\DoNotIndex{\@fs@pre,\@ifclassloaded,\@ifnextchar,\@ifpackageloaded} @@ -177,7 +181,7 @@ %\DoNotIndex{\xspace,\@tempa,\@tempb,\centi,\cubed,\deci} %\DoNotIndex{\DeclareMathSymbol,\DeclareSymbolFont,\dm} %\DoNotIndex{\mathord,\metre,\milli,\mole,\relax,\spacefactor} -%\DoNotIndex{\usk,\futurelet} +%\DoNotIndex{\usk,\futurelet,\@ifundefined} % % \title{\texttt{chemstyle} --- Writing chemistry with style% % \thanks{This file describes version \fileversion, last revised @@ -238,6 +242,8 @@ % \midrule % none & Not applicable\\ % angew & \emph{Angew.\ Chem.}, \emph{Chem.\ Eur.\ J.} \\ +% jomc & \emph{J.\ Organomet.\ Chem.}, +% \emph{Coord.\ Chem.\ Rev.} \\ % ic & \emph{Inorg.\ Chem.} \\ % jacs & \emph{J.\ Am.\ Chem.\ Soc.} \\ % jcp & \emph{J.\ Phys.\ Chem.\ A}, \emph{J.\ Phys.\ Chem.\ B} \\ @@ -527,7 +533,7 @@ % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{chemstyle} - [2007/10/04 v1.1d Writing chemistry with style] + [2007/10/19 v1.1g Writing chemistry with style] % \end{macrocode} %\changes{v1.1d}{2007/10/04}{Require caption in all cases} %\changes{v1.0a}{2007/08/23}{No longer load \texttt{fixltx2e} @@ -784,10 +790,13 @@ % \end{macrocode} % %\subsection{Cross-references} +%\changes{v1.1g}{2007/10/19}{Fixed problem with cross-referencing +% when \texttt{babel} is not loaded} % The naming for cross-references is sorted out properly using the % |varioref| package. % \begin{macrocode} -\labelformat{scheme}{\schemename~#1} +\AtBeginDocument{% + \labelformat{scheme}{\schemename~#1}} \labelformat{figure}{\figurename~#1} \labelformat{table}{\tablename~#1} % \end{macrocode} @@ -848,6 +857,7 @@ %\end{macro} %\begin{macro}{\cst@addpunct} %\changes{v1.1}{2007/09/17}{New macro} +%\changes{v1.1f}{2007/10/14}{No longer used when comma not required} %\begin{macro}{\cst@add@punct} %\changes{v1.1}{2007/09/17}{New macro} %\begin{macro}{\cst@add@punct@} @@ -888,18 +898,12 @@ \fi \@tempb% } -% \end{macrocode} -%\end{macro} -%\end{macro} -% The case where a comma is not needed is much more simple. No fancy -% work is done; instead a single check is made on the next character. -% \begin{macrocode} - \else - \def\cst@addpunct{\@ifnextchar.{}{\spacefactor999.\cst@xspace}} \fi } % \end{macrocode} %\end{macro} +%\end{macro} +%\end{macro} % %\begin{macro}{\cst@xspace} % The use of |xspace| is optional; this is handled using a package @@ -917,10 +921,15 @@ %\begin{macro}{\etc} %\begin{macro}{\invacuo} %\begin{macro}{\etal} +%\changes{v1.1f}{2007/10/14}{Fixed problem with full stop spacing} %\begin{macro}{\eg} %\changes{v1.1}{2007/09/17}{Adds comma for ACS journals} +%\changes{v1.1f}{2007/10/14}{Fixed problem with full stop spacing} +%\changes{v1.1f}{2007/10/14}{Definition comma-mode dependent} %\begin{macro}{\ie} %\changes{v1.1}{2007/09/17}{Adds comma for ACS journals} +%\changes{v1.1f}{2007/10/14}{Fixed problem with full stop spacing} +%\changes{v1.1f}{2007/10/14}{Definition comma-mode dependent} % For the macros themselves, care is taken about trailing full stops. % The \cmd{\xspace} command deals with any problems of spacing. % Things could go wrong with complex punctuation, as no other checks @@ -930,15 +939,22 @@ \ifcst@phrases \AtBeginDocument{ \providecommand{\etc}% - {\latin{etc}\@ifnextchar.{}{.\cst@xspace}} + {\@ifnextchar.{\cst@etc}{\cst@etc.\cst@xspace}} \providecommand{\invacuo}% {\latin{in vacuo}\cst@xspace} \providecommand{\etal}% - {\latin{et~al}\@ifnextchar.{}{.\cst@xspace}} - \providecommand{\eg}% - {\latin{e.g}\cst@addpunct} - \providecommand{\ie}% - {\latin{i.e}\cst@addpunct} + {\@ifnextchar.{\cst@etal}{\cst@etal.\cst@xspace}} + \ifcst@comma + \providecommand{\eg}% + {\cst@eg\cst@addpunct} + \providecommand{\ie}% + {\cst@ie\cst@addpunct} + \else + \providecommand{\eg}% + {\@ifnextchar.{\cst@eg}{\cst@eg.\cst@xspace}} + \providecommand{\ie}% + {\@ifnextchar.{\cst@ie}{\cst@ie.\cst@xspace}} + \fi } \fi % \end{macrocode} @@ -947,6 +963,28 @@ % \end{macro} % \end{macro} % \end{macro} +%\begin{macro}{\cst@etal} +%\changes{v1.1f}{2007/10/14}{New macro} +%\begin{macro}{\cst@etc} +%\changes{v1.1f}{2007/10/14}{New macro} +%\begin{macro}{\cst@eg} +%\changes{v1.1f}{2007/10/14}{New macro} +%\begin{macro}{\cst@ie} +%\changes{v1.1f}{2007/10/14}{New macro} +% Internal macros are used for items ending in a full stop, to allow +% clean handling of spacing. Notice that \cmd{\ie} and \cmd{\eg} +% cannot come at the end of a sentence, they are designed to give +% only an inter-word space. +% \begin{macrocode} +\def\cst@etal{\latin{et~al}} +\def\cst@etc{\latin{etc}} +\def\cst@ie{\latin{i.e\spacefactor999\relax}} +\def\cst@eg{\latin{e.g\spacefactor999\relax}} +% \end{macrocode} +%\end{macro} +%\end{macro} +%\end{macro} +%\end{macro} % % \subsection{Handling section naming} % @@ -979,26 +1017,28 @@ % \end{macrocode} % \end{macro} % \begin{macro}{\cst@refsection} +%\changes{v1.1g}{2007/10/19}{Changed to use \cs{@ifundefined}} % The existence of a suitable reference section name command is % checked here. Some document classes (\eg\ minimal) may not define % a suitable command. Assuming that is not the case, % \cmd{\cst@refsection} is used to store the name of the macro % holding the references section. % \begin{macrocode} -\ifx\refname\@undefined - \ifx\bibname\@undefined - \PackageWarning{chemstyle}% - {No bibliography name command defined in document class} - \def\cst@namerefs#1#2#3#4{}% - \else - \def\cst@refsection{\bibname} - \fi - \else - \def\cst@refsection{\refname} -\fi +\@ifundefined{refname}{% + \@ifundefined{bibname}{% + \PackageWarning{chemstyle}% + {No bibliography name command defined in document class}% + \def\cst@namerefs#1#2#3#4{}% + }{% + \def\cst@refsection{\bibname}% + } +}{% + \def\cst@refsection{\refname}% +} % \end{macrocode} % \end{macro} % \begin{macro}{\cst@namerefs} +%\changes{v1.1g}{2007/10/19}{Changed to use \cs{@ifundefined}} % \begin{macro}{\cst@language@check} % The main macro of the heading-altering section takes four % arguments, \marg{language}, \marg{references}, \marg{and} @@ -1006,7 +1046,7 @@ % that the words are four, and the other three parameters and the % words ``References'', ``and'' and ``Notes'', respectively. % \begin{macrocode} -\ifx\cst@namerefs\@undefined +\@ifundefined{cst@namerefs}{% \def\cst@namerefs#1#2#3#4{% \ifcst@notes% % \end{macrocode} @@ -1048,7 +1088,7 @@ {}} \fi% } -\fi +}{} % \end{macrocode} % \end{macro} % \end{macro} @@ -1104,14 +1144,12 @@ % \fi % % \subsection{RSC style} -%\changes{v1.0b}{2007/09/04}{Fixed formatting of alkyls} -%\changes{v1.1}{2007/09/17}{Fixed (another) error in alkyl formatting} -% \begin{macrocode} -\ProvidesFile{rsc.jdf}[2007/10/04 v1.1d] -% \end{macrocode} %\changes{v1.0b}{2007/09/04}{Sorted a problem with \texttt{babel} % and figure name format} +%\changes{v1.0b}{2007/09/04}{Fixed formatting of alkyls} +%\changes{v1.1}{2007/09/17}{Fixed (another) error in alkyl formatting} % \begin{macrocode} +\ProvidesFile{rsc.jdf}[2007/10/19 v1.1g] \AtBeginDocument{% \renewcommand{\figurename}{Fig.}} \captionsetup{labelsep=quad,labelfont=bf} @@ -1131,7 +1169,7 @@ %\changes{v1.0a}{2007/08/23}{Fixed incorrect Latin formatting for % \texttt{angew} option} % \begin{macrocode} -\ProvidesFile{angew.def}[2007/09/2 v1.1c] +\ProvidesFile{angew.def}[2007/10/19 v1.1g] \captionsetup{labelsep=period,labelfont={bf,it},font=sf,singlelinecheck=off} \captionsetup[table]{labelsep=colon} \let\cst@emph\emph @@ -1143,12 +1181,32 @@ % \end{macrocode} % \iffalse %</angew> +%<*jomc> +% \fi +% +%\subsection{\emph{J.~Organomet.~Chem.}~style} +%\changes{v1.1g}{2007/10/19}{Added \texttt{jomc} style} +% \begin{macrocode} +\ProvidesFile{jomc.def}[2007/10/19 v1.1g] +\captionsetup{labelsep=period} +\captionsetup[table]{labelsep=newline,singlelinecheck=off} +\AtBeginDocument{% + \renewcommand{\figurename}{Fig.}} +\let\cst@emph\emph +\def\cst@hyph{} +\let\cst@super\textsuperscript +\cst@prefixtrue +\latinemphoff +\cst@commafalse +% \end{macrocode} +% \iffalse +%</jomc> %<*jacs> % \fi % %\subsection{\emph{J.~Am.~Chem.~Soc.}~style} % \begin{macrocode} -\ProvidesFile{jacs.jdf}[2007/10/04 v1.1d] +\ProvidesFile{jacs.jdf}[2007/10/19 v1.1g] \DeclareCaptionLabelSeparator{perquad}{.\quad} \captionsetup{labelfont={bf,it,sf},textfont=sf,labelsep=perquad} \captionsetup[figure]{textfont=rm} @@ -1173,7 +1231,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/09/2 v1.1c] +\ProvidesFile{ic.jdf}[2007/10/19 v1.1g] \input {jacs.jdf} \captionsetup{textfont=rm} % \end{macrocode} @@ -1185,7 +1243,7 @@ %\subsection{\emph{J.~Phys.~Chem.}~style} %\changes{v1.0a}{2007/08/23}{Added \emph{J.~Phys.~Chem.}~style} % \begin{macrocode} -\ProvidesFile{jpc.jdf}[2007/10/04 v1.1d] +\ProvidesFile{jpc.jdf}[2007/10/19 v1.1g] \DeclareCaptionFormat{labelcaps}{\MakeUppercase{#1}#2#3} \captionsetup{font=bf,labelsep=colon,format=labelcaps} \captionsetup[figure]{format=plain,textfont=md,labelsep=period} @@ -1209,7 +1267,7 @@ %\subsection{\emph{Org.~Lett.}~style} %\changes{v1.0a}{2007/08/23}{Added \emph{Org.~Lett.}~style} % \begin{macrocode} -\ProvidesFile{orglett.jdf}[2007/10/04 v1.1d] +\ProvidesFile{orglett.jdf}[2007/10/19 v1.1g] \RequirePackage{xcolor} % \end{macrocode} %\begin{macro}{\OrgLettColour} @@ -1285,7 +1343,7 @@ % style of the RSC is followed. % % \begin{macrocode} -\ProvidesFile{none.jdf}[2007/10/04 v1.1d] +\ProvidesFile{none.jdf}[2007/10/19 v1.1g] \floatstyle{plain} \restylefloat{table} \labelformat{scheme}{#1} @@ -1313,14 +1371,15 @@ % \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{jawltxdoc} - [2007/10/04 v1.0a] + [2007/10/14 v1.0b] % First of all, a number of support packages are loaded. \usepackage[T1]{fontenc} \usepackage[english,UKenglish]{babel} \usepackage[scaled=0.95]{helvet} \usepackage[version=3]{mhchem} \usepackage[final]{microtype} -\usepackage{mathpazo,booktabs,array,url,graphicx,courier,unitsdef} +\usepackage[osf]{mathpazo} +\usepackage{booktabs,array,url,graphicx,courier,unitsdef} \usepackage{upgreek,ifpdf,listings} % If using PDFLaTeX, the source will be attached to the PDF. This % is basically the system used by Heiko Oberdiek, but with a check diff --git a/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins b/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins index 17b4b24359c..c2a5f5c5877 100644 --- a/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins +++ b/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins @@ -30,14 +30,16 @@ \usedir{tex/latex/contib/chemstyle} \generate{\file{\jobname.ins}{\from{\jobname.dtx}{install}} \file{\jobname.sty}{\from{\jobname.dtx}{package}} - \file{rsc.jdf}{\from{chemstyle.dtx}{rsc}} + \file{jawltxdoc.sty}{\from{\jobname.dtx}{jawltxdoc}} +} +\generate{\file{rsc.jdf}{\from{chemstyle.dtx}{rsc}} \file{angew.jdf}{\from{chemstyle.dtx}{angew}} + \file{jomc.jdf}{\from{chemstyle.dtx}{jomc}} \file{jacs.jdf}{\from{chemstyle.dtx}{jacs}} \file{ic.jdf}{\from{chemstyle.dtx}{ic}} \file{jpc.jdf}{\from{chemstyle.dtx}{jpc}} \file{orglett.jdf}{\from{chemstyle.dtx}{orglett}} \file{none.jdf}{\from{chemstyle.dtx}{none}} - \file{jawltxdoc.sty}{\from{\jobname.dtx}{jawltxdoc}} } \endbatchfile \endinput |