this is context 2009.08.19 17:10

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

11 files changed, 170 insertions, 1119 deletions

diff --git a/Master/texmf-dist/fonts/enc/dvips/context/lm-ec-os.enc b/Master/texmf-dist/fonts/enc/dvips/context/lm-ec-os.enc
deleted file mode 100644
index 6bb22f31985..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/context/lm-ec-os.enc
+++ /dev/null
@@ -1,258 +0,0 @@
-/enclmec[
-/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
-/zero.oldstyle
-/one.oldstyle
-/two.oldstyle
-/three.oldstyle
-/four.oldstyle
-/five.oldstyle
-/six.oldstyle
-/seven.oldstyle
-/eight.oldstyle
-/nine.oldstyle
-/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
-/Scedilla
-/Tcaron
-/Tcedilla
-/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
-/scedilla
-/tcaron
-/tcedilla
-/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/lm-qx-os.enc b/Master/texmf-dist/fonts/enc/dvips/context/lm-qx-os.enc
deleted file mode 100644
index 6f4fd6bfc51..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/context/lm-qx-os.enc
+++ /dev/null
@@ -1,258 +0,0 @@
-/enclmqx[
-/.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
-/zero.oldstyle
-/one.oldstyle
-/two.oldstyle
-/three.oldstyle
-/four.oldstyle
-/five.oldstyle
-/six.oldstyle
-/sevev.oldstyle
-/eight.oldstyle
-/nine.oldstyle
-/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/lm-qxtt-os.enc b/Master/texmf-dist/fonts/enc/dvips/context/lm-qxtt-os.enc
deleted file mode 100644
index 905a34fd9f4..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/context/lm-qxtt-os.enc
+++ /dev/null
@@ -1,258 +0,0 @@
-/enclmqxtt[
-/.notdef
-/Delta
-/.notdef
-/.notdef
-/.notdef
-/Pi
-/Sigma
-/mu
-/ellipsis
-/.notdef
-/Omega
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/dotlessi
-/dotlessj
-/grave
-/acute
-/caron
-/breve
-/macron
-/ring
-/cedilla
-/germandbls
-/ae
-/oe
-/oslash
-/AE
-/OE
-/Oslash
-/visiblespace
-/exclam
-/quotedbl
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
-/zero.oldstyle
-/one.oldstyle
-/two.oldstyle
-/three.oldstyle
-/four.oldstyle
-/five.oldstyle
-/six.oldstyle
-/seven.oldstyle
-/eight.oldstyle
-/nine.oldstyle
-/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
-/dieresis
-/Euro
-/Aogonek
-/Cacute
-/.notdef
-/.notdef
-/.notdef
-/Eogonek
-/Iogonek
-/.notdef
-/.notdef
-/Lslash
-/Nacute
-/.notdef
-/.notdef
-/.notdef
-/dagger
-/daggerdbl
-/Sacute
-/Scaron
-/Scommaaccent
-/degree
-/Tcommaaccent
-/ogonek
-/Uogonek
-/Ydieresis
-/Zacute
-/Zcaron
-/Zdotaccent
-/.notdef
-/.notdef
-/.notdef
-/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
-/.notdef
-/periodcentered
-/.notdef
-/quotesingle
-/Agrave
-/Aacute
-/Acircumflex
-/Atilde
-/Adieresis
-/Aring
-/.notdef
-/Ccedilla
-/Egrave
-/Eacute
-/Ecircumflex
-/Edieresis
-/Igrave
-/Iacute
-/Icircumflex
-/Idieresis
-/Eth
-/Ntilde
-/Ograve
-/Oacute
-/Ocircumflex
-/Otilde
-/Odieresis
-/currency
-/perthousand
-/Ugrave
-/Uacute
-/Ucircumflex
-/Udieresis
-/Yacute
-/Thorn
-/.notdef
-/agrave
-/aacute
-/acircumflex
-/atilde
-/adieresis
-/aring
-/.notdef
-/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/lm-t5-os.enc b/Master/texmf-dist/fonts/enc/dvips/context/lm-t5-os.enc
deleted file mode 100644
index 4ff792fb7e1..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/context/lm-t5-os.enc
+++ /dev/null
@@ -1,258 +0,0 @@
-/enclmt5[
-/grave
-/acute
-/circumflex
-/tilde
-/dieresis
-/dotbelow
-/ring
-/caron
-/breve
-/macron
-/dotaccent
-/cedilla
-/hookabove
-/quotesinglbase
-/guilsinglleft
-/guilsinglright
-/quotedblleft
-/quotedblright
-/quotedblbase
-/guillemotleft
-/guillemotright
-/endash
-/emdash
-/cwm
-/perthousandzero
-/dotlessi
-/Yhookabove
-/yhookabove
-/Ydotbelow
-/ydotbelow
-/Dcroat
-/dcroat
-/visiblespace
-/exclam
-/quotedbl
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
-/zero.oldstyle
-/one.oldstyle
-/two.oldstyle
-/three.oldstyle
-/four.oldstyle
-/five.oldstyle
-/six.oldstyle
-/seven.oldstyle
-/eight.oldstyle
-/nine.oldstyle
-/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
-/sfthyphen
-/Agrave
-/Aacute
-/Atilde
-/Ahookabove
-/Adotbelow
-/Acircumflex
-/Acircumflexgrave
-/Acircumflexacute
-/Acircumflextilde
-/Acircumflexhookabove
-/Acircumflexdotbelow
-/Abreve
-/Abrevegrave
-/Abreveacute
-/Abrevetilde
-/Abrevehookabove
-/Abrevedotbelow
-/Egrave
-/Eacute
-/Etilde
-/Ehookabove
-/Edotbelow
-/Ecircumflex
-/Ecircumflexgrave
-/Ecircumflexacute
-/Ecircumflextilde
-/Ecircumflexhookabove
-/Ecircumflexdotbelow
-/Igrave
-/Iacute
-/Itilde
-/Ihookabove
-/agrave
-/aacute
-/atilde
-/ahookabove
-/adotbelow
-/acircumflex
-/acircumflexgrave
-/acircumflexacute
-/acircumflextilde
-/acircumflexhookabove
-/acircumflexdotbelow
-/abreve
-/abrevegrave
-/abreveacute
-/abrevetilde
-/abrevehookabove
-/abrevedotbelow
-/egrave
-/eacute
-/etilde
-/ehookabove
-/edotbelow
-/ecircumflex
-/ecircumflexgrave
-/ecircumflexacute
-/ecircumflextilde
-/ecircumflexhookabove
-/ecircumflexdotbelow
-/igrave
-/iacute
-/itilde
-/ihookabove
-/Idotbelow
-/Ograve
-/Oacute
-/Otilde
-/Ohookabove
-/Odotbelow
-/Ocircumflex
-/Ocircumflexgrave
-/Ocircumflexacute
-/Ocircumflextilde
-/Ocircumflexhookabove
-/Ocircumflexdotbelow
-/Ohorn
-/Ohorngrave
-/Ohornacute
-/Ohorntilde
-/Ohornhookabove
-/Ohorndotbelow
-/Ugrave
-/Uacute
-/Utilde
-/Uhookabove
-/Udotbelow
-/Uhorn
-/Uhorngrave
-/Uhornacute
-/Uhorntilde
-/Uhornhookabove
-/Uhorndotbelow
-/Ygrave
-/Yacute
-/Ytilde
-/idotbelow
-/ograve
-/oacute
-/otilde
-/ohookabove
-/odotbelow
-/ocircumflex
-/ocircumflexgrave
-/ocircumflexacute
-/ocircumflextilde
-/ocircumflexhookabove
-/ocircumflexdotbelow
-/ohorn
-/ohorngrave
-/ohornacute
-/ohorntilde
-/ohornhookabove
-/ohorndotbelow
-/ugrave
-/uacute
-/utilde
-/uhookabove
-/udotbelow
-/uhorn
-/uhorngrave
-/uhornacute
-/uhorntilde
-/uhornhookabove
-/uhorndotbelow
-/ygrave
-/yacute
-/ytilde
-] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/context/lm-texnansi-os.enc b/Master/texmf-dist/fonts/enc/dvips/context/q-8r.enc
index 059dd788b6d..be8b3261327 100644
--- a/Master/texmf-dist/fonts/enc/dvips/context/lm-texnansi-os.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/context/q-8r.enc
@@ -1,36 +1,42 @@
-/enclmtexnansi[
+% This file could belong to the TeX Gyre collection of fonts,
+% but is only needed and thus distributed with ConTeXt macro package.
+%
+% It provides 8r encoding compatible with TeX Gyre fonts and is used to enable
+% substituting Adobe fonts by TeX Gyre in pxfonts & txfonts.
+%
+/encq8r [
 /.notdef
-/Euro
-/.notdef
-/.notdef
-/fraction
 /dotaccent
+/fi
+/fl
+/fraction
 /hungarumlaut
+/Lslash
+/lslash
 /ogonek
-/fl
+/ring
 /.notdef
-/cwm
-/ff
-/fi
+/breve
+/minus
 /.notdef
-/ffi
-/ffl
+/Zcaron
+/zcaron
+/caron
 /dotlessi
 /dotlessj
+/ff
+/ffi
+/ffl
+/notequal
+/infinity
+/lessequal
+/greaterequal
+/partialdiff
+/summation
+/product
+/pi
 /grave
-/acute
-/caron
-/breve
-/macron
-/ring
-/cedilla
-/germandbls
-/ae
-/oe
-/oslash
-/AE
-/OE
-/Oslash
+/quotesingle
 /space
 /exclam
 /quotedbl
@@ -47,16 +53,16 @@
 /hyphen
 /period
 /slash
-/zero.oldstyle
-/one.oldstyle
-/two.oldstyle
-/three.oldstyle
-/four.oldstyle
-/five.oldstyle
-/six.oldstyle
-/seven.oldstyle
-/eight.oldstyle
-/nine.oldstyle
+/zero
+/one
+/two
+/three
+/four
+/five
+/six
+/seven
+/eight
+/nine
 /colon
 /semicolon
 /less
@@ -93,7 +99,7 @@
 /bracketleft
 /backslash
 /bracketright
-/circumflex
+/asciicircum
 /underscore
 /quoteleft
 /a
@@ -125,41 +131,41 @@
 /braceleft
 /bar
 /braceright
-/tilde
-/dieresis
-/Lslash
-/quotesingle
+/asciitilde
+/.notdef
+/Euro
+/integral
 /quotesinglbase
 /florin
 /quotedblbase
 /ellipsis
 /dagger
 /daggerdbl
-/circumflex.dup
+/circumflex
 /perthousand
 /Scaron
 /guilsinglleft
-/OE.dup
-/Zcaron
-/asciicircum
-/minus
-/lslash
-/quoteleft.dup
-/quoteright.dup
+/OE
+/Omega
+/radical
+/approxequal
+/.notdef
+/.notdef
+/.notdef
 /quotedblleft
 /quotedblright
 /bullet
 /endash
 /emdash
-/tilde.dup
+/tilde
 /trademark
 /scaron
 /guilsinglright
-/oe.dup
-/zcaron
-/asciitilde
+/oe
+/Delta
+/lozenge
 /Ydieresis
-/nbspace
+/.notdef
 /exclamdown
 /cent
 /sterling
@@ -167,24 +173,24 @@
 /yen
 /brokenbar
 /section
-/dieresis.dup
+/dieresis
 /copyright
 /ordfeminine
 /guillemotleft
 /logicalnot
-/sfthyphen
+/hyphen
 /registered
-/macron.dup
+/macron
 /degree
 /plusminus
-/twosuperior
-/threesuperior
-/acute.dup
+/two.superior
+/three.superior
+/acute
 /mu
 /paragraph
 /periodcentered
-/cedilla.dup
-/onesuperior
+/cedilla
+/one.superior
 /ordmasculine
 /guillemotright
 /onequarter
@@ -197,7 +203,7 @@
 /Atilde
 /Adieresis
 /Aring
-/AE.dup
+/AE
 /Ccedilla
 /Egrave
 /Eacute
@@ -215,21 +221,21 @@
 /Otilde
 /Odieresis
 /multiply
-/Oslash.dup
+/Oslash
 /Ugrave
 /Uacute
 /Ucircumflex
 /Udieresis
 /Yacute
 /Thorn
-/germandbls.dup
+/germandbls
 /agrave
 /aacute
 /acircumflex
 /atilde
 /adieresis
 /aring
-/ae.dup
+/ae
 /ccedilla
 /egrave
 /eacute
@@ -247,7 +253,7 @@
 /otilde
 /odieresis
 /divide
-/oslash.dup
+/oslash
 /ugrave
 /uacute
 /ucircumflex
diff --git a/Master/texmf-dist/fonts/map/dvips/context/contnav.map b/Master/texmf-dist/fonts/map/dvips/context/contnav.map
new file mode 100644
index 00000000000..942798c579f
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/context/contnav.map
@@ -0,0 +1 @@
+contnav ContextNavigation <contnav.pfb
diff --git a/Master/texmf-dist/fonts/map/luatex/context/demo-font.lum b/Master/texmf-dist/fonts/map/luatex/context/demo-font.lum
new file mode 100644
index 00000000000..0beca031baa
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/luatex/context/demo-font.lum
@@ -0,0 +1,70 @@
+if not modules then modules = { } end modules ['demo-font.lum'] = {
+    version   = 1.001,
+    comment   = "companion to font-map.lua",
+    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
+    copyright = "PRAGMA ADE / ConTeXt Development Team",
+    license   = "see context related readme files"
+}
+
+--[[
+
+    After some testing Taco and I decided that the lack of information
+    with regards to unicode mapping of alternative shapes can best be
+    handled by an auxiliary table. So, here is an example. This file
+    gets its place in TDS in:
+
+        <texroot>/fonts/map/luatex/context/demo-file.lum
+
+    We recommend that you use a lowercase filename, just to prevent
+    lookup errors. Font filenames are already such a mess.
+
+    A test file, dedicated to Dohyun Kim is:
+
+        \usemodule[fnt-20]
+
+        \starttext
+
+        \definefontfeature
+          [otftracker-kozminprovi-regular]
+          [mode=node,vrt2=yes,script=latn]
+
+        \setvariables
+          [otftracker]
+          [font=kozminprovi-regular,
+           sample=\char"3002]
+
+        \stoptext
+
+    In the resulting pdf file you will then find:
+
+        begincmap
+        /CIDSystemInfo
+        << /Registry (TeX)
+        /Ordering (FNUMTE-KozMinProVI-Regular)
+        /Supplement 0
+        >> def
+        /CMapName /TeX-Identity-FNUMTE-KozMinProVI-Regular def
+        /CMapType 2 def
+        1 begincodespacerange
+        <0000> <FFFF>
+        endcodespacerange
+        0 beginbfrange
+        endbfrange
+        2 beginbfchar
+        <027B> <3002>
+        <1ED0> <3002>
+        endbfchar
+        endcmap
+
+    Of course this assumes that the font used is the same as we
+    have on our machines.
+
+]]--
+
+return {
+    version = 1.00,
+    fontname = "kozminprovi-regular.otf",
+    tounicode = {
+        ["Japan1.7888"] = 0x3002,
+    },
+}
diff --git a/Master/texmf-dist/fonts/map/pdftex/context/original-ams-euler.map b/Master/texmf-dist/fonts/map/pdftex/context/original-ams-euler.map
index ecbd65b77a0..34b94c34c05 100644
--- a/Master/texmf-dist/fonts/map/pdftex/context/original-ams-euler.map
+++ b/Master/texmf-dist/fonts/map/pdftex/context/original-ams-euler.map
@@ -22,4 +22,4 @@ eusb10 EUSB10 <eusb10.pfb
 
 eusm5  EUSM5  <eusm5.pfb
 eusm7  EUSM7  <eusm7.pfb
-eusm10 EUSM10 <eusm10.pfb
\ No newline at end of file
+eusm10 EUSM10 <eusm10.pfb
diff --git a/Master/texmf-dist/fonts/map/pdftex/context/original-youngryu-px.map b/Master/texmf-dist/fonts/map/pdftex/context/original-youngryu-px.map
index 87c1f48cf71..6a27e357d61 100644
--- a/Master/texmf-dist/fonts/map/pdftex/context/original-youngryu-px.map
+++ b/Master/texmf-dist/fonts/map/pdftex/context/original-youngryu-px.map
@@ -1,16 +1,17 @@
 % 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 fonts replaced by TeX Gyre
 
-% URW Palatino
+% TeX Gyre Pagella (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
+rpxpplr  TeXGyrePagella-Regular     "encq8r ReEncodeFont" <q-8r.enc <qplr.pfb
+rpxpplb  TeXGyrePagella-Bold        "encq8r ReEncodeFont" <q-8r.enc <qplb.pfb
+rpxpplri TeXGyrePagella-Italic      "encq8r ReEncodeFont" <q-8r.enc <qplri.pfb
+rpxpplbi TeXGyrePagella-BoldItalic  "encq8r ReEncodeFont" <q-8r.enc <qplbi.pfb
+% no idea why these were added
+rpxpplro TeXGyrePagella-Oblique     ".167 SlantFont encq8r ReEncodeFont" <q-8r.enc <qplr.pfb
+rpxpplbo TeXGyrePagella-BoldOblique ".167 SlantFont encq8r ReEncodeFont" <q-8r.enc <qplb.pfb
 
 % PX Text
 
diff --git a/Master/texmf-dist/fonts/map/pdftex/context/original-youngryu-tx.map b/Master/texmf-dist/fonts/map/pdftex/context/original-youngryu-tx.map
index 5618ee8bc16..d2600fa787d 100644
--- a/Master/texmf-dist/fonts/map/pdftex/context/original-youngryu-tx.map
+++ b/Master/texmf-dist/fonts/map/pdftex/context/original-youngryu-tx.map
@@ -1,23 +1,28 @@
 % 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 fonts replaced by TeX Gyre
 
-% URW times
+% TeX Gyre Termes (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
+rtxptmr  TeXGyreTermes-Regular     "encq8r ReEncodeFont" <q-8r.enc <qtmr.pfb
+rtxptmb  TeXGyreTermes-Bold        "encq8r ReEncodeFont" <q-8r.enc <qtmb.pfb
+rtxptmri TeXGyreTermes-Italic      "encq8r ReEncodeFont" <q-8r.enc <qtmri.pfb
+rtxptmbi TeXGyreTermes-BoldItalic  "encq8r ReEncodeFont" <q-8r.enc <qtmbi.pfb
+% no idea why these were added
+rtxptmro TeXGyreTermes-Oblique     ".167 SlantFont encq8r ReEncodeFont" <q-8r.enc <qtmr.pfb
+rtxptmbo TeXGyreTermes-BoldOblique ".167 SlantFont encq8r ReEncodeFont" <q-8r.enc <qtmb.pfb
 
-% URW Helvetica
+% TeX Gyre Heros (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
+rtxphvr  TeXGyreHeros-Regular     "encqrm ReEncodeFont" <q-rm.enc <qtmr.pfb
+rtxphvb  TeXGyreHeros-Bold        "encqrm ReEncodeFont" <q-rm.enc <qtmb.pfb
+% probably not used by txfonts
+% rtxphvri TeXGyreHeros-Italic      "encqrm ReEncodeFont" <q-rm.enc <qtmri.pfb
+% rtxphvbi TeXGyreHeros-BoldItalic  "encqrm ReEncodeFont" <q-rm.enc <qtmbi.pfb
+% followed original definitions; one could also use the italic version
+rtxphvro TeXGyreHeros-Oblique     ".167 SlantFont encqrm ReEncodeFont" <q-rm.enc <qtmr.pfb
+rtxphvbo TeXGyreHeros-BoldOblique ".167 SlantFont encqrm ReEncodeFont" <q-rm.enc <qtmb.pfb
 
 % TX Text
 
diff --git a/Master/texmf-dist/fonts/type1/hoekwater/context/contnav.pfm b/Master/texmf-dist/fonts/type1/hoekwater/context/contnav.pfm
deleted file mode 100644
index 2e6e2eebb6c..00000000000
--- a/Master/texmf-dist/fonts/type1/hoekwater/context/contnav.pfm
+++ /dev/null