2016-01-05 19:23:00

11 files changed, 136 insertions, 154 deletions

diff --git a/tex/context/base/catc-sym.mkiv b/tex/context/base/catc-sym.mkiv
index 71e02f31d..ae1253272 100644
--- a/tex/context/base/catc-sym.mkiv
+++ b/tex/context/base/catc-sym.mkiv
@@ -11,12 +11,9 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-% we now have loaded syst-* so we have all @@catcode constants
-
-%D We want to have access to the raw alternatives of the
-%D special characters. We use a \type {\xdef} instead of
-%D \type {\let} because we need an expandable token in a
-%D \type {\write}.
+%D We want to have access to the raw alternatives of the special characters. We
+%D use a \type {\xdef} instead of \type {\let} because we need an expandable token
+%D in a \type {\write}.
 
 \bgroup
 
@@ -24,32 +21,37 @@
 \catcode`E=\endgroupcatcode
 \catcode`.=\escapecatcode
 
-.catcode `.{ 12 .xdef .letteropenbrace       B.string{E
-.catcode `.} 12 .xdef .letterclosebrace      B.string}E
-.catcode `.& 12 .xdef .letterampersand       B.string&E
-.catcode `.< 12 .xdef .letterless            B.string<E
-.catcode `.> 12 .xdef .lettermore            B.string>E
-.catcode `.# 12 .xdef .letterhash            B.string#E
-.catcode `." 12 .xdef .letterdoublequote     B.string"E
-.catcode `.' 12 .xdef .lettersinglequote     B.string'E
-.catcode `.$ 12 .xdef .letterdollar          B.string$E
-.catcode `.% 12 .xdef .letterpercent         B.string%E
-.catcode `.^ 12 .xdef .letterhat             B.string^E
-.catcode `._ 12 .xdef .letterunderscore      B.string_E
-.catcode `.| 12 .xdef .letterbar             B.string|E
-.catcode `.~ 12 .xdef .lettertilde           B.string~E
-.catcode `.\ 12 .xdef .letterbackslash       B.string\E
-.catcode `./ 12 .xdef .letterslash           B.string/E
-.catcode `.? 12 .xdef .letterquestionmark    B.string?E
-.catcode `.! 12 .xdef .letterexclamationmark B.string!E
-.catcode `.@ 12 .xdef .letterat              B.string@E
-.catcode `.: 12 .xdef .lettercolon           B.string:E
+.catcode `.{ 12 .xdef .letterleftbrace        B.string{E
+.catcode `.} 12 .xdef .letterrightbrace       B.string}E
+.catcode `.& 12 .xdef .letterampersand        B.string&E
+.catcode `.< 12 .xdef .letterless             B.string<E
+.catcode `.> 12 .xdef .lettermore             B.string>E
+.catcode `.# 12 .xdef .letterhash             B.string#E
+.catcode `." 12 .xdef .letterdoublequote      B.string"E
+.catcode `.' 12 .xdef .lettersinglequote      B.string'E
+.catcode `.$ 12 .xdef .letterdollar           B.string$E
+.catcode `.% 12 .xdef .letterpercent          B.string%E
+.catcode `.^ 12 .xdef .letterhat              B.string^E
+.catcode `._ 12 .xdef .letterunderscore       B.string_E
+.catcode `.| 12 .xdef .letterbar              B.string|E
+.catcode `.~ 12 .xdef .lettertilde            B.string~E
+.catcode `.\ 12 .xdef .letterbackslash        B.string\E
+.catcode `./ 12 .xdef .letterslash            B.string/E
+.catcode `.? 12 .xdef .letterquestionmark     B.string?E
+.catcode `.! 12 .xdef .letterexclamationmark  B.string!E
+.catcode `.@ 12 .xdef .letterat               B.string@E
+.catcode `.: 12 .xdef .lettercolon            B.string:E
+
+.catcode `.( 12 .xdef .letterleftparenthesis  B.string(E
+.catcode `.) 12 .xdef .letterrightparenthesis B.string)E
+.catcode `.[ 12 .xdef .letterleftbracket      B.string[E
+.catcode `.] 12 .xdef .letterrightbracket     B.string]E
 
          .global .let .letterescape     .letterbackslash
