summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/playfair
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-10-16 20:55:15 +0000
committerKarl Berry <karl@freefriends.org>2019-10-16 20:55:15 +0000
commita6439a9cf26d146fb436c26e141a900ee2152007 (patch)
treeb73eedfa316796757e856062a9a7a1e3fca750fc /Master/texmf-dist/tex/latex/playfair
parentbb06b9093350e49f4dfd9755154865cde6c11f75 (diff)
playfair (16oct19)
git-svn-id: svn://tug.org/texlive/trunk@52409 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/playfair')
-rw-r--r--Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-LF.fd110
-rw-r--r--Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-OsF.fd110
-rw-r--r--Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-Sup.fd89
-rw-r--r--Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-TLF.fd203
-rw-r--r--Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-TOsF.fd203
-rw-r--r--Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-LF.fd110
-rw-r--r--Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-OsF.fd110
-rw-r--r--Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-Sup.fd89
-rw-r--r--Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-TLF.fd203
-rw-r--r--Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-TOsF.fd203
-rw-r--r--Master/texmf-dist/tex/latex/playfair/PlayfairDisplay.sty14
-rw-r--r--Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-LF.fd110
-rw-r--r--Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-OsF.fd110
-rw-r--r--Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-Sup.fd89
-rw-r--r--Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-TLF.fd203
-rw-r--r--Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-TOsF.fd203
-rw-r--r--Master/texmf-dist/tex/latex/playfair/TS1PlayfairDisplay-LF.fd62
-rw-r--r--Master/texmf-dist/tex/latex/playfair/TS1PlayfairDisplay-OsF.fd62
-rw-r--r--Master/texmf-dist/tex/latex/playfair/TS1PlayfairDisplay-TLF.fd119
-rw-r--r--Master/texmf-dist/tex/latex/playfair/TS1PlayfairDisplay-TOsF.fd119
20 files changed, 1682 insertions, 839 deletions
diff --git a/Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-LF.fd b/Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-LF.fd
deleted file mode 100644
index e3a812db647..00000000000
--- a/Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-LF.fd
+++ /dev/null
@@ -1,110 +0,0 @@
-%% Generated by autoinst on 2014/05/23
-%%
-\ProvidesFile{LY1PlayfairDisplay-LF.fd}
- [2014/05/23 (autoinst) Font definitions for LY1/PlayfairDisplay-LF.]
-
-\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
- \let\PlayfairDisplay@@scale\@empty
-\else
- \edef\PlayfairDisplay@@scale{s*[\csname PlayfairDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{PlayfairDisplay-LF}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{k}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{k}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{k}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{k}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{k}{scsl}{
- <-> ssub * PlayfairDisplay-LF/k/scit
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{k}{sl}{
- <-> ssub * PlayfairDisplay-LF/k/it
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{b}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{b}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{b}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{b}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{b}{scsl}{
- <-> ssub * PlayfairDisplay-LF/b/scit
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{b}{sl}{
- <-> ssub * PlayfairDisplay-LF/b/it
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{m}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{m}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{m}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{m}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{m}{scsl}{
- <-> ssub * PlayfairDisplay-LF/m/scit
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{m}{sl}{
- <-> ssub * PlayfairDisplay-LF/m/it
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{bx}{sl}{
- <-> ssub * PlayfairDisplay-LF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{bx}{scsl}{
- <-> ssub * PlayfairDisplay-LF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{bx}{sc}{
- <-> ssub * PlayfairDisplay-LF/b/sc
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{bx}{n}{
- <-> ssub * PlayfairDisplay-LF/b/n
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{bx}{it}{
- <-> ssub * PlayfairDisplay-LF/b/it
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-LF}{bx}{scit}{
- <-> ssub * PlayfairDisplay-LF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-OsF.fd b/Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-OsF.fd
deleted file mode 100644
index d86e4690320..00000000000
--- a/Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-OsF.fd
+++ /dev/null
@@ -1,110 +0,0 @@
-%% Generated by autoinst on 2014/05/23
-%%
-\ProvidesFile{LY1PlayfairDisplay-OsF.fd}
- [2014/05/23 (autoinst) Font definitions for LY1/PlayfairDisplay-OsF.]
-
-\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
- \let\PlayfairDisplay@@scale\@empty
-\else
- \edef\PlayfairDisplay@@scale{s*[\csname PlayfairDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{PlayfairDisplay-OsF}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{k}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{k}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{k}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{k}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{k}{scsl}{
- <-> ssub * PlayfairDisplay-OsF/k/scit
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{k}{sl}{
- <-> ssub * PlayfairDisplay-OsF/k/it
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{b}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{b}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{b}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{b}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{b}{scsl}{
- <-> ssub * PlayfairDisplay-OsF/b/scit
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{b}{sl}{
- <-> ssub * PlayfairDisplay-OsF/b/it
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{m}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{m}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{m}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{m}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{m}{scsl}{
- <-> ssub * PlayfairDisplay-OsF/m/scit
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{m}{sl}{
- <-> ssub * PlayfairDisplay-OsF/m/it
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{bx}{sl}{
- <-> ssub * PlayfairDisplay-OsF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{bx}{scsl}{
- <-> ssub * PlayfairDisplay-OsF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{bx}{sc}{
- <-> ssub * PlayfairDisplay-OsF/b/sc
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{bx}{n}{
- <-> ssub * PlayfairDisplay-OsF/b/n
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{bx}{it}{
- <-> ssub * PlayfairDisplay-OsF/b/it
-}{}
-
-\DeclareFontShape{LY1}{PlayfairDisplay-OsF}{bx}{scit}{
- <-> ssub * PlayfairDisplay-OsF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-Sup.fd b/Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-Sup.fd
index 32e2bc64caf..48f157c291d 100644
--- a/Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-Sup.fd
+++ b/Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/23
+%% Generated by autoinst on 2019/10/15
%%
\ProvidesFile{LY1PlayfairDisplay-Sup.fd}
- [2014/05/23 (autoinst) Font definitions for LY1/PlayfairDisplay-Sup.]
+ [2019/10/15 (autoinst) Font definitions for LY1/PlayfairDisplay-Sup.]
\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
\let\PlayfairDisplay@@scale\@empty
@@ -11,50 +11,107 @@
\DeclareFontFamily{LY1}{PlayfairDisplay-Sup}{}
-\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{k}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{regular}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{regular}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{regular}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/regular/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{black}{n}{
<-> \PlayfairDisplay@@scale PlayfairDisplay-Black-sup-ly1
}{}
-\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{k}{it}{
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{black}{it}{
<-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-sup-ly1
}{}
-\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{k}{sl}{
- <-> ssub * PlayfairDisplay-Sup/k/it
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{black}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/black/it
}{}
-\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{bold}{n}{
<-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-sup-ly1
}{}
-\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{b}{it}{
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{bold}{it}{
<-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-sup-ly1
}{}
-\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{b}{sl}{
- <-> ssub * PlayfairDisplay-Sup/b/it
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{bold}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/bold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{m}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/regular/sl
}{}
\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{m}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-sup-ly1
+ <-> ssub * PlayfairDisplay-Sup/regular/n
}{}
\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{m}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-sup-ly1
+ <-> ssub * PlayfairDisplay-Sup/regular/it
}{}
-\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{m}{sl}{
- <-> ssub * PlayfairDisplay-Sup/m/it
+
+% b --> bold
+
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{b}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/bold/sl
}{}
-\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{bx}{sl}{
- <-> ssub * PlayfairDisplay-Sup/b/sl
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{b}{n}{
+ <-> ssub * PlayfairDisplay-Sup/bold/n
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{b}{it}{
+ <-> ssub * PlayfairDisplay-Sup/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{eb}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/black/sl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{eb}{n}{
+ <-> ssub * PlayfairDisplay-Sup/black/n
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{eb}{it}{
+ <-> ssub * PlayfairDisplay-Sup/black/it
}{}
\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{bx}{n}{
<-> ssub * PlayfairDisplay-Sup/b/n
}{}
+\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{bx}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/b/sl
+}{}
+
\DeclareFontShape{LY1}{PlayfairDisplay-Sup}{bx}{it}{
<-> ssub * PlayfairDisplay-Sup/b/it
}{}
diff --git a/Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-TLF.fd b/Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-TLF.fd
new file mode 100644
index 00000000000..109e47b7e28
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-TLF.fd
@@ -0,0 +1,203 @@
+%% Generated by autoinst on 2019/10/15
+%%
+\ProvidesFile{LY1PlayfairDisplay-TLF.fd}
+ [2019/10/15 (autoinst) Font definitions for LY1/PlayfairDisplay-TLF.]
+
+\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
+ \let\PlayfairDisplay@@scale\@empty
+\else
+ \edef\PlayfairDisplay@@scale{s*[\csname PlayfairDisplay@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{PlayfairDisplay-TLF}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{regular}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{regular}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{regular}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{regular}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{regular}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{regular}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/regular/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{black}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{black}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{black}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{black}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{black}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/black/scit
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{black}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{bold}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{bold}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{bold}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{bold}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{bold}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{bold}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/bold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{m}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{m}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/regular/scsl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{m}{sc}{
+ <-> ssub * PlayfairDisplay-TLF/regular/sc
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{m}{n}{
+ <-> ssub * PlayfairDisplay-TLF/regular/n
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{m}{it}{
+ <-> ssub * PlayfairDisplay-TLF/regular/it
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{m}{scit}{
+ <-> ssub * PlayfairDisplay-TLF/regular/scit
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{b}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{b}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{b}{sc}{
+ <-> ssub * PlayfairDisplay-TLF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{b}{n}{
+ <-> ssub * PlayfairDisplay-TLF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{b}{it}{
+ <-> ssub * PlayfairDisplay-TLF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{b}{scit}{
+ <-> ssub * PlayfairDisplay-TLF/bold/scit
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{eb}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{eb}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{eb}{sc}{
+ <-> ssub * PlayfairDisplay-TLF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{eb}{n}{
+ <-> ssub * PlayfairDisplay-TLF/black/n
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{eb}{it}{
+ <-> ssub * PlayfairDisplay-TLF/black/it
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{eb}{scit}{
+ <-> ssub * PlayfairDisplay-TLF/black/scit
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{bx}{n}{
+ <-> ssub * PlayfairDisplay-TLF/b/n
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{bx}{sc}{
+ <-> ssub * PlayfairDisplay-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{bx}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{bx}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{bx}{it}{
+ <-> ssub * PlayfairDisplay-TLF/b/it
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TLF}{bx}{scit}{
+ <-> ssub * PlayfairDisplay-TLF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-TOsF.fd b/Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-TOsF.fd
new file mode 100644
index 00000000000..9beeca68ce8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/playfair/LY1PlayfairDisplay-TOsF.fd
@@ -0,0 +1,203 @@
+%% Generated by autoinst on 2019/10/15
+%%
+\ProvidesFile{LY1PlayfairDisplay-TOsF.fd}
+ [2019/10/15 (autoinst) Font definitions for LY1/PlayfairDisplay-TOsF.]
+
+\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
+ \let\PlayfairDisplay@@scale\@empty
+\else
+ \edef\PlayfairDisplay@@scale{s*[\csname PlayfairDisplay@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{PlayfairDisplay-TOsF}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{regular}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{regular}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{regular}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{regular}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{regular}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{regular}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{black}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{black}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{black}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{black}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{black}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/black/scit
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{black}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{bold}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{bold}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{bold}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{bold}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{bold}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{bold}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{m}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{m}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/scsl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{m}{sc}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/sc
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{m}{n}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/n
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{m}{it}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/it
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{m}{scit}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/scit
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{b}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{b}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{b}{sc}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{b}{n}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{b}{it}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{b}{scit}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/scit
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{eb}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{eb}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{eb}{sc}{
+ <-> ssub * PlayfairDisplay-TOsF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{eb}{n}{
+ <-> ssub * PlayfairDisplay-TOsF/black/n
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{eb}{it}{
+ <-> ssub * PlayfairDisplay-TOsF/black/it
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{eb}{scit}{
+ <-> ssub * PlayfairDisplay-TOsF/black/scit
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{bx}{n}{
+ <-> ssub * PlayfairDisplay-TOsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{bx}{sc}{
+ <-> ssub * PlayfairDisplay-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{bx}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{bx}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{bx}{it}{
+ <-> ssub * PlayfairDisplay-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{PlayfairDisplay-TOsF}{bx}{scit}{
+ <-> ssub * PlayfairDisplay-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-LF.fd b/Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-LF.fd
deleted file mode 100644
index 8c52db69b10..00000000000
--- a/Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-LF.fd
+++ /dev/null
@@ -1,110 +0,0 @@
-%% Generated by autoinst on 2014/05/23
-%%
-\ProvidesFile{OT1PlayfairDisplay-LF.fd}
- [2014/05/23 (autoinst) Font definitions for OT1/PlayfairDisplay-LF.]
-
-\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
- \let\PlayfairDisplay@@scale\@empty
-\else
- \edef\PlayfairDisplay@@scale{s*[\csname PlayfairDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{PlayfairDisplay-LF}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{k}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{k}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{k}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{k}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{k}{scsl}{
- <-> ssub * PlayfairDisplay-LF/k/scit
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{k}{sl}{
- <-> ssub * PlayfairDisplay-LF/k/it
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{b}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{b}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{b}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{b}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{b}{scsl}{
- <-> ssub * PlayfairDisplay-LF/b/scit
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{b}{sl}{
- <-> ssub * PlayfairDisplay-LF/b/it
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{m}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{m}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{m}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{m}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{m}{scsl}{
- <-> ssub * PlayfairDisplay-LF/m/scit
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{m}{sl}{
- <-> ssub * PlayfairDisplay-LF/m/it
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{bx}{sl}{
- <-> ssub * PlayfairDisplay-LF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{bx}{scsl}{
- <-> ssub * PlayfairDisplay-LF/b/scsl
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{bx}{sc}{
- <-> ssub * PlayfairDisplay-LF/b/sc
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{bx}{n}{
- <-> ssub * PlayfairDisplay-LF/b/n
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{bx}{it}{
- <-> ssub * PlayfairDisplay-LF/b/it
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-LF}{bx}{scit}{
- <-> ssub * PlayfairDisplay-LF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-OsF.fd b/Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-OsF.fd
deleted file mode 100644
index d45f02095c0..00000000000
--- a/Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-OsF.fd
+++ /dev/null
@@ -1,110 +0,0 @@
-%% Generated by autoinst on 2014/05/23
-%%
-\ProvidesFile{OT1PlayfairDisplay-OsF.fd}
- [2014/05/23 (autoinst) Font definitions for OT1/PlayfairDisplay-OsF.]
-
-\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
- \let\PlayfairDisplay@@scale\@empty
-\else
- \edef\PlayfairDisplay@@scale{s*[\csname PlayfairDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{PlayfairDisplay-OsF}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{k}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{k}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{k}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{k}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{k}{scsl}{
- <-> ssub * PlayfairDisplay-OsF/k/scit
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{k}{sl}{
- <-> ssub * PlayfairDisplay-OsF/k/it
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{b}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{b}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{b}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{b}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{b}{scsl}{
- <-> ssub * PlayfairDisplay-OsF/b/scit
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{b}{sl}{
- <-> ssub * PlayfairDisplay-OsF/b/it
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{m}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{m}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{m}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{m}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{m}{scsl}{
- <-> ssub * PlayfairDisplay-OsF/m/scit
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{m}{sl}{
- <-> ssub * PlayfairDisplay-OsF/m/it
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{bx}{sl}{
- <-> ssub * PlayfairDisplay-OsF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{bx}{scsl}{
- <-> ssub * PlayfairDisplay-OsF/b/scsl
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{bx}{sc}{
- <-> ssub * PlayfairDisplay-OsF/b/sc
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{bx}{n}{
- <-> ssub * PlayfairDisplay-OsF/b/n
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{bx}{it}{
- <-> ssub * PlayfairDisplay-OsF/b/it
-}{}
-
-\DeclareFontShape{OT1}{PlayfairDisplay-OsF}{bx}{scit}{
- <-> ssub * PlayfairDisplay-OsF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-Sup.fd b/Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-Sup.fd
index 70688856262..8921c8bbe75 100644
--- a/Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-Sup.fd
+++ b/Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/23
+%% Generated by autoinst on 2019/10/15
%%
\ProvidesFile{OT1PlayfairDisplay-Sup.fd}
- [2014/05/23 (autoinst) Font definitions for OT1/PlayfairDisplay-Sup.]
+ [2019/10/15 (autoinst) Font definitions for OT1/PlayfairDisplay-Sup.]
\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
\let\PlayfairDisplay@@scale\@empty
@@ -11,50 +11,107 @@
\DeclareFontFamily{OT1}{PlayfairDisplay-Sup}{}
-\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{k}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{regular}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{regular}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{regular}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/regular/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{black}{n}{
<-> \PlayfairDisplay@@scale PlayfairDisplay-Black-sup-ot1
}{}
-\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{k}{it}{
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{black}{it}{
<-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{k}{sl}{
- <-> ssub * PlayfairDisplay-Sup/k/it
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{black}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/black/it
}{}
-\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{bold}{n}{
<-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-sup-ot1
}{}
-\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{b}{it}{
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{bold}{it}{
<-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{b}{sl}{
- <-> ssub * PlayfairDisplay-Sup/b/it
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{bold}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/bold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{m}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/regular/sl
}{}
\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{m}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-sup-ot1
+ <-> ssub * PlayfairDisplay-Sup/regular/n
}{}
\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{m}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-sup-ot1
+ <-> ssub * PlayfairDisplay-Sup/regular/it
}{}
-\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{m}{sl}{
- <-> ssub * PlayfairDisplay-Sup/m/it
+
+% b --> bold
+
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{b}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/bold/sl
}{}
-\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{bx}{sl}{
- <-> ssub * PlayfairDisplay-Sup/b/sl
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{b}{n}{
+ <-> ssub * PlayfairDisplay-Sup/bold/n
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{b}{it}{
+ <-> ssub * PlayfairDisplay-Sup/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{eb}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/black/sl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{eb}{n}{
+ <-> ssub * PlayfairDisplay-Sup/black/n
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{eb}{it}{
+ <-> ssub * PlayfairDisplay-Sup/black/it
}{}
\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{bx}{n}{
<-> ssub * PlayfairDisplay-Sup/b/n
}{}
+\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{bx}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/b/sl
+}{}
+
\DeclareFontShape{OT1}{PlayfairDisplay-Sup}{bx}{it}{
<-> ssub * PlayfairDisplay-Sup/b/it
}{}
diff --git a/Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-TLF.fd b/Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-TLF.fd
new file mode 100644
index 00000000000..eb691b00c5a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-TLF.fd
@@ -0,0 +1,203 @@
+%% Generated by autoinst on 2019/10/15
+%%
+\ProvidesFile{OT1PlayfairDisplay-TLF.fd}
+ [2019/10/15 (autoinst) Font definitions for OT1/PlayfairDisplay-TLF.]
+
+\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
+ \let\PlayfairDisplay@@scale\@empty
+\else
+ \edef\PlayfairDisplay@@scale{s*[\csname PlayfairDisplay@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{PlayfairDisplay-TLF}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{regular}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{regular}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{regular}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{regular}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{regular}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{regular}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/regular/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{black}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{black}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{black}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{black}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{black}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/black/scit
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{black}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{bold}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{bold}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{bold}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{bold}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{bold}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{bold}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/bold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{m}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{m}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/regular/scsl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{m}{sc}{
+ <-> ssub * PlayfairDisplay-TLF/regular/sc
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{m}{n}{
+ <-> ssub * PlayfairDisplay-TLF/regular/n
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{m}{it}{
+ <-> ssub * PlayfairDisplay-TLF/regular/it
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{m}{scit}{
+ <-> ssub * PlayfairDisplay-TLF/regular/scit
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{b}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{b}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{b}{sc}{
+ <-> ssub * PlayfairDisplay-TLF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{b}{n}{
+ <-> ssub * PlayfairDisplay-TLF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{b}{it}{
+ <-> ssub * PlayfairDisplay-TLF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{b}{scit}{
+ <-> ssub * PlayfairDisplay-TLF/bold/scit
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{eb}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{eb}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{eb}{sc}{
+ <-> ssub * PlayfairDisplay-TLF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{eb}{n}{
+ <-> ssub * PlayfairDisplay-TLF/black/n
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{eb}{it}{
+ <-> ssub * PlayfairDisplay-TLF/black/it
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{eb}{scit}{
+ <-> ssub * PlayfairDisplay-TLF/black/scit
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{bx}{n}{
+ <-> ssub * PlayfairDisplay-TLF/b/n
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{bx}{sc}{
+ <-> ssub * PlayfairDisplay-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{bx}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{bx}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{bx}{it}{
+ <-> ssub * PlayfairDisplay-TLF/b/it
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TLF}{bx}{scit}{
+ <-> ssub * PlayfairDisplay-TLF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-TOsF.fd b/Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-TOsF.fd
new file mode 100644
index 00000000000..5b5f50733f4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/playfair/OT1PlayfairDisplay-TOsF.fd
@@ -0,0 +1,203 @@
+%% Generated by autoinst on 2019/10/15
+%%
+\ProvidesFile{OT1PlayfairDisplay-TOsF.fd}
+ [2019/10/15 (autoinst) Font definitions for OT1/PlayfairDisplay-TOsF.]
+
+\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
+ \let\PlayfairDisplay@@scale\@empty
+\else
+ \edef\PlayfairDisplay@@scale{s*[\csname PlayfairDisplay@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{PlayfairDisplay-TOsF}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{regular}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{regular}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{regular}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{regular}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{regular}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{regular}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{black}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{black}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{black}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{black}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{black}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/black/scit
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{black}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{bold}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{bold}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{bold}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{bold}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{bold}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{bold}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{m}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{m}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/scsl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{m}{sc}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/sc
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{m}{n}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/n
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{m}{it}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/it
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{m}{scit}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/scit
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{b}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{b}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{b}{sc}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{b}{n}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{b}{it}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{b}{scit}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/scit
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{eb}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{eb}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{eb}{sc}{
+ <-> ssub * PlayfairDisplay-TOsF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{eb}{n}{
+ <-> ssub * PlayfairDisplay-TOsF/black/n
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{eb}{it}{
+ <-> ssub * PlayfairDisplay-TOsF/black/it
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{eb}{scit}{
+ <-> ssub * PlayfairDisplay-TOsF/black/scit
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{bx}{n}{
+ <-> ssub * PlayfairDisplay-TOsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{bx}{sc}{
+ <-> ssub * PlayfairDisplay-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{bx}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{bx}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{bx}{it}{
+ <-> ssub * PlayfairDisplay-TOsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{PlayfairDisplay-TOsF}{bx}{scit}{
+ <-> ssub * PlayfairDisplay-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/playfair/PlayfairDisplay.sty b/Master/texmf-dist/tex/latex/playfair/PlayfairDisplay.sty
index 948bea153a2..d1f42d39e52 100644
--- a/Master/texmf-dist/tex/latex/playfair/PlayfairDisplay.sty
+++ b/Master/texmf-dist/tex/latex/playfair/PlayfairDisplay.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{PlayfairDisplay}[%
- 2014/05/23 (Bob Tennent) Supports PlayfairDisplay fonts for all LaTeX engines. ]
+ 2019/10/15 (Bob Tennent) Supports PlayfairDisplay fonts for all LaTeX engines. ]
\RequirePackage{ifxetex,ifluatex,textcomp}
@@ -71,12 +71,12 @@
\else % type1
\ifplayfair@lining
- \def\playfair@figurestyle{LF}
+ \def\playfair@figurestyle{TLF}
\else
- \def\playfair@figurestyle{OsF}
+ \def\playfair@figurestyle{TOsF}
\fi
\ifplayfair@black
- \def\bfseries@rm{k}
+ \def\bfseries@rm{eb}
\else
\def\bfseries@rm{b}
\fi
@@ -143,9 +143,9 @@
\renewcommand*\rmdefault{\playfairfamily}
\newcommand*\playfair{\fontfamily{\playfairfamily}\selectfont}
- \newcommand*\playfairblack{\fontfamily{\playfairfamily}\fontseries{k}\selectfont}
- \newcommand*\playfairOsF{\fontfamily{PlayfairDisplay-OsF}\selectfont}
- \newcommand*\playfairLF{\fontfamily{PlayfairDisplay-LF}\selectfont}
+ \newcommand*\playfairblack{\fontfamily{\playfairfamily}\fontseries{eb}\selectfont}
+ \newcommand*\playfairOsF{\fontfamily{PlayfairDisplay-TOsF}\selectfont}
+ \newcommand*\playfairLF{\fontfamily{PlayfairDisplay-TLF}\selectfont}
\fi
diff --git a/Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-LF.fd b/Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-LF.fd
deleted file mode 100644
index cb37436ca43..00000000000
--- a/Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-LF.fd
+++ /dev/null
@@ -1,110 +0,0 @@
-%% Generated by autoinst on 2014/05/23
-%%
-\ProvidesFile{T1PlayfairDisplay-LF.fd}
- [2014/05/23 (autoinst) Font definitions for T1/PlayfairDisplay-LF.]
-
-\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
- \let\PlayfairDisplay@@scale\@empty
-\else
- \edef\PlayfairDisplay@@scale{s*[\csname PlayfairDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{PlayfairDisplay-LF}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{k}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{k}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-lf-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{k}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-lf-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{k}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{k}{scsl}{
- <-> ssub * PlayfairDisplay-LF/k/scit
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{k}{sl}{
- <-> ssub * PlayfairDisplay-LF/k/it
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{b}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{b}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-lf-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{b}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-lf-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{b}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{b}{scsl}{
- <-> ssub * PlayfairDisplay-LF/b/scit
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{b}{sl}{
- <-> ssub * PlayfairDisplay-LF/b/it
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{m}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{m}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-lf-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{m}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-lf-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{m}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{m}{scsl}{
- <-> ssub * PlayfairDisplay-LF/m/scit
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{m}{sl}{
- <-> ssub * PlayfairDisplay-LF/m/it
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{bx}{sl}{
- <-> ssub * PlayfairDisplay-LF/b/sl
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{bx}{scsl}{
- <-> ssub * PlayfairDisplay-LF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{bx}{sc}{
- <-> ssub * PlayfairDisplay-LF/b/sc
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{bx}{n}{
- <-> ssub * PlayfairDisplay-LF/b/n
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{bx}{it}{
- <-> ssub * PlayfairDisplay-LF/b/it
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-LF}{bx}{scit}{
- <-> ssub * PlayfairDisplay-LF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-OsF.fd b/Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-OsF.fd
deleted file mode 100644
index 537bf6bcb37..00000000000
--- a/Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-OsF.fd
+++ /dev/null
@@ -1,110 +0,0 @@
-%% Generated by autoinst on 2014/05/23
-%%
-\ProvidesFile{T1PlayfairDisplay-OsF.fd}
- [2014/05/23 (autoinst) Font definitions for T1/PlayfairDisplay-OsF.]
-
-\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
- \let\PlayfairDisplay@@scale\@empty
-\else
- \edef\PlayfairDisplay@@scale{s*[\csname PlayfairDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{PlayfairDisplay-OsF}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{k}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{k}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-osf-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{k}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{k}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{k}{scsl}{
- <-> ssub * PlayfairDisplay-OsF/k/scit
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{k}{sl}{
- <-> ssub * PlayfairDisplay-OsF/k/it
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{b}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{b}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-osf-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{b}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{b}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{b}{scsl}{
- <-> ssub * PlayfairDisplay-OsF/b/scit
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{b}{sl}{
- <-> ssub * PlayfairDisplay-OsF/b/it
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{m}{sc}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{m}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-osf-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{m}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{m}{scit}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{m}{scsl}{
- <-> ssub * PlayfairDisplay-OsF/m/scit
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{m}{sl}{
- <-> ssub * PlayfairDisplay-OsF/m/it
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{bx}{sl}{
- <-> ssub * PlayfairDisplay-OsF/b/sl
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{bx}{scsl}{
- <-> ssub * PlayfairDisplay-OsF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{bx}{sc}{
- <-> ssub * PlayfairDisplay-OsF/b/sc
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{bx}{n}{
- <-> ssub * PlayfairDisplay-OsF/b/n
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{bx}{it}{
- <-> ssub * PlayfairDisplay-OsF/b/it
-}{}
-
-\DeclareFontShape{T1}{PlayfairDisplay-OsF}{bx}{scit}{
- <-> ssub * PlayfairDisplay-OsF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-Sup.fd b/Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-Sup.fd
index e76b4a099a0..75b45971b49 100644
--- a/Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-Sup.fd
+++ b/Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/23
+%% Generated by autoinst on 2019/10/15
%%
\ProvidesFile{T1PlayfairDisplay-Sup.fd}
- [2014/05/23 (autoinst) Font definitions for T1/PlayfairDisplay-Sup.]
+ [2019/10/15 (autoinst) Font definitions for T1/PlayfairDisplay-Sup.]
\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
\let\PlayfairDisplay@@scale\@empty
@@ -11,50 +11,107 @@
\DeclareFontFamily{T1}{PlayfairDisplay-Sup}{}
-\DeclareFontShape{T1}{PlayfairDisplay-Sup}{k}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{regular}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-sup-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{regular}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{regular}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/regular/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{black}{n}{
<-> \PlayfairDisplay@@scale PlayfairDisplay-Black-sup-t1
}{}
-\DeclareFontShape{T1}{PlayfairDisplay-Sup}{k}{it}{
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{black}{it}{
<-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-sup-t1
}{}
-\DeclareFontShape{T1}{PlayfairDisplay-Sup}{k}{sl}{
- <-> ssub * PlayfairDisplay-Sup/k/it
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{black}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/black/it
}{}
-\DeclareFontShape{T1}{PlayfairDisplay-Sup}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{bold}{n}{
<-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-sup-t1
}{}
-\DeclareFontShape{T1}{PlayfairDisplay-Sup}{b}{it}{
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{bold}{it}{
<-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-sup-t1
}{}
-\DeclareFontShape{T1}{PlayfairDisplay-Sup}{b}{sl}{
- <-> ssub * PlayfairDisplay-Sup/b/it
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{bold}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/bold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{m}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/regular/sl
}{}
\DeclareFontShape{T1}{PlayfairDisplay-Sup}{m}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-sup-t1
+ <-> ssub * PlayfairDisplay-Sup/regular/n
}{}
\DeclareFontShape{T1}{PlayfairDisplay-Sup}{m}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-sup-t1
+ <-> ssub * PlayfairDisplay-Sup/regular/it
}{}
-\DeclareFontShape{T1}{PlayfairDisplay-Sup}{m}{sl}{
- <-> ssub * PlayfairDisplay-Sup/m/it
+
+% b --> bold
+
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{b}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/bold/sl
}{}
-\DeclareFontShape{T1}{PlayfairDisplay-Sup}{bx}{sl}{
- <-> ssub * PlayfairDisplay-Sup/b/sl
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{b}{n}{
+ <-> ssub * PlayfairDisplay-Sup/bold/n
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{b}{it}{
+ <-> ssub * PlayfairDisplay-Sup/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{eb}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/black/sl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{eb}{n}{
+ <-> ssub * PlayfairDisplay-Sup/black/n
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{eb}{it}{
+ <-> ssub * PlayfairDisplay-Sup/black/it
}{}
\DeclareFontShape{T1}{PlayfairDisplay-Sup}{bx}{n}{
<-> ssub * PlayfairDisplay-Sup/b/n
}{}
+\DeclareFontShape{T1}{PlayfairDisplay-Sup}{bx}{sl}{
+ <-> ssub * PlayfairDisplay-Sup/b/sl
+}{}
+
\DeclareFontShape{T1}{PlayfairDisplay-Sup}{bx}{it}{
<-> ssub * PlayfairDisplay-Sup/b/it
}{}
diff --git a/Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-TLF.fd b/Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-TLF.fd
new file mode 100644
index 00000000000..ab9d0ea4372
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-TLF.fd
@@ -0,0 +1,203 @@
+%% Generated by autoinst on 2019/10/15
+%%
+\ProvidesFile{T1PlayfairDisplay-TLF.fd}
+ [2019/10/15 (autoinst) Font definitions for T1/PlayfairDisplay-TLF.]
+
+\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
+ \let\PlayfairDisplay@@scale\@empty
+\else
+ \edef\PlayfairDisplay@@scale{s*[\csname PlayfairDisplay@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{PlayfairDisplay-TLF}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{regular}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{regular}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{regular}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{regular}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{regular}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{regular}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/regular/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{black}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{black}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{black}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{black}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{black}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/black/scit
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{black}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{bold}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{bold}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{bold}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{bold}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{bold}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{bold}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/bold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{m}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{m}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/regular/scsl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{m}{sc}{
+ <-> ssub * PlayfairDisplay-TLF/regular/sc
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{m}{n}{
+ <-> ssub * PlayfairDisplay-TLF/regular/n
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{m}{it}{
+ <-> ssub * PlayfairDisplay-TLF/regular/it
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{m}{scit}{
+ <-> ssub * PlayfairDisplay-TLF/regular/scit
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{b}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{b}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{b}{sc}{
+ <-> ssub * PlayfairDisplay-TLF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{b}{n}{
+ <-> ssub * PlayfairDisplay-TLF/bold/n
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{b}{it}{
+ <-> ssub * PlayfairDisplay-TLF/bold/it
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{b}{scit}{
+ <-> ssub * PlayfairDisplay-TLF/bold/scit
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{eb}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/black/sl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{eb}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{eb}{sc}{
+ <-> ssub * PlayfairDisplay-TLF/black/sc
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{eb}{n}{
+ <-> ssub * PlayfairDisplay-TLF/black/n
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{eb}{it}{
+ <-> ssub * PlayfairDisplay-TLF/black/it
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{eb}{scit}{
+ <-> ssub * PlayfairDisplay-TLF/black/scit
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{bx}{n}{
+ <-> ssub * PlayfairDisplay-TLF/b/n
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{bx}{sc}{
+ <-> ssub * PlayfairDisplay-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{bx}{scsl}{
+ <-> ssub * PlayfairDisplay-TLF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{bx}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/b/sl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{bx}{it}{
+ <-> ssub * PlayfairDisplay-TLF/b/it
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TLF}{bx}{scit}{
+ <-> ssub * PlayfairDisplay-TLF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-TOsF.fd b/Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-TOsF.fd
new file mode 100644
index 00000000000..f72dbb4c9e7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/playfair/T1PlayfairDisplay-TOsF.fd
@@ -0,0 +1,203 @@
+%% Generated by autoinst on 2019/10/15
+%%
+\ProvidesFile{T1PlayfairDisplay-TOsF.fd}
+ [2019/10/15 (autoinst) Font definitions for T1/PlayfairDisplay-TOsF.]
+
+\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
+ \let\PlayfairDisplay@@scale\@empty
+\else
+ \edef\PlayfairDisplay@@scale{s*[\csname PlayfairDisplay@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{PlayfairDisplay-TOsF}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{regular}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{regular}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{regular}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{regular}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{regular}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{regular}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{black}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{black}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{black}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{black}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{black}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/black/scit
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{black}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{bold}{sc}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{bold}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{bold}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{bold}{scit}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{bold}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{bold}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{m}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{m}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/scsl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{m}{sc}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/sc
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{m}{n}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/n
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{m}{it}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/it
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{m}{scit}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/scit
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{b}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{b}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{b}{sc}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{b}{n}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{b}{it}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/it
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{b}{scit}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/scit
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{eb}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/black/sl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{eb}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{eb}{sc}{
+ <-> ssub * PlayfairDisplay-TOsF/black/sc
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{eb}{n}{
+ <-> ssub * PlayfairDisplay-TOsF/black/n
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{eb}{it}{
+ <-> ssub * PlayfairDisplay-TOsF/black/it
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{eb}{scit}{
+ <-> ssub * PlayfairDisplay-TOsF/black/scit
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{bx}{n}{
+ <-> ssub * PlayfairDisplay-TOsF/b/n
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{bx}{sc}{
+ <-> ssub * PlayfairDisplay-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{bx}{scsl}{
+ <-> ssub * PlayfairDisplay-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{bx}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{bx}{it}{
+ <-> ssub * PlayfairDisplay-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{PlayfairDisplay-TOsF}{bx}{scit}{
+ <-> ssub * PlayfairDisplay-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/playfair/TS1PlayfairDisplay-LF.fd b/Master/texmf-dist/tex/latex/playfair/TS1PlayfairDisplay-LF.fd
deleted file mode 100644
index 217f1a7b1ee..00000000000
--- a/Master/texmf-dist/tex/latex/playfair/TS1PlayfairDisplay-LF.fd
+++ /dev/null
@@ -1,62 +0,0 @@
-%% Generated by autoinst on 2014/05/23
-%%
-\ProvidesFile{TS1PlayfairDisplay-LF.fd}
- [2014/05/23 (autoinst) Font definitions for TS1/PlayfairDisplay-LF.]
-
-\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
- \let\PlayfairDisplay@@scale\@empty
-\else
- \edef\PlayfairDisplay@@scale{s*[\csname PlayfairDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{PlayfairDisplay-LF}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-LF}{k}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-LF}{k}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-LF}{k}{sl}{
- <-> ssub * PlayfairDisplay-LF/k/it
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-LF}{b}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-LF}{b}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-LF}{b}{sl}{
- <-> ssub * PlayfairDisplay-LF/b/it
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-LF}{m}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-LF}{m}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-LF}{m}{sl}{
- <-> ssub * PlayfairDisplay-LF/m/it
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-LF}{bx}{sl}{
- <-> ssub * PlayfairDisplay-LF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-LF}{bx}{n}{
- <-> ssub * PlayfairDisplay-LF/b/n
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-LF}{bx}{it}{
- <-> ssub * PlayfairDisplay-LF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/playfair/TS1PlayfairDisplay-OsF.fd b/Master/texmf-dist/tex/latex/playfair/TS1PlayfairDisplay-OsF.fd
deleted file mode 100644
index 2826cf54a29..00000000000
--- a/Master/texmf-dist/tex/latex/playfair/TS1PlayfairDisplay-OsF.fd
+++ /dev/null
@@ -1,62 +0,0 @@
-%% Generated by autoinst on 2014/05/23
-%%
-\ProvidesFile{TS1PlayfairDisplay-OsF.fd}
- [2014/05/23 (autoinst) Font definitions for TS1/PlayfairDisplay-OsF.]
-
-\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
- \let\PlayfairDisplay@@scale\@empty
-\else
- \edef\PlayfairDisplay@@scale{s*[\csname PlayfairDisplay@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{PlayfairDisplay-OsF}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-OsF}{k}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-OsF}{k}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-OsF}{k}{sl}{
- <-> ssub * PlayfairDisplay-OsF/k/it
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-OsF}{b}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-OsF}{b}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-OsF}{b}{sl}{
- <-> ssub * PlayfairDisplay-OsF/b/it
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-OsF}{m}{n}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-OsF}{m}{it}{
- <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-OsF}{m}{sl}{
- <-> ssub * PlayfairDisplay-OsF/m/it
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-OsF}{bx}{sl}{
- <-> ssub * PlayfairDisplay-OsF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-OsF}{bx}{n}{
- <-> ssub * PlayfairDisplay-OsF/b/n
-}{}
-
-\DeclareFontShape{TS1}{PlayfairDisplay-OsF}{bx}{it}{
- <-> ssub * PlayfairDisplay-OsF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/playfair/TS1PlayfairDisplay-TLF.fd b/Master/texmf-dist/tex/latex/playfair/TS1PlayfairDisplay-TLF.fd
new file mode 100644
index 00000000000..414956d9e64
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/playfair/TS1PlayfairDisplay-TLF.fd
@@ -0,0 +1,119 @@
+%% Generated by autoinst on 2019/10/15
+%%
+\ProvidesFile{TS1PlayfairDisplay-TLF.fd}
+ [2019/10/15 (autoinst) Font definitions for TS1/PlayfairDisplay-TLF.]
+
+\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
+ \let\PlayfairDisplay@@scale\@empty
+\else
+ \edef\PlayfairDisplay@@scale{s*[\csname PlayfairDisplay@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{PlayfairDisplay-TLF}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{regular}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{regular}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{regular}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/regular/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{black}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{black}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{black}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{bold}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{bold}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{bold}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/bold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{m}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/regular/sl
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{m}{n}{
+ <-> ssub * PlayfairDisplay-TLF/regular/n
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{m}{it}{
+ <-> ssub * PlayfairDisplay-TLF/regular/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{b}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{b}{n}{
+ <-> ssub * PlayfairDisplay-TLF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{b}{it}{
+ <-> ssub * PlayfairDisplay-TLF/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{eb}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{eb}{n}{
+ <-> ssub * PlayfairDisplay-TLF/black/n
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{eb}{it}{
+ <-> ssub * PlayfairDisplay-TLF/black/it
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{bx}{n}{
+ <-> ssub * PlayfairDisplay-TLF/b/n
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{bx}{sl}{
+ <-> ssub * PlayfairDisplay-TLF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TLF}{bx}{it}{
+ <-> ssub * PlayfairDisplay-TLF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/playfair/TS1PlayfairDisplay-TOsF.fd b/Master/texmf-dist/tex/latex/playfair/TS1PlayfairDisplay-TOsF.fd
new file mode 100644
index 00000000000..cf650bbfcc1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/playfair/TS1PlayfairDisplay-TOsF.fd
@@ -0,0 +1,119 @@
+%% Generated by autoinst on 2019/10/15
+%%
+\ProvidesFile{TS1PlayfairDisplay-TOsF.fd}
+ [2019/10/15 (autoinst) Font definitions for TS1/PlayfairDisplay-TOsF.]
+
+\expandafter\ifx\csname PlayfairDisplay@scale\endcsname\relax
+ \let\PlayfairDisplay@@scale\@empty
+\else
+ \edef\PlayfairDisplay@@scale{s*[\csname PlayfairDisplay@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{PlayfairDisplay-TOsF}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{regular}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Regular-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{regular}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Italic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{regular}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{black}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Black-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{black}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BlackItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{black}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{bold}{n}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-Bold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{bold}{it}{
+ <-> \PlayfairDisplay@@scale PlayfairDisplay-BoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{bold}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{m}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{m}{n}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/n
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{m}{it}{
+ <-> ssub * PlayfairDisplay-TOsF/regular/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{b}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{b}{n}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{b}{it}{
+ <-> ssub * PlayfairDisplay-TOsF/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{eb}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{eb}{n}{
+ <-> ssub * PlayfairDisplay-TOsF/black/n
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{eb}{it}{
+ <-> ssub * PlayfairDisplay-TOsF/black/it
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{bx}{n}{
+ <-> ssub * PlayfairDisplay-TOsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{bx}{sl}{
+ <-> ssub * PlayfairDisplay-TOsF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{PlayfairDisplay-TOsF}{bx}{it}{
+ <-> ssub * PlayfairDisplay-TOsF/b/it
+}{}
+
+\endinput