27 files changed, 5 insertions, 94 deletions
diff --git a/tex/generic/context/luatex-basics-gen.lua b/tex/generic/context/luatex/luatex-basics-gen.lua
index a0368c13a..a0368c13a 100644
--- a/tex/generic/context/luatex-basics-gen.lua
+++ b/tex/generic/context/luatex/luatex-basics-gen.lua
diff --git a/tex/generic/context/luatex-basics-nod.lua b/tex/generic/context/luatex/luatex-basics-nod.lua
index 151d98a8f..151d98a8f 100644
--- a/tex/generic/context/luatex-basics-nod.lua
+++ b/tex/generic/context/luatex/luatex-basics-nod.lua
diff --git a/tex/generic/context/luatex-basics.tex b/tex/generic/context/luatex/luatex-basics.tex
index bb34587ff..bb34587ff 100644
--- a/tex/generic/context/luatex-basics.tex
+++ b/tex/generic/context/luatex/luatex-basics.tex
diff --git a/tex/generic/context/luatex-fonts-cbk.lua b/tex/generic/context/luatex/luatex-fonts-cbk.lua
index 9db94f65e..9db94f65e 100644
--- a/tex/generic/context/luatex-fonts-cbk.lua
+++ b/tex/generic/context/luatex/luatex-fonts-cbk.lua
diff --git a/tex/generic/context/luatex-fonts-def.lua b/tex/generic/context/luatex/luatex-fonts-def.lua
index 0c2f0dbd5..0c2f0dbd5 100644
--- a/tex/generic/context/luatex-fonts-def.lua
+++ b/tex/generic/context/luatex/luatex-fonts-def.lua
diff --git a/tex/generic/context/luatex-fonts-demo-vf-1.lua b/tex/generic/context/luatex/luatex-fonts-demo-vf-1.lua
index 3878ae648..3878ae648 100644
--- a/tex/generic/context/luatex-fonts-demo-vf-1.lua
+++ b/tex/generic/context/luatex/luatex-fonts-demo-vf-1.lua
diff --git a/tex/generic/context/luatex-fonts-enc.lua b/tex/generic/context/luatex/luatex-fonts-enc.lua
index e20c3a03b..e20c3a03b 100644
--- a/tex/generic/context/luatex-fonts-enc.lua
+++ b/tex/generic/context/luatex/luatex-fonts-enc.lua
diff --git a/tex/generic/context/luatex-fonts-ext.lua b/tex/generic/context/luatex/luatex-fonts-ext.lua
index 951afcc7e..951afcc7e 100644
--- a/tex/generic/context/luatex-fonts-ext.lua
+++ b/tex/generic/context/luatex/luatex-fonts-ext.lua
diff --git a/tex/generic/context/luatex-fonts-lua.lua b/tex/generic/context/luatex/luatex-fonts-lua.lua
index ec3fe38be..ec3fe38be 100644
--- a/tex/generic/context/luatex-fonts-lua.lua
+++ b/tex/generic/context/luatex/luatex-fonts-lua.lua
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 455d8ba41..b2115c4a6 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 06/23/11 19:25:18
+-- merge date  : 06/25/11 11:24:40
 
 do -- begin closure to overcome local limits and interference
 
@@ -4681,9 +4681,9 @@ function mappings.addtounicode(data,filename)
                     end
                 end
             end
-            if not unicode then
-                originals[index], tounicode[index] = 0xFFFD, "FFFD"
-            end
+         -- if not unicode then
+         --     originals[index], tounicode[index] = 0xFFFD, "FFFD"
+         -- end
         end
     end
     if trace_mapping then
@@ -4984,7 +4984,7 @@ local otf                = fonts.handlers.otf
 
 otf.glists               = { "gsub", "gpos" }
 
-otf.version              = 2.731 -- beware: also sync font-mis.lua
+otf.version              = 2.732 -- beware: also sync font-mis.lua
 otf.cache                = containers.define("fonts", "otf", otf.version, true)
 
 local fontdata           = fonts.hashes.identifiers