-         .global .let .letterbgroup     .letteropenbrace
-         .global .let .letteregroup     .letterclosebrace
-         .global .let .letterleftbrace  .letteropenbrace
-         .global .let .letterrightbrace .letterclosebrace
+         .global .let .letterbgroup     .letterleftbrace
+         .global .let .letteregroup     .letterrightbrace
+         .global .let .letteropenbrace  .letterleftbrace
+         .global .let .letterclosebrace .letterrightbrace
 
 .egroup
 
diff --git a/tex/context/base/char-def.lua b/tex/context/base/char-def.lua
index a525005f0..26c9c9e8c 100644
--- a/tex/context/base/char-def.lua
+++ b/tex/context/base/char-def.lua
@@ -65746,16 +65746,8 @@ characters.data={
   description="LEFT CEILING",
   direction="on",
   linebreak="op",
-  mathspec={
-   {
-    class="open",
-    name="lceil",
-   },
-   {
-    class="open",
-    name="lceiling",
-   },
-  },
+  mathclass="open",
+  mathname="lceil",
   mirror=0x2309,
   unicodeslot=0x2308,
  },
@@ -65764,16 +65756,8 @@ characters.data={
   description="RIGHT CEILING",
   direction="on",
   linebreak="cl",
-  mathspec={
-   {
-    class="close",
-    name="rceil",
-   },
-   {
-    class="close",
-    name="rceiling",
-   },
-  },
+  mathclass="close",
+  mathname="rceil",
   mirror=0x2308,
   unicodeslot=0x2309,
  },
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 01512d912..fbf54053f 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{2016.01.04 15:47}
+\newcontextversion{2016.01.05 19:20}
 
 %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/context-version.pdf b/tex/context/base/context-version.pdf
index afdfcd136..e4d9946fe 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index dd0020994..7e26fd898 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2016.01.04 15:47}
+\edef\contextversion{2016.01.05 19:20}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/math-fen.mkiv b/tex/context/base/math-fen.mkiv
index d1e978e42..cff95db62 100644
--- a/tex/context/base/math-fen.mkiv
+++ b/tex/context/base/math-fen.mkiv
@@ -132,7 +132,7 @@
 \definemathfence [angle]       [\c!left="27E8,\c!right="27E9]
 \definemathfence [doubleangle] [\c!left="27EA,\c!right="27EB]
 \definemathfence [solidus]     [\c!left="2044,\c!right="2044]
-\definemathfence [ceil]        [\c!left="2308,\c!right="2309]
+\definemathfence [ceiling]     [\c!left="2308,\c!right="2309]
 \definemathfence [floor]       [\c!left="230A,\c!right="230B]
 \definemathfence [moustache]   [\c!left="23B0,\c!right="23B1]
 \definemathfence [uppercorner] [\c!left="231C,\c!right="231D]
@@ -153,7 +153,7 @@
 \definemathfence [mirroredangle]       [mirrored] [\c!right="27E8,\c!left="27E9]
 \definemathfence [mirroreddoubleangle] [mirrored] [\c!right="27EA,\c!left="27EB]
 \definemathfence [mirroredsolidus]     [mirrored] [\c!right="2044,\c!left="2044]
-\definemathfence [mirroredceil]        [mirrored] [\c!right="2308,\c!left="2309]
+\definemathfence [mirroredceiling]     [mirrored] [\c!right="2308,\c!left="2309]
 \definemathfence [mirroredfloor]       [mirrored] [\c!right="230A,\c!left="230B]
 \definemathfence [mirroredmoustache]   [mirrored] [\c!right="23B0,\c!left="23B1]
 \definemathfence [mirroreduppercorner] [mirrored] [\c!right="231C,\c!left="231D]
@@ -165,7 +165,7 @@
 
 %D A bonus:
 
-\unexpanded\def\Lparent              {\math_fenced_fenced_start{parenthesis}}          \unexpanded\def\Rparent              {\math_fenced_fenced_stop {parenthesis}}
+\unexpanded\def\Lparenthesis         {\math_fenced_fenced_start{parenthesis}}          \unexpanded\def\Rparenthesis         {\math_fenced_fenced_stop {parenthesis}}
 \unexpanded\def\Lbracket             {\math_fenced_fenced_start{bracket}}              \unexpanded\def\Rbracket             {\math_fenced_fenced_stop {bracket}}
 \unexpanded\def\Lbrace               {\math_fenced_fenced_start{brace}}                \unexpanded\def\Rbrace               {\math_fenced_fenced_stop {brace}}
 \unexpanded\def\Langle               {\math_fenced_fenced_start{angle}}                \unexpanded\def\Rangle               {\math_fenced_fenced_stop {angle}}
