summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/fonts/bitter/README22
-rw-r--r--Master/texmf-dist/doc/fonts/bitter/bitter-samples.pdfbin18766 -> 13811 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/bitter/bitter-samples.tex1
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/bitter/bttr_6upxhe.enc62
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/bitter/bttr_72jdjw.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/bitter/bttr_azarls.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/bitter/bttr_b5i5mx.enc62
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/bitter/bttr_f2umud.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/bitter/bttr_gljolu.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/bitter/bttr_ncjtqa.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/bitter/bttr_ssdm5h.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/bitter/bttr_vzfpnj.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/bitter/bttr_w3wxei.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/bitter/bttr_x2bjkb.enc63
-rw-r--r--Master/texmf-dist/fonts/map/dvips/bitter/bitter.map14
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ly1--base.tfmbin0 -> 1824 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ly1.tfmbin0 -> 1924 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ot1.tfmbin0 -> 1408 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-t1--base.tfmbin0 -> 1744 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-t1.tfmbin0 -> 1852 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ts1--base.tfmbin0 -> 1396 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ts1.tfmbin0 -> 1400 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ly1--base.tfmbin0 -> 1988 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ly1.tfmbin0 -> 2036 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ot1.tfmbin0 -> 1452 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-t1--base.tfmbin0 -> 1940 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-t1.tfmbin0 -> 1992 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ts1--base.tfmbin0 -> 1416 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ts1.tfmbin0 -> 1416 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ly1--base.tfmbin0 -> 1712 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ly1.tfmbin0 -> 1928 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ot1.tfmbin0 -> 1476 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-t1--base.tfmbin0 -> 1652 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-t1.tfmbin0 -> 1880 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ts1--base.tfmbin0 -> 1376 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ts1.tfmbin0 -> 1380 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/huerta/bitter/Bttr-Bold.pfbbin0 -> 38783 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/huerta/bitter/Bttr-Italic.pfbbin0 -> 45380 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/huerta/bitter/Bttr-Regular.pfbbin0 -> 40493 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Bold-tlf-ly1.vfbin0 -> 1636 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Bold-tlf-t1.vfbin0 -> 1344 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Bold-tlf-ts1.vfbin0 -> 484 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Italic-tlf-ly1.vfbin0 -> 1652 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Italic-tlf-t1.vfbin0 -> 1628 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Italic-tlf-ts1.vfbin0 -> 500 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Regular-tlf-ly1.vfbin0 -> 1660 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Regular-tlf-t1.vfbin0 -> 1348 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Regular-tlf-ts1.vfbin0 -> 500 bytes
-rw-r--r--Master/texmf-dist/tex/latex/bitter/LY1Bttr-TLF.fd67
-rw-r--r--Master/texmf-dist/tex/latex/bitter/OT1Bttr-TLF.fd67
-rw-r--r--Master/texmf-dist/tex/latex/bitter/T1Bttr-TLF.fd67
-rw-r--r--Master/texmf-dist/tex/latex/bitter/TS1Bttr-TLF.fd67
-rw-r--r--Master/texmf-dist/tex/latex/bitter/bitter.sty48
-rw-r--r--Master/tlpkg/tlpsrc/bitter.tlpsrc1
54 files changed, 1022 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/fonts/bitter/README b/Master/texmf-dist/doc/fonts/bitter/README
index b70d708dd8c..ddd898b7249 100644
--- a/Master/texmf-dist/doc/fonts/bitter/README
+++ b/Master/texmf-dist/doc/fonts/bitter/README
@@ -1,12 +1,11 @@
This is the README for the bitter package, version
-2020-07-25.
+2020-08-02.
This package provides the Bitter family of fonts,
designed by Sol Matas for Huerta Tipografica
-(http://www.huertatipografica.com.ar), for use with xeLaTeX
-and luaLaTeX. Bitter is a contemporary slab-serif typeface
-for text. There are regular and bold weights and an italic,
-but no bold italic.
+(http://www.huertatipografica.com.ar). Bitter is a
+contemporary slab-serif typeface for text. There are regular
+and bold weights and an italic, but no bold italic.
To install this package on a TDS-compliant TeX system
download the file "tex-archive"/install/fonts/bitter.tds.zip
@@ -14,7 +13,8 @@ where the preferred URL for "tex-archive" is
http://mirrors.ctan.org. Unzip the archive at the root
of an appropriate texmf tree, likely a personal or local
tree. If necessary, update the file-name database (e.g.,
-texhash).
+texhash). Update the font-map files by enabling the Map file
+bitter.map.
To use, add
@@ -33,7 +33,9 @@ The original Truetype fonts were obtained from
https://fonts.google.com/specimen/Bitter
and are licensed under the SIL Open Font License, version
-1.1; the text may be found in the doc directory. The rest
-of the package is licensed under the terms of the LaTeX
-Project Public License. The maintainer of this package is
-Bob Tennent (rdt at cs.queensu.ca).
+1.1; the text may be found in the doc directory. The type1
+fonts were generated by fontforge and re-named in compliance
+with the Reserved Font Name provision of the OFL license.
+The rest of the package is licensed under the terms of the
+LaTeX Project Public License. The maintainer of this package
+is Bob Tennent (rdt at cs.queensu.ca).
diff --git a/Master/texmf-dist/doc/fonts/bitter/bitter-samples.pdf b/Master/texmf-dist/doc/fonts/bitter/bitter-samples.pdf
index 0bbc621301b..2c85d29be5f 100644
--- a/Master/texmf-dist/doc/fonts/bitter/bitter-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/bitter/bitter-samples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/bitter/bitter-samples.tex b/Master/texmf-dist/doc/fonts/bitter/bitter-samples.tex
index 0761c0ce00b..9403f92567b 100644
--- a/Master/texmf-dist/doc/fonts/bitter/bitter-samples.tex
+++ b/Master/texmf-dist/doc/fonts/bitter/bitter-samples.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage{bitter}
\usepackage{lipsum}
\begin{document}
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_6upxhe.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_6upxhe.enc
new file mode 100644
index 00000000000..dfe12f1c3c5
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_6upxhe.enc
@@ -0,0 +1,62 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_6upxhe2m74q2iptst22s37sn3e
+% Encoding created by otftotfm on Sun Aug 2 10:59:07 2020
+% Command line follows encoding
+/AutoEnc_6upxhe2m74q2iptst22s37sn3e [
+%00
+ /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.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 /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/huerta/bitter
+% --vf-directory=texmf/fonts/vf/huerta/bitter
+% --truetype-directory=texmf/fonts/truetype/huerta/bitter
+% --encoding-directory=texmf/fonts/enc/dvips/bitter
+% --map-file=texmf/fonts/map/dvips/bitter/Bttr.map --no-updmap --force
+% --coding-scheme=TEX TEXT Bttr-Italic.ttf Bttr-Italic-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_72jdjw.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_72jdjw.enc
new file mode 100644
index 00000000000..936089b5a37
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_72jdjw.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_72jdjwm5vgvijtliocbuglmi3h
+% Encoding created by otftotfm on Sun Aug 2 10:59:06 2020
+% Command line follows encoding
+/AutoEnc_72jdjwm5vgvijtliocbuglmi3h [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /.notdef /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /.notdef /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+ /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
+ /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/huerta/bitter
+% --vf-directory=texmf/fonts/vf/huerta/bitter
+% --truetype-directory=texmf/fonts/truetype/huerta/bitter
+% --encoding-directory=texmf/fonts/enc/dvips/bitter
+% --map-file=texmf/fonts/map/dvips/bitter/Bttr.map --no-updmap --force
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% Bttr-Bold.ttf Bttr-Bold-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_azarls.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_azarls.enc
new file mode 100644
index 00000000000..ea9949bfd73
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_azarls.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_azarlslxpu5crmzy6prv63uygf
+% Encoding created by otftotfm on Sun Aug 2 10:59:07 2020
+% Command line follows encoding
+/AutoEnc_azarlslxpu5crmzy6prv63uygf [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+ /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
+ /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/huerta/bitter
+% --vf-directory=texmf/fonts/vf/huerta/bitter
+% --truetype-directory=texmf/fonts/truetype/huerta/bitter
+% --encoding-directory=texmf/fonts/enc/dvips/bitter
+% --map-file=texmf/fonts/map/dvips/bitter/Bttr.map --no-updmap --force
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI Bttr-Italic.ttf
+% Bttr-Italic-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_b5i5mx.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_b5i5mx.enc
new file mode 100644
index 00000000000..13c9588d2ee
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_b5i5mx.enc
@@ -0,0 +1,62 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_b5i5mxmtjpehcnzsivl27t6vdh
+% Encoding created by otftotfm on Sun Aug 2 10:59:06 2020
+% Command line follows encoding
+/AutoEnc_b5i5mxmtjpehcnzsivl27t6vdh [
+%00
+ /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /.notdef /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.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 /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/huerta/bitter
+% --vf-directory=texmf/fonts/vf/huerta/bitter
+% --truetype-directory=texmf/fonts/truetype/huerta/bitter
+% --encoding-directory=texmf/fonts/enc/dvips/bitter
+% --map-file=texmf/fonts/map/dvips/bitter/Bttr.map --no-updmap --force
+% --coding-scheme=TEX TEXT --feature=kern Bttr-Bold.ttf Bttr-Bold-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_f2umud.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_f2umud.enc
new file mode 100644
index 00000000000..08e869be241
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_f2umud.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_f2umud5nj76no6f4hufpv63avg
+% Encoding created by otftotfm on Sun Aug 2 10:59:07 2020
+% Command line follows encoding
+/AutoEnc_f2umud5nj76no6f4hufpv63avg [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /.notdef /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
+ /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/huerta/bitter
+% --vf-directory=texmf/fonts/vf/huerta/bitter
+% --truetype-directory=texmf/fonts/truetype/huerta/bitter
+% --encoding-directory=texmf/fonts/enc/dvips/bitter
+% --map-file=texmf/fonts/map/dvips/bitter/Bttr.map --no-updmap --force
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% Bttr-Regular.ttf Bttr-Regular-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_gljolu.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_gljolu.enc
new file mode 100644
index 00000000000..2850b6f33e0
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_gljolu.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_gljoluzdupcjvmvcx5spx3cmkd
+% Encoding created by otftotfm on Sun Aug 2 10:59:06 2020
+% Command line follows encoding
+/AutoEnc_gljoluzdupcjvmvcx5spx3cmkd [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /Scaron /.notdef /.notdef /.notdef /.notdef /.notdef
+ /Ydieresis /.notdef /Zcaron /.notdef /.notdef /.notdef /.notdef /section
+%A0
+ /.notdef /aogonek /.notdef /.notdef /.notdef /.notdef /eogonek /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /scaron /.notdef /.notdef /.notdef /.notdef /.notdef
+ /ydieresis /.notdef /zcaron /.notdef /.notdef /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/huerta/bitter
+% --vf-directory=texmf/fonts/vf/huerta/bitter
+% --truetype-directory=texmf/fonts/truetype/huerta/bitter
+% --encoding-directory=texmf/fonts/enc/dvips/bitter
+% --map-file=texmf/fonts/map/dvips/bitter/Bttr.map --no-updmap --force
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% Bttr-Bold.ttf Bttr-Bold-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_ncjtqa.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_ncjtqa.enc
new file mode 100644
index 00000000000..617e56435dd
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_ncjtqa.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ncjtqa6w53xc5iw5jpj6lsnv3a
+% Encoding created by otftotfm on Sun Aug 2 10:59:07 2020
+% Command line follows encoding
+/AutoEnc_ncjtqa6w53xc5iw5jpj6lsnv3a [
+%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 /Omega
+ /.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 /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
+%B0
+ /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered
+ /.notdef /onesuperior /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/fonts/tfm/huerta/bitter
+% --vf-directory=texmf/fonts/vf/huerta/bitter
+% --truetype-directory=texmf/fonts/truetype/huerta/bitter
+% --encoding-directory=texmf/fonts/enc/dvips/bitter
+% --map-file=texmf/fonts/map/dvips/bitter/Bttr.map --no-updmap --force
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 Bttr-Italic.ttf
+% Bttr-Italic-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_ssdm5h.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_ssdm5h.enc
new file mode 100644
index 00000000000..7122fe6163e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_ssdm5h.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ssdm5hoa4cjlz25r7myoz4wwob
+% Encoding created by otftotfm on Sun Aug 2 10:59:07 2020
+% Command line follows encoding
+/AutoEnc_ssdm5hoa4cjlz25r7myoz4wwob [
+%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 /uni03A9
+ /.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 /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
+%B0
+ /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered
+ /.notdef /onesuperior /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/fonts/tfm/huerta/bitter
+% --vf-directory=texmf/fonts/vf/huerta/bitter
+% --truetype-directory=texmf/fonts/truetype/huerta/bitter
+% --encoding-directory=texmf/fonts/enc/dvips/bitter
+% --map-file=texmf/fonts/map/dvips/bitter/Bttr.map --no-updmap --force
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 Bttr-Regular.ttf
+% Bttr-Regular-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_vzfpnj.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_vzfpnj.enc
new file mode 100644
index 00000000000..8540af9bdc5
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_vzfpnj.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_vzfpnj5z64g6oor364db7i6alc
+% Encoding created by otftotfm on Sun Aug 2 10:59:07 2020
+% Command line follows encoding
+/AutoEnc_vzfpnj5z64g6oor364db7i6alc [
+%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 /.notdef
+ /.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 /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
+%B0
+ /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered
+ /.notdef /onesuperior /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/fonts/tfm/huerta/bitter
+% --vf-directory=texmf/fonts/vf/huerta/bitter
+% --truetype-directory=texmf/fonts/truetype/huerta/bitter
+% --encoding-directory=texmf/fonts/enc/dvips/bitter
+% --map-file=texmf/fonts/map/dvips/bitter/Bttr.map --no-updmap --force
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 Bttr-Bold.ttf
+% Bttr-Bold-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_w3wxei.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_w3wxei.enc
new file mode 100644
index 00000000000..ebc4fe6863c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_w3wxei.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_w3wxeivjqfma7thzjcozosvs3e
+% Encoding created by otftotfm on Sun Aug 2 10:59:07 2020
+% Command line follows encoding
+/AutoEnc_w3wxeivjqfma7thzjcozosvs3e [
+%00
+ /.notdef /uni0394 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /.notdef /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.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 /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/huerta/bitter
+% --vf-directory=texmf/fonts/vf/huerta/bitter
+% --truetype-directory=texmf/fonts/truetype/huerta/bitter
+% --encoding-directory=texmf/fonts/enc/dvips/bitter
+% --map-file=texmf/fonts/map/dvips/bitter/Bttr.map --no-updmap --force
+% --coding-scheme=TEX TEXT --feature=kern Bttr-Regular.ttf
+% Bttr-Regular-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_x2bjkb.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_x2bjkb.enc
new file mode 100644
index 00000000000..e01b882061f
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/bitter/bttr_x2bjkb.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_x2bjkb5sd5zxjhh6beeklz5rxd
+% Encoding created by otftotfm on Sun Aug 2 10:59:07 2020
+% Command line follows encoding
+/AutoEnc_x2bjkb5sd5zxjhh6beeklz5rxd [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /.notdef /Lslash /Nacute /Ncaron /.notdef /.notdef /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /.notdef /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /.notdef /section
+%A0
+ /abreve /aogonek /cacute /ccaron /.notdef /ecaron /eogonek /gbreve
+ /lacute /.notdef /lslash /nacute /ncaron /.notdef /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /scedilla /.notdef /tcommaaccent /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/huerta/bitter
+% --vf-directory=texmf/fonts/vf/huerta/bitter
+% --truetype-directory=texmf/fonts/truetype/huerta/bitter
+% --encoding-directory=texmf/fonts/enc/dvips/bitter
+% --map-file=texmf/fonts/map/dvips/bitter/Bttr.map --no-updmap --force
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN Bttr-Italic.ttf
+% Bttr-Italic-tlf-t1'
diff --git a/Master/texmf-dist/fonts/map/dvips/bitter/bitter.map b/Master/texmf-dist/fonts/map/dvips/bitter/bitter.map
new file mode 100644
index 00000000000..eebc29b198f
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/bitter/bitter.map
@@ -0,0 +1,14 @@
+% Automatically maintained by otftotfm or other programs. Do not edit.
+
+Bttr-Bold-tlf-ot1 Bttr-Bold "AutoEnc_b5i5mxmtjpehcnzsivl27t6vdh ReEncodeFont" <[bttr_b5i5mx.enc <Bttr-Bold.pfb
+Bttr-Bold-tlf-t1--base Bttr-Bold "AutoEnc_gljoluzdupcjvmvcx5spx3cmkd ReEncodeFont" <[bttr_gljolu.enc <Bttr-Bold.pfb
+Bttr-Bold-tlf-ly1--base Bttr-Bold "AutoEnc_72jdjwm5vgvijtliocbuglmi3h ReEncodeFont" <[bttr_72jdjw.enc <Bttr-Bold.pfb
+Bttr-Bold-tlf-ts1--base Bttr-Bold "AutoEnc_vzfpnj5z64g6oor364db7i6alc ReEncodeFont" <[bttr_vzfpnj.enc <Bttr-Bold.pfb
+Bttr-Italic-tlf-ot1 Bttr-Italic "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[bttr_6upxhe.enc <Bttr-Italic.pfb
+Bttr-Italic-tlf-t1--base Bttr-Italic "AutoEnc_x2bjkb5sd5zxjhh6beeklz5rxd ReEncodeFont" <[bttr_x2bjkb.enc <Bttr-Italic.pfb
+Bttr-Italic-tlf-ly1--base Bttr-Italic "AutoEnc_azarlslxpu5crmzy6prv63uygf ReEncodeFont" <[bttr_azarls.enc <Bttr-Italic.pfb
+Bttr-Italic-tlf-ts1--base Bttr-Italic "AutoEnc_ncjtqa6w53xc5iw5jpj6lsnv3a ReEncodeFont" <[bttr_ncjtqa.enc <Bttr-Italic.pfb
+Bttr-Regular-tlf-ot1 Bttr-Regular "AutoEnc_w3wxeivjqfma7thzjcozosvs3e ReEncodeFont" <[bttr_w3wxei.enc <Bttr-Regular.pfb
+Bttr-Regular-tlf-t1--base Bttr-Regular "AutoEnc_gljoluzdupcjvmvcx5spx3cmkd ReEncodeFont" <[bttr_gljolu.enc <Bttr-Regular.pfb
+Bttr-Regular-tlf-ly1--base Bttr-Regular "AutoEnc_f2umud5nj76no6f4hufpv63avg ReEncodeFont" <[bttr_f2umud.enc <Bttr-Regular.pfb
+Bttr-Regular-tlf-ts1--base Bttr-Regular "AutoEnc_ssdm5hoa4cjlz25r7myoz4wwob ReEncodeFont" <[bttr_ssdm5h.enc <Bttr-Regular.pfb
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ly1--base.tfm
new file mode 100644
index 00000000000..65cf28e989a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ly1.tfm
new file mode 100644
index 00000000000..20660b97dfb
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ot1.tfm
new file mode 100644
index 00000000000..688be204745
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-t1--base.tfm
new file mode 100644
index 00000000000..2362c879cb3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-t1.tfm
new file mode 100644
index 00000000000..4670c923b8c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ts1--base.tfm
new file mode 100644
index 00000000000..0faf0b859d3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ts1.tfm
new file mode 100644
index 00000000000..d57469f5ac6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Bold-tlf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ly1--base.tfm
new file mode 100644
index 00000000000..9f1cb535cff
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ly1.tfm
new file mode 100644
index 00000000000..ce1a9fa5558
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ot1.tfm
new file mode 100644
index 00000000000..ccfc9fa5c52
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-t1--base.tfm
new file mode 100644
index 00000000000..5338c507d64
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-t1.tfm
new file mode 100644
index 00000000000..c8f22f817d9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ts1--base.tfm
new file mode 100644
index 00000000000..25b61f9edb8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ts1.tfm
new file mode 100644
index 00000000000..a35b2e426dc
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Italic-tlf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ly1--base.tfm
new file mode 100644
index 00000000000..623221c5835
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ly1.tfm
new file mode 100644
index 00000000000..bbee9c977eb
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ot1.tfm
new file mode 100644
index 00000000000..e6c484bd9df
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-t1--base.tfm
new file mode 100644
index 00000000000..937c82ad708
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-t1.tfm
new file mode 100644
index 00000000000..c024da805bb
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ts1--base.tfm
new file mode 100644
index 00000000000..1610ee63032
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ts1.tfm
new file mode 100644
index 00000000000..7e0a9bb23df
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bttr-Regular-tlf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/huerta/bitter/Bttr-Bold.pfb b/Master/texmf-dist/fonts/type1/huerta/bitter/Bttr-Bold.pfb
new file mode 100644
index 00000000000..4dfc3f55703
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/huerta/bitter/Bttr-Bold.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/huerta/bitter/Bttr-Italic.pfb b/Master/texmf-dist/fonts/type1/huerta/bitter/Bttr-Italic.pfb
new file mode 100644
index 00000000000..b4ac80c318c
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/huerta/bitter/Bttr-Italic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/huerta/bitter/Bttr-Regular.pfb b/Master/texmf-dist/fonts/type1/huerta/bitter/Bttr-Regular.pfb
new file mode 100644
index 00000000000..64320a1db9a
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/huerta/bitter/Bttr-Regular.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Bold-tlf-ly1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Bold-tlf-ly1.vf
new file mode 100644
index 00000000000..080635ec388
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Bold-tlf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Bold-tlf-t1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Bold-tlf-t1.vf
new file mode 100644
index 00000000000..fc97fdd752b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Bold-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Bold-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Bold-tlf-ts1.vf
new file mode 100644
index 00000000000..c896704bda6
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Bold-tlf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Italic-tlf-ly1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Italic-tlf-ly1.vf
new file mode 100644
index 00000000000..d99d15e322b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Italic-tlf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Italic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Italic-tlf-t1.vf
new file mode 100644
index 00000000000..22d98597215
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Italic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Italic-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Italic-tlf-ts1.vf
new file mode 100644
index 00000000000..87237c85bd6
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Italic-tlf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Regular-tlf-ly1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Regular-tlf-ly1.vf
new file mode 100644
index 00000000000..3492ba65205
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Regular-tlf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Regular-tlf-t1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Regular-tlf-t1.vf
new file mode 100644
index 00000000000..43adde4bd47
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Regular-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Regular-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Regular-tlf-ts1.vf
new file mode 100644
index 00000000000..240f3166902
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/huerta/bitter/Bttr-Regular-tlf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/bitter/LY1Bttr-TLF.fd b/Master/texmf-dist/tex/latex/bitter/LY1Bttr-TLF.fd
new file mode 100644
index 00000000000..06a6fde47c0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bitter/LY1Bttr-TLF.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2020/08/02
+%%
+\ProvidesFile{LY1Bttr-TLF.fd}
+ [2020/08/02 (autoinst) Font definitions for LY1/Bttr-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Bttr@scale\endcsname\relax
+ \let\Bttr@@scale\@empty
+\else
+ \edef\Bttr@@scale{s*[\csname Bttr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Bttr-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Bttr-TLF}{m}{n}{
+ <-> \Bttr@@scale Bttr-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Bttr-TLF}{regular}{n}{
+ <-> alias * Bttr-TLF/m/n
+}{}
+
+\DeclareFontShape{LY1}{Bttr-TLF}{m}{it}{
+ <-> \Bttr@@scale Bttr-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Bttr-TLF}{regular}{it}{
+ <-> alias * Bttr-TLF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Bttr-TLF}{m}{sl}{
+ <-> ssub * Bttr-TLF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Bttr-TLF}{regular}{sl}{
+ <-> ssub * Bttr-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{Bttr-TLF}{b}{n}{
+ <-> \Bttr@@scale Bttr-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Bttr-TLF}{bold}{n}{
+ <-> alias * Bttr-TLF/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{Bttr-TLF}{bx}{n}{
+ <-> ssub * Bttr-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/bitter/OT1Bttr-TLF.fd b/Master/texmf-dist/tex/latex/bitter/OT1Bttr-TLF.fd
new file mode 100644
index 00000000000..b2a13ab5d76
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bitter/OT1Bttr-TLF.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2020/08/02
+%%
+\ProvidesFile{OT1Bttr-TLF.fd}
+ [2020/08/02 (autoinst) Font definitions for OT1/Bttr-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Bttr@scale\endcsname\relax
+ \let\Bttr@@scale\@empty
+\else
+ \edef\Bttr@@scale{s*[\csname Bttr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Bttr-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Bttr-TLF}{m}{n}{
+ <-> \Bttr@@scale Bttr-Regular-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Bttr-TLF}{regular}{n}{
+ <-> alias * Bttr-TLF/m/n
+}{}
+
+\DeclareFontShape{OT1}{Bttr-TLF}{m}{it}{
+ <-> \Bttr@@scale Bttr-Italic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Bttr-TLF}{regular}{it}{
+ <-> alias * Bttr-TLF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Bttr-TLF}{m}{sl}{
+ <-> ssub * Bttr-TLF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Bttr-TLF}{regular}{sl}{
+ <-> ssub * Bttr-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Bttr-TLF}{b}{n}{
+ <-> \Bttr@@scale Bttr-Bold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Bttr-TLF}{bold}{n}{
+ <-> alias * Bttr-TLF/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{Bttr-TLF}{bx}{n}{
+ <-> ssub * Bttr-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/bitter/T1Bttr-TLF.fd b/Master/texmf-dist/tex/latex/bitter/T1Bttr-TLF.fd
new file mode 100644
index 00000000000..6f501bf729c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bitter/T1Bttr-TLF.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2020/08/02
+%%
+\ProvidesFile{T1Bttr-TLF.fd}
+ [2020/08/02 (autoinst) Font definitions for T1/Bttr-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Bttr@scale\endcsname\relax
+ \let\Bttr@@scale\@empty
+\else
+ \edef\Bttr@@scale{s*[\csname Bttr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Bttr-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{Bttr-TLF}{m}{n}{
+ <-> \Bttr@@scale Bttr-Regular-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Bttr-TLF}{regular}{n}{
+ <-> alias * Bttr-TLF/m/n
+}{}
+
+\DeclareFontShape{T1}{Bttr-TLF}{m}{it}{
+ <-> \Bttr@@scale Bttr-Italic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Bttr-TLF}{regular}{it}{
+ <-> alias * Bttr-TLF/m/it
+}{}
+
+\DeclareFontShape{T1}{Bttr-TLF}{m}{sl}{
+ <-> ssub * Bttr-TLF/m/it
+}{}
+
+\DeclareFontShape{T1}{Bttr-TLF}{regular}{sl}{
+ <-> ssub * Bttr-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Bttr-TLF}{b}{n}{
+ <-> \Bttr@@scale Bttr-Bold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Bttr-TLF}{bold}{n}{
+ <-> alias * Bttr-TLF/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{Bttr-TLF}{bx}{n}{
+ <-> ssub * Bttr-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/bitter/TS1Bttr-TLF.fd b/Master/texmf-dist/tex/latex/bitter/TS1Bttr-TLF.fd
new file mode 100644
index 00000000000..f3c83f56124
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bitter/TS1Bttr-TLF.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2020/08/02
+%%
+\ProvidesFile{TS1Bttr-TLF.fd}
+ [2020/08/02 (autoinst) Font definitions for TS1/Bttr-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Bttr@scale\endcsname\relax
+ \let\Bttr@@scale\@empty
+\else
+ \edef\Bttr@@scale{s*[\csname Bttr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{Bttr-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{Bttr-TLF}{m}{n}{
+ <-> \Bttr@@scale Bttr-Regular-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Bttr-TLF}{regular}{n}{
+ <-> alias * Bttr-TLF/m/n
+}{}
+
+\DeclareFontShape{TS1}{Bttr-TLF}{m}{it}{
+ <-> \Bttr@@scale Bttr-Italic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Bttr-TLF}{regular}{it}{
+ <-> alias * Bttr-TLF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Bttr-TLF}{m}{sl}{
+ <-> ssub * Bttr-TLF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Bttr-TLF}{regular}{sl}{
+ <-> ssub * Bttr-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{Bttr-TLF}{b}{n}{
+ <-> \Bttr@@scale Bttr-Bold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Bttr-TLF}{bold}{n}{
+ <-> alias * Bttr-TLF/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{Bttr-TLF}{bx}{n}{
+ <-> ssub * Bttr-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/bitter/bitter.sty b/Master/texmf-dist/tex/latex/bitter/bitter.sty
index b792ae6d1e6..a215441ee70 100644
--- a/Master/texmf-dist/tex/latex/bitter/bitter.sty
+++ b/Master/texmf-dist/tex/latex/bitter/bitter.sty
@@ -1,31 +1,40 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bitter}
- [200/07/25 (R.D. Tennent) Supports Bitter fonts for xeLaTeX and luaLaTeX.]
+ [2020/08/02 (R.D. Tennent) Supports Bitter fonts for all LaTeX engines.]
-\RequirePackage{iftex}
+\RequirePackage{ifxetex,ifluatex,textcomp}
-\ifpdftex
-\PackageError{bitter}{%
- *****************************************\MessageBreak
- Please process using XeLaTeX or luaLaTeX\MessageBreak
- *****************************************}
-\fi
+\newif\ifBitter@ttf
+\ifxetex
+ \Bitter@ttftrue
+\else\ifluatex
+ \Bitter@ttftrue
+\else % [pdf]LaTeX
+ \Bitter@ttffalse
+\fi\fi
-
-\newcommand*{\Bitter@scale}{1}
+\newcommand*{\Bttr@scale}{1}
\RequirePackage{xkeyval}
-\DeclareOptionX{scaled}{\renewcommand*{\Bitter@scale}{#1}}
-\DeclareOptionX{scale}{\renewcommand*{\Bitter@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\Bttr@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\Bttr@scale}{#1}}
+
+\DeclareOptionX{type1}{\Bitter@ttffalse}
\ProcessOptionsX\relax
+\ifBitter@ttf
\RequirePackage{fontspec}
+\else
+ \RequirePackage{fontenc,fontaxes,mweights}
+\fi
+\ifBitter@ttf
+ \def\Bitter@regular{Regular}
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
Extension = .ttf ,
- Scale = \Bitter@scale ,
+ Scale = \Bttr@scale ,
}
\setmainfont
[ UprightFont = *-Regular ,
@@ -43,8 +52,21 @@
]
{Bitter}
+\else % type1
+
+ \def\bfseries@rm{b}
+ \def\mdseries@rm{m}
+ \def\seriesdefault{\mdseries@rm}
+ \def\bitterfamily{Bttr-TLF}
+ \def\bitter{\fontfamily{\bitterfamily}\selectfont}
+ \def\rmdefault{\bitterfamily}
+
+\fi
+
% turn off defaults in case other fonts are selected:
+\ifBitter@ttf
\defaultfontfeatures{}
+\fi
\endinput
diff --git a/Master/tlpkg/tlpsrc/bitter.tlpsrc b/Master/tlpkg/tlpsrc/bitter.tlpsrc
index e69de29bb2d..493569ed3f6 100644
--- a/Master/tlpkg/tlpsrc/bitter.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bitter.tlpsrc
@@ -0,0 +1 @@
+execute addMap ${PKGNAME}.map