diff --git a/tex/generic/context/luatex-fonts-syn.lua b/tex/generic/context/luatex/luatex-fonts-syn.lua
index 36a74d0f4..36a74d0f4 100644
--- a/tex/generic/context/luatex-fonts-syn.lua
+++ b/tex/generic/context/luatex/luatex-fonts-syn.lua
diff --git a/tex/generic/context/luatex-fonts-tfm.lua b/tex/generic/context/luatex/luatex-fonts-tfm.lua
index b9bb1bd0f..b9bb1bd0f 100644
--- a/tex/generic/context/luatex-fonts-tfm.lua
+++ b/tex/generic/context/luatex/luatex-fonts-tfm.lua
diff --git a/tex/generic/context/luatex-fonts.lua b/tex/generic/context/luatex/luatex-fonts.lua
index 1d844911d..1d844911d 100644
--- a/tex/generic/context/luatex-fonts.lua
+++ b/tex/generic/context/luatex/luatex-fonts.lua
diff --git a/tex/generic/context/luatex-fonts.tex b/tex/generic/context/luatex/luatex-fonts.tex
index a7c8bc2b8..a7c8bc2b8 100644
--- a/tex/generic/context/luatex-fonts.tex
+++ b/tex/generic/context/luatex/luatex-fonts.tex
diff --git a/tex/generic/context/luatex-mplib.lua b/tex/generic/context/luatex/luatex-mplib.lua
index c6628acb3..c6628acb3 100644
--- a/tex/generic/context/luatex-mplib.lua
+++ b/tex/generic/context/luatex/luatex-mplib.lua
diff --git a/tex/generic/context/luatex-mplib.tex b/tex/generic/context/luatex/luatex-mplib.tex
index ef6dfff95..ef6dfff95 100644
--- a/tex/generic/context/luatex-mplib.tex
+++ b/tex/generic/context/luatex/luatex-mplib.tex
diff --git a/tex/generic/context/luatex-plain.tex b/tex/generic/context/luatex/luatex-plain.tex
index e47ad58ad..e47ad58ad 100644
--- a/tex/generic/context/luatex-plain.tex
+++ b/tex/generic/context/luatex/luatex-plain.tex
diff --git a/tex/generic/context/luatex-preprocessor-test.tex b/tex/generic/context/luatex/luatex-preprocessor-test.tex
index 857b28f83..857b28f83 100644
--- a/tex/generic/context/luatex-preprocessor-test.tex
+++ b/tex/generic/context/luatex/luatex-preprocessor-test.tex
diff --git a/tex/generic/context/luatex-preprocessor.lua b/tex/generic/context/luatex/luatex-preprocessor.lua
index 8faa0b47e..8faa0b47e 100644
--- a/tex/generic/context/luatex-preprocessor.lua
+++ b/tex/generic/context/luatex/luatex-preprocessor.lua
diff --git a/tex/generic/context/luatex-preprocessor.tex b/tex/generic/context/luatex/luatex-preprocessor.tex
index 03b483f41..03b483f41 100644
--- a/tex/generic/context/luatex-preprocessor.tex
+++ b/tex/generic/context/luatex/luatex-preprocessor.tex
diff --git a/tex/generic/context/luatex-test.tex b/tex/generic/context/luatex/luatex-test.tex
index 830d30a91..830d30a91 100644
--- a/tex/generic/context/luatex-test.tex
+++ b/tex/generic/context/luatex/luatex-test.tex
diff --git a/tex/generic/context/m-metapo.tex b/tex/generic/context/m-metapo.tex
deleted file mode 100644
index f02830a13..000000000
--- a/tex/generic/context/m-metapo.tex
+++ /dev/null
@@ -1,89 +0,0 @@
-%D \module
-%D   [       file=m-metapo,
-%D        version=1999.03.26,
-%D          title=\LATEX\ Modules,
-%D       subtitle=\METAPOST\ Inclusion,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ distribution and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D We quit when \CONTEXT\ is found and use some deep down
-%D macro to trigger this:
-
-\ifx\undefined\dodoplaceexternalfigure \else \expandafter \endinput \fi
-
-%D \macros
-%D   {includeMPgraphics}
-%D
-%D This rather small \LATEX\ module is dedicated to David
-%D Arnold. It takes care of including the fonts used in
-%D \METAPOST\ graphics in the file. This hack is needed when
-%D one uses another \DVI\ driver than \DVIPS. This module
-%D falls back on the generic \CONTEXT\ support module:
-
-\ifx\undefined\includeMPfonts \input supp-mps.tex \relax \fi
-
-%D Instead of using \type {\includegraphics}, one should use its
-%D little brother \type {\includeMPgraphics}. This macro takes
-%D the same arguments.
-
-\def\includeMPgraphics#1#%
-  {\leavevmode\vbox\bgroup\hbox\bgroup
-     \def\includeMPgraphics##1%
-       {\includeMPfonts{##1}%
-        \includegraphics#1{##1}%
-        \egroup\egroup}%
-     \includeMPgraphics}
-
-%D An example of using this module is given below:
-%D
-%D \starttyping
-%D \documentclass[10pt]{article}
-%D
-%D \usepackage{graphicx}
-%D \usepackage{m-metapo}
-%D
-%D \begin{document}
-%D   \includeMPgraphics{somefile.1}
-%D   \includeMPgraphics[angle=90]{somefile.2}
-%D \end{document}
-%D \stoptyping
-%D
-%D This module needs \type {supp-mps} and \type {supp-mis},
-%D that both are present in the \CONTEXT\ path.
-%D
-%D Please do not forget to say \type {prologues:=1} at the
-%D top of the metapost file!
-%D
-%D For non \LATEX\ (and \CONTEXT) users we provide an
-%D alternative inclusion macro. This one has no optional
-%D arguments.
-
-\ifx\includegraphics\undefined
-
-  \ifx\undefined\dogetEPSboundingbox \input supp-eps.tex \relax \fi
-
-  \def\includeMPgraphics#1%
-    {\hbox\bgroup
-     \includeMPfonts{#1}%
-     \dogetEPSboundingbox{#1}{\dimen2}{\dimen4}{\dimen6}{\dimen8}%
-     \vbox to \dimen8
-       {\forgetall
-        \hsize\dimen6
-        \vfill
-        \hbox to \hsize
-          {\special
-             {PSfile="#1"\space
-              llx=\EPSllx\space
-              lly=\EPSlly\space
-              urx=\EPSurx\space
-              ury=\EPSury\space}}}%
-     \egroup}
-
-\fi
-
-\endinput
diff --git a/tex/generic/context/mptopdf.tex b/tex/generic/context/mptopdf/mptopdf.tex
index 3efe57392..3efe57392 100644
--- a/tex/generic/context/mptopdf.tex
+++ b/tex/generic/context/mptopdf/mptopdf.tex
diff --git a/tex/generic/context/m-ch-de.tex b/tex/generic/context/ppchtex/m-ch-de.tex
index 467cdc670..467cdc670 100644
--- a/tex/generic/context/m-ch-de.tex
+++ b/tex/generic/context/ppchtex/m-ch-de.tex
diff --git a/tex/generic/context/m-ch-en.tex b/tex/generic/context/ppchtex/m-ch-en.tex
index 6bd435319..6bd435319 100644
--- a/tex/generic/context/m-ch-en.tex
+++ b/tex/generic/context/ppchtex/m-ch-en.tex
diff --git a/tex/generic/context/m-ch-nl.tex b/tex/generic/context/ppchtex/m-ch-nl.tex
index c9d77733a..c9d77733a 100644
--- a/tex/generic/context/m-ch-nl.tex
+++ b/tex/generic/context/ppchtex/m-ch-nl.tex
diff --git a/tex/generic/context/ppchtex.noc b/tex/generic/context/ppchtex/ppchtex.noc
index 99d073255..99d073255 100644
--- a/tex/generic/context/ppchtex.noc
+++ b/tex/generic/context/ppchtex/ppchtex.noc