beta 2013.01.09 10:51

19 files changed, 120 insertions, 110 deletions

diff --git a/tex/context/base/char-def.lua b/tex/context/base/char-def.lua
index f26e63f18..71110ab00 100644
--- a/tex/context/base/char-def.lua
+++ b/tex/context/base/char-def.lua
@@ -446,7 +446,7 @@ characters.data={
   description="SOLIDUS",
   direction="cs",
   linebreak="sy",
-  mathclass="ord",
+  mathclass="ordinary",
   mathsymbol=0x2044,
   unicodeslot=0x002F,
  },
@@ -1718,11 +1718,11 @@ characters.data={
   linebreak="al",
   mathspec={
    {
-    class="ord",
+    class="ordinary",
     name="lnot",
    },
    {
-    class="ord",
+    class="ordinary",
     name="neg",
    },
   },
@@ -2527,7 +2527,7 @@ characters.data={
   description="LATIN SMALL LETTER ETH",
   direction="l",
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="eth",
   uccode=0x00D0,
   unicodeslot=0x00F0,
@@ -10239,7 +10239,7 @@ characters.data={
   description="GREEK KAPPA SYMBOL",
   direction="l",
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="varkappa",
   specials={ "compat", 0x03BA },
   uccode=0x039A,
@@ -56877,7 +56877,7 @@ characters.data={
   linebreak="is",
   mathspec={
    {
-    class="ord",
+    class="ordinary",
     name="slash",
    },
    {
@@ -58125,7 +58125,7 @@ characters.data={
      name="hslash",
    },
    {
-     class="ord",
+     class="ordinary",
      name="hbar",
    },
   },
@@ -58454,7 +58454,7 @@ characters.data={
   direction="l",
   lccode=0x214E,
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="Finv",
   unicodeslot=0x2132,
  },
@@ -58583,7 +58583,7 @@ characters.data={
   description="TURNED SANS-SERIF CAPITAL G",
   direction="on",
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="Game",
   unicodeslot=0x2141,
  },
@@ -58593,7 +58593,7 @@ characters.data={
   description="TURNED SANS-SERIF CAPITAL L",
   direction="on",
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   unicodeslot=0x2142,
  },
  [0x2143]={
@@ -58602,7 +58602,7 @@ characters.data={
   description="REVERSED SANS-SERIF CAPITAL L",
   direction="on",
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   unicodeslot=0x2143,
  },
  [0x2144]={
@@ -58611,7 +58611,7 @@ characters.data={
   description="TURNED SANS-SERIF CAPITAL Y",
   direction="on",
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   unicodeslot=0x2144,
  },
  [0x2145]={
@@ -58669,7 +58669,7 @@ characters.data={
   description="PROPERTY LINE",
   direction="on",
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="PropertyLine",
   unicodeslot=0x214A,
  },
@@ -59604,7 +59604,7 @@ characters.data={
   direction="on",
   linebreak="al",
   mathextensible="v",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="updownarrowbar",
   unicodeslot=0x21A8,
  },
@@ -59725,7 +59725,7 @@ characters.data={
   direction="on",
   linebreak="al",
   mathextensible="m",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="linefeed",
   unicodeslot=0x21B4,
  },
@@ -59737,7 +59737,7 @@ characters.data={
   direction="on",
   linebreak="al",
   mathextensible="m",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="carriagereturn",
   unicodeslot=0x21B5,
  },
@@ -60282,7 +60282,7 @@ characters.data={
   direction="on",
   linebreak="al",
   mathextensible="l",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="leftwhitearrow",
   unicodeslot=0x21E6,
  },
@@ -60294,7 +60294,7 @@ characters.data={
   direction="on",
   linebreak="al",
   mathextensible="u",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="upwhitearrow",
   unicodeslot=0x21E7,
  },
@@ -60305,7 +60305,7 @@ characters.data={
   direction="on",
   linebreak="al",
   mathextensible="r",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="rightwhitearrow",
   unicodeslot=0x21E8,
  },
@@ -60316,7 +60316,7 @@ characters.data={
   direction="on",
   linebreak="al",
   mathextensible="d",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="downwhitearrow",
   unicodeslot=0x21E9,
  },
@@ -60334,7 +60334,7 @@ characters.data={
   direction="on",
   linebreak="al",
   mathextensible="u",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="whitearrowupfrombar",
   unicodeslot=0x21EB,
  },
@@ -60521,7 +60521,7 @@ characters.data={
   description="FOR ALL",
   direction="on",
   linebreak="ai",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="forall",
   unicodeslot=0x2200,
  },
@@ -60530,7 +60530,7 @@ characters.data={
   description="COMPLEMENT",
   direction="on",
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="complement",
   unicodeslot=0x2201,
  },
@@ -60552,7 +60552,7 @@ characters.data={
   description="THERE EXISTS",
   direction="on",
   linebreak="ai",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="exists",
   unicodeslot=0x2203,
  },
@@ -60561,7 +60561,7 @@ characters.data={
   description="THERE DOES NOT EXIST",
   direction="on",
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="nexists",
   specials={ "char", 0x2203, 0x0338 },
   unicodeslot=0x2204,
@@ -60760,7 +60760,7 @@ characters.data={
   adobename="divisionslash",
   category="sm",
   cjkwd="a",
-  comment="mathclass=ord,mathname=diagup",
+  comment="mathclass=ordinary,mathname=diagup",
   description="DIVISION SLASH",
   direction="on",
   linebreak="ai",
@@ -60769,7 +60769,7 @@ characters.data={
  },
  [0x2216]={
   category="sm",
-  comment="mathclass=ord,mathname=diagdown",
+  comment="mathclass=ordinary,mathname=diagdown",
   description="SET MINUS",
   direction="on",
   linebreak="al",
@@ -60864,7 +60864,7 @@ characters.data={
   description="RIGHT ANGLE",
   direction="on",
   linebreak="ai",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="rightangle",
   unicodeslot=0x221F,
  },
@@ -60875,7 +60875,7 @@ characters.data={
   description="ANGLE",
   direction="on",
   linebreak="ai",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="angle",
   unicodeslot=0x2220,
  },
@@ -60884,7 +60884,7 @@ characters.data={
   description="MEASURED ANGLE",
   direction="on",
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="measuredangle",
   unicodeslot=0x2221,
  },
@@ -60893,7 +60893,7 @@ characters.data={
   description="SPHERICAL ANGLE",
   direction="on",
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="sphericalangle",
   unicodeslot=0x2222,
  },
@@ -63274,7 +63274,7 @@ characters.data={
   description="DIAMETER SIGN",
   direction="on",
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="varnothing",
   unicodeslot=0x2300,
  },
@@ -66464,7 +66464,7 @@ characters.data={
   direction="l",
   lccode=0x24E1,
   linebreak="ai",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="circledR",
   specials={ "circle", 0x0052 },
   unicodeslot=0x24C7,
@@ -66477,7 +66477,7 @@ characters.data={
   direction="l",
   lccode=0x24E2,
   linebreak="ai",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="circledS",
   specials={ "circle", 0x0053 },
   unicodeslot=0x24C8,
@@ -68328,7 +68328,7 @@ characters.data={
   description="BLACK SQUARE",
   direction="on",
   linebreak="ai",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="blacksquare",
   unicodeslot=0x25A0,
  },
@@ -68341,11 +68341,11 @@ characters.data={
   linebreak="ai",
   mathspec={
    {
-    class="ord",
+    class="ordinary",
     name="square",
    },
    {
-    class="ord",
+    class="ordinary",
     name="Box",
    },
   },
@@ -68356,7 +68356,7 @@ characters.data={
   description="WHITE SQUARE WITH ROUNDED CORNERS",
   direction="on",
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   unicodeslot=0x25A2,
  },
  [0x25A3]={
@@ -68501,7 +68501,7 @@ characters.data={
   linebreak="ai",
   mathspec={
    {
-    class="ord",
+    class="ordinary",
     name="triangle",
    },
    {
@@ -68717,7 +68717,7 @@ characters.data={
   description="LOZENGE",
   direction="on",
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="lozenge",
   unicodeslot=0x25CA,
  },
@@ -69160,7 +69160,7 @@ characters.data={
   description="BLACK STAR",
   direction="on",
   linebreak="ai",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="bigstar",
   unicodeslot=0x2605,
  },
@@ -69885,7 +69885,7 @@ characters.data={
   description="BLACK DIAMOND SUIT",
   direction="on",
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="blacklozenge",
   unicodeslot=0x2666,
  },
@@ -140213,7 +140213,7 @@ characters.data={
   description="CUNEIFORM SIGN ARAD TIMES KUR",
   direction="l",
   linebreak="al",
-  mathclass="ord",
+  mathclass="ordinary",
   mathname="backprime",
   unicodeslot=0x12035,
  },
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 7d8fe2311..6886f69f6 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{2013.01.08 19:28}
+\newcontextversion{2013.01.09 10:51}
 
 %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 6be11d865..39ae9a61a 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{2013.01.08 19:28}
+\newcontextversion{2013.01.09 10:51}
 
 %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
deleted file mode 100644
index 953d4925a..000000000
--- a/tex/context/base/context-version.pdf
+++ /dev/null
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 42f092e60..3bd028c60 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{2013.01.08 19:28}
+\edef\contextversion{2013.01.09 10:51}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index a8daeb3fd..f86564fd3 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.01.08 19:28}
+\edef\contextversion{2013.01.09 10:51}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/file-job.lua b/tex/context/base/file-job.lua
index f05be5708..572697443 100644
--- a/tex/context/base/file-job.lua
+++ b/tex/context/base/file-job.lua
@@ -911,3 +911,11 @@ function commands.logoptions()
     end
     write_nl("log","%\n% end of command line files\n\n")
 end
+
+function commands.doifelsecontinuewithfile(inpname)
+    local continue = addsuffix(inpname,"tex") == addsuffix(environment.jobname,"tex")
+    if continue then
+        report_system("continuing input file %q",inpname)
+    end
+    commands.doifelse(continue)
+end
diff --git a/tex/context/base/file-job.mkvi b/tex/context/base/file-job.mkvi
index b488ee4eb..3434e06f0 100644
--- a/tex/context/base/file-job.mkvi
+++ b/tex/context/base/file-job.mkvi
@@ -195,8 +195,7 @@
 
 %D Handy for modules that have a test/demo appended.
 
-\def\continueifinputfile#name{\doifnot\inputfilename{#name}\endinput} % will be lua call ./ check
-%def\processifinputfile #name{\doif   \inputfilename{#name}}
+\unexpanded\def\continueifinputfile#name{\ctxcommand{doifelsecontinuewithfile("#name")}\relax\endinput} % we cannot do \endinput via lua
 
 % \startproject test
 %     1: \startmode[*project] project \stopmode \endgraf
diff --git a/tex/context/base/grph-inc.lua b/tex/context/base/grph-inc.lua
index c8a4bcf1a..4701e224f 100644
--- a/tex/context/base/grph-inc.lua
+++ b/tex/context/base/grph-inc.lua
@@ -1249,6 +1249,7 @@ local epstopdf = {
         [variables.high]   = "prepress",
     },
     command = os.type == "windows" and "gswin32c" or "gs",
+    -- -dProcessDSCComments=false
     argument = [[
         -q
         -sDEVICE=pdfwrite
diff --git a/tex/context/base/math-ini.lua b/tex/context/base/math-ini.lua
index 22a079337..1602b387e 100644
--- a/tex/context/base/math-ini.lua
+++ b/tex/context/base/math-ini.lua
@@ -64,6 +64,22 @@ local classes = allocate {
     box       =  0,  -- mathboxcomm     @@mathboxcomm
     limop     =  1,  -- mathlimopcomm   @@mathlimopcomm
     nolop     =  1,  -- mathnolopcomm   @@mathnolopcomm
+    --
+    ordinary    = 0, -- ord
+    alphabetic  = 7, -- alpha
+    unknown     = 0, -- nothing
+    default     = 0, -- nothing
+    punctuation = 6, -- punct
+    normal      = 0, -- nothing
+    opening     = 4, -- open
+    closing     = 5, -- close
+    binary      = 2, -- bin
+    relation    = 3, -- rel
+    fence       = 0, -- unknown
+    diacritic   = 8, -- accent
+    large       = 1, -- op
+    variable    = 7, -- alphabetic
+    number      = 7, -- alphabetic
 }
 
 local accents = allocate {
@@ -104,21 +120,6 @@ mathematics.codes           = codes
 -----------.accents         = codes
 mathematics.families        = families
 
-classes.alphabetic  = classes.alpha
-classes.unknown     = classes.nothing
-classes.default     = classes.nothing
-classes.punctuation = classes.punct
-classes.normal      = classes.nothing
-classes.opening     = classes.open
-classes.closing     = classes.close
-classes.binary      = classes.bin
-classes.relation    = classes.rel
-classes.fence       = classes.unknown
-classes.diacritic   = classes.accent
-classes.large       = classes.op
-classes.variable    = classes.alphabetic
-classes.number      = classes.alphabetic
-
 -- there will be proper functions soon (and we will move this code in-line)
 -- no need for " in class and family (saves space)
 
diff --git a/tex/context/base/math-stc.mkvi b/tex/context/base/math-stc.mkvi
index 557969f4e..622f2ac48 100644
--- a/tex/context/base/math-stc.mkvi
+++ b/tex/context/base/math-stc.mkvi
@@ -687,6 +687,8 @@
       #3%
       \endgroup}}
 
+% These will be defined in char-def as well:
+
 \unexpanded\def\rightarrowfill        {\math_stackers_hacked_fill \relbar                   \relbar                      \rightarrow}
 \unexpanded\def\leftarrowfill         {\math_stackers_hacked_fill \leftarrow                \relbar                      \relbar    }
 \unexpanded\def\rightoverleftarrowfill{\math_stackers_hacked_fill \ctxdoublearrowfillleftend\ctxdoublearrowfillmiddlepart\ctxdoublearrowfillrightend}
diff --git a/tex/context/base/mult-prm.lua b/tex/context/base/mult-prm.lua
index 53d2c75a6..7287b1fb1 100644
--- a/tex/context/base/mult-prm.lua
+++ b/tex/context/base/mult-prm.lua
@@ -1,3 +1,5 @@
+-- the tex table has overlap
+
 return {
  ["aleph"]={
   "AlephVersion",
diff --git a/tex/context/base/s-mat-11.mkiv b/tex/context/base/s-mat-11.mkiv
index 88bfad8ef..862872499 100644
--- a/tex/context/base/s-mat-11.mkiv
+++ b/tex/context/base/s-mat-11.mkiv
@@ -1,17 +1,5 @@
 \usemodule[s][mat-10]
 
-% layout
-
-\setuplayout
-  [width=middle,
-   height=middle,
-   topspace=15mm,
-   backspace=15mm,
-   bottomspace=15mm,
-   header=1cm,
-   headerdistance=0.5cm,
-   footer=0pt]
-
 % rendering
 
 \def\startmathfontlist
@@ -91,6 +79,16 @@
 
 \continueifinputfile{s-mat-11.mkiv}
 
+\setuplayout
+  [width=middle,
+   height=middle,
+   topspace=15mm,
+   backspace=15mm,
+   bottomspace=15mm,
+   header=1cm,
+   headerdistance=0.5cm,
+   footer=0pt]
+
 \starttext
 %     \setupbodyfont[cambria,  12pt] \showmathfontcharacters
 %     \setupbodyfont[lmvirtual,12pt] \showmathfontcharacters
diff --git a/tex/context/base/s-pre-05.tex b/tex/context/base/s-pre-05.tex
index 808112787..ccffd1f4d 100644
--- a/tex/context/base/s-pre-05.tex
+++ b/tex/context/base/s-pre-05.tex
@@ -16,7 +16,7 @@
 %D As all styles sofar, this one has the same structuring
 %D commands.
 
-\startmode[asintended] \setupbodyfont[lbr] \stopmode
+\startmode[asintended] \setupbodyfont[ludicaot] \stopmode
 
 \setupbodyfont[14.4pt]
 
@@ -115,7 +115,7 @@
 \defineoverlay [TitleGraphic] [\useMPgraphic{TitleGraphic}]
 \defineoverlay [NextPage]     [\overlaybutton{forward}]
 
-\def\StartTitlePage%
+\unexpanded\def\StartTitlePage
   {\setupbackgrounds[page][background={color,TitleGraphic,NextPage}]
    \setupbackgrounds[text][text][background=]
    \setupinteraction[menu=off]
@@ -128,7 +128,7 @@
    \vfil
    \let\\=\vfil}
 
-\def\StopTitlePage%
+\unexpanded\def\StopTitlePage
   {\vfil\vfil\vfil
    \stopstandardmakeup
    \setuplayout[width=430pt,rightedge=110pt]
@@ -137,7 +137,7 @@
    \setupbackgrounds[page][background=color]
    \setupbackgrounds[text][text][background={HashFrameA,NextPage}]}
 
-\def\TitlePage#1%
+\unexpanded\def\TitlePage#1%
   {\StartTitlePage#1\StopTitlePage}
 
 %D \macros
@@ -146,8 +146,8 @@
 %D Since the lists are in the menu, we don't honor list
 %D placement macros.
 
-\def\Topics#1{}
-\def\Subjects{}
+\unexpanded\def\Topics#1{}
+\unexpanded\def\Subjects{}
 
 %D \macros
 %D   {Topic, Nopic, Subject}
@@ -217,7 +217,7 @@
   endfor ;
 \stopuseMPgraphic
 
-\doifnotmode{demo}{\endinput}
+\continueifinputfile{s-pre-05.tex}
 
 %D The (rather silly) demo section.
 
diff --git a/tex/context/base/scrn-but.mkvi b/tex/context/base/scrn-but.mkvi
index b20d34c09..fd2da9e08 100644
--- a/tex/context/base/scrn-but.mkvi
+++ b/tex/context/base/scrn-but.mkvi
@@ -934,32 +934,16 @@
 
 %D Lists:
 
-\ifdefined\definelistalternative
-
-    \definelistalternative [\v!left  ] [\c!renderingsetup=strc:lists:rendering:menu]
-    \definelistalternative [\v!right ] [\c!renderingsetup=strc:lists:rendering:menu]
-    \definelistalternative [\v!top   ] [\c!renderingsetup=strc:lists:rendering:menu]
-    \definelistalternative [\v!bottom] [\c!renderingsetup=strc:lists:rendering:menu]
-
-    \startsetups[strc:lists:rendering:menu]
-        \startbut[internal(\currentlistentryinternal)]
-            \limitatetext\currentlistentrytext{\currentlistparameter\c!maxwidth}\unknown
-        \stopbut
-    \stopsetups
-
-\else % will go
-
-    \setvalue{\??listelement\v!left  }{\def\dosomelistelement{\scrn_menu_list_element\v!left  }}
-    \setvalue{\??listelement\v!right }{\def\dosomelistelement{\scrn_menu_list_element\v!right }}
-    \setvalue{\??listelement\v!top   }{\def\dosomelistelement{\scrn_menu_list_element\v!top   }}
-    \setvalue{\??listelement\v!bottom}{\def\dosomelistelement{\scrn_menu_list_element\v!bottom}}
-
-    \def\scrn_menu_list_element#1#2#3#4#5#6#7%
-      {\startbut[internal(#3)]
-         \limitatetext{#5}{\namedlistparameter{#2}\c!maxwidth}\unknown%
-       \stopbut}
-
-\fi
+\definelistalternative [\v!left  ] [\c!renderingsetup=strc:lists:rendering:menu]
+\definelistalternative [\v!right ] [\c!renderingsetup=strc:lists:rendering:menu]
+\definelistalternative [\v!top   ] [\c!renderingsetup=strc:lists:rendering:menu]
+\definelistalternative [\v!bottom] [\c!renderingsetup=strc:lists:rendering:menu]
+
+\startsetups[strc:lists:rendering:menu]
+    \startbut[internal(\currentlistentrylocation)]
+        \limitatetext\currentlistentrytitle{\listparameter\c!maxwidth}\unknown
+    \stopbut
+\stopsetups
 
 %D Sometimes handy:
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 54021878c..1b26e3ffb 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 9be00e003..6dc10dffc 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/syst-aux.mkiv
index 406bbae8b..9a6c75f3c 100644
--- a/tex/context/base/syst-aux.mkiv
+++ b/tex/context/base/syst-aux.mkiv
@@ -58,6 +58,21 @@
 
 \let\unexpanded\normalprotected
 
+% %D \macros
+% %D   {expunded}
+% %D
+% %D \unexpanded\edef\TestA{zzz}
+% %D            \edef\TestB{zzz}
+% %D
+% %D \doifelse {\TestA}                   {\TestB} {WRONG} {OKAY} \par
+% %D \doifelse {\TestA}          {\expunded\TestB} {WRONG} {OKAY} \par
+% %D \doifelse {\expunded\TestA}          {\TestB} {OKAY} {WRONG} \par
+% %D \doifelse {\expunded\TestA} {\expunded\TestB} {OKAY} {WRONG} \par
+
+% %def\expunded#1{\normalexpanded\expandafter{#1}}
+% \def\expunded#1{\expandafter\empty#1} % used within an edef anyway
+
+
 %D As we don't have namespace definers yet, we use a special one:
 
 \newcount\c_syst_helpers_n_of_namespaces \c_syst_helpers_n_of_namespaces\pluseight % 1-8 reserved for catcodes
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 8b36f4a17..c17f6bfc0 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  : 01/08/13 19:28:06
+-- merge date  : 01/09/13 10:51:50
 
 do -- begin closure to overcome local limits and interference