summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/context/documents/general/qrcs/setup-cs.pdfbin831150 -> 831150 bytes
-rw-r--r--doc/context/documents/general/qrcs/setup-de.pdfbin830507 -> 830506 bytes
-rw-r--r--doc/context/documents/general/qrcs/setup-en.pdfbin836040 -> 836040 bytes
-rw-r--r--doc/context/documents/general/qrcs/setup-fr.pdfbin828568 -> 828566 bytes
-rw-r--r--doc/context/documents/general/qrcs/setup-it.pdfbin830446 -> 830444 bytes
-rw-r--r--doc/context/documents/general/qrcs/setup-nl.pdfbin827502 -> 827502 bytes
-rw-r--r--doc/context/documents/general/qrcs/setup-ro.pdfbin827007 -> 827007 bytes
-rw-r--r--tex/context/base/mkii/cont-new.mkii2
-rw-r--r--tex/context/base/mkii/context.mkii2
-rw-r--r--tex/context/base/mkii/mult-cs.mkii1
-rw-r--r--tex/context/base/mkii/mult-de.mkii1
-rw-r--r--tex/context/base/mkii/mult-en.mkii1
-rw-r--r--tex/context/base/mkii/mult-fr.mkii1
-rw-r--r--tex/context/base/mkii/mult-it.mkii1
-rw-r--r--tex/context/base/mkii/mult-nl.mkii1
-rw-r--r--tex/context/base/mkii/mult-pe.mkii1
-rw-r--r--tex/context/base/mkii/mult-ro.mkii1
-rw-r--r--tex/context/base/mkiv/cont-new.mkiv2
-rw-r--r--tex/context/base/mkiv/context.mkiv2
-rw-r--r--tex/context/base/mkiv/math-del.mkiv66
-rw-r--r--tex/context/base/mkiv/mult-def.lua3
-rw-r--r--tex/context/base/mkiv/status-files.pdfbin25648 -> 25665 bytes
-rw-r--r--tex/context/base/mkiv/status-lua.pdfbin368443 -> 368442 bytes
-rw-r--r--tex/context/base/mkiv/strc-con.mkvi5
-rw-r--r--tex/context/interface/mkii/keys-cs.xml1
-rw-r--r--tex/context/interface/mkii/keys-de.xml1
-rw-r--r--tex/context/interface/mkii/keys-en.xml1
-rw-r--r--tex/context/interface/mkii/keys-fr.xml1
-rw-r--r--tex/context/interface/mkii/keys-it.xml1
-rw-r--r--tex/context/interface/mkii/keys-nl.xml1
-rw-r--r--tex/context/interface/mkii/keys-pe.xml1
-rw-r--r--tex/context/interface/mkii/keys-ro.xml1
-rw-r--r--tex/context/interface/mkiv/i-context.pdfbin836040 -> 836040 bytes
-rw-r--r--tex/context/interface/mkiv/i-readme.pdfbin60764 -> 60766 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
35 files changed, 70 insertions, 30 deletions
diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf
index dfdd807a6..c35c5edc4 100644
--- a/doc/context/documents/general/qrcs/setup-cs.pdf
+++ b/doc/context/documents/general/qrcs/setup-cs.pdf
Binary files differ
diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf
index f24d4d90c..37092a33a 100644
--- a/doc/context/documents/general/qrcs/setup-de.pdf
+++ b/doc/context/documents/general/qrcs/setup-de.pdf
Binary files differ
diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf
index 34fc2a0fb..0c266d81b 100644
--- a/doc/context/documents/general/qrcs/setup-en.pdf
+++ b/doc/context/documents/general/qrcs/setup-en.pdf
Binary files differ
diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf
index 5d8c9ba14..ba0216791 100644
--- a/doc/context/documents/general/qrcs/setup-fr.pdf
+++ b/doc/context/documents/general/qrcs/setup-fr.pdf
Binary files differ
diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf
index 88e8e36f8..f2aacc366 100644
--- a/doc/context/documents/general/qrcs/setup-it.pdf
+++ b/doc/context/documents/general/qrcs/setup-it.pdf
Binary files differ
diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf
index eca6d6bc4..d656d661d 100644
--- a/doc/context/documents/general/qrcs/setup-nl.pdf
+++ b/doc/context/documents/general/qrcs/setup-nl.pdf
Binary files differ
diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf
index 59a328dc9..fcf595eb9 100644
--- a/doc/context/documents/general/qrcs/setup-ro.pdf
+++ b/doc/context/documents/general/qrcs/setup-ro.pdf
Binary files differ
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 9b133226d..eb871979a 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2016.11.04 11:06}
+\newcontextversion{2016.11.04 20:50}
%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/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index b93ed8140..f3d3d6bbd 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2016.11.04 11:06}
+\edef\contextversion{2016.11.04 20:50}
%D For those who want to use this:
diff --git a/tex/context/base/mkii/mult-cs.mkii b/tex/context/base/mkii/mult-cs.mkii
index 621d80f52..a32302fe2 100644
--- a/tex/context/base/mkii/mult-cs.mkii
+++ b/tex/context/base/mkii/mult-cs.mkii
@@ -775,6 +775,7 @@
\setinterfaceconstant{etaloption}{etaloption}
\setinterfaceconstant{etaltext}{etaltext}
\setinterfaceconstant{evenmargin}{sudamarginalie}
+\setinterfaceconstant{exact}{exact}
\setinterfaceconstant{exitoffset}{exitoffset}
\setinterfaceconstant{expansion}{expanzen}
\setinterfaceconstant{export}{export}
diff --git a/tex/context/base/mkii/mult-de.mkii b/tex/context/base/mkii/mult-de.mkii
index 9b9f81c6c..d3e4f6865 100644
--- a/tex/context/base/mkii/mult-de.mkii
+++ b/tex/context/base/mkii/mult-de.mkii
@@ -775,6 +775,7 @@
\setinterfaceconstant{etaloption}{etaloption}
\setinterfaceconstant{etaltext}{etaltext}
\setinterfaceconstant{evenmargin}{geraderand}
+\setinterfaceconstant{exact}{exact}
\setinterfaceconstant{exitoffset}{exitoffset}
\setinterfaceconstant{expansion}{expansion}
\setinterfaceconstant{export}{export}
diff --git a/tex/context/base/mkii/mult-en.mkii b/tex/context/base/mkii/mult-en.mkii
index 221cdde4e..07359c8c8 100644
--- a/tex/context/base/mkii/mult-en.mkii
+++ b/tex/context/base/mkii/mult-en.mkii
@@ -775,6 +775,7 @@
\setinterfaceconstant{etaloption}{etaloption}
\setinterfaceconstant{etaltext}{etaltext}
\setinterfaceconstant{evenmargin}{evenmargin}
+\setinterfaceconstant{exact}{exact}
\setinterfaceconstant{exitoffset}{exitoffset}
\setinterfaceconstant{expansion}{expansion}
\setinterfaceconstant{export}{export}
diff --git a/tex/context/base/mkii/mult-fr.mkii b/tex/context/base/mkii/mult-fr.mkii
index 201a521f4..87e6b3a2c 100644
--- a/tex/context/base/mkii/mult-fr.mkii
+++ b/tex/context/base/mkii/mult-fr.mkii
@@ -775,6 +775,7 @@
\setinterfaceconstant{etaloption}{etaloption}
\setinterfaceconstant{etaltext}{etaltext}
\setinterfaceconstant{evenmargin}{margepaire}
+\setinterfaceconstant{exact}{exact}
\setinterfaceconstant{exitoffset}{exitoffset}
\setinterfaceconstant{expansion}{expansion}
\setinterfaceconstant{export}{export}
diff --git a/tex/context/base/mkii/mult-it.mkii b/tex/context/base/mkii/mult-it.mkii
index a6a6731d0..39bd65cf9 100644
--- a/tex/context/base/mkii/mult-it.mkii
+++ b/tex/context/base/mkii/mult-it.mkii
@@ -775,6 +775,7 @@
\setinterfaceconstant{etaloption}{etaloption}
\setinterfaceconstant{etaltext}{etaltext}
\setinterfaceconstant{evenmargin}{marginepari}
+\setinterfaceconstant{exact}{exact}
\setinterfaceconstant{exitoffset}{exitoffset}
\setinterfaceconstant{expansion}{espansione}
\setinterfaceconstant{export}{export}
diff --git a/tex/context/base/mkii/mult-nl.mkii b/tex/context/base/mkii/mult-nl.mkii
index c75d2a5a0..9e2b2cc2a 100644
--- a/tex/context/base/mkii/mult-nl.mkii
+++ b/tex/context/base/mkii/mult-nl.mkii
@@ -775,6 +775,7 @@
\setinterfaceconstant{etaloption}{etaloption}
\setinterfaceconstant{etaltext}{etaltext}
\setinterfaceconstant{evenmargin}{evenmarge}
+\setinterfaceconstant{exact}{exact}
\setinterfaceconstant{exitoffset}{exitoffset}
\setinterfaceconstant{expansion}{expansie}
\setinterfaceconstant{export}{exporteer}
diff --git a/tex/context/base/mkii/mult-pe.mkii b/tex/context/base/mkii/mult-pe.mkii
index b0c10e385..399155996 100644
--- a/tex/context/base/mkii/mult-pe.mkii
+++ b/tex/context/base/mkii/mult-pe.mkii
@@ -775,6 +775,7 @@
\setinterfaceconstant{etaloption}{etaloption}
\setinterfaceconstant{etaltext}{etaltext}
\setinterfaceconstant{evenmargin}{حاشیه‌زوج}
+\setinterfaceconstant{exact}{exact}
\setinterfaceconstant{exitoffset}{exitoffset}
\setinterfaceconstant{expansion}{گسترش}
\setinterfaceconstant{export}{export}
diff --git a/tex/context/base/mkii/mult-ro.mkii b/tex/context/base/mkii/mult-ro.mkii
index 5c8ced81c..886bc6c2b 100644
--- a/tex/context/base/mkii/mult-ro.mkii
+++ b/tex/context/base/mkii/mult-ro.mkii
@@ -775,6 +775,7 @@
\setinterfaceconstant{etaloption}{etaloption}
\setinterfaceconstant{etaltext}{etaltext}
\setinterfaceconstant{evenmargin}{marginepara}
+\setinterfaceconstant{exact}{exact}
\setinterfaceconstant{exitoffset}{exitoffset}
\setinterfaceconstant{expansion}{expansiune}
\setinterfaceconstant{export}{export}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 6815414db..ed4c07e2a 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2016.11.04 11:06}
+\newcontextversion{2016.11.04 20:50}
%D This file is loaded at runtime, thereby providing an excellent place for
%D hacks, patches, extensions and new features.
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index aceb8fe35..8e1364f90 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2016.11.04 11:06}
+\edef\contextversion{2016.11.04 20:50}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/mkiv/math-del.mkiv b/tex/context/base/mkiv/math-del.mkiv
index 41dd40a99..9629d595d 100644
--- a/tex/context/base/mkiv/math-del.mkiv
+++ b/tex/context/base/mkiv/math-del.mkiv
@@ -79,6 +79,8 @@
[\c!symbol=0,
\c!command=\v!yes,
\c!factor=1.5,
+ \c!axis=\v!yes,
+ % \c!exact=\v!yes
\c!height=\exheight,
\c!depth=\exheight]
@@ -93,34 +95,50 @@
{\dodoubleempty\math_fenced_extensible_indeed}
\unexpanded\def\math_fenced_extensible_indeed[#1][#2]%
- {\mathop{%
- \edef\currentmathextensible{#1}%
- \edef\p_factor{\mathextensibleparameter\c!factor}%
- \ifsecondargument
- \doifassignmentelse{#2}
- {\setupcurrentmathextensible[#2]%
- \edef\p_factor{\mathextensibleparameter\c!factor}}%
- {\edef\p_factor{#2}}%
- \else
- \edef\p_factor{\mathextensibleparameter\c!factor}%
- \fi
- \Uvextensible
- axis % can be an option
- height \p_factor\dimexpr\mathextensibleparameter\c!height\relax
- depth \p_factor\dimexpr\mathextensibleparameter\c!depth\relax
- \Udelimiter\zerocount\zerocount\mathextensibleparameter\c!symbol
- \relax}%
- }
+ {\mathop
+ {\edef\currentmathextensible{#1}%
+ \edef\p_factor{\mathextensibleparameter\c!factor}%
+ \ifsecondargument
+ \doifassignmentelse{#2}
+ {\setupcurrentmathextensible[#2]%
+ \edef\p_factor{\mathextensibleparameter\c!factor}}%
+ {\edef\p_factor{#2}}%
+ \else
+ \edef\p_factor{\mathextensibleparameter\c!factor}%
+ \fi
+ \edef\p_exact{\mathextensibleparameter\c!exact}%
+ \edef\p_axis {\mathextensibleparameter\c!axis}%
+ \edef\p_leftoffset{\mathextensibleparameter\c!leftoffset}%
+ \edef\p_rightoffset{\mathextensibleparameter\c!rightoffset}%
+ \ifx\p_leftoffset\empty\else
+ \mskip\p_leftoffset
+ \fi
+ \Uvextensible
+ \ifx\p_exact\v!yes exact \fi
+ \ifx\p_axis \v!yes axis \fi
+ height \p_factor\dimexpr\mathextensibleparameter\c!height\relax
+ depth \p_factor\dimexpr\mathextensibleparameter\c!depth \relax
+ \Udelimiter\zerocount\zerocount\mathextensibleparameter\c!symbol
+ \relax
+ \ifx\p_rightoffset\empty\else
+ \mskip\p_rightoffset
+ \fi}}
\let\mathextensible\math_fenced_extensible
-% \startformula
-% \integral[factor=3] \frac{1}{2}
-% \integral[5] \frac{1}{2}
-% \stopformula
-
\definemathextensible[integral][\c!symbol="222B]
+% \setupmathextensible[integral][rightoffset=-3mu,exact=yes,factor=2]
+%
+% \let\int\integral
+%
+% \startlines
+% \ruledhbox{$\integral f\frac{1}{2}$}
+% \ruledhbox{$\integral[factor=1] f\frac{1}{2}$}
+% \ruledhbox{$\integral[factor=3] f\frac{1}{2}$}
+% \ruledhbox{$\int f\frac{1}{2}$}
+% \stoplines
+
\unexpanded\def\autointegral#1#2#3%
{\ifmmode
\setbox\nextbox\mathstylehbox{#3}%
@@ -138,7 +156,7 @@
\normalsubscript{#2}%
\box\nextbox
\else
- \char"222B\relax
+ \char"222B\relax
\fi}
% \startformula
diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua
index d1ed74b6e..8bd8bb802 100644
--- a/tex/context/base/mkiv/mult-def.lua
+++ b/tex/context/base/mkiv/mult-def.lua
@@ -7745,6 +7745,9 @@ return {
["pe"]="حاشیه‌زوج",
["ro"]="marginepara",
},
+ ["exact"]={
+ ["en"]="exact",
+ },
["exitoffset"]={
["en"]="exitoffset",
},
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 4e44163d8..3b2304159 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index adc58e56e..c64546d95 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/strc-con.mkvi b/tex/context/base/mkiv/strc-con.mkvi
index 25e26bf73..36c5d1b42 100644
--- a/tex/context/base/mkiv/strc-con.mkvi
+++ b/tex/context/base/mkiv/strc-con.mkvi
@@ -914,6 +914,9 @@
\global\let\currentconstructionexpansion\v!no
\fi
%
+ \ifx\currentconstructionreferenceprefix\empty
+ \global\let\currentconstructionreferenceprefix\referenceprefix
+ \fi
\ifx\currentconstructionexpansion\s!xml
\xmlstartraw
\xdef\currentconstructiontitle {\constructionparameter\c!title}%
@@ -972,7 +975,7 @@
internal \nextinternalreference
order \nextinternalorderreference
reference {\currentconstructionreference}
- prefix {\referenceprefix}
+ prefix {\currentconstructionreferenceprefix}
% block {\currentsectionblock}
% section structures.sections.currentid(),
}
diff --git a/tex/context/interface/mkii/keys-cs.xml b/tex/context/interface/mkii/keys-cs.xml
index 20e14f760..5a59e9fae 100644
--- a/tex/context/interface/mkii/keys-cs.xml
+++ b/tex/context/interface/mkii/keys-cs.xml
@@ -781,6 +781,7 @@
<cd:constant name='etaloption' value='etaloption'/>
<cd:constant name='etaltext' value='etaltext'/>
<cd:constant name='evenmargin' value='sudamarginalie'/>
+ <cd:constant name='exact' value='exact'/>
<cd:constant name='exitoffset' value='exitoffset'/>
<cd:constant name='expansion' value='expanzen'/>
<cd:constant name='export' value='export'/>
diff --git a/tex/context/interface/mkii/keys-de.xml b/tex/context/interface/mkii/keys-de.xml
index c4bf99cff..939b6ee1e 100644
--- a/tex/context/interface/mkii/keys-de.xml
+++ b/tex/context/interface/mkii/keys-de.xml
@@ -781,6 +781,7 @@
<cd:constant name='etaloption' value='etaloption'/>
<cd:constant name='etaltext' value='etaltext'/>
<cd:constant name='evenmargin' value='geraderand'/>
+ <cd:constant name='exact' value='exact'/>
<cd:constant name='exitoffset' value='exitoffset'/>
<cd:constant name='expansion' value='expansion'/>
<cd:constant name='export' value='export'/>
diff --git a/tex/context/interface/mkii/keys-en.xml b/tex/context/interface/mkii/keys-en.xml
index 3a5d77e53..5eb518a75 100644
--- a/tex/context/interface/mkii/keys-en.xml
+++ b/tex/context/interface/mkii/keys-en.xml
@@ -781,6 +781,7 @@
<cd:constant name='etaloption' value='etaloption'/>
<cd:constant name='etaltext' value='etaltext'/>
<cd:constant name='evenmargin' value='evenmargin'/>
+ <cd:constant name='exact' value='exact'/>
<cd:constant name='exitoffset' value='exitoffset'/>
<cd:constant name='expansion' value='expansion'/>
<cd:constant name='export' value='export'/>
diff --git a/tex/context/interface/mkii/keys-fr.xml b/tex/context/interface/mkii/keys-fr.xml
index 00a0864e8..9f7ea64b1 100644
--- a/tex/context/interface/mkii/keys-fr.xml
+++ b/tex/context/interface/mkii/keys-fr.xml
@@ -781,6 +781,7 @@
<cd:constant name='etaloption' value='etaloption'/>
<cd:constant name='etaltext' value='etaltext'/>
<cd:constant name='evenmargin' value='margepaire'/>
+ <cd:constant name='exact' value='exact'/>
<cd:constant name='exitoffset' value='exitoffset'/>
<cd:constant name='expansion' value='expansion'/>
<cd:constant name='export' value='export'/>
diff --git a/tex/context/interface/mkii/keys-it.xml b/tex/context/interface/mkii/keys-it.xml
index f15c27393..9e9b4cdf0 100644
--- a/tex/context/interface/mkii/keys-it.xml
+++ b/tex/context/interface/mkii/keys-it.xml
@@ -781,6 +781,7 @@
<cd:constant name='etaloption' value='etaloption'/>
<cd:constant name='etaltext' value='etaltext'/>
<cd:constant name='evenmargin' value='marginepari'/>
+ <cd:constant name='exact' value='exact'/>
<cd:constant name='exitoffset' value='exitoffset'/>
<cd:constant name='expansion' value='espansione'/>
<cd:constant name='export' value='export'/>
diff --git a/tex/context/interface/mkii/keys-nl.xml b/tex/context/interface/mkii/keys-nl.xml
index df5485bbe..6466aa7f8 100644
--- a/tex/context/interface/mkii/keys-nl.xml
+++ b/tex/context/interface/mkii/keys-nl.xml
@@ -781,6 +781,7 @@
<cd:constant name='etaloption' value='etaloption'/>
<cd:constant name='etaltext' value='etaltext'/>
<cd:constant name='evenmargin' value='evenmarge'/>
+ <cd:constant name='exact' value='exact'/>
<cd:constant name='exitoffset' value='exitoffset'/>
<cd:constant name='expansion' value='expansie'/>
<cd:constant name='export' value='exporteer'/>
diff --git a/tex/context/interface/mkii/keys-pe.xml b/tex/context/interface/mkii/keys-pe.xml
index 75d2d8772..224ec2b6a 100644
--- a/tex/context/interface/mkii/keys-pe.xml
+++ b/tex/context/interface/mkii/keys-pe.xml
@@ -781,6 +781,7 @@
<cd:constant name='etaloption' value='etaloption'/>
<cd:constant name='etaltext' value='etaltext'/>
<cd:constant name='evenmargin' value='حاشیه‌زوج'/>
+ <cd:constant name='exact' value='exact'/>
<cd:constant name='exitoffset' value='exitoffset'/>
<cd:constant name='expansion' value='گسترش'/>
<cd:constant name='export' value='export'/>
diff --git a/tex/context/interface/mkii/keys-ro.xml b/tex/context/interface/mkii/keys-ro.xml
index 45c2e0ce0..477ef7115 100644
--- a/tex/context/interface/mkii/keys-ro.xml
+++ b/tex/context/interface/mkii/keys-ro.xml
@@ -781,6 +781,7 @@
<cd:constant name='etaloption' value='etaloption'/>
<cd:constant name='etaltext' value='etaltext'/>
<cd:constant name='evenmargin' value='marginepara'/>
+ <cd:constant name='exact' value='exact'/>
<cd:constant name='exitoffset' value='exitoffset'/>
<cd:constant name='expansion' value='expansiune'/>
<cd:constant name='export' value='export'/>
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 34fc2a0fb..0c266d81b 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
Binary files differ
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index b5463a4e8..fa27198d2 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 0fb2eff32..b3dee6347 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua
-- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date : 11/04/16 11:06:23
+-- merge date : 11/04/16 20:50:34
do -- begin closure to overcome local limits and interference