From ec1de3b8427180add25ac29a696c0ed3f08b4f52 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 12 Oct 2019 21:50:04 +0000 Subject: cabin (12oct19) git-svn-id: svn://tug.org/texlive/trunk@52350 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/cabin/README | 2 +- .../texmf-dist/doc/fonts/cabin/cabin-samples.pdf | Bin 0 -> 88572 bytes .../texmf-dist/doc/fonts/cabin/cabin-samples.tex | 77 ++++ .../fonts/enc/dvips/cabin/cbn_2wmmq3.enc | 19 +- .../fonts/enc/dvips/cabin/cbn_5nrtpu.enc | 65 +++ .../fonts/enc/dvips/cabin/cbn_5xld5w.enc | 19 +- .../fonts/enc/dvips/cabin/cbn_fp7bit.enc | 19 +- .../fonts/enc/dvips/cabin/cbn_hau3x5.enc | 19 +- .../fonts/enc/dvips/cabin/cbn_i3ioen.enc | 17 +- .../fonts/enc/dvips/cabin/cbn_jjp77t.enc | 19 +- .../fonts/enc/dvips/cabin/cbn_meva6t.enc | 19 +- .../fonts/enc/dvips/cabin/cbn_mvtsrz.enc | 18 +- .../fonts/enc/dvips/cabin/cbn_taosrr.enc | 64 --- .../fonts/enc/dvips/cabin/cbn_tz56ju.enc | 65 +++ .../fonts/enc/dvips/cabin/cbn_vqopxp.enc | 19 +- .../fonts/enc/dvips/cabin/cbn_vqpkf5.enc | 19 +- .../fonts/enc/dvips/cabin/cbn_yhiurv.enc | 19 +- .../fonts/enc/dvips/cabin/cbn_yhzmyq.enc | 64 --- Master/texmf-dist/fonts/map/dvips/cabin/cabin.map | 82 +++- .../impallari/cabin/Cabin-Bold-tlf-ts1--base.tfm | Bin 1416 -> 1468 bytes .../tfm/impallari/cabin/Cabin-Bold-tlf-ts1.tfm | Bin 1432 -> 1480 bytes .../cabin/Cabin-BoldItalic-tlf-ts1--base.tfm | Bin 1452 -> 1512 bytes .../impallari/cabin/Cabin-BoldItalic-tlf-ts1.tfm | Bin 1468 -> 1524 bytes .../impallari/cabin/Cabin-Italic-tlf-ts1--base.tfm | Bin 1464 -> 1516 bytes .../tfm/impallari/cabin/Cabin-Italic-tlf-ts1.tfm | Bin 1460 -> 1512 bytes .../impallari/cabin/Cabin-Medium-tlf-ts1--base.tfm | Bin 1428 -> 1480 bytes .../tfm/impallari/cabin/Cabin-Medium-tlf-ts1.tfm | Bin 1440 -> 1488 bytes .../cabin/Cabin-MediumItalic-tlf-ts1--base.tfm | Bin 1460 -> 1516 bytes .../impallari/cabin/Cabin-MediumItalic-tlf-ts1.tfm | Bin 1468 -> 1520 bytes .../cabin/Cabin-Regular-tlf-ts1--base.tfm | Bin 1416 -> 1464 bytes .../tfm/impallari/cabin/Cabin-Regular-tlf-ts1.tfm | Bin 1428 -> 1476 bytes .../cabin/Cabin-SemiBold-tlf-ts1--base.tfm | Bin 1412 -> 1464 bytes .../tfm/impallari/cabin/Cabin-SemiBold-tlf-ts1.tfm | Bin 1432 -> 1484 bytes .../cabin/Cabin-SemiBoldItalic-tlf-ts1--base.tfm | Bin 1452 -> 1512 bytes .../cabin/Cabin-SemiBoldItalic-tlf-ts1.tfm | Bin 1460 -> 1520 bytes .../cabin/CabinCondensed-Bold-tlf-ts1--base.tfm | Bin 1412 -> 1460 bytes .../cabin/CabinCondensed-Bold-tlf-ts1.tfm | Bin 1428 -> 1476 bytes .../CabinCondensed-BoldItalic-tlf-ts1--base.tfm | Bin 1584 -> 1644 bytes .../cabin/CabinCondensed-BoldItalic-tlf-ts1.tfm | Bin 1592 -> 1652 bytes .../cabin/CabinCondensed-Italic-tlf-ts1--base.tfm | Bin 1600 -> 1652 bytes .../cabin/CabinCondensed-Italic-tlf-ts1.tfm | Bin 1600 -> 1652 bytes .../cabin/CabinCondensed-Medium-tlf-ts1--base.tfm | Bin 1420 -> 1472 bytes .../cabin/CabinCondensed-Medium-tlf-ts1.tfm | Bin 1432 -> 1480 bytes .../CabinCondensed-MediumItalic-tlf-ts1--base.tfm | Bin 1604 -> 1668 bytes .../cabin/CabinCondensed-MediumItalic-tlf-ts1.tfm | Bin 1608 -> 1668 bytes .../cabin/CabinCondensed-Regular-tlf-ts1--base.tfm | Bin 1420 -> 1464 bytes .../cabin/CabinCondensed-Regular-tlf-ts1.tfm | Bin 1428 -> 1472 bytes .../CabinCondensed-SemiBold-tlf-ts1--base.tfm | Bin 1416 -> 1468 bytes .../cabin/CabinCondensed-SemiBold-tlf-ts1.tfm | Bin 1424 -> 1476 bytes ...CabinCondensed-SemiBoldItalic-tlf-ts1--base.tfm | Bin 1596 -> 1660 bytes .../CabinCondensed-SemiBoldItalic-tlf-ts1.tfm | Bin 1596 -> 1660 bytes .../fonts/vf/impallari/cabin/Cabin-Bold-tlf-ts1.vf | Bin 540 -> 560 bytes .../vf/impallari/cabin/Cabin-BoldItalic-tlf-ts1.vf | Bin 544 -> 568 bytes .../vf/impallari/cabin/Cabin-Italic-tlf-ts1.vf | Bin 540 -> 564 bytes .../vf/impallari/cabin/Cabin-Medium-tlf-ts1.vf | Bin 540 -> 564 bytes .../impallari/cabin/Cabin-MediumItalic-tlf-ts1.vf | Bin 548 -> 568 bytes .../vf/impallari/cabin/Cabin-Regular-tlf-ts1.vf | Bin 544 -> 564 bytes .../vf/impallari/cabin/Cabin-SemiBold-tlf-ts1.vf | Bin 544 -> 564 bytes .../cabin/Cabin-SemiBoldItalic-tlf-ts1.vf | Bin 548 -> 572 bytes .../impallari/cabin/CabinCondensed-Bold-tlf-ts1.vf | Bin 548 -> 568 bytes .../cabin/CabinCondensed-BoldItalic-tlf-ts1.vf | Bin 556 -> 576 bytes .../cabin/CabinCondensed-Italic-tlf-ts1.vf | Bin 552 -> 572 bytes .../cabin/CabinCondensed-Medium-tlf-ts1.vf | Bin 552 -> 572 bytes .../cabin/CabinCondensed-MediumItalic-tlf-ts1.vf | Bin 556 -> 576 bytes .../cabin/CabinCondensed-Regular-tlf-ts1.vf | Bin 552 -> 572 bytes .../cabin/CabinCondensed-SemiBold-tlf-ts1.vf | Bin 552 -> 572 bytes .../cabin/CabinCondensed-SemiBoldItalic-tlf-ts1.vf | Bin 560 -> 580 bytes Master/texmf-dist/tex/latex/cabin/LGRCabin-Sup.fd | 269 ++++++++++++ Master/texmf-dist/tex/latex/cabin/LGRCabin-TLF.fd | 473 +++++++++++++++++++++ Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd | 50 ++- Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd | 86 +++- Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd | 50 ++- Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd | 86 +++- Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd | 50 ++- Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd | 86 +++- Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd | 50 ++- Master/texmf-dist/tex/latex/cabin/cabin.sty | 26 +- 77 files changed, 1506 insertions(+), 345 deletions(-) create mode 100644 Master/texmf-dist/doc/fonts/cabin/cabin-samples.pdf create mode 100644 Master/texmf-dist/doc/fonts/cabin/cabin-samples.tex create mode 100644 Master/texmf-dist/fonts/enc/dvips/cabin/cbn_5nrtpu.enc delete mode 100644 Master/texmf-dist/fonts/enc/dvips/cabin/cbn_taosrr.enc create mode 100644 Master/texmf-dist/fonts/enc/dvips/cabin/cbn_tz56ju.enc delete mode 100644 Master/texmf-dist/fonts/enc/dvips/cabin/cbn_yhzmyq.enc create mode 100644 Master/texmf-dist/tex/latex/cabin/LGRCabin-Sup.fd create mode 100644 Master/texmf-dist/tex/latex/cabin/LGRCabin-TLF.fd diff --git a/Master/texmf-dist/doc/fonts/cabin/README b/Master/texmf-dist/doc/fonts/cabin/README index 2f5a9a74eb9..8e49d3d3ea7 100644 --- a/Master/texmf-dist/doc/fonts/cabin/README +++ b/Master/texmf-dist/doc/fonts/cabin/README @@ -1,4 +1,4 @@ -This is the README for the cabin package, version 2019-04-24. +This is the README for the cabin package, version 2019-10-12. This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for the Cabin and Cabin Condensed families of sans serif fonts, designed by diff --git a/Master/texmf-dist/doc/fonts/cabin/cabin-samples.pdf b/Master/texmf-dist/doc/fonts/cabin/cabin-samples.pdf new file mode 100644 index 00000000000..4d02a4bdfe9 Binary files /dev/null and b/Master/texmf-dist/doc/fonts/cabin/cabin-samples.pdf differ diff --git a/Master/texmf-dist/doc/fonts/cabin/cabin-samples.tex b/Master/texmf-dist/doc/fonts/cabin/cabin-samples.tex new file mode 100644 index 00000000000..cb5dcd22f51 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/cabin/cabin-samples.tex @@ -0,0 +1,77 @@ +\documentclass{article} +\usepackage[LGR,T1]{fontenc} +\usepackage[sfdefault]{cabin} +\usepackage{textcomp} +\usepackage{lipsum} +\begin{document} + +\section*{Cabin} +\subsection*{Regular} +\lipsum[1] + +\subsection*{Italic} +\textit{\lipsum[2]} + +\subsection*{Bold} + +\textbf{\lipsum[3]} + + + +\subsection*{Bold Italic} + +\textbf{\textit{\lipsum[4]}} + + + +\subsection*{Small Caps Regular} +\textsc{\lipsum[5]} + + +\subsection*{Small Caps Italic} +\textsc{\textit{\lipsum[6]}} + +\subsection*{Small Caps Bold} +\textsc{\textbf{\lipsum[7]}} + +\subsection*{Small Caps Bold Italic} + +\textsc{\textbf{\textit{\lipsum[8]}}} + + +\section*{Cabin Condensed} +\cabincondensed + +\subsection*{Regular} +\lipsum[1] + +\subsection*{Italic} +\textit{\lipsum[2]} + +\subsection*{Bold} + +\textbf{\lipsum[3]} + + + +\subsection*{Bold Italic} + +\textbf{\textit{\lipsum[4]}} + + + +\subsection*{Small Caps Regular} +\textsc{\lipsum[5]} + + +\subsection*{Small Caps Italic} +\textsc{\textit{\lipsum[6]}} + +\subsection*{Small Caps Bold} +\textsc{\textbf{\lipsum[7]}} + +\subsection*{Small Caps Bold Italic} + +\textsc{\textbf{\textit{\lipsum[8]}}} + +\end{document} diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_2wmmq3.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_2wmmq3.enc index 0d1d0f42c94..01886e8286c 100644 --- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_2wmmq3.enc +++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_2wmmq3.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_2wmmq3oozpiud56xhllpapxp5a -% Encoding created by otftotfm on Wed Apr 24 09:08:03 2019 +% Encoding created by otftotfm on Sat Oct 12 09:02:25 2019 % Command line follows encoding /AutoEnc_2wmmq3oozpiud56xhllpapxp5a [ %00 @@ -54,11 +54,12 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=texmf.new/fonts/tfm/impallari/cabin -% --vf-directory=texmf.new/fonts/vf/impallari/cabin -% --type1-directory=texmf.new/fonts/type1/impallari/cabin -% --truetype-directory=texmf.new/fonts/truetype/impallari/cabin -% --encoding-directory=texmf.new/fonts/enc/dvips/cabin -% --map-file=texmf.new/fonts/map/dvips/cabin/Cabin.map --no-updmap -% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern -% Cabin-BoldItalic.otf Cabin-BoldItalic-tlf-lgr' +% --tfm-directory=texmf/fonts/tfm/impallari/cabin +% --vf-directory=texmf/fonts/vf/impallari/cabin +% --type1-directory=texmf/fonts/type1/impallari/cabin +% --truetype-directory=texmf/fonts/truetype/impallari/cabin +% --encoding-directory=texmf/fonts/enc/dvips/cabin +% --map-file=texmf/fonts/map/dvips/cabin/Cabin.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --ligkern=f i =: +% fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi +% --ligkern=ff l =: ffl Cabin-BoldItalic.otf Cabin-BoldItalic-tlf-lgr' diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_5nrtpu.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_5nrtpu.enc new file mode 100644 index 00000000000..0b55ba903df --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_5nrtpu.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_5nrtpusnbrswxsqggsx5t7embc +% Encoding created by otftotfm on Sat Oct 12 09:02:25 2019 +% Command line follows encoding +/AutoEnc_5nrtpusnbrswxsqggsx5t7embc [ +%00 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /C /asterisk +%10 + /exclam /exclamdown /quotedblbase /question /questiondown /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /endash /.notdef +%20 + /.notdef /bar /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle + /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction +%30 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef +%40 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%50 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni2126 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%60 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%70 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%80 + /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand + /bullet /.notdef /.notdef /.notdef /florin /colonmonetary /uni20A9 /.notdef +%90 + /.notdef /.notdef /lira /.notdef /.notdef /.notdef /dong /trademark + /.notdef /.notdef /.notdef /uni2116 /.notdef /estimated /.notdef /.notdef +%A0 + /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section + /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef +%B0 + /degree /plusminus /uni00B2 /uni00B3 /.notdef /uni00B5 /paragraph /periodcentered + /.notdef /uni00B9 /ordmasculine /radical /onequarter /onehalf /threequarters /Euro +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef + /.notdef /.notdef /.notdef /.notdef /l /.notdef /i /f +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts1 +% --tfm-directory=texmf/fonts/tfm/impallari/cabin +% --vf-directory=texmf/fonts/vf/impallari/cabin +% --type1-directory=texmf/fonts/type1/impallari/cabin +% --truetype-directory=texmf/fonts/truetype/impallari/cabin +% --encoding-directory=texmf/fonts/enc/dvips/cabin +% --map-file=texmf/fonts/map/dvips/cabin/Cabin.map --no-updmap +% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl Cabin-BoldItalic.otf Cabin-BoldItalic-tlf-ts1' diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_5xld5w.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_5xld5w.enc index dab40acf081..94dec22fcc3 100644 --- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_5xld5w.enc +++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_5xld5w.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c -% Encoding created by otftotfm on Wed Apr 24 09:08:04 2019 +% Encoding created by otftotfm on Sat Oct 12 09:02:26 2019 % Command line follows encoding /AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c [ %00 @@ -54,11 +54,12 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf.new/fonts/tfm/impallari/cabin -% --vf-directory=texmf.new/fonts/vf/impallari/cabin -% --type1-directory=texmf.new/fonts/type1/impallari/cabin -% --truetype-directory=texmf.new/fonts/truetype/impallari/cabin -% --encoding-directory=texmf.new/fonts/enc/dvips/cabin -% --map-file=texmf.new/fonts/map/dvips/cabin/Cabin.map --no-updmap -% --coding-scheme=TEX TEXT --feature=kern --feature=sups --ligkern=* {KL} * -% Cabin-BoldItalic.otf Cabin-BoldItalic-sup-ot1' +% --tfm-directory=texmf/fonts/tfm/impallari/cabin +% --vf-directory=texmf/fonts/vf/impallari/cabin +% --type1-directory=texmf/fonts/type1/impallari/cabin +% --truetype-directory=texmf/fonts/truetype/impallari/cabin +% --encoding-directory=texmf/fonts/enc/dvips/cabin +% --map-file=texmf/fonts/map/dvips/cabin/Cabin.map --no-updmap +% --coding-scheme=TEX TEXT --feature=kern --feature=sups --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl --ligkern=* {KL} * Cabin-BoldItalic.otf Cabin-BoldItalic-sup-ot1' diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_fp7bit.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_fp7bit.enc index 01a1ab001d1..8a2b2e28e2a 100644 --- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_fp7bit.enc +++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_fp7bit.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_fp7bitgpoju4haj2k5cvcskgig -% Encoding created by otftotfm on Wed Apr 24 09:08:03 2019 +% Encoding created by otftotfm on Sat Oct 12 09:02:25 2019 % Command line follows encoding /AutoEnc_fp7bitgpoju4haj2k5cvcskgig [ %00 @@ -54,11 +54,12 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis ] def % Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=texmf.new/fonts/tfm/impallari/cabin -% --vf-directory=texmf.new/fonts/vf/impallari/cabin -% --type1-directory=texmf.new/fonts/type1/impallari/cabin -% --truetype-directory=texmf.new/fonts/truetype/impallari/cabin -% --encoding-directory=texmf.new/fonts/enc/dvips/cabin -% --map-file=texmf.new/fonts/map/dvips/cabin/Cabin.map --no-updmap -% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% Cabin-BoldItalic.otf Cabin-BoldItalic-tlf-ly1' +% --tfm-directory=texmf/fonts/tfm/impallari/cabin +% --vf-directory=texmf/fonts/vf/impallari/cabin +% --type1-directory=texmf/fonts/type1/impallari/cabin +% --truetype-directory=texmf/fonts/truetype/impallari/cabin +% --encoding-directory=texmf/fonts/enc/dvips/cabin +% --map-file=texmf/fonts/map/dvips/cabin/Cabin.map --no-updmap +% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern --ligkern=f +% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi +% --ligkern=ff l =: ffl Cabin-BoldItalic.otf Cabin-BoldItalic-tlf-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_hau3x5.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_hau3x5.enc index 7a033abbfbc..624bdf20a21 100644 --- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_hau3x5.enc +++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_hau3x5.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_hau3x57gtxdzdvbsbvzpyrbxxf -% Encoding created by otftotfm on Wed Apr 24 09:08:04 2019 +% Encoding created by otftotfm on Sat Oct 12 09:02:26 2019 % Command line follows encoding /AutoEnc_hau3x57gtxdzdvbsbvzpyrbxxf [ %00 @@ -54,12 +54,13 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis ] def % Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=texmf.new/fonts/tfm/impallari/cabin -% --vf-directory=texmf.new/fonts/vf/impallari/cabin -% --type1-directory=texmf.new/fonts/type1/impallari/cabin -% --truetype-directory=texmf.new/fonts/truetype/impallari/cabin -% --encoding-directory=texmf.new/fonts/enc/dvips/cabin -% --map-file=texmf.new/fonts/map/dvips/cabin/Cabin.map --no-updmap +% --tfm-directory=texmf/fonts/tfm/impallari/cabin +% --vf-directory=texmf/fonts/vf/impallari/cabin +% --type1-directory=texmf/fonts/type1/impallari/cabin +% --truetype-directory=texmf/fonts/truetype/impallari/cabin +% --encoding-directory=texmf/fonts/enc/dvips/cabin +% --map-file=texmf/fonts/map/dvips/cabin/Cabin.map --no-updmap % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=sups --ligkern=* {KL} * Cabin-BoldItalic.otf -% Cabin-BoldItalic-sup-ly1' +% --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * +% Cabin-BoldItalic.otf Cabin-BoldItalic-sup-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_i3ioen.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_i3ioen.enc index 2a7a7beca8f..14a349bc1d7 100644 --- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_i3ioen.enc +++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_i3ioen.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_i3ioen3bplo55fam3kxhynteph -% Encoding created by otftotfm on Wed Apr 24 09:08:03 2019 +% Encoding created by otftotfm on Sat Oct 12 09:02:24 2019 % Command line follows encoding /AutoEnc_i3ioen3bplo55fam3kxhynteph [ %00 @@ -54,11 +54,12 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls ] def % Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=texmf.new/fonts/tfm/impallari/cabin -% --vf-directory=texmf.new/fonts/vf/impallari/cabin -% --type1-directory=texmf.new/fonts/type1/impallari/cabin -% --truetype-directory=texmf.new/fonts/truetype/impallari/cabin -% --encoding-directory=texmf.new/fonts/enc/dvips/cabin -% --map-file=texmf.new/fonts/map/dvips/cabin/Cabin.map --no-updmap +% --tfm-directory=texmf/fonts/tfm/impallari/cabin +% --vf-directory=texmf/fonts/vf/impallari/cabin +% --type1-directory=texmf/fonts/type1/impallari/cabin +% --truetype-directory=texmf/fonts/truetype/impallari/cabin +% --encoding-directory=texmf/fonts/enc/dvips/cabin +% --map-file=texmf/fonts/map/dvips/cabin/Cabin.map --no-updmap % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern -% Cabin-BoldItalic.otf Cabin-BoldItalic-tlf-t1' +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl Cabin-BoldItalic.otf Cabin-BoldItalic-tlf-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_jjp77t.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_jjp77t.enc index 25f6a22aa9a..5339539c2a8 100644 --- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_jjp77t.enc +++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_jjp77t.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_jjp77tzr5q3rdiuqcjzmprtsvb -% Encoding created by otftotfm on Wed Apr 24 09:08:03 2019 +% Encoding created by otftotfm on Sat Oct 12 09:02:24 2019 % Command line follows encoding /AutoEnc_jjp77tzr5q3rdiuqcjzmprtsvb [ %00 @@ -54,11 +54,12 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf.new/fonts/tfm/impallari/cabin -% --vf-directory=texmf.new/fonts/vf/impallari/cabin -% --type1-directory=texmf.new/fonts/type1/impallari/cabin -% --truetype-directory=texmf.new/fonts/truetype/impallari/cabin -% --encoding-directory=texmf.new/fonts/enc/dvips/cabin -% --map-file=texmf.new/fonts/map/dvips/cabin/Cabin.map --no-updmap -% --coding-scheme=TEX TEXT --feature=kern Cabin-BoldItalic.otf -% Cabin-BoldItalic-tlf-ot1' +% --tfm-directory=texmf/fonts/tfm/impallari/cabin +% --vf-directory=texmf/fonts/vf/impallari/cabin +% --type1-directory=texmf/fonts/type1/impallari/cabin +% --truetype-directory=texmf/fonts/truetype/impallari/cabin +% --encoding-directory=texmf/fonts/enc/dvips/cabin +% --map-file=texmf/fonts/map/dvips/cabin/Cabin.map --no-updmap +% --coding-scheme=TEX TEXT --feature=kern --ligkern=f i =: fi --ligkern=f l +% =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% Cabin-BoldItalic.otf Cabin-BoldItalic-tlf-ot1' diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_meva6t.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_meva6t.enc index 2341e82fcc2..43de4effb75 100644 --- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_meva6t.enc +++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_meva6t.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_meva6tz2wd5yaptncgu6ryho4g -% Encoding created by otftotfm on Wed Apr 24 09:08:04 2019 +% Encoding created by otftotfm on Sat Oct 12 09:02:25 2019 % Command line follows encoding /AutoEnc_meva6tz2wd5yaptncgu6ryho4g [ %00 @@ -54,12 +54,13 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=texmf.new/fonts/tfm/impallari/cabin -% --vf-directory=texmf.new/fonts/vf/impallari/cabin -% --type1-directory=texmf.new/fonts/type1/impallari/cabin -% --truetype-directory=texmf.new/fonts/truetype/impallari/cabin -% --encoding-directory=texmf.new/fonts/enc/dvips/cabin -% --map-file=texmf.new/fonts/map/dvips/cabin/Cabin.map --no-updmap +% --tfm-directory=texmf/fonts/tfm/impallari/cabin +% --vf-directory=texmf/fonts/vf/impallari/cabin +% --type1-directory=texmf/fonts/type1/impallari/cabin +% --truetype-directory=texmf/fonts/truetype/impallari/cabin +% --encoding-directory=texmf/fonts/enc/dvips/cabin +% --map-file=texmf/fonts/map/dvips/cabin/Cabin.map --no-updmap % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern -% --feature=smcp --unicoding=germandbls =: SSsmall Cabin-BoldItalic.otf -% Cabin-BoldItalic-tlf-sc-t1' +% --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: +% SSsmall Cabin-BoldItalic.otf Cabin-BoldItalic-tlf-sc-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_mvtsrz.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_mvtsrz.enc index 77739286af2..ecdb7c9fd21 100644 --- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_mvtsrz.enc +++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_mvtsrz.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_mvtsrziu3qc7ulibw3r5ab5jcc -% Encoding created by otftotfm on Wed Apr 24 09:08:04 2019 +% Encoding created by otftotfm on Sat Oct 12 09:02:26 2019 % Command line follows encoding /AutoEnc_mvtsrziu3qc7ulibw3r5ab5jcc [ %00 @@ -54,11 +54,13 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=texmf.new/fonts/tfm/impallari/cabin -% --vf-directory=texmf.new/fonts/vf/impallari/cabin -% --type1-directory=texmf.new/fonts/type1/impallari/cabin -% --truetype-directory=texmf.new/fonts/truetype/impallari/cabin -% --encoding-directory=texmf.new/fonts/enc/dvips/cabin -% --map-file=texmf.new/fonts/map/dvips/cabin/Cabin.map --no-updmap +% --tfm-directory=texmf/fonts/tfm/impallari/cabin +% --vf-directory=texmf/fonts/vf/impallari/cabin +% --type1-directory=texmf/fonts/type1/impallari/cabin +% --truetype-directory=texmf/fonts/truetype/impallari/cabin +% --encoding-directory=texmf/fonts/enc/dvips/cabin +% --map-file=texmf/fonts/map/dvips/cabin/Cabin.map --no-updmap % --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=sups -% --ligkern=* {KL} * Cabin-BoldItalic.otf Cabin-BoldItalic-sup-lgr' +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * Cabin-BoldItalic.otf +% Cabin-BoldItalic-sup-lgr' diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_taosrr.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_taosrr.enc deleted file mode 100644 index 32ee0c72a48..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_taosrr.enc +++ /dev/null @@ -1,64 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_taosrrygdoo3kyb3irmctifjkf -% Encoding created by otftotfm on Wed Apr 24 09:08:07 2019 -% Command line follows encoding -/AutoEnc_taosrrygdoo3kyb3irmctifjkf [ -%00 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk -%10 - /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef -%20 - /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle - /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction -%30 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef -%40 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%50 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni2126 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%60 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%70 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%80 - /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand - /bullet /.notdef /.notdef /.notdef /florin /colonmonetary /uni20A9 /.notdef -%90 - /.notdef /.notdef /lira /.notdef /.notdef /.notdef /dong /trademark - /.notdef /.notdef /.notdef /uni2116 /.notdef /estimated /.notdef /.notdef -%A0 - /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section - /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef -%B0 - /degree /plusminus /uni00B2 /uni00B3 /.notdef /uni00B5 /paragraph /periodcentered - /.notdef /uni00B9 /ordmasculine /radical /onequarter /onehalf /threequarters /Euro -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=texmf.new/fonts/tfm/impallari/cabin -% --vf-directory=texmf.new/fonts/vf/impallari/cabin -% --type1-directory=texmf.new/fonts/type1/impallari/cabin -% --truetype-directory=texmf.new/fonts/truetype/impallari/cabin -% --encoding-directory=texmf.new/fonts/enc/dvips/cabin -% --map-file=texmf.new/fonts/map/dvips/cabin/Cabin.map --no-updmap -% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 -% CabinCondensed-BoldItalic.otf CabinCondensed-BoldItalic-tlf-ts1' diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_tz56ju.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_tz56ju.enc new file mode 100644 index 00000000000..39c35bb59e5 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_tz56ju.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_tz56jup5dthir6jy6y5ouoowsh +% Encoding created by otftotfm on Sat Oct 12 09:02:29 2019 +% Command line follows encoding +/AutoEnc_tz56jup5dthir6jy6y5ouoowsh [ +%00 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk +%10 + /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef +%20 + /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle + /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction +%30 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef +%40 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%50 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni2126 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%60 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%70 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%80 + /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand + /bullet /.notdef /.notdef /.notdef /florin /colonmonetary /uni20A9 /.notdef +%90 + /.notdef /.notdef /lira /.notdef /.notdef /.notdef /dong /trademark + /.notdef /.notdef /.notdef /uni2116 /.notdef /estimated /.notdef /.notdef +%A0 + /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section + /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef +%B0 + /degree /plusminus /uni00B2 /uni00B3 /.notdef /uni00B5 /paragraph /periodcentered + /.notdef /uni00B9 /ordmasculine /radical /onequarter /onehalf /threequarters /Euro +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef + /.notdef /.notdef /.notdef /.notdef /l /.notdef /i /f +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts1 +% --tfm-directory=texmf/fonts/tfm/impallari/cabin +% --vf-directory=texmf/fonts/vf/impallari/cabin +% --type1-directory=texmf/fonts/type1/impallari/cabin +% --truetype-directory=texmf/fonts/truetype/impallari/cabin +% --encoding-directory=texmf/fonts/enc/dvips/cabin +% --map-file=texmf/fonts/map/dvips/cabin/Cabin.map --no-updmap +% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl CabinCondensed-BoldItalic.otf CabinCondensed-BoldItalic-tlf-ts1' diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_vqopxp.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_vqopxp.enc index dcf370f6d72..5f72a592b14 100644 --- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_vqopxp.enc +++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_vqopxp.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_vqopxpb44g7w7kf5cxambeuooe -% Encoding created by otftotfm on Wed Apr 24 09:08:03 2019 +% Encoding created by otftotfm on Sat Oct 12 09:02:25 2019 % Command line follows encoding /AutoEnc_vqopxpb44g7w7kf5cxambeuooe [ %00 @@ -54,12 +54,13 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=texmf.new/fonts/tfm/impallari/cabin -% --vf-directory=texmf.new/fonts/vf/impallari/cabin -% --type1-directory=texmf.new/fonts/type1/impallari/cabin -% --truetype-directory=texmf.new/fonts/truetype/impallari/cabin -% --encoding-directory=texmf.new/fonts/enc/dvips/cabin -% --map-file=texmf.new/fonts/map/dvips/cabin/Cabin.map --no-updmap -% --coding-scheme=TEX TEXT --feature=kern --feature=smcp -% --unicoding=germandbls =: SSsmall Cabin-BoldItalic.otf +% --tfm-directory=texmf/fonts/tfm/impallari/cabin +% --vf-directory=texmf/fonts/vf/impallari/cabin +% --type1-directory=texmf/fonts/type1/impallari/cabin +% --truetype-directory=texmf/fonts/truetype/impallari/cabin +% --encoding-directory=texmf/fonts/enc/dvips/cabin +% --map-file=texmf/fonts/map/dvips/cabin/Cabin.map --no-updmap +% --coding-scheme=TEX TEXT --feature=kern --feature=smcp --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl --unicoding=germandbls =: SSsmall Cabin-BoldItalic.otf % Cabin-BoldItalic-tlf-sc-ot1' diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_vqpkf5.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_vqpkf5.enc index 6d1cb20b929..cc266e6015b 100644 --- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_vqpkf5.enc +++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_vqpkf5.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_vqpkf5uszgaieumdtwmphcxlcb -% Encoding created by otftotfm on Wed Apr 24 09:08:04 2019 +% Encoding created by otftotfm on Sat Oct 12 09:02:26 2019 % Command line follows encoding /AutoEnc_vqpkf5uszgaieumdtwmphcxlcb [ %00 @@ -54,12 +54,13 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls ] def % Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=texmf.new/fonts/tfm/impallari/cabin -% --vf-directory=texmf.new/fonts/vf/impallari/cabin -% --type1-directory=texmf.new/fonts/type1/impallari/cabin -% --truetype-directory=texmf.new/fonts/truetype/impallari/cabin -% --encoding-directory=texmf.new/fonts/enc/dvips/cabin -% --map-file=texmf.new/fonts/map/dvips/cabin/Cabin.map --no-updmap +% --tfm-directory=texmf/fonts/tfm/impallari/cabin +% --vf-directory=texmf/fonts/vf/impallari/cabin +% --type1-directory=texmf/fonts/type1/impallari/cabin +% --truetype-directory=texmf/fonts/truetype/impallari/cabin +% --encoding-directory=texmf/fonts/enc/dvips/cabin +% --map-file=texmf/fonts/map/dvips/cabin/Cabin.map --no-updmap % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern -% --feature=sups --ligkern=* {KL} * Cabin-BoldItalic.otf -% Cabin-BoldItalic-sup-t1' +% --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * +% Cabin-BoldItalic.otf Cabin-BoldItalic-sup-t1' diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_yhiurv.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_yhiurv.enc index 2ee2b1cbaf0..da65d9393fe 100644 --- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_yhiurv.enc +++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_yhiurv.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_yhiurvsvbd3h7rarpdqq2tijsa -% Encoding created by otftotfm on Wed Apr 24 09:08:04 2019 +% Encoding created by otftotfm on Sat Oct 12 09:02:25 2019 % Command line follows encoding /AutoEnc_yhiurvsvbd3h7rarpdqq2tijsa [ %00 @@ -54,12 +54,13 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis ] def % Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=texmf.new/fonts/tfm/impallari/cabin -% --vf-directory=texmf.new/fonts/vf/impallari/cabin -% --type1-directory=texmf.new/fonts/type1/impallari/cabin -% --truetype-directory=texmf.new/fonts/truetype/impallari/cabin -% --encoding-directory=texmf.new/fonts/enc/dvips/cabin -% --map-file=texmf.new/fonts/map/dvips/cabin/Cabin.map --no-updmap +% --tfm-directory=texmf/fonts/tfm/impallari/cabin +% --vf-directory=texmf/fonts/vf/impallari/cabin +% --type1-directory=texmf/fonts/type1/impallari/cabin +% --truetype-directory=texmf/fonts/truetype/impallari/cabin +% --encoding-directory=texmf/fonts/enc/dvips/cabin +% --map-file=texmf/fonts/map/dvips/cabin/Cabin.map --no-updmap % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern -% --feature=smcp --unicoding=germandbls =: SSsmall Cabin-BoldItalic.otf -% Cabin-BoldItalic-tlf-sc-ly1' +% --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: +% SSsmall Cabin-BoldItalic.otf Cabin-BoldItalic-tlf-sc-ly1' diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_yhzmyq.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_yhzmyq.enc deleted file mode 100644 index 2f3140f42d8..00000000000 --- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_yhzmyq.enc +++ /dev/null @@ -1,64 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_yhzmyqaxmy5zwjtkfrgblnd7va -% Encoding created by otftotfm on Wed Apr 24 09:08:04 2019 -% Command line follows encoding -/AutoEnc_yhzmyqaxmy5zwjtkfrgblnd7va [ -%00 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /C /asterisk -%10 - /exclam /exclamdown /quotedblbase /question /questiondown /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /endash /.notdef -%20 - /.notdef /bar /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle - /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction -%30 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef -%40 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%50 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni2126 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%60 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%70 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%80 - /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand - /bullet /.notdef /.notdef /.notdef /florin /colonmonetary /uni20A9 /.notdef -%90 - /.notdef /.notdef /lira /.notdef /.notdef /.notdef /dong /trademark - /.notdef /.notdef /.notdef /uni2116 /.notdef /estimated /.notdef /.notdef -%A0 - /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section - /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef -%B0 - /degree /plusminus /uni00B2 /uni00B3 /.notdef /uni00B5 /paragraph /periodcentered - /.notdef /uni00B9 /ordmasculine /radical /onequarter /onehalf /threequarters /Euro -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=texmf.new/fonts/tfm/impallari/cabin -% --vf-directory=texmf.new/fonts/vf/impallari/cabin -% --type1-directory=texmf.new/fonts/type1/impallari/cabin -% --truetype-directory=texmf.new/fonts/truetype/impallari/cabin -% --encoding-directory=texmf.new/fonts/enc/dvips/cabin -% --map-file=texmf.new/fonts/map/dvips/cabin/Cabin.map --no-updmap -% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 Cabin-BoldItalic.otf -% Cabin-BoldItalic-tlf-ts1' diff --git a/Master/texmf-dist/fonts/map/dvips/cabin/cabin.map b/Master/texmf-dist/fonts/map/dvips/cabin/cabin.map index 251893cf326..17dd538e7fd 100644 --- a/Master/texmf-dist/fonts/map/dvips/cabin/cabin.map +++ b/Master/texmf-dist/fonts/map/dvips/cabin/cabin.map @@ -1,162 +1,208 @@ -% Automatically maintained by otftotfm or other programs. Do not edit. - Cabin-BoldItalic-tlf-ot1 Cabin-BoldItalic "AutoEnc_jjp77tzr5q3rdiuqcjzmprtsvb ReEncodeFont" <[cbn_jjp77t.enc \Cabin@@scale Cabin-Regular-sup-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{regular}{it}{ + <-> \Cabin@@scale Cabin-Italic-sup-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{regular}{sl}{ + <-> ssub * Cabin-Sup/regular/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{LGR}{Cabin-Sup}{semibold}{n}{ + <-> \Cabin@@scale Cabin-SemiBold-sup-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{semibold}{it}{ + <-> \Cabin@@scale Cabin-SemiBoldItalic-sup-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{semibold}{sl}{ + <-> ssub * Cabin-Sup/semibold/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{LGR}{Cabin-Sup}{bold}{n}{ + <-> \Cabin@@scale Cabin-Bold-sup-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{bold}{it}{ + <-> \Cabin@@scale Cabin-BoldItalic-sup-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{bold}{sl}{ + <-> ssub * Cabin-Sup/bold/it +}{} + + +% ---- boldcondensed ---- + +\DeclareFontShape{LGR}{Cabin-Sup}{boldcondensed}{n}{ + <-> \Cabin@@scale CabinCondensed-Bold-sup-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{boldcondensed}{it}{ + <-> \Cabin@@scale CabinCondensed-BoldItalic-sup-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{boldcondensed}{sl}{ + <-> ssub * Cabin-Sup/boldcondensed/it +}{} + + +% ---- condensed ---- + +\DeclareFontShape{LGR}{Cabin-Sup}{condensed}{n}{ + <-> \Cabin@@scale CabinCondensed-Regular-sup-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{condensed}{it}{ + <-> \Cabin@@scale CabinCondensed-Italic-sup-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{condensed}{sl}{ + <-> ssub * Cabin-Sup/condensed/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{LGR}{Cabin-Sup}{medium}{n}{ + <-> \Cabin@@scale Cabin-Medium-sup-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{medium}{it}{ + <-> \Cabin@@scale Cabin-MediumItalic-sup-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{medium}{sl}{ + <-> ssub * Cabin-Sup/medium/it +}{} + + +% ---- mediumcondensed ---- + +\DeclareFontShape{LGR}{Cabin-Sup}{mediumcondensed}{n}{ + <-> \Cabin@@scale CabinCondensed-Medium-sup-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{mediumcondensed}{it}{ + <-> \Cabin@@scale CabinCondensed-MediumItalic-sup-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{mediumcondensed}{sl}{ + <-> ssub * Cabin-Sup/mediumcondensed/it +}{} + + +% ---- semiboldcondensed ---- + +\DeclareFontShape{LGR}{Cabin-Sup}{semiboldcondensed}{n}{ + <-> \Cabin@@scale CabinCondensed-SemiBold-sup-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{semiboldcondensed}{it}{ + <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-sup-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{semiboldcondensed}{sl}{ + <-> ssub * Cabin-Sup/semiboldcondensed/it +}{} + +% +% 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 + +\DeclareFontShape{LGR}{Cabin-Sup}{c}{sl}{ + <-> ssub * Cabin-Sup/mediumcondensed/sl +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{c}{n}{ + <-> ssub * Cabin-Sup/mediumcondensed/n +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{c}{it}{ + <-> ssub * Cabin-Sup/mediumcondensed/it +}{} + + +% m --> medium + +\DeclareFontShape{LGR}{Cabin-Sup}{m}{sl}{ + <-> ssub * Cabin-Sup/medium/sl +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{m}{n}{ + <-> ssub * Cabin-Sup/medium/n +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{m}{it}{ + <-> ssub * Cabin-Sup/medium/it +}{} + + +% sbc --> semiboldcondensed + +\DeclareFontShape{LGR}{Cabin-Sup}{sbc}{sl}{ + <-> ssub * Cabin-Sup/semiboldcondensed/sl +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{sbc}{n}{ + <-> ssub * Cabin-Sup/semiboldcondensed/n +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{sbc}{it}{ + <-> ssub * Cabin-Sup/semiboldcondensed/it +}{} + + +% sb --> semibold + +\DeclareFontShape{LGR}{Cabin-Sup}{sb}{sl}{ + <-> ssub * Cabin-Sup/semibold/sl +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{sb}{n}{ + <-> ssub * Cabin-Sup/semibold/n +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{sb}{it}{ + <-> ssub * Cabin-Sup/semibold/it +}{} + + +% bc --> boldcondensed + +\DeclareFontShape{LGR}{Cabin-Sup}{bc}{sl}{ + <-> ssub * Cabin-Sup/boldcondensed/sl +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{bc}{n}{ + <-> ssub * Cabin-Sup/boldcondensed/n +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{bc}{it}{ + <-> ssub * Cabin-Sup/boldcondensed/it +}{} + + +% b --> bold + +\DeclareFontShape{LGR}{Cabin-Sup}{b}{sl}{ + <-> ssub * Cabin-Sup/bold/sl +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{b}{n}{ + <-> ssub * Cabin-Sup/bold/n +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{b}{it}{ + <-> ssub * Cabin-Sup/bold/it +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{bx}{n}{ + <-> ssub * Cabin-Sup/b/n +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{bx}{sl}{ + <-> ssub * Cabin-Sup/b/sl +}{} + +\DeclareFontShape{LGR}{Cabin-Sup}{bx}{it}{ + <-> ssub * Cabin-Sup/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/cabin/LGRCabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/LGRCabin-TLF.fd new file mode 100644 index 00000000000..ad14b4b3d11 --- /dev/null +++ b/Master/texmf-dist/tex/latex/cabin/LGRCabin-TLF.fd @@ -0,0 +1,473 @@ +%% Generated by autoinst on 2019/10/12 +%% +\ProvidesFile{LGRCabin-TLF.fd} + [2019/10/12 (autoinst) Font definitions for LGR/Cabin-TLF.] + +\expandafter\ifx\csname Cabin@scale\endcsname\relax + \let\Cabin@@scale\@empty +\else + \edef\Cabin@@scale{s*[\csname Cabin@scale\endcsname]}% +\fi + +\DeclareFontFamily{LGR}{Cabin-TLF}{} + + +% ---- regular ---- + +\DeclareFontShape{LGR}{Cabin-TLF}{regular}{sc}{ + <-> \Cabin@@scale Cabin-Regular-tlf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{regular}{n}{ + <-> \Cabin@@scale Cabin-Regular-tlf-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{regular}{it}{ + <-> \Cabin@@scale Cabin-Italic-tlf-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{regular}{scit}{ + <-> \Cabin@@scale Cabin-Italic-tlf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{regular}{scsl}{ + <-> ssub * Cabin-TLF/regular/scit +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{regular}{sl}{ + <-> ssub * Cabin-TLF/regular/it +}{} + + +% ---- semibold ---- + +\DeclareFontShape{LGR}{Cabin-TLF}{semibold}{sc}{ + <-> \Cabin@@scale Cabin-SemiBold-tlf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{semibold}{n}{ + <-> \Cabin@@scale Cabin-SemiBold-tlf-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{semibold}{it}{ + <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{semibold}{scit}{ + <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{semibold}{scsl}{ + <-> ssub * Cabin-TLF/semibold/scit +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{semibold}{sl}{ + <-> ssub * Cabin-TLF/semibold/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{LGR}{Cabin-TLF}{bold}{sc}{ + <-> \Cabin@@scale Cabin-Bold-tlf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{bold}{n}{ + <-> \Cabin@@scale Cabin-Bold-tlf-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{bold}{it}{ + <-> \Cabin@@scale Cabin-BoldItalic-tlf-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{bold}{scit}{ + <-> \Cabin@@scale Cabin-BoldItalic-tlf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{bold}{scsl}{ + <-> ssub * Cabin-TLF/bold/scit +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{bold}{sl}{ + <-> ssub * Cabin-TLF/bold/it +}{} + + +% ---- boldcondensed ---- + +\DeclareFontShape{LGR}{Cabin-TLF}{boldcondensed}{sc}{ + <-> \Cabin@@scale CabinCondensed-Bold-tlf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{boldcondensed}{n}{ + <-> \Cabin@@scale CabinCondensed-Bold-tlf-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{boldcondensed}{it}{ + <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{boldcondensed}{scit}{ + <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{boldcondensed}{scsl}{ + <-> ssub * Cabin-TLF/boldcondensed/scit +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{boldcondensed}{sl}{ + <-> ssub * Cabin-TLF/boldcondensed/it +}{} + + +% ---- condensed ---- + +\DeclareFontShape{LGR}{Cabin-TLF}{condensed}{sc}{ + <-> \Cabin@@scale CabinCondensed-Regular-tlf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{condensed}{n}{ + <-> \Cabin@@scale CabinCondensed-Regular-tlf-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{condensed}{it}{ + <-> \Cabin@@scale CabinCondensed-Italic-tlf-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{condensed}{scit}{ + <-> \Cabin@@scale CabinCondensed-Italic-tlf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{condensed}{scsl}{ + <-> ssub * Cabin-TLF/condensed/scit +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{condensed}{sl}{ + <-> ssub * Cabin-TLF/condensed/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{LGR}{Cabin-TLF}{medium}{sc}{ + <-> \Cabin@@scale Cabin-Medium-tlf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{medium}{n}{ + <-> \Cabin@@scale Cabin-Medium-tlf-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{medium}{it}{ + <-> \Cabin@@scale Cabin-MediumItalic-tlf-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{medium}{scit}{ + <-> \Cabin@@scale Cabin-MediumItalic-tlf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{medium}{scsl}{ + <-> ssub * Cabin-TLF/medium/scit +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{medium}{sl}{ + <-> ssub * Cabin-TLF/medium/it +}{} + + +% ---- mediumcondensed ---- + +\DeclareFontShape{LGR}{Cabin-TLF}{mediumcondensed}{sc}{ + <-> \Cabin@@scale CabinCondensed-Medium-tlf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{mediumcondensed}{n}{ + <-> \Cabin@@scale CabinCondensed-Medium-tlf-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{mediumcondensed}{it}{ + <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{mediumcondensed}{scit}{ + <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{mediumcondensed}{scsl}{ + <-> ssub * Cabin-TLF/mediumcondensed/scit +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{mediumcondensed}{sl}{ + <-> ssub * Cabin-TLF/mediumcondensed/it +}{} + + +% ---- semiboldcondensed ---- + +\DeclareFontShape{LGR}{Cabin-TLF}{semiboldcondensed}{sc}{ + <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{semiboldcondensed}{n}{ + <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{semiboldcondensed}{it}{ + <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{semiboldcondensed}{scit}{ + <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{semiboldcondensed}{scsl}{ + <-> ssub * Cabin-TLF/semiboldcondensed/scit +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{semiboldcondensed}{sl}{ + <-> ssub * Cabin-TLF/semiboldcondensed/it +}{} + +% +% 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 + +\DeclareFontShape{LGR}{Cabin-TLF}{c}{sl}{ + <-> ssub * Cabin-TLF/mediumcondensed/sl +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{c}{scsl}{ + <-> ssub * Cabin-TLF/mediumcondensed/scsl +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{c}{sc}{ + <-> ssub * Cabin-TLF/mediumcondensed/sc +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{c}{n}{ + <-> ssub * Cabin-TLF/mediumcondensed/n +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{c}{it}{ + <-> ssub * Cabin-TLF/mediumcondensed/it +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{c}{scit}{ + <-> ssub * Cabin-TLF/mediumcondensed/scit +}{} + + +% m --> medium + +\DeclareFontShape{LGR}{Cabin-TLF}{m}{sl}{ + <-> ssub * Cabin-TLF/medium/sl +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{m}{scsl}{ + <-> ssub * Cabin-TLF/medium/scsl +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{m}{sc}{ + <-> ssub * Cabin-TLF/medium/sc +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{m}{n}{ + <-> ssub * Cabin-TLF/medium/n +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{m}{it}{ + <-> ssub * Cabin-TLF/medium/it +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{m}{scit}{ + <-> ssub * Cabin-TLF/medium/scit +}{} + + +% sbc --> semiboldcondensed + +\DeclareFontShape{LGR}{Cabin-TLF}{sbc}{sl}{ + <-> ssub * Cabin-TLF/semiboldcondensed/sl +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{sbc}{scsl}{ + <-> ssub * Cabin-TLF/semiboldcondensed/scsl +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{sbc}{sc}{ + <-> ssub * Cabin-TLF/semiboldcondensed/sc +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{sbc}{n}{ + <-> ssub * Cabin-TLF/semiboldcondensed/n +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{sbc}{it}{ + <-> ssub * Cabin-TLF/semiboldcondensed/it +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{sbc}{scit}{ + <-> ssub * Cabin-TLF/semiboldcondensed/scit +}{} + + +% sb --> semibold + +\DeclareFontShape{LGR}{Cabin-TLF}{sb}{sl}{ + <-> ssub * Cabin-TLF/semibold/sl +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{sb}{scsl}{ + <-> ssub * Cabin-TLF/semibold/scsl +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{sb}{sc}{ + <-> ssub * Cabin-TLF/semibold/sc +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{sb}{n}{ + <-> ssub * Cabin-TLF/semibold/n +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{sb}{it}{ + <-> ssub * Cabin-TLF/semibold/it +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{sb}{scit}{ + <-> ssub * Cabin-TLF/semibold/scit +}{} + + +% bc --> boldcondensed + +\DeclareFontShape{LGR}{Cabin-TLF}{bc}{sl}{ + <-> ssub * Cabin-TLF/boldcondensed/sl +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{bc}{scsl}{ + <-> ssub * Cabin-TLF/boldcondensed/scsl +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{bc}{sc}{ + <-> ssub * Cabin-TLF/boldcondensed/sc +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{bc}{n}{ + <-> ssub * Cabin-TLF/boldcondensed/n +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{bc}{it}{ + <-> ssub * Cabin-TLF/boldcondensed/it +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{bc}{scit}{ + <-> ssub * Cabin-TLF/boldcondensed/scit +}{} + + +% b --> bold + +\DeclareFontShape{LGR}{Cabin-TLF}{b}{sl}{ + <-> ssub * Cabin-TLF/bold/sl +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{b}{scsl}{ + <-> ssub * Cabin-TLF/bold/scsl +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{b}{sc}{ + <-> ssub * Cabin-TLF/bold/sc +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{b}{n}{ + <-> ssub * Cabin-TLF/bold/n +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{b}{it}{ + <-> ssub * Cabin-TLF/bold/it +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{b}{scit}{ + <-> ssub * Cabin-TLF/bold/scit +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{bx}{n}{ + <-> ssub * Cabin-TLF/b/n +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{bx}{sc}{ + <-> ssub * Cabin-TLF/b/sc +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{bx}{scsl}{ + <-> ssub * Cabin-TLF/b/scsl +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{bx}{sl}{ + <-> ssub * Cabin-TLF/b/sl +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{bx}{it}{ + <-> ssub * Cabin-TLF/b/it +}{} + +\DeclareFontShape{LGR}{Cabin-TLF}{bx}{scit}{ + <-> ssub * Cabin-TLF/b/scit +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd index f50003e5d75..54f41c26cde 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/04/24 +%% Generated by autoinst on 2019/10/12 %% \ProvidesFile{LY1Cabin-Sup.fd} - [2019/04/24 (autoinst) Font definitions for LY1/Cabin-Sup.] + [2019/10/12 (autoinst) Font definitions for LY1/Cabin-Sup.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -135,36 +135,66 @@ % Extra 'ssub' rules to map the standard NFSS codes to our fancy names % -% c --> condensed +% slc --> condensed -\DeclareFontShape{LY1}{Cabin-Sup}{c}{sl}{ +\DeclareFontShape{LY1}{Cabin-Sup}{slc}{sl}{ <-> ssub * Cabin-Sup/condensed/sl }{} -\DeclareFontShape{LY1}{Cabin-Sup}{c}{n}{ +\DeclareFontShape{LY1}{Cabin-Sup}{slc}{n}{ <-> ssub * Cabin-Sup/condensed/n }{} -\DeclareFontShape{LY1}{Cabin-Sup}{c}{it}{ +\DeclareFontShape{LY1}{Cabin-Sup}{slc}{it}{ <-> ssub * Cabin-Sup/condensed/it }{} -% m --> regular +% sl --> regular -\DeclareFontShape{LY1}{Cabin-Sup}{m}{sl}{ +\DeclareFontShape{LY1}{Cabin-Sup}{sl}{sl}{ <-> ssub * Cabin-Sup/regular/sl }{} -\DeclareFontShape{LY1}{Cabin-Sup}{m}{n}{ +\DeclareFontShape{LY1}{Cabin-Sup}{sl}{n}{ <-> ssub * Cabin-Sup/regular/n }{} -\DeclareFontShape{LY1}{Cabin-Sup}{m}{it}{ +\DeclareFontShape{LY1}{Cabin-Sup}{sl}{it}{ <-> ssub * Cabin-Sup/regular/it }{} +% c --> mediumcondensed + +\DeclareFontShape{LY1}{Cabin-Sup}{c}{sl}{ + <-> ssub * Cabin-Sup/mediumcondensed/sl +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{c}{n}{ + <-> ssub * Cabin-Sup/mediumcondensed/n +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{c}{it}{ + <-> ssub * Cabin-Sup/mediumcondensed/it +}{} + + +% m --> medium + +\DeclareFontShape{LY1}{Cabin-Sup}{m}{sl}{ + <-> ssub * Cabin-Sup/medium/sl +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{m}{n}{ + <-> ssub * Cabin-Sup/medium/n +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{m}{it}{ + <-> ssub * Cabin-Sup/medium/it +}{} + + % sbc --> semiboldcondensed \DeclareFontShape{LY1}{Cabin-Sup}{sbc}{sl}{ diff --git a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd index 6ee16fcb58a..7972b7842b2 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/04/24 +%% Generated by autoinst on 2019/10/12 %% \ProvidesFile{LY1Cabin-TLF.fd} - [2019/04/24 (autoinst) Font definitions for LY1/Cabin-TLF.] + [2019/10/12 (autoinst) Font definitions for LY1/Cabin-TLF.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -231,60 +231,114 @@ % Extra 'ssub' rules to map the standard NFSS codes to our fancy names % -% c --> condensed +% slc --> condensed -\DeclareFontShape{LY1}{Cabin-TLF}{c}{sl}{ +\DeclareFontShape{LY1}{Cabin-TLF}{slc}{sl}{ <-> ssub * Cabin-TLF/condensed/sl }{} -\DeclareFontShape{LY1}{Cabin-TLF}{c}{scsl}{ +\DeclareFontShape{LY1}{Cabin-TLF}{slc}{scsl}{ <-> ssub * Cabin-TLF/condensed/scsl }{} -\DeclareFontShape{LY1}{Cabin-TLF}{c}{sc}{ +\DeclareFontShape{LY1}{Cabin-TLF}{slc}{sc}{ <-> ssub * Cabin-TLF/condensed/sc }{} -\DeclareFontShape{LY1}{Cabin-TLF}{c}{n}{ +\DeclareFontShape{LY1}{Cabin-TLF}{slc}{n}{ <-> ssub * Cabin-TLF/condensed/n }{} -\DeclareFontShape{LY1}{Cabin-TLF}{c}{it}{ +\DeclareFontShape{LY1}{Cabin-TLF}{slc}{it}{ <-> ssub * Cabin-TLF/condensed/it }{} -\DeclareFontShape{LY1}{Cabin-TLF}{c}{scit}{ +\DeclareFontShape{LY1}{Cabin-TLF}{slc}{scit}{ <-> ssub * Cabin-TLF/condensed/scit }{} -% m --> regular +% sl --> regular -\DeclareFontShape{LY1}{Cabin-TLF}{m}{sl}{ +\DeclareFontShape{LY1}{Cabin-TLF}{sl}{sl}{ <-> ssub * Cabin-TLF/regular/sl }{} -\DeclareFontShape{LY1}{Cabin-TLF}{m}{scsl}{ +\DeclareFontShape{LY1}{Cabin-TLF}{sl}{scsl}{ <-> ssub * Cabin-TLF/regular/scsl }{} -\DeclareFontShape{LY1}{Cabin-TLF}{m}{sc}{ +\DeclareFontShape{LY1}{Cabin-TLF}{sl}{sc}{ <-> ssub * Cabin-TLF/regular/sc }{} -\DeclareFontShape{LY1}{Cabin-TLF}{m}{n}{ +\DeclareFontShape{LY1}{Cabin-TLF}{sl}{n}{ <-> ssub * Cabin-TLF/regular/n }{} -\DeclareFontShape{LY1}{Cabin-TLF}{m}{it}{ +\DeclareFontShape{LY1}{Cabin-TLF}{sl}{it}{ <-> ssub * Cabin-TLF/regular/it }{} -\DeclareFontShape{LY1}{Cabin-TLF}{m}{scit}{ +\DeclareFontShape{LY1}{Cabin-TLF}{sl}{scit}{ <-> ssub * Cabin-TLF/regular/scit }{} +% c --> mediumcondensed + +\DeclareFontShape{LY1}{Cabin-TLF}{c}{sl}{ + <-> ssub * Cabin-TLF/mediumcondensed/sl +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{c}{scsl}{ + <-> ssub * Cabin-TLF/mediumcondensed/scsl +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{c}{sc}{ + <-> ssub * Cabin-TLF/mediumcondensed/sc +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{c}{n}{ + <-> ssub * Cabin-TLF/mediumcondensed/n +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{c}{it}{ + <-> ssub * Cabin-TLF/mediumcondensed/it +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{c}{scit}{ + <-> ssub * Cabin-TLF/mediumcondensed/scit +}{} + + +% m --> medium + +\DeclareFontShape{LY1}{Cabin-TLF}{m}{sl}{ + <-> ssub * Cabin-TLF/medium/sl +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{m}{scsl}{ + <-> ssub * Cabin-TLF/medium/scsl +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{m}{sc}{ + <-> ssub * Cabin-TLF/medium/sc +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{m}{n}{ + <-> ssub * Cabin-TLF/medium/n +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{m}{it}{ + <-> ssub * Cabin-TLF/medium/it +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{m}{scit}{ + <-> ssub * Cabin-TLF/medium/scit +}{} + + % sbc --> semiboldcondensed \DeclareFontShape{LY1}{Cabin-TLF}{sbc}{sl}{ diff --git a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd index a08f6e02ef3..9891ba0ee6a 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/04/24 +%% Generated by autoinst on 2019/10/12 %% \ProvidesFile{OT1Cabin-Sup.fd} - [2019/04/24 (autoinst) Font definitions for OT1/Cabin-Sup.] + [2019/10/12 (autoinst) Font definitions for OT1/Cabin-Sup.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -135,36 +135,66 @@ % Extra 'ssub' rules to map the standard NFSS codes to our fancy names % -% c --> condensed +% slc --> condensed -\DeclareFontShape{OT1}{Cabin-Sup}{c}{sl}{ +\DeclareFontShape{OT1}{Cabin-Sup}{slc}{sl}{ <-> ssub * Cabin-Sup/condensed/sl }{} -\DeclareFontShape{OT1}{Cabin-Sup}{c}{n}{ +\DeclareFontShape{OT1}{Cabin-Sup}{slc}{n}{ <-> ssub * Cabin-Sup/condensed/n }{} -\DeclareFontShape{OT1}{Cabin-Sup}{c}{it}{ +\DeclareFontShape{OT1}{Cabin-Sup}{slc}{it}{ <-> ssub * Cabin-Sup/condensed/it }{} -% m --> regular +% sl --> regular -\DeclareFontShape{OT1}{Cabin-Sup}{m}{sl}{ +\DeclareFontShape{OT1}{Cabin-Sup}{sl}{sl}{ <-> ssub * Cabin-Sup/regular/sl }{} -\DeclareFontShape{OT1}{Cabin-Sup}{m}{n}{ +\DeclareFontShape{OT1}{Cabin-Sup}{sl}{n}{ <-> ssub * Cabin-Sup/regular/n }{} -\DeclareFontShape{OT1}{Cabin-Sup}{m}{it}{ +\DeclareFontShape{OT1}{Cabin-Sup}{sl}{it}{ <-> ssub * Cabin-Sup/regular/it }{} +% c --> mediumcondensed + +\DeclareFontShape{OT1}{Cabin-Sup}{c}{sl}{ + <-> ssub * Cabin-Sup/mediumcondensed/sl +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{c}{n}{ + <-> ssub * Cabin-Sup/mediumcondensed/n +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{c}{it}{ + <-> ssub * Cabin-Sup/mediumcondensed/it +}{} + + +% m --> medium + +\DeclareFontShape{OT1}{Cabin-Sup}{m}{sl}{ + <-> ssub * Cabin-Sup/medium/sl +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{m}{n}{ + <-> ssub * Cabin-Sup/medium/n +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{m}{it}{ + <-> ssub * Cabin-Sup/medium/it +}{} + + % sbc --> semiboldcondensed \DeclareFontShape{OT1}{Cabin-Sup}{sbc}{sl}{ diff --git a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd index dfc9786dda6..d21164a7762 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/04/24 +%% Generated by autoinst on 2019/10/12 %% \ProvidesFile{OT1Cabin-TLF.fd} - [2019/04/24 (autoinst) Font definitions for OT1/Cabin-TLF.] + [2019/10/12 (autoinst) Font definitions for OT1/Cabin-TLF.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -231,60 +231,114 @@ % Extra 'ssub' rules to map the standard NFSS codes to our fancy names % -% c --> condensed +% slc --> condensed -\DeclareFontShape{OT1}{Cabin-TLF}{c}{sl}{ +\DeclareFontShape{OT1}{Cabin-TLF}{slc}{sl}{ <-> ssub * Cabin-TLF/condensed/sl }{} -\DeclareFontShape{OT1}{Cabin-TLF}{c}{scsl}{ +\DeclareFontShape{OT1}{Cabin-TLF}{slc}{scsl}{ <-> ssub * Cabin-TLF/condensed/scsl }{} -\DeclareFontShape{OT1}{Cabin-TLF}{c}{sc}{ +\DeclareFontShape{OT1}{Cabin-TLF}{slc}{sc}{ <-> ssub * Cabin-TLF/condensed/sc }{} -\DeclareFontShape{OT1}{Cabin-TLF}{c}{n}{ +\DeclareFontShape{OT1}{Cabin-TLF}{slc}{n}{ <-> ssub * Cabin-TLF/condensed/n }{} -\DeclareFontShape{OT1}{Cabin-TLF}{c}{it}{ +\DeclareFontShape{OT1}{Cabin-TLF}{slc}{it}{ <-> ssub * Cabin-TLF/condensed/it }{} -\DeclareFontShape{OT1}{Cabin-TLF}{c}{scit}{ +\DeclareFontShape{OT1}{Cabin-TLF}{slc}{scit}{ <-> ssub * Cabin-TLF/condensed/scit }{} -% m --> regular +% sl --> regular -\DeclareFontShape{OT1}{Cabin-TLF}{m}{sl}{ +\DeclareFontShape{OT1}{Cabin-TLF}{sl}{sl}{ <-> ssub * Cabin-TLF/regular/sl }{} -\DeclareFontShape{OT1}{Cabin-TLF}{m}{scsl}{ +\DeclareFontShape{OT1}{Cabin-TLF}{sl}{scsl}{ <-> ssub * Cabin-TLF/regular/scsl }{} -\DeclareFontShape{OT1}{Cabin-TLF}{m}{sc}{ +\DeclareFontShape{OT1}{Cabin-TLF}{sl}{sc}{ <-> ssub * Cabin-TLF/regular/sc }{} -\DeclareFontShape{OT1}{Cabin-TLF}{m}{n}{ +\DeclareFontShape{OT1}{Cabin-TLF}{sl}{n}{ <-> ssub * Cabin-TLF/regular/n }{} -\DeclareFontShape{OT1}{Cabin-TLF}{m}{it}{ +\DeclareFontShape{OT1}{Cabin-TLF}{sl}{it}{ <-> ssub * Cabin-TLF/regular/it }{} -\DeclareFontShape{OT1}{Cabin-TLF}{m}{scit}{ +\DeclareFontShape{OT1}{Cabin-TLF}{sl}{scit}{ <-> ssub * Cabin-TLF/regular/scit }{} +% c --> mediumcondensed + +\DeclareFontShape{OT1}{Cabin-TLF}{c}{sl}{ + <-> ssub * Cabin-TLF/mediumcondensed/sl +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{c}{scsl}{ + <-> ssub * Cabin-TLF/mediumcondensed/scsl +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{c}{sc}{ + <-> ssub * Cabin-TLF/mediumcondensed/sc +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{c}{n}{ + <-> ssub * Cabin-TLF/mediumcondensed/n +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{c}{it}{ + <-> ssub * Cabin-TLF/mediumcondensed/it +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{c}{scit}{ + <-> ssub * Cabin-TLF/mediumcondensed/scit +}{} + + +% m --> medium + +\DeclareFontShape{OT1}{Cabin-TLF}{m}{sl}{ + <-> ssub * Cabin-TLF/medium/sl +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{m}{scsl}{ + <-> ssub * Cabin-TLF/medium/scsl +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{m}{sc}{ + <-> ssub * Cabin-TLF/medium/sc +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{m}{n}{ + <-> ssub * Cabin-TLF/medium/n +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{m}{it}{ + <-> ssub * Cabin-TLF/medium/it +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{m}{scit}{ + <-> ssub * Cabin-TLF/medium/scit +}{} + + % sbc --> semiboldcondensed \DeclareFontShape{OT1}{Cabin-TLF}{sbc}{sl}{ diff --git a/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd index f0891614ad2..861eca637c7 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/04/24 +%% Generated by autoinst on 2019/10/12 %% \ProvidesFile{T1Cabin-Sup.fd} - [2019/04/24 (autoinst) Font definitions for T1/Cabin-Sup.] + [2019/10/12 (autoinst) Font definitions for T1/Cabin-Sup.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -135,36 +135,66 @@ % Extra 'ssub' rules to map the standard NFSS codes to our fancy names % -% c --> condensed +% slc --> condensed -\DeclareFontShape{T1}{Cabin-Sup}{c}{sl}{ +\DeclareFontShape{T1}{Cabin-Sup}{slc}{sl}{ <-> ssub * Cabin-Sup/condensed/sl }{} -\DeclareFontShape{T1}{Cabin-Sup}{c}{n}{ +\DeclareFontShape{T1}{Cabin-Sup}{slc}{n}{ <-> ssub * Cabin-Sup/condensed/n }{} -\DeclareFontShape{T1}{Cabin-Sup}{c}{it}{ +\DeclareFontShape{T1}{Cabin-Sup}{slc}{it}{ <-> ssub * Cabin-Sup/condensed/it }{} -% m --> regular +% sl --> regular -\DeclareFontShape{T1}{Cabin-Sup}{m}{sl}{ +\DeclareFontShape{T1}{Cabin-Sup}{sl}{sl}{ <-> ssub * Cabin-Sup/regular/sl }{} -\DeclareFontShape{T1}{Cabin-Sup}{m}{n}{ +\DeclareFontShape{T1}{Cabin-Sup}{sl}{n}{ <-> ssub * Cabin-Sup/regular/n }{} -\DeclareFontShape{T1}{Cabin-Sup}{m}{it}{ +\DeclareFontShape{T1}{Cabin-Sup}{sl}{it}{ <-> ssub * Cabin-Sup/regular/it }{} +% c --> mediumcondensed + +\DeclareFontShape{T1}{Cabin-Sup}{c}{sl}{ + <-> ssub * Cabin-Sup/mediumcondensed/sl +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{c}{n}{ + <-> ssub * Cabin-Sup/mediumcondensed/n +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{c}{it}{ + <-> ssub * Cabin-Sup/mediumcondensed/it +}{} + + +% m --> medium + +\DeclareFontShape{T1}{Cabin-Sup}{m}{sl}{ + <-> ssub * Cabin-Sup/medium/sl +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{m}{n}{ + <-> ssub * Cabin-Sup/medium/n +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{m}{it}{ + <-> ssub * Cabin-Sup/medium/it +}{} + + % sbc --> semiboldcondensed \DeclareFontShape{T1}{Cabin-Sup}{sbc}{sl}{ diff --git a/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd index f57a6264e12..42f9cc5c8c1 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/04/24 +%% Generated by autoinst on 2019/10/12 %% \ProvidesFile{T1Cabin-TLF.fd} - [2019/04/24 (autoinst) Font definitions for T1/Cabin-TLF.] + [2019/10/12 (autoinst) Font definitions for T1/Cabin-TLF.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -231,60 +231,114 @@ % Extra 'ssub' rules to map the standard NFSS codes to our fancy names % -% c --> condensed +% slc --> condensed -\DeclareFontShape{T1}{Cabin-TLF}{c}{sl}{ +\DeclareFontShape{T1}{Cabin-TLF}{slc}{sl}{ <-> ssub * Cabin-TLF/condensed/sl }{} -\DeclareFontShape{T1}{Cabin-TLF}{c}{scsl}{ +\DeclareFontShape{T1}{Cabin-TLF}{slc}{scsl}{ <-> ssub * Cabin-TLF/condensed/scsl }{} -\DeclareFontShape{T1}{Cabin-TLF}{c}{sc}{ +\DeclareFontShape{T1}{Cabin-TLF}{slc}{sc}{ <-> ssub * Cabin-TLF/condensed/sc }{} -\DeclareFontShape{T1}{Cabin-TLF}{c}{n}{ +\DeclareFontShape{T1}{Cabin-TLF}{slc}{n}{ <-> ssub * Cabin-TLF/condensed/n }{} -\DeclareFontShape{T1}{Cabin-TLF}{c}{it}{ +\DeclareFontShape{T1}{Cabin-TLF}{slc}{it}{ <-> ssub * Cabin-TLF/condensed/it }{} -\DeclareFontShape{T1}{Cabin-TLF}{c}{scit}{ +\DeclareFontShape{T1}{Cabin-TLF}{slc}{scit}{ <-> ssub * Cabin-TLF/condensed/scit }{} -% m --> regular +% sl --> regular -\DeclareFontShape{T1}{Cabin-TLF}{m}{sl}{ +\DeclareFontShape{T1}{Cabin-TLF}{sl}{sl}{ <-> ssub * Cabin-TLF/regular/sl }{} -\DeclareFontShape{T1}{Cabin-TLF}{m}{scsl}{ +\DeclareFontShape{T1}{Cabin-TLF}{sl}{scsl}{ <-> ssub * Cabin-TLF/regular/scsl }{} -\DeclareFontShape{T1}{Cabin-TLF}{m}{sc}{ +\DeclareFontShape{T1}{Cabin-TLF}{sl}{sc}{ <-> ssub * Cabin-TLF/regular/sc }{} -\DeclareFontShape{T1}{Cabin-TLF}{m}{n}{ +\DeclareFontShape{T1}{Cabin-TLF}{sl}{n}{ <-> ssub * Cabin-TLF/regular/n }{} -\DeclareFontShape{T1}{Cabin-TLF}{m}{it}{ +\DeclareFontShape{T1}{Cabin-TLF}{sl}{it}{ <-> ssub * Cabin-TLF/regular/it }{} -\DeclareFontShape{T1}{Cabin-TLF}{m}{scit}{ +\DeclareFontShape{T1}{Cabin-TLF}{sl}{scit}{ <-> ssub * Cabin-TLF/regular/scit }{} +% c --> mediumcondensed + +\DeclareFontShape{T1}{Cabin-TLF}{c}{sl}{ + <-> ssub * Cabin-TLF/mediumcondensed/sl +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{c}{scsl}{ + <-> ssub * Cabin-TLF/mediumcondensed/scsl +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{c}{sc}{ + <-> ssub * Cabin-TLF/mediumcondensed/sc +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{c}{n}{ + <-> ssub * Cabin-TLF/mediumcondensed/n +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{c}{it}{ + <-> ssub * Cabin-TLF/mediumcondensed/it +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{c}{scit}{ + <-> ssub * Cabin-TLF/mediumcondensed/scit +}{} + + +% m --> medium + +\DeclareFontShape{T1}{Cabin-TLF}{m}{sl}{ + <-> ssub * Cabin-TLF/medium/sl +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{m}{scsl}{ + <-> ssub * Cabin-TLF/medium/scsl +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{m}{sc}{ + <-> ssub * Cabin-TLF/medium/sc +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{m}{n}{ + <-> ssub * Cabin-TLF/medium/n +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{m}{it}{ + <-> ssub * Cabin-TLF/medium/it +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{m}{scit}{ + <-> ssub * Cabin-TLF/medium/scit +}{} + + % sbc --> semiboldcondensed \DeclareFontShape{T1}{Cabin-TLF}{sbc}{sl}{ diff --git a/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd index e83d995212f..527323bc930 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/04/24 +%% Generated by autoinst on 2019/10/12 %% \ProvidesFile{TS1Cabin-TLF.fd} - [2019/04/24 (autoinst) Font definitions for TS1/Cabin-TLF.] + [2019/10/12 (autoinst) Font definitions for TS1/Cabin-TLF.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -135,36 +135,66 @@ % Extra 'ssub' rules to map the standard NFSS codes to our fancy names % -% c --> condensed +% slc --> condensed -\DeclareFontShape{TS1}{Cabin-TLF}{c}{sl}{ +\DeclareFontShape{TS1}{Cabin-TLF}{slc}{sl}{ <-> ssub * Cabin-TLF/condensed/sl }{} -\DeclareFontShape{TS1}{Cabin-TLF}{c}{n}{ +\DeclareFontShape{TS1}{Cabin-TLF}{slc}{n}{ <-> ssub * Cabin-TLF/condensed/n }{} -\DeclareFontShape{TS1}{Cabin-TLF}{c}{it}{ +\DeclareFontShape{TS1}{Cabin-TLF}{slc}{it}{ <-> ssub * Cabin-TLF/condensed/it }{} -% m --> regular +% sl --> regular -\DeclareFontShape{TS1}{Cabin-TLF}{m}{sl}{ +\DeclareFontShape{TS1}{Cabin-TLF}{sl}{sl}{ <-> ssub * Cabin-TLF/regular/sl }{} -\DeclareFontShape{TS1}{Cabin-TLF}{m}{n}{ +\DeclareFontShape{TS1}{Cabin-TLF}{sl}{n}{ <-> ssub * Cabin-TLF/regular/n }{} -\DeclareFontShape{TS1}{Cabin-TLF}{m}{it}{ +\DeclareFontShape{TS1}{Cabin-TLF}{sl}{it}{ <-> ssub * Cabin-TLF/regular/it }{} +% c --> mediumcondensed + +\DeclareFontShape{TS1}{Cabin-TLF}{c}{sl}{ + <-> ssub * Cabin-TLF/mediumcondensed/sl +}{} + +\DeclareFontShape{TS1}{Cabin-TLF}{c}{n}{ + <-> ssub * Cabin-TLF/mediumcondensed/n +}{} + +\DeclareFontShape{TS1}{Cabin-TLF}{c}{it}{ + <-> ssub * Cabin-TLF/mediumcondensed/it +}{} + + +% m --> medium + +\DeclareFontShape{TS1}{Cabin-TLF}{m}{sl}{ + <-> ssub * Cabin-TLF/medium/sl +}{} + +\DeclareFontShape{TS1}{Cabin-TLF}{m}{n}{ + <-> ssub * Cabin-TLF/medium/n +}{} + +\DeclareFontShape{TS1}{Cabin-TLF}{m}{it}{ + <-> ssub * Cabin-TLF/medium/it +}{} + + % sbc --> semiboldcondensed \DeclareFontShape{TS1}{Cabin-TLF}{sbc}{sl}{ diff --git a/Master/texmf-dist/tex/latex/cabin/cabin.sty b/Master/texmf-dist/tex/latex/cabin/cabin.sty index 72642b0534e..ae36f8d0713 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/04/24 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.] + [2019/10/12 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.] \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} @@ -45,15 +45,15 @@ \else % type1 \ifcabin@condensed - \def\bfseries@sf{boldcondensed} - \ifcabin@semibold\def\bfseries@sf{semiboldcondensed}\fi - \def\mdseries@sf{condensed} - \ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi + \def\bfseries@sf{bc} + \ifcabin@semibold\def\bfseries@sf{sbc}\fi + \def\mdseries@sf{slc} + \ifcabin@medium\def\mdseries@sf{c}\fi \else - \def\bfseries@sf{bold} - \ifcabin@semibold\def\bfseries@sf{semibold}\fi - \def\mdseries@sf{regular} - \ifcabin@medium\def\mdseries@sf{medium}\fi + \def\bfseries@sf{b} + \ifcabin@semibold\def\bfseries@sf{sb}\fi + \def\mdseries@sf{sl} + \ifcabin@medium\def\mdseries@sf{m}\fi \fi \fi @@ -104,10 +104,10 @@ \def\cabinfamily{Cabin-TLF} \newcommand*\cabin{\fontfamily{\cabinfamily}\selectfont} \newcommand*\cabincondensed{% - \def\bfseries@sf{boldcondensed} - \ifcabin@semibold\def\bfseries@sf{semiboldcondensed}\fi - \def\mdseries@sf{condensed} - \ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi + \def\bfseries@sf{bc} + \ifcabin@semibold\def\bfseries@sf{sbc}\fi + \def\mdseries@sf{slc} + \ifcabin@medium\def\mdseries@sf{c}\fi } \def\sfdefault{\cabinfamily} \ifcabin@default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries@sf}\fi -- cgit v1.2.3