beta 2011.10.19 00:02

43 files changed, 114 insertions, 111 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 454326b97..0746a3aad 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2011.10.18 22:09}
+\newcontextversion{2011.10.19 00:02}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 1747b8c53..07d18e487 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2011.10.18 22:09}
+\newcontextversion{2011.10.19 00:02}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 42e949c07..3a88873dd 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 542cb6e37..6ebef33b3 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index a5cb432a0..b4a822878 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.10.18 22:09}
+\edef\contextversion{2011.10.19 00:02}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index c98936a32..4bf35d766 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.10.18 22:09}
+\edef\contextversion{2011.10.19 00:02}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/font-otf.lua b/tex/context/base/font-otf.lua
index 6a75a0c5c..cab6fae2b 100644
--- a/tex/context/base/font-otf.lua
+++ b/tex/context/base/font-otf.lua
@@ -1838,6 +1838,11 @@ local function copytotfm(data,cache_id)
         local fullname = metadata.fullname or fontname
         local units    = metadata.units_per_em or 1000
         --
+        if units == 0 then -- catch bugs in fonts
+            units = 1000
+            metadata.units_per_em = 1000
+        end
+        --
         parameters.slant         = 0
         parameters.space         = spaceunits          -- 3.333 (cmr10)
         parameters.space_stretch = units/2   --  500   -- 1.666 (cmr10)
diff --git a/tex/context/base/luat-ini.mkiv b/tex/context/base/luat-ini.mkiv
index dfee302ca..1be2720b6 100644
--- a/tex/context/base/luat-ini.mkiv
+++ b/tex/context/base/luat-ini.mkiv
@@ -145,7 +145,7 @@
 %D \stopusercode
 %D \stopbuffer
 %D
-%D \typebuffer \getbuffer
+%D \typebuffer
 
 %D We need a way to pass strings safely to \LUA\ without the
 %D need for tricky escaping. Compare:
