7 files changed, 404 insertions, 412 deletions

diff --git a/fonts/enc/dvips/context/ec-var-lm.enc b/fonts/enc/dvips/context/ec-var-lm.enc
deleted file mode 100644
index bc54a41d4..000000000
--- a/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/fonts/enc/dvips/context/ec-os-lm.enc b/fonts/enc/dvips/context/lm-ec-os.enc
index d05302a4b..6bb22f319 100644
--- a/fonts/enc/dvips/context/ec-os-lm.enc
+++ b/fonts/enc/dvips/context/lm-ec-os.enc
@@ -1,4 +1,4 @@
-/enccorklm[
+/enclmec[
 /grave
 /acute
 /circumflex
@@ -47,16 +47,16 @@
 /hyphen
 /period
 /slash
-/zerooldstyle
-/oneoldstyle
-/twooldstyle
-/threeoldstyle
-/fouroldstyle
-/fiveoldstyle
-/sixoldstyle
-/sevenoldstyle
-/eightoldstyle
-/nineoldstyle
+/zero.oldstyle
+/one.oldstyle
+/two.oldstyle
+/three.oldstyle
+/four.oldstyle
+/five.oldstyle
+/six.oldstyle
+/seven.oldstyle
+/eight.oldstyle
+/nine.oldstyle
 /colon
 /semicolon
 /less
@@ -146,9 +146,9 @@
 /Rcaron
 /Sacute
 /Scaron
-/Scommaaccent
+/Scedilla
 /Tcaron
-/Tcommaaccent
+/Tcedilla
 /Uhungarumlaut
 /Uring
 /Ydieresis
@@ -178,9 +178,9 @@
 /rcaron
 /sacute
 /scaron
-/scommaaccent
+/scedilla
 /tcaron
-/tcommaaccent
+/tcedilla
 /uhungarumlaut
 /uring
 /ydieresis
diff --git a/fonts/enc/dvips/context/qx-os-lm.enc b/fonts/enc/dvips/context/lm-qx-os.enc
index 4f6ec0860..6f4fd6bfc 100644
--- a/fonts/enc/dvips/context/qx-os-lm.enc
+++ b/fonts/enc/dvips/context/lm-qx-os.enc
@@ -1,4 +1,4 @@
-/encqxlm[
+/enclmqx[
 /.notdef
 /Delta
 /.notdef
@@ -47,16 +47,16 @@
 /hyphen
 /period
 /slash
-/zerooldstyle
-/oneoldstyle
-/twooldstyle
-/threeoldstyle
-/fouroldstyle
-/fiveoldstyle
-/sixoldstyle
-/sevenoldstyle
-/eightoldstyle
-/nineoldstyle
+/zero.oldstyle
+/one.oldstyle
+/two.oldstyle
+/three.oldstyle
+/four.oldstyle
+/five.oldstyle
+/six.oldstyle
+/sevev.oldstyle
+/eight.oldstyle
+/nine.oldstyle
 /colon
 /semicolon
 /exclamdown
diff --git a/fonts/enc/dvips/context/texnansi-var-lm.enc b/fonts/enc/dvips/context/lm-qxtt-os.enc
index 8afba5633..905a34fd9 100644
--- a/fonts/enc/dvips/context/texnansi-var-lm.enc
+++ b/fonts/enc/dvips/context/lm-qxtt-os.enc
@@ -1,24 +1,20 @@
-% author: Hans Hagen
-%
-% This enc file defines texnansi encoded Latin Modern adapted for umlauts and other variations.
-
-/enctexnansivarlm[
+/enclmqxtt[
+/.notdef
+/Delta
+/.notdef
+/.notdef
+/.notdef
+/Pi
+/Sigma
+/mu
+/ellipsis
+/.notdef
+/Omega
 /.notdef
-/Euro
 /.notdef
 /.notdef
-/fraction
-/dotaccent
-/hungarumlaut
-/ogonek
-/fl
 /.notdef
-/cwm
-/ff
-/fi
 /.notdef
-/ffi
-/ffl
 /dotlessi
 /dotlessj
 /grave
@@ -35,7 +31,7 @@
 /AE
 /OE
 /Oslash
-/space
+/visiblespace
 /exclam
 /quotedbl
 /numbersign
@@ -51,16 +47,16 @@
 /hyphen
 /period
 /slash
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
-/eight
-/nine
+/zero.oldstyle
+/one.oldstyle
+/two.oldstyle
+/three.oldstyle
+/four.oldstyle
+/five.oldstyle
+/six.oldstyle
+/seven.oldstyle
+/eight.oldstyle
+/nine.oldstyle
 /colon
 /semicolon
 /less
@@ -97,7 +93,7 @@
 /bracketleft
 /backslash
 /bracketright
-/circumflex
+/asciicircum
 /underscore
 /quoteleft
 /a
@@ -129,134 +125,134 @@
 /braceleft
 /bar
 /braceright
-/tilde
-/vardieresis
+/asciitilde
+/dieresis
+/Euro
+/Aogonek
+/Cacute
+/.notdef
+/.notdef
+/.notdef
+/Eogonek
+/Iogonek
+/.notdef
+/.notdef
 /Lslash
-/quotesingle
-/quotesinglbase
-/florin
-/quotedblbase
-/ellipsis
+/Nacute
+/.notdef
+/.notdef
+/.notdef
 /dagger
 /daggerdbl
-/circumflex.dup
-/perthousand
+/Sacute
 /Scaron
-/guilsinglleft
-/OE.dup
+/Scommaaccent
+/degree
+/Tcommaaccent
+/ogonek
+/Uogonek
+/Ydieresis
+/Zacute
 /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
+/Zdotaccent
+/.notdef
+/.notdef
+/.notdef
 /section
-/dieresis.dup
-/varcopyright
-/ordfeminine
-/guillemotleft
-/logicalnot
-/sfthyphen
+/.notdef
+/aogonek
+/cacute
 /registered
-/macron.dup
-/degree
+/copyright
+/divide
+/eogonek
+/iogonek
+/minus
+/multiply
+/lslash
+/nacute
 /plusminus
-/twosuperior
-/threesuperior
-/acute.dup
-/mu
+/.notdef
+/guillemotleft
+/guillemotright
 /paragraph
+/sacute
+/scaron
+/scommaaccent
+/bullet
+/tcommaaccent
+/threequartersemdash
+/uogonek
+/ydieresis
+/zacute
+/zcaron
+/zdotaccent
+/.notdef
 /periodcentered
-/cedilla.dup
-/onesuperior
-/ordmasculine
-/guillemotright
-/onequarter
-/onehalf
-/threequarters
-/questiondown
+/.notdef
+/quotesingle
 /Agrave
 /Aacute
 /Acircumflex
 /Atilde
-/Avardieresis
+/Adieresis
 /Aring
-/AE.dup
+/.notdef
 /Ccedilla
 /Egrave
 /Eacute
 /Ecircumflex
-/Evardieresis
+/Edieresis
 /Igrave
 /Iacute
 /Icircumflex
-/Ivardieresis
+/Idieresis
 /Eth
 /Ntilde
 /Ograve
 /Oacute
 /Ocircumflex
 /Otilde
-/Ovardieresis
-/multiply
-/Oslash.dup
+/Odieresis
+/currency
+/perthousand
 /Ugrave
 /Uacute
 /Ucircumflex
-/Uvardieresis
+/Udieresis
 /Yacute
 /Thorn
-/germandbls.dup
+/.notdef
 /agrave
 /aacute
 /acircumflex
 /atilde
-/avardieresis
+/adieresis
 /aring
-/ae.dup
+/.notdef
 /ccedilla
 /egrave
 /eacute
 /ecircumflex
-/evardieresis
+/edieresis
 /igrave
 /iacute
 /icircumflex
-/ivardieresis
+/idieresis
 /eth
 /ntilde
 /ograve
 /oacute
 /ocircumflex
 /otilde
-/ovardieresis
-/divide
-/oslash.dup
+/odieresis
+/anglearc
+/diameter
 /ugrave
 /uacute
 /ucircumflex
-/uvardieresis
+/udieresis
 /yacute
 /thorn
-/yvardieresis
-] def
\ No newline at end of file
+/quotedblbase
+] def
diff --git a/fonts/enc/dvips/context/lm-t5-os.enc b/fonts/enc/dvips/context/lm-t5-os.enc
new file mode 100644
index 000000000..4ff792fb7
--- /dev/null
+++ b/fonts/enc/dvips/context/lm-t5-os.enc
@@ -0,0 +1,258 @@
+/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/fonts/enc/dvips/context/texnansi-os-lm.enc b/fonts/enc/dvips/context/lm-texnansi-os.enc
index 575deb9f7..059dd788b 100644
--- a/fonts/enc/dvips/context/texnansi-os-lm.enc
+++ b/fonts/enc/dvips/context/lm-texnansi-os.enc
@@ -1,4 +1,4 @@
-/enctexnansilm[
+/enclmtexnansi[
 /.notdef
 /Euro
 /.notdef
@@ -47,16 +47,16 @@
 /hyphen
 /period
 /slash
-/zerooldstyle
-/oneoldstyle
-/twooldstyle
-/threeoldstyle
-/fouroldstyle
-/fiveoldstyle
-/sixoldstyle
-/sevenoldstyle
-/eightoldstyle
-/nineoldstyle
+/zero.oldstyle
+/one.oldstyle
+/two.oldstyle
+/three.oldstyle
+/four.oldstyle
+/five.oldstyle
+/six.oldstyle
+/seven.oldstyle
+/eight.oldstyle
+/nine.oldstyle
 /colon
 /semicolon
 /less
diff --git a/fonts/enc/dvips/context/texnansi-osfsc.enc b/fonts/enc/dvips/context/lm-texnansi-osfsc.enc
index 7a12a83fb..d6c4a812d 100644
--- a/fonts/enc/dvips/context/texnansi-osfsc.enc
+++ b/fonts/enc/dvips/context/lm-texnansi-osfsc.enc
@@ -53,16 +53,16 @@
 /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
+/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