summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/cabin
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-10-21 20:58:02 +0000
committerKarl Berry <karl@freefriends.org>2019-10-21 20:58:02 +0000
commit5ffcd5dba732b336a636f94620428f6614b4bc5e (patch)
treec4c96e0aadb831129eb1c6ba164d17b825099748 /Master/texmf-dist/tex/latex/cabin
parent7873aa917069da8d1dfcc60eb5eea04a8c4e62ce (diff)
cabin (21oct19)
git-svn-id: svn://tug.org/texlive/trunk@52475 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/cabin')
-rw-r--r--Master/texmf-dist/tex/latex/cabin/LGRCabin-Sup.fd50
-rw-r--r--Master/texmf-dist/tex/latex/cabin/LGRCabin-TLF.fd86
-rw-r--r--Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd50
-rw-r--r--Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd86
-rw-r--r--Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd50
-rw-r--r--Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd86
-rw-r--r--Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd50
-rw-r--r--Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd86
-rw-r--r--Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd50
-rw-r--r--Master/texmf-dist/tex/latex/cabin/cabin.sty14
10 files changed, 121 insertions, 487 deletions
diff --git a/Master/texmf-dist/tex/latex/cabin/LGRCabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/LGRCabin-Sup.fd
index 110bccbfe6c..781d3be9f51 100644
--- a/Master/texmf-dist/tex/latex/cabin/LGRCabin-Sup.fd
+++ b/Master/texmf-dist/tex/latex/cabin/LGRCabin-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
%%
\ProvidesFile{LGRCabin-Sup.fd}
- [2019/10/12 (autoinst) Font definitions for LGR/Cabin-Sup.]
+ [2019/10/21 (autoinst) Font definitions for LGR/Cabin-Sup.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -135,63 +135,33 @@
% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% slc --> condensed
-
-\DeclareFontShape{LGR}{Cabin-Sup}{slc}{sl}{
- <-> ssub * Cabin-Sup/condensed/sl
-}{}
-
-\DeclareFontShape{LGR}{Cabin-Sup}{slc}{n}{
- <-> ssub * Cabin-Sup/condensed/n
-}{}
-
-\DeclareFontShape{LGR}{Cabin-Sup}{slc}{it}{
- <-> ssub * Cabin-Sup/condensed/it
-}{}
-
-
-% sl --> regular
-
-\DeclareFontShape{LGR}{Cabin-Sup}{sl}{sl}{
- <-> ssub * Cabin-Sup/regular/sl
-}{}
-
-\DeclareFontShape{LGR}{Cabin-Sup}{sl}{n}{
- <-> ssub * Cabin-Sup/regular/n
-}{}
-
-\DeclareFontShape{LGR}{Cabin-Sup}{sl}{it}{
- <-> ssub * Cabin-Sup/regular/it
-}{}
-
-
-% c --> mediumcondensed
+% c --> condensed
\DeclareFontShape{LGR}{Cabin-Sup}{c}{sl}{
- <-> ssub * Cabin-Sup/mediumcondensed/sl
+ <-> ssub * Cabin-Sup/condensed/sl
}{}
\DeclareFontShape{LGR}{Cabin-Sup}{c}{n}{
- <-> ssub * Cabin-Sup/mediumcondensed/n
+ <-> ssub * Cabin-Sup/condensed/n
}{}
\DeclareFontShape{LGR}{Cabin-Sup}{c}{it}{
- <-> ssub * Cabin-Sup/mediumcondensed/it
+ <-> ssub * Cabin-Sup/condensed/it
}{}
-% m --> medium
+% m --> regular
\DeclareFontShape{LGR}{Cabin-Sup}{m}{sl}{
- <-> ssub * Cabin-Sup/medium/sl
+ <-> ssub * Cabin-Sup/regular/sl
}{}
\DeclareFontShape{LGR}{Cabin-Sup}{m}{n}{
- <-> ssub * Cabin-Sup/medium/n
+ <-> ssub * Cabin-Sup/regular/n
}{}
\DeclareFontShape{LGR}{Cabin-Sup}{m}{it}{
- <-> ssub * Cabin-Sup/medium/it
+ <-> ssub * Cabin-Sup/regular/it
}{}
diff --git a/Master/texmf-dist/tex/latex/cabin/LGRCabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/LGRCabin-TLF.fd
index ad14b4b3d11..7fd939ed012 100644
--- a/Master/texmf-dist/tex/latex/cabin/LGRCabin-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cabin/LGRCabin-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
%%
\ProvidesFile{LGRCabin-TLF.fd}
- [2019/10/12 (autoinst) Font definitions for LGR/Cabin-TLF.]
+ [2019/10/21 (autoinst) Font definitions for LGR/Cabin-TLF.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -231,111 +231,57 @@
% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% slc --> condensed
-
-\DeclareFontShape{LGR}{Cabin-TLF}{slc}{sl}{
- <-> ssub * Cabin-TLF/condensed/sl
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{slc}{scsl}{
- <-> ssub * Cabin-TLF/condensed/scsl
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{slc}{sc}{
- <-> ssub * Cabin-TLF/condensed/sc
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{slc}{n}{
- <-> ssub * Cabin-TLF/condensed/n
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{slc}{it}{
- <-> ssub * Cabin-TLF/condensed/it
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{slc}{scit}{
- <-> ssub * Cabin-TLF/condensed/scit
-}{}
-
-
-% sl --> regular
-
-\DeclareFontShape{LGR}{Cabin-TLF}{sl}{sl}{
- <-> ssub * Cabin-TLF/regular/sl
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{sl}{scsl}{
- <-> ssub * Cabin-TLF/regular/scsl
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{sl}{sc}{
- <-> ssub * Cabin-TLF/regular/sc
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{sl}{n}{
- <-> ssub * Cabin-TLF/regular/n
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{sl}{it}{
- <-> ssub * Cabin-TLF/regular/it
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{sl}{scit}{
- <-> ssub * Cabin-TLF/regular/scit
-}{}
-
-
-% c --> mediumcondensed
+% c --> condensed
\DeclareFontShape{LGR}{Cabin-TLF}{c}{sl}{
- <-> ssub * Cabin-TLF/mediumcondensed/sl
+ <-> ssub * Cabin-TLF/condensed/sl
}{}
\DeclareFontShape{LGR}{Cabin-TLF}{c}{scsl}{
- <-> ssub * Cabin-TLF/mediumcondensed/scsl
+ <-> ssub * Cabin-TLF/condensed/scsl
}{}
\DeclareFontShape{LGR}{Cabin-TLF}{c}{sc}{
- <-> ssub * Cabin-TLF/mediumcondensed/sc
+ <-> ssub * Cabin-TLF/condensed/sc
}{}
\DeclareFontShape{LGR}{Cabin-TLF}{c}{n}{
- <-> ssub * Cabin-TLF/mediumcondensed/n
+ <-> ssub * Cabin-TLF/condensed/n
}{}
\DeclareFontShape{LGR}{Cabin-TLF}{c}{it}{
- <-> ssub * Cabin-TLF/mediumcondensed/it
+ <-> ssub * Cabin-TLF/condensed/it
}{}
\DeclareFontShape{LGR}{Cabin-TLF}{c}{scit}{
- <-> ssub * Cabin-TLF/mediumcondensed/scit
+ <-> ssub * Cabin-TLF/condensed/scit
}{}
-% m --> medium
+% m --> regular
\DeclareFontShape{LGR}{Cabin-TLF}{m}{sl}{
- <-> ssub * Cabin-TLF/medium/sl
+ <-> ssub * Cabin-TLF/regular/sl
}{}
\DeclareFontShape{LGR}{Cabin-TLF}{m}{scsl}{
- <-> ssub * Cabin-TLF/medium/scsl
+ <-> ssub * Cabin-TLF/regular/scsl
}{}
\DeclareFontShape{LGR}{Cabin-TLF}{m}{sc}{
- <-> ssub * Cabin-TLF/medium/sc
+ <-> ssub * Cabin-TLF/regular/sc
}{}
\DeclareFontShape{LGR}{Cabin-TLF}{m}{n}{
- <-> ssub * Cabin-TLF/medium/n
+ <-> ssub * Cabin-TLF/regular/n
}{}
\DeclareFontShape{LGR}{Cabin-TLF}{m}{it}{
- <-> ssub * Cabin-TLF/medium/it
+ <-> ssub * Cabin-TLF/regular/it
}{}
\DeclareFontShape{LGR}{Cabin-TLF}{m}{scit}{
- <-> ssub * Cabin-TLF/medium/scit
+ <-> ssub * Cabin-TLF/regular/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd
index 54f41c26cde..f686c60dbb7 100644
--- a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd
+++ b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
%%
\ProvidesFile{LY1Cabin-Sup.fd}
- [2019/10/12 (autoinst) Font definitions for LY1/Cabin-Sup.]
+ [2019/10/21 (autoinst) Font definitions for LY1/Cabin-Sup.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -135,63 +135,33 @@
% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% slc --> condensed
-
-\DeclareFontShape{LY1}{Cabin-Sup}{slc}{sl}{
- <-> ssub * Cabin-Sup/condensed/sl
-}{}
-
-\DeclareFontShape{LY1}{Cabin-Sup}{slc}{n}{
- <-> ssub * Cabin-Sup/condensed/n
-}{}
-
-\DeclareFontShape{LY1}{Cabin-Sup}{slc}{it}{
- <-> ssub * Cabin-Sup/condensed/it
-}{}
-
-
-% sl --> regular
-
-\DeclareFontShape{LY1}{Cabin-Sup}{sl}{sl}{
- <-> ssub * Cabin-Sup/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{Cabin-Sup}{sl}{n}{
- <-> ssub * Cabin-Sup/regular/n
-}{}
-
-\DeclareFontShape{LY1}{Cabin-Sup}{sl}{it}{
- <-> ssub * Cabin-Sup/regular/it
-}{}
-
-
-% c --> mediumcondensed
+% c --> condensed
\DeclareFontShape{LY1}{Cabin-Sup}{c}{sl}{
- <-> ssub * Cabin-Sup/mediumcondensed/sl
+ <-> ssub * Cabin-Sup/condensed/sl
}{}
\DeclareFontShape{LY1}{Cabin-Sup}{c}{n}{
- <-> ssub * Cabin-Sup/mediumcondensed/n
+ <-> ssub * Cabin-Sup/condensed/n
}{}
\DeclareFontShape{LY1}{Cabin-Sup}{c}{it}{
- <-> ssub * Cabin-Sup/mediumcondensed/it
+ <-> ssub * Cabin-Sup/condensed/it
}{}
-% m --> medium
+% m --> regular
\DeclareFontShape{LY1}{Cabin-Sup}{m}{sl}{
- <-> ssub * Cabin-Sup/medium/sl
+ <-> ssub * Cabin-Sup/regular/sl
}{}
\DeclareFontShape{LY1}{Cabin-Sup}{m}{n}{
- <-> ssub * Cabin-Sup/medium/n
+ <-> ssub * Cabin-Sup/regular/n
}{}
\DeclareFontShape{LY1}{Cabin-Sup}{m}{it}{
- <-> ssub * Cabin-Sup/medium/it
+ <-> ssub * Cabin-Sup/regular/it
}{}
diff --git a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd
index 7972b7842b2..15321079672 100644
--- a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
%%
\ProvidesFile{LY1Cabin-TLF.fd}
- [2019/10/12 (autoinst) Font definitions for LY1/Cabin-TLF.]
+ [2019/10/21 (autoinst) Font definitions for LY1/Cabin-TLF.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -231,111 +231,57 @@
% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% slc --> condensed
-
-\DeclareFontShape{LY1}{Cabin-TLF}{slc}{sl}{
- <-> ssub * Cabin-TLF/condensed/sl
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{slc}{scsl}{
- <-> ssub * Cabin-TLF/condensed/scsl
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{slc}{sc}{
- <-> ssub * Cabin-TLF/condensed/sc
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{slc}{n}{
- <-> ssub * Cabin-TLF/condensed/n
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{slc}{it}{
- <-> ssub * Cabin-TLF/condensed/it
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{slc}{scit}{
- <-> ssub * Cabin-TLF/condensed/scit
-}{}
-
-
-% sl --> regular
-
-\DeclareFontShape{LY1}{Cabin-TLF}{sl}{sl}{
- <-> ssub * Cabin-TLF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{sl}{scsl}{
- <-> ssub * Cabin-TLF/regular/scsl
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{sl}{sc}{
- <-> ssub * Cabin-TLF/regular/sc
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{sl}{n}{
- <-> ssub * Cabin-TLF/regular/n
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{sl}{it}{
- <-> ssub * Cabin-TLF/regular/it
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{sl}{scit}{
- <-> ssub * Cabin-TLF/regular/scit
-}{}
-
-
-% c --> mediumcondensed
+% c --> condensed
\DeclareFontShape{LY1}{Cabin-TLF}{c}{sl}{
- <-> ssub * Cabin-TLF/mediumcondensed/sl
+ <-> ssub * Cabin-TLF/condensed/sl
}{}
\DeclareFontShape{LY1}{Cabin-TLF}{c}{scsl}{
- <-> ssub * Cabin-TLF/mediumcondensed/scsl
+ <-> ssub * Cabin-TLF/condensed/scsl
}{}
\DeclareFontShape{LY1}{Cabin-TLF}{c}{sc}{
- <-> ssub * Cabin-TLF/mediumcondensed/sc
+ <-> ssub * Cabin-TLF/condensed/sc
}{}
\DeclareFontShape{LY1}{Cabin-TLF}{c}{n}{
- <-> ssub * Cabin-TLF/mediumcondensed/n
+ <-> ssub * Cabin-TLF/condensed/n
}{}
\DeclareFontShape{LY1}{Cabin-TLF}{c}{it}{
- <-> ssub * Cabin-TLF/mediumcondensed/it
+ <-> ssub * Cabin-TLF/condensed/it
}{}
\DeclareFontShape{LY1}{Cabin-TLF}{c}{scit}{
- <-> ssub * Cabin-TLF/mediumcondensed/scit
+ <-> ssub * Cabin-TLF/condensed/scit
}{}
-% m --> medium
+% m --> regular
\DeclareFontShape{LY1}{Cabin-TLF}{m}{sl}{
- <-> ssub * Cabin-TLF/medium/sl
+ <-> ssub * Cabin-TLF/regular/sl
}{}
\DeclareFontShape{LY1}{Cabin-TLF}{m}{scsl}{
- <-> ssub * Cabin-TLF/medium/scsl
+ <-> ssub * Cabin-TLF/regular/scsl
}{}
\DeclareFontShape{LY1}{Cabin-TLF}{m}{sc}{
- <-> ssub * Cabin-TLF/medium/sc
+ <-> ssub * Cabin-TLF/regular/sc
}{}
\DeclareFontShape{LY1}{Cabin-TLF}{m}{n}{
- <-> ssub * Cabin-TLF/medium/n
+ <-> ssub * Cabin-TLF/regular/n
}{}
\DeclareFontShape{LY1}{Cabin-TLF}{m}{it}{
- <-> ssub * Cabin-TLF/medium/it
+ <-> ssub * Cabin-TLF/regular/it
}{}
\DeclareFontShape{LY1}{Cabin-TLF}{m}{scit}{
- <-> ssub * Cabin-TLF/medium/scit
+ <-> ssub * Cabin-TLF/regular/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd
index 9891ba0ee6a..eb6f39195ef 100644
--- a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd
+++ b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
%%
\ProvidesFile{OT1Cabin-Sup.fd}
- [2019/10/12 (autoinst) Font definitions for OT1/Cabin-Sup.]
+ [2019/10/21 (autoinst) Font definitions for OT1/Cabin-Sup.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -135,63 +135,33 @@
% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% slc --> condensed
-
-\DeclareFontShape{OT1}{Cabin-Sup}{slc}{sl}{
- <-> ssub * Cabin-Sup/condensed/sl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-Sup}{slc}{n}{
- <-> ssub * Cabin-Sup/condensed/n
-}{}
-
-\DeclareFontShape{OT1}{Cabin-Sup}{slc}{it}{
- <-> ssub * Cabin-Sup/condensed/it
-}{}
-
-
-% sl --> regular
-
-\DeclareFontShape{OT1}{Cabin-Sup}{sl}{sl}{
- <-> ssub * Cabin-Sup/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-Sup}{sl}{n}{
- <-> ssub * Cabin-Sup/regular/n
-}{}
-
-\DeclareFontShape{OT1}{Cabin-Sup}{sl}{it}{
- <-> ssub * Cabin-Sup/regular/it
-}{}
-
-
-% c --> mediumcondensed
+% c --> condensed
\DeclareFontShape{OT1}{Cabin-Sup}{c}{sl}{
- <-> ssub * Cabin-Sup/mediumcondensed/sl
+ <-> ssub * Cabin-Sup/condensed/sl
}{}
\DeclareFontShape{OT1}{Cabin-Sup}{c}{n}{
- <-> ssub * Cabin-Sup/mediumcondensed/n
+ <-> ssub * Cabin-Sup/condensed/n
}{}
\DeclareFontShape{OT1}{Cabin-Sup}{c}{it}{
- <-> ssub * Cabin-Sup/mediumcondensed/it
+ <-> ssub * Cabin-Sup/condensed/it
}{}
-% m --> medium
+% m --> regular
\DeclareFontShape{OT1}{Cabin-Sup}{m}{sl}{
- <-> ssub * Cabin-Sup/medium/sl
+ <-> ssub * Cabin-Sup/regular/sl
}{}
\DeclareFontShape{OT1}{Cabin-Sup}{m}{n}{
- <-> ssub * Cabin-Sup/medium/n
+ <-> ssub * Cabin-Sup/regular/n
}{}
\DeclareFontShape{OT1}{Cabin-Sup}{m}{it}{
- <-> ssub * Cabin-Sup/medium/it
+ <-> ssub * Cabin-Sup/regular/it
}{}
diff --git a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd
index d21164a7762..9dfbb17f9b6 100644
--- a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
%%
\ProvidesFile{OT1Cabin-TLF.fd}
- [2019/10/12 (autoinst) Font definitions for OT1/Cabin-TLF.]
+ [2019/10/21 (autoinst) Font definitions for OT1/Cabin-TLF.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -231,111 +231,57 @@
% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% slc --> condensed
-
-\DeclareFontShape{OT1}{Cabin-TLF}{slc}{sl}{
- <-> ssub * Cabin-TLF/condensed/sl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{slc}{scsl}{
- <-> ssub * Cabin-TLF/condensed/scsl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{slc}{sc}{
- <-> ssub * Cabin-TLF/condensed/sc
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{slc}{n}{
- <-> ssub * Cabin-TLF/condensed/n
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{slc}{it}{
- <-> ssub * Cabin-TLF/condensed/it
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{slc}{scit}{
- <-> ssub * Cabin-TLF/condensed/scit
-}{}
-
-
-% sl --> regular
-
-\DeclareFontShape{OT1}{Cabin-TLF}{sl}{sl}{
- <-> ssub * Cabin-TLF/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{sl}{scsl}{
- <-> ssub * Cabin-TLF/regular/scsl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{sl}{sc}{
- <-> ssub * Cabin-TLF/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{sl}{n}{
- <-> ssub * Cabin-TLF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{sl}{it}{
- <-> ssub * Cabin-TLF/regular/it
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{sl}{scit}{
- <-> ssub * Cabin-TLF/regular/scit
-}{}
-
-
-% c --> mediumcondensed
+% c --> condensed
\DeclareFontShape{OT1}{Cabin-TLF}{c}{sl}{
- <-> ssub * Cabin-TLF/mediumcondensed/sl
+ <-> ssub * Cabin-TLF/condensed/sl
}{}
\DeclareFontShape{OT1}{Cabin-TLF}{c}{scsl}{
- <-> ssub * Cabin-TLF/mediumcondensed/scsl
+ <-> ssub * Cabin-TLF/condensed/scsl
}{}
\DeclareFontShape{OT1}{Cabin-TLF}{c}{sc}{
- <-> ssub * Cabin-TLF/mediumcondensed/sc
+ <-> ssub * Cabin-TLF/condensed/sc
}{}
\DeclareFontShape{OT1}{Cabin-TLF}{c}{n}{
- <-> ssub * Cabin-TLF/mediumcondensed/n
+ <-> ssub * Cabin-TLF/condensed/n
}{}
\DeclareFontShape{OT1}{Cabin-TLF}{c}{it}{
- <-> ssub * Cabin-TLF/mediumcondensed/it
+ <-> ssub * Cabin-TLF/condensed/it
}{}
\DeclareFontShape{OT1}{Cabin-TLF}{c}{scit}{
- <-> ssub * Cabin-TLF/mediumcondensed/scit
+ <-> ssub * Cabin-TLF/condensed/scit
}{}
-% m --> medium
+% m --> regular
\DeclareFontShape{OT1}{Cabin-TLF}{m}{sl}{
- <-> ssub * Cabin-TLF/medium/sl
+ <-> ssub * Cabin-TLF/regular/sl
}{}
\DeclareFontShape{OT1}{Cabin-TLF}{m}{scsl}{
- <-> ssub * Cabin-TLF/medium/scsl
+ <-> ssub * Cabin-TLF/regular/scsl
}{}
\DeclareFontShape{OT1}{Cabin-TLF}{m}{sc}{
- <-> ssub * Cabin-TLF/medium/sc
+ <-> ssub * Cabin-TLF/regular/sc
}{}
\DeclareFontShape{OT1}{Cabin-TLF}{m}{n}{
- <-> ssub * Cabin-TLF/medium/n
+ <-> ssub * Cabin-TLF/regular/n
}{}
\DeclareFontShape{OT1}{Cabin-TLF}{m}{it}{
- <-> ssub * Cabin-TLF/medium/it
+ <-> ssub * Cabin-TLF/regular/it
}{}
\DeclareFontShape{OT1}{Cabin-TLF}{m}{scit}{
- <-> ssub * Cabin-TLF/medium/scit
+ <-> ssub * Cabin-TLF/regular/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd
index 861eca637c7..e36ceec83ae 100644
--- a/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd
+++ b/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
%%
\ProvidesFile{T1Cabin-Sup.fd}
- [2019/10/12 (autoinst) Font definitions for T1/Cabin-Sup.]
+ [2019/10/21 (autoinst) Font definitions for T1/Cabin-Sup.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -135,63 +135,33 @@
% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% slc --> condensed
-
-\DeclareFontShape{T1}{Cabin-Sup}{slc}{sl}{
- <-> ssub * Cabin-Sup/condensed/sl
-}{}
-
-\DeclareFontShape{T1}{Cabin-Sup}{slc}{n}{
- <-> ssub * Cabin-Sup/condensed/n
-}{}
-
-\DeclareFontShape{T1}{Cabin-Sup}{slc}{it}{
- <-> ssub * Cabin-Sup/condensed/it
-}{}
-
-
-% sl --> regular
-
-\DeclareFontShape{T1}{Cabin-Sup}{sl}{sl}{
- <-> ssub * Cabin-Sup/regular/sl
-}{}
-
-\DeclareFontShape{T1}{Cabin-Sup}{sl}{n}{
- <-> ssub * Cabin-Sup/regular/n
-}{}
-
-\DeclareFontShape{T1}{Cabin-Sup}{sl}{it}{
- <-> ssub * Cabin-Sup/regular/it
-}{}
-
-
-% c --> mediumcondensed
+% c --> condensed
\DeclareFontShape{T1}{Cabin-Sup}{c}{sl}{
- <-> ssub * Cabin-Sup/mediumcondensed/sl
+ <-> ssub * Cabin-Sup/condensed/sl
}{}
\DeclareFontShape{T1}{Cabin-Sup}{c}{n}{
- <-> ssub * Cabin-Sup/mediumcondensed/n
+ <-> ssub * Cabin-Sup/condensed/n
}{}
\DeclareFontShape{T1}{Cabin-Sup}{c}{it}{
- <-> ssub * Cabin-Sup/mediumcondensed/it
+ <-> ssub * Cabin-Sup/condensed/it
}{}
-% m --> medium
+% m --> regular
\DeclareFontShape{T1}{Cabin-Sup}{m}{sl}{
- <-> ssub * Cabin-Sup/medium/sl
+ <-> ssub * Cabin-Sup/regular/sl
}{}
\DeclareFontShape{T1}{Cabin-Sup}{m}{n}{
- <-> ssub * Cabin-Sup/medium/n
+ <-> ssub * Cabin-Sup/regular/n
}{}
\DeclareFontShape{T1}{Cabin-Sup}{m}{it}{
- <-> ssub * Cabin-Sup/medium/it
+ <-> ssub * Cabin-Sup/regular/it
}{}
diff --git a/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd
index 42f9cc5c8c1..9a7a30fc0d2 100644
--- a/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
%%
\ProvidesFile{T1Cabin-TLF.fd}
- [2019/10/12 (autoinst) Font definitions for T1/Cabin-TLF.]
+ [2019/10/21 (autoinst) Font definitions for T1/Cabin-TLF.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -231,111 +231,57 @@
% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% slc --> condensed
-
-\DeclareFontShape{T1}{Cabin-TLF}{slc}{sl}{
- <-> ssub * Cabin-TLF/condensed/sl
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{slc}{scsl}{
- <-> ssub * Cabin-TLF/condensed/scsl
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{slc}{sc}{
- <-> ssub * Cabin-TLF/condensed/sc
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{slc}{n}{
- <-> ssub * Cabin-TLF/condensed/n
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{slc}{it}{
- <-> ssub * Cabin-TLF/condensed/it
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{slc}{scit}{
- <-> ssub * Cabin-TLF/condensed/scit
-}{}
-
-
-% sl --> regular
-
-\DeclareFontShape{T1}{Cabin-TLF}{sl}{sl}{
- <-> ssub * Cabin-TLF/regular/sl
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{sl}{scsl}{
- <-> ssub * Cabin-TLF/regular/scsl
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{sl}{sc}{
- <-> ssub * Cabin-TLF/regular/sc
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{sl}{n}{
- <-> ssub * Cabin-TLF/regular/n
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{sl}{it}{
- <-> ssub * Cabin-TLF/regular/it
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{sl}{scit}{
- <-> ssub * Cabin-TLF/regular/scit
-}{}
-
-
-% c --> mediumcondensed
+% c --> condensed
\DeclareFontShape{T1}{Cabin-TLF}{c}{sl}{
- <-> ssub * Cabin-TLF/mediumcondensed/sl
+ <-> ssub * Cabin-TLF/condensed/sl
}{}
\DeclareFontShape{T1}{Cabin-TLF}{c}{scsl}{
- <-> ssub * Cabin-TLF/mediumcondensed/scsl
+ <-> ssub * Cabin-TLF/condensed/scsl
}{}
\DeclareFontShape{T1}{Cabin-TLF}{c}{sc}{
- <-> ssub * Cabin-TLF/mediumcondensed/sc
+ <-> ssub * Cabin-TLF/condensed/sc
}{}
\DeclareFontShape{T1}{Cabin-TLF}{c}{n}{
- <-> ssub * Cabin-TLF/mediumcondensed/n
+ <-> ssub * Cabin-TLF/condensed/n
}{}
\DeclareFontShape{T1}{Cabin-TLF}{c}{it}{
- <-> ssub * Cabin-TLF/mediumcondensed/it
+ <-> ssub * Cabin-TLF/condensed/it
}{}
\DeclareFontShape{T1}{Cabin-TLF}{c}{scit}{
- <-> ssub * Cabin-TLF/mediumcondensed/scit
+ <-> ssub * Cabin-TLF/condensed/scit
}{}
-% m --> medium
+% m --> regular
\DeclareFontShape{T1}{Cabin-TLF}{m}{sl}{
- <-> ssub * Cabin-TLF/medium/sl
+ <-> ssub * Cabin-TLF/regular/sl
}{}
\DeclareFontShape{T1}{Cabin-TLF}{m}{scsl}{
- <-> ssub * Cabin-TLF/medium/scsl
+ <-> ssub * Cabin-TLF/regular/scsl
}{}
\DeclareFontShape{T1}{Cabin-TLF}{m}{sc}{
- <-> ssub * Cabin-TLF/medium/sc
+ <-> ssub * Cabin-TLF/regular/sc
}{}
\DeclareFontShape{T1}{Cabin-TLF}{m}{n}{
- <-> ssub * Cabin-TLF/medium/n
+ <-> ssub * Cabin-TLF/regular/n
}{}
\DeclareFontShape{T1}{Cabin-TLF}{m}{it}{
- <-> ssub * Cabin-TLF/medium/it
+ <-> ssub * Cabin-TLF/regular/it
}{}
\DeclareFontShape{T1}{Cabin-TLF}{m}{scit}{
- <-> ssub * Cabin-TLF/medium/scit
+ <-> ssub * Cabin-TLF/regular/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd
index 527323bc930..62f4c2e7a0e 100644
--- a/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
%%
\ProvidesFile{TS1Cabin-TLF.fd}
- [2019/10/12 (autoinst) Font definitions for TS1/Cabin-TLF.]
+ [2019/10/21 (autoinst) Font definitions for TS1/Cabin-TLF.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -135,63 +135,33 @@
% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% slc --> condensed
-
-\DeclareFontShape{TS1}{Cabin-TLF}{slc}{sl}{
- <-> ssub * Cabin-TLF/condensed/sl
-}{}
-
-\DeclareFontShape{TS1}{Cabin-TLF}{slc}{n}{
- <-> ssub * Cabin-TLF/condensed/n
-}{}
-
-\DeclareFontShape{TS1}{Cabin-TLF}{slc}{it}{
- <-> ssub * Cabin-TLF/condensed/it
-}{}
-
-
-% sl --> regular
-
-\DeclareFontShape{TS1}{Cabin-TLF}{sl}{sl}{
- <-> ssub * Cabin-TLF/regular/sl
-}{}
-
-\DeclareFontShape{TS1}{Cabin-TLF}{sl}{n}{
- <-> ssub * Cabin-TLF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{Cabin-TLF}{sl}{it}{
- <-> ssub * Cabin-TLF/regular/it
-}{}
-
-
-% c --> mediumcondensed
+% c --> condensed
\DeclareFontShape{TS1}{Cabin-TLF}{c}{sl}{
- <-> ssub * Cabin-TLF/mediumcondensed/sl
+ <-> ssub * Cabin-TLF/condensed/sl
}{}
\DeclareFontShape{TS1}{Cabin-TLF}{c}{n}{
- <-> ssub * Cabin-TLF/mediumcondensed/n
+ <-> ssub * Cabin-TLF/condensed/n
}{}
\DeclareFontShape{TS1}{Cabin-TLF}{c}{it}{
- <-> ssub * Cabin-TLF/mediumcondensed/it
+ <-> ssub * Cabin-TLF/condensed/it
}{}
-% m --> medium
+% m --> regular
\DeclareFontShape{TS1}{Cabin-TLF}{m}{sl}{
- <-> ssub * Cabin-TLF/medium/sl
+ <-> ssub * Cabin-TLF/regular/sl
}{}
\DeclareFontShape{TS1}{Cabin-TLF}{m}{n}{
- <-> ssub * Cabin-TLF/medium/n
+ <-> ssub * Cabin-TLF/regular/n
}{}
\DeclareFontShape{TS1}{Cabin-TLF}{m}{it}{
- <-> ssub * Cabin-TLF/medium/it
+ <-> ssub * Cabin-TLF/regular/it
}{}
diff --git a/Master/texmf-dist/tex/latex/cabin/cabin.sty b/Master/texmf-dist/tex/latex/cabin/cabin.sty
index afff4ba3340..af101920617 100644
--- a/Master/texmf-dist/tex/latex/cabin/cabin.sty
+++ b/Master/texmf-dist/tex/latex/cabin/cabin.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{cabin}
- [2019/10/18 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.]
+ [2019/10/21 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
@@ -47,14 +47,14 @@
\ifcabin@condensed
\def\bfseries@sf{bc}
\ifcabin@semibold\def\bfseries@sf{sbc}\fi
- \def\mdseries@sf{slc}
- \ifcabin@medium\def\mdseries@sf{c}\fi
+ \def\mdseries@sf{c}
+ \ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi
\def\seriesdefault{\mdseries@sf}
\else
\def\bfseries@sf{b}
\ifcabin@semibold\def\bfseries@sf{sb}\fi
- \def\mdseries@sf{sl}
- \ifcabin@medium\def\mdseries@sf{m}\fi
+ \def\mdseries@sf{m}
+ \ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi
\fi
\fi
@@ -107,8 +107,8 @@
\newcommand*\cabincondensed{%
\def\bfseries@sf{bc}
\ifcabin@semibold\def\bfseries@sf{sbc}\fi
- \def\mdseries@sf{slc}
- \ifcabin@medium\def\mdseries@sf{c}\fi
+ \def\mdseries@sf{c}
+ \ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi
\mdseries
}
\def\sfdefault{\cabinfamily}