bitter (25jul20)

git-svn-id: svn://tug.org/texlive/trunk@55939 c570f23f-e606-0410-a88d-b1316a301751

53 files changed, 22 insertions, 1030 deletions

diff --git a/Master/texmf-dist/doc/fonts/bitter/README b/Master/texmf-dist/doc/fonts/bitter/README
index 3f5a2a64545..b70d708dd8c 100644
--- a/Master/texmf-dist/doc/fonts/bitter/README
+++ b/Master/texmf-dist/doc/fonts/bitter/README
@@ -1,12 +1,12 @@
 This is the README for the bitter package, version
-2019-05-10.
+2020-07-25.
 
-This package provides LaTeX, pdfLaTeX, XeLaTeX
-and LuaLaTeX support for the Bitter family of
-fonts, designed by Sol Matas for Huerta Tipografica
-(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.
+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.
 
 To install this package on a TDS-compliant TeX system
 download the file "tex-archive"/install/fonts/bitter.tds.zip
@@ -14,8 +14,7 @@ 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). Update the font-map files by enabling the Map file
-bitter.map.
+texhash). 
 
 To use, add
 
@@ -24,24 +23,17 @@ To use, add
 to the preamble of your document. This will activate Bitter as
 the main (serifed) text font. 
 
-LuaLaTeX and xeLaTeX users who might prefer type1 fonts or who wish
-to avoid fontspec may use the type1 option.
-
 Options scaled=<number> or scale=<number> may be used to scale the
 fonts.
 
 The only figure style is tabular-lining.
 
-Font encodings supported are OT1, T1, LY1, and TS1.
-
 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 type1 versions were created using fontforge. The
-support files were created using autoinst and otftotfm and
-are licensed under the terms of the LaTeX Project Public
-License. The maintainer of this package is Bob Tennent (rdt
-at cs.queensu.ca)
+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).
diff --git a/Master/texmf-dist/doc/fonts/bitter/bitter-samples.pdf b/Master/texmf-dist/doc/fonts/bitter/bitter-samples.pdf
index e6d89d258a8..0bbc621301b 100644
--- a/Master/texmf-dist/doc/fonts/bitter/bitter-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/bitter/bitter-samples.pdf
diff --git a/Master/texmf-dist/doc/fonts/bitter/bitter-samples.tex b/Master/texmf-dist/doc/fonts/bitter/bitter-samples.tex
index 9403f92567b..0761c0ce00b 100644
--- a/Master/texmf-dist/doc/fonts/bitter/bitter-samples.tex
+++ b/Master/texmf-dist/doc/fonts/bitter/bitter-samples.tex
@@ -1,5 +1,4 @@
 \documentclass{article}
-\usepackage[T1]{fontenc}
 \usepackage{bitter}
 \usepackage{lipsum}
 \begin{document}
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_6upxhe.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/btr_6upxhe.enc
deleted file mode 100644
index d8e495723d9..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_6upxhe.enc
+++ /dev/null
@@ -1,63 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_6upxhe2m74q2iptst22s37sn3e
-% Encoding created by otftotfm on Fri May 10 14:33:39 2019
-% 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
-% --type1-directory=texmf/fonts/type1/huerta/bitter
-% --truetype-directory=texmf/fonts/truetype/huerta/bitter
-% --encoding-directory=texmf/fonts/enc/dvips/bitter
-% --map-file=texmf/fonts/map/dvips/bitter/Bitter.map --no-updmap --no-type1
-% --coding-scheme=TEX TEXT Bitter-Italic.ttf Bitter-Italic-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_72jdjw.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/btr_72jdjw.enc
deleted file mode 100644
index f4b921346d5..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_72jdjw.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_72jdjwm5vgvijtliocbuglmi3h
-% Encoding created by otftotfm on Fri May 10 14:33:38 2019
-% 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
-% --type1-directory=texmf/fonts/type1/huerta/bitter
-% --truetype-directory=texmf/fonts/truetype/huerta/bitter
-% --encoding-directory=texmf/fonts/enc/dvips/bitter
-% --map-file=texmf/fonts/map/dvips/bitter/Bitter.map --no-updmap --no-type1
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% Bitter-Bold.ttf Bitter-Bold-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_azarls.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/btr_azarls.enc
deleted file mode 100644
index e16457cff68..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_azarls.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_azarlslxpu5crmzy6prv63uygf
-% Encoding created by otftotfm on Fri May 10 14:33:39 2019
-% 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
-% --type1-directory=texmf/fonts/type1/huerta/bitter
-% --truetype-directory=texmf/fonts/truetype/huerta/bitter
-% --encoding-directory=texmf/fonts/enc/dvips/bitter
-% --map-file=texmf/fonts/map/dvips/bitter/Bitter.map --no-updmap --no-type1
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI Bitter-Italic.ttf
-% Bitter-Italic-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_b5i5mx.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/btr_b5i5mx.enc
deleted file mode 100644
index fabffb3395a..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_b5i5mx.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_b5i5mxmtjpehcnzsivl27t6vdh
-% Encoding created by otftotfm on Fri May 10 14:33:38 2019
-% 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
-% --type1-directory=texmf/fonts/type1/huerta/bitter
-% --truetype-directory=texmf/fonts/truetype/huerta/bitter
-% --encoding-directory=texmf/fonts/enc/dvips/bitter
-% --map-file=texmf/fonts/map/dvips/bitter/Bitter.map --no-updmap --no-type1
-% --coding-scheme=TEX TEXT --feature=kern Bitter-Bold.ttf
-% Bitter-Bold-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_f2umud.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/btr_f2umud.enc
deleted file mode 100644
index cfd44d8fac0..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_f2umud.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_f2umud5nj76no6f4hufpv63avg
-% Encoding created by otftotfm on Fri May 10 14:33:39 2019
-% 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
-% --type1-directory=texmf/fonts/type1/huerta/bitter
-% --truetype-directory=texmf/fonts/truetype/huerta/bitter
-% --encoding-directory=texmf/fonts/enc/dvips/bitter
-% --map-file=texmf/fonts/map/dvips/bitter/Bitter.map --no-updmap --no-type1
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% Bitter-Regular.ttf Bitter-Regular-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_gljolu.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/btr_gljolu.enc
deleted file mode 100644
index 04f9e2383f0..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_gljolu.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_gljoluzdupcjvmvcx5spx3cmkd
-% Encoding created by otftotfm on Fri May 10 14:33:38 2019
-% 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
-% --type1-directory=texmf/fonts/type1/huerta/bitter
-% --truetype-directory=texmf/fonts/truetype/huerta/bitter
-% --encoding-directory=texmf/fonts/enc/dvips/bitter
-% --map-file=texmf/fonts/map/dvips/bitter/Bitter.map --no-updmap --no-type1
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% Bitter-Bold.ttf Bitter-Bold-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_ncjtqa.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/btr_ncjtqa.enc
deleted file mode 100644
index bed02f7a948..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_ncjtqa.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ncjtqa6w53xc5iw5jpj6lsnv3a
-% Encoding created by otftotfm on Fri May 10 14:33:39 2019
-% 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
-% --type1-directory=texmf/fonts/type1/huerta/bitter
-% --truetype-directory=texmf/fonts/truetype/huerta/bitter
-% --encoding-directory=texmf/fonts/enc/dvips/bitter
-% --map-file=texmf/fonts/map/dvips/bitter/Bitter.map --no-updmap --no-type1
-% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 Bitter-Italic.ttf
-% Bitter-Italic-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_ssdm5h.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/btr_ssdm5h.enc
deleted file mode 100644
index 49fde19c612..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_ssdm5h.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ssdm5hoa4cjlz25r7myoz4wwob
-% Encoding created by otftotfm on Fri May 10 14:33:40 2019
-% 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
-% --type1-directory=texmf/fonts/type1/huerta/bitter
-% --truetype-directory=texmf/fonts/truetype/huerta/bitter
-% --encoding-directory=texmf/fonts/enc/dvips/bitter
-% --map-file=texmf/fonts/map/dvips/bitter/Bitter.map --no-updmap --no-type1
-% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 Bitter-Regular.ttf
-% Bitter-Regular-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_vzfpnj.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/btr_vzfpnj.enc
deleted file mode 100644
index 6fd565b7aec..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_vzfpnj.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_vzfpnj5z64g6oor364db7i6alc
-% Encoding created by otftotfm on Fri May 10 14:33:39 2019
-% 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
-% --type1-directory=texmf/fonts/type1/huerta/bitter
-% --truetype-directory=texmf/fonts/truetype/huerta/bitter
-% --encoding-directory=texmf/fonts/enc/dvips/bitter
-% --map-file=texmf/fonts/map/dvips/bitter/Bitter.map --no-updmap --no-type1
-% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 Bitter-Bold.ttf
-% Bitter-Bold-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_w3wxei.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/btr_w3wxei.enc
deleted file mode 100644
index e71d6635d27..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_w3wxei.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_w3wxeivjqfma7thzjcozosvs3e
-% Encoding created by otftotfm on Fri May 10 14:33:39 2019
-% 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
-% --type1-directory=texmf/fonts/type1/huerta/bitter
-% --truetype-directory=texmf/fonts/truetype/huerta/bitter
-% --encoding-directory=texmf/fonts/enc/dvips/bitter
-% --map-file=texmf/fonts/map/dvips/bitter/Bitter.map --no-updmap --no-type1
-% --coding-scheme=TEX TEXT --feature=kern Bitter-Regular.ttf
-% Bitter-Regular-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_x2bjkb.enc b/Master/texmf-dist/fonts/enc/dvips/bitter/btr_x2bjkb.enc
deleted file mode 100644
index 840a78c7f06..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/bitter/btr_x2bjkb.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_x2bjkb5sd5zxjhh6beeklz5rxd
-% Encoding created by otftotfm on Fri May 10 14:33:39 2019
-% 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
-% --type1-directory=texmf/fonts/type1/huerta/bitter
-% --truetype-directory=texmf/fonts/truetype/huerta/bitter
-% --encoding-directory=texmf/fonts/enc/dvips/bitter
-% --map-file=texmf/fonts/map/dvips/bitter/Bitter.map --no-updmap --no-type1
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN Bitter-Italic.ttf
-% Bitter-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
deleted file mode 100644
index 37a74a5d6ef..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/bitter/bitter.map
+++ /dev/null
@@ -1,14 +0,0 @@
-% Automatically maintained by otftotfm or other programs. Do not edit.
-
-Bitter-Bold-tlf-ot1 Bitter-Bold "AutoEnc_b5i5mxmtjpehcnzsivl27t6vdh ReEncodeFont" <[btr_b5i5mx.enc <Bitter-Bold.pfb
-Bitter-Bold-tlf-t1--base Bitter-Bold "AutoEnc_gljoluzdupcjvmvcx5spx3cmkd ReEncodeFont" <[btr_gljolu.enc <Bitter-Bold.pfb
-Bitter-Bold-tlf-ly1--base Bitter-Bold "AutoEnc_72jdjwm5vgvijtliocbuglmi3h ReEncodeFont" <[btr_72jdjw.enc <Bitter-Bold.pfb
-Bitter-Bold-tlf-ts1--base Bitter-Bold "AutoEnc_vzfpnj5z64g6oor364db7i6alc ReEncodeFont" <[btr_vzfpnj.enc <Bitter-Bold.pfb
-Bitter-Italic-tlf-ot1 Bitter-Italic "AutoEnc_6upxhe2m74q2iptst22s37sn3e ReEncodeFont" <[btr_6upxhe.enc <Bitter-Italic.pfb
-Bitter-Italic-tlf-t1--base Bitter-Italic "AutoEnc_x2bjkb5sd5zxjhh6beeklz5rxd ReEncodeFont" <[btr_x2bjkb.enc <Bitter-Italic.pfb
-Bitter-Italic-tlf-ly1--base Bitter-Italic "AutoEnc_azarlslxpu5crmzy6prv63uygf ReEncodeFont" <[btr_azarls.enc <Bitter-Italic.pfb
-Bitter-Italic-tlf-ts1--base Bitter-Italic "AutoEnc_ncjtqa6w53xc5iw5jpj6lsnv3a ReEncodeFont" <[btr_ncjtqa.enc <Bitter-Italic.pfb
-Bitter-Regular-tlf-ot1 Bitter-Regular "AutoEnc_w3wxeivjqfma7thzjcozosvs3e ReEncodeFont" <[btr_w3wxei.enc <Bitter-Regular.pfb
-Bitter-Regular-tlf-t1--base Bitter-Regular "AutoEnc_gljoluzdupcjvmvcx5spx3cmkd ReEncodeFont" <[btr_gljolu.enc <Bitter-Regular.pfb
-Bitter-Regular-tlf-ly1--base Bitter-Regular "AutoEnc_f2umud5nj76no6f4hufpv63avg ReEncodeFont" <[btr_f2umud.enc <Bitter-Regular.pfb
-Bitter-Regular-tlf-ts1--base Bitter-Regular "AutoEnc_ssdm5hoa4cjlz25r7myoz4wwob ReEncodeFont" <[btr_ssdm5h.enc <Bitter-Regular.pfb
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-ly1--base.tfm
deleted file mode 100644
index 5624f204349..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-ly1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-ly1.tfm
deleted file mode 100644
index b54b8b75fbc..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-ly1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-ot1.tfm
deleted file mode 100644
index 9fbfca67d8e..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-ot1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-t1--base.tfm
deleted file mode 100644
index 8f69293ef2d..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-t1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-t1.tfm
deleted file mode 100644
index aceadc0dfc2..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-t1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-ts1--base.tfm
deleted file mode 100644
index 227cb6d5f72..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-ts1.tfm
deleted file mode 100644
index 2d4f2ebe396..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Bold-tlf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-ly1--base.tfm
deleted file mode 100644
index d98b9d6608b..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-ly1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-ly1.tfm
deleted file mode 100644
index b860688bd7c..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-ly1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-ot1.tfm
deleted file mode 100644
index dcaa12ced06..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-ot1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-t1--base.tfm
deleted file mode 100644
index 9dd52e5099c..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-t1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-t1.tfm
deleted file mode 100644
index 66c41e640ca..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-t1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-ts1--base.tfm
deleted file mode 100644
index 334f33a9f0d..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-ts1.tfm
deleted file mode 100644
index e602ddd12f0..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Italic-tlf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-ly1--base.tfm
deleted file mode 100644
index c78c917bf53..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-ly1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-ly1.tfm
deleted file mode 100644
index f68e4037a2f..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-ly1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-ot1.tfm
deleted file mode 100644
index 81f7a1c7176..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-ot1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-t1--base.tfm
deleted file mode 100644
index df7fc715fbb..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-t1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-t1.tfm
deleted file mode 100644
index 4435cc29f5b..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-t1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-ts1--base.tfm
deleted file mode 100644
index 03856aa9892..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-ts1--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-ts1.tfm
deleted file mode 100644
index 5de11d49f22..00000000000
--- a/Master/texmf-dist/fonts/tfm/huerta/bitter/Bitter-Regular-tlf-ts1.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/huerta/bitter/Bitter-Bold.pfb b/Master/texmf-dist/fonts/type1/huerta/bitter/Bitter-Bold.pfb
deleted file mode 100644
index cd7694cf09e..00000000000
--- a/Master/texmf-dist/fonts/type1/huerta/bitter/Bitter-Bold.pfb
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/huerta/bitter/Bitter-Italic.pfb b/Master/texmf-dist/fonts/type1/huerta/bitter/Bitter-Italic.pfb
deleted file mode 100644
index 7c8dd2b605b..00000000000
--- a/Master/texmf-dist/fonts/type1/huerta/bitter/Bitter-Italic.pfb
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/huerta/bitter/Bitter-Regular.pfb b/Master/texmf-dist/fonts/type1/huerta/bitter/Bitter-Regular.pfb
deleted file mode 100644
index 0cf068c0f4a..00000000000
--- a/Master/texmf-dist/fonts/type1/huerta/bitter/Bitter-Regular.pfb
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Bold-tlf-ly1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Bold-tlf-ly1.vf
deleted file mode 100644
index 470b8876f19..00000000000
--- a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Bold-tlf-ly1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Bold-tlf-t1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Bold-tlf-t1.vf
deleted file mode 100644
index ed890f74657..00000000000
--- a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Bold-tlf-t1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Bold-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Bold-tlf-ts1.vf
deleted file mode 100644
index d96d336ae94..00000000000
--- a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Bold-tlf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Italic-tlf-ly1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Italic-tlf-ly1.vf
deleted file mode 100644
index 4b3bfded331..00000000000
--- a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Italic-tlf-ly1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Italic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Italic-tlf-t1.vf
deleted file mode 100644
index 19868d2146a..00000000000
--- a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Italic-tlf-t1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Italic-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Italic-tlf-ts1.vf
deleted file mode 100644
index 902beacd1bd..00000000000
--- a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Italic-tlf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Regular-tlf-ly1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Regular-tlf-ly1.vf
deleted file mode 100644
index e1ef8d84294..00000000000
--- a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Regular-tlf-ly1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Regular-tlf-t1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Regular-tlf-t1.vf
deleted file mode 100644
index ec7209f9631..00000000000
--- a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Regular-tlf-t1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Regular-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Regular-tlf-ts1.vf
deleted file mode 100644
index df820568f57..00000000000
--- a/Master/texmf-dist/fonts/vf/huerta/bitter/Bitter-Regular-tlf-ts1.vf
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/bitter/LY1Bitter-TLF.fd b/Master/texmf-dist/tex/latex/bitter/LY1Bitter-TLF.fd
deleted file mode 100644
index 1d1a22b1975..00000000000
--- a/Master/texmf-dist/tex/latex/bitter/LY1Bitter-TLF.fd
+++ /dev/null
@@ -1,65 +0,0 @@
-%% Generated by autoinst on 2019/05/10
-%%
-\ProvidesFile{LY1Bitter-TLF.fd}
-    [2019/05/10 (autoinst)  Font definitions for LY1/Bitter-TLF.]
-
-\expandafter\ifx\csname Bitter@scale\endcsname\relax
-    \let\Bitter@@scale\@empty
-\else
-    \edef\Bitter@@scale{s*[\csname Bitter@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{Bitter-TLF}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{LY1}{Bitter-TLF}{regular}{n}{
-      <-> \Bitter@@scale Bitter-Regular-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Bitter-TLF}{regular}{it}{
-      <-> \Bitter@@scale Bitter-Italic-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Bitter-TLF}{regular}{sl}{
-      <-> ssub * Bitter-TLF/regular/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{LY1}{Bitter-TLF}{bold}{n}{
-      <-> \Bitter@@scale Bitter-Bold-tlf-ly1
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   m --> regular
-
-\DeclareFontShape{LY1}{Bitter-TLF}{m}{sl}{
-      <-> ssub * Bitter-TLF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{Bitter-TLF}{m}{n}{
-      <-> ssub * Bitter-TLF/regular/n
-}{}
-
-\DeclareFontShape{LY1}{Bitter-TLF}{m}{it}{
-      <-> ssub * Bitter-TLF/regular/it
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{LY1}{Bitter-TLF}{b}{n}{
-      <-> ssub * Bitter-TLF/bold/n
-}{}
-
-\DeclareFontShape{LY1}{Bitter-TLF}{bx}{n}{
-      <-> ssub * Bitter-TLF/b/n
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/bitter/OT1Bitter-TLF.fd b/Master/texmf-dist/tex/latex/bitter/OT1Bitter-TLF.fd
deleted file mode 100644
index cf2ba306962..00000000000
--- a/Master/texmf-dist/tex/latex/bitter/OT1Bitter-TLF.fd
+++ /dev/null
@@ -1,65 +0,0 @@
-%% Generated by autoinst on 2019/05/10
-%%
-\ProvidesFile{OT1Bitter-TLF.fd}
-    [2019/05/10 (autoinst)  Font definitions for OT1/Bitter-TLF.]
-
-\expandafter\ifx\csname Bitter@scale\endcsname\relax
-    \let\Bitter@@scale\@empty
-\else
-    \edef\Bitter@@scale{s*[\csname Bitter@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{Bitter-TLF}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{OT1}{Bitter-TLF}{regular}{n}{
-      <-> \Bitter@@scale Bitter-Regular-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Bitter-TLF}{regular}{it}{
-      <-> \Bitter@@scale Bitter-Italic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Bitter-TLF}{regular}{sl}{
-      <-> ssub * Bitter-TLF/regular/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{OT1}{Bitter-TLF}{bold}{n}{
-      <-> \Bitter@@scale Bitter-Bold-tlf-ot1
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   m --> regular
-
-\DeclareFontShape{OT1}{Bitter-TLF}{m}{sl}{
-      <-> ssub * Bitter-TLF/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{Bitter-TLF}{m}{n}{
-      <-> ssub * Bitter-TLF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{Bitter-TLF}{m}{it}{
-      <-> ssub * Bitter-TLF/regular/it
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{OT1}{Bitter-TLF}{b}{n}{
-      <-> ssub * Bitter-TLF/bold/n
-}{}
-
-\DeclareFontShape{OT1}{Bitter-TLF}{bx}{n}{
-      <-> ssub * Bitter-TLF/b/n
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/bitter/T1Bitter-TLF.fd b/Master/texmf-dist/tex/latex/bitter/T1Bitter-TLF.fd
deleted file mode 100644
index 30ef1da2e80..00000000000
--- a/Master/texmf-dist/tex/latex/bitter/T1Bitter-TLF.fd
+++ /dev/null
@@ -1,65 +0,0 @@
-%% Generated by autoinst on 2019/05/10
-%%
-\ProvidesFile{T1Bitter-TLF.fd}
-    [2019/05/10 (autoinst)  Font definitions for T1/Bitter-TLF.]
-
-\expandafter\ifx\csname Bitter@scale\endcsname\relax
-    \let\Bitter@@scale\@empty
-\else
-    \edef\Bitter@@scale{s*[\csname Bitter@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{Bitter-TLF}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{T1}{Bitter-TLF}{regular}{n}{
-      <-> \Bitter@@scale Bitter-Regular-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{Bitter-TLF}{regular}{it}{
-      <-> \Bitter@@scale Bitter-Italic-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{Bitter-TLF}{regular}{sl}{
-      <-> ssub * Bitter-TLF/regular/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{T1}{Bitter-TLF}{bold}{n}{
-      <-> \Bitter@@scale Bitter-Bold-tlf-t1
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   m --> regular
-
-\DeclareFontShape{T1}{Bitter-TLF}{m}{sl}{
-      <-> ssub * Bitter-TLF/regular/sl
-}{}
-
-\DeclareFontShape{T1}{Bitter-TLF}{m}{n}{
-      <-> ssub * Bitter-TLF/regular/n
-}{}
-
-\DeclareFontShape{T1}{Bitter-TLF}{m}{it}{
-      <-> ssub * Bitter-TLF/regular/it
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{T1}{Bitter-TLF}{b}{n}{
-      <-> ssub * Bitter-TLF/bold/n
-}{}
-
-\DeclareFontShape{T1}{Bitter-TLF}{bx}{n}{
-      <-> ssub * Bitter-TLF/b/n
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/bitter/TS1Bitter-TLF.fd b/Master/texmf-dist/tex/latex/bitter/TS1Bitter-TLF.fd
deleted file mode 100644
index 8504d093ef3..00000000000
--- a/Master/texmf-dist/tex/latex/bitter/TS1Bitter-TLF.fd
+++ /dev/null
@@ -1,65 +0,0 @@
-%% Generated by autoinst on 2019/05/10
-%%
-\ProvidesFile{TS1Bitter-TLF.fd}
-    [2019/05/10 (autoinst)  Font definitions for TS1/Bitter-TLF.]
-
-\expandafter\ifx\csname Bitter@scale\endcsname\relax
-    \let\Bitter@@scale\@empty
-\else
-    \edef\Bitter@@scale{s*[\csname Bitter@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{Bitter-TLF}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{TS1}{Bitter-TLF}{regular}{n}{
-      <-> \Bitter@@scale Bitter-Regular-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Bitter-TLF}{regular}{it}{
-      <-> \Bitter@@scale Bitter-Italic-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Bitter-TLF}{regular}{sl}{
-      <-> ssub * Bitter-TLF/regular/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{TS1}{Bitter-TLF}{bold}{n}{
-      <-> \Bitter@@scale Bitter-Bold-tlf-ts1
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   m --> regular
-
-\DeclareFontShape{TS1}{Bitter-TLF}{m}{sl}{
-      <-> ssub * Bitter-TLF/regular/sl
-}{}
-
-\DeclareFontShape{TS1}{Bitter-TLF}{m}{n}{
-      <-> ssub * Bitter-TLF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{Bitter-TLF}{m}{it}{
-      <-> ssub * Bitter-TLF/regular/it
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{TS1}{Bitter-TLF}{b}{n}{
-      <-> ssub * Bitter-TLF/bold/n
-}{}
-
-\DeclareFontShape{TS1}{Bitter-TLF}{bx}{n}{
-      <-> ssub * Bitter-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 1362c92640d..b792ae6d1e6 100644
--- a/Master/texmf-dist/tex/latex/bitter/bitter.sty
+++ b/Master/texmf-dist/tex/latex/bitter/bitter.sty
@@ -1,35 +1,26 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{bitter}
-    [2019/05/10 (R.D. Tennent)  Supports Bitter fonts for all LaTeX engines.]
+    [200/07/25 (R.D. Tennent)  Supports Bitter fonts for xeLaTeX and luaLaTeX.]
 
-\RequirePackage{ifxetex,ifluatex,textcomp}
+\RequirePackage{iftex}
+
+\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}  
 \RequirePackage{xkeyval}
 \DeclareOptionX{scaled}{\renewcommand*{\Bitter@scale}{#1}}
 \DeclareOptionX{scale}{\renewcommand*{\Bitter@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 ,
@@ -52,21 +43,8 @@
       ]
       {Bitter}
 
-\else % type1
-
-  \def\bfseries@rm{b}
-  \def\mdseries@rm{m}
-  \def\seriesdefault{\mdseries@rm}
-  \def\bitterfamily{Bitter-TLF}
-  \def\bitter{\fontfamily{\bitterfamily}\selectfont}
-  \def\rmdefault{\bitterfamily}
-
-\fi
-
 % turn off defaults in case other fonts are selected:
-\ifBitter@ttf
   \defaultfontfeatures{}
-\fi
 
 \endinput