11 files changed, 613 insertions, 345 deletions
diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty b/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty
new file mode 100644
index 00000000000..045e05a2489
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty
@@ -0,0 +1,258 @@
+%%
+%% This is file `chemscheme.sty',
+%% generated with the docstrip utility.
+%%
+%% 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
+%%  ----------------------------------------------------------------
+%% 
+\NeedsTeXFormat{LaTeX2e}
+\def\csh@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
+    #5/#6/#7\space v1.4\space}
+\ProvidesPackage{chemscheme}
+  [\csh@id $Id: chemscheme.dtx 36 2008-07-17 07:39:53Z joseph $
+   Support for chemical schemes]
+\RequirePackage{kvoptions,psfrag,iflang}
+\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}}
+  \addtodef{\@smemmain}{}{%
+    \ifartopt\else
+      \counterwithin{scheme}{chapter}
+    \fi}
+  \addtodef{\backmatter}{}{%
+    \ifartopt\else
+      \counterwithout{scheme}{chapter}%
+      \setcounter{scheme}{0}%
+    \fi}
+  \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}{%
+  \DeclareNewFloatType{scheme}
+    {fileext=los,placement=tbp,name=Scheme}
+  \@ifundefined{chapter}{}
+    {\floatsetup[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}
+  \newcommand*{\floatcontentscentre}{%
+    \let\csh@everyfloat\centering}
+  \newcommand*{\floatcontentscenter}{%
+    \let\csh@everyfloat\centering}
+  \newcommand*{\floatcontentsleft}{%
+    \let\csh@everyfloat\relax}
+  \newcommand*{\floatcontentsright}{%
+    \let\csh@everyfloat\raggedleft}
+\fi
+\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
+%%
+%% 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 87fe0b2aa1f..34322e56d7d 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
+++ b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
@@ -6,7 +6,7 @@
 %%
 %% chemstyle.dtx  (with options: `package')
 %%  ----------------------------------------------------------------
-%%  The chemstyle package --- Writing chemistry with style
+%%  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
@@ -14,24 +14,19 @@
 %%  ----------------------------------------------------------------
 %% 
 \NeedsTeXFormat{LaTeX2e}
