From 6e3aed01a902165bea587b4672d2d8311c5df231 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 21 Oct 2007 00:44:56 +0000 Subject: chemstyle update (21oct07) git-svn-id: svn://tug.org/texlive/trunk@5246 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/chemstyle/angew.jdf | 2 +- .../texmf-dist/tex/latex/chemstyle/chemstyle.sty | 85 ++++++++++++++-------- Master/texmf-dist/tex/latex/chemstyle/ic.jdf | 2 +- Master/texmf-dist/tex/latex/chemstyle/jacs.jdf | 2 +- .../texmf-dist/tex/latex/chemstyle/jawltxdoc.sty | 5 +- Master/texmf-dist/tex/latex/chemstyle/jomc.jdf | 29 ++++++++ Master/texmf-dist/tex/latex/chemstyle/jpc.jdf | 2 +- Master/texmf-dist/tex/latex/chemstyle/none.jdf | 2 +- Master/texmf-dist/tex/latex/chemstyle/orglett.jdf | 2 +- Master/texmf-dist/tex/latex/chemstyle/rsc.jdf | 2 +- 10 files changed, 92 insertions(+), 41 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/chemstyle/jomc.jdf (limited to 'Master/texmf-dist/tex/latex/chemstyle') diff --git a/Master/texmf-dist/tex/latex/chemstyle/angew.jdf b/Master/texmf-dist/tex/latex/chemstyle/angew.jdf index 045a7bc40e7..9579f2c9805 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/angew.jdf +++ b/Master/texmf-dist/tex/latex/chemstyle/angew.jdf @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\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 diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty index c9419381d96..0e996cd8909 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty +++ b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty @@ -6,16 +6,17 @@ %% %% chemstyle.dtx (with options: `package') %% ---------------------------------------------------------------- -%% chemstyle - Writing chemistry with style +%% The chemstyle package --- Writing chemistry with style %% 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 %% ---------------------------------------------------------------- +%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{chemstyle} - [2007/09/18 v1.1a Writing chemistry with style] -\RequirePackage{graphicx,varioref} + [2007/10/19 v1.1g Writing chemistry with style] +\RequirePackage{graphicx,varioref,caption} \let\cst@emph\relax \def\cst@hyph{} \let\cst@super\relax @@ -50,6 +51,7 @@ \DeclareOption{nonotes}{\cst@notesfalse} \DeclareOption{nophrases}{\cst@phrasesfalse} \DeclareOption{siunits}{\cst@sitrue} +\DeclareOption{SIunits}{\cst@sitrue} \DeclareOption{xspace}{\cst@xspacetrue} \let\cst@option\relax \DeclareOption*{% @@ -59,18 +61,25 @@ \fi \edef\cst@option{\CurrentOption} } -\@ifpackageloaded{siunits} +\@ifpackageloaded{SIunits} {\ExecuteOptions{siunits}} - {} + {\@ifpackageloaded{siunits} + {\ExecuteOptions{siunits}} + {}} \ProcessOptions* \ifcst@si \@ifpackageloaded{unitsdef} {\PackageWarning{chemstyle}{% - You have set the siunits option,\MessageBreak + You have set the SIunits option,\MessageBreak but have already loaded unitsdef!\MessageBreak unitsdef will be used for extra unit macros} \cst@sifalse} - {\RequirePackage{siunits}} + {\AtBeginDocument{% + \@ifpackageloaded{siunits}% + {} + {\RequirePackage{SIunits}}% + } + } \else \ifx\fg\@undefined \else @@ -109,9 +118,9 @@ \newcommand{\cmc}{\cubiccentimeter} \newcommand{\Hz}{\hertz} \DeclareSymbolFont{CSTAMS}{U}{msb}{m}{n} -\DeclareMathSymbol{\cst@varnothing} {\mathord}{CSTAMS}{"3F} -\newcommand*{\standardstate}% - {\textsuperscript{\rotatebox[origin=c]{140.8}% +\DeclareMathSymbol{\cst@varnothing}{\mathord}{CSTAMS}{"3F} +\providecommand*{\standardstate}% + {\textsuperscript{\rotatebox[origin=c]{138.8}% {\ensuremath{\cst@varnothing}}}} \@ifclassloaded{memoir} {\let\newfloat\@undefined @@ -126,7 +135,8 @@ \floatplacement{scheme}{htbp} \floatplacement{figure}{htbp} \floatcontentscentre -\labelformat{scheme}{\schemename~#1} +\AtBeginDocument{% + \labelformat{scheme}{\schemename~#1}} \labelformat{figure}{\figurename~#1} \labelformat{table}{\tablename~#1} \let\latinemphon\relax @@ -162,8 +172,6 @@ \fi \@tempb% } - \else - \def\cst@addpunct{\@ifnextchar.{}{\spacefactor999.\cst@xspace}} \fi } \ifcst@xspace @@ -175,17 +183,28 @@ \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 +\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}} \newif \ifcst@notesbefore \cst@notesbeforetrue \def\cst@name@refs#1#2#3{% \ifcst@notesbefore @@ -195,18 +214,18 @@ \fi } \def\cst@language{english} -\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 -\ifx\cst@namerefs\@undefined +\@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}% +} +\@ifundefined{cst@namerefs}{% \def\cst@namerefs#1#2#3#4{% \ifcst@notes% \def\cst@language@check{#1} @@ -233,11 +252,13 @@ {}} \fi% } -\fi +}{} \cst@namerefs{english}{References}{and}{Notes} \cst@namerefs{UKenglish}{References}{and}{Notes} \cst@namerefs{ngerman}{Literatur}{und}{Notizen} +\cst@namerefs{german}{Literatur}{und}{Notizen} \cst@namerefs{french}{R\'ef\'erences}{et}{Notes} +\cst@namerefs{frenchb}{R\'ef\'erences}{et}{Notes} \ifx\cst@option\relax \PackageWarning{chemstyle} {You didn't say which style to use \MessageBreak diff --git a/Master/texmf-dist/tex/latex/chemstyle/ic.jdf b/Master/texmf-dist/tex/latex/chemstyle/ic.jdf index f8692ee46a7..1972d96398e 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/ic.jdf +++ b/Master/texmf-dist/tex/latex/chemstyle/ic.jdf @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\ProvidesFile{ic.jdf}[2007/09/2 v1.1c] +\ProvidesFile{ic.jdf}[2007/10/19 v1.1g] \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 637bb2f3cda..2af1f1b9933 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/jacs.jdf +++ b/Master/texmf-dist/tex/latex/chemstyle/jacs.jdf @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\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} diff --git a/Master/texmf-dist/tex/latex/chemstyle/jawltxdoc.sty b/Master/texmf-dist/tex/latex/chemstyle/jawltxdoc.sty index ef86d060f5f..fe7d9ec4135 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/jawltxdoc.sty +++ b/Master/texmf-dist/tex/latex/chemstyle/jawltxdoc.sty @@ -15,13 +15,14 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{jawltxdoc} - [2007/10/04 v1.0a] + [2007/10/14 v1.0b] \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} \ifpdf \usepackage{embedfile} diff --git a/Master/texmf-dist/tex/latex/chemstyle/jomc.jdf b/Master/texmf-dist/tex/latex/chemstyle/jomc.jdf new file mode 100644 index 00000000000..f358034cfc2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/chemstyle/jomc.jdf @@ -0,0 +1,29 @@ +%% +%% This is file `jomc.jdf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% chemstyle.dtx (with options: `jomc') +%% ---------------------------------------------------------------- +%% The chemstyle package --- Writing chemistry with style +%% 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 +%% ---------------------------------------------------------------- +%% +\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 +\endinput +%% +%% End of file `jomc.jdf'. diff --git a/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf b/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf index d01452191f6..f6f5097b20e 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf +++ b/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\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} diff --git a/Master/texmf-dist/tex/latex/chemstyle/none.jdf b/Master/texmf-dist/tex/latex/chemstyle/none.jdf index 36b062339b4..0a0b810989d 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/none.jdf +++ b/Master/texmf-dist/tex/latex/chemstyle/none.jdf @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\ProvidesFile{none.jdf}[2007/10/04 v1.1d] +\ProvidesFile{none.jdf}[2007/10/19 v1.1g] \floatstyle{plain} \restylefloat{table} \labelformat{scheme}{#1} diff --git a/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf b/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf index 8d48f55352d..8dd149a0547 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf +++ b/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\ProvidesFile{orglett.jdf}[2007/10/04 v1.1d] +\ProvidesFile{orglett.jdf}[2007/10/19 v1.1g] \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 f4c4d419c6a..8992099530e 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/rsc.jdf +++ b/Master/texmf-dist/tex/latex/chemstyle/rsc.jdf @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\ProvidesFile{rsc.jdf}[2007/10/04 v1.1d] +\ProvidesFile{rsc.jdf}[2007/10/19 v1.1g] \AtBeginDocument{% \renewcommand{\figurename}{Fig.}} \captionsetup{labelsep=quad,labelfont=bf} -- cgit v1.2.3