summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/context/general/allkind/context.rme70
-rw-r--r--fonts/map/dvips/context/ec-lm.map (renamed from fonts/map/pdftex/context/ec-public-lm.map)0
-rw-r--r--fonts/map/dvips/context/el-lm.map69
-rw-r--r--fonts/map/dvips/context/qx-lm.map (renamed from fonts/map/pdftex/context/qx-public-lm.map)0
-rw-r--r--fonts/map/dvips/context/t5-lm.map (renamed from fonts/map/pdftex/context/t5-public-lm.map)0
-rw-r--r--fonts/map/dvips/context/texnansi-lm.map (renamed from fonts/map/pdftex/context/texnansi-public-lm.map)0
-rw-r--r--fonts/map/dvips/context/ts1-lm.map69
-rw-r--r--fonts/map/pdftex/context/context-base.map1077
-rw-r--r--fonts/map/pdftex/context/original-public-lm.map170
-rw-r--r--fonts/map/pdftex/context/original-wasy.map7
-rw-r--r--metapost/context/base/mp-spec.mp21
-rw-r--r--scripts/context/perl/mptopdf.pl10
-rw-r--r--scripts/context/perl/texexec.pl2
-rw-r--r--scripts/context/ruby/base/ctx.rb2
-rw-r--r--scripts/context/ruby/base/tex.rb2
-rw-r--r--scripts/context/ruby/base/texutil.rb12
-rw-r--r--scripts/context/ruby/texmfstart.rb6
-rw-r--r--tex/context/base/context.tex6
-rw-r--r--tex/context/base/core-ntb.tex97
-rw-r--r--tex/context/base/core-tbl.tex3
-rw-r--r--tex/context/base/core-ver.tex97
-rw-r--r--tex/context/base/supp-mis.tex3
-rw-r--r--tex/context/base/symb-was.tex205
-rw-r--r--tex/context/base/syst-ext.tex13
-rw-r--r--tex/context/base/syst-gen.tex75
-rw-r--r--tex/context/base/type-map.tex8
-rw-r--r--tex/context/base/verb-ini.tex2
-rw-r--r--tex/context/interface/keys-cz.xml2
-rw-r--r--tex/context/interface/keys-de.xml2
-rw-r--r--tex/context/interface/keys-en.xml2
-rw-r--r--tex/context/interface/keys-it.xml2
-rw-r--r--tex/context/interface/keys-nl.xml2
-rw-r--r--tex/context/interface/keys-ro.xml2
33 files changed, 671 insertions, 1367 deletions
diff --git a/doc/context/general/allkind/context.rme b/doc/context/general/allkind/context.rme
deleted file mode 100644
index 1cb12cc07..000000000
--- a/doc/context/general/allkind/context.rme
+++ /dev/null
@@ -1,70 +0,0 @@
-Some Basic information
-----------------------
-
-There are currently three interfaces available:
-
- cont-en the english version
- cont-de the german version
- cont-nl the dutch version
- cont-cz the czech version
- cont-ro the romanian version
- cont-it the italian version
-
-One should compile one of these (or all) into a fmt file.
-When one uses the main file,
-
- context the undefined version
-
-TeX ask for an interface language as well as a message
-language. Here one has to specify the full name (english,
-german, dutch, etc.) or use the default (enter). The \
-savest way to update the TeX and MetaPost format files
-is to use TeXExec:
-
-texexec --make --alone en nl metafun
-
-In the TeXExec manual you can read how to generate a format
-with specific fonts and patterns.
-
-By default only the english hyphenation patterns are loaded,
-unless more are enabled in:
-
- cont-usr the typesetting language specifications
-
-Furthermore, users can preset commands etc in the file
-
- cont-sys a system file loaded at runtime
-
-For questions and remarks on ConTeXt, one can subscribe to
-the list:
-
- ntg-context@ntg.nl
-
-by sending the message
-
- subscribe ntg-context
-
-to the list server:
-
- majordomo@ntg.nl
-
-One can find more info at:
-
- www.pragma-ade.com
-
-or at the mirror sites mentioned there.
-
-Don't hesitate to ask questions. ConTeXt can do a lot, and
-the manuals are always a bit behind and incomplete. Also take
-a look at the files
-
- mreadme.pdf
- minstall.pdf
- mtexexec.pdf
- mtexutil.pdf
-
-The teTeX, fpTeX, and 4TeX distributions demonstrate how
-ConTeXt can be integrated in a TeX directory structure.
-
--------------------------
-Hans Hagen, pragma@wxs.nl
diff --git a/fonts/map/pdftex/context/ec-public-lm.map b/fonts/map/dvips/context/ec-lm.map
index d4640394f..d4640394f 100644
--- a/fonts/map/pdftex/context/ec-public-lm.map
+++ b/fonts/map/dvips/context/ec-lm.map
diff --git a/fonts/map/dvips/context/el-lm.map b/fonts/map/dvips/context/el-lm.map
new file mode 100644
index 000000000..f8b605afb
--- /dev/null
+++ b/fonts/map/dvips/context/el-lm.map
@@ -0,0 +1,69 @@
+el-lmb10 LMRoman10-Demi "enclmel ReEncodeFont" <lm-el.enc <lmb10.pfb
+el-lmbo10 LMRoman10-DemiOblique "enclmel ReEncodeFont" <lm-el.enc <lmbo10.pfb
+el-lmbx10 LMRoman10-Bold "enclmel ReEncodeFont" <lm-el.enc <lmbx10.pfb
+el-lmbx12 LMRoman12-Bold "enclmel ReEncodeFont" <lm-el.enc <lmbx12.pfb
+el-lmbx5 LMRoman5-Bold "enclmel ReEncodeFont" <lm-el.enc <lmbx5.pfb
+el-lmbx6 LMRoman6-Bold "enclmel ReEncodeFont" <lm-el.enc <lmbx6.pfb
+el-lmbx7 LMRoman7-Bold "enclmel ReEncodeFont" <lm-el.enc <lmbx7.pfb
+el-lmbx8 LMRoman8-Bold "enclmel ReEncodeFont" <lm-el.enc <lmbx8.pfb
+el-lmbx9 LMRoman9-Bold "enclmel ReEncodeFont" <lm-el.enc <lmbx9.pfb
+el-lmbxi10 LMRoman10-BoldItalic "enclmel ReEncodeFont" <lm-el.enc <lmbxi10.pfb
+el-lmbxo10 LMRoman10-BoldOblique "enclmel ReEncodeFont" <lm-el.enc <lmbxo10.pfb
+el-lmcsc10 LMRoman10-CapsRegular "enclmel ReEncodeFont" <lm-el.enc <lmcsc10.pfb
+el-lmcsco10 LMRoman10-CapsOblique "enclmel ReEncodeFont" <lm-el.enc <lmcsco10.pfb
+el-lmr10 LMRoman10-Regular "enclmel ReEncodeFont" <lm-el.enc <lmr10.pfb
+el-lmr12 LMRoman12-Regular "enclmel ReEncodeFont" <lm-el.enc <lmr12.pfb
+el-lmr17 LMRoman17-Regular "enclmel ReEncodeFont" <lm-el.enc <lmr17.pfb
+el-lmr5 LMRoman5-Regular "enclmel ReEncodeFont" <lm-el.enc <lmr5.pfb
+el-lmr6 LMRoman6-Regular "enclmel ReEncodeFont" <lm-el.enc <lmr6.pfb
+el-lmr7 LMRoman7-Regular "enclmel ReEncodeFont" <lm-el.enc <lmr7.pfb
+el-lmr8 LMRoman8-Regular "enclmel ReEncodeFont" <lm-el.enc <lmr8.pfb
+el-lmr9 LMRoman9-Regular "enclmel ReEncodeFont" <lm-el.enc <lmr9.pfb
+el-lmri10 LMRoman10-Italic "enclmel ReEncodeFont" <lm-el.enc <lmri10.pfb
+el-lmri12 LMRoman12-Italic "enclmel ReEncodeFont" <lm-el.enc <lmri12.pfb
+el-lmri7 LMRoman7-Italic "enclmel ReEncodeFont" <lm-el.enc <lmri7.pfb
+el-lmri8 LMRoman8-Italic "enclmel ReEncodeFont" <lm-el.enc <lmri8.pfb
+el-lmri9 LMRoman9-Italic "enclmel ReEncodeFont" <lm-el.enc <lmri9.pfb
+el-lmro10 LMRoman10-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmro10.pfb
+el-lmro12 LMRoman12-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmro12.pfb
+el-lmro17 LMRoman17-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmro17.pfb
+el-lmro8 LMRoman8-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmro8.pfb
+el-lmro9 LMRoman9-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmro9.pfb
+el-lmss10 LMSans10-Regular "enclmel ReEncodeFont" <lm-el.enc <lmss10.pfb
+el-lmss12 LMSans12-Regular "enclmel ReEncodeFont" <lm-el.enc <lmss12.pfb
+el-lmss17 LMSans17-Regular "enclmel ReEncodeFont" <lm-el.enc <lmss17.pfb
+el-lmss8 LMSans8-Regular "enclmel ReEncodeFont" <lm-el.enc <lmss8.pfb
+el-lmss9 LMSans9-Regular "enclmel ReEncodeFont" <lm-el.enc <lmss9.pfb
+el-lmssbo10 LMSans10-BoldOblique "enclmel ReEncodeFont" <lm-el.enc <lmssbo10.pfb
+el-lmssbx10 LMSans10-Bold "enclmel ReEncodeFont" <lm-el.enc <lmssbx10.pfb
+el-lmssdc10 LMSans10-DemiCondensed "enclmel ReEncodeFont" <lm-el.enc <lmssdc10.pfb
+el-lmssdo10 LMSans10-DemiCondensedOblique "enclmel ReEncodeFont" <lm-el.enc <lmssdo10.pfb
+el-lmsso10 LMSans10-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmsso10.pfb
+el-lmsso12 LMSans12-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmsso12.pfb
+el-lmsso17 LMSans17-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmsso17.pfb
+el-lmsso8 LMSans8-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmsso8.pfb
+el-lmsso9 LMSans9-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmsso9.pfb
+el-lmssq8 LMSansQuotation8-Regular "enclmel ReEncodeFont" <lm-el.enc <lmssq8.pfb
+el-lmssqbo8 LMSansQuotation8-BoldOblique "enclmel ReEncodeFont" <lm-el.enc <lmssqbo8.pfb
+el-lmssqbx8 LMSansQuotation8-Bold "enclmel ReEncodeFont" <lm-el.enc <lmssqbx8.pfb
+el-lmssqo8 LMSansQuotation8-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmssqo8.pfb
+el-lmtcsc10 LMTypewriter10-CapsRegular "enclmel ReEncodeFont" <lm-el.enc <lmtcsc10.pfb
+el-lmtcso10 LMTypewriter10-CapsOblique "enclmel ReEncodeFont" <lm-el.enc <lmtcso10.pfb
+el-lmtl10 LMTypewriter10-Light "enclmel ReEncodeFont" <lm-el.enc <lmtl10.pfb
+el-lmtlo10 LMTypewriter10-LightOblique "enclmel ReEncodeFont" <lm-el.enc <lmtlo10.pfb
+el-lmtlc10 LMTypewriter10-LightCondensed "enclmel ReEncodeFont" <lm-el.enc <lmtlc10.pfb
+el-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmel ReEncodeFont" <lm-el.enc <lmtlco10.pfb
+el-lmtk10 LMTypewriter10-Dark "enclmel ReEncodeFont" <lm-el.enc <lmtk10.pfb
+el-lmtko10 LMTypewriter10-DarkOblique "enclmel ReEncodeFont" <lm-el.enc <lmtko10.pfb
+el-lmtt10 LMTypewriter10-Regular "enclmel ReEncodeFont" <lm-el.enc <lmtt10.pfb
+el-lmtt12 LMTypewriter12-Regular "enclmel ReEncodeFont" <lm-el.enc <lmtt12.pfb
+el-lmtt8 LMTypewriter8-Regular "enclmel ReEncodeFont" <lm-el.enc <lmtt8.pfb
+el-lmtt9 LMTypewriter9-Regular "enclmel ReEncodeFont" <lm-el.enc <lmtt9.pfb
+el-lmtti10 LMTypewriter10-Italic "enclmel ReEncodeFont" <lm-el.enc <lmtti10.pfb
+el-lmtto10 LMTypewriter10-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmtto10.pfb
+el-lmvtt10 LMTypewriterVarWd10-Regular "enclmel ReEncodeFont" <lm-el.enc <lmvtt10.pfb
+el-lmvtto10 LMTypewriterVarWd10-Oblique "enclmel ReEncodeFont" <lm-el.enc <lmvtto10.pfb
+el-lmvtl10 LMTypewriterVarWd10-Light "enclmel ReEncodeFont" <lm-el.enc <lmvtl10.pfb
+el-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmel ReEncodeFont" <lm-el.enc <lmvtlo10.pfb
+el-lmvtk10 LMTypewriterVarWd10-Dark "enclmel ReEncodeFont" <lm-el.enc <lmvtk10.pfb
+el-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmel ReEncodeFont" <lm-el.enc <lmvtko10.pfb
diff --git a/fonts/map/pdftex/context/qx-public-lm.map b/fonts/map/dvips/context/qx-lm.map
index d69d50d93..d69d50d93 100644
--- a/fonts/map/pdftex/context/qx-public-lm.map
+++ b/fonts/map/dvips/context/qx-lm.map
diff --git a/fonts/map/pdftex/context/t5-public-lm.map b/fonts/map/dvips/context/t5-lm.map
index 0e626d7e4..0e626d7e4 100644
--- a/fonts/map/pdftex/context/t5-public-lm.map
+++ b/fonts/map/dvips/context/t5-lm.map
diff --git a/fonts/map/pdftex/context/texnansi-public-lm.map b/fonts/map/dvips/context/texnansi-lm.map
index af8106115..af8106115 100644
--- a/fonts/map/pdftex/context/texnansi-public-lm.map
+++ b/fonts/map/dvips/context/texnansi-lm.map
diff --git a/fonts/map/dvips/context/ts1-lm.map b/fonts/map/dvips/context/ts1-lm.map
new file mode 100644
index 000000000..f5e1b4b73
--- /dev/null
+++ b/fonts/map/dvips/context/ts1-lm.map
@@ -0,0 +1,69 @@
+ts1-lmb10 LMRoman10-Demi "enclmts1 ReEncodeFont" <lm-ts1.enc <lmb10.pfb
+ts1-lmbo10 LMRoman10-DemiOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbo10.pfb
+ts1-lmbx10 LMRoman10-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbx10.pfb
+ts1-lmbx12 LMRoman12-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbx12.pfb
+ts1-lmbx5 LMRoman5-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbx5.pfb
+ts1-lmbx6 LMRoman6-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbx6.pfb
+ts1-lmbx7 LMRoman7-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbx7.pfb
+ts1-lmbx8 LMRoman8-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbx8.pfb
+ts1-lmbx9 LMRoman9-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbx9.pfb
+ts1-lmbxi10 LMRoman10-BoldItalic "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbxi10.pfb
+ts1-lmbxo10 LMRoman10-BoldOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmbxo10.pfb
+ts1-lmcsc10 LMRoman10-CapsRegular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmcsc10.pfb
+ts1-lmcsco10 LMRoman10-CapsOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmcsco10.pfb
+ts1-lmr10 LMRoman10-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmr10.pfb
+ts1-lmr12 LMRoman12-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmr12.pfb
+ts1-lmr17 LMRoman17-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmr17.pfb
+ts1-lmr5 LMRoman5-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmr5.pfb
+ts1-lmr6 LMRoman6-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmr6.pfb
+ts1-lmr7 LMRoman7-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmr7.pfb
+ts1-lmr8 LMRoman8-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmr8.pfb
+ts1-lmr9 LMRoman9-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmr9.pfb
+ts1-lmri10 LMRoman10-Italic "enclmts1 ReEncodeFont" <lm-ts1.enc <lmri10.pfb
+ts1-lmri12 LMRoman12-Italic "enclmts1 ReEncodeFont" <lm-ts1.enc <lmri12.pfb
+ts1-lmri7 LMRoman7-Italic "enclmts1 ReEncodeFont" <lm-ts1.enc <lmri7.pfb
+ts1-lmri8 LMRoman8-Italic "enclmts1 ReEncodeFont" <lm-ts1.enc <lmri8.pfb
+ts1-lmri9 LMRoman9-Italic "enclmts1 ReEncodeFont" <lm-ts1.enc <lmri9.pfb
+ts1-lmro10 LMRoman10-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmro10.pfb
+ts1-lmro12 LMRoman12-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmro12.pfb
+ts1-lmro17 LMRoman17-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmro17.pfb
+ts1-lmro8 LMRoman8-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmro8.pfb
+ts1-lmro9 LMRoman9-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmro9.pfb
+ts1-lmss10 LMSans10-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmss10.pfb
+ts1-lmss12 LMSans12-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmss12.pfb
+ts1-lmss17 LMSans17-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmss17.pfb
+ts1-lmss8 LMSans8-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmss8.pfb
+ts1-lmss9 LMSans9-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmss9.pfb
+ts1-lmssbo10 LMSans10-BoldOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmssbo10.pfb
+ts1-lmssbx10 LMSans10-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmssbx10.pfb
+ts1-lmssdc10 LMSans10-DemiCondensed "enclmts1 ReEncodeFont" <lm-ts1.enc <lmssdc10.pfb
+ts1-lmssdo10 LMSans10-DemiCondensedOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmssdo10.pfb
+ts1-lmsso10 LMSans10-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmsso10.pfb
+ts1-lmsso12 LMSans12-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmsso12.pfb
+ts1-lmsso17 LMSans17-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmsso17.pfb
+ts1-lmsso8 LMSans8-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmsso8.pfb
+ts1-lmsso9 LMSans9-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmsso9.pfb
+ts1-lmssq8 LMSansQuotation8-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmssq8.pfb
+ts1-lmssqbo8 LMSansQuotation8-BoldOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmssqbo8.pfb
+ts1-lmssqbx8 LMSansQuotation8-Bold "enclmts1 ReEncodeFont" <lm-ts1.enc <lmssqbx8.pfb
+ts1-lmssqo8 LMSansQuotation8-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmssqo8.pfb
+ts1-lmtcsc10 LMTypewriter10-CapsRegular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtcsc10.pfb
+ts1-lmtcso10 LMTypewriter10-CapsOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtcso10.pfb
+ts1-lmtl10 LMTypewriter10-Light "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtl10.pfb
+ts1-lmtlo10 LMTypewriter10-LightOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtlo10.pfb
+ts1-lmtlc10 LMTypewriter10-LightCondensed "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtlc10.pfb
+ts1-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtlco10.pfb
+ts1-lmtk10 LMTypewriter10-Dark "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtk10.pfb
+ts1-lmtko10 LMTypewriter10-DarkOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtko10.pfb
+ts1-lmtt10 LMTypewriter10-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtt10.pfb
+ts1-lmtt12 LMTypewriter12-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtt12.pfb
+ts1-lmtt8 LMTypewriter8-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtt8.pfb
+ts1-lmtt9 LMTypewriter9-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtt9.pfb
+ts1-lmtti10 LMTypewriter10-Italic "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtti10.pfb
+ts1-lmtto10 LMTypewriter10-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmtto10.pfb
+ts1-lmvtt10 LMTypewriterVarWd10-Regular "enclmts1 ReEncodeFont" <lm-ts1.enc <lmvtt10.pfb
+ts1-lmvtto10 LMTypewriterVarWd10-Oblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmvtto10.pfb
+ts1-lmvtl10 LMTypewriterVarWd10-Light "enclmts1 ReEncodeFont" <lm-ts1.enc <lmvtl10.pfb
+ts1-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmvtlo10.pfb
+ts1-lmvtk10 LMTypewriterVarWd10-Dark "enclmts1 ReEncodeFont" <lm-ts1.enc <lmvtk10.pfb
+ts1-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmts1 ReEncodeFont" <lm-ts1.enc <lmvtko10.pfb
diff --git a/fonts/map/pdftex/context/context-base.map b/fonts/map/pdftex/context/context-base.map
deleted file mode 100644
index dcb72f69e..000000000
--- a/fonts/map/pdftex/context/context-base.map
+++ /dev/null
@@ -1,1077 +0,0 @@
-% combined file
-
-lasy5 LASY5 <lasy5.pfb
-lasy6 LASY6 <lasy6.pfb
-lasy7 LASY7 <lasy7.pfb
-lasy8 LASY8 <lasy8.pfb
-lasy9 LASY9 <lasy9.pfb
-lasy10 LASY10 <lasy10.pfb
-
-lasyb10 LASYB10 <lasyb10.pfb
-lcircle10 LCIRCLE10 <lcircle1.pfb
-lcirclew10 LCIRCLEW10 <lcirclew.pfb
-lcmss8 LCMSS8 <lcmss8.pfb
-lcmssb8 LCMSSB8 <lcmssb8.pfb
-lcmssi8 LCMSSI8 <lcmssi8.pfb
-line10 LINE10 <line10.pfb
-linew10 LINEW10 <linew10.pfb
-
-logo8 LOGO8 <logo8.pfb
-logo9 LOGO9 <logo9.pfb
-logo10 LOGO10 <logo10.pfb
-logobf10 LOGOBF10 <logobf10.pfb
-logosl10 LOGOSL10 <logosl10.pfb
-
-msam5 MSAM5 <msam5.pfb
-msam7 MSAM7 <msam7.pfb
-msam10 MSAM10 <msam10.pfb
-msbm5 MSBM5 <msbm5.pfb
-msbm7 MSBM7 <msbm7.pfb
-msbm10 MSBM10 <msbm10.pfb
-
-wncyb10 WNCYB10 <wncyb10.pfb
-wncyi10 WNCYI10 <wncyi10.pfb
-wncyr10 WNCYR10 <wncyr10.pfb
-wncysc10 WNCYSC10 <wncysc10.pfb
-wncyss10 WNCYSS10 <wncyss10.pfb
-
-manfnt MANFNT <manfnt.pfb
-
-% i dunno what this is
-
-icmex10 <icmex10.pfb
-icmmi8 <icmmi8.pfb
-icmsy8 <icmsy8.pfb
-icmtt8 <icmtt8.pfb
-ilasy8 <ilasy8.pfb
-ilcmss8 <ilcmss8.pfb
-ilcmssb8 <ilcmssb8.pfb
-ilcmssi8 <ilcmssi8.pfb
-
-
-euex10 EUEX10 <euex10.pfb
-
-eufb5 EUFB5 <eufb5.pfb
-eufb7 EUFB7 <eufb7.pfb
-eufb10 EUFB10 <eufb10.pfb
-
-eufm5 EUFM5 <eufm5.pfb
-eufm7 EUFM7 <eufm7.pfb
-eufm10 EUFM10 <eufm10.pfb
-
-eurb5 EURB5 <eurb5.pfb
-eurb7 EURB7 <eurb7.pfb
-eurb10 EURB10 <eurb10.pfb
-
-eurm5 EURM5 <eurm5.pfb
-eurm7 EURM7 <eurm7.pfb
-eurm10 EURM10 <eurm10.pfb
-
-eusb5 EUSB5 <eusb5.pfb
-eusb7 EUSB7 <eusb7.pfb
-eusb10 EUSB10 <eusb10.pfb
-
-eusm5 EUSM5 <eusm5.pfb
-eusm7 EUSM7 <eusm7.pfb
-eusm10 EUSM10 <eusm10.pfb
-
-% LM replacement, thanks to Jacko
-
-% official
-%
-% cmb10 LMRomanDemi10-Regular <cmrm.enc <lmb10.pfb
-% cmbx10 LMRoman10-Bold <cmrm.enc <lmbx10.pfb
-% cmbx12 LMRoman12-Bold <cmrm.enc <lmbx12.pfb
-% cmbx5 LMRoman5-Bold <cmrm.enc <lmbx5.pfb
-% cmbx6 LMRoman6-Bold <cmrm.enc <lmbx6.pfb
-% cmbx7 LMRoman7-Bold <cmrm.enc <lmbx7.pfb
-% cmbx8 LMRoman8-Bold <cmrm.enc <lmbx8.pfb
-% cmbx9 LMRoman9-Bold <cmrm.enc <lmbx9.pfb
-% cmbxsl10 LMSlanted10-BoldItalic <cmrm.enc <lmbxo10.pfb
-% cmbxti10 LMRoman10-BoldItalic <cmit.enc <lmbxi10.pfb
-% cmbxti12 LMRoman10-BoldItalic <cmit.enc <lmbxti10.pfb
-% cmbxti7 LMRoman10-BoldItalic <cmit.enc <lmbxti10.pfb
-% cmcsc10 LMCaps10-Regular <cmsc.enc <lmcsc10.pfb
-% cmcsc8 LMCaps10-Regular <cmsc.enc <lmcsc10.pfb
-% cmcsc9 LMCaps10-Regular <cmsc.enc <lmcsc10.pfb
-% cminch LMSans10-Bold <cmin.enc <lmssbx10.pfb
-% cmitt10 LMTypewriter10-Italic <cmitt.enc <lmtti10.pfb
-% cmitt12 LMTypewriter10-Italic <cmitt.enc <lmtti10.pfb
-% cmitt9 LMTypewriter10-Italic <cmitt.enc <lmtti10.pfb
-% cmr10 LMRoman10-Regular <cmrm.enc <lmr10.pfb
-% cmr12 LMRoman12-Regular <cmrm.enc <lmr12.pfb
-% cmr17 LMRoman17-Regular <cmrm.enc <lmr17.pfb
-% cmr5 LMRoman5-Regular <cmsc.enc <lmr5.pfb
-% cmr6 LMRoman6-Regular <cmrm.enc <lmr6.pfb
-% cmr7 LMRoman7-Regular <cmrm.enc <lmr7.pfb
-% cmr8 LMRoman8-Regular <cmrm.enc <lmr8.pfb
-% cmr9 LMRoman9-Regular <cmrm.enc <lmr9.pfb
-% cmsl10 LMSlanted10-Italic <cmrm.enc <lmro10.pfb
-% cmsl12 LMSlanted12-Italic <cmrm.enc <lmro12.pfb
-% cmsl6 LMSlanted8-Italic <cmrm.enc <lmro8.pfb
-% cmsl8 LMSlanted8-Italic <cmrm.enc <lmro8.pfb
-% cmsl9 LMSlanted9-Italic <cmrm.enc <lmro9.pfb
-% cmsltt10 LMTypewriterSlanted10-Italic <cmtt.enc <lmtto10.pfb
-% cmsltt9 LMTypewriterSlanted10-Italic <cmtt.enc <lmtto10.pfb
-% cmss10 LMSans10-Regular <cmrm.enc <lmss10.pfb
-% cmss12 LMSans12-Regular <cmrm.enc <lmss12.pfb
-% cmss17 LMSans17-Regular <cmrm.enc <lmss17.pfb
-% cmss8 LMSans8-Regular <cmrm.enc <lmss8.pfb
-% cmss9 LMSans9-Regular <cmrm.enc <lmss9.pfb
-% cmssbx10 LMSans10-Bold <cmrm.enc <lmssbx10.pfb
-% cmssbxo10 LMSans10-BoldItalic <cmrm.enc <lmssbo10.pfb
-% cmssdc10 LMSansDemiCond10-Regular <cmrm.enc <lmssdc10.pfb
-% cmssi10 LMSans10-Italic <cmrm.enc <lmsso10.pfb
-% cmssi12 LMSans12-Italic <cmrm.enc <lmsso12.pfb
-% cmssi17 LMSans17-Italic <cmrm.enc <lmsso17.pfb
-% cmssi8 LMSans8-Italic <cmrm.enc <lmsso8.pfb
-% cmssi9 LMSans9-Italic <cmrm.enc <lmsso9.pfb
-% cmssq8 LMSansQuotation8-Regular <cmrm.enc <lmssq8.pfb
-% cmssqi8 LMSansQuotation8-Italic <cmrm.enc <lmssqo8.pfb
-% cmtcsc10 LMTypewriterCaps10-Regular <cmtt.enc <lmtcsc10.pfb
-% cmti10 LMRoman10-Italic <cmit.enc <lmri10.pfb
-% cmti12 LMRoman12-Italic <cmit.enc <lmri12.pfb
-% cmti7 LMRoman7-Italic <cmit.enc <lmri7.pfb
-% cmti8 LMRoman8-Italic <cmit.enc <lmri8.pfb
-% cmti9 LMRoman9-Italic <cmit.enc <lmri9.pfb
-% cmtt10 LMTypewriter10-Regular <cmtt.enc <lmtt10.pfb
-% cmtt12 LMTypewriter12-Regular <cmtt.enc <lmtt12.pfb
-% cmtt8 LMTypewriter8-Regular <cmtt.enc <lmtt8.pfb
-% cmtt9 LMTypewriter9-Regular <cmtt.enc <lmtt9.pfb
-% cmvtt10 LMTypewriterVarWd10-Regular <cmrm.enc <lmvtt10.pfb
-%
-% but more efficient since to-be-included old files have those names
-
-cmb10 CMB10 <cmrm.enc <lmb10.pfb
-cmbx10 CMBX10 <cmrm.enc <lmbx10.pfb
-cmbx12 CMBX12 <cmrm.enc <lmbx12.pfb
-cmbx5 CMBX5 <cmrm.enc <lmbx5.pfb
-cmbx6 CMBX6 <cmrm.enc <lmbx6.pfb
-cmbx7 CMBX7 <cmrm.enc <lmbx7.pfb
-cmbx8 CMBX8 <cmrm.enc <lmbx8.pfb
-cmbx9 CMBX9 <cmrm.enc <lmbx9.pfb
-cmbxsl10 CMBXSL10 <cmrm.enc <lmbxo10.pfb
-cmbxti10 CMBXTI10 <cmit.enc <lmbxi10.pfb
-cmbxti12 CMBXTI12 <cmit.enc <lmbxti10.pfb
-cmbxti7 CMBXTI7 <cmit.enc <lmbxti10.pfb
-cmcsc10 CMCSC10 <cmsc.enc <lmcsc10.pfb
-cmcsc8 CMCSC8 <cmsc.enc <lmcsc10.pfb
-cmcsc9 CMCSC9 <cmsc.enc <lmcsc10.pfb
-cminch CMINCH <cmin.enc <lmssbx10.pfb
-cmitt10 CMITT10 <cmitt.enc <lmtti10.pfb
-cmitt12 CMITT12 <cmitt.enc <lmtti10.pfb
-cmitt9 CMITT9 <cmitt.enc <lmtti10.pfb
-cmr10 CMR10 <cmrm.enc <lmr10.pfb
-cmr12 CMR12 <cmrm.enc <lmr12.pfb
-cmr17 CMR17 <cmrm.enc <lmr17.pfb
-cmr5 CMR5 <cmsc.enc <lmr5.pfb
-cmr6 CMR6 <cmrm.enc <lmr6.pfb
-cmr7 CMR7 <cmrm.enc <lmr7.pfb
-cmr8 CMR8 <cmrm.enc <lmr8.pfb
-cmr9 CMR9 <cmrm.enc <lmr9.pfb
-cmsl10 CMSL10 <cmrm.enc <lmro10.pfb
-cmsl12 CMSL12 <cmrm.enc <lmro12.pfb
-cmsl6 CMSL6 <cmrm.enc <lmro8.pfb
-cmsl8 CMSL8 <cmrm.enc <lmro8.pfb
-cmsl9 CMSL9 <cmrm.enc <lmro9.pfb
-cmsltt10 CMSLTT10 <cmtt.enc <lmtto10.pfb
-cmsltt9 CMSLTT9 <cmtt.enc <lmtto10.pfb
-cmss10 CMS10 <cmrm.enc <lmss10.pfb
-cmss12 CMS12 <cmrm.enc <lmss12.pfb
-cmss17 CMS17 <cmrm.enc <lmss17.pfb
-cmss8 CMS8 <cmrm.enc <lmss8.pfb
-cmss9 CMS9 <cmrm.enc <lmss9.pfb
-cmssbx10 CMSSBX10 <cmrm.enc <lmssbx10.pfb
-cmssbxo10 CMSSBXO10 <cmrm.enc <lmssbo10.pfb
-cmssdc10 CMSSDC10 <cmrm.enc <lmssdc10.pfb
-cmssi10 CMSI10 <cmrm.enc <lmsso10.pfb
-cmssi12 CMSI12 <cmrm.enc <lmsso12.pfb
-cmssi17 CMSI17 <cmrm.enc <lmsso17.pfb
-cmssi8 CMSSI8 <cmrm.enc <lmsso8.pfb
-cmssi9 CMSSI9 <cmrm.enc <lmsso9.pfb
-cmssq8 CMSQ8 <cmrm.enc <lmssq8.pfb
-cmssqi8 CMSSQI8 <cmrm.enc <lmssqo8.pfb
-cmtcsc10 CMTCSC10 <cmtt.enc <lmtcsc10.pfb
-cmti10 CMTI10 <cmit.enc <lmri10.pfb
-cmti12 CMTI12 <cmit.enc <lmri12.pfb
-cmti7 CMTI7 <cmit.enc <lmri7.pfb
-cmti8 CMTI8 <cmit.enc <lmri8.pfb
-cmti9 CMTI9 <cmit.enc <lmri9.pfb
-cmtt10 CMTT10 <cmtt.enc <lmtt10.pfb
-cmtt12 CMTT12 <cmtt.enc <lmtt12.pfb
-cmtt8 CMTT8 <cmtt.enc <lmtt8.pfb
-cmtt9 CMTT9 <cmtt.enc <lmtt9.pfb
-cmvtt10 CMVTT10 <cmrm.enc <lmvtt10.pfb
-
-% original
-
-cmbsy10 CMBSY10 <cmbsy10.pfb
-cmbsy5 CMBSY5 <cmbsy5.pfb
-cmbsy6 CMBSY7 <cmbsy7.pfb
-cmbsy7 CMBSY7 <cmbsy7.pfb
-cmbsy8 CMBSY7 <cmbsy7.pfb
-cmbsy9 CMBSY10 <cmbsy10.pfb
-cmdunh10 CMDUNH10 <cmdunh10.pfb
-cmex10 CMEX10 <cmex10.pfb
-cmex7 CMEX10 <cmex10.pfb
-cmex8 CMEX10 <cmex10.pfb
-cmex9 CMEX10 <cmex10.pfb
-cmff10 CMFF10 <cmff10.pfb
-cmfi10 CMFI10 <cmfi10.pfb
-cmfib8 CMFIB8 <cmfib8.pfb
-cmmi10 CMMI10 <cmmi10.pfb
-cmmi12 CMMI12 <cmmi12.pfb
-cmmi5 CMMI5 <cmmi5.pfb
-cmmi6 CMMI6 <cmmi6.pfb
-cmmi7 CMMI7 <cmmi7.pfb
-cmmi8 CMMI8 <cmmi8.pfb
-cmmi9 CMMI9 <cmmi9.pfb
-cmmib10 CMMIB10 <cmmib10.pfb
-cmmib5 CMMIB5 <cmmib5.pfb
-cmmib6 CMMIB7 <cmmib7.pfb
-cmmib7 CMMIB7 <cmmib7.pfb
-cmmib8 CMMIB7 <cmmib7.pfb
-cmmib9 CMMIB10 <cmmib10.pfb
-cmsy10 CMSY10 <cmsy10.pfb
-cmsy5 CMSY5 <cmsy5.pfb
-cmsy6 CMSY6 <cmsy6.pfb
-cmsy7 CMSY7 <cmsy7.pfb
-cmsy8 CMSY8 <cmsy8.pfb
-cmsy9 CMSY9 <cmsy9.pfb
-cmtex10 CMTEX10 <cmtex10.pfb
-cmtex8 CMTEX8 <cmtex8.pfb
-cmtex9 CMTEX9 <cmtex9.pfb
-
-% a weird one, not used in context
-
-cmu10 LMRoman10-Italic "-0.25 SlantFont" <cmit.enc <lmri10.pfb
-
-
-% courier / urw
-
-ucrb8r NimbusMonL-Bold <8r.enc <ucrb8a.pfb
-ucrbo8r NimbusMonL-BoldObli <8r.enc <ucrbo8a.pfb
-ucrr8r NimbusMonL-Regu <8r.enc <ucrr8a.pfb
-ucrro8r NimbusMonL-ReguObli <8r.enc <ucrro8a.pfb
-
-% courier / adobe
-
-pcrb8r NimbusMonL-Bold <8r.enc <ucrb8a.pfb
-pcrbo8r NimbusMonL-BoldObli <8r.enc <ucrbo8a.pfb
-pcrr8r NimbusMonL-Regu <8r.enc <ucrr8a.pfb
-pcrro8r NimbusMonL-ReguObli <8r.enc <ucrro8a.pfb
-
-% helvetica / urw
-
-uhvb8r NimbusSanL-Bold <8r.enc <uhvb8a.pfb
-uhvbo8r NimbusSanL-BoldItal <8r.enc <uhvbo8a.pfb
-uhvr8r NimbusSanL-Regu <8r.enc <uhvr8a.pfb
-uhvro8r NimbusSanL-ReguItal <8r.enc <uhvro8a.pfb
-
-% helvetica / adobe
-
-phvb8r NimbusSanL-Bold <8r.enc <uhvb8a.pfb
-phvbo8r NimbusSanL-BoldItal <8r.enc <uhvbo8a.pfb
-phvr8r NimbusSanL-Regu <8r.enc <uhvr8a.pfb
-phvro8r NimbusSanL-ReguItal <8r.enc <uhvro8a.pfb
-
-% times / urw
-
-utmb8r NimbusRomNo9L-Medi <8r.enc <utmb8a.pfb
-utmbi8r NimbusRomNo9L-MediItal <8r.enc <utmbi8a.pfb
-utmr8r NimbusRomNo9L-Regu <8r.enc <utmr8a.pfb
-utmri8r NimbusRomNo9L-ReguItal <8r.enc <utmri8a.pfb
-
-utmbo8r NimbusRomNo9L-Medi ".167 SlantFont" <8r.enc <utmb8a.pfb
-utmro8r NimbusRomNo9L-Regu ".167 SlantFont" <8r.enc <utmr8a.pfb
-
-% times / adobe
-
-ptmb8r NimbusRomNo9L-Medi <8r.enc <utmb8a.pfb
-ptmbi8r NimbusRomNo9L-MediItal <8r.enc <utmbi8a.pfb
-ptmr8r NimbusRomNo9L-Regu <8r.enc <utmr8a.pfb
-ptmri8r NimbusRomNo9L-ReguItal <8r.enc <utmri8a.pfb
-
-ptmbo8r NimbusRomNo9L-Medi ".167 SlantFont" <8r.enc <utmb8a.pfb
-ptmro8r NimbusRomNo9L-Regu ".167 SlantFont" <8r.enc <utmr8a.pfb
-
-% palatino / urw
-
-uplb8r URWPalladioL-Bold <8r.enc <uplb8a.pfb
-uplbi8r URWPalladioL-BoldItal <8r.enc <uplbi8a.pfb
-uplr8r URWPalladioL-Roma <8r.enc <uplr8a.pfb
-uplri8r URWPalladioL-Ital <8r.enc <uplri8a.pfb
-
-uplbo8r URWPalladioL-Bold ".167 SlantFont" <8r.enc <uplb8a.pfb
-uplro8r URWPalladioL-Roma ".167 SlantFont" <8r.enc <uplr8a.pfb
-
-% palatino / adobe
-
-pplb8r URWPalladioL-Bold <8r.enc <uplb8a.pfb
-pplbi8r URWPalladioL-BoldItal <8r.enc <uplbi8a.pfb
-pplr8r URWPalladioL-Roma <8r.enc <uplr8a.pfb
-pplri8r URWPalladioL-Ital <8r.enc <uplri8a.pfb
-
-pplbo8r URWPalladioL-Bold ".167 SlantFont" <8r.enc <uplb8a.pfb
-pplro8r URWPalladioL-Roma ".167 SlantFont" <8r.enc <uplr8a.pfb
-
-% bookman / urw
-
-ubkd8r URWBookmanL-DemiBold <8r.enc <ubkd8a.pfb
-ubkdi8r URWBookmanL-DemiBoldItal <8r.enc <ubkdi8a.pfb
-ubkl8r URWBookmanL-Ligh <8r.enc <ubkl8a.pfb
-ubkli8r URWBookmanL-LighItal <8r.enc <ubkli8a.pfb
-
-ubkdo8r URWBookmanL-DemiBold ".167 SlantFont" <8r.enc <ubkd8a.pfb
-ubklo8r URWBookmanL-Ligh ".167 SlantFont" <8r.enc <ubkl8a.pfb
-
-% bookman / adobe
-
-pbkd8r URWBookmanL-DemiBold <8r.enc <ubkd8a.pfb
-pbkdi8r URWBookmanL-DemiBoldItal <8r.enc <ubkdi8a.pfb
-pbkl8r URWBookmanL-Ligh <8r.enc <ubkl8a.pfb
-pbkli8r URWBookmanL-LighItal <8r.enc <ubkli8a.pfb
-
-pbkdo8r URWBookmanL-DemiBold ".167 SlantFont" <8r.enc <ubkd8a.pfb
-pbklo8r URWBookmanL-Ligh ".167 SlantFont" <8r.enc <ubkl8a.pfb
-
-% chancery / urw
-
-uzcmi8r URWChanceryL-MediItal <8r.enc <uzcmi8a.pfb
-
-% chancery / adobe
-
-pzcmi8r URWChanceryL-MediItal <8r.enc <uzcmi8a.pfb
-
-% schoolbook / urw
-
-uncb8r CenturySchL-Bold <8r.enc <uncb8a.pfb
-uncbi8r CenturySchL-BoldItal <8r.enc <uncbi8a.pfb
-uncr8r CenturySchL-Roma <8r.enc <uncr8a.pfb
-uncri8r CenturySchL-Ital <8r.enc <uncri8a.pfb
-
-uncbo8r CenturySchL-Bold ".167 SlantFont" <8r.enc <uncb8a.pfb
-uncro8r CenturySchL-Roma ".167 SlantFont" <8r.enc <uncr8a.pfb
-
-% schoolbook / adobe
-
-pncb8r CenturySchL-Bold <8r.enc <uncb8a.pfb
-pncbi8r CenturySchL-BoldItal <8r.enc <uncbi8a.pfb
-pncr8r CenturySchL-Roma <8r.enc <uncr8a.pfb
-pncri8r CenturySchL-Ital <8r.enc <uncri8a.pfb
-
-pncbo8r CenturySchL-Bold ".167 SlantFont" <8r.enc <uncb8a.pfb
-pncro8r CenturySchL-Roma ".167 SlantFont" <8r.enc <uncr8a.pfb
-
-% utopia
-
-putb8r Utopia-Bold <8r.enc <putb8a.pfb
-putbi8r Utopia-BoldItalic <8r.enc <putbi8a.pfb
-putr8r Utopia-Regular <8r.enc <putr8a.pfb
-putri8r Utopia-Italic <8r.enc <putri8a.pfb
-
-putbo8r Utopia-Bold ".167 SlantFont" <8r.enc <putb8a.pfb
-putro8r Utopia-Regular ".167 SlantFont" <8r.enc <putr8a.pfb
-
-% charter
-
-bchb8r CharterBT-Bold <8r.enc <bchb8a.pfb
-bchbi8r CharterBT-BoldItalic <8r.enc <bchbi8a.pfb
-bchr8r CharterBT-Roman <8r.enc <bchr8a.pfb
-bchri8r CharterBT-Italic <8r.enc <bchri8a.pfb
-
-bchbo8r CharterBT-Bold ".167 SlantFont" <8r.enc <bchb8a.pfb
-bchro8r CharterBT-Roman ".167 SlantFont" <8r.enc <bchr8a.pfb
-
-% courier / urw
-
-ucrb8t NimbusMonL-Bold <ec.enc <ucrb8a.pfb
-ucrbo8t NimbusMonL-BoldObli <ec.enc <ucrbo8a.pfb
-ucrr8t NimbusMonL-Regu <ec.enc <ucrr8a.pfb
-ucrro8t NimbusMonL-ReguObli <ec.enc <ucrro8a.pfb
-
-% courier / adobe
-
-pcrb8t NimbusMonL-Bold <ec.enc <ucrb8a.pfb
-pcrbo8t NimbusMonL-BoldObli <ec.enc <ucrbo8a.pfb
-pcrr8t NimbusMonL-Regu <ec.enc <ucrr8a.pfb
-pcrro8t NimbusMonL-ReguObli <ec.enc <ucrro8a.pfb
-
-% helvetica / urw
-
-uhvb8t NimbusSanL-Bold <ec.enc <uhvb8a.pfb
-uhvbo8t NimbusSanL-BoldItal <ec.enc <uhvbo8a.pfb
-uhvr8t NimbusSanL-Regu <ec.enc <uhvr8a.pfb
-uhvro8t NimbusSanL-ReguItal <ec.enc <uhvro8a.pfb
-
-% helvetica / adobe
-
-phvb8t NimbusSanL-Bold <ec.enc <uhvb8a.pfb
-phvbo8t NimbusSanL-BoldItal <ec.enc <uhvbo8a.pfb
-phvr8t NimbusSanL-Regu <ec.enc <uhvr8a.pfb
-phvro8t NimbusSanL-ReguItal <ec.enc <uhvro8a.pfb
-
-% times / urw
-
-utmb8t NimbusRomNo9L-Medi <ec.enc <utmb8a.pfb
-utmbi8t NimbusRomNo9L-MediItal <ec.enc <utmbi8a.pfb
-utmr8t NimbusRomNo9L-Regu <ec.enc <utmr8a.pfb
-utmri8t NimbusRomNo9L-ReguItal <ec.enc <utmri8a.pfb
-
-utmbo8t NimbusRomNo9L-Medi ".167 SlantFont" <ec.enc <utmb8a.pfb
-utmro8t NimbusRomNo9L-Regu ".167 SlantFont" <ec.enc <utmr8a.pfb
-
-% times / adobe
-
-ptmb8t NimbusRomNo9L-Medi <ec.enc <utmb8a.pfb
-ptmbi8t NimbusRomNo9L-MediItal <ec.enc <utmbi8a.pfb
-ptmr8t NimbusRomNo9L-Regu <ec.enc <utmr8a.pfb
-ptmri8t NimbusRomNo9L-ReguItal <ec.enc <utmri8a.pfb
-
-ptmbo8t NimbusRomNo9L-Medi ".167 SlantFont" <ec.enc <utmb8a.pfb
-ptmro8t NimbusRomNo9L-Regu ".167 SlantFont" <ec.enc <utmr8a.pfb
-
-% palatino / urw
-
-uplb8t URWPalladioL-Bold <ec.enc <uplb8a.pfb
-uplbi8t URWPalladioL-BoldItal <ec.enc <uplbi8a.pfb
-uplr8t URWPalladioL-Roma <ec.enc <uplr8a.pfb
-uplri8t URWPalladioL-Ital <ec.enc <uplri8a.pfb
-
-uplbo8t URWPalladioL-Bold ".167 SlantFont" <ec.enc <uplb8a.pfb
-uplro8t URWPalladioL-Roma ".167 SlantFont" <ec.enc <uplr8a.pfb
-
-% palatino / adobe
-
-pplb8t URWPalladioL-Bold <ec.enc <uplb8a.pfb
-pplbi8t URWPalladioL-BoldItal <ec.enc <uplbi8a.pfb
-pplr8t URWPalladioL-Roma <ec.enc <uplr8a.pfb
-pplri8t URWPalladioL-Ital <ec.enc <uplri8a.pfb
-
-pplbo8t URWPalladioL-Bold ".167 SlantFont" <ec.enc <uplb8a.pfb
-pplro8t URWPalladioL-Roma ".167 SlantFont" <ec.enc <upplr8a.pfb
-
-% bookman / urw
-
-ubkd8t URWBookmanL-DemiBold <ec.enc <ubkd8a.pfb
-ubkdi8t URWBookmanL-DemiBoldItal <ec.enc <ubkdi8a.pfb
-ubkl8t URWBookmanL-Ligh <ec.enc <ubkl8a.pfb
-ubkli8t URWBookmanL-LighItal <ec.enc <ubkli8a.pfb
-
-ubkdo8t URWBookmanL-DemiBold ".167 SlantFont" <ec.enc <ubkd8a.pfb
-ubklo8t URWBookmanL-Ligh ".167 SlantFont" <ec.enc <ubkl8a.pfb
-
-% bookman / adobe
-
-pbkd8t URWBookmanL-DemiBold <ec.enc <ubkd8a.pfb
-pbkdi8t URWBookmanL-DemiBoldItal <ec.enc <ubkdi8a.pfb
-pbkl8t URWBookmanL-Ligh <ec.enc <ubkl8a.pfb
-pbkli8t URWBookmanL-LighItal <ec.enc <ubkli8a.pfb
-
-pbkdo8t URWBookmanL-DemiBold ".167 SlantFont" <ec.enc <ubkd8a.pfb
-pbklo8t URWBookmanL-Ligh ".167 SlantFont" <ec.enc <ubkl8a.pfb
-
-% chancery / urw
-
-uzcmi8t URWChanceryL-MediItal <ec.enc <uzcmi8a.pfb
-
-% chancery / adobe
-
-pzcmi8t URWChanceryL-MediItal <ec.enc <uzcmi8a.pfb
-
-% schoolbook / urw
-
-uncb8t CenturySchL-Bold <ec.enc <uncb8a.pfb
-uncbi8t CenturySchL-BoldItal <ec.enc <uncbi8a.pfb
-uncr8t CenturySchL-Roma <ec.enc <uncr8a.pfb
-uncri8t CenturySchL-Ital <ec.enc <uncri8a.pfb
-
-uncbo8t CenturySchL-Bold ".167 SlantFont" <ec.enc <uncb8a.pfb
-uncro8t CenturySchL-Roma ".167 SlantFont" <ec.enc <uncr8a.pfb
-
-% schoolbook / adobe
-
-pncb8t CenturySchL-Bold <ec.enc <uncb8a.pfb
-pncbi8t CenturySchL-BoldItal <ec.enc <uncbi8a.pfb
-pncr8t CenturySchL-Roma <ec.enc <uncr8a.pfb
-pncri8t CenturySchL-Ital <ec.enc <uncri8a.pfb
-
-pncbo8t CenturySchL-Bold ".167 SlantFont" <ec.enc <uncb8a.pfb
-pncro8t CenturySchL-Roma ".167 SlantFont" <ec.enc <uncr8a.pfb
-
-% utopia
-
-putb8t Utopia-Bold <ec.enc <putb8a.pfb
-putbi8t Utopia-BoldItalic <ec.enc <putbi8a.pfb
-putr8t Utopia-Regular <ec.enc <putr8a.pfb
-putri8t Utopia-Italic <ec.enc <putri8a.pfb
-
-putbo8t Utopia-Bold ".167 SlantFont" <ec.enc <putb8a.pfb
-putro8t Utopia-Regular ".167 SlantFont" <ec.enc <putr8a.pfb
-
-% charter
-
-bchb8t CharterBT-Bold <ec.enc <bchb8a.pfb
-bchbi8t CharterBT-BoldItalic <ec.enc <bchbi8a.pfb
-bchr8t CharterBT-Roman <ec.enc <bchr8a.pfb
-bchri8t CharterBT-Italic <ec.enc <bchri8a.pfb
-
-bchbo8t CharterBT-Bold ".167 SlantFont" <ec.enc <bchb8a.pfb
-bchro8t CharterBT-Roman ".167 SlantFont" <ec.enc <bchr8a.pfb
-
-ec-lmb10 LMRoman10-Demi "enclmec ReEncodeFont" <lm-ec.enc <lmb10.pfb
-ec-lmbo10 LMRoman10-DemiOblique "enclmec ReEncodeFont" <lm-ec.enc <lmbo10.pfb
-ec-lmbx10 LMRoman10-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx10.pfb
-ec-lmbx12 LMRoman12-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx12.pfb
-ec-lmbx5 LMRoman5-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx5.pfb
-ec-lmbx6 LMRoman6-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx6.pfb
-ec-lmbx7 LMRoman7-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx7.pfb
-ec-lmbx8 LMRoman8-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx8.pfb
-ec-lmbx9 LMRoman9-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx9.pfb
-ec-lmbxi10 LMRoman10-BoldItalic "enclmec ReEncodeFont" <lm-ec.enc <lmbxi10.pfb
-ec-lmbxo10 LMRoman10-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmbxo10.pfb
-ec-lmcsc10 LMRoman10-CapsRegular "enclmec ReEncodeFont" <lm-ec.enc <lmcsc10.pfb
-ec-lmcsco10 LMRoman10-CapsOblique "enclmec ReEncodeFont" <lm-ec.enc <lmcsco10.pfb
-ec-lmr10 LMRoman10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr10.pfb
-ec-lmr12 LMRoman12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr12.pfb
-ec-lmr17 LMRoman17-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr17.pfb
-ec-lmr5 LMRoman5-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr5.pfb
-ec-lmr6 LMRoman6-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr6.pfb
-ec-lmr7 LMRoman7-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr7.pfb
-ec-lmr8 LMRoman8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr8.pfb
-ec-lmr9 LMRoman9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr9.pfb
-ec-lmri10 LMRoman10-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri10.pfb
-ec-lmri12 LMRoman12-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri12.pfb
-ec-lmri7 LMRoman7-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri7.pfb
-ec-lmri8 LMRoman8-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri8.pfb
-ec-lmri9 LMRoman9-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri9.pfb
-ec-lmro10 LMRoman10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro10.pfb
-ec-lmro12 LMRoman12-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro12.pfb
-ec-lmro17 LMRoman17-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro17.pfb
-ec-lmro8 LMRoman8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro8.pfb
-ec-lmro9 LMRoman9-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro9.pfb
-ec-lmss10 LMSans10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss10.pfb
-ec-lmss12 LMSans12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss12.pfb
-ec-lmss17 LMSans17-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss17.pfb
-ec-lmss8 LMSans8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss8.pfb
-ec-lmss9 LMSans9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss9.pfb
-ec-lmssbo10 LMSans10-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssbo10.pfb
-ec-lmssbx10 LMSans10-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmssbx10.pfb
-ec-lmssdc10 LMSans10-DemiCondensed "enclmec ReEncodeFont" <lm-ec.enc <lmssdc10.pfb
-ec-lmssdo10 LMSans10-DemiCondensedOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssdo10.pfb
-ec-lmsso10 LMSans10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso10.pfb
-ec-lmsso12 LMSans12-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso12.pfb
-ec-lmsso17 LMSans17-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso17.pfb
-ec-lmsso8 LMSans8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso8.pfb
-ec-lmsso9 LMSans9-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso9.pfb
-ec-lmssq8 LMSansQuotation8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmssq8.pfb
-ec-lmssqbo8 LMSansQuotation8-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssqbo8.pfb
-ec-lmssqbx8 LMSansQuotation8-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmssqbx8.pfb
-ec-lmssqo8 LMSansQuotation8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmssqo8.pfb
-ec-lmtcsc10 LMTypewriter10-CapsRegular "enclmec ReEncodeFont" <lm-ec.enc <lmtcsc10.pfb
-ec-lmtcso10 LMTypewriter10-CapsOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtcso10.pfb
-ec-lmtl10 LMTypewriter10-Light "enclmec ReEncodeFont" <lm-ec.enc <lmtl10.pfb
-ec-lmtlo10 LMTypewriter10-LightOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtlo10.pfb
-ec-lmtlc10 LMTypewriter10-LightCondensed "enclmec ReEncodeFont" <lm-ec.enc <lmtlc10.pfb
-ec-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtlco10.pfb
-ec-lmtk10 LMTypewriter10-Dark "enclmec ReEncodeFont" <lm-ec.enc <lmtk10.pfb
-ec-lmtko10 LMTypewriter10-DarkOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtko10.pfb
-ec-lmtt10 LMTypewriter10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt10.pfb
-ec-lmtt12 LMTypewriter12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt12.pfb
-ec-lmtt8 LMTypewriter8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt8.pfb
-ec-lmtt9 LMTypewriter9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt9.pfb
-ec-lmtti10 LMTypewriter10-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmtti10.pfb
-ec-lmtto10 LMTypewriter10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmtto10.pfb
-ec-lmvtt10 LMTypewriterVarWd10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmvtt10.pfb
-ec-lmvtto10 LMTypewriterVarWd10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtto10.pfb
-ec-lmvtl10 LMTypewriterVarWd10-Light "enclmec ReEncodeFont" <lm-ec.enc <lmvtl10.pfb
-ec-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtlo10.pfb
-ec-lmvtk10 LMTypewriterVarWd10-Dark "enclmec ReEncodeFont" <lm-ec.enc <lmvtk10.pfb
-ec-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtko10.pfb
-
-
-% courier / urw
-
-qcrb <qcr.enc <qcrb.pfb
-qcrbi <qcr.enc <qcrbi.pfb
-qcrr <qcr.enc <qcrr.pfb
-qcrri <qcr.enc <qcrri.pfb
-
-% helvetica / urw
-
-qhvb <qhv.enc <qhvb.pfb
-qhvbi <qhv.enc <qhvbi.pfb
-qhvcb <qhv.enc <qhvcb.pfb
-qhvcbi <qhv.enc <qhvcbi.pfb
-qhvcr <qhv.enc <qhvcr.pfb
-qhvcri <qhv.enc <qhvcri.pfb
-qhvr <qhv.enc <qhvr.pfb
-qhvri <qhv.enc <qhvri.pfb
-
-% times / urw
-
-qtmb <qtm.enc <qtmb.pfb
-qtmbi <qtm.enc <qtmbi.pfb
-qtmr <qtm.enc <qtmr.pfb
-qtmri <qtm.enc <qtmri.pfb
-
-% palatino / urw
-
-qplb <qpl.enc <qplb.pfb
-qplbi <qpl.enc <qplbi.pfb
-qplr <qpl.enc <qplr.pfb
-qplri <qpl.enc <qplri.pfb
-
-% bookman / urw
-
-qbkb <qbk.enc <qbkb.pfb
-qbkbi <qbk.enc <qbkbi.pfb
-qbkr <qbk.enc <qbkr.pfb
-qbkri <qbk.enc <qbkri.pfb
-
-% chancery / urw
-
-qzcmi <qzc.enc <qzcmi.pfb
-
-% schoolbook / urw
-%
-% not available
-
-% utopia
-%
-% not available
-
-% charter
-%
-% not available
-
-
-
-qx-lmb10 LMRoman10-Demi "enclmqx ReEncodeFont" <lm-qx.enc <lmb10.pfb
-qx-lmbo10 LMRoman10-DemiOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmbo10.pfb
-qx-lmbx10 LMRoman10-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx10.pfb
-qx-lmbx12 LMRoman12-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx12.pfb
-qx-lmbx5 LMRoman5-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx5.pfb
-qx-lmbx6 LMRoman6-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx6.pfb
-qx-lmbx7 LMRoman7-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx7.pfb
-qx-lmbx8 LMRoman8-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx8.pfb
-qx-lmbx9 LMRoman9-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx9.pfb
-qx-lmbxi10 LMRoman10-BoldItalic "enclmqx ReEncodeFont" <lm-qx.enc <lmbxi10.pfb
-qx-lmbxo10 LMRoman10-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmbxo10.pfb
-qx-lmcsc10 LMRoman10-CapsRegular "enclmqx ReEncodeFont" <lm-qx.enc <lmcsc10.pfb
-qx-lmcsco10 LMRoman10-CapsOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmcsco10.pfb
-qx-lmr10 LMRoman10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr10.pfb
-qx-lmr12 LMRoman12-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr12.pfb
-qx-lmr17 LMRoman17-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr17.pfb
-qx-lmr5 LMRoman5-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr5.pfb
-qx-lmr6 LMRoman6-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr6.pfb
-qx-lmr7 LMRoman7-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr7.pfb
-qx-lmr8 LMRoman8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr8.pfb
-qx-lmr9 LMRoman9-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr9.pfb
-qx-lmri10 LMRoman10-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri10.pfb
-qx-lmri12 LMRoman12-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri12.pfb
-qx-lmri7 LMRoman7-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri7.pfb
-qx-lmri8 LMRoman8-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri8.pfb
-qx-lmri9 LMRoman9-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri9.pfb
-qx-lmro10 LMRoman10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro10.pfb
-qx-lmro12 LMRoman12-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro12.pfb
-qx-lmro17 LMRoman17-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro17.pfb
-qx-lmro8 LMRoman8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro8.pfb
-qx-lmro9 LMRoman9-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro9.pfb
-qx-lmss10 LMSans10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss10.pfb
-qx-lmss12 LMSans12-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss12.pfb
-qx-lmss17 LMSans17-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss17.pfb
-qx-lmss8 LMSans8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss8.pfb
-qx-lmss9 LMSans9-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss9.pfb
-qx-lmssbo10 LMSans10-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssbo10.pfb
-qx-lmssbx10 LMSans10-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmssbx10.pfb
-qx-lmssdc10 LMSans10-DemiCondensed "enclmqx ReEncodeFont" <lm-qx.enc <lmssdc10.pfb
-qx-lmssdo10 LMSans10-DemiCondensedOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssdo10.pfb
-qx-lmsso10 LMSans10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso10.pfb
-qx-lmsso12 LMSans12-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso12.pfb
-qx-lmsso17 LMSans17-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso17.pfb
-qx-lmsso8 LMSans8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso8.pfb
-qx-lmsso9 LMSans9-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso9.pfb
-qx-lmssq8 LMSansQuotation8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmssq8.pfb
-qx-lmssqbo8 LMSansQuotation8-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssqbo8.pfb
-qx-lmssqbx8 LMSansQuotation8-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmssqbx8.pfb
-qx-lmssqo8 LMSansQuotation8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssqo8.pfb
-qx-lmtcsc10 LMTypewriter10-CapsRegular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtcsc10.pfb
-qx-lmtcso10 LMTypewriter10-CapsOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtcso10.pfb
-qx-lmtl10 LMTypewriter10-Light "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtl10.pfb
-qx-lmtlo10 LMTypewriter10-LightOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlo10.pfb
-qx-lmtlc10 LMTypewriter10-LightCondensed "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlc10.pfb
-qx-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlco10.pfb
-qx-lmtk10 LMTypewriter10-Dark "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtk10.pfb
-qx-lmtko10 LMTypewriter10-DarkOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtko10.pfb
-qx-lmtt10 LMTypewriter10-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt10.pfb
-qx-lmtt12 LMTypewriter12-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt12.pfb
-qx-lmtt8 LMTypewriter8-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt8.pfb
-qx-lmtt9 LMTypewriter9-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt9.pfb
-qx-lmtti10 LMTypewriter10-Italic "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtti10.pfb
-qx-lmtto10 LMTypewriter10-Oblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtto10.pfb
-qx-lmvtt10 LMTypewriterVarWd10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmvtt10.pfb
-qx-lmvtto10 LMTypewriterVarWd10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtto10.pfb
-qx-lmvtl10 LMTypewriterVarWd10-Light "enclmqx ReEncodeFont" <lm-qx.enc <lmvtl10.pfb
-qx-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtlo10.pfb
-qx-lmvtk10 LMTypewriterVarWd10-Dark "enclmqx ReEncodeFont" <lm-qx.enc <lmvtk10.pfb
-qx-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtko10.pfb
-
-
-% courier / urw
-
-ucrr8v VnNimbusMonL-Regu "T5Encoding ReEncodeFont" <t5.enc <ucrr8v.pfb
-ucrro8v VnNimbusMonL-ReguObli "T5Encoding ReEncodeFont" <t5.enc <ucrro8v.pfb
-ucrb8v VnNimbusMonL-Bold "T5Encoding ReEncodeFont" <t5.enc <ucrb8v.pfb
-ucrbo8v VnNimbusMonL-BoldObli "T5Encoding ReEncodeFont" <t5.enc <ucrbo8v.pfb
-
-% helvetica / urw
-
-uhvr8v VnNimbusSanL-Regu "T5Encoding ReEncodeFont" <t5.enc <uhvr8v.pfb
-uhvro8v VnNimbusSanL-ReguItal "T5Encoding ReEncodeFont" <t5.enc <uhvro8v.pfb
-uhvb8v VnNimbusSanL-Bold "T5Encoding ReEncodeFont" <t5.enc <uhvb8v.pfb
-uhvbo8v VnNimbusSanL-BoldItal "T5Encoding ReEncodeFont" <t5.enc <uhvbo8v.pfb
-
-% times / urw
-
-utmr8v VnNimbusRomNo9L-Regu "T5Encoding ReEncodeFont" <t5.enc <utmr8v.pfb
-utmri8v VnNimbusRomNo9L-ReguItal "T5Encoding ReEncodeFont" <t5.enc <utmri8v.pfb
-utmb8v VnNimbusRomNo9L-Medi "T5Encoding ReEncodeFont" <t5.enc <utmb8v.pfb
-utmbi8v VnNimbusRomNo9L-MediItal "T5Encoding ReEncodeFont" <t5.enc <utmbi8v.pfb
-
-utmro8v VnNimbusRomNo9L-Regu "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <utmr8v.pfb
-utmbo8v VnNimbusRomNo9L-Medi "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <utmb8v.pfb
-
-% palatino / urw
-
-uplr8v VnURWPalladioL-Roma "T5Encoding ReEncodeFont" <t5.enc <uplr8v.pfb
-uplri8v VnURWPalladioL-Ital "T5Encoding ReEncodeFont" <t5.enc <uplri8v.pfb
-uplb8v VnURWPalladioL-Bold "T5Encoding ReEncodeFont" <t5.enc <uplb8v.pfb
-uplbi8v VnURWPalladioL-BoldItal "T5Encoding ReEncodeFont" <t5.enc <uplbi8v.pfb
-
-uplro8v VnURWPalladioL-Roma "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <uplr8v.pfb
-uplbo8v VnURWPalladioL-Bold "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <uplb8v.pfb
-
-% bookman / urw
-
-ubkl8v VnURWBookmanL-Ligh "T5Encoding ReEncodeFont" <t5.enc <ubkl8v.pfb
-ubkli8v VnURWBookmanL-LighItal "T5Encoding ReEncodeFont" <t5.enc <ubkli8v.pfb
-ubkd8v VnURWBookmanL-DemiBold "T5Encoding ReEncodeFont" <t5.enc <ubkd8v.pfb
-ubkdi8v VnURWBookmanL-DemiBoldItal "T5Encoding ReEncodeFont" <t5.enc <ubkdi8v.pfb
-
-ubklo8v VnURWBookmanL-Ligh "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <ubkl8v.pfb
-ubkdo8v VnURWBookmanL-DemiBold "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <ubkd8v.pfb
-
-% chancery / urw
-
-% not supported
-%
-% schoolbook / urw
-
-uncr8v VnCenturySchL-Roma "T5Encoding ReEncodeFont" <t5.enc <uncr8v.pfb
-uncri8v VnCenturySchL-Ital "T5Encoding ReEncodeFont" <t5.enc <uncri8v.pfb
-uncb8v VnCenturySchL-Bold "T5Encoding ReEncodeFont" <t5.enc <uncb8v.pfb
-uncbi8v VnCenturySchL-BoldItal "T5Encoding ReEncodeFont" <t5.enc <uncbi8v.pfb
-
-uncro8v VnCenturySchL-Roma "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <uncr8v.pfb
-uncbo8v VnCenturySchL-Bold "0.277 SlantFont T5Encoding ReEncodeFont" <t5.enc <uncb8v.pfb
-
-% utopia
-%
-% not supported
-
-% charter
-%
-% not supported
-
-% gothic / urw
-
-uagk8v VnURWGothicL-Book "T5Encoding ReEncodeFont" <t5.enc <uagk8v.pfb
-uagko8v VnURWGothicL-BookObli "T5Encoding ReEncodeFont" <t5.enc <uagko8v.pfb
-uagd8v VnURWGothicL-Demi "T5Encoding ReEncodeFont" <t5.enc <uagd8v.pfb
-uagdo8v VnURWGothicL-DemiObli "T5Encoding ReEncodeFont" <t5.enc <uagdo8v.pfb
-
-
-t5-lmb10 LMRoman10-Demi "enclmt5 ReEncodeFont" <lm-t5.enc <lmb10.pfb
-t5-lmbo10 LMRoman10-DemiOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmbo10.pfb
-t5-lmbx10 LMRoman10-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx10.pfb
-t5-lmbx12 LMRoman12-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx12.pfb
-t5-lmbx5 LMRoman5-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx5.pfb
-t5-lmbx6 LMRoman6-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx6.pfb
-t5-lmbx7 LMRoman7-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx7.pfb
-t5-lmbx8 LMRoman8-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx8.pfb
-t5-lmbx9 LMRoman9-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx9.pfb
-t5-lmbxi10 LMRoman10-BoldItalic "enclmt5 ReEncodeFont" <lm-t5.enc <lmbxi10.pfb
-t5-lmbxo10 LMRoman10-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmbxo10.pfb
-t5-lmcsc10 LMRoman10-CapsRegular "enclmt5 ReEncodeFont" <lm-t5.enc <lmcsc10.pfb
-t5-lmcsco10 LMRoman10-CapsOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmcsco10.pfb
-t5-lmr10 LMRoman10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr10.pfb
-t5-lmr12 LMRoman12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr12.pfb
-t5-lmr17 LMRoman17-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr17.pfb
-t5-lmr5 LMRoman5-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr5.pfb
-t5-lmr6 LMRoman6-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr6.pfb
-t5-lmr7 LMRoman7-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr7.pfb
-t5-lmr8 LMRoman8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr8.pfb
-t5-lmr9 LMRoman9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr9.pfb
-t5-lmri10 LMRoman10-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri10.pfb
-t5-lmri12 LMRoman12-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri12.pfb
-t5-lmri7 LMRoman7-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri7.pfb
-t5-lmri8 LMRoman8-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri8.pfb
-t5-lmri9 LMRoman9-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri9.pfb
-t5-lmro10 LMRoman10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro10.pfb
-t5-lmro12 LMRoman12-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro12.pfb
-t5-lmro17 LMRoman17-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro17.pfb
-t5-lmro8 LMRoman8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro8.pfb
-t5-lmro9 LMRoman9-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro9.pfb
-t5-lmss10 LMSans10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss10.pfb
-t5-lmss12 LMSans12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss12.pfb
-t5-lmss17 LMSans17-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss17.pfb
-t5-lmss8 LMSans8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss8.pfb
-t5-lmss9 LMSans9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss9.pfb
-t5-lmssbo10 LMSans10-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssbo10.pfb
-t5-lmssbx10 LMSans10-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmssbx10.pfb
-t5-lmssdc10 LMSans10-DemiCondensed "enclmt5 ReEncodeFont" <lm-t5.enc <lmssdc10.pfb
-t5-lmssdo10 LMSans10-DemiCondensedOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssdo10.pfb
-t5-lmsso10 LMSans10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso10.pfb
-t5-lmsso12 LMSans12-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso12.pfb
-t5-lmsso17 LMSans17-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso17.pfb
-t5-lmsso8 LMSans8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso8.pfb
-t5-lmsso9 LMSans9-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso9.pfb
-t5-lmssq8 LMSansQuotation8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmssq8.pfb
-t5-lmssqbo8 LMSansQuotation8-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqbo8.pfb
-t5-lmssqbx8 LMSansQuotation8-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqbx8.pfb
-t5-lmssqo8 LMSansQuotation8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqo8.pfb
-t5-lmtcsc10 LMTypewriter10-CapsRegular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtcsc10.pfb
-t5-lmtcso10 LMTypewriter10-CapsOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtcso10.pfb
-t5-lmtl10 LMTypewriter10-Light "enclmt5 ReEncodeFont" <lm-t5.enc <lmtl10.pfb
-t5-lmtlo10 LMTypewriter10-LightOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlo10.pfb
-t5-lmtlc10 LMTypewriter10-LightCondensed "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlc10.pfb
-t5-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlco10.pfb
-t5-lmtk10 LMTypewriter10-Dark "enclmt5 ReEncodeFont" <lm-t5.enc <lmtk10.pfb
-t5-lmtko10 LMTypewriter10-DarkOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtko10.pfb
-t5-lmtt10 LMTypewriter10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt10.pfb
-t5-lmtt12 LMTypewriter12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt12.pfb
-t5-lmtt8 LMTypewriter8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt8.pfb
-t5-lmtt9 LMTypewriter9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt9.pfb
-t5-lmtti10 LMTypewriter10-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmtti10.pfb
-t5-lmtto10 LMTypewriter10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtto10.pfb
-t5-lmvtt10 LMTypewriterVarWd10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtt10.pfb
-t5-lmvtto10 LMTypewriterVarWd10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtto10.pfb
-t5-lmvtl10 LMTypewriterVarWd10-Light "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtl10.pfb
-t5-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtlo10.pfb
-t5-lmvtk10 LMTypewriterVarWd10-Dark "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtk10.pfb
-t5-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtko10.pfb
-
-
-% author: Hans Hagen
-%
-% This map file defines the texnansi alternatives of the public fonts,
-% beware, these are seldom present on your system. If you really want
-% to use these fonts, uncomment the relevant lines. If no fonts are
-% present, pdftex may get confused.
-
-% courier / urw
-
-% ucrb8y NimbusMonL-Bold <texnansi.enc <ucrb8a.pfb
-% ucrbo8y NimbusMonL-BoldObli <texnansi.enc <ucrbo8a.pfb
-% ucrr8y NimbusMonL-Regu <texnansi.enc <ucrr8a.pfb
-% ucrro8y NimbusMonL-ReguObli <texnansi.enc <ucrro8a.pfb
-
-% courier / adobe
-
-% pcrb8y NimbusMonL-Bold <texnansi.enc <ucrb8a.pfb
-% pcrbo8y NimbusMonL-BoldObli <texnansi.enc <ucrbo8a.pfb
-% pcrr8y NimbusMonL-Regu <texnansi.enc <ucrr8a.pfb
-% pcrro8y NimbusMonL-ReguObli <texnansi.enc <ucrro8a.pfb
-
-% helvetica / urw
-
-% uhvb8y NimbusSanL-Bold <texnansi.enc <uhvb8a.pfb
-% uhvbo8y NimbusSanL-BoldItal <texnansi.enc <uhvbo8a.pfb
-% uhvr8y NimbusSanL-Regu <texnansi.enc <uhvr8a.pfb
-% uhvro8y NimbusSanL-ReguItal <texnansi.enc <uhvro8a.pfb
-
-% helvetica / adobe
-
-% phvb8y NimbusSanL-Bold <texnansi.enc <uhvb8a.pfb
-% phvbo8y NimbusSanL-BoldItal <texnansi.enc <uhvbo8a.pfb
-% phvr8y NimbusSanL-Regu <texnansi.enc <uhvr8a.pfb
-% phvro8y NimbusSanL-ReguItal <texnansi.enc <uhvro8a.pfb
-
-% times / urw
-
-% utmb8y NimbusRomNo9L-Medi <texnansi.enc <utmb8a.pfb
-% utmbi8y NimbusRomNo9L-MediItal <texnansi.enc <utmbi8a.pfb
-% utmr8y NimbusRomNo9L-Regu <texnansi.enc <utmr8a.pfb
-% utmri8y NimbusRomNo9L-ReguItal <texnansi.enc <utmri8a.pfb
-
-% utmbo8y NimbusRomNo9L-Medi ".167 SlantFont" <texnansi.enc <utmb8a.pfb
-% utmro8y NimbusRomNo9L-Regu ".167 SlantFont" <texnansi.enc <utmr8a.pfb
-
-% times / adobe
-
-% ptmb8y NimbusRomNo9L-Medi <texnansi.enc <utmb8a.pfb
-% ptmbi8y NimbusRomNo9L-MediItal <texnansi.enc <utmbi8a.pfb
-% ptmr8y NimbusRomNo9L-Regu <texnansi.enc <utmr8a.pfb
-% ptmri8y NimbusRomNo9L-ReguItal <texnansi.enc <utmri8a.pfb
-
-% ptmbo8y NimbusRomNo9L-Medi ".167 SlantFont" <texnansi.enc <utmb8a.pfb
-% ptmro8y NimbusRomNo9L-Regu ".167 SlantFont" <texnansi.enc <utmr8a.pfb
-
-% palatino / urw
-
-% uplb8y URWPalladioL-Bold <texnansi.enc <uplb8a.pfb
-% uplbi8y URWPalladioL-BoldItal <texnansi.enc <uplbi8a.pfb
-% uplr8y URWPalladioL-Roma <texnansi.enc <uplr8a.pfb
-% uplri8y URWPalladioL-Ital <texnansi.enc <uplri8a.pfb
-
-% uplbo8y URWPalladioL-Bold ".167 SlantFont" <texnansi.enc <uplb8a.pfb
-% uplro8y URWPalladioL-Roma ".167 SlantFont" <texnansi.enc <uplr8a.pfb
-
-% palatino / adobe
-
-% pplb8y URWPalladioL-Bold <texnansi.enc <uplb8a.pfb
-% pplbi8y URWPalladioL-BoldItal <texnansi.enc <uplbi8a.pfb
-% pplr8y URWPalladioL-Roma <texnansi.enc <uplr8a.pfb
-% pplri8y URWPalladioL-Ital <texnansi.enc <uplri8a.pfb
-
-% pplbo8y URWPalladioL-Bold ".167 SlantFont" <texnansi.enc <uplb8a.pfb
-% pplro8y URWPalladioL-Roma ".167 SlantFont" <texnansi.enc <uplr8a.pfb
-
-% bookman / urw
-
-% ubkd8y URWBookmanL-DemiBold <texnansi.enc <ubkd8a.pfb
-% ubkdi8y URWBookmanL-DemiBoldItal <texnansi.enc <ubkdi8a.pfb
-% ubkl8y URWBookmanL-Ligh <texnansi.enc <ubkl8a.pfb
-% vubkli8y URWBookmanL-LighItal <texnansi.enc <ubkli8a.pfb
-
-% ubkdo8y URWBookmanL-DemiBold ".167 SlantFont" <texnansi.enc <ubkd8a.pfb
-% ubklo8y URWBookmanL-Ligh ".167 SlantFont" <texnansi.enc <ubkl8a.pfb
-
-% bookman / adobe
-
-% pbkd8y URWBookmanL-DemiBold <texnansi.enc <ubkd8a.pfb
-% pbkdi8y URWBookmanL-DemiBoldItal <texnansi.enc <ubkdi8a.pfb
-% pbkl8y URWBookmanL-Ligh <texnansi.enc <ubkl8a.pfb
-% pbkli8y URWBookmanL-LighItal <texnansi.enc <ubkli8a.pfb
-
-% pbkdo8y URWBookmanL-DemiBold ".167 SlantFont" <texnansi.enc <ubkd8a.pfb
-% pbklo8y URWBookmanL-Ligh ".167 SlantFont" <texnansi.enc <ubkl8a.pfb
-
-% chancery / urw
-
-% uzcmi8y URWChanceryL-MediItal <texnansi.enc <uzcmi8a.pfb
-
-% chancery / adobe
-
-% pzcmi8y URWChanceryL-MediItal <texnansi.enc <uzcmi8a.pfb
-
-% schoolbook / urw
-
-% uncb8y CenturySchL-Bold <texnansi.enc <uncb8a.pfb
-% uncbi8y CenturySchL-BoldItal <texnansi.enc <uncbi8a.pfb
-% uncr8y CenturySchL-Roma <texnansi.enc <uncr8a.pfb
-% uncri8y CenturySchL-Ital <texnansi.enc <uncri8a.pfb
-
-% uncbo8y CenturySchL-Bold ".167 SlantFont" <texnansi.enc <uncb8a.pfb
-% uncro8y CenturySchL-Roma ".167 SlantFont" <texnansi.enc <uncr8a.pfb
-
-% schoolbook / adobe
-
-% pncb8y CenturySchL-Bold <texnansi.enc <uncb8a.pfb
-% pncbi8y CenturySchL-BoldItal <texnansi.enc <uncbi8a.pfb
-% pncr8y CenturySchL-Roma <texnansi.enc <uncr8a.pfb
-% pncri8y CenturySchL-Ital <texnansi.enc <uncri8a.pfb
-
-% pncbo8y CenturySchL-Bold ".167 SlantFont" <texnansi.enc <uncb8a.pfb
-% pncro8y CenturySchL-Roma ".167 SlantFont" <texnansi.enc <uncr8a.pfb
-
-% utopia
-
-% putb8y Utopia-Bold <texnansi.enc <putb8a.pfb
-% putbi8y Utopia-BoldItalic <texnansi.enc <putbi8a.pfb
-% putr8y Utopia-Regular <texnansi.enc <putr8a.pfb
-% putri8y Utopia-Italic <texnansi.enc <putri8a.pfb
-
-% putbo8y Utopia-Bold ".167 SlantFont" <texnansi.enc <putb8a.pfb
-% putro8y Utopia-Regular ".167 SlantFont" <texnansi.enc <putr8a.pfb
-
-% charter
-
-% bchb8y CharterBT-Bold <texnansi.enc <bchb8a.pfb
-% bchbi8y CharterBT-BoldItalic <texnansi.enc <bchbi8a.pfb
-% bchr8y CharterBT-Roman <texnansi.enc <bchr8a.pfb
-% bchri8y CharterBT-Italic <texnansi.enc <bchri8a.pfb
-
-% bchbo8y CharterBT-Bold ".167 SlantFont" <texnansi.enc <bchb8a.pfb
-% bchro8y CharterBT-Roman ".167 SlantFont " <texnansi.enc <bchr8a.pfb
-
-texnansi-lmb10 LMRoman10-Demi "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmb10.pfb
-texnansi-lmbo10 LMRoman10-DemiOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbo10.pfb
-texnansi-lmbx10 LMRoman10-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx10.pfb
-texnansi-lmbx12 LMRoman12-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx12.pfb
-texnansi-lmbx5 LMRoman5-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx5.pfb
-texnansi-lmbx6 LMRoman6-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx6.pfb
-texnansi-lmbx7 LMRoman7-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx7.pfb
-texnansi-lmbx8 LMRoman8-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx8.pfb
-texnansi-lmbx9 LMRoman9-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx9.pfb
-texnansi-lmbxi10 LMRoman10-BoldItalic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbxi10.pfb
-texnansi-lmbxo10 LMRoman10-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbxo10.pfb
-texnansi-lmcsc10 LMRoman10-CapsRegular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmcsc10.pfb
-texnansi-lmcsco10 LMRoman10-CapsOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmcsco10.pfb
-texnansi-lmr10 LMRoman10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr10.pfb
-texnansi-lmr12 LMRoman12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr12.pfb
-texnansi-lmr17 LMRoman17-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr17.pfb
-texnansi-lmr5 LMRoman5-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr5.pfb
-texnansi-lmr6 LMRoman6-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr6.pfb
-texnansi-lmr7 LMRoman7-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr7.pfb
-texnansi-lmr8 LMRoman8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr8.pfb
-texnansi-lmr9 LMRoman9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr9.pfb
-texnansi-lmri10 LMRoman10-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri10.pfb
-texnansi-lmri12 LMRoman12-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri12.pfb
-texnansi-lmri7 LMRoman7-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri7.pfb
-texnansi-lmri8 LMRoman8-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri8.pfb
-texnansi-lmri9 LMRoman9-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri9.pfb
-texnansi-lmro10 LMRoman10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro10.pfb
-texnansi-lmro12 LMRoman12-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro12.pfb
-texnansi-lmro17 LMRoman17-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro17.pfb
-texnansi-lmro8 LMRoman8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro8.pfb
-texnansi-lmro9 LMRoman9-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro9.pfb
-texnansi-lmss10 LMSans10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss10.pfb
-texnansi-lmss12 LMSans12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss12.pfb
-texnansi-lmss17 LMSans17-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss17.pfb
-texnansi-lmss8 LMSans8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss8.pfb
-texnansi-lmss9 LMSans9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss9.pfb
-texnansi-lmssbo10 LMSans10-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssbo10.pfb
-texnansi-lmssbx10 LMSans10-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssbx10.pfb
-texnansi-lmssdc10 LMSans10-DemiCondensed "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssdc10.pfb
-texnansi-lmssdo10 LMSans10-DemiCondensedOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssdo10.pfb
-texnansi-lmsso10 LMSans10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso10.pfb
-texnansi-lmsso12 LMSans12-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso12.pfb
-texnansi-lmsso17 LMSans17-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso17.pfb
-texnansi-lmsso8 LMSans8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso8.pfb
-texnansi-lmsso9 LMSans9-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso9.pfb
-texnansi-lmssq8 LMSansQuotation8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssq8.pfb
-texnansi-lmssqbo8 LMSansQuotation8-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqbo8.pfb
-texnansi-lmssqbx8 LMSansQuotation8-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqbx8.pfb
-texnansi-lmssqo8 LMSansQuotation8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqo8.pfb
-texnansi-lmtcsc10 LMTypewriter10-CapsRegular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtcsc10.pfb
-texnansi-lmtcso10 LMTypewriter10-CapsOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtcso10.pfb
-texnansi-lmtl10 LMTypewriter10-Light "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtl10.pfb
-texnansi-lmtlo10 LMTypewriter10-LightOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlo10.pfb
-texnansi-lmtlc10 LMTypewriter10-LightCondensed "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlc10.pfb
-texnansi-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlco10.pfb
-texnansi-lmtk10 LMTypewriter10-Dark "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtk10.pfb
-texnansi-lmtko10 LMTypewriter10-DarkOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtko10.pfb
-texnansi-lmtt10 LMTypewriter10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt10.pfb
-texnansi-lmtt12 LMTypewriter12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt12.pfb
-texnansi-lmtt8 LMTypewriter8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt8.pfb
-texnansi-lmtt9 LMTypewriter9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt9.pfb
-texnansi-lmtti10 LMTypewriter10-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtti10.pfb
-texnansi-lmtto10 LMTypewriter10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtto10.pfb
-texnansi-lmvtt10 LMTypewriterVarWd10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtt10.pfb
-texnansi-lmvtto10 LMTypewriterVarWd10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtto10.pfb
-texnansi-lmvtl10 LMTypewriterVarWd10-Light "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtl10.pfb
-texnansi-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtlo10.pfb
-texnansi-lmvtk10 LMTypewriterVarWd10-Dark "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtk10.pfb
-texnansi-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtko10.pfb
diff --git a/fonts/map/pdftex/context/original-public-lm.map b/fonts/map/pdftex/context/original-public-lm.map
deleted file mode 100644
index 2ba41ba78..000000000
--- a/fonts/map/pdftex/context/original-public-lm.map
+++ /dev/null
@@ -1,170 +0,0 @@
-% LM replacement, thanks to Jacko
-
-% official
-%
-% cmb10 LMRomanDemi10-Regular <cmrm.enc <lmb10.pfb
-% cmbx10 LMRoman10-Bold <cmrm.enc <lmbx10.pfb
-% cmbx12 LMRoman12-Bold <cmrm.enc <lmbx12.pfb
-% cmbx5 LMRoman5-Bold <cmrm.enc <lmbx5.pfb
-% cmbx6 LMRoman6-Bold <cmrm.enc <lmbx6.pfb
-% cmbx7 LMRoman7-Bold <cmrm.enc <lmbx7.pfb
-% cmbx8 LMRoman8-Bold <cmrm.enc <lmbx8.pfb
-% cmbx9 LMRoman9-Bold <cmrm.enc <lmbx9.pfb
-% cmbxsl10 LMSlanted10-BoldItalic <cmrm.enc <lmbxo10.pfb
-% cmbxti10 LMRoman10-BoldItalic <cmit.enc <lmbxi10.pfb
-% cmbxti12 LMRoman10-BoldItalic <cmit.enc <lmbxti10.pfb
-% cmbxti7 LMRoman10-BoldItalic <cmit.enc <lmbxti10.pfb
-% cmcsc10 LMCaps10-Regular <cmsc.enc <lmcsc10.pfb
-% cmcsc8 LMCaps10-Regular <cmsc.enc <lmcsc10.pfb
-% cmcsc9 LMCaps10-Regular <cmsc.enc <lmcsc10.pfb
-% cminch LMSans10-Bold <cmin.enc <lmssbx10.pfb
-% cmitt10 LMTypewriter10-Italic <cmitt.enc <lmtti10.pfb
-% cmitt12 LMTypewriter10-Italic <cmitt.enc <lmtti10.pfb
-% cmitt9 LMTypewriter10-Italic <cmitt.enc <lmtti10.pfb
-% cmr10 LMRoman10-Regular <cmrm.enc <lmr10.pfb
-% cmr12 LMRoman12-Regular <cmrm.enc <lmr12.pfb
-% cmr17 LMRoman17-Regular <cmrm.enc <lmr17.pfb
-% cmr5 LMRoman5-Regular <cmsc.enc <lmr5.pfb
-% cmr6 LMRoman6-Regular <cmrm.enc <lmr6.pfb
-% cmr7 LMRoman7-Regular <cmrm.enc <lmr7.pfb
-% cmr8 LMRoman8-Regular <cmrm.enc <lmr8.pfb
-% cmr9 LMRoman9-Regular <cmrm.enc <lmr9.pfb
-% cmsl10 LMSlanted10-Italic <cmrm.enc <lmro10.pfb
-% cmsl12 LMSlanted12-Italic <cmrm.enc <lmro12.pfb
-% cmsl6 LMSlanted8-Italic <cmrm.enc <lmro8.pfb
-% cmsl8 LMSlanted8-Italic <cmrm.enc <lmro8.pfb
-% cmsl9 LMSlanted9-Italic <cmrm.enc <lmro9.pfb
-% cmsltt10 LMTypewriterSlanted10-Italic <cmtt.enc <lmtto10.pfb
-% cmsltt9 LMTypewriterSlanted10-Italic <cmtt.enc <lmtto10.pfb
-% cmss10 LMSans10-Regular <cmrm.enc <lmss10.pfb
-% cmss12 LMSans12-Regular <cmrm.enc <lmss12.pfb
-% cmss17 LMSans17-Regular <cmrm.enc <lmss17.pfb
-% cmss8 LMSans8-Regular <cmrm.enc <lmss8.pfb
-% cmss9 LMSans9-Regular <cmrm.enc <lmss9.pfb
-% cmssbx10 LMSans10-Bold <cmrm.enc <lmssbx10.pfb
-% cmssbxo10 LMSans10-BoldItalic <cmrm.enc <lmssbo10.pfb
-% cmssdc10 LMSansDemiCond10-Regular <cmrm.enc <lmssdc10.pfb
-% cmssi10 LMSans10-Italic <cmrm.enc <lmsso10.pfb
-% cmssi12 LMSans12-Italic <cmrm.enc <lmsso12.pfb
-% cmssi17 LMSans17-Italic <cmrm.enc <lmsso17.pfb
-% cmssi8 LMSans8-Italic <cmrm.enc <lmsso8.pfb
-% cmssi9 LMSans9-Italic <cmrm.enc <lmsso9.pfb
-% cmssq8 LMSansQuotation8-Regular <cmrm.enc <lmssq8.pfb
-% cmssqi8 LMSansQuotation8-Italic <cmrm.enc <lmssqo8.pfb
-% cmtcsc10 LMTypewriterCaps10-Regular <cmtt.enc <lmtcsc10.pfb
-% cmti10 LMRoman10-Italic <cmit.enc <lmri10.pfb
-% cmti12 LMRoman12-Italic <cmit.enc <lmri12.pfb
-% cmti7 LMRoman7-Italic <cmit.enc <lmri7.pfb
-% cmti8 LMRoman8-Italic <cmit.enc <lmri8.pfb
-% cmti9 LMRoman9-Italic <cmit.enc <lmri9.pfb
-% cmtt10 LMTypewriter10-Regular <cmtt.enc <lmtt10.pfb
-% cmtt12 LMTypewriter12-Regular <cmtt.enc <lmtt12.pfb
-% cmtt8 LMTypewriter8-Regular <cmtt.enc <lmtt8.pfb
-% cmtt9 LMTypewriter9-Regular <cmtt.enc <lmtt9.pfb
-% cmvtt10 LMTypewriterVarWd10-Regular <cmrm.enc <lmvtt10.pfb
-%
-% but more efficient since to-be-included old files have those names
-
-cmb10 CMB10 <cmrm.enc <lmb10.pfb
-cmbx10 CMBX10 <cmrm.enc <lmbx10.pfb
-cmbx12 CMBX12 <cmrm.enc <lmbx12.pfb
-cmbx5 CMBX5 <cmrm.enc <lmbx5.pfb
-cmbx6 CMBX6 <cmrm.enc <lmbx6.pfb
-cmbx7 CMBX7 <cmrm.enc <lmbx7.pfb
-cmbx8 CMBX8 <cmrm.enc <lmbx8.pfb
-cmbx9 CMBX9 <cmrm.enc <lmbx9.pfb
-cmbxsl10 CMBXSL10 <cmrm.enc <lmbxo10.pfb
-cmbxti10 CMBXTI10 <cmit.enc <lmbxi10.pfb
-cmbxti12 CMBXTI12 <cmit.enc <lmbxti10.pfb
-cmbxti7 CMBXTI7 <cmit.enc <lmbxti10.pfb
-cmcsc10 CMCSC10 <cmsc.enc <lmcsc10.pfb
-cmcsc8 CMCSC8 <cmsc.enc <lmcsc10.pfb
-cmcsc9 CMCSC9 <cmsc.enc <lmcsc10.pfb
-cminch CMINCH <cmin.enc <lmssbx10.pfb
-cmitt10 CMITT10 <cmitt.enc <lmtti10.pfb
-cmitt12 CMITT12 <cmitt.enc <lmtti10.pfb
-cmitt9 CMITT9 <cmitt.enc <lmtti10.pfb
-cmr10 CMR10 <cmrm.enc <lmr10.pfb
-cmr12 CMR12 <cmrm.enc <lmr12.pfb
-cmr17 CMR17 <cmrm.enc <lmr17.pfb
-cmr5 CMR5 <cmsc.enc <lmr5.pfb
-cmr6 CMR6 <cmrm.enc <lmr6.pfb
-cmr7 CMR7 <cmrm.enc <lmr7.pfb
-cmr8 CMR8 <cmrm.enc <lmr8.pfb
-cmr9 CMR9 <cmrm.enc <lmr9.pfb
-cmsl10 CMSL10 <cmrm.enc <lmro10.pfb
-cmsl12 CMSL12 <cmrm.enc <lmro12.pfb
-cmsl6 CMSL6 <cmrm.enc <lmro8.pfb
-cmsl8 CMSL8 <cmrm.enc <lmro8.pfb
-cmsl9 CMSL9 <cmrm.enc <lmro9.pfb
-cmsltt10 CMSLTT10 <cmtt.enc <lmtto10.pfb
-cmsltt9 CMSLTT9 <cmtt.enc <lmtto10.pfb
-cmss10 CMS10 <cmrm.enc <lmss10.pfb
-cmss12 CMS12 <cmrm.enc <lmss12.pfb
-cmss17 CMS17 <cmrm.enc <lmss17.pfb
-cmss8 CMS8 <cmrm.enc <lmss8.pfb
-cmss9 CMS9 <cmrm.enc <lmss9.pfb
-cmssbx10 CMSSBX10 <cmrm.enc <lmssbx10.pfb
-cmssbxo10 CMSSBXO10 <cmrm.enc <lmssbo10.pfb
-cmssdc10 CMSSDC10 <cmrm.enc <lmssdc10.pfb
-cmssi10 CMSI10 <cmrm.enc <lmsso10.pfb
-cmssi12 CMSI12 <cmrm.enc <lmsso12.pfb
-cmssi17 CMSI17 <cmrm.enc <lmsso17.pfb
-cmssi8 CMSSI8 <cmrm.enc <lmsso8.pfb
-cmssi9 CMSSI9 <cmrm.enc <lmsso9.pfb
-cmssq8 CMSQ8 <cmrm.enc <lmssq8.pfb
-cmssqi8 CMSSQI8 <cmrm.enc <lmssqo8.pfb
-cmtcsc10 CMTCSC10 <cmtt.enc <lmtcsc10.pfb
-cmti10 CMTI10 <cmit.enc <lmri10.pfb
-cmti12 CMTI12 <cmit.enc <lmri12.pfb
-cmti7 CMTI7 <cmit.enc <lmri7.pfb
-cmti8 CMTI8 <cmit.enc <lmri8.pfb
-cmti9 CMTI9 <cmit.enc <lmri9.pfb
-cmtt10 CMTT10 <cmtt.enc <lmtt10.pfb
-cmtt12 CMTT12 <cmtt.enc <lmtt12.pfb
-cmtt8 CMTT8 <cmtt.enc <lmtt8.pfb
-cmtt9 CMTT9 <cmtt.enc <lmtt9.pfb
-cmvtt10 CMVTT10 <cmrm.enc <lmvtt10.pfb
-
-% original
-
-cmbsy10 CMBSY10 <cmbsy10.pfb
-cmbsy5 CMBSY5 <cmbsy5.pfb
-cmbsy6 CMBSY7 <cmbsy7.pfb
-cmbsy7 CMBSY7 <cmbsy7.pfb
-cmbsy8 CMBSY7 <cmbsy7.pfb
-cmbsy9 CMBSY10 <cmbsy10.pfb
-cmdunh10 CMDUNH10 <cmdunh10.pfb
-cmex10 CMEX10 <cmex10.pfb
-cmex7 CMEX10 <cmex10.pfb
-cmex8 CMEX10 <cmex10.pfb
-cmex9 CMEX10 <cmex10.pfb
-cmff10 CMFF10 <cmff10.pfb
-cmfi10 CMFI10 <cmfi10.pfb
-cmfib8 CMFIB8 <cmfib8.pfb
-cmmi10 CMMI10 <cmmi10.pfb
-cmmi12 CMMI12 <cmmi12.pfb
-cmmi5 CMMI5 <cmmi5.pfb
-cmmi6 CMMI6 <cmmi6.pfb
-cmmi7 CMMI7 <cmmi7.pfb
-cmmi8 CMMI8 <cmmi8.pfb
-cmmi9 CMMI9 <cmmi9.pfb
-cmmib10 CMMIB10 <cmmib10.pfb
-cmmib5 CMMIB5 <cmmib5.pfb
-cmmib6 CMMIB7 <cmmib7.pfb
-cmmib7 CMMIB7 <cmmib7.pfb
-cmmib8 CMMIB7 <cmmib7.pfb
-cmmib9 CMMIB10 <cmmib10.pfb
-cmsy10 CMSY10 <cmsy10.pfb
-cmsy5 CMSY5 <cmsy5.pfb
-cmsy6 CMSY6 <cmsy6.pfb
-cmsy7 CMSY7 <cmsy7.pfb
-cmsy8 CMSY8 <cmsy8.pfb
-cmsy9 CMSY9 <cmsy9.pfb
-cmtex10 CMTEX10 <cmtex10.pfb
-cmtex8 CMTEX8 <cmtex8.pfb
-cmtex9 CMTEX9 <cmtex9.pfb
-
-% a weird one, not used in context
-
-cmu10 LMRoman10-Italic "-0.25 SlantFont" <cmit.enc <lmri10.pfb
diff --git a/fonts/map/pdftex/context/original-wasy.map b/fonts/map/pdftex/context/original-wasy.map
new file mode 100644
index 000000000..4a439634b
--- /dev/null
+++ b/fonts/map/pdftex/context/original-wasy.map
@@ -0,0 +1,7 @@
+wasy5 WASY5 <wasy5.pfb
+wasy6 WASY6 <wasy6.pfb
+wasy7 WASY7 <wasy7.pfb
+wasy8 WASY8 <wasy8.pfb
+wasy9 WASY9 <wasy9.pfb
+wasy10 WASY10 <wasy10.pfb
+wasyb10 WASYB10 <wasyb10.pfb
diff --git a/metapost/context/base/mp-spec.mp b/metapost/context/base/mp-spec.mp
index 9fe3c724f..9965199f2 100644
--- a/metapost/context/base/mp-spec.mp
+++ b/metapost/context/base/mp-spec.mp
@@ -48,12 +48,31 @@ boolean _inline_specials_ ; _inline_specials_ := false ;
string _global_specials_ ; _global_specials_ := "" ;
string _local_specials_ ; _local_specials_ := "" ;
+% vardef add_special_signal = % write the version number
+% if (length _global_specials_>0) or (length _local_specials_ >0) :
+% special ("%%MetaPostSpecials: 1.0 " & decimal _special_signal_ ) ;
+% fi ;
+% enddef ;
+%
+% After some reported problems at the \CONTEXT\ mailing list,
+% Taco's came up with:
+
+% TH: \quotation {Ok, got it. There is a bug in mp-spec.mp (inside metafun).
+% Because of a wrapping number, it fails to recognize the fact that there
+% are embedded specials at all.} The corrected definition is:
+
vardef add_special_signal = % write the version number
- if (length _global_specials_>0) or (length _local_specials_ >0) :
+ if (length _global_specials_ <> 0) or (length _local_specials_ <> 0) :
special ("%%MetaPostSpecials: 1.0 " & decimal _special_signal_ ) ;
fi ;
enddef ;
+% \quotation {It now tests for \quote {not equal to zero} instead of
+% \quote {larger than zero}: because of all the included files, the
+% string \type {_local_specials_} becomes longer than the maximum number
+% \quote {length} can return, so it returns -32768 instead, and that is
+% of course less than zero.}
+
vardef add_extra_specials =
scantokens _global_specials_ ;
scantokens _local_specials_ ;
diff --git a/scripts/context/perl/mptopdf.pl b/scripts/context/perl/mptopdf.pl
index 7a4ac2f30..2ab90be06 100644
--- a/scripts/context/perl/mptopdf.pl
+++ b/scripts/context/perl/mptopdf.pl
@@ -99,14 +99,12 @@ foreach my $file (@files)
{ $_ = $file ;
if (s/\.(\d+|mps)$// && -e $file)
{ if ($miktex)
- { $command = "pdfetex -undump=mptopdf" }
+ { $command = "pdfetex -undump=mptopdf" }
else
- { $command = "pdfetex -progname=context -fmt=mptopdf" }
+ { $command = "pdfetex -fmt=mptopdf -progname=context" }
if ($dosish)
- { $command = "$command \\relax $file" }
- else
- { $command = "$command \\\\relax $file" }
- #~ print $command ;
+ { $command = "$command \\relax $file" }
+ else #~ print $command ;
system($command) ;
rename ("$_.pdf", "$_-$1.pdf") ;
if (-e "$_.pdf") { CopyFile ("$_.pdf", "$_-$1.pdf") }
diff --git a/scripts/context/perl/texexec.pl b/scripts/context/perl/texexec.pl
index 2f3b89e04..a020727df 100644
--- a/scripts/context/perl/texexec.pl
+++ b/scripts/context/perl/texexec.pl
@@ -255,6 +255,7 @@ my $MakeMpy = '';
"once" => \$RunOnce,
"output=s" => \$OutputFormat,
"pages=s" => \$Pages,
+ "paper=s" => \$PaperFormat,
"paperformat=s" => \$PaperFormat,
"passon=s" => \$PassOn,
"path=s" => \$InpPath,
@@ -275,6 +276,7 @@ my $MakeMpy = '';
"selection=s" => \$Selection,
"combination=s" => \$Combination,
"noduplex" => \$NoDuplex,
+ "offset=s" => \$PaperOffset,
"paperoffset=s" => \$PaperOffset,
"backspace=s" => \$BackSpace,
"topspace=s" => \$TopSpace,
diff --git a/scripts/context/ruby/base/ctx.rb b/scripts/context/ruby/base/ctx.rb
index 852c3f704..b1fda3c3a 100644
--- a/scripts/context/ruby/base/ctx.rb
+++ b/scripts/context/ruby/base/ctx.rb
@@ -101,7 +101,7 @@ class CtxRunner
@modules << justtext(mod)
end
REXML::XPath.each(@xmldata.root,"/ctx:job/ctx:process/ctx:resources/ctx:filter") do |fil|
- @filters << justtext(mod)
+ @filters << justtext(fil)
end
REXML::XPath.each(@xmldata.root,"/ctx:job/ctx:preprocess/ctx:files") do |files|
REXML::XPath.each(files,"ctx:file") do |pattern|
diff --git a/scripts/context/ruby/base/tex.rb b/scripts/context/ruby/base/tex.rb
index 2cc9d2542..6132e5a26 100644
--- a/scripts/context/ruby/base/tex.rb
+++ b/scripts/context/ruby/base/tex.rb
@@ -1136,7 +1136,7 @@ class TEX
system("dvipdfmx -d 4 #{File.unsuffixed(rawname)}")
when 'xetex' then
fixbackendvars('xetex')
- system("xdv2pdf #{File.suffixed(jrawname,'xdv')}")
+ system("xdv2pdf #{File.suffixed(rawname,'xdv')}")
when 'dvips' then
fixbackendvars('dvips')
mapfiles = ''
diff --git a/scripts/context/ruby/base/texutil.rb b/scripts/context/ruby/base/texutil.rb
index c279bcc97..4c9bf6139 100644
--- a/scripts/context/ruby/base/texutil.rb
+++ b/scripts/context/ruby/base/texutil.rb
@@ -213,6 +213,7 @@ class TeXUtil
def preset(shortcuts=[],expansions=[],reductions=[],divisions=[])
# maybe we should move this to sort-def.tex
'a'.upto('z') do |c| expander(c) ; division(c) end
+ 'A'.upto('Z') do |c| expander(c) ; division(c) end
expander('1','b') ; expander('2','c') ; expander('3','e') ; expander('4','f')
expander('5','g') ; expander('6','h') ; expander('7','i') ; expander('8','i')
expander('9','j') ; expander('0','a') ; expander('-','-') ;
@@ -240,7 +241,7 @@ class TeXUtil
# what to do with xml and utf-8
# \"e etc
# unknown \cs
- s.gsub!(/\\[a-z][a-z]+\s*\{(.*?)\}/o) do $1 end
+ s.gsub!(/\\[a-zA-Z][a-zA-Z]+\s*\{(.*?)\}/o) do $1 end
return s
end
@@ -384,7 +385,7 @@ class TeXUtil
class Synonym
@@debug = false
- @@debug = true
+ # @@debug = true
def initialize(t, c, k, d)
@type, @command, @key, @sortkey, @data = t, c, k, k, d
@@ -463,7 +464,7 @@ class TeXUtil
class Register
@@debug = false
- @@debug = true
+ # @@debug = true
@@howto = /^(.*?)\:\:(.*)$/o
@@split = ' && '
@@ -505,7 +506,7 @@ class TeXUtil
@sortkey,
@texthowto.ljust(10,' '),
@state,
- @realpage.rjust(6,' '),
+ (@realpage ||'').rjust(6,' '),
@pagehowto
].join(@@split)
end
@@ -555,7 +556,7 @@ class TeXUtil
else
testalpha = entry.sortkey[0,1].downcase
end
- if testalpha != alpha.downcase or alphaclass != entry.class then
+ if testalpha != alpha.downcase || alphaclass != entry.class then
alpha = testalpha
alphaclass = entry.class
if alpha != ' ' then
@@ -614,6 +615,7 @@ class TeXUtil
Register.flushsavedline(handle)
handle << "\\registersee{#{entry.type}}{#{entry.pagehowto},#{entry.texthowto}}{#{entry.seetoo}}{#{entry.page}}\n" ;
lastpage, lastrealpage = entry.page, entry.realpage
+ copied = false # no page !
elsif @@savedhowto != entry.pagehowto and ! entry.pagehowto.empty? then
@@savedhowto = entry.pagehowto
end
diff --git a/scripts/context/ruby/texmfstart.rb b/scripts/context/ruby/texmfstart.rb
index dc166bf92..0dfd14263 100644
--- a/scripts/context/ruby/texmfstart.rb
+++ b/scripts/context/ruby/texmfstart.rb
@@ -36,7 +36,7 @@ require "rbconfig"
$mswindows = Config::CONFIG['host_os'] =~ /mswin/
$separator = File::PATH_SEPARATOR
-$version = "1.6.2"
+$version = "1.7.0"
if $mswindows then
@@ -71,6 +71,7 @@ $predefined['pstopdf'] = 'pstopdf.rb'
$predefined['examplex'] = 'examplex.rb'
$predefined['concheck'] = 'concheck.rb'
+$predefined['runtools'] = 'runtools.rb'
$predefined['textools'] = 'textools.rb'
$predefined['tmftools'] = 'tmftools.rb'
$predefined['ctxtools'] = 'ctxtools.rb'
@@ -384,6 +385,7 @@ def usage
print("switches : --verbose --report --browser --direct --execute --locate --iftouched\n")
print(" --program --file --page --arguments --batch --edit --report --clear\n")
print(" --make --lmake --wmake --path --stubpath --indirect --before --after\n")
+ print(" --tree\n")
print("\n")
print("example : texmfstart pstopdf.rb cow.eps\n")
print(" texmfstart --locate examplex.rb\n")
@@ -562,7 +564,7 @@ def find(filename,program)
fullname = result[0]
end
rescue
- report("locating '#{filename}.#{suffix}' in tree '#{texroot}' aborted")
+ report("locating '#{filename}.#{suffixlist.join('|')}' in tree '#{texroot}' aborted")
end
end
return shortpathname(fullname) if register(filename,fullname)
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 0d67d6746..941bea809 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -31,7 +31,11 @@
%D 2004.8.30 the low level interface is english. Watch out and adapt
%D your styles an modules.
-\def\contextversion{2005.10.27}
+\def\contextversion{2005.11.09}
+
+%D For those who want to use this:
+
+\def\fmtname{context}
%D Welcome to the main module. When this module is ran through
%D \type{initex} or \type {tex -i} or \type {whatevertex} using
diff --git a/tex/context/base/core-ntb.tex b/tex/context/base/core-ntb.tex
index 080d5c31a..31f641600 100644
--- a/tex/context/base/core-ntb.tex
+++ b/tex/context/base/core-ntb.tex
@@ -100,10 +100,12 @@
\def\settblwid#1#2{\setxvalue{\@@tblprefix#1:w}{#2}} % global !
\def\settblhei#1#2{\setxvalue{\@@tblprefix#1:h}{#2}} % global !
+\def\settbldis#1#2{\setxvalue{\@@tblprefix#1:d}{#2}} % global !
\def\settblaut#1#2{\setxvalue{\@@tblprefix#1:a}{#2}} % global !
\def\gettblwid#1{\executeifdefined{\@@tblprefix#1:w}\zeropoint}
\def\gettblhei#1{\executeifdefined{\@@tblprefix#1:h}\zeropoint}
+\def\gettbldis#1{\executeifdefined{\@@tblprefix#1:d}\zeropoint}
\def\gettblaut#1{\csname\@@tblprefix#1:a\endcsname}
\def\doiftbltag #1#2{\doifdefined {\@@tblprefix#1:#2:s}}
@@ -366,6 +368,51 @@
\long\def\parseTN[#1]#2\eTN
{\parseTD[#1]\digits#2\relax\eTD}
+%D Vit Zyka needed the option to create a distance between columns, so I
+%D added support for individual column distances.
+%D
+%D \startbuffer
+%D % \setupTABLE[c][each][distance=2em]
+%D \setupTABLE[c][1][distance=2em]
+%D \setupTABLE[c][2][distance=3em]
+%D
+%D \bTABLE
+%D \bTR \bTD test \eTD \bTD test \eTD \bTD test \eTD \eTR
+%D \bTR \bTD[nx=2] test \eTD \bTD test \eTD \eTR
+%D \bTR \bTD test \eTD \bTD[nx=2] test \eTD \eTR
+%D \eTABLE
+%D
+%D \bTABLE[option=stretch]
+%D \bTR \bTD test \eTD \bTD test \eTD \bTD test \eTD \eTR
+%D \bTR \bTD[nx=2] test \eTD \bTD test \eTD \eTR
+%D \bTR \bTD test \eTD \bTD[nx=2] test \eTD \eTR
+%D \eTABLE
+%D \stopbuffer
+%D
+%D \typebuffer \startlinecorrection \getbuffer \stoplinecorrection
+%D
+%D and he provided patches for the global left and right margin distances
+%D as well as the columndistance (although i changed the names -). Here
+%D is his testcase:
+%D
+%D \startbuffer
+%D \framed[offset=overlay]\bgroup
+%D \setupTABLE[column][2][align=left]%
+%D \setupTABLE[column][3][align=right]%
+%D \bTABLE[margindistance=2cm,leftmargindistance=.3cm,margindistance=.5cm]
+%D \bTR \bTH[nc=3] Table head\eTH \eTR
+%D \bTR \bTD[nc=2] AB\eTD \bTD C\eTD \eTR
+%D \bTR \bTD[nc=2,align=left] AB\eTD \bTD C\eTD \eTR
+%D \bTR \bTD[nc=2,align=middle] AB\eTD \bTD C\eTD \eTR
+%D \bTR \bTD A\eTD \bTD B\eTD \bTD C\eTD \eTR
+%D \bTR \bTD Aa\eTD \bTD Bb\eTD \bTD Cccc\eTD \eTR
+%D \bTR \bTD[nc=3,align=middle] ABC\eTD \eTR
+%D \eTABLE
+%D \egroup
+%D \stopbuffer
+%D
+%D \typebuffer \startlinecorrection \getbuffer \stoplinecorrection
+
\newtoks\TBLhead
\newtoks\TBLnext
\newtoks\TBLbody
@@ -573,7 +620,9 @@
{\doglobal\increment\colTBL}
\def\nexttblcol
- {\doglobal\increment\colTBL&}
+ {\doglobal\increment\colTBL
+ \kern\tbltblcolumndistance
+ &}
\def\spantblcol
{\span}
@@ -582,10 +631,14 @@
{\noalign
{\doglobal\increment\rowTBL
\doglobal\newcounter\colTBL}%
- \nexttblcol}
+ \nexttblcol
+ \kern\tbltblleftmargindistance
+ \kern-\tbltblcolumndistance}
\def\endtblrow
- {\crcr
+ {\kern-\tbltblcolumndistance
+ \kern\tbltblrightmargindistance
+ \crcr
\noalign
{\nointerlineskip
\allowbreak
@@ -659,7 +712,8 @@
{\settblwd \recurselevel\xcol\!!zeropoint
\settblht \recurselevel\xcol\!!zeropoint}%
% till here
- \settblwid\recurselevel\!!zeropoint}%
+ \settblwid\recurselevel\!!zeropoint
+ \settbldis\recurselevel\!!zeropoint}%
\dorecurse\maximumrow
{\settblhei\recurselevel\maxdimen}%
\chardef\TBLpass\plusone
@@ -674,6 +728,7 @@
\settblaut\colTBL\localwidth
\fi}}%
\setbox0\vbox{\trialtypesettingtrue \the\tbltoks}%
+\settbldis\maximumcol{\zeropoint}%
\ifautoTBLspread
% experimental, stretch non fixed cells to \hsize
\checktblwidthsone % trial run
@@ -703,7 +758,10 @@
\globalpushmacro\colTBL
\dorecurse{\gettblcol{##1}{##2}}
{\advance\dimen2 \gettblwid\colTBL
+ \advance\dimen2 \tbltblcolumndistance
+\ifnum\recurselevel<\gettblcol{##1}{##2}\relax \advance\dimen2 \gettbldis\colTBL\fi
\increment\colTBL}%
+ \advance\dimen2 -\tbltblcolumndistance
\edef\widthTBL{\the\dimen2}%
\globalpopmacro\colTBL
\setbox\scratchbox\hbox{\gettbltxt{##1}{##2}}%
@@ -739,7 +797,10 @@
\scratchdimen\zeropoint
\dorecurse{\gettblcol{##1}{##2}}
{\advance\scratchdimen \gettblwid\colTBL
+ \advance\scratchdimen \tbltblcolumndistance
+\ifnum\recurselevel<\gettblcol{##1}{##2}\relax \advance\scratchdimen \gettbldis\colTBL\fi
\increment\colTBL}%
+ \advance\scratchdimen -\tbltblcolumndistance
\edef\widthTBL{\the\scratchdimen}%
\globalpopmacro\colTBL
% cell
@@ -765,11 +826,17 @@
\def\stretchtblwidths
{\!!dimend\zeropoint
+ \!!dimene\hsize
\dorecurse\maximumcol
- {\advance\!!dimend\gettblwid\recurselevel}%
+ {\advance\!!dimend \gettblwid\recurselevel
+ \advance\!!dimend \tbltblcolumndistance
+ \advance\!!dimene-\gettbldis\recurselevel}%
+ \advance\!!dimend-\tbltblcolumndistance
+ \advance\!!dimend\tbltblleftmargindistance
+ \advance\!!dimend\tbltblrightmargindistance
% distribute width (stretch)
- \ifdim\!!dimend<\hsize
- \advance\!!dimend-\hsize
+ \ifdim\!!dimend<\!!dimene
+ \advance\!!dimend-\!!dimene
\!!dimend-\!!dimend
\divide\!!dimend\maximumcol
\dorecurse\maximumcol
@@ -1060,6 +1127,7 @@
\!!counta\zerocount
\dorecurse\maximumcol
{\scratchdimen\gettblaut\recurselevel\relax
+% test: \advance\!!dimena-\gettbldis\recurselevel\relax
\ifdim\scratchdimen>\zeropoint\relax
\advance\!!dimena -\scratchdimen
\else
@@ -1179,6 +1247,10 @@
\long\def\dohandleTBLcellA#1#2[#3]#4%
{\setbox\scratchbox\hbox
{\setupTBLcell{#1}{#2}%
+\scratchdimen\tbltbldistance\relax
+\ifdim\scratchdimen>\gettbldis{#2}\relax
+ \settbldis{#2}{\the\scratchdimen}%
+\fi
\localframed
[\@@tbl\@@tbl]
[#3,\c!background=,\c!frame=\v!off]% 25% faster
@@ -1282,7 +1354,8 @@
[\@@tbl\@@tbl]
[\c!color=,\c!width=\widthTBL,\c!height=\heightTBL]
{\bTBLCELL\TBLcharalign{#2}{#4}\eTBLCELL}%
- \fi}}
+ \fi}%
+ \hskip\gettbldis{#2}}
\setupTABLE
[\c!frameoffset=.5\linewidth,
@@ -1302,6 +1375,10 @@
\c!textwidth=\hsize,
\c!split=\v!no,
\c!splitoffset=0pt,
+ \c!distance=\zeropoint, % individual column
+ \c!columndistance=\zeropoint, % each column (whole table)
+ \c!leftmargindistance=\zeropoint, % whole table
+ \c!rightmargindistance=\zeropoint,% whole table
\c!splitmethod=a]
%D We have already prepared the previous macros for nesting,
@@ -1426,6 +1503,8 @@
\def\TableTB{\doTableinterline{TB}}
\appendtoks\let\TB\TableTB \to\everytable
-\appendtoks\let\TB\TabulateTB\to\everytabulate
+\appendtoks\let\TB\TabulateTB\to\everytabulate % strange place
+
+\appendtoks \chardef\recodeverbatimmode\plustwo \to \everytable
\protect \endinput
diff --git a/tex/context/base/core-tbl.tex b/tex/context/base/core-tbl.tex
index b33302da4..c3be264bd 100644
--- a/tex/context/base/core-tbl.tex
+++ b/tex/context/base/core-tbl.tex
@@ -748,7 +748,8 @@
% An example of its usage:
-\appendtoks \optimizeverbatimfalse \to \everytabulate
+\appendtoks \optimizeverbatimfalse \to \everytabulate
+\appendtoks \chardef\recodeverbatimmode\plustwo \to \everytabulate
% A status variable:
diff --git a/tex/context/base/core-ver.tex b/tex/context/base/core-ver.tex
index eb8363cf0..1c152b165 100644
--- a/tex/context/base/core-ver.tex
+++ b/tex/context/base/core-ver.tex
@@ -286,23 +286,97 @@
\@EAEAEA\dodotypeD
\fi\fi}
+% Verbatim does not work when passed as an argument, so here is a
+% workaround. Beware, spaces are introduced after a \type {\csname}.
+
+\chardef\recodeverbatimmode\zerocount % 0=nothing 1=rescan 2=autorescan
+\chardef\recodeverbatimmode\zerocount % 0=nothing 1=rescan 2=autorescan
+
+% \appendtoks \chardef\recodeverbatimmode\plustwo \to \everytabulate
+% \appendtoks \chardef\recodeverbatimmode\plustwo \to \everytable
+
+\def\dodotypeA
+ {\initializetype
+ \initializetypegrouping
+ \verbatimcolor
+ \ifcase\recodeverbatimmode
+ \@EA\dodotypeAA
+ \or
+ \@EA\dodotypeAB
+ \or
+ \ifnum\catcode`\{=\@@active
+ \@EAEAEA\dodotypeAB
+ \else
+ \@EAEAEA\dodotypeAA
+ \fi
+ \else
+ \@EA\dodotypeAA
+ \fi}
+
+\def\dodotypeAA
+ {\afterassignment\protectfirsttype\let\next=}
+
+\def\dodotypeAB
+ {\bgroup
+ \catcode`\}=\@@endgroup
+ \catcode`\{=\@@begingroup
+ \afterassignment\redotypeAB\global\globalscratchtoks}
+
+\def\redotypeAB
+ {\egroup
+ \expandafter\convertargument\the\globalscratchtoks\to\ascii
+ \ifx\scantokens\undefined\ascii\else\everyeof{\hskip-\spaceskip}\scantokens\expandafter{\ascii}\fi
+ \egroup}
+
+% bugged
+%
+% \bgroup
+% \catcode`\[=\@@begingroup
+% \catcode`\]=\@@endgroup
+% \catcode`\{=\@@active
+% \catcode`\}=\@@active
+% \gdef\initializetypegrouping%
+% [\catcode`\{=\@@active
+% \catcode`\}=\@@endgroup % otherwise things go wrong ...
+% \def\activerightargument%
+% [\rightargument
+% \egroup]%
+% \def\activeleftargument%
+% [\bgroup
+% \leftargument %% this way TeXEdit can check: {
+% \catcode`\}=\@@active % ... in alignments (tables)
+% \let}=\activerightargument]%
+% \let{=\activeleftargument]% %% this way TeXEdit can check: }
+% \egroup
+%
+% ok:
+
\bgroup
\catcode`\[=\@@begingroup
\catcode`\]=\@@endgroup
\catcode`\{=\@@active
\catcode`\}=\@@active
\gdef\initializetypegrouping%
- [\catcode`\{=\@@active
- \catcode`\}=\@@endgroup % otherwise things go wrong ...
- \def\activerightargument%
- [\rightargument
- \egroup]%
+ [\ifnum\catcode`\{=\@@active
+ \let\normalactivebgroup{%
+ \let\normalactiveegroup}%
+ \else
+ \catcode`\{=\@@active
+ \catcode`\}=\@@active
+ \let\normalactivebgroup\leftargument
+ \let\normalactiveegroup\rightargument
+ \fi
\def\activeleftargument%
[\bgroup
- \leftargument %% this way TeXEdit can check: {
- \catcode`\}=\@@active % ... in alignments (tables)
- \let}=\activerightargument]%
- \let{=\activeleftargument]% %% this way TeXEdit can check: }
+ \let}\activerightargument
+ \normalactivebgroup
+ ]%
+ \def\activerightargument%
+ [\normalactiveegroup
+ \egroup]%
+ \let{=\activeleftargument
+ \let}=\egroup
+ ]
\egroup
\bgroup
@@ -463,10 +537,7 @@
{\setupgroupedtype
\slantedtypepermittedtrue}
-% the next one was \string, but this prevents coloring, one can make
-% it \string again if needed
-
-\let\protectedfirsttype\relax
+\let\protectedfirsttype\string % \relax for special cases
\bgroup
\catcode`\<=\active
diff --git a/tex/context/base/supp-mis.tex b/tex/context/base/supp-mis.tex
index ab089a297..7ad444695 100644
--- a/tex/context/base/supp-mis.tex
+++ b/tex/context/base/supp-mis.tex
@@ -154,8 +154,9 @@
% no time now, will do a better test later (based on dimendef)
\def\!!stringa{plain} \ifx\!!stringa\fmtname \donetrue \else
+\def\!!stringa{eplain} \ifx\!!stringa\fmtname \donetrue \else
\def\!!stringa{babel-plain} \ifx\!!stringa\fmtname \donetrue \else
- \donefalse \fi \fi
+ \donefalse \fi \fi \fi
\ifdone
% plain defines some 15 dimens, so we need to define a few
diff --git a/tex/context/base/symb-was.tex b/tex/context/base/symb-was.tex
new file mode 100644
index 000000000..ba2617306
--- /dev/null
+++ b/tex/context/base/symb-was.tex
@@ -0,0 +1,205 @@
+%D \module
+%D [ file=symb-was,
+%D version=2005.10.15,
+%D title=\CONTEXT\ Symbol Libraries,
+%D subtitle=Roland Waldi's Symbols (wasy-2),
+%D author=Henning Hraban Ramm,
+%D date=\currentdate,
+%D copyright={public domain}]
+%C
+%C This module is in the public domain.
+
+%D This module implements the Roland Waldi Symbole font
+%D (wasy). The names are derived from the \LATEX\ package
+%D \type {wasysym} by Axel Kielhorn. The symbols are
+%D available as Type~1 font and are included in \TEX\ distributions.
+%D
+%D This symbol font offers basic sets of astronomical, astrological,
+%D geometrical, musical and general symbols, plus those needed
+%D for the APL programming language and some more.
+%D This module leaves out most of the math stuff, such as operators
+%D and integrals.
+%D
+%D The font was designed by Robert Waldi and is in the public domain.
+%D The PS Type 1 fonts are by Taco Hoekwater, \hyphenatedurl
+%D {taco.hoekwater@wkap.nl}, and also in the public domain.
+%D The wasysym \LATEX\ package is (c) Axel Kielhorn, \hyphenatedurl
+%D {A.Kielhorn@web.de}, under the LaTeX Project Public License.
+%D This stuff lives in \hyphenatedurl {http://dante.ctan.org/CTAN/fonts/wasy2/}.
+%D
+%D This \CONTEXT\ module is by Henning Hraban Ramm, \hyphenatedurl
+%D {hraban@fiee.net}, given to the public domain as far as allowed
+%D (some parts are copied from the \LATEX\ package).
+
+%D Slightly patched by HH.
+
+\loadmapfile[original-wasy.map]
+
+% there are also fonts for 6, 7, 8, 9 pt; how can we access these automatically?
+% how about the bold wasy font?
+
+\definefontsynonym [WaldiSymbol] [wasy10]
+\definefontsynonym [WaldiSymbolBold] [wasyb10]
+
+\def\WaldiSymbol#1{\getglyph{WaldiSymbol}{\char#1}}
+
+\def\wasy@over#1#2{{\setbox0\hbox{$#2$}\hbox to \wd0{\hss$#1$\hss}\kern-\wd0\box0}}
+
+% general symbols
+
+\startsymbolset [wasy general]
+ \definesymbol [male] [\WaldiSymbol {26}]
+ \definesymbol [female] [\WaldiSymbol {25}]
+ \definesymbol [currency] [\WaldiSymbol {27}]
+ \definesymbol [cent] [\WaldiSymbol{103}]
+ \definesymbol [lozenge] [\WaldiSymbol {53}]
+ \definesymbol [kreuz] [\WaldiSymbol {54}]
+ \definesymbol [smiley] [\WaldiSymbol {44}]
+ \definesymbol [blacksmiley] [\WaldiSymbol {45}]
+ \definesymbol [frownie] [\WaldiSymbol {47}]
+ \definesymbol [sun] [\WaldiSymbol {46}]
+ \definesymbol [checked] [\WaldiSymbol {8}]
+ \definesymbol [brokenvert] [\WaldiSymbol{124}]
+ \definesymbol [diameter] [\WaldiSymbol {31}]
+ \definesymbol [invdiameter] [\WaldiSymbol {21}]
+ \definesymbol [phone] [\WaldiSymbol {7}]
+ \definesymbol [recorder] [\WaldiSymbol {6}]
+ \definesymbol [clock] [\WaldiSymbol {28}]
+ \definesymbol [permil] [\WaldiSymbol{104}]
+ \definesymbol [bell] [\WaldiSymbol {10}]
+ \definesymbol [ataribox] [\WaldiSymbol{109}]
+ \definesymbol [pointer] [\WaldiSymbol {9}]
+ \definesymbol [lightning] [\WaldiSymbol {18}]
+ \definesymbol [agemO] [\WaldiSymbol {48}]
+\stopsymbolset
+
+\startsymbolset [wasy music]
+ \definesymbol [eighthnote] [\WaldiSymbol{11}]
+ \definesymbol [quarternote] [\WaldiSymbol{12}]
+ \definesymbol [halfnote] [\WaldiSymbol{13}]
+ \definesymbol [fullnote] [\WaldiSymbol{14}]
+ \definesymbol [twonotes] [\WaldiSymbol{15}]
+\stopsymbolset
+
+\startsymbolset [wasy astronomy]
+ \definesymbol [ascnode] [\WaldiSymbol{19}]
+ \definesymbol [descnode] [\WaldiSymbol{20}]
+ \definesymbol [astrosun] [\mathematics{\odot}]
+ \definesymbol [sun] [\WaldiSymbol{46}] % additional
+ \definesymbol [newmoon] [\WaldiSymbol{32}]
+ \definesymbol [fullmoon] [\WaldiSymbol{35}]
+ \definesymbol [rightmoon] [\WaldiSymbol{37}]
+ \definesymbol [leftmoon] [\WaldiSymbol{36}]
+ \definesymbol [vernal] [\WaldiSymbol{23}]
+ \definesymbol [mercury] [\WaldiSymbol{39}]
+ \definesymbol [mars] [\dontleavehmode\lower.2ex\hbox{\WaldiSymbol{26}}]
+ \definesymbol [saturn] [\WaldiSymbol{89}]
+ \definesymbol [neptune] [\WaldiSymbol{91}]
+ \definesymbol [earth] [\dontleavehmode\lower.3ex\hbox{\WaldiSymbol{38}}]
+ \definesymbol [venus] [\dontleavehmode\raise.2ex\hbox{\WaldiSymbol{25}}]
+ \definesymbol [jupiter] [\WaldiSymbol{88}]
+ \definesymbol [uranus] [\WaldiSymbol{90}]
+ \definesymbol [pluto] [\WaldiSymbol{92}]
+\stopsymbolset
+
+\startsymbolset [wasy astrology]
+ \definesymbol [conjunction] [\WaldiSymbol {86}]
+ \definesymbol [opposition] [\WaldiSymbol {87}]
+ \definesymbol [aries] [\WaldiSymbol {23}]
+ \definesymbol [libra] [\WaldiSymbol {97}]
+ \definesymbol [taurus] [\WaldiSymbol {93}]
+ \definesymbol [scorpio] [\WaldiSymbol {98}]
+ \definesymbol [gemini] [\WaldiSymbol {94}]
+ \definesymbol [sagittarius] [\WaldiSymbol {99}]
+ \definesymbol [cancer] [\WaldiSymbol {95}]
+ \definesymbol [capricornus] [\WaldiSymbol{100}]
+ \definesymbol [leo] [\WaldiSymbol {19}]
+ \definesymbol [aquarius] [\WaldiSymbol{101}]
+ \definesymbol [virgo] [\WaldiSymbol {96}]
+ \definesymbol [pisces] [\WaldiSymbol{102}]
+\stopsymbolset
+
+\startsymbolset [wasy geometry]
+ \definesymbol [fivestar] [\WaldiSymbol {69}] % HHR additional
+ \definesymbol [hexstar] [\WaldiSymbol {65}]
+ \definesymbol [varhexstar] [\WaldiSymbol {66}]
+ \definesymbol [davidsstar] [\WaldiSymbol {67}]
+ \definesymbol [Circle] [\WaldiSymbol {35}]
+ \definesymbol [CIRCLE] [\WaldiSymbol {32}]
+ \definesymbol [Leftcircle] [\WaldiSymbol {73}]
+ \definesymbol [LEFTCIRCLE] [\WaldiSymbol {71}]
+ \definesymbol [Rightcircle] [\WaldiSymbol {74}]
+ \definesymbol [RIGHTCIRCLE] [\WaldiSymbol {72}]
+ \definesymbol [LEFTcircle] [\dontleavehmode\hbox to \zeropoint{\WaldiSymbol{71}\hss}\WaldiSymbol{35}]
+ \definesymbol [RIGHTcircle] [\dontleavehmode\hbox to \zeropoint{\WaldiSymbol{72}\hss}\WaldiSymbol{35}]
+ \definesymbol [LEFTarrow] [\WaldiSymbol {16}]
+ \definesymbol [RIGHTarrow] [\WaldiSymbol {17}]
+ \definesymbol [UParrow] [\WaldiSymbol {75}]
+ \definesymbol [DOWNarrow] [\WaldiSymbol {76}]
+ \definesymbol [Box] [\WaldiSymbol {32}]
+ \definesymbol [APLbox] [\WaldiSymbol{126}]
+ \definesymbol [XBox] [\WaldiSymbol {52}]
+ \definesymbol [Bowtie] [\WaldiSymbol {49}]
+ \definesymbol [Diamond] [\WaldiSymbol {51}]
+ \definesymbol [octagon] [\WaldiSymbol {56}]
+ \definesymbol [hexagon] [\WaldiSymbol {55}]
+ \definesymbol [varhexagon] [\WaldiSymbol {57}]
+ \definesymbol [pentagon] [\WaldiSymbol {68}]
+ \definesymbol [pentastar] [\dontleavehmode\hbox to \zeropoint{\WaldiSymbol{68}\hss}\lower.04em\hbox{\WaldiSymbol{69}}] % HHR additional
+\stopsymbolset
+
+\startsymbolset [wasy physics]
+ \definesymbol [varangle] [\WaldiSymbol{30}]
+ \definesymbol [invneg] [\WaldiSymbol{24}]
+ \definesymbol [leftturn] [\WaldiSymbol{34}]
+ \definesymbol [rightturn] [\WaldiSymbol{33}]
+ \definesymbol [diameter] [\WaldiSymbol{31}]
+ \definesymbol [invdiameter] [\WaldiSymbol{21}] % additional
+ \definesymbol [therefore] [\WaldiSymbol {5}]
+ \definesymbol [AC] [\mbox{\kern.05em\WaldiSymbol{58}\kern.05em}]
+ \definesymbol [HF] [\dontleavehmode
+ \lower.09em\hbox to \zeropoint{\kern.05em\WaldiSymbol{58}\hss}%
+ \raise.09em\hbox{\kern.05em\WaldiSymbol{58}\kern.05em}]
+ \definesymbol [VHF] [\WaldiSymbol{64}]
+ \definesymbol [photon] [\hbox{\WaldiSymbol{58}\WaldiSymbol{58}\WaldiSymbol{58}\WaldiSymbol{58}}]
+ \definesymbol [gluon] [\hbox{\WaldiSymbol{80}\WaldiSymbol{80}\WaldiSymbol{80}\WaldiSymbol{80}\WaldiSymbol{80}\WaldiSymbol{80}}]
+\stopsymbolset
+
+\startsymbolset [wasy apl]
+ \definesymbol [APLup] [\WaldiSymbol{0}]
+ \definesymbol [APLdown] [\WaldiSymbol{70}]
+ \definesymbol [APLbox] [\WaldiSymbol{126}]
+ \definesymbol [APLinv] [\dontleavehmode\hbox to \zeropoint{$\div$\hss}\WaldiSymbol{126}]
+ \definesymbol [APLleftarrowbox] [\WaldiSymbol{112}]
+ \definesymbol [APLrightarrowbox][\WaldiSymbol{113}]
+ \definesymbol [APLuparrowbox] [\WaldiSymbol{110}]
+ \definesymbol [APLdownarrowbox] [\WaldiSymbol{111}]
+ \definesymbol [APLinput] [\WaldiSymbol{125}]
+ \definesymbol [APLminus] [\dontleavehmode\raise.7ex\hbox{$-$}]
+ \definesymbol [APLlog] [\WaldiSymbol{22}]
+ \definesymbol [APLstar] [\WaldiSymbol{69}]
+ \definesymbol [APLcomment] [\WaldiSymbol{127}]
+ \definesymbol [notslash] [\wasy@over{/}{-}]
+ \definesymbol [notbackslash] [\wasy@over{\backslash}{-}]
+ %
+ %definesymbol [APLvert] [\WaldiSymbol{}]
+ %definesymbol [APLnot] [\WaldiSymbol{}]
+ %definesymbol [APLcirc] [\WaldiSymbol{}]
+ %
+ % HH: messy, best define all combinations (todo)
+ %
+ \def\APLnot #1{\wasy@over{\sim }{#1}}
+ \def\APLcirc#1{\wasy@over{\circ}{#1}}
+ \def\APLvert#1{\wasy@over{\vert}{#1}}
+ %
+\stopsymbolset
+
+%D \showsymbolset[wasy general]
+%D \showsymbolset[wasy music]
+%D \showsymbolset[wasy astronomy]
+%D \showsymbolset[wasy astrology]
+%D \showsymbolset[wasy geometry]
+%D \showsymbolset[wasy physics]
+%D \showsymbolset[wasy apl]
+
+\endinput
diff --git a/tex/context/base/syst-ext.tex b/tex/context/base/syst-ext.tex
index 51376ce78..579eb0112 100644
--- a/tex/context/base/syst-ext.tex
+++ b/tex/context/base/syst-ext.tex
@@ -2677,6 +2677,19 @@
{\rawdoifinsetelse{#1}#2\resetglobal
{\dodoglobal\edef#2{#1\ifx#2\empty\else,#2\fi}}}
+\def\robustdoifinsetelse#1#2%
+ {\expanded{\convertargument#1}\to\!!stringa
+ \expanded{\convertargument#2}\to\!!stringb
+ \rawdoifinsetelse\!!stringa\!!stringb}
+
+\def\robustaddtocommalist#1#2% {item} \cs
+ {\robustdoifinsetelse{#1}#2\resetglobal
+ {\dodoglobal\edef#2{\ifx#2\empty\else#2,\fi#1}}}
+
+\def\robustpretocommalist#1#2% {item} \cs
+ {\robustdoifinsetelse{#1}#2\resetglobal
+ {\dodoglobal\edef#2{#1\ifx#2\empty\else,#2\fi}}}
+
\def\xsplitstring#1#2% \cs {str}
{\def\dosplitstring##1,#2,##2,#2,##3\\%
{\edef\!!stringa{\bcleanedupcommalist##1\empty\empty\relax}%
diff --git a/tex/context/base/syst-gen.tex b/tex/context/base/syst-gen.tex
index 25e5390af..c4f42d24e 100644
--- a/tex/context/base/syst-gen.tex
+++ b/tex/context/base/syst-gen.tex
@@ -3001,6 +3001,81 @@
\def\doeassign [#1][#2]{\p!doassign\dosetevalue #1\@relax@#2==\empty\@relax@}
\def\undoassign[#1][#2]{\p!doassign\doresetvalue#1\@relax@#2==\empty\@relax@}
+%D When someone asked on the mailing list if it's possible to
+%D use the current value of a parameter, Taco posted a small module
+%D which is included here. Instead of redefining \type {\getparameters}
+%D as well, we opt for using \type {\expanded}; see examnple below.
+
+%D This variant redefines the parameter assignment engine in \CONTEXT\
+%D so that the special macro \type {\currentvalue} can be used to get
+%D at the current value of the parameter to be assigned to. If the
+%D parameter is not set, it's expansion will be empty.
+%D
+%D Example document:
+%D
+%D \startbuffer
+%D \getparameters[a][b=d]
+%D \expanded{\getparameters[a][b=c\currentvalue]}
+%D \framed{\ab}
+%D \stopbuffer
+%D \typebuffer
+%D
+%D Gives: \getbuffer
+
+%D \macros{currentvalue}
+%D
+%D Just in case a \type{\getparameter} argument itself ends up
+%D inside a \type{\write} or other expandable location, our
+%D new macro needs a default value.
+
+\let\currentvalue\empty
+
+%D \macros{p!doassignwithcurrent}
+%D
+%D The next definition does the work of re-creating
+%D the expandable \type{\currentvalue} again and again.
+%D The macro is \type{\let} instead of \type{\def}-ed
+%D because that is a little easier on resources, and
+%D faster as well.
+
+\beginTEX
+
+\def\p!doassign#1#2\@relax@#3=#4=#5#6\@relax@
+ {\ifx#5\empty
+ \@EA\xshowassignerror
+ \else\ifx#5=%
+ \@EA\ifx\csname#2#3\endcsname\relax
+ \let\currentvalue\empty
+ \else
+ \@EA\let\@EA\currentvalue\csname#2#3\endcsname
+ \fi
+ \@EAEAEA#1%
+ \else
+ \@EAEAEA\xshowassignerror
+ \fi\fi
+ {#2}{#3}{#4}}
+
+\endTEX
+
+\beginETEX
+
+\def\p!doassign#1#2\@relax@#3=#4=#5#6\@relax@
+ {\ifx#5\empty
+ \@EA\xshowassignerror
+ \else\ifx#5=%
+ \ifcsname#2#3\endcsname
+ \@EA\let\@EA\currentvalue\csname#2#3\endcsname
+ \else
+ \let\currentvalue\empty
+ \fi
+ \@EAEAEA#1%
+ \else
+ \@EAEAEA\xshowassignerror
+ \fi\fi
+ {#2}{#3}{#4}}
+
+\endETEX
+
%D \macros
%D {getemptyparameters}
%D
diff --git a/tex/context/base/type-map.tex b/tex/context/base/type-map.tex
index 2c87d8ad2..e69571bc2 100644
--- a/tex/context/base/type-map.tex
+++ b/tex/context/base/type-map.tex
@@ -63,8 +63,12 @@
% in the name; for the moment we ship copies of the map files.
\starttypescript [map] [modern,modern-vari,modern-cond,computer-modern,latin-modern,latin-modern-vari,latin-modern-cond,] [ec,texnansi,qx,t5]
-% \loadmapfile[lm-\typescriptthree.map] % maybe some day
- \loadmapfile[\typescriptthree-public-lm.map]
+ % this was what we had at the start and what fits best into our naming scheme
+ % \loadmapfile[\typescriptthree-public-lm.map]
+ % this one also fits into the naming scheme but has been dropped by the distributers
+ \loadmapfile[\typescriptthree-lm.map]
+ % this is what teh latest distributions provide
+ % \loadmapfile[lm-\typescriptthree.map] % maybe some day
\stoptypescript
% \usetypescript [map] [latin-modern-os] [ec] % lm is loaded under ec regime
diff --git a/tex/context/base/verb-ini.tex b/tex/context/base/verb-ini.tex
index c38c3f6f4..a43bb1e0a 100644
--- a/tex/context/base/verb-ini.tex
+++ b/tex/context/base/verb-ini.tex
@@ -348,7 +348,7 @@
%D \type{\goodbreaks}. And this is how it's done:
\def\doverbatimnobreak
- {\ifoptimizeverbatim\penalty500\fi}
+ {\ifoptimizeverbatim\penalty500 \fi}
\def\doverbatimgoodbreak
{\ifoptimizeverbatim\penalty\linepenalty\fi}
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index e0e1423d9..496e8a857 100644
--- a/tex/context/interface/keys-cz.xml
+++ b/tex/context/interface/keys-cz.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2005.10.27">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2005.11.09">
<cd:variables>
<cd:variable name="one" value="jedna"/>
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
index 831fd37c1..43e27f3bf 100644
--- a/tex/context/interface/keys-de.xml
+++ b/tex/context/interface/keys-de.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2005.10.27">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2005.11.09">
<cd:variables>
<cd:variable name="one" value="eins"/>
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
index d913ebe67..d0ddd2b1b 100644
--- a/tex/context/interface/keys-en.xml
+++ b/tex/context/interface/keys-en.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2005.10.27">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2005.11.09">
<cd:variables>
<cd:variable name="one" value="one"/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index 63f45e6dc..f7c124736 100644
--- a/tex/context/interface/keys-it.xml
+++ b/tex/context/interface/keys-it.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2005.10.27">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2005.11.09">
<cd:variables>
<cd:variable name="one" value="uno"/>
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
index ee84ea394..be58640d4 100644
--- a/tex/context/interface/keys-nl.xml
+++ b/tex/context/interface/keys-nl.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2005.10.27">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2005.11.09">
<cd:variables>
<cd:variable name="one" value="een"/>
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
index 5e86b26db..6df62d311 100644
--- a/tex/context/interface/keys-ro.xml
+++ b/tex/context/interface/keys-ro.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2005.10.27">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2005.11.09">
<cd:variables>
<cd:variable name="one" value="unu"/>