clara (24dec19)

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

24 files changed, 1302 insertions, 208 deletions

diff --git a/Master/texmf-dist/tex/latex/clara/LGRClara-Sup.fd b/Master/texmf-dist/tex/latex/clara/LGRClara-Sup.fd
new file mode 100644
index 00000000000..f865d6cee80
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/clara/LGRClara-Sup.fd
@@ -0,0 +1,97 @@
+%% Generated by autoinst on 2019/12/24
+%%
+\ProvidesFile{LGRClara-Sup.fd}
+    [2019/12/24 (autoinst)  Font definitions for LGR/Clara-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Clara@scale\endcsname\relax
+    \let\Clara@@scale\@empty
+\else
+    \edef\Clara@@scale{s*[\csname Clara@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LGR}{Clara-Sup}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{Clara-Sup}{bold}{it}{
+      <-> \Clara@@scale ClaraBoldItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{Clara-Sup}{bold}{n}{
+      <-> \Clara@@scale ClaraBold-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{Clara-Sup}{bold}{sl}{
+      <-> ssub * Clara-Sup/bold/it
+}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{Clara-Sup}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{Clara-Sup}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{Clara-Sup}{regular}{sl}{
+      <-> ssub * Clara-Sup/regular/it
+}{}
+
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{Clara-Sup}{m}{it}{
+      <-> alias * Clara-Sup/regular/it
+}{}
+
+\DeclareFontShape{LGR}{Clara-Sup}{m}{sl}{
+      <-> alias * Clara-Sup/regular/sl
+}{}
+
+\DeclareFontShape{LGR}{Clara-Sup}{m}{n}{
+      <-> alias * Clara-Sup/regular/n
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{Clara-Sup}{b}{it}{
+      <-> alias * Clara-Sup/bold/it
+}{}
+
+\DeclareFontShape{LGR}{Clara-Sup}{b}{sl}{
+      <-> alias * Clara-Sup/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{Clara-Sup}{b}{n}{
+      <-> alias * Clara-Sup/bold/n
+}{}
+
+\DeclareFontShape{LGR}{Clara-Sup}{bx}{it}{
+      <-> ssub * Clara-Sup/b/it
+}{}
+
+\DeclareFontShape{LGR}{Clara-Sup}{bx}{sl}{
+      <-> ssub * Clara-Sup/b/sl
+}{}
+
+\DeclareFontShape{LGR}{Clara-Sup}{bx}{n}{
+      <-> ssub * Clara-Sup/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/clara/LGRClara-TLF.fd b/Master/texmf-dist/tex/latex/clara/LGRClara-TLF.fd
new file mode 100644
index 00000000000..1546d5d0ec7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/clara/LGRClara-TLF.fd
@@ -0,0 +1,105 @@
+%% Generated by autoinst on 2019/12/24
+%%
+\ProvidesFile{LGRClara-TLF.fd}
+    [2019/12/24 (autoinst)  Font definitions for LGR/Clara-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Clara@scale\endcsname\relax
+    \let\Clara@@scale\@empty
+\else
+    \edef\Clara@@scale{s*[\csname Clara@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LGR}{Clara-TLF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{Clara-TLF}{regular}{sc}{
+      <-> \Clara@@scale ClaraRegular-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Clara-TLF}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Clara-TLF}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Clara-TLF}{regular}{sl}{
+      <-> ssub * Clara-TLF/regular/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{Clara-TLF}{bold}{it}{
+      <-> \Clara@@scale ClaraBoldItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Clara-TLF}{bold}{n}{
+      <-> \Clara@@scale ClaraBold-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Clara-TLF}{bold}{sl}{
+      <-> ssub * Clara-TLF/bold/it
+}{}
+
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{Clara-TLF}{m}{it}{
+      <-> alias * Clara-TLF/regular/it
+}{}
+
+\DeclareFontShape{LGR}{Clara-TLF}{m}{sl}{
+      <-> alias * Clara-TLF/regular/sl
+}{}
+
+\DeclareFontShape{LGR}{Clara-TLF}{m}{n}{
+      <-> alias * Clara-TLF/regular/n
+}{}
+
+\DeclareFontShape{LGR}{Clara-TLF}{m}{sc}{
+      <-> alias * Clara-TLF/regular/sc
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{Clara-TLF}{b}{it}{
+      <-> alias * Clara-TLF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{Clara-TLF}{b}{sl}{
+      <-> alias * Clara-TLF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{Clara-TLF}{b}{n}{
+      <-> alias * Clara-TLF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{Clara-TLF}{bx}{n}{
+      <-> ssub * Clara-TLF/b/n
+}{}
+
+\DeclareFontShape{LGR}{Clara-TLF}{bx}{sl}{
+      <-> ssub * Clara-TLF/b/sl
+}{}
+
+\DeclareFontShape{LGR}{Clara-TLF}{bx}{it}{
+      <-> ssub * Clara-TLF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/clara/LGRClara-TOsF.fd b/Master/texmf-dist/tex/latex/clara/LGRClara-TOsF.fd
new file mode 100644
index 00000000000..70f5538b742
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/clara/LGRClara-TOsF.fd
@@ -0,0 +1,63 @@
+%% Generated by autoinst on 2019/12/24
+%%
+\ProvidesFile{LGRClara-TOsF.fd}
+    [2019/12/24 (autoinst)  Font definitions for LGR/Clara-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Clara@scale\endcsname\relax
+    \let\Clara@@scale\@empty
+\else
+    \edef\Clara@@scale{s*[\csname Clara@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LGR}{Clara-TOsF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{Clara-TOsF}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Clara-TOsF}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Clara-TOsF}{regular}{sc}{
+      <-> \Clara@@scale ClaraRegular-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Clara-TOsF}{regular}{sl}{
+      <-> ssub * Clara-TOsF/regular/it
+}{}
+
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{Clara-TOsF}{m}{it}{
+      <-> alias * Clara-TOsF/regular/it
+}{}
+
+\DeclareFontShape{LGR}{Clara-TOsF}{m}{sl}{
+      <-> alias * Clara-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{LGR}{Clara-TOsF}{m}{n}{
+      <-> alias * Clara-TOsF/regular/n
+}{}
+
+\DeclareFontShape{LGR}{Clara-TOsF}{m}{sc}{
+      <-> alias * Clara-TOsF/regular/sc
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/clara/LY1Clara-Sup.fd b/Master/texmf-dist/tex/latex/clara/LY1Clara-Sup.fd
index a76912e0743..76bad86b0e2 100644
--- a/Master/texmf-dist/tex/latex/clara/LY1Clara-Sup.fd
+++ b/Master/texmf-dist/tex/latex/clara/LY1Clara-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/12/14
+%% Generated by autoinst on 2019/12/24
 %%
 \ProvidesFile{LY1Clara-Sup.fd}
-    [2019/12/14 (autoinst)  Font definitions for LY1/Clara-Sup.]
+    [2019/12/24 (autoinst)  Font definitions for LY1/Clara-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,25 +20,14 @@
 \DeclareFontFamily{LY1}{Clara-Sup}{}
 
 
-%   ----  regular  ----
-
-\DeclareFontShape{LY1}{Clara-Sup}{regular}{it}{
-      <-> \Clara@@scale Clara-Italic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{Clara-Sup}{regular}{sl}{
-      <-> ssub * Clara-Sup/regular/it
-}{}
-
-
 %   ----  bold  ----
 
-\DeclareFontShape{LY1}{Clara-Sup}{bold}{it}{
-      <-> \Clara@@scale Clara-Bold-Italic-sup-ly1
+\DeclareFontShape{LY1}{Clara-Sup}{bold}{n}{
+      <-> \Clara@@scale ClaraBold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Clara-Sup}{bold}{n}{
-      <-> \Clara@@scale Clara-Bold-sup-ly1
+\DeclareFontShape{LY1}{Clara-Sup}{bold}{it}{
+      <-> \Clara@@scale ClaraBoldItalic-sup-ly1
 }{}
 
 \DeclareFontShape{LY1}{Clara-Sup}{bold}{sl}{
@@ -46,10 +35,18 @@
 }{}
 
 
-%   ----  book  ----
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{Clara-Sup}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Clara-Sup}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-sup-ly1
+}{}
 
-\DeclareFontShape{LY1}{Clara-Sup}{book}{n}{
-      <-> \Clara@@scale Clara-sup-ly1
+\DeclareFontShape{LY1}{Clara-Sup}{regular}{sl}{
+      <-> ssub * Clara-Sup/regular/it
 }{}
 
 %
@@ -58,6 +55,10 @@
 
 %   m --> regular
 
+\DeclareFontShape{LY1}{Clara-Sup}{m}{n}{
+      <-> alias * Clara-Sup/regular/n
+}{}
+
 \DeclareFontShape{LY1}{Clara-Sup}{m}{sl}{
       <-> alias * Clara-Sup/regular/sl
 }{}
@@ -81,10 +82,6 @@
       <-> alias * Clara-Sup/bold/it
 }{}
 
-\DeclareFontShape{LY1}{Clara-Sup}{bx}{sl}{
-      <-> ssub * Clara-Sup/b/sl
-}{}
-
 \DeclareFontShape{LY1}{Clara-Sup}{bx}{it}{
       <-> ssub * Clara-Sup/b/it
 }{}
@@ -93,4 +90,8 @@
       <-> ssub * Clara-Sup/b/n
 }{}
 
+\DeclareFontShape{LY1}{Clara-Sup}{bx}{sl}{
+      <-> ssub * Clara-Sup/b/sl
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/clara/LY1Clara-TLF.fd b/Master/texmf-dist/tex/latex/clara/LY1Clara-TLF.fd
index 8514761e298..63c9951c2d4 100644
--- a/Master/texmf-dist/tex/latex/clara/LY1Clara-TLF.fd
+++ b/Master/texmf-dist/tex/latex/clara/LY1Clara-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/12/14
+%% Generated by autoinst on 2019/12/24
 %%
 \ProvidesFile{LY1Clara-TLF.fd}
-    [2019/12/14 (autoinst)  Font definitions for LY1/Clara-TLF.]
+    [2019/12/24 (autoinst)  Font definitions for LY1/Clara-TLF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,40 +20,37 @@
 \DeclareFontFamily{LY1}{Clara-TLF}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{Clara-TLF}{regular}{it}{
-      <-> \Clara@@scale Clara-Italic-tlf-ly1
+\DeclareFontShape{LY1}{Clara-TLF}{bold}{n}{
+      <-> \Clara@@scale ClaraBold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Clara-TLF}{regular}{sl}{
-      <-> ssub * Clara-TLF/regular/it
+\DeclareFontShape{LY1}{Clara-TLF}{bold}{it}{
+      <-> \Clara@@scale ClaraBoldItalic-tlf-ly1
 }{}
 
-
-%   ----  book  ----
-
-\DeclareFontShape{LY1}{Clara-TLF}{book}{sc}{
-      <-> \Clara@@scale Clara-tlf-sc-ly1
+\DeclareFontShape{LY1}{Clara-TLF}{bold}{sl}{
+      <-> ssub * Clara-TLF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{Clara-TLF}{book}{n}{
-      <-> \Clara@@scale Clara-tlf-ly1
-}{}
 
+%   ----  regular  ----
 
-%   ----  bold  ----
+\DeclareFontShape{LY1}{Clara-TLF}{regular}{sc}{
+      <-> \Clara@@scale ClaraRegular-tlf-sc-ly1
+}{}
 
-\DeclareFontShape{LY1}{Clara-TLF}{bold}{n}{
-      <-> \Clara@@scale Clara-Bold-tlf-ly1
+\DeclareFontShape{LY1}{Clara-TLF}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Clara-TLF}{bold}{it}{
-      <-> \Clara@@scale Clara-Bold-Italic-tlf-ly1
+\DeclareFontShape{LY1}{Clara-TLF}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Clara-TLF}{bold}{sl}{
-      <-> ssub * Clara-TLF/bold/it
+\DeclareFontShape{LY1}{Clara-TLF}{regular}{sl}{
+      <-> ssub * Clara-TLF/regular/it
 }{}
 
 %
@@ -62,6 +59,10 @@
 
 %   m --> regular
 
+\DeclareFontShape{LY1}{Clara-TLF}{m}{sc}{
+      <-> alias * Clara-TLF/regular/sc
+}{}
+
 \DeclareFontShape{LY1}{Clara-TLF}{m}{it}{
       <-> alias * Clara-TLF/regular/it
 }{}
@@ -70,9 +71,17 @@
       <-> alias * Clara-TLF/regular/sl
 }{}
 
+\DeclareFontShape{LY1}{Clara-TLF}{m}{n}{
+      <-> alias * Clara-TLF/regular/n
+}{}
+
 
 %   b --> bold
 
+\DeclareFontShape{LY1}{Clara-TLF}{b}{n}{
+      <-> alias * Clara-TLF/bold/n
+}{}
+
 \DeclareFontShape{LY1}{Clara-TLF}{b}{sl}{
       <-> alias * Clara-TLF/bold/sl
 }{}
@@ -81,18 +90,14 @@
       <-> alias * Clara-TLF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{Clara-TLF}{b}{n}{
-      <-> alias * Clara-TLF/bold/n
+\DeclareFontShape{LY1}{Clara-TLF}{bx}{it}{
+      <-> ssub * Clara-TLF/b/it
 }{}
 
 \DeclareFontShape{LY1}{Clara-TLF}{bx}{n}{
       <-> ssub * Clara-TLF/b/n
 }{}
 
-\DeclareFontShape{LY1}{Clara-TLF}{bx}{it}{
-      <-> ssub * Clara-TLF/b/it
-}{}
-
 \DeclareFontShape{LY1}{Clara-TLF}{bx}{sl}{
       <-> ssub * Clara-TLF/b/sl
 }{}
diff --git a/Master/texmf-dist/tex/latex/clara/LY1Clara-TOsF.fd b/Master/texmf-dist/tex/latex/clara/LY1Clara-TOsF.fd
index 0e8f88dd091..fa6ce5b812f 100644
--- a/Master/texmf-dist/tex/latex/clara/LY1Clara-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/clara/LY1Clara-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/12/14
+%% Generated by autoinst on 2019/12/24
 %%
 \ProvidesFile{LY1Clara-TOsF.fd}
-    [2019/12/14 (autoinst)  Font definitions for LY1/Clara-TOsF.]
+    [2019/12/24 (autoinst)  Font definitions for LY1/Clara-TOsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,21 +20,18 @@
 \DeclareFontFamily{LY1}{Clara-TOsF}{}
 
 
-%   ----  book  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{Clara-TOsF}{book}{n}{
-      <-> \Clara@@scale Clara-tosf-ly1
+\DeclareFontShape{LY1}{Clara-TOsF}{regular}{sc}{
+      <-> \Clara@@scale ClaraRegular-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Clara-TOsF}{book}{sc}{
-      <-> \Clara@@scale Clara-tosf-sc-ly1
+\DeclareFontShape{LY1}{Clara-TOsF}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-tosf-ly1
 }{}
 
-
-%   ----  regular  ----
-
 \DeclareFontShape{LY1}{Clara-TOsF}{regular}{it}{
-      <-> \Clara@@scale Clara-Italic-tosf-ly1
+      <-> \Clara@@scale ClaraItalic-tosf-ly1
 }{}
 
 \DeclareFontShape{LY1}{Clara-TOsF}{regular}{sl}{
@@ -47,12 +44,20 @@
 
 %   m --> regular
 
-\DeclareFontShape{LY1}{Clara-TOsF}{m}{it}{
-      <-> alias * Clara-TOsF/regular/it
+\DeclareFontShape{LY1}{Clara-TOsF}{m}{n}{
+      <-> alias * Clara-TOsF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{Clara-TOsF}{m}{sl}{
       <-> alias * Clara-TOsF/regular/sl
 }{}
 
+\DeclareFontShape{LY1}{Clara-TOsF}{m}{it}{
+      <-> alias * Clara-TOsF/regular/it
+}{}
+
+\DeclareFontShape{LY1}{Clara-TOsF}{m}{sc}{
+      <-> alias * Clara-TOsF/regular/sc
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/clara/OT1Clara-Sup.fd b/Master/texmf-dist/tex/latex/clara/OT1Clara-Sup.fd
index aeaab42ca05..3d47bab0ee2 100644
--- a/Master/texmf-dist/tex/latex/clara/OT1Clara-Sup.fd
+++ b/Master/texmf-dist/tex/latex/clara/OT1Clara-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/12/14
+%% Generated by autoinst on 2019/12/24
 %%
 \ProvidesFile{OT1Clara-Sup.fd}
-    [2019/12/14 (autoinst)  Font definitions for OT1/Clara-Sup.]
+    [2019/12/24 (autoinst)  Font definitions for OT1/Clara-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,8 +22,12 @@
 
 %   ----  regular  ----
 
+\DeclareFontShape{OT1}{Clara-Sup}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-sup-ot1
+}{}
+
 \DeclareFontShape{OT1}{Clara-Sup}{regular}{it}{
-      <-> \Clara@@scale Clara-Italic-sup-ot1
+      <-> \Clara@@scale ClaraItalic-sup-ot1
 }{}
 
 \DeclareFontShape{OT1}{Clara-Sup}{regular}{sl}{
@@ -34,36 +38,33 @@
 %   ----  bold  ----
 
 \DeclareFontShape{OT1}{Clara-Sup}{bold}{it}{
-      <-> \Clara@@scale Clara-Bold-Italic-sup-ot1
+      <-> \Clara@@scale ClaraBoldItalic-sup-ot1
 }{}
 
 \DeclareFontShape{OT1}{Clara-Sup}{bold}{n}{
-      <-> \Clara@@scale Clara-Bold-sup-ot1
+      <-> \Clara@@scale ClaraBold-sup-ot1
 }{}
 
 \DeclareFontShape{OT1}{Clara-Sup}{bold}{sl}{
       <-> ssub * Clara-Sup/bold/it
 }{}
 
-
-%   ----  book  ----
-
-\DeclareFontShape{OT1}{Clara-Sup}{book}{n}{
-      <-> \Clara@@scale Clara-sup-ot1
-}{}
-
 %
 %  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   m --> regular
 
+\DeclareFontShape{OT1}{Clara-Sup}{m}{it}{
+      <-> alias * Clara-Sup/regular/it
+}{}
+
 \DeclareFontShape{OT1}{Clara-Sup}{m}{sl}{
       <-> alias * Clara-Sup/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{Clara-Sup}{m}{it}{
-      <-> alias * Clara-Sup/regular/it
+\DeclareFontShape{OT1}{Clara-Sup}{m}{n}{
+      <-> alias * Clara-Sup/regular/n
 }{}
 
 
diff --git a/Master/texmf-dist/tex/latex/clara/OT1Clara-TLF.fd b/Master/texmf-dist/tex/latex/clara/OT1Clara-TLF.fd
index ffd709b7ca1..679eab53d08 100644
--- a/Master/texmf-dist/tex/latex/clara/OT1Clara-TLF.fd
+++ b/Master/texmf-dist/tex/latex/clara/OT1Clara-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/12/14
+%% Generated by autoinst on 2019/12/24
 %%
 \ProvidesFile{OT1Clara-TLF.fd}
-    [2019/12/14 (autoinst)  Font definitions for OT1/Clara-TLF.]
+    [2019/12/24 (autoinst)  Font definitions for OT1/Clara-TLF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,34 +22,31 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{OT1}{Clara-TLF}{regular}{it}{
-      <-> \Clara@@scale Clara-Italic-tlf-ot1
+\DeclareFontShape{OT1}{Clara-TLF}{regular}{sc}{
+      <-> \Clara@@scale ClaraRegular-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Clara-TLF}{regular}{sl}{
-      <-> ssub * Clara-TLF/regular/it
+\DeclareFontShape{OT1}{Clara-TLF}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-tlf-ot1
 }{}
 
-
-%   ----  book  ----
-
-\DeclareFontShape{OT1}{Clara-TLF}{book}{n}{
-      <-> \Clara@@scale Clara-tlf-ot1
+\DeclareFontShape{OT1}{Clara-TLF}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Clara-TLF}{book}{sc}{
-      <-> \Clara@@scale Clara-tlf-sc-ot1
+\DeclareFontShape{OT1}{Clara-TLF}{regular}{sl}{
+      <-> ssub * Clara-TLF/regular/it
 }{}
 
 
 %   ----  bold  ----
 
 \DeclareFontShape{OT1}{Clara-TLF}{bold}{it}{
-      <-> \Clara@@scale Clara-Bold-Italic-tlf-ot1
+      <-> \Clara@@scale ClaraBoldItalic-tlf-ot1
 }{}
 
 \DeclareFontShape{OT1}{Clara-TLF}{bold}{n}{
-      <-> \Clara@@scale Clara-Bold-tlf-ot1
+      <-> \Clara@@scale ClaraBold-tlf-ot1
 }{}
 
 \DeclareFontShape{OT1}{Clara-TLF}{bold}{sl}{
@@ -62,6 +59,10 @@
 
 %   m --> regular
 
+\DeclareFontShape{OT1}{Clara-TLF}{m}{n}{
+      <-> alias * Clara-TLF/regular/n
+}{}
+
 \DeclareFontShape{OT1}{Clara-TLF}{m}{sl}{
       <-> alias * Clara-TLF/regular/sl
 }{}
@@ -70,6 +71,10 @@
       <-> alias * Clara-TLF/regular/it
 }{}
 
+\DeclareFontShape{OT1}{Clara-TLF}{m}{sc}{
+      <-> alias * Clara-TLF/regular/sc
+}{}
+
 
 %   b --> bold
 
@@ -85,6 +90,10 @@
       <-> alias * Clara-TLF/bold/it
 }{}
 
+\DeclareFontShape{OT1}{Clara-TLF}{bx}{sl}{
+      <-> ssub * Clara-TLF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{Clara-TLF}{bx}{n}{
       <-> ssub * Clara-TLF/b/n
 }{}
@@ -93,8 +102,4 @@
       <-> ssub * Clara-TLF/b/it
 }{}
 
-\DeclareFontShape{OT1}{Clara-TLF}{bx}{sl}{
-      <-> ssub * Clara-TLF/b/sl
-}{}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/clara/OT1Clara-TOsF.fd b/Master/texmf-dist/tex/latex/clara/OT1Clara-TOsF.fd
index 66e4f2636f6..eb1ed6950b8 100644
--- a/Master/texmf-dist/tex/latex/clara/OT1Clara-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/clara/OT1Clara-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/12/14
+%% Generated by autoinst on 2019/12/24
 %%
 \ProvidesFile{OT1Clara-TOsF.fd}
-    [2019/12/14 (autoinst)  Font definitions for OT1/Clara-TOsF.]
+    [2019/12/24 (autoinst)  Font definitions for OT1/Clara-TOsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,21 +20,18 @@
 \DeclareFontFamily{OT1}{Clara-TOsF}{}
 
 
-%   ----  book  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{Clara-TOsF}{book}{n}{
-      <-> \Clara@@scale Clara-tosf-ot1
+\DeclareFontShape{OT1}{Clara-TOsF}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Clara-TOsF}{book}{sc}{
-      <-> \Clara@@scale Clara-tosf-sc-ot1
+\DeclareFontShape{OT1}{Clara-TOsF}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-tosf-ot1
 }{}
 
-
-%   ----  regular  ----
-
-\DeclareFontShape{OT1}{Clara-TOsF}{regular}{it}{
-      <-> \Clara@@scale Clara-Italic-tosf-ot1
+\DeclareFontShape{OT1}{Clara-TOsF}{regular}{sc}{
+      <-> \Clara@@scale ClaraRegular-tosf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{Clara-TOsF}{regular}{sl}{
@@ -47,6 +44,10 @@
 
 %   m --> regular
 
+\DeclareFontShape{OT1}{Clara-TOsF}{m}{sc}{
+      <-> alias * Clara-TOsF/regular/sc
+}{}
+
 \DeclareFontShape{OT1}{Clara-TOsF}{m}{it}{
       <-> alias * Clara-TOsF/regular/it
 }{}
@@ -55,4 +56,8 @@
       <-> alias * Clara-TOsF/regular/sl
 }{}
 
+\DeclareFontShape{OT1}{Clara-TOsF}{m}{n}{
+      <-> alias * Clara-TOsF/regular/n
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/clara/T1Clara-Sup.fd b/Master/texmf-dist/tex/latex/clara/T1Clara-Sup.fd
index 11c6828801d..19c141a2899 100644
--- a/Master/texmf-dist/tex/latex/clara/T1Clara-Sup.fd
+++ b/Master/texmf-dist/tex/latex/clara/T1Clara-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/12/14
+%% Generated by autoinst on 2019/12/24
 %%
 \ProvidesFile{T1Clara-Sup.fd}
-    [2019/12/14 (autoinst)  Font definitions for T1/Clara-Sup.]
+    [2019/12/24 (autoinst)  Font definitions for T1/Clara-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,21 +20,14 @@
 \DeclareFontFamily{T1}{Clara-Sup}{}
 
 
-%   ----  book  ----
-
-\DeclareFontShape{T1}{Clara-Sup}{book}{n}{
-      <-> \Clara@@scale Clara-sup-t1
-}{}
-
-
 %   ----  bold  ----
 
-\DeclareFontShape{T1}{Clara-Sup}{bold}{it}{
-      <-> \Clara@@scale Clara-Bold-Italic-sup-t1
+\DeclareFontShape{T1}{Clara-Sup}{bold}{n}{
+      <-> \Clara@@scale ClaraBold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Clara-Sup}{bold}{n}{
-      <-> \Clara@@scale Clara-Bold-sup-t1
+\DeclareFontShape{T1}{Clara-Sup}{bold}{it}{
+      <-> \Clara@@scale ClaraBoldItalic-sup-t1
 }{}
 
 \DeclareFontShape{T1}{Clara-Sup}{bold}{sl}{
@@ -44,8 +37,12 @@
 
 %   ----  regular  ----
 
+\DeclareFontShape{T1}{Clara-Sup}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-sup-t1
+}{}
+
 \DeclareFontShape{T1}{Clara-Sup}{regular}{it}{
-      <-> \Clara@@scale Clara-Italic-sup-t1
+      <-> \Clara@@scale ClaraItalic-sup-t1
 }{}
 
 \DeclareFontShape{T1}{Clara-Sup}{regular}{sl}{
@@ -66,12 +63,12 @@
       <-> alias * Clara-Sup/regular/sl
 }{}
 
+\DeclareFontShape{T1}{Clara-Sup}{m}{n}{
+      <-> alias * Clara-Sup/regular/n
+}{}
 
-%   b --> bold
 
-\DeclareFontShape{T1}{Clara-Sup}{b}{n}{
-      <-> alias * Clara-Sup/bold/n
-}{}
+%   b --> bold
 
 \DeclareFontShape{T1}{Clara-Sup}{b}{it}{
       <-> alias * Clara-Sup/bold/it
@@ -81,6 +78,10 @@
       <-> alias * Clara-Sup/bold/sl
 }{}
 
+\DeclareFontShape{T1}{Clara-Sup}{b}{n}{
+      <-> alias * Clara-Sup/bold/n
+}{}
+
 \DeclareFontShape{T1}{Clara-Sup}{bx}{n}{
       <-> ssub * Clara-Sup/b/n
 }{}
diff --git a/Master/texmf-dist/tex/latex/clara/T1Clara-TLF.fd b/Master/texmf-dist/tex/latex/clara/T1Clara-TLF.fd
index 8759fd0f42a..902ab84a2c1 100644
--- a/Master/texmf-dist/tex/latex/clara/T1Clara-TLF.fd
+++ b/Master/texmf-dist/tex/latex/clara/T1Clara-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/12/14
+%% Generated by autoinst on 2019/12/24
 %%
 \ProvidesFile{T1Clara-TLF.fd}
-    [2019/12/14 (autoinst)  Font definitions for T1/Clara-TLF.]
+    [2019/12/24 (autoinst)  Font definitions for T1/Clara-TLF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,40 +20,37 @@
 \DeclareFontFamily{T1}{Clara-TLF}{}
 
 
-%   ----  book  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{Clara-TLF}{book}{n}{
-      <-> \Clara@@scale Clara-tlf-t1
+\DeclareFontShape{T1}{Clara-TLF}{regular}{sc}{
+      <-> \Clara@@scale ClaraRegular-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Clara-TLF}{book}{sc}{
-      <-> \Clara@@scale Clara-tlf-sc-t1
+\DeclareFontShape{T1}{Clara-TLF}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-tlf-t1
 }{}
 
-
-%   ----  bold  ----
-
-\DeclareFontShape{T1}{Clara-TLF}{bold}{n}{
-      <-> \Clara@@scale Clara-Bold-tlf-t1
+\DeclareFontShape{T1}{Clara-TLF}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Clara-TLF}{bold}{it}{
-      <-> \Clara@@scale Clara-Bold-Italic-tlf-t1
+\DeclareFontShape{T1}{Clara-TLF}{regular}{sl}{
+      <-> ssub * Clara-TLF/regular/it
 }{}
 
-\DeclareFontShape{T1}{Clara-TLF}{bold}{sl}{
-      <-> ssub * Clara-TLF/bold/it
-}{}
 
+%   ----  bold  ----
 
-%   ----  regular  ----
+\DeclareFontShape{T1}{Clara-TLF}{bold}{it}{
+      <-> \Clara@@scale ClaraBoldItalic-tlf-t1
+}{}
 
-\DeclareFontShape{T1}{Clara-TLF}{regular}{it}{
-      <-> \Clara@@scale Clara-Italic-tlf-t1
+\DeclareFontShape{T1}{Clara-TLF}{bold}{n}{
+      <-> \Clara@@scale ClaraBold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Clara-TLF}{regular}{sl}{
-      <-> ssub * Clara-TLF/regular/it
+\DeclareFontShape{T1}{Clara-TLF}{bold}{sl}{
+      <-> ssub * Clara-TLF/bold/it
 }{}
 
 %
@@ -62,6 +59,14 @@
 
 %   m --> regular
 
+\DeclareFontShape{T1}{Clara-TLF}{m}{sc}{
+      <-> alias * Clara-TLF/regular/sc
+}{}
+
+\DeclareFontShape{T1}{Clara-TLF}{m}{n}{
+      <-> alias * Clara-TLF/regular/n
+}{}
+
 \DeclareFontShape{T1}{Clara-TLF}{m}{sl}{
       <-> alias * Clara-TLF/regular/sl
 }{}
@@ -77,22 +82,22 @@
       <-> alias * Clara-TLF/bold/n
 }{}
 
-\DeclareFontShape{T1}{Clara-TLF}{b}{it}{
-      <-> alias * Clara-TLF/bold/it
-}{}
-
 \DeclareFontShape{T1}{Clara-TLF}{b}{sl}{
       <-> alias * Clara-TLF/bold/sl
 }{}
 
-\DeclareFontShape{T1}{Clara-TLF}{bx}{n}{
-      <-> ssub * Clara-TLF/b/n
+\DeclareFontShape{T1}{Clara-TLF}{b}{it}{
+      <-> alias * Clara-TLF/bold/it
 }{}
 
 \DeclareFontShape{T1}{Clara-TLF}{bx}{it}{
       <-> ssub * Clara-TLF/b/it
 }{}
 
+\DeclareFontShape{T1}{Clara-TLF}{bx}{n}{
+      <-> ssub * Clara-TLF/b/n
+}{}
+
 \DeclareFontShape{T1}{Clara-TLF}{bx}{sl}{
       <-> ssub * Clara-TLF/b/sl
 }{}
diff --git a/Master/texmf-dist/tex/latex/clara/T1Clara-TOsF.fd b/Master/texmf-dist/tex/latex/clara/T1Clara-TOsF.fd
index 260d83dfbcf..a13b7ebb97d 100644
--- a/Master/texmf-dist/tex/latex/clara/T1Clara-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/clara/T1Clara-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/12/14
+%% Generated by autoinst on 2019/12/24
 %%
 \ProvidesFile{T1Clara-TOsF.fd}
-    [2019/12/14 (autoinst)  Font definitions for T1/Clara-TOsF.]
+    [2019/12/24 (autoinst)  Font definitions for T1/Clara-TOsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,23 +22,20 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{T1}{Clara-TOsF}{regular}{it}{
-      <-> \Clara@@scale Clara-Italic-tosf-t1
+\DeclareFontShape{T1}{Clara-TOsF}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Clara-TOsF}{regular}{sl}{
-      <-> ssub * Clara-TOsF/regular/it
+\DeclareFontShape{T1}{Clara-TOsF}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-tosf-t1
 }{}
 
-
-%   ----  book  ----
-
-\DeclareFontShape{T1}{Clara-TOsF}{book}{n}{
-      <-> \Clara@@scale Clara-tosf-t1
+\DeclareFontShape{T1}{Clara-TOsF}{regular}{sc}{
+      <-> \Clara@@scale ClaraRegular-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Clara-TOsF}{book}{sc}{
-      <-> \Clara@@scale Clara-tosf-sc-t1
+\DeclareFontShape{T1}{Clara-TOsF}{regular}{sl}{
+      <-> ssub * Clara-TOsF/regular/it
 }{}
 
 %
@@ -47,12 +44,20 @@
 
 %   m --> regular
 
+\DeclareFontShape{T1}{Clara-TOsF}{m}{it}{
+      <-> alias * Clara-TOsF/regular/it
+}{}
+
 \DeclareFontShape{T1}{Clara-TOsF}{m}{sl}{
       <-> alias * Clara-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{Clara-TOsF}{m}{it}{
-      <-> alias * Clara-TOsF/regular/it
+\DeclareFontShape{T1}{Clara-TOsF}{m}{n}{
+      <-> alias * Clara-TOsF/regular/n
+}{}
+
+\DeclareFontShape{T1}{Clara-TOsF}{m}{sc}{
+      <-> alias * Clara-TOsF/regular/sc
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/clara/T2AClara-Sup.fd b/Master/texmf-dist/tex/latex/clara/T2AClara-Sup.fd
new file mode 100644
index 00000000000..357f1d63f17
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/clara/T2AClara-Sup.fd
@@ -0,0 +1,97 @@
+%% Generated by autoinst on 2019/12/24
+%%
+\ProvidesFile{T2AClara-Sup.fd}
+    [2019/12/24 (autoinst)  Font definitions for T2A/Clara-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Clara@scale\endcsname\relax
+    \let\Clara@@scale\@empty
+\else
+    \edef\Clara@@scale{s*[\csname Clara@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2A}{Clara-Sup}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2A}{Clara-Sup}{bold}{n}{
+      <-> \Clara@@scale ClaraBold-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{Clara-Sup}{bold}{it}{
+      <-> \Clara@@scale ClaraBoldItalic-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{Clara-Sup}{bold}{sl}{
+      <-> ssub * Clara-Sup/bold/it
+}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2A}{Clara-Sup}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{Clara-Sup}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{Clara-Sup}{regular}{sl}{
+      <-> ssub * Clara-Sup/regular/it
+}{}
+
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T2A}{Clara-Sup}{m}{n}{
+      <-> alias * Clara-Sup/regular/n
+}{}
+
+\DeclareFontShape{T2A}{Clara-Sup}{m}{sl}{
+      <-> alias * Clara-Sup/regular/sl
+}{}
+
+\DeclareFontShape{T2A}{Clara-Sup}{m}{it}{
+      <-> alias * Clara-Sup/regular/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2A}{Clara-Sup}{b}{n}{
+      <-> alias * Clara-Sup/bold/n
+}{}
+
+\DeclareFontShape{T2A}{Clara-Sup}{b}{sl}{
+      <-> alias * Clara-Sup/bold/sl
+}{}
+
+\DeclareFontShape{T2A}{Clara-Sup}{b}{it}{
+      <-> alias * Clara-Sup/bold/it
+}{}
+
+\DeclareFontShape{T2A}{Clara-Sup}{bx}{sl}{
+      <-> ssub * Clara-Sup/b/sl
+}{}
+
+\DeclareFontShape{T2A}{Clara-Sup}{bx}{n}{
+      <-> ssub * Clara-Sup/b/n
+}{}
+
+\DeclareFontShape{T2A}{Clara-Sup}{bx}{it}{
+      <-> ssub * Clara-Sup/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/clara/T2AClara-TLF.fd b/Master/texmf-dist/tex/latex/clara/T2AClara-TLF.fd
new file mode 100644
index 00000000000..ea8bf6408d3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/clara/T2AClara-TLF.fd
@@ -0,0 +1,105 @@
+%% Generated by autoinst on 2019/12/24
+%%
+\ProvidesFile{T2AClara-TLF.fd}
+    [2019/12/24 (autoinst)  Font definitions for T2A/Clara-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Clara@scale\endcsname\relax
+    \let\Clara@@scale\@empty
+\else
+    \edef\Clara@@scale{s*[\csname Clara@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2A}{Clara-TLF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2A}{Clara-TLF}{regular}{sc}{
+      <-> \Clara@@scale ClaraRegular-tlf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{Clara-TLF}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{Clara-TLF}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{Clara-TLF}{regular}{sl}{
+      <-> ssub * Clara-TLF/regular/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2A}{Clara-TLF}{bold}{it}{
+      <-> \Clara@@scale ClaraBoldItalic-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{Clara-TLF}{bold}{n}{
+      <-> \Clara@@scale ClaraBold-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{Clara-TLF}{bold}{sl}{
+      <-> ssub * Clara-TLF/bold/it
+}{}
+
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T2A}{Clara-TLF}{m}{it}{
+      <-> alias * Clara-TLF/regular/it
+}{}
+
+\DeclareFontShape{T2A}{Clara-TLF}{m}{sl}{
+      <-> alias * Clara-TLF/regular/sl
+}{}
+
+\DeclareFontShape{T2A}{Clara-TLF}{m}{n}{
+      <-> alias * Clara-TLF/regular/n
+}{}
+
+\DeclareFontShape{T2A}{Clara-TLF}{m}{sc}{
+      <-> alias * Clara-TLF/regular/sc
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2A}{Clara-TLF}{b}{n}{
+      <-> alias * Clara-TLF/bold/n
+}{}
+
+\DeclareFontShape{T2A}{Clara-TLF}{b}{sl}{
+      <-> alias * Clara-TLF/bold/sl
+}{}
+
+\DeclareFontShape{T2A}{Clara-TLF}{b}{it}{
+      <-> alias * Clara-TLF/bold/it
+}{}
+
+\DeclareFontShape{T2A}{Clara-TLF}{bx}{sl}{
+      <-> ssub * Clara-TLF/b/sl
+}{}
+
+\DeclareFontShape{T2A}{Clara-TLF}{bx}{n}{
+      <-> ssub * Clara-TLF/b/n
+}{}
+
+\DeclareFontShape{T2A}{Clara-TLF}{bx}{it}{
+      <-> ssub * Clara-TLF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/clara/T2AClara-TOsF.fd b/Master/texmf-dist/tex/latex/clara/T2AClara-TOsF.fd
new file mode 100644
index 00000000000..5ef513f65a5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/clara/T2AClara-TOsF.fd
@@ -0,0 +1,63 @@
+%% Generated by autoinst on 2019/12/24
+%%
+\ProvidesFile{T2AClara-TOsF.fd}
+    [2019/12/24 (autoinst)  Font definitions for T2A/Clara-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Clara@scale\endcsname\relax
+    \let\Clara@@scale\@empty
+\else
+    \edef\Clara@@scale{s*[\csname Clara@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2A}{Clara-TOsF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2A}{Clara-TOsF}{regular}{sc}{
+      <-> \Clara@@scale ClaraRegular-tosf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{Clara-TOsF}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{Clara-TOsF}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{Clara-TOsF}{regular}{sl}{
+      <-> ssub * Clara-TOsF/regular/it
+}{}
+
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T2A}{Clara-TOsF}{m}{sc}{
+      <-> alias * Clara-TOsF/regular/sc
+}{}
+
+\DeclareFontShape{T2A}{Clara-TOsF}{m}{n}{
+      <-> alias * Clara-TOsF/regular/n
+}{}
+
+\DeclareFontShape{T2A}{Clara-TOsF}{m}{sl}{
+      <-> alias * Clara-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{T2A}{Clara-TOsF}{m}{it}{
+      <-> alias * Clara-TOsF/regular/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/clara/T2BClara-Sup.fd b/Master/texmf-dist/tex/latex/clara/T2BClara-Sup.fd
new file mode 100644
index 00000000000..0ab6c8ee5c2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/clara/T2BClara-Sup.fd
@@ -0,0 +1,97 @@
+%% Generated by autoinst on 2019/12/24
+%%
+\ProvidesFile{T2BClara-Sup.fd}
+    [2019/12/24 (autoinst)  Font definitions for T2B/Clara-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Clara@scale\endcsname\relax
+    \let\Clara@@scale\@empty
+\else
+    \edef\Clara@@scale{s*[\csname Clara@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2B}{Clara-Sup}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2B}{Clara-Sup}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-sup-t2b
+}{}
+
+\DeclareFontShape{T2B}{Clara-Sup}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-sup-t2b
+}{}
+
+\DeclareFontShape{T2B}{Clara-Sup}{regular}{sl}{
+      <-> ssub * Clara-Sup/regular/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2B}{Clara-Sup}{bold}{n}{
+      <-> \Clara@@scale ClaraBold-sup-t2b
+}{}
+
+\DeclareFontShape{T2B}{Clara-Sup}{bold}{it}{
+      <-> \Clara@@scale ClaraBoldItalic-sup-t2b
+}{}
+
+\DeclareFontShape{T2B}{Clara-Sup}{bold}{sl}{
+      <-> ssub * Clara-Sup/bold/it
+}{}
+
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T2B}{Clara-Sup}{m}{it}{
+      <-> alias * Clara-Sup/regular/it
+}{}
+
+\DeclareFontShape{T2B}{Clara-Sup}{m}{sl}{
+      <-> alias * Clara-Sup/regular/sl
+}{}
+
+\DeclareFontShape{T2B}{Clara-Sup}{m}{n}{
+      <-> alias * Clara-Sup/regular/n
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2B}{Clara-Sup}{b}{n}{
+      <-> alias * Clara-Sup/bold/n
+}{}
+
+\DeclareFontShape{T2B}{Clara-Sup}{b}{sl}{
+      <-> alias * Clara-Sup/bold/sl
+}{}
+
+\DeclareFontShape{T2B}{Clara-Sup}{b}{it}{
+      <-> alias * Clara-Sup/bold/it
+}{}
+
+\DeclareFontShape{T2B}{Clara-Sup}{bx}{it}{
+      <-> ssub * Clara-Sup/b/it
+}{}
+
+\DeclareFontShape{T2B}{Clara-Sup}{bx}{n}{
+      <-> ssub * Clara-Sup/b/n
+}{}
+
+\DeclareFontShape{T2B}{Clara-Sup}{bx}{sl}{
+      <-> ssub * Clara-Sup/b/sl
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/clara/T2BClara-TLF.fd b/Master/texmf-dist/tex/latex/clara/T2BClara-TLF.fd
new file mode 100644
index 00000000000..e3ad6a4c1f4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/clara/T2BClara-TLF.fd
@@ -0,0 +1,105 @@
+%% Generated by autoinst on 2019/12/24
+%%
+\ProvidesFile{T2BClara-TLF.fd}
+    [2019/12/24 (autoinst)  Font definitions for T2B/Clara-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Clara@scale\endcsname\relax
+    \let\Clara@@scale\@empty
+\else
+    \edef\Clara@@scale{s*[\csname Clara@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2B}{Clara-TLF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2B}{Clara-TLF}{regular}{sc}{
+      <-> \Clara@@scale ClaraRegular-tlf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{Clara-TLF}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-tlf-t2b
+}{}
+
+\DeclareFontShape{T2B}{Clara-TLF}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-tlf-t2b
+}{}
+
+\DeclareFontShape{T2B}{Clara-TLF}{regular}{sl}{
+      <-> ssub * Clara-TLF/regular/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2B}{Clara-TLF}{bold}{n}{
+      <-> \Clara@@scale ClaraBold-tlf-t2b
+}{}
+
+\DeclareFontShape{T2B}{Clara-TLF}{bold}{it}{
+      <-> \Clara@@scale ClaraBoldItalic-tlf-t2b
+}{}
+
+\DeclareFontShape{T2B}{Clara-TLF}{bold}{sl}{
+      <-> ssub * Clara-TLF/bold/it
+}{}
+
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T2B}{Clara-TLF}{m}{sc}{
+      <-> alias * Clara-TLF/regular/sc
+}{}
+
+\DeclareFontShape{T2B}{Clara-TLF}{m}{n}{
+      <-> alias * Clara-TLF/regular/n
+}{}
+
+\DeclareFontShape{T2B}{Clara-TLF}{m}{sl}{
+      <-> alias * Clara-TLF/regular/sl
+}{}
+
+\DeclareFontShape{T2B}{Clara-TLF}{m}{it}{
+      <-> alias * Clara-TLF/regular/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2B}{Clara-TLF}{b}{it}{
+      <-> alias * Clara-TLF/bold/it
+}{}
+
+\DeclareFontShape{T2B}{Clara-TLF}{b}{sl}{
+      <-> alias * Clara-TLF/bold/sl
+}{}
+
+\DeclareFontShape{T2B}{Clara-TLF}{b}{n}{
+      <-> alias * Clara-TLF/bold/n
+}{}
+
+\DeclareFontShape{T2B}{Clara-TLF}{bx}{it}{
+      <-> ssub * Clara-TLF/b/it
+}{}
+
+\DeclareFontShape{T2B}{Clara-TLF}{bx}{sl}{
+      <-> ssub * Clara-TLF/b/sl
+}{}
+
+\DeclareFontShape{T2B}{Clara-TLF}{bx}{n}{
+      <-> ssub * Clara-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/clara/T2BClara-TOsF.fd b/Master/texmf-dist/tex/latex/clara/T2BClara-TOsF.fd
new file mode 100644
index 00000000000..87853777365
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/clara/T2BClara-TOsF.fd
@@ -0,0 +1,63 @@
+%% Generated by autoinst on 2019/12/24
+%%
+\ProvidesFile{T2BClara-TOsF.fd}
+    [2019/12/24 (autoinst)  Font definitions for T2B/Clara-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Clara@scale\endcsname\relax
+    \let\Clara@@scale\@empty
+\else
+    \edef\Clara@@scale{s*[\csname Clara@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2B}{Clara-TOsF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2B}{Clara-TOsF}{regular}{sc}{
+      <-> \Clara@@scale ClaraRegular-tosf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{Clara-TOsF}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-tosf-t2b
+}{}
+
+\DeclareFontShape{T2B}{Clara-TOsF}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-tosf-t2b
+}{}
+
+\DeclareFontShape{T2B}{Clara-TOsF}{regular}{sl}{
+      <-> ssub * Clara-TOsF/regular/it
+}{}
+
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T2B}{Clara-TOsF}{m}{n}{
+      <-> alias * Clara-TOsF/regular/n
+}{}
+
+\DeclareFontShape{T2B}{Clara-TOsF}{m}{sl}{
+      <-> alias * Clara-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{T2B}{Clara-TOsF}{m}{it}{
+      <-> alias * Clara-TOsF/regular/it
+}{}
+
+\DeclareFontShape{T2B}{Clara-TOsF}{m}{sc}{
+      <-> alias * Clara-TOsF/regular/sc
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/clara/T2CClara-Sup.fd b/Master/texmf-dist/tex/latex/clara/T2CClara-Sup.fd
new file mode 100644
index 00000000000..f4e14175c73
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/clara/T2CClara-Sup.fd
@@ -0,0 +1,97 @@
+%% Generated by autoinst on 2019/12/24
+%%
+\ProvidesFile{T2CClara-Sup.fd}
+    [2019/12/24 (autoinst)  Font definitions for T2C/Clara-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Clara@scale\endcsname\relax
+    \let\Clara@@scale\@empty
+\else
+    \edef\Clara@@scale{s*[\csname Clara@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2C}{Clara-Sup}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2C}{Clara-Sup}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-sup-t2c
+}{}
+
+\DeclareFontShape{T2C}{Clara-Sup}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-sup-t2c
+}{}
+
+\DeclareFontShape{T2C}{Clara-Sup}{regular}{sl}{
+      <-> ssub * Clara-Sup/regular/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2C}{Clara-Sup}{bold}{n}{
+      <-> \Clara@@scale ClaraBold-sup-t2c
+}{}
+
+\DeclareFontShape{T2C}{Clara-Sup}{bold}{it}{
+      <-> \Clara@@scale ClaraBoldItalic-sup-t2c
+}{}
+
+\DeclareFontShape{T2C}{Clara-Sup}{bold}{sl}{
+      <-> ssub * Clara-Sup/bold/it
+}{}
+
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T2C}{Clara-Sup}{m}{it}{
+      <-> alias * Clara-Sup/regular/it
+}{}
+
+\DeclareFontShape{T2C}{Clara-Sup}{m}{sl}{
+      <-> alias * Clara-Sup/regular/sl
+}{}
+
+\DeclareFontShape{T2C}{Clara-Sup}{m}{n}{
+      <-> alias * Clara-Sup/regular/n
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2C}{Clara-Sup}{b}{n}{
+      <-> alias * Clara-Sup/bold/n
+}{}
+
+\DeclareFontShape{T2C}{Clara-Sup}{b}{sl}{
+      <-> alias * Clara-Sup/bold/sl
+}{}
+
+\DeclareFontShape{T2C}{Clara-Sup}{b}{it}{
+      <-> alias * Clara-Sup/bold/it
+}{}
+
+\DeclareFontShape{T2C}{Clara-Sup}{bx}{it}{
+      <-> ssub * Clara-Sup/b/it
+}{}
+
+\DeclareFontShape{T2C}{Clara-Sup}{bx}{n}{
+      <-> ssub * Clara-Sup/b/n
+}{}
+
+\DeclareFontShape{T2C}{Clara-Sup}{bx}{sl}{
+      <-> ssub * Clara-Sup/b/sl
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/clara/T2CClara-TLF.fd b/Master/texmf-dist/tex/latex/clara/T2CClara-TLF.fd
new file mode 100644
index 00000000000..4d03db203a6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/clara/T2CClara-TLF.fd
@@ -0,0 +1,105 @@
+%% Generated by autoinst on 2019/12/24
+%%
+\ProvidesFile{T2CClara-TLF.fd}
+    [2019/12/24 (autoinst)  Font definitions for T2C/Clara-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Clara@scale\endcsname\relax
+    \let\Clara@@scale\@empty
+\else
+    \edef\Clara@@scale{s*[\csname Clara@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2C}{Clara-TLF}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2C}{Clara-TLF}{bold}{n}{
+      <-> \Clara@@scale ClaraBold-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{Clara-TLF}{bold}{it}{
+      <-> \Clara@@scale ClaraBoldItalic-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{Clara-TLF}{bold}{sl}{
+      <-> ssub * Clara-TLF/bold/it
+}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2C}{Clara-TLF}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{Clara-TLF}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{Clara-TLF}{regular}{sc}{
+      <-> \Clara@@scale ClaraRegular-tlf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{Clara-TLF}{regular}{sl}{
+      <-> ssub * Clara-TLF/regular/it
+}{}
+
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T2C}{Clara-TLF}{m}{sc}{
+      <-> alias * Clara-TLF/regular/sc
+}{}
+
+\DeclareFontShape{T2C}{Clara-TLF}{m}{it}{
+      <-> alias * Clara-TLF/regular/it
+}{}
+
+\DeclareFontShape{T2C}{Clara-TLF}{m}{sl}{
+      <-> alias * Clara-TLF/regular/sl
+}{}
+
+\DeclareFontShape{T2C}{Clara-TLF}{m}{n}{
+      <-> alias * Clara-TLF/regular/n
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2C}{Clara-TLF}{b}{it}{
+      <-> alias * Clara-TLF/bold/it
+}{}
+
+\DeclareFontShape{T2C}{Clara-TLF}{b}{sl}{
+      <-> alias * Clara-TLF/bold/sl
+}{}
+
+\DeclareFontShape{T2C}{Clara-TLF}{b}{n}{
+      <-> alias * Clara-TLF/bold/n
+}{}
+
+\DeclareFontShape{T2C}{Clara-TLF}{bx}{n}{
+      <-> ssub * Clara-TLF/b/n
+}{}
+
+\DeclareFontShape{T2C}{Clara-TLF}{bx}{sl}{
+      <-> ssub * Clara-TLF/b/sl
+}{}
+
+\DeclareFontShape{T2C}{Clara-TLF}{bx}{it}{
+      <-> ssub * Clara-TLF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/clara/T2CClara-TOsF.fd b/Master/texmf-dist/tex/latex/clara/T2CClara-TOsF.fd
new file mode 100644
index 00000000000..82bd43dc94e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/clara/T2CClara-TOsF.fd
@@ -0,0 +1,63 @@
+%% Generated by autoinst on 2019/12/24
+%%
+\ProvidesFile{T2CClara-TOsF.fd}
+    [2019/12/24 (autoinst)  Font definitions for T2C/Clara-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Clara@scale\endcsname\relax
+    \let\Clara@@scale\@empty
+\else
+    \edef\Clara@@scale{s*[\csname Clara@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2C}{Clara-TOsF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2C}{Clara-TOsF}{regular}{sc}{
+      <-> \Clara@@scale ClaraRegular-tosf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{Clara-TOsF}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-tosf-t2c
+}{}
+
+\DeclareFontShape{T2C}{Clara-TOsF}{regular}{it}{
+      <-> \Clara@@scale ClaraItalic-tosf-t2c
+}{}
+
+\DeclareFontShape{T2C}{Clara-TOsF}{regular}{sl}{
+      <-> ssub * Clara-TOsF/regular/it
+}{}
+
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T2C}{Clara-TOsF}{m}{sc}{
+      <-> alias * Clara-TOsF/regular/sc
+}{}
+
+\DeclareFontShape{T2C}{Clara-TOsF}{m}{it}{
+      <-> alias * Clara-TOsF/regular/it
+}{}
+
+\DeclareFontShape{T2C}{Clara-TOsF}{m}{sl}{
+      <-> alias * Clara-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{T2C}{Clara-TOsF}{m}{n}{
+      <-> alias * Clara-TOsF/regular/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/clara/TS1Clara-TLF.fd b/Master/texmf-dist/tex/latex/clara/TS1Clara-TLF.fd
index 9d29517638a..72324c45f2f 100644
--- a/Master/texmf-dist/tex/latex/clara/TS1Clara-TLF.fd
+++ b/Master/texmf-dist/tex/latex/clara/TS1Clara-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/12/14
+%% Generated by autoinst on 2019/12/24
 %%
 \ProvidesFile{TS1Clara-TLF.fd}
-    [2019/12/14 (autoinst)  Font definitions for TS1/Clara-TLF.]
+    [2019/12/24 (autoinst)  Font definitions for TS1/Clara-TLF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,21 +20,14 @@
 \DeclareFontFamily{TS1}{Clara-TLF}{}
 
 
-%   ----  book  ----
-
-\DeclareFontShape{TS1}{Clara-TLF}{book}{n}{
-      <-> \Clara@@scale Clara-tlf-ts1
-}{}
-
-
 %   ----  bold  ----
 
 \DeclareFontShape{TS1}{Clara-TLF}{bold}{n}{
-      <-> \Clara@@scale Clara-Bold-tlf-ts1
+      <-> \Clara@@scale ClaraBold-tlf-ts1
 }{}
 
 \DeclareFontShape{TS1}{Clara-TLF}{bold}{it}{
-      <-> \Clara@@scale Clara-Bold-Italic-tlf-ts1
+      <-> \Clara@@scale ClaraBoldItalic-tlf-ts1
 }{}
 
 \DeclareFontShape{TS1}{Clara-TLF}{bold}{sl}{
@@ -45,7 +38,11 @@
 %   ----  regular  ----
 
 \DeclareFontShape{TS1}{Clara-TLF}{regular}{it}{
-      <-> \Clara@@scale Clara-Italic-tlf-ts1
+      <-> \Clara@@scale ClaraItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Clara-TLF}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-tlf-ts1
 }{}
 
 \DeclareFontShape{TS1}{Clara-TLF}{regular}{sl}{
@@ -58,39 +55,43 @@
 
 %   m --> regular
 
-\DeclareFontShape{TS1}{Clara-TLF}{m}{it}{
-      <-> alias * Clara-TLF/regular/it
+\DeclareFontShape{TS1}{Clara-TLF}{m}{n}{
+      <-> alias * Clara-TLF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{Clara-TLF}{m}{sl}{
       <-> alias * Clara-TLF/regular/sl
 }{}
 
+\DeclareFontShape{TS1}{Clara-TLF}{m}{it}{
+      <-> alias * Clara-TLF/regular/it
+}{}
 
-%   b --> bold
 
-\DeclareFontShape{TS1}{Clara-TLF}{b}{sl}{
-      <-> alias * Clara-TLF/bold/sl
-}{}
+%   b --> bold
 
 \DeclareFontShape{TS1}{Clara-TLF}{b}{it}{
       <-> alias * Clara-TLF/bold/it
 }{}
 
+\DeclareFontShape{TS1}{Clara-TLF}{b}{sl}{
+      <-> alias * Clara-TLF/bold/sl
+}{}
+
 \DeclareFontShape{TS1}{Clara-TLF}{b}{n}{
       <-> alias * Clara-TLF/bold/n
 }{}
 
-\DeclareFontShape{TS1}{Clara-TLF}{bx}{n}{
-      <-> ssub * Clara-TLF/b/n
+\DeclareFontShape{TS1}{Clara-TLF}{bx}{it}{
+      <-> ssub * Clara-TLF/b/it
 }{}
 
 \DeclareFontShape{TS1}{Clara-TLF}{bx}{sl}{
       <-> ssub * Clara-TLF/b/sl
 }{}
 
-\DeclareFontShape{TS1}{Clara-TLF}{bx}{it}{
-      <-> ssub * Clara-TLF/b/it
+\DeclareFontShape{TS1}{Clara-TLF}{bx}{n}{
+      <-> ssub * Clara-TLF/b/n
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/clara/TS1Clara-TOsF.fd b/Master/texmf-dist/tex/latex/clara/TS1Clara-TOsF.fd
index d986a6f0e14..a7f639e0ec4 100644
--- a/Master/texmf-dist/tex/latex/clara/TS1Clara-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/clara/TS1Clara-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/12/14
+%% Generated by autoinst on 2019/12/24
 %%
 \ProvidesFile{TS1Clara-TOsF.fd}
-    [2019/12/14 (autoinst)  Font definitions for TS1/Clara-TOsF.]
+    [2019/12/24 (autoinst)  Font definitions for TS1/Clara-TOsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,17 +20,14 @@
 \DeclareFontFamily{TS1}{Clara-TOsF}{}
 
 
-%   ----  book  ----
-
-\DeclareFontShape{TS1}{Clara-TOsF}{book}{n}{
-      <-> \Clara@@scale Clara-tosf-ts1
-}{}
-
-
 %   ----  regular  ----
 
 \DeclareFontShape{TS1}{Clara-TOsF}{regular}{it}{
-      <-> \Clara@@scale Clara-Italic-tosf-ts1
+      <-> \Clara@@scale ClaraItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Clara-TOsF}{regular}{n}{
+      <-> \Clara@@scale ClaraRegular-tosf-ts1
 }{}
 
 \DeclareFontShape{TS1}{Clara-TOsF}{regular}{sl}{
@@ -43,6 +40,10 @@
 
 %   m --> regular
 
+\DeclareFontShape{TS1}{Clara-TOsF}{m}{n}{
+      <-> alias * Clara-TOsF/regular/n
+}{}
+
 \DeclareFontShape{TS1}{Clara-TOsF}{m}{sl}{
       <-> alias * Clara-TOsF/regular/sl
 }{}
diff --git a/Master/texmf-dist/tex/latex/clara/clara.sty b/Master/texmf-dist/tex/latex/clara/clara.sty
index aa484ec78db..0fb99817ee0 100644
--- a/Master/texmf-dist/tex/latex/clara/clara.sty
+++ b/Master/texmf-dist/tex/latex/clara/clara.sty
@@ -1,10 +1,10 @@
-%% Generated by autoinst on 2019/12/14
+%% Generated by autoinst on 2019/12/24
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{clara}
-    [2019/12/14 (autoinst)  Style file for Clara.]
+    [2019/12/24 (autoinst)  Style file for Clara.]
 
-\RequirePackage[LY1,T1]{fontenc}
+%\RequirePackage[LY1,LGR,T1,T2A,T2B,T2C]{fontenc}
 \RequirePackage{textcomp}
 \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
 \IfFileExists{fontaxes.sty}{
@@ -36,9 +36,8 @@
     \renewcommand{\familydefault}{\rmdefault}
 }
 \DeclareOptionX{bold}{\edef\bfseries@rm{bold}}
-\DeclareOptionX{book}{\edef\mdseries@rm{book}}
 \DeclareOptionX{regular}{\edef\mdseries@rm{regular}}
-\ExecuteOptionsX{oldstyle,tabular,bold,regular}
+\ExecuteOptionsX{lining,tabular,bold,regular}
 \ProcessOptionsX\relax
 
 \renewcommand*