+\def\cst@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
+    \def\cst@ver{#5/#6/#7\space v1.3\space}}
+\cst@id $Id: chemstyle.dtx 36 2008-07-17 07:39:53Z joseph $
 \ProvidesPackage{chemstyle}
-  [2008/04/14 v1.2b Writing chemistry with style]
-\RequirePackage{xkeyval}
-\@ifpackagelater{xkeyval}{2005/05/07}
-  {}
-  {\PackageError{chemstyle}
-     {xkeyval >= 2.5 required}
-     {chemstyle requires the `xkeyval' package, version 2.5
-       or later.\MessageBreak The version loaded is:
-       `\@nameuse{ver@xkeyval.sty}'.\MessageBreak
-        This is a fatal error: loading will abort.}
-   \endinput}
+  [\cst@ver Writing chemistry with style]
+\RequirePackage{xkeyval}[2005/05/07]
 \RequirePackage{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}
@@ -71,6 +66,7 @@
   phrases=true,
   chemcompounds=true,
   xspace=true,
+  floatrow=true,
   journal=none,
   radprefix=true,
   rademph=true,
@@ -84,11 +80,16 @@
 \ifcst@chemcompounds
   \PassOptionsToPackage{chemcompounds}{chemscheme}
 \fi
-\RequirePackage{chemscheme}
+\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}
@@ -101,25 +102,26 @@
   \ifnum0=`{\fi\iffalse}\fi}
 \AtBeginDocument{
   \@ifpackageloaded{siunitx}
-    {\makeatletter
-     \si@requirecfgs{synchem}
-     \makeatother}
-    {\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}}
-       {\@ifpackageloaded{SIunits}{}
-         {\@ifpackageloaded{siunits}{}
-          {\RequirePackage{SIunits}}}
-        \newcommand*{\cubiccentimeter}{\centi\metre\cubed}
+    {\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*{\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}}}}}
 \DeclareSymbolFont{CSTAMS}{U}{msb}{m}{n}
 \DeclareMathSymbol{\cst@varnothing}{\mathord}{CSTAMS}{"3F}
 \providecommand*{\standardstate}%
@@ -159,10 +161,6 @@
 \cst@radical{i}{Bu}%
 \cst@radical{s}{Bu}%
 \cst@radical{t}{Bu}%
-\@ifclassloaded{memoir}
-  {\let\newfloat\@undefined
-   \RequirePackage{float}}
-  {}
 \floatstyle{plaintop}
 \restylefloat{table}
 \floatstyle{plain}
@@ -241,8 +239,9 @@
     \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}}}
+          found\MessageBreak This is a core part of
+          chemstyle\MessageBreak Something is wrong with
+          the installation}}}
 \begingroup
   \@ifundefined{chapter}
     {\@ifundefined{refname}
@@ -261,14 +260,14 @@
   \ifcst@notes
     \ifcst@autonotes
       \ifnum\the\value{bibnote}>\z@
-        \expandafter\expandafter\expandafter\expandafter\expandafter
-          \expandafter\expandafter\cst@ref@name%
+        \expandafter\expandafter\expandafter\expandafter
+          \expandafter\expandafter\expandafter\cst@ref@name
       \else
-        \expandafter\expandafter\expandafter\expandafter\expandafter
-          \expandafter\expandafter\cst@ref@name@%
+        \expandafter\expandafter\expandafter\expandafter
+          \expandafter\expandafter\expandafter\cst@ref@name@
       \fi
     \else
-      \expandafter\expandafter\expandafter\cst@ref@name%
+      \expandafter\expandafter\expandafter\cst@ref@name
     \fi
   \else
     \expandafter\cst@ref@name@%
@@ -292,16 +291,19 @@
      \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}}}}
+          \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}}
+              {\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}
diff --git a/Master/texmf-dist/tex/latex/chemstyle/angew.jdf b/Master/texmf-dist/tex/latex/chemstyle/config/angew.jdf
index cc011495a2f..85e3c0d3725 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/angew.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/angew.jdf
@@ -1,29 +1,30 @@
-%%
-%% This is file `angew.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `angew')
-%%  ----------------------------------------------------------------
-%%  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.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{angew.def}
-  [2008/04/14 v1.2b 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'.
+%%
+%% 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/ic.jdf b/Master/texmf-dist/tex/latex/chemstyle/config/ic.jdf
index b539be42e93..7e66d5ffb79 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/ic.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/ic.jdf
@@ -1,22 +1,22 @@
-%%
-%% This is file `ic.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `ic')
-%%  ----------------------------------------------------------------
-%%  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.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{ic.jdf}
-  [2008/04/14 v1.2b Inorg. Chem. journal style]
-\input {jacs.jdf}
-\captionsetup{textfont=rm}
-\endinput
-%%
-%% End of file `ic.jdf'.
+%%
+%% 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/config/jacs.jdf
index 76bce6128b6..0fca04dd32a 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/jacs.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/jacs.jdf
@@ -1,36 +1,37 @@
-%%
-%% This is file `jacs.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `jacs')
-%%  ----------------------------------------------------------------
-%%  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.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{jacs.jdf}
-  [2008/04/14 v1.2b 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'.
+%%
+%% 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/config/jomc.jdf
index 848501881d6..ebf537ed975 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/jomc.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/jomc.jdf
@@ -1,32 +1,32 @@
-%%
-%% 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.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{jomc.def}
-  [2008/04/14 v1.2b 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'.
+%%
+%% 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/config/jpc.jdf
index e8283edad1f..a5718a67901 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/jpc.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/jpc.jdf
@@ -1,36 +1,36 @@
-%%
-%% This is file `jpc.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `jpc')
-%%  ----------------------------------------------------------------
-%%  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.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{jpc.jdf}
-  [2008/04/14 v1.2b 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'.
+%%
+%% 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/config/none.jdf
index 38de7628063..ceb496c7133 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/none.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/none.jdf
@@ -1,29 +1,29 @@
-%%
-%% This is file `none.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `none')
-%%  ----------------------------------------------------------------
-%%  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.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{none.jdf}
-  [2008/04/14 v1.2b 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'.
+%%
+%% 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/config/orglett.jdf
index 1c16960f13d..35a1c1fd5f7 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/orglett.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/orglett.jdf
@@ -1,56 +1,62 @@
-%%
-%% This is file `orglett.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `orglett')
-%%  ----------------------------------------------------------------
-%%  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.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{orglett.jdf}
-  [2008/04/14 v1.2b Org. Lett. journal style]
-\RequirePackage{xcolor}
-\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'.
+%%
+%% 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/config/rsc.jdf
index d8ba06b5580..cdc83a098cf 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/rsc.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/rsc.jdf
@@ -1,30 +1,30 @@
-%%
-%% This is file `rsc.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `rsc')
-%%  ----------------------------------------------------------------
-%%  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.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{rsc.jdf}
-  [2008/04/14 v1.2b 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'.
+%%
+%% 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/config/tetlett.jdf
index 824d49cb9bf..8e0b6d8d823 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/tetlett.jdf
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/tetlett.jdf
@@ -1,29 +1,29 @@
-%%
-%% This is file `tetlett.jdf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% chemstyle.dtx  (with options: `tetlett')
-%%  ----------------------------------------------------------------
-%%  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.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
-%% 
-\ProvidesFile{tetlett.def}
-  [2008/04/14 v1.2b 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'.
+%%
+%% 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'.