beta 2011.03.29 12:49

34 files changed, 154 insertions, 70 deletions

diff --git a/tex/context/base/bibl-tra.mkiv b/tex/context/base/bibl-tra.mkiv
index 6eea80899..8e2f61641 100644
--- a/tex/context/base/bibl-tra.mkiv
+++ b/tex/context/base/bibl-tra.mkiv
@@ -1471,7 +1471,8 @@
   [\c!monthconversion=,
    \c!alternative=apa,
    \c!method=\v!global,
-   \c!criterium=\v!previous,
+  %\c!criterium=\v!previous,
+   \c!criterium=\v!cite, % mojca wants this so bother her, not me
    \c!refcommand=num,
    \c!numbercommand=\bibleftnumber]
 
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 5937cabe3..10ba078b6 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.03.28 18:59}
+\newcontextversion{2011.03.29 12:49}
 
 %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 24d53b738..eb932d1e8 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.03.28 18:59}
+\newcontextversion{2011.03.29 12:49}
 
 %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.mkii b/tex/context/base/context.mkii
index 09516c038..c6952b7bb 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.03.28 18:59}
+\edef\contextversion{2011.03.29 12:49}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 46b6c21d0..d6b9fafee 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.03.28 18:59}
+\edef\contextversion{2011.03.29 12:49}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/font-ctx.lua b/tex/context/base/font-ctx.lua
index e68874a4a..fe32a2420 100644
--- a/tex/context/base/font-ctx.lua
+++ b/tex/context/base/font-ctx.lua
@@ -99,11 +99,13 @@ setmetatablekey(fontdata, "__index", function(t,k)
 end)
 
 local chardata      = allocate() -- chardata
+local parameters    = allocate()
 local csnames       = allocate() -- namedata
 local quaddata      = allocate() -- quaddata
 local xheightdata   = allocate() -- xheightdata
 
 hashes.characters   = chardata
+hashes.parameters   = parameters
 hashes.quads        = quaddata
 hashes.xheights     = xheightdata
 
@@ -113,15 +115,21 @@ setmetatablekey(chardata, "__index", function(t,k)
     return characters
 end)
 