diff --git a/tex/context/base/m-chart.lua b/tex/context/base/m-chart.lua
index 772ae47f2..9ae7feabf 100644
--- a/tex/context/base/m-chart.lua
+++ b/tex/context/base/m-chart.lua
@@ -14,9 +14,11 @@ if not modules then modules = { } end modules ['x-flow'] = {
 moduledata.charts = moduledata.charts or { }
 
 local gsub, match, find, format, lower = string.gsub, string.match, string.find, string.format, string.lower
-local lpegmatch = lpeg.match
 local setmetatableindex = table.setmetatableindex
 
+local P, S, C, Cc = lpeg.P, lpeg.S, lpeg.C, lpeg.Cc
+local lpegmatch = lpeg.match
+
 local points    = number.points
 
 local variables  = interfaces.variables
@@ -357,7 +359,6 @@ local function expanded(chart,chartsettings)
     return expandedchart
 end
 
-
 local splitter = lpeg.splitat(",")
 
 function commands.flow_set_location(x,y)
@@ -455,6 +456,7 @@ local function process_cells(chart,xoffset,yoffset)
     if not data then
         return
     end
+    local focus = utilities.parsers.settings_to_hash(chart.settings.chart.focus or "")
     for i=1,#data do
         local cell = visible(chart,data[i])
         if cell then
@@ -472,7 +474,7 @@ local function process_cells(chart,xoffset,yoffset)
                     context("flow_shape_line_color := \\MPcolor{%s} ;", linesettings.color)
                     context("flow_shape_fill_color := \\MPcolor{%s} ;", linesettings.backgroundcolor)
                     context("flow_shape_line_width := %s ; ",           points(linesettingsrulethickness))
-                elseif hasfocus then -- doifcommonelse{FLOWcell,FLOWfocus}@@FLOWfocus
+                elseif focus[cell.focus] or focus[cell.name] then
                     local focussettings = settings.focus
                     context("flow_shape_line_color := \\MPcolor{%s} ;", focussettings.framecolor)
                     context("flow_shape_fill_color := \\MPcolor{%s} ;", focussettings.backgroundcolor)
@@ -493,6 +495,37 @@ end
 
 -- todo : make lpeg for splitter
 
+local sign  = S("+p") /  "1"
+            + S("-m") / "-1"
+
+local full  = C(P("left"))
+            + C(P("right"))
+            + C(P("top"))
+            + C(P("bottom"))
+
+local char  = P("l") / "left"
+            + P("r") / "right"
+            + P("t") / "top"
+            + P("b") / "bottom"
+
+local space = P(" ")^0
+
+local what  = space
+            * (sign + Cc("0"))
+            * space
+            * (full + char)
+            * space
+            * (sign + Cc("0"))
+            * space
+            * (full + char)
+            * space
+            * P(-1)
+
+-- print(lpegmatch(what,"lr"))
+-- print(lpegmatch(what,"+l+r"))
+-- print(lpegmatch(what,"+l"))
+-- print(lpegmatch(what,"+ left+r     "))
+
 local function process_connections(chart,xoffset,yoffset)
     local data = chart.data
     local hash = chart.hash
@@ -513,21 +546,24 @@ local function process_connections(chart,xoffset,yoffset)
                     local otherx, othery, location = othercell.x, othercell.y, connection.location
                     if otherx > 0 and othery > 0 and cellx > 0 and celly > 0 and connection.location then
                         -- move to setter
-                        local what_cell, where_cell, what_other, where_other = match(location,"([%+%-pm]-)([lrtb]),?([%+%-pm]-)([lrtb])")
-                        local what_cell   = what [what_cell]   or 0
-                        local what_other  = what [what_other]  or 0
-                        local where_cell  = where[where_cell]  or "left"
-                        local where_other = where[where_other] or "right"
-                        local linesettings = settings.line
-                        context("flow_smooth := %s ;", linesettings.corner == v_round and "true" or "false")
-                        context("flow_dashline := %s ;", linesettings.dash == v_yes and "true" or "false")
-                        context("flow_arrowtip := %s ;", linesettings.arrow == v_yes and "true" or "false")
-                        context("flow_touchshape := %s ;", linesettings.offset == v_none and "true" or "false")
-                        context("flow_dsp_x := %s ; flow_dsp_y := %s ;",connection.dx or 0, connection.dy or 0)
-                        context("flow_connection_line_color := \\MPcolor{%s} ;",linesettings.color)
-                        context("flow_connection_line_width := 2pt ;",points(linesettings.rulethickness))
-                        context("flow_connect_%s_%s(%s,%s,%s) (%s,%s,%s) ;",where_cell,where_other,cellx,celly,what_cell,otherx,othery,what_other)
-                        context("flow_dsp_x := 0 ; flow_dsp_y := 0 ;")
+                     -- local what_cell, where_cell, what_other, where_other = match(location,"([%+%-pm]-)([lrtb]),?([%+%-pm]-)([lrtb])")
+                     -- local what_cell   = what [what_cell]   or 0
+                     -- local what_other  = what [what_other]  or 0
+                     -- local where_cell  = where[where_cell]  or "left"
+                     -- local where_other = where[where_other] or "right"
+                        local what_cell, where_cell, what_other, where_other = lpegmatch(what,location)
+                        if what_cell and where_cell and what_other and where_other then
+                            local linesettings = settings.line
+                            context("flow_smooth := %s ;", linesettings.corner == v_round and "true" or "false")
+                            context("flow_dashline := %s ;", linesettings.dash == v_yes and "true" or "false")
+                            context("flow_arrowtip := %s ;", linesettings.arrow == v_yes and "true" or "false")
+                            context("flow_touchshape := %s ;", linesettings.offset == v_none and "true" or "false")
+                            context("flow_dsp_x := %s ; flow_dsp_y := %s ;",connection.dx or 0, connection.dy or 0)
+                            context("flow_connection_line_color := \\MPcolor{%s} ;",linesettings.color)
+                            context("flow_connection_line_width := 2pt ;",points(linesettings.rulethickness))
+                            context("flow_connect_%s_%s(%s,%s,%s) (%s,%s,%s) ;",where_cell,where_other,cellx,celly,what_cell,otherx,othery,what_other)
+                            context("flow_dsp_x := 0 ; flow_dsp_y := 0 ;")
+                        end
                     end
                 end
             end
diff --git a/tex/context/base/m-chart.mkvi b/tex/context/base/m-chart.mkvi
index 2d9ad33ae..89d17463b 100644
--- a/tex/context/base/m-chart.mkvi
+++ b/tex/context/base/m-chart.mkvi
@@ -198,6 +198,7 @@
             dot             = "\FLOWchartparameter\c!dot", % private option
             hcompact        = "\FLOWchartparameter\c!hcompact", % undocumented option
             vcompact        = "\FLOWchartparameter\c!vcompact", % undocumented option
+            focus           = "\FLOWchartparameter\c!focus",
         },
         shape = {
             rulethickness   = \number\dimexpr\FLOWshapeparameter\c!rulethickness,
diff --git a/tex/context/base/mult-de.mkii b/tex/context/base/mult-de.mkii
index 589ed7bac..3e0f74a0c 100644
--- a/tex/context/base/mult-de.mkii
+++ b/tex/context/base/mult-de.mkii
@@ -1361,7 +1361,6 @@
 \setinterfacecommand{pagenumber}{seitenummer}
 \setinterfacecommand{pageoffset}{pageoffset}
 \setinterfacecommand{pagereference}{seitenreferenz}
-\setinterfacecommand{pagetype}{seitentyp}
 \setinterfacecommand{paperheight}{papierhoehe}
 \setinterfacecommand{paperwidth}{papierbreite}
 \setinterfacecommand{periods}{punkt}
diff --git a/tex/context/base/mult-def.lua b/tex/context/base/mult-def.lua
index da43faec5..08bf7401b 100644
--- a/tex/context/base/mult-def.lua
+++ b/tex/context/base/mult-def.lua
@@ -2880,16 +2880,6 @@ return {
    ["pe"]="مرجع‌صفحه",
    ["ro"]="referintapagina",
   },
-  ["pagetype"]={
-   ["cs"]="typstrany",
-   ["de"]="seitentyp",
-   ["en"]="pagetype",
-   ["fr"]="tapepage",
-   ["it"]="tipopagina",
-   ["nl"]="soortpagina",
-   ["pe"]="نوع‌صفحه",
-   ["ro"]="tippagina",
-  },
   ["paperheight"]={
    ["cs"]="vyskapapiru",
    ["de"]="papierhoehe",
diff --git a/tex/context/base/mult-en.mkii b/tex/context/base/mult-en.mkii
index 55918c294..b52915129 100644
--- a/tex/context/base/mult-en.mkii
+++ b/tex/context/base/mult-en.mkii
@@ -1361,7 +1361,6 @@
 \setinterfacecommand{pagenumber}{pagenumber}
 \setinterfacecommand{pageoffset}{pageoffset}
 \setinterfacecommand{pagereference}{pagereference}
-\setinterfacecommand{pagetype}{pagetype}
 \setinterfacecommand{paperheight}{paperheight}
 \setinterfacecommand{paperwidth}{paperwidth}
 \setinterfacecommand{periods}{periods}
diff --git a/tex/context/base/mult-fr.mkii b/tex/context/base/mult-fr.mkii
index 8c01e1810..5bd491d12 100644
--- a/tex/context/base/mult-fr.mkii
+++ b/tex/context/base/mult-fr.mkii
@@ -1361,7 +1361,6 @@
 \setinterfacecommand{pagenumber}{numeropage}
 \setinterfacecommand{pageoffset}{pageoffset}
 \setinterfacecommand{pagereference}{referencepage}
-\setinterfacecommand{pagetype}{tapepage}
 \setinterfacecommand{paperheight}{hauteurpapier}
 \setinterfacecommand{paperwidth}{largeurpapier}
 \setinterfacecommand{periods}{periodes}
diff --git a/tex/context/base/mult-it.mkii b/tex/context/base/mult-it.mkii
index 3600da43d..0530fe5e0 100644
--- a/tex/context/base/mult-it.mkii
+++ b/tex/context/base/mult-it.mkii
@@ -1361,7 +1361,6 @@
 \setinterfacecommand{pagenumber}{numeropagina}
 \setinterfacecommand{pageoffset}{pageoffset}
 \setinterfacecommand{pagereference}{riferimentopagina}
-\setinterfacecommand{pagetype}{tipopagina}
 \setinterfacecommand{paperheight}{altezzacarta}
 \setinterfacecommand{paperwidth}{ampiezzacarta}
 \setinterfacecommand{periods}{punti}
diff --git a/tex/context/base/mult-nl.mkii b/tex/context/base/mult-nl.mkii
index 56ce14940..13139b18c 100644
--- a/tex/context/base/mult-nl.mkii
+++ b/tex/context/base/mult-nl.mkii
@@ -1361,7 +1361,6 @@
 \setinterfacecommand{pagenumber}{paginanummer}
 \setinterfacecommand{pageoffset}{paginaoffset}
 \setinterfacecommand{pagereference}{paginareferentie}
-\setinterfacecommand{pagetype}{soortpagina}
 \setinterfacecommand{paperheight}{papierhoogte}
 \setinterfacecommand{paperwidth}{papierbreedte}
 \setinterfacecommand{periods}{punten}
diff --git a/tex/context/base/mult-pe.mkii b/tex/context/base/mult-pe.mkii
index e3624cd44..2f5bff053 100644
--- a/tex/context/base/mult-pe.mkii
+++ b/tex/context/base/mult-pe.mkii
@@ -1361,7 +1361,6 @@
 \setinterfacecommand{pagenumber}{شماره‌صفحه}
 \setinterfacecommand{pageoffset}{آفست‌صفحه}
 \setinterfacecommand{pagereference}{مرجع‌صفحه}
-\setinterfacecommand{pagetype}{نوع‌صفحه}
 \setinterfacecommand{paperheight}{ارتفاع‌برگ}
 \setinterfacecommand{paperwidth}{عرض‌برگ}
 \setinterfacecommand{periods}{نقطه‌ها}
diff --git a/tex/context/base/mult-ro.mkii b/tex/context/base/mult-ro.mkii
index f3385fb3f..26dc564a9 100644
--- a/tex/context/base/mult-ro.mkii
+++ b/tex/context/base/mult-ro.mkii
@@ -1361,7 +1361,6 @@
 \setinterfacecommand{pagenumber}{numarpagina}
 \setinterfacecommand{pageoffset}{pageoffset}
 \setinterfacecommand{pagereference}{referintapagina}
-\setinterfacecommand{pagetype}{tippagina}
 \setinterfacecommand{paperheight}{inaltimehartie}
 \setinterfacecommand{paperwidth}{latimehartie}
 \setinterfacecommand{periods}{puncte}
diff --git a/tex/context/base/page-ini.mkiv b/tex/context/base/page-ini.mkiv
index 8abb67000..4b325cc85 100644
--- a/tex/context/base/page-ini.mkiv
+++ b/tex/context/base/page-ini.mkiv
@@ -1266,14 +1266,6 @@
 
 \def\dodefinepagebreak[#1][#2]% non recursive, meant for simple mappings
   {\setvalue{\??pe::#1}{#2}}
-
-% don't change this / test case:
-%
-% \setupbackgrounds[state=repeat]
-% \setupbackgrounds[text][text][background=whatever]
-% \couplepage[chapter][before={\defineoverlay[whatever][ON]}]
-% \setuphead[chapter][before={\pagetype[chapter]}]
-% \chapter{First} \page test \chapter{second} \page test
 
 \long\def\installcolumnbreakhandler#1#2#3% #1=otr-id #2=tag
   {\long\setvalue{\??cn:#1:#2}{#3}}
@@ -1375,24 +1367,6 @@
   {\doifsomething\currentpageselection
      {\processcommacommand[\currentpageselection]\dodoaftershipout}}
 
-% Dit wordt eigenlijk nooit en moet worden vervangen door
-% het meer algemene mechanisme.
-
-\def\dopagetype[#1]%
-  {\edef\desoortpagina{#1}%
-   \ifx\desoortpagina\empty \else
-     \@EA\doglobal\@EA\addtocommalist\@EA{\desoortpagina}\currentpageselection
-     \ifselectingpages
-       \fullexpandtwoargsafter\doifcommon\desoortpagina\pageselection
-         {\global\pageselectedtrue}%
-     \fi
-     \gdef\beforeshipout{\dobeforeshipout}%
-     \gdef\aftershipout {\doaftershipout}%
-   \fi}
-
-\def\pagetype
-  {\dosingleargument\dopagetype}
-
 \def\docouplepage[#1][#2]%
   {\getparameters
      [\??pg]
diff --git a/tex/context/base/page-mak.mkiv b/tex/context/base/page-mak.mkiv
index 631934c2f..f27a979e8 100644
--- a/tex/context/base/page-mak.mkiv
+++ b/tex/context/base/page-mak.mkiv
@@ -117,7 +117,6 @@
 \def\dodostartmakeup
   {\doifvaluesomething{\??do\currentmakeup\c!page}
      {\page[\makeupparameter\c!page]}%
-   \pagetype[\currentmakeup]%
    \setsystemmode\v!makeup
    \setupmakeuplayout
    \makeupparameter\c!commands % hm, what is this one doing here ?
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index eaaa02a99..f56801740 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 1af9db895..66ae19cd8 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-lst.lua b/tex/context/base/strc-lst.lua
index 41f1718a9..d96a4a9ea 100644
--- a/tex/context/base/strc-lst.lua
+++ b/tex/context/base/strc-lst.lua
@@ -11,6 +11,8 @@ if not modules then modules = { } end modules ['strc-lst'] = {
 -- section, metadata cache (internal then has to move up one level) or a
 -- shared cache [we can use a fast and stupid serializer]
 
+-- todo: tag entry in list is crap
+
 local format, gmatch, gsub = string.format, string.gmatch, string.gsub
 local tonumber = tonumber
 local texcount = tex.count
@@ -122,12 +124,12 @@ function lists.push(t)
         pushed[i] = p
         r.listindex = p
     end
-
+    --
     local setcomponent = references.setcomponent
     if setcomponent then
         setcomponent(t) -- might move to the tex end
     end
-
+    --
     context(p)
 end
 
diff --git a/tex/context/base/strc-ren.mkiv b/tex/context/base/strc-ren.mkiv
index 11a2ee2b3..b212f5b39 100644
--- a/tex/context/base/strc-ren.mkiv
+++ b/tex/context/base/strc-ren.mkiv
@@ -112,6 +112,7 @@
 
 \def\headreferenceattributes
   {\iflocation
+   % \ctxlua{structures.lists.taglocation(\nextinternalreference)}% maybe ... tags entry as used
      attr \destinationattribute \currentstructureattribute
      attr \referenceattribute   \currentstructurereferenceattribute
    % attr \internalattribute    \nextinternalreference
diff --git a/tex/context/base/strc-sec.mkiv b/tex/context/base/strc-sec.mkiv
index 06df1ae57..1747031fc 100644
--- a/tex/context/base/strc-sec.mkiv
+++ b/tex/context/base/strc-sec.mkiv
@@ -352,8 +352,7 @@
      {\setfalse\headshownumber}}
 
 \unexpanded\def\theheadsynchonization
-  {\pagetype[\currentheadcoupling]% hm also number
-   \currentstructuresynchronize}
+  {\currentstructuresynchronize}
 
 % BEWARE: \marking[section]{my text} does not work as we use list indices instead
 % so we need a 'keep track of raw set option' (or maybe a funny internal prefix)
@@ -569,18 +568,20 @@
    \getheadsyncs}
 
 \unexpanded\def\placecurrentheadhidden
-  {\setxvalue{\currenthead:sync}%
-     {\noexpand\setgvalue{\currenthead:sync}{}%
-      \noexpand\pagetype[\currentheadcoupling]% hm also number
+  {\setxvalue{\currenthead:hidden:attr}%
+     {\headreferenceattributes}% can be used when making a box
+   \setxvalue{\currenthead:hidden:sync}%
+     {\noexpand\letgvalue{\currenthead:hidden:sync}\relax
       \noexpand\setmarking[\currentheadcoupling]{\currentstructurelistnumber}%
-      \currentstructuresynchronize}}
+      \hbox\headreferenceattributes{}% otherwise no destination ... maybe tag ref as hidden and fall back on page reference
+      \currentstructuresynchronize}} % and it's a node anyway
 
-\def\synchronizehead#1%
-  {\csname#1:sync\endcsname}
+\def\synchronizehead           #1{\csname#1:hidden:sync\endcsname}
+\def\theheadreferenceattributes#1{\csname#1:hidden:attr\endcsname}
 
-\unexpanded\def\placerawheaddata  [#1]{\synchronizehead {#1}}
+\unexpanded\def\placerawheaddata  [#1]{\synchronizehead{#1}}
 \unexpanded\def\placerawheadtext  [#1]{\getspecificstructuretitle{\thenamedheadlevel{#1}}}
-\unexpanded\def\placerawheadnumber[#1]{\getfullstructurenumber   {\thenamedheadlevel{#1}}}
+\unexpanded\def\placerawheadnumber[#1]{\getfullstructurenumber{\thenamedheadlevel{#1}}}
 
 % \setuphead[chapter][placehead=hidden]
 % \chapter {test}
diff --git a/tex/context/interface/cont-cs.xml b/tex/context/interface/cont-cs.xml
index 7af35cd94..0128912b6 100644
--- a/tex/context/interface/cont-cs.xml
+++ b/tex/context/interface/cont-cs.xml
@@ -7236,16 +7236,16 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="pagetype" file="page-ini.tex">
+  <!-- cd:command name="pagetype" file="page-ini.tex">
     <cd:sequence>
-      <cd:string value="typstrany"/>
+      <cd:string value="pagetype"/>
     </cd:sequence>
     <cd:arguments>
       <cd:keywords n="1">
         <cd:constant type="cd:name"/>
       </cd:keywords>
     </cd:arguments>
-  </cd:command>
+  </cd:command -->
 
   <cd:command name="processpage" file="page-ini.tex">
     <cd:sequence>
diff --git a/tex/context/interface/cont-de.xml b/tex/context/interface/cont-de.xml
index 7d164e861..00acf3d2a 100644
--- a/tex/context/interface/cont-de.xml
+++ b/tex/context/interface/cont-de.xml
@@ -7236,16 +7236,16 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="pagetype" file="page-ini.tex">
+  <!-- cd:command name="pagetype" file="page-ini.tex">
     <cd:sequence>
-      <cd:string value="seitentyp"/>
+      <cd:string value="pagetype"/>
     </cd:sequence>
     <cd:arguments>
       <cd:keywords n="1">
         <cd:constant type="cd:name"/>
       </cd:keywords>
     </cd:arguments>
-  </cd:command>
+  </cd:command -->
 
   <cd:command name="processpage" file="page-ini.tex">
     <cd:sequence>
diff --git a/tex/context/interface/cont-en.xml b/tex/context/interface/cont-en.xml
index 8cc1bac6c..0d017867c 100644
--- a/tex/context/interface/cont-en.xml
+++ b/tex/context/interface/cont-en.xml
@@ -7236,7 +7236,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="pagetype" file="page-ini.tex">
+  <!-- cd:command name="pagetype" file="page-ini.tex">
     <cd:sequence>
       <cd:string value="pagetype"/>
     </cd:sequence>
@@ -7245,7 +7245,7 @@
         <cd:constant type="cd:name"/>
       </cd:keywords>
     </cd:arguments>
-  </cd:command>
+  </cd:command -->
 
   <cd:command name="processpage" file="page-ini.tex">
     <cd:sequence>
diff --git a/tex/context/interface/cont-fr.xml b/tex/context/interface/cont-fr.xml
index 7b109fd68..195a9a603 100644
--- a/tex/context/interface/cont-fr.xml
+++ b/tex/context/interface/cont-fr.xml
@@ -7236,16 +7236,16 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="pagetype" file="page-ini.tex">
+  <!-- cd:command name="pagetype" file="page-ini.tex">
     <cd:sequence>
-      <cd:string value="tapepage"/>
+      <cd:string value="pagetype"/>
     </cd:sequence>
     <cd:arguments>
       <cd:keywords n="1">
         <cd:constant type="cd:name"/>
       </cd:keywords>
     </cd:arguments>
-  </cd:command>
+  </cd:command -->
 
   <cd:command name="processpage" file="page-ini.tex">
     <cd:sequence>
diff --git a/tex/context/interface/cont-it.xml b/tex/context/interface/cont-it.xml
index e8574d2f6..315cf2023 100644
--- a/tex/context/interface/cont-it.xml
+++ b/tex/context/interface/cont-it.xml
@@ -7236,16 +7236,16 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="pagetype" file="page-ini.tex">
+  <!-- cd:command name="pagetype" file="page-ini.tex">
     <cd:sequence>
-      <cd:string value="tipopagina"/>
+      <cd:string value="pagetype"/>
     </cd:sequence>
     <cd:arguments>
       <cd:keywords n="1">
         <cd:constant type="cd:name"/>
       </cd:keywords>
     </cd:arguments>
-  </cd:command>
+  </cd:command -->
 
   <cd:command name="processpage" file="page-ini.tex">
     <cd:sequence>
diff --git a/tex/context/interface/cont-nl.xml b/tex/context/interface/cont-nl.xml
index cb585d771..6be62c459 100644
--- a/tex/context/interface/cont-nl.xml
+++ b/tex/context/interface/cont-nl.xml
@@ -7236,16 +7236,16 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="pagetype" file="page-ini.tex">
+  <!-- cd:command name="pagetype" file="page-ini.tex">
     <cd:sequence>
-      <cd:string value="soortpagina"/>
+      <cd:string value="pagetype"/>
     </cd:sequence>
     <cd:arguments>
       <cd:keywords n="1">
         <cd:constant type="cd:name"/>
       </cd:keywords>
     </cd:arguments>
-  </cd:command>
+  </cd:command -->
 
   <cd:command name="processpage" file="page-ini.tex">
     <cd:sequence>
diff --git a/tex/context/interface/cont-pe.xml b/tex/context/interface/cont-pe.xml
index e271cb846..d138017db 100644
--- a/tex/context/interface/cont-pe.xml
+++ b/tex/context/interface/cont-pe.xml
@@ -7236,16 +7236,16 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="pagetype" file="page-ini.tex">
+  <!-- cd:command name="pagetype" file="page-ini.tex">
     <cd:sequence>
-      <cd:string value="نوع‌صفحه"/>
+      <cd:string value="pagetype"/>
     </cd:sequence>
     <cd:arguments>
       <cd:keywords n="1">
         <cd:constant type="cd:name"/>
       </cd:keywords>
     </cd:arguments>
-  </cd:command>
+  </cd:command -->
 
   <cd:command name="processpage" file="page-ini.tex">
     <cd:sequence>
diff --git a/tex/context/interface/cont-ro.xml b/tex/context/interface/cont-ro.xml
index dc198d252..daaac6183 100644
--- a/tex/context/interface/cont-ro.xml
+++ b/tex/context/interface/cont-ro.xml
@@ -7236,16 +7236,16 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="pagetype" file="page-ini.tex">
+  <!-- cd:command name="pagetype" file="page-ini.tex">
     <cd:sequence>
-      <cd:string value="tippagina"/>
+      <cd:string value="pagetype"/>
     </cd:sequence>
     <cd:arguments>
       <cd:keywords n="1">
         <cd:constant type="cd:name"/>
       </cd:keywords>
     </cd:arguments>
-  </cd:command>
+  </cd:command -->
 
   <cd:command name="processpage" file="page-ini.tex">
     <cd:sequence>
diff --git a/tex/context/interface/keys-cs.xml b/tex/context/interface/keys-cs.xml
index ec4abd887..68074b44e 100644
--- a/tex/context/interface/keys-cs.xml
+++ b/tex/context/interface/keys-cs.xml
@@ -1373,7 +1373,6 @@
 		<cd:command name='pagenumber' value='cislostrany'/>
 		<cd:command name='pageoffset' value='pageoffset'/>
 		<cd:command name='pagereference' value='odkaznastranu'/>
-		<cd:command name='pagetype' value='typstrany'/>
 		<cd:command name='paperheight' value='vyskapapiru'/>
 		<cd:command name='paperwidth' value='sirkapapiru'/>
 		<cd:command name='periods' value='tecky'/>
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
index fff289231..15351d5bb 100644
--- a/tex/context/interface/keys-de.xml
+++ b/tex/context/interface/keys-de.xml
@@ -1373,7 +1373,6 @@
 		<cd:command name='pagenumber' value='seitenummer'/>
 		<cd:command name='pageoffset' value='pageoffset'/>
 		<cd:command name='pagereference' value='seitenreferenz'/>
-		<cd:command name='pagetype' value='seitentyp'/>
 		<cd:command name='paperheight' value='papierhoehe'/>
 		<cd:command name='paperwidth' value='papierbreite'/>
 		<cd:command name='periods' value='punkt'/>
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
index f89b03479..c51105a51 100644
--- a/tex/context/interface/keys-en.xml
+++ b/tex/context/interface/keys-en.xml
@@ -1373,7 +1373,6 @@
 		<cd:command name='pagenumber' value='pagenumber'/>
 		<cd:command name='pageoffset' value='pageoffset'/>
 		<cd:command name='pagereference' value='pagereference'/>
-		<cd:command name='pagetype' value='pagetype'/>
 		<cd:command name='paperheight' value='paperheight'/>
 		<cd:command name='paperwidth' value='paperwidth'/>
 		<cd:command name='periods' value='periods'/>
diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml
index 7720ff77e..ab0aab58f 100644
--- a/tex/context/interface/keys-fr.xml
+++ b/tex/context/interface/keys-fr.xml
@@ -1373,7 +1373,6 @@
 		<cd:command name='pagenumber' value='numeropage'/>
 		<cd:command name='pageoffset' value='pageoffset'/>
 		<cd:command name='pagereference' value='referencepage'/>
-		<cd:command name='pagetype' value='tapepage'/>
 		<cd:command name='paperheight' value='hauteurpapier'/>
 		<cd:command name='paperwidth' value='largeurpapier'/>
 		<cd:command name='periods' value='periodes'/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index eadef06f8..68b94e9fb 100644
--- a/tex/context/interface/keys-it.xml
+++ b/tex/context/interface/keys-it.xml
@@ -1373,7 +1373,6 @@
 		<cd:command name='pagenumber' value='numeropagina'/>
 		<cd:command name='pageoffset' value='pageoffset'/>
 		<cd:command name='pagereference' value='riferimentopagina'/>
-		<cd:command name='pagetype' value='tipopagina'/>
 		<cd:command name='paperheight' value='altezzacarta'/>
 		<cd:command name='paperwidth' value='ampiezzacarta'/>
 		<cd:command name='periods' value='punti'/>
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
index 7f2423256..03ae8dd3e 100644
--- a/tex/context/interface/keys-nl.xml
+++ b/tex/context/interface/keys-nl.xml
@@ -1373,7 +1373,6 @@
 		<cd:command name='pagenumber' value='paginanummer'/>
 		<cd:command name='pageoffset' value='paginaoffset'/>
 		<cd:command name='pagereference' value='paginareferentie'/>
-		<cd:command name='pagetype' value='soortpagina'/>
 		<cd:command name='paperheight' value='papierhoogte'/>
 		<cd:command name='paperwidth' value='papierbreedte'/>
 		<cd:command name='periods' value='punten'/>
diff --git a/tex/context/interface/keys-pe.xml b/tex/context/interface/keys-pe.xml
index 1017bf867..9b99a1edb 100644
--- a/tex/context/interface/keys-pe.xml
+++ b/tex/context/interface/keys-pe.xml
@@ -1373,7 +1373,6 @@
 		<cd:command name='pagenumber' value='شماره‌صفحه'/>
 		<cd:command name='pageoffset' value='آفست‌صفحه'/>
 		<cd:command name='pagereference' value='مرجع‌صفحه'/>
-		<cd:command name='pagetype' value='نوع‌صفحه'/>
 		<cd:command name='paperheight' value='ارتفاع‌برگ'/>
 		<cd:command name='paperwidth' value='عرض‌برگ'/>
 		<cd:command name='periods' value='نقطه‌ها'/>
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
index 82bd2fd6e..ae47b60aa 100644
--- a/tex/context/interface/keys-ro.xml
+++ b/tex/context/interface/keys-ro.xml
@@ -1373,7 +1373,6 @@
 		<cd:command name='pagenumber' value='numarpagina'/>
 		<cd:command name='pageoffset' value='pageoffset'/>
 		<cd:command name='pagereference' value='referintapagina'/>
-		<cd:command name='pagetype' value='tippagina'/>
 		<cd:command name='paperheight' value='inaltimehartie'/>
 		<cd:command name='paperwidth' value='latimehartie'/>
 		<cd:command name='periods' value='puncte'/>
diff --git a/tex/generic/context/luatex/luatex-basics-gen.lua b/tex/generic/context/luatex/luatex-basics-gen.lua
index c0fc396ad..bdbc3cf51 100644
--- a/tex/generic/context/luatex/luatex-basics-gen.lua
+++ b/tex/generic/context/luatex/luatex-basics-gen.lua
@@ -80,6 +80,8 @@ local remapper = {
     dfont = "truetype fonts", -- "truetype dictionary",
     cid   = "cid maps",
     fea   = "font feature files",
+    pfa   = "type1 fonts", -- this is for Khaled, in ConTeXt we don't use this!
+    pfb   = "type1 fonts", -- this is for Khaled, in ConTeXt we don't use this!
 }
 
 function resolvers.findfile(name,fileformat)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index a115ae001..6c947293d 100644
--- a/tex/generic/context/luatex/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  : 10/18/11 22:09:27
+-- merge date  : 10/19/11 00:02:57
 
 do -- begin closure to overcome local limits and interference
 
@@ -2688,6 +2688,8 @@ local remapper = {
     dfont = "truetype fonts", -- "truetype dictionary",
     cid   = "cid maps",
     fea   = "font feature files",
+    pfa   = "type1 fonts", -- this is for Khaled, in ConTeXt we don't use this!
+    pfb   = "type1 fonts", -- this is for Khaled, in ConTeXt we don't use this!
 }
 
 function resolvers.findfile(name,fileformat)
@@ -6937,6 +6939,11 @@ local function copytotfm(data,cache_id)
         local fullname = metadata.fullname or fontname
         local units    = metadata.units_per_em or 1000
         --
+        if units == 0 then -- catch bugs in fonts
+            units = 1000
+            metadata.units_per_em = 1000
+        end
+        --
         parameters.slant         = 0
         parameters.space         = spaceunits          -- 3.333 (cmr10)
         parameters.space_stretch = units/2   --  500   -- 1.666 (cmr10)