chemstyle 2 (6jun09)

git-svn-id: svn://tug.org/texlive/trunk@13659 c570f23f-e606-0410-a88d-b1316a301751

18 files changed, 1223 insertions, 833 deletions

diff --git a/Master/texmf-dist/tex/latex/chemstyle/angew.jdf b/Master/texmf-dist/tex/latex/chemstyle/angew.jdf
deleted file mode 100644
index 0d29eb3c51f..00000000000
--- a/Master/texmf-dist/tex/latex/chemstyle/angew.jdf
+++ /dev/null
@@ -1,30 +0,0 @@
-%%
-%% This is file `angew.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `angew')
-%%  ----------------------------------------------------------------
-%%  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
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{angew.def}
-  [\cst@ver Angew. Chem. journal style]
-\captionsetup{labelsep=period,labelfont={bf,it},font=sf,
-  singlelinecheck=off}
-\captionsetup[table]{labelsep=colon}
-\setkeys[cst]{opt}{
-  radprefix=true,
-  rademph=true,
-  radsuper=false,
-  radhyphen=false,
-  abbremph=false,
-  abbrcomma=false}
-\endinput
-%%
-%% End of file `angew.jdf'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty b/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty
index 461cbe2cb76..3f4e61317ae 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty
+++ b/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty
@@ -4,256 +4,324 @@
 %%
 %% The original source files were:
 %%
-%% chemscheme.dtx  (with options: `package')
-%%  ----------------------------------------------------------------
-%%  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
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% chemstyle.dtx  (with options: `chemscheme')
+%% ----------------------------------------------------------------
+%% 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
+%% ----------------------------------------------------------------
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\def\csh@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
-    #5/#6/#7\space v1.4a\space}
 \ProvidesPackage{chemscheme}
-  [\csh@id $Id: chemscheme.dtx 48 2008-07-31 19:22:43Z joseph $
-   Support for chemical schemes]
-\RequirePackage{kvoptions,psfrag,iflang}
+  [2009/06/06 v2.0 Schemes for chemistry]
+\RequirePackage{kvoptions,psfrag}
 \SetupKeyvalOptions{
-  family=csh,
-  prefix=csh@}
-\newif\ifcsh@bpchem
-\define@key{csh}{tracking}
-  {\csh@bpchemtrue
-   \lowercase{\edef\@tempa{#1}}%
-   \def\@tempb{bpchem}%
-   \ifx\@tempa\@tempb\else
-     \def\@tempb{chemcompounds}%
-     \ifx\@tempa\@tempb
-       \csh@bpchemfalse
-     \else
-       \PackageError{chemscheme}
-         {Unknown value `#1' for option numbers}
-         {The `tracking' option accepts values `bpchem'
-          and `chemcompounds'}%
-     \fi
-   \fi}
-\DeclareVoidOption{chemcompounds}{\csh@bpchemfalse}
-\DeclareVoidOption{bpchem}{\csh@bpchemtrue}
-\DeclareVoidOption{chapter}
-  {\PackageInfo{chemscheme}
-    {Ignoring obsolete option `chapter'}}
-\define@key{csh}{floats}
-  {\lowercase{\renewcommand*{\csh@fltpkg}{#1}}%
-   \def\@tempa{floatrow}%
-   \ifx\csh@fltpkg\@tempa\else
-     \def\@tempa{float}%
-     \ifx\csh@fltpkg\@tempa\else
-       \def\@tempa{memoir}%
-       \ifx\csh@fltpkg\@tempa
-         \@ifclassloaded{memoir}{}
-           {\PackageWarning{chemscheme}
-            {You asked for floats to be created using memoir,
-             \MessageBreak but have used a different document
-             class\MessageBreak Using floatrow instead}%
-            \renewcommand*{\csh@fltpkg}{floatrow}}%
-       \else
-         \PackageError{chemscheme}
-           {Unknown value `#1' for option numbers}
-           {The `floats' option accepts values `float',
-            `floatrow' and `memoir'}%
-       \fi
-     \fi
-   \fi}
-\@ifpackageloaded{floatrow}
-  {\newcommand*{\csh@fltpkg}{floatrow}%
-   \define@key{csh}{floats}
-     {\PackageInfo{chemscheme}{Package floatrow already
-      loaded\MessageBreak Option `floats' disabled}}}
-  {\@ifpackageloaded{float}
-     {\newcommand*{\csh@fltpkg}{float}%
-      \define@key{csh}{floats}
-        {\PackageInfo{chemscheme}{Package float already
-         loaded\MessageBreak Option `floats' disabled}}}
-     {\@ifclassloaded{memoir}
-        {\newcommand*{\csh@fltpkg}{memoir}}
-        {\newcommand*{\csh@fltpkg}{floatrow}}}}
-\ProcessKeyvalOptions{csh}
-\newcommand*{\csh@load@memoir}{}
-\newcommand*{\csh@load@float}{%
-  \@ifpackageloaded{float}{}
-    {\let\newfloat\@undefined}
-  \RequirePackage{float,caption}}
-\newcommand*{\csh@load@floatrow}{%
-  \@ifpackageloaded{floatrow}{}
-    {\let\newfloat\@undefined}
-  \RequirePackage{floatrow,caption}}
-\csname csh@load@\csh@fltpkg\endcsname
-\newcommand*{\schemename}{Scheme}
-\newcommand*{\listschemename}{List of Schemes}
-\newcommand*{\csh@makesch@memoir}{%
-  \AtBeginDocument{\csh@mksch@memoir}}
-\newcommand*{\csh@mksch@memoir}{%
-  \newfloat[chapter]{scheme}{los}{\schemename}
-  \kill@lastcounter{losdepth}
-  \renewcommand*{\thescheme}{\thechapter.\@arabic\c@scheme}
-  \addtodef{\@smemfront}{}{\counterwithout{scheme}{chapter}}
+  family=cst,
+  prefix=cst@
+}
+\DeclareBoolOption[true]{chemcompounds}
+\DeclareComplementaryOption{bpchem}{chemcompounds}
+\DeclareBoolOption[true]{floatrow}
+\define@key{cst}{tracking}[chemcompounds]{%
+  \edef\KVO@param{#1}%
+  \@onelevel@sanitize\KVO@param
+  \ifx\KVO@param\cst@opt@bpchem
+    \expandafter\cst@chemcompoundsfalse
+  \else
+    \ifx\KVO@param\cst@opt@chemcompounds
+      \expandafter\expandafter\expandafter\cst@chemcompoundstrue
+    \else
+      \expandafter\expandafter\expandafter\cst@opt@ref@error
+    \fi
+  \fi
+}
+\newcommand*\cst@opt@bpchem{bpchem}
+\newcommand*\cst@opt@chemcompounds{chemcompounds}
+\newcommand*\cst@opt@ref@error{%
+  \PackageWarning{chemscheme}{%
+    Value `\KVO@param' is not supported by\MessageBreak
+    option `tracking'%
+  }%
+}
+\newif\ifcst@memoir
+\define@key{cst}{floats}{%
+  \edef\KVO@param{#1}%
+  \cst@floatrowtrue
+  \cst@memoirfalse
+  \ifx\KVO@param\cst@opt@float
+    \expandafter\cst@floatrowfalse
+  \else
+    \ifx\KVO@param\cst@opt@floatrow\else
+      \ifx\KVO@param\cst@opt@memoir
+        \expandafter\expandafter\expandafter\expandafter
+        \expandafter\expandafter\expandafter\cst@memoirtrue
+      \else
+        \expandafter\expandafter\expandafter\expandafter
+        \expandafter\expandafter\expandafter\cst@opt@floats@error
+      \fi
+    \fi
+  \fi
+}
+\newcommand*\cst@opt@float{float}
+\newcommand*\cst@opt@floatrow{floatrow}
+\newcommand*\cst@opt@memoir{memoir}
+\newcommand*\cst@opt@floats@error{%
+  \PackageWarning{chemscheme}{%
+    Value `\KVO@param' is not supported by\MessageBreak
+    option `floats'%
+  }%
+}
+\newcommand*\cst@float@pkg{}
+\newcommand*\cst@float@execute{}
+\newcommand*\cst@float@load{%
+  \IfFileExists{floatrow.sty}{}{%
+    \ifcst@floatrow
+      \expandafter\cst@floatrowfalse
+    \fi
+  }%
+  \ifcst@floatrow
+    \expandafter\cst@float@load@floatrow
+  \else
+    \expandafter\cst@float@load@float
+  \fi
+}
+\newcommand*\cst@float@load@float{%
+  \RequirePackage{float}
+  \def\cst@float@pkg{float}
+  \def\cst@float@execute{\AtBeginDocument}
+}
+\newcommand*\cst@float@load@floatrow{%
+  \RequirePackage{floatrow}
+  \def\cst@float@pkg{floatrow}
+  \def\cst@float@execute{\@firstofone}
+}
+\newcommand*\cst@float@chapter@hook{}
+\newcommand*\cst@float@chapter{}
+\ifx\@chapter\@undefined\else
+  \let\cst@float@chapter\@chapter
+  \def\@chapter{%
+    \cst@float@chapter@hook
+    \cst@float@chapter
+  }
+\fi
+\newcommand*\cst@float@chapter@fix{%
+  \g@addto@macro{\cst@float@chapter@hook}{%
+    \addtocontents{los}{\protect\addvspace{10\p@}}%
+  }%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname KOMAScriptVersion\endcsname\relax
+    \@namedef{thescheme}{%
+      \ifnum\c@chapter>\z@\relax
+        \thechapter.%
+      \fi
+      \arabic{scheme}%
+    }%
+  \fi
+}
+\newcommand*\cst@float@make@float{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname chapter\endcsname\relax
+    \newfloat{scheme}{tbp}{los}%
+  \else
+    \newfloat{scheme}{tbp}{los}[chapter]%
+    \expandafter\cst@float@chapter@fix
+  \fi
+  \floatname{scheme}{\schemename}%
+  \newcommand*\listofschemes{%
+    \listof{scheme}{\listschemename}%
+  }%
+}
+\newcommand*\cst@float@make@floatrow{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname chapter\endcsname\relax
+    \DeclareNewFloatType{scheme}{%
+      fileext   = los,
+      placement = tbp,
+      name      = Scheme
+    }%
+  \else
+    \DeclareNewFloatType{scheme}{%
+      fileext   = los,
+      placement = tbp,
+      name      = Scheme,
+      within    = chapter
+    }%
+    \cst@float@chapter@fix
+  \fi
+  \newcommand*\listofschemes{%
+    \listof{scheme}{\listschemename}%
+  }%
+}
+\newcommand*\cst@float@make@memoir{%
+  \newfloat[chapter]{scheme}{los}{\schemename}%
+  \newlistof{listofschemes}{los}{\listschemename}%
+  \addtodef{\@smemfront}{}{\counterwithout{scheme}{chapter}}%
   \addtodef{\@smemmain}{}{%
     \ifartopt\else
-      \counterwithin{scheme}{chapter}
-    \fi}
+      \counterwithin{scheme}{chapter}%
+    \fi
+  }%
   \addtodef{\backmatter}{}{%
     \ifartopt\else
       \counterwithout{scheme}{chapter}%
       \setcounter{scheme}{0}%
-    \fi}
+    \fi
+  }%
+  \newlistentry[chapter]{scheme}{los}{0}%
+  \cftsetindents{scheme}{0em}{2.3em}%
+  \addtodef{\insertchapterspace}{}{%
+    \addtocontents{los}{\protect\addvspace{10pt}}%
+  }%
   \ifartopt
     \counterwithout{scheme}{chapter}%
   \fi
-  \newlistof{listofschemes}{los}{\listschemename}
-  \kill@lastcounter{losdepth}
-  \newlistentry[chapter]{scheme}{los}{0}
-  \cftsetindents{scheme}{0em}{2.3em}
-  \addtodef{\insertchapterspace}{}%
-    {\addtocontents{los}{\protect\addvspace{10pt}}}
-  \@ifundefined{c@losdepth}%
-    {\newcounter{losdepth}\setcounter{losdepth}{1}}{}}
-\newcommand*{\csh@makesch@float}{%
-  \AtBeginDocument{\csh@mksch@float}}
-\newcommand*{\csh@mksch@float}{%
-  \@ifundefined{chapter}
-    {\newfloat{scheme}{tbp}{los}}
-    {\newfloat{scheme}{tbp}{los}[chapter]%
-     \csh@fixchapter}%
-  \floatname{scheme}{\schemename}
-  \newcommand*{\listofschemes}{%
-    \listof{scheme}{\listschemename}}}
-\newcommand*{\csh@makesch@floatrow}{%
-  \@ifundefined{chapter}
-    {\DeclareNewFloatType{scheme}
-      {fileext=los,placement=tbp,name=Scheme}}
-    {\DeclareNewFloatType{scheme}
-      {fileext=los,placement=tbp,name=Scheme,within=chapter}%
-     \csh@fixchapter}%
-  \newcommand*{\listofschemes}{%
-    \listof{scheme}{\listschemename}}}
-\newcommand*{\csh@fixchapter}{%
-  \@ifundefined{KOMAScriptVersion}
-    {\renewcommand*{\thescheme}{%
-       \ifnum\c@chapter>\z@ \thechapter.\fi \@arabic\c@scheme}}
-    {}%
-    \let\csh@chapter\@chapter
-    \renewcommand{\@chapter}{%
-      \addtocontents{los}{\protect\addvspace{10\p@}}%
-      \csh@chapter}}
-\csname csh@makesch@\csh@fltpkg\endcsname
-\def\@tempa{floatrow}
-\ifx\@tempa\csh@fltpkg
-  \newcommand*{\floatcontentscentre}{%
-    \floatsetup{objectset=centering}}
-  \newcommand*{\floatcontentscenter}{%
-    \floatsetup{objectset=centering}}
-  \newcommand*{\floatcontentsright}{%
-    \floatsetup{objectset=raggedleft}}
-  \newcommand*{\floatcontentsleft}{%
-    \floatsetup{objectset=raggedright}}
-\else
-  \let\csh@floatboxreset\@floatboxreset
-  \renewcommand*{\@floatboxreset}{%
-    \csh@everyfloat
-    \csh@floatboxreset}
+}
+\ProcessKeyvalOptions{cst}
+\@ifpackageloaded{floatrow}{%
+  \def\cst@float@pkg{floatrow}
+  \def\cst@float@execute{\@firstofone}
+}{%
+  \@ifpackageloaded{float}{%
+    \def\cst@float@pkg{float}
+    \def\cst@float@execute{\AtBeginDocument}
+  }{%
+    \@ifclassloaded{memoir}{%
+      \def\cst@float@pkg{memoir}
+      \def\cst@float@execute{\AtBeginDocument}
+    }{%
+      \@ifpackageloaded{chemstyle}{}{%
+        \cst@float@load
+      }%
+    }%
+  }%
+}
+\ifx\cst@float@pkg\cst@opt@memoir\else
+  \let\newfloat\@undefined
+\fi
+\@ifpackageloaded{chemstyle}{}{%
+  \cst@float@execute{\@nameuse{cst@float@make@\cst@float@pkg}}
+}
+\@ifpackageloaded{floatrow}{}{%
+  \newcommand*\schemename{Scheme}
+}
+\newcommand*\listschemename{List of Schemes}
+\AtBeginDocument{%
+  \@ifpackageloaded{babel}{%
+    \addto{\captionsfrench}{%
+      \def\listschemename{Table des sch\`emes}%
+      \def\schemename{{\scshape Sch\`eme}}%
+    }%
+    \addto{\captionsgerman}{%
+      \def\listschemename{Schemenverzeichnis}%
+      \def\schemename{Schema}%
+    }%
+    \expandafter\selectlanguage\expandafter{\languagename}%
+  }{}%
+}
+\@ifpackageloaded{floatrow}{%
+  \newcommand*\floatcontentscentre{%
+    \floatsetup{objectset=centering}%
+  }
+  \newcommand*\floatcontentscenter{%
+    \floatsetup{objectset=centering}%
+  }
+  \newcommand*\floatcontentsright{%
+    \floatsetup{objectset=raggedleft}%
+  }
+  \newcommand*\floatcontentsleft{%
+    \floatsetup{objectset=raggedright}%
+  }
+}{%
+  \newcommand*\cst@floatboxreset{}
+  \newcommand*\cst@everyfloat{}
+  \let\cst@floatboxreset\@floatboxreset
+  \def\@floatboxreset{%
+    \cst@everyfloat
+    \cst@floatboxreset
+  }
   \newcommand*{\floatcontentscentre}{%
-    \let\csh@everyfloat\centering}
+    \let\cst@everyfloat\centering
+  }
   \newcommand*{\floatcontentscenter}{%
-    \let\csh@everyfloat\centering}
+    \let\cst@everyfloat\centering
+  }
   \newcommand*{\floatcontentsleft}{%
-    \let\csh@everyfloat\relax}
+    \let\cst@everyfloat\relax
+  }
   \newcommand*{\floatcontentsright}{%
-    \let\csh@everyfloat\raggedleft}
-\fi
+    \let\cst@everyfloat\raggedleft
+  }
+}
 \floatcontentsleft
-\newif\ifcsh@babel
-\@ifpackageloaded{babel}
-  {\csh@babeltrue}
-  {}
-\@ifclassloaded{memoir}{}
-  {\@ifpackageloaded{babel}
-     {\IfLanguageName{french}
-        {\let\floatc@plain\FB@makecaption}
-        {\IfLanguageName{frenchb}
-          {\let\floatc@plain\FB@makecaption}
-          {}}}
-  {}}
-\AtBeginDocument{
-  \@ifpackageloaded{babel}
-    {\addto{\captionsngerman}{%
-       \renewcommand*{\schemename}{Schema}}
-     \addto{\captionsngerman}{%
-       \renewcommand*{\listschemename}{Schemenverzeichnis}}
-     \addto{\captionsgerman}{%
-       \renewcommand*{\schemename}{Schema}}
-     \addto{\captionsgerman}{%
-       \renewcommand*{\listschemename}{Schemenverzeichnis}}
-     \addto{\captionsfrench}{%
-       \renewcommand*{\schemename}{\scshape Sch\`eme}}
-     \addto{\captionsfrench}{%
-       \renewcommand*{\listschemename}{Table des sch\`emes}}
-     \addto{\captionsfrenchb}{%
-       \renewcommand*{\schemename}{\scshape Sch\`eme}}
-     \addto{\captionsfrenchb}{%
-       \renewcommand*{\listschemename}{Table des sch\`emes}}
-     \expandafter\selectlanguage\expandafter{\languagename}
-     \@ifclassloaded{memoir}{}
-       {\IfLanguageName{french}
-          {\ifcsh@babel\else
-             \let\floatc@plain\FB@makecaption
-           \fi}
-          {\IfLanguageName{frenchb}
-            {\ifcsh@babel\else
-               \let\floatc@plain\FB@makecaption
-             \fi}
-          {}}}
-      {}}{}}
-\newcommand*{\schemerefmarker}{TMP}
-\newcommand*{\schemerefformat}{\textsf}
-\ifcsh@bpchem
-  \RequirePackage{bpchem}
-  \let\csh@label\CNlabel
-\else
-  \RequirePackage{chemcompounds}
-  \let\csh@label\compound
-\fi
-\newcount\csh@num
-\newcommand*{\schemeref}{%
-  \advance\csh@num\@ne
-  \@ifnextchar[%]
-    {\csh@schemeref}
-    {\csh@schemeref[\schemerefmarker\the\csh@num]}}
-\def\csh@schemeref[#1]#2{%
-  \psfrag{#1}[b][b]
-    {\schemerefformat{\csh@label{#2}}}}
-\def\csh@schemerefsub[#1]#2#3{%
-  \psfrag{#1}[b][b]
-    {\schemerefformat{\CNlabelsub{#2}{#3}}}}
-\newcommand*{\chemschemeref}[1]{\schemeref[#1]}
-\ifcsh@bpchem
-  \newcommand*{\schemerefsub}{%
-    \advance\csh@num\@ne
-    \@ifnextchar[%]
-      {\csh@schemerefsub}
-      {\csh@schemerefsub[\schemerefmarker\the\csh@num]}}
-  \newcommand*{\chemschemerefsub}[1]{\schemerefsub[#1]}
-\else
-  \newcommand*{\schemerefsub}[3][]{%
-    \advance\csh@num\@ne
-    \PackageWarning{chemscheme}
-      {`chemcompound' option active\MessageBreak
-       Command \string\chemschemerefsub\space not used
-       \MessageBreak Please alter your source to \MessageBreak
-       \string\chemschemeref}}
-  \newcommand*{\chemschemerefsub}{\schemerefsub}
-\fi
-\endinput
+\newcommand*\schemerefmarker{TMP}
+\newcommand*\schemerefformat{\textsf}
+\newcount\cst@ref@count
+\newcommand*\cst@ref@label{}
+\newcommand*\cst@ref@load{%
+  \ifcst@chemcompounds
+    \RequirePackage{chemcompounds}
+    \let\cst@ref@label\compound
+  \else
+    \RequirePackage{bpchem}
+    \let\cst@ref@label\CNlabel
+  \fi
+}
+\@ifpackageloaded{chemstyle}{}{%
+  \cst@ref@load
+}
+\DeclareRobustCommand*\schemeref[2]
+  [\schemerefmarker\the\cst@ref@count]{%
+  \advance\cst@ref@count\@ne\relax
+  \psfrag{#1}[b][b]{%
+    \schemerefformat{\cst@ref@label{#2}}%
+  }%
+}
+\DeclareRobustCommand*\chemschemeref[1]{%
+  \schemeref[#1]%
+}
+\DeclareRobustCommand*\schemerefsub[3]
+  [\schemerefmarker\the\cst@ref@count]{%
+  \advance\cst@ref@count\@ne\relax
+  \psfrag{#1}[b][b]{%
+    \schemerefformat{\CNlabelsub{#2}{#3}}%
+  }%
+}
+\DeclareRobustCommand*\chemschemerefsub[1]{%
+  \schemerefsub[#1]%
+}
+\newcommand*\cst@ref@check@sub{%
+  \@ifpackageloaded{bpchem}{}{%
+    \def\schemerefsub[3][]{%
+      \PackageWarning{chemscheme}{%
+        \string\schemerefsub\space not available unless bpchem
+        \MessageBreak package is loaded
+      }%
+    }%
+  }%
+}
+\AtBeginDocument{\cst@ref@check@sub}
+
+%% 
+%% Copyright (C) 2006-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% 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 `chemscheme.sty'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
index 7fa7d048d33..7fa4babf398 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
+++ b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
@@ -5,316 +5,477 @@
 %% The original source files were:
 %%
 %% chemstyle.dtx  (with options: `package')
-%%  ----------------------------------------------------------------
-%%  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
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% 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
+%% ----------------------------------------------------------------
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\def\cst@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
-    \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{amstext,graphicx,varioref,caption,xspace}
-\newcommand*{\cst@tempa}{}
-\newcommand*{\cst@tempb}{}
-\newcommand*{\cst@boolkey}[1]{
-  \define@boolkey[cst]{opt}[cst@]{#1}[true]{}}
-\cst@boolkey{chemcompounds}
-\cst@boolkey{floatrow}
-\cst@boolkey{xspace}
-\cst@boolkey{phrases}
-\cst@boolkey{radprefix}
-\cst@boolkey{rademph}
-\cst@boolkey{radsuper}
-\cst@boolkey{radhyphen}
-\cst@boolkey{abbremph}
-\cst@boolkey{abbrcomma}
-\cst@boolkey{notesbefore}
+  [2009/06/06 v2.0 Schemes and style for chemistry]
+\RequirePackage{amstext,caption,chemscheme,varioref,xspace}
+\SetupKeyvalOptions{
+  family=cst,
+  prefix=cst@
+}
+\newcommand*\cst@tempa{}
+\DeclareBoolOption[false]{abbrcomma}
+\DeclareBoolOption[true]{abbremph}
+\DeclareBoolOption[true]{notesbefore}
+\DeclareBoolOption[true]{phrases}
+\DeclareComplementaryOption{nophrases}{phrases}
+\DeclareBoolOption[true]{rademph}
+\DeclareBoolOption[true]{radhyphen}
+\DeclareBoolOption[true]{radprefix}
+\DeclareBoolOption[false]{radsuper}
+\DeclareBoolOption[true]{xspace}
+\DeclareStringOption{journal}
+\DeclareDefaultOption{%
+  \ifx\CurrentOptionValue\relax
+    \edef\cst@journal{\CurrentOptionKey}%
+  \else
+    \PackageWarning{chemstyle}{%
+      Unknown key option `\CurrentOptionKey'%
+    }%
+  \fi
+}
+\DeclareStringOption{language}
+\setkeys{cst}{%
+  journal  = ,
+  language = english
+}
 \newif\ifcst@notes
 \newif\ifcst@autonotes
-\define@choicekey*[cst]{opt}{notes}[\cst@tempa]
-  {true,false,auto}[true]
-  {\cst@notesfalse
-   \cst@autonotesfalse
-   \edef\cst@tempb{auto}
-   \ifx\cst@tempa\cst@tempb
-     \cst@notestrue
-     \cst@autonotestrue
-   \fi
-   \edef\cst@tempb{true}
-   \ifx\cst@tempa\cst@tempb
-     \cst@notestrue
-   \fi}
-\DeclareOptionX[cst]<opt>{siunits}
-  {\PackageInfo{chemstyle}{Option siunits no longer required}}
-\DeclareOptionX[cst]<opt>{SIunits}
-  {\PackageInfo{chemstyle}{Option siunits no longer required}}
-\DeclareOptionX[cst]<opt>{nonotes}
-  {\ExecuteOptionsX[cst]<opt>{notes=false}}
-\DeclareOptionX[cst]<opt>{nophrases}
-  {\ExecuteOptionsX[cst]<opt>{phrases=false}}
-\define@cmdkeys[cst]{opt}[cst@]{journal,language}
-\DeclareOptionX*{\edef\cst@journal{\CurrentOption}}
-\setkeys[cst]{opt}{
-  notes=true,
-  phrases=true,
-  chemcompounds=true,
-  xspace=true,
-  floatrow=true,
-  journal=none,
-  radprefix=true,
-  rademph=true,
-  radsuper=false,
-  radhyphen=true,
-  abbremph=true,
-  abbrcomma=false,
-  language=english,
-  notesbefore=true}
-\ProcessOptionsX[cst]<opt>
-\ifcst@chemcompounds
-  \PassOptionsToPackage{chemcompounds}{chemscheme}
-\fi
-\ifcst@floatrow
-  \RequirePackage[floats=floatrow]{chemscheme}
-\else
-  \RequirePackage[floats=float]{chemscheme}
-\fi
-\newcommand*{\cst@disablekey}[1]{
-  \define@key[cst]{opt}{#1}{\PackageWarning{chemstyle}
-    {Option `#1' only valid when loading package}}}
-\AtBeginDocument{
-  \cst@disablekey{floatrow}
-  \cst@disablekey{journal}
-  \cst@disablekey{phrases}
-  \cst@disablekey{nophrases}
-  \cst@disablekey{notes}
-  \cst@disablekey{nonotes}
-  \cst@disablekey{chemcompounds}}
-\newcommand*{\cstsetup}[1]{%
-  \iffalse{\fi\ifnum0=`}\fi
-  \setkeys[cst]{opt}{#1}%
-  \ifnum0=`{\fi\iffalse}\fi}
-\@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}}}}
-\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}}
-\newcommand*{\cst@radical}[2]{%
-  \expandafter\DeclareRobustCommand\expandafter*\expandafter{%
-    \csname #1#2\endcsname}{%
-    \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%
+\newcommand*\cst@opt@auto{auto}
+\define@key{cst}{notes}[true]{%
+  \edef\KVO@param{#1}%
+  \@onelevel@sanitize\KVO@param
+  \ifx\KVO@param\KVO@true
+    \expandafter\cst@opt@notestrue
+  \else
+    \ifx\KVO@param\KVO@false
+      \expandafter\expandafter\expandafter\cst@opt@notesfalse
+    \else
+      \ifx\KVO@param\cst@opt@auto
+        \expandafter\expandafter\expandafter\expandafter\expandafter
+        \expandafter\expandafter\cst@opt@notesauto
       \else
-        #2\cst@hyphen\cst@super{\cst@emph{#1}}%
+        \expandafter\expandafter\expandafter\expandafter\expandafter
+        \expandafter\expandafter\cst@opt@noteserror
       \fi
-      \cst@xspace
-    }%
+    \fi
+  \fi
+}
+\newcommand*\cst@opt@notestrue{%
+  \cst@notestrue
+  \cst@autonotesfalse
+}
+\newcommand*\cst@opt@notesfalse{%
+  \cst@notesfalse
+  \cst@autonotesfalse
+}
+\newcommand*\cst@opt@notesauto{%
+  \cst@notestrue
+  \cst@autonotestrue
+}
+\newcommand*\cst@opt@noteserror{%
+  \PackageWarning{chemstyle}{%
+    Value `\KVO@param' is not supported by\MessageBreak
+    option `notes'%
   }%
 }
-\newcommand*{\cst@xspace}{%
+\DeclareComplementaryOption{nonotes}{notes}
+\newcommand*\cstsetup{%
+  \setkeys{cst}
+}
+\newcommand*\cst@xspace{%
   \ifcst@xspace
-    \expandafter\xspace%
-  \fi}
-\cst@radical{n}{Pr}%
-\cst@radical{i}{Pr}%
-\cst@radical{n}{Bu}%
-\cst@radical{i}{Bu}%
-\cst@radical{s}{Bu}%
-\cst@radical{t}{Bu}%
-\floatstyle{plaintop}
-\restylefloat{table}
-\floatstyle{plain}
-\restylefloat{figure}
-\floatplacement{table}{htbp}
-\floatplacement{figure}{htbp}
-\AtBeginDocument{
-  \restylefloat{scheme}
-  \floatplacement{scheme}{htbp}}
-\floatcontentscentre
-\labelformat{figure}{\figurename~#1}
-\labelformat{table}{\tablename~#1}
-\AtBeginDocument{\labelformat{scheme}{\schemename~#1}}
-\newcommand*{\cst@latin}{%
+    \expandafter\xspace
+  \fi
+}
+\@ifpackageloaded{siunitx}{
+  \requiresiconfigs{synchem}
+}{%
+  \@ifpackageloaded{SIunits}{}{%
+    \@ifpackageloaded{unitsdef}{}{%
+      \IfFileExists{siunitx.sty}{%
+        \RequirePackage[alsoload=synchem]{siunitx}
+      }{%
+        \IfFileExists{SIunits.sty}{%
+          \RequirePackage{SIunits}
+        }{%
+          \PackageWarning{chemstyle}{%
+            Could not find siunitx or SIunits package:\MessageBreak
+            additional units not defined%
+          }
+        }
+      }
+    }
+  }
+}
+\@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}
+  }{}
+}
+\providecommand*\standardstate{%
+  {%
+    \ensuremath{\protect\cst@standardstate}%
+  }%
+}
+\newcommand*\cst@standardstate{%
+  \mathpalette\cst@standardstate@aux\circ
+}
+\newcommand*\cst@standardstate@aux[2]{%
+  \ooalign{%
+    \hfil
+    $#1-$%
+    \hfil
+    \cr
+    \hfil
+    $#1#2$%
+    \hfil
+    \cr
+  }%
+}
+\newcommand*\cst@latin{%
   \ifcst@abbremph
-    \expandafter\emph%
-  \fi}
-\newcommand*{\latinemphon}{\cstsetup{abbremph=true}}
-\newcommand*{\latinemphoff}{\cstsetup{abbremph=false}}
-\AtBeginDocument{\providecommand*\latin{\cst@latin}}
-\ifcst@phrases
-  \AtBeginDocument{
-    \providecommand*{\etc}
-      {\@ifnextchar.{\cst@etc}{\cst@etc.\cst@xspace}}
-    \providecommand*{\invacuo}
-      {\latin{in vacuo}\cst@xspace}
-    \providecommand*{\etal}
-      {\@ifnextchar.{\cst@etal}{\cst@etal.\cst@xspace}}
-    \providecommand*{\eg}
-      {\ifcst@abbrcomma
-         \expandafter\cst@commaabbr%
-       \else
-         \expandafter\cst@nocommaabbr%
-       \fi
-       {eg}}
-    \providecommand*{\ie}
-      {\ifcst@abbrcomma
-         \expandafter\cst@commaabbr%
-       \else
-         \expandafter\cst@nocommaabbr%
-       \fi
-       {ie}}}
-\fi
-\newcommand*{\cst@etal}{\latin{et~al}}
-\newcommand*{\cst@etc}{\latin{etc}}
-\newcommand*{\cst@ie}{\latin{i.e\spacefactor999\relax}}
-\newcommand*{\cst@eg}{\latin{e.g\spacefactor999\relax}}
-\newcommand*{\cst@commaabbr}[1]{%
-  \csname cst@#1\endcsname%
-  \cst@addpunct}
-\newcommand*{\cst@nocommaabbr}[1]{%
-  \@ifnextchar.%
-    {\csname cst@#1\endcsname}
-    {\csname cst@#1\endcsname.\cst@xspace}}
-\newcommand*{\cst@addpunct}{%
-  \cst@add@punct\relax}
-\newcommand*{\cst@add@punct}[1]{%
-  \futurelet\cst@tempa\cst@add@punct@}
-\newcommand*{\cst@add@punct@}{%
-  \ifx.\cst@tempa
-    \let\cst@tempb\cst@add@punct
+    \expandafter\emph
   \else
-    \ifx,\cst@tempa
-      \let\cst@tempb\cst@add@punct
-    \else
-      \let\cst@tempb\cst@commapunct
+    \expandafter\@firstofone
+  \fi
+}
+\newcommand*{\latinemphon}{%
+  \cstsetup{abbremph=true}%
+}
+\newcommand*{\latinemphoff}{%
+  \cstsetup{abbremph=false}%
+}
+\AtBeginDocument{%
+  \providecommand*\latin{\cst@latin}%
+}
+\newcommand*\cst@phrases@make{%
+  \providecommand*\etal{%
+    \cst@phrase{et~al}%
+  }%
+  \providecommand*\eg{%
+    \cst@phrase@comma{e.g\spacefactor999\relax}%
+  }%
+  \providecommand*\etc{%
+    \cst@phrase{etc}%
+  }%
+  \providecommand*\ie{%
+    \cst@phrase@comma{i.e\spacefactor999\relax}%
+  }%
+  \providecommand*\invacuo{%
+    \latin{in vacuo}%
+    \cst@xspace
+  }%
+}
+\AtBeginDocument{%
+  \ifcst@phrases
+    \expandafter\cst@phrases@make
+  \fi
+}
+\newcommand*\cst@phrase[1]{%
+  \latin{#1}%
+  \@ifnextchar.{}{%
+    .%
+    \cst@xspace
+  }%
+}
+\newcommand*\cst@phrase@comma{%
+  \ifcst@abbrcomma
+    \expandafter\cst@phrase@with@comma
+  \else
+    \expandafter\cst@phrase
+  \fi
+}
+\newcommand*\cst@phrase@with@comma[1]{%
+  \latin{#1}%
+  \cst@phrase@with@comma@aux@i\relax
+}
+\newcommand*\cst@phrase@with@comma@token{}
+\newcommand*\cst@phrase@with@comma@aux@i[1]{%
+  \futurelet\cst@phrase@with@comma@token\cst@phrase@with@comma@aux@ii
+}
+\newcommand*\cst@phrase@with@comma@aux@ii{%
+  \let\cst@phrase@with@comma@next\cst@phrase@with@comma@aux@i
+  \if.\cst@phrase@with@comma@token\else
+    \if,\cst@phrase@with@comma@token\else
+      \let\cst@phrase@with@comma@next\cst@phrase@with@comma@end
     \fi
   \fi
-  \cst@tempb}
-\newcommand*{\cst@commapunct}{.,\cst@xspace}
-\InputIfFileExists{\cst@journal.jdf}
-  {\PackageInfo{chemstyle}
-    {Loaded \cst@journal.jdf}}
-  {\PackageWarning{chemstyle}
-    {Requested style `\cst@journal' does not exist\MessageBreak
-     Loading default style}
-    \InputIfFileExists{none.jdf}{}
-      {\PackageError{chemstyle}{Failed to load none.jdf}
-         {The default journal definition file was not
-          found\MessageBreak This is a core part of
-          chemstyle\MessageBreak Something is wrong with
-          the installation}}}
-\begingroup
-  \@ifundefined{chapter}
-    {\@ifundefined{refname}
-       {\PackageInfo{chemstyle}
-          {No bibliography name command found}
-        \cstsetup{notes=false}}
-       {\gdef\cst@refsec{\refname}}}
-    {\gdef\cst@refsec{\bibname}}
-\endgroup
-\ifcst@autonotes
-  \AtBeginDocument{
-    \@ifpackageloaded{notes2bib}{}
-      {\newcounter{bibnote}}}
+  \cst@phrase@with@comma@next
+}
+\newcommand*\cst@phrase@with@comma@end{%
+  .,%
+  \cst@xspace
+}
+\newcommand*\cst@phrase@with@comma@next{}
+\newcommand*\cst@radical@make[2]{%
+  \expandafter\DeclareRobustCommand\expandafter*\csname #1#2\endcsname{%
+    \text{\cst@radical{#1}{#2}}%
+    \cst@xspace
+  }%
+}
+\cst@radical@make{n}{Pr}
+\cst@radical@make{i}{Pr}
+\cst@radical@make{n}{Bu}
+\cst@radical@make{i}{Bu}
+\cst@radical@make{s}{Bu}
+\cst@radical@make{t}{Bu}
+\newcommand*\cst@radical@emph{}
+\newcommand*\cst@radical@hyphen{}
+\newcommand*\cst@radical@hyphen@true{-}
+\newcommand*\cst@radical@super{}
+\newcommand*\cst@radical{%
+  \let\cst@radical@emph\@firstofone
+  \ifcst@rademph
+    \let\cst@radical@emph\emph
+  \fi
+  \let\cst@radical@hyphen\relax
+  \ifcst@radhyphen
+    \let\cst@radical@hyphen\cst@radical@hyphen@true
+  \fi
+  \let\cst@radical@super\@firstofone
+  \ifcst@radsuper
+    \let\cst@radical@super\textsuperscript
+  \fi
+  \ifcst@radprefix
+    \expandafter\cst@radical@pre
+  \else
+    \expandafter\cst@radical@post
+  \fi
+}
+\newcommand*\cst@radical@pre[2]{%
+  \cst@radical@super{%
+    \cst@radical@emph{#1}%
+  }%
+  \cst@radical@hyphen
+  #2%
+}
+\newcommand*\cst@radical@post[2]{%
+  #2%
+  \cst@radical@hyphen
+  \cst@radical@super{%
+    \cst@radical@emph{#1}%
+  }%
+}
+\labelformat{figure}{\figurename~#1}
+\labelformat{table}{\tablename~#1}
+\AtEndOfPackage{%
+  \AtBeginDocument{%
+    \labelformat{scheme}{\schemename~#1}%
+  }%
+}
+\AtBeginDocument{%
+  \@ifpackageloaded{notes2bib}{}{%
+    \newcounter{bibnote}%
+  }%
+}
+\newcommand*\cst@refsec@name{}
+\newcommand*\cst@refsec@find[1]{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname #1\endcsname\relax
+    \expandafter\cst@refsec@set@name
+  \else
+    \expandafter\@gobble
+  \fi
+  {#1}%
+}
+\newcommand*\cst@refsec@set@name[1]{%
+  \def\cst@refsec@name{#1}%
+}
+\cst@refsec@find{bibname}%
+\cst@refsec@find{refname}%
+\ifx\cst@refsec@name\@empty
+  \expandafter\cst@notesfalse
 \fi
-\newcommand*{\cst@refname}{%
-  \ifcst@notes
-    \ifcst@autonotes
-      \ifnum\the\value{bibnote}>\z@
-        \expandafter\expandafter\expandafter\expandafter
-          \expandafter\expandafter\expandafter\cst@ref@name
-      \else
-        \expandafter\expandafter\expandafter\expandafter
-          \expandafter\expandafter\expandafter\cst@ref@name@
-      \fi
-    \else
-      \expandafter\expandafter\expandafter\cst@ref@name
-    \fi
+\newcommand*\cst@refsec@lang{}
+\newcommand*\cst@refsec@lang@clist{}
+\newcommand*\cst@refsec@lang@define[4]{%
+  \ifx\cst@refsec@lang@clist\@empty
+    \def\cst@refsec@lang@clist{#1}%
   \else
-    \expandafter\cst@ref@name@%
-  \fi}
-\newcommand*{\cst@ref@name}[3]{%
+    \edef\cst@refsec@lang@clist{%
+      \cst@refsec@lang@clist
+      ,#1%
+    }%
+  \fi
+  \@namedef{cst@refsec@lang@#1@references}{#2}%
+  \@namedef{cst@refsec@lang@#1@and}{#3}%
+  \@namedef{cst@refsec@lang@#1@notes}{#4}%
+}
+\cst@refsec@lang@define{english}{References}{and}{Notes}
+\cst@refsec@lang@define{UKenglish}{References}{and}{Notes}
+\cst@refsec@lang@define{ngerman}{Literatur}{und}{Notizen}
+\cst@refsec@lang@define{german}{Literatur}{und}{Notizen}
+\cst@refsec@lang@define{french}{R\'ef\'erences}{et}{Notes}
+\cst@refsec@lang@define{frenchb}{R\'ef\'erences}{et}{Notes}
+\ifcst@notes
+  \AtBeginDocument{\cst@refsec@set}
+\fi
+\newcommand*\cst@refsec@set{%
+  \@ifpackageloded{biblatex}{%
+    \@for\cst@refsec@lang:=\cst@refsec@lang@clist\do{%
+      \cst@refsec@set@biblatex\cst@refsec@lang
+    }%
+  }{%
+    \@ifpackageloded{babel}{%
+      \@for\cst@refsec@lang:=\cst@refsec@lang@clist\do{%
+        \cst@refsec@set@babel\cst@refsec@lang
+      }%
+      \expandafter\selectlanguage\expandafter{\languagename}%
+    }{%
+      \@for\cst@refsec@lang:=\cst@refsec@lang@clist\do{%
+        \cst@refsec@set@language\cst@refsec@lang
+      }%
+    }%
+  }
+}
+\newcommand*\cst@refsec@set@biblatex[1]{%
+  \edef\cst@tempa{%
+    \noexpand\csgappto{bib@strings@#1}{%
+      \noexpand\def\expandafter\noexpand
+        \csname\cst@refsec@name\endcsname{%
+        \noexpand\cst@refsec@make@name{#1}%
+      }%
+    }%
+  }%
+  \cst@tempa
+}
+\newcommand*\cst@refsec@set@babel[1]{%
+  \edef\cst@tempa{%
+    \noexpand\addto{\expandafter\noexpand\csname captions#1\endcsname}{%
+      \noexpand\def\expandafter\noexpand
+        \csname\cst@refsec@name\endcsname{%
+        \noexpand\cst@refsec@make@name{#1}%
+      }%
+    }%
+  }%
+  \cst@tempa
+}
+\newcommand*\cst@refsec@set@language[1]{%
+  \ifx#1\cst@language
+    \edef\cst@tempa{%
+      \noexpand\def\expandafter\noexpand
+        \csname\cst@refsec@name\endcsname{%
+        \noexpand\cst@refsec@make@name{#1}%
+      }%
+    }%
+    \cst@tempa
+  \fi
+}
+\newcommand*\cst@refsec@make@name@fixed[1]{%
   \ifcst@notesbefore
-    #3\space#2\space#1%
+    \@nameuse{cst@refsec@lang@#1@notes}
+    \@nameuse{cst@refsec@lang@#1@and}
+    \@nameuse{cst@refsec@lang@#1@references}%
   \else
-    #1\space#2\space#3%
-  \fi}
-\newcommand*{\cst@ref@name@}[3]{#1}
-\@ifundefined{cst@refsec}
-  {\let\cst@setrefname\@gobblefour}
-  {\newcommand*{\cst@setrefname}[4]{
-     \edef\cst@tempa{#1}%
-     \ifx\cst@tempa\cst@language
-       \expandafter\renewcommand\expandafter*\expandafter{%
-         \cst@refsec}
-         {\cst@refname{#2}{#3}{#4}}
-     \fi
-     \AtBeginDocument{
-       \@ifpackageloaded{biblatex}
-         {\def\cst@tempa{\csgappto{bib@strings@#1}}
-          \expandafter\cst@tempa\expandafter{\expandafter
-            \renewcommand\expandafter*\expandafter{%
-              \cst@refsec}{%
-                \cst@refname{#2}{#3}{#4}}}}
-         {\@ifpackageloaded{babel}
-           {\def\cst@tempa{\expandafter\addto\expandafter{%
-              \csname captions#1\endcsname}}
-            \expandafter\cst@tempa\expandafter
-              {\expandafter\renewcommand\expandafter*%
-                \expandafter{\cst@refsec}{%
-                  \cst@refname{#2}{#3}{#4}}}
-            \expandafter\selectlanguage\expandafter{%
-              \languagename}}
-           {}}}}}
-\cst@setrefname{english}{References}{and}{Notes}
-\cst@setrefname{UKenglish}{References}{and}{Notes}
-\cst@setrefname{ngerman}{Literatur}{und}{Notizen}
-\cst@setrefname{german}{Literatur}{und}{Notizen}
-\cst@setrefname{french}{R\'ef\'erences}{et}{Notes}
-\cst@setrefname{frenchb}{R\'ef\'erences}{et}{Notes}
-\endinput
+    \@nameuse{cst@refsec@lang@#1@references}
+    \@nameuse{cst@refsec@lang@#1@and}
+    \@nameuse{cst@refsec@lang@#1@notes}%
+  \fi
+}
+\newcommand*\cst@refsec@make@name@auto{%
+  \ifnum\the\value{bibnote}>\z@\relax
+    \expandafter\cst@refsec@make@name@fixed
+  \else
+    \expandafter\cst@refsec@make@name@nonotes
+  \fi
+}
+\newcommand*\cst@refsec@make@name@nonotes[1]{%
+  \@nameuse{cst@refsec@lang@#1@references}%
+}
+\let\cst@refsec@make@name\cst@refsec@make@name@fixed
+\ifcst@notes
+  \ifcst@autonotes
+    \let\cst@refsec@make@name\cst@refsec@make@name@auto
+  \fi
+\fi
+\ProcessKeyvalOptions{cst}
+\newcommand*\cst@float@memoir@correct{%
+  \let\newfloat\@undefined
+}
+\ifx\cst@float@pkg\cst@opt@memoir
+  \expandafter\cst@float@memoir@correct
+\fi
+\cst@float@load
+\cst@float@execute{\@nameuse{cst@float@make@\cst@float@pkg}}
+\@ifpackageloaded{floatrow}{%
+  \floatsetup{objectset=centering}
+  \floatplacement{figure}{htbp}
+  \floatplacement{scheme}{htbp}
+  \floatplacement{table}{htbp}
+  \floatsetup[table]{style=plaintop}
+}{%
+  \floatstyle{plaintop}
+  \restylefloat{table}
+  \floatstyle{plain}
+  \restylefloat{figure}
+  \floatplacement{table}{htbp}
+  \floatplacement{figure}{htbp}
+  \AtBeginDocument{%
+    \restylefloat{scheme}
+    \floatplacement{scheme}{htbp}
+  }
+}
+\ifx\cst@journal\@empty\else
+  \InputIfFileExists{\cst@journal.chemstyle.cfg}{%
+    \setkeys{cst}{
+      abbrcomma   = false,
+      abbremph    = true,
+      notesbefore = true,
+      rademph     = true,
+      radhyphen   = true,
+      radprefix   = true,
+      radsuper    = false,
+    }
+  }{%
+    \PackageWarning{chemstyle}{%
+      Requested style `\cst@journal' does not exist\MessageBreak
+    }
+  }
+\fi
+\cst@ref@load
+
+%% 
+%% Copyright (C) 2006-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% 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.sty'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/angew.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/angew.chemstyle.cfg
new file mode 100644
index 00000000000..0838ca333b8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/angew.chemstyle.cfg
@@ -0,0 +1,53 @@
+%%
+%% This is file `angew.chemstyle.cfg',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% chemstyle.dtx  (with options: `angew')
+%% ----------------------------------------------------------------
+%% 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
+%% ----------------------------------------------------------------
+%% 
+\ProvidesFile{angew.chemstyle.cfg}
+  [2009/06/06 v2.0 Angew. Chem. journal style]
+\setkeys{cst}{
+  abbremph  = false,
+  radhyphen = false
+}
+\captionsetup{
+  font            = sf,
+  labelfont       = {bf,it},
+  labelsep        = period,
+  singlelinecheck = off
+}
+\captionsetup[table]{
+  labelsep = colon
+}
+
+%% 
+%% Copyright (C) 2006-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% 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 `angew.chemstyle.cfg'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/ic.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/ic.chemstyle.cfg
new file mode 100644
index 00000000000..4e7d1d36dd5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/ic.chemstyle.cfg
@@ -0,0 +1,64 @@
+%%
+%% This is file `ic.chemstyle.cfg',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% chemstyle.dtx  (with options: `ic')
+%% ----------------------------------------------------------------
+%% 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
+%% ----------------------------------------------------------------
+%% 
+\ProvidesFile{ic.chemstyle.cfg}
+  [2009/06/06 v2.0 Inorg. Chem. journal style]
+\DeclareCaptionLabelSeparator{perquad}{.\quad}
+\captionsetup{
+  labelfont       = {bf,it,sf},
+  labelsep        = perquad,
+  singlelinecheck = off
+  textfont        = rm
+}
+\captionsetup[figure]{
+  textfont = rm
+}
+\setkeys{cst}{
+  abbrcomma   = true,
+  abbremph    = false,
+  notesbefore = false,
+  radhyphen   = false,
+  radsuper    = true
+}
+\@ifpackageloaded{floatrow}{%
+  \floatsetup[scheme]{style=plaintop}
+}{%
+  \floatstyle{plaintype}
+  \restylefloat{scheme}
+  \floatstyle{plain}
+}
+
+%% 
+%% Copyright (C) 2006-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% 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 `ic.chemstyle.cfg'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/jacs.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/jacs.chemstyle.cfg
new file mode 100644
index 00000000000..7f77ecc6dd0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/jacs.chemstyle.cfg
@@ -0,0 +1,64 @@
+%%
+%% This is file `jacs.chemstyle.cfg',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% chemstyle.dtx  (with options: `jacs')
+%% ----------------------------------------------------------------
+%% 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
+%% ----------------------------------------------------------------
+%% 
+\ProvidesFile{jacs.chemstyle.cfg}
+  [2009/06/06 v2.0 J. Am. Chem. Soc. journal style]
+\DeclareCaptionLabelSeparator{perquad}{.\quad}
+\captionsetup{
+  labelfont       = {bf,it,sf},
+  labelsep        = perquad,
+  singlelinecheck = off
+  textfont        = sf
+}
+\captionsetup[figure]{
+  textfont = rm
+}
+\setkeys{cst}{
+  abbrcomma   = true,
+  abbremph    = false,
+  notesbefore = false,
+  radhyphen   = false,
+  radsuper    = true
+}
+\@ifpackageloaded{floatrow}{%
+  \floatsetup[scheme]{style=plaintop}
+}{%
+  \floatstyle{plaintype}
+  \restylefloat{scheme}
+  \floatstyle{plain}
+}
+
+%% 
+%% Copyright (C) 2006-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% 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 `jacs.chemstyle.cfg'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/jomc.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/jomc.chemstyle.cfg
new file mode 100644
index 00000000000..9e8bf75da44
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/jomc.chemstyle.cfg
@@ -0,0 +1,55 @@
+%%
+%% This is file `jomc.chemstyle.cfg',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% chemstyle.dtx  (with options: `jomc')
+%% ----------------------------------------------------------------
+%% 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
+%% ----------------------------------------------------------------
+%% 
+\ProvidesFile{jomc.chemstyle.cfg}
+  [2009/06/06 v2.0 J. Organomet. Chem. journal style]
+\setkeys{cst}{
+  abbremph  = false,
+  radhyphen = true,
+  radsuper  = true,
+}
+\captionsetup{
+  labelsep        = period,
+}
+\captionsetup[table]{
+  labelsep        = newline,
+  singlelinecheck = off
+}
+\AtBeginDocument{%
+  \def\figurename{Fig.}%
+}
+
+%% 
+%% Copyright (C) 2006-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% 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 `jomc.chemstyle.cfg'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/orglett.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/orglett.chemstyle.cfg
new file mode 100644
index 00000000000..414df6f0a8a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/orglett.chemstyle.cfg
@@ -0,0 +1,136 @@
+%%
+%% This is file `orglett.chemstyle.cfg',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% chemstyle.dtx  (with options: `orglett')
+%% ----------------------------------------------------------------
+%% 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
+%% ----------------------------------------------------------------
+%% 
+\ProvidesFile{orglett.chemstyle.cfg}
+  [2009/06/06 v2.0 Org. Lett. journal style]
+\DeclareCaptionLabelSeparator{perquad}{.\quad}
+\captionsetup{
+  labelfont       = bf,
+  labelsep        = perquad
+}
+\setkeys{cst}{
+  abbrcomma   = true,
+  abbremph    = false,
+  notesbefore = false,
+  radhyphen   = false,
+  radsuper    = true
+}
+\RequirePackage{xcolor}
+\newcommand*\fs@orglett{%
+  \def\@fs@cfont{\bfseries}%
+  \let\@fs@capt\floatc@ruled
+  \def\@fs@pre{%
+    \begingroup
+      \color{purple}%
+      \hrule height 12pt depth 0pt\relax
+      \kern 2pt\relax
+    \endgroup
+  }%
+  \def\@fs@mid{%
+    \vspace\belowcaptionskip\relax
+  }%
+  \def\@fs@post{%
+    \begingroup
+      \color{purple}%
+      \kern 2pt\relax
+      \hrule height 1.5pt depth 0pt\relax
+    \endgroup
+  }%
+  \let\@fs@iftopcapt\iftrue
+}
+\newcommand*\fs@orglettfig{%
+  \def\@fs@cfont{\bfseries}%
+  \let\@fs@capt\floatc@plain
+  \def\@fs@pre{%
+    \begingroup
+      \color{purple}%
+      \hrule height 12pt depth 0pt\relax
+      \kern 2pt\relax
+    \endgroup
+  }%
+  \def\@fs@mid{%
+    \vspace\abovecaptionskip\relax
+  }%
+  \def\@fs@post{%
+    \begingroup
+      \color{purple}%
+      \kern 2pt\relax
+      \hrule height1.5pt depth 0pt\relax
+  \endgroup
+  }%
+  \let\@fs@iftopcapt\iffalse
+}
+\DeclareFloatVCode{orglettthickrule}{%
+  \par
+  \begingroup
+    \color{purple}%
+    \hrule height 12pt depth 0pt\relax
+    \vskip 2pt\relax
+  \endgroup
+  \par
+}
+\DeclareFloatVCode{orglettlowrule}{%
+  \par
+  \begingroup
+    \vskip 2pt\relax
+    \hrule height 1.5pt depth 0pt\relax
+  \endgroup
+  \par
+}
+\@ifpackageloaded{floatrow}{%
+  \floatsetup{
+    capposition  = top,
+    heightadjust = all,
+    postcode     = orglettlowrule,
+    precode      = orglettthickrule,
+    midcode      = rule,
+  }
+  \floatsetup[figure]{
+    capposition  = bottom,
+    heightadjust = all,
+    postcode     = orglettlowrule,
+    precode      = orglettthickrule,
+    midcode      = rule,
+  }
+}{%
+  \floatstyle{orglettfig}
+  \restylefloat{figure}
+  \floatstyle{orglett}
+  \restylefloat{scheme}
+  \restylefloat{table}
+}
+
+%% 
+%% Copyright (C) 2006-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% 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 `orglett.chemstyle.cfg'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/rsc.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/rsc.chemstyle.cfg
new file mode 100644
index 00000000000..7bbf64b6705
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/rsc.chemstyle.cfg
@@ -0,0 +1,47 @@
+%%
+%% This is file `rsc.chemstyle.cfg',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% chemstyle.dtx  (with options: `rsc')
+%% ----------------------------------------------------------------
+%% 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
+%% ----------------------------------------------------------------
+%% 
+\ProvidesFile{rsc.chemstyle.cfg}
+  [2009/06/06 v2.0 RSC journal style]
+\captionsetup{
+  labelsep  = quad,
+  labelfont = bf
+}
+\AtBeginDocument{%
+  \def\figurename{Fig.}%
+}
+
+%% 
+%% Copyright (C) 2006-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% 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 `rsc.chemstyle.cfg'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/tetlett.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/tetlett.chemstyle.cfg
new file mode 100644
index 00000000000..e21931713a2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/tetlett.chemstyle.cfg
@@ -0,0 +1,49 @@
+%%
+%% This is file `tetlett.chemstyle.cfg',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% chemstyle.dtx  (with options: `tetlett')
+%% ----------------------------------------------------------------
+%% 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
+%% ----------------------------------------------------------------
+%% 
+\ProvidesFile{tetlett.chemstyle.cfg}
+  [2009/06/06 v2.0 Tetrahedron Lett. journal style]
+\captionsetup{
+  labelsep        = period,
+  labelfont       = bf,
+  singlelinecheck = off
+}
+\setkeys{cst}{
+  abbrcomma = true,
+  abbremph  = false,
+}
+
+%% 
+%% Copyright (C) 2006-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% 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 `tetlett.chemstyle.cfg'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/ic.jdf b/Master/texmf-dist/tex/latex/chemstyle/ic.jdf
deleted file mode 100644
index 075e4caeabe..00000000000
--- a/Master/texmf-dist/tex/latex/chemstyle/ic.jdf
+++ /dev/null
@@ -1,22 +0,0 @@
-%%
-%% This is file `ic.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `ic')
-%%  ----------------------------------------------------------------
-%%  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
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{ic.jdf}
-  [\cst@ver Inorg. Chem. journal style]
-\input {jacs.jdf}
-\captionsetup{textfont=rm}
-\endinput
-%%
-%% End of file `ic.jdf'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/jacs.jdf b/Master/texmf-dist/tex/latex/chemstyle/jacs.jdf
deleted file mode 100644
index 20f2b8c945e..00000000000
--- a/Master/texmf-dist/tex/latex/chemstyle/jacs.jdf
+++ /dev/null
@@ -1,37 +0,0 @@
-%%
-%% This is file `jacs.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `jacs')
-%%  ----------------------------------------------------------------
-%%  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
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{jacs.jdf}
-  [\cst@ver J. Am. Chem. Soc. journal style]
-\DeclareCaptionLabelSeparator{perquad}{.\quad}
-\captionsetup{labelfont={bf,it,sf},textfont=sf,
-  labelsep=perquad}
-\captionsetup[figure]{textfont=rm}
-\captionsetup{singlelinecheck=off}
-\setkeys[cst]{opt}{
-  radprefix=true,
-  rademph=true,
-  radsuper=true,
-  radhyphen=false,
-  abbremph=false,
-  abbrcomma=true,
-  notesbefore=true}
-\floatstyle{plaintop}
-\restylefloat{scheme}
-\floatstyle{plain}
-\cst@notesbeforefalse
-\endinput
-%%
-%% End of file `jacs.jdf'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/jomc.jdf b/Master/texmf-dist/tex/latex/chemstyle/jomc.jdf
deleted file mode 100644
index 2c43078554e..00000000000
--- a/Master/texmf-dist/tex/latex/chemstyle/jomc.jdf
+++ /dev/null
@@ -1,32 +0,0 @@
-%%
-%% This is file `jomc.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `jomc')
-%%  ----------------------------------------------------------------
-%%  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
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{jomc.def}
-  [\cst@ver J. Organomet. Chem. journal style]
-\captionsetup{labelsep=period}
-\captionsetup[table]{labelsep=newline,singlelinecheck=off}
-\AtBeginDocument{%
-  \renewcommand{\figurename}{Fig.}}
-\setkeys[cst]{opt}{
-  radprefix=true,
-  rademph=true,
-  radsuper=true,
-  radhyphen=false,
-  abbremph=false,
-  abbrcomma=false,
-  notesbefore=true}
-\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
deleted file mode 100644
index 2545edc5129..00000000000
--- a/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf
+++ /dev/null
@@ -1,36 +0,0 @@
-%%
-%% This is file `jpc.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `jpc')
-%%  ----------------------------------------------------------------
-%%  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
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{jpc.jdf}
-  [\cst@ver J. Phys. Chem. journal style]
-\DeclareCaptionFormat{labelcaps}{\MakeUppercase{#1}#2#3}
-\captionsetup{font=bf,labelsep=colon,format=labelcaps}
-\captionsetup[figure]{format=plain,textfont=md,labelsep=period}
-\captionsetup{singlelinecheck=off}
-\setkeys[cst]{opt}{
-  radprefix=true,
-  rademph=true,
-  radsuper=false,
-  radhyphen=false,
-  abbremph=false,
-  abbrcomma=true,
-  notesbefore=true}
-\floatstyle{plaintop}
-\restylefloat{scheme}
-\floatstyle{plain}
-\cst@notesbeforefalse
-\endinput
-%%
-%% End of file `jpc.jdf'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/none.jdf b/Master/texmf-dist/tex/latex/chemstyle/none.jdf
deleted file mode 100644
index 08ce0ba79a4..00000000000
--- a/Master/texmf-dist/tex/latex/chemstyle/none.jdf
+++ /dev/null
@@ -1,29 +0,0 @@
-%%
-%% This is file `none.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `none')
-%%  ----------------------------------------------------------------
-%%  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
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{none.jdf}
-  [\cst@ver Empty journal style]
-\floatstyle{plain}
-\restylefloat{table}
-\labelformat{figure}{#1}
-\labelformat{table}{#1}
-\floatplacement{table}{tbp}
-\floatplacement{figure}{tbp}
-\AtBeginDocument{
-  \floatplacement{scheme}{tbp}
-  \labelformat{scheme}{#1}}
-\endinput
-%%
-%% End of file `none.jdf'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf b/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf
deleted file mode 100644
index b58a72e1390..00000000000
--- a/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf
+++ /dev/null
@@ -1,62 +0,0 @@
-%%
-%% This is file `orglett.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `orglett')
-%%  ----------------------------------------------------------------
-%%  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
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{orglett.jdf}
-  [\cst@ver Org. Lett. journal style]
-\RequirePackage{xcolor}
-\@ifpackageloaded{floatrow}
-  {\PackageError{chemstyle}
-    {Org. Lett. style only works with float}
-    {Load chemstyle with the floatrow=false option
-      to\MessageBreak use the orglett style}}
-  {}
-\newcommand*{\OrgLettColour}{purple}
-\newcommand*{\fs@orglett}{%
-  \def\@fs@cfont{\bfseries}%
-  \let\@fs@capt\floatc@ruled
-  \def\@fs@pre{\begingroup\color{\OrgLettColour}
-    \hrule height12pt depth0pt \kern2pt\endgroup}%
-  \def\@fs@mid{\vspace\belowcaptionskip\relax}%
-  \def\@fs@post{\begingroup\color{\OrgLettColour}\kern2pt
-    \hrule height1.5pt depth0pt\endgroup}%
-  \let\@fs@iftopcapt\iftrue}
-\newcommand*{\fs@orglettfig}{%
-  \def\@fs@cfont{\bfseries}%
-  \let\@fs@capt\floatc@plain
-  \def\@fs@pre{\begingroup\color{\OrgLettColour}%
-    \hrule height12pt depth0pt \kern2pt\endgroup}%
-  \def\@fs@mid{\vspace\abovecaptionskip\relax}%
-  \def\@fs@post{\begingroup\color{\OrgLettColour}\kern2pt
-    \hrule height1.5pt depth0pt\endgroup}%
-  \let\@fs@iftopcapt\iffalse}
-\floatstyle{orglettfig}
-\restylefloat{figure}
-\floatstyle{orglett}
-\restylefloat{scheme}
-\restylefloat{table}
-\DeclareCaptionLabelSeparator{perquad}{.\quad}
-\captionsetup{labelfont=bf,labelsep=perquad}
-\setkeys[cst]{opt}{
-  radprefix=true,
-  rademph=true,
-  radsuper=true,
-  radhyphen=false,
-  abbremph=false,
-  abbrcomma=true,
-  notesbefore=true}
-\cst@notesbeforefalse
-\endinput
-%%
-%% End of file `orglett.jdf'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/rsc.jdf b/Master/texmf-dist/tex/latex/chemstyle/rsc.jdf
deleted file mode 100644
index e4116bcc55b..00000000000
--- a/Master/texmf-dist/tex/latex/chemstyle/rsc.jdf
+++ /dev/null
@@ -1,30 +0,0 @@
-%%
-%% This is file `rsc.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `rsc')
-%%  ----------------------------------------------------------------
-%%  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
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{rsc.jdf}
-  [\cst@ver RSC journal style]
-\AtBeginDocument{%
-  \renewcommand{\figurename}{Fig.}}
-\captionsetup{labelsep=quad,labelfont=bf}
-\setkeys[cst]{opt}{
-  radprefix=true,
-  rademph=true,
-  radsuper=false,
-  radhyphen=true,
-  abbremph=true,
-  abbrcomma=false}
-\endinput
-%%
-%% End of file `rsc.jdf'.
diff --git a/Master/texmf-dist/tex/latex/chemstyle/tetlett.jdf b/Master/texmf-dist/tex/latex/chemstyle/tetlett.jdf
deleted file mode 100644
index 5d1648d97bc..00000000000
--- a/Master/texmf-dist/tex/latex/chemstyle/tetlett.jdf
+++ /dev/null
@@ -1,29 +0,0 @@
-%%
-%% This is file `tetlett.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `tetlett')
-%%  ----------------------------------------------------------------
-%%  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
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{tetlett.def}
-  [\cst@ver Tetrahedron Lett. journal style]
-\captionsetup{labelsep=period,singlelinecheck=off,labelfont=bf}
-\setkeys[cst]{opt}{
-  radprefix=true,
-  rademph=true,
-  radsuper=false,
-  radhyphen=true,
-  abbremph=false,
-  abbrcomma=true,
-  notesbefore=true}
-\endinput
-%%
-%% End of file `tetlett.jdf'.