-setmetatablekey(quaddata, "__index", function(t,k)
+setmetatablekey(parameters, "__index", function(t,k)
     local parameters = fontdata[k].parameters
+    t[k] = parameters
+    return parameters
+end)
+
+setmetatablekey(quaddata, "__index", function(t,k)
+    local parameters = parameters[k]
     local quad = parameters and parameters.quad or 0
     t[k] = quad
     return quad
 end)
 
 setmetatablekey(xheightdata, "__index", function(t,k)
-    local parameters = fontdata[k].parameters
+    local parameters = parameters[k]
     local xheight = parameters and parameters.xheight or 0
     t[k] = xheight
     return quad
diff --git a/tex/context/base/lpdf-nod.lua b/tex/context/base/lpdf-nod.lua
index e2da39889..39bba2d63 100644
--- a/tex/context/base/lpdf-nod.lua
+++ b/tex/context/base/lpdf-nod.lua
@@ -35,6 +35,13 @@ function nodepool.pdfliteral(str)
     return t
 end
 
+function nodepool.pdfdirect(str)
+    local t = copy_node(pdfliteral)
+    t.data = str
+    t.mode = 1
+    return t
+end
+
 function nodepool.pdfannotation(w,h,d,data,n)
     local t = copy_node(pdfannot)
     if w and w ~= 0 then t.width  = w end
diff --git a/tex/context/base/mult-de.mkii b/tex/context/base/mult-de.mkii
index 1ac862210..6d6b04dca 100644
--- a/tex/context/base/mult-de.mkii
+++ b/tex/context/base/mult-de.mkii
@@ -643,6 +643,7 @@
 \setinterfaceconstant{editoretallimit}{editoretallimit}
 \setinterfaceconstant{editoretaltext}{editoretaltext}
 \setinterfaceconstant{empty}{leer}
+\setinterfaceconstant{entries}{entries}
 \setinterfaceconstant{equalheight}{equalheight}
 \setinterfaceconstant{equalwidth}{equalwidth}
 \setinterfaceconstant{escape}{escape}
@@ -720,6 +721,7 @@
 \setinterfaceconstant{juniorsep}{juniorsep}
 \setinterfaceconstant{ken}{ken}
 \setinterfaceconstant{keyexpansion}{keyexpansion}
+\setinterfaceconstant{keys}{keys}
 \setinterfaceconstant{keyword}{keyword}
 \setinterfaceconstant{label}{label}
 \setinterfaceconstant{lastnamesep}{lastnamesep}
diff --git a/tex/context/base/mult-def.lua b/tex/context/base/mult-def.lua
index ad8618c09..c43af377e 100644
--- a/tex/context/base/mult-def.lua
+++ b/tex/context/base/mult-def.lua
@@ -6471,6 +6471,14 @@ return {
   },
  },
  ["constants"]={
+  ["keys"]={
+   ["en"]="keys",
+   ["nl"]="sleutels", -- brrr
+  },
+  ["entries"]={
+   ["en"]="entries",
+   ["nl"]="ingangen",
+  },
   ["strip"]={
    ["en"]="strip",
   },
diff --git a/tex/context/base/mult-en.mkii b/tex/context/base/mult-en.mkii
index cbb3bad57..a40f341c6 100644
--- a/tex/context/base/mult-en.mkii
+++ b/tex/context/base/mult-en.mkii
@@ -643,6 +643,7 @@
 \setinterfaceconstant{editoretallimit}{editoretallimit}
 \setinterfaceconstant{editoretaltext}{editoretaltext}
 \setinterfaceconstant{empty}{empty}
+\setinterfaceconstant{entries}{entries}
 \setinterfaceconstant{equalheight}{equalheight}
 \setinterfaceconstant{equalwidth}{equalwidth}
 \setinterfaceconstant{escape}{escape}
@@ -720,6 +721,7 @@
 \setinterfaceconstant{juniorsep}{juniorsep}
 \setinterfaceconstant{ken}{ken}
 \setinterfaceconstant{keyexpansion}{keyexpansion}
+\setinterfaceconstant{keys}{keys}
 \setinterfaceconstant{keyword}{keyword}
 \setinterfaceconstant{label}{label}
 \setinterfaceconstant{lastnamesep}{lastnamesep}
diff --git a/tex/context/base/mult-fr.mkii b/tex/context/base/mult-fr.mkii
index e86f13c8b..da0676ebb 100644
--- a/tex/context/base/mult-fr.mkii
+++ b/tex/context/base/mult-fr.mkii
@@ -643,6 +643,7 @@
 \setinterfaceconstant{editoretallimit}{editoretallimit}
 \setinterfaceconstant{editoretaltext}{editoretaltext}
 \setinterfaceconstant{empty}{vide}
+\setinterfaceconstant{entries}{entries}
 \setinterfaceconstant{equalheight}{equalheight}
 \setinterfaceconstant{equalwidth}{equalwidth}
 \setinterfaceconstant{escape}{escape}
@@ -720,6 +721,7 @@
 \setinterfaceconstant{juniorsep}{juniorsep}
 \setinterfaceconstant{ken}{ken}
 \setinterfaceconstant{keyexpansion}{keyexpansion}
+\setinterfaceconstant{keys}{keys}
 \setinterfaceconstant{keyword}{motcle}
 \setinterfaceconstant{label}{etiquette}
 \setinterfaceconstant{lastnamesep}{lastnamesep}
diff --git a/tex/context/base/mult-it.mkii b/tex/context/base/mult-it.mkii
index f88b5f49b..3823e651c 100644
--- a/tex/context/base/mult-it.mkii
+++ b/tex/context/base/mult-it.mkii
@@ -643,6 +643,7 @@
 \setinterfaceconstant{editoretallimit}{editoretallimit}
 \setinterfaceconstant{editoretaltext}{editoretaltext}
 \setinterfaceconstant{empty}{vuoto}
+\setinterfaceconstant{entries}{entries}
 \setinterfaceconstant{equalheight}{equalheight}
 \setinterfaceconstant{equalwidth}{equalwidth}
 \setinterfaceconstant{escape}{escape}
@@ -720,6 +721,7 @@
 \setinterfaceconstant{juniorsep}{juniorsep}
 \setinterfaceconstant{ken}{ken}
 \setinterfaceconstant{keyexpansion}{keyexpansion}
+\setinterfaceconstant{keys}{keys}
 \setinterfaceconstant{keyword}{parolachiave}
 \setinterfaceconstant{label}{etichetta}
 \setinterfaceconstant{lastnamesep}{lastnamesep}
diff --git a/tex/context/base/mult-nl.mkii b/tex/context/base/mult-nl.mkii
index 68768df57..a5b62ad33 100644
--- a/tex/context/base/mult-nl.mkii
+++ b/tex/context/base/mult-nl.mkii
@@ -643,6 +643,7 @@
 \setinterfaceconstant{editoretallimit}{editoretallimit}
 \setinterfaceconstant{editoretaltext}{editoretaltext}
 \setinterfaceconstant{empty}{leeg}
+\setinterfaceconstant{entries}{ingangen}
 \setinterfaceconstant{equalheight}{equalheight}
 \setinterfaceconstant{equalwidth}{equalwidth}
 \setinterfaceconstant{escape}{escape}
@@ -720,6 +721,7 @@
 \setinterfaceconstant{juniorsep}{juniorsep}
 \setinterfaceconstant{ken}{ken}
 \setinterfaceconstant{keyexpansion}{sleutelexpansie}
+\setinterfaceconstant{keys}{sleutels}
 \setinterfaceconstant{keyword}{trefwoord}
 \setinterfaceconstant{label}{label}
 \setinterfaceconstant{lastnamesep}{lastnamesep}
diff --git a/tex/context/base/mult-pe.mkii b/tex/context/base/mult-pe.mkii
index 66c7529c5..284fa40e8 100644
--- a/tex/context/base/mult-pe.mkii
+++ b/tex/context/base/mult-pe.mkii
@@ -643,6 +643,7 @@
 \setinterfaceconstant{editoretallimit}{editoretallimit}
 \setinterfaceconstant{editoretaltext}{editoretaltext}
 \setinterfaceconstant{empty}{تهی}
+\setinterfaceconstant{entries}{entries}
 \setinterfaceconstant{equalheight}{ارتفاع‌یکسان}
 \setinterfaceconstant{equalwidth}{عرض‌یکسان}
 \setinterfaceconstant{escape}{فرار}
@@ -720,6 +721,7 @@
 \setinterfaceconstant{juniorsep}{juniorsep}
 \setinterfaceconstant{ken}{ken}
 \setinterfaceconstant{keyexpansion}{گسترش‌کلید}
+\setinterfaceconstant{keys}{keys}
 \setinterfaceconstant{keyword}{کلید‌واژه}
 \setinterfaceconstant{label}{برچسب}
 \setinterfaceconstant{lastnamesep}{lastnamesep}
diff --git a/tex/context/base/mult-ro.mkii b/tex/context/base/mult-ro.mkii
index 4455a5100..474cf7c43 100644
--- a/tex/context/base/mult-ro.mkii
+++ b/tex/context/base/mult-ro.mkii
@@ -643,6 +643,7 @@
 \setinterfaceconstant{editoretallimit}{editoretallimit}
 \setinterfaceconstant{editoretaltext}{editoretaltext}
 \setinterfaceconstant{empty}{gol}
+\setinterfaceconstant{entries}{entries}
 \setinterfaceconstant{equalheight}{equalheight}
 \setinterfaceconstant{equalwidth}{equalwidth}
 \setinterfaceconstant{escape}{escape}
@@ -720,6 +721,7 @@
 \setinterfaceconstant{juniorsep}{juniorsep}
 \setinterfaceconstant{ken}{ken}
 \setinterfaceconstant{keyexpansion}{keyexpansion}
+\setinterfaceconstant{keys}{keys}
 \setinterfaceconstant{keyword}{keyword}
 \setinterfaceconstant{label}{eticheta}
 \setinterfaceconstant{lastnamesep}{lastnamesep}
diff --git a/tex/context/base/node-aux.lua b/tex/context/base/node-aux.lua
index e6f698950..65a47939b 100644
--- a/tex/context/base/node-aux.lua
+++ b/tex/context/base/node-aux.lua
@@ -97,9 +97,7 @@ nodes.setattributes        = set_attributes
 nodes.setunsetattributes   = set_unset_attributes
 nodes.unsetattributes      = unset_attributes
 
--- history:
---
--- local function cp_skipable(a,id)  -- skipable nodes at the margins during character protrusion
+-- function nodes.is_skipable(a,id)  -- skipable nodes at the margins during character protrusion
 --     return (
 --             id ~= glyph_node
 --         or  id == ins_node
@@ -114,6 +112,9 @@ nodes.unsetattributes      = unset_attributes
 --         or (id == whatsit_node and a.subtype ~= pdf_refximage_node and a.subtype ~= pdf_refxform_node)
 --     )
 -- end
+
+-- history:
+--
 --
 -- local function glyph_width(a)
 --     local ch = chardata[a.font][a.char]
diff --git a/tex/context/base/node-tra.lua b/tex/context/base/node-tra.lua
index 84d772670..f86ab791a 100644
--- a/tex/context/base/node-tra.lua
+++ b/tex/context/base/node-tra.lua
@@ -638,14 +638,20 @@ end
 
 -- might move elsewhere
 
-local factor   = number.dimenfactors.pt
+local ptfactor = number.dimenfactors.pt
+local bpfactor = number.dimenfactors.bp
 local stripper = lpeg.patterns.stripzeros
 
 local points = function(n)
-    return lpegmatch(stripper,format("%.5fpt",n*factor))
+    return lpegmatch(stripper,format("%.5fpt",n*ptfactor))
 end
 
-number.points = points
+local basepoints = function(n)
+    return lpegmatch(stripper,format("%.5fbp",n*bpfactor))
+end
+
+number.points     = points
+number.basepoints = basepoints
 
 --~ function nodes.thespec(s)
 --~     local stretch_order = s.stretch_order
diff --git a/tex/context/base/page-lay.mkiv b/tex/context/base/page-lay.mkiv
index a8150cc51..55608d590 100644
--- a/tex/context/base/page-lay.mkiv
+++ b/tex/context/base/page-lay.mkiv
@@ -1277,7 +1277,7 @@
                    \c!style=,
                    \c!color=,
                  \c!marking=\v!off,
-                \c!location=\v!middle, % \v!singlesided, but unset is signal
+                \c!location=,% \v!singlesided, but unset is signal (no other default, spoils arrange)
                    \c!scale=1,
                       \c!sx=1,
                       \c!sy=1,
diff --git a/tex/context/base/spac-ver.lua b/tex/context/base/spac-ver.lua
index a734c5f38..5d016eb7b 100644
--- a/tex/context/base/spac-ver.lua
+++ b/tex/context/base/spac-ver.lua
@@ -246,6 +246,25 @@ local function already_done(parentid,list,a_snapmethod) -- todo: done when only
     return false
 end
 
+
+-- quite tricky: ceil(-something) => -0
+
+local function ceiled(n)
+    if n < 0 or n < 0.01 then
+        return 0
+    else
+        return ceil(n)
+    end
+end
+
+local function lower(n)
+    if n < 0 or n < 0.01 then
+        return 0
+    else
+        return floored(n)
+    end
+end
+
 local function snap_hlist(where,current,method,height,depth) -- method.strut is default
     local list = current.list
 --~ print(table.serialize(method))
@@ -384,12 +403,14 @@ h, d = ch, cd
 --~         -- first or last
 --~     else
     if method.minheight then
-        ch = max(floor((h-hr*snapht)/snaphtdp),0)*snaphtdp + plusht
+     -- ch = max(floor((h-hr*snapht)/snaphtdp),0)*snaphtdp + plusht
+        ch = floored((h-hr*snapht)/snaphtdp)*snaphtdp + plusht
         if t then
             t[#t+1] = format("minheight: %s",points(ch))
         end
     elseif method.maxheight then
-        ch = max(ceil((h-hr*snapht)/snaphtdp),0)*snaphtdp + plusht
+     -- ch = max(ceil((h-hr*snapht)/snaphtdp),0)*snaphtdp + plusht
+        ch = ceiled((h-hr*snapht)/snaphtdp)*snaphtdp + plusht
         if t then
             t[#t+1] = format("maxheight: %s",points(ch))
         end
@@ -403,12 +424,14 @@ h, d = ch, cd
 --~         -- first or last
 --~     else
     if method.mindepth then
-        cd = max(floor((d-dr*snapdp)/snaphtdp),0)*snaphtdp + plusdp
+     -- cd = max(floor((d-dr*snapdp)/snaphtdp),0)*snaphtdp + plusdp
+        cd = floored((d-dr*snapdp)/snaphtdp)*snaphtdp + plusdp
         if t then
             t[#t+1] = format("mindepth: %s",points(cd))
         end
     elseif method.maxdepth then
-        cd = max(ceil((d-dr*snapdp)/snaphtdp),0)*snaphtdp + plusdp
+     -- cd = max(ceil((d-dr*snapdp)/snaphtdp),0)*snaphtdp + plusdp
+        cd = ceiled((d-dr*snapdp)/snaphtdp)*snaphtdp + plusdp
         if t then
             t[#t+1] = format("maxdepth: %s",points(cd))
         end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 94a8c97d3..35f708c26 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/strc-mat.mkiv b/tex/context/base/strc-mat.mkiv
index c5f6f632c..8d4089360 100644
--- a/tex/context/base/strc-mat.mkiv
+++ b/tex/context/base/strc-mat.mkiv
@@ -480,6 +480,15 @@
    \forgetdisplayskips
    \getvalue{\e!start\formulaparameter\c!alternative\v!formula}}
 
+% experiment:
+
+\appendtoks
+   \edef\currentformulagrid{\formulaparameter\c!grid}%
+   \ifx\currentformulagrid\empty \else
+        \autosetsnapvalue\currentformulagrid
+   \fi
+\to \everybeforedisplayformula
+
 \def\switchtoformulabodyfont{\switchtobodyfont}
 
 \setvalue{\v!formula}{\dosingleempty\doformula}
diff --git a/tex/context/base/strc-reg.lua b/tex/context/base/strc-reg.lua
index d37997baf..b2deb0605 100644
--- a/tex/context/base/strc-reg.lua
+++ b/tex/context/base/strc-reg.lua
@@ -671,7 +671,13 @@ function registers.flush(data,options,prefixspec,pagespec)
             local entry = data[d]
             if entry.metadata.kind == "see" then
                 local list = entry.list
-                list[#list] = nil
+                if #list > 1 then
+                    list[#list] = nil
+                else
+                    -- we have an \seeindex{Foo}{Bar} without Foo being defined anywhere
+                    report_registers("invalid see entry in register '%s', reference '%s'",
+                        entry.metadata.name or "?",list[1][1] or "?")
+                end
             end
         end
         while d < #data do
diff --git a/tex/context/base/strc-reg.mkiv b/tex/context/base/strc-reg.mkiv
index e7c643f28..19634390d 100644
--- a/tex/context/base/strc-reg.mkiv
+++ b/tex/context/base/strc-reg.mkiv
@@ -17,9 +17,6 @@
 
 \unprotect
 
-\def\c!keys   {keys}
-\def\c!entries{entries}
-
 % todo: tag:: becomes rendering
 % todo: language, character, linked, location
 
diff --git a/tex/context/base/type-dejavu.mkiv b/tex/context/base/type-dejavu.mkiv
deleted file mode 100644
index ac83123db..000000000
--- a/tex/context/base/type-dejavu.mkiv
+++ /dev/null
@@ -1,47 +0,0 @@
-%D \module
-%D   [       file=type-dejavu,
-%D        version=2010.06.21,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Dejavu fonts (dejavu-fonts.org),
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright=PRAGMA ADE, NL]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-\starttypescriptcollection[dejavu]
-
-    \starttypescript [serif] [dejavu] [name]
-        \setups[font:fallback:serif]
-        \definefontsynonym [Serif]           [name:dejavuserif]           [features=default]
-        \definefontsynonym [SerifBold]       [name:dejavuserifbold]       [features=default]
-        \definefontsynonym [SerifItalic]     [name:dejavuserifitalic]     [features=default]
-        \definefontsynonym [SerifBoldItalic] [name:dejavuserifbolditalic] [features=default]
-    \stoptypescript
-
-    \starttypescript [sans] [dejavu] [name]
-        \setups[font:fallback:sans]
-        \definefontsynonym [Sans]           [name:dejavusans]            [features=default]
-        \definefontsynonym [SansBold]       [name:dejavusansbold]        [features=default]
-        \definefontsynonym [SansItalic]     [name:dejavusansoblique]     [features=default]
-        \definefontsynonym [SansBoldItalic] [name:dejavusansboldoblique] [features=default]
-    \stoptypescript
-
-    \starttypescript [mono] [dejavu] [name]
-        \setups[font:fallback:mono]
-        \definefontsynonym [Mono]           [name:dejavusansmono]            [features=none]
-        \definefontsynonym [MonoBold]       [name:dejavusansmonobold]        [features=none]
-        \definefontsynonym [MonoItalic]     [name:dejavusansmonooblique]     [features=none]
-        \definefontsynonym [MonoBoldItalic] [name:dejavusansmonoboldoblique] [features=none]
-    \stoptypescript
-
-    \starttypescript[dejavu]
-        \definetypeface [dejavu] [rm] [serif] [dejavu] [default]
-        \definetypeface [dejavu] [ss] [sans]  [dejavu] [default]
-        \definetypeface [dejavu] [tt] [mono]  [dejavu] [default]
-        \definetypeface [dejavu] [mm] [math]  [xits]   [default] [rscale=auto]
-    \stoptypescript
-
-\stoptypescriptcollection
diff --git a/tex/context/base/type-otf.mkiv b/tex/context/base/type-otf.mkiv
index fcfd134f9..0fcac7dbc 100644
--- a/tex/context/base/type-otf.mkiv
+++ b/tex/context/base/type-otf.mkiv
@@ -633,6 +633,41 @@
 
 \stoptypescriptcollection
 
+\starttypescriptcollection[dejavu]
+
+    \starttypescript [serif] [dejavu] [name]
+        \setups[font:fallback:serif]
+        \definefontsynonym [Serif]           [name:dejavuserif]           [features=default]
+        \definefontsynonym [SerifBold]       [name:dejavuserifbold]       [features=default]
+        \definefontsynonym [SerifItalic]     [name:dejavuserifitalic]     [features=default]
+        \definefontsynonym [SerifBoldItalic] [name:dejavuserifbolditalic] [features=default]
+    \stoptypescript
+
+    \starttypescript [sans] [dejavu] [name]
+        \setups[font:fallback:sans]
+        \definefontsynonym [Sans]           [name:dejavusans]            [features=default]
+        \definefontsynonym [SansBold]       [name:dejavusansbold]        [features=default]
+        \definefontsynonym [SansItalic]     [name:dejavusansoblique]     [features=default]
+        \definefontsynonym [SansBoldItalic] [name:dejavusansboldoblique] [features=default]
+    \stoptypescript
+
+    \starttypescript [mono] [dejavu] [name]
+        \setups[font:fallback:mono]
+        \definefontsynonym [Mono]           [name:dejavusansmono]            [features=none]
+        \definefontsynonym [MonoBold]       [name:dejavusansmonobold]        [features=none]
+        \definefontsynonym [MonoItalic]     [name:dejavusansmonooblique]     [features=none]
+        \definefontsynonym [MonoBoldItalic] [name:dejavusansmonoboldoblique] [features=none]
+    \stoptypescript
+
+    \starttypescript[dejavu]
+        \definetypeface [dejavu] [rm] [serif] [dejavu] [default]
+        \definetypeface [dejavu] [ss] [sans]  [dejavu] [default]
+        \definetypeface [dejavu] [tt] [mono]  [dejavu] [default]
+        \definetypeface [dejavu] [mm] [math]  [xits]   [default] [rscale=auto]
+    \stoptypescript
+
+\stoptypescriptcollection
+
 \starttypescriptcollection[antykwa]
 
     % Antykwa Torunska (GUST)
diff --git a/tex/context/interface/keys-cs.xml b/tex/context/interface/keys-cs.xml
index 16d08fd12..f91cc06f5 100644
--- a/tex/context/interface/keys-cs.xml
+++ b/tex/context/interface/keys-cs.xml
@@ -649,6 +649,7 @@
 		<cd:constant name='editoretallimit' value='editoretallimit'/>
 		<cd:constant name='editoretaltext' value='editoretaltext'/>
 		<cd:constant name='empty' value='prazdne'/>
+		<cd:constant name='entries' value='entries'/>
 		<cd:constant name='equalheight' value='equalheight'/>
 		<cd:constant name='equalwidth' value='equalwidth'/>
 		<cd:constant name='escape' value='escape'/>
@@ -726,6 +727,7 @@
 		<cd:constant name='juniorsep' value='juniorsep'/>
 		<cd:constant name='ken' value='ken'/>
 		<cd:constant name='keyexpansion' value='keyexpansion'/>
+		<cd:constant name='keys' value='keys'/>
 		<cd:constant name='keyword' value='keyword'/>
 		<cd:constant name='label' value='popisek'/>
 		<cd:constant name='lastnamesep' value='lastnamesep'/>
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
index b981d2091..9f01c61b4 100644
--- a/tex/context/interface/keys-de.xml
+++ b/tex/context/interface/keys-de.xml
@@ -649,6 +649,7 @@
 		<cd:constant name='editoretallimit' value='editoretallimit'/>
 		<cd:constant name='editoretaltext' value='editoretaltext'/>
 		<cd:constant name='empty' value='leer'/>
+		<cd:constant name='entries' value='entries'/>
 		<cd:constant name='equalheight' value='equalheight'/>
 		<cd:constant name='equalwidth' value='equalwidth'/>
 		<cd:constant name='escape' value='escape'/>
@@ -726,6 +727,7 @@
 		<cd:constant name='juniorsep' value='juniorsep'/>
 		<cd:constant name='ken' value='ken'/>
 		<cd:constant name='keyexpansion' value='keyexpansion'/>
+		<cd:constant name='keys' value='keys'/>
 		<cd:constant name='keyword' value='keyword'/>
 		<cd:constant name='label' value='label'/>
 		<cd:constant name='lastnamesep' value='lastnamesep'/>
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
index 43f3048f1..b2954aa3a 100644
--- a/tex/context/interface/keys-en.xml
+++ b/tex/context/interface/keys-en.xml
@@ -649,6 +649,7 @@
 		<cd:constant name='editoretallimit' value='editoretallimit'/>
 		<cd:constant name='editoretaltext' value='editoretaltext'/>
 		<cd:constant name='empty' value='empty'/>
+		<cd:constant name='entries' value='entries'/>
 		<cd:constant name='equalheight' value='equalheight'/>
 		<cd:constant name='equalwidth' value='equalwidth'/>
 		<cd:constant name='escape' value='escape'/>
@@ -726,6 +727,7 @@
 		<cd:constant name='juniorsep' value='juniorsep'/>
 		<cd:constant name='ken' value='ken'/>
 		<cd:constant name='keyexpansion' value='keyexpansion'/>
+		<cd:constant name='keys' value='keys'/>
 		<cd:constant name='keyword' value='keyword'/>
 		<cd:constant name='label' value='label'/>
 		<cd:constant name='lastnamesep' value='lastnamesep'/>
diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml
index d41c6e396..0730c972f 100644
--- a/tex/context/interface/keys-fr.xml
+++ b/tex/context/interface/keys-fr.xml
@@ -649,6 +649,7 @@
 		<cd:constant name='editoretallimit' value='editoretallimit'/>
 		<cd:constant name='editoretaltext' value='editoretaltext'/>
 		<cd:constant name='empty' value='vide'/>
+		<cd:constant name='entries' value='entries'/>
 		<cd:constant name='equalheight' value='equalheight'/>
 		<cd:constant name='equalwidth' value='equalwidth'/>
 		<cd:constant name='escape' value='escape'/>
@@ -726,6 +727,7 @@
 		<cd:constant name='juniorsep' value='juniorsep'/>
 		<cd:constant name='ken' value='ken'/>
 		<cd:constant name='keyexpansion' value='keyexpansion'/>
+		<cd:constant name='keys' value='keys'/>
 		<cd:constant name='keyword' value='motcle'/>
 		<cd:constant name='label' value='etiquette'/>
 		<cd:constant name='lastnamesep' value='lastnamesep'/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index cc2039fc8..0a156e842 100644
--- a/tex/context/interface/keys-it.xml
+++ b/tex/context/interface/keys-it.xml
@@ -649,6 +649,7 @@
 		<cd:constant name='editoretallimit' value='editoretallimit'/>
 		<cd:constant name='editoretaltext' value='editoretaltext'/>
 		<cd:constant name='empty' value='vuoto'/>
+		<cd:constant name='entries' value='entries'/>
 		<cd:constant name='equalheight' value='equalheight'/>
 		<cd:constant name='equalwidth' value='equalwidth'/>
 		<cd:constant name='escape' value='escape'/>
@@ -726,6 +727,7 @@
 		<cd:constant name='juniorsep' value='juniorsep'/>
 		<cd:constant name='ken' value='ken'/>
 		<cd:constant name='keyexpansion' value='keyexpansion'/>
+		<cd:constant name='keys' value='keys'/>
 		<cd:constant name='keyword' value='parolachiave'/>
 		<cd:constant name='label' value='etichetta'/>
 		<cd:constant name='lastnamesep' value='lastnamesep'/>
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
index e1f05f8b1..eb156cf5a 100644
--- a/tex/context/interface/keys-nl.xml
+++ b/tex/context/interface/keys-nl.xml
@@ -649,6 +649,7 @@
 		<cd:constant name='editoretallimit' value='editoretallimit'/>
 		<cd:constant name='editoretaltext' value='editoretaltext'/>
 		<cd:constant name='empty' value='leeg'/>
+		<cd:constant name='entries' value='ingangen'/>
 		<cd:constant name='equalheight' value='equalheight'/>
 		<cd:constant name='equalwidth' value='equalwidth'/>
 		<cd:constant name='escape' value='escape'/>
@@ -726,6 +727,7 @@
 		<cd:constant name='juniorsep' value='juniorsep'/>
 		<cd:constant name='ken' value='ken'/>
 		<cd:constant name='keyexpansion' value='sleutelexpansie'/>
+		<cd:constant name='keys' value='sleutels'/>
 		<cd:constant name='keyword' value='trefwoord'/>
 		<cd:constant name='label' value='label'/>
 		<cd:constant name='lastnamesep' value='lastnamesep'/>
diff --git a/tex/context/interface/keys-pe.xml b/tex/context/interface/keys-pe.xml
index 219a53059..2dd57b3d1 100644
--- a/tex/context/interface/keys-pe.xml
+++ b/tex/context/interface/keys-pe.xml
@@ -649,6 +649,7 @@
 		<cd:constant name='editoretallimit' value='editoretallimit'/>
 		<cd:constant name='editoretaltext' value='editoretaltext'/>
 		<cd:constant name='empty' value='تهی'/>
+		<cd:constant name='entries' value='entries'/>
 		<cd:constant name='equalheight' value='ارتفاع‌یکسان'/>
 		<cd:constant name='equalwidth' value='عرض‌یکسان'/>
 		<cd:constant name='escape' value='فرار'/>
@@ -726,6 +727,7 @@
 		<cd:constant name='juniorsep' value='juniorsep'/>
 		<cd:constant name='ken' value='ken'/>
 		<cd:constant name='keyexpansion' value='گسترش‌کلید'/>
+		<cd:constant name='keys' value='keys'/>
 		<cd:constant name='keyword' value='کلید‌واژه'/>
 		<cd:constant name='label' value='برچسب'/>
 		<cd:constant name='lastnamesep' value='lastnamesep'/>
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
index 47c3e6349..c0ebc9c96 100644
--- a/tex/context/interface/keys-ro.xml
+++ b/tex/context/interface/keys-ro.xml
@@ -649,6 +649,7 @@
 		<cd:constant name='editoretallimit' value='editoretallimit'/>
 		<cd:constant name='editoretaltext' value='editoretaltext'/>
 		<cd:constant name='empty' value='gol'/>
+		<cd:constant name='entries' value='entries'/>
 		<cd:constant name='equalheight' value='equalheight'/>
 		<cd:constant name='equalwidth' value='equalwidth'/>
 		<cd:constant name='escape' value='escape'/>
@@ -726,6 +727,7 @@
 		<cd:constant name='juniorsep' value='juniorsep'/>
 		<cd:constant name='ken' value='ken'/>
 		<cd:constant name='keyexpansion' value='keyexpansion'/>
+		<cd:constant name='keys' value='keys'/>
 		<cd:constant name='keyword' value='keyword'/>
 		<cd:constant name='label' value='eticheta'/>
 		<cd:constant name='lastnamesep' value='lastnamesep'/>
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 808ee507d..c401f5937 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 03/28/11 18:59:04
+-- merge date  : 03/29/11 12:49:38
 
 do -- begin closure to overcome local limits and interference