stable 2005.03.16

15 files changed, 1433 insertions, 975 deletions

diff --git a/fonts/enc/dvips/lm/ec-lm.enc b/fonts/enc/dvips/lm/ec-lm.enc
index efaf0f369..d250e2b5c 100644
--- a/fonts/enc/dvips/lm/ec-lm.enc
+++ b/fonts/enc/dvips/lm/ec-lm.enc
@@ -1,9 +1,4 @@
-% author: Hans Hagen
-%
-% This is a copy of "cork-lm.enc" which we need because context uses ec- as
-% prefix. We prefer this copy instead of yet another remapping of filenames.
-
-/enccorklm[
+/enceclm[
 /grave
 /acute
 /circumflex
diff --git a/fonts/enc/dvips/context/cork-os-lm.enc b/fonts/enc/dvips/lm/qx-lm.enc
index d05302a4b..528f2e0fa 100644
--- a/fonts/enc/dvips/context/cork-os-lm.enc
+++ b/fonts/enc/dvips/lm/qx-lm.enc
@@ -1,39 +1,39 @@
-/enccorklm[
+/encqxlm[
+/.notdef
+/Delta
+/.notdef
+/.notdef
+/.notdef
+/Pi
+/Sigma
+/mu
+/ellipsis
+/f_k
+/Omega
+/ff
+/fi
+/fl
+/ffi
+/ffl
+/dotlessi
+/dotlessj
 /grave
 /acute
-/circumflex
-/tilde
-/dieresis
-/hungarumlaut
-/ring
 /caron
 /breve
 /macron
-/dotaccent
+/ring
 /cedilla
-/ogonek
-/quotesinglbase
-/guilsinglleft
-/guilsinglright
-/quotedblleft
-/quotedblright
-/quotedblbase
-/guillemotleft
-/guillemotright
-/endash
-/emdash
-/cwm
-/perthousandzero
-/dotlessi
-/dotlessj
-/ff
-/fi
-/fl
-/ffi
-/ffl
-/visiblespace
+/germandbls
+/ae
+/oe
+/oslash
+/AE
+/OE
+/Oslash
+/space
 /exclam
-/quotedbl
+/quotedblright
 /numbersign
 /dollar
 /percent
@@ -47,21 +47,21 @@
 /hyphen
 /period
 /slash
-/zerooldstyle
-/oneoldstyle
-/twooldstyle
-/threeoldstyle
-/fouroldstyle
-/fiveoldstyle
-/sixoldstyle
-/sevenoldstyle
-/eightoldstyle
-/nineoldstyle
+/zero
+/one
+/two
+/three
+/four
+/five
+/six
+/seven
+/eight
+/nine
 /colon
 /semicolon
-/less
+/exclamdown
 /equal
-/greater
+/questiondown
 /question
 /at
 /A
@@ -91,10 +91,10 @@
 /Y
 /Z
 /bracketleft
-/backslash
+/quotedblleft
 /bracketright
-/asciicircum
-/underscore
+/circumflex
+/dotaccent
 /quoteleft
 /a
 /b
@@ -122,82 +122,82 @@
 /x
 /y
 /z
-/braceleft
-/bar
-/braceright
-/asciitilde
-/hyphenchar
-/Abreve
+/endash
+/emdash
+/hungarumlaut
+/tilde
+/dieresis
+/Euro
 /Aogonek
 /Cacute
-/Ccaron
-/Dcaron
-/Ecaron
+/greater
+/.notdef
+/.notdef
 /Eogonek
-/Gbreve
-/Lacute
-/Lcaron
+/Iogonek
+/less
+/.notdef
 /Lslash
 /Nacute
-/Ncaron
-/Eng
-/Ohungarumlaut
-/Racute
-/Rcaron
+/asciitilde
+/asciicircum
+/.notdef
+/dagger
+/daggerdbl
 /Sacute
 /Scaron
 /Scommaaccent
-/Tcaron
+/degree
 /Tcommaaccent
-/Uhungarumlaut
-/Uring
+/ogonek
+/Uogonek
 /Ydieresis
 /Zacute
 /Zcaron
 /Zdotaccent
 /IJ
-/Idotaccent
-/dcroat
+/braceleft
+/braceright
 /section
-/abreve
+/.notdef
 /aogonek
 /cacute
-/ccaron
-/dcaron
-/ecaron
+/registered
+/copyright
+/divide
 /eogonek
-/gbreve
-/lacute
-/lcaron
+/iogonek
+/minus
+/multiply
 /lslash
 /nacute
-/ncaron
-/eng
-/ohungarumlaut
-/racute
-/rcaron
+/plusminus
+/.notdef
+/guillemotleft
+/guillemotright
+/paragraph
 /sacute
 /scaron
 /scommaaccent
-/tcaron
+/bullet
 /tcommaaccent
-/uhungarumlaut
-/uring
+/threequartersemdash
+/uogonek
 /ydieresis
 /zacute
 /zcaron
 /zdotaccent
 /ij
-/exclamdown
-/questiondown
-/sterling
+/periodcentered
+/quotedbl
+/quotesingle
 /Agrave
 /Aacute
 /Acircumflex
 /Atilde
 /Adieresis
 /Aring
-/AE
+/backslash
 /Ccedilla
 /Egrave
 /Eacute
@@ -214,22 +214,22 @@
 /Ocircumflex
 /Otilde
 /Odieresis
-/OE
-/Oslash
+/currency
+/perthousand
 /Ugrave
 /Uacute
 /Ucircumflex
 /Udieresis
 /Yacute
 /Thorn
-/Germandbls
+/bar
 /agrave
 /aacute
 /acircumflex
 /atilde
 /adieresis
 /aring
-/ae
+/underscore
 /ccedilla
 /egrave
 /eacute
@@ -246,13 +246,13 @@
 /ocircumflex
 /otilde
 /odieresis
-/oe
-/oslash
+/anglearc
+/diameter
 /ugrave
 /uacute
 /ucircumflex
 /udieresis
 /yacute
 /thorn
-/germandbls
+/quotedblbase
 ] def
diff --git a/fonts/enc/dvips/lm/qx-lmtt.enc b/fonts/enc/dvips/lm/qx-lmtt.enc
new file mode 100644
index 000000000..e9581b553
--- /dev/null
+++ b/fonts/enc/dvips/lm/qx-lmtt.enc
@@ -0,0 +1,258 @@
+/encqxlmtt[
+/.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
+/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
+/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/fonts/enc/dvips/lm/t5-lm.enc b/fonts/enc/dvips/lm/t5-lm.enc
index 68acc2534..8c4e87cae 100644
--- a/fonts/enc/dvips/lm/t5-lm.enc
+++ b/fonts/enc/dvips/lm/t5-lm.enc
@@ -1,253 +1,258 @@
-% t5-lm.enc
-%
-% This is generic T5 encoding for Vietnamese, with unicode-numbered
-% glyphs replaced with PS-named glyphs; to be used with the Latin Modern
-% family of fonts.
-%
-% history:
-%
-%   version 1.0 (28-Jan-2000):
-%     First version.
-%
-%   version 1.1 (29-Apr-2002):
-%     Rewritten to make it AGL compliant.
-%
-%   version 1.2 (01-May-2002):
-%     Use uni2423 instead uni2420.
-%
-%   version 1.3 (27-Sep-2002):
-%   . Changed the following to Unicode entity:
-%         0xB3  uni1EBD  etilde
-%         0x93  uni1EBC  Etilde
-%   . Ytilde (uni1EF8) was used in slot for ytilde (uni1EF9)
-%   . using .notdef in slot for compound word mark (on position 0x17) caused
-%         some problems so it was changed to cwm (for compatibilty with ec.enc)
-%   . use sfthyphen in slot 127 instead of hyphen
-%
-%   version 1.3lm (01-Feb-2005):
-%   . Unicode names replaced by PostScript ones (BJ, JMN)
-%
-% LIGKERN hyphen hyphen =: endash ;
-% LIGKERN endash hyphen =: emdash ;
-% LIGKERN quoteleft quoteleft =: quotedblleft ;
-% LIGKERN quoteright quoteright =: quotedblright ;
-% LIGKERN comma comma =: quotedblbase ;
-%
-%   We blow away kerns to and from spaces (TeX doesn't have a
-%   space) and also remove any kerns from the numbers.
-%
-% LIGKERN space {} * ; * {} space ;
-% LIGKERN zero {} * ; * {} zero ;
-% LIGKERN one {} * ; * {} one ;
-% LIGKERN two {} * ; * {} two ;
-% LIGKERN three {} * ; * {} three ;
-% LIGKERN four {} * ; * {} four ;
-% LIGKERN five {} * ; * {} five ;
-% LIGKERN six {} * ; * {} six ;
-% LIGKERN seven {} * ; * {} seven ;
-% LIGKERN eight {} * ; * {} eight ;
-% LIGKERN nine {} * ; * {} nine ;
-%
-%
-% Some notes on the glyph names:
-%
-% . We follow the Adobe Glyph List (AGL), also using its associated
-%   algorithm.
-%
-% . The glyph `spacing dot below' (on position 0x05) is not in Unicode.
-%   We call it `dotbelow'.
-%
-% . The compound word mark (on position 0x17) is rather an internal flag
-%   for TeX than a real output glyph; it is thus replaced with `.notdef'.
-%
-% . The following glyphs have no special name in the AGL and are thus
-%   represented as a Unicode entity:
-%
-%     0x1A  uni1EF6  Y hook above
-%     0x1B  uni1EF7  y hook above
-%     0x1C  uni1EF4  Y dot below
-%     0x1D  uni1EF5  y dot below
-%
-%     0x20  uni2423  graphic symbol for space
-%
-%     0x83  uni1EA2  A hook above
-%     0x84  uni1EA0  A dot below
-%     0x86  uni1EA6  A circumflex grave
-%     0x87  uni1EA4  A circumflex acute
-%     0x88  uni1EAA  A circumflex tilde
-%     0x89  uni1EA8  A circumflex hook above
-%     0x8A  uni1EAC  A circumflex dot below
-%     0x8C  uni1EB0  A breve grave
-%     0x8D  uni1EAE  A breve acute
-%     0x8E  uni1EB4  A breve tilde
-%     0x8F  uni1EB2  A breve hook above
-%     0x90  uni1EB6  A breve dot below
-%
-%     0x93  uni1EBC  E tilde
-%     0x94  uni1EBA  E hook above
-%     0x95  uni1EB8  E dot below
-%     0x97  uni1EC0  E circumflex grave
-%     0x98  uni1EBE  E circumflex acute
-%     0x99  uni1EC4  E circumflex tilde
-%     0x9A  uni1EC2  E circumflex hook above
-%     0x9B  uni1EC6  E circumflex dot below
-%
-%     0x9F  uni1EC8  I hook above
-%
-%     0xA3  uni1EA3  a hook above
-%     0xA4  uni1EA1  a dot below
-%     0xA6  uni1EA7  a circumflex grave
-%     0xA7  uni1EA5  a circumflex acute
-%     0xA8  uni1EAB  a circumflex tilde
-%     0xA9  uni1EA9  a circumflex hook above
-%     0xAA  uni1EAD  a circumflex dot below
-%     0xAC  uni1EB1  a breve grave
-%     0xAD  uni1EAF  a breve acute
-%     0xAE  uni1EB5  a breve tilde
-%     0xAF  uni1EB3  a breve hook above
-%     0xB0  uni1EB7  a breve dot below
-%
-%     0xB3  uni1EBD  e tilde
-%     0xB4  uni1EBB  e hook above
-%     0xB5  uni1EB9  e dot below
-%     0xB7  uni1EC1  e circumflex grave
-%     0xB8  uni1EBF  e circumflex acute
-%     0xB9  uni1EC5  e circumflex tilde
-%     0xBA  uni1EC3  e circumflex hook above
-%     0xBB  uni1EC7  e circumflex dot below
-%
-%     0xBF  uni1EC9  i hook above
-%
-%     0xC0  uni1ECA  I dot below
-%
-%     0xC4  uni1ECE  O hook above
-%     0xC5  uni1ECC  O dot below
-%     0xC7  uni1ED2  O circumflex grave
-%     0xC8  uni1ED0  O circumflex acute
-%     0xC9  uni1ED6  O circumflex tilde
-%     0xCA  uni1ED4  O circumflex hook above
-%     0xCB  uni1ED8  O circumflex dot below
-%     0xCD  uni1EDC  O horn grave
-%     0xCE  uni1EDA  O horn acute
-%     0xCF  uni1EE0  O horn tilde
-%     0xD0  uni1EDE  O horn hook above
-%     0xD1  uni1EE2  O horn dot below
-%
-%     0xD5  uni1EE6  U hook above
-%     0xD6  uni1EE4  U dot below
-%     0xD8  uni1EEA  U horn grave
-%     0xD9  uni1EE8  U horn acute
-%     0xDA  uni1EEE  U horn tilde
-%     0xDB  uni1EEC  U horn hook above
-%     0xDC  uni1EF0  U horn dot below
-%
-%     0xDF  uni1EF8  Y tilde
-%
-%     0xE0  uni1ECB  i dot below
-%
-%     0xE4  uni1ECF  o hook above
-%     0xE5  uni1ECD  o dot below
-%     0xE7  uni1ED3  o circumflex grave
-%     0xE8  uni1ED1  o circumflex acute
-%     0xE9  uni1ED7  o circumflex tilde
-%     0xEA  uni1ED5  o circumflex hook above
-%     0xEB  uni1ED9  o circumflex dot below
-%     0xED  uni1EDD  o horn grave
-%     0xEE  uni1EDB  o horn acute
-%     0xEF  uni1EE1  o horn tilde
-%     0xF0  uni1EDF  o horn hook above
-%     0xF1  uni1EE3  o horn dot below
-%
-%     0xF5  uni1EE7  u hook above
-%     0xF6  uni1EE5  u dot below
-%     0xF8  uni1EEB  u horn grave
-%     0xF9  uni1EE9  u horn acute
-%     0xFA  uni1EEF  u horn tilde
-%     0xFB  uni1EED  u horn hook above
-%     0xFC  uni1EF1  u horn dot below
-%
-%     0xFF  uni1EF9  y tilde
-/T5LMEncoding [
-% 0x00
-  /grave /acute /circumflex /tilde
-  /dieresis /dotbelow /ring /caron
-  /breve /macron /dotaccent /cedilla
-  /hookabove /quotesinglbase /guilsinglleft /guilsinglright
-% 0x10
-  /quotedblleft /quotedblright /quotedblbase /guillemotleft
-  /guillemotright /endash /emdash /cwm
-  /zeroinferior /dotlessi /Yhookabove /yhookabove
-  /Ydotbelow /ydotbelow /Dcroat /dcroat
-% 0x20
-  /visiblespace /exclam /quotedbl /numbersign
-  /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus
-  /comma /hyphen /period /slash
-% 0x30
-  /zero /one /two /three
-  /four /five /six /seven
-  /eight /nine /colon /semicolon
-  /less /equal /greater /question
-% 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 /b /c
-  /d /e /f /g
-  /h /i /j /k
-  /l /m /n /o
-% 0x70
-  /p /q /r /s
-  /t /u /v /w
-  /x /y /z /braceleft
-  /bar /braceright /asciitilde /sfthyphen
-% 0x80
-  /Agrave /Aacute /Atilde /Ahookabove
-  /Adotbelow /Acircumflex /Acircumflexgrave /Acircumflexacute
-  /Acircumflextilde /Acircumflexhookabove /Acircumflexdotbelow /Abreve
-  /Abrevegrave /Abreveacute /Abrevetilde /Abrevehookabove
-% 0x90
-  /Abrevedotbelow /Egrave /Eacute /Etilde
-  /Ehookabove /Edotbelow /Ecircumflex /Ecircumflexgrave
-  /Ecircumflexacute /Ecircumflextilde /Ecircumflexhookabove /Ecircumflexdotbelow
-  /Igrave /Iacute /Itilde /Ihookabove
-% 0xA0
-  /agrave /aacute /atilde /ahookabove
-  /adotbelow /acircumflex /acircumflexgrave /acircumflexacute
-  /acircumflextilde /acircumflexhookabove /acircumflexdotbelow /abreve
-  /abrevegrave /abreveacute /abrevetilde /abrevehookabove
-% 0xB0
-  /abrevedotbelow /egrave /eacute /etilde
-  /ehookabove /edotbelow /ecircumflex /ecircumflexgrave
-  /ecircumflexacute /ecircumflextilde /ecircumflexhookabove /ecircumflexdotbelow
-  /igrave /iacute /itilde /ihookabove
-% 0xC0
-  /Idotbelow /Ograve /Oacute /Otilde
-  /Ohookabove /Odotbelow /Ocircumflex /Ocircumflexgrave
-  /Ocircumflexacute /Ocircumflextilde /Ocircumflexhookabove /Ocircumflexdotbelow
-  /Ohorn /Ohorngrave /Ohornacute /Ohorntilde
-% 0xD0
-  /Ohornhookabove /Ohorndotbelow /Ugrave /Uacute
-  /Utilde /Uhookabove /Udotbelow /Uhorn
-  /Uhorngrave /Uhornacute /Uhorntilde /Uhornhookabove
-  /Uhorndotbelow /Ygrave /Yacute /Ytilde
-% 0xE0
-  /idotbelow /ograve /oacute /otilde
-  /ohookabove /odotbelow /ocircumflex /ocircumflexgrave
-  /ocircumflexacute /ocircumflextilde /ocircumflexhookabove /ocircumflexdotbelow
-  /ohorn /ohorngrave /ohornacute /ohorntilde
-% 0xF0
-  /ohornhookabove /ohorndotbelow /ugrave /uacute
-  /utilde /uhookabove /udotbelow /uhorn
-  /uhorngrave /uhornacute /uhorntilde /uhornhookabove
-  /uhorndotbelow /ygrave /yacute /ytilde
+/enct5lm[
+/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
+/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
+/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
-
-% end of t5-lm.enc
diff --git a/fonts/enc/dvips/context/cork-var-lm.enc b/fonts/enc/dvips/lm/texnansi-lm.enc
index e56a53e0e..ddc953e19 100644
--- a/fonts/enc/dvips/context/cork-var-lm.enc
+++ b/fonts/enc/dvips/lm/texnansi-lm.enc
@@ -1,41 +1,37 @@
-% author: Hans Hagen
-%
-% This enc file defines ec (cork) encoded Latin Modern adapted for umlauts and other variations.
-
-/enccorkvarlm[
-/grave
-/acute
-/circumflex
-/tilde
-/vardieresis
-/hungarumlaut
-/ring
-/caron
-/breve
-/macron
+/enctexnansilm[
+/.notdef
+/Euro
+/.notdef
+/.notdef
+/fraction
 /dotaccent
-/cedilla
+/hungarumlaut
 /ogonek
-/quotesinglbase
-/guilsinglleft
-/guilsinglright
-/quotedblleft
-/quotedblright
-/quotedblbase
-/guillemotleft
-/guillemotright
-/endash
-/emdash
+/fl
+/.notdef
 /cwm
-/zeroinferior
-/dotlessi
-/dotlessj
 /ff
 /fi
-/fl
+/.notdef
 /ffi
 /ffl
-/visualspace
+/dotlessi
+/dotlessj
+/grave
+/acute
+/caron
+/breve
+/macron
+/ring
+/cedilla
+/germandbls
+/ae
+/oe
+/oslash
+/AE
+/OE
+/Oslash
+/space
 /exclam
 /quotedbl
 /numbersign
@@ -97,7 +93,7 @@
 /bracketleft
 /backslash
 /bracketright
-/asciicircum
+/circumflex
 /underscore
 /quoteleft
 /a
@@ -129,134 +125,134 @@
 /braceleft
 /bar
 /braceright
-/asciitilde
-/hyphen
-/Abreve
-/Aogonek
-/Cacute
-/Ccaron
-/Dcaron
-/Ecaron
-/Eogonek
-/Gbreve
-/Lacute
-/Lcaron
+/tilde
+/dieresis
 /Lslash
-/Nacute
-/Ncaron
-/Ng
-/Ohungarumlaut
-/Racute
-/Rcaron
-/Sacute
+/quotesingle
+/quotesinglbase
+/florin
+/quotedblbase
+/ellipsis
+/dagger
+/daggerdbl
+/circumflex.dup
+/perthousand
 /Scaron
-/Scedilla
-/Tcaron
-/Tcedilla
-/Uhungarumlaut
-/Uring
-/Yvardieresis
-/Zacute
+/guilsinglleft
+/OE.dup
 /Zcaron
-/Zdotaccent
-/IJ
-/Idotaccent
-/dbar
-/section
-/abreve
-/aogonek
-/cacute
-/ccaron
-/dcaron
-/ecaron
-/eogonek
-/gbreve
-/lacute
-/lcaron
+/asciicircum
+/minus
 /lslash
-/nacute
-/ncaron
-/ng
-/ohungarumlaut
-/racute
-/rcaron
-/sacute
+/quoteleft.dup
+/quoteright.dup
+/quotedblleft
+/quotedblright
+/bullet
+/endash
+/emdash
+/tilde.dup
+/trademark
 /scaron
-/scedilla
-/tquoteright
-/tcedilla
-/uhungarumlaut
-/uring
-/yvardieresis
-/zacute
+/guilsinglright
+/oe.dup
 /zcaron
-/zdotaccent
-/ij
+/asciitilde
+/Ydieresis
+/nbspace
 /exclamdown
-/questiondown
+/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
-/Avardieresis
+/Adieresis
 /Aring
-/AE
+/AE.dup
 /Ccedilla
 /Egrave
 /Eacute
 /Ecircumflex
-/Evardieresis
+/Edieresis
 /Igrave
 /Iacute
 /Icircumflex
-/Ivardieresis
+/Idieresis
 /Eth
 /Ntilde
 /Ograve
 /Oacute
 /Ocircumflex
 /Otilde
-/Ovardieresis
-/OE
-/Oslash
+/Odieresis
+/multiply
+/Oslash.dup
 /Ugrave
 /Uacute
 /Ucircumflex
-/Uvardieresis
+/Udieresis
 /Yacute
 /Thorn
-/Germandbls
+/germandbls.dup
 /agrave
 /aacute
 /acircumflex
 /atilde
-/avardieresis
+/adieresis
 /aring
-/ae
+/ae.dup
 /ccedilla
 /egrave
 /eacute
 /ecircumflex
-/evardieresis
+/edieresis
 /igrave
 /iacute
 /icircumflex
-/ivardieresis
+/idieresis
 /eth
 /ntilde
 /ograve
 /oacute
 /ocircumflex
 /otilde
-/ovardieresis
-/oe
-/oslash
+/odieresis
+/divide
+/oslash.dup
 /ugrave
 /uacute
 /ucircumflex
-/uvardieresis
+/udieresis
 /yacute
 /thorn
-/germandbls
-] def
\ No newline at end of file
+/ydieresis
+] def
diff --git a/fonts/enc/dvips/lm/ts1-lm.enc b/fonts/enc/dvips/lm/ts1-lm.enc
new file mode 100644
index 000000000..d43f5f227
--- /dev/null
+++ b/fonts/enc/dvips/lm/ts1-lm.enc
@@ -0,0 +1,258 @@
+/encts1lm[
+/grave
+/acute
+/circumflex
+/tilde
+/dieresis
+/hungarumlaut
+/ring
+/caron
+/breve
+/macron
+/dotaccent
+/cedilla
+/ogonek
+/quotesinglbase.ts1
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/quotedblbase.ts1
+/.notdef
+/.notdef
+/twelveudash
+/threequartersemdash
+/cwmcapital
+/arrowleft
+/arrowright
+/tieaccentlowercase
+/tieaccentcapital
+/tieaccentlowercase.new
+/tieaccentcapital.new
+/.notdef
+/cwmascender
+/blanksymbol
+/.notdef
+/.notdef
+/.notdef
+/dollar
+/.notdef
+/.notdef
+/quotesingle.ts1
+/.notdef
+/.notdef
+/asteriskmath
+/.notdef
+/comma
+/hyphendbl
+/period
+/fraction
+/zero.oldstyle
+/one.oldstyle
+/two.oldstyle
+/three.oldstyle
+/four.oldstyle
+/five.oldstyle
+/six.oldstyle
+/seven.oldstyle
+/eight.oldstyle
+/nine.oldstyle
+/.notdef
+/.notdef
+/angleleft
+/minus
+/angleright
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/mho
+/.notdef
+/bigcircle
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/ohm
+/.notdef
+/.notdef
+/.notdef
+/dblbracketleft
+/.notdef
+/dblbracketright
+/arrowup
+/arrowdown
+/grave.ts1
+/.notdef
+/born
+/divorced
+/died
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/leaf
+/married
+/musicalnote
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/tildelow
+/hyphendbl.alt
+/breve.ts1
+/caron.ts1
+/hungarumlaut.ts1
+/dblgrave.ts1
+/dagger
+/daggerdbl
+/dblverticalbar
+/perthousand
+/bullet
+/centigrade
+/dollar.oldstyle
+/cent.oldstyle
+/florin
+/colonmonetary
+/won
+/naira
+/guarani
+/peso
+/lira
+/recipe
+/interrobang
+/gnaborretni
+/dong
+/trademark
+/permyriad
+/paragraph.alt
+/baht
+/nomero
+/discount
+/estimated
+/openbullet
+/servicemark
+/quillbracketleft
+/quillbracketright
+/cent
+/sterling
+/currency
+/yen
+/brokenbar
+/section
+/dieresis.ts1
+/copyright
+/ordfeminine
+/copyleft
+/logicalnot
+/published
+/registered
+/macron.ts1
+/degree
+/plusminus
+/twosuperior
+/threesuperior
+/acute.ts1
+/mu
+/paragraph
+/periodcentered
+/referencemark
+/onesuperior
+/ordmasculine
+/radical
+/onequarter
+/onehalf
+/threequarters
+/Euro
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/multiply
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/divide
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+] def
diff --git a/fonts/map/pdftex/context/context-base.map b/fonts/map/pdftex/context/context-base.map
index 41fc954a0..6e2e16712 100644
--- a/fonts/map/pdftex/context/context-base.map
+++ b/fonts/map/pdftex/context/context-base.map
@@ -454,63 +454,63 @@ 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
 
-cork-lmb10    LMRomanDemi10-Regular        <cork-lm.enc <lmb10.pfb
-cork-lmbo10   LMRomanDemi10-Italic         <cork-lm.enc <lmbo10.pfb
-cork-lmbx10   LMRoman10-Bold               <cork-lm.enc <lmbx10.pfb
-cork-lmbx12   LMRoman12-Bold               <cork-lm.enc <lmbx12.pfb
-cork-lmbx5    LMRoman5-Bold                <cork-lm.enc <lmbx5.pfb
-cork-lmbx6    LMRoman6-Bold                <cork-lm.enc <lmbx6.pfb
-cork-lmbx7    LMRoman7-Bold                <cork-lm.enc <lmbx7.pfb
-cork-lmbx8    LMRoman8-Bold                <cork-lm.enc <lmbx8.pfb
-cork-lmbx9    LMRoman9-Bold                <cork-lm.enc <lmbx9.pfb
-cork-lmbxi10  LMRoman10-BoldItalic         <cork-lm.enc <lmbxi10.pfb
-cork-lmbxo10  LMSlanted10-BoldItalic       <cork-lm.enc <lmbxo10.pfb
-cork-lmcsc10  LMCaps10-Regular             <cork-lm.enc <lmcsc10.pfb
-cork-lmcsco10 LMCaps10-Italic              <cork-lm.enc <lmcsco10.pfb
-cork-lmr10    LMRoman10-Regular            <cork-lm.enc <lmr10.pfb
-cork-lmr12    LMRoman12-Regular            <cork-lm.enc <lmr12.pfb
-cork-lmr17    LMRoman17-Regular            <cork-lm.enc <lmr17.pfb
-cork-lmr5     LMRoman5-Regular             <cork-lm.enc <lmr5.pfb
-cork-lmr6     LMRoman6-Regular             <cork-lm.enc <lmr6.pfb
-cork-lmr7     LMRoman7-Regular             <cork-lm.enc <lmr7.pfb
-cork-lmr8     LMRoman8-Regular             <cork-lm.enc <lmr8.pfb
-cork-lmr9     LMRoman9-Regular             <cork-lm.enc <lmr9.pfb
-cork-lmri10   LMRoman10-Italic             <cork-lm.enc <lmri10.pfb
-cork-lmri12   LMRoman12-Italic             <cork-lm.enc <lmri12.pfb
-cork-lmri7    LMRoman7-Italic              <cork-lm.enc <lmri7.pfb
-cork-lmri8    LMRoman8-Italic              <cork-lm.enc <lmri8.pfb
-cork-lmri9    LMRoman9-Italic              <cork-lm.enc <lmri9.pfb
-cork-lmro10   LMSlanted10-Italic           <cork-lm.enc <lmro10.pfb
-cork-lmro12   LMSlanted12-Italic           <cork-lm.enc <lmro12.pfb
-cork-lmro8    LMSlanted8-Italic            <cork-lm.enc <lmro8.pfb
-cork-lmro9    LMSlanted9-Italic            <cork-lm.enc <lmro9.pfb
-cork-lmss10   LMSans10-Regular             <cork-lm.enc <lmss10.pfb
-cork-lmss12   LMSans12-Regular             <cork-lm.enc <lmss12.pfb
-cork-lmss17   LMSans17-Regular             <cork-lm.enc <lmss17.pfb
-cork-lmss8    LMSans8-Regular              <cork-lm.enc <lmss8.pfb
-cork-lmss9    LMSans9-Regular              <cork-lm.enc <lmss9.pfb
-cork-lmssbo10 LMSans10-BoldItalic          <cork-lm.enc <lmssbo10.pfb
-cork-lmssbx10 LMSans10-Bold                <cork-lm.enc <lmssbx10.pfb
-cork-lmssdc10 LMSansDemiCond10-Regular     <cork-lm.enc <lmssdc10.pfb
-cork-lmssdo10 LMSansDemiCond10-Italic      <cork-lm.enc <lmssdo10.pfb
-cork-lmsso10  LMSans10-Italic              <cork-lm.enc <lmsso10.pfb
-cork-lmsso12  LMSans12-Italic              <cork-lm.enc <lmsso12.pfb
-cork-lmsso17  LMSans17-Italic              <cork-lm.enc <lmsso17.pfb
-cork-lmsso8   LMSans8-Italic               <cork-lm.enc <lmsso8.pfb
-cork-lmsso9   LMSans9-Italic               <cork-lm.enc <lmsso9.pfb
-cork-lmssq8   LMSansQuotation8-Regular     <cork-lm.enc <lmssq8.pfb
-cork-lmssqbo8 LMSansQuotation8-BoldItalic  <cork-lm.enc <lmssqbo8.pfb
-cork-lmssqbx8 LMSansQuotation8-Bold        <cork-lm.enc <lmssqbx8.pfb
-cork-lmssqo8  LMSansQuotation8-Italic      <cork-lm.enc <lmssqo8.pfb
-cork-lmtcsc10 LMTypewriterCaps10-Regular   <cork-lm.enc <lmtcsc10.pfb
-cork-lmtt10   LMTypewriter10-Regular       <cork-lm.enc <lmtt10.pfb
-cork-lmtt12   LMTypewriter12-Regular       <cork-lm.enc <lmtt12.pfb
-cork-lmtt8    LMTypewriter8-Regular        <cork-lm.enc <lmtt8.pfb
-cork-lmtt9    LMTypewriter9-Regular        <cork-lm.enc <lmtt9.pfb
-cork-lmtti10  LMTypewriter10-Italic        <cork-lm.enc <lmtti10.pfb
-cork-lmtto10  LMTypewriterSlanted10-Italic <cork-lm.enc <lmtto10.pfb
-cork-lmvtt10  LMTypewriterVarWd10-Regular  <cork-lm.enc <lmvtt10.pfb
-cork-lmvtto10 LMTypewriterVarWd10-Italic   <cork-lm.enc <lmvtto10.pfb
+ec-lmb10    LMRomanDemi10-Regular        <ec-lm.enc <lmb10.pfb
+ec-lmbo10   LMRomanDemi10-Italic         <ec-lm.enc <lmbo10.pfb
+ec-lmbx10   LMRoman10-Bold               <ec-lm.enc <lmbx10.pfb
+ec-lmbx12   LMRoman12-Bold               <ec-lm.enc <lmbx12.pfb
+ec-lmbx5    LMRoman5-Bold                <ec-lm.enc <lmbx5.pfb
+ec-lmbx6    LMRoman6-Bold                <ec-lm.enc <lmbx6.pfb
+ec-lmbx7    LMRoman7-Bold                <ec-lm.enc <lmbx7.pfb
+ec-lmbx8    LMRoman8-Bold                <ec-lm.enc <lmbx8.pfb
+ec-lmbx9    LMRoman9-Bold                <ec-lm.enc <lmbx9.pfb
+ec-lmbxi10  LMRoman10-BoldItalic         <ec-lm.enc <lmbxi10.pfb
+ec-lmbxo10  LMSlanted10-BoldItalic       <ec-lm.enc <lmbxo10.pfb
+ec-lmcsc10  LMCaps10-Regular             <ec-lm.enc <lmcsc10.pfb
+ec-lmcsco10 LMCaps10-Italic              <ec-lm.enc <lmcsco10.pfb
+ec-lmr10    LMRoman10-Regular            <ec-lm.enc <lmr10.pfb
+ec-lmr12    LMRoman12-Regular            <ec-lm.enc <lmr12.pfb
+ec-lmr17    LMRoman17-Regular            <ec-lm.enc <lmr17.pfb
+ec-lmr5     LMRoman5-Regular             <ec-lm.enc <lmr5.pfb
+ec-lmr6     LMRoman6-Regular             <ec-lm.enc <lmr6.pfb
+ec-lmr7     LMRoman7-Regular             <ec-lm.enc <lmr7.pfb
+ec-lmr8     LMRoman8-Regular             <ec-lm.enc <lmr8.pfb
+ec-lmr9     LMRoman9-Regular             <ec-lm.enc <lmr9.pfb
+ec-lmri10   LMRoman10-Italic             <ec-lm.enc <lmri10.pfb
+ec-lmri12   LMRoman12-Italic             <ec-lm.enc <lmri12.pfb
+ec-lmri7    LMRoman7-Italic              <ec-lm.enc <lmri7.pfb
+ec-lmri8    LMRoman8-Italic              <ec-lm.enc <lmri8.pfb
+ec-lmri9    LMRoman9-Italic              <ec-lm.enc <lmri9.pfb
+ec-lmro10   LMSlanted10-Italic           <ec-lm.enc <lmro10.pfb
+ec-lmro12   LMSlanted12-Italic           <ec-lm.enc <lmro12.pfb
+ec-lmro8    LMSlanted8-Italic            <ec-lm.enc <lmro8.pfb
+ec-lmro9    LMSlanted9-Italic            <ec-lm.enc <lmro9.pfb
+ec-lmss10   LMSans10-Regular             <ec-lm.enc <lmss10.pfb
+ec-lmss12   LMSans12-Regular             <ec-lm.enc <lmss12.pfb
+ec-lmss17   LMSans17-Regular             <ec-lm.enc <lmss17.pfb
+ec-lmss8    LMSans8-Regular              <ec-lm.enc <lmss8.pfb
+ec-lmss9    LMSans9-Regular              <ec-lm.enc <lmss9.pfb
+ec-lmssbo10 LMSans10-BoldItalic          <ec-lm.enc <lmssbo10.pfb
+ec-lmssbx10 LMSans10-Bold                <ec-lm.enc <lmssbx10.pfb
+ec-lmssdc10 LMSansDemiCond10-Regular     <ec-lm.enc <lmssdc10.pfb
+ec-lmssdo10 LMSansDemiCond10-Italic      <ec-lm.enc <lmssdo10.pfb
+ec-lmsso10  LMSans10-Italic              <ec-lm.enc <lmsso10.pfb
+ec-lmsso12  LMSans12-Italic              <ec-lm.enc <lmsso12.pfb
+ec-lmsso17  LMSans17-Italic              <ec-lm.enc <lmsso17.pfb
+ec-lmsso8   LMSans8-Italic               <ec-lm.enc <lmsso8.pfb
+ec-lmsso9   LMSans9-Italic               <ec-lm.enc <lmsso9.pfb
+ec-lmssq8   LMSansQuotation8-Regular     <ec-lm.enc <lmssq8.pfb
+ec-lmssqbo8 LMSansQuotation8-BoldItalic  <ec-lm.enc <lmssqbo8.pfb
+ec-lmssqbx8 LMSansQuotation8-Bold        <ec-lm.enc <lmssqbx8.pfb
+ec-lmssqo8  LMSansQuotation8-Italic      <ec-lm.enc <lmssqo8.pfb
+ec-lmtcsc10 LMTypewriterCaps10-Regular   <ec-lm.enc <lmtcsc10.pfb
+ec-lmtt10   LMTypewriter10-Regular       <ec-lm.enc <lmtt10.pfb
+ec-lmtt12   LMTypewriter12-Regular       <ec-lm.enc <lmtt12.pfb
+ec-lmtt8    LMTypewriter8-Regular        <ec-lm.enc <lmtt8.pfb
+ec-lmtt9    LMTypewriter9-Regular        <ec-lm.enc <lmtt9.pfb
+ec-lmtti10  LMTypewriter10-Italic        <ec-lm.enc <lmtti10.pfb
+ec-lmtto10  LMTypewriterSlanted10-Italic <ec-lm.enc <lmtto10.pfb
+ec-lmvtt10  LMTypewriterVarWd10-Regular  <ec-lm.enc <lmvtt10.pfb
+ec-lmvtto10 LMTypewriterVarWd10-Italic   <ec-lm.enc <lmvtto10.pfb
 
 
 % courier / urw
@@ -769,6 +769,9 @@ vnu10  LMRoman10-Italic "-0.25 SlantFont" <t5-lm.enc <lmri10.pfb
 % vnfib8
 
 
+# not yet defined
+
+
 % LM replacement / thanks to Jacko
 
 csb10    LMRomanDemi10-Regular        <csrm.enc <lmb10.pfb
@@ -835,6 +838,9 @@ csfi10   csfi10   <csfi10.pfb
 csu10    LMRoman10-Italic "-0.25 SlantFont" <csrm.enc <lmri10.pfb
 
 
+# not yet defined
+
+
 % LM replacement, thanks to Jacko
 
 plb10    LMRomanDemi10-Regular        <plrm.enc  <lmb10.pfb
diff --git a/fonts/map/pdftex/context/cork-public-lm.map b/fonts/map/pdftex/context/cork-public-lm.map
deleted file mode 100644
index e80956406..000000000
--- a/fonts/map/pdftex/context/cork-public-lm.map
+++ /dev/null
@@ -1,57 +0,0 @@
-cork-lmb10    LMRomanDemi10-Regular        <cork-lm.enc <lmb10.pfb
-cork-lmbo10   LMRomanDemi10-Italic         <cork-lm.enc <lmbo10.pfb
-cork-lmbx10   LMRoman10-Bold               <cork-lm.enc <lmbx10.pfb
-cork-lmbx12   LMRoman12-Bold               <cork-lm.enc <lmbx12.pfb
-cork-lmbx5    LMRoman5-Bold                <cork-lm.enc <lmbx5.pfb
-cork-lmbx6    LMRoman6-Bold                <cork-lm.enc <lmbx6.pfb
-cork-lmbx7    LMRoman7-Bold                <cork-lm.enc <lmbx7.pfb
-cork-lmbx8    LMRoman8-Bold                <cork-lm.enc <lmbx8.pfb
-cork-lmbx9    LMRoman9-Bold                <cork-lm.enc <lmbx9.pfb
-cork-lmbxi10  LMRoman10-BoldItalic         <cork-lm.enc <lmbxi10.pfb
-cork-lmbxo10  LMSlanted10-BoldItalic       <cork-lm.enc <lmbxo10.pfb
-cork-lmcsc10  LMCaps10-Regular             <cork-lm.enc <lmcsc10.pfb
-cork-lmcsco10 LMCaps10-Italic              <cork-lm.enc <lmcsco10.pfb
-cork-lmr10    LMRoman10-Regular            <cork-lm.enc <lmr10.pfb
-cork-lmr12    LMRoman12-Regular            <cork-lm.enc <lmr12.pfb
-cork-lmr17    LMRoman17-Regular            <cork-lm.enc <lmr17.pfb
-cork-lmr5     LMRoman5-Regular             <cork-lm.enc <lmr5.pfb
-cork-lmr6     LMRoman6-Regular             <cork-lm.enc <lmr6.pfb
-cork-lmr7     LMRoman7-Regular             <cork-lm.enc <lmr7.pfb
-cork-lmr8     LMRoman8-Regular             <cork-lm.enc <lmr8.pfb
-cork-lmr9     LMRoman9-Regular             <cork-lm.enc <lmr9.pfb
-cork-lmri10   LMRoman10-Italic             <cork-lm.enc <lmri10.pfb
-cork-lmri12   LMRoman12-Italic             <cork-lm.enc <lmri12.pfb
-cork-lmri7    LMRoman7-Italic              <cork-lm.enc <lmri7.pfb
-cork-lmri8    LMRoman8-Italic              <cork-lm.enc <lmri8.pfb
-cork-lmri9    LMRoman9-Italic              <cork-lm.enc <lmri9.pfb
-cork-lmro10   LMSlanted10-Italic           <cork-lm.enc <lmro10.pfb
-cork-lmro12   LMSlanted12-Italic           <cork-lm.enc <lmro12.pfb
-cork-lmro8    LMSlanted8-Italic            <cork-lm.enc <lmro8.pfb
-cork-lmro9    LMSlanted9-Italic            <cork-lm.enc <lmro9.pfb
-cork-lmss10   LMSans10-Regular             <cork-lm.enc <lmss10.pfb
-cork-lmss12   LMSans12-Regular             <cork-lm.enc <lmss12.pfb
-cork-lmss17   LMSans17-Regular             <cork-lm.enc <lmss17.pfb
-cork-lmss8    LMSans8-Regular              <cork-lm.enc <lmss8.pfb
-cork-lmss9    LMSans9-Regular              <cork-lm.enc <lmss9.pfb
-cork-lmssbo10 LMSans10-BoldItalic          <cork-lm.enc <lmssbo10.pfb
-cork-lmssbx10 LMSans10-Bold                <cork-lm.enc <lmssbx10.pfb
-cork-lmssdc10 LMSansDemiCond10-Regular     <cork-lm.enc <lmssdc10.pfb
-cork-lmssdo10 LMSansDemiCond10-Italic      <cork-lm.enc <lmssdo10.pfb
-cork-lmsso10  LMSans10-Italic              <cork-lm.enc <lmsso10.pfb
-cork-lmsso12  LMSans12-Italic              <cork-lm.enc <lmsso12.pfb
-cork-lmsso17  LMSans17-Italic              <cork-lm.enc <lmsso17.pfb
-cork-lmsso8   LMSans8-Italic               <cork-lm.enc <lmsso8.pfb
-cork-lmsso9   LMSans9-Italic               <cork-lm.enc <lmsso9.pfb
-cork-lmssq8   LMSansQuotation8-Regular     <cork-lm.enc <lmssq8.pfb
-cork-lmssqbo8 LMSansQuotation8-BoldItalic  <cork-lm.enc <lmssqbo8.pfb
-cork-lmssqbx8 LMSansQuotation8-Bold        <cork-lm.enc <lmssqbx8.pfb
-cork-lmssqo8  LMSansQuotation8-Italic      <cork-lm.enc <lmssqo8.pfb
-cork-lmtcsc10 LMTypewriterCaps10-Regular   <cork-lm.enc <lmtcsc10.pfb
-cork-lmtt10   LMTypewriter10-Regular       <cork-lm.enc <lmtt10.pfb
-cork-lmtt12   LMTypewriter12-Regular       <cork-lm.enc <lmtt12.pfb
-cork-lmtt8    LMTypewriter8-Regular        <cork-lm.enc <lmtt8.pfb
-cork-lmtt9    LMTypewriter9-Regular        <cork-lm.enc <lmtt9.pfb
-cork-lmtti10  LMTypewriter10-Italic        <cork-lm.enc <lmtti10.pfb
-cork-lmtto10  LMTypewriterSlanted10-Italic <cork-lm.enc <lmtto10.pfb
-cork-lmvtt10  LMTypewriterVarWd10-Regular  <cork-lm.enc <lmvtt10.pfb
-cork-lmvtto10 LMTypewriterVarWd10-Italic   <cork-lm.enc <lmvtto10.pfb
\ No newline at end of file
diff --git a/fonts/map/pdftex/context/cork-var-exclusive-public-lm.map b/fonts/map/pdftex/context/cork-var-exclusive-public-lm.map
deleted file mode 100644
index 85913a7d1..000000000
--- a/fonts/map/pdftex/context/cork-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.
-
-cork-lmb10    LMRomanDemi10-Regular        <cork-var-lm.enc <lmb10.pfb
-cork-lmbo10   LMRomanDemi10-Italic         <cork-var-lm.enc <lmbo10.pfb
-cork-lmbx10   LMRoman10-Bold               <cork-var-lm.enc <lmbx10.pfb
-cork-lmbx12   LMRoman12-Bold               <cork-var-lm.enc <lmbx12.pfb
-cork-lmbx5    LMRoman5-Bold                <cork-var-lm.enc <lmbx5.pfb
-cork-lmbx6    LMRoman6-Bold                <cork-var-lm.enc <lmbx6.pfb
-cork-lmbx7    LMRoman7-Bold                <cork-var-lm.enc <lmbx7.pfb
-cork-lmbx8    LMRoman8-Bold                <cork-var-lm.enc <lmbx8.pfb
-cork-lmbx9    LMRoman9-Bold                <cork-var-lm.enc <lmbx9.pfb
-cork-lmbxi10  LMRoman10-BoldItalic         <cork-var-lm.enc <lmbxi10.pfb
-cork-lmbxo10  LMSlanted10-BoldItalic       <cork-var-lm.enc <lmbxo10.pfb
-cork-lmcsc10  LMCaps10-Regular             <cork-var-lm.enc <lmcsc10.pfb
-cork-lmcsco10 LMCaps10-Italic              <cork-var-lm.enc <lmcsco10.pfb
-cork-lmr10    LMRoman10-Regular            <cork-var-lm.enc <lmr10.pfb
-cork-lmr12    LMRoman12-Regular            <cork-var-lm.enc <lmr12.pfb
-cork-lmr17    LMRoman17-Regular            <cork-var-lm.enc <lmr17.pfb
-cork-lmr5     LMRoman5-Regular             <cork-var-lm.enc <lmr5.pfb
-cork-lmr6     LMRoman6-Regular             <cork-var-lm.enc <lmr6.pfb
-cork-lmr7     LMRoman7-Regular             <cork-var-lm.enc <lmr7.pfb
-cork-lmr8     LMRoman8-Regular             <cork-var-lm.enc <lmr8.pfb
-cork-lmr9     LMRoman9-Regular             <cork-var-lm.enc <lmr9.pfb
-cork-lmri10   LMRoman10-Italic             <cork-var-lm.enc <lmri10.pfb
-cork-lmri12   LMRoman12-Italic             <cork-var-lm.enc <lmri12.pfb
-cork-lmri7    LMRoman7-Italic              <cork-var-lm.enc <lmri7.pfb
-cork-lmri8    LMRoman8-Italic              <cork-var-lm.enc <lmri8.pfb
-cork-lmri9    LMRoman9-Italic              <cork-var-lm.enc <lmri9.pfb
-cork-lmro10   LMSlanted10-Italic           <cork-var-lm.enc <lmro10.pfb
-cork-lmro12   LMSlanted12-Italic           <cork-var-lm.enc <lmro12.pfb
-cork-lmro8    LMSlanted8-Italic            <cork-var-lm.enc <lmro8.pfb
-cork-lmro9    LMSlanted9-Italic            <cork-var-lm.enc <lmro9.pfb
-cork-lmss10   LMSans10-Regular             <cork-var-lm.enc <lmss10.pfb
-cork-lmss12   LMSans12-Regular             <cork-var-lm.enc <lmss12.pfb
-cork-lmss17   LMSans17-Regular             <cork-var-lm.enc <lmss17.pfb
-cork-lmss8    LMSans8-Regular              <cork-var-lm.enc <lmss8.pfb
-cork-lmss9    LMSans9-Regular              <cork-var-lm.enc <lmss9.pfb
-cork-lmssbo10 LMSans10-BoldItalic          <cork-var-lm.enc <lmssbo10.pfb
-cork-lmssbx10 LMSans10-Bold                <cork-var-lm.enc <lmssbx10.pfb
-cork-lmssdc10 LMSansDemiCond10-Regular     <cork-var-lm.enc <lmssdc10.pfb
-cork-lmssdo10 LMSansDemiCond10-Italic      <cork-var-lm.enc <lmssdo10.pfb
-cork-lmsso10  LMSans10-Italic              <cork-var-lm.enc <lmsso10.pfb
-cork-lmsso12  LMSans12-Italic              <cork-var-lm.enc <lmsso12.pfb
-cork-lmsso17  LMSans17-Italic              <cork-var-lm.enc <lmsso17.pfb
-cork-lmsso8   LMSans8-Italic               <cork-var-lm.enc <lmsso8.pfb
-cork-lmsso9   LMSans9-Italic               <cork-var-lm.enc <lmsso9.pfb
-cork-lmssq8   LMSansQuotation8-Regular     <cork-var-lm.enc <lmssq8.pfb
-cork-lmssqbo8 LMSansQuotation8-BoldItalic  <cork-var-lm.enc <lmssqbo8.pfb
-cork-lmssqbx8 LMSansQuotation8-Bold        <cork-var-lm.enc <lmssqbx8.pfb
-cork-lmssqo8  LMSansQuotation8-Italic      <cork-var-lm.enc <lmssqo8.pfb
-cork-lmtcsc10 LMTypewriterCaps10-Regular   <cork-var-lm.enc <lmtcsc10.pfb
-cork-lmtt10   LMTypewriter10-Regular       <cork-var-lm.enc <lmtt10.pfb
-cork-lmtt12   LMTypewriter12-Regular       <cork-var-lm.enc <lmtt12.pfb
-cork-lmtt8    LMTypewriter8-Regular        <cork-var-lm.enc <lmtt8.pfb
-cork-lmtt9    LMTypewriter9-Regular        <cork-var-lm.enc <lmtt9.pfb
-cork-lmtti10  LMTypewriter10-Italic        <cork-var-lm.enc <lmtti10.pfb
-cork-lmtto10  LMTypewriterSlanted10-Italic <cork-var-lm.enc <lmtto10.pfb
-cork-lmvtt10  LMTypewriterVarWd10-Regular  <cork-var-lm.enc <lmvtt10.pfb
-cork-lmvtto10 LMTypewriterVarWd10-Italic   <cork-var-lm.enc <lmvtto10.pfb
\ No newline at end of file
diff --git a/fonts/map/pdftex/context/cork-var-public-lm.map b/fonts/map/pdftex/context/cork-var-public-lm.map
deleted file mode 100644
index 736e22f8d..000000000
--- a/fonts/map/pdftex/context/cork-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.
-
-cork-var-lmb10    LMRomanDemi10-Regular        <cork-var-lm.enc <lmb10.pfb
-cork-var-lmbo10   LMRomanDemi10-Italic         <cork-var-lm.enc <lmbo10.pfb
-cork-var-lmbx10   LMRoman10-Bold               <cork-var-lm.enc <lmbx10.pfb
-cork-var-lmbx12   LMRoman12-Bold               <cork-var-lm.enc <lmbx12.pfb
-cork-var-lmbx5    LMRoman5-Bold                <cork-var-lm.enc <lmbx5.pfb
-cork-var-lmbx6    LMRoman6-Bold                <cork-var-lm.enc <lmbx6.pfb
-cork-var-lmbx7    LMRoman7-Bold                <cork-var-lm.enc <lmbx7.pfb
-cork-var-lmbx8    LMRoman8-Bold                <cork-var-lm.enc <lmbx8.pfb
-cork-var-lmbx9    LMRoman9-Bold                <cork-var-lm.enc <lmbx9.pfb
-cork-var-lmbxi10  LMRoman10-BoldItalic         <cork-var-lm.enc <lmbxi10.pfb
-cork-var-lmbxo10  LMSlanted10-BoldItalic       <cork-var-lm.enc <lmbxo10.pfb
-cork-var-lmcsc10  LMCaps10-Regular             <cork-var-lm.enc <lmcsc10.pfb
-cork-var-lmcsco10 LMCaps10-Italic              <cork-var-lm.enc <lmcsco10.pfb
-cork-var-lmr10    LMRoman10-Regular            <cork-var-lm.enc <lmr10.pfb
-cork-var-lmr12    LMRoman12-Regular            <cork-var-lm.enc <lmr12.pfb
-cork-var-lmr17    LMRoman17-Regular            <cork-var-lm.enc <lmr17.pfb
-cork-var-lmr5     LMRoman5-Regular             <cork-var-lm.enc <lmr5.pfb
-cork-var-lmr6     LMRoman6-Regular             <cork-var-lm.enc <lmr6.pfb
-cork-var-lmr7     LMRoman7-Regular             <cork-var-lm.enc <lmr7.pfb
-cork-var-lmr8     LMRoman8-Regular             <cork-var-lm.enc <lmr8.pfb
-cork-var-lmr9     LMRoman9-Regular             <cork-var-lm.enc <lmr9.pfb
-cork-var-lmri10   LMRoman10-Italic             <cork-var-lm.enc <lmri10.pfb
-cork-var-lmri12   LMRoman12-Italic             <cork-var-lm.enc <lmri12.pfb
-cork-var-lmri7    LMRoman7-Italic              <cork-var-lm.enc <lmri7.pfb
-cork-var-lmri8    LMRoman8-Italic              <cork-var-lm.enc <lmri8.pfb
-cork-var-lmri9    LMRoman9-Italic              <cork-var-lm.enc <lmri9.pfb
-cork-var-lmro10   LMSlanted10-Italic           <cork-var-lm.enc <lmro10.pfb
-cork-var-lmro12   LMSlanted12-Italic           <cork-var-lm.enc <lmro12.pfb
-cork-var-lmro8    LMSlanted8-Italic            <cork-var-lm.enc <lmro8.pfb
-cork-var-lmro9    LMSlanted9-Italic            <cork-var-lm.enc <lmro9.pfb
-cork-var-lmss10   LMSans10-Regular             <cork-var-lm.enc <lmss10.pfb
-cork-var-lmss12   LMSans12-Regular             <cork-var-lm.enc <lmss12.pfb
-cork-var-lmss17   LMSans17-Regular             <cork-var-lm.enc <lmss17.pfb
-cork-var-lmss8    LMSans8-Regular              <cork-var-lm.enc <lmss8.pfb
-cork-var-lmss9    LMSans9-Regular              <cork-var-lm.enc <lmss9.pfb
-cork-var-lmssbo10 LMSans10-BoldItalic          <cork-var-lm.enc <lmssbo10.pfb
-cork-var-lmssbx10 LMSans10-Bold                <cork-var-lm.enc <lmssbx10.pfb
-cork-var-lmssdc10 LMSansDemiCond10-Regular     <cork-var-lm.enc <lmssdc10.pfb
-cork-var-lmssdo10 LMSansDemiCond10-Italic      <cork-var-lm.enc <lmssdo10.pfb
-cork-var-lmsso10  LMSans10-Italic              <cork-var-lm.enc <lmsso10.pfb
-cork-var-lmsso12  LMSans12-Italic              <cork-var-lm.enc <lmsso12.pfb
-cork-var-lmsso17  LMSans17-Italic              <cork-var-lm.enc <lmsso17.pfb
-cork-var-lmsso8   LMSans8-Italic               <cork-var-lm.enc <lmsso8.pfb
-cork-var-lmsso9   LMSans9-Italic               <cork-var-lm.enc <lmsso9.pfb
-cork-var-lmssq8   LMSansQuotation8-Regular     <cork-var-lm.enc <lmssq8.pfb
-cork-var-lmssqbo8 LMSansQuotation8-BoldItalic  <cork-var-lm.enc <lmssqbo8.pfb
-cork-var-lmssqbx8 LMSansQuotation8-Bold        <cork-var-lm.enc <lmssqbx8.pfb
-cork-var-lmssqo8  LMSansQuotation8-Italic      <cork-var-lm.enc <lmssqo8.pfb
-cork-var-lmtcsc10 LMTypewriterCaps10-Regular   <cork-var-lm.enc <lmtcsc10.pfb
-cork-var-lmtt10   LMTypewriter10-Regular       <cork-var-lm.enc <lmtt10.pfb
-cork-var-lmtt12   LMTypewriter12-Regular       <cork-var-lm.enc <lmtt12.pfb
-cork-var-lmtt8    LMTypewriter8-Regular        <cork-var-lm.enc <lmtt8.pfb
-cork-var-lmtt9    LMTypewriter9-Regular        <cork-var-lm.enc <lmtt9.pfb
-cork-var-lmtti10  LMTypewriter10-Italic        <cork-var-lm.enc <lmtti10.pfb
-cork-var-lmtto10  LMTypewriterSlanted10-Italic <cork-var-lm.enc <lmtto10.pfb
-cork-var-lmvtt10  LMTypewriterVarWd10-Regular  <cork-var-lm.enc <lmvtt10.pfb
-cork-var-lmvtto10 LMTypewriterVarWd10-Italic   <cork-var-lm.enc <lmvtto10.pfb
\ No newline at end of file
diff --git a/fonts/map/pdftex/context/ec-os-public-lm.map b/fonts/map/pdftex/context/ec-os-public-lm.map
index 50e3c1252..0f6f7082b 100644
--- a/fonts/map/pdftex/context/ec-os-public-lm.map
+++ b/fonts/map/pdftex/context/ec-os-public-lm.map
@@ -1,57 +1,57 @@
-cork-lmb10    LMRomanDemi10-Regular        <cork-os-lm.enc <lmb10.pfb
-cork-lmbo10   LMRomanDemi10-Italic         <cork-os-lm.enc <lmbo10.pfb
-cork-lmbx10   LMRoman10-Bold               <cork-os-lm.enc <lmbx10.pfb
-cork-lmbx12   LMRoman12-Bold               <cork-os-lm.enc <lmbx12.pfb
-cork-lmbx5    LMRoman5-Bold                <cork-os-lm.enc <lmbx5.pfb
-cork-lmbx6    LMRoman6-Bold                <cork-os-lm.enc <lmbx6.pfb
-cork-lmbx7    LMRoman7-Bold                <cork-os-lm.enc <lmbx7.pfb
-cork-lmbx8    LMRoman8-Bold                <cork-os-lm.enc <lmbx8.pfb
-cork-lmbx9    LMRoman9-Bold                <cork-os-lm.enc <lmbx9.pfb
-cork-lmbxi10  LMRoman10-BoldItalic         <cork-os-lm.enc <lmbxi10.pfb
-cork-lmbxo10  LMSlanted10-BoldItalic       <cork-os-lm.enc <lmbxo10.pfb
-cork-lmcsc10  LMCaps10-Regular             <cork-os-lm.enc <lmcsc10.pfb
-cork-lmcsco10 LMCaps10-Italic              <cork-os-lm.enc <lmcsco10.pfb
-cork-lmr10    LMRoman10-Regular            <cork-os-lm.enc <lmr10.pfb
-cork-lmr12    LMRoman12-Regular            <cork-os-lm.enc <lmr12.pfb
-cork-lmr17    LMRoman17-Regular            <cork-os-lm.enc <lmr17.pfb
-cork-lmr5     LMRoman5-Regular             <cork-os-lm.enc <lmr5.pfb
-cork-lmr6     LMRoman6-Regular             <cork-os-lm.enc <lmr6.pfb
-cork-lmr7     LMRoman7-Regular             <cork-os-lm.enc <lmr7.pfb
-cork-lmr8     LMRoman8-Regular             <cork-os-lm.enc <lmr8.pfb
-cork-lmr9     LMRoman9-Regular             <cork-os-lm.enc <lmr9.pfb
-cork-lmri10   LMRoman10-Italic             <cork-os-lm.enc <lmri10.pfb
-cork-lmri12   LMRoman12-Italic             <cork-os-lm.enc <lmri12.pfb
-cork-lmri7    LMRoman7-Italic              <cork-os-lm.enc <lmri7.pfb
-cork-lmri8    LMRoman8-Italic              <cork-os-lm.enc <lmri8.pfb
-cork-lmri9    LMRoman9-Italic              <cork-os-lm.enc <lmri9.pfb
-cork-lmro10   LMSlanted10-Italic           <cork-os-lm.enc <lmro10.pfb
-cork-lmro12   LMSlanted12-Italic           <cork-os-lm.enc <lmro12.pfb
-cork-lmro8    LMSlanted8-Italic            <cork-os-lm.enc <lmro8.pfb
-cork-lmro9    LMSlanted9-Italic            <cork-os-lm.enc <lmro9.pfb
-cork-lmss10   LMSans10-Regular             <cork-os-lm.enc <lmss10.pfb
-cork-lmss12   LMSans12-Regular             <cork-os-lm.enc <lmss12.pfb
-cork-lmss17   LMSans17-Regular             <cork-os-lm.enc <lmss17.pfb
-cork-lmss8    LMSans8-Regular              <cork-os-lm.enc <lmss8.pfb
-cork-lmss9    LMSans9-Regular              <cork-os-lm.enc <lmss9.pfb
-cork-lmssbo10 LMSans10-BoldItalic          <cork-os-lm.enc <lmssbo10.pfb
-cork-lmssbx10 LMSans10-Bold                <cork-os-lm.enc <lmssbx10.pfb
-cork-lmssdc10 LMSansDemiCond10-Regular     <cork-os-lm.enc <lmssdc10.pfb
-cork-lmssdo10 LMSansDemiCond10-Italic      <cork-os-lm.enc <lmssdo10.pfb
-cork-lmsso10  LMSans10-Italic              <cork-os-lm.enc <lmsso10.pfb
-cork-lmsso12  LMSans12-Italic              <cork-os-lm.enc <lmsso12.pfb
-cork-lmsso17  LMSans17-Italic              <cork-os-lm.enc <lmsso17.pfb
-cork-lmsso8   LMSans8-Italic               <cork-os-lm.enc <lmsso8.pfb
-cork-lmsso9   LMSans9-Italic               <cork-os-lm.enc <lmsso9.pfb
-cork-lmssq8   LMSansQuotation8-Regular     <cork-os-lm.enc <lmssq8.pfb
-cork-lmssqbo8 LMSansQuotation8-BoldItalic  <cork-os-lm.enc <lmssqbo8.pfb
-cork-lmssqbx8 LMSansQuotation8-Bold        <cork-os-lm.enc <lmssqbx8.pfb
-cork-lmssqo8  LMSansQuotation8-Italic      <cork-os-lm.enc <lmssqo8.pfb
-cork-lmtcsc10 LMTypewriterCaps10-Regular   <cork-os-lm.enc <lmtcsc10.pfb
-cork-lmtt10   LMTypewriter10-Regular       <cork-os-lm.enc <lmtt10.pfb
-cork-lmtt12   LMTypewriter12-Regular       <cork-os-lm.enc <lmtt12.pfb
-cork-lmtt8    LMTypewriter8-Regular        <cork-os-lm.enc <lmtt8.pfb
-cork-lmtt9    LMTypewriter9-Regular        <cork-os-lm.enc <lmtt9.pfb
-cork-lmtti10  LMTypewriter10-Italic        <cork-os-lm.enc <lmtti10.pfb
-cork-lmtto10  LMTypewriterSlanted10-Italic <cork-os-lm.enc <lmtto10.pfb
-cork-lmvtt10  LMTypewriterVarWd10-Regular  <cork-os-lm.enc <lmvtt10.pfb
-cork-lmvtto10 LMTypewriterVarWd10-Italic   <cork-os-lm.enc <lmvtto10.pfb
+ec-lmb10    LMRomanDemi10-Regular        <ec-os-lm.enc <lmb10.pfb
+ec-lmbo10   LMRomanDemi10-Italic         <ec-os-lm.enc <lmbo10.pfb
+ec-lmbx10   LMRoman10-Bold               <ec-os-lm.enc <lmbx10.pfb
+ec-lmbx12   LMRoman12-Bold               <ec-os-lm.enc <lmbx12.pfb
+ec-lmbx5    LMRoman5-Bold                <ec-os-lm.enc <lmbx5.pfb
+ec-lmbx6    LMRoman6-Bold                <ec-os-lm.enc <lmbx6.pfb
+ec-lmbx7    LMRoman7-Bold                <ec-os-lm.enc <lmbx7.pfb
+ec-lmbx8    LMRoman8-Bold                <ec-os-lm.enc <lmbx8.pfb
+ec-lmbx9    LMRoman9-Bold                <ec-os-lm.enc <lmbx9.pfb
+ec-lmbxi10  LMRoman10-BoldItalic         <ec-os-lm.enc <lmbxi10.pfb
+ec-lmbxo10  LMSlanted10-BoldItalic       <ec-os-lm.enc <lmbxo10.pfb
+ec-lmcsc10  LMCaps10-Regular             <ec-os-lm.enc <lmcsc10.pfb
+ec-lmcsco10 LMCaps10-Italic              <ec-os-lm.enc <lmcsco10.pfb
+ec-lmr10    LMRoman10-Regular            <ec-os-lm.enc <lmr10.pfb
+ec-lmr12    LMRoman12-Regular            <ec-os-lm.enc <lmr12.pfb
+ec-lmr17    LMRoman17-Regular            <ec-os-lm.enc <lmr17.pfb
+ec-lmr5     LMRoman5-Regular             <ec-os-lm.enc <lmr5.pfb
+ec-lmr6     LMRoman6-Regular             <ec-os-lm.enc <lmr6.pfb
+ec-lmr7     LMRoman7-Regular             <ec-os-lm.enc <lmr7.pfb
+ec-lmr8     LMRoman8-Regular             <ec-os-lm.enc <lmr8.pfb
+ec-lmr9     LMRoman9-Regular             <ec-os-lm.enc <lmr9.pfb
+ec-lmri10   LMRoman10-Italic             <ec-os-lm.enc <lmri10.pfb
+ec-lmri12   LMRoman12-Italic             <ec-os-lm.enc <lmri12.pfb
+ec-lmri7    LMRoman7-Italic              <ec-os-lm.enc <lmri7.pfb
+ec-lmri8    LMRoman8-Italic              <ec-os-lm.enc <lmri8.pfb
+ec-lmri9    LMRoman9-Italic              <ec-os-lm.enc <lmri9.pfb
+ec-lmro10   LMSlanted10-Italic           <ec-os-lm.enc <lmro10.pfb
+ec-lmro12   LMSlanted12-Italic           <ec-os-lm.enc <lmro12.pfb
+ec-lmro8    LMSlanted8-Italic            <ec-os-lm.enc <lmro8.pfb
+ec-lmro9    LMSlanted9-Italic            <ec-os-lm.enc <lmro9.pfb
+ec-lmss10   LMSans10-Regular             <ec-os-lm.enc <lmss10.pfb
+ec-lmss12   LMSans12-Regular             <ec-os-lm.enc <lmss12.pfb
+ec-lmss17   LMSans17-Regular             <ec-os-lm.enc <lmss17.pfb
+ec-lmss8    LMSans8-Regular              <ec-os-lm.enc <lmss8.pfb
+ec-lmss9    LMSans9-Regular              <ec-os-lm.enc <lmss9.pfb
+ec-lmssbo10 LMSans10-BoldItalic          <ec-os-lm.enc <lmssbo10.pfb
+ec-lmssbx10 LMSans10-Bold                <ec-os-lm.enc <lmssbx10.pfb
+ec-lmssdc10 LMSansDemiCond10-Regular     <ec-os-lm.enc <lmssdc10.pfb
+ec-lmssdo10 LMSansDemiCond10-Italic      <ec-os-lm.enc <lmssdo10.pfb
+ec-lmsso10  LMSans10-Italic              <ec-os-lm.enc <lmsso10.pfb
+ec-lmsso12  LMSans12-Italic              <ec-os-lm.enc <lmsso12.pfb
+ec-lmsso17  LMSans17-Italic              <ec-os-lm.enc <lmsso17.pfb
+ec-lmsso8   LMSans8-Italic               <ec-os-lm.enc <lmsso8.pfb
+ec-lmsso9   LMSans9-Italic               <ec-os-lm.enc <lmsso9.pfb
+ec-lmssq8   LMSansQuotation8-Regular     <ec-os-lm.enc <lmssq8.pfb
+ec-lmssqbo8 LMSansQuotation8-BoldItalic  <ec-os-lm.enc <lmssqbo8.pfb
+ec-lmssqbx8 LMSansQuotation8-Bold        <ec-os-lm.enc <lmssqbx8.pfb
+ec-lmssqo8  LMSansQuotation8-Italic      <ec-os-lm.enc <lmssqo8.pfb
+ec-lmtcsc10 LMTypewriterCaps10-Regular   <ec-os-lm.enc <lmtcsc10.pfb
+ec-lmtt10   LMTypewriter10-Regular       <ec-os-lm.enc <lmtt10.pfb
+ec-lmtt12   LMTypewriter12-Regular       <ec-os-lm.enc <lmtt12.pfb
+ec-lmtt8    LMTypewriter8-Regular        <ec-os-lm.enc <lmtt8.pfb
+ec-lmtt9    LMTypewriter9-Regular        <ec-os-lm.enc <lmtt9.pfb
+ec-lmtti10  LMTypewriter10-Italic        <ec-os-lm.enc <lmtti10.pfb
+ec-lmtto10  LMTypewriterSlanted10-Italic <ec-os-lm.enc <lmtto10.pfb
+ec-lmvtt10  LMTypewriterVarWd10-Regular  <ec-os-lm.enc <lmvtt10.pfb
+ec-lmvtto10 LMTypewriterVarWd10-Italic   <ec-os-lm.enc <lmvtto10.pfb
diff --git a/fonts/map/pdftex/context/ec-public-lm.map b/fonts/map/pdftex/context/ec-public-lm.map
index e9db5a7f7..148444aa7 100644
--- a/fonts/map/pdftex/context/ec-public-lm.map
+++ b/fonts/map/pdftex/context/ec-public-lm.map
@@ -1,57 +1,57 @@
-cork-lmb10    LMRomanDemi10-Regular        <cork-lm.enc <lmb10.pfb
-cork-lmbo10   LMRomanDemi10-Italic         <cork-lm.enc <lmbo10.pfb
-cork-lmbx10   LMRoman10-Bold               <cork-lm.enc <lmbx10.pfb
-cork-lmbx12   LMRoman12-Bold               <cork-lm.enc <lmbx12.pfb
-cork-lmbx5    LMRoman5-Bold                <cork-lm.enc <lmbx5.pfb
-cork-lmbx6    LMRoman6-Bold                <cork-lm.enc <lmbx6.pfb
-cork-lmbx7    LMRoman7-Bold                <cork-lm.enc <lmbx7.pfb
-cork-lmbx8    LMRoman8-Bold                <cork-lm.enc <lmbx8.pfb
-cork-lmbx9    LMRoman9-Bold                <cork-lm.enc <lmbx9.pfb
-cork-lmbxi10  LMRoman10-BoldItalic         <cork-lm.enc <lmbxi10.pfb
-cork-lmbxo10  LMSlanted10-BoldItalic       <cork-lm.enc <lmbxo10.pfb
-cork-lmcsc10  LMCaps10-Regular             <cork-lm.enc <lmcsc10.pfb
-cork-lmcsco10 LMCaps10-Italic              <cork-lm.enc <lmcsco10.pfb
-cork-lmr10    LMRoman10-Regular            <cork-lm.enc <lmr10.pfb
-cork-lmr12    LMRoman12-Regular            <cork-lm.enc <lmr12.pfb
-cork-lmr17    LMRoman17-Regular            <cork-lm.enc <lmr17.pfb
-cork-lmr5     LMRoman5-Regular             <cork-lm.enc <lmr5.pfb
-cork-lmr6     LMRoman6-Regular             <cork-lm.enc <lmr6.pfb
-cork-lmr7     LMRoman7-Regular             <cork-lm.enc <lmr7.pfb
-cork-lmr8     LMRoman8-Regular             <cork-lm.enc <lmr8.pfb
-cork-lmr9     LMRoman9-Regular             <cork-lm.enc <lmr9.pfb
-cork-lmri10   LMRoman10-Italic             <cork-lm.enc <lmri10.pfb
-cork-lmri12   LMRoman12-Italic             <cork-lm.enc <lmri12.pfb
-cork-lmri7    LMRoman7-Italic              <cork-lm.enc <lmri7.pfb
-cork-lmri8    LMRoman8-Italic              <cork-lm.enc <lmri8.pfb
-cork-lmri9    LMRoman9-Italic              <cork-lm.enc <lmri9.pfb
-cork-lmro10   LMSlanted10-Italic           <cork-lm.enc <lmro10.pfb
-cork-lmro12   LMSlanted12-Italic           <cork-lm.enc <lmro12.pfb
-cork-lmro8    LMSlanted8-Italic            <cork-lm.enc <lmro8.pfb
-cork-lmro9    LMSlanted9-Italic            <cork-lm.enc <lmro9.pfb
-cork-lmss10   LMSans10-Regular             <cork-lm.enc <lmss10.pfb
-cork-lmss12   LMSans12-Regular             <cork-lm.enc <lmss12.pfb
-cork-lmss17   LMSans17-Regular             <cork-lm.enc <lmss17.pfb
-cork-lmss8    LMSans8-Regular              <cork-lm.enc <lmss8.pfb
-cork-lmss9    LMSans9-Regular              <cork-lm.enc <lmss9.pfb
-cork-lmssbo10 LMSans10-BoldItalic          <cork-lm.enc <lmssbo10.pfb
-cork-lmssbx10 LMSans10-Bold                <cork-lm.enc <lmssbx10.pfb
-cork-lmssdc10 LMSansDemiCond10-Regular     <cork-lm.enc <lmssdc10.pfb
-cork-lmssdo10 LMSansDemiCond10-Italic      <cork-lm.enc <lmssdo10.pfb
-cork-lmsso10  LMSans10-Italic              <cork-lm.enc <lmsso10.pfb
-cork-lmsso12  LMSans12-Italic              <cork-lm.enc <lmsso12.pfb
-cork-lmsso17  LMSans17-Italic              <cork-lm.enc <lmsso17.pfb
-cork-lmsso8   LMSans8-Italic               <cork-lm.enc <lmsso8.pfb
-cork-lmsso9   LMSans9-Italic               <cork-lm.enc <lmsso9.pfb
-cork-lmssq8   LMSansQuotation8-Regular     <cork-lm.enc <lmssq8.pfb
-cork-lmssqbo8 LMSansQuotation8-BoldItalic  <cork-lm.enc <lmssqbo8.pfb
-cork-lmssqbx8 LMSansQuotation8-Bold        <cork-lm.enc <lmssqbx8.pfb
-cork-lmssqo8  LMSansQuotation8-Italic      <cork-lm.enc <lmssqo8.pfb
-cork-lmtcsc10 LMTypewriterCaps10-Regular   <cork-lm.enc <lmtcsc10.pfb
-cork-lmtt10   LMTypewriter10-Regular       <cork-lm.enc <lmtt10.pfb
-cork-lmtt12   LMTypewriter12-Regular       <cork-lm.enc <lmtt12.pfb
-cork-lmtt8    LMTypewriter8-Regular        <cork-lm.enc <lmtt8.pfb
-cork-lmtt9    LMTypewriter9-Regular        <cork-lm.enc <lmtt9.pfb
-cork-lmtti10  LMTypewriter10-Italic        <cork-lm.enc <lmtti10.pfb
-cork-lmtto10  LMTypewriterSlanted10-Italic <cork-lm.enc <lmtto10.pfb
-cork-lmvtt10  LMTypewriterVarWd10-Regular  <cork-lm.enc <lmvtt10.pfb
-cork-lmvtto10 LMTypewriterVarWd10-Italic   <cork-lm.enc <lmvtto10.pfb
+ec-lmb10    LMRomanDemi10-Regular        <ec-lm.enc <lmb10.pfb
+ec-lmbo10   LMRomanDemi10-Italic         <ec-lm.enc <lmbo10.pfb
+ec-lmbx10   LMRoman10-Bold               <ec-lm.enc <lmbx10.pfb
+ec-lmbx12   LMRoman12-Bold               <ec-lm.enc <lmbx12.pfb
+ec-lmbx5    LMRoman5-Bold                <ec-lm.enc <lmbx5.pfb
+ec-lmbx6    LMRoman6-Bold                <ec-lm.enc <lmbx6.pfb
+ec-lmbx7    LMRoman7-Bold                <ec-lm.enc <lmbx7.pfb
+ec-lmbx8    LMRoman8-Bold                <ec-lm.enc <lmbx8.pfb
+ec-lmbx9    LMRoman9-Bold                <ec-lm.enc <lmbx9.pfb
+ec-lmbxi10  LMRoman10-BoldItalic         <ec-lm.enc <lmbxi10.pfb
+ec-lmbxo10  LMSlanted10-BoldItalic       <ec-lm.enc <lmbxo10.pfb
+ec-lmcsc10  LMCaps10-Regular             <ec-lm.enc <lmcsc10.pfb
+ec-lmcsco10 LMCaps10-Italic              <ec-lm.enc <lmcsco10.pfb
+ec-lmr10    LMRoman10-Regular            <ec-lm.enc <lmr10.pfb
+ec-lmr12    LMRoman12-Regular            <ec-lm.enc <lmr12.pfb
+ec-lmr17    LMRoman17-Regular            <ec-lm.enc <lmr17.pfb
+ec-lmr5     LMRoman5-Regular             <ec-lm.enc <lmr5.pfb
+ec-lmr6     LMRoman6-Regular             <ec-lm.enc <lmr6.pfb
+ec-lmr7     LMRoman7-Regular             <ec-lm.enc <lmr7.pfb
+ec-lmr8     LMRoman8-Regular             <ec-lm.enc <lmr8.pfb
+ec-lmr9     LMRoman9-Regular             <ec-lm.enc <lmr9.pfb
+ec-lmri10   LMRoman10-Italic             <ec-lm.enc <lmri10.pfb
+ec-lmri12   LMRoman12-Italic             <ec-lm.enc <lmri12.pfb
+ec-lmri7    LMRoman7-Italic              <ec-lm.enc <lmri7.pfb
+ec-lmri8    LMRoman8-Italic              <ec-lm.enc <lmri8.pfb
+ec-lmri9    LMRoman9-Italic              <ec-lm.enc <lmri9.pfb
+ec-lmro10   LMSlanted10-Italic           <ec-lm.enc <lmro10.pfb
+ec-lmro12   LMSlanted12-Italic           <ec-lm.enc <lmro12.pfb
+ec-lmro8    LMSlanted8-Italic            <ec-lm.enc <lmro8.pfb
+ec-lmro9    LMSlanted9-Italic            <ec-lm.enc <lmro9.pfb
+ec-lmss10   LMSans10-Regular             <ec-lm.enc <lmss10.pfb
+ec-lmss12   LMSans12-Regular             <ec-lm.enc <lmss12.pfb
+ec-lmss17   LMSans17-Regular             <ec-lm.enc <lmss17.pfb
+ec-lmss8    LMSans8-Regular              <ec-lm.enc <lmss8.pfb
+ec-lmss9    LMSans9-Regular              <ec-lm.enc <lmss9.pfb
+ec-lmssbo10 LMSans10-BoldItalic          <ec-lm.enc <lmssbo10.pfb
+ec-lmssbx10 LMSans10-Bold                <ec-lm.enc <lmssbx10.pfb
+ec-lmssdc10 LMSansDemiCond10-Regular     <ec-lm.enc <lmssdc10.pfb
+ec-lmssdo10 LMSansDemiCond10-Italic      <ec-lm.enc <lmssdo10.pfb
+ec-lmsso10  LMSans10-Italic              <ec-lm.enc <lmsso10.pfb
+ec-lmsso12  LMSans12-Italic              <ec-lm.enc <lmsso12.pfb
+ec-lmsso17  LMSans17-Italic              <ec-lm.enc <lmsso17.pfb
+ec-lmsso8   LMSans8-Italic               <ec-lm.enc <lmsso8.pfb
+ec-lmsso9   LMSans9-Italic               <ec-lm.enc <lmsso9.pfb
+ec-lmssq8   LMSansQuotation8-Regular     <ec-lm.enc <lmssq8.pfb
+ec-lmssqbo8 LMSansQuotation8-BoldItalic  <ec-lm.enc <lmssqbo8.pfb
+ec-lmssqbx8 LMSansQuotation8-Bold        <ec-lm.enc <lmssqbx8.pfb
+ec-lmssqo8  LMSansQuotation8-Italic      <ec-lm.enc <lmssqo8.pfb
+ec-lmtcsc10 LMTypewriterCaps10-Regular   <ec-lm.enc <lmtcsc10.pfb
+ec-lmtt10   LMTypewriter10-Regular       <ec-lm.enc <lmtt10.pfb
+ec-lmtt12   LMTypewriter12-Regular       <ec-lm.enc <lmtt12.pfb
+ec-lmtt8    LMTypewriter8-Regular        <ec-lm.enc <lmtt8.pfb
+ec-lmtt9    LMTypewriter9-Regular        <ec-lm.enc <lmtt9.pfb
+ec-lmtti10  LMTypewriter10-Italic        <ec-lm.enc <lmtti10.pfb
+ec-lmtto10  LMTypewriterSlanted10-Italic <ec-lm.enc <lmtto10.pfb
+ec-lmvtt10  LMTypewriterVarWd10-Regular  <ec-lm.enc <lmvtt10.pfb
+ec-lmvtto10 LMTypewriterVarWd10-Italic   <ec-lm.enc <lmvtto10.pfb
diff --git a/fonts/map/pdftex/context/original-ams-cmr.map b/fonts/map/pdftex/context/original-ams-cmr.map
index aa8818ec0..6139ad754 100644
--- a/fonts/map/pdftex/context/original-ams-cmr.map
+++ b/fonts/map/pdftex/context/original-ams-cmr.map
@@ -1,47 +1,97 @@
-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
+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/fonts/map/pdftex/context/original-public-lm.map b/fonts/map/pdftex/context/original-public-lm.map
index 92540d7b5..1b3aaa3c9 100644
--- a/fonts/map/pdftex/context/original-public-lm.map
+++ b/fonts/map/pdftex/context/original-public-lm.map
@@ -1,65 +1,130 @@
 % LM replacement, thanks to Jacko
 
-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
+% 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     CMBX12    <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
 
diff --git a/fonts/map/pdftex/context/psclean.map b/fonts/map/pdftex/context/psclean.map
index 75bd34291..322517975 100644
--- a/fonts/map/pdftex/context/psclean.map
+++ b/fonts/map/pdftex/context/psclean.map
@@ -456,63 +456,63 @@ 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
 
-cork-lmb10    LMRomanDemi10-Regular        <cork-lm.enc <lmb10.pfb
-cork-lmbo10   LMRomanDemi10-Italic         <cork-lm.enc <lmbo10.pfb
-cork-lmbx10   LMRoman10-Bold               <cork-lm.enc <lmbx10.pfb
-cork-lmbx12   LMRoman12-Bold               <cork-lm.enc <lmbx12.pfb
-cork-lmbx5    LMRoman5-Bold                <cork-lm.enc <lmbx5.pfb
-cork-lmbx6    LMRoman6-Bold                <cork-lm.enc <lmbx6.pfb
-cork-lmbx7    LMRoman7-Bold                <cork-lm.enc <lmbx7.pfb
-cork-lmbx8    LMRoman8-Bold                <cork-lm.enc <lmbx8.pfb
-cork-lmbx9    LMRoman9-Bold                <cork-lm.enc <lmbx9.pfb
-cork-lmbxi10  LMRoman10-BoldItalic         <cork-lm.enc <lmbxi10.pfb
-cork-lmbxo10  LMSlanted10-BoldItalic       <cork-lm.enc <lmbxo10.pfb
-cork-lmcsc10  LMCaps10-Regular             <cork-lm.enc <lmcsc10.pfb
-cork-lmcsco10 LMCaps10-Italic              <cork-lm.enc <lmcsco10.pfb
-cork-lmr10    LMRoman10-Regular            <cork-lm.enc <lmr10.pfb
-cork-lmr12    LMRoman12-Regular            <cork-lm.enc <lmr12.pfb
-cork-lmr17    LMRoman17-Regular            <cork-lm.enc <lmr17.pfb
-cork-lmr5     LMRoman5-Regular             <cork-lm.enc <lmr5.pfb
-cork-lmr6     LMRoman6-Regular             <cork-lm.enc <lmr6.pfb
-cork-lmr7     LMRoman7-Regular             <cork-lm.enc <lmr7.pfb
-cork-lmr8     LMRoman8-Regular             <cork-lm.enc <lmr8.pfb
-cork-lmr9     LMRoman9-Regular             <cork-lm.enc <lmr9.pfb
-cork-lmri10   LMRoman10-Italic             <cork-lm.enc <lmri10.pfb
-cork-lmri12   LMRoman12-Italic             <cork-lm.enc <lmri12.pfb
-cork-lmri7    LMRoman7-Italic              <cork-lm.enc <lmri7.pfb
-cork-lmri8    LMRoman8-Italic              <cork-lm.enc <lmri8.pfb
-cork-lmri9    LMRoman9-Italic              <cork-lm.enc <lmri9.pfb
-cork-lmro10   LMSlanted10-Italic           <cork-lm.enc <lmro10.pfb
-cork-lmro12   LMSlanted12-Italic           <cork-lm.enc <lmro12.pfb
-cork-lmro8    LMSlanted8-Italic            <cork-lm.enc <lmro8.pfb
-cork-lmro9    LMSlanted9-Italic            <cork-lm.enc <lmro9.pfb
-cork-lmss10   LMSans10-Regular             <cork-lm.enc <lmss10.pfb
-cork-lmss12   LMSans12-Regular             <cork-lm.enc <lmss12.pfb
-cork-lmss17   LMSans17-Regular             <cork-lm.enc <lmss17.pfb
-cork-lmss8    LMSans8-Regular              <cork-lm.enc <lmss8.pfb
-cork-lmss9    LMSans9-Regular              <cork-lm.enc <lmss9.pfb
-cork-lmssbo10 LMSans10-BoldItalic          <cork-lm.enc <lmssbo10.pfb
-cork-lmssbx10 LMSans10-Bold                <cork-lm.enc <lmssbx10.pfb
-cork-lmssdc10 LMSansDemiCond10-Regular     <cork-lm.enc <lmssdc10.pfb
-cork-lmssdo10 LMSansDemiCond10-Italic      <cork-lm.enc <lmssdo10.pfb
-cork-lmsso10  LMSans10-Italic              <cork-lm.enc <lmsso10.pfb
-cork-lmsso12  LMSans12-Italic              <cork-lm.enc <lmsso12.pfb
-cork-lmsso17  LMSans17-Italic              <cork-lm.enc <lmsso17.pfb
-cork-lmsso8   LMSans8-Italic               <cork-lm.enc <lmsso8.pfb
-cork-lmsso9   LMSans9-Italic               <cork-lm.enc <lmsso9.pfb
-cork-lmssq8   LMSansQuotation8-Regular     <cork-lm.enc <lmssq8.pfb
-cork-lmssqbo8 LMSansQuotation8-BoldItalic  <cork-lm.enc <lmssqbo8.pfb
-cork-lmssqbx8 LMSansQuotation8-Bold        <cork-lm.enc <lmssqbx8.pfb
-cork-lmssqo8  LMSansQuotation8-Italic      <cork-lm.enc <lmssqo8.pfb
-cork-lmtcsc10 LMTypewriterCaps10-Regular   <cork-lm.enc <lmtcsc10.pfb
-cork-lmtt10   LMTypewriter10-Regular       <cork-lm.enc <lmtt10.pfb
-cork-lmtt12   LMTypewriter12-Regular       <cork-lm.enc <lmtt12.pfb
-cork-lmtt8    LMTypewriter8-Regular        <cork-lm.enc <lmtt8.pfb
-cork-lmtt9    LMTypewriter9-Regular        <cork-lm.enc <lmtt9.pfb
-cork-lmtti10  LMTypewriter10-Italic        <cork-lm.enc <lmtti10.pfb
-cork-lmtto10  LMTypewriterSlanted10-Italic <cork-lm.enc <lmtto10.pfb
-cork-lmvtt10  LMTypewriterVarWd10-Regular  <cork-lm.enc <lmvtt10.pfb
-cork-lmvtto10 LMTypewriterVarWd10-Italic   <cork-lm.enc <lmvtto10.pfb
+ec-lmb10    LMRomanDemi10-Regular        <ec-lm.enc <lmb10.pfb
+ec-lmbo10   LMRomanDemi10-Italic         <ec-lm.enc <lmbo10.pfb
+ec-lmbx10   LMRoman10-Bold               <ec-lm.enc <lmbx10.pfb
+ec-lmbx12   LMRoman12-Bold               <ec-lm.enc <lmbx12.pfb
+ec-lmbx5    LMRoman5-Bold                <ec-lm.enc <lmbx5.pfb
+ec-lmbx6    LMRoman6-Bold                <ec-lm.enc <lmbx6.pfb
+ec-lmbx7    LMRoman7-Bold                <ec-lm.enc <lmbx7.pfb
+ec-lmbx8    LMRoman8-Bold                <ec-lm.enc <lmbx8.pfb
+ec-lmbx9    LMRoman9-Bold                <ec-lm.enc <lmbx9.pfb
+ec-lmbxi10  LMRoman10-BoldItalic         <ec-lm.enc <lmbxi10.pfb
+ec-lmbxo10  LMSlanted10-BoldItalic       <ec-lm.enc <lmbxo10.pfb
+ec-lmcsc10  LMCaps10-Regular             <ec-lm.enc <lmcsc10.pfb
+ec-lmcsco10 LMCaps10-Italic              <ec-lm.enc <lmcsco10.pfb
+ec-lmr10    LMRoman10-Regular            <ec-lm.enc <lmr10.pfb
+ec-lmr12    LMRoman12-Regular            <ec-lm.enc <lmr12.pfb
+ec-lmr17    LMRoman17-Regular            <ec-lm.enc <lmr17.pfb
+ec-lmr5     LMRoman5-Regular             <ec-lm.enc <lmr5.pfb
+ec-lmr6     LMRoman6-Regular             <ec-lm.enc <lmr6.pfb
+ec-lmr7     LMRoman7-Regular             <ec-lm.enc <lmr7.pfb
+ec-lmr8     LMRoman8-Regular             <ec-lm.enc <lmr8.pfb
+ec-lmr9     LMRoman9-Regular             <ec-lm.enc <lmr9.pfb
+ec-lmri10   LMRoman10-Italic             <ec-lm.enc <lmri10.pfb
+ec-lmri12   LMRoman12-Italic             <ec-lm.enc <lmri12.pfb
+ec-lmri7    LMRoman7-Italic              <ec-lm.enc <lmri7.pfb
+ec-lmri8    LMRoman8-Italic              <ec-lm.enc <lmri8.pfb
+ec-lmri9    LMRoman9-Italic              <ec-lm.enc <lmri9.pfb
+ec-lmro10   LMSlanted10-Italic           <ec-lm.enc <lmro10.pfb
+ec-lmro12   LMSlanted12-Italic           <ec-lm.enc <lmro12.pfb
+ec-lmro8    LMSlanted8-Italic            <ec-lm.enc <lmro8.pfb
+ec-lmro9    LMSlanted9-Italic            <ec-lm.enc <lmro9.pfb
+ec-lmss10   LMSans10-Regular             <ec-lm.enc <lmss10.pfb
+ec-lmss12   LMSans12-Regular             <ec-lm.enc <lmss12.pfb
+ec-lmss17   LMSans17-Regular             <ec-lm.enc <lmss17.pfb
+ec-lmss8    LMSans8-Regular              <ec-lm.enc <lmss8.pfb
+ec-lmss9    LMSans9-Regular              <ec-lm.enc <lmss9.pfb
+ec-lmssbo10 LMSans10-BoldItalic          <ec-lm.enc <lmssbo10.pfb
+ec-lmssbx10 LMSans10-Bold                <ec-lm.enc <lmssbx10.pfb
+ec-lmssdc10 LMSansDemiCond10-Regular     <ec-lm.enc <lmssdc10.pfb
+ec-lmssdo10 LMSansDemiCond10-Italic      <ec-lm.enc <lmssdo10.pfb
+ec-lmsso10  LMSans10-Italic              <ec-lm.enc <lmsso10.pfb
+ec-lmsso12  LMSans12-Italic              <ec-lm.enc <lmsso12.pfb
+ec-lmsso17  LMSans17-Italic              <ec-lm.enc <lmsso17.pfb
+ec-lmsso8   LMSans8-Italic               <ec-lm.enc <lmsso8.pfb
+ec-lmsso9   LMSans9-Italic               <ec-lm.enc <lmsso9.pfb
+ec-lmssq8   LMSansQuotation8-Regular     <ec-lm.enc <lmssq8.pfb
+ec-lmssqbo8 LMSansQuotation8-BoldItalic  <ec-lm.enc <lmssqbo8.pfb
+ec-lmssqbx8 LMSansQuotation8-Bold        <ec-lm.enc <lmssqbx8.pfb
+ec-lmssqo8  LMSansQuotation8-Italic      <ec-lm.enc <lmssqo8.pfb
+ec-lmtcsc10 LMTypewriterCaps10-Regular   <ec-lm.enc <lmtcsc10.pfb
+ec-lmtt10   LMTypewriter10-Regular       <ec-lm.enc <lmtt10.pfb
+ec-lmtt12   LMTypewriter12-Regular       <ec-lm.enc <lmtt12.pfb
+ec-lmtt8    LMTypewriter8-Regular        <ec-lm.enc <lmtt8.pfb
+ec-lmtt9    LMTypewriter9-Regular        <ec-lm.enc <lmtt9.pfb
+ec-lmtti10  LMTypewriter10-Italic        <ec-lm.enc <lmtti10.pfb
+ec-lmtto10  LMTypewriterSlanted10-Italic <ec-lm.enc <lmtto10.pfb
+ec-lmvtt10  LMTypewriterVarWd10-Regular  <ec-lm.enc <lmvtt10.pfb
+ec-lmvtto10 LMTypewriterVarWd10-Italic   <ec-lm.enc <lmvtto10.pfb
 
 
 % courier / urw
@@ -771,6 +771,9 @@ vnu10  LMRoman10-Italic "-0.25 SlantFont" <t5-lm.enc <lmri10.pfb
 % vnfib8
 
 
+# not yet defined
+
+
 % LM replacement / thanks to Jacko
 
 csb10    LMRomanDemi10-Regular        <csrm.enc <lmb10.pfb
@@ -837,6 +840,9 @@ csfi10   csfi10   <csfi10.pfb
 csu10    LMRoman10-Italic "-0.25 SlantFont" <csrm.enc <lmri10.pfb
 
 
+# not yet defined
+
+
 % LM replacement, thanks to Jacko
 
 plb10    LMRomanDemi10-Regular        <plrm.enc  <lmb10.pfb