@@ -175,7 +175,7 @@
 \unexpanded\def\Ltriplebar           {\math_fenced_fenced_start{triplebar}}            \unexpanded\def\Rtriplebar           {\math_fenced_fenced_stop {triplebar}}
 \unexpanded\def\Lsolidus             {\math_fenced_fenced_start{solidus}}              \unexpanded\def\Rsolidus             {\math_fenced_fenced_stop {solidus}}
 \unexpanded\def\Lfloor               {\math_fenced_fenced_start{floor}}                \unexpanded\def\Rfloor               {\math_fenced_fenced_stop {floor}}
-\unexpanded\def\Lceil                {\math_fenced_fenced_start{ceil}}                 \unexpanded\def\Rceil                {\math_fenced_fenced_stop {ceil}}
+\unexpanded\def\Lceiling             {\math_fenced_fenced_start{ceiling}}              \unexpanded\def\Rceiling             {\math_fenced_fenced_stop {ceiling}}
 \unexpanded\def\Lmoustache           {\math_fenced_fenced_start{moustache}}            \unexpanded\def\Rmoustache           {\math_fenced_fenced_stop {moustache}}
 \unexpanded\def\Luppercorner         {\math_fenced_fenced_start{uppercorner}}          \unexpanded\def\Ruppercorner         {\math_fenced_fenced_stop {uppercorner}}
 \unexpanded\def\Llowercorner         {\math_fenced_fenced_start{lowercorner}}          \unexpanded\def\Rlowercorner         {\math_fenced_fenced_stop {lowercorner}}
@@ -183,7 +183,7 @@
 \unexpanded\def\Lopenbracket         {\math_fenced_fenced_start{openbracket}}          \unexpanded\def\Ropenbracket         {\math_fenced_fenced_stop {openbracket}}
 \unexpanded\def\Lnothing             {\math_fenced_fenced_start{nothing}}              \unexpanded\def\Rnothing             {\math_fenced_fenced_stop {nothing}}
 
-\unexpanded\def\Lparentmirrored      {\math_fenced_fenced_stop {mirroredparenthesis}}  \unexpanded\def\Rparentmirrored      {\math_fenced_fenced_start{mirroredparenthesis}}
+\unexpanded\def\Lparenthesismirrored {\math_fenced_fenced_stop {mirroredparenthesis}}  \unexpanded\def\Rparenthesismirrored {\math_fenced_fenced_start{mirroredparenthesis}}
 \unexpanded\def\Lbracketmirrored     {\math_fenced_fenced_stop {mirroredbracket}}      \unexpanded\def\Rbracketmirrored     {\math_fenced_fenced_start{mirroredbracket}}
 \unexpanded\def\Lbracemirrored       {\math_fenced_fenced_stop {mirroredbrace}}        \unexpanded\def\Rbracemirrored       {\math_fenced_fenced_start{mirroredbrace}}
 \unexpanded\def\Langlemirrored       {\math_fenced_fenced_stop {mirroredangle}}        \unexpanded\def\Ranglemirrored       {\math_fenced_fenced_start{mirroredangle}}
@@ -193,7 +193,7 @@
 \unexpanded\def\Ltriplebarmirrored   {\math_fenced_fenced_stop {mirroredtriplebar}}    \unexpanded\def\Rtriplebarmirrored   {\math_fenced_fenced_start{mirroredtriplebar}}
 \unexpanded\def\Lsolidusmirrored     {\math_fenced_fenced_stop {mirroredsolidus}}      \unexpanded\def\Rsolidusmirrored     {\math_fenced_fenced_start{mirroredsolidus}}
 \unexpanded\def\Lfloormirrored       {\math_fenced_fenced_stop {mirroredfloor}}        \unexpanded\def\Rfloormirrored       {\math_fenced_fenced_start{mirroredfloor}}
