2015-12-19 22:13:00

11 files changed, 17 insertions, 39 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index fe76643ad..7efa9aaea 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{2015.12.19 14:43}
+\newcontextversion{2015.12.19 22:10}
 
 %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 8b3e2464a..d7aced2f0 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 32f977b1d..fd7379c60 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{2015.12.19 14:43}
+\edef\contextversion{2015.12.19 22:10}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/font-ini.mkvi b/tex/context/base/font-ini.mkvi
index 3248781ec..cf9f63e47 100644
--- a/tex/context/base/font-ini.mkvi
+++ b/tex/context/base/font-ini.mkvi
@@ -486,7 +486,6 @@
 
 \def\font_basics_set_mapped_fontsize#from%
   {\ifcsname\??mappedfontsize\the\dimexpr#from\relax\endcsname
-    %\csname\??mappedfontsize\the\dimexpr#from\relax\endcsname\else#from%
      \lastnamedcs\else#from%
    \fi}
 
@@ -511,10 +510,8 @@
 \def\font_helpers_check_relative_font_size#style%
   {\edef\p_font_rscale
      {\ifcsname\??fontclass\fontclass#style\s!rscale\endcsname
-       %\csname\??fontclass\fontclass#style\s!rscale\endcsname
         \lastnamedcs
       \else\ifcsname\??fontclass\defaultfontclass#style\s!rscale\endcsname % brr
-       %\csname\??fontclass\defaultfontclass#style\s!rscale\endcsname
         \lastnamedcs
       \else
         \v_font_rscale_default
@@ -529,7 +526,6 @@
 
 \def\font_rscale_xx#style%
   {\ifcsname\??fontclass\fontclass#style\s!rscale\endcsname
-    %\csname\??fontclass\fontclass#style\s!rscale\endcsname
      \lastnamedcs
    \else
      \v_font_rscale_default
@@ -537,7 +533,6 @@
 
 \def\font_rscale_mm
   {\ifcsname\??fontclass\fontclass\s!mm\s!rscale\endcsname
-    %\csname\??fontclass\fontclass\s!mm\s!rscale\endcsname
      \lastnamedcs
    \else
      \v_font_rscale_default
@@ -1055,10 +1050,8 @@
 
 \def\currentfontbodysize % gets number (the normal sa 1 etc)
   {\ifcsname\??fontenvironments\fontclass\s!default\somefontsize\endcsname
-    %\csname\??fontenvironments\fontclass\s!default\somefontsize\endcsname
      \lastnamedcs
    \else\ifcsname\??fontenvironments\s!default\somefontsize\endcsname
-    %\csname\??fontenvironments\s!default\somefontsize\endcsname
      \lastnamedcs
    \else
      \somefontsize
@@ -1900,7 +1893,6 @@
 \def\font_helpers_check_strategy_class_a % --- --- --- --- % pt tt bf a
   {\ifcsname\??fontinstanceready\fontclass-\fontbody-\fontstyle-\fontalternative-\fontsize-\fontface\endcsname
      \setfalse\c_font_auto_size
-    %\csname\??fontinstanceready\fontclass-\fontbody-\fontstyle-\fontalternative-\fontsize-\fontface\endcsname
      \lastnamedcs
    \else
      \expandafter\font_helpers_check_strategy_class_b
@@ -1909,7 +1901,6 @@
 \def\font_helpers_check_strategy_class_b % --- --- --- def % pt tt bf
   {\ifcsname\??fontinstanceready\fontclass-\fontbody-\fontstyle-\fontalternative-\defaultfontsize-\fontface\endcsname
      \settrue\c_font_auto_size
-    %\csname\??fontinstanceready\fontclass-\fontbody-\fontstyle-\fontalternative-\defaultfontsize-\fontface\endcsname
      \lastnamedcs
    \else
      \expandafter\font_helpers_check_strategy_class_c
@@ -1918,7 +1909,6 @@
 \def\font_helpers_check_strategy_class_c % --- --- def --- % pt tt tf a
   {\ifcsname\??fontinstanceready\fontclass-\fontbody-\fontstyle-\defaultfontalternative-\fontsize-\fontface\endcsname
      \settrue\c_font_auto_size
-    %\csname\??fontinstanceready\fontclass-\fontbody-\fontstyle-\defaultfontalternative-\fontsize-\fontface\endcsname
      \lastnamedcs
    \else
      \expandafter\font_helpers_check_strategy_class_d
@@ -1927,7 +1917,6 @@
 \def\font_helpers_check_strategy_class_d % --- --- def def % pt tt tf
   {\ifcsname\??fontinstanceready\fontclass-\fontbody-\fontstyle-\defaultfontalternative-\defaultfontsize-\fontface\endcsname
      \settrue\c_font_auto_size
-    %\csname\??fontinstanceready\fontclass-\fontbody-\fontstyle-\defaultfontalternative-\defaultfontsize-\fontface\endcsname
      \lastnamedcs
    \else
      \expandafter\font_helpers_check_strategy_class_e
@@ -1936,17 +1925,14 @@
 \def\font_helpers_check_strategy_class_e % --- def def def % pt rm tf
   {\ifcsname\??fontinstanceready\fontclass-\fontbody-\defaultfontstyle-\defaultfontalternative-\defaultfontsize-\fontface\endcsname
      \setfalse\c_font_auto_size
-    %\csname\??fontinstanceready\fontclass-\fontbody-\defaultfontstyle-\defaultfontalternative-\defaultfontsize-\fontface\endcsname
      \lastnamedcs
    \else
      \expandafter\font_helpers_check_strategy_class_f
-   % \expandafter\font_helpers_check_strategy_a
    \fi}
 
 \def\font_helpers_check_strategy_class_f % def def def def % rm tf
   {\ifcsname\??fontinstanceready\fontclass-\defaultfontbody-\defaultfontstyle-\defaultfontalternative-\defaultfontsize-\fontface\endcsname
      \settrue\c_font_auto_size
-    %\csname\??fontinstanceready\fontclass-\defaultfontbody-\defaultfontstyle-\defaultfontalternative-\defaultfontsize-\fontface\endcsname
      \lastnamedcs
    \else
      \expandafter\font_helpers_check_strategy_a
@@ -1957,7 +1943,6 @@
 \def\font_helpers_check_strategy_a % --- --- --- --- % pt tt bf a
   {\ifcsname\??fontinstanceready\fontbody-\fontstyle-\fontalternative-\fontsize-\fontface\endcsname
      \setfalse\c_font_auto_size
-    %\csname\??fontinstanceready\fontbody-\fontstyle-\fontalternative-\fontsize-\fontface\endcsname
      \lastnamedcs
    \else
      \expandafter\font_helpers_check_strategy_b
@@ -1966,7 +1951,6 @@
 \def\font_helpers_check_strategy_b % --- --- --- --- % pt tt bf a
   {\ifcsname\??fontinstanceready\fontbody-\fontstyle-\fontalternative-\defaultfontsize-\fontface\endcsname
      \settrue\c_font_auto_size
-    %\csname\??fontinstanceready\fontbody-\fontstyle-\fontalternative-\defaultfontsize-\fontface\endcsname
      \lastnamedcs
    \else
      \expandafter\font_helpers_check_strategy_c
@@ -1975,7 +1959,6 @@
 \def\font_helpers_check_strategy_c % --- --- --- --- % pt tt bf a
   {\ifcsname\??fontinstanceready\fontbody-\fontstyle-\defaultfontalternative-\fontsize-\fontface\endcsname
      \settrue\c_font_auto_size
-    %\csname\??fontinstanceready\fontbody-\fontstyle-\defaultfontalternative-\fontsize-\fontface\endcsname
      \lastnamedcs
    \else
      \expandafter\font_helpers_check_strategy_d
@@ -1984,7 +1967,6 @@
 \def\font_helpers_check_strategy_d % --- --- --- --- % pt tt bf a
   {\ifcsname\??fontinstanceready\fontbody-\fontstyle-\defaultfontalternative-\defaultfontsize-\fontface\endcsname
      \settrue\c_font_auto_size
-    %\csname\??fontinstanceready\fontbody-\fontstyle-\defaultfontalternative-\defaultfontsize-\fontface\endcsname
      \lastnamedcs
    \else
      \expandafter\font_helpers_check_strategy_e
@@ -1993,7 +1975,6 @@
 \def\font_helpers_check_strategy_e % --- --- --- --- % pt tt bf a
   {\ifcsname\??fontinstanceready\fontbody-\defaultfontstyle-\defaultfontalternative-\defaultfontsize-\fontface\endcsname
      \setfalse\c_font_auto_size
-    %\csname\??fontinstanceready\fontbody-\defaultfontstyle-\defaultfontalternative-\defaultfontsize-\fontface\endcsname
      \lastnamedcs
    \else
      \expandafter\font_helpers_check_strategy_f
@@ -2002,7 +1983,6 @@
 \def\font_helpers_check_strategy_f % --- --- --- --- % pt tt bf a
   {\ifcsname\??fontinstanceready\defaultfontbody-\defaultfontstyle-\defaultfontalternative-\defaultfontsize-\fontface\endcsname
      \settrue\c_font_auto_size
-    %\csname\??fontinstanceready\defaultfontbody-\defaultfontstyle-\defaultfontalternative-\defaultfontsize-\fontface\endcsname
      \lastnamedcs
    \fi}
 
@@ -2498,7 +2478,6 @@
 
 \unexpanded\def\predefinedfont[#1]% global !
   {\ifcsname\??predefinedfont#1\endcsname
-    %\csname\??predefinedfont#1\endcsname
      \lastnamedcs
    \else
      \font_basics_predefined{#1}%
diff --git a/tex/context/base/font-sel.mkvi b/tex/context/base/font-sel.mkvi
index cd18812d2..eb45ea033 100644
--- a/tex/context/base/font-sel.mkvi
+++ b/tex/context/base/font-sel.mkvi
@@ -108,7 +108,6 @@
 
 \def\selectfont_preset_process#name%
   {\ifcsname\??selectfontpreset#name\endcsname
-    %\csname\??selectfontpreset#name\endcsname
      \lastnamedcs
    \else
      % unknown preset
diff --git a/tex/context/base/font-sty.mkvi b/tex/context/base/font-sty.mkvi
index 8c42d2516..48b81b55a 100644
--- a/tex/context/base/font-sty.mkvi
+++ b/tex/context/base/font-sty.mkvi
@@ -77,7 +77,6 @@
    \fi}
 
 \def\applyalternativestyle#name% public
- %{\ifcsname\??alternativestyles#name\endcsname\csname\??alternativestyles#name\expandafter\endcsname\fi}
   {\begincsname\??alternativestyles#name\endcsname}
 
 %D Maybe too geneneric, but probably ok is the following. (Maybe one
@@ -151,11 +150,9 @@
 \def\font_helpers_do_convert_font
   {\edef\m_current_convert_font_dt{\detokenize\expandafter{\m_current_convert_font}}%
    \ifcsname\??alternativestyles\m_current_convert_font_dt\endcsname
-    %\csname\??alternativestyles\m_current_convert_font_dt\expandafter\endcsname
      \expandafter\lastnamedcs
    \else\ifcsname\m_current_convert_font_dt\endcsname
-     \csname\m_current_convert_font_dt\expandafter\endcsname
-     \expandafter\lastnamedcs
+     \doubleexpandafter\lastnamedcs
    \else
      \doubleexpandafter\m_current_convert_font
    \fi\fi}
@@ -185,7 +182,6 @@
 
 \unexpanded\def\dousestylehashparameter#hash#parameter%
   {\ifcsname#hash#parameter\endcsname
-    %\expandafter\dousestyleparameter\csname#hash#parameter\endcsname
      \expandafter\dousestyleparameter\lastnamedcs
    \fi}
 
@@ -193,10 +189,8 @@
   {\edef\detokenizedstyleparameter{\detokenize\expandafter{\currentstyleparameter}}%
    \settrue\fontattributeisset % reset is done elsewhere
    \ifcsname\??alternativestyles\detokenizedstyleparameter\endcsname
-    %\csname\??alternativestyles\detokenizedstyleparameter\endcsname
      \lastnamedcs
    \else\ifcsname\detokenizedstyleparameter\endcsname
-    %\csname\detokenizedstyleparameter\endcsname
      \lastnamedcs
    \else
      \currentstyleparameter
diff --git a/tex/context/base/font-sym.mkvi b/tex/context/base/font-sym.mkvi
index 4d31b96f8..c1ffd6361 100644
--- a/tex/context/base/font-sym.mkvi
+++ b/tex/context/base/font-sym.mkvi
@@ -135,7 +135,6 @@
 \def\setscaledstyledsymbolicfont#1#2#3% quite a slowdown, glyphfontfile
   {\edef\askedsymbolfont{\truefontname{\glyphfontfile{#3}} at \the\dimexpr#2\dimexpr\currentfontbodyscale\dimexpr#1}%
    \ifcsname\??symbolfont\askedsymbolfont\endcsname
-    %\csname\??symbolfont\askedsymbolfont\endcsname
      \lastnamedcs
    \else
      \font_basics_define_symbolic_font
@@ -144,7 +143,6 @@
 \def\setscaleddirectsymbolicfont#1#2#3% quite a slowdown, glyphfontfile
   {\edef\askedsymbolfont{\truefontname{#3} at \the\dimexpr#2\dimexpr\currentfontbodyscale\dimexpr#1}%
    \ifcsname\??symbolfont\askedsymbolfont\endcsname
-    %\csname\??symbolfont\askedsymbolfont\endcsname
      \lastnamedcs
    \else
      \font_basics_define_symbolic_font
@@ -153,7 +151,6 @@
 \def\setstyledsymbolicfont#fontname% quite a slowdown, glyphfontfile
   {\edef\askedsymbolfont{\truefontname{\glyphfontfile{#fontname}} at \the\dimexpr\currentfontbodyscale\dimexpr\fontbody}%
    \ifcsname\??symbolfont\askedsymbolfont\endcsname
-    %\csname\??symbolfont\askedsymbolfont\endcsname
      \lastnamedcs
    \else
      \font_basics_define_symbolic_font
@@ -162,7 +159,6 @@
 \def\setdirectsymbolicfont#fontname%
   {\edef\askedsymbolfont{\truefontname{#fontname} at \the\dimexpr\currentfontbodyscale\dimexpr\fontbody}%
    \ifcsname\??symbolfont\askedsymbolfont\endcsname
-    %\csname\??symbolfont\askedsymbolfont\endcsname
      \lastnamedcs
    \else
      \font_basics_define_symbolic_font
diff --git a/tex/context/base/node-nut.lua b/tex/context/base/node-nut.lua
index 2edc57c1a..d82a21443 100644
--- a/tex/context/base/node-nut.lua
+++ b/tex/context/base/node-nut.lua
@@ -258,6 +258,16 @@ if not direct.mlist_to_hlist then
 
 end
 
+if not direct.setlist then
+
+    local setfield = nuts.setfield
+
+    function direct.setlist   (n,l) setfield(n,"list",l) end
+    function direct.setleader (n,l) setfield(n,"leader",l) end
+    function direct.setsubtype(n,s) setfield(n,"subtype",s) end
+
+end
+
 nuts.getdisc    = direct.getdisc
 nuts.setdisc    = direct.setdisc
 nuts.setchar    = direct.setchar
@@ -266,9 +276,9 @@ nuts.setprev    = direct.setprev
 nuts.setboth    = direct.setboth
 nuts.getboth    = direct.getboth
 nuts.setlink    = direct.setlink
-nuts.setlist    = direct.setlist    or function(n,l) setfield(n,"list",l) end
-nuts.setleader  = direct.setleader  or function(n,l) setfield(n,"leader",l) end
-nuts.setsubtype = direct.setsubtype or function(n,s) setfield(n,"subtype",s) end
+nuts.setlist    = direct.setlist
+nuts.setleader  = direct.setleader
+nuts.setsubtype = direct.setsubtype
 nuts.is_char    = direct.is_char
 
 local d_remove_node     = direct.remove
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index b83118d5a..e036704e0 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 cb5a71bf9..3a178e16c 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index daa5d02a2..d4707d5c1 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  : 12/19/15 14:43:46
+-- merge date  : 12/19/15 22:10:54
 
 do -- begin closure to overcome local limits and interference