summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-06-20 21:31:24 +0000
committerKarl Berry <karl@freefriends.org>2019-06-20 21:31:24 +0000
commit957f2809550fd56d0d3225166b0a095c92c158f2 (patch)
treefdb3d32f40601f63920af17039fbd8387ab00266 /Master/texmf-dist/tex
parentaa5ca4cd1f918038582549fcb75c6c5ccc55c852 (diff)
cantarell (20jun19)
git-svn-id: svn://tug.org/texlive/trunk@51412 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/OT1cantarell-LF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/OT1cantarell-OsF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/OT1cantarell-TLF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/OT1cantarell-TOsF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/T1cantarell-LF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/T1cantarell-OsF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/T1cantarell-TLF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/T1cantarell-TOsF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/T2Acantarell-LF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/T2Acantarell-OsF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/T2Acantarell-TLF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/T2Acantarell-TOsF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/T2Bcantarell-LF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/T2Bcantarell-OsF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/T2Bcantarell-TLF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/T2Bcantarell-TOsF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/T2Ccantarell-LF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/T2Ccantarell-OsF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/T2Ccantarell-TLF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/T2Ccantarell-TOsF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/TS1cantarell-LF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/TS1cantarell-OsF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/TS1cantarell-TLF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/TS1cantarell-TOsF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/X2cantarell-LF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/X2cantarell-OsF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/X2cantarell-TLF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/X2cantarell-TOsF.fd46
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/cantarell.sty183
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/ot1fca.fd59
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/t1fca.fd59
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/t2afca.fd59
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/t2bfca.fd59
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/t2cfca.fd59
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/ts1fca.fd59
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/x2fca.fd59
36 files changed, 1440 insertions, 444 deletions
diff --git a/Master/texmf-dist/tex/latex/cantarell/OT1cantarell-LF.fd b/Master/texmf-dist/tex/latex/cantarell/OT1cantarell-LF.fd
new file mode 100644
index 00000000000..30d9f61842c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/OT1cantarell-LF.fd
@@ -0,0 +1,46 @@
+%% OT1cantarell-LF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{OT1cantarell-LF.fd}[2019/06/19 Font definitions for OT1/cantarell-LF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{OT1}{cantarell-LF}{}
+
+\DeclareFontShape{OT1}{cantarell-LF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-OT1-LF}{}
+\DeclareFontShape{OT1}{cantarell-LF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-OT1-LF}{}
+\DeclareFontShape{OT1}{cantarell-LF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-OT1-LF}{}
+\DeclareFontShape{OT1}{cantarell-LF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-OT1-LF}{}
+\DeclareFontShape{OT1}{cantarell-LF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-OT1-LF}{}
+\DeclareFontShape{OT1}{cantarell-LF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-OT1-LF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-LF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-OT1-LF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-LF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-OT1-LF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-LF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-OT1-LF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-LF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-OT1-LF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-LF}{bx}{n}{<-> ssub * cantarell-LF/b/n}{}
+\DeclareFontShape{OT1}{cantarell-LF}{l}{it}{<-> ssub * cantarell-LF/l/sl}{}
+\DeclareFontShape{OT1}{cantarell-LF}{b}{it}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{OT1}{cantarell-LF}{bx}{sl}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{OT1}{cantarell-LF}{bx}{it}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{OT1}{cantarell-LF}{el}{it}{<-> ssub * cantarell-LF/el/sl}{}
+\DeclareFontShape{OT1}{cantarell-LF}{m}{it}{<-> ssub * cantarell-LF/m/sl}{}
+\DeclareFontShape{OT1}{cantarell-LF}{eb}{it}{<-> ssub * cantarell-LF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/OT1cantarell-OsF.fd b/Master/texmf-dist/tex/latex/cantarell/OT1cantarell-OsF.fd
new file mode 100644
index 00000000000..178754b8195
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/OT1cantarell-OsF.fd
@@ -0,0 +1,46 @@
+%% OT1cantarell-OsF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{OT1cantarell-OsF.fd}[2019/06/19 Font definitions for OT1/cantarell-OsF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{OT1}{cantarell-OsF}{}
+
+\DeclareFontShape{OT1}{cantarell-OsF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-OT1-OsF}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-OT1-OsF}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-OT1-OsF}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-OT1-OsF}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-OT1-OsF}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-OT1-OsF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-OT1-OsF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-OT1-OsF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-OT1-OsF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-OT1-OsF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{bx}{n}{<-> ssub * cantarell-OsF/b/n}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{l}{it}{<-> ssub * cantarell-OsF/l/sl}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{b}{it}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{bx}{sl}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{bx}{it}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{el}{it}{<-> ssub * cantarell-OsF/el/sl}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{m}{it}{<-> ssub * cantarell-OsF/m/sl}{}
+\DeclareFontShape{OT1}{cantarell-OsF}{eb}{it}{<-> ssub * cantarell-OsF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/OT1cantarell-TLF.fd b/Master/texmf-dist/tex/latex/cantarell/OT1cantarell-TLF.fd
new file mode 100644
index 00000000000..cfdd9090d57
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/OT1cantarell-TLF.fd
@@ -0,0 +1,46 @@
+%% OT1cantarell-TLF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{OT1cantarell-TLF.fd}[2019/06/19 Font definitions for OT1/cantarell-TLF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{OT1}{cantarell-TLF}{}
+
+\DeclareFontShape{OT1}{cantarell-TLF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-OT1-TLF}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-OT1-TLF}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-OT1-TLF}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-OT1-TLF}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-OT1-TLF}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-OT1-TLF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-OT1-TLF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-OT1-TLF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-OT1-TLF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-OT1-TLF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{bx}{n}{<-> ssub * cantarell-TLF/b/n}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{l}{it}{<-> ssub * cantarell-TLF/l/sl}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{b}{it}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{bx}{sl}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{bx}{it}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{el}{it}{<-> ssub * cantarell-TLF/el/sl}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{m}{it}{<-> ssub * cantarell-TLF/m/sl}{}
+\DeclareFontShape{OT1}{cantarell-TLF}{eb}{it}{<-> ssub * cantarell-TLF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/OT1cantarell-TOsF.fd b/Master/texmf-dist/tex/latex/cantarell/OT1cantarell-TOsF.fd
new file mode 100644
index 00000000000..74c3c4b0992
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/OT1cantarell-TOsF.fd
@@ -0,0 +1,46 @@
+%% OT1cantarell-TOsF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{OT1cantarell-TOsF.fd}[2019/06/19 Font definitions for OT1/cantarell-TOsF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{OT1}{cantarell-TOsF}{}
+
+\DeclareFontShape{OT1}{cantarell-TOsF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-OT1-TOsF}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-OT1-TOsF}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-OT1-TOsF}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-OT1-TOsF}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-OT1-TOsF}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-OT1-TOsF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-OT1-TOsF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-OT1-TOsF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-OT1-TOsF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-OT1-TOsF-Slanted}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{bx}{n}{<-> ssub * cantarell-TOsF/b/n}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{l}{it}{<-> ssub * cantarell-TOsF/l/sl}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{b}{it}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{bx}{sl}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{bx}{it}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{el}{it}{<-> ssub * cantarell-TOsF/el/sl}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{m}{it}{<-> ssub * cantarell-TOsF/m/sl}{}
+\DeclareFontShape{OT1}{cantarell-TOsF}{eb}{it}{<-> ssub * cantarell-TOsF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/T1cantarell-LF.fd b/Master/texmf-dist/tex/latex/cantarell/T1cantarell-LF.fd
new file mode 100644
index 00000000000..809b2b08458
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/T1cantarell-LF.fd
@@ -0,0 +1,46 @@
+%% T1cantarell-LF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{T1cantarell-LF.fd}[2019/06/19 Font definitions for T1/cantarell-LF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{T1}{cantarell-LF}{}
+
+\DeclareFontShape{T1}{cantarell-LF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-T1-LF}{}
+\DeclareFontShape{T1}{cantarell-LF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-T1-LF}{}
+\DeclareFontShape{T1}{cantarell-LF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-T1-LF}{}
+\DeclareFontShape{T1}{cantarell-LF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-T1-LF}{}
+\DeclareFontShape{T1}{cantarell-LF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-T1-LF}{}
+\DeclareFontShape{T1}{cantarell-LF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-T1-LF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-LF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-T1-LF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-LF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-T1-LF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-LF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-T1-LF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-LF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-T1-LF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-LF}{bx}{n}{<-> ssub * cantarell-LF/b/n}{}
+\DeclareFontShape{T1}{cantarell-LF}{l}{it}{<-> ssub * cantarell-LF/l/sl}{}
+\DeclareFontShape{T1}{cantarell-LF}{b}{it}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{T1}{cantarell-LF}{bx}{sl}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{T1}{cantarell-LF}{bx}{it}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{T1}{cantarell-LF}{el}{it}{<-> ssub * cantarell-LF/el/sl}{}
+\DeclareFontShape{T1}{cantarell-LF}{m}{it}{<-> ssub * cantarell-LF/m/sl}{}
+\DeclareFontShape{T1}{cantarell-LF}{eb}{it}{<-> ssub * cantarell-LF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/T1cantarell-OsF.fd b/Master/texmf-dist/tex/latex/cantarell/T1cantarell-OsF.fd
new file mode 100644
index 00000000000..4f35a86edae
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/T1cantarell-OsF.fd
@@ -0,0 +1,46 @@
+%% T1cantarell-OsF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{T1cantarell-OsF.fd}[2019/06/19 Font definitions for T1/cantarell-OsF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{T1}{cantarell-OsF}{}
+
+\DeclareFontShape{T1}{cantarell-OsF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-T1-OsF}{}
+\DeclareFontShape{T1}{cantarell-OsF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-T1-OsF}{}
+\DeclareFontShape{T1}{cantarell-OsF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-T1-OsF}{}
+\DeclareFontShape{T1}{cantarell-OsF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-T1-OsF}{}
+\DeclareFontShape{T1}{cantarell-OsF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-T1-OsF}{}
+\DeclareFontShape{T1}{cantarell-OsF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-T1-OsF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-OsF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-T1-OsF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-OsF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-T1-OsF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-OsF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-T1-OsF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-OsF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-T1-OsF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-OsF}{bx}{n}{<-> ssub * cantarell-OsF/b/n}{}
+\DeclareFontShape{T1}{cantarell-OsF}{l}{it}{<-> ssub * cantarell-OsF/l/sl}{}
+\DeclareFontShape{T1}{cantarell-OsF}{b}{it}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{T1}{cantarell-OsF}{bx}{sl}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{T1}{cantarell-OsF}{bx}{it}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{T1}{cantarell-OsF}{el}{it}{<-> ssub * cantarell-OsF/el/sl}{}
+\DeclareFontShape{T1}{cantarell-OsF}{m}{it}{<-> ssub * cantarell-OsF/m/sl}{}
+\DeclareFontShape{T1}{cantarell-OsF}{eb}{it}{<-> ssub * cantarell-OsF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/T1cantarell-TLF.fd b/Master/texmf-dist/tex/latex/cantarell/T1cantarell-TLF.fd
new file mode 100644
index 00000000000..958b6416fad
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/T1cantarell-TLF.fd
@@ -0,0 +1,46 @@
+%% T1cantarell-TLF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{T1cantarell-TLF.fd}[2019/06/19 Font definitions for T1/cantarell-TLF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{T1}{cantarell-TLF}{}
+
+\DeclareFontShape{T1}{cantarell-TLF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-T1-TLF}{}
+\DeclareFontShape{T1}{cantarell-TLF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-T1-TLF}{}
+\DeclareFontShape{T1}{cantarell-TLF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-T1-TLF}{}
+\DeclareFontShape{T1}{cantarell-TLF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-T1-TLF}{}
+\DeclareFontShape{T1}{cantarell-TLF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-T1-TLF}{}
+\DeclareFontShape{T1}{cantarell-TLF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-T1-TLF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-TLF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-T1-TLF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-TLF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-T1-TLF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-TLF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-T1-TLF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-TLF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-T1-TLF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-TLF}{bx}{n}{<-> ssub * cantarell-TLF/b/n}{}
+\DeclareFontShape{T1}{cantarell-TLF}{l}{it}{<-> ssub * cantarell-TLF/l/sl}{}
+\DeclareFontShape{T1}{cantarell-TLF}{b}{it}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{T1}{cantarell-TLF}{bx}{sl}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{T1}{cantarell-TLF}{bx}{it}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{T1}{cantarell-TLF}{el}{it}{<-> ssub * cantarell-TLF/el/sl}{}
+\DeclareFontShape{T1}{cantarell-TLF}{m}{it}{<-> ssub * cantarell-TLF/m/sl}{}
+\DeclareFontShape{T1}{cantarell-TLF}{eb}{it}{<-> ssub * cantarell-TLF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/T1cantarell-TOsF.fd b/Master/texmf-dist/tex/latex/cantarell/T1cantarell-TOsF.fd
new file mode 100644
index 00000000000..b823b708ff4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/T1cantarell-TOsF.fd
@@ -0,0 +1,46 @@
+%% T1cantarell-TOsF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{T1cantarell-TOsF.fd}[2019/06/19 Font definitions for T1/cantarell-TOsF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{T1}{cantarell-TOsF}{}
+
+\DeclareFontShape{T1}{cantarell-TOsF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-T1-TOsF}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-T1-TOsF}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-T1-TOsF}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-T1-TOsF}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-T1-TOsF}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-T1-TOsF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-T1-TOsF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-T1-TOsF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-T1-TOsF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-T1-TOsF-Slanted}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{bx}{n}{<-> ssub * cantarell-TOsF/b/n}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{l}{it}{<-> ssub * cantarell-TOsF/l/sl}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{b}{it}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{bx}{sl}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{bx}{it}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{el}{it}{<-> ssub * cantarell-TOsF/el/sl}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{m}{it}{<-> ssub * cantarell-TOsF/m/sl}{}
+\DeclareFontShape{T1}{cantarell-TOsF}{eb}{it}{<-> ssub * cantarell-TOsF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/T2Acantarell-LF.fd b/Master/texmf-dist/tex/latex/cantarell/T2Acantarell-LF.fd
new file mode 100644
index 00000000000..220b553eccf
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/T2Acantarell-LF.fd
@@ -0,0 +1,46 @@
+%% T2Acantarell-LF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{T2Acantarell-LF.fd}[2019/06/19 Font definitions for T2A/cantarell-LF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{T2A}{cantarell-LF}{}
+
+\DeclareFontShape{T2A}{cantarell-LF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-T2A-LF}{}
+\DeclareFontShape{T2A}{cantarell-LF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-T2A-LF}{}
+\DeclareFontShape{T2A}{cantarell-LF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-T2A-LF}{}
+\DeclareFontShape{T2A}{cantarell-LF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-T2A-LF}{}
+\DeclareFontShape{T2A}{cantarell-LF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-T2A-LF}{}
+\DeclareFontShape{T2A}{cantarell-LF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-T2A-LF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-LF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-T2A-LF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-LF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-T2A-LF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-LF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-T2A-LF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-LF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-T2A-LF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-LF}{bx}{n}{<-> ssub * cantarell-LF/b/n}{}
+\DeclareFontShape{T2A}{cantarell-LF}{l}{it}{<-> ssub * cantarell-LF/l/sl}{}
+\DeclareFontShape{T2A}{cantarell-LF}{b}{it}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{T2A}{cantarell-LF}{bx}{sl}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{T2A}{cantarell-LF}{bx}{it}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{T2A}{cantarell-LF}{el}{it}{<-> ssub * cantarell-LF/el/sl}{}
+\DeclareFontShape{T2A}{cantarell-LF}{m}{it}{<-> ssub * cantarell-LF/m/sl}{}
+\DeclareFontShape{T2A}{cantarell-LF}{eb}{it}{<-> ssub * cantarell-LF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/T2Acantarell-OsF.fd b/Master/texmf-dist/tex/latex/cantarell/T2Acantarell-OsF.fd
new file mode 100644
index 00000000000..bab206de7bc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/T2Acantarell-OsF.fd
@@ -0,0 +1,46 @@
+%% T2Acantarell-OsF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{T2Acantarell-OsF.fd}[2019/06/19 Font definitions for T2A/cantarell-OsF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{T2A}{cantarell-OsF}{}
+
+\DeclareFontShape{T2A}{cantarell-OsF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-T2A-OsF}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-T2A-OsF}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-T2A-OsF}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-T2A-OsF}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-T2A-OsF}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-T2A-OsF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-T2A-OsF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-T2A-OsF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-T2A-OsF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-T2A-OsF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{bx}{n}{<-> ssub * cantarell-OsF/b/n}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{l}{it}{<-> ssub * cantarell-OsF/l/sl}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{b}{it}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{bx}{sl}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{bx}{it}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{el}{it}{<-> ssub * cantarell-OsF/el/sl}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{m}{it}{<-> ssub * cantarell-OsF/m/sl}{}
+\DeclareFontShape{T2A}{cantarell-OsF}{eb}{it}{<-> ssub * cantarell-OsF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/T2Acantarell-TLF.fd b/Master/texmf-dist/tex/latex/cantarell/T2Acantarell-TLF.fd
new file mode 100644
index 00000000000..a5b7ddad897
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/T2Acantarell-TLF.fd
@@ -0,0 +1,46 @@
+%% T2Acantarell-TLF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{T2Acantarell-TLF.fd}[2019/06/19 Font definitions for T2A/cantarell-TLF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{T2A}{cantarell-TLF}{}
+
+\DeclareFontShape{T2A}{cantarell-TLF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-T2A-TLF}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-T2A-TLF}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-T2A-TLF}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-T2A-TLF}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-T2A-TLF}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-T2A-TLF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-T2A-TLF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-T2A-TLF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-T2A-TLF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-T2A-TLF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{bx}{n}{<-> ssub * cantarell-TLF/b/n}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{l}{it}{<-> ssub * cantarell-TLF/l/sl}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{b}{it}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{bx}{sl}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{bx}{it}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{el}{it}{<-> ssub * cantarell-TLF/el/sl}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{m}{it}{<-> ssub * cantarell-TLF/m/sl}{}
+\DeclareFontShape{T2A}{cantarell-TLF}{eb}{it}{<-> ssub * cantarell-TLF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/T2Acantarell-TOsF.fd b/Master/texmf-dist/tex/latex/cantarell/T2Acantarell-TOsF.fd
new file mode 100644
index 00000000000..ddb7c740af0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/T2Acantarell-TOsF.fd
@@ -0,0 +1,46 @@
+%% T2Acantarell-TOsF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{T2Acantarell-TOsF.fd}[2019/06/19 Font definitions for T2A/cantarell-TOsF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{T2A}{cantarell-TOsF}{}
+
+\DeclareFontShape{T2A}{cantarell-TOsF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-T2A-TOsF}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-T2A-TOsF}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-T2A-TOsF}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-T2A-TOsF}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-T2A-TOsF}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-T2A-TOsF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-T2A-TOsF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-T2A-TOsF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-T2A-TOsF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-T2A-TOsF-Slanted}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{bx}{n}{<-> ssub * cantarell-TOsF/b/n}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{l}{it}{<-> ssub * cantarell-TOsF/l/sl}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{b}{it}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{bx}{sl}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{bx}{it}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{el}{it}{<-> ssub * cantarell-TOsF/el/sl}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{m}{it}{<-> ssub * cantarell-TOsF/m/sl}{}
+\DeclareFontShape{T2A}{cantarell-TOsF}{eb}{it}{<-> ssub * cantarell-TOsF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/T2Bcantarell-LF.fd b/Master/texmf-dist/tex/latex/cantarell/T2Bcantarell-LF.fd
new file mode 100644
index 00000000000..89eca5c5c17
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/T2Bcantarell-LF.fd
@@ -0,0 +1,46 @@
+%% T2Bcantarell-LF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{T2Bcantarell-LF.fd}[2019/06/19 Font definitions for T2B/cantarell-LF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{T2B}{cantarell-LF}{}
+
+\DeclareFontShape{T2B}{cantarell-LF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-T2B-LF}{}
+\DeclareFontShape{T2B}{cantarell-LF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-T2B-LF}{}
+\DeclareFontShape{T2B}{cantarell-LF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-T2B-LF}{}
+\DeclareFontShape{T2B}{cantarell-LF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-T2B-LF}{}
+\DeclareFontShape{T2B}{cantarell-LF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-T2B-LF}{}
+\DeclareFontShape{T2B}{cantarell-LF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-T2B-LF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-LF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-T2B-LF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-LF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-T2B-LF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-LF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-T2B-LF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-LF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-T2B-LF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-LF}{bx}{n}{<-> ssub * cantarell-LF/b/n}{}
+\DeclareFontShape{T2B}{cantarell-LF}{l}{it}{<-> ssub * cantarell-LF/l/sl}{}
+\DeclareFontShape{T2B}{cantarell-LF}{b}{it}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{T2B}{cantarell-LF}{bx}{sl}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{T2B}{cantarell-LF}{bx}{it}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{T2B}{cantarell-LF}{el}{it}{<-> ssub * cantarell-LF/el/sl}{}
+\DeclareFontShape{T2B}{cantarell-LF}{m}{it}{<-> ssub * cantarell-LF/m/sl}{}
+\DeclareFontShape{T2B}{cantarell-LF}{eb}{it}{<-> ssub * cantarell-LF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/T2Bcantarell-OsF.fd b/Master/texmf-dist/tex/latex/cantarell/T2Bcantarell-OsF.fd
new file mode 100644
index 00000000000..6c94f7756ea
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/T2Bcantarell-OsF.fd
@@ -0,0 +1,46 @@
+%% T2Bcantarell-OsF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{T2Bcantarell-OsF.fd}[2019/06/19 Font definitions for T2B/cantarell-OsF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{T2B}{cantarell-OsF}{}
+
+\DeclareFontShape{T2B}{cantarell-OsF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-T2B-OsF}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-T2B-OsF}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-T2B-OsF}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-T2B-OsF}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-T2B-OsF}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-T2B-OsF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-T2B-OsF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-T2B-OsF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-T2B-OsF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-T2B-OsF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{bx}{n}{<-> ssub * cantarell-OsF/b/n}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{l}{it}{<-> ssub * cantarell-OsF/l/sl}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{b}{it}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{bx}{sl}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{bx}{it}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{el}{it}{<-> ssub * cantarell-OsF/el/sl}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{m}{it}{<-> ssub * cantarell-OsF/m/sl}{}
+\DeclareFontShape{T2B}{cantarell-OsF}{eb}{it}{<-> ssub * cantarell-OsF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/T2Bcantarell-TLF.fd b/Master/texmf-dist/tex/latex/cantarell/T2Bcantarell-TLF.fd
new file mode 100644
index 00000000000..71075dc3357
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/T2Bcantarell-TLF.fd
@@ -0,0 +1,46 @@
+%% T2Bcantarell-TLF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{T2Bcantarell-TLF.fd}[2019/06/19 Font definitions for T2B/cantarell-TLF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{T2B}{cantarell-TLF}{}
+
+\DeclareFontShape{T2B}{cantarell-TLF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-T2B-TLF}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-T2B-TLF}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-T2B-TLF}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-T2B-TLF}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-T2B-TLF}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-T2B-TLF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-T2B-TLF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-T2B-TLF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-T2B-TLF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-T2B-TLF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{bx}{n}{<-> ssub * cantarell-TLF/b/n}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{l}{it}{<-> ssub * cantarell-TLF/l/sl}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{b}{it}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{bx}{sl}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{bx}{it}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{el}{it}{<-> ssub * cantarell-TLF/el/sl}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{m}{it}{<-> ssub * cantarell-TLF/m/sl}{}
+\DeclareFontShape{T2B}{cantarell-TLF}{eb}{it}{<-> ssub * cantarell-TLF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/T2Bcantarell-TOsF.fd b/Master/texmf-dist/tex/latex/cantarell/T2Bcantarell-TOsF.fd
new file mode 100644
index 00000000000..e386159963d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/T2Bcantarell-TOsF.fd
@@ -0,0 +1,46 @@
+%% T2Bcantarell-TOsF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{T2Bcantarell-TOsF.fd}[2019/06/19 Font definitions for T2B/cantarell-TOsF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{T2B}{cantarell-TOsF}{}
+
+\DeclareFontShape{T2B}{cantarell-TOsF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-T2B-TOsF}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-T2B-TOsF}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-T2B-TOsF}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-T2B-TOsF}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-T2B-TOsF}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-T2B-TOsF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-T2B-TOsF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-T2B-TOsF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-T2B-TOsF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-T2B-TOsF-Slanted}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{bx}{n}{<-> ssub * cantarell-TOsF/b/n}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{l}{it}{<-> ssub * cantarell-TOsF/l/sl}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{b}{it}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{bx}{sl}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{bx}{it}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{el}{it}{<-> ssub * cantarell-TOsF/el/sl}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{m}{it}{<-> ssub * cantarell-TOsF/m/sl}{}
+\DeclareFontShape{T2B}{cantarell-TOsF}{eb}{it}{<-> ssub * cantarell-TOsF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/T2Ccantarell-LF.fd b/Master/texmf-dist/tex/latex/cantarell/T2Ccantarell-LF.fd
new file mode 100644
index 00000000000..57836b45d15
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/T2Ccantarell-LF.fd
@@ -0,0 +1,46 @@
+%% T2Ccantarell-LF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{T2Ccantarell-LF.fd}[2019/06/19 Font definitions for T2C/cantarell-LF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{T2C}{cantarell-LF}{}
+
+\DeclareFontShape{T2C}{cantarell-LF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-T2C-LF}{}
+\DeclareFontShape{T2C}{cantarell-LF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-T2C-LF}{}
+\DeclareFontShape{T2C}{cantarell-LF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-T2C-LF}{}
+\DeclareFontShape{T2C}{cantarell-LF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-T2C-LF}{}
+\DeclareFontShape{T2C}{cantarell-LF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-T2C-LF}{}
+\DeclareFontShape{T2C}{cantarell-LF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-T2C-LF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-LF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-T2C-LF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-LF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-T2C-LF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-LF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-T2C-LF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-LF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-T2C-LF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-LF}{bx}{n}{<-> ssub * cantarell-LF/b/n}{}
+\DeclareFontShape{T2C}{cantarell-LF}{l}{it}{<-> ssub * cantarell-LF/l/sl}{}
+\DeclareFontShape{T2C}{cantarell-LF}{b}{it}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{T2C}{cantarell-LF}{bx}{sl}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{T2C}{cantarell-LF}{bx}{it}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{T2C}{cantarell-LF}{el}{it}{<-> ssub * cantarell-LF/el/sl}{}
+\DeclareFontShape{T2C}{cantarell-LF}{m}{it}{<-> ssub * cantarell-LF/m/sl}{}
+\DeclareFontShape{T2C}{cantarell-LF}{eb}{it}{<-> ssub * cantarell-LF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/T2Ccantarell-OsF.fd b/Master/texmf-dist/tex/latex/cantarell/T2Ccantarell-OsF.fd
new file mode 100644
index 00000000000..e299df42f2a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/T2Ccantarell-OsF.fd
@@ -0,0 +1,46 @@
+%% T2Ccantarell-OsF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{T2Ccantarell-OsF.fd}[2019/06/19 Font definitions for T2C/cantarell-OsF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{T2C}{cantarell-OsF}{}
+
+\DeclareFontShape{T2C}{cantarell-OsF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-T2C-OsF}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-T2C-OsF}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-T2C-OsF}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-T2C-OsF}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-T2C-OsF}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-T2C-OsF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-T2C-OsF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-T2C-OsF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-T2C-OsF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-T2C-OsF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{bx}{n}{<-> ssub * cantarell-OsF/b/n}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{l}{it}{<-> ssub * cantarell-OsF/l/sl}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{b}{it}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{bx}{sl}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{bx}{it}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{el}{it}{<-> ssub * cantarell-OsF/el/sl}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{m}{it}{<-> ssub * cantarell-OsF/m/sl}{}
+\DeclareFontShape{T2C}{cantarell-OsF}{eb}{it}{<-> ssub * cantarell-OsF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/T2Ccantarell-TLF.fd b/Master/texmf-dist/tex/latex/cantarell/T2Ccantarell-TLF.fd
new file mode 100644
index 00000000000..be902615c4f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/T2Ccantarell-TLF.fd
@@ -0,0 +1,46 @@
+%% T2Ccantarell-TLF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{T2Ccantarell-TLF.fd}[2019/06/19 Font definitions for T2C/cantarell-TLF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{T2C}{cantarell-TLF}{}
+
+\DeclareFontShape{T2C}{cantarell-TLF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-T2C-TLF}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-T2C-TLF}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-T2C-TLF}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-T2C-TLF}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-T2C-TLF}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-T2C-TLF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-T2C-TLF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-T2C-TLF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-T2C-TLF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-T2C-TLF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{bx}{n}{<-> ssub * cantarell-TLF/b/n}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{l}{it}{<-> ssub * cantarell-TLF/l/sl}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{b}{it}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{bx}{sl}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{bx}{it}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{el}{it}{<-> ssub * cantarell-TLF/el/sl}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{m}{it}{<-> ssub * cantarell-TLF/m/sl}{}
+\DeclareFontShape{T2C}{cantarell-TLF}{eb}{it}{<-> ssub * cantarell-TLF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/T2Ccantarell-TOsF.fd b/Master/texmf-dist/tex/latex/cantarell/T2Ccantarell-TOsF.fd
new file mode 100644
index 00000000000..493595ec046
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/T2Ccantarell-TOsF.fd
@@ -0,0 +1,46 @@
+%% T2Ccantarell-TOsF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{T2Ccantarell-TOsF.fd}[2019/06/19 Font definitions for T2C/cantarell-TOsF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{T2C}{cantarell-TOsF}{}
+
+\DeclareFontShape{T2C}{cantarell-TOsF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-T2C-TOsF}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-T2C-TOsF}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-T2C-TOsF}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-T2C-TOsF}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-T2C-TOsF}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-T2C-TOsF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-T2C-TOsF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-T2C-TOsF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-T2C-TOsF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-T2C-TOsF-Slanted}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{bx}{n}{<-> ssub * cantarell-TOsF/b/n}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{l}{it}{<-> ssub * cantarell-TOsF/l/sl}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{b}{it}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{bx}{sl}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{bx}{it}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{el}{it}{<-> ssub * cantarell-TOsF/el/sl}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{m}{it}{<-> ssub * cantarell-TOsF/m/sl}{}
+\DeclareFontShape{T2C}{cantarell-TOsF}{eb}{it}{<-> ssub * cantarell-TOsF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/TS1cantarell-LF.fd b/Master/texmf-dist/tex/latex/cantarell/TS1cantarell-LF.fd
new file mode 100644
index 00000000000..2f6627c91de
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/TS1cantarell-LF.fd
@@ -0,0 +1,46 @@
+%% TS1cantarell-LF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{TS1cantarell-LF.fd}[2019/06/19 Font definitions for TS1/cantarell-LF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{TS1}{cantarell-LF}{}
+
+\DeclareFontShape{TS1}{cantarell-LF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-TS1-LF}{}
+\DeclareFontShape{TS1}{cantarell-LF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-TS1-LF}{}
+\DeclareFontShape{TS1}{cantarell-LF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-TS1-LF}{}
+\DeclareFontShape{TS1}{cantarell-LF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-TS1-LF}{}
+\DeclareFontShape{TS1}{cantarell-LF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-TS1-LF}{}
+\DeclareFontShape{TS1}{cantarell-LF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-TS1-LF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-LF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-TS1-LF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-LF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-TS1-LF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-LF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-TS1-LF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-LF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-TS1-LF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-LF}{bx}{n}{<-> ssub * cantarell-LF/b/n}{}
+\DeclareFontShape{TS1}{cantarell-LF}{l}{it}{<-> ssub * cantarell-LF/l/sl}{}
+\DeclareFontShape{TS1}{cantarell-LF}{b}{it}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{TS1}{cantarell-LF}{bx}{sl}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{TS1}{cantarell-LF}{bx}{it}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{TS1}{cantarell-LF}{el}{it}{<-> ssub * cantarell-LF/el/sl}{}
+\DeclareFontShape{TS1}{cantarell-LF}{m}{it}{<-> ssub * cantarell-LF/m/sl}{}
+\DeclareFontShape{TS1}{cantarell-LF}{eb}{it}{<-> ssub * cantarell-LF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/TS1cantarell-OsF.fd b/Master/texmf-dist/tex/latex/cantarell/TS1cantarell-OsF.fd
new file mode 100644
index 00000000000..7a17302f165
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/TS1cantarell-OsF.fd
@@ -0,0 +1,46 @@
+%% TS1cantarell-OsF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{TS1cantarell-OsF.fd}[2019/06/19 Font definitions for TS1/cantarell-OsF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{TS1}{cantarell-OsF}{}
+
+\DeclareFontShape{TS1}{cantarell-OsF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-TS1-OsF}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-TS1-OsF}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-TS1-OsF}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-TS1-OsF}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-TS1-OsF}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-TS1-OsF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-TS1-OsF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-TS1-OsF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-TS1-OsF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-TS1-OsF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{bx}{n}{<-> ssub * cantarell-OsF/b/n}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{l}{it}{<-> ssub * cantarell-OsF/l/sl}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{b}{it}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{bx}{sl}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{bx}{it}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{el}{it}{<-> ssub * cantarell-OsF/el/sl}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{m}{it}{<-> ssub * cantarell-OsF/m/sl}{}
+\DeclareFontShape{TS1}{cantarell-OsF}{eb}{it}{<-> ssub * cantarell-OsF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/TS1cantarell-TLF.fd b/Master/texmf-dist/tex/latex/cantarell/TS1cantarell-TLF.fd
new file mode 100644
index 00000000000..c544554156e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/TS1cantarell-TLF.fd
@@ -0,0 +1,46 @@
+%% TS1cantarell-TLF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{TS1cantarell-TLF.fd}[2019/06/19 Font definitions for TS1/cantarell-TLF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{TS1}{cantarell-TLF}{}
+
+\DeclareFontShape{TS1}{cantarell-TLF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-TS1-TLF}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-TS1-TLF}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-TS1-TLF}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-TS1-TLF}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-TS1-TLF}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-TS1-TLF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-TS1-TLF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-TS1-TLF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-TS1-TLF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-TS1-TLF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{bx}{n}{<-> ssub * cantarell-TLF/b/n}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{l}{it}{<-> ssub * cantarell-TLF/l/sl}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{b}{it}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{bx}{sl}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{bx}{it}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{el}{it}{<-> ssub * cantarell-TLF/el/sl}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{m}{it}{<-> ssub * cantarell-TLF/m/sl}{}
+\DeclareFontShape{TS1}{cantarell-TLF}{eb}{it}{<-> ssub * cantarell-TLF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/TS1cantarell-TOsF.fd b/Master/texmf-dist/tex/latex/cantarell/TS1cantarell-TOsF.fd
new file mode 100644
index 00000000000..e4c96d55a72
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/TS1cantarell-TOsF.fd
@@ -0,0 +1,46 @@
+%% TS1cantarell-TOsF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{TS1cantarell-TOsF.fd}[2019/06/19 Font definitions for TS1/cantarell-TOsF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{TS1}{cantarell-TOsF}{}
+
+\DeclareFontShape{TS1}{cantarell-TOsF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-TS1-TOsF}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-TS1-TOsF}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-TS1-TOsF}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-TS1-TOsF}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-TS1-TOsF}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-TS1-TOsF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-TS1-TOsF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-TS1-TOsF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-TS1-TOsF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-TS1-TOsF-Slanted}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{bx}{n}{<-> ssub * cantarell-TOsF/b/n}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{l}{it}{<-> ssub * cantarell-TOsF/l/sl}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{b}{it}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{bx}{sl}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{bx}{it}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{el}{it}{<-> ssub * cantarell-TOsF/el/sl}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{m}{it}{<-> ssub * cantarell-TOsF/m/sl}{}
+\DeclareFontShape{TS1}{cantarell-TOsF}{eb}{it}{<-> ssub * cantarell-TOsF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/X2cantarell-LF.fd b/Master/texmf-dist/tex/latex/cantarell/X2cantarell-LF.fd
new file mode 100644
index 00000000000..7f3d88cd7a8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/X2cantarell-LF.fd
@@ -0,0 +1,46 @@
+%% X2cantarell-LF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{X2cantarell-LF.fd}[2019/06/19 Font definitions for X2/cantarell-LF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{X2}{cantarell-LF}{}
+
+\DeclareFontShape{X2}{cantarell-LF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-X2-LF}{}
+\DeclareFontShape{X2}{cantarell-LF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-X2-LF}{}
+\DeclareFontShape{X2}{cantarell-LF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-X2-LF}{}
+\DeclareFontShape{X2}{cantarell-LF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-X2-LF}{}
+\DeclareFontShape{X2}{cantarell-LF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-X2-LF}{}
+\DeclareFontShape{X2}{cantarell-LF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-X2-LF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-LF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-X2-LF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-LF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-X2-LF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-LF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-X2-LF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-LF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-X2-LF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-LF}{bx}{n}{<-> ssub * cantarell-LF/b/n}{}
+\DeclareFontShape{X2}{cantarell-LF}{l}{it}{<-> ssub * cantarell-LF/l/sl}{}
+\DeclareFontShape{X2}{cantarell-LF}{b}{it}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{X2}{cantarell-LF}{bx}{sl}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{X2}{cantarell-LF}{bx}{it}{<-> ssub * cantarell-LF/b/sl}{}
+\DeclareFontShape{X2}{cantarell-LF}{el}{it}{<-> ssub * cantarell-LF/el/sl}{}
+\DeclareFontShape{X2}{cantarell-LF}{m}{it}{<-> ssub * cantarell-LF/m/sl}{}
+\DeclareFontShape{X2}{cantarell-LF}{eb}{it}{<-> ssub * cantarell-LF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/X2cantarell-OsF.fd b/Master/texmf-dist/tex/latex/cantarell/X2cantarell-OsF.fd
new file mode 100644
index 00000000000..e496353572a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/X2cantarell-OsF.fd
@@ -0,0 +1,46 @@
+%% X2cantarell-OsF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{X2cantarell-OsF.fd}[2019/06/19 Font definitions for X2/cantarell-OsF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{X2}{cantarell-OsF}{}
+
+\DeclareFontShape{X2}{cantarell-OsF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-X2-OsF}{}
+\DeclareFontShape{X2}{cantarell-OsF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-X2-OsF}{}
+\DeclareFontShape{X2}{cantarell-OsF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-X2-OsF}{}
+\DeclareFontShape{X2}{cantarell-OsF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-X2-OsF}{}
+\DeclareFontShape{X2}{cantarell-OsF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-X2-OsF}{}
+\DeclareFontShape{X2}{cantarell-OsF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-X2-OsF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-OsF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-X2-OsF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-OsF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-X2-OsF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-OsF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-X2-OsF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-OsF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-X2-OsF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-OsF}{bx}{n}{<-> ssub * cantarell-OsF/b/n}{}
+\DeclareFontShape{X2}{cantarell-OsF}{l}{it}{<-> ssub * cantarell-OsF/l/sl}{}
+\DeclareFontShape{X2}{cantarell-OsF}{b}{it}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{X2}{cantarell-OsF}{bx}{sl}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{X2}{cantarell-OsF}{bx}{it}{<-> ssub * cantarell-OsF/b/sl}{}
+\DeclareFontShape{X2}{cantarell-OsF}{el}{it}{<-> ssub * cantarell-OsF/el/sl}{}
+\DeclareFontShape{X2}{cantarell-OsF}{m}{it}{<-> ssub * cantarell-OsF/m/sl}{}
+\DeclareFontShape{X2}{cantarell-OsF}{eb}{it}{<-> ssub * cantarell-OsF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/X2cantarell-TLF.fd b/Master/texmf-dist/tex/latex/cantarell/X2cantarell-TLF.fd
new file mode 100644
index 00000000000..bd9a5d27dc8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/X2cantarell-TLF.fd
@@ -0,0 +1,46 @@
+%% X2cantarell-TLF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{X2cantarell-TLF.fd}[2019/06/19 Font definitions for X2/cantarell-TLF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{X2}{cantarell-TLF}{}
+
+\DeclareFontShape{X2}{cantarell-TLF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-X2-TLF}{}
+\DeclareFontShape{X2}{cantarell-TLF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-X2-TLF}{}
+\DeclareFontShape{X2}{cantarell-TLF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-X2-TLF}{}
+\DeclareFontShape{X2}{cantarell-TLF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-X2-TLF}{}
+\DeclareFontShape{X2}{cantarell-TLF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-X2-TLF}{}
+\DeclareFontShape{X2}{cantarell-TLF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-X2-TLF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-TLF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-X2-TLF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-TLF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-X2-TLF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-TLF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-X2-TLF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-TLF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-X2-TLF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-TLF}{bx}{n}{<-> ssub * cantarell-TLF/b/n}{}
+\DeclareFontShape{X2}{cantarell-TLF}{l}{it}{<-> ssub * cantarell-TLF/l/sl}{}
+\DeclareFontShape{X2}{cantarell-TLF}{b}{it}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{X2}{cantarell-TLF}{bx}{sl}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{X2}{cantarell-TLF}{bx}{it}{<-> ssub * cantarell-TLF/b/sl}{}
+\DeclareFontShape{X2}{cantarell-TLF}{el}{it}{<-> ssub * cantarell-TLF/el/sl}{}
+\DeclareFontShape{X2}{cantarell-TLF}{m}{it}{<-> ssub * cantarell-TLF/m/sl}{}
+\DeclareFontShape{X2}{cantarell-TLF}{eb}{it}{<-> ssub * cantarell-TLF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/X2cantarell-TOsF.fd b/Master/texmf-dist/tex/latex/cantarell/X2cantarell-TOsF.fd
new file mode 100644
index 00000000000..bbd00f09cb2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/X2cantarell-TOsF.fd
@@ -0,0 +1,46 @@
+%% X2cantarell-TOsF.fd
+%% Copyright 2019 Mohamed El Morabity
+%
+% This work may be distributed and/or modified under the conditions of the LaTeX
+% Project Public License, either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status \`maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+
+\ProvidesFile{X2cantarell-TOsF.fd}[2019/06/19 Font definitions for X2/cantarell-TOsF.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@@scale\@empty
+\else
+ \edef\cantarell@@scale{s*[\csname cantarell@scale\endcsname]}
+\fi
+
+\DeclareFontFamily{X2}{cantarell-TOsF}{}
+
+\DeclareFontShape{X2}{cantarell-TOsF}{l}{n}{<-> \cantarell@@scale Cantarell-Light-X2-TOsF}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{b}{n}{<-> \cantarell@@scale Cantarell-Bold-X2-TOsF}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{el}{n}{<-> \cantarell@@scale Cantarell-Thin-X2-TOsF}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{m}{n}{<-> \cantarell@@scale Cantarell-Regular-X2-TOsF}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{eb}{n}{<-> \cantarell@@scale Cantarell-ExtraBold-X2-TOsF}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{l}{sl}{<-> \cantarell@@scale Cantarell-Light-X2-TOsF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{b}{sl}{<-> \cantarell@@scale Cantarell-Bold-X2-TOsF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{el}{sl}{<-> \cantarell@@scale Cantarell-Thin-X2-TOsF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{m}{sl}{<-> \cantarell@@scale Cantarell-Regular-X2-TOsF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{eb}{sl}{<-> \cantarell@@scale Cantarell-ExtraBold-X2-TOsF-Slanted}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{bx}{n}{<-> ssub * cantarell-TOsF/b/n}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{l}{it}{<-> ssub * cantarell-TOsF/l/sl}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{b}{it}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{bx}{sl}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{bx}{it}{<-> ssub * cantarell-TOsF/b/sl}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{el}{it}{<-> ssub * cantarell-TOsF/el/sl}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{m}{it}{<-> ssub * cantarell-TOsF/m/sl}{}
+\DeclareFontShape{X2}{cantarell-TOsF}{eb}{it}{<-> ssub * cantarell-TOsF/eb/sl}{}
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/cantarell/cantarell.sty b/Master/texmf-dist/tex/latex/cantarell/cantarell.sty
index eaec95d6634..22913552918 100644
--- a/Master/texmf-dist/tex/latex/cantarell/cantarell.sty
+++ b/Master/texmf-dist/tex/latex/cantarell/cantarell.sty
@@ -1,5 +1,5 @@
%% cantarell.sty
-%% Copyright 2011, 2012 Mohamed El Morabity
+%% Copyright 2019 Mohamed El Morabity
%
% This work may be distributed and/or modified under the conditions of the LaTeX
% Project Public License, either version 1.3 of this license or (at your option)
@@ -8,40 +8,161 @@
% distributions of LaTeX version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is Mohamed El Morabity
%
% This work consists of all files listed in manifest.txt.
+
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cantarell}[2012/01/03 Cantarell]
-
-\RequirePackage{keyval}
-\RequirePackage{slantsc}
-
-% Taken from inconsolata.sty
-\define@key{cantarell}{scale}[1.0]{\def\cantarell@scale{s*[#1]}}
-\DeclareOption*{%
- \begingroup%
- \edef\x{\endgroup%
- \noexpand\setkeys{cantarell}{\CurrentOption}}%
- \x%
-}
-
-\DeclareOption{defaultsans}{%
- \renewcommand*{\sfdefault}{fca}%
-}
-
-\DeclareOption{default}{%
- \renewcommand*{\familydefault}{fca}%
- \renewcommand*{\sfdefault}{fca}%
-}
-
-\ProcessOptions*
-
-\newcommand{\fcafamily}{%
- \fontfamily{fca}%
- \selectfont%
-}
+\ProvidesPackage{cantarell}[2019/06/15 Style file for Cantarell.]
+
+\RequirePackage{fontaxes}
+\RequirePackage{ifluatex}
+\RequirePackage{ifxetex}
+\RequirePackage{xkeyval}
+
+\newif\ifcantarell@otf
+\ifxetex
+\cantarell@otftrue
+\else
+\ifluatex
+\cantarell@otftrue
+\else
+\cantarell@otffalse
+\fi
+\fi
+
+\newif\ifcantarell@lining
+\newif\ifcantarell@oldstyle
+
+\newif\ifcantarell@tabular
+\newif\ifcantarell@proportional
+
+\newif\ifcantarell@default
+\cantarell@defaultfalse
+
+\newif\ifcantarell@defaultsans
+\cantarell@defaultsansfalse
+
+\newcommand*{\cantarell@scale}{1}
+\DeclareOptionX{scale}{\renewcommand*{\cantarell@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\cantarell@scale}{#1}}
+
+\DeclareOptionX{default}{\cantarell@defaulttrue}
+\DeclareOptionX{defaultsans}{\cantarell@defaultsanstrue}
+\DeclareOptionX{lining}{\cantarell@liningtrue}
+\DeclareOptionX{oldstyle}{\cantarell@liningfalse}
+\DeclareOptionX{tabular}{\cantarell@tabulartrue}
+\DeclareOptionX{proportional}{\cantarell@tabularfalse}
+\DeclareOptionX{type1}{\cantarell@otffalse}
+
+\ExecuteOptionsX{tabular,lining}
+\ProcessOptionsX
+\relax
+
+\ifcantarell@tabular
+ \newcommand*{\cantarell@figurewidth@otf}{Monospaced}
+ \newcommand*{\cantarell@figurewidth@pfb}{T}
+\else
+ \newcommand*{\cantarell@figurewidth@otf}{Proportional}
+ \newcommand*{\cantarell@figurewidth@pfb}{}
+\fi
+\ifcantarell@lining
+ \newcommand*{\cantarell@figurestyle@otf}{Lining}
+ \newcommand*{\cantarell@figurestyle@pfb}{LF}
+\else
+ \newcommand*{\cantarell@figurestyle@otf}{OldStyle}
+ \newcommand*{\cantarell@figurestyle@pfb}{OsF}
+\fi
+
+\newcommand*{\cantarell@familyprefix}{cantarell}
+\newcommand*{\cantarell@family}[1]{\cantarell@familyprefix-#1}
+\newcommand*{\cantarellfamily}{\cantarell@family{\cantarell@figurewidth@pfb\cantarell@figurestyle@pfb}}
+
+\ifcantarell@otf
+ \RequirePackage{fontspec}
+
+ \ifxetex
+ \XeTeXtracingfonts=1
+ \fi
+
+ \newcommand*{\cantarell@otf@slant}{0.141}
+ \newcommand*{\cantarell@otf@features}{%
+ Extension=.otf,%
+ Ligatures=Common,%
+ Scale=\cantarell@scale,%
+ FontFace={el}{n}{*-Thin},%
+ FontFace={el}{it}{Font=*-Thin,FakeSlant=\cantarell@otf@slant},%
+ FontFace={l}{n}{*-Light},%
+ FontFace={l}{it}{Font=*-Light,FakeSlant=\cantarell@otf@slant},%
+ UprightFont={*-Regular},%
+ ItalicFont={*-Regular},%
+ ItalicFeatures={FakeSlant=\cantarell@otf@slant},
+ FontFace={b}{n}{*-Bold},%
+ FontFace={b}{it}{Font=*-Bold,FakeSlant=\cantarell@otf@slant},%
+ BoldFont={*-Bold},%
+ BoldItalicFont={*-Bold},%
+ BoldItalicFeatures={FakeSlant=\cantarell@otf@slant},%
+ FontFace={eb}{n}{*-ExtraBold},%
+ FontFace={eb}{it}{Font=*-ExtraBold,FakeSlant=\cantarell@otf@slant}%
+ }
+
+ % Define family for each figure style/width, with corresponding
+ % NFSS family, for fontaxes support
+ \newfontfamily{\cantarell@otf@TLF}[%
+ \cantarell@otf@features,%
+ Numbers={Monospaced,Lining},%
+ NFSSFamily=\cantarell@family{TLF}%
+ ]{Cantarell}
+ \newfontfamily{\cantarell@otf@LF}[%
+ \cantarell@otf@features,%
+ Numbers={Proportional,Lining},%
+ NFSSFamily=\cantarell@family{LF}%
+ ]{Cantarell}
+ \newfontfamily{\cantarell@otf@TOsF}[%
+ \cantarell@otf@features,%
+ Numbers={Monospaced,OldStyle},%
+ NFSSFamily=\cantarell@family{TOsF}%
+ ]{Cantarell}
+ \newfontfamily{\cantarell@otf@OsF}[%
+ \cantarell@otf@features,%
+ Numbers={Proportional,OldStyle},%
+ NFSSFamily=\cantarell@family{OsF}%
+ ]{Cantarell}
+
+ \expandafter\let\expandafter\cantarell\csname cantarell@otf@\cantarell@figurewidth@pfb\cantarell@figurestyle@pfb\endcsname
+
+ % Legacy compatibility
+ \newfontfamily{\fcafamily}[%
+ \cantarell@otf@features,%
+ Numbers={Monospaced,Lining},%
+ NFSSFamily=fca%
+ ]{Cantarell}
+
+ \ifcantarell@defaultsans
+ \setsansfont[%
+ \cantarell@otf@features,%
+ Numbers={\cantarell@figurewidth@otf,\cantarell@figurestyle@otf},%
+ ]{Cantarell}
+ \fi
+ \ifcantarell@default
+ \setmainfont[%
+ \cantarell@otf@features,%
+ Numbers={\cantarell@figurewidth@otf,\cantarell@figurestyle@otf},%
+ ]{Cantarell}
+ \fi
+\else
+ \newcommand*{\cantarell}{\fontfamily{\cantarellfamily}\selectfont}
+ % Legacy compatibility
+ \newcommand*{\fcafamily}{\fontfamily{cantarell-TLF}\selectfont}
+
+ \ifcantarell@defaultsans
+ \renewcommand*{\sfdefault}{\cantarellfamily}
+ \fi
+ \ifcantarell@default
+ \renewcommand*{\familydefault}{\cantarellfamily}
+ \fi
+\fi
\endinput
diff --git a/Master/texmf-dist/tex/latex/cantarell/ot1fca.fd b/Master/texmf-dist/tex/latex/cantarell/ot1fca.fd
deleted file mode 100644
index dced5d12864..00000000000
--- a/Master/texmf-dist/tex/latex/cantarell/ot1fca.fd
+++ /dev/null
@@ -1,59 +0,0 @@
-%Filename: ot1fca.fd
-%Created by: tex cantarell-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ot1fca.fd}
- [2012/06/11 Fontinst v1.933 font definitions for OT1/fca.]
-
-\expandafter\ifx\csname cantarell@scale\endcsname\relax
- \let\cantarell@scale\@empty
-\fi
-
-\DeclareFontFamily{OT1}{fca}{}
-
-\DeclareFontShape{OT1}{fca}{m}{n}{
- <->\cantarell@scale Cantarell-Regular-ot1
-}{}
-
-\DeclareFontShape{OT1}{fca}{m}{sl}{
- <->\cantarell@scale Cantarell-Regular-Slanted-ot1
-}{}
-
-\DeclareFontShape{OT1}{fca}{m}{sc}{
- <->\cantarell@scale Cantarell-Regular-SmallCaps-ot1
-}{}
-
-\DeclareFontShape{OT1}{fca}{m}{scsl}{
- <->\cantarell@scale Cantarell-Regular-Slanted-SmallCaps-ot1
-}{}
-
-\DeclareFontShape{OT1}{fca}{b}{n}{
- <->\cantarell@scale Cantarell-Bold-ot1
-}{}
-
-\DeclareFontShape{OT1}{fca}{b}{sl}{
- <->\cantarell@scale Cantarell-Bold-Slanted-ot1
-}{}
-
-\DeclareFontShape{OT1}{fca}{b}{sc}{
- <->\cantarell@scale Cantarell-Bold-SmallCaps-ot1
-}{}
-
-\DeclareFontShape{OT1}{fca}{b}{scsl}{
- <->\cantarell@scale Cantarell-Bold-Slanted-SmallCaps-ot1
-}{}
-
-\DeclareFontShape{OT1}{fca}{m}{it}{<->ssub * fca/m/sl}{}
-\DeclareFontShape{OT1}{fca}{m}{scit}{<->ssub * fca/m/scsl}{}
-\DeclareFontShape{OT1}{fca}{bx}{n}{<->ssub * fca/b/n}{}
-\DeclareFontShape{OT1}{fca}{bx}{sl}{<->ssub * fca/b/sl}{}
-\DeclareFontShape{OT1}{fca}{b}{it}{<->ssub * fca/b/sl}{}
-\DeclareFontShape{OT1}{fca}{bx}{it}{<->ssub * fca/b/it}{}
-\DeclareFontShape{OT1}{fca}{bx}{sc}{<->ssub * fca/b/sc}{}
-\DeclareFontShape{OT1}{fca}{bx}{scsl}{<->ssub * fca/b/scsl}{}
-\DeclareFontShape{OT1}{fca}{b}{scit}{<->ssub * fca/b/scsl}{}
-\DeclareFontShape{OT1}{fca}{bx}{scit}{<->ssub * fca/b/scit}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/cantarell/t1fca.fd b/Master/texmf-dist/tex/latex/cantarell/t1fca.fd
deleted file mode 100644
index e64a853ac7a..00000000000
--- a/Master/texmf-dist/tex/latex/cantarell/t1fca.fd
+++ /dev/null
@@ -1,59 +0,0 @@
-%Filename: t1fca.fd
-%Created by: tex cantarell-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t1fca.fd}
- [2012/06/11 Fontinst v1.933 font definitions for T1/fca.]
-
-\expandafter\ifx\csname cantarell@scale\endcsname\relax
- \let\cantarell@scale\@empty
-\fi
-
-\DeclareFontFamily{T1}{fca}{}
-
-\DeclareFontShape{T1}{fca}{m}{n}{
- <->\cantarell@scale Cantarell-Regular-t1
-}{}
-
-\DeclareFontShape{T1}{fca}{m}{sl}{
- <->\cantarell@scale Cantarell-Regular-Slanted-t1
-}{}
-
-\DeclareFontShape{T1}{fca}{m}{sc}{
- <->\cantarell@scale Cantarell-Regular-SmallCaps-t1
-}{}
-
-\DeclareFontShape{T1}{fca}{m}{scsl}{
- <->\cantarell@scale Cantarell-Regular-Slanted-SmallCaps-t1
-}{}
-
-\DeclareFontShape{T1}{fca}{b}{n}{
- <->\cantarell@scale Cantarell-Bold-t1
-}{}
-
-\DeclareFontShape{T1}{fca}{b}{sl}{
- <->\cantarell@scale Cantarell-Bold-Slanted-t1
-}{}
-
-\DeclareFontShape{T1}{fca}{b}{sc}{
- <->\cantarell@scale Cantarell-Bold-SmallCaps-t1
-}{}
-
-\DeclareFontShape{T1}{fca}{b}{scsl}{
- <->\cantarell@scale Cantarell-Bold-Slanted-SmallCaps-t1
-}{}
-
-\DeclareFontShape{T1}{fca}{m}{it}{<->ssub * fca/m/sl}{}
-\DeclareFontShape{T1}{fca}{m}{scit}{<->ssub * fca/m/scsl}{}
-\DeclareFontShape{T1}{fca}{bx}{n}{<->ssub * fca/b/n}{}
-\DeclareFontShape{T1}{fca}{bx}{sl}{<->ssub * fca/b/sl}{}
-\DeclareFontShape{T1}{fca}{b}{it}{<->ssub * fca/b/sl}{}
-\DeclareFontShape{T1}{fca}{bx}{it}{<->ssub * fca/b/it}{}
-\DeclareFontShape{T1}{fca}{bx}{sc}{<->ssub * fca/b/sc}{}
-\DeclareFontShape{T1}{fca}{bx}{scsl}{<->ssub * fca/b/scsl}{}
-\DeclareFontShape{T1}{fca}{b}{scit}{<->ssub * fca/b/scsl}{}
-\DeclareFontShape{T1}{fca}{bx}{scit}{<->ssub * fca/b/scit}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/cantarell/t2afca.fd b/Master/texmf-dist/tex/latex/cantarell/t2afca.fd
deleted file mode 100644
index c687f663ba8..00000000000
--- a/Master/texmf-dist/tex/latex/cantarell/t2afca.fd
+++ /dev/null
@@ -1,59 +0,0 @@
-%Filename: t2afca.fd
-%Created by: tex cantarell-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t2afca.fd}
- [2012/06/11 Fontinst v1.933 font definitions for T2A/fca.]
-
-\expandafter\ifx\csname cantarell@scale\endcsname\relax
- \let\cantarell@scale\@empty
-\fi
-
-\DeclareFontFamily{T2A}{fca}{}
-
-\DeclareFontShape{T2A}{fca}{m}{n}{
- <->\cantarell@scale Cantarell-Regular-t2a
-}{}
-
-\DeclareFontShape{T2A}{fca}{m}{sl}{
- <->\cantarell@scale Cantarell-Regular-Slanted-t2a
-}{}
-
-\DeclareFontShape{T2A}{fca}{m}{sc}{
- <->\cantarell@scale Cantarell-Regular-SmallCaps-t2a
-}{}
-
-\DeclareFontShape{T2A}{fca}{m}{scsl}{
- <->\cantarell@scale Cantarell-Regular-Slanted-SmallCaps-t2a
-}{}
-
-\DeclareFontShape{T2A}{fca}{b}{n}{
- <->\cantarell@scale Cantarell-Bold-t2a
-}{}
-
-\DeclareFontShape{T2A}{fca}{b}{sl}{
- <->\cantarell@scale Cantarell-Bold-Slanted-t2a
-}{}
-
-\DeclareFontShape{T2A}{fca}{b}{sc}{
- <->\cantarell@scale Cantarell-Bold-SmallCaps-t2a
-}{}
-
-\DeclareFontShape{T2A}{fca}{b}{scsl}{
- <->\cantarell@scale Cantarell-Bold-Slanted-SmallCaps-t2a
-}{}
-
-\DeclareFontShape{T2A}{fca}{m}{it}{<->ssub * fca/m/sl}{}
-\DeclareFontShape{T2A}{fca}{m}{scit}{<->ssub * fca/m/scsl}{}
-\DeclareFontShape{T2A}{fca}{bx}{n}{<->ssub * fca/b/n}{}
-\DeclareFontShape{T2A}{fca}{bx}{sl}{<->ssub * fca/b/sl}{}
-\DeclareFontShape{T2A}{fca}{b}{it}{<->ssub * fca/b/sl}{}
-\DeclareFontShape{T2A}{fca}{bx}{it}{<->ssub * fca/b/it}{}
-\DeclareFontShape{T2A}{fca}{bx}{sc}{<->ssub * fca/b/sc}{}
-\DeclareFontShape{T2A}{fca}{bx}{scsl}{<->ssub * fca/b/scsl}{}
-\DeclareFontShape{T2A}{fca}{b}{scit}{<->ssub * fca/b/scsl}{}
-\DeclareFontShape{T2A}{fca}{bx}{scit}{<->ssub * fca/b/scit}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/cantarell/t2bfca.fd b/Master/texmf-dist/tex/latex/cantarell/t2bfca.fd
deleted file mode 100644
index f799a13ee05..00000000000
--- a/Master/texmf-dist/tex/latex/cantarell/t2bfca.fd
+++ /dev/null
@@ -1,59 +0,0 @@
-%Filename: t2bfca.fd
-%Created by: tex cantarell-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t2bfca.fd}
- [2012/06/11 Fontinst v1.933 font definitions for T2B/fca.]
-
-\expandafter\ifx\csname cantarell@scale\endcsname\relax
- \let\cantarell@scale\@empty
-\fi
-
-\DeclareFontFamily{T2B}{fca}{}
-
-\DeclareFontShape{T2B}{fca}{m}{n}{
- <->\cantarell@scale Cantarell-Regular-t2b
-}{}
-
-\DeclareFontShape{T2B}{fca}{m}{sl}{
- <->\cantarell@scale Cantarell-Regular-Slanted-t2b
-}{}
-
-\DeclareFontShape{T2B}{fca}{m}{sc}{
- <->\cantarell@scale Cantarell-Regular-SmallCaps-t2b
-}{}
-
-\DeclareFontShape{T2B}{fca}{m}{scsl}{
- <->\cantarell@scale Cantarell-Regular-Slanted-SmallCaps-t2b
-}{}
-
-\DeclareFontShape{T2B}{fca}{b}{n}{
- <->\cantarell@scale Cantarell-Bold-t2b
-}{}
-
-\DeclareFontShape{T2B}{fca}{b}{sl}{
- <->\cantarell@scale Cantarell-Bold-Slanted-t2b
-}{}
-
-\DeclareFontShape{T2B}{fca}{b}{sc}{
- <->\cantarell@scale Cantarell-Bold-SmallCaps-t2b
-}{}
-
-\DeclareFontShape{T2B}{fca}{b}{scsl}{
- <->\cantarell@scale Cantarell-Bold-Slanted-SmallCaps-t2b
-}{}
-
-\DeclareFontShape{T2B}{fca}{m}{it}{<->ssub * fca/m/sl}{}
-\DeclareFontShape{T2B}{fca}{m}{scit}{<->ssub * fca/m/scsl}{}
-\DeclareFontShape{T2B}{fca}{bx}{n}{<->ssub * fca/b/n}{}
-\DeclareFontShape{T2B}{fca}{bx}{sl}{<->ssub * fca/b/sl}{}
-\DeclareFontShape{T2B}{fca}{b}{it}{<->ssub * fca/b/sl}{}
-\DeclareFontShape{T2B}{fca}{bx}{it}{<->ssub * fca/b/it}{}
-\DeclareFontShape{T2B}{fca}{bx}{sc}{<->ssub * fca/b/sc}{}
-\DeclareFontShape{T2B}{fca}{bx}{scsl}{<->ssub * fca/b/scsl}{}
-\DeclareFontShape{T2B}{fca}{b}{scit}{<->ssub * fca/b/scsl}{}
-\DeclareFontShape{T2B}{fca}{bx}{scit}{<->ssub * fca/b/scit}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/cantarell/t2cfca.fd b/Master/texmf-dist/tex/latex/cantarell/t2cfca.fd
deleted file mode 100644
index 4e6fc0fe202..00000000000
--- a/Master/texmf-dist/tex/latex/cantarell/t2cfca.fd
+++ /dev/null
@@ -1,59 +0,0 @@
-%Filename: t2cfca.fd
-%Created by: tex cantarell-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{t2cfca.fd}
- [2012/06/11 Fontinst v1.933 font definitions for T2C/fca.]
-
-\expandafter\ifx\csname cantarell@scale\endcsname\relax
- \let\cantarell@scale\@empty
-\fi
-
-\DeclareFontFamily{T2C}{fca}{}
-
-\DeclareFontShape{T2C}{fca}{m}{n}{
- <->\cantarell@scale Cantarell-Regular-t2c
-}{}
-
-\DeclareFontShape{T2C}{fca}{m}{sl}{
- <->\cantarell@scale Cantarell-Regular-Slanted-t2c
-}{}
-
-\DeclareFontShape{T2C}{fca}{m}{sc}{
- <->\cantarell@scale Cantarell-Regular-SmallCaps-t2c
-}{}
-
-\DeclareFontShape{T2C}{fca}{m}{scsl}{
- <->\cantarell@scale Cantarell-Regular-Slanted-SmallCaps-t2c
-}{}
-
-\DeclareFontShape{T2C}{fca}{b}{n}{
- <->\cantarell@scale Cantarell-Bold-t2c
-}{}
-
-\DeclareFontShape{T2C}{fca}{b}{sl}{
- <->\cantarell@scale Cantarell-Bold-Slanted-t2c
-}{}
-
-\DeclareFontShape{T2C}{fca}{b}{sc}{
- <->\cantarell@scale Cantarell-Bold-SmallCaps-t2c
-}{}
-
-\DeclareFontShape{T2C}{fca}{b}{scsl}{
- <->\cantarell@scale Cantarell-Bold-Slanted-SmallCaps-t2c
-}{}
-
-\DeclareFontShape{T2C}{fca}{m}{it}{<->ssub * fca/m/sl}{}
-\DeclareFontShape{T2C}{fca}{m}{scit}{<->ssub * fca/m/scsl}{}
-\DeclareFontShape{T2C}{fca}{bx}{n}{<->ssub * fca/b/n}{}
-\DeclareFontShape{T2C}{fca}{bx}{sl}{<->ssub * fca/b/sl}{}
-\DeclareFontShape{T2C}{fca}{b}{it}{<->ssub * fca/b/sl}{}
-\DeclareFontShape{T2C}{fca}{bx}{it}{<->ssub * fca/b/it}{}
-\DeclareFontShape{T2C}{fca}{bx}{sc}{<->ssub * fca/b/sc}{}
-\DeclareFontShape{T2C}{fca}{bx}{scsl}{<->ssub * fca/b/scsl}{}
-\DeclareFontShape{T2C}{fca}{b}{scit}{<->ssub * fca/b/scsl}{}
-\DeclareFontShape{T2C}{fca}{bx}{scit}{<->ssub * fca/b/scit}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/cantarell/ts1fca.fd b/Master/texmf-dist/tex/latex/cantarell/ts1fca.fd
deleted file mode 100644
index 0934e02a8b6..00000000000
--- a/Master/texmf-dist/tex/latex/cantarell/ts1fca.fd
+++ /dev/null
@@ -1,59 +0,0 @@
-%Filename: ts1fca.fd
-%Created by: tex cantarell-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ts1fca.fd}
- [2012/06/11 Fontinst v1.933 font definitions for TS1/fca.]
-
-\expandafter\ifx\csname cantarell@scale\endcsname\relax
- \let\cantarell@scale\@empty
-\fi
-
-\DeclareFontFamily{TS1}{fca}{}
-
-\DeclareFontShape{TS1}{fca}{m}{n}{
- <->\cantarell@scale Cantarell-Regular-ts1
-}{}
-
-\DeclareFontShape{TS1}{fca}{m}{sl}{
- <->\cantarell@scale Cantarell-Regular-Slanted-ts1
-}{}
-
-\DeclareFontShape{TS1}{fca}{m}{sc}{
- <->\cantarell@scale Cantarell-Regular-ts1
-}{}
-
-\DeclareFontShape{TS1}{fca}{m}{scsl}{
- <->\cantarell@scale Cantarell-Regular-Slanted-ts1
-}{}
-
-\DeclareFontShape{TS1}{fca}{b}{n}{
- <->\cantarell@scale Cantarell-Bold-ts1
-}{}
-
-\DeclareFontShape{TS1}{fca}{b}{sl}{
- <->\cantarell@scale Cantarell-Bold-Slanted-ts1
-}{}
-
-\DeclareFontShape{TS1}{fca}{b}{sc}{
- <->\cantarell@scale Cantarell-Bold-ts1
-}{}
-
-\DeclareFontShape{TS1}{fca}{b}{scsl}{
- <->\cantarell@scale Cantarell-Bold-Slanted-ts1
-}{}
-
-\DeclareFontShape{TS1}{fca}{m}{it}{<->ssub * fca/m/sl}{}
-\DeclareFontShape{TS1}{fca}{m}{scit}{<->ssub * fca/m/scsl}{}
-\DeclareFontShape{TS1}{fca}{bx}{n}{<->ssub * fca/b/n}{}
-\DeclareFontShape{TS1}{fca}{bx}{sl}{<->ssub * fca/b/sl}{}
-\DeclareFontShape{TS1}{fca}{b}{it}{<->ssub * fca/b/sl}{}
-\DeclareFontShape{TS1}{fca}{bx}{it}{<->ssub * fca/b/it}{}
-\DeclareFontShape{TS1}{fca}{bx}{sc}{<->ssub * fca/b/sc}{}
-\DeclareFontShape{TS1}{fca}{bx}{scsl}{<->ssub * fca/b/scsl}{}
-\DeclareFontShape{TS1}{fca}{b}{scit}{<->ssub * fca/b/scsl}{}
-\DeclareFontShape{TS1}{fca}{bx}{scit}{<->ssub * fca/b/scit}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/cantarell/x2fca.fd b/Master/texmf-dist/tex/latex/cantarell/x2fca.fd
deleted file mode 100644
index 8c4f348c6aa..00000000000
--- a/Master/texmf-dist/tex/latex/cantarell/x2fca.fd
+++ /dev/null
@@ -1,59 +0,0 @@
-%Filename: x2fca.fd
-%Created by: tex cantarell-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{x2fca.fd}
- [2012/06/11 Fontinst v1.933 font definitions for X2/fca.]
-
-\expandafter\ifx\csname cantarell@scale\endcsname\relax
- \let\cantarell@scale\@empty
-\fi
-
-\DeclareFontFamily{X2}{fca}{}
-
-\DeclareFontShape{X2}{fca}{m}{n}{
- <->\cantarell@scale Cantarell-Regular-x2
-}{}
-
-\DeclareFontShape{X2}{fca}{m}{sl}{
- <->\cantarell@scale Cantarell-Regular-Slanted-x2
-}{}
-
-\DeclareFontShape{X2}{fca}{m}{sc}{
- <->\cantarell@scale Cantarell-Regular-SmallCaps-x2
-}{}
-
-\DeclareFontShape{X2}{fca}{m}{scsl}{
- <->\cantarell@scale Cantarell-Regular-Slanted-SmallCaps-x2
-}{}
-
-\DeclareFontShape{X2}{fca}{b}{n}{
- <->\cantarell@scale Cantarell-Bold-x2
-}{}
-
-\DeclareFontShape{X2}{fca}{b}{sl}{
- <->\cantarell@scale Cantarell-Bold-Slanted-x2
-}{}
-
-\DeclareFontShape{X2}{fca}{b}{sc}{
- <->\cantarell@scale Cantarell-Bold-SmallCaps-x2
-}{}
-
-\DeclareFontShape{X2}{fca}{b}{scsl}{
- <->\cantarell@scale Cantarell-Bold-Slanted-SmallCaps-x2
-}{}
-
-\DeclareFontShape{X2}{fca}{m}{it}{<->ssub * fca/m/sl}{}
-\DeclareFontShape{X2}{fca}{m}{scit}{<->ssub * fca/m/scsl}{}
-\DeclareFontShape{X2}{fca}{bx}{n}{<->ssub * fca/b/n}{}
-\DeclareFontShape{X2}{fca}{bx}{sl}{<->ssub * fca/b/sl}{}
-\DeclareFontShape{X2}{fca}{b}{it}{<->ssub * fca/b/sl}{}
-\DeclareFontShape{X2}{fca}{bx}{it}{<->ssub * fca/b/it}{}
-\DeclareFontShape{X2}{fca}{bx}{sc}{<->ssub * fca/b/sc}{}
-\DeclareFontShape{X2}{fca}{bx}{scsl}{<->ssub * fca/b/scsl}{}
-\DeclareFontShape{X2}{fca}{b}{scit}{<->ssub * fca/b/scsl}{}
-\DeclareFontShape{X2}{fca}{bx}{scit}{<->ssub * fca/b/scit}{}
-
-\endinput