-\unexpanded\def\Lceilmirrored        {\math_fenced_fenced_stop {mirroredceil}}         \unexpanded\def\Rceilmirrored        {\math_fenced_fenced_start{mirroredceil}}
+\unexpanded\def\Lceilingmirrored     {\math_fenced_fenced_stop {mirroredceiling}}      \unexpanded\def\Rceilingmirrored     {\math_fenced_fenced_start{mirroredceiling}}
 \unexpanded\def\Lmoustachemirrored   {\math_fenced_fenced_stop {mirroredmoustache}}    \unexpanded\def\Rmoustachemirrored   {\math_fenced_fenced_start{mirroredmoustache}}
 \unexpanded\def\Luppercornermirrored {\math_fenced_fenced_stop {mirroreduppercorner}}  \unexpanded\def\Ruppercornermirrored {\math_fenced_fenced_start{mirroreduppercorner}}
 \unexpanded\def\Llowercornermirrored {\math_fenced_fenced_stop {mirroredlowercorner}}  \unexpanded\def\Rlowercornermirrored {\math_fenced_fenced_start{mirroredlowercorner}}
@@ -263,11 +263,7 @@
 
 \unexpanded\def\installmathfencepair#1#2#3#4%
   {\expandafter\let\csname\??mathleft \meaning#1\endcsname#2%
-   \expandafter\let\csname\??mathright\meaning#3\endcsname#4%
-%    \writestatus{!}{\meaning#1=\meaning#2}%
-%    \writestatus{!}{\meaning#3=\meaning#4}%
-%    \wait
-   }
+   \expandafter\let\csname\??mathright\meaning#3\endcsname#4}
 
 \def\math_unknown_left  {\setfalse\c_math_fenced_done\ifconditional\c_math_fenced_unknown\normalleft  \nexttoken\fi}
 \def\math_unknown_right {\setfalse\c_math_fenced_done\ifconditional\c_math_fenced_unknown\normalright \nexttoken\fi}
@@ -340,7 +336,7 @@
 \installmathfencepair [ \Lbracket            ] \Rbracket
 \installmathfencepair ] \Rbracketmirrored    [ \Lbracketmirrored
 
-\installmathfencepair ( \Lparent             ) \Rparent
+\installmathfencepair ( \Lparenthesis        ) \Rparenthesis
 \installmathfencepair ) \Rparentmirrored     ( \Lparentmirrored
 
 \installmathfencepair < \Langle              > \Rangle
@@ -354,8 +350,8 @@
 
 \installmathfencepair ⌊ \Lfloor              ⌋ \Rfloor
 \installmathfencepair ⌋ \Rfloormirrored      ⌊ \Lfloormirrored
-\installmathfencepair ⌈ \Lceil               ⌉ \Rceil
-\installmathfencepair ⌉ \Rceilmirrored       ⌈ \Lceilmirrored
+\installmathfencepair ⌈ \Lceiling            ⌉ \Rceiling
+\installmathfencepair ⌉ \Rceilingmirrored    ⌈ \Lceilingmirrored
 
 \installmathfencepair ⟨ \Langle              ⟩ \Rangle
 \installmathfencepair ⟩ \Ranglemirrored      ⟨ \Langlemirrored
@@ -376,25 +372,49 @@
     \ignorediscretionaries % so $\mtext{a|b}$ works, this is ok because it's an \hbox
 \to \everymathematics
 
-\installmathfencepair \lbrace     \Lbrace       \rbrace     \Rbrace
-\installmathfencepair \lbracket   \Lbracket     \rbracket   \Rbracket
-\installmathfencepair \lparent    \Lparent      \rparent    \Rparent
-\installmathfencepair \langle     \Langle       \rangle     \Rangle
-\installmathfencepair \llangle    \Ldoubleangle \rrangle    \Rdoubleangle
-%installmathfencepair \lbar       \Lbar         \rbar       \Rbar
-\installmathfencepair \lVert      \Ldoublebar   \rVert      \Rdoublebar
-\installmathfencepair \vert       \Lbar         \vert       \Rbar
-\installmathfencepair \solidus    \Lsolidus     \solidus    \Rsolidus
-\installmathfencepair \lfloor     \Lfloor       \rfloor     \Rfloor
-\installmathfencepair \lceil      \Lceil        \rceil      \Rceil
-
-\installmathfencepair \ulcorner   \Luppercorner \urcorner   \Ruppercorner
-\installmathfencepair \llcorner   \Llowercorner \lrcorner   \Rlowercorner
-\installmathfencepair \lmoustache \Lmoustache   \rmoustache \Rmoustache
-\installmathfencepair \llbracket  \Lopenbracket \rrbracket  \Ropenbracket
-\installmathfencepair \lgroup     \Lgroup       \rgroup     \Rgroup
-
-% unofficial and only there for some fuzzy web related math:
+% We unofficial support some synonyms as we need them for some fuzzy web related math.
+
+% The names in char-def.lua (historic mess):
+
+\let\lbrack      \lbracket
+\let\rbrack      \rbracket
+\let\lceiling    \lceil
+\let\rceiling    \rceil
+\let\lparenthesis\lparent
+\let\rparenthesis\rparent
+\let\lparen      \lparent
+\let\rparen      \rparent
+
+% Just defined:
+
+\let\Lceil  \Lceiling
+\let\Rceil  \Rceiling
+\let\Lparent\Lparenthesis
+\let\Rparent\Rparenthesis
+\let\Lparen \Lparenthesis
+\let\Rparen \Rparenthesis
+
+\installmathfencepair \lbrace       \Lbrace       \rbrace       \Rbrace
+\installmathfencepair \lbracket     \Lbracket     \rbracket     \Rbracket
+\installmathfencepair \lbrack       \Lbracket     \rbracket     \Rbracket
+\installmathfencepair \lparenthesis \Lparenthesis \rparenthesis \Rparenthesis
+\installmathfencepair \lparent      \Lparenthesis \rparent      \Rparenthesis
+\installmathfencepair \lparen       \Lparenthesis \rparen       \Rparenthesis
+\installmathfencepair \langle       \Langle       \rangle       \Rangle
+\installmathfencepair \llangle      \Ldoubleangle \rrangle      \Rdoubleangle
+%installmathfencepair \lbar         \Lbar         \rbar         \Rbar
+\installmathfencepair \lVert        \Ldoublebar   \rVert        \Rdoublebar
+\installmathfencepair \vert         \Lbar         \vert         \Rbar
+\installmathfencepair \solidus      \Lsolidus     \solidus      \Rsolidus
+\installmathfencepair \lfloor       \Lfloor       \rfloor       \Rfloor
+\installmathfencepair \lceiling     \Lceiling     \rceiling     \Rceiling
+\installmathfencepair \lceil        \Lceiling     \rceil        \Rceiling
+
+\installmathfencepair \ulcorner     \Luppercorner \urcorner     \Ruppercorner
+\installmathfencepair \llcorner     \Llowercorner \lrcorner     \Rlowercorner
+\installmathfencepair \lmoustache   \Lmoustache   \rmoustache   \Rmoustache
+\installmathfencepair \llbracket    \Lopenbracket \rrbracket    \Ropenbracket
+\installmathfencepair \lgroup       \Lgroup       \rgroup       \Rgroup
 
 \let\textlbar\lbar \let\mathlbar\Lbar
 \let\textrbar\lbar \let\mathrbar\Rbar
@@ -402,28 +422,22 @@
 \unexpanded\def\lbar{\mathortext\mathlbar\textlbar}
 \unexpanded\def\rbar{\mathortext\mathrbar\textrbar}
 
-\let\lbrack\lbracket
-\let\rbrack\rbracket
-
-\let\lparen\lparent
-\let\rparen\rparent
-
 % \setupmathfences[color=darkgreen]
 
-\unexpanded\def\{{\mathortext\lbrace  \letterleftbrace   } % or maybe a chardef
-\unexpanded\def\}{\mathortext\rbrace  \letterrightbrace  } % or maybe a chardef
-\unexpanded\def\[{\mathortext\lbracket\letterleftbracket } % or maybe a chardef
-\unexpanded\def\]{\mathortext\rbracket\letterrightbracket} % or maybe a chardef
-\unexpanded\def\({\mathortext\lparent \letterleftparent  } % or maybe a chardef
-\unexpanded\def\){\mathortext\rparent \letterrightparent } % or maybe a chardef
-\unexpanded\def\|{\mathortext\vert    \letterbar         } % or maybe a chardef
-%unexpanded\def\/{\mathortext\solidus \letterslash       } % or maybe a chardef
-
-\installmathfencepair \{ \Lbrace   \} \Rbrace
-\installmathfencepair \[ \Lbracket \] \Rbracket
-\installmathfencepair \( \Lparent  \) \Rparent
-\installmathfencepair \< \Langle   \> \Rangle
-\installmathfencepair \| \Lbar     \| \Rbar
+\unexpanded\def\{{\mathortext\lbrace      \letterleftbrace       } % or maybe a chardef
+\unexpanded\def\}{\mathortext\rbrace      \letterrightbrace      } % or maybe a chardef
+\unexpanded\def\[{\mathortext\lbracket    \letterleftbracket     } % or maybe a chardef
+\unexpanded\def\]{\mathortext\rbracket    \letterrightbracket    } % or maybe a chardef
+\unexpanded\def\({\mathortext\lparenthesis\letterleftparenthesis } % or maybe a chardef
+\unexpanded\def\){\mathortext\rparenthesis\letterrightparenthesis} % or maybe a chardef
+\unexpanded\def\|{\mathortext\vert        \letterbar             } % or maybe a chardef
+%unexpanded\def\/{\mathortext\solidus     \letterslash           } % or maybe a chardef
+
+\installmathfencepair \{ \Lbrace        \} \Rbrace
+\installmathfencepair \[ \Lbracket      \] \Rbracket
+\installmathfencepair \( \Lparenthesis  \) \Rparenthesis
+\installmathfencepair \< \Langle        \> \Rangle
+\installmathfencepair \| \Lbar          \| \Rbar
 
 %D As we have overloaded \type {\left} and \type {\right} we also need a more
 %D clever version of the following:
diff --git a/tex/context/base/math-stc.mkvi b/tex/context/base/math-stc.mkvi
index 164508f05..96e1738db 100644
--- a/tex/context/base/math-stc.mkvi
+++ b/tex/context/base/math-stc.mkvi
@@ -974,9 +974,6 @@
 \let\normalunderrightarrow\underrightarrow
 \let\normaloverrightarrow \overrightarrow
 
-\let\lceil                \lceiling
-\let\rceil                \rceiling
-
 %D Here come the new ones:
 
 \definemathstackers [\v!none]   [\v!mathematics] [\c!hoffset=\zeropoint]
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index d75785346..1b3b4a129 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 ab77d9c62..d14d446b2 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/syst-ini.mkiv b/tex/context/base/syst-ini.mkiv
index c09e3f15b..cd8238c76 100644
--- a/tex/context/base/syst-ini.mkiv
+++ b/tex/context/base/syst-ini.mkiv
@@ -298,30 +298,12 @@
 %D strings instead of tokens that take more memory. It's a trick to trick to force
 %D strings. This macro is never used in \CONTEXT.
 
-\normalprotected\def\newhelp#1#2{\newtoks#1#1\expandafter{\csname#2\endcsname}}
+%normalprotected\def\newhelp#1#2{\newtoks#1#1\expandafter{\csname#2\endcsname}}
+\normalprotected\def\newhelp#1#2{\newtoks#1#1\expandafter{\detokenize{#2}}}
 
-%D For the moment:
-
-% for the moment (till 0.82)
-
-\ifdefined\outputmode                 \else \let\outputmode                 \pdfoutput           \fi
-
-\ifdefined\pagewidth                  \else \let\pagewidth                  \pdfpagewidth        \let\normalpagewidth                  \pdfpagewidth                \fi
-\ifdefined\pageheight                 \else \let\pageheight                 \pdfpageheight       \let\normalpageheight                 \pdfpageheight               \fi
-
-\ifdefined\adjustspacing              \else \let\adjustspacing              \pdfadjustspacing    \let\normaladjustspacing              \adjustspacing               \fi
-\ifdefined\protrudechars              \else \let\protrudechars              \pdfprotrudechars    \let\normalprotrudechars              \protrudechars               \fi
-
-\ifdefined\saveboxresource            \else \let\saveboxresource            \pdfxform            \let\normalsaveboxresource            \saveboxresource             \fi
-\ifdefined\lastsavedboxresourceindex  \else \let\lastsavedboxresourceindex  \pdflastxform        \let\normallastsavedboxresourceindex  \lastsavedboxresourceindex   \fi
-\ifdefined\useboxresource             \else \let\useboxresource             \pdfrefxform         \let\normaluseboxresource             \useboxresource              \fi
-
-\ifdefined\saveimageresource          \else \let\saveimageresource          \pdfximage           \let\normalsaveimageresource          \saveimageresource           \fi
-\ifdefined\lastsavedimageresourceindex\else \let\lastsavedimageresourceindex\pdflastximage       \let\normallastsavedimageresourceindex\lastsavedimageresourceindex \fi
-\ifdefined\lastsavedimageresourcepages\else \let\lastsavedimageresourcepages\pdflastximagepages  \let\normallastsavedimageresourcepages\lastsavedimageresourcepages \fi
-\ifdefined\useimageresource           \else \let\useimageresource           \pdfrefximage        \let\normaluseimageresource           \useimageresource            \fi
-
-% for the moment, this will move to the backend module
+% For the moment we define some \pdf... helpers but this will move to the backend
+% module after which the official interfaces have to be used. This is needed for
+% modules not made by ctx developers.
 
 \ifdefined\pdfextension
 
@@ -352,32 +334,35 @@
 
 \fi
 
-\ifdefined\pdfextension
-
-    \def\pdftexversion             {\numexpr\pdffeedback version}
-    \def\pdftexrevision                    {\pdffeedback revision}
-    \def\pdflastlink               {\numexpr\pdffeedback lastlink}
-    \def\pdfretval                 {\numexpr\pdffeedback retval}
-    \def\pdflastobj                {\numexpr\pdffeedback lastobj}
-    \def\pdflastannot              {\numexpr\pdffeedback lastannot}
-    \def\pdfxformname              {\numexpr\pdffeedback xformname}
-    \def\pdfcreationdate                   {\pdffeedback creationdate}
-    \def\pdffontname               {\numexpr\pdffeedback fontname}
-    \def\pdffontobjnum             {\numexpr\pdffeedback fontobjnum}
-    \def\pdffontsize               {\dimexpr\pdffeedback fontsize}
-    \def\pdfpageref                {\numexpr\pdffeedback pageref}
-    \def\pdfcolorstackinit                 {\pdffeedback colorstackinit}
+\ifdefined\pdffeedback
+
+    \def\pdftexversion     {\numexpr\pdffeedback version}
+    \def\pdftexrevision            {\pdffeedback revision}
+    \def\pdflastlink       {\numexpr\pdffeedback lastlink}
+    \def\pdfretval         {\numexpr\pdffeedback retval}
+    \def\pdflastobj        {\numexpr\pdffeedback lastobj}
+    \def\pdflastannot      {\numexpr\pdffeedback lastannot}
+    \def\pdfxformname      {\numexpr\pdffeedback xformname}
+    \def\pdfcreationdate           {\pdffeedback creationdate}
+    \def\pdffontname       {\numexpr\pdffeedback fontname}
+    \def\pdffontobjnum     {\numexpr\pdffeedback fontobjnum}
+    \def\pdffontsize       {\dimexpr\pdffeedback fontsize}
+    \def\pdfpageref        {\numexpr\pdffeedback pageref}
+    \def\pdfcolorstackinit         {\pdffeedback colorstackinit}
 
 \fi
 
 \ifdefined\pdfxform \else
-    \let \pdfxform            \saveboxresource
-    \let \pdflastxform        \lastsavedboxresourceindex
-    \let \pdfrefxform         \useboxresource
-    \let \pdfximage           \saveimageresource
-    \let \pdflastximage       \lastsavedimageresourceindex
-    \let \pdflastximagepages  \lastsavedimageresourcepages
-    \let \pdfrefximage        \useimageresource
+    \let\pdfxform           \saveboxresource
+    \let\pdflastxform       \lastsavedboxresourceindex
+    \let\pdfrefxform        \useboxresource
+    \let\pdfximage          \saveimageresource
+    \let\pdflastximage      \lastsavedimageresourceindex
+    \let\pdflastximagepages \lastsavedimageresourcepages
+    \let\pdfrefximage       \useimageresource
+    \let\pdfsavepos         \savepos
+    \let\pdflastxpos        \lastxpos
+    \let\pdflastypos        \lastypos
 \fi
 
 \ifdefined\pdfvariable
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 6be225fcd..cbf3cd358 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  : 01/04/16 15:47:13
+-- merge date  : 01/05/16 19:20:37
 
 do -- begin closure to overcome local limits and interference