remove no longer used context files

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

70 files changed, 0 insertions, 7311 deletions

diff --git a/Master/texmf-dist/doc/context/base/context.rme b/Master/texmf-dist/doc/context/base/context.rme
deleted file mode 100644
index 1cb12cc074c..00000000000
--- a/Master/texmf-dist/doc/context/base/context.rme
+++ /dev/null
@@ -1,70 +0,0 @@
-Some Basic information 
-----------------------
-
-There are currently three interfaces available: 
-
-  cont-en   the english version
-  cont-de   the german version 
-  cont-nl   the dutch version
-  cont-cz   the czech version
-  cont-ro   the romanian version
-  cont-it   the italian version
-
-One should compile one of these (or all) into a fmt file. 
-When one uses the main file, 
-
-  context   the undefined version
-
-TeX ask for an interface language as well as a message 
-language. Here one has to specify the full name (english, 
-german, dutch, etc.) or use the default (enter). The \
-savest way to update the TeX and MetaPost format files 
-is to use TeXExec:
-
-texexec --make --alone en nl metafun  
-
-In the TeXExec manual you can read how to generate a format 
-with specific fonts and patterns. 
-
-By default only the english hyphenation patterns are loaded,
-unless more are enabled in: 
-
-  cont-usr  the typesetting language specifications
-
-Furthermore, users can preset commands etc in the file 
-
-  cont-sys  a system file loaded at runtime
-
-For questions and remarks on ConTeXt, one can subscribe to 
-the list:
-
-  ntg-context@ntg.nl
-
-by sending the message
-
-  subscribe ntg-context
-
-to the list server: 
-
-  majordomo@ntg.nl
-
-One can find more info at:
-
-  www.pragma-ade.com
-
-or at the mirror sites mentioned there. 
-
-Don't hesitate to ask questions. ConTeXt can do a lot, and 
-the manuals are always a bit behind and incomplete. Also take
-a look at the files 
-  
-  mreadme.pdf
-  minstall.pdf
-  mtexexec.pdf
-  mtexutil.pdf
-
-The teTeX, fpTeX, and 4TeX distributions demonstrate how
-ConTeXt can be integrated in a TeX directory structure. 
-
--------------------------
-Hans Hagen, pragma@wxs.nl
diff --git a/Master/texmf-dist/doc/context/base/minstall.pdf b/Master/texmf-dist/doc/context/base/minstall.pdf
deleted file mode 100644
index 29b3da4cab5..00000000000
--- a/Master/texmf-dist/doc/context/base/minstall.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/context/base/mreadme.pdf b/Master/texmf-dist/doc/context/base/mreadme.pdf
deleted file mode 100644
index 6ee736c94f6..00000000000
--- a/Master/texmf-dist/doc/context/base/mreadme.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/enc/dvips/context/ec-os-lm.enc b/Master/texmf-dist/fonts/enc/dvips/context/ec-os-lm.enc
deleted file mode 100644
index d05302a4b8a..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/context/ec-os-lm.enc
+++ /dev/null
@@ -1,258 +0,0 @@
-/enccorklm[
-/grave
-/acute
-/circumflex
-/tilde
-/dieresis
-/hungarumlaut
-/ring
-/caron
-/breve
-/macron
-/dotaccent
-/cedilla
-/ogonek
-/quotesinglbase
-/guilsinglleft
-/guilsinglright
-/quotedblleft
-/quotedblright
-/quotedblbase
-/guillemotleft
-/guillemotright
-/endash
-/emdash
-/cwm
-/perthousandzero
-/dotlessi
-/dotlessj
-/ff
-/fi
-/fl
-/ffi
-/ffl
-/visiblespace
-/exclam
-/quotedbl
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
-/zerooldstyle
-/oneoldstyle
-/twooldstyle
-/threeoldstyle
-/fouroldstyle
-/fiveoldstyle
-/sixoldstyle
-/sevenoldstyle
-/eightoldstyle
-/nineoldstyle
-/colon
-/semicolon
-/less
-/equal
-/greater
-/question
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
-/X
-/Y
-/Z
-/bracketleft
-/backslash
-/bracketright
-/asciicircum
-/underscore
-/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
-/x
-/y
-/z
-/braceleft
-/bar
-/braceright
-/asciitilde
-/hyphenchar
-/Abreve
-/Aogonek
-/Cacute
-/Ccaron
-/Dcaron
-/Ecaron
-/Eogonek
-/Gbreve
-/Lacute
-/Lcaron
-/Lslash
-/Nacute
-/Ncaron
-/Eng
-/Ohungarumlaut
-/Racute
-/Rcaron
-/Sacute
-/Scaron
-/Scommaaccent
-/Tcaron
-/Tcommaaccent
-/Uhungarumlaut
-/Uring
-/Ydieresis
-/Zacute
-/Zcaron
-/Zdotaccent
-/IJ
-/Idotaccent
-/dcroat
-/section
-/abreve
-/aogonek
-/cacute
-/ccaron
-/dcaron
-/ecaron
-/eogonek
-/gbreve
-/lacute
-/lcaron
-/lslash
-/nacute
-/ncaron
-/eng
-/ohungarumlaut
-/racute
-/rcaron
-/sacute
-/scaron
-/scommaaccent
-/tcaron
-/tcommaaccent
-/uhungarumlaut
-/uring
-/ydieresis
-/zacute
-/zcaron
-/zdotaccent
-/ij
-/exclamdown
-/questiondown
-/sterling
-/Agrave
-/Aacute
-/Acircumflex
-/Atilde
-/Adieresis
-/Aring
-/AE
-/Ccedilla
-/Egrave
-/Eacute
-/Ecircumflex
-/Edieresis
-/Igrave
-/Iacute
-/Icircumflex
-/Idieresis
-/Eth
-/Ntilde
-/Ograve
-/Oacute
-/Ocircumflex
-/Otilde
-/Odieresis
-/OE
-/Oslash
-/Ugrave
-/Uacute
-/Ucircumflex
-/Udieresis
-/Yacute
-/Thorn
-/Germandbls
-/agrave
-/aacute
-/acircumflex
-/atilde
-/adieresis
-/aring
-/ae
-/ccedilla
-/egrave
-/eacute
-/ecircumflex
-/edieresis
-/igrave
-/iacute
-/icircumflex
-/idieresis
-/eth
-/ntilde
-/ograve
-/oacute
-/ocircumflex
-/otilde
-/odieresis
-/oe
-/oslash
-/ugrave
-/uacute
-/ucircumflex
-/udieresis
-/yacute
-/thorn
-/germandbls
-] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/context/ec-sc.enc b/Master/texmf-dist/fonts/enc/dvips/context/ec-sc.enc
deleted file mode 100644
index 77357c9f369..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/context/ec-sc.enc
+++ /dev/null
@@ -1,84 +0,0 @@
-% This version is sc extended by Hans Hagen using PalatinoNova-Regular.afm.
-%
-%
-%   This is the EC encoding.
-%
-%   These are the ligs and kerns in addition to those found in the
-%   AFM file.  (The only ligs in the Times-Roman.afm file are the
-%   fi and fl ligatures.)
-%
-% LIGKERN space l =: lslash ; space L =: Lslash ;
-% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
-% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
-% LIGKERN quoteleft quoteleft =: quotedblleft ;
-% LIGKERN quoteright quoteright =: quotedblright ;
-%
-%   We blow away kerns to and from spaces (TeX doesn't have a
-%   space) and also remove any kerns from the numbers (although
-%   the only kern pair that mentions a number in Times-Roman.afm
-%   is one one.)
-%
-% LIGKERN space {} * ; * {} space ; zero {} * ; * {} zero ;
-% LIGKERN one {} * ; * {} one ; two {} * ; * {} two ;
-% LIGKERN three {} * ; * {} three ; four {} * ; * {} four ;
-% LIGKERN five {} * ; * {} five ; six {} * ; * {} six ;
-% LIGKERN seven {} * ; * {} seven ; eight {} * ; * {} eight ;
-% LIGKERN nine {} * ; * {} nine ;
-% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
-% LIGKERN greater greater =: guillemotright ;
-%
-/ECEncoding [          % now 256 chars follow
-% 0x00
-  /grave.sc /acute.sc /circumflex.sc /tilde.sc /dieresis.sc /hungarumlaut.sc /ring.sc /caron.sc
-  /breve.sc /macron.sc /dotaccent.sc /cedilla
-  /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-% 0x10
-  /quotedblleft /quotedblright /quotedblbase /guillemotleft 
-  /guillemotright /endash /emdash /cwm
-  /zeroinferior /dotlessi /dotlessj /ff /fi.sc /fl.sc /ffi /ffl
-% 0x20
-  /visualspace /exclam.sc /quotedbl /numbersign
-  /dollar.sc /percent.sc /ampersand.sc /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-% 0x30
-  /zero.sc /one.sc /two.sc /three.sc /four.sc /five.sc /six.sc /seven.sc
-  /eight.sc /nine.sc /colon /semicolon /less /equal /greater /question.sc
-% 0x40
-  /at /A /B /C /D /E /F /G /H /I /J /K /L /M /N /O
-% 0x50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-% 0x60
-  /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
-% 0x70
-  /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
-  /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
-% 0x80
-  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
-  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Ng /Ohungarumlaut /Racute
-% 0x90
-  /Rcaron /Sacute /Scaron /Scedilla
-  /Tcaron /Tcedilla /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dbar /section
-% 0xA0
-  /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
-  /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /ng /ohungarumlaut.sc /racute.sc
-% 0xB0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc
-  /tquoteright /tcedilla /uhungarumlaut.sc /uring.sc
-  /ldot.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling.sc
-% 0xC0
-  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-  /Egrave /Eacute /Ecircumflex /Edieresis
-  /Igrave /Iacute /Icircumflex /Idieresis
-% 0xD0
-  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
-  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /Germandbls
-% 0xE0
-  /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
-  /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc
-  /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
-% 0xF0
-  /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /germandbls.sc
-] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/context/ec-var-lm.enc b/Master/texmf-dist/fonts/enc/dvips/context/ec-var-lm.enc
deleted file mode 100644
index bc54a41d4db..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/context/ec-var-lm.enc
+++ /dev/null
@@ -1,262 +0,0 @@
-% author: Hans Hagen
-%
-% This enc file defines ec (cork) encoded Latin Modern adapted for umlauts and other variations.
-
-/encecvarlm[
-/grave
-/acute
-/circumflex
-/tilde
-/vardieresis
-/hungarumlaut
-/ring
-/caron
-/breve
-/macron
-/dotaccent
-/cedilla
-/ogonek
-/quotesinglbase
-/guilsinglleft
-/guilsinglright
-/quotedblleft
-/quotedblright
-/quotedblbase
-/guillemotleft
-/guillemotright
-/endash
-/emdash
-/cwm
-/zeroinferior
-/dotlessi
-/dotlessj
-/ff
-/fi
-/fl
-/ffi
-/ffl
-/visualspace
-/exclam
-/quotedbl
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
-/eight
-/nine
-/colon
-/semicolon
-/less
-/equal
-/greater
-/question
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
-/X
-/Y
-/Z
-/bracketleft
-/backslash
-/bracketright
-/asciicircum
-/underscore
-/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
-/x
-/y
-/z
-/braceleft
-/bar
-/braceright
-/asciitilde
-/hyphen
-/Abreve
-/Aogonek
-/Cacute
-/Ccaron
-/Dcaron
-/Ecaron
-/Eogonek
-/Gbreve
-/Lacute
-/Lcaron
-/Lslash
-/Nacute
-/Ncaron
-/Ng
-/Ohungarumlaut
-/Racute
-/Rcaron
-/Sacute
-/Scaron
-/Scedilla
-/Tcaron
-/Tcedilla
-/Uhungarumlaut
-/Uring
-/Yvardieresis
-/Zacute
-/Zcaron
-/Zdotaccent
-/IJ
-/Idotaccent
-/dbar
-/section
-/abreve
-/aogonek
-/cacute
-/ccaron
-/dcaron
-/ecaron
-/eogonek
-/gbreve
-/lacute
-/lcaron
-/lslash
-/nacute
-/ncaron
-/ng
-/ohungarumlaut
-/racute
-/rcaron
-/sacute
-/scaron
-/scedilla
-/tquoteright
-/tcedilla
-/uhungarumlaut
-/uring
-/yvardieresis
-/zacute
-/zcaron
-/zdotaccent
-/ij
-/exclamdown
-/questiondown
-/sterling
-/Agrave
-/Aacute
-/Acircumflex
-/Atilde
-/Avardieresis
-/Aring
-/AE
-/Ccedilla
-/Egrave
-/Eacute
-/Ecircumflex
-/Evardieresis
-/Igrave
-/Iacute
-/Icircumflex
-/Ivardieresis
-/Eth
-/Ntilde
-/Ograve
-/Oacute
-/Ocircumflex
-/Otilde
-/Ovardieresis
-/OE
-/Oslash
-/Ugrave
-/Uacute
-/Ucircumflex
-/Uvardieresis
-/Yacute
-/Thorn
-/Germandbls
-/agrave
-/aacute
-/acircumflex
-/atilde
-/avardieresis
-/aring
-/ae
-/ccedilla
-/egrave
-/eacute
-/ecircumflex
-/evardieresis
-/igrave
-/iacute
-/icircumflex
-/ivardieresis
-/eth
-/ntilde
-/ograve
-/oacute
-/ocircumflex
-/otilde
-/ovardieresis
-/oe
-/oslash
-/ugrave
-/uacute
-/ucircumflex
-/uvardieresis
-/yacute
-/thorn
-/germandbls
-] def
\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/enc/dvips/context/lm-texnansi-osfsc.enc b/Master/texmf-dist/fonts/enc/dvips/context/lm-texnansi-osfsc.enc
deleted file mode 100644
index d6c4a812d86..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/context/lm-texnansi-osfsc.enc
+++ /dev/null
@@ -1,264 +0,0 @@
-% Old Style with Small Caps by thomas.schmitz@uni-bonn.de
-%
-% generate metrics using:
-%
-% texfont --encoding=texnansi --variant=osfsc --[other options]
-
-/TeXnANSIOSFSCEncoding [
-/.notdef            %   0
-/Euro               %   1 /Uni20AC
-/.notdef            %   2
-/.notdef            %   3
-/fraction           %   4
-/dotaccent          %   5
-/hungarumlaut       %   6
-/ogonek             %   7
-/fl                 %   8
-/.notdef            %   9 /fraction not used (see 4), backward compatability only
-/cwm                %  10 not used, except boundary char internally maybe
-/ff                 %  11
-/fi                 %  12
-/.notdef            %  13 /fl not used (see 8), backward compatability only
-/ffi                %  14
-/ffl                %  15
-/dotlessi           %  16
-/dotlessj           %  17
-/grave              %  18
-/acute              %  19
-/caron              %  20
-/breve              %  21
-/macron             %  22
-/ring               %  23
-/cedilla            %  24
-/germandbls         %  25
-/AEsmall            %  26
-/OEsmall            %  27
-/Oslashsmall        %  28
-/AE                 %  29
-/OE                 %  30
-/Oslash             %  31
-/space              %  32 /suppress in TeX text
-/exclam             %  33
-/quotedbl           %  34 /quotedblright in TeX text
-/numbersign         %  35
-/dollar             %  36
-/percent            %  37
-/ampersand          %  38
-/quoteright         %  39 /quotesingle in ANSI
-/parenleft          %  40
-/parenright         %  41
-/asterisk           %  42
-/plus               %  43
-/comma              %  44
-/hyphen             %  45
-/period             %  46
-/slash              %  47
-/zero.oldstyle      %  48
-/one.oldstyle       %  49
-/two.oldstyle       %  50
-/three.oldstyle     %  51
-/four.oldstyle      %  52
-/five.oldstyle      %  53
-/six.oldstyle       %  54
-/seven.oldstyle     %  55
-/eight.oldstyle     %  56
-/nine.oldstyle      %  57
-/colon              %  58
-/semicolon          %  59
-/less               %  60 /exclamdown in TeX text
-/equal              %  61
-/greater            %  62 /questiondown in TeX text
-/question           %  63
-/at                 %  64
-/A                  %  65
-/B                  %  66
-/C                  %  67
-/D                  %  68
-/E                  %  69
-/F                  %  70
-/G                  %  71
-/H                  %  72
-/I                  %  73
-/J                  %  74
-/K                  %  75
-/L                  %  76
-/M                  %  77
-/N                  %  78
-/O                  %  79
-/P                  %  80
-/Q                  %  81
-/R                  %  82
-/S                  %  83
-/T                  %  84
-/U                  %  85
-/V                  %  86
-/W                  %  87
-/X                  %  88
-/Y                  %  89
-/Z                  %  90
-/bracketleft        %  91
-/backslash          %  92 /quotedblleft in TeX text
-/bracketright       %  93
-/circumflex         %  94 /asciicircum in ASCII
-/underscore         %  95 /dotaccent in TeX text
-/quoteleft          %  96 /grave accent in ANSI
-/Asmall             %  97
-/Bsmall             %  98
-/Csmall             %  99
-/Dsmall             % 100
-/Esmall             % 101
-/Fsmall             % 102
-/Gsmall             % 103
-/Hsmall             % 104
-/Ismall             % 105
-/Jsmall             % 106
-/Ksmall             % 107
-/Lsmall             % 108
-/Msmall             % 109
-/Nsmall             % 110
-/Osmall             % 111
-/Psmall             % 112
-/Qsmall             % 113
-/Rsmall             % 114
-/Ssmall             % 115
-/Tsmall             % 116
-/Usmall             % 117
-/Vsmall             % 118
-/Wsmall             % 119
-/Xsmall             % 120
-/Ysmall             % 121
-/Zsmall             % 122
-/braceleft          % 123 /endash in TeX text
-/bar                % 124 /emdash in TeX test
-/braceright         % 125 /hungarumlaut in TeX text
-/tilde              % 126 /asciitilde in ASCII
-/dieresis           % 127 not used (see 168), use higher up instead
-/Lslash             % 128 this position is unfortunate, but now too late to fix
-/quotesingle        % 129
-/quotesinglbase     % 130
-/florin             % 131
-/quotedblbase       % 132
-/ellipsis           % 133
-/dagger             % 134
-/daggerdbl          % 135
-/circumflex         % 136
-/perthousand        % 137
-/Scaron             % 138
-/guilsinglleft      % 139
-/OE                 % 140
-/Zcaron             % 141
-/asciicircum        % 142
-/minus              % 143
-/lslash             % 144
-/quoteleft          % 145
-/quoteright         % 146
-/quotedblleft       % 147
-/quotedblright      % 148
-/bullet             % 149
-/endash             % 150
-/emdash             % 151
-/tilde              % 152
-/trademark          % 153
-/scaron             % 154
-/guilsinglright     % 155
-/oe                 % 156
-/zcaron             % 157
-/asciitilde         % 158
-/Ydieresis          % 159
-/nbspace            % 160 /space (no break space)
-/exclamdown         % 161
-/cent               % 162
-/sterling           % 163
-/currency           % 164
-/yen                % 165
-/brokenbar          % 166
-/section            % 167
-/dieresis           % 168
-/copyright          % 169
-/ordfeminine        % 170
-/guillemotleft      % 171
-/logicalnot         % 172
-/sfthyphen          % 173 /hyphen (hanging hyphen)
-/registered         % 174
-/macron             % 175
-/degree             % 176
-/plusminus          % 177
-/twosuperior        % 178
-/threesuperior      % 179
-/acute              % 180
-/mu                 % 181
-/paragraph          % 182
-/periodcentered     % 183
-/cedilla            % 184
-/onesuperior        % 185
-/ordmasculine       % 186
-/guillemotright     % 187
-/onequarter         % 188
-/onehalf            % 189
-/threequarters      % 190
-/questiondown       % 191
-/Agrave             % 192
-/Aacute             % 193
-/Acircumflex        % 194
-/Atilde             % 195
-/Adieresis          % 196
-/Aring              % 197
-/AE                 % 198
-/Ccedilla           % 199
-/Egrave             % 200
-/Eacute             % 201
-/Ecircumflex        % 202
-/Edieresis          % 203
-/Igrave             % 204
-/Iacute             % 205
-/Icircumflex        % 206
-/Idieresis          % 207
-/Eth                % 208
-/Ntilde             % 209
-/Ograve             % 210
-/Oacute             % 211
-/Ocircumflex        % 212
-/Otilde             % 213
-/Odieresis          % 214
-/multiply           % 215 OE in T1
-/Oslash             % 216
-/Ugrave             % 217
-/Uacute             % 218
-/Ucircumflex        % 219
-/Udieresis          % 220
-/Yacute             % 221
-/Thorn              % 222
-/germandbls         % 223
-/Agravesmall        % 224
-/Aacutesmall        % 225
-/Acircumflexsmall   % 226
-/Atildesmall        % 227
-/Adieresissmall     % 228
-/Aringsmall         % 229
-/AEsmall            % 230
-/Ccedillasmall      % 231
-/Egravesmall        % 232
-/Eacutesmall        % 233
-/Ecircumflexsmall   % 234
-/Edieresissmall     % 235
-/Igravesmall        % 236
-/Iacutesmall        % 237
-/Icircumflexsmall   % 238
-/Idieresissmall     % 239
-/eth                % 240
-/Ntildesmall        % 241
-/Ogravesmall        % 242
-/Oacutesmall        % 243
-/Ocircumflexsmall   % 244
-/Otildesmall        % 245
-/Odieresissmall     % 246
-/divide             % 247 oe in T1
-/Oslashsmall        % 248
-/Ugravesmall        % 249
-/Uacutesmall        % 250
-/Ucircumflexsmall   % 251
-/Udieresissmall     % 252
-/Yacutesmall        % 253
-/Thornsmall         % 254
-/Ydieresissmall     % 255 germandbls in T1
-] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/context/qx-os-lm.enc b/Master/texmf-dist/fonts/enc/dvips/context/qx-os-lm.enc
deleted file mode 100644
index 4f6ec086053..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/context/qx-os-lm.enc
+++ /dev/null
@@ -1,258 +0,0 @@
-/encqxlm[
-/.notdef
-/Delta
-/.notdef
-/.notdef
-/.notdef
-/Pi
-/Sigma
-/mu
-/ellipsis
-/f_k
-/Omega
-/ff
-/fi
-/fl
-/ffi
-/ffl
-/dotlessi
-/dotlessj
-/grave
-/acute
-/caron
-/breve
-/macron
-/ring
-/cedilla
-/germandbls
-/ae
-/oe
-/oslash
-/AE
-/OE
-/Oslash
-/space
-/exclam
-/quotedblright
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
-/zerooldstyle
-/oneoldstyle
-/twooldstyle
-/threeoldstyle
-/fouroldstyle
-/fiveoldstyle
-/sixoldstyle
-/sevenoldstyle
-/eightoldstyle
-/nineoldstyle
-/colon
-/semicolon
-/exclamdown
-/equal
-/questiondown
-/question
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
-/X
-/Y
-/Z
-/bracketleft
-/quotedblleft
-/bracketright
-/circumflex
-/dotaccent
-/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
-/x
-/y
-/z
-/endash
-/emdash
-/hungarumlaut
-/tilde
-/dieresis
-/Euro
-/Aogonek
-/Cacute
-/greater
-/.notdef
-/.notdef
-/Eogonek
-/Iogonek
-/less
-/.notdef
-/Lslash
-/Nacute
-/asciitilde
-/asciicircum
-/.notdef
-/dagger
-/daggerdbl
-/Sacute
-/Scaron
-/Scommaaccent
-/degree
-/Tcommaaccent
-/ogonek
-/Uogonek
-/Ydieresis
-/Zacute
-/Zcaron
-/Zdotaccent
-/IJ
-/braceleft
-/braceright
-/section
-/.notdef
-/aogonek
-/cacute
-/registered
-/copyright
-/divide
-/eogonek
-/iogonek
-/minus
-/multiply
-/lslash
-/nacute
-/plusminus
-/.notdef
-/guillemotleft
-/guillemotright
-/paragraph
-/sacute
-/scaron
-/scommaaccent
-/bullet
-/tcommaaccent
-/threequartersemdash
-/uogonek
-/ydieresis
-/zacute
-/zcaron
-/zdotaccent
-/ij
-/periodcentered
-/quotedbl
-/quotesingle
-/Agrave
-/Aacute
-/Acircumflex
-/Atilde
-/Adieresis
-/Aring
-/backslash
-/Ccedilla
-/Egrave
-/Eacute
-/Ecircumflex
-/Edieresis
-/Igrave
-/Iacute
-/Icircumflex
-/Idieresis
-/Eth
-/Ntilde
-/Ograve
-/Oacute
-/Ocircumflex
-/Otilde
-/Odieresis
-/currency
-/perthousand
-/Ugrave
-/Uacute
-/Ucircumflex
-/Udieresis
-/Yacute
-/Thorn
-/bar
-/agrave
-/aacute
-/acircumflex
-/atilde
-/adieresis
-/aring
-/underscore
-/ccedilla
-/egrave
-/eacute
-/ecircumflex
-/edieresis
-/igrave
-/iacute
-/icircumflex
-/idieresis
-/eth
-/ntilde
-/ograve
-/oacute
-/ocircumflex
-/otilde
-/odieresis
-/anglearc
-/diameter
-/ugrave
-/uacute
-/ucircumflex
-/udieresis
-/yacute
-/thorn
-/quotedblbase
-] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/context/texnansi-os-lm.enc b/Master/texmf-dist/fonts/enc/dvips/context/texnansi-os-lm.enc
deleted file mode 100644
index 575deb9f70c..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/context/texnansi-os-lm.enc
+++ /dev/null
@@ -1,258 +0,0 @@
-/enctexnansilm[
-/.notdef
-/Euro
-/.notdef
-/.notdef
-/fraction
-/dotaccent
-/hungarumlaut
-/ogonek
-/fl
-/.notdef
-/cwm
-/ff
-/fi
-/.notdef
-/ffi
-/ffl
-/dotlessi
-/dotlessj
-/grave
-/acute
-/caron
-/breve
-/macron
-/ring
-/cedilla
-/germandbls
-/ae
-/oe
-/oslash
-/AE
-/OE
-/Oslash
-/space
-/exclam
-/quotedbl
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
-/zerooldstyle
-/oneoldstyle
-/twooldstyle
-/threeoldstyle
-/fouroldstyle
-/fiveoldstyle
-/sixoldstyle
-/sevenoldstyle
-/eightoldstyle
-/nineoldstyle
-/colon
-/semicolon
-/less
-/equal
-/greater
-/question
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
-/X
-/Y
-/Z
-/bracketleft
-/backslash
-/bracketright
-/circumflex
-/underscore
-/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
-/x
-/y
-/z
-/braceleft
-/bar
-/braceright
-/tilde
-/dieresis
-/Lslash
-/quotesingle
-/quotesinglbase
-/florin
-/quotedblbase
-/ellipsis
-/dagger
-/daggerdbl
-/circumflex.dup
-/perthousand
-/Scaron
-/guilsinglleft
-/OE.dup
-/Zcaron
-/asciicircum
-/minus
-/lslash
-/quoteleft.dup
-/quoteright.dup
-/quotedblleft
-/quotedblright
-/bullet
-/endash
-/emdash
-/tilde.dup
-/trademark
-/scaron
-/guilsinglright
-/oe.dup
-/zcaron
-/asciitilde
-/Ydieresis
-/nbspace
-/exclamdown
-/cent
-/sterling
-/currency
-/yen
-/brokenbar
-/section
-/dieresis.dup
-/copyright
-/ordfeminine
-/guillemotleft
-/logicalnot
-/sfthyphen
-/registered
-/macron.dup
-/degree
-/plusminus
-/twosuperior
-/threesuperior
-/acute.dup
-/mu
-/paragraph
-/periodcentered
-/cedilla.dup
-/onesuperior
-/ordmasculine
-/guillemotright
-/onequarter
-/onehalf
-/threequarters
-/questiondown
-/Agrave
-/Aacute
-/Acircumflex
-/Atilde
-/Adieresis
-/Aring
-/AE.dup
-/Ccedilla
-/Egrave
-/Eacute
-/Ecircumflex
-/Edieresis
-/Igrave
-/Iacute
-/Icircumflex
-/Idieresis
-/Eth
-/Ntilde
-/Ograve
-/Oacute
-/Ocircumflex
-/Otilde
-/Odieresis
-/multiply
-/Oslash.dup
-/Ugrave
-/Uacute
-/Ucircumflex
-/Udieresis
-/Yacute
-/Thorn
-/germandbls.dup
-/agrave
-/aacute
-/acircumflex
-/atilde
-/adieresis
-/aring
-/ae.dup
-/ccedilla
-/egrave
-/eacute
-/ecircumflex
-/edieresis
-/igrave
-/iacute
-/icircumflex
-/idieresis
-/eth
-/ntilde
-/ograve
-/oacute
-/ocircumflex
-/otilde
-/odieresis
-/divide
-/oslash.dup
-/ugrave
-/uacute
-/ucircumflex
-/udieresis
-/yacute
-/thorn
-/ydieresis
-] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/context/texnansi-osfsc.enc b/Master/texmf-dist/fonts/enc/dvips/context/texnansi-osfsc.enc
deleted file mode 100644
index 7a12a83fba5..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/context/texnansi-osfsc.enc
+++ /dev/null
@@ -1,264 +0,0 @@
-% Old Style with Small Caps by thomas.schmitz@uni-bonn.de
-%
-% generate metrics using:
-%
-% texfont --encoding=texnansi --variant=osfsc --[other options]
-
-/TeXnANSIOSFSCEncoding [
-/.notdef            %   0
-/Euro               %   1 /Uni20AC
-/.notdef            %   2
-/.notdef            %   3
-/fraction           %   4
-/dotaccent          %   5
-/hungarumlaut       %   6
-/ogonek             %   7
-/fl                 %   8
-/.notdef            %   9 /fraction not used (see 4), backward compatability only
-/cwm                %  10 not used, except boundary char internally maybe
-/ff                 %  11
-/fi                 %  12
-/.notdef            %  13 /fl not used (see 8), backward compatability only
-/ffi                %  14
-/ffl                %  15
-/dotlessi           %  16
-/dotlessj           %  17
-/grave              %  18
-/acute              %  19
-/caron              %  20
-/breve              %  21
-/macron             %  22
-/ring               %  23
-/cedilla            %  24
-/germandbls         %  25
-/AEsmall            %  26
-/OEsmall            %  27
-/Oslashsmall        %  28
-/AE                 %  29
-/OE                 %  30
-/Oslash             %  31
-/space              %  32 /suppress in TeX text
-/exclam             %  33
-/quotedbl           %  34 /quotedblright in TeX text
-/numbersign         %  35
-/dollar             %  36
-/percent            %  37
-/ampersand          %  38
-/quoteright         %  39 /quotesingle in ANSI
-/parenleft          %  40
-/parenright         %  41
-/asterisk           %  42
-/plus               %  43
-/comma              %  44
-/hyphen             %  45
-/period             %  46
-/slash              %  47
-/zerooldstyle       %  48
-/oneoldstyle        %  49
-/twooldstyle        %  50
-/threeoldstyle      %  51
-/fouroldstyle       %  52
-/fiveoldstyle       %  53
-/sixoldstyle        %  54
-/sevenoldstyle      %  55
-/eightoldstyle      %  56
-/nineoldstyle       %  57
-/colon              %  58
-/semicolon          %  59
-/less               %  60 /exclamdown in TeX text
-/equal              %  61
-/greater            %  62 /questiondown in TeX text
-/question           %  63
-/at                 %  64
-/A                  %  65
-/B                  %  66
-/C                  %  67
-/D                  %  68
-/E                  %  69
-/F                  %  70
-/G                  %  71
-/H                  %  72
-/I                  %  73
-/J                  %  74
-/K                  %  75
-/L                  %  76
-/M                  %  77
-/N                  %  78
-/O                  %  79
-/P                  %  80
-/Q                  %  81
-/R                  %  82
-/S                  %  83
-/T                  %  84
-/U                  %  85
-/V                  %  86
-/W                  %  87
-/X                  %  88
-/Y                  %  89
-/Z                  %  90
-/bracketleft        %  91
-/backslash          %  92 /quotedblleft in TeX text
-/bracketright       %  93
-/circumflex         %  94 /asciicircum in ASCII
-/underscore         %  95 /dotaccent in TeX text
-/quoteleft          %  96 /grave accent in ANSI
-/Asmall             %  97
-/Bsmall             %  98
-/Csmall             %  99
-/Dsmall             % 100
-/Esmall             % 101
-/Fsmall             % 102
-/Gsmall             % 103
-/Hsmall             % 104
-/Ismall             % 105
-/Jsmall             % 106
-/Ksmall             % 107
-/Lsmall             % 108
-/Msmall             % 109
-/Nsmall             % 110
-/Osmall             % 111
-/Psmall             % 112
-/Qsmall             % 113
-/Rsmall             % 114
-/Ssmall             % 115
-/Tsmall             % 116
-/Usmall             % 117
-/Vsmall             % 118
-/Wsmall             % 119
-/Xsmall             % 120
-/Ysmall             % 121
-/Zsmall             % 122
-/braceleft          % 123 /endash in TeX text
-/bar                % 124 /emdash in TeX test
-/braceright         % 125 /hungarumlaut in TeX text
-/tilde              % 126 /asciitilde in ASCII
-/dieresis           % 127 not used (see 168), use higher up instead
-/Lslash             % 128 this position is unfortunate, but now too late to fix
-/quotesingle        % 129
-/quotesinglbase     % 130
-/florin             % 131
-/quotedblbase       % 132
-/ellipsis           % 133
-/dagger             % 134
-/daggerdbl          % 135
-/circumflex         % 136
-/perthousand        % 137
-/Scaron             % 138
-/guilsinglleft      % 139
-/OE                 % 140
-/Zcaron             % 141
-/asciicircum        % 142
-/minus              % 143
-/lslash             % 144
-/quoteleft          % 145
-/quoteright         % 146
-/quotedblleft       % 147
-/quotedblright      % 148
-/bullet             % 149
-/endash             % 150
-/emdash             % 151
-/tilde              % 152
-/trademark          % 153
-/scaron             % 154
-/guilsinglright     % 155
-/oe                 % 156
-/zcaron             % 157
-/asciitilde         % 158
-/Ydieresis          % 159
-/nbspace            % 160 /space (no break space)
-/exclamdown         % 161
-/cent               % 162
-/sterling           % 163
-/currency           % 164
-/yen                % 165
-/brokenbar          % 166
-/section            % 167
-/dieresis           % 168
-/copyright          % 169
-/ordfeminine        % 170
-/guillemotleft      % 171
-/logicalnot         % 172
-/sfthyphen          % 173 /hyphen (hanging hyphen)
-/registered         % 174
-/macron             % 175
-/degree             % 176
-/plusminus          % 177
-/twosuperior        % 178
-/threesuperior      % 179
-/acute              % 180
-/mu                 % 181
-/paragraph          % 182
-/periodcentered     % 183
-/cedilla            % 184
-/onesuperior        % 185
-/ordmasculine       % 186
-/guillemotright     % 187
-/onequarter         % 188
-/onehalf            % 189
-/threequarters      % 190
-/questiondown       % 191
-/Agrave             % 192
-/Aacute             % 193
-/Acircumflex        % 194
-/Atilde             % 195
-/Adieresis          % 196
-/Aring              % 197
-/AE                 % 198
-/Ccedilla           % 199
-/Egrave             % 200
-/Eacute             % 201
-/Ecircumflex        % 202
-/Edieresis          % 203
-/Igrave             % 204
-/Iacute             % 205
-/Icircumflex        % 206
-/Idieresis          % 207
-/Eth                % 208
-/Ntilde             % 209
-/Ograve             % 210
-/Oacute             % 211
-/Ocircumflex        % 212
-/Otilde             % 213
-/Odieresis          % 214
-/multiply           % 215 OE in T1
-/Oslash             % 216
-/Ugrave             % 217
-/Uacute             % 218
-/Ucircumflex        % 219
-/Udieresis          % 220
-/Yacute             % 221
-/Thorn              % 222
-/germandbls         % 223
-/Agravesmall        % 224
-/Aacutesmall        % 225
-/Acircumflexsmall   % 226
-/Atildesmall        % 227
-/Adieresissmall     % 228
-/Aringsmall         % 229
-/AEsmall            % 230
-/Ccedillasmall      % 231
-/Egravesmall        % 232
-/Eacutesmall        % 233
-/Ecircumflexsmall   % 234
-/Edieresissmall     % 235
-/Igravesmall        % 236
-/Iacutesmall        % 237
-/Icircumflexsmall   % 238
-/Idieresissmall     % 239
-/eth                % 240
-/Ntildesmall        % 241
-/Ogravesmall        % 242
-/Oacutesmall        % 243
-/Ocircumflexsmall   % 244
-/Otildesmall        % 245
-/Odieresissmall     % 246
-/divide             % 247 oe in T1
-/Oslashsmall        % 248
-/Ugravesmall        % 249
-/Uacutesmall        % 250
-/Ucircumflexsmall   % 251
-/Udieresissmall     % 252
-/Yacutesmall        % 253
-/Thornsmall         % 254
-/Ydieresissmall     % 255 germandbls in T1
-] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/context/texnansi-sc.enc b/Master/texmf-dist/fonts/enc/dvips/context/texnansi-sc.enc
deleted file mode 100644
index 553a74d8883..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/context/texnansi-sc.enc
+++ /dev/null
@@ -1,319 +0,0 @@
-% This version is sc extended by Hans Hagen using PalatinoNova-Regular.afm.
-%
-% @psencodingfile{
-%   author = "Y&Y, Inc.",
-%   version = "1.1",
-%   date = "1 December 1996",
-%   filename = "texnansi.enc",
-%   email = "help@YandY.com",
-%   address = "45 Walden Street // Concord, MA 01742, USA",
-%   codetable = "ISO/ASCII",
-%   checksum = "xx",
-%   docstring = "Encoding for fonts in Adobe Type 1 format for use with TeX."
-% }
-%
-% The idea is to have all 228 characters normally included in Type 1 text
-% fonts (plus a few more) available for typesetting.  This is effectively
-% the character set in Adobe Standard Encoding, ISO Latin 1, plus a few more.
-%
-% Character code assignments were made as follows:
-%
-% (1) The character layout largely matches `ASCII' in the 32 -- 126 range,
-% except for `circumflex' in 94 and `tilde' in 126, to match `TeX text'
-% (`asciicircumflex' and `asciitilde' appear in 158 and 142 instead).
-%
-% (2) The character layout matches `Windows ANSI' in almost all places,
-% except for `quoteright' in 39 and `quoteleft' in 96 to match ASCII
-% (`quotesingle' and `grave' appear in 129 and 18 instead).
-%
-% (3) The character layout matches `TeX typewriter' used by CM text fonts
-% in most places (except for discordant positions such as hungarumlaut
-% (instead of braceright), dotaccent (instead of underscore) etc.
-%
-% (4) Remaining characters are assigned arbitrarily to the `control character'
-% range (0 -- 31), avoiding 0, 9, 10 and 13 in case we meet dumb software
-% - similarly one should really avoid 127 and 128 if possible.
-% In addition, the 8 open slots in Windows ANSI between 128 and 159 are used.
-%
-% (5) Y&Y Lucida Bright includes some extra ligatures and such; ff, ffi, ffl,
-% and `dotlessj,' these are included 11 -- 15, and 17.
-%
-% (6) Hyphen appears both at 45 and 173 for compatibility with both ASCII
-% and Windows ANSI.
-%
-% (7) It doesn't really matter where ligatures appear (both real, such as ffi,
-% and pseudo such as ---) since these should not be accessed directly, only
-% via ligature information in the TFM file.
-%
-% SAMPLE USAGE (in `psfonts.map' file for DVIPS):
-% 
-% lbr LucidaBright "TeXnANSIEncoding ReEncodeFont" <texnansi.enc <lbr.pfb
-%
-% This tells DVIPS that the font called `lbr' in TeX has PostScript 
-% FontName `LucidaBright.'  It also asks DVIPS to expand the file `lbr.pfb'
-% into PFA form, to include the attached `texnansi.enc' encoding vector,
-% and to then actually reencode the font based on that encoding vector.
-%
-% Revised 1996 June 1 by adding second position for `fl' to avoid Acrobat bug.
-% Revised 1996 June 1 by adding second position for `fraction' for same reason.
-% Revised 1997 Oct 1 by adding cwm  (used in boundary char TFM code)
-% Revised 1998 Mar 1 by adding Unicode for Euro character
-%
-/TeXnANSIEncoding [
-/.notdef % 0
-/Euro.sc % /Uni20AC 1
-/.notdef % 2
-/.notdef % 3
-/fraction %	4
-/dotaccent.sc %	5
-/hungarumlaut.sc %	6
-/ogonek	%	7
-/fl.sc	%	8
-/.notdef % /fraction %	9	not used (see 4), backward compatability only
-/cwm	%	10	not used, except boundary char internally maybe
-/ff    %	11
-/fi.sc    %	12
-/.notdef % /fl.sc    %	13	not used (see 8), backward compatability only
-/ffi   %	14
-/ffl   %	15
-/dotlessi %	16
-/dotlessj %	17
-/grave.sc %	18
-/acute.sc %	19
-/caron.sc %	20
-/breve.sc %	21
-/macron.sc %	22
-/ring.sc  %	23
-/cedilla %	24
-/germandbls.sc %	25
-/ae.sc    %	26
-/oe.sc    %	27
-/oslash.sc %	28
-/AE    %	29
-/OE    %	30
-/Oslash %	31
-/space %	32	% /suppress in TeX text
-/exclam.sc %	33
-/quotedbl %	34	% /quotedblright in TeX text
-/numbersign %	35
-/dollar.sc %	36
-/percent.sc %	37
-/ampersand.sc %	38
-/quoteright %	39	% /quotesingle in ANSI
-/parenleft %	40
-/parenright %	41
-/asterisk %	42
-/plus  %	43
-/comma %	44
-/hyphen %	45
-/period %	46
-/slash %	47
-/zero.sc  %	48
-/one.sc   %	49
-/two.sc   %	50
-/three.sc %	51
-/four.sc  %	52
-/five.sc  %	53
-/six.sc   %	54
-/seven.sc %	55
-/eight.sc %	56
-/nine.sc  %	57
-/colon %	58
-/semicolon %	59
-/less  %	60	% /exclamdown.sc in Tex text
-/equal %	61
-/greater %	62	% /questiondown.sc in TeX text
-/question.sc %	63
-/at %	64
-/A %	65
-/B %	66
-/C %	67
-/D %	68
-/E %	69
-/F %	70
-/G %	71
-/H %	72
-/I %	73
-/J %	74
-/K %	75
-/L %	76
-/M %	77
-/N %	78
-/O %	79
-/P %	80
-/Q %	81
-/R %	82
-/S %	83
-/T %	84
-/U %	85
-/V %	86
-/W %	87
-/X %	88
-/Y %	89
-/Z %	90
-/bracketleft %	91
-/backslash %	92	% /quotedblleft in TeX text
-/bracketright %	93
-/circumflex.sc %	94	% /asciicircum in ASCII
-/underscore %	95	% /dotaccent.sc in TeX text
-/quoteleft %	96	% /grave.sc accent in ANSI
-/a.sc %	97
-/b.sc %	98
-/c.sc %	99
-/d.sc %	100
-/e.sc %	101
-/f.sc %	102
-/g.sc %	103
-/h.sc %	104
-/i.sc %	105
-/j.sc %	106
-/k.sc %	107
-/l.sc %	108
-/m.sc %	109
-/n.sc %	110
-/o.sc %	111
-/p.sc %	112
-/q.sc %	113
-/r.sc %	114
-/s.sc %	115
-/t.sc %	116
-/u.sc %	117
-/v.sc %	118
-/w.sc %	119
-/x.sc %	120
-/y.sc %	121
-/z.sc %	122
-/braceleft %	123	% /endash in TeX text
-/bar   %	124	% /emdash in TeX test
-/braceright %	125	% /hungarumlaut.sc in TeX text
-/tilde.sc %	126	% /asciitilde in ASCII
-/dieresis.sc %	127	not used (see 168), use higher up instead
-/Lslash	%	128	this position is unfortunate, but now too late to fix
-/quotesingle %	129
-/quotesinglbase %	130
-/florin.sc %	131
-/quotedblbase %	132
-/ellipsis %	133
-/dagger %	134
-/daggerdbl %	135
-/circumflex.sc %	136
-/perthousand.sc %	137
-/Scaron %	138
-/guilsinglleft %	139
-/OE    %	140
-/Zcaron %	141
-/asciicircum %	142
-/minus %	143
-/lslash.sc %	144
-/quoteleft %	145
-/quoteright %	146
-/quotedblleft %	147
-/quotedblright %	148
-/bullet %	149
-/endash %	150
-/emdash %	151
-/tilde.sc %	152
-/trademark %	153
-/scaron.sc %	154
-/guilsinglright %	155
-/oe.sc    %	156
-/zcaron.sc %	157
-/asciitilde %	158
-/Ydieresis %	159
-/nbspace %	160	% /space (no break space)
-/exclamdown.sc %	161
-/cent.sc  %	162
-/sterling.sc %	163
-/currency %	164
-/yen.sc   %	165
-/brokenbar %	166
-/section %	167
-/dieresis.sc %	168
-/copyright %	169
-/ordfeminine.sc %	170
-/guillemotleft %	171
-/logicalnot %	172
-/sfthyphen %	173 % /hyphen (hanging hyphen)
-/registered %	174
-/macron.sc %	175
-/degree %	176
-/plusminus %	177
-/twosuperior %	178
-/threesuperior %	179
-/acute.sc %	180
-/mu    %	181
-/paragraph %	182
-/periodcentered %	183
-/cedilla %	184
-/onesuperior %	185
-/ordmasculine %	186
-/guillemotright %	187
-/onequarter %	188
-/onehalf %	189
-/threequarters %	190
-/questiondown.sc %	191
-/Agrave %	192
-/Aacute %	193
-/Acircumflex %	194
-/Atilde %	195
-/Adieresis %	196
-/Aring %	197
-/AE    %	198
-/Ccedilla %	199
-/Egrave %	200
-/Eacute %	201
-/Ecircumflex %	202
-/Edieresis %	203
-/Igrave %	204
-/Iacute %	205
-/Icircumflex %	206
-/Idieresis %	207
-/Eth   %	208
-/Ntilde %	209
-/Ograve %	210
-/Oacute %	211
-/Ocircumflex %	212
-/Otilde %	213
-/Odieresis %	214
-/multiply %	215	% OE in T1
-/Oslash %	216
-/Ugrave %	217
-/Uacute %	218
-/Ucircumflex %	219
-/Udieresis %	220
-/Yacute %	221
-/Thorn %	222
-/germandbls.sc %	223
-/agrave.sc %	224
-/aacute.sc %	225
-/acircumflex.sc %	226
-/atilde.sc %	227
-/adieresis.sc %	228
-/aring.sc %	229
-/ae.sc    %	230
-/ccedilla.sc %	231
-/egrave.sc %	232
-/eacute.sc %	233
-/ecircumflex.sc %	234
-/edieresis.sc %	235
-/igrave.sc %	236
-/iacute.sc %	237
-/icircumflex.sc %	238
-/idieresis.sc %	239
-/eth.sc   %	240
-/ntilde.sc %	241
-/ograve.sc %	242
-/oacute.sc %	243
-/ocircumflex.sc %	244
-/otilde.sc %	245
-/odieresis.sc %	246
-/divide %	247	% oe in T1
-/oslash.sc %	248
-/ugrave.sc %	249
-/uacute.sc %	250
-/ucircumflex.sc %	251
-/udieresis.sc %	252
-/yacute.sc %	253
-/thorn.sc %	254
-/ydieresis.sc %	255	% germandbls in T1
-] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/context/texnansi-var-lm.enc b/Master/texmf-dist/fonts/enc/dvips/context/texnansi-var-lm.enc
deleted file mode 100644
index 8afba56330c..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/context/texnansi-var-lm.enc
+++ /dev/null
@@ -1,262 +0,0 @@
-% author: Hans Hagen
-%
-% This enc file defines texnansi encoded Latin Modern adapted for umlauts and other variations.
-
-/enctexnansivarlm[
-/.notdef
-/Euro
-/.notdef
-/.notdef
-/fraction
-/dotaccent
-/hungarumlaut
-/ogonek
-/fl
-/.notdef
-/cwm
-/ff
-/fi
-/.notdef
-/ffi
-/ffl
-/dotlessi
-/dotlessj
-/grave
-/acute
-/caron
-/breve
-/macron
-/ring
-/cedilla
-/germandbls
-/ae
-/oe
-/oslash
-/AE
-/OE
-/Oslash
-/space
-/exclam
-/quotedbl
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
-/eight
-/nine
-/colon
-/semicolon
-/less
-/equal
-/greater
-/question
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
-/X
-/Y
-/Z
-/bracketleft
-/backslash
-/bracketright
-/circumflex
-/underscore
-/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
-/x
-/y
-/z
-/braceleft
-/bar
-/braceright
-/tilde
-/vardieresis
-/Lslash
-/quotesingle
-/quotesinglbase
-/florin
-/quotedblbase
-/ellipsis
-/dagger
-/daggerdbl
-/circumflex.dup
-/perthousand
-/Scaron
-/guilsinglleft
-/OE.dup
-/Zcaron
-/asciicircum
-/minus
-/lslash
-/quoteleft.dup
-/quoteright.dup
-/quotedblleft
-/quotedblright
-/bullet
-/endash
-/emdash
-/tilde.dup
-/vartrademark
-/scaron
-/guilsinglright
-/oe.dup
-/zcaron
-/asciitilde
-/Yvardieresis
-/nbspace
-/exclamdown
-/cent
-/sterling
-/currency
-/yen
-/brokenbar
-/section
-/dieresis.dup
-/varcopyright
-/ordfeminine
-/guillemotleft
-/logicalnot
-/sfthyphen
-/registered
-/macron.dup
-/degree
-/plusminus
-/twosuperior
-/threesuperior
-/acute.dup
-/mu
-/paragraph
-/periodcentered
-/cedilla.dup
-/onesuperior
-/ordmasculine
-/guillemotright
-/onequarter
-/onehalf
-/threequarters
-/questiondown
-/Agrave
-/Aacute
-/Acircumflex
-/Atilde
-/Avardieresis
-/Aring
-/AE.dup
-/Ccedilla
-/Egrave
-/Eacute
-/Ecircumflex
-/Evardieresis
-/Igrave
-/Iacute
-/Icircumflex
-/Ivardieresis
-/Eth
-/Ntilde
-/Ograve
-/Oacute
-/Ocircumflex
-/Otilde
-/Ovardieresis
-/multiply
-/Oslash.dup
-/Ugrave
-/Uacute
-/Ucircumflex
-/Uvardieresis
-/Yacute
-/Thorn
-/germandbls.dup
-/agrave
-/aacute
-/acircumflex
-/atilde
-/avardieresis
-/aring
-/ae.dup
-/ccedilla
-/egrave
-/eacute
-/ecircumflex
-/evardieresis
-/igrave
-/iacute
-/icircumflex
-/ivardieresis
-/eth
-/ntilde
-/ograve
-/oacute
-/ocircumflex
-/otilde
-/ovardieresis
-/divide
-/oslash.dup
-/ugrave
-/uacute
-/ucircumflex
-/uvardieresis
-/yacute
-/thorn
-/yvardieresis
-] def
\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/map/dvips/context/8r-base.map b/Master/texmf-dist/fonts/map/dvips/context/8r-base.map
deleted file mode 100644
index e1611cfe8a9..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/8r-base.map
+++ /dev/null
@@ -1,135 +0,0 @@
-% courier / urw
-
-ucrb8r  NimbusMonL-Bold          <8r.enc <ucrb8a.pfb
-ucrbo8r NimbusMonL-BoldObli      <8r.enc <ucrbo8a.pfb
-ucrr8r  NimbusMonL-Regu          <8r.enc <ucrr8a.pfb
-ucrro8r NimbusMonL-ReguObli      <8r.enc <ucrro8a.pfb
-
-% courier / adobe
-
-pcrb8r  NimbusMonL-Bold          <8r.enc <ucrb8a.pfb
-pcrbo8r NimbusMonL-BoldObli      <8r.enc <ucrbo8a.pfb
-pcrr8r  NimbusMonL-Regu          <8r.enc <ucrr8a.pfb
-pcrro8r NimbusMonL-ReguObli      <8r.enc <ucrro8a.pfb
-
-% helvetica / urw
-
-uhvb8r  NimbusSanL-Bold          <8r.enc <uhvb8a.pfb
-uhvbo8r NimbusSanL-BoldItal      <8r.enc <uhvbo8a.pfb
-uhvr8r  NimbusSanL-Regu          <8r.enc <uhvr8a.pfb
-uhvro8r NimbusSanL-ReguItal      <8r.enc <uhvro8a.pfb
-
-% helvetica / adobe
-
-phvb8r  NimbusSanL-Bold          <8r.enc <uhvb8a.pfb
-phvbo8r NimbusSanL-BoldItal      <8r.enc <uhvbo8a.pfb
-phvr8r  NimbusSanL-Regu          <8r.enc <uhvr8a.pfb
-phvro8r NimbusSanL-ReguItal      <8r.enc <uhvro8a.pfb
-
-% times / urw
-
-utmb8r  NimbusRomNo9L-Medi       <8r.enc <utmb8a.pfb
-utmbi8r NimbusRomNo9L-MediItal   <8r.enc <utmbi8a.pfb
-utmr8r  NimbusRomNo9L-Regu       <8r.enc <utmr8a.pfb
-utmri8r NimbusRomNo9L-ReguItal   <8r.enc <utmri8a.pfb
-
-utmbo8r NimbusRomNo9L-Medi       ".167 SlantFont" <8r.enc <utmb8a.pfb
-utmro8r NimbusRomNo9L-Regu       ".167 SlantFont" <8r.enc <utmr8a.pfb
-
-% times / adobe
-
-ptmb8r  NimbusRomNo9L-Medi       <8r.enc <utmb8a.pfb
-ptmbi8r NimbusRomNo9L-MediItal   <8r.enc <utmbi8a.pfb
-ptmr8r  NimbusRomNo9L-Regu       <8r.enc <utmr8a.pfb
-ptmri8r NimbusRomNo9L-ReguItal   <8r.enc <utmri8a.pfb
-
-ptmbo8r NimbusRomNo9L-Medi       ".167 SlantFont" <8r.enc <utmb8a.pfb
-ptmro8r NimbusRomNo9L-Regu       ".167 SlantFont" <8r.enc <utmr8a.pfb
-
-% palatino / urw
-
-uplb8r  URWPalladioL-Bold        <8r.enc <uplb8a.pfb
-uplbi8r URWPalladioL-BoldItal    <8r.enc <uplbi8a.pfb
-uplr8r  URWPalladioL-Roma        <8r.enc <uplr8a.pfb
-uplri8r URWPalladioL-Ital        <8r.enc <uplri8a.pfb
-
-uplbo8r URWPalladioL-Bold        ".167 SlantFont" <8r.enc <uplb8a.pfb
-uplro8r URWPalladioL-Roma        ".167 SlantFont" <8r.enc <uplr8a.pfb
-
-% palatino / adobe
-
-pplb8r  URWPalladioL-Bold        <8r.enc <uplb8a.pfb
-pplbi8r URWPalladioL-BoldItal    <8r.enc <uplbi8a.pfb
-pplr8r  URWPalladioL-Roma        <8r.enc <uplr8a.pfb
-pplri8r URWPalladioL-Ital        <8r.enc <uplri8a.pfb
-
-pplbo8r URWPalladioL-Bold        ".167 SlantFont" <8r.enc <uplb8a.pfb
-pplro8r URWPalladioL-Roma        ".167 SlantFont" <8r.enc <uplr8a.pfb
-
-% bookman / urw
-
-ubkd8r  URWBookmanL-DemiBold     <8r.enc <ubkd8a.pfb
-ubkdi8r URWBookmanL-DemiBoldItal <8r.enc <ubkdi8a.pfb
-ubkl8r  URWBookmanL-Ligh         <8r.enc <ubkl8a.pfb
-ubkli8r URWBookmanL-LighItal     <8r.enc <ubkli8a.pfb
-
-ubkdo8r URWBookmanL-DemiBold     ".167 SlantFont" <8r.enc <ubkd8a.pfb
-ubklo8r URWBookmanL-Ligh         ".167 SlantFont" <8r.enc <ubkl8a.pfb
-
-% bookman / adobe
-
-pbkd8r  URWBookmanL-DemiBold     <8r.enc <ubkd8a.pfb
-pbkdi8r URWBookmanL-DemiBoldItal <8r.enc <ubkdi8a.pfb
-pbkl8r  URWBookmanL-Ligh         <8r.enc <ubkl8a.pfb
-pbkli8r URWBookmanL-LighItal     <8r.enc <ubkli8a.pfb
-
-pbkdo8r URWBookmanL-DemiBold     ".167 SlantFont" <8r.enc <ubkd8a.pfb
-pbklo8r URWBookmanL-Ligh         ".167 SlantFont" <8r.enc <ubkl8a.pfb
-
-% chancery / urw
-
-uzcmi8r URWChanceryL-MediItal    <8r.enc <uzcmi8a.pfb
-
-% chancery / adobe
-
-pzcmi8r URWChanceryL-MediItal    <8r.enc <uzcmi8a.pfb
-
-% schoolbook / urw
-
-uncb8r  CenturySchL-Bold         <8r.enc <uncb8a.pfb
-uncbi8r CenturySchL-BoldItal     <8r.enc <uncbi8a.pfb
-uncr8r  CenturySchL-Roma         <8r.enc <uncr8a.pfb
-uncri8r CenturySchL-Ital         <8r.enc <uncri8a.pfb
-
-uncbo8r CenturySchL-Bold         ".167 SlantFont" <8r.enc <uncb8a.pfb
-uncro8r CenturySchL-Roma         ".167 SlantFont" <8r.enc <uncr8a.pfb
-
-% schoolbook / adobe
-
-pncb8r  CenturySchL-Bold         <8r.enc <uncb8a.pfb
-pncbi8r CenturySchL-BoldItal     <8r.enc <uncbi8a.pfb
-pncr8r  CenturySchL-Roma         <8r.enc <uncr8a.pfb
-pncri8r CenturySchL-Ital         <8r.enc <uncri8a.pfb
-
-pncbo8r CenturySchL-Bold         ".167 SlantFont" <8r.enc <uncb8a.pfb
-pncro8r CenturySchL-Roma         ".167 SlantFont" <8r.enc <uncr8a.pfb
-
-% utopia
-
-putb8r  Utopia-Bold              <8r.enc <putb8a.pfb
-putbi8r Utopia-BoldItalic        <8r.enc <putbi8a.pfb
-putr8r  Utopia-Regular           <8r.enc <putr8a.pfb
-putri8r Utopia-Italic            <8r.enc <putri8a.pfb
-
-putbo8r Utopia-Bold              ".167 SlantFont" <8r.enc <putb8a.pfb
-putro8r Utopia-Regular           ".167 SlantFont" <8r.enc <putr8a.pfb
-
-% charter
-
-bchb8r  CharterBT-Bold           <8r.enc <bchb8a.pfb
-bchbi8r CharterBT-BoldItalic     <8r.enc <bchbi8a.pfb
-bchr8r  CharterBT-Roman          <8r.enc <bchr8a.pfb
-bchri8r CharterBT-Italic         <8r.enc <bchri8a.pfb
-
-bchbo8r CharterBT-Bold           ".167 SlantFont" <8r.enc <bchb8a.pfb
-bchro8r CharterBT-Roman          ".167 SlantFont" <8r.enc <bchr8a.pfb
\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/map/dvips/context/context-base.map b/Master/texmf-dist/fonts/map/dvips/context/context-base.map
deleted file mode 100644
index dcb72f69efc..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/context-base.map
+++ /dev/null
@@ -1,1077 +0,0 @@
-% combined file
-
-lasy5      LASY5      <lasy5.pfb
-lasy6      LASY6      <lasy6.pfb
-lasy7      LASY7      <lasy7.pfb
-lasy8      LASY8      <lasy8.pfb
-lasy9      LASY9      <lasy9.pfb
-lasy10     LASY10     <lasy10.pfb
-
-lasyb10    LASYB10    <lasyb10.pfb
-lcircle10  LCIRCLE10  <lcircle1.pfb
-lcirclew10 LCIRCLEW10 <lcirclew.pfb
-lcmss8     LCMSS8     <lcmss8.pfb
-lcmssb8    LCMSSB8    <lcmssb8.pfb
-lcmssi8    LCMSSI8    <lcmssi8.pfb
-line10     LINE10     <line10.pfb
-linew10    LINEW10    <linew10.pfb
-
-logo8      LOGO8      <logo8.pfb
-logo9      LOGO9      <logo9.pfb
-logo10     LOGO10     <logo10.pfb
-logobf10   LOGOBF10   <logobf10.pfb
-logosl10   LOGOSL10   <logosl10.pfb
-
-msam5      MSAM5      <msam5.pfb
-msam7      MSAM7      <msam7.pfb
-msam10     MSAM10     <msam10.pfb
-msbm5      MSBM5      <msbm5.pfb
-msbm7      MSBM7      <msbm7.pfb
-msbm10     MSBM10     <msbm10.pfb
-
-wncyb10    WNCYB10    <wncyb10.pfb
-wncyi10    WNCYI10    <wncyi10.pfb
-wncyr10    WNCYR10    <wncyr10.pfb
-wncysc10   WNCYSC10   <wncysc10.pfb
-wncyss10   WNCYSS10   <wncyss10.pfb
-
-manfnt     MANFNT     <manfnt.pfb
-
-% i dunno what this is
-
-icmex10    <icmex10.pfb
-icmmi8     <icmmi8.pfb
-icmsy8     <icmsy8.pfb
-icmtt8     <icmtt8.pfb
-ilasy8     <ilasy8.pfb
-ilcmss8    <ilcmss8.pfb
-ilcmssb8   <ilcmssb8.pfb
-ilcmssi8   <ilcmssi8.pfb
-
-
-euex10 EUEX10 <euex10.pfb
-
-eufb5  EUFB5  <eufb5.pfb
-eufb7  EUFB7  <eufb7.pfb
-eufb10 EUFB10 <eufb10.pfb
-
-eufm5  EUFM5  <eufm5.pfb
-eufm7  EUFM7  <eufm7.pfb
-eufm10 EUFM10 <eufm10.pfb
-
-eurb5  EURB5  <eurb5.pfb
-eurb7  EURB7  <eurb7.pfb
-eurb10 EURB10 <eurb10.pfb
-
-eurm5  EURM5  <eurm5.pfb
-eurm7  EURM7  <eurm7.pfb
-eurm10 EURM10 <eurm10.pfb
-
-eusb5  EUSB5  <eusb5.pfb
-eusb7  EUSB7  <eusb7.pfb
-eusb10 EUSB10 <eusb10.pfb
-
-eusm5  EUSM5  <eusm5.pfb
-eusm7  EUSM7  <eusm7.pfb
-eusm10 EUSM10 <eusm10.pfb
-
-% LM replacement, thanks to Jacko
-
-% official
-%
-% cmb10     LMRomanDemi10-Regular        <cmrm.enc  <lmb10.pfb
-% cmbx10    LMRoman10-Bold               <cmrm.enc  <lmbx10.pfb
-% cmbx12    LMRoman12-Bold               <cmrm.enc  <lmbx12.pfb
-% cmbx5     LMRoman5-Bold                <cmrm.enc  <lmbx5.pfb
-% cmbx6     LMRoman6-Bold                <cmrm.enc  <lmbx6.pfb
-% cmbx7     LMRoman7-Bold                <cmrm.enc  <lmbx7.pfb
-% cmbx8     LMRoman8-Bold                <cmrm.enc  <lmbx8.pfb
-% cmbx9     LMRoman9-Bold                <cmrm.enc  <lmbx9.pfb
-% cmbxsl10  LMSlanted10-BoldItalic       <cmrm.enc  <lmbxo10.pfb
-% cmbxti10  LMRoman10-BoldItalic         <cmit.enc  <lmbxi10.pfb
-% cmbxti12  LMRoman10-BoldItalic         <cmit.enc  <lmbxti10.pfb
-% cmbxti7   LMRoman10-BoldItalic         <cmit.enc  <lmbxti10.pfb
-% cmcsc10   LMCaps10-Regular             <cmsc.enc  <lmcsc10.pfb
-% cmcsc8    LMCaps10-Regular             <cmsc.enc  <lmcsc10.pfb
-% cmcsc9    LMCaps10-Regular             <cmsc.enc  <lmcsc10.pfb
-% cminch    LMSans10-Bold                <cmin.enc  <lmssbx10.pfb
-% cmitt10   LMTypewriter10-Italic        <cmitt.enc <lmtti10.pfb
-% cmitt12   LMTypewriter10-Italic        <cmitt.enc <lmtti10.pfb
-% cmitt9    LMTypewriter10-Italic        <cmitt.enc <lmtti10.pfb
-% cmr10     LMRoman10-Regular            <cmrm.enc  <lmr10.pfb
-% cmr12     LMRoman12-Regular            <cmrm.enc  <lmr12.pfb
-% cmr17     LMRoman17-Regular            <cmrm.enc  <lmr17.pfb
-% cmr5      LMRoman5-Regular             <cmsc.enc  <lmr5.pfb
-% cmr6      LMRoman6-Regular             <cmrm.enc  <lmr6.pfb
-% cmr7      LMRoman7-Regular             <cmrm.enc  <lmr7.pfb
-% cmr8      LMRoman8-Regular             <cmrm.enc  <lmr8.pfb
-% cmr9      LMRoman9-Regular             <cmrm.enc  <lmr9.pfb
-% cmsl10    LMSlanted10-Italic           <cmrm.enc  <lmro10.pfb
-% cmsl12    LMSlanted12-Italic           <cmrm.enc  <lmro12.pfb
-% cmsl6     LMSlanted8-Italic            <cmrm.enc  <lmro8.pfb
-% cmsl8     LMSlanted8-Italic            <cmrm.enc  <lmro8.pfb
-% cmsl9     LMSlanted9-Italic            <cmrm.enc  <lmro9.pfb
-% cmsltt10  LMTypewriterSlanted10-Italic <cmtt.enc  <lmtto10.pfb
-% cmsltt9   LMTypewriterSlanted10-Italic <cmtt.enc  <lmtto10.pfb
-% cmss10    LMSans10-Regular             <cmrm.enc  <lmss10.pfb
-% cmss12    LMSans12-Regular             <cmrm.enc  <lmss12.pfb
-% cmss17    LMSans17-Regular             <cmrm.enc  <lmss17.pfb
-% cmss8     LMSans8-Regular              <cmrm.enc  <lmss8.pfb
-% cmss9     LMSans9-Regular              <cmrm.enc  <lmss9.pfb
-% cmssbx10  LMSans10-Bold                <cmrm.enc  <lmssbx10.pfb
-% cmssbxo10 LMSans10-BoldItalic          <cmrm.enc  <lmssbo10.pfb
-% cmssdc10  LMSansDemiCond10-Regular     <cmrm.enc  <lmssdc10.pfb
-% cmssi10   LMSans10-Italic              <cmrm.enc  <lmsso10.pfb
-% cmssi12   LMSans12-Italic              <cmrm.enc  <lmsso12.pfb
-% cmssi17   LMSans17-Italic              <cmrm.enc  <lmsso17.pfb
-% cmssi8    LMSans8-Italic               <cmrm.enc  <lmsso8.pfb
-% cmssi9    LMSans9-Italic               <cmrm.enc  <lmsso9.pfb
-% cmssq8    LMSansQuotation8-Regular     <cmrm.enc  <lmssq8.pfb
-% cmssqi8   LMSansQuotation8-Italic      <cmrm.enc  <lmssqo8.pfb
-% cmtcsc10  LMTypewriterCaps10-Regular   <cmtt.enc  <lmtcsc10.pfb
-% cmti10    LMRoman10-Italic             <cmit.enc  <lmri10.pfb
-% cmti12    LMRoman12-Italic             <cmit.enc  <lmri12.pfb
-% cmti7     LMRoman7-Italic              <cmit.enc  <lmri7.pfb
-% cmti8     LMRoman8-Italic              <cmit.enc  <lmri8.pfb
-% cmti9     LMRoman9-Italic              <cmit.enc  <lmri9.pfb
-% cmtt10    LMTypewriter10-Regular       <cmtt.enc  <lmtt10.pfb
-% cmtt12    LMTypewriter12-Regular       <cmtt.enc  <lmtt12.pfb
-% cmtt8     LMTypewriter8-Regular        <cmtt.enc  <lmtt8.pfb
-% cmtt9     LMTypewriter9-Regular        <cmtt.enc  <lmtt9.pfb
-% cmvtt10   LMTypewriterVarWd10-Regular  <cmrm.enc  <lmvtt10.pfb
-%
-% but more efficient since to-be-included old files have those names
-
-cmb10     CMB10     <cmrm.enc  <lmb10.pfb
-cmbx10    CMBX10    <cmrm.enc  <lmbx10.pfb
-cmbx12    CMBX12    <cmrm.enc  <lmbx12.pfb
-cmbx5     CMBX5     <cmrm.enc  <lmbx5.pfb
-cmbx6     CMBX6     <cmrm.enc  <lmbx6.pfb
-cmbx7     CMBX7     <cmrm.enc  <lmbx7.pfb
-cmbx8     CMBX8     <cmrm.enc  <lmbx8.pfb
-cmbx9     CMBX9     <cmrm.enc  <lmbx9.pfb
-cmbxsl10  CMBXSL10  <cmrm.enc  <lmbxo10.pfb
-cmbxti10  CMBXTI10  <cmit.enc  <lmbxi10.pfb
-cmbxti12  CMBXTI12  <cmit.enc  <lmbxti10.pfb
-cmbxti7   CMBXTI7   <cmit.enc  <lmbxti10.pfb
-cmcsc10   CMCSC10   <cmsc.enc  <lmcsc10.pfb
-cmcsc8    CMCSC8    <cmsc.enc  <lmcsc10.pfb
-cmcsc9    CMCSC9    <cmsc.enc  <lmcsc10.pfb
-cminch    CMINCH    <cmin.enc  <lmssbx10.pfb
-cmitt10   CMITT10   <cmitt.enc <lmtti10.pfb
-cmitt12   CMITT12   <cmitt.enc <lmtti10.pfb
-cmitt9    CMITT9    <cmitt.enc <lmtti10.pfb
-cmr10     CMR10     <cmrm.enc  <lmr10.pfb
-cmr12     CMR12     <cmrm.enc  <lmr12.pfb
-cmr17     CMR17     <cmrm.enc  <lmr17.pfb
-cmr5      CMR5      <cmsc.enc  <lmr5.pfb
-cmr6      CMR6      <cmrm.enc  <lmr6.pfb
-cmr7      CMR7      <cmrm.enc  <lmr7.pfb
-cmr8      CMR8      <cmrm.enc  <lmr8.pfb
-cmr9      CMR9      <cmrm.enc  <lmr9.pfb
-cmsl10    CMSL10    <cmrm.enc  <lmro10.pfb
-cmsl12    CMSL12    <cmrm.enc  <lmro12.pfb
-cmsl6     CMSL6     <cmrm.enc  <lmro8.pfb
-cmsl8     CMSL8     <cmrm.enc  <lmro8.pfb
-cmsl9     CMSL9     <cmrm.enc  <lmro9.pfb
-cmsltt10  CMSLTT10  <cmtt.enc  <lmtto10.pfb
-cmsltt9   CMSLTT9   <cmtt.enc  <lmtto10.pfb
-cmss10    CMS10     <cmrm.enc  <lmss10.pfb
-cmss12    CMS12     <cmrm.enc  <lmss12.pfb
-cmss17    CMS17     <cmrm.enc  <lmss17.pfb
-cmss8     CMS8      <cmrm.enc  <lmss8.pfb
-cmss9     CMS9      <cmrm.enc  <lmss9.pfb
-cmssbx10  CMSSBX10  <cmrm.enc  <lmssbx10.pfb
-cmssbxo10 CMSSBXO10 <cmrm.enc  <lmssbo10.pfb
-cmssdc10  CMSSDC10  <cmrm.enc  <lmssdc10.pfb
-cmssi10   CMSI10    <cmrm.enc  <lmsso10.pfb
-cmssi12   CMSI12    <cmrm.enc  <lmsso12.pfb
-cmssi17   CMSI17    <cmrm.enc  <lmsso17.pfb
-cmssi8    CMSSI8    <cmrm.enc  <lmsso8.pfb
-cmssi9    CMSSI9    <cmrm.enc  <lmsso9.pfb
-cmssq8    CMSQ8     <cmrm.enc  <lmssq8.pfb
-cmssqi8   CMSSQI8   <cmrm.enc  <lmssqo8.pfb
-cmtcsc10  CMTCSC10  <cmtt.enc  <lmtcsc10.pfb
-cmti10    CMTI10    <cmit.enc  <lmri10.pfb
-cmti12    CMTI12    <cmit.enc  <lmri12.pfb
-cmti7     CMTI7     <cmit.enc  <lmri7.pfb
-cmti8     CMTI8     <cmit.enc  <lmri8.pfb
-cmti9     CMTI9     <cmit.enc  <lmri9.pfb
-cmtt10    CMTT10    <cmtt.enc  <lmtt10.pfb
-cmtt12    CMTT12    <cmtt.enc  <lmtt12.pfb
-cmtt8     CMTT8     <cmtt.enc  <lmtt8.pfb
-cmtt9     CMTT9     <cmtt.enc  <lmtt9.pfb
-cmvtt10   CMVTT10   <cmrm.enc  <lmvtt10.pfb
-
-% original
-
-cmbsy10   CMBSY10  <cmbsy10.pfb
-cmbsy5    CMBSY5   <cmbsy5.pfb
-cmbsy6    CMBSY7   <cmbsy7.pfb
-cmbsy7    CMBSY7   <cmbsy7.pfb
-cmbsy8    CMBSY7   <cmbsy7.pfb
-cmbsy9    CMBSY10  <cmbsy10.pfb
-cmdunh10  CMDUNH10 <cmdunh10.pfb
-cmex10    CMEX10   <cmex10.pfb
-cmex7     CMEX10   <cmex10.pfb
-cmex8     CMEX10   <cmex10.pfb
-cmex9     CMEX10   <cmex10.pfb
-cmff10    CMFF10   <cmff10.pfb
-cmfi10    CMFI10   <cmfi10.pfb
-cmfib8    CMFIB8   <cmfib8.pfb
-cmmi10    CMMI10   <cmmi10.pfb
-cmmi12    CMMI12   <cmmi12.pfb
-cmmi5     CMMI5    <cmmi5.pfb
-cmmi6     CMMI6    <cmmi6.pfb
-cmmi7     CMMI7    <cmmi7.pfb
-cmmi8     CMMI8    <cmmi8.pfb
-cmmi9     CMMI9    <cmmi9.pfb
-cmmib10   CMMIB10  <cmmib10.pfb
-cmmib5    CMMIB5   <cmmib5.pfb
-cmmib6    CMMIB7   <cmmib7.pfb
-cmmib7    CMMIB7   <cmmib7.pfb
-cmmib8    CMMIB7   <cmmib7.pfb
-cmmib9    CMMIB10  <cmmib10.pfb
-cmsy10    CMSY10   <cmsy10.pfb
-cmsy5     CMSY5    <cmsy5.pfb
-cmsy6     CMSY6    <cmsy6.pfb
-cmsy7     CMSY7    <cmsy7.pfb
-cmsy8     CMSY8    <cmsy8.pfb
-cmsy9     CMSY9    <cmsy9.pfb
-cmtex10   CMTEX10  <cmtex10.pfb
-cmtex8    CMTEX8   <cmtex8.pfb
-cmtex9    CMTEX9   <cmtex9.pfb
-
-% a weird one, not used in context
-
-cmu10     LMRoman10-Italic "-0.25 SlantFont" <cmit.enc <lmri10.pfb
-
-
-% courier / urw
-
-ucrb8r  NimbusMonL-Bold          <8r.enc <ucrb8a.pfb
-ucrbo8r NimbusMonL-BoldObli      <8r.enc <ucrbo8a.pfb
-ucrr8r  NimbusMonL-Regu          <8r.enc <ucrr8a.pfb
-ucrro8r NimbusMonL-ReguObli      <8r.enc <ucrro8a.pfb
-
-% courier / adobe
-
-pcrb8r  NimbusMonL-Bold          <8r.enc <ucrb8a.pfb
-pcrbo8r NimbusMonL-BoldObli      <8r.enc <ucrbo8a.pfb
-pcrr8r  NimbusMonL-Regu          <8r.enc <ucrr8a.pfb
-pcrro8r NimbusMonL-ReguObli      <8r.enc <ucrro8a.pfb
-
-% helvetica / urw
-
-uhvb8r  NimbusSanL-Bold          <8r.enc <uhvb8a.pfb
-uhvbo8r NimbusSanL-BoldItal      <8r.enc <uhvbo8a.pfb
-uhvr8r  NimbusSanL-Regu          <8r.enc <uhvr8a.pfb
-uhvro8r NimbusSanL-ReguItal      <8r.enc <uhvro8a.pfb
-
-% helvetica / adobe
-
-phvb8r  NimbusSanL-Bold          <8r.enc <uhvb8a.pfb
-phvbo8r NimbusSanL-BoldItal      <8r.enc <uhvbo8a.pfb
-phvr8r  NimbusSanL-Regu          <8r.enc <uhvr8a.pfb
-phvro8r NimbusSanL-ReguItal      <8r.enc <uhvro8a.pfb
-
-% times / urw
-
-utmb8r  NimbusRomNo9L-Medi       <8r.enc <utmb8a.pfb
-utmbi8r NimbusRomNo9L-MediItal   <8r.enc <utmbi8a.pfb
-utmr8r  NimbusRomNo9L-Regu       <8r.enc <utmr8a.pfb
-utmri8r NimbusRomNo9L-ReguItal   <8r.enc <utmri8a.pfb
-
-utmbo8r NimbusRomNo9L-Medi       ".167 SlantFont" <8r.enc <utmb8a.pfb
-utmro8r NimbusRomNo9L-Regu       ".167 SlantFont" <8r.enc <utmr8a.pfb
-
-% times / adobe
-
-ptmb8r  NimbusRomNo9L-Medi       <8r.enc <utmb8a.pfb
-ptmbi8r NimbusRomNo9L-MediItal   <8r.enc <utmbi8a.pfb
-ptmr8r  NimbusRomNo9L-Regu       <8r.enc <utmr8a.pfb
-ptmri8r NimbusRomNo9L-ReguItal   <8r.enc <utmri8a.pfb
-
-ptmbo8r NimbusRomNo9L-Medi       ".167 SlantFont" <8r.enc <utmb8a.pfb
-ptmro8r NimbusRomNo9L-Regu       ".167 SlantFont" <8r.enc <utmr8a.pfb
-
-% palatino / urw
-
-uplb8r  URWPalladioL-Bold        <8r.enc <uplb8a.pfb
-uplbi8r URWPalladioL-BoldItal    <8r.enc <uplbi8a.pfb
-uplr8r  URWPalladioL-Roma        <8r.enc <uplr8a.pfb
-uplri8r URWPalladioL-Ital        <8r.enc <uplri8a.pfb
-
-uplbo8r URWPalladioL-Bold        ".167 SlantFont" <8r.enc <uplb8a.pfb
-uplro8r URWPalladioL-Roma        ".167 SlantFont" <8r.enc <uplr8a.pfb
-
-% palatino / adobe
-
-pplb8r  URWPalladioL-Bold        <8r.enc <uplb8a.pfb
-pplbi8r URWPalladioL-BoldItal    <8r.enc <uplbi8a.pfb
-pplr8r  URWPalladioL-Roma        <8r.enc <uplr8a.pfb
-pplri8r URWPalladioL-Ital        <8r.enc <uplri8a.pfb
-
-pplbo8r URWPalladioL-Bold        ".167 SlantFont" <8r.enc <uplb8a.pfb
-pplro8r URWPalladioL-Roma        ".167 SlantFont" <8r.enc <uplr8a.pfb
-
-% bookman / urw
-
-ubkd8r  URWBookmanL-DemiBold     <8r.enc <ubkd8a.pfb
-ubkdi8r URWBookmanL-DemiBoldItal <8r.enc <ubkdi8a.pfb
-ubkl8r  URWBookmanL-Ligh         <8r.enc <ubkl8a.pfb
-ubkli8r URWBookmanL-LighItal     <8r.enc <ubkli8a.pfb
-
-ubkdo8r URWBookmanL-DemiBold     ".167 SlantFont" <8r.enc <ubkd8a.pfb
-ubklo8r URWBookmanL-Ligh         ".167 SlantFont" <8r.enc <ubkl8a.pfb
-
-% bookman / adobe
-
-pbkd8r  URWBookmanL-DemiBold     <8r.enc <ubkd8a.pfb
-pbkdi8r URWBookmanL-DemiBoldItal <8r.enc <ubkdi8a.pfb
-pbkl8r  URWBookmanL-Ligh         <8r.enc <ubkl8a.pfb
-pbkli8r URWBookmanL-LighItal     <8r.enc <ubkli8a.pfb
-
-pbkdo8r URWBookmanL-DemiBold     ".167 SlantFont" <8r.enc <ubkd8a.pfb
-pbklo8r URWBookmanL-Ligh         ".167 SlantFont" <8r.enc <ubkl8a.pfb
-
-% chancery / urw
-
-uzcmi8r URWChanceryL-MediItal    <8r.enc <uzcmi8a.pfb
-
-% chancery / adobe
-
-pzcmi8r URWChanceryL-MediItal    <8r.enc <uzcmi8a.pfb
-
-% schoolbook / urw
-
-uncb8r  CenturySchL-Bold         <8r.enc <uncb8a.pfb
-uncbi8r CenturySchL-BoldItal     <8r.enc <uncbi8a.pfb
-uncr8r  CenturySchL-Roma         <8r.enc <uncr8a.pfb
-uncri8r CenturySchL-Ital         <8r.enc <uncri8a.pfb
-
-uncbo8r CenturySchL-Bold         ".167 SlantFont" <8r.enc <uncb8a.pfb
-uncro8r CenturySchL-Roma         ".167 SlantFont" <8r.enc <uncr8a.pfb
-
-% schoolbook / adobe
-
-pncb8r  CenturySchL-Bold         <8r.enc <uncb8a.pfb
-pncbi8r CenturySchL-BoldItal     <8r.enc <uncbi8a.pfb
-pncr8r  CenturySchL-Roma         <8r.enc <uncr8a.pfb
-pncri8r CenturySchL-Ital         <8r.enc <uncri8a.pfb
-
-pncbo8r CenturySchL-Bold         ".167 SlantFont" <8r.enc <uncb8a.pfb
-pncro8r CenturySchL-Roma         ".167 SlantFont" <8r.enc <uncr8a.pfb
-
-% utopia
-
-putb8r  Utopia-Bold              <8r.enc <putb8a.pfb
-putbi8r Utopia-BoldItalic        <8r.enc <putbi8a.pfb
-putr8r  Utopia-Regular           <8r.enc <putr8a.pfb
-putri8r Utopia-Italic            <8r.enc <putri8a.pfb
-
-putbo8r Utopia-Bold              ".167 SlantFont" <8r.enc <putb8a.pfb
-putro8r Utopia-Regular           ".167 SlantFont" <8r.enc <putr8a.pfb
-
-% charter
-
-bchb8r  CharterBT-Bold           <8r.enc <bchb8a.pfb
-bchbi8r CharterBT-BoldItalic     <8r.enc <bchbi8a.pfb
-bchr8r  CharterBT-Roman          <8r.enc <bchr8a.pfb
-bchri8r CharterBT-Italic         <8r.enc <bchri8a.pfb
-
-bchbo8r CharterBT-Bold           ".167 SlantFont" <8r.enc <bchb8a.pfb
-bchro8r CharterBT-Roman          ".167 SlantFont" <8r.enc <bchr8a.pfb
-
-% courier / urw
-
-ucrb8t  NimbusMonL-Bold          <ec.enc <ucrb8a.pfb
-ucrbo8t NimbusMonL-BoldObli      <ec.enc <ucrbo8a.pfb
-ucrr8t  NimbusMonL-Regu          <ec.enc <ucrr8a.pfb
-ucrro8t NimbusMonL-ReguObli      <ec.enc <ucrro8a.pfb
-
-% courier / adobe
-
-pcrb8t  NimbusMonL-Bold          <ec.enc <ucrb8a.pfb
-pcrbo8t NimbusMonL-BoldObli      <ec.enc <ucrbo8a.pfb
-pcrr8t  NimbusMonL-Regu          <ec.enc <ucrr8a.pfb
-pcrro8t NimbusMonL-ReguObli      <ec.enc <ucrro8a.pfb
-
-% helvetica / urw
-
-uhvb8t  NimbusSanL-Bold          <ec.enc <uhvb8a.pfb
-uhvbo8t NimbusSanL-BoldItal      <ec.enc <uhvbo8a.pfb
-uhvr8t  NimbusSanL-Regu          <ec.enc <uhvr8a.pfb
-uhvro8t NimbusSanL-ReguItal      <ec.enc <uhvro8a.pfb
-
-% helvetica / adobe
-
-phvb8t  NimbusSanL-Bold          <ec.enc <uhvb8a.pfb
-phvbo8t NimbusSanL-BoldItal      <ec.enc <uhvbo8a.pfb
-phvr8t  NimbusSanL-Regu          <ec.enc <uhvr8a.pfb
-phvro8t NimbusSanL-ReguItal      <ec.enc <uhvro8a.pfb
-
-% times / urw
-
-utmb8t  NimbusRomNo9L-Medi       <ec.enc <utmb8a.pfb
-utmbi8t NimbusRomNo9L-MediItal   <ec.enc <utmbi8a.pfb
-utmr8t  NimbusRomNo9L-Regu       <ec.enc <utmr8a.pfb
-utmri8t NimbusRomNo9L-ReguItal   <ec.enc <utmri8a.pfb
-
-utmbo8t NimbusRomNo9L-Medi       ".167 SlantFont" <ec.enc <utmb8a.pfb
-utmro8t NimbusRomNo9L-Regu       ".167 SlantFont" <ec.enc <utmr8a.pfb
-
-% times / adobe
-
-ptmb8t  NimbusRomNo9L-Medi       <ec.enc <utmb8a.pfb
-ptmbi8t NimbusRomNo9L-MediItal   <ec.enc <utmbi8a.pfb
-ptmr8t  NimbusRomNo9L-Regu       <ec.enc <utmr8a.pfb
-ptmri8t NimbusRomNo9L-ReguItal   <ec.enc <utmri8a.pfb
-
-ptmbo8t NimbusRomNo9L-Medi       ".167 SlantFont" <ec.enc <utmb8a.pfb
-ptmro8t NimbusRomNo9L-Regu       ".167 SlantFont" <ec.enc <utmr8a.pfb
-
-% palatino / urw
-
-uplb8t  URWPalladioL-Bold        <ec.enc <uplb8a.pfb
-uplbi8t URWPalladioL-BoldItal    <ec.enc <uplbi8a.pfb
-uplr8t  URWPalladioL-Roma        <ec.enc <uplr8a.pfb
-uplri8t URWPalladioL-Ital        <ec.enc <uplri8a.pfb
-
-uplbo8t URWPalladioL-Bold        ".167 SlantFont" <ec.enc <uplb8a.pfb
-uplro8t URWPalladioL-Roma        ".167 SlantFont" <ec.enc <uplr8a.pfb
-
-% palatino / adobe
-
-pplb8t  URWPalladioL-Bold        <ec.enc <uplb8a.pfb
-pplbi8t URWPalladioL-BoldItal    <ec.enc <uplbi8a.pfb
-pplr8t  URWPalladioL-Roma        <ec.enc <uplr8a.pfb
-pplri8t URWPalladioL-Ital        <ec.enc <uplri8a.pfb
-
-pplbo8t URWPalladioL-Bold        ".167 SlantFont" <ec.enc <uplb8a.pfb
-pplro8t URWPalladioL-Roma        ".167 SlantFont" <ec.enc <upplr8a.pfb
-
-% bookman / urw
-
-ubkd8t  URWBookmanL-DemiBold     <ec.enc <ubkd8a.pfb
-ubkdi8t URWBookmanL-DemiBoldItal <ec.enc <ubkdi8a.pfb
-ubkl8t  URWBookmanL-Ligh         <ec.enc <ubkl8a.pfb
-ubkli8t URWBookmanL-LighItal     <ec.enc <ubkli8a.pfb
-
-ubkdo8t URWBookmanL-DemiBold     ".167 SlantFont" <ec.enc <ubkd8a.pfb
-ubklo8t URWBookmanL-Ligh         ".167 SlantFont" <ec.enc <ubkl8a.pfb
-
-% bookman / adobe
-
-pbkd8t  URWBookmanL-DemiBold     <ec.enc <ubkd8a.pfb
-pbkdi8t URWBookmanL-DemiBoldItal <ec.enc <ubkdi8a.pfb
-pbkl8t  URWBookmanL-Ligh         <ec.enc <ubkl8a.pfb
-pbkli8t URWBookmanL-LighItal     <ec.enc <ubkli8a.pfb
-
-pbkdo8t URWBookmanL-DemiBold     ".167 SlantFont" <ec.enc <ubkd8a.pfb
-pbklo8t URWBookmanL-Ligh         ".167 SlantFont" <ec.enc <ubkl8a.pfb
-
-% chancery / urw
-
-uzcmi8t URWChanceryL-MediItal    <ec.enc <uzcmi8a.pfb
-
-% chancery / adobe
-
-pzcmi8t URWChanceryL-MediItal    <ec.enc <uzcmi8a.pfb
-
-% schoolbook / urw
-
-uncb8t  CenturySchL-Bold         <ec.enc <uncb8a.pfb
-uncbi8t CenturySchL-BoldItal     <ec.enc <uncbi8a.pfb
-uncr8t  CenturySchL-Roma         <ec.enc <uncr8a.pfb
-uncri8t CenturySchL-Ital         <ec.enc <uncri8a.pfb
-
-uncbo8t CenturySchL-Bold         ".167 SlantFont" <ec.enc <uncb8a.pfb
-uncro8t CenturySchL-Roma         ".167 SlantFont" <ec.enc <uncr8a.pfb
-
-% schoolbook / adobe
-
-pncb8t  CenturySchL-Bold         <ec.enc <uncb8a.pfb
-pncbi8t CenturySchL-BoldItal     <ec.enc <uncbi8a.pfb
-pncr8t  CenturySchL-Roma         <ec.enc <uncr8a.pfb
-pncri8t CenturySchL-Ital         <ec.enc <uncri8a.pfb
-
-pncbo8t CenturySchL-Bold         ".167 SlantFont" <ec.enc <uncb8a.pfb
-pncro8t CenturySchL-Roma         ".167 SlantFont" <ec.enc <uncr8a.pfb
-
-% utopia
-
-putb8t  Utopia-Bold              <ec.enc <putb8a.pfb
-putbi8t Utopia-BoldItalic        <ec.enc <putbi8a.pfb
-putr8t  Utopia-Regular           <ec.enc <putr8a.pfb
-putri8t Utopia-Italic            <ec.enc <putri8a.pfb
-
-putbo8t Utopia-Bold              ".167 SlantFont" <ec.enc <putb8a.pfb
-putro8t Utopia-Regular           ".167 SlantFont" <ec.enc <putr8a.pfb
-
-% charter
-
-bchb8t  CharterBT-Bold           <ec.enc <bchb8a.pfb
-bchbi8t CharterBT-BoldItalic     <ec.enc <bchbi8a.pfb
-bchr8t  CharterBT-Roman          <ec.enc <bchr8a.pfb
-bchri8t CharterBT-Italic         <ec.enc <bchri8a.pfb
-
-bchbo8t CharterBT-Bold           ".167 SlantFont" <ec.enc <bchb8a.pfb
-bchro8t CharterBT-Roman          ".167 SlantFont" <ec.enc <bchr8a.pfb
-
-ec-lmb10 LMRoman10-Demi "enclmec ReEncodeFont" <lm-ec.enc <lmb10.pfb
-ec-lmbo10 LMRoman10-DemiOblique "enclmec ReEncodeFont" <lm-ec.enc <lmbo10.pfb
-ec-lmbx10 LMRoman10-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx10.pfb
-ec-lmbx12 LMRoman12-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx12.pfb
-ec-lmbx5 LMRoman5-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx5.pfb
-ec-lmbx6 LMRoman6-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx6.pfb
-ec-lmbx7 LMRoman7-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx7.pfb
-ec-lmbx8 LMRoman8-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx8.pfb
-ec-lmbx9 LMRoman9-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx9.pfb
-ec-lmbxi10 LMRoman10-BoldItalic "enclmec ReEncodeFont" <lm-ec.enc <lmbxi10.pfb
-ec-lmbxo10 LMRoman10-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmbxo10.pfb
-ec-lmcsc10 LMRoman10-CapsRegular "enclmec ReEncodeFont" <lm-ec.enc <lmcsc10.pfb
-ec-lmcsco10 LMRoman10-CapsOblique "enclmec ReEncodeFont" <lm-ec.enc <lmcsco10.pfb
-ec-lmr10 LMRoman10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr10.pfb
-ec-lmr12 LMRoman12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr12.pfb
-ec-lmr17 LMRoman17-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr17.pfb
-ec-lmr5 LMRoman5-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr5.pfb
-ec-lmr6 LMRoman6-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr6.pfb
-ec-lmr7 LMRoman7-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr7.pfb
-ec-lmr8 LMRoman8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr8.pfb
-ec-lmr9 LMRoman9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr9.pfb
-ec-lmri10 LMRoman10-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri10.pfb
-ec-lmri12 LMRoman12-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri12.pfb
-ec-lmri7 LMRoman7-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri7.pfb
-ec-lmri8 LMRoman8-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri8.pfb
-ec-lmri9 LMRoman9-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri9.pfb
-ec-lmro10 LMRoman10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro10.pfb
-ec-lmro12 LMRoman12-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro12.pfb
-ec-lmro17 LMRoman17-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro17.pfb
-ec-lmro8 LMRoman8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro8.pfb
-ec-lmro9 LMRoman9-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro9.pfb
-ec-lmss10 LMSans10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss10.pfb
-ec-lmss12 LMSans12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss12.pfb
-ec-lmss17 LMSans17-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss17.pfb
-ec-lmss8 LMSans8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss8.pfb
-ec-lmss9 LMSans9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss9.pfb
-ec-lmssbo10 LMSans10-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssbo10.pfb
-ec-lmssbx10 LMSans10-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmssbx10.pfb
-ec-lmssdc10 LMSans10-DemiCondensed "enclmec ReEncodeFont" <lm-ec.enc <lmssdc10.pfb
-ec-lmssdo10 LMSans10-DemiCondensedOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssdo10.pfb
-ec-lmsso10 LMSans10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso10.pfb
-ec-lmsso12 LMSans12-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso12.pfb
-ec-lmsso17 LMSans17-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso17.pfb
-ec-lmsso8 LMSans8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso8.pfb
-ec-lmsso9 LMSans9-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso9.pfb
-ec-lmssq8 LMSansQuotation8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmssq8.pfb
-ec-lmssqbo8 LMSansQuotation8-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssqbo8.pfb
-ec-lmssqbx8 LMSansQuotation8-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmssqbx8.pfb
-ec-lmssqo8 LMSansQuotation8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmssqo8.pfb
-ec-lmtcsc10 LMTypewriter10-CapsRegular "enclmec ReEncodeFont" <lm-ec.enc <lmtcsc10.pfb
-ec-lmtcso10 LMTypewriter10-CapsOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtcso10.pfb
-ec-lmtl10 LMTypewriter10-Light "enclmec ReEncodeFont" <lm-ec.enc <lmtl10.pfb
-ec-lmtlo10 LMTypewriter10-LightOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtlo10.pfb
-ec-lmtlc10 LMTypewriter10-LightCondensed "enclmec ReEncodeFont" <lm-ec.enc <lmtlc10.pfb
-ec-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtlco10.pfb
-ec-lmtk10 LMTypewriter10-Dark "enclmec ReEncodeFont" <lm-ec.enc <lmtk10.pfb
-ec-lmtko10 LMTypewriter10-DarkOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtko10.pfb
-ec-lmtt10 LMTypewriter10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt10.pfb
-ec-lmtt12 LMTypewriter12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt12.pfb
-ec-lmtt8 LMTypewriter8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt8.pfb
-ec-lmtt9 LMTypewriter9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt9.pfb
-ec-lmtti10 LMTypewriter10-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmtti10.pfb
-ec-lmtto10 LMTypewriter10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmtto10.pfb
-ec-lmvtt10 LMTypewriterVarWd10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmvtt10.pfb
-ec-lmvtto10 LMTypewriterVarWd10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtto10.pfb
-ec-lmvtl10 LMTypewriterVarWd10-Light "enclmec ReEncodeFont" <lm-ec.enc <lmvtl10.pfb
-ec-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtlo10.pfb
-ec-lmvtk10 LMTypewriterVarWd10-Dark "enclmec ReEncodeFont" <lm-ec.enc <lmvtk10.pfb
-ec-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtko10.pfb
-
-
-% courier / urw
-
-qcrb  <qcr.enc <qcrb.pfb
-qcrbi <qcr.enc <qcrbi.pfb
-qcrr  <qcr.enc <qcrr.pfb
-qcrri <qcr.enc <qcrri.pfb
-
-% helvetica / urw
-
-qhvb   <qhv.enc <qhvb.pfb
-qhvbi  <qhv.enc <qhvbi.pfb
-qhvcb  <qhv.enc <qhvcb.pfb
-qhvcbi <qhv.enc <qhvcbi.pfb
-qhvcr  <qhv.enc <qhvcr.pfb
-qhvcri <qhv.enc <qhvcri.pfb
-qhvr   <qhv.enc <qhvr.pfb
-qhvri  <qhv.enc <qhvri.pfb
-
-% times / urw
-
-qtmb  <qtm.enc <qtmb.pfb
-qtmbi <qtm.enc <qtmbi.pfb
-qtmr  <qtm.enc <qtmr.pfb
-qtmri <qtm.enc <qtmri.pfb
-
-% palatino / urw
-
-qplb  <qpl.enc <qplb.pfb
-qplbi <qpl.enc <qplbi.pfb
-qplr  <qpl.enc <qplr.pfb
-qplri <qpl.enc <qplri.pfb
-
-% bookman / urw
-
-qbkb  <qbk.enc <qbkb.pfb
-qbkbi <qbk.enc <qbkbi.pfb
-qbkr  <qbk.enc <qbkr.pfb
-qbkri <qbk.enc <qbkri.pfb
-
-% chancery / urw
-
-qzcmi <qzc.enc <qzcmi.pfb
-
-% schoolbook / urw
-%
-% not available
-
-% utopia
-%
-% not available
-
-% charter
-%
-% not available
-
-
-
-qx-lmb10 LMRoman10-Demi "enclmqx ReEncodeFont" <lm-qx.enc <lmb10.pfb
-qx-lmbo10 LMRoman10-DemiOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmbo10.pfb
-qx-lmbx10 LMRoman10-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx10.pfb
-qx-lmbx12 LMRoman12-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx12.pfb
-qx-lmbx5 LMRoman5-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx5.pfb
-qx-lmbx6 LMRoman6-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx6.pfb
-qx-lmbx7 LMRoman7-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx7.pfb
-qx-lmbx8 LMRoman8-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx8.pfb
-qx-lmbx9 LMRoman9-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx9.pfb
-qx-lmbxi10 LMRoman10-BoldItalic "enclmqx ReEncodeFont" <lm-qx.enc <lmbxi10.pfb
-qx-lmbxo10 LMRoman10-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmbxo10.pfb
-qx-lmcsc10 LMRoman10-CapsRegular "enclmqx ReEncodeFont" <lm-qx.enc <lmcsc10.pfb
-qx-lmcsco10 LMRoman10-CapsOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmcsco10.pfb
-qx-lmr10 LMRoman10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr10.pfb
-qx-lmr12 LMRoman12-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr12.pfb
-qx-lmr17 LMRoman17-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr17.pfb
-qx-lmr5 LMRoman5-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr5.pfb
-qx-lmr6 LMRoman6-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr6.pfb
-qx-lmr7 LMRoman7-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr7.pfb
-qx-lmr8 LMRoman8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr8.pfb
-qx-lmr9 LMRoman9-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr9.pfb
-qx-lmri10 LMRoman10-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri10.pfb
-qx-lmri12 LMRoman12-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri12.pfb
-qx-lmri7 LMRoman7-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri7.pfb
-qx-lmri8 LMRoman8-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri8.pfb
-qx-lmri9 LMRoman9-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri9.pfb
-qx-lmro10 LMRoman10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro10.pfb
-qx-lmro12 LMRoman12-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro12.pfb
-qx-lmro17 LMRoman17-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro17.pfb
-qx-lmro8 LMRoman8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro8.pfb
-qx-lmro9 LMRoman9-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro9.pfb
-qx-lmss10 LMSans10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss10.pfb
-qx-lmss12 LMSans12-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss12.pfb
-qx-lmss17 LMSans17-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss17.pfb
-qx-lmss8 LMSans8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss8.pfb
-qx-lmss9 LMSans9-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss9.pfb
-qx-lmssbo10 LMSans10-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssbo10.pfb
-qx-lmssbx10 LMSans10-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmssbx10.pfb
-qx-lmssdc10 LMSans10-DemiCondensed "enclmqx ReEncodeFont" <lm-qx.enc <lmssdc10.pfb
-qx-lmssdo10 LMSans10-DemiCondensedOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssdo10.pfb
-qx-lmsso10 LMSans10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso10.pfb
-qx-lmsso12 LMSans12-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso12.pfb
-qx-lmsso17 LMSans17-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso17.pfb
-qx-lmsso8 LMSans8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso8.pfb
-qx-lmsso9 LMSans9-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso9.pfb
-qx-lmssq8 LMSansQuotation8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmssq8.pfb
-qx-lmssqbo8 LMSansQuotation8-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssqbo8.pfb
-qx-lmssqbx8 LMSansQuotation8-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmssqbx8.pfb
-qx-lmssqo8 LMSansQuotation8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssqo8.pfb
-qx-lmtcsc10 LMTypewriter10-CapsRegular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtcsc10.pfb
-qx-lmtcso10 LMTypewriter10-CapsOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtcso10.pfb
-qx-lmtl10 LMTypewriter10-Light "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtl10.pfb
-qx-lmtlo10 LMTypewriter10-LightOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlo10.pfb
-qx-lmtlc10 LMTypewriter10-LightCondensed "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlc10.pfb
-qx-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlco10.pfb
-qx-lmtk10 LMTypewriter10-Dark "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtk10.pfb
-qx-lmtko10 LMTypewriter10-DarkOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtko10.pfb
-qx-lmtt10 LMTypewriter10-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt10.pfb
-qx-lmtt12 LMTypewriter12-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt12.pfb
-qx-lmtt8 LMTypewriter8-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt8.pfb
-qx-lmtt9 LMTypewriter9-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt9.pfb
-qx-lmtti10 LMTypewriter10-Italic "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtti10.pfb
-qx-lmtto10 LMTypewriter10-Oblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtto10.pfb
-qx-lmvtt10 LMTypewriterVarWd10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmvtt10.pfb
-qx-lmvtto10 LMTypewriterVarWd10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtto10.pfb
-qx-lmvtl10 LMTypewriterVarWd10-Light "enclmqx ReEncodeFont" <lm-qx.enc <lmvtl10.pfb
-qx-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtlo10.pfb
-qx-lmvtk10 LMTypewriterVarWd10-Dark "enclmqx ReEncodeFont" <lm-qx.enc <lmvtk10.pfb
-qx-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtko10.pfb
-
-
-% courier / urw
-
-ucrr8v  VnNimbusMonL-Regu                          "T5Encoding ReEncodeFont" <t5.enc <ucrr8v.pfb
-ucrro8v VnNimbusMonL-ReguObli                      "T5Encoding ReEncodeFont" <t5.enc <ucrro8v.pfb
-ucrb8v  VnNimbusMonL-Bold                          "T5Encoding ReEncodeFont" <t5.enc <ucrb8v.pfb
-ucrbo8v VnNimbusMonL-BoldObli                      "T5Encoding ReEncodeFont" <t5.enc <ucrbo8v.pfb
-
-% helvetica / urw
-
-uhvr8v  VnNimbusSanL-Regu                          "T5Encoding ReEncodeFont" <t5.enc <uhvr8v.pfb
-uhvro8v VnNimbusSanL-ReguItal                      "T5Encoding ReEncodeFont" <t5.enc <uhvro8v.pfb
-uhvb8v  VnNimbusSanL-Bold                          "T5Encoding ReEncodeFont" <t5.enc <uhvb8v.pfb
-uhvbo8v VnNimbusSanL-BoldItal                      "T5Encoding ReEncodeFont" <t5.enc <uhvbo8v.pfb
-
-% times / urw
-
-utmr8v  VnNimbusRomNo9L-Regu                       "T5Encoding ReEncodeFont" <t5.enc <utmr8v.pfb
-utmri8v VnNimbusRomNo9L-ReguItal                   "T5Encoding ReEncodeFont" <t5.enc <utmri8v.pfb
-utmb8v  VnNimbusRomNo9L-Medi                       "T5Encoding ReEncodeFont" <t5.enc <utmb8v.pfb
-utmbi8v VnNimbusRomNo9L-MediItal                   "T5Encoding ReEncodeFont" <t5.enc <utmbi8v.pfb
-
-utmro8v VnNimbusRomNo9L-Regu       "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <utmr8v.pfb
-utmbo8v VnNimbusRomNo9L-Medi       "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <utmb8v.pfb
-
-% palatino / urw
-
-uplr8v  VnURWPalladioL-Roma                        "T5Encoding ReEncodeFont" <t5.enc <uplr8v.pfb
-uplri8v VnURWPalladioL-Ital                        "T5Encoding ReEncodeFont" <t5.enc <uplri8v.pfb
-uplb8v  VnURWPalladioL-Bold                        "T5Encoding ReEncodeFont" <t5.enc <uplb8v.pfb
-uplbi8v VnURWPalladioL-BoldItal                    "T5Encoding ReEncodeFont" <t5.enc <uplbi8v.pfb
-
-uplro8v VnURWPalladioL-Roma        "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <uplr8v.pfb
-uplbo8v VnURWPalladioL-Bold        "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <uplb8v.pfb
-
-% bookman / urw
-
-ubkl8v  VnURWBookmanL-Ligh                         "T5Encoding ReEncodeFont" <t5.enc <ubkl8v.pfb
-ubkli8v VnURWBookmanL-LighItal                     "T5Encoding ReEncodeFont" <t5.enc <ubkli8v.pfb
-ubkd8v  VnURWBookmanL-DemiBold                     "T5Encoding ReEncodeFont" <t5.enc <ubkd8v.pfb
-ubkdi8v VnURWBookmanL-DemiBoldItal                 "T5Encoding ReEncodeFont" <t5.enc <ubkdi8v.pfb
-
-ubklo8v VnURWBookmanL-Ligh         "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <ubkl8v.pfb
-ubkdo8v VnURWBookmanL-DemiBold     "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <ubkd8v.pfb
-
-% chancery / urw
-
-% not supported
-%
-% schoolbook / urw
-
-uncr8v  VnCenturySchL-Roma                         "T5Encoding ReEncodeFont" <t5.enc <uncr8v.pfb
-uncri8v VnCenturySchL-Ital                         "T5Encoding ReEncodeFont" <t5.enc <uncri8v.pfb
-uncb8v  VnCenturySchL-Bold                         "T5Encoding ReEncodeFont" <t5.enc <uncb8v.pfb
-uncbi8v VnCenturySchL-BoldItal                     "T5Encoding ReEncodeFont" <t5.enc <uncbi8v.pfb
-
-uncro8v VnCenturySchL-Roma         "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <uncr8v.pfb
-uncbo8v VnCenturySchL-Bold         "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <uncb8v.pfb
-
-% utopia
-%
-% not supported
-
-% charter
-%
-% not supported
-
-% gothic / urw
-
-uagk8v  VnURWGothicL-Book                          "T5Encoding ReEncodeFont" <t5.enc <uagk8v.pfb
-uagko8v VnURWGothicL-BookObli                      "T5Encoding ReEncodeFont" <t5.enc <uagko8v.pfb
-uagd8v  VnURWGothicL-Demi                          "T5Encoding ReEncodeFont" <t5.enc <uagd8v.pfb
-uagdo8v VnURWGothicL-DemiObli                      "T5Encoding ReEncodeFont" <t5.enc <uagdo8v.pfb
-
-
-t5-lmb10 LMRoman10-Demi "enclmt5 ReEncodeFont" <lm-t5.enc <lmb10.pfb
-t5-lmbo10 LMRoman10-DemiOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmbo10.pfb
-t5-lmbx10 LMRoman10-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx10.pfb
-t5-lmbx12 LMRoman12-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx12.pfb
-t5-lmbx5 LMRoman5-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx5.pfb
-t5-lmbx6 LMRoman6-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx6.pfb
-t5-lmbx7 LMRoman7-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx7.pfb
-t5-lmbx8 LMRoman8-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx8.pfb
-t5-lmbx9 LMRoman9-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx9.pfb
-t5-lmbxi10 LMRoman10-BoldItalic "enclmt5 ReEncodeFont" <lm-t5.enc <lmbxi10.pfb
-t5-lmbxo10 LMRoman10-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmbxo10.pfb
-t5-lmcsc10 LMRoman10-CapsRegular "enclmt5 ReEncodeFont" <lm-t5.enc <lmcsc10.pfb
-t5-lmcsco10 LMRoman10-CapsOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmcsco10.pfb
-t5-lmr10 LMRoman10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr10.pfb
-t5-lmr12 LMRoman12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr12.pfb
-t5-lmr17 LMRoman17-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr17.pfb
-t5-lmr5 LMRoman5-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr5.pfb
-t5-lmr6 LMRoman6-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr6.pfb
-t5-lmr7 LMRoman7-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr7.pfb
-t5-lmr8 LMRoman8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr8.pfb
-t5-lmr9 LMRoman9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr9.pfb
-t5-lmri10 LMRoman10-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri10.pfb
-t5-lmri12 LMRoman12-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri12.pfb
-t5-lmri7 LMRoman7-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri7.pfb
-t5-lmri8 LMRoman8-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri8.pfb
-t5-lmri9 LMRoman9-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri9.pfb
-t5-lmro10 LMRoman10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro10.pfb
-t5-lmro12 LMRoman12-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro12.pfb
-t5-lmro17 LMRoman17-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro17.pfb
-t5-lmro8 LMRoman8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro8.pfb
-t5-lmro9 LMRoman9-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro9.pfb
-t5-lmss10 LMSans10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss10.pfb
-t5-lmss12 LMSans12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss12.pfb
-t5-lmss17 LMSans17-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss17.pfb
-t5-lmss8 LMSans8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss8.pfb
-t5-lmss9 LMSans9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss9.pfb
-t5-lmssbo10 LMSans10-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssbo10.pfb
-t5-lmssbx10 LMSans10-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmssbx10.pfb
-t5-lmssdc10 LMSans10-DemiCondensed "enclmt5 ReEncodeFont" <lm-t5.enc <lmssdc10.pfb
-t5-lmssdo10 LMSans10-DemiCondensedOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssdo10.pfb
-t5-lmsso10 LMSans10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso10.pfb
-t5-lmsso12 LMSans12-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso12.pfb
-t5-lmsso17 LMSans17-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso17.pfb
-t5-lmsso8 LMSans8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso8.pfb
-t5-lmsso9 LMSans9-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso9.pfb
-t5-lmssq8 LMSansQuotation8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmssq8.pfb
-t5-lmssqbo8 LMSansQuotation8-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqbo8.pfb
-t5-lmssqbx8 LMSansQuotation8-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqbx8.pfb
-t5-lmssqo8 LMSansQuotation8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqo8.pfb
-t5-lmtcsc10 LMTypewriter10-CapsRegular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtcsc10.pfb
-t5-lmtcso10 LMTypewriter10-CapsOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtcso10.pfb
-t5-lmtl10 LMTypewriter10-Light "enclmt5 ReEncodeFont" <lm-t5.enc <lmtl10.pfb
-t5-lmtlo10 LMTypewriter10-LightOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlo10.pfb
-t5-lmtlc10 LMTypewriter10-LightCondensed "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlc10.pfb
-t5-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlco10.pfb
-t5-lmtk10 LMTypewriter10-Dark "enclmt5 ReEncodeFont" <lm-t5.enc <lmtk10.pfb
-t5-lmtko10 LMTypewriter10-DarkOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtko10.pfb
-t5-lmtt10 LMTypewriter10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt10.pfb
-t5-lmtt12 LMTypewriter12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt12.pfb
-t5-lmtt8 LMTypewriter8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt8.pfb
-t5-lmtt9 LMTypewriter9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt9.pfb
-t5-lmtti10 LMTypewriter10-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmtti10.pfb
-t5-lmtto10 LMTypewriter10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtto10.pfb
-t5-lmvtt10 LMTypewriterVarWd10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtt10.pfb
-t5-lmvtto10 LMTypewriterVarWd10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtto10.pfb
-t5-lmvtl10 LMTypewriterVarWd10-Light "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtl10.pfb
-t5-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtlo10.pfb
-t5-lmvtk10 LMTypewriterVarWd10-Dark "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtk10.pfb
-t5-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtko10.pfb
-
-
-% author: Hans Hagen
-%
-% This map file defines the texnansi alternatives of the public fonts,
-% beware, these are seldom present on your system. If you really want
-% to use these fonts, uncomment the relevant lines. If no fonts are
-% present, pdftex may get confused.
-
-% courier / urw
-
-% ucrb8y  NimbusMonL-Bold          <texnansi.enc <ucrb8a.pfb
-% ucrbo8y NimbusMonL-BoldObli      <texnansi.enc <ucrbo8a.pfb
-% ucrr8y  NimbusMonL-Regu          <texnansi.enc <ucrr8a.pfb
-% ucrro8y NimbusMonL-ReguObli      <texnansi.enc <ucrro8a.pfb
-
-% courier / adobe
-
-% pcrb8y  NimbusMonL-Bold          <texnansi.enc <ucrb8a.pfb
-% pcrbo8y NimbusMonL-BoldObli      <texnansi.enc <ucrbo8a.pfb
-% pcrr8y  NimbusMonL-Regu          <texnansi.enc <ucrr8a.pfb
-% pcrro8y NimbusMonL-ReguObli      <texnansi.enc <ucrro8a.pfb
-
-% helvetica / urw
-
-% uhvb8y  NimbusSanL-Bold          <texnansi.enc <uhvb8a.pfb
-% uhvbo8y NimbusSanL-BoldItal      <texnansi.enc <uhvbo8a.pfb
-% uhvr8y  NimbusSanL-Regu          <texnansi.enc <uhvr8a.pfb
-% uhvro8y NimbusSanL-ReguItal      <texnansi.enc <uhvro8a.pfb
-
-% helvetica / adobe
-
-% phvb8y  NimbusSanL-Bold          <texnansi.enc <uhvb8a.pfb
-% phvbo8y NimbusSanL-BoldItal      <texnansi.enc <uhvbo8a.pfb
-% phvr8y  NimbusSanL-Regu          <texnansi.enc <uhvr8a.pfb
-% phvro8y NimbusSanL-ReguItal      <texnansi.enc <uhvro8a.pfb
-
-% times / urw
-
-% utmb8y  NimbusRomNo9L-Medi       <texnansi.enc <utmb8a.pfb
-% utmbi8y NimbusRomNo9L-MediItal   <texnansi.enc <utmbi8a.pfb
-% utmr8y  NimbusRomNo9L-Regu       <texnansi.enc <utmr8a.pfb
-% utmri8y NimbusRomNo9L-ReguItal   <texnansi.enc <utmri8a.pfb
-
-% utmbo8y NimbusRomNo9L-Medi       ".167 SlantFont" <texnansi.enc <utmb8a.pfb
-% utmro8y NimbusRomNo9L-Regu       ".167 SlantFont" <texnansi.enc <utmr8a.pfb
-
-% times / adobe
-
-% ptmb8y  NimbusRomNo9L-Medi       <texnansi.enc <utmb8a.pfb
-% ptmbi8y NimbusRomNo9L-MediItal   <texnansi.enc <utmbi8a.pfb
-% ptmr8y  NimbusRomNo9L-Regu       <texnansi.enc <utmr8a.pfb
-% ptmri8y NimbusRomNo9L-ReguItal   <texnansi.enc <utmri8a.pfb
-
-% ptmbo8y NimbusRomNo9L-Medi       ".167 SlantFont" <texnansi.enc <utmb8a.pfb
-% ptmro8y NimbusRomNo9L-Regu       ".167 SlantFont" <texnansi.enc <utmr8a.pfb
-
-% palatino / urw
-
-% uplb8y  URWPalladioL-Bold        <texnansi.enc <uplb8a.pfb
-% uplbi8y URWPalladioL-BoldItal    <texnansi.enc <uplbi8a.pfb
-% uplr8y  URWPalladioL-Roma        <texnansi.enc <uplr8a.pfb
-% uplri8y URWPalladioL-Ital        <texnansi.enc <uplri8a.pfb
-
-% uplbo8y URWPalladioL-Bold        ".167 SlantFont" <texnansi.enc <uplb8a.pfb
-% uplro8y URWPalladioL-Roma        ".167 SlantFont" <texnansi.enc <uplr8a.pfb
-
-% palatino / adobe
-
-% pplb8y  URWPalladioL-Bold        <texnansi.enc <uplb8a.pfb
-% pplbi8y URWPalladioL-BoldItal    <texnansi.enc <uplbi8a.pfb
-% pplr8y  URWPalladioL-Roma        <texnansi.enc <uplr8a.pfb
-% pplri8y URWPalladioL-Ital        <texnansi.enc <uplri8a.pfb
-
-% pplbo8y URWPalladioL-Bold        ".167 SlantFont" <texnansi.enc <uplb8a.pfb
-% pplro8y URWPalladioL-Roma        ".167 SlantFont" <texnansi.enc <uplr8a.pfb
-
-% bookman / urw
-
-% ubkd8y  URWBookmanL-DemiBold     <texnansi.enc <ubkd8a.pfb
-% ubkdi8y URWBookmanL-DemiBoldItal <texnansi.enc <ubkdi8a.pfb
-% ubkl8y  URWBookmanL-Ligh         <texnansi.enc <ubkl8a.pfb
-% vubkli8y URWBookmanL-LighItal     <texnansi.enc <ubkli8a.pfb
-
-% ubkdo8y URWBookmanL-DemiBold     ".167 SlantFont" <texnansi.enc <ubkd8a.pfb
-% ubklo8y URWBookmanL-Ligh         ".167 SlantFont" <texnansi.enc <ubkl8a.pfb
-
-% bookman / adobe
-
-% pbkd8y  URWBookmanL-DemiBold     <texnansi.enc <ubkd8a.pfb
-% pbkdi8y URWBookmanL-DemiBoldItal <texnansi.enc <ubkdi8a.pfb
-% pbkl8y  URWBookmanL-Ligh         <texnansi.enc <ubkl8a.pfb
-% pbkli8y URWBookmanL-LighItal     <texnansi.enc <ubkli8a.pfb
-
-% pbkdo8y URWBookmanL-DemiBold     ".167 SlantFont" <texnansi.enc <ubkd8a.pfb
-% pbklo8y URWBookmanL-Ligh         ".167 SlantFont" <texnansi.enc <ubkl8a.pfb
-
-% chancery / urw
-
-% uzcmi8y URWChanceryL-MediItal    <texnansi.enc <uzcmi8a.pfb
-
-% chancery / adobe
-
-% pzcmi8y URWChanceryL-MediItal    <texnansi.enc <uzcmi8a.pfb
-
-% schoolbook / urw
-
-% uncb8y  CenturySchL-Bold         <texnansi.enc <uncb8a.pfb
-% uncbi8y CenturySchL-BoldItal     <texnansi.enc <uncbi8a.pfb
-% uncr8y  CenturySchL-Roma         <texnansi.enc <uncr8a.pfb
-% uncri8y CenturySchL-Ital         <texnansi.enc <uncri8a.pfb
-
-% uncbo8y CenturySchL-Bold         ".167 SlantFont" <texnansi.enc <uncb8a.pfb
-% uncro8y CenturySchL-Roma         ".167 SlantFont" <texnansi.enc <uncr8a.pfb
-
-% schoolbook / adobe
-
-% pncb8y  CenturySchL-Bold         <texnansi.enc <uncb8a.pfb
-% pncbi8y CenturySchL-BoldItal     <texnansi.enc <uncbi8a.pfb
-% pncr8y  CenturySchL-Roma         <texnansi.enc <uncr8a.pfb
-% pncri8y CenturySchL-Ital         <texnansi.enc <uncri8a.pfb
-
-% pncbo8y CenturySchL-Bold         ".167 SlantFont" <texnansi.enc <uncb8a.pfb
-% pncro8y CenturySchL-Roma         ".167 SlantFont" <texnansi.enc <uncr8a.pfb
-
-% utopia
-
-% putb8y  Utopia-Bold              <texnansi.enc <putb8a.pfb
-% putbi8y Utopia-BoldItalic        <texnansi.enc <putbi8a.pfb
-% putr8y  Utopia-Regular           <texnansi.enc <putr8a.pfb
-% putri8y Utopia-Italic            <texnansi.enc <putri8a.pfb
-
-% putbo8y Utopia-Bold              ".167 SlantFont" <texnansi.enc <putb8a.pfb
-% putro8y Utopia-Regular           ".167 SlantFont" <texnansi.enc <putr8a.pfb
-
-% charter
-
-% bchb8y  CharterBT-Bold           <texnansi.enc <bchb8a.pfb
-% bchbi8y CharterBT-BoldItalic     <texnansi.enc <bchbi8a.pfb
-% bchr8y  CharterBT-Roman          <texnansi.enc <bchr8a.pfb
-% bchri8y CharterBT-Italic         <texnansi.enc <bchri8a.pfb
-
-% bchbo8y CharterBT-Bold           ".167 SlantFont"  <texnansi.enc <bchb8a.pfb
-% bchro8y CharterBT-Roman          ".167 SlantFont " <texnansi.enc <bchr8a.pfb
-
-texnansi-lmb10 LMRoman10-Demi "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmb10.pfb
-texnansi-lmbo10 LMRoman10-DemiOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbo10.pfb
-texnansi-lmbx10 LMRoman10-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx10.pfb
-texnansi-lmbx12 LMRoman12-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx12.pfb
-texnansi-lmbx5 LMRoman5-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx5.pfb
-texnansi-lmbx6 LMRoman6-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx6.pfb
-texnansi-lmbx7 LMRoman7-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx7.pfb
-texnansi-lmbx8 LMRoman8-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx8.pfb
-texnansi-lmbx9 LMRoman9-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx9.pfb
-texnansi-lmbxi10 LMRoman10-BoldItalic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbxi10.pfb
-texnansi-lmbxo10 LMRoman10-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbxo10.pfb
-texnansi-lmcsc10 LMRoman10-CapsRegular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmcsc10.pfb
-texnansi-lmcsco10 LMRoman10-CapsOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmcsco10.pfb
-texnansi-lmr10 LMRoman10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr10.pfb
-texnansi-lmr12 LMRoman12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr12.pfb
-texnansi-lmr17 LMRoman17-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr17.pfb
-texnansi-lmr5 LMRoman5-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr5.pfb
-texnansi-lmr6 LMRoman6-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr6.pfb
-texnansi-lmr7 LMRoman7-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr7.pfb
-texnansi-lmr8 LMRoman8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr8.pfb
-texnansi-lmr9 LMRoman9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr9.pfb
-texnansi-lmri10 LMRoman10-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri10.pfb
-texnansi-lmri12 LMRoman12-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri12.pfb
-texnansi-lmri7 LMRoman7-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri7.pfb
-texnansi-lmri8 LMRoman8-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri8.pfb
-texnansi-lmri9 LMRoman9-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri9.pfb
-texnansi-lmro10 LMRoman10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro10.pfb
-texnansi-lmro12 LMRoman12-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro12.pfb
-texnansi-lmro17 LMRoman17-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro17.pfb
-texnansi-lmro8 LMRoman8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro8.pfb
-texnansi-lmro9 LMRoman9-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro9.pfb
-texnansi-lmss10 LMSans10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss10.pfb
-texnansi-lmss12 LMSans12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss12.pfb
-texnansi-lmss17 LMSans17-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss17.pfb
-texnansi-lmss8 LMSans8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss8.pfb
-texnansi-lmss9 LMSans9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss9.pfb
-texnansi-lmssbo10 LMSans10-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssbo10.pfb
-texnansi-lmssbx10 LMSans10-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssbx10.pfb
-texnansi-lmssdc10 LMSans10-DemiCondensed "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssdc10.pfb
-texnansi-lmssdo10 LMSans10-DemiCondensedOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssdo10.pfb
-texnansi-lmsso10 LMSans10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso10.pfb
-texnansi-lmsso12 LMSans12-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso12.pfb
-texnansi-lmsso17 LMSans17-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso17.pfb
-texnansi-lmsso8 LMSans8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso8.pfb
-texnansi-lmsso9 LMSans9-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso9.pfb
-texnansi-lmssq8 LMSansQuotation8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssq8.pfb
-texnansi-lmssqbo8 LMSansQuotation8-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqbo8.pfb
-texnansi-lmssqbx8 LMSansQuotation8-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqbx8.pfb
-texnansi-lmssqo8 LMSansQuotation8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqo8.pfb
-texnansi-lmtcsc10 LMTypewriter10-CapsRegular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtcsc10.pfb
-texnansi-lmtcso10 LMTypewriter10-CapsOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtcso10.pfb
-texnansi-lmtl10 LMTypewriter10-Light "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtl10.pfb
-texnansi-lmtlo10 LMTypewriter10-LightOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlo10.pfb
-texnansi-lmtlc10 LMTypewriter10-LightCondensed "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlc10.pfb
-texnansi-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlco10.pfb
-texnansi-lmtk10 LMTypewriter10-Dark "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtk10.pfb
-texnansi-lmtko10 LMTypewriter10-DarkOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtko10.pfb
-texnansi-lmtt10 LMTypewriter10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt10.pfb
-texnansi-lmtt12 LMTypewriter12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt12.pfb
-texnansi-lmtt8 LMTypewriter8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt8.pfb
-texnansi-lmtt9 LMTypewriter9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt9.pfb
-texnansi-lmtti10 LMTypewriter10-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtti10.pfb
-texnansi-lmtto10 LMTypewriter10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtto10.pfb
-texnansi-lmvtt10 LMTypewriterVarWd10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtt10.pfb
-texnansi-lmvtto10 LMTypewriterVarWd10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtto10.pfb
-texnansi-lmvtl10 LMTypewriterVarWd10-Light "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtl10.pfb
-texnansi-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtlo10.pfb
-texnansi-lmvtk10 LMTypewriterVarWd10-Dark "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtk10.pfb
-texnansi-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtko10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/ec-base.map b/Master/texmf-dist/fonts/map/dvips/context/ec-base.map
deleted file mode 100644
index 5011a22ca04..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/ec-base.map
+++ /dev/null
@@ -1,135 +0,0 @@
-% courier / urw
-
-ucrb8t  NimbusMonL-Bold          <ec.enc <ucrb8a.pfb
-ucrbo8t NimbusMonL-BoldObli      <ec.enc <ucrbo8a.pfb
-ucrr8t  NimbusMonL-Regu          <ec.enc <ucrr8a.pfb
-ucrro8t NimbusMonL-ReguObli      <ec.enc <ucrro8a.pfb
-
-% courier / adobe
-
-pcrb8t  NimbusMonL-Bold          <ec.enc <ucrb8a.pfb
-pcrbo8t NimbusMonL-BoldObli      <ec.enc <ucrbo8a.pfb
-pcrr8t  NimbusMonL-Regu          <ec.enc <ucrr8a.pfb
-pcrro8t NimbusMonL-ReguObli      <ec.enc <ucrro8a.pfb
-
-% helvetica / urw
-
-uhvb8t  NimbusSanL-Bold          <ec.enc <uhvb8a.pfb
-uhvbo8t NimbusSanL-BoldItal      <ec.enc <uhvbo8a.pfb
-uhvr8t  NimbusSanL-Regu          <ec.enc <uhvr8a.pfb
-uhvro8t NimbusSanL-ReguItal      <ec.enc <uhvro8a.pfb
-
-% helvetica / adobe
-
-phvb8t  NimbusSanL-Bold          <ec.enc <uhvb8a.pfb
-phvbo8t NimbusSanL-BoldItal      <ec.enc <uhvbo8a.pfb
-phvr8t  NimbusSanL-Regu          <ec.enc <uhvr8a.pfb
-phvro8t NimbusSanL-ReguItal      <ec.enc <uhvro8a.pfb
-
-% times / urw
-
-utmb8t  NimbusRomNo9L-Medi       <ec.enc <utmb8a.pfb
-utmbi8t NimbusRomNo9L-MediItal   <ec.enc <utmbi8a.pfb
-utmr8t  NimbusRomNo9L-Regu       <ec.enc <utmr8a.pfb
-utmri8t NimbusRomNo9L-ReguItal   <ec.enc <utmri8a.pfb
-
-utmbo8t NimbusRomNo9L-Medi       ".167 SlantFont" <ec.enc <utmb8a.pfb
-utmro8t NimbusRomNo9L-Regu       ".167 SlantFont" <ec.enc <utmr8a.pfb
-
-% times / adobe
-
-ptmb8t  NimbusRomNo9L-Medi       <ec.enc <utmb8a.pfb
-ptmbi8t NimbusRomNo9L-MediItal   <ec.enc <utmbi8a.pfb
-ptmr8t  NimbusRomNo9L-Regu       <ec.enc <utmr8a.pfb
-ptmri8t NimbusRomNo9L-ReguItal   <ec.enc <utmri8a.pfb
-
-ptmbo8t NimbusRomNo9L-Medi       ".167 SlantFont" <ec.enc <utmb8a.pfb
-ptmro8t NimbusRomNo9L-Regu       ".167 SlantFont" <ec.enc <utmr8a.pfb
-
-% palatino / urw
-
-uplb8t  URWPalladioL-Bold        <ec.enc <uplb8a.pfb
-uplbi8t URWPalladioL-BoldItal    <ec.enc <uplbi8a.pfb
-uplr8t  URWPalladioL-Roma        <ec.enc <uplr8a.pfb
-uplri8t URWPalladioL-Ital        <ec.enc <uplri8a.pfb
-
-uplbo8t URWPalladioL-Bold        ".167 SlantFont" <ec.enc <uplb8a.pfb
-uplro8t URWPalladioL-Roma        ".167 SlantFont" <ec.enc <uplr8a.pfb
-
-% palatino / adobe
-
-pplb8t  URWPalladioL-Bold        <ec.enc <uplb8a.pfb
-pplbi8t URWPalladioL-BoldItal    <ec.enc <uplbi8a.pfb
-pplr8t  URWPalladioL-Roma        <ec.enc <uplr8a.pfb
-pplri8t URWPalladioL-Ital        <ec.enc <uplri8a.pfb
-
-pplbo8t URWPalladioL-Bold        ".167 SlantFont" <ec.enc <uplb8a.pfb
-pplro8t URWPalladioL-Roma        ".167 SlantFont" <ec.enc <upplr8a.pfb
-
-% bookman / urw
-
-ubkd8t  URWBookmanL-DemiBold     <ec.enc <ubkd8a.pfb
-ubkdi8t URWBookmanL-DemiBoldItal <ec.enc <ubkdi8a.pfb
-ubkl8t  URWBookmanL-Ligh         <ec.enc <ubkl8a.pfb
-ubkli8t URWBookmanL-LighItal     <ec.enc <ubkli8a.pfb
-
-ubkdo8t URWBookmanL-DemiBold     ".167 SlantFont" <ec.enc <ubkd8a.pfb
-ubklo8t URWBookmanL-Ligh         ".167 SlantFont" <ec.enc <ubkl8a.pfb
-
-% bookman / adobe
-
-pbkd8t  URWBookmanL-DemiBold     <ec.enc <ubkd8a.pfb
-pbkdi8t URWBookmanL-DemiBoldItal <ec.enc <ubkdi8a.pfb
-pbkl8t  URWBookmanL-Ligh         <ec.enc <ubkl8a.pfb
-pbkli8t URWBookmanL-LighItal     <ec.enc <ubkli8a.pfb
-
-pbkdo8t URWBookmanL-DemiBold     ".167 SlantFont" <ec.enc <ubkd8a.pfb
-pbklo8t URWBookmanL-Ligh         ".167 SlantFont" <ec.enc <ubkl8a.pfb
-
-% chancery / urw
-
-uzcmi8t URWChanceryL-MediItal    <ec.enc <uzcmi8a.pfb
-
-% chancery / adobe
-
-pzcmi8t URWChanceryL-MediItal    <ec.enc <uzcmi8a.pfb
-
-% schoolbook / urw
-
-uncb8t  CenturySchL-Bold         <ec.enc <uncb8a.pfb
-uncbi8t CenturySchL-BoldItal     <ec.enc <uncbi8a.pfb
-uncr8t  CenturySchL-Roma         <ec.enc <uncr8a.pfb
-uncri8t CenturySchL-Ital         <ec.enc <uncri8a.pfb
-
-uncbo8t CenturySchL-Bold         ".167 SlantFont" <ec.enc <uncb8a.pfb
-uncro8t CenturySchL-Roma         ".167 SlantFont" <ec.enc <uncr8a.pfb
-
-% schoolbook / adobe
-
-pncb8t  CenturySchL-Bold         <ec.enc <uncb8a.pfb
-pncbi8t CenturySchL-BoldItal     <ec.enc <uncbi8a.pfb
-pncr8t  CenturySchL-Roma         <ec.enc <uncr8a.pfb
-pncri8t CenturySchL-Ital         <ec.enc <uncri8a.pfb
-
-pncbo8t CenturySchL-Bold         ".167 SlantFont" <ec.enc <uncb8a.pfb
-pncro8t CenturySchL-Roma         ".167 SlantFont" <ec.enc <uncr8a.pfb
-
-% utopia
-
-putb8t  Utopia-Bold              <ec.enc <putb8a.pfb
-putbi8t Utopia-BoldItalic        <ec.enc <putbi8a.pfb
-putr8t  Utopia-Regular           <ec.enc <putr8a.pfb
-putri8t Utopia-Italic            <ec.enc <putri8a.pfb
-
-putbo8t Utopia-Bold              ".167 SlantFont" <ec.enc <putb8a.pfb
-putro8t Utopia-Regular           ".167 SlantFont" <ec.enc <putr8a.pfb
-
-% charter
-
-bchb8t  CharterBT-Bold           <ec.enc <bchb8a.pfb
-bchbi8t CharterBT-BoldItalic     <ec.enc <bchbi8a.pfb
-bchr8t  CharterBT-Roman          <ec.enc <bchr8a.pfb
-bchri8t CharterBT-Italic         <ec.enc <bchri8a.pfb
-
-bchbo8t CharterBT-Bold           ".167 SlantFont" <ec.enc <bchb8a.pfb
-bchro8t CharterBT-Roman          ".167 SlantFont" <ec.enc <bchr8a.pfb
\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/map/dvips/context/ec-lm.map b/Master/texmf-dist/fonts/map/dvips/context/ec-lm.map
deleted file mode 100644
index d4640394fa4..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/ec-lm.map
+++ /dev/null
@@ -1,69 +0,0 @@
-ec-lmb10 LMRoman10-Demi "enclmec ReEncodeFont" <lm-ec.enc <lmb10.pfb
-ec-lmbo10 LMRoman10-DemiOblique "enclmec ReEncodeFont" <lm-ec.enc <lmbo10.pfb
-ec-lmbx10 LMRoman10-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx10.pfb
-ec-lmbx12 LMRoman12-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx12.pfb
-ec-lmbx5 LMRoman5-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx5.pfb
-ec-lmbx6 LMRoman6-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx6.pfb
-ec-lmbx7 LMRoman7-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx7.pfb
-ec-lmbx8 LMRoman8-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx8.pfb
-ec-lmbx9 LMRoman9-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx9.pfb
-ec-lmbxi10 LMRoman10-BoldItalic "enclmec ReEncodeFont" <lm-ec.enc <lmbxi10.pfb
-ec-lmbxo10 LMRoman10-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmbxo10.pfb
-ec-lmcsc10 LMRoman10-CapsRegular "enclmec ReEncodeFont" <lm-ec.enc <lmcsc10.pfb
-ec-lmcsco10 LMRoman10-CapsOblique "enclmec ReEncodeFont" <lm-ec.enc <lmcsco10.pfb
-ec-lmr10 LMRoman10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr10.pfb
-ec-lmr12 LMRoman12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr12.pfb
-ec-lmr17 LMRoman17-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr17.pfb
-ec-lmr5 LMRoman5-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr5.pfb
-ec-lmr6 LMRoman6-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr6.pfb
-ec-lmr7 LMRoman7-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr7.pfb
-ec-lmr8 LMRoman8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr8.pfb
-ec-lmr9 LMRoman9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr9.pfb
-ec-lmri10 LMRoman10-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri10.pfb
-ec-lmri12 LMRoman12-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri12.pfb
-ec-lmri7 LMRoman7-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri7.pfb
-ec-lmri8 LMRoman8-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri8.pfb
-ec-lmri9 LMRoman9-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri9.pfb
-ec-lmro10 LMRoman10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro10.pfb
-ec-lmro12 LMRoman12-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro12.pfb
-ec-lmro17 LMRoman17-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro17.pfb
-ec-lmro8 LMRoman8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro8.pfb
-ec-lmro9 LMRoman9-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro9.pfb
-ec-lmss10 LMSans10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss10.pfb
-ec-lmss12 LMSans12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss12.pfb
-ec-lmss17 LMSans17-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss17.pfb
-ec-lmss8 LMSans8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss8.pfb
-ec-lmss9 LMSans9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss9.pfb
-ec-lmssbo10 LMSans10-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssbo10.pfb
-ec-lmssbx10 LMSans10-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmssbx10.pfb
-ec-lmssdc10 LMSans10-DemiCondensed "enclmec ReEncodeFont" <lm-ec.enc <lmssdc10.pfb
-ec-lmssdo10 LMSans10-DemiCondensedOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssdo10.pfb
-ec-lmsso10 LMSans10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso10.pfb
-ec-lmsso12 LMSans12-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso12.pfb
-ec-lmsso17 LMSans17-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso17.pfb
-ec-lmsso8 LMSans8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso8.pfb
-ec-lmsso9 LMSans9-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso9.pfb
-ec-lmssq8 LMSansQuotation8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmssq8.pfb
-ec-lmssqbo8 LMSansQuotation8-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssqbo8.pfb
-ec-lmssqbx8 LMSansQuotation8-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmssqbx8.pfb
-ec-lmssqo8 LMSansQuotation8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmssqo8.pfb
-ec-lmtcsc10 LMTypewriter10-CapsRegular "enclmec ReEncodeFont" <lm-ec.enc <lmtcsc10.pfb
-ec-lmtcso10 LMTypewriter10-CapsOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtcso10.pfb
-ec-lmtl10 LMTypewriter10-Light "enclmec ReEncodeFont" <lm-ec.enc <lmtl10.pfb
-ec-lmtlo10 LMTypewriter10-LightOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtlo10.pfb
-ec-lmtlc10 LMTypewriter10-LightCondensed "enclmec ReEncodeFont" <lm-ec.enc <lmtlc10.pfb
-ec-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtlco10.pfb
-ec-lmtk10 LMTypewriter10-Dark "enclmec ReEncodeFont" <lm-ec.enc <lmtk10.pfb
-ec-lmtko10 LMTypewriter10-DarkOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtko10.pfb
-ec-lmtt10 LMTypewriter10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt10.pfb
-ec-lmtt12 LMTypewriter12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt12.pfb
-ec-lmtt8 LMTypewriter8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt8.pfb
-ec-lmtt9 LMTypewriter9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt9.pfb
-ec-lmtti10 LMTypewriter10-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmtti10.pfb
-ec-lmtto10 LMTypewriter10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmtto10.pfb
-ec-lmvtt10 LMTypewriterVarWd10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmvtt10.pfb
-ec-lmvtto10 LMTypewriterVarWd10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtto10.pfb
-ec-lmvtl10 LMTypewriterVarWd10-Light "enclmec ReEncodeFont" <lm-ec.enc <lmvtl10.pfb
-ec-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtlo10.pfb
-ec-lmvtk10 LMTypewriterVarWd10-Dark "enclmec ReEncodeFont" <lm-ec.enc <lmvtk10.pfb
-ec-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtko10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/ec-os-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/ec-os-public-lm.map
deleted file mode 100644
index d68013c36f3..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/ec-os-public-lm.map
+++ /dev/null
@@ -1,69 +0,0 @@
-ec-lmb10 LMRoman10-Demi "enclmecos ReEncodeFont" <lm-ec-os.enc <lmb10.pfb
-ec-lmbo10 LMRoman10-DemiOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbo10.pfb
-ec-lmbx10 LMRoman10-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbx10.pfb
-ec-lmbx12 LMRoman12-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbx12.pfb
-ec-lmbx5 LMRoman5-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbx5.pfb
-ec-lmbx6 LMRoman6-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbx6.pfb
-ec-lmbx7 LMRoman7-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbx7.pfb
-ec-lmbx8 LMRoman8-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbx8.pfb
-ec-lmbx9 LMRoman9-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbx9.pfb
-ec-lmbxi10 LMRoman10-BoldItalic "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbxi10.pfb
-ec-lmbxo10 LMRoman10-BoldOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbxo10.pfb
-ec-lmcsc10 LMRoman10-CapsRegular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmcsc10.pfb
-ec-lmcsco10 LMRoman10-CapsOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmcsco10.pfb
-ec-lmr10 LMRoman10-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmr10.pfb
-ec-lmr12 LMRoman12-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmr12.pfb
-ec-lmr17 LMRoman17-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmr17.pfb
-ec-lmr5 LMRoman5-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmr5.pfb
-ec-lmr6 LMRoman6-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmr6.pfb
-ec-lmr7 LMRoman7-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmr7.pfb
-ec-lmr8 LMRoman8-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmr8.pfb
-ec-lmr9 LMRoman9-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmr9.pfb
-ec-lmri10 LMRoman10-Italic "enclmecos ReEncodeFont" <lm-ec-os.enc <lmri10.pfb
-ec-lmri12 LMRoman12-Italic "enclmecos ReEncodeFont" <lm-ec-os.enc <lmri12.pfb
-ec-lmri7 LMRoman7-Italic "enclmecos ReEncodeFont" <lm-ec-os.enc <lmri7.pfb
-ec-lmri8 LMRoman8-Italic "enclmecos ReEncodeFont" <lm-ec-os.enc <lmri8.pfb
-ec-lmri9 LMRoman9-Italic "enclmecos ReEncodeFont" <lm-ec-os.enc <lmri9.pfb
-ec-lmro10 LMRoman10-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmro10.pfb
-ec-lmro12 LMRoman12-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmro12.pfb
-ec-lmro17 LMRoman17-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmro17.pfb
-ec-lmro8 LMRoman8-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmro8.pfb
-ec-lmro9 LMRoman9-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmro9.pfb
-ec-lmss10 LMSans10-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmss10.pfb
-ec-lmss12 LMSans12-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmss12.pfb
-ec-lmss17 LMSans17-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmss17.pfb
-ec-lmss8 LMSans8-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmss8.pfb
-ec-lmss9 LMSans9-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmss9.pfb
-ec-lmssbo10 LMSans10-BoldOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmssbo10.pfb
-ec-lmssbx10 LMSans10-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmssbx10.pfb
-ec-lmssdc10 LMSans10-DemiCondensed "enclmecos ReEncodeFont" <lm-ec-os.enc <lmssdc10.pfb
-ec-lmssdo10 LMSans10-DemiCondensedOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmssdo10.pfb
-ec-lmsso10 LMSans10-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmsso10.pfb
-ec-lmsso12 LMSans12-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmsso12.pfb
-ec-lmsso17 LMSans17-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmsso17.pfb
-ec-lmsso8 LMSans8-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmsso8.pfb
-ec-lmsso9 LMSans9-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmsso9.pfb
-ec-lmssq8 LMSansQuotation8-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmssq8.pfb
-ec-lmssqbo8 LMSansQuotation8-BoldOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmssqbo8.pfb
-ec-lmssqbx8 LMSansQuotation8-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmssqbx8.pfb
-ec-lmssqo8 LMSansQuotation8-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmssqo8.pfb
-ec-lmtcsc10 LMTypewriter10-CapsRegular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtcsc10.pfb
-ec-lmtcso10 LMTypewriter10-CapsOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtcso10.pfb
-ec-lmtl10 LMTypewriter10-Light "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtl10.pfb
-ec-lmtlo10 LMTypewriter10-LightOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtlo10.pfb
-ec-lmtlc10 LMTypewriter10-LightCondensed "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtlc10.pfb
-ec-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtlco10.pfb
-ec-lmtk10 LMTypewriter10-Dark "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtk10.pfb
-ec-lmtko10 LMTypewriter10-DarkOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtko10.pfb
-ec-lmtt10 LMTypewriter10-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtt10.pfb
-ec-lmtt12 LMTypewriter12-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtt12.pfb
-ec-lmtt8 LMTypewriter8-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtt8.pfb
-ec-lmtt9 LMTypewriter9-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtt9.pfb
-ec-lmtti10 LMTypewriter10-Italic "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtti10.pfb
-ec-lmtto10 LMTypewriter10-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtto10.pfb
-ec-lmvtt10 LMTypewriterVarWd10-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmvtt10.pfb
-ec-lmvtto10 LMTypewriterVarWd10-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmvtto10.pfb
-ec-lmvtl10 LMTypewriterVarWd10-Light "enclmecos ReEncodeFont" <lm-ec-os.enc <lmvtl10.pfb
-ec-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmvtlo10.pfb
-ec-lmvtk10 LMTypewriterVarWd10-Dark "enclmecos ReEncodeFont" <lm-ec-os.enc <lmvtk10.pfb
-ec-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmvtko10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/ec-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/ec-public-lm.map
deleted file mode 100644
index d4640394fa4..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/ec-public-lm.map
+++ /dev/null
@@ -1,69 +0,0 @@
-ec-lmb10 LMRoman10-Demi "enclmec ReEncodeFont" <lm-ec.enc <lmb10.pfb
-ec-lmbo10 LMRoman10-DemiOblique "enclmec ReEncodeFont" <lm-ec.enc <lmbo10.pfb
-ec-lmbx10 LMRoman10-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx10.pfb
-ec-lmbx12 LMRoman12-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx12.pfb
-ec-lmbx5 LMRoman5-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx5.pfb
-ec-lmbx6 LMRoman6-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx6.pfb
-ec-lmbx7 LMRoman7-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx7.pfb
-ec-lmbx8 LMRoman8-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx8.pfb
-ec-lmbx9 LMRoman9-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx9.pfb
-ec-lmbxi10 LMRoman10-BoldItalic "enclmec ReEncodeFont" <lm-ec.enc <lmbxi10.pfb
-ec-lmbxo10 LMRoman10-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmbxo10.pfb
-ec-lmcsc10 LMRoman10-CapsRegular "enclmec ReEncodeFont" <lm-ec.enc <lmcsc10.pfb
-ec-lmcsco10 LMRoman10-CapsOblique "enclmec ReEncodeFont" <lm-ec.enc <lmcsco10.pfb
-ec-lmr10 LMRoman10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr10.pfb
-ec-lmr12 LMRoman12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr12.pfb
-ec-lmr17 LMRoman17-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr17.pfb
-ec-lmr5 LMRoman5-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr5.pfb
-ec-lmr6 LMRoman6-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr6.pfb
-ec-lmr7 LMRoman7-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr7.pfb
-ec-lmr8 LMRoman8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr8.pfb
-ec-lmr9 LMRoman9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr9.pfb
-ec-lmri10 LMRoman10-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri10.pfb
-ec-lmri12 LMRoman12-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri12.pfb
-ec-lmri7 LMRoman7-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri7.pfb
-ec-lmri8 LMRoman8-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri8.pfb
-ec-lmri9 LMRoman9-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri9.pfb
-ec-lmro10 LMRoman10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro10.pfb
-ec-lmro12 LMRoman12-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro12.pfb
-ec-lmro17 LMRoman17-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro17.pfb
-ec-lmro8 LMRoman8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro8.pfb
-ec-lmro9 LMRoman9-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro9.pfb
-ec-lmss10 LMSans10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss10.pfb
-ec-lmss12 LMSans12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss12.pfb
-ec-lmss17 LMSans17-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss17.pfb
-ec-lmss8 LMSans8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss8.pfb
-ec-lmss9 LMSans9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss9.pfb
-ec-lmssbo10 LMSans10-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssbo10.pfb
-ec-lmssbx10 LMSans10-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmssbx10.pfb
-ec-lmssdc10 LMSans10-DemiCondensed "enclmec ReEncodeFont" <lm-ec.enc <lmssdc10.pfb
-ec-lmssdo10 LMSans10-DemiCondensedOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssdo10.pfb
-ec-lmsso10 LMSans10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso10.pfb
-ec-lmsso12 LMSans12-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso12.pfb
-ec-lmsso17 LMSans17-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso17.pfb
-ec-lmsso8 LMSans8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso8.pfb
-ec-lmsso9 LMSans9-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso9.pfb
-ec-lmssq8 LMSansQuotation8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmssq8.pfb
-ec-lmssqbo8 LMSansQuotation8-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssqbo8.pfb
-ec-lmssqbx8 LMSansQuotation8-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmssqbx8.pfb
-ec-lmssqo8 LMSansQuotation8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmssqo8.pfb
-ec-lmtcsc10 LMTypewriter10-CapsRegular "enclmec ReEncodeFont" <lm-ec.enc <lmtcsc10.pfb
-ec-lmtcso10 LMTypewriter10-CapsOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtcso10.pfb
-ec-lmtl10 LMTypewriter10-Light "enclmec ReEncodeFont" <lm-ec.enc <lmtl10.pfb
-ec-lmtlo10 LMTypewriter10-LightOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtlo10.pfb
-ec-lmtlc10 LMTypewriter10-LightCondensed "enclmec ReEncodeFont" <lm-ec.enc <lmtlc10.pfb
-ec-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtlco10.pfb
-ec-lmtk10 LMTypewriter10-Dark "enclmec ReEncodeFont" <lm-ec.enc <lmtk10.pfb
-ec-lmtko10 LMTypewriter10-DarkOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtko10.pfb
-ec-lmtt10 LMTypewriter10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt10.pfb
-ec-lmtt12 LMTypewriter12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt12.pfb
-ec-lmtt8 LMTypewriter8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt8.pfb
-ec-lmtt9 LMTypewriter9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt9.pfb
-ec-lmtti10 LMTypewriter10-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmtti10.pfb
-ec-lmtto10 LMTypewriter10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmtto10.pfb
-ec-lmvtt10 LMTypewriterVarWd10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmvtt10.pfb
-ec-lmvtto10 LMTypewriterVarWd10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtto10.pfb
-ec-lmvtl10 LMTypewriterVarWd10-Light "enclmec ReEncodeFont" <lm-ec.enc <lmvtl10.pfb
-ec-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtlo10.pfb
-ec-lmvtk10 LMTypewriterVarWd10-Dark "enclmec ReEncodeFont" <lm-ec.enc <lmvtk10.pfb
-ec-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtko10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/ec-var-exclusive-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/ec-var-exclusive-public-lm.map
deleted file mode 100644
index fb478037436..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/ec-var-exclusive-public-lm.map
+++ /dev/null
@@ -1,62 +0,0 @@
-% author: Hans Hagen
-%
-% This map file remaps ec (cork) encoded Latin Modern adapted for
-% umlauts and other variations.
-
-ec-lmb10    LMRomanDemi10-Regular        <ec-var-lm.enc <lmb10.pfb
-ec-lmbo10   LMRomanDemi10-Italic         <ec-var-lm.enc <lmbo10.pfb
-ec-lmbx10   LMRoman10-Bold               <ec-var-lm.enc <lmbx10.pfb
-ec-lmbx12   LMRoman12-Bold               <ec-var-lm.enc <lmbx12.pfb
-ec-lmbx5    LMRoman5-Bold                <ec-var-lm.enc <lmbx5.pfb
-ec-lmbx6    LMRoman6-Bold                <ec-var-lm.enc <lmbx6.pfb
-ec-lmbx7    LMRoman7-Bold                <ec-var-lm.enc <lmbx7.pfb
-ec-lmbx8    LMRoman8-Bold                <ec-var-lm.enc <lmbx8.pfb
-ec-lmbx9    LMRoman9-Bold                <ec-var-lm.enc <lmbx9.pfb
-ec-lmbxi10  LMRoman10-BoldItalic         <ec-var-lm.enc <lmbxi10.pfb
-ec-lmbxo10  LMSlanted10-BoldItalic       <ec-var-lm.enc <lmbxo10.pfb
-ec-lmcsc10  LMCaps10-Regular             <ec-var-lm.enc <lmcsc10.pfb
-ec-lmcsco10 LMCaps10-Italic              <ec-var-lm.enc <lmcsco10.pfb
-ec-lmr10    LMRoman10-Regular            <ec-var-lm.enc <lmr10.pfb
-ec-lmr12    LMRoman12-Regular            <ec-var-lm.enc <lmr12.pfb
-ec-lmr17    LMRoman17-Regular            <ec-var-lm.enc <lmr17.pfb
-ec-lmr5     LMRoman5-Regular             <ec-var-lm.enc <lmr5.pfb
-ec-lmr6     LMRoman6-Regular             <ec-var-lm.enc <lmr6.pfb
-ec-lmr7     LMRoman7-Regular             <ec-var-lm.enc <lmr7.pfb
-ec-lmr8     LMRoman8-Regular             <ec-var-lm.enc <lmr8.pfb
-ec-lmr9     LMRoman9-Regular             <ec-var-lm.enc <lmr9.pfb
-ec-lmri10   LMRoman10-Italic             <ec-var-lm.enc <lmri10.pfb
-ec-lmri12   LMRoman12-Italic             <ec-var-lm.enc <lmri12.pfb
-ec-lmri7    LMRoman7-Italic              <ec-var-lm.enc <lmri7.pfb
-ec-lmri8    LMRoman8-Italic              <ec-var-lm.enc <lmri8.pfb
-ec-lmri9    LMRoman9-Italic              <ec-var-lm.enc <lmri9.pfb
-ec-lmro10   LMSlanted10-Italic           <ec-var-lm.enc <lmro10.pfb
-ec-lmro12   LMSlanted12-Italic           <ec-var-lm.enc <lmro12.pfb
-ec-lmro8    LMSlanted8-Italic            <ec-var-lm.enc <lmro8.pfb
-ec-lmro9    LMSlanted9-Italic            <ec-var-lm.enc <lmro9.pfb
-ec-lmss10   LMSans10-Regular             <ec-var-lm.enc <lmss10.pfb
-ec-lmss12   LMSans12-Regular             <ec-var-lm.enc <lmss12.pfb
-ec-lmss17   LMSans17-Regular             <ec-var-lm.enc <lmss17.pfb
-ec-lmss8    LMSans8-Regular              <ec-var-lm.enc <lmss8.pfb
-ec-lmss9    LMSans9-Regular              <ec-var-lm.enc <lmss9.pfb
-ec-lmssbo10 LMSans10-BoldItalic          <ec-var-lm.enc <lmssbo10.pfb
-ec-lmssbx10 LMSans10-Bold                <ec-var-lm.enc <lmssbx10.pfb
-ec-lmssdc10 LMSansDemiCond10-Regular     <ec-var-lm.enc <lmssdc10.pfb
-ec-lmssdo10 LMSansDemiCond10-Italic      <ec-var-lm.enc <lmssdo10.pfb
-ec-lmsso10  LMSans10-Italic              <ec-var-lm.enc <lmsso10.pfb
-ec-lmsso12  LMSans12-Italic              <ec-var-lm.enc <lmsso12.pfb
-ec-lmsso17  LMSans17-Italic              <ec-var-lm.enc <lmsso17.pfb
-ec-lmsso8   LMSans8-Italic               <ec-var-lm.enc <lmsso8.pfb
-ec-lmsso9   LMSans9-Italic               <ec-var-lm.enc <lmsso9.pfb
-ec-lmssq8   LMSansQuotation8-Regular     <ec-var-lm.enc <lmssq8.pfb
-ec-lmssqbo8 LMSansQuotation8-BoldItalic  <ec-var-lm.enc <lmssqbo8.pfb
-ec-lmssqbx8 LMSansQuotation8-Bold        <ec-var-lm.enc <lmssqbx8.pfb
-ec-lmssqo8  LMSansQuotation8-Italic      <ec-var-lm.enc <lmssqo8.pfb
-ec-lmtcsc10 LMTypewriterCaps10-Regular   <ec-var-lm.enc <lmtcsc10.pfb
-ec-lmtt10   LMTypewriter10-Regular       <ec-var-lm.enc <lmtt10.pfb
-ec-lmtt12   LMTypewriter12-Regular       <ec-var-lm.enc <lmtt12.pfb
-ec-lmtt8    LMTypewriter8-Regular        <ec-var-lm.enc <lmtt8.pfb
-ec-lmtt9    LMTypewriter9-Regular        <ec-var-lm.enc <lmtt9.pfb
-ec-lmtti10  LMTypewriter10-Italic        <ec-var-lm.enc <lmtti10.pfb
-ec-lmtto10  LMTypewriterSlanted10-Italic <ec-var-lm.enc <lmtto10.pfb
-ec-lmvtt10  LMTypewriterVarWd10-Regular  <ec-var-lm.enc <lmvtt10.pfb
-ec-lmvtto10 LMTypewriterVarWd10-Italic   <ec-var-lm.enc <lmvtto10.pfb
\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/map/dvips/context/ec-var-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/ec-var-public-lm.map
deleted file mode 100644
index 406136bc954..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/ec-var-public-lm.map
+++ /dev/null
@@ -1,62 +0,0 @@
-% author: Hans Hagen
-%
-% This map file defines ec (cork) encoded Latin Modern adapted for
-% umlauts and other variations.
-
-ec-var-lmb10    LMRomanDemi10-Regular        <ec-var-lm.enc <lmb10.pfb
-ec-var-lmbo10   LMRomanDemi10-Italic         <ec-var-lm.enc <lmbo10.pfb
-ec-var-lmbx10   LMRoman10-Bold               <ec-var-lm.enc <lmbx10.pfb
-ec-var-lmbx12   LMRoman12-Bold               <ec-var-lm.enc <lmbx12.pfb
-ec-var-lmbx5    LMRoman5-Bold                <ec-var-lm.enc <lmbx5.pfb
-ec-var-lmbx6    LMRoman6-Bold                <ec-var-lm.enc <lmbx6.pfb
-ec-var-lmbx7    LMRoman7-Bold                <ec-var-lm.enc <lmbx7.pfb
-ec-var-lmbx8    LMRoman8-Bold                <ec-var-lm.enc <lmbx8.pfb
-ec-var-lmbx9    LMRoman9-Bold                <ec-var-lm.enc <lmbx9.pfb
-ec-var-lmbxi10  LMRoman10-BoldItalic         <ec-var-lm.enc <lmbxi10.pfb
-ec-var-lmbxo10  LMSlanted10-BoldItalic       <ec-var-lm.enc <lmbxo10.pfb
-ec-var-lmcsc10  LMCaps10-Regular             <ec-var-lm.enc <lmcsc10.pfb
-ec-var-lmcsco10 LMCaps10-Italic              <ec-var-lm.enc <lmcsco10.pfb
-ec-var-lmr10    LMRoman10-Regular            <ec-var-lm.enc <lmr10.pfb
-ec-var-lmr12    LMRoman12-Regular            <ec-var-lm.enc <lmr12.pfb
-ec-var-lmr17    LMRoman17-Regular            <ec-var-lm.enc <lmr17.pfb
-ec-var-lmr5     LMRoman5-Regular             <ec-var-lm.enc <lmr5.pfb
-ec-var-lmr6     LMRoman6-Regular             <ec-var-lm.enc <lmr6.pfb
-ec-var-lmr7     LMRoman7-Regular             <ec-var-lm.enc <lmr7.pfb
-ec-var-lmr8     LMRoman8-Regular             <ec-var-lm.enc <lmr8.pfb
-ec-var-lmr9     LMRoman9-Regular             <ec-var-lm.enc <lmr9.pfb
-ec-var-lmri10   LMRoman10-Italic             <ec-var-lm.enc <lmri10.pfb
-ec-var-lmri12   LMRoman12-Italic             <ec-var-lm.enc <lmri12.pfb
-ec-var-lmri7    LMRoman7-Italic              <ec-var-lm.enc <lmri7.pfb
-ec-var-lmri8    LMRoman8-Italic              <ec-var-lm.enc <lmri8.pfb
-ec-var-lmri9    LMRoman9-Italic              <ec-var-lm.enc <lmri9.pfb
-ec-var-lmro10   LMSlanted10-Italic           <ec-var-lm.enc <lmro10.pfb
-ec-var-lmro12   LMSlanted12-Italic           <ec-var-lm.enc <lmro12.pfb
-ec-var-lmro8    LMSlanted8-Italic            <ec-var-lm.enc <lmro8.pfb
-ec-var-lmro9    LMSlanted9-Italic            <ec-var-lm.enc <lmro9.pfb
-ec-var-lmss10   LMSans10-Regular             <ec-var-lm.enc <lmss10.pfb
-ec-var-lmss12   LMSans12-Regular             <ec-var-lm.enc <lmss12.pfb
-ec-var-lmss17   LMSans17-Regular             <ec-var-lm.enc <lmss17.pfb
-ec-var-lmss8    LMSans8-Regular              <ec-var-lm.enc <lmss8.pfb
-ec-var-lmss9    LMSans9-Regular              <ec-var-lm.enc <lmss9.pfb
-ec-var-lmssbo10 LMSans10-BoldItalic          <ec-var-lm.enc <lmssbo10.pfb
-ec-var-lmssbx10 LMSans10-Bold                <ec-var-lm.enc <lmssbx10.pfb
-ec-var-lmssdc10 LMSansDemiCond10-Regular     <ec-var-lm.enc <lmssdc10.pfb
-ec-var-lmssdo10 LMSansDemiCond10-Italic      <ec-var-lm.enc <lmssdo10.pfb
-ec-var-lmsso10  LMSans10-Italic              <ec-var-lm.enc <lmsso10.pfb
-ec-var-lmsso12  LMSans12-Italic              <ec-var-lm.enc <lmsso12.pfb
-ec-var-lmsso17  LMSans17-Italic              <ec-var-lm.enc <lmsso17.pfb
-ec-var-lmsso8   LMSans8-Italic               <ec-var-lm.enc <lmsso8.pfb
-ec-var-lmsso9   LMSans9-Italic               <ec-var-lm.enc <lmsso9.pfb
-ec-var-lmssq8   LMSansQuotation8-Regular     <ec-var-lm.enc <lmssq8.pfb
-ec-var-lmssqbo8 LMSansQuotation8-BoldItalic  <ec-var-lm.enc <lmssqbo8.pfb
-ec-var-lmssqbx8 LMSansQuotation8-Bold        <ec-var-lm.enc <lmssqbx8.pfb
-ec-var-lmssqo8  LMSansQuotation8-Italic      <ec-var-lm.enc <lmssqo8.pfb
-ec-var-lmtcsc10 LMTypewriterCaps10-Regular   <ec-var-lm.enc <lmtcsc10.pfb
-ec-var-lmtt10   LMTypewriter10-Regular       <ec-var-lm.enc <lmtt10.pfb
-ec-var-lmtt12   LMTypewriter12-Regular       <ec-var-lm.enc <lmtt12.pfb
-ec-var-lmtt8    LMTypewriter8-Regular        <ec-var-lm.enc <lmtt8.pfb
-ec-var-lmtt9    LMTypewriter9-Regular        <ec-var-lm.enc <lmtt9.pfb
-ec-var-lmtti10  LMTypewriter10-Italic        <ec-var-lm.enc <lmtti10.pfb
-ec-var-lmtto10  LMTypewriterSlanted10-Italic <ec-var-lm.enc <lmtto10.pfb
-ec-var-lmvtt10  LMTypewriterVarWd10-Regular  <ec-var-lm.enc <lmvtt10.pfb
-ec-var-lmvtto10 LMTypewriterVarWd10-Italic   <ec-var-lm.enc <lmvtto10.pfb
\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/map/dvips/context/el-lm.map b/Master/texmf-dist/fonts/map/dvips/context/el-lm.map
deleted file mode 100644
index f8b605afb43..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/el-lm.map
+++ /dev/null
@@ -1,69 +0,0 @@
-el-lmb10 LMRoman10-Demi "enclmel ReEncodeFont" <lm-el.enc <lmb10.pfb
-el-lmbo10 LMRoman10-DemiOblique "enclmel ReEncodeFont" <lm-el.enc <lmbo10.pfb
-el-lmbx10 LMRoman10-Bold "enclmel ReEncodeFont" <lm-el.enc <lmbx10.pfb
-el-lmbx12 LMRoman12-Bold "enclmel ReEncodeFont" <lm-el.enc <lmbx12.pfb
-el-lmbx5 LMRoman5-Bold "enclmel ReEncodeFont" <lm-el.enc <lmbx5.pfb
-el-lmbx6 LMRoman6-Bold "enclmel ReEncodeFont" <lm-el.enc <lmbx6.pfb
-el-lmbx7 LMRoman7-Bold "enclmel ReEncodeFont" <lm-el.enc <lmbx7.pfb
-el-lmbx8 LMRoman8-Bold "enclmel ReEncodeFont" <lm-el.enc <lmbx8.pfb
-el-lmbx9 LMRoman9-Bold "enclmel ReEncodeFont" <lm-el.enc <lmbx9.pfb
-el-lmbxi10 LMRoman10-BoldItalic "enclmel ReEncodeFont" <lm-el.enc <lmbxi10.pfb
-el-lmbxo10 LMRoman10-BoldOblique "enclmel ReEncodeFont" <lm-el.enc <lmbxo10.pfb
-el-lmcsc10 LMRoman10-CapsRegular "enclmel ReEncodeFont" <lm-el.enc <lmcsc10.pfb
-el-lmcsco10 LMRoman10-CapsOblique "enclmel ReEncodeFont" <lm-el.enc <lmcsco10.pfb
-el-lmr10 LMRoman10-Regular "enclmel ReEncodeFont" <lm-el.enc <lmr10.pfb
-el-lmr12 LMRoman12-Regular "enclmel ReEncodeFont" <lm-el.enc <lmr12.pfb
-el-lmr17 LMRoman17-Regular "enclmel ReEncodeFont" <lm-el.enc <lmr17.pfb
-el-lmr5 LMRoman5-Regular "enclmel ReEncodeFont" <lm-el.enc <lmr5.pfb
-el-lmr6 LMRoman6-Regular "enclmel ReEncodeFont" <lm-el.enc <lmr6.pfb
-el-lmr7 LMRoman7-Regular "enclmel ReEncodeFont" <lm-el.enc <lmr7.pfb
-el-lmr8 LMRoman8-Regular "enclmel ReEncodeFont" <lm-el.enc <lmr8.pfb
-el-lmr9 LMRoman9-Regular "enclmel ReEncodeFont" <lm-el.enc <lmr9.pfb
-el-lmri10 LMRoman10-Italic "enclmel ReEncodeFont" <lm-el.enc <lmri10.pfb
-el-lmri12 LMRoman12-Italic "enclmel ReEncodeFont" <lm-el.enc <lmri12.pfb
-el-lmri7 LMRoman7-Italic "enclmel ReEncodeFont" <lm-el.enc <lmri7.pfb
-el-lmri8 LMRoman8-Italic "enclmel ReEncodeFont" <lm-el.enc <lmri8.pfb
-el-lmri9 LMRoman9-Italic "enclmel ReEncodeFont" <lm-el.enc <lmri9.pfb
-el-lmro10 LMRoman10-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmro10.pfb
-el-lmro12 LMRoman12-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmro12.pfb
-el-lmro17 LMRoman17-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmro17.pfb
-el-lmro8 LMRoman8-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmro8.pfb
-el-lmro9 LMRoman9-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmro9.pfb
-el-lmss10 LMSans10-Regular "enclmel ReEncodeFont" <lm-el.enc <lmss10.pfb
-el-lmss12 LMSans12-Regular "enclmel ReEncodeFont" <lm-el.enc <lmss12.pfb
-el-lmss17 LMSans17-Regular "enclmel ReEncodeFont" <lm-el.enc <lmss17.pfb
-el-lmss8 LMSans8-Regular "enclmel ReEncodeFont" <lm-el.enc <lmss8.pfb
-el-lmss9 LMSans9-Regular "enclmel ReEncodeFont" <lm-el.enc <lmss9.pfb
-el-lmssbo10 LMSans10-BoldOblique "enclmel ReEncodeFont" <lm-el.enc <lmssbo10.pfb
-el-lmssbx10 LMSans10-Bold "enclmel ReEncodeFont" <lm-el.enc <lmssbx10.pfb
-el-lmssdc10 LMSans10-DemiCondensed "enclmel ReEncodeFont" <lm-el.enc <lmssdc10.pfb
-el-lmssdo10 LMSans10-DemiCondensedOblique "enclmel ReEncodeFont" <lm-el.enc <lmssdo10.pfb
-el-lmsso10 LMSans10-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmsso10.pfb
-el-lmsso12 LMSans12-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmsso12.pfb
-el-lmsso17 LMSans17-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmsso17.pfb
-el-lmsso8 LMSans8-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmsso8.pfb
-el-lmsso9 LMSans9-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmsso9.pfb
-el-lmssq8 LMSansQuotation8-Regular "enclmel ReEncodeFont" <lm-el.enc <lmssq8.pfb
-el-lmssqbo8 LMSansQuotation8-BoldOblique "enclmel ReEncodeFont" <lm-el.enc <lmssqbo8.pfb
-el-lmssqbx8 LMSansQuotation8-Bold "enclmel ReEncodeFont" <lm-el.enc <lmssqbx8.pfb
-el-lmssqo8 LMSansQuotation8-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmssqo8.pfb
-el-lmtcsc10 LMTypewriter10-CapsRegular "enclmel ReEncodeFont" <lm-el.enc <lmtcsc10.pfb
-el-lmtcso10 LMTypewriter10-CapsOblique "enclmel ReEncodeFont" <lm-el.enc <lmtcso10.pfb
-el-lmtl10 LMTypewriter10-Light "enclmel ReEncodeFont" <lm-el.enc <lmtl10.pfb
-el-lmtlo10 LMTypewriter10-LightOblique "enclmel ReEncodeFont" <lm-el.enc <lmtlo10.pfb
-el-lmtlc10 LMTypewriter10-LightCondensed "enclmel ReEncodeFont" <lm-el.enc <lmtlc10.pfb
-el-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmel ReEncodeFont" <lm-el.enc <lmtlco10.pfb
-el-lmtk10 LMTypewriter10-Dark "enclmel ReEncodeFont" <lm-el.enc <lmtk10.pfb
-el-lmtko10 LMTypewriter10-DarkOblique "enclmel ReEncodeFont" <lm-el.enc <lmtko10.pfb
-el-lmtt10 LMTypewriter10-Regular "enclmel ReEncodeFont" <lm-el.enc <lmtt10.pfb
-el-lmtt12 LMTypewriter12-Regular "enclmel ReEncodeFont" <lm-el.enc <lmtt12.pfb
-el-lmtt8 LMTypewriter8-Regular "enclmel ReEncodeFont" <lm-el.enc <lmtt8.pfb
-el-lmtt9 LMTypewriter9-Regular "enclmel ReEncodeFont" <lm-el.enc <lmtt9.pfb
-el-lmtti10 LMTypewriter10-Italic "enclmel ReEncodeFont" <lm-el.enc <lmtti10.pfb
-el-lmtto10 LMTypewriter10-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmtto10.pfb
-el-lmvtt10 LMTypewriterVarWd10-Regular "enclmel ReEncodeFont" <lm-el.enc <lmvtt10.pfb
-el-lmvtto10 LMTypewriterVarWd10-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmvtto10.pfb
-el-lmvtl10 LMTypewriterVarWd10-Light "enclmel ReEncodeFont" <lm-el.enc <lmvtl10.pfb
-el-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmel ReEncodeFont" <lm-el.enc <lmvtlo10.pfb
-el-lmvtk10 LMTypewriterVarWd10-Dark "enclmel ReEncodeFont" <lm-el.enc <lmvtk10.pfb
-el-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmel ReEncodeFont" <lm-el.enc <lmvtko10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/il2-base.map b/Master/texmf-dist/fonts/map/dvips/context/il2-base.map
deleted file mode 100644
index 19756645c17..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/il2-base.map
+++ /dev/null
@@ -1 +0,0 @@
-# not yet defined
diff --git a/Master/texmf-dist/fonts/map/dvips/context/il2-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/il2-public-lm.map
deleted file mode 100644
index 150096d2982..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/il2-public-lm.map
+++ /dev/null
@@ -1,64 +0,0 @@
-% LM replacement / thanks to Jacko
-
-csb10    LMRomanDemi10-Regular        <csrm.enc <lmb10.pfb
-csbx5    LMRoman5-Bold                <csrm.enc <lmbx5.pfb
-csbx6    LMRoman6-Bold                <csrm.enc <lmbx6.pfb
-csbx7    LMRoman7-Bold                <csrm.enc <lmbx7.pfb
-csbx8    LMRoman8-Bold                <csrm.enc <lmbx8.pfb
-csbx9    LMRoman9-Bold                <csrm.enc <lmbx9.pfb
-csbx10   LMRoman10-Bold               <csrm.enc <lmbx10.pfb
-csbx12   LMRoman12-Bold               <csrm.enc <lmbx12.pfb
-csbxsl10 LMSlanted10-BoldItalic       <csrm.enc <lmbxo10.pfb
-csbxti10 LMRoman10-BoldItalic         <csrm.enc <lmbxi10.pfb
-csinch   LMSans10-Bold                <csin.enc <lmssbx10.pfb
-csitt10  LMTypewriter10-Italic        <cstt.enc <lmtti10.pfb
-cscsc10  LMCaps10-Regular             <cssc.enc <lmcsc10.pfb
-csr5     LMRoman5-Regular             <cssc.enc <lmr5.pfb
-csr6     LMRoman6-Regular             <csrm.enc <lmr6.pfb
-csr7     LMRoman7-Regular             <csrm.enc <lmr7.pfb
-csr8     LMRoman8-Regular             <csrm.enc <lmr8.pfb
-csr9     LMRoman9-Regular             <csrm.enc <lmr9.pfb
-csr10    LMRoman10-Regular            <csrm.enc <lmr10.pfb
-csr12    LMRoman12-Regular            <csrm.enc <lmr12.pfb
-csr17    LMRoman17-Regular            <csrm.enc <lmr17.pfb
-cssl8    LMSlanted8-Italic            <csrm.enc <lmro8.pfb
-cssl9    LMSlanted9-Italic            <csrm.enc <lmro9.pfb
-cssl10   LMSlanted10-Italic           <csrm.enc <lmro10.pfb
-cssl12   LMSlanted12-Italic           <csrm.enc <lmro12.pfb
-cssltt10 LMTypewriterSlanted10-Italic <cstt.enc <lmtto10.pfb
-csss8    LMSans8-Regular              <csrm.enc <lmss8.pfb
-csss9    LMSans9-Regular              <csrm.enc <lmss9.pfb
-csss10   LMSans10-Regular             <csrm.enc <lmss10.pfb
-csss12   LMSans12-Regular             <csrm.enc <lmss12.pfb
-csss17   LMSans17-Regular             <csrm.enc <lmss17.pfb
-csssbx10 LMSans10-Bold                <csrm.enc <lmssbx10.pfb
-csssdc10 LMSansDemiCond10-Regular     <csrm.enc <lmssdc10.pfb
-csssi8   LMSans8-Italic               <csrm.enc <lmsso8.pfb
-csssi9   LMSans9-Italic               <csrm.enc <lmsso9.pfb
-csssi10  LMSans10-Italic              <csrm.enc <lmsso10.pfb
-csssi12  LMSans12-Italic              <csrm.enc <lmsso12.pfb
-csssi17  LMSans17-Italic              <csrm.enc <lmsso17.pfb
-csssq8   LMSansQuotation8-Regular     <csrm.enc <lmssq8.pfb
-csssqi8  LMSansQuotation8-Italic      <csrm.enc <lmssqo8.pfb
-cstcsc10 LMTypewriterCaps10-Regular   <cstt.enc <lmtcsc10.pfb
-csti7    LMRoman7-Italic              <csrm.enc <lmri7.pfb
-csti8    LMRoman8-Italic              <csrm.enc <lmri8.pfb
-csti9    LMRoman9-Italic              <csrm.enc <lmri9.pfb
-csti10   LMRoman10-Italic             <csrm.enc <lmri10.pfb
-csti12   LMRoman12-Italic             <csrm.enc <lmri12.pfb
-cstt8    LMTypewriter8-Regular        <cstt.enc <lmtt8.pfb
-cstt9    LMTypewriter9-Regular        <cstt.enc <lmtt9.pfb
-cstt10   LMTypewriter10-Regular       <cstt.enc <lmtt10.pfb
-cstt12   LMTypewriter12-Regular       <cstt.enc <lmtt12.pfb
-csvtt10  LMTypewriterVarWd10-Regular  <cstt.enc <lmvtt10.pfb
-
-% some originals, not used in context
-
-csdunh10 csdunh10 <csdunh10.pfb
-csff10   csff10   <csff10.pfb
-csfib8   csfib8   <csfib8.pfb
-csfi10   csfi10   <csfi10.pfb
-
-% a weird one, not used in context
-
-csu10    LMRoman10-Italic "-0.25 SlantFont" <csrm.enc <lmri10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/il2-var-exclusive-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/il2-var-exclusive-public-lm.map
deleted file mode 100644
index 19756645c17..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/il2-var-exclusive-public-lm.map
+++ /dev/null
@@ -1 +0,0 @@
-# not yet defined
diff --git a/Master/texmf-dist/fonts/map/dvips/context/original-adobe-euro.map b/Master/texmf-dist/fonts/map/dvips/context/original-adobe-euro.map
deleted file mode 100644
index 7a1137ebb62..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/original-adobe-euro.map
+++ /dev/null
@@ -1,25 +0,0 @@
-euromo   <euromo.pfb
-euromob  <euromob.pfb
-euromoi  <euromoi.pfb
-euromobi <euromobi.pfb
-eurosa   <eurosa.pfb
-eurosab  <eurosab.pfb
-eurosai  <eurosai.pfb
-eurosabi <eurosebi.pfb
-eurose   <eurose.pfb
-euroseb  <euroseb.pfb
-eurosei  <eurosei.pfb
-eurosebi <eurosebi.pfb
-
-% euromo   <_2______.pfb
-% euromob  <_2b_____.pfb
-% euromoi  <_2i_____.pfb
-% euromobi <_2bi____.pfb
-% eurosa   <_1______.pfb
-% eurosab  <_1b_____.pfb
-% eurosai  <_1i_____.pfb
-% eurosabi <_1bi____.pfb
-% eurose   <_3______.pfb
-% euroseb  <_3b_____.pfb
-% eurosei  <_3i_____.pfb
-% eurosebi <_3bi____.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/original-ams-base.map b/Master/texmf-dist/fonts/map/dvips/context/original-ams-base.map
deleted file mode 100644
index aa8818ec0e0..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/original-ams-base.map
+++ /dev/null
@@ -1,47 +0,0 @@
-lasy5      LASY5      <lasy5.pfb
-lasy6      LASY6      <lasy6.pfb
-lasy7      LASY7      <lasy7.pfb
-lasy8      LASY8      <lasy8.pfb
-lasy9      LASY9      <lasy9.pfb
-lasy10     LASY10     <lasy10.pfb
-
-lasyb10    LASYB10    <lasyb10.pfb
-lcircle10  LCIRCLE10  <lcircle1.pfb
-lcirclew10 LCIRCLEW10 <lcirclew.pfb
-lcmss8     LCMSS8     <lcmss8.pfb
-lcmssb8    LCMSSB8    <lcmssb8.pfb
-lcmssi8    LCMSSI8    <lcmssi8.pfb
-line10     LINE10     <line10.pfb
-linew10    LINEW10    <linew10.pfb
-
-logo8      LOGO8      <logo8.pfb
-logo9      LOGO9      <logo9.pfb
-logo10     LOGO10     <logo10.pfb
-logobf10   LOGOBF10   <logobf10.pfb
-logosl10   LOGOSL10   <logosl10.pfb
-
-msam5      MSAM5      <msam5.pfb
-msam7      MSAM7      <msam7.pfb
-msam10     MSAM10     <msam10.pfb
-msbm5      MSBM5      <msbm5.pfb
-msbm7      MSBM7      <msbm7.pfb
-msbm10     MSBM10     <msbm10.pfb
-
-wncyb10    WNCYB10    <wncyb10.pfb
-wncyi10    WNCYI10    <wncyi10.pfb
-wncyr10    WNCYR10    <wncyr10.pfb
-wncysc10   WNCYSC10   <wncysc10.pfb
-wncyss10   WNCYSS10   <wncyss10.pfb
-
-manfnt     MANFNT     <manfnt.pfb
-
-% i dunno what this is
-
-icmex10    <icmex10.pfb
-icmmi8     <icmmi8.pfb
-icmsy8     <icmsy8.pfb
-icmtt8     <icmtt8.pfb
-ilasy8     <ilasy8.pfb
-ilcmss8    <ilcmss8.pfb
-ilcmssb8   <ilcmssb8.pfb
-ilcmssi8   <ilcmssi8.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/original-ams-cmr.map b/Master/texmf-dist/fonts/map/dvips/context/original-ams-cmr.map
deleted file mode 100644
index 6139ad754b8..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/original-ams-cmr.map
+++ /dev/null
@@ -1,97 +0,0 @@
-cmb10      CMB10     <cmb10.pfb
-
-cmbsy6     CMBSY6    <cmbsy6.pfb
-cmbsy7     CMBSY7    <cmbsy7.pfb
-cmbsy8     CMBSY8    <cmbsy8.pfb
-cmbsy9     CMBSY9    <cmbsy9.pfb
-cmbsy10    CMBSY10   <cmbsy10.pfb
-
-cmbx5      CMBX5     <cmbx5.pfb
-cmbx6      CMBX6     <cmbx6.pfb
-cmbx7      CMBX7     <cmbx7.pfb
-cmbx8      CMBX8     <cmbx8.pfb
-cmbx9      CMBX9     <cmbx9.pfb
-cmbx10     CMBX10    <cmbx10.pfb
-cmbx12     CMBX10    <cmbx12.pfb
-
-cmbxsl10   CMBXSL10  <cmbxsl10.pfb
-cmbxti10   CMBXTI10  <cmbxti10.pfb
-
-cmcsc10    CMCSC10   <cmcsc10.pfb
-cmdunh10   CMDUNH10  <cmdunh10.pfb
-cmex10     CMEX10    <cmex10.pfb
-cmff10     CMFF10    <cmff10.pfb
-cmfi10     CMFI10    <cmfi10.pfb
-cmfib8     CMFIB8    <cmfib8.pfb
-cminch     CMINCH    <cminch.pfb
-cmitt10    CMITT10   <cmitt10.pfb
-cmmib10    CMMIB10   <cmmib10.pfb
-
-cmmi5      CMMI5     <cmmi5.pfb
-cmmi6      CMMI6     <cmmi6.pfb
-cmmi7      CMMI7     <cmmi7.pfb
-cmmi8      CMMI8     <cmmi8.pfb
-cmmi9      CMMI9     <cmmi9.pfb
-cmmi10     CMMI10    <cmmi10.pfb
-cmmi12     CMMI12    <cmmi12.pfb
-
-cmr5       CMR5      <cmr5.pfb
-cmr6       CMR6      <cmr6.pfb
-cmr7       CMR7      <cmr7.pfb
-cmr8       CMR8      <cmr8.pfb
-cmr9       CMR9      <cmr9.pfb
-cmr10      CMR10     <cmr10.pfb
-cmr12      CMR12     <cmr12.pfb
-cmr17      CMR17     <cmr17.pfb
-
-cmsl8      CMSL8     <cmsl8.pfb
-cmsl9      CMSL9     <cmsl9.pfb
-cmsl10     CMSL10    <cmsl10.pfb
-cmsl12     CMSL12    <cmsl12.pfb
-
-cmsltt10   CMSLTT10  <cmsltt10.pfb
-
-cmss8      CMSS8     <cmss8.pfb
-cmss9      CMSS9     <cmss9.pfb
-cmss10     CMSS10    <cmss10.pfb
-cmss12     CMSS12    <cmss12.pfb
-cmss17     CMSS17    <cmss17.pfb
-
-cmssbx10   CMSSBX10  <cmssbx10.pfb
-cmssdc10   CMSSDC10  <cmssdc10.pfb
-
-cmssi8     CMSSI8    <cmssi8.pfb
-cmssi9     CMSSI9    <cmssi9.pfb
-cmssi10    CMSSI10   <cmssi10.pfb
-cmssi12    CMSSI12   <cmssi12.pfb
-cmssi17    CMSSI17   <cmssi17.pfb
-
-cmssq8     CMSSQ8    <cmssq8.pfb
-cmssqi8    CMSSQI8   <cmssqi8.pfb
-
-cmsy5      CMSY5     <cmsy5.pfb
-cmsy6      CMSY6     <cmsy6.pfb
-cmsy7      CMSY7     <cmsy7.pfb
-cmsy8      CMSY8     <cmsy8.pfb
-cmsy9      CMSY9     <cmsy9.pfb
-cmsy10     CMSY10    <cmsy10.pfb
-
-cmtcsc10   CMTCSC10  <cmtcsc10.pfb
-
-cmtex8     CMTEX8    <cmtex8.pfb
-cmtex9     CMTEX9    <cmtex9.pfb
-cmtex10    CMTEX10   <cmtex10.pfb
-
-cmti7      CMTI7     <cmti7.pfb
-cmti8      CMTI8     <cmti8.pfb
-cmti9      CMTI9     <cmti9.pfb
-cmti10     CMTI10    <cmti10.pfb
-cmti12     CMTI12    <cmti12.pfb
-
-cmtt8      CMTT8     <cmtt8.pfb
-cmtt9      CMTT9     <cmtt9.pfb
-cmtt10     CMTT10    <cmtt10.pfb
-cmtt12     CMTT12    <cmtt12.pfb
-
-cmu10      CMU10     <cmu10.pfb
-cmvtt10    CMVTT10   <cmvtt10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/original-ams-euler.map b/Master/texmf-dist/fonts/map/dvips/context/original-ams-euler.map
deleted file mode 100644
index ecbd65b77a0..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/original-ams-euler.map
+++ /dev/null
@@ -1,25 +0,0 @@
-euex10 EUEX10 <euex10.pfb
-
-eufb5  EUFB5  <eufb5.pfb
-eufb7  EUFB7  <eufb7.pfb
-eufb10 EUFB10 <eufb10.pfb
-
-eufm5  EUFM5  <eufm5.pfb
-eufm7  EUFM7  <eufm7.pfb
-eufm10 EUFM10 <eufm10.pfb
-
-eurb5  EURB5  <eurb5.pfb
-eurb7  EURB7  <eurb7.pfb
-eurb10 EURB10 <eurb10.pfb
-
-eurm5  EURM5  <eurm5.pfb
-eurm7  EURM7  <eurm7.pfb
-eurm10 EURM10 <eurm10.pfb
-
-eusb5  EUSB5  <eusb5.pfb
-eusb7  EUSB7  <eusb7.pfb
-eusb10 EUSB10 <eusb10.pfb
-
-eusm5  EUSM5  <eusm5.pfb
-eusm7  EUSM7  <eusm7.pfb
-eusm10 EUSM10 <eusm10.pfb
\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/map/dvips/context/original-base.map b/Master/texmf-dist/fonts/map/dvips/context/original-base.map
deleted file mode 100644
index 637a87aa518..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/original-base.map
+++ /dev/null
@@ -1,63 +0,0 @@
-% ralph
-
-rsfs7  rsfs5                       <rsfs7.pfb
-rsfs5  rsfs7                       <rsfs5.pfb
-rsfs10 rsfs10                      <rsfs10.pfb
-
-% marvosym
-
-fmvr8x  MarVoSym                   <marvosym.pfb
-fmvri8x MarVoSym ".167 SlantFont"  <marvosym.pfb
-
-% context
-
-contnav ContextNavigation          <contnav.pfb
-hans    Hans-Regular               <hans.pfb
-hans-sh Hans-sh-Regular            <hans-sh.pfb
-
-% dingbats
-
-uzdr Dingbats                      <uzdr.pfb
-pzdr Dingbats                      <pzdr.pfb
-
-% symbols
-
-usyr StandardSymL                  <usyr.pfb
-
-% xypic
-
-xyatip10 XYATIP10                  <xyatip10.pfb
-xybsql10 XYBSQL10                  <xybsql10.pfb
-xybtip10 XYBTIP10                  <xybtip10.pfb
-xycirc10 XYCIRC10                  <xycirc10.pfb
-xydash10 XYDASH10                  <xydash10.pfb
-
-xycmat10 XYCMAT10                  <xycmat10.pfb
-xycmbt10 XYCMBT10                  <xycmbt10.pfb
-xyeuat10 XYEUAT10                  <xyeuat10.pfb
-xyeubt10 XYEUBT10                  <xyeubt10.pfb
-
-xycmat11 XYCMAT10 "1.1 ExtendFont" <xycmat10.pfb
-xycmbt11 XYCMBT10 "1.1 ExtendFont" <xycmbt10.pfb
-xyeuat11 XYEUAT10 "1.1 ExtendFont" <xyeuat10.pfb
-xyeubt11 XYEUBT10 "1.1 ExtendFont" <xyeubt10.pfb
-
-xycmat12 XYCMAT10 "1.2 ExtendFont" <xycmat10.pfb
-xycmbt12 XYCMBT10 "1.2 ExtendFont" <xycmbt10.pfb
-xyeuat12 XYEUAT10 "1.2 ExtendFont" <xyeuat10.pfb
-xyeubt12 XYEUBT10 "1.2 ExtendFont" <xyeubt10.pfb
-
-% euro
-
-zpeub   EuroSerif-Bold             <zpeub.pfb
-zpeubi  EuroSerif-BoldItalic       <zpeubi.pfb
-zpeubis EuroSans-BoldItalic        <zpeubis.pfb
-zpeubit EuroMono-BoldItalic        <zpeubit.pfb
-zpeubs  EuroSans-Bold              <zpeubs.pfb
-zpeubt  EuroMono-Bold              <zpeubt.pfb
-zpeur   EuroSerif-Regular          <zpeur.pfb
-zpeuri  EuroSerif-Italic           <zpeuri.pfb
-zpeuris EuroSans-Italic            <zpeuris.pfb
-zpeurit EuroMono-Italic            <zpeurit.pfb
-zpeurs  EuroSans-Regular           <zpeurs.pfb
-zpeurt  EuroMono-Regular           <zpeurt.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/original-context-symbol.map b/Master/texmf-dist/fonts/map/dvips/context/original-context-symbol.map
deleted file mode 100644
index ace5cfe8e49..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/original-context-symbol.map
+++ /dev/null
@@ -1,3 +0,0 @@
-contnav ContextNavigation          <contnav.pfb
-hans    Hans-Regular               <hans.pfb
-hans-sh Hans-sh-Regular            <hans-sh.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/original-dummy.map b/Master/texmf-dist/fonts/map/dvips/context/original-dummy.map
deleted file mode 100644
index c4843945cdf..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/original-dummy.map
+++ /dev/null
@@ -1 +0,0 @@
-% no entries in here
diff --git a/Master/texmf-dist/fonts/map/dvips/context/original-empty.map b/Master/texmf-dist/fonts/map/dvips/context/original-empty.map
deleted file mode 100644
index 84d22b78228..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/original-empty.map
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-% this is an empty map file
-
diff --git a/Master/texmf-dist/fonts/map/dvips/context/original-micropress-informal.map b/Master/texmf-dist/fonts/map/dvips/context/original-micropress-informal.map
deleted file mode 100644
index 01a61516fd6..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/original-micropress-informal.map
+++ /dev/null
@@ -1,7 +0,0 @@
-ifrm10cm   Informal Regular            <cm.enc <ifrg.pfb
-ifrb10cm   InformalBold                <cm.enc <ifb.pfb
-ifro10cm   InformalOblique             <cm.enc <ifo.pfb
-ifbo10cm   InformalBoldOblique         <cm.enc <ifbo.pfb
-ifex10     InformalExtendedMathSymbols         <ifex10.pfb
-ifmi10     InformalMathItalics                 <ifmi10.pfb
-ifsy10     InformalMathSymbols                 <ifsy10.pfb
\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/map/dvips/context/original-public-csr.map b/Master/texmf-dist/fonts/map/dvips/context/original-public-csr.map
deleted file mode 100644
index 8c07d310fbc..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/original-public-csr.map
+++ /dev/null
@@ -1,56 +0,0 @@
-csr5     CSR5     <csr1.enc <csr5.pfb
-csr6     CSR6     <csr.enc  <csr6.pfb
-csr7     CSR7     <csr.enc  <csr7.pfb
-csr8     CSR8     <csr.enc  <csr8.pfb
-csr9     CSR9     <csr.enc  <csr9.pfb
-csr10    CSR10    <csr.enc  <csr10.pfb
-csr12    CSR12    <csr.enc  <csr12.pfb
-csr17    CSR17    <csr.enc  <csr17.pfb
-csbx5    CSBX5    <csr.enc  <csbx5.pfb
-csbx6    CSBX6    <csr.enc  <csbx6.pfb
-csbx7    CSBX7    <csr.enc  <csbx7.pfb
-csbx8    CSBX8    <csr.enc  <csbx8.pfb
-csbx9    CSBX9    <csr.enc  <csbx9.pfb
-csbx10   CSBX10   <csr.enc  <csbx10.pfb
-csbx12   CSBX12   <csr.enc  <csbx12.pfb
-csb10    CSB10    <csr.enc  <csb10.pfb
-csti7    CSTI7    <csr.enc  <csti7.pfb
-csti8    CSTI8    <csr.enc  <csti8.pfb
-csti9    CSTI9    <csr.enc  <csti9.pfb
-csti10   CSTI10   <csr.enc  <csti10.pfb
-csti12   CSTI12   <csr.enc  <csti12.pfb
-cstt8    CSTT8    <cstt.enc <cstt8.pfb
-cstt9    CSTT9    <cstt.enc <cstt9.pfb
-cstt10   CSTT10   <cstt.enc <cstt10.pfb
-cstt12   CSTT12   <cstt.enc <cstt12.pfb
-cssltt10 CSSLTT10 <cstt.enc <cssltt10.pfb
-csvtt10  CSVTT10  <cstt.enc <csvtt10.pfb
-csss8    CSSS8    <csr.enc  <csss8.pfb
-csss9    CSSS9    <csr.enc  <csss9.pfb
-csss10   CSSS10   <csr.enc  <csss10.pfb
-csss12   CSSS12   <csr.enc  <csss12.pfb
-csss17   CSSS17   <csr.enc  <csss17.pfb
-csssi8   CSSSI8   <csr.enc  <csssi8.pfb
-csssi9   CSSSI9   <csr.enc  <csssi9.pfb
-csssi10  CSSSI10  <csr.enc  <csssi10.pfb
-csssi12  CSSSI12  <csr.enc  <csssi12.pfb
-csssi17  CSSSI17  <csr.enc  <csssi17.pfb
-cssl8    CSSL8    <csr.enc  <cssl8.pfb
-cssl9    CSSL9    <csr.enc  <cssl9.pfb
-cssl10   CSSL10   <csr.enc  <cssl10.pfb
-cssl12   CSSL12   <csr.enc  <cssl12.pfb
-csssq8   CSSSQ8   <csr.enc  <csssq8.pfb
-csssqi8  CSSSQI8  <csr.enc  <csssqi8.pfb
-csssdc10 CSSSDC10 <csr.enc  <csssdc10.pfb
-csssbx10 CSSSBX10 <csr.enc  <csssbx10.pfb
-csinch   CSINCH   <csin.enc <csinch.pfb
-csdunh10 CSDUNH10 <csr.enc  <csdunh10.pfb
-csbxsl10 CSBXSL10 <csr.enc  <csbxsl10.pfb
-csff10   CSFF10   <csr.enc  <csff10.pfb
-csfib8   CSFIB8   <csr.enc  <csfib8.pfb
-csbxti10 CSBXTI10 <csr.enc  <csbxti10.pfb
-csitt10  CSITT10  <cstt.enc <csitt10.pfb
-csu10    CSU10    <csr.enc  <csu10.pfb
-csfi10   CSFI10   <csr.enc  <csfi10.pfb
-cscsc10  CSCSC10  <csr1.enc <cscsc10.pfb
-cstcsc10 CSTCSC10 <cstt.enc <cstcsc10.pfb
\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/map/dvips/context/original-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/original-public-lm.map
deleted file mode 100644
index 2ba41ba78a6..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/original-public-lm.map
+++ /dev/null
@@ -1,170 +0,0 @@
-% LM replacement, thanks to Jacko
-
-% official
-%
-% cmb10     LMRomanDemi10-Regular        <cmrm.enc  <lmb10.pfb
-% cmbx10    LMRoman10-Bold               <cmrm.enc  <lmbx10.pfb
-% cmbx12    LMRoman12-Bold               <cmrm.enc  <lmbx12.pfb
-% cmbx5     LMRoman5-Bold                <cmrm.enc  <lmbx5.pfb
-% cmbx6     LMRoman6-Bold                <cmrm.enc  <lmbx6.pfb
-% cmbx7     LMRoman7-Bold                <cmrm.enc  <lmbx7.pfb
-% cmbx8     LMRoman8-Bold                <cmrm.enc  <lmbx8.pfb
-% cmbx9     LMRoman9-Bold                <cmrm.enc  <lmbx9.pfb
-% cmbxsl10  LMSlanted10-BoldItalic       <cmrm.enc  <lmbxo10.pfb
-% cmbxti10  LMRoman10-BoldItalic         <cmit.enc  <lmbxi10.pfb
-% cmbxti12  LMRoman10-BoldItalic         <cmit.enc  <lmbxti10.pfb
-% cmbxti7   LMRoman10-BoldItalic         <cmit.enc  <lmbxti10.pfb
-% cmcsc10   LMCaps10-Regular             <cmsc.enc  <lmcsc10.pfb
-% cmcsc8    LMCaps10-Regular             <cmsc.enc  <lmcsc10.pfb
-% cmcsc9    LMCaps10-Regular             <cmsc.enc  <lmcsc10.pfb
-% cminch    LMSans10-Bold                <cmin.enc  <lmssbx10.pfb
-% cmitt10   LMTypewriter10-Italic        <cmitt.enc <lmtti10.pfb
-% cmitt12   LMTypewriter10-Italic        <cmitt.enc <lmtti10.pfb
-% cmitt9    LMTypewriter10-Italic        <cmitt.enc <lmtti10.pfb
-% cmr10     LMRoman10-Regular            <cmrm.enc  <lmr10.pfb
-% cmr12     LMRoman12-Regular            <cmrm.enc  <lmr12.pfb
-% cmr17     LMRoman17-Regular            <cmrm.enc  <lmr17.pfb
-% cmr5      LMRoman5-Regular             <cmsc.enc  <lmr5.pfb
-% cmr6      LMRoman6-Regular             <cmrm.enc  <lmr6.pfb
-% cmr7      LMRoman7-Regular             <cmrm.enc  <lmr7.pfb
-% cmr8      LMRoman8-Regular             <cmrm.enc  <lmr8.pfb
-% cmr9      LMRoman9-Regular             <cmrm.enc  <lmr9.pfb
-% cmsl10    LMSlanted10-Italic           <cmrm.enc  <lmro10.pfb
-% cmsl12    LMSlanted12-Italic           <cmrm.enc  <lmro12.pfb
-% cmsl6     LMSlanted8-Italic            <cmrm.enc  <lmro8.pfb
-% cmsl8     LMSlanted8-Italic            <cmrm.enc  <lmro8.pfb
-% cmsl9     LMSlanted9-Italic            <cmrm.enc  <lmro9.pfb
-% cmsltt10  LMTypewriterSlanted10-Italic <cmtt.enc  <lmtto10.pfb
-% cmsltt9   LMTypewriterSlanted10-Italic <cmtt.enc  <lmtto10.pfb
-% cmss10    LMSans10-Regular             <cmrm.enc  <lmss10.pfb
-% cmss12    LMSans12-Regular             <cmrm.enc  <lmss12.pfb
-% cmss17    LMSans17-Regular             <cmrm.enc  <lmss17.pfb
-% cmss8     LMSans8-Regular              <cmrm.enc  <lmss8.pfb
-% cmss9     LMSans9-Regular              <cmrm.enc  <lmss9.pfb
-% cmssbx10  LMSans10-Bold                <cmrm.enc  <lmssbx10.pfb
-% cmssbxo10 LMSans10-BoldItalic          <cmrm.enc  <lmssbo10.pfb
-% cmssdc10  LMSansDemiCond10-Regular     <cmrm.enc  <lmssdc10.pfb
-% cmssi10   LMSans10-Italic              <cmrm.enc  <lmsso10.pfb
-% cmssi12   LMSans12-Italic              <cmrm.enc  <lmsso12.pfb
-% cmssi17   LMSans17-Italic              <cmrm.enc  <lmsso17.pfb
-% cmssi8    LMSans8-Italic               <cmrm.enc  <lmsso8.pfb
-% cmssi9    LMSans9-Italic               <cmrm.enc  <lmsso9.pfb
-% cmssq8    LMSansQuotation8-Regular     <cmrm.enc  <lmssq8.pfb
-% cmssqi8   LMSansQuotation8-Italic      <cmrm.enc  <lmssqo8.pfb
-% cmtcsc10  LMTypewriterCaps10-Regular   <cmtt.enc  <lmtcsc10.pfb
-% cmti10    LMRoman10-Italic             <cmit.enc  <lmri10.pfb
-% cmti12    LMRoman12-Italic             <cmit.enc  <lmri12.pfb
-% cmti7     LMRoman7-Italic              <cmit.enc  <lmri7.pfb
-% cmti8     LMRoman8-Italic              <cmit.enc  <lmri8.pfb
-% cmti9     LMRoman9-Italic              <cmit.enc  <lmri9.pfb
-% cmtt10    LMTypewriter10-Regular       <cmtt.enc  <lmtt10.pfb
-% cmtt12    LMTypewriter12-Regular       <cmtt.enc  <lmtt12.pfb
-% cmtt8     LMTypewriter8-Regular        <cmtt.enc  <lmtt8.pfb
-% cmtt9     LMTypewriter9-Regular        <cmtt.enc  <lmtt9.pfb
-% cmvtt10   LMTypewriterVarWd10-Regular  <cmrm.enc  <lmvtt10.pfb
-%
-% but more efficient since to-be-included old files have those names
-
-cmb10     CMB10     <cmrm.enc  <lmb10.pfb
-cmbx10    CMBX10    <cmrm.enc  <lmbx10.pfb
-cmbx12    CMBX12    <cmrm.enc  <lmbx12.pfb
-cmbx5     CMBX5     <cmrm.enc  <lmbx5.pfb
-cmbx6     CMBX6     <cmrm.enc  <lmbx6.pfb
-cmbx7     CMBX7     <cmrm.enc  <lmbx7.pfb
-cmbx8     CMBX8     <cmrm.enc  <lmbx8.pfb
-cmbx9     CMBX9     <cmrm.enc  <lmbx9.pfb
-cmbxsl10  CMBXSL10  <cmrm.enc  <lmbxo10.pfb
-cmbxti10  CMBXTI10  <cmit.enc  <lmbxi10.pfb
-cmbxti12  CMBXTI12  <cmit.enc  <lmbxti10.pfb
-cmbxti7   CMBXTI7   <cmit.enc  <lmbxti10.pfb
-cmcsc10   CMCSC10   <cmsc.enc  <lmcsc10.pfb
-cmcsc8    CMCSC8    <cmsc.enc  <lmcsc10.pfb
-cmcsc9    CMCSC9    <cmsc.enc  <lmcsc10.pfb
-cminch    CMINCH    <cmin.enc  <lmssbx10.pfb
-cmitt10   CMITT10   <cmitt.enc <lmtti10.pfb
-cmitt12   CMITT12   <cmitt.enc <lmtti10.pfb
-cmitt9    CMITT9    <cmitt.enc <lmtti10.pfb
-cmr10     CMR10     <cmrm.enc  <lmr10.pfb
-cmr12     CMR12     <cmrm.enc  <lmr12.pfb
-cmr17     CMR17     <cmrm.enc  <lmr17.pfb
-cmr5      CMR5      <cmsc.enc  <lmr5.pfb
-cmr6      CMR6      <cmrm.enc  <lmr6.pfb
-cmr7      CMR7      <cmrm.enc  <lmr7.pfb
-cmr8      CMR8      <cmrm.enc  <lmr8.pfb
-cmr9      CMR9      <cmrm.enc  <lmr9.pfb
-cmsl10    CMSL10    <cmrm.enc  <lmro10.pfb
-cmsl12    CMSL12    <cmrm.enc  <lmro12.pfb
-cmsl6     CMSL6     <cmrm.enc  <lmro8.pfb
-cmsl8     CMSL8     <cmrm.enc  <lmro8.pfb
-cmsl9     CMSL9     <cmrm.enc  <lmro9.pfb
-cmsltt10  CMSLTT10  <cmtt.enc  <lmtto10.pfb
-cmsltt9   CMSLTT9   <cmtt.enc  <lmtto10.pfb
-cmss10    CMS10     <cmrm.enc  <lmss10.pfb
-cmss12    CMS12     <cmrm.enc  <lmss12.pfb
-cmss17    CMS17     <cmrm.enc  <lmss17.pfb
-cmss8     CMS8      <cmrm.enc  <lmss8.pfb
-cmss9     CMS9      <cmrm.enc  <lmss9.pfb
-cmssbx10  CMSSBX10  <cmrm.enc  <lmssbx10.pfb
-cmssbxo10 CMSSBXO10 <cmrm.enc  <lmssbo10.pfb
-cmssdc10  CMSSDC10  <cmrm.enc  <lmssdc10.pfb
-cmssi10   CMSI10    <cmrm.enc  <lmsso10.pfb
-cmssi12   CMSI12    <cmrm.enc  <lmsso12.pfb
-cmssi17   CMSI17    <cmrm.enc  <lmsso17.pfb
-cmssi8    CMSSI8    <cmrm.enc  <lmsso8.pfb
-cmssi9    CMSSI9    <cmrm.enc  <lmsso9.pfb
-cmssq8    CMSQ8     <cmrm.enc  <lmssq8.pfb
-cmssqi8   CMSSQI8   <cmrm.enc  <lmssqo8.pfb
-cmtcsc10  CMTCSC10  <cmtt.enc  <lmtcsc10.pfb
-cmti10    CMTI10    <cmit.enc  <lmri10.pfb
-cmti12    CMTI12    <cmit.enc  <lmri12.pfb
-cmti7     CMTI7     <cmit.enc  <lmri7.pfb
-cmti8     CMTI8     <cmit.enc  <lmri8.pfb
-cmti9     CMTI9     <cmit.enc  <lmri9.pfb
-cmtt10    CMTT10    <cmtt.enc  <lmtt10.pfb
-cmtt12    CMTT12    <cmtt.enc  <lmtt12.pfb
-cmtt8     CMTT8     <cmtt.enc  <lmtt8.pfb
-cmtt9     CMTT9     <cmtt.enc  <lmtt9.pfb
-cmvtt10   CMVTT10   <cmrm.enc  <lmvtt10.pfb
-
-% original
-
-cmbsy10   CMBSY10  <cmbsy10.pfb
-cmbsy5    CMBSY5   <cmbsy5.pfb
-cmbsy6    CMBSY7   <cmbsy7.pfb
-cmbsy7    CMBSY7   <cmbsy7.pfb
-cmbsy8    CMBSY7   <cmbsy7.pfb
-cmbsy9    CMBSY10  <cmbsy10.pfb
-cmdunh10  CMDUNH10 <cmdunh10.pfb
-cmex10    CMEX10   <cmex10.pfb
-cmex7     CMEX10   <cmex10.pfb
-cmex8     CMEX10   <cmex10.pfb
-cmex9     CMEX10   <cmex10.pfb
-cmff10    CMFF10   <cmff10.pfb
-cmfi10    CMFI10   <cmfi10.pfb
-cmfib8    CMFIB8   <cmfib8.pfb
-cmmi10    CMMI10   <cmmi10.pfb
-cmmi12    CMMI12   <cmmi12.pfb
-cmmi5     CMMI5    <cmmi5.pfb
-cmmi6     CMMI6    <cmmi6.pfb
-cmmi7     CMMI7    <cmmi7.pfb
-cmmi8     CMMI8    <cmmi8.pfb
-cmmi9     CMMI9    <cmmi9.pfb
-cmmib10   CMMIB10  <cmmib10.pfb
-cmmib5    CMMIB5   <cmmib5.pfb
-cmmib6    CMMIB7   <cmmib7.pfb
-cmmib7    CMMIB7   <cmmib7.pfb
-cmmib8    CMMIB7   <cmmib7.pfb
-cmmib9    CMMIB10  <cmmib10.pfb
-cmsy10    CMSY10   <cmsy10.pfb
-cmsy5     CMSY5    <cmsy5.pfb
-cmsy6     CMSY6    <cmsy6.pfb
-cmsy7     CMSY7    <cmsy7.pfb
-cmsy8     CMSY8    <cmsy8.pfb
-cmsy9     CMSY9    <cmsy9.pfb
-cmtex10   CMTEX10  <cmtex10.pfb
-cmtex8    CMTEX8   <cmtex8.pfb
-cmtex9    CMTEX9   <cmtex9.pfb
-
-% a weird one, not used in context
-
-cmu10     LMRoman10-Italic "-0.25 SlantFont" <cmit.enc <lmri10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/original-public-plr.map b/Master/texmf-dist/fonts/map/dvips/context/original-public-plr.map
deleted file mode 100644
index 4fce40d3fba..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/original-public-plr.map
+++ /dev/null
@@ -1,77 +0,0 @@
-plb10    PLB10     <plrm.enc  <plb10.pfb
-plbsy10  PLBSY10   <plms.enc  <plbsy10.pfb
-plbx5    PLBX5     <plrm.enc  <plbx5.pfb
-plbx6    PLBX6     <plrm.enc  <plbx6.pfb
-plbx7    PLBX7     <plrm.enc  <plbx7.pfb
-plbx8    PLBX8     <plrm.enc  <plbx8.pfb
-plbx9    PLBX9     <plrm.enc  <plbx9.pfb
-plbx10   PLBX10    <plrm.enc  <plbx10.pfb
-plbx12   PLBX12    <plrm.enc  <plbx12.pfb
-plbxsl10 PLBXSL10  <plrm.enc  <plbxsl10.pfb
-plbxti10 PLBXTI10  <plit.enc  <plbxti10.pfb
-plcsc10  PLCSC10   <plsc.enc  <plcsc10.pfb
-pldunh10 PLDUNH10  <plrm.enc  <pldunh10.pfb
-plex9    PLEX9     <plme.enc  <plex9.pfb
-plex10   PLEX10    <plme.enc  <plex10.pfb
-plff10   PLFF10    <plrm.enc  <plff10.pfb
-plfi10   PLFI10    <plit.enc  <plfi10.pfb
-plfib8   PLFIB8    <plrm.enc  <plfib8.pfb
-plinch   PLINCH    <plin.enc  <plinch.pfb
-plitt10  PLITT10   <plitt.enc <plitt10.pfb
-plmi5    PLMI5     <plmi.enc  <plmi5.pfb
-plmi6    PLMI6     <plmi.enc  <plmi6.pfb
-plmi7    PLMI7     <plmi.enc  <plmi7.pfb
-plmi8    PLMI8     <plmi.enc  <plmi8.pfb
-plmi9    PLMI9     <plmi.enc  <plmi9.pfb
-plmi10   PLMI10    <plmi.enc  <plmi10.pfb
-plmi12   PLMI12    <plmi.enc  <plmi12.pfb
-plmib10  PLMIB10   <plmi.enc  <plmib10.pfb
-plr5     PLR5      <plsc.enc  <plr5.pfb
-plr6     PLR6      <plrm.enc  <plr6.pfb
-plr7     PLR7      <plrm.enc  <plr7.pfb
-plr8     PLR8      <plrm.enc  <plr8.pfb
-plr9     PLR9      <plrm.enc  <plr9.pfb
-plr10    PLR10     <plrm.enc  <plr10.pfb
-plr12    PLR12     <plrm.enc  <plr12.pfb
-plr17    PLR17     <plrm.enc  <plr17.pfb
-plsl8    PLSL8     <plrm.enc  <plsl8.pfb
-plsl9    PLSL9     <plrm.enc  <plsl9.pfb
-plsl10   PLSL10    <plrm.enc  <plsl10.pfb
-plsl12   PLSL12    <plrm.enc  <plsl12.pfb
-plsltt10 PLSLTT10  <pltt.enc  <plsltt10.pfb
-plss8    PLSS8     <plrm.enc  <plss8.pfb
-plss9    PLSS9     <plrm.enc  <plss9.pfb
-plss10   PLSS10    <plrm.enc  <plss10.pfb
-plss12   PLSS12    <plrm.enc  <plss12.pfb
-plss17   PLSS17    <plrm.enc  <plss17.pfb
-plssbi10 PLSSBI10  <plrm.enc  <plssbi10.pfb
-plssbx10 PLSSBX10  <plrm.enc  <plssbx10.pfb
-plssdc10 PLSSDC10  <plrm.enc  <plssdc10.pfb
-plssi8   PLSSI8    <plrm.enc  <plssi8.pfb
-plssi9   PLSSI9    <plrm.enc  <plssi9.pfb
-plssi10  PLSSI10   <plrm.enc  <plssi10.pfb
-plssi12  PLSSI12   <plrm.enc  <plssi12.pfb
-plssi17  PLSSI17   <plrm.enc  <plssi17.pfb
-plssq8   PLSSQ8    <plrm.enc  <plssq8.pfb
-plssqi8  PLSSQI8   <plrm.enc  <plssqi8.pfb
-plsy5    PLSY5     <plms.enc  <plsy5.pfb
-plsy6    PLSY6     <plms.enc  <plsy6.pfb
-plsy7    PLSY7     <plms.enc  <plsy7.pfb
-plsy8    PLSY8     <plms.enc  <plsy8.pfb
-plsy9    PLSY9     <plms.enc  <plsy9.pfb
-plsy10   PLSY10    <plms.enc  <plsy10.pfb
-pltcsc10 PLTCSC10  <pltt.enc  <pltcsc10.pfb
-pltex8   PLTEX8    <plte.enc  <pltex8.pfb
-pltex9   PLTEX9    <plte.enc  <pltex9.pfb
-pltex10  PLTEX10   <plte.enc  <pltex10.pfb
-plti7    PLTI7     <plit.enc  <plti7.pfb
-plti8    PLTI8     <plit.enc  <plti8.pfb
-plti9    PLTI9     <plit.enc  <plti9.pfb
-plti10   PLTI10    <plit.enc  <plti10.pfb
-plti12   PLTI12    <plit.enc  <plti12.pfb
-pltt8    PLTT8     <pltt.enc  <pltt8.pfb
-pltt9    PLTT9     <pltt.enc  <pltt9.pfb
-pltt10   PLTT10    <pltt.enc  <pltt10.pfb
-pltt12   PLTT12    <pltt.enc  <pltt12.pfb
-plu10    PLU10     <plit.enc  <plu10.pfb
-plvtt10  PLVTT10   <plrm.enc  <plvtt10.pfb
\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/map/dvips/context/original-public-vnr.map b/Master/texmf-dist/fonts/map/dvips/context/original-public-vnr.map
deleted file mode 100644
index 9b6018de126..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/original-public-vnr.map
+++ /dev/null
@@ -1,59 +0,0 @@
-% this is the original file, i don't want to be surprised by changes,
-% so we copied it; some day soon we will use pdfmapline instead; well
-% we'll use latin modern in the end
-
-vnb10    VNB10    <vnb10.pfb
-vnbx10   VNBX10   <vnbx10.pfb
-vnbx12   VNBX12   <vnbx12.pfb
-vnbx5    VNBX5    <vnbx5.pfb
-vnbx6    VNBX6    <vnbx6.pfb
-vnbx7    VNBX7    <vnbx7.pfb
-vnbx8    VNBX8    <vnbx8.pfb
-vnbx9    VNBX9    <vnbx9.pfb
-vnbxsl10 VNBXSL10 <vnbxsl10.pfb
-vnbxti10 VNBXTI10 <vnbxti10.pfb
-vncsc10  VNCSC10  <vncsc10.pfb
-vndunh10 VNDUNH10 <vndunh10.pfb
-vnff10   VNFF10   <vnff10.pfb
-vnfi10   VNFI10   <vnfi10.pfb
-vnfib8   VNFIB8   <vnfib8.pfb
-vnitt10  VNITT10  <vnitt10.pfb
-vnr10    VNR10    <vnr10.pfb
-vnr12    VNR12    <vnr12.pfb
-vnr17    VNR17    <vnr17.pfb
-vnr5     VNR5     <vnr5.pfb
-vnr6     VNR6     <vnr6.pfb
-vnr7     VNR7     <vnr7.pfb
-vnr8     VNR8     <vnr8.pfb
-vnr9     VNR9     <vnr9.pfb
-vnsl10   VNSL10   <vnsl10.pfb
-vnsl12   VNSL12   <vnsl12.pfb
-vnsl8    VNSL8    <vnsl8.pfb
-vnsl9    VNSL9    <vnsl9.pfb
-vnsltt10 VNSLTT10 <vnsltt10.pfb
-vnss10   VNSS10   <vnss10.pfb
-vnss12   VNSS12   <vnss12.pfb
-vnss17   VNSS17   <vnss17.pfb
-vnss8    VNSS8    <vnss8.pfb
-vnss9    VNSS9    <vnss9.pfb
-vnssbx10 VNSSBX10 <vnssbx10.pfb
-vnssdc10 VNSSDC10 <vnssdc10.pfb
-vnssi10  VNSSI10  <vnssi10.pfb
-vnssi12  VNSSI12  <vnssi12.pfb
-vnssi17  VNSSI17  <vnssi17.pfb
-vnssi8   VNSSI8   <vnssi8.pfb
-vnssi9   VNSSI9   <vnssi9.pfb
-vnssq8   VNSSQ8   <vnssq8.pfb
-vnssqi8  VNSSQI8  <vnssqi8.pfb
-vntcsc10 VNTCSC10 <vntcsc10.pfb
-vnti10   VNTI10   <vnti10.pfb
-vnti12   VNTI12   <vnti12.pfb
-vnti7    VNTI7    <vnti7.pfb
-vnti8    VNTI8    <vnti8.pfb
-vnti9    VNTI9    <vnti9.pfb
-vntt10   VNTT10   <vntt10.pfb
-vntt12   VNTT12   <vntt12.pfb
-vntt8    VNTT8    <vntt8.pfb
-vntt9    VNTT9    <vntt9.pfb
-vnu10    VNU10    <vnu10.pfb
-vnvtt10  VNVTT10  <vnvtt10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/original-vogel-symbol.map b/Master/texmf-dist/fonts/map/dvips/context/original-vogel-symbol.map
deleted file mode 100644
index 601d0317dab..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/original-vogel-symbol.map
+++ /dev/null
@@ -1,2 +0,0 @@
-fmvr8x Marvosym < marvosym.pfb
-
diff --git a/Master/texmf-dist/fonts/map/dvips/context/original-youngryu-px.map b/Master/texmf-dist/fonts/map/dvips/context/original-youngryu-px.map
deleted file mode 100644
index 87c1f48cf71..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/original-youngryu-px.map
+++ /dev/null
@@ -1,50 +0,0 @@
-% This file a (slightly adapted) copy of the map file
-% that comes with the PX fonts by Young Ryu.
-
-% tx8r.enc replaced by 8r.enc
-
-% URW Palatino
-
-rpxpplb  URWPalladioL-Bold                      <8r.enc <uplb8a.pfb
-rpxpplbo URWPalladioL-Bold     ".167 SlantFont" <8r.enc <uplb8a.pfb
-rpxpplbi URWPalladioL-BoldItal                  <8r.enc <uplbi8a.pfb
-rpxpplr  URWPalladioL-Roma                      <8r.enc <uplr8a.pfb
-rpxpplro URWPalladioL-Roma     ".167 SlantFont" <8r.enc <uplr8a.pfb
-rpxpplri URWPalladioL-Ital                      <8r.enc <uplri8a.pfb
-
-% PX Text
-
-rpxr    rpxr                    <rpxr.pfb
-rpxsl   rpxr   ".167 SlantFont" <rpxr.pfb
-rpxi    rpxi                    <rpxi.pfb
-rpxsc   rpxsc                   <rpxsc.pfb
-rpxb    rpxb                    <rpxb.pfb
-rpxbsl  rpxb   ".167 SlantFont" <rpxb.pfb
-rpxbi   rpxbi                   <rpxbi.pfb
-rpxbsc  rpxbsc                  <rpxbsc.pfb
-rpcxb   rpcxb                   <rpcxb.pfb
-rpcxbsl rpcxb  ".167 SlantFont" <rpcxb.pfb
-rpcxbi  rpcxbi                  <rpcxbi.pfb
-rpcxi   rpcxi                   <rpcxi.pfb
-rpcxr   rpcxr                   <rpcxr.pfb
-rpcxsl  rpcxsl ".167 SlantFont" <rpcxr.pfb
-
-% PX Math
-
-rpxbmi  rpxbmi                  <rpxbmi.pfb
-rpxmi   rpxmi                   <rpxmi.pfb
-
-pxbex   pxbex                   <pxbex.pfb
-pxbexa  pxbexa                  <pxbexa.pfb
-pxbmia  pxbmia                  <pxbmia.pfb
-pxbsy   pxbsy                   <pxbsy.pfb
-pxbsya  pxbsya                  <pxbsya.pfb
-pxbsyb  pxbsyb                  <pxbsyb.pfb
-pxbsyc  pxbsyc                  <pxbsyc.pfb
-pxex    pxex                    <pxex.pfb
-pxexa   pxexa                   <pxexa.pfb
-pxmia   pxmia                   <pxmia.pfb
-pxsy    pxsy                    <pxsy.pfb
-pxsya   pxsya                   <pxsya.pfb
-pxsyb   pxsyb                   <pxsyb.pfb
-pxsyc   pxsyc                   <pxsyc.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/original-youngryu-tx.map b/Master/texmf-dist/fonts/map/dvips/context/original-youngryu-tx.map
deleted file mode 100644
index 5618ee8bc16..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/original-youngryu-tx.map
+++ /dev/null
@@ -1,89 +0,0 @@
-% This file is a (slightly adapted) copy of the map file
-% that comes with the TX fonts by Young Ryu.
-
-% tx8r.enc replaced by 8r.enc
-
-% URW times
-
-rtxptmb  NimbusRomNo9L-Medi                      <8r.enc <utmb8a.pfb
-rtxptmbo NimbusRomNo9L-Medi     ".167 SlantFont" <8r.enc <utmb8a.pfb
-rtxptmbi NimbusRomNo9L-MediItal                  <8r.enc <utmbi8a.pfb
-rtxptmr  NimbusRomNo9L-Regu                      <8r.enc <utmr8a.pfb
-rtxptmro NimbusRomNo9L-Regu     ".167 SlantFont" <8r.enc <utmr8a.pfb
-rtxptmri NimbusRomNo9L-ReguItal                  <8r.enc <utmri8a.pfb
-
-% URW Helvetica
-
-rtxphvr  NimbusSanL-Regu                         <8r.enc <uhv8a.pfb
-rtxphvro NimbusSanL-Regu        ".167 SlantFont" <8r.enc <uhv8a.pfb
-rtxphvb  NimbusSanL-Bold                         <8r.enc <uhvb8a.pfb
-rtxphvbo NimbusSanL-Bold        ".167 SlantFont" <8r.enc <uhvb8a.pfb
-
-% TX Text
-
-rtxr     rtxr                      <rtxr.pfb
-rtxsl    rtxr    ".167 SlantFont"  <rtxr.pfb
-rtxi     rtxi                      <rtxi.pfb
-rtxsc    rtxsc                     <rtxsc.pfb
-rtxb     rtxb                      <rtxb.pfb
-rtxbsl   rtxb    ".167 SlantFont"  <rtxb.pfb
-rtxbi    rtxbi                     <rtxbi.pfb
-rtxbsc   rtxbsc                    <rtxbsc.pfb
-rtcxb    rtcxb                     <rtcxb.pfb
-rtcxbsl  rtcxb   ".167 SlantFont"  <rtcxb.pfb
-rtcxbi   rtcxbi                    <rtcxbi.pfb
-rtcxi    rtcxi                     <rtcxi.pfb
-rtcxr    rtcxr                     <rtcxr.pfb
-rtcxsl   rtcx    ".167 SlantFont"  <rtcxr.pfb
-
-% TX Math
-
-rtxbmi   rtxbmi                    <rtxbmi.pfb
-rtxmi    rtxmi                     <rtxmi.pfb
-
-txbex    txbex                     <txbex.pfb
-txbexa   txbexa                    <txbexa.pfb
-txbmia   txbmia                    <txbmia.pfb
-txbsy    txbsy                     <txbsy.pfb
-txbsya   txbsya                    <txbsya.pfb
-txbsyb   txbsyb                    <txbsyb.pfb
-txbsyc   txbsyc                    <txbsyc.pfb
-txex     txex                      <txex.pfb
-txexa    txexa                     <txexa.pfb
-txmia    txmia                     <txmia.pfb
-txsy     txsy                      <txsy.pfb
-txsya    txsya                     <txsya.pfb
-txsyb    txsyb                     <txsyb.pfb
-txsyc    txsyc                     <txsyc.pfb
-
-% TX TT Text
-
-txtt     txtt                      <txtt.pfb
-txttsl   txtt     ".167 SlantFont" <txtt.pfb
-txttsc   txttsc                    <txttsc.pfb
-txbtt    txbtt                     <txbtt.pfb
-txbttsl  txbtt    ".167 SlantFont" <txbtt.pfb
-txbttsc  txbttsc                   <txbttsc.pfb
-t1xtt    t1xtt                     <t1xtt.pfb
-t1xttsl  t1xtt    ".167 SlantFont" <t1xtt.pfb
-t1xttsc  t1xttsc                   <t1xttsc.pfb
-t1xbtt   t1xbtt                    <t1xbtt.pfb
-t1xbttsl t1xbtt   ".167 SlantFont" <t1xbtt.pfb
-t1xbttsc t1xbttsc                  <t1xbttsc.pfb
-tcxtt    tcxtt                     <tcxtt.pfb
-tcxttsl  tcxtt    ".167 SlantFont" <tcxtt.pfb
-tcxbtt   tcxbtt                    <tcxbtt.pfb
-tcxbttsl tcxbtt   ".167 SlantFont" <tcxbtt.pfb
-
-% TX SS Text
-
-rtxss    rtxss                     <rtxss.pfb
-rtxsssl  rtxss    ".167 SlantFont" <rtxss.pfb
-rtxsssc  rtxsssc                   <rtxsssc.pfb
-rtxbss   rtxbss                    <rtxbss.pfb
-rtxbsssl rtxbss   ".167 SlantFont" <rtxbss.pfb
-rtxbsssc rtxbsssc                  <rtxbsssc.pfb
-rtcxss   rtcxss                    <rtcxss.pfb
-rtcxbss  rtcxbss                   <rtcxbss.pfb
-rtcxsssl rtcxss   ".167 SlantFont" <rtcxss.pfb
-rtcxbsso rtcxbss  ".167 SlantFont" <rtcxbss.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/pl0-base.map b/Master/texmf-dist/fonts/map/dvips/context/pl0-base.map
deleted file mode 100644
index 19756645c17..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/pl0-base.map
+++ /dev/null
@@ -1 +0,0 @@
-# not yet defined
diff --git a/Master/texmf-dist/fonts/map/dvips/context/pl0-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/pl0-public-lm.map
deleted file mode 100644
index 427ff877375..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/pl0-public-lm.map
+++ /dev/null
@@ -1,85 +0,0 @@
-% LM replacement, thanks to Jacko
-
-plb10    LMRomanDemi10-Regular        <plrm.enc  <lmb10.pfb
-plbx5    LMRoman5-Bold                <plrm.enc  <lmbx5.pfb
-plbx6    LMRoman6-Bold                <plrm.enc  <lmbx6.pfb
-plbx7    LMRoman7-Bold                <plrm.enc  <lmbx7.pfb
-plbx8    LMRoman8-Bold                <plrm.enc  <lmbx8.pfb
-plbx9    LMRoman9-Bold                <plrm.enc  <lmbx9.pfb
-plbx10   LMRoman10-Bold               <plrm.enc  <lmbx10.pfb
-plbx12   LMRoman12-Bold               <plrm.enc  <lmbx12.pfb
-plbxsl10 LMSlanted10-BoldItalic       <plrm.enc  <lmbxo10.pfb
-plbxti10 LMRoman10-BoldItalic         <plit.enc  <lmbxi10.pfb
-plcsc10  LMCaps10-Regular             <plsc.enc  <lmcsc10.pfb
-plinch   LMSans10-Bold                <plin.enc  <lmssbx10.pfb
-plitt10  LMTypewriter10-Italic        <plitt.enc <lmtti10.pfb
-plr5     LMRoman5-Regular             <plsc.enc  <lmr5.pfb
-plr6     LMRoman6-Regular             <plrm.enc  <lmr6.pfb
-plr7     LMRoman7-Regular             <plrm.enc  <lmr7.pfb
-plr8     LMRoman8-Regular             <plrm.enc  <lmr8.pfb
-plr9     LMRoman9-Regular             <plrm.enc  <lmr9.pfb
-plr10    LMRoman10-Regular            <plrm.enc  <lmr10.pfb
-plr12    LMRoman12-Regular            <plrm.enc  <lmr12.pfb
-plr17    LMRoman17-Regular            <plrm.enc  <lmr17.pfb
-plsl8    LMSlanted8-Italic            <plrm.enc  <lmro8.pfb
-plsl9    LMSlanted9-Italic            <plrm.enc  <lmro9.pfb
-plsl10   LMSlanted10-Italic           <plrm.enc  <lmro10.pfb
-plsl12   LMSlanted12-Italic           <plrm.enc  <lmro12.pfb
-plsltt10 LMTypewriterSlanted10-Italic <pltt.enc  <lmtto10.pfb
-plss8    LMSans8-Regular              <plrm.enc  <lmss8.pfb
-plss9    LMSans9-Regular              <plrm.enc  <lmss9.pfb
-plss10   LMSans10-Regular             <plrm.enc  <lmss10.pfb
-plss12   LMSans12-Regular             <plrm.enc  <lmss12.pfb
-plss17   LMSans17-Regular             <plrm.enc  <lmss17.pfb
-plssbi10 LMSans10-BoldItalic          <plrm.enc  <lmssbo10.pfb
-plssbx10 LMSans10-Bold                <plrm.enc  <lmssbx10.pfb
-plssdc10 LMSansDemiCond10-Regular     <plrm.enc  <lmssdc10.pfb
-plssi8   LMSans8-Italic               <plrm.enc  <lmssi8.pfb
-plssi9   LMSans9-Italic               <plrm.enc  <lmssi9.pfb
-plssi10  LMSans10-Italic              <plrm.enc  <lmssi10.pfb
-plssi12  LMSans12-Italic              <plrm.enc  <lmssi12.pfb
-plssi17  LMSans17-Italic              <plrm.enc  <lmssi17.pfb
-plssq8   LMSansQuotation8-Regular     <plrm.enc  <lmssq8.pfb
-plssqi8  LMSansQuotation8-Italic      <plrm.enc  <lmssqo8.pfb
-pltcsc10 LMTypewriterCaps10-Regular   <pltt.enc  <lmtcsc10.pfb
-plti7    LMRoman7-Italic              <plit.enc  <lmri7.pfb
-plti8    LMRoman8-Italic              <plit.enc  <lmri8.pfb
-plti9    LMRoman9-Italic              <plit.enc  <lmri9.pfb
-plti10   LMRoman10-Italic             <plit.enc  <lmri10.pfb
-plti12   LMRoman12-Italic             <plit.enc  <lmri12.pfb
-pltt8    LMTypewriter8-Regular        <pltt.enc  <lmtt8.pfb
-pltt9    LMTypewriter9-Regular        <pltt.enc  <lmtt9.pfb
-pltt10   LMTypewriter10-Regular       <pltt.enc  <lmtt10.pfb
-pltt12   LMTypewriter12-Regular       <pltt.enc  <lmtt12.pfb
-plvtt10  LMTypewriterVarWd10-Regular  <plrm.enc  <lmvtt10.pfb
-
-% some originals, not used in context
-
-pldunh10 PLDunhill10-Regular          <plrm.enc  <pldunh10.pfb
-plbsy10  PLMathSymbols10-BoldItalic   <plms.enc  <plbsy10.pfb
-plex10   PLMathExtension10-Regular    <plme.enc  <plex10.pfb
-plex9    PLMathExtension9-Regular     <plme.enc  <plex9.pfb
-plff10   PLFunny10-Regular            <plrm.enc  <plff10.pfb
-plfi10   PLFunny10-Italic             <plit.enc  <plfi10.pfb
-plfib8   PLFibonacci8-Regular         <plrm.enc  <plfib8.pfb
-plmi10   PLMathItalic10-Italic        <plmi.enc  <plmi10.pfb
-plmi12   PLMathItalic12-Italic        <plmi.enc  <plmi12.pfb
-plmi5    PLMathItalic5-Italic         <plmi.enc  <plmi5.pfb
-plmi6    PLMathItalic6-Italic         <plmi.enc  <plmi6.pfb
-plmi7    PLMathItalic7-Italic         <plmi.enc  <plmi7.pfb
-plmi8    PLMathItalic8-Italic         <plmi.enc  <plmi8.pfb
-plmi9    PLMathItalic9-Italic         <plmi.enc  <plmi9.pfb
-plmib10  PLMathItalic10-BoldItalic    <plmi.enc  <plmib10.pfb
-plsy10   PLMathSymbols10-Italic       <plms.enc  <plsy10.pfb
-plsy5    PLMathSymbols5-Italic        <plms.enc  <plsy5.pfb
-plsy6    PLMathSymbols6-Italic        <plms.enc  <plsy6.pfb
-plsy7    PLMathSymbols7-Italic        <plms.enc  <plsy7.pfb
-plsy8    PLMathSymbols8-Italic        <plms.enc  <plsy8.pfb
-plsy9    PLMathSymbols9-Italic        <plms.enc  <plsy9.pfb
-pltex10  PLTeXExtended10-Regular      <plte.enc  <pltex10.pfb
-pltex8   PLTeXExtended8-Regular       <plte.enc  <pltex8.pfb
-pltex9   PLTeXExtended9-Regular       <plte.enc  <pltex9.pfb
-
-% a weird one, not used in context
-
-plu10    LMRoman10-Italic "-0.25 SlantFont" <plit.enc <lmri10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/pl0-var-exclusive-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/pl0-var-exclusive-public-lm.map
deleted file mode 100644
index 19756645c17..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/pl0-var-exclusive-public-lm.map
+++ /dev/null
@@ -1 +0,0 @@
-# not yet defined
diff --git a/Master/texmf-dist/fonts/map/dvips/context/qx-base.map b/Master/texmf-dist/fonts/map/dvips/context/qx-base.map
deleted file mode 100644
index 242426bdd79..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/qx-base.map
+++ /dev/null
@@ -1,55 +0,0 @@
-% courier / urw
-
-qcrb  <qcr.enc <qcrb.pfb
-qcrbi <qcr.enc <qcrbi.pfb
-qcrr  <qcr.enc <qcrr.pfb
-qcrri <qcr.enc <qcrri.pfb
-
-% helvetica / urw
-
-qhvb   <qhv.enc <qhvb.pfb
-qhvbi  <qhv.enc <qhvbi.pfb
-qhvcb  <qhv.enc <qhvcb.pfb
-qhvcbi <qhv.enc <qhvcbi.pfb
-qhvcr  <qhv.enc <qhvcr.pfb
-qhvcri <qhv.enc <qhvcri.pfb
-qhvr   <qhv.enc <qhvr.pfb
-qhvri  <qhv.enc <qhvri.pfb
-
-% times / urw
-
-qtmb  <qtm.enc <qtmb.pfb
-qtmbi <qtm.enc <qtmbi.pfb
-qtmr  <qtm.enc <qtmr.pfb
-qtmri <qtm.enc <qtmri.pfb
-
-% palatino / urw
-
-qplb  <qpl.enc <qplb.pfb
-qplbi <qpl.enc <qplbi.pfb
-qplr  <qpl.enc <qplr.pfb
-qplri <qpl.enc <qplri.pfb
-
-% bookman / urw
-
-qbkb  <qbk.enc <qbkb.pfb
-qbkbi <qbk.enc <qbkbi.pfb
-qbkr  <qbk.enc <qbkr.pfb
-qbkri <qbk.enc <qbkri.pfb
-
-% chancery / urw
-
-qzcmi <qzc.enc <qzcmi.pfb
-
-% schoolbook / urw
-%
-% not available
-
-% utopia
-%
-% not available
-
-% charter
-%
-% not available
-
diff --git a/Master/texmf-dist/fonts/map/dvips/context/qx-lm.map b/Master/texmf-dist/fonts/map/dvips/context/qx-lm.map
deleted file mode 100644
index d69d50d936c..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/qx-lm.map
+++ /dev/null
@@ -1,69 +0,0 @@
-qx-lmb10 LMRoman10-Demi "enclmqx ReEncodeFont" <lm-qx.enc <lmb10.pfb
-qx-lmbo10 LMRoman10-DemiOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmbo10.pfb
-qx-lmbx10 LMRoman10-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx10.pfb
-qx-lmbx12 LMRoman12-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx12.pfb
-qx-lmbx5 LMRoman5-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx5.pfb
-qx-lmbx6 LMRoman6-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx6.pfb
-qx-lmbx7 LMRoman7-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx7.pfb
-qx-lmbx8 LMRoman8-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx8.pfb
-qx-lmbx9 LMRoman9-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx9.pfb
-qx-lmbxi10 LMRoman10-BoldItalic "enclmqx ReEncodeFont" <lm-qx.enc <lmbxi10.pfb
-qx-lmbxo10 LMRoman10-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmbxo10.pfb
-qx-lmcsc10 LMRoman10-CapsRegular "enclmqx ReEncodeFont" <lm-qx.enc <lmcsc10.pfb
-qx-lmcsco10 LMRoman10-CapsOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmcsco10.pfb
-qx-lmr10 LMRoman10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr10.pfb
-qx-lmr12 LMRoman12-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr12.pfb
-qx-lmr17 LMRoman17-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr17.pfb
-qx-lmr5 LMRoman5-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr5.pfb
-qx-lmr6 LMRoman6-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr6.pfb
-qx-lmr7 LMRoman7-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr7.pfb
-qx-lmr8 LMRoman8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr8.pfb
-qx-lmr9 LMRoman9-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr9.pfb
-qx-lmri10 LMRoman10-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri10.pfb
-qx-lmri12 LMRoman12-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri12.pfb
-qx-lmri7 LMRoman7-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri7.pfb
-qx-lmri8 LMRoman8-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri8.pfb
-qx-lmri9 LMRoman9-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri9.pfb
-qx-lmro10 LMRoman10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro10.pfb
-qx-lmro12 LMRoman12-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro12.pfb
-qx-lmro17 LMRoman17-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro17.pfb
-qx-lmro8 LMRoman8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro8.pfb
-qx-lmro9 LMRoman9-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro9.pfb
-qx-lmss10 LMSans10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss10.pfb
-qx-lmss12 LMSans12-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss12.pfb
-qx-lmss17 LMSans17-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss17.pfb
-qx-lmss8 LMSans8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss8.pfb
-qx-lmss9 LMSans9-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss9.pfb
-qx-lmssbo10 LMSans10-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssbo10.pfb
-qx-lmssbx10 LMSans10-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmssbx10.pfb
-qx-lmssdc10 LMSans10-DemiCondensed "enclmqx ReEncodeFont" <lm-qx.enc <lmssdc10.pfb
-qx-lmssdo10 LMSans10-DemiCondensedOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssdo10.pfb
-qx-lmsso10 LMSans10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso10.pfb
-qx-lmsso12 LMSans12-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso12.pfb
-qx-lmsso17 LMSans17-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso17.pfb
-qx-lmsso8 LMSans8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso8.pfb
-qx-lmsso9 LMSans9-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso9.pfb
-qx-lmssq8 LMSansQuotation8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmssq8.pfb
-qx-lmssqbo8 LMSansQuotation8-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssqbo8.pfb
-qx-lmssqbx8 LMSansQuotation8-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmssqbx8.pfb
-qx-lmssqo8 LMSansQuotation8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssqo8.pfb
-qx-lmtcsc10 LMTypewriter10-CapsRegular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtcsc10.pfb
-qx-lmtcso10 LMTypewriter10-CapsOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtcso10.pfb
-qx-lmtl10 LMTypewriter10-Light "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtl10.pfb
-qx-lmtlo10 LMTypewriter10-LightOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlo10.pfb
-qx-lmtlc10 LMTypewriter10-LightCondensed "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlc10.pfb
-qx-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlco10.pfb
-qx-lmtk10 LMTypewriter10-Dark "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtk10.pfb
-qx-lmtko10 LMTypewriter10-DarkOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtko10.pfb
-qx-lmtt10 LMTypewriter10-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt10.pfb
-qx-lmtt12 LMTypewriter12-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt12.pfb
-qx-lmtt8 LMTypewriter8-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt8.pfb
-qx-lmtt9 LMTypewriter9-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt9.pfb
-qx-lmtti10 LMTypewriter10-Italic "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtti10.pfb
-qx-lmtto10 LMTypewriter10-Oblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtto10.pfb
-qx-lmvtt10 LMTypewriterVarWd10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmvtt10.pfb
-qx-lmvtto10 LMTypewriterVarWd10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtto10.pfb
-qx-lmvtl10 LMTypewriterVarWd10-Light "enclmqx ReEncodeFont" <lm-qx.enc <lmvtl10.pfb
-qx-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtlo10.pfb
-qx-lmvtk10 LMTypewriterVarWd10-Dark "enclmqx ReEncodeFont" <lm-qx.enc <lmvtk10.pfb
-qx-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtko10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/qx-os-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/qx-os-public-lm.map
deleted file mode 100644
index 57ddc0ebfc1..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/qx-os-public-lm.map
+++ /dev/null
@@ -1,69 +0,0 @@
-qx-lmb10 LMRoman10-Demi "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmb10.pfb
-qx-lmbo10 LMRoman10-DemiOblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbo10.pfb
-qx-lmbx10 LMRoman10-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbx10.pfb
-qx-lmbx12 LMRoman12-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbx12.pfb
-qx-lmbx5 LMRoman5-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbx5.pfb
-qx-lmbx6 LMRoman6-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbx6.pfb
-qx-lmbx7 LMRoman7-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbx7.pfb
-qx-lmbx8 LMRoman8-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbx8.pfb
-qx-lmbx9 LMRoman9-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbx9.pfb
-qx-lmbxi10 LMRoman10-BoldItalic "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbxi10.pfb
-qx-lmbxo10 LMRoman10-BoldOblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbxo10.pfb
-qx-lmcsc10 LMRoman10-CapsRegular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmcsc10.pfb
-qx-lmcsco10 LMRoman10-CapsOblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmcsco10.pfb
-qx-lmr10 LMRoman10-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmr10.pfb
-qx-lmr12 LMRoman12-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmr12.pfb
-qx-lmr17 LMRoman17-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmr17.pfb
-qx-lmr5 LMRoman5-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmr5.pfb
-qx-lmr6 LMRoman6-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmr6.pfb
-qx-lmr7 LMRoman7-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmr7.pfb
-qx-lmr8 LMRoman8-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmr8.pfb
-qx-lmr9 LMRoman9-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmr9.pfb
-qx-lmri10 LMRoman10-Italic "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmri10.pfb
-qx-lmri12 LMRoman12-Italic "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmri12.pfb
-qx-lmri7 LMRoman7-Italic "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmri7.pfb
-qx-lmri8 LMRoman8-Italic "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmri8.pfb
-qx-lmri9 LMRoman9-Italic "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmri9.pfb
-qx-lmro10 LMRoman10-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmro10.pfb
-qx-lmro12 LMRoman12-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmro12.pfb
-qx-lmro17 LMRoman17-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmro17.pfb
-qx-lmro8 LMRoman8-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmro8.pfb
-qx-lmro9 LMRoman9-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmro9.pfb
-qx-lmss10 LMSans10-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmss10.pfb
-qx-lmss12 LMSans12-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmss12.pfb
-qx-lmss17 LMSans17-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmss17.pfb
-qx-lmss8 LMSans8-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmss8.pfb
-qx-lmss9 LMSans9-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmss9.pfb
-qx-lmssbo10 LMSans10-BoldOblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmssbo10.pfb
-qx-lmssbx10 LMSans10-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmssbx10.pfb
-qx-lmssdc10 LMSans10-DemiCondensed "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmssdc10.pfb
-qx-lmssdo10 LMSans10-DemiCondensedOblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmssdo10.pfb
-qx-lmsso10 LMSans10-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmsso10.pfb
-qx-lmsso12 LMSans12-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmsso12.pfb
-qx-lmsso17 LMSans17-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmsso17.pfb
-qx-lmsso8 LMSans8-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmsso8.pfb
-qx-lmsso9 LMSans9-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmsso9.pfb
-qx-lmssq8 LMSansQuotation8-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmssq8.pfb
-qx-lmssqbo8 LMSansQuotation8-BoldOblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmssqbo8.pfb
-qx-lmssqbx8 LMSansQuotation8-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmssqbx8.pfb
-qx-lmssqo8 LMSansQuotation8-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmssqo8.pfb
-qx-lmtcsc10 LMTypewriter10-CapsRegular "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtcsc10.pfb
-qx-lmtcso10 LMTypewriter10-CapsOblique "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtcso10.pfb
-qx-lmtl10 LMTypewriter10-Light "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtl10.pfb
-qx-lmtlo10 LMTypewriter10-LightOblique "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtlo10.pfb
-qx-lmtlc10 LMTypewriter10-LightCondensed "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtlc10.pfb
-qx-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtlco10.pfb
-qx-lmtk10 LMTypewriter10-Dark "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtk10.pfb
-qx-lmtko10 LMTypewriter10-DarkOblique "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtko10.pfb
-qx-lmtt10 LMTypewriter10-Regular "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtt10.pfb
-qx-lmtt12 LMTypewriter12-Regular "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtt12.pfb
-qx-lmtt8 LMTypewriter8-Regular "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtt8.pfb
-qx-lmtt9 LMTypewriter9-Regular "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtt9.pfb
-qx-lmtti10 LMTypewriter10-Italic "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtti10.pfb
-qx-lmtto10 LMTypewriter10-Oblique "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtto10.pfb
-qx-lmvtt10 LMTypewriterVarWd10-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmvtt10.pfb
-qx-lmvtto10 LMTypewriterVarWd10-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmvtto10.pfb
-qx-lmvtl10 LMTypewriterVarWd10-Light "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmvtl10.pfb
-qx-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmvtlo10.pfb
-qx-lmvtk10 LMTypewriterVarWd10-Dark "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmvtk10.pfb
-qx-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmvtko10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/qx-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/qx-public-lm.map
deleted file mode 100644
index d69d50d936c..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/qx-public-lm.map
+++ /dev/null
@@ -1,69 +0,0 @@
-qx-lmb10 LMRoman10-Demi "enclmqx ReEncodeFont" <lm-qx.enc <lmb10.pfb
-qx-lmbo10 LMRoman10-DemiOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmbo10.pfb
-qx-lmbx10 LMRoman10-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx10.pfb
-qx-lmbx12 LMRoman12-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx12.pfb
-qx-lmbx5 LMRoman5-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx5.pfb
-qx-lmbx6 LMRoman6-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx6.pfb
-qx-lmbx7 LMRoman7-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx7.pfb
-qx-lmbx8 LMRoman8-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx8.pfb
-qx-lmbx9 LMRoman9-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx9.pfb
-qx-lmbxi10 LMRoman10-BoldItalic "enclmqx ReEncodeFont" <lm-qx.enc <lmbxi10.pfb
-qx-lmbxo10 LMRoman10-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmbxo10.pfb
-qx-lmcsc10 LMRoman10-CapsRegular "enclmqx ReEncodeFont" <lm-qx.enc <lmcsc10.pfb
-qx-lmcsco10 LMRoman10-CapsOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmcsco10.pfb
-qx-lmr10 LMRoman10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr10.pfb
-qx-lmr12 LMRoman12-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr12.pfb
-qx-lmr17 LMRoman17-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr17.pfb
-qx-lmr5 LMRoman5-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr5.pfb
-qx-lmr6 LMRoman6-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr6.pfb
-qx-lmr7 LMRoman7-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr7.pfb
-qx-lmr8 LMRoman8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr8.pfb
-qx-lmr9 LMRoman9-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr9.pfb
-qx-lmri10 LMRoman10-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri10.pfb
-qx-lmri12 LMRoman12-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri12.pfb
-qx-lmri7 LMRoman7-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri7.pfb
-qx-lmri8 LMRoman8-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri8.pfb
-qx-lmri9 LMRoman9-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri9.pfb
-qx-lmro10 LMRoman10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro10.pfb
-qx-lmro12 LMRoman12-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro12.pfb
-qx-lmro17 LMRoman17-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro17.pfb
-qx-lmro8 LMRoman8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro8.pfb
-qx-lmro9 LMRoman9-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro9.pfb
-qx-lmss10 LMSans10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss10.pfb
-qx-lmss12 LMSans12-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss12.pfb
-qx-lmss17 LMSans17-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss17.pfb
-qx-lmss8 LMSans8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss8.pfb
-qx-lmss9 LMSans9-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss9.pfb
-qx-lmssbo10 LMSans10-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssbo10.pfb
-qx-lmssbx10 LMSans10-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmssbx10.pfb
-qx-lmssdc10 LMSans10-DemiCondensed "enclmqx ReEncodeFont" <lm-qx.enc <lmssdc10.pfb
-qx-lmssdo10 LMSans10-DemiCondensedOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssdo10.pfb
-qx-lmsso10 LMSans10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso10.pfb
-qx-lmsso12 LMSans12-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso12.pfb
-qx-lmsso17 LMSans17-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso17.pfb
-qx-lmsso8 LMSans8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso8.pfb
-qx-lmsso9 LMSans9-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso9.pfb
-qx-lmssq8 LMSansQuotation8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmssq8.pfb
-qx-lmssqbo8 LMSansQuotation8-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssqbo8.pfb
-qx-lmssqbx8 LMSansQuotation8-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmssqbx8.pfb
-qx-lmssqo8 LMSansQuotation8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssqo8.pfb
-qx-lmtcsc10 LMTypewriter10-CapsRegular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtcsc10.pfb
-qx-lmtcso10 LMTypewriter10-CapsOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtcso10.pfb
-qx-lmtl10 LMTypewriter10-Light "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtl10.pfb
-qx-lmtlo10 LMTypewriter10-LightOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlo10.pfb
-qx-lmtlc10 LMTypewriter10-LightCondensed "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlc10.pfb
-qx-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlco10.pfb
-qx-lmtk10 LMTypewriter10-Dark "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtk10.pfb
-qx-lmtko10 LMTypewriter10-DarkOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtko10.pfb
-qx-lmtt10 LMTypewriter10-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt10.pfb
-qx-lmtt12 LMTypewriter12-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt12.pfb
-qx-lmtt8 LMTypewriter8-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt8.pfb
-qx-lmtt9 LMTypewriter9-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt9.pfb
-qx-lmtti10 LMTypewriter10-Italic "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtti10.pfb
-qx-lmtto10 LMTypewriter10-Oblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtto10.pfb
-qx-lmvtt10 LMTypewriterVarWd10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmvtt10.pfb
-qx-lmvtto10 LMTypewriterVarWd10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtto10.pfb
-qx-lmvtl10 LMTypewriterVarWd10-Light "enclmqx ReEncodeFont" <lm-qx.enc <lmvtl10.pfb
-qx-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtlo10.pfb
-qx-lmvtk10 LMTypewriterVarWd10-Dark "enclmqx ReEncodeFont" <lm-qx.enc <lmvtk10.pfb
-qx-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtko10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/qx-var-exclusive-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/qx-var-exclusive-public-lm.map
deleted file mode 100644
index 19756645c17..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/qx-var-exclusive-public-lm.map
+++ /dev/null
@@ -1 +0,0 @@
-# not yet defined
diff --git a/Master/texmf-dist/fonts/map/dvips/context/t5-base.map b/Master/texmf-dist/fonts/map/dvips/context/t5-base.map
deleted file mode 100644
index da05cafebb2..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/t5-base.map
+++ /dev/null
@@ -1,72 +0,0 @@
-% courier / urw
-
-ucrr8v  VnNimbusMonL-Regu                          "T5Encoding ReEncodeFont" <t5.enc <ucrr8v.pfb
-ucrro8v VnNimbusMonL-ReguObli                      "T5Encoding ReEncodeFont" <t5.enc <ucrro8v.pfb
-ucrb8v  VnNimbusMonL-Bold                          "T5Encoding ReEncodeFont" <t5.enc <ucrb8v.pfb
-ucrbo8v VnNimbusMonL-BoldObli                      "T5Encoding ReEncodeFont" <t5.enc <ucrbo8v.pfb
-
-% helvetica / urw
-
-uhvr8v  VnNimbusSanL-Regu                          "T5Encoding ReEncodeFont" <t5.enc <uhvr8v.pfb
-uhvro8v VnNimbusSanL-ReguItal                      "T5Encoding ReEncodeFont" <t5.enc <uhvro8v.pfb
-uhvb8v  VnNimbusSanL-Bold                          "T5Encoding ReEncodeFont" <t5.enc <uhvb8v.pfb
-uhvbo8v VnNimbusSanL-BoldItal                      "T5Encoding ReEncodeFont" <t5.enc <uhvbo8v.pfb
-
-% times / urw
-
-utmr8v  VnNimbusRomNo9L-Regu                       "T5Encoding ReEncodeFont" <t5.enc <utmr8v.pfb
-utmri8v VnNimbusRomNo9L-ReguItal                   "T5Encoding ReEncodeFont" <t5.enc <utmri8v.pfb
-utmb8v  VnNimbusRomNo9L-Medi                       "T5Encoding ReEncodeFont" <t5.enc <utmb8v.pfb
-utmbi8v VnNimbusRomNo9L-MediItal                   "T5Encoding ReEncodeFont" <t5.enc <utmbi8v.pfb
-
-utmro8v VnNimbusRomNo9L-Regu       "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <utmr8v.pfb
-utmbo8v VnNimbusRomNo9L-Medi       "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <utmb8v.pfb
-
-% palatino / urw
-
-uplr8v  VnURWPalladioL-Roma                        "T5Encoding ReEncodeFont" <t5.enc <uplr8v.pfb
-uplri8v VnURWPalladioL-Ital                        "T5Encoding ReEncodeFont" <t5.enc <uplri8v.pfb
-uplb8v  VnURWPalladioL-Bold                        "T5Encoding ReEncodeFont" <t5.enc <uplb8v.pfb
-uplbi8v VnURWPalladioL-BoldItal                    "T5Encoding ReEncodeFont" <t5.enc <uplbi8v.pfb
-
-uplro8v VnURWPalladioL-Roma        "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <uplr8v.pfb
-uplbo8v VnURWPalladioL-Bold        "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <uplb8v.pfb
-
-% bookman / urw
-
-ubkl8v  VnURWBookmanL-Ligh                         "T5Encoding ReEncodeFont" <t5.enc <ubkl8v.pfb
-ubkli8v VnURWBookmanL-LighItal                     "T5Encoding ReEncodeFont" <t5.enc <ubkli8v.pfb
-ubkd8v  VnURWBookmanL-DemiBold                     "T5Encoding ReEncodeFont" <t5.enc <ubkd8v.pfb
-ubkdi8v VnURWBookmanL-DemiBoldItal                 "T5Encoding ReEncodeFont" <t5.enc <ubkdi8v.pfb
-
-ubklo8v VnURWBookmanL-Ligh         "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <ubkl8v.pfb
-ubkdo8v VnURWBookmanL-DemiBold     "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <ubkd8v.pfb
-
-% chancery / urw
-
-% not supported
-%
-% schoolbook / urw
-
-uncr8v  VnCenturySchL-Roma                         "T5Encoding ReEncodeFont" <t5.enc <uncr8v.pfb
-uncri8v VnCenturySchL-Ital                         "T5Encoding ReEncodeFont" <t5.enc <uncri8v.pfb
-uncb8v  VnCenturySchL-Bold                         "T5Encoding ReEncodeFont" <t5.enc <uncb8v.pfb
-uncbi8v VnCenturySchL-BoldItal                     "T5Encoding ReEncodeFont" <t5.enc <uncbi8v.pfb
-
-uncro8v VnCenturySchL-Roma         "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <uncr8v.pfb
-uncbo8v VnCenturySchL-Bold         "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <uncb8v.pfb
-
-% utopia
-%
-% not supported
-
-% charter
-%
-% not supported
-
-% gothic / urw
-
-uagk8v  VnURWGothicL-Book                          "T5Encoding ReEncodeFont" <t5.enc <uagk8v.pfb
-uagko8v VnURWGothicL-BookObli                      "T5Encoding ReEncodeFont" <t5.enc <uagko8v.pfb
-uagd8v  VnURWGothicL-Demi                          "T5Encoding ReEncodeFont" <t5.enc <uagd8v.pfb
-uagdo8v VnURWGothicL-DemiObli                      "T5Encoding ReEncodeFont" <t5.enc <uagdo8v.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/t5-lm.map b/Master/texmf-dist/fonts/map/dvips/context/t5-lm.map
deleted file mode 100644
index 0e626d7e424..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/t5-lm.map
+++ /dev/null
@@ -1,69 +0,0 @@
-t5-lmb10 LMRoman10-Demi "enclmt5 ReEncodeFont" <lm-t5.enc <lmb10.pfb
-t5-lmbo10 LMRoman10-DemiOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmbo10.pfb
-t5-lmbx10 LMRoman10-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx10.pfb
-t5-lmbx12 LMRoman12-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx12.pfb
-t5-lmbx5 LMRoman5-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx5.pfb
-t5-lmbx6 LMRoman6-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx6.pfb
-t5-lmbx7 LMRoman7-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx7.pfb
-t5-lmbx8 LMRoman8-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx8.pfb
-t5-lmbx9 LMRoman9-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx9.pfb
-t5-lmbxi10 LMRoman10-BoldItalic "enclmt5 ReEncodeFont" <lm-t5.enc <lmbxi10.pfb
-t5-lmbxo10 LMRoman10-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmbxo10.pfb
-t5-lmcsc10 LMRoman10-CapsRegular "enclmt5 ReEncodeFont" <lm-t5.enc <lmcsc10.pfb
-t5-lmcsco10 LMRoman10-CapsOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmcsco10.pfb
-t5-lmr10 LMRoman10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr10.pfb
-t5-lmr12 LMRoman12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr12.pfb
-t5-lmr17 LMRoman17-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr17.pfb
-t5-lmr5 LMRoman5-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr5.pfb
-t5-lmr6 LMRoman6-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr6.pfb
-t5-lmr7 LMRoman7-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr7.pfb
-t5-lmr8 LMRoman8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr8.pfb
-t5-lmr9 LMRoman9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr9.pfb
-t5-lmri10 LMRoman10-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri10.pfb
-t5-lmri12 LMRoman12-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri12.pfb
-t5-lmri7 LMRoman7-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri7.pfb
-t5-lmri8 LMRoman8-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri8.pfb
-t5-lmri9 LMRoman9-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri9.pfb
-t5-lmro10 LMRoman10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro10.pfb
-t5-lmro12 LMRoman12-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro12.pfb
-t5-lmro17 LMRoman17-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro17.pfb
-t5-lmro8 LMRoman8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro8.pfb
-t5-lmro9 LMRoman9-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro9.pfb
-t5-lmss10 LMSans10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss10.pfb
-t5-lmss12 LMSans12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss12.pfb
-t5-lmss17 LMSans17-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss17.pfb
-t5-lmss8 LMSans8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss8.pfb
-t5-lmss9 LMSans9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss9.pfb
-t5-lmssbo10 LMSans10-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssbo10.pfb
-t5-lmssbx10 LMSans10-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmssbx10.pfb
-t5-lmssdc10 LMSans10-DemiCondensed "enclmt5 ReEncodeFont" <lm-t5.enc <lmssdc10.pfb
-t5-lmssdo10 LMSans10-DemiCondensedOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssdo10.pfb
-t5-lmsso10 LMSans10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso10.pfb
-t5-lmsso12 LMSans12-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso12.pfb
-t5-lmsso17 LMSans17-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso17.pfb
-t5-lmsso8 LMSans8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso8.pfb
-t5-lmsso9 LMSans9-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso9.pfb
-t5-lmssq8 LMSansQuotation8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmssq8.pfb
-t5-lmssqbo8 LMSansQuotation8-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqbo8.pfb
-t5-lmssqbx8 LMSansQuotation8-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqbx8.pfb
-t5-lmssqo8 LMSansQuotation8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqo8.pfb
-t5-lmtcsc10 LMTypewriter10-CapsRegular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtcsc10.pfb
-t5-lmtcso10 LMTypewriter10-CapsOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtcso10.pfb
-t5-lmtl10 LMTypewriter10-Light "enclmt5 ReEncodeFont" <lm-t5.enc <lmtl10.pfb
-t5-lmtlo10 LMTypewriter10-LightOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlo10.pfb
-t5-lmtlc10 LMTypewriter10-LightCondensed "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlc10.pfb
-t5-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlco10.pfb
-t5-lmtk10 LMTypewriter10-Dark "enclmt5 ReEncodeFont" <lm-t5.enc <lmtk10.pfb
-t5-lmtko10 LMTypewriter10-DarkOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtko10.pfb
-t5-lmtt10 LMTypewriter10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt10.pfb
-t5-lmtt12 LMTypewriter12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt12.pfb
-t5-lmtt8 LMTypewriter8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt8.pfb
-t5-lmtt9 LMTypewriter9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt9.pfb
-t5-lmtti10 LMTypewriter10-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmtti10.pfb
-t5-lmtto10 LMTypewriter10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtto10.pfb
-t5-lmvtt10 LMTypewriterVarWd10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtt10.pfb
-t5-lmvtto10 LMTypewriterVarWd10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtto10.pfb
-t5-lmvtl10 LMTypewriterVarWd10-Light "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtl10.pfb
-t5-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtlo10.pfb
-t5-lmvtk10 LMTypewriterVarWd10-Dark "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtk10.pfb
-t5-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtko10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/t5-os-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/t5-os-public-lm.map
deleted file mode 100644
index c9e3c4dcb8f..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/t5-os-public-lm.map
+++ /dev/null
@@ -1,69 +0,0 @@
-t5-lmb10 LMRoman10-Demi "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmb10.pfb
-t5-lmbo10 LMRoman10-DemiOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbo10.pfb
-t5-lmbx10 LMRoman10-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbx10.pfb
-t5-lmbx12 LMRoman12-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbx12.pfb
-t5-lmbx5 LMRoman5-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbx5.pfb
-t5-lmbx6 LMRoman6-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbx6.pfb
-t5-lmbx7 LMRoman7-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbx7.pfb
-t5-lmbx8 LMRoman8-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbx8.pfb
-t5-lmbx9 LMRoman9-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbx9.pfb
-t5-lmbxi10 LMRoman10-BoldItalic "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbxi10.pfb
-t5-lmbxo10 LMRoman10-BoldOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbxo10.pfb
-t5-lmcsc10 LMRoman10-CapsRegular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmcsc10.pfb
-t5-lmcsco10 LMRoman10-CapsOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmcsco10.pfb
-t5-lmr10 LMRoman10-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmr10.pfb
-t5-lmr12 LMRoman12-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmr12.pfb
-t5-lmr17 LMRoman17-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmr17.pfb
-t5-lmr5 LMRoman5-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmr5.pfb
-t5-lmr6 LMRoman6-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmr6.pfb
-t5-lmr7 LMRoman7-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmr7.pfb
-t5-lmr8 LMRoman8-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmr8.pfb
-t5-lmr9 LMRoman9-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmr9.pfb
-t5-lmri10 LMRoman10-Italic "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmri10.pfb
-t5-lmri12 LMRoman12-Italic "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmri12.pfb
-t5-lmri7 LMRoman7-Italic "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmri7.pfb
-t5-lmri8 LMRoman8-Italic "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmri8.pfb
-t5-lmri9 LMRoman9-Italic "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmri9.pfb
-t5-lmro10 LMRoman10-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmro10.pfb
-t5-lmro12 LMRoman12-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmro12.pfb
-t5-lmro17 LMRoman17-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmro17.pfb
-t5-lmro8 LMRoman8-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmro8.pfb
-t5-lmro9 LMRoman9-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmro9.pfb
-t5-lmss10 LMSans10-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmss10.pfb
-t5-lmss12 LMSans12-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmss12.pfb
-t5-lmss17 LMSans17-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmss17.pfb
-t5-lmss8 LMSans8-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmss8.pfb
-t5-lmss9 LMSans9-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmss9.pfb
-t5-lmssbo10 LMSans10-BoldOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmssbo10.pfb
-t5-lmssbx10 LMSans10-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmssbx10.pfb
-t5-lmssdc10 LMSans10-DemiCondensed "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmssdc10.pfb
-t5-lmssdo10 LMSans10-DemiCondensedOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmssdo10.pfb
-t5-lmsso10 LMSans10-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmsso10.pfb
-t5-lmsso12 LMSans12-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmsso12.pfb
-t5-lmsso17 LMSans17-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmsso17.pfb
-t5-lmsso8 LMSans8-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmsso8.pfb
-t5-lmsso9 LMSans9-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmsso9.pfb
-t5-lmssq8 LMSansQuotation8-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmssq8.pfb
-t5-lmssqbo8 LMSansQuotation8-BoldOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmssqbo8.pfb
-t5-lmssqbx8 LMSansQuotation8-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmssqbx8.pfb
-t5-lmssqo8 LMSansQuotation8-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmssqo8.pfb
-t5-lmtcsc10 LMTypewriter10-CapsRegular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtcsc10.pfb
-t5-lmtcso10 LMTypewriter10-CapsOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtcso10.pfb
-t5-lmtl10 LMTypewriter10-Light "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtl10.pfb
-t5-lmtlo10 LMTypewriter10-LightOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtlo10.pfb
-t5-lmtlc10 LMTypewriter10-LightCondensed "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtlc10.pfb
-t5-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtlco10.pfb
-t5-lmtk10 LMTypewriter10-Dark "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtk10.pfb
-t5-lmtko10 LMTypewriter10-DarkOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtko10.pfb
-t5-lmtt10 LMTypewriter10-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtt10.pfb
-t5-lmtt12 LMTypewriter12-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtt12.pfb
-t5-lmtt8 LMTypewriter8-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtt8.pfb
-t5-lmtt9 LMTypewriter9-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtt9.pfb
-t5-lmtti10 LMTypewriter10-Italic "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtti10.pfb
-t5-lmtto10 LMTypewriter10-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtto10.pfb
-t5-lmvtt10 LMTypewriterVarWd10-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmvtt10.pfb
-t5-lmvtto10 LMTypewriterVarWd10-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmvtto10.pfb
-t5-lmvtl10 LMTypewriterVarWd10-Light "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmvtl10.pfb
-t5-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmvtlo10.pfb
-t5-lmvtk10 LMTypewriterVarWd10-Dark "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmvtk10.pfb
-t5-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmvtko10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/t5-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/t5-public-lm.map
deleted file mode 100644
index 0e626d7e424..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/t5-public-lm.map
+++ /dev/null
@@ -1,69 +0,0 @@
-t5-lmb10 LMRoman10-Demi "enclmt5 ReEncodeFont" <lm-t5.enc <lmb10.pfb
-t5-lmbo10 LMRoman10-DemiOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmbo10.pfb
-t5-lmbx10 LMRoman10-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx10.pfb
-t5-lmbx12 LMRoman12-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx12.pfb
-t5-lmbx5 LMRoman5-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx5.pfb
-t5-lmbx6 LMRoman6-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx6.pfb
-t5-lmbx7 LMRoman7-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx7.pfb
-t5-lmbx8 LMRoman8-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx8.pfb
-t5-lmbx9 LMRoman9-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx9.pfb
-t5-lmbxi10 LMRoman10-BoldItalic "enclmt5 ReEncodeFont" <lm-t5.enc <lmbxi10.pfb
-t5-lmbxo10 LMRoman10-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmbxo10.pfb
-t5-lmcsc10 LMRoman10-CapsRegular "enclmt5 ReEncodeFont" <lm-t5.enc <lmcsc10.pfb
-t5-lmcsco10 LMRoman10-CapsOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmcsco10.pfb
-t5-lmr10 LMRoman10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr10.pfb
-t5-lmr12 LMRoman12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr12.pfb
-t5-lmr17 LMRoman17-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr17.pfb
-t5-lmr5 LMRoman5-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr5.pfb
-t5-lmr6 LMRoman6-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr6.pfb
-t5-lmr7 LMRoman7-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr7.pfb
-t5-lmr8 LMRoman8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr8.pfb
-t5-lmr9 LMRoman9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr9.pfb
-t5-lmri10 LMRoman10-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri10.pfb
-t5-lmri12 LMRoman12-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri12.pfb
-t5-lmri7 LMRoman7-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri7.pfb
-t5-lmri8 LMRoman8-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri8.pfb
-t5-lmri9 LMRoman9-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri9.pfb
-t5-lmro10 LMRoman10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro10.pfb
-t5-lmro12 LMRoman12-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro12.pfb
-t5-lmro17 LMRoman17-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro17.pfb
-t5-lmro8 LMRoman8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro8.pfb
-t5-lmro9 LMRoman9-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro9.pfb
-t5-lmss10 LMSans10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss10.pfb
-t5-lmss12 LMSans12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss12.pfb
-t5-lmss17 LMSans17-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss17.pfb
-t5-lmss8 LMSans8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss8.pfb
-t5-lmss9 LMSans9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss9.pfb
-t5-lmssbo10 LMSans10-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssbo10.pfb
-t5-lmssbx10 LMSans10-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmssbx10.pfb
-t5-lmssdc10 LMSans10-DemiCondensed "enclmt5 ReEncodeFont" <lm-t5.enc <lmssdc10.pfb
-t5-lmssdo10 LMSans10-DemiCondensedOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssdo10.pfb
-t5-lmsso10 LMSans10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso10.pfb
-t5-lmsso12 LMSans12-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso12.pfb
-t5-lmsso17 LMSans17-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso17.pfb
-t5-lmsso8 LMSans8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso8.pfb
-t5-lmsso9 LMSans9-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso9.pfb
-t5-lmssq8 LMSansQuotation8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmssq8.pfb
-t5-lmssqbo8 LMSansQuotation8-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqbo8.pfb
-t5-lmssqbx8 LMSansQuotation8-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqbx8.pfb
-t5-lmssqo8 LMSansQuotation8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqo8.pfb
-t5-lmtcsc10 LMTypewriter10-CapsRegular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtcsc10.pfb
-t5-lmtcso10 LMTypewriter10-CapsOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtcso10.pfb
-t5-lmtl10 LMTypewriter10-Light "enclmt5 ReEncodeFont" <lm-t5.enc <lmtl10.pfb
-t5-lmtlo10 LMTypewriter10-LightOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlo10.pfb
-t5-lmtlc10 LMTypewriter10-LightCondensed "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlc10.pfb
-t5-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlco10.pfb
-t5-lmtk10 LMTypewriter10-Dark "enclmt5 ReEncodeFont" <lm-t5.enc <lmtk10.pfb
-t5-lmtko10 LMTypewriter10-DarkOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtko10.pfb
-t5-lmtt10 LMTypewriter10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt10.pfb
-t5-lmtt12 LMTypewriter12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt12.pfb
-t5-lmtt8 LMTypewriter8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt8.pfb
-t5-lmtt9 LMTypewriter9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt9.pfb
-t5-lmtti10 LMTypewriter10-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmtti10.pfb
-t5-lmtto10 LMTypewriter10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtto10.pfb
-t5-lmvtt10 LMTypewriterVarWd10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtt10.pfb
-t5-lmvtto10 LMTypewriterVarWd10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtto10.pfb
-t5-lmvtl10 LMTypewriterVarWd10-Light "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtl10.pfb
-t5-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtlo10.pfb
-t5-lmvtk10 LMTypewriterVarWd10-Dark "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtk10.pfb
-t5-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtko10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/t5-var-exclusive-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/t5-var-exclusive-public-lm.map
deleted file mode 100644
index 19756645c17..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/t5-var-exclusive-public-lm.map
+++ /dev/null
@@ -1 +0,0 @@
-# not yet defined
diff --git a/Master/texmf-dist/fonts/map/dvips/context/texnansi-base.map b/Master/texmf-dist/fonts/map/dvips/context/texnansi-base.map
deleted file mode 100644
index 3078a1d1f9b..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/texnansi-base.map
+++ /dev/null
@@ -1,142 +0,0 @@
-% author: Hans Hagen
-%
-% This map file defines the texnansi alternatives of the public fonts,
-% beware, these are seldom present on your system. If you really want
-% to use these fonts, uncomment the relevant lines. If no fonts are
-% present, pdftex may get confused.
-
-% courier / urw
-
-% ucrb8y  NimbusMonL-Bold          <texnansi.enc <ucrb8a.pfb
-% ucrbo8y NimbusMonL-BoldObli      <texnansi.enc <ucrbo8a.pfb
-% ucrr8y  NimbusMonL-Regu          <texnansi.enc <ucrr8a.pfb
-% ucrro8y NimbusMonL-ReguObli      <texnansi.enc <ucrro8a.pfb
-
-% courier / adobe
-
-% pcrb8y  NimbusMonL-Bold          <texnansi.enc <ucrb8a.pfb
-% pcrbo8y NimbusMonL-BoldObli      <texnansi.enc <ucrbo8a.pfb
-% pcrr8y  NimbusMonL-Regu          <texnansi.enc <ucrr8a.pfb
-% pcrro8y NimbusMonL-ReguObli      <texnansi.enc <ucrro8a.pfb
-
-% helvetica / urw
-
-% uhvb8y  NimbusSanL-Bold          <texnansi.enc <uhvb8a.pfb
-% uhvbo8y NimbusSanL-BoldItal      <texnansi.enc <uhvbo8a.pfb
-% uhvr8y  NimbusSanL-Regu          <texnansi.enc <uhvr8a.pfb
-% uhvro8y NimbusSanL-ReguItal      <texnansi.enc <uhvro8a.pfb
-
-% helvetica / adobe
-
-% phvb8y  NimbusSanL-Bold          <texnansi.enc <uhvb8a.pfb
-% phvbo8y NimbusSanL-BoldItal      <texnansi.enc <uhvbo8a.pfb
-% phvr8y  NimbusSanL-Regu          <texnansi.enc <uhvr8a.pfb
-% phvro8y NimbusSanL-ReguItal      <texnansi.enc <uhvro8a.pfb
-
-% times / urw
-
-% utmb8y  NimbusRomNo9L-Medi       <texnansi.enc <utmb8a.pfb
-% utmbi8y NimbusRomNo9L-MediItal   <texnansi.enc <utmbi8a.pfb
-% utmr8y  NimbusRomNo9L-Regu       <texnansi.enc <utmr8a.pfb
-% utmri8y NimbusRomNo9L-ReguItal   <texnansi.enc <utmri8a.pfb
-
-% utmbo8y NimbusRomNo9L-Medi       ".167 SlantFont" <texnansi.enc <utmb8a.pfb
-% utmro8y NimbusRomNo9L-Regu       ".167 SlantFont" <texnansi.enc <utmr8a.pfb
-
-% times / adobe
-
-% ptmb8y  NimbusRomNo9L-Medi       <texnansi.enc <utmb8a.pfb
-% ptmbi8y NimbusRomNo9L-MediItal   <texnansi.enc <utmbi8a.pfb
-% ptmr8y  NimbusRomNo9L-Regu       <texnansi.enc <utmr8a.pfb
-% ptmri8y NimbusRomNo9L-ReguItal   <texnansi.enc <utmri8a.pfb
-
-% ptmbo8y NimbusRomNo9L-Medi       ".167 SlantFont" <texnansi.enc <utmb8a.pfb
-% ptmro8y NimbusRomNo9L-Regu       ".167 SlantFont" <texnansi.enc <utmr8a.pfb
-
-% palatino / urw
-
-% uplb8y  URWPalladioL-Bold        <texnansi.enc <uplb8a.pfb
-% uplbi8y URWPalladioL-BoldItal    <texnansi.enc <uplbi8a.pfb
-% uplr8y  URWPalladioL-Roma        <texnansi.enc <uplr8a.pfb
-% uplri8y URWPalladioL-Ital        <texnansi.enc <uplri8a.pfb
-
-% uplbo8y URWPalladioL-Bold        ".167 SlantFont" <texnansi.enc <uplb8a.pfb
-% uplro8y URWPalladioL-Roma        ".167 SlantFont" <texnansi.enc <uplr8a.pfb
-
-% palatino / adobe
-
-% pplb8y  URWPalladioL-Bold        <texnansi.enc <uplb8a.pfb
-% pplbi8y URWPalladioL-BoldItal    <texnansi.enc <uplbi8a.pfb
-% pplr8y  URWPalladioL-Roma        <texnansi.enc <uplr8a.pfb
-% pplri8y URWPalladioL-Ital        <texnansi.enc <uplri8a.pfb
-
-% pplbo8y URWPalladioL-Bold        ".167 SlantFont" <texnansi.enc <uplb8a.pfb
-% pplro8y URWPalladioL-Roma        ".167 SlantFont" <texnansi.enc <uplr8a.pfb
-
-% bookman / urw
-
-% ubkd8y  URWBookmanL-DemiBold     <texnansi.enc <ubkd8a.pfb
-% ubkdi8y URWBookmanL-DemiBoldItal <texnansi.enc <ubkdi8a.pfb
-% ubkl8y  URWBookmanL-Ligh         <texnansi.enc <ubkl8a.pfb
-% vubkli8y URWBookmanL-LighItal     <texnansi.enc <ubkli8a.pfb
-
-% ubkdo8y URWBookmanL-DemiBold     ".167 SlantFont" <texnansi.enc <ubkd8a.pfb
-% ubklo8y URWBookmanL-Ligh         ".167 SlantFont" <texnansi.enc <ubkl8a.pfb
-
-% bookman / adobe
-
-% pbkd8y  URWBookmanL-DemiBold     <texnansi.enc <ubkd8a.pfb
-% pbkdi8y URWBookmanL-DemiBoldItal <texnansi.enc <ubkdi8a.pfb
-% pbkl8y  URWBookmanL-Ligh         <texnansi.enc <ubkl8a.pfb
-% pbkli8y URWBookmanL-LighItal     <texnansi.enc <ubkli8a.pfb
-
-% pbkdo8y URWBookmanL-DemiBold     ".167 SlantFont" <texnansi.enc <ubkd8a.pfb
-% pbklo8y URWBookmanL-Ligh         ".167 SlantFont" <texnansi.enc <ubkl8a.pfb
-
-% chancery / urw
-
-% uzcmi8y URWChanceryL-MediItal    <texnansi.enc <uzcmi8a.pfb
-
-% chancery / adobe
-
-% pzcmi8y URWChanceryL-MediItal    <texnansi.enc <uzcmi8a.pfb
-
-% schoolbook / urw
-
-% uncb8y  CenturySchL-Bold         <texnansi.enc <uncb8a.pfb
-% uncbi8y CenturySchL-BoldItal     <texnansi.enc <uncbi8a.pfb
-% uncr8y  CenturySchL-Roma         <texnansi.enc <uncr8a.pfb
-% uncri8y CenturySchL-Ital         <texnansi.enc <uncri8a.pfb
-
-% uncbo8y CenturySchL-Bold         ".167 SlantFont" <texnansi.enc <uncb8a.pfb
-% uncro8y CenturySchL-Roma         ".167 SlantFont" <texnansi.enc <uncr8a.pfb
-
-% schoolbook / adobe
-
-% pncb8y  CenturySchL-Bold         <texnansi.enc <uncb8a.pfb
-% pncbi8y CenturySchL-BoldItal     <texnansi.enc <uncbi8a.pfb
-% pncr8y  CenturySchL-Roma         <texnansi.enc <uncr8a.pfb
-% pncri8y CenturySchL-Ital         <texnansi.enc <uncri8a.pfb
-
-% pncbo8y CenturySchL-Bold         ".167 SlantFont" <texnansi.enc <uncb8a.pfb
-% pncro8y CenturySchL-Roma         ".167 SlantFont" <texnansi.enc <uncr8a.pfb
-
-% utopia
-
-% putb8y  Utopia-Bold              <texnansi.enc <putb8a.pfb
-% putbi8y Utopia-BoldItalic        <texnansi.enc <putbi8a.pfb
-% putr8y  Utopia-Regular           <texnansi.enc <putr8a.pfb
-% putri8y Utopia-Italic            <texnansi.enc <putri8a.pfb
-
-% putbo8y Utopia-Bold              ".167 SlantFont" <texnansi.enc <putb8a.pfb
-% putro8y Utopia-Regular           ".167 SlantFont" <texnansi.enc <putr8a.pfb
-
-% charter
-
-% bchb8y  CharterBT-Bold           <texnansi.enc <bchb8a.pfb
-% bchbi8y CharterBT-BoldItalic     <texnansi.enc <bchbi8a.pfb
-% bchr8y  CharterBT-Roman          <texnansi.enc <bchr8a.pfb
-% bchri8y CharterBT-Italic         <texnansi.enc <bchri8a.pfb
-
-% bchbo8y CharterBT-Bold           ".167 SlantFont"  <texnansi.enc <bchb8a.pfb
-% bchro8y CharterBT-Roman          ".167 SlantFont " <texnansi.enc <bchr8a.pfb
\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/map/dvips/context/texnansi-lm.map b/Master/texmf-dist/fonts/map/dvips/context/texnansi-lm.map
deleted file mode 100644
index af810611512..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/texnansi-lm.map
+++ /dev/null
@@ -1,69 +0,0 @@
-texnansi-lmb10 LMRoman10-Demi "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmb10.pfb
-texnansi-lmbo10 LMRoman10-DemiOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbo10.pfb
-texnansi-lmbx10 LMRoman10-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx10.pfb
-texnansi-lmbx12 LMRoman12-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx12.pfb
-texnansi-lmbx5 LMRoman5-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx5.pfb
-texnansi-lmbx6 LMRoman6-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx6.pfb
-texnansi-lmbx7 LMRoman7-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx7.pfb
-texnansi-lmbx8 LMRoman8-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx8.pfb
-texnansi-lmbx9 LMRoman9-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx9.pfb
-texnansi-lmbxi10 LMRoman10-BoldItalic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbxi10.pfb
-texnansi-lmbxo10 LMRoman10-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbxo10.pfb
-texnansi-lmcsc10 LMRoman10-CapsRegular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmcsc10.pfb
-texnansi-lmcsco10 LMRoman10-CapsOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmcsco10.pfb
-texnansi-lmr10 LMRoman10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr10.pfb
-texnansi-lmr12 LMRoman12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr12.pfb
-texnansi-lmr17 LMRoman17-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr17.pfb
-texnansi-lmr5 LMRoman5-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr5.pfb
-texnansi-lmr6 LMRoman6-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr6.pfb
-texnansi-lmr7 LMRoman7-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr7.pfb
-texnansi-lmr8 LMRoman8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr8.pfb
-texnansi-lmr9 LMRoman9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr9.pfb
-texnansi-lmri10 LMRoman10-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri10.pfb
-texnansi-lmri12 LMRoman12-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri12.pfb
-texnansi-lmri7 LMRoman7-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri7.pfb
-texnansi-lmri8 LMRoman8-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri8.pfb
-texnansi-lmri9 LMRoman9-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri9.pfb
-texnansi-lmro10 LMRoman10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro10.pfb
-texnansi-lmro12 LMRoman12-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro12.pfb
-texnansi-lmro17 LMRoman17-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro17.pfb
-texnansi-lmro8 LMRoman8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro8.pfb
-texnansi-lmro9 LMRoman9-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro9.pfb
-texnansi-lmss10 LMSans10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss10.pfb
-texnansi-lmss12 LMSans12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss12.pfb
-texnansi-lmss17 LMSans17-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss17.pfb
-texnansi-lmss8 LMSans8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss8.pfb
-texnansi-lmss9 LMSans9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss9.pfb
-texnansi-lmssbo10 LMSans10-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssbo10.pfb
-texnansi-lmssbx10 LMSans10-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssbx10.pfb
-texnansi-lmssdc10 LMSans10-DemiCondensed "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssdc10.pfb
-texnansi-lmssdo10 LMSans10-DemiCondensedOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssdo10.pfb
-texnansi-lmsso10 LMSans10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso10.pfb
-texnansi-lmsso12 LMSans12-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso12.pfb
-texnansi-lmsso17 LMSans17-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso17.pfb
-texnansi-lmsso8 LMSans8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso8.pfb
-texnansi-lmsso9 LMSans9-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso9.pfb
-texnansi-lmssq8 LMSansQuotation8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssq8.pfb
-texnansi-lmssqbo8 LMSansQuotation8-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqbo8.pfb
-texnansi-lmssqbx8 LMSansQuotation8-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqbx8.pfb
-texnansi-lmssqo8 LMSansQuotation8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqo8.pfb
-texnansi-lmtcsc10 LMTypewriter10-CapsRegular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtcsc10.pfb
-texnansi-lmtcso10 LMTypewriter10-CapsOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtcso10.pfb
-texnansi-lmtl10 LMTypewriter10-Light "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtl10.pfb
-texnansi-lmtlo10 LMTypewriter10-LightOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlo10.pfb
-texnansi-lmtlc10 LMTypewriter10-LightCondensed "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlc10.pfb
-texnansi-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlco10.pfb
-texnansi-lmtk10 LMTypewriter10-Dark "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtk10.pfb
-texnansi-lmtko10 LMTypewriter10-DarkOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtko10.pfb
-texnansi-lmtt10 LMTypewriter10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt10.pfb
-texnansi-lmtt12 LMTypewriter12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt12.pfb
-texnansi-lmtt8 LMTypewriter8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt8.pfb
-texnansi-lmtt9 LMTypewriter9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt9.pfb
-texnansi-lmtti10 LMTypewriter10-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtti10.pfb
-texnansi-lmtto10 LMTypewriter10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtto10.pfb
-texnansi-lmvtt10 LMTypewriterVarWd10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtt10.pfb
-texnansi-lmvtto10 LMTypewriterVarWd10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtto10.pfb
-texnansi-lmvtl10 LMTypewriterVarWd10-Light "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtl10.pfb
-texnansi-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtlo10.pfb
-texnansi-lmvtk10 LMTypewriterVarWd10-Dark "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtk10.pfb
-texnansi-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtko10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/texnansi-os-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/texnansi-os-public-lm.map
deleted file mode 100644
index 85ba31a063d..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/texnansi-os-public-lm.map
+++ /dev/null
@@ -1,69 +0,0 @@
-texnansi-lmb10 LMRoman10-Demi "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmb10.pfb
-texnansi-lmbo10 LMRoman10-DemiOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbo10.pfb
-texnansi-lmbx10 LMRoman10-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbx10.pfb
-texnansi-lmbx12 LMRoman12-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbx12.pfb
-texnansi-lmbx5 LMRoman5-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbx5.pfb
-texnansi-lmbx6 LMRoman6-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbx6.pfb
-texnansi-lmbx7 LMRoman7-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbx7.pfb
-texnansi-lmbx8 LMRoman8-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbx8.pfb
-texnansi-lmbx9 LMRoman9-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbx9.pfb
-texnansi-lmbxi10 LMRoman10-BoldItalic "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbxi10.pfb
-texnansi-lmbxo10 LMRoman10-BoldOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbxo10.pfb
-texnansi-lmcsc10 LMRoman10-CapsRegular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmcsc10.pfb
-texnansi-lmcsco10 LMRoman10-CapsOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmcsco10.pfb
-texnansi-lmr10 LMRoman10-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmr10.pfb
-texnansi-lmr12 LMRoman12-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmr12.pfb
-texnansi-lmr17 LMRoman17-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmr17.pfb
-texnansi-lmr5 LMRoman5-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmr5.pfb
-texnansi-lmr6 LMRoman6-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmr6.pfb
-texnansi-lmr7 LMRoman7-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmr7.pfb
-texnansi-lmr8 LMRoman8-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmr8.pfb
-texnansi-lmr9 LMRoman9-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmr9.pfb
-texnansi-lmri10 LMRoman10-Italic "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmri10.pfb
-texnansi-lmri12 LMRoman12-Italic "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmri12.pfb
-texnansi-lmri7 LMRoman7-Italic "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmri7.pfb
-texnansi-lmri8 LMRoman8-Italic "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmri8.pfb
-texnansi-lmri9 LMRoman9-Italic "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmri9.pfb
-texnansi-lmro10 LMRoman10-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmro10.pfb
-texnansi-lmro12 LMRoman12-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmro12.pfb
-texnansi-lmro17 LMRoman17-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmro17.pfb
-texnansi-lmro8 LMRoman8-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmro8.pfb
-texnansi-lmro9 LMRoman9-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmro9.pfb
-texnansi-lmss10 LMSans10-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmss10.pfb
-texnansi-lmss12 LMSans12-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmss12.pfb
-texnansi-lmss17 LMSans17-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmss17.pfb
-texnansi-lmss8 LMSans8-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmss8.pfb
-texnansi-lmss9 LMSans9-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmss9.pfb
-texnansi-lmssbo10 LMSans10-BoldOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmssbo10.pfb
-texnansi-lmssbx10 LMSans10-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmssbx10.pfb
-texnansi-lmssdc10 LMSans10-DemiCondensed "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmssdc10.pfb
-texnansi-lmssdo10 LMSans10-DemiCondensedOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmssdo10.pfb
-texnansi-lmsso10 LMSans10-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmsso10.pfb
-texnansi-lmsso12 LMSans12-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmsso12.pfb
-texnansi-lmsso17 LMSans17-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmsso17.pfb
-texnansi-lmsso8 LMSans8-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmsso8.pfb
-texnansi-lmsso9 LMSans9-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmsso9.pfb
-texnansi-lmssq8 LMSansQuotation8-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmssq8.pfb
-texnansi-lmssqbo8 LMSansQuotation8-BoldOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmssqbo8.pfb
-texnansi-lmssqbx8 LMSansQuotation8-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmssqbx8.pfb
-texnansi-lmssqo8 LMSansQuotation8-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmssqo8.pfb
-texnansi-lmtcsc10 LMTypewriter10-CapsRegular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtcsc10.pfb
-texnansi-lmtcso10 LMTypewriter10-CapsOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtcso10.pfb
-texnansi-lmtl10 LMTypewriter10-Light "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtl10.pfb
-texnansi-lmtlo10 LMTypewriter10-LightOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtlo10.pfb
-texnansi-lmtlc10 LMTypewriter10-LightCondensed "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtlc10.pfb
-texnansi-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtlco10.pfb
-texnansi-lmtk10 LMTypewriter10-Dark "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtk10.pfb
-texnansi-lmtko10 LMTypewriter10-DarkOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtko10.pfb
-texnansi-lmtt10 LMTypewriter10-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtt10.pfb
-texnansi-lmtt12 LMTypewriter12-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtt12.pfb
-texnansi-lmtt8 LMTypewriter8-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtt8.pfb
-texnansi-lmtt9 LMTypewriter9-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtt9.pfb
-texnansi-lmtti10 LMTypewriter10-Italic "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtti10.pfb
-texnansi-lmtto10 LMTypewriter10-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtto10.pfb
-texnansi-lmvtt10 LMTypewriterVarWd10-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmvtt10.pfb
-texnansi-lmvtto10 LMTypewriterVarWd10-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmvtto10.pfb
-texnansi-lmvtl10 LMTypewriterVarWd10-Light "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmvtl10.pfb
-texnansi-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmvtlo10.pfb
-texnansi-lmvtk10 LMTypewriterVarWd10-Dark "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmvtk10.pfb
-texnansi-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmvtko10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/texnansi-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/texnansi-public-lm.map
deleted file mode 100644
index af810611512..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/texnansi-public-lm.map
+++ /dev/null
@@ -1,69 +0,0 @@
-texnansi-lmb10 LMRoman10-Demi "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmb10.pfb
-texnansi-lmbo10 LMRoman10-DemiOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbo10.pfb
-texnansi-lmbx10 LMRoman10-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx10.pfb
-texnansi-lmbx12 LMRoman12-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx12.pfb
-texnansi-lmbx5 LMRoman5-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx5.pfb
-texnansi-lmbx6 LMRoman6-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx6.pfb
-texnansi-lmbx7 LMRoman7-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx7.pfb
-texnansi-lmbx8 LMRoman8-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx8.pfb
-texnansi-lmbx9 LMRoman9-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx9.pfb
-texnansi-lmbxi10 LMRoman10-BoldItalic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbxi10.pfb
-texnansi-lmbxo10 LMRoman10-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbxo10.pfb
-texnansi-lmcsc10 LMRoman10-CapsRegular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmcsc10.pfb
-texnansi-lmcsco10 LMRoman10-CapsOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmcsco10.pfb
-texnansi-lmr10 LMRoman10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr10.pfb
-texnansi-lmr12 LMRoman12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr12.pfb
-texnansi-lmr17 LMRoman17-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr17.pfb
-texnansi-lmr5 LMRoman5-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr5.pfb
-texnansi-lmr6 LMRoman6-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr6.pfb
-texnansi-lmr7 LMRoman7-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr7.pfb
-texnansi-lmr8 LMRoman8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr8.pfb
-texnansi-lmr9 LMRoman9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr9.pfb
-texnansi-lmri10 LMRoman10-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri10.pfb
-texnansi-lmri12 LMRoman12-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri12.pfb
-texnansi-lmri7 LMRoman7-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri7.pfb
-texnansi-lmri8 LMRoman8-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri8.pfb
-texnansi-lmri9 LMRoman9-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri9.pfb
-texnansi-lmro10 LMRoman10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro10.pfb
-texnansi-lmro12 LMRoman12-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro12.pfb
-texnansi-lmro17 LMRoman17-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro17.pfb
-texnansi-lmro8 LMRoman8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro8.pfb
-texnansi-lmro9 LMRoman9-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro9.pfb
-texnansi-lmss10 LMSans10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss10.pfb
-texnansi-lmss12 LMSans12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss12.pfb
-texnansi-lmss17 LMSans17-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss17.pfb
-texnansi-lmss8 LMSans8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss8.pfb
-texnansi-lmss9 LMSans9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss9.pfb
-texnansi-lmssbo10 LMSans10-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssbo10.pfb
-texnansi-lmssbx10 LMSans10-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssbx10.pfb
-texnansi-lmssdc10 LMSans10-DemiCondensed "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssdc10.pfb
-texnansi-lmssdo10 LMSans10-DemiCondensedOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssdo10.pfb
-texnansi-lmsso10 LMSans10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso10.pfb
-texnansi-lmsso12 LMSans12-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso12.pfb
-texnansi-lmsso17 LMSans17-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso17.pfb
-texnansi-lmsso8 LMSans8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso8.pfb
-texnansi-lmsso9 LMSans9-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso9.pfb
-texnansi-lmssq8 LMSansQuotation8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssq8.pfb
-texnansi-lmssqbo8 LMSansQuotation8-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqbo8.pfb
-texnansi-lmssqbx8 LMSansQuotation8-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqbx8.pfb
-texnansi-lmssqo8 LMSansQuotation8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqo8.pfb
-texnansi-lmtcsc10 LMTypewriter10-CapsRegular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtcsc10.pfb
-texnansi-lmtcso10 LMTypewriter10-CapsOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtcso10.pfb
-texnansi-lmtl10 LMTypewriter10-Light "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtl10.pfb
-texnansi-lmtlo10 LMTypewriter10-LightOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlo10.pfb
-texnansi-lmtlc10 LMTypewriter10-LightCondensed "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlc10.pfb
-texnansi-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlco10.pfb
-texnansi-lmtk10 LMTypewriter10-Dark "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtk10.pfb
-texnansi-lmtko10 LMTypewriter10-DarkOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtko10.pfb
-texnansi-lmtt10 LMTypewriter10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt10.pfb
-texnansi-lmtt12 LMTypewriter12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt12.pfb
-texnansi-lmtt8 LMTypewriter8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt8.pfb
-texnansi-lmtt9 LMTypewriter9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt9.pfb
-texnansi-lmtti10 LMTypewriter10-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtti10.pfb
-texnansi-lmtto10 LMTypewriter10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtto10.pfb
-texnansi-lmvtt10 LMTypewriterVarWd10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtt10.pfb
-texnansi-lmvtto10 LMTypewriterVarWd10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtto10.pfb
-texnansi-lmvtl10 LMTypewriterVarWd10-Light "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtl10.pfb
-texnansi-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtlo10.pfb
-texnansi-lmvtk10 LMTypewriterVarWd10-Dark "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtk10.pfb
-texnansi-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtko10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/context/texnansi-var-exclusive-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/texnansi-var-exclusive-public-lm.map
deleted file mode 100644
index 9e0ee5ea33b..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/texnansi-var-exclusive-public-lm.map
+++ /dev/null
@@ -1,62 +0,0 @@
-% author: Hans Hagen
-%
-% This map file remaps texnansi encoded Latin Modern adapted for
-% umlauts and other variations.
-
-texnansi-lmb10    LMRomanDemi10-Regular        <texnansi-var-lm.enc <lmb10.pfb
-texnansi-lmbo10   LMRomanDemi10-Italic         <texnansi-var-lm.enc <lmbo10.pfb
-texnansi-lmbx10   LMRoman10-Bold               <texnansi-var-lm.enc <lmbx10.pfb
-texnansi-lmbx12   LMRoman12-Bold               <texnansi-var-lm.enc <lmbx12.pfb
-texnansi-lmbx5    LMRoman5-Bold                <texnansi-var-lm.enc <lmbx5.pfb
-texnansi-lmbx6    LMRoman6-Bold                <texnansi-var-lm.enc <lmbx6.pfb
-texnansi-lmbx7    LMRoman7-Bold                <texnansi-var-lm.enc <lmbx7.pfb
-texnansi-lmbx8    LMRoman8-Bold                <texnansi-var-lm.enc <lmbx8.pfb
-texnansi-lmbx9    LMRoman9-Bold                <texnansi-var-lm.enc <lmbx9.pfb
-texnansi-lmbxi10  LMRoman10-BoldItalic         <texnansi-var-lm.enc <lmbxi10.pfb
-texnansi-lmbxo10  LMSlanted10-BoldItalic       <texnansi-var-lm.enc <lmbxo10.pfb
-texnansi-lmcsc10  LMCaps10-Regular             <texnansi-var-lm.enc <lmcsc10.pfb
-texnansi-lmcsco10 LMCaps10-Italic              <texnansi-var-lm.enc <lmcsco10.pfb
-texnansi-lmr10    LMRoman10-Regular            <texnansi-var-lm.enc <lmr10.pfb
-texnansi-lmr12    LMRoman12-Regular            <texnansi-var-lm.enc <lmr12.pfb
-texnansi-lmr17    LMRoman17-Regular            <texnansi-var-lm.enc <lmr17.pfb
-texnansi-lmr5     LMRoman5-Regular             <texnansi-var-lm.enc <lmr5.pfb
-texnansi-lmr6     LMRoman6-Regular             <texnansi-var-lm.enc <lmr6.pfb
-texnansi-lmr7     LMRoman7-Regular             <texnansi-var-lm.enc <lmr7.pfb
-texnansi-lmr8     LMRoman8-Regular             <texnansi-var-lm.enc <lmr8.pfb
-texnansi-lmr9     LMRoman9-Regular             <texnansi-var-lm.enc <lmr9.pfb
-texnansi-lmri10   LMRoman10-Italic             <texnansi-var-lm.enc <lmri10.pfb
-texnansi-lmri12   LMRoman12-Italic             <texnansi-var-lm.enc <lmri12.pfb
-texnansi-lmri7    LMRoman7-Italic              <texnansi-var-lm.enc <lmri7.pfb
-texnansi-lmri8    LMRoman8-Italic              <texnansi-var-lm.enc <lmri8.pfb
-texnansi-lmri9    LMRoman9-Italic              <texnansi-var-lm.enc <lmri9.pfb
-texnansi-lmro10   LMSlanted10-Italic           <texnansi-var-lm.enc <lmro10.pfb
-texnansi-lmro12   LMSlanted12-Italic           <texnansi-var-lm.enc <lmro12.pfb
-texnansi-lmro8    LMSlanted8-Italic            <texnansi-var-lm.enc <lmro8.pfb
-texnansi-lmro9    LMSlanted9-Italic            <texnansi-var-lm.enc <lmro9.pfb
-texnansi-lmss10   LMSans10-Regular             <texnansi-var-lm.enc <lmss10.pfb
-texnansi-lmss12   LMSans12-Regular             <texnansi-var-lm.enc <lmss12.pfb
-texnansi-lmss17   LMSans17-Regular             <texnansi-var-lm.enc <lmss17.pfb
-texnansi-lmss8    LMSans8-Regular              <texnansi-var-lm.enc <lmss8.pfb
-texnansi-lmss9    LMSans9-Regular              <texnansi-var-lm.enc <lmss9.pfb
-texnansi-lmssbo10 LMSans10-BoldItalic          <texnansi-var-lm.enc <lmssbo10.pfb
-texnansi-lmssbx10 LMSans10-Bold                <texnansi-var-lm.enc <lmssbx10.pfb
-texnansi-lmssdc10 LMSansDemiCond10-Regular     <texnansi-var-lm.enc <lmssdc10.pfb
-texnansi-lmssdo10 LMSansDemiCond10-Italic      <texnansi-var-lm.enc <lmssdo10.pfb
-texnansi-lmsso10  LMSans10-Italic              <texnansi-var-lm.enc <lmsso10.pfb
-texnansi-lmsso12  LMSans12-Italic              <texnansi-var-lm.enc <lmsso12.pfb
-texnansi-lmsso17  LMSans17-Italic              <texnansi-var-lm.enc <lmsso17.pfb
-texnansi-lmsso8   LMSans8-Italic               <texnansi-var-lm.enc <lmsso8.pfb
-texnansi-lmsso9   LMSans9-Italic               <texnansi-var-lm.enc <lmsso9.pfb
-texnansi-lmssq8   LMSansQuotation8-Regular     <texnansi-var-lm.enc <lmssq8.pfb
-texnansi-lmssqbo8 LMSansQuotation8-BoldItalic  <texnansi-var-lm.enc <lmssqbo8.pfb
-texnansi-lmssqbx8 LMSansQuotation8-Bold        <texnansi-var-lm.enc <lmssqbx8.pfb
-texnansi-lmssqo8  LMSansQuotation8-Italic      <texnansi-var-lm.enc <lmssqo8.pfb
-texnansi-lmtcsc10 LMTypewriterCaps10-Regular   <texnansi-var-lm.enc <lmtcsc10.pfb
-texnansi-lmtt10   LMTypewriter10-Regular       <texnansi-var-lm.enc <lmtt10.pfb
-texnansi-lmtt12   LMTypewriter12-Regular       <texnansi-var-lm.enc <lmtt12.pfb
-texnansi-lmtt8    LMTypewriter8-Regular        <texnansi-var-lm.enc <lmtt8.pfb
-texnansi-lmtt9    LMTypewriter9-Regular        <texnansi-var-lm.enc <lmtt9.pfb
-texnansi-lmtti10  LMTypewriter10-Italic        <texnansi-var-lm.enc <lmtti10.pfb
-texnansi-lmtto10  LMTypewriterSlanted10-Italic <texnansi-var-lm.enc <lmtto10.pfb
-texnansi-lmvtt10  LMTypewriterVarWd10-Regular  <texnansi-var-lm.enc <lmvtt10.pfb
-texnansi-lmvtto10 LMTypewriterVarWd10-Italic   <texnansi-var-lm.enc <lmvtto10.pfb
\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/map/dvips/context/texnansi-var-public-lm.map b/Master/texmf-dist/fonts/map/dvips/context/texnansi-var-public-lm.map
deleted file mode 100644
index f8a669e8950..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/texnansi-var-public-lm.map
+++ /dev/null
@@ -1,62 +0,0 @@
-% author: Hans Hagen
-%
-% This map file defines texnansi encoded Latin Modern adapted for
-% umlauts and other variations.
-
-texnansi-var-lmb10    LMRomanDemi10-Regular        <texnansi-var-lm.enc <lmb10.pfb
-texnansi-var-lmbo10   LMRomanDemi10-Italic         <texnansi-var-lm.enc <lmbo10.pfb
-texnansi-var-lmbx10   LMRoman10-Bold               <texnansi-var-lm.enc <lmbx10.pfb
-texnansi-var-lmbx12   LMRoman12-Bold               <texnansi-var-lm.enc <lmbx12.pfb
-texnansi-var-lmbx5    LMRoman5-Bold                <texnansi-var-lm.enc <lmbx5.pfb
-texnansi-var-lmbx6    LMRoman6-Bold                <texnansi-var-lm.enc <lmbx6.pfb
-texnansi-var-lmbx7    LMRoman7-Bold                <texnansi-var-lm.enc <lmbx7.pfb
-texnansi-var-lmbx8    LMRoman8-Bold                <texnansi-var-lm.enc <lmbx8.pfb
-texnansi-var-lmbx9    LMRoman9-Bold                <texnansi-var-lm.enc <lmbx9.pfb
-texnansi-var-lmbxi10  LMRoman10-BoldItalic         <texnansi-var-lm.enc <lmbxi10.pfb
-texnansi-var-lmbxo10  LMSlanted10-BoldItalic       <texnansi-var-lm.enc <lmbxo10.pfb
-texnansi-var-lmcsc10  LMCaps10-Regular             <texnansi-var-lm.enc <lmcsc10.pfb
-texnansi-var-lmcsco10 LMCaps10-Italic              <texnansi-var-lm.enc <lmcsco10.pfb
-texnansi-var-lmr10    LMRoman10-Regular            <texnansi-var-lm.enc <lmr10.pfb
-texnansi-var-lmr12    LMRoman12-Regular            <texnansi-var-lm.enc <lmr12.pfb
-texnansi-var-lmr17    LMRoman17-Regular            <texnansi-var-lm.enc <lmr17.pfb
-texnansi-var-lmr5     LMRoman5-Regular             <texnansi-var-lm.enc <lmr5.pfb
-texnansi-var-lmr6     LMRoman6-Regular             <texnansi-var-lm.enc <lmr6.pfb
-texnansi-var-lmr7     LMRoman7-Regular             <texnansi-var-lm.enc <lmr7.pfb
-texnansi-var-lmr8     LMRoman8-Regular             <texnansi-var-lm.enc <lmr8.pfb
-texnansi-var-lmr9     LMRoman9-Regular             <texnansi-var-lm.enc <lmr9.pfb
-texnansi-var-lmri10   LMRoman10-Italic             <texnansi-var-lm.enc <lmri10.pfb
-texnansi-var-lmri12   LMRoman12-Italic             <texnansi-var-lm.enc <lmri12.pfb
-texnansi-var-lmri7    LMRoman7-Italic              <texnansi-var-lm.enc <lmri7.pfb
-texnansi-var-lmri8    LMRoman8-Italic              <texnansi-var-lm.enc <lmri8.pfb
-texnansi-var-lmri9    LMRoman9-Italic              <texnansi-var-lm.enc <lmri9.pfb
-texnansi-var-lmro10   LMSlanted10-Italic           <texnansi-var-lm.enc <lmro10.pfb
-texnansi-var-lmro12   LMSlanted12-Italic           <texnansi-var-lm.enc <lmro12.pfb
-texnansi-var-lmro8    LMSlanted8-Italic            <texnansi-var-lm.enc <lmro8.pfb
-texnansi-var-lmro9    LMSlanted9-Italic            <texnansi-var-lm.enc <lmro9.pfb
-texnansi-var-lmss10   LMSans10-Regular             <texnansi-var-lm.enc <lmss10.pfb
-texnansi-var-lmss12   LMSans12-Regular             <texnansi-var-lm.enc <lmss12.pfb
-texnansi-var-lmss17   LMSans17-Regular             <texnansi-var-lm.enc <lmss17.pfb
-texnansi-var-lmss8    LMSans8-Regular              <texnansi-var-lm.enc <lmss8.pfb
-texnansi-var-lmss9    LMSans9-Regular              <texnansi-var-lm.enc <lmss9.pfb
-texnansi-var-lmssbo10 LMSans10-BoldItalic          <texnansi-var-lm.enc <lmssbo10.pfb
-texnansi-var-lmssbx10 LMSans10-Bold                <texnansi-var-lm.enc <lmssbx10.pfb
-texnansi-var-lmssdc10 LMSansDemiCond10-Regular     <texnansi-var-lm.enc <lmssdc10.pfb
-texnansi-var-lmssdo10 LMSansDemiCond10-Italic      <texnansi-var-lm.enc <lmssdo10.pfb
-texnansi-var-lmsso10  LMSans10-Italic              <texnansi-var-lm.enc <lmsso10.pfb
-texnansi-var-lmsso12  LMSans12-Italic              <texnansi-var-lm.enc <lmsso12.pfb
-texnansi-var-lmsso17  LMSans17-Italic              <texnansi-var-lm.enc <lmsso17.pfb
-texnansi-var-lmsso8   LMSans8-Italic               <texnansi-var-lm.enc <lmsso8.pfb
-texnansi-var-lmsso9   LMSans9-Italic               <texnansi-var-lm.enc <lmsso9.pfb
-texnansi-var-lmssq8   LMSansQuotation8-Regular     <texnansi-var-lm.enc <lmssq8.pfb
-texnansi-var-lmssqbo8 LMSansQuotation8-BoldItalic  <texnansi-var-lm.enc <lmssqbo8.pfb
-texnansi-var-lmssqbx8 LMSansQuotation8-Bold        <texnansi-var-lm.enc <lmssqbx8.pfb
-texnansi-var-lmssqo8  LMSansQuotation8-Italic      <texnansi-var-lm.enc <lmssqo8.pfb
-texnansi-var-lmtcsc10 LMTypewriterCaps10-Regular   <texnansi-var-lm.enc <lmtcsc10.pfb
-texnansi-var-lmtt10   LMTypewriter10-Regular       <texnansi-var-lm.enc <lmtt10.pfb
-texnansi-var-lmtt12   LMTypewriter12-Regular       <texnansi-var-lm.enc <lmtt12.pfb
-texnansi-var-lmtt8    LMTypewriter8-Regular        <texnansi-var-lm.enc <lmtt8.pfb
-texnansi-var-lmtt9    LMTypewriter9-Regular        <texnansi-var-lm.enc <lmtt9.pfb
-texnansi-var-lmtti10  LMTypewriter10-Italic        <texnansi-var-lm.enc <lmtti10.pfb
-texnansi-var-lmtto10  LMTypewriterSlanted10-Italic <texnansi-var-lm.enc <lmtto10.pfb
-texnansi-var-lmvtt10  LMTypewriterVarWd10-Regular  <texnansi-var-lm.enc <lmvtt10.pfb
-texnansi-var-lmvtto10 LMTypewriterVarWd10-Italic   <texnansi-var-lm.enc <lmvtto10.pfb
\ No newline at end of file
diff --git a/Master/texmf-dist/fonts/map/dvips/context/ts1-lm.map b/Master/texmf-dist/fonts/map/dvips/context/ts1-lm.map
deleted file mode 100644
index f5e1b4b733c..00000000000
--- a/Master/texmf-dist/fonts/map/dvips/context/ts1-lm.map
+++ /dev/null
@@ -1,69 +0,0 @@
-ts1-lmb10 LMRoman10-Demi "enclmts1 ReEncodeFont" <lm-ts1.enc <lmb10.pfb
-ts1-lmbo10 LMRoman10-DemiOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbo10.pfb
-ts1-lmbx10 LMRoman10-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbx10.pfb
-ts1-lmbx12 LMRoman12-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbx12.pfb
-ts1-lmbx5 LMRoman5-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbx5.pfb
-ts1-lmbx6 LMRoman6-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbx6.pfb
-ts1-lmbx7 LMRoman7-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbx7.pfb
-ts1-lmbx8 LMRoman8-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbx8.pfb
-ts1-lmbx9 LMRoman9-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbx9.pfb
-ts1-lmbxi10 LMRoman10-BoldItalic "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbxi10.pfb
-ts1-lmbxo10 LMRoman10-BoldOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbxo10.pfb
-ts1-lmcsc10 LMRoman10-CapsRegular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmcsc10.pfb
-ts1-lmcsco10 LMRoman10-CapsOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmcsco10.pfb
-ts1-lmr10 LMRoman10-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmr10.pfb
-ts1-lmr12 LMRoman12-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmr12.pfb
-ts1-lmr17 LMRoman17-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmr17.pfb
-ts1-lmr5 LMRoman5-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmr5.pfb
-ts1-lmr6 LMRoman6-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmr6.pfb
-ts1-lmr7 LMRoman7-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmr7.pfb
-ts1-lmr8 LMRoman8-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmr8.pfb
-ts1-lmr9 LMRoman9-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmr9.pfb
-ts1-lmri10 LMRoman10-Italic "enclmts1 ReEncodeFont" <lm-ts1.enc <lmri10.pfb
-ts1-lmri12 LMRoman12-Italic "enclmts1 ReEncodeFont" <lm-ts1.enc <lmri12.pfb
-ts1-lmri7 LMRoman7-Italic "enclmts1 ReEncodeFont" <lm-ts1.enc <lmri7.pfb
-ts1-lmri8 LMRoman8-Italic "enclmts1 ReEncodeFont" <lm-ts1.enc <lmri8.pfb
-ts1-lmri9 LMRoman9-Italic "enclmts1 ReEncodeFont" <lm-ts1.enc <lmri9.pfb
-ts1-lmro10 LMRoman10-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmro10.pfb
-ts1-lmro12 LMRoman12-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmro12.pfb
-ts1-lmro17 LMRoman17-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmro17.pfb
-ts1-lmro8 LMRoman8-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmro8.pfb
-ts1-lmro9 LMRoman9-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmro9.pfb
-ts1-lmss10 LMSans10-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmss10.pfb
-ts1-lmss12 LMSans12-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmss12.pfb
-ts1-lmss17 LMSans17-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmss17.pfb
-ts1-lmss8 LMSans8-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmss8.pfb
-ts1-lmss9 LMSans9-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmss9.pfb
-ts1-lmssbo10 LMSans10-BoldOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmssbo10.pfb
-ts1-lmssbx10 LMSans10-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmssbx10.pfb
-ts1-lmssdc10 LMSans10-DemiCondensed "enclmts1 ReEncodeFont" <lm-ts1.enc <lmssdc10.pfb
-ts1-lmssdo10 LMSans10-DemiCondensedOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmssdo10.pfb
-ts1-lmsso10 LMSans10-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmsso10.pfb
-ts1-lmsso12 LMSans12-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmsso12.pfb
-ts1-lmsso17 LMSans17-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmsso17.pfb
-ts1-lmsso8 LMSans8-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmsso8.pfb
-ts1-lmsso9 LMSans9-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmsso9.pfb
-ts1-lmssq8 LMSansQuotation8-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmssq8.pfb
-ts1-lmssqbo8 LMSansQuotation8-BoldOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmssqbo8.pfb
-ts1-lmssqbx8 LMSansQuotation8-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmssqbx8.pfb
-ts1-lmssqo8 LMSansQuotation8-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmssqo8.pfb
-ts1-lmtcsc10 LMTypewriter10-CapsRegular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtcsc10.pfb
-ts1-lmtcso10 LMTypewriter10-CapsOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtcso10.pfb
-ts1-lmtl10 LMTypewriter10-Light "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtl10.pfb
-ts1-lmtlo10 LMTypewriter10-LightOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtlo10.pfb
-ts1-lmtlc10 LMTypewriter10-LightCondensed "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtlc10.pfb
-ts1-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtlco10.pfb
-ts1-lmtk10 LMTypewriter10-Dark "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtk10.pfb
-ts1-lmtko10 LMTypewriter10-DarkOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtko10.pfb
-ts1-lmtt10 LMTypewriter10-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtt10.pfb
-ts1-lmtt12 LMTypewriter12-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtt12.pfb
-ts1-lmtt8 LMTypewriter8-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtt8.pfb
-ts1-lmtt9 LMTypewriter9-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtt9.pfb
-ts1-lmtti10 LMTypewriter10-Italic "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtti10.pfb
-ts1-lmtto10 LMTypewriter10-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtto10.pfb
-ts1-lmvtt10 LMTypewriterVarWd10-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmvtt10.pfb
-ts1-lmvtto10 LMTypewriterVarWd10-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmvtto10.pfb
-ts1-lmvtl10 LMTypewriterVarWd10-Light "enclmts1 ReEncodeFont" <lm-ts1.enc <lmvtl10.pfb
-ts1-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmvtlo10.pfb
-ts1-lmvtk10 LMTypewriterVarWd10-Dark "enclmts1 ReEncodeFont" <lm-ts1.enc <lmvtk10.pfb
-ts1-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmvtko10.pfb
diff --git a/Master/texmf-dist/scripts/context/perl/fdf2tan.pl b/Master/texmf-dist/scripts/context/perl/fdf2tan.pl
deleted file mode 100644
index c612f9886e1..00000000000
--- a/Master/texmf-dist/scripts/context/perl/fdf2tan.pl
+++ /dev/null
@@ -1,121 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
-        if 0;
-
-#D \module
-#D   [       file=fdf2tan.pl,
-#D        version=2000.02.06,
-#D          title=converting \FDF\ annotations,
-#D       subtitle=fdf2tan,
-#D         author=Hans Hagen,
-#D           date=\currentdate,
-#D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
-#C
-#C This module is part of the \CONTEXT\ macro||package and is
-#C therefore copyrighted by \PRAGMA. See licen-en.pdf for
-#C details.
-
-#D This is a preliminary version, that will probably be changed 
-#D and merged into a more general module. 
-
-use Text::Wrap ; 
-
-my $filename = $ARGV[0] ; exit if ($filename eq '') ;
-
-$filename =~ s/\..*$//o ;
-
-my $D  = "[0-9\-\.]" ;
-my $nn = 0 ; 
-
-my %stack ;
-
-sub saveobject
-  { $n = shift ; $str = shift ;
-    if ($n>$max) { $max = $n } 
-    if ($str =~ s/\/Type\s+\/Annot\s+\/Subtype\s+\/Text//o)
-      { ++$nn ; 
-        $str =~ s/\/Page\s+(\d+)//o ;
-        $page = $1 ; ++$page ;  
-        $str =~ s/\/Rect\s+\[\s*(.*?)\s*\]//o ;
-        $rec = $1 ; 
-        if ($rec =~ /($D+)\s*($D+)\s*($D+)\s*($D+)/o) 
-         { $FDFllx = $1 ; $FDFlly = $2 ; $FDFurx = $3 ; $FDFury = $4 }  
-        $X = $FDFllx - $PDFllx ; 
-        $Y = $PDFury - $FDFury ; 
-        $str =~ s/\/M\s.*$//o ;
-        $str =~ s/\/T\s.*$//o ;
-        $str =~ s/^.*\/Contents\s.*?\(//o ;
-        $str =~ s/\)\s+$//o ;
-        $str =~ s/\\\\r/@@@@@@/o ;
-        $str =~ s/\\r/\n/go; 
-        $str =~ s/@@@@@@/\\r/o ;
-        $str =~ s/\\([\<\>\(\)\{\}\\])/$1/go  ; 
-        $stack{sprintf("test:%3d %3d %3d\n",$page,$Y,$X)} = 
-          "\\startFDFcomment[$page]" . 
-          sprintf("[%.3f,%.3f]",$X,$Y) . 
-          "\n$str\n\\stopFDFcomment\n\n" } } 
-
-exit unless (open (PDF,"<$filename.pdf")) ; binmode PDF ; 
-exit unless (open (FDF,"<$filename.fdf")) ; 
-exit unless (open (TAN,">$filename.tan")) ; 
-
-print "processing $filename ... " ; 
-
-$PDFllx = 0 ; $PDFlly = 0 ; $PDFurx = 597 ; $PDFury = 847 ;
-
-while (<PDF>) 
-  { if (/\/MediaBox\s*\[\s*($D+)\s*($D+)\s*($D+)\s*($D+)/o) 
-      { $PDFllx = $1 ; $PDFlly = $2 ; $PDFurx = $3 ; $PDFury = $4 ;
-        last } }
- 
-$_ = "" ; while ($Line=<FDF>) { chomp $Line; $_ .= $Line }
-
-s/\\n/ /go ; 
-s/\\\s//go ;
-
-s/\\225/\\\/L/go ; s/\\226/\\OE/go ; s/\\227/\\vS/go  ;
-s/\\230/\\"Y/go  ; s/\\231/\\vZ/go ; s/\\233/\\\/l/go ;
-s/\\234/\\oe/go  ; s/\\235/\\vs/go ; s/\\236/\\vz/go  ;
-s/\\253/\\<</go  ; s/\\273/\\>>/go ; s/\\300/\\`A/go  ; 
-s/\\301/\\'A/go  ; s/\\302/\\^A/go ; s/\\303/\\~A/go  ;
-s/\\304/\\"A/go  ; s/\\305/\\oA/go ; s/\\306/\\AE/go  ;
-s/\\307/\\,C/go  ; s/\\310/\\`E/go ; s/\\311/\\'E/go  ;
-s/\\312/\\^E/go  ; s/\\313/\\"E/go ; s/\\314/\\`I/go  ;
-s/\\315/\\'I/go  ; s/\\316/\\^I/go ; s/\\317/\\"I/go  ;
-s/\\321/\\~N/go  ; s/\\322/\\`O/go ; s/\\323/\\'O/go  ;
-s/\\324/\\^O/go  ; s/\\325/\\~O/go ; s/\\326/\\"O/go  ;
-s/\\330/\\\/O/go ; s/\\331/\\`U/go ; s/\\332/\\'U/go  ; 
-s/\\333/\\^U/go  ; s/\\334/\\"U/go ; s/\\335/\\'Y/go  ;
-s/\\337/\\SS/go  ; s/\\340/\\`a/go ; s/\\341/\\'a/go  ;
-s/\\342/\\^a/go  ; s/\\343/\\~a/go ; s/\\344/\\"a/go  ; 
-s/\\345/\\oa/go  ; s/\\346/\\ae/go ; s/\\347/\\,c/go  ; 
-s/\\350/\\`e/go  ; s/\\351/\\'e/go ; s/\\352/\\^e/go  ;
-s/\\353/\\"e/go  ; s/\\354/\\`i/go ; s/\\355/\\'i/go  ;
-s/\\356/\\^i/go  ; s/\\357/\\"i/go ; s/\\361/\\~n/go  ;
-s/\\362/\\`o/go  ; s/\\363/\\'o/go ; s/\\364/\\^o/go  ;
-s/\\365/\\~o/go  ; s/\\366/\\"o/go ; s/\\370/\\\/o/go ;
-s/\\371/\\`u/go  ; s/\\372/\\'u/go ; s/\\373/\\^u/go  ;
-s/\\374/\\"u/go  ; s/\\375/\\'y/go ; s/\\377/\\"y/go  ;
-
-s/\\(\d\d\d)/[$1]/go  ; 
-
-while (s/(\d+)(\s+\d+\s+obj)(.*?)endobj/saveobject($1,$3)/goe) { } 
-
-$wrap::columns = 80 ; 
-
-foreach $key (sort keys %stack) 
-  { print TAN wrap("","",$stack{$key}) } 
-
-close (PDF) ; close (FDF) ; close (TAN) ; 
-
-if (open (TAN,">fdf-tan.tex")) 
-  { print TAN "% interface=en output=pdftex\n\n"    .
-              "\\setupcolors[state=start]\n\n"      .
-              "\\setupinteraction[state=start]\n\n" .
-              "\\setupbodyfont[pos,10pt]\n\n"       .
-              "\\starttext\n\n"                     . 
-              "\\usemodule[fdfann]\n\n"             .
-              "\\annotatepages[$filename]\n\n"      .
-              "\\stoptext\n" ; 
-    close (TAN) } 
-
-print "$nn annotations found, run 'texexec fdf-tan'\n" ; 
diff --git a/Master/texmf-dist/scripts/context/perl/fdf2tex.pl b/Master/texmf-dist/scripts/context/perl/fdf2tex.pl
deleted file mode 100644
index f9684cd9f21..00000000000
--- a/Master/texmf-dist/scripts/context/perl/fdf2tex.pl
+++ /dev/null
@@ -1,213 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
-        if 0;
-
-# not yet public 
-
-# We're dealing with:
-
-$InpFile = $ARGV[0] ; $OutFile = $ARGV[1] ; $Field = $ARGV[2] ; 
-
-# beware: fields are funny sorted
-
-$Program = "fdf2tex 1.02 - ConTeXt / PRAGMA 1997-2000" ;
-
-if ($Field eq "") 
- { print "\n$Program\n\n" }
-
-# filter \type{filename.fdf} into \type{filename.fdt}
-
-unless ($OutFile)
-  { $OutFile = $InpFile ;
-    $OutFile =~ s/\..*// }
-
-unless ($InpFile=~/\./)
-  { if (-e "$InpFile.fdf") 
-      { $InpFile .= ".fdf" }
-    elsif (-e "$InpFile.xml") 
-      { $InpFile .= ".xml" } }
-
-unless ($OutFile=~/\./)
-  { $OutFile .= ".fdt" }
-
-if (open (FDF, "<$InpFile"))
-  { binmode FDF ;
-    open (FDT, ">$OutFile") ;
-    if ($Field eq "") 
-      { print "            input file : $InpFile\n" ;
-        print "           output file : $OutFile\n" } }
-else
-  { if ($Field eq "") 
-      { print "                 error : $InpFile not found\n" }
-    exit }
-
-# load the whole file in the buffer
-
-$_ = "" ; while ($Line=<FDF>) { chomp $Line; $_ .= $Line }
-
-# or faster: dan ///s gebruiken (ipv m) 
-
-# $/ = "\0777" ; $_ = <FDF> ;
-
-# zoom in on the objects and remove the header and trialer
-
-if ($InpFile =~ /\.xml$/) 
-
-{ # begin kind of xml alternative 
-
-s/\>\s*\</\>\</goms ; 
-$N = s/\<field\s+(.*?)\/\>/\\FDFfield\[$1\]\n/goms ;
-s/(name|value)\=\"(.*?)\"/$1=\{$2\}/goms ; 
-s/\} (name|value)/\}\,$1/goms ; 
-s/\<fdfobject\>(.*?)\<\/fdfobject\>/\\beginFDFobject\n$1\\endFDFobject\n/goms ; 
-s/\<fdfdata\>(.*?)\<\/fdfdata\>/\\beginFDFdata\n$1\\endFDFdata\n/goms ; 
-s/\<fdffields\>(.*?)\<\/fdffields\>/\\beginFDFfields\n$1\\endFDFfields\n/goms ; 
-
-} # end kind of xml alternative 
-
-else 
-
-{ # begin fdf alternative
-
-s/.*?obj\s*?<<(.*?)>>\s*?endobj/\n\\beginFDFobject$1\n\\endFDFobject/go;
-s/trailer.*//;
-
-# zoom in on the FDF data
-
-s/\/FDF.*?<<(.*)>>/\n\\beginFDFdata$1\n\\endFDFdata/go;
-
-# zoom in on the Field collection and remove whatever else
-
-s/\/Fields.*?\[.*?<<.*?(.*).*?>>.*?\]/\n\\beginFDFfields<<$1>>\n\\endFDFfields/go;
-s/\\endFDFfields.*\n\\endFDFdata/\\endFDFfields\n\\endFDFdata/go;
-
-# tag each field
-
-$N = s/\<<(.*?)>>/\n\\FDFfield[$1]/go;
-
-# remove non relevant entries, but keep \type{/T} and \type{/V}
-
-s/\s*?\/[Kids|Opt]\s*?<<.*?>>//go;
-s/\s*?\/[Ff|setFf|ClrFf|F|SetF|ClrF]\s*?\d*?//go;
-s/\s*?\/[AP|A|AS]\s*?\[.*?\]//go;
-s/\s*?\/AS\s*?\/.*?\s//go;
-
-# format the field identifier
-
-s/(.*?)\/T.*?\((.*?)\)/$1 name=$2,/go;
-
-# format the value, which can be a name or string
-
-s/\/V\s?\((.*?)\)/value=\{$1\},/go;
-s/\/V\s?\/(.*?)[\s|\/]/value=\{$1\},/go;
-
-# sanitize some special \TeX\ tokens
-
-s/(\#|\$|\&|\^|\_|\|)/\\$1/go;
-
-# remove spaces and commas
-
-#s/\s?([name|value])/$1/go;
-s/\[\s*/\[/go;
-s/,\]/\]/go;
-
-# convert PDFDocEncoding
-
-s/\\225/\\\/L/ ;
-s/\\226/\\OE/ ;
-s/\\227/\\vS/ ;
-s/\\230/\\"Y/ ;
-s/\\231/\\vZ/ ;
-s/\\233/\\\/l/ ;
-s/\\234/\\oe/ ;
-s/\\235/\\vs/ ;
-s/\\236/\\vz/ ;
-s/\\253/\\<</ ;
-s/\\273/\\>>/ ;
-s/\\300/\\`A/ ;
-s/\\301/\\'A/ ;
-s/\\302/\\^A/ ;
-s/\\303/\\~A/ ;
-s/\\304/\\"A/ ;
-s/\\305/\\oA/ ;
-s/\\306/\\AE/ ;
-s/\\307/\\,C/ ;
-s/\\310/\\`E/ ;
-s/\\311/\\'E/ ;
-s/\\312/\\^E/ ;
-s/\\313/\\"E/ ;
-s/\\314/\\`I/ ;
-s/\\315/\\'I/ ;
-s/\\316/\\^I/ ;
-s/\\317/\\"I/ ;
-s/\\321/\\~N/ ;
-s/\\322/\\`O/ ;
-s/\\323/\\'O/ ;
-s/\\324/\\^O/ ;
-s/\\325/\\~O/ ;
-s/\\326/\\"O/ ;
-s/\\330/\\\/O/ ;
-s/\\331/\\`U/ ;
-s/\\332/\\'U/ ;
-s/\\333/\\^U/ ;
-s/\\334/\\"U/ ;
-s/\\335/\\'Y/ ;
-s/\\337/\\ss/ ;
-s/\\340/\\`a/ ;
-s/\\341/\\'a/ ;
-s/\\342/\\^a/ ;
-s/\\343/\\~a/ ;
-s/\\344/\\"a/ ;
-s/\\345/\\oa/ ;
-s/\\346/\\ae/ ;
-s/\\347/\\,c/ ;
-s/\\350/\\`e/ ;
-s/\\351/\\'e/ ;
-s/\\352/\\^e/ ;
-s/\\353/\\"e/ ;
-s/\\354/\\`i/ ;
-s/\\355/\\'i/ ;
-s/\\356/\\^i/ ;
-s/\\357/\\"i/ ;
-s/\\361/\\~n/ ;
-s/\\362/\\`o/ ;
-s/\\363/\\'o/ ;
-s/\\364/\\^o/ ;
-s/\\365/\\~o/ ;
-s/\\366/\\"o/ ;
-s/\\370/\\\/o/ ;
-s/\\371/\\`u/ ;
-s/\\372/\\'u/ ;
-s/\\373/\\^u/ ;
-s/\\374/\\"u/ ;
-s/\\375/\\'y/ ;
-s/\\377/\\"y/ ;
-
-s/\\\</\</ ; 
-s/\\\>/\>/ ; 
-s/\\\(/\(/ ; 
-s/\\\)/\)/ ; 
-s/\#/\\#/ ;
-
-# convert newline and return commands
-
-s/\\n/ /go;
-s/\\r/\\par /go;
-
-} # end fdf alternative 
-
-# flush buffer
-
-print FDT $_ ;
-
-close FDT ;
-close FDF ;
-
-# report some characteristics
-
-if ($Field eq "") 
-  { print "      number of fields : $N\n" }
-else 
-  { if (/\\FDFfield\[value\=\{(.*)\}\,\s*name=$Field/mos)
-      { print "$1" }       
-    elsif (/\\FDFfield\[name=$Field\,\s*value\=\{(.*)\}/mos)
-      { print "$1" } }      
diff --git a/Master/texmf-dist/tex/context/base/enco-uni.tex b/Master/texmf-dist/tex/context/base/enco-uni.tex
deleted file mode 100644
index c09c2e1bfb3..00000000000
--- a/Master/texmf-dist/tex/context/base/enco-uni.tex
+++ /dev/null
@@ -1,5 +0,0 @@
-% temporary module, needed for downward compatibility
-
-% \input regi-uni.tex 
-
-\endinput 
diff --git a/Master/texmf-dist/tex/context/base/font-map.tex b/Master/texmf-dist/tex/context/base/font-map.tex
deleted file mode 100644
index 33e7fd7ddc8..00000000000
--- a/Master/texmf-dist/tex/context/base/font-map.tex
+++ /dev/null
@@ -1,125 +0,0 @@
-%D \module
-%D   [     file=font-map,
-%D      version=1998.03.13,
-%D        title=\CONTEXT\ Font Macros,
-%D     subtitle=Postscript for Maps,
-%D       author=Taco Hoekwater,
-%D         date=\currentdate,
-%D    copyright=NTG Maps]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See licen-en.pdf for
-%C details.
-
-% NOT YET ADAPTED TO THE NEW FONT MACROS
-
-\startnotmode[localfonts]
-
-\definefontsynonym [Mono]             [pcrr7tn]   [encoding=texnansi]
-\definefontsynonym [MonoSlanted]      [pcrro7tn]  [encoding=texnansi]
-\definefontsynonym [MonoBold]         [pcrb7tn]   [encoding=texnansi]
-\definefontsynonym [MonoBoldSlanted]  [pcrbo7tn]  [encoding=texnansi]
-\definefontsynonym [MonoBoldItalic]   [pcrbo7tn]  [encoding=texnansi]
-
-\definefontsynonym [Serif]            [ptmr7d]   [encoding=texnansi]
-\definefontsynonym [SerifBold]        [ftb]      [encoding=texnansi]
-\definefontsynonym [SerifItalic]      [ptmri7d]  [encoding=texnansi]
-\definefontsynonym [SerifSlanted]     [ptmro9t]  [encoding=texnansi]
-\definefontsynonym [SerifBoldItalic]  [ftbi]     [encoding=texnansi]
-\definefontsynonym [SerifBoldSlanted] [ftbi]     [encoding=texnansi]
-\definefontsynonym [SerifCaps]        [ptmrc9t]  [encoding=texnansi]
-
-\definefontsynonym [Sans]             [ftl]      [encoding=texnansi]
-\definefontsynonym [SansBold]         [ftb]      [encoding=texnansi]
-\definefontsynonym [SansItalic]       [ftli]     [encoding=texnansi]
-\definefontsynonym [SansSlanted]      [ftli]     [encoding=texnansi]
-\definefontsynonym [SansBoldItalic]   [ftbi]     [encoding=texnansi]
-\definefontsynonym [SansBoldSlanted]  [ftbi]     [encoding=texnansi]
-\definefontsynonym [SansCaps]         [ftr]      [encoding=texnansi]
-
-\definefontsynonym [BigSerif]         [ptmr7t]   [encoding=texnansi]
-\definefontsynonym [BigSerifSlanted]  [ptmro7t]  [encoding=texnansi]
-
-\stopnotmode
-
-\startmode[localfonts]
-
-\definefontsynonym [BigSerif]         [Serif]
-\definefontsynonym [BigSerifSlanted]  [SerifSlanted]
-
-\stopmode
-
-\definebodyfont [14.4pt,12pt,11pt,10pt,9pt,8pt,7pt,6pt,5pt] [rm]
-  [tf=Serif            sa 1.06,
-   bf=SerifBold        sa 1,
-   it=SerifItalic      sa 1.06,
-   sl=SerifSlanted     sa 1.06,
-   bi=SerifBoldItalic  sa 1,
-   bs=SerifBoldSlanted sa 1,
-   sc=SerifCaps        sa 1.06]
-
-\definebodyfont [14.4pt,12pt,11pt,10pt,9pt,8pt] [rm]
-  [tfa=BigSerif         sa 1.200,
-   tfb=BigSerif         sa 1.440,
-   tfc=BigSerif         sa 1.728,
-   tfd=BigSerif         sa 2.074,
-   bfa=SerifBold        sa 1.200,
-   bfb=SerifBold        sa 1.440,
-   bfc=SerifBold        sa 1.728,
-   bfd=SerifBold        sa 2.074,
-   sla=BigSerifSlanted  sa 1.200,
-   slb=BigSerifSlanted  sa 1.440,
-   slc=BigSerifSlanted  sa 1.728,
-   sld=BigSerifSlanted  sa 2.074,
-   bsa=SerifBoldSlanted sa 1.200,
-   bsb=SerifBoldSlanted sa 1.440,
-   bsc=SerifBoldSlanted sa 1.728,
-   bsd=SerifBoldSlanted sa 2.074,
-   bia=SerifBoldItalic  sa 1.200,
-   bib=SerifBoldItalic  sa 1.440,
-   bic=SerifBoldItalic  sa 1.728,
-   bid=SerifBoldItalic  sa 2.074]
-
-\definebodyfont [22pt,17pt,14.4pt,12pt,11pt,10pt,9pt,8pt,7pt,6pt,5pt] [ss]
-  [tf=Sans            sa 1,
-   bf=SansBold        sa 1,
-   it=SansItalic      sa 1,
-   sl=SansSlanted     sa 1,
-   bs=SansBoldSlanted sa 1,
-   bi=SansBoldSlanted sa 1,
-   sc=SansCaps        sa .8,
-  tfa=Sans            sa 1.200,
-  tfb=Sans            sa 1.440,
-  tfc=Sans            sa 1.728,
-  tfd=Sans            sa 2.074,
-  bfa=SansBold        sa 1.200,
-  bfb=SansBold        sa 1.440,
-  bfc=SansBold        sa 1.728,
-  bfd=SansBold        sa 2.074,
-  bsa=SansBoldSlanted sa 1.200,
-  bsb=SansBoldSlanted sa 1.440,
-  bsc=SansBoldSlanted sa 1.728,
-  bsd=SansBoldSlanted sa 2.074]
-
-\definebodyfont [14.4pt,12pt,11pt,10pt,9pt,8pt,7pt,6pt,5pt] [tt]
-  [ tf=Mono            sa 1,
-    sl=MonoSlanted     sa 1,
-    bf=MonoBold        sa 1,
-    bs=MonoBoldSlanted sa 1,
-    bi=MonoBoldSlanted sa 1,
-   tfa=Mono            sa 1.200,
-   tfb=Mono            sa 1.440,
-   tfc=Mono            sa 1.728,
-   tfd=Mono            sa 2.074,
-   sla=MonoSlanted     sa 1.200,
-   slb=MonoSlanted     sa 1.440,
-   slc=MonoSlanted     sa 1.728,
-   sld=MonoSlanted     sa 2.074]
-
-%D The Courier font does not contain \TEX's visual space. The
-%D next definition offers an alternative.
-
-\def\controlspace%
-  {\hbox{\font\next=cmtt10 at \bodyfontsize\next\char32}}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/base/plus-rul.tex b/Master/texmf-dist/tex/context/base/plus-rul.tex
deleted file mode 100644
index 57d94cfb1a9..00000000000
--- a/Master/texmf-dist/tex/context/base/plus-rul.tex
+++ /dev/null
@@ -1,184 +0,0 @@
-%D \module
-%D   [       file=plus-rul,
-%D        version=2003.03.16,
-%D          title=\CONTEXT\ Plus Macros,
-%D       subtitle=Ruled Stuff Handling,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright=PRAGMA-ADE]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-\writestatus{loading}{Context Plus Macros / Ruled Content Handling}
-
-\unprotect
-
-%D \definesidebar[whow][rulecolor=green,distance=]
-%D
-%D \input tufte \par
-%D \startsidebar
-%D   \input tufte \par
-%D   \input tufte \par
-%D   \startsidebar[whow]
-%D     \input tufte \par
-%D     \input tufte \par
-%D     \input tufte
-%D   \stopsidebar \par
-%D   \input tufte \par
-%D   \input tufte
-%D \stopsidebar \par
-%D \input tufte \par
-%D \input tufte \par
-%D \startsidebar
-%D   \input tufte \par
-%D   \input tufte \par
-%D   \input tufte \par
-%D   \input tufte \par
-%D   \input tufte
-%D \stopsidebar \par
-%D \input tufte \par
-%D \input tufte \par
-%D \startsidebar
-%D   \input tufte
-%D   \input tufte
-%D   \input tufte
-%D   \input tufte
-%D   \input tufte
-%D \stopsidebar
-
-\newcounter\currentsidebar
-\newdimen  \sidebardistance
-
-\definesystemvariable{sr}
-
-\def\setupsidebars
-  {\dodoubleargument\dosetupsidebars}
-
-\def\dosetupsidebars[#1][#2]%
-  {\ifsecondargument
-     \getparameters[\??sr#1][#2]%
-   \else
-     \getparameters[\??sr][#1]%
-   \fi}
-
-% \setupMPvariables
-%   [mpos:bar]
-%   [linecolor=red,
-%    linewidth=2pt,
-%    distance=5pt]
-
-\setupsidebars
-  [\c!rulethickness=2pt,
-   \c!rulecolor=red,
-   \c!distance=.5\bodyfontsize]
-
-\def\definesidebar
-  {\dodoubleempty\dodefinesidebar}
-
-\def\dodefinesidebar[#1][#2]%
-  {\copyparameters
-     [\??sr#1][\??sr]
-     [\c!rulethickness,\c!rulecolor,\c!distance]%
-   \getparameters
-     [\??sr#1][#2]}
-
-\def\startsidebar
-  {\dosingleempty\dostartsidebar}
-
-\def\dostartsidebar[#1]%
-  {\bgroup
-   \dontleavehmode
-   \checktextbackgrounds
-   \doglobal\increment\currentsidebar
-   \doifelsenothing{#1}
-     {\advance\sidebardistance\@@srdistance}
-     {\doifelsevaluenothing{\??sr#1\c!distance}
-        {\advance\sidebardistance\@@srdistance}
-        {\sidebardistance\getvalue{\??sr#1\c!distance}}}%
-   \startpositionoverlay{text-1}%
-     \expanded{\setMPpositiongraphicrange
-       {b:side:\currentsidebar}%
-       {e:side:\currentsidebar}%
-       {mpos:bar}%
-       {self=side:\currentsidebar,
-        linewidth=\getvalue{\??sr#1\c!rulethickness},
-        linecolor=\getvalue{\??sr#1\c!rulecolor},
-        distance=\the\sidebardistance}}%
-   \stoppositionoverlay
-   \edef\stopsidebar{\noexpand\dostopsidebar{\currentsidebar}}%
-   \bpos{side:\currentsidebar}\ignorespaces}
-
-\def\dostopsidebar#1%
-  {\removelastspace\tpos{side:#1}\carryoverpar\egroup}
-
-\startMPpositionmethod{mpos:bar}
-  \startMPpositiongraphic{mpos:bar}{linecolor,linewidth,distance}%
-    StartPage ;
-      path p ; p :=
-      if \MPp\MPbself=\MPp\MPeself :
-        (xpart ulcorner Field[Text][Text],\MPy\MPbself+\MPh\MPbself) --
-        (xpart llcorner Field[Text][Text],\MPy\MPeself-\MPd\MPeself) ;
-      elseif RealPageNumber=\MPp\MPbself :
-        (xpart ulcorner Field[Text][Text],\MPy\MPbself+\MPh\MPbself) --
-        (llcorner Field[Text][Text]) ;
-      elseif RealPageNumber=\MPp\MPeself :
-        (ulcorner Field[Text][Text]) --
-        (xpart llcorner Field[Text][Text],\MPy\MPeself-\MPd\MPeself) ;
-      else :
-        (ulcorner Field[Text][Text]) --
-        (llcorner Field[Text][Text]) ;
-      fi ;
-      p := p shifted (-llcorner Field[Text][Text]-(\MPvar{distance},0)) ;
-      interim linecap := butt ;
-      draw p
-        withpen pencircle scaled \MPvar{linewidth}
-        withcolor \MPvar{linecolor} ;
-    StopPage ;
-  \stopMPpositiongraphic
-  \MPpositiongraphic{mpos:bar}{}%
-\stopMPpositionmethod
-
-%D We now reimplement the margin rules handler defined in
-%D \type {core-rul}:
-%D
-%D \setupmarginrules[level=5]
-%D
-%D \startmarginrule[1]
-%D First we set the level at~5. Next we typeset this first
-%D paragraph as a level~1 one. As expected no rule show up.
-%D \stopmarginrule
-%D
-%D \startmarginrule[5]
-%D The second paragraph is a level~5 one. As we can see here,
-%D the marginal rule gets a width according to its level.
-%D \stopmarginrule
-%D
-%D \startmarginrule[8]
-%D It will of course be no surprise that this third paragraph
-%D has a even thicker margin rule. This behavior can be
-%D overruled by specifying the width explictly.
-%D \stopmarginrule
-
-\definesidebar
-  [\v!margin]
-  [\c!rulecolor=\s!black,
-   \c!rulethickness=\@@karulethickness,
-   \c!distance=\dimexpr(\leftmargindistance-\@@karulethickness/2)]
-
-\def\complexstartmarginrule[#1]%
-  {\bgroup
-   \ifnum#1<\@@kalevel\relax
-     \let\stopmarginrule\egroup
-   \else
-     \def\@@kadefaultwidth{#1}%
-     \let\stopmarginrule\dostopmarginrule
-     \@EA\startsidebar\@EA[\@EA\v!margin\@EA]%
-   \fi}
-
-\def\dostopmarginrule
-  {\stopsidebar
-   \egroup}
-
-\protect \endinput
diff --git a/Master/texmf-dist/tex/context/base/regi-grk.tex b/Master/texmf-dist/tex/context/base/regi-grk.tex
deleted file mode 100644
index 848a4aba52f..00000000000
--- a/Master/texmf-dist/tex/context/base/regi-grk.tex
+++ /dev/null
@@ -1,117 +0,0 @@
-%D \module
-%D   [       file=regi-grk,
-%D        version=2003.03.01,
-%D          title=\CONTEXT\ Encoding Macros,
-%D       subtitle=Greek,
-%D         author=Apostolos Syropoulos,
-%D           date=\currentdate,
-%D      copyright=PRAGMA-ADE]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-\startregime[grk]
-
-%
-% Uppercase Greek letters
-%
-
-\defineactivetoken 193 {\greekAlpha}
-\defineactivetoken 194 {\greekBeta}
-\defineactivetoken 195 {\greekGamma}
-\defineactivetoken 196 {\greekDelta}
-\defineactivetoken 197 {\greekEpsilon}
-\defineactivetoken 198 {\greekZeta}
-\defineactivetoken 199 {\greekEta}
-\defineactivetoken 200 {\greekTheta}
-\defineactivetoken 201 {\greekIota}
-\defineactivetoken 202 {\greekKappa}
-\defineactivetoken 203 {\greekLambda}
-\defineactivetoken 204 {\greekMu}
-\defineactivetoken 205 {\greekNu}
-\defineactivetoken 206 {\greekXi}
-\defineactivetoken 207 {\greekOmicron}
-\defineactivetoken 208 {\greekPi}
-\defineactivetoken 209 {\greekRho}
-\defineactivetoken 211 {\greekSigma}
-\defineactivetoken 212 {\greekTau}
-\defineactivetoken 213 {\greekUpsilon}
-\defineactivetoken 214 {\greekPhi}
-\defineactivetoken 215 {\greekChi}
-\defineactivetoken 216 {\greekPsi}
-\defineactivetoken 217 {\greekOmega}
-
-%
-% Lowercase Greek letters
-%
-
-\defineactivetoken 225 {\greekalpha}
-\defineactivetoken 226 {\greekbeta}
-\defineactivetoken 227 {\greekgamma}
-\defineactivetoken 228 {\greekdelta}
-\defineactivetoken 229 {\greekepsilon}
-\defineactivetoken 230 {\greekzeta}
-\defineactivetoken 231 {\greeketa}
-\defineactivetoken 232 {\greektheta}
-\defineactivetoken 233 {\greekiota}
-\defineactivetoken 234 {\greekkappa}
-\defineactivetoken 235 {\greeklambda}
-\defineactivetoken 236 {\greekmu}
-\defineactivetoken 237 {\greeknu}
-\defineactivetoken 238 {\greekxi}
-\defineactivetoken 239 {\greekomicron}
-\defineactivetoken 240 {\greekpi}
-\defineactivetoken 241 {\greekrho}
-\defineactivetoken 242 {\greekfinalsigma}
-\defineactivetoken 243 {\greeksigma}
-\defineactivetoken 244 {\greektau}
-\defineactivetoken 245 {\greekupsilon}
-\defineactivetoken 246 {\greekphi}
-\defineactivetoken 247 {\greekchi}
-\defineactivetoken 248 {\greekpsi}
-\defineactivetoken 249 {\greekomega}
-
-%
-% Accented Uppercase Greek letters
-%
-
-\defineactivetoken 182 {\greekAlphatonos}
-\defineactivetoken 184 {\greekEpsilontonos}
-\defineactivetoken 185 {\greekEtatonos}
-\defineactivetoken 186 {\greekIotatonos}
-\defineactivetoken 188 {\greekOmicrontonos}
-\defineactivetoken 190 {\greekUpsilontonos}
-\defineactivetoken 191 {\greekOmegatonos}
-\defineactivetoken 218 {\greekIotadialytika}
-\defineactivetoken 219 {\greekUpsilondialytika}
-
-%
-% Accented Lowercase Greek letters
-%
-
-\defineactivetoken 220 {\greekalphatonos}
-\defineactivetoken 221 {\greekepsilontonos}
-\defineactivetoken 222 {\greeketatonos}
-\defineactivetoken 223 {\greekiotatonos}
-\defineactivetoken 252 {\greekomicrontonos}
-\defineactivetoken 253 {\greekupsilontonos}
-\defineactivetoken 254 {\greekomegatonos}
-\defineactivetoken 250 {\greekiotadialytika}
-\defineactivetoken 251 {\greekupsilondialytika}
-\defineactivetoken 192 {\greekiotadialytikatonos}
-\defineactivetoken 224 {\greekupsilondialytikatonos}
-
-%
-% Miscellaneous Greek symbols
-%
-
-\defineactivetoken 171 {\greekleftquot}
-\defineactivetoken 187 {\greekrightquot}
-\defineactivetoken 180 {\greektonos}
-\defineactivetoken 181 {\greekdialytikatonos}
-\defineactivetoken 162 {\greekapostrophos}
-
-\stopregime
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/base/regi-il1.tex b/Master/texmf-dist/tex/context/base/regi-il1.tex
deleted file mode 100644
index 7c1838feccb..00000000000
--- a/Master/texmf-dist/tex/context/base/regi-il1.tex
+++ /dev/null
@@ -1,154 +0,0 @@
-%D \module
-%D   [       file=regi-il1,
-%D        version=2000.05.07, 
-%D          title=\CONTEXT\ Encoding Macros,
-%D       subtitle=ISO Latin 1 keys,
-%D         author={Daniel Flipo, Hans Hagen, Denis Roegel},
-%D           date=\currentdate,
-%D      copyright=PRAGMA-ADE]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D This module is not yet finished since some characters 
-%D need to be mapped onto symbols, which is work in progress. 
-
-\startregime [il1]
-
-\defineactivetoken 180 {\textacute}
-\defineactivetoken 146 {\textacute}        % also see 180
-\defineactivetoken 150 {\textbreve}
-\defineactivetoken 159 {\textcaron}
-\defineactivetoken 184 {\textcedilla}
-\defineactivetoken 147 {\textcircumflex}
-\defineactivetoken 168 {\textdiaeresis}
-\defineactivetoken 151 {\textdotaccent}
-\defineactivetoken 145 {\textgrave}
-\defineactivetoken 157 {\texthungarumlaut}
-\defineactivetoken 175 {\textmacron}
-\defineactivetoken 149 {\textmacron}
-\defineactivetoken 158 {\textogonek}
-\defineactivetoken 154 {\textring}
-\defineactivetoken 148 {\texttilde}
-
-\defineactivetoken 144 {\dotlessi}
-
-\defineactivetoken 162 {\textcent} 
-\defineactivetoken 163 {\textsterling}
-\defineactivetoken 164 {\textcurrency} 
-\defineactivetoken 165 {\textyen} 
-
-\defineactivetoken 167 {\sectionmark}
-\defineactivetoken 182 {\paragraphmark}
-
-\defineactivetoken 171 {\ifvmode\leavevmode\fi\leftguillemot\prewordbreak}
-\defineactivetoken 187 {\prewordbreak\rightguillemot}
-
-\defineactivetoken 173 {\softhyphen} 
-\defineactivetoken 160 {\nonbreakablespace} % ? 
-
-\defineactivetoken 169 {\copyright}
-\defineactivetoken 174 {\registered} 
-
-\defineactivetoken 185 {\textonesuperior} 
-\defineactivetoken 178 {\texttwosuperior} 
-\defineactivetoken 179 {\textthreesuperior} 
-
-\defineactivetoken 188 {\textonequarter} 
-\defineactivetoken 189 {\textonehalf} 
-\defineactivetoken 190 {\textthreequarters} 
-
-%defineactivetoken 183 {\textperiodcentered} 
-
-\defineactivetoken 166 {\textbrokenbar} 
-\defineactivetoken 176 {\textdegree} 
-\defineactivetoken 247 {\textdiv} 
-\defineactivetoken 172 {\textlognot}
-\defineactivetoken 215 {\textmultiply} 
-\defineactivetoken 181 {\textmu} 
-\defineactivetoken 177 {\textpm} 
-
-\defineactivetoken 254 {\thorn}
-\defineactivetoken 222 {\Thorn}
-
-\defineactivetoken 223 {\ssharp}
-
-\defineactivetoken 208 {\Eth} 
-\defineactivetoken 240 {\eth} 
-
-\defineactivetoken 198 {\AEligature}
-\defineactivetoken 230 {\aeligature}
-
-\defineactivetoken 225 {\aacute}
-\defineactivetoken 193 {\Aacute}
-\defineactivetoken 233 {\eacute}
-\defineactivetoken 201 {\Eacute}
-\defineactivetoken 237 {\iacute}
-\defineactivetoken 205 {\Iacute}
-\defineactivetoken 243 {\oacute}
-\defineactivetoken 211 {\Oacute}
-\defineactivetoken 250 {\uacute}
-\defineactivetoken 218 {\Uacute}
-\defineactivetoken 253 {\yacute} 
-\defineactivetoken 221 {\Yacute} 
-
-\defineactivetoken 231 {\ccedilla}
-\defineactivetoken 199 {\Ccedilla}
-
-\defineactivetoken 226 {\acircumflex}
-\defineactivetoken 194 {\Acircumflex}
-\defineactivetoken 234 {\ecircumflex}
-\defineactivetoken 202 {\Ecircumflex}
-\defineactivetoken 238 {\icircumflex}
-\defineactivetoken 206 {\Icircumflex}
-\defineactivetoken 244 {\ocircumflex}
-\defineactivetoken 212 {\Ocircumflex}
-\defineactivetoken 251 {\ucircumflex}
-\defineactivetoken 219 {\Ucircumflex}
-
-\defineactivetoken 228 {\adiaeresis}
-\defineactivetoken 196 {\Adiaeresis}
-\defineactivetoken 235 {\ediaeresis}
-\defineactivetoken 203 {\Ediaeresis}
-\defineactivetoken 239 {\idiaeresis}
-\defineactivetoken 207 {\Idiaeresis}
-\defineactivetoken 246 {\odiaeresis}
-\defineactivetoken 214 {\Odiaeresis}
-\defineactivetoken 252 {\udiaeresis}
-\defineactivetoken 220 {\Udiaeresis}
-\defineactivetoken 255 {\ydiaeresis}
-
-\defineactivetoken 224 {\agrave}
-\defineactivetoken 192 {\Agrave}
-\defineactivetoken 232 {\egrave}
-\defineactivetoken 200 {\Egrave}
-\defineactivetoken 236 {\igrave}
-\defineactivetoken 204 {\Igrave}
-\defineactivetoken 242 {\ograve}
-\defineactivetoken 210 {\Ograve}
-\defineactivetoken 249 {\ugrave}
-\defineactivetoken 217 {\Ugrave}
-
-\defineactivetoken 229 {\aring}
-\defineactivetoken 197 {\Aring}
-
-\defineactivetoken 248 {\ostroke}
-\defineactivetoken 216 {\Ostroke}
-
-\defineactivetoken 227 {\atilde}
-\defineactivetoken 195 {\Atilde}
-\defineactivetoken 241 {\ntilde}
-\defineactivetoken 209 {\Ntilde}
-\defineactivetoken 245 {\otilde}
-\defineactivetoken 213 {\Otilde}
-
-\stopregime
-
-\endinput
-
-% \defineactivetoken 186 {\textordmasculine} 
-% \defineactivetoken 170 {\textordfeminine} 
-
-% \defineactivetoken 161 {!`}
-% \defineactivetoken 191 {?`}
diff --git a/Master/texmf-dist/tex/context/base/regi-lat.tex b/Master/texmf-dist/tex/context/base/regi-lat.tex
deleted file mode 100644
index 7c1666ac6e3..00000000000
--- a/Master/texmf-dist/tex/context/base/regi-lat.tex
+++ /dev/null
@@ -1,124 +0,0 @@
-%D \module
-%D   [     file=regi-lat,
-%D      version=2005.07.20, % 1999.11.16
-%D        title=\CONTEXT\ Encoding Macros,
-%D     subtitle=Iso Latin 2,
-%D       author={Mojca Miklavec \& Hans Hagen},
-%D         date=\currentdate,
-%D    copyright=PRAGMA-ADE]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D This file implements the ISO-8859-2 Central European character
-%D set.
-
-\startregime[latin2]
-
-\defineactivetoken 160 {\nonbreakablespace}         %   00A0 NO-BREAK SPACE
-\defineactivetoken 161 {\Aogonek}                   % ¡ 0104 LATIN CAPITAL LETTER A WITH OGONEK
-\defineactivetoken 162 {\textbreve}                 % ¢ 02D8 BREVE
-\defineactivetoken 163 {\Lstroke}                   % £ 0141 LATIN CAPITAL LETTER L WITH STROKE
-\defineactivetoken 164 {\textcurrency}              % ¤ 00A4 CURRENCY SIGN
-\defineactivetoken 165 {\Lcaron}                    % ¥ 013D LATIN CAPITAL LETTER L WITH CARON
-\defineactivetoken 166 {\Sacute}                    % ¦ 015A LATIN CAPITAL LETTER S WITH ACUTE
-\defineactivetoken 167 {\sectionmark}               % § 00A7 SECTION SIGN
-\defineactivetoken 168 {\textdiaeresis}             % ¨ 00A8 DIAERESIS
-\defineactivetoken 169 {\Scaron}                    % © 0160 LATIN CAPITAL LETTER S WITH CARON
-\defineactivetoken 170 {\Scedilla}                  % ª 015E LATIN CAPITAL LETTER S WITH CEDILLA
-\defineactivetoken 171 {\Tcaron}                    % « 0164 LATIN CAPITAL LETTER T WITH CARON
-\defineactivetoken 172 {\Zacute}                    % ¬ 0179 LATIN CAPITAL LETTER Z WITH ACUTE
-\defineactivetoken 173 {\softhyphen}                % ­ 00AD SOFT HYPHEN
-\defineactivetoken 174 {\Zcaron}                    % ® 017D LATIN CAPITAL LETTER Z WITH CARON
-\defineactivetoken 175 {\Zdotaccent}                % ¯ 017B LATIN CAPITAL LETTER Z WITH DOT ABOVE
-
-\defineactivetoken 176 {\textdegree}                % ° 00B0 DEGREE SIGN
-\defineactivetoken 177 {\aogonek}                   % ± 0105 LATIN SMALL LETTER A WITH OGONEK
-\defineactivetoken 178 {\textogonek}                % ² 02DB OGONEK
-\defineactivetoken 179 {\lstroke}                   % ³ 0142 LATIN SMALL LETTER L WITH STROKE
-\defineactivetoken 180 {\textacute}                 % ´ 00B4 ACUTE ACCENT
-\defineactivetoken 181 {\lcaron}                    % µ 013E LATIN SMALL LETTER L WITH CARON
-\defineactivetoken 182 {\sacute}                    % ¶ 015B LATIN SMALL LETTER S WITH ACUTE
-\defineactivetoken 183 {\textcaron}                 % · 02C7 CARON
-\defineactivetoken 184 {\textcedilla}               % ¸ 00B8 CEDILLA
-\defineactivetoken 185 {\scaron}                    % ¹ 0161 LATIN SMALL LETTER S WITH CARON
-\defineactivetoken 186 {\scedilla}                  % º 015F LATIN SMALL LETTER S WITH CEDILLA
-\defineactivetoken 187 {\tcaron}                    % » 0165 LATIN SMALL LETTER T WITH CARON
-\defineactivetoken 188 {\zacute}                    % ¼ 017A LATIN SMALL LETTER Z WITH ACUTE
-\defineactivetoken 189 {\texthungarumlaut}          % ½ 02DD DOUBLE ACUTE ACCENT
-\defineactivetoken 190 {\zcaron}                    % ¾ 017E LATIN SMALL LETTER Z WITH CARON
-\defineactivetoken 191 {\zdotaccent}                % ¿ 017C LATIN SMALL LETTER Z WITH DOT ABOVE
-
-\defineactivetoken 192 {\Racute}                    % À 0154 LATIN CAPITAL LETTER R WITH ACUTE
-\defineactivetoken 193 {\Aacute}                    % Á 00C1 LATIN CAPITAL LETTER A WITH ACUTE
-\defineactivetoken 194 {\Acircumflex}               % Â 00C2 LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-\defineactivetoken 195 {\Abreve}                    % Ã 0102 LATIN CAPITAL LETTER A WITH BREVE
-\defineactivetoken 196 {\Adiaeresis}                % Ä 00C4 LATIN CAPITAL LETTER A WITH DIAERESIS
-\defineactivetoken 197 {\Lacute}                    % Å 0139 LATIN CAPITAL LETTER L WITH ACUTE
-\defineactivetoken 198 {\Cacute}                    % Æ 0106 LATIN CAPITAL LETTER C WITH ACUTE
-\defineactivetoken 199 {\Ccedilla}                  % Ç 00C7 LATIN CAPITAL LETTER C WITH CEDILLA
-\defineactivetoken 200 {\Ccaron}                    % È 010C LATIN CAPITAL LETTER C WITH CARON
-\defineactivetoken 201 {\Eacute}                    % É 00C9 LATIN CAPITAL LETTER E WITH ACUTE
-\defineactivetoken 202 {\Eogonek}                   % Ê 0118 LATIN CAPITAL LETTER E WITH OGONEK
-\defineactivetoken 203 {\Ediaeresis}                % Ë 00CB LATIN CAPITAL LETTER E WITH DIAERESIS
-\defineactivetoken 204 {\Ecaron}                    % Ì 011A LATIN CAPITAL LETTER E WITH CARON
-\defineactivetoken 205 {\Iacute}                    % Í 00CD LATIN CAPITAL LETTER I WITH ACUTE
-\defineactivetoken 206 {\Icircumflex}               % Î 00CE LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-\defineactivetoken 207 {\Dcaron}                    % Ï 010E LATIN CAPITAL LETTER D WITH CARON
-
-\defineactivetoken 208 {\Dstroke}                   % Ð 0110 LATIN CAPITAL LETTER D WITH STROKE
-\defineactivetoken 209 {\Nacute}                    % Ñ 0143 LATIN CAPITAL LETTER N WITH ACUTE
-\defineactivetoken 210 {\Ncaron}                    % Ò 0147 LATIN CAPITAL LETTER N WITH CARON
-\defineactivetoken 211 {\Oacute}                    % Ó 00D3 LATIN CAPITAL LETTER O WITH ACUTE
-\defineactivetoken 212 {\Ocircumflex}               % Ô 00D4 LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-\defineactivetoken 213 {\Ohungarumlaut}             % Õ 0150 LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-\defineactivetoken 214 {\Odiaeresis}                % Ö 00D6 LATIN CAPITAL LETTER O WITH DIAERESIS
-\defineactivetoken 215 {\textmultiply}              % × 00D7 MULTIPLICATION SIGN
-\defineactivetoken 216 {\Rcaron}                    % Ø 0158 LATIN CAPITAL LETTER R WITH CARON
-\defineactivetoken 217 {\Uring}                     % Ù 016E LATIN CAPITAL LETTER U WITH RING ABOVE
-\defineactivetoken 218 {\Uacute}                    % Ú 00DA LATIN CAPITAL LETTER U WITH ACUTE
-\defineactivetoken 219 {\Uhungarumlaut}             % Û 0170 LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-\defineactivetoken 220 {\Udiaeresis}                % Ü 00DC LATIN CAPITAL LETTER U WITH DIAERESIS
-\defineactivetoken 221 {\Yacute}                    % Ý 00DD LATIN CAPITAL LETTER Y WITH ACUTE
-\defineactivetoken 222 {\Tcedilla}                  % Þ 0162 LATIN CAPITAL LETTER T WITH CEDILLA
-\defineactivetoken 223 {\ssharp}                    % ß 00DF LATIN SMALL LETTER SHARP S
-
-\defineactivetoken 224 {\racute}                    % à 0155 LATIN SMALL LETTER R WITH ACUTE
-\defineactivetoken 225 {\aacute}                    % á 00E1 LATIN SMALL LETTER A WITH ACUTE
-\defineactivetoken 226 {\acircumflex}               % â 00E2 LATIN SMALL LETTER A WITH CIRCUMFLEX
-\defineactivetoken 227 {\abreve}                    % ã 0103 LATIN SMALL LETTER A WITH BREVE
-\defineactivetoken 228 {\adiaeresis}                % ä 00E4 LATIN SMALL LETTER A WITH DIAERESIS
-\defineactivetoken 229 {\lacute}                    % å 013A LATIN SMALL LETTER L WITH ACUTE
-\defineactivetoken 230 {\cacute}                    % æ 0107 LATIN SMALL LETTER C WITH ACUTE
-\defineactivetoken 231 {\ccedilla}                  % ç 00E7 LATIN SMALL LETTER C WITH CEDILLA
-\defineactivetoken 232 {\ccaron}                    % è 010D LATIN SMALL LETTER C WITH CARON
-\defineactivetoken 233 {\eacute}                    % é 00E9 LATIN SMALL LETTER E WITH ACUTE
-\defineactivetoken 234 {\eogonek}                   % ê 0119 LATIN SMALL LETTER E WITH OGONEK
-\defineactivetoken 235 {\ediaeresis}                % ë 00EB LATIN SMALL LETTER E WITH DIAERESIS
-\defineactivetoken 236 {\ecaron}                    % ì 011B LATIN SMALL LETTER E WITH CARON
-\defineactivetoken 237 {\iacute}                    % í 00ED LATIN SMALL LETTER I WITH ACUTE
-\defineactivetoken 238 {\icircumflex}               % î 00EE LATIN SMALL LETTER I WITH CIRCUMFLEX
-\defineactivetoken 239 {\dcaron}                    % ï 010F LATIN SMALL LETTER D WITH CARON
-
-\defineactivetoken 240 {\dstroke}                   % ð 0111 LATIN SMALL LETTER D WITH STROKE
-\defineactivetoken 241 {\nacute}                    % ñ 0144 LATIN SMALL LETTER N WITH ACUTE
-\defineactivetoken 242 {\ncaron}                    % ò 0148 LATIN SMALL LETTER N WITH CARON
-\defineactivetoken 243 {\oacute}                    % ó 00F3 LATIN SMALL LETTER O WITH ACUTE
-\defineactivetoken 244 {\ocircumflex}               % ô 00F4 LATIN SMALL LETTER O WITH CIRCUMFLEX
-\defineactivetoken 245 {\ohungarumlaut}             % õ 0151 LATIN SMALL LETTER O WITH DOUBLE ACUTE
-\defineactivetoken 246 {\odiaeresis}                % ö 00F6 LATIN SMALL LETTER O WITH DIAERESIS
-\defineactivetoken 247 {\textdiv}                   % ÷ 00F7 DIVISION SIGN
-\defineactivetoken 248 {\rcaron}                    % ø 0159 LATIN SMALL LETTER R WITH CARON
-\defineactivetoken 249 {\uring}                     % ù 016F LATIN SMALL LETTER U WITH RING ABOVE
-\defineactivetoken 250 {\uacute}                    % ú 00FA LATIN SMALL LETTER U WITH ACUTE
-\defineactivetoken 251 {\uhungarumlaut}             % û 0171 LATIN SMALL LETTER U WITH DOUBLE ACUTE
-\defineactivetoken 252 {\udiaeresis}                % ü 00FC LATIN SMALL LETTER U WITH DIAERESIS
-\defineactivetoken 253 {\yacute}                    % ý 00FD LATIN SMALL LETTER Y WITH ACUTE
-\defineactivetoken 254 {\tcedilla}                  % þ 0163 LATIN SMALL LETTER T WITH CEDILLA
-\defineactivetoken 255 {\textdotaccent}             % ÿ 02D9 DOT ABOVE
-
-\stopregime
-
-\endinput
-
diff --git a/Master/texmf-dist/tex/context/base/regi-win.tex b/Master/texmf-dist/tex/context/base/regi-win.tex
deleted file mode 100644
index c9a301dff27..00000000000
--- a/Master/texmf-dist/tex/context/base/regi-win.tex
+++ /dev/null
@@ -1,150 +0,0 @@
-%D \module
-%D   [       file=regi-win,
-%D        version=1997.08.29,
-%D          title=\CONTEXT\ Encoding Macros,
-%D       subtitle=Windows 1252 ANSI keys,
-%D         author={Tobias Burnus \& Hans Hagen \& Victor Figurnov},
-%D           date=\currentdate,
-%D      copyright=PRAGMA-ADE]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D This module activates the (western) \MSWINDOWS\ high \ANSI\
-%D characters, such as ë and á.
-
-\startregime [windows]
-
-\defineactivetoken 128 {\texteuro}
-\defineactivetoken 129 {\unknownchar}
-\defineactivetoken 130 {\lowerleftsingleninequote}
-\defineactivetoken 131 {\textflorin}
-\defineactivetoken 132 {\lowerleftdoubleninequote}
-\defineactivetoken 133 {\dots}
-\defineactivetoken 134 {\textdag}
-\defineactivetoken 135 {\textddag}
-\defineactivetoken 136 {\textcircumflex}
-\defineactivetoken 137 {\perthousand}
-\defineactivetoken 138 {\Scaron}
-\defineactivetoken 139 {\leftsubguillemot}
-\defineactivetoken 140 {\OEligature}
-\defineactivetoken 141 {\unknownchar}
-\defineactivetoken 142 {\unknownchar}
-\defineactivetoken 143 {\unknownchar}
-\defineactivetoken 144 {\unknownchar}
-\defineactivetoken 145 {\upperleftsinglesixquote}
-\defineactivetoken 146 {\upperrightsingleninequote}
-\defineactivetoken 147 {\upperleftdoublesixquote}
-\defineactivetoken 148 {\upperrightdoubleninequote}
-\defineactivetoken 149 {\textbullet}
-\defineactivetoken 150 {\endash}
-\defineactivetoken 151 {\emdash}
-\defineactivetoken 152 {\texttilde}
-\defineactivetoken 153 {\trademark}
-\defineactivetoken 154 {\scaron}
-\defineactivetoken 155 {\rightsubguillemot}
-\defineactivetoken 156 {\oeligature}
-\defineactivetoken 157 {\unknownchar}
-\defineactivetoken 158 {\unknownchar}
-\defineactivetoken 159 {\Ydiaeresis}
-\defineactivetoken 160 {\nonbreakablespace}
-\defineactivetoken 161 {\exclamdown}
-\defineactivetoken 162 {\textcent}
-\defineactivetoken 163 {\textsterling}
-\defineactivetoken 164 {\textcurrency}
-\defineactivetoken 165 {\textyen}
-\defineactivetoken 166 {\textbrokenbar}
-\defineactivetoken 167 {\sectionmark}
-\defineactivetoken 168 {\textdiaeresis}
-\defineactivetoken 169 {\copyright}
-\defineactivetoken 170 {\ordfeminine}
-\defineactivetoken 171 {\leftguillemot}
-\defineactivetoken 172 {\textlognot}
-\defineactivetoken 173 {\hyphen}
-\defineactivetoken 174 {\registered}
-\defineactivetoken 175 {\textmacron}
-\defineactivetoken 176 {\textdegree}
-\defineactivetoken 177 {\textpm}
-\defineactivetoken 178 {\twosuperior}
-\defineactivetoken 179 {\threesuperior}
-\defineactivetoken 180 {\textacute}
-\defineactivetoken 181 {\textmu}
-\defineactivetoken 182 {\paragraphmark}
-\defineactivetoken 183 {\periodcentered}
-\defineactivetoken 184 {\textcedilla}
-\defineactivetoken 185 {\onesuperior}
-\defineactivetoken 186 {\ordmasculine}
-\defineactivetoken 187 {\rightguillemot}
-\defineactivetoken 188 {\onequarter}
-\defineactivetoken 189 {\onehalf}
-\defineactivetoken 190 {\threequarter}
-\defineactivetoken 191 {\questiondown}
-\defineactivetoken 192 {\Agrave}
-\defineactivetoken 193 {\Aacute}
-\defineactivetoken 194 {\Acircumflex}
-\defineactivetoken 195 {\Atilde}
-\defineactivetoken 196 {\Adiaeresis}
-\defineactivetoken 197 {\Aring}
-\defineactivetoken 198 {\AEligature}
-\defineactivetoken 199 {\Ccedilla}
-\defineactivetoken 200 {\Egrave}
-\defineactivetoken 201 {\Eacute}
-\defineactivetoken 202 {\Ecircumflex}
-\defineactivetoken 203 {\Ediaeresis}
-\defineactivetoken 204 {\Igrave}
-\defineactivetoken 205 {\Iacute}
-\defineactivetoken 206 {\Icircumflex}
-\defineactivetoken 207 {\Idiaeresis}
-\defineactivetoken 208 {\Eth}
-\defineactivetoken 209 {\Ntilde}
-\defineactivetoken 210 {\Ograve}
-\defineactivetoken 211 {\Oacute}
-\defineactivetoken 212 {\Ocircumflex}
-\defineactivetoken 213 {\Otilde}
-\defineactivetoken 214 {\Odiaeresis}
-\defineactivetoken 215 {\textmultiply}
-\defineactivetoken 216 {\Ostroke}
-\defineactivetoken 217 {\Ugrave}
-\defineactivetoken 218 {\Uacute}
-\defineactivetoken 219 {\Ucircumflex}
-\defineactivetoken 220 {\Udiaeresis}
-\defineactivetoken 221 {\Ygrave}
-\defineactivetoken 222 {\thorn}
-\defineactivetoken 223 {\ssharp}
-\defineactivetoken 224 {\agrave}
-\defineactivetoken 225 {\aacute}
-\defineactivetoken 226 {\acircumflex}
-\defineactivetoken 227 {\atilde}
-\defineactivetoken 228 {\adiaeresis}
-\defineactivetoken 229 {\aring}
-\defineactivetoken 230 {\aeligature}
-\defineactivetoken 231 {\ccedilla}
-\defineactivetoken 232 {\egrave}
-\defineactivetoken 233 {\eacute}
-\defineactivetoken 234 {\ecircumflex}
-\defineactivetoken 235 {\ediaeresis}
-\defineactivetoken 236 {\igrave}
-\defineactivetoken 237 {\iacute}
-\defineactivetoken 238 {\icircumflex}
-\defineactivetoken 239 {\idiaeresis}
-\defineactivetoken 240 {\eth}
-\defineactivetoken 241 {\ntilde}
-\defineactivetoken 242 {\ograve}
-\defineactivetoken 243 {\oacute}
-\defineactivetoken 244 {\ocircumflex}
-\defineactivetoken 245 {\otilde}
-\defineactivetoken 246 {\odiaeresis}
-\defineactivetoken 247 {\textdiv}
-\defineactivetoken 248 {\ostroke}
-\defineactivetoken 249 {\ugrave}
-\defineactivetoken 250 {\uacute}
-\defineactivetoken 251 {\ucircumflex}
-\defineactivetoken 252 {\udiaeresis}
-\defineactivetoken 253 {\ygrave}
-\defineactivetoken 254 {\Thorn}
-\defineactivetoken 255 {\ydiaeresis}
-
-\stopregime
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/base/sort-new.tex b/Master/texmf-dist/tex/context/base/sort-new.tex
deleted file mode 100644
index cc6d6983d66..00000000000
--- a/Master/texmf-dist/tex/context/base/sort-new.tex
+++ /dev/null
@@ -1,59 +0,0 @@
-% temporary overloading
-
-\unprotect
-
-\def\strippedcsname
-  {\expandafter\dostrippedcsname\string}
-
-\def\dostrippedcsname#1%
-  {\if\noexpand#1\letterbackslash\else#1\fi}
-
-\def\doregisterreference[#1]#2%
-  {\doifvalue{\??id#1\c!referencing}\v!on
-     {\pagereference[#1:\strippedcsname#2]}}
-
-\def\doprocesspageregister[#1]#2#3% key altnum entry
-  {\begingroup
-   \thisisnextinternal\s!ind
-   \ifduplicate\getlastregisterentry{#3}\fi
-   \convertexpanded{\registerparameter\c!keyexpansion}{#1}\asciiregisterentryA
-   \convertexpanded{\registerparameter\c!expansion   }{#3}\asciiregisterentryB
-   \doifsomething{\registerparameter\c!keyexpansion}
-     {\ifx\asciiregisterentryA\empty
-       \convertexpanded{\registerparameter\c!keyexpansion}{#3}\asciiregisterentryA
-      \fi}%
-   \makesectionformat
-   \doifelse{\registerparameter\c!ownnumber}\v!yes
-     \donetrue\donefalse
-   % the spaces between } { are essential for texutil's split
-   \expanded
-     {\writeutility%
-        {r \ifcase\registerpagestatus\space\or e \or f \or t \fi
-         {\currentregister} %
-         {\nextinternalreference} %
-         {\asciiregisterentryA} %
-         {\asciiregisterentryB} %
-         {\sectionformat\sectionseparator\sectionseparator
-          \ifdone#2\else\noexpand\pagenumber\fi} %
-         {\noexpand\realfolio}}}%
-   \getfirstcharacter\currentregister
-   \registerinfo{> \firstcharacter}{#3}%
-   \endgroup}
-
-\def\convertmeaning#1\to % watch the double expansion !
-  {\bgroup
-     \honorunexpanded
-     %dontexpandencoding    % new
-     \literateencodedtokens % newer
-     \xdef\@@globalexpanded{#1}%
-     \xdef\@@globalexpanded{\@@globalexpanded}%
-   \egroup
-   \convertcommand\@@globalexpanded\to}
-
-\def\reduceargument#1\to#2%
-  {\begingroup
-   \reducetocoding[raw]%
-   \edef\ascii{#1}%
-   \expandafter\endgroup\expandafter\edef\expandafter#2\expandafter{\ascii}}
-
-\protect