beta 2011.01.13 10:20

10 files changed, 146 insertions, 134 deletions

diff --git a/tex/context/base/catc-ctx.tex b/tex/context/base/catc-ctx.tex
index f3cbece13..1216dba9d 100644
--- a/tex/context/base/catc-ctx.tex
+++ b/tex/context/base/catc-ctx.tex
@@ -22,65 +22,64 @@
 \ifdefined \typcatcodesc \else \newcatcodetable \typcatcodesc \fi % delimited
 
 \startcatcodetable \ctxcatcodes
-    \catcode\tabasciicode      \spacecatcode
-    \catcode\endoflineasciicode\endoflinecatcode
-    \catcode\formfeedasciicode \endoflinecatcode
-    \catcode\spaceasciicode    \spacecatcode
-  % \catcode\newlineasciicode  \spacecatcode
-    \catcode\endoffileasciicode\ignorecatcode
-    \catcode`\\                \escapecatcode
-    \catcode`\{                \begingroupcatcode
-    \catcode`\}                \endgroupcatcode
-    \catcode`\$                \mathshiftcatcode
-    \catcode`\&                \alignmentcatcode
-    \catcode`\#                \parametercatcode
-    \catcode`\^                \superscriptcatcode
-    \catcode`\_                \subscriptcatcode
-    \catcode`\%                \commentcatcode
-    \catcode`\~                \activecatcode
-    \catcode`\|                \activecatcode
+    \catcode\tabasciicode       \spacecatcode
+    \catcode\endoflineasciicode \endoflinecatcode
+    \catcode\formfeedasciicode  \endoflinecatcode
+    \catcode\spaceasciicode     \spacecatcode
+    \catcode\endoffileasciicode \ignorecatcode
+    \catcode\caretasciicode     \superscriptcatcode
+    \catcode\underscoreasciicode\subscriptcatcode
+    \catcode\ampersandasciicode \alignmentcatcode
+    \catcode`\\                 \escapecatcode
+    \catcode`\{                 \begingroupcatcode
+    \catcode`\}                 \endgroupcatcode
+    \catcode`\$                 \mathshiftcatcode
+    \catcode`\#                 \parametercatcode
+    \catcode`\%                 \commentcatcode
+    \catcode`\~                 \activecatcode
+    \catcode`\|                 \activecatcode
 \stopcatcodetable
 
 \startcatcodetable \prtcatcodes
-    \catcode\tabasciicode      \spacecatcode
-    \catcode\endoflineasciicode\endoflinecatcode
-    \catcode\formfeedasciicode \endoflinecatcode
-    \catcode\spaceasciicode    \spacecatcode
-    \catcode\endoffileasciicode\ignorecatcode
-    \catcode`\\                \escapecatcode
-    \catcode`\{                \begingroupcatcode
-    \catcode`\}                \endgroupcatcode
-    \catcode`\$                \mathshiftcatcode
-    \catcode`\&                \alignmentcatcode
-    \catcode`\#                \parametercatcode
-    \catcode`\^                \superscriptcatcode % soon we will also get rid of the usage of ^^ so then ^ can also be other
-    \catcode`\_                \ifnum\texengine=\luatexengine\lettercatcode \else \subscriptcatcode \fi
-    \catcode`\%                \commentcatcode
-    \catcode`\@                \lettercatcode
-    \catcode`\!                \lettercatcode
-    \catcode`\?                \lettercatcode
-    \catcode`\~                \activecatcode
-    \catcode`\|                \activecatcode
+    \catcode\tabasciicode       \spacecatcode
+    \catcode\endoflineasciicode \endoflinecatcode
+    \catcode\formfeedasciicode  \endoflinecatcode
+    \catcode\spaceasciicode     \spacecatcode
+    \catcode\endoffileasciicode \ignorecatcode
+    \catcode\caretasciicode     \superscriptcatcode % soon we will also get rid of the usage of ^^ so then ^ can also be other
+    \catcode\underscoreasciicode\ifnum\texengine=\luatexengine\lettercatcode \else \subscriptcatcode \fi
+    \catcode\ampersandasciicode \alignmentcatcode
+    \catcode`\\                 \escapecatcode
+    \catcode`\{                 \begingroupcatcode
+    \catcode`\}                 \endgroupcatcode
+    \catcode`\$                 \mathshiftcatcode
+    \catcode`\#                 \parametercatcode
+    \catcode`\%                 \commentcatcode
+    \catcode`\@                 \lettercatcode
+    \catcode`\!                 \lettercatcode
+    \catcode`\?                 \lettercatcode
+    \catcode`\~                 \activecatcode
+    \catcode`\|                 \activecatcode
 \stopcatcodetable
 
 \startcatcodetable \mthcatcodes
-    \catcode\tabasciicode      \spacecatcode
-    \catcode\endoflineasciicode\endoflinecatcode
-   %\catcode\newlineasciicode  \spacecatcode
-    \catcode\formfeedasciicode \endoflinecatcode
-    \catcode\spaceasciicode    \spacecatcode
-    \catcode\endoffileasciicode\ignorecatcode
-    \catcode`\\                \escapecatcode
-    \catcode`\{                \begingroupcatcode
-    \catcode`\}                \endgroupcatcode
-    \catcode`\$                \mathshiftcatcode
-    \catcode`\&                \alignmentcatcode
-    \catcode`\#                \parametercatcode
-    \catcode`\^                \superscriptcatcode
-    \catcode`\_                \subscriptcatcode
-    \catcode`\%                \commentcatcode
-   %\catcode`\~                \activecatcode
-   %\catcode`\|                \activecatcode
+    \catcode\tabasciicode       \spacecatcode
+    \catcode\endoflineasciicode \endoflinecatcode
+   %\catcode\newlineasciicode   \spacecatcode
+    \catcode\formfeedasciicode  \endoflinecatcode
+    \catcode\spaceasciicode     \spacecatcode
+    \catcode\endoffileasciicode \ignorecatcode
+    \catcode\caretasciicode     \superscriptcatcode
+    \catcode\underscoreasciicode\subscriptcatcode
+    \catcode\ampersandasciicode \alignmentcatcode
+    \catcode`\\                 \escapecatcode
+    \catcode`\{                 \begingroupcatcode
+    \catcode`\}                 \endgroupcatcode
+    \catcode`\$                 \mathshiftcatcode
+    \catcode`\#                 \parametercatcode
+    \catcode`\%                 \commentcatcode
+   %\catcode`\~                 \activecatcode
+   %\catcode`\|                 \activecatcode
 \stopcatcodetable
 
 \startcatcodetable \typcatcodesa
diff --git a/tex/context/base/catc-def.tex b/tex/context/base/catc-def.tex
index eac2378c0..7db086489 100644
--- a/tex/context/base/catc-def.tex
+++ b/tex/context/base/catc-def.tex
@@ -29,63 +29,63 @@
 \stopcatcodetable
 
 \startcatcodetable \texcatcodes
-    \catcode\tabasciicode      \spacecatcode
-    \catcode\endoflineasciicode\endoflinecatcode
-    \catcode\formfeedasciicode \endoflinecatcode
-    \catcode\spaceasciicode    \spacecatcode
-    \catcode\endoffileasciicode\ignorecatcode
-    \catcode`\\                \escapecatcode
-    \catcode`\{                \begingroupcatcode
-    \catcode`\}                \endgroupcatcode
-    \catcode`\$                \mathshiftcatcode
-    \catcode`\&                \alignmentcatcode
-    \catcode`\#                \parametercatcode
-    \catcode`\^                \superscriptcatcode
-    \catcode`\_                \subscriptcatcode
-    \catcode`\%                \commentcatcode
+    \catcode\tabasciicode       \spacecatcode
+    \catcode\endoflineasciicode \endoflinecatcode
+    \catcode\formfeedasciicode  \endoflinecatcode
+    \catcode\spaceasciicode     \spacecatcode
+    \catcode\endoffileasciicode \ignorecatcode
+    \catcode\caretasciicode     \superscriptcatcode
+    \catcode\underscoreasciicode\subscriptcatcode
+    \catcode\ampersandasciicode \alignmentcatcode
+    \catcode`\\                 \escapecatcode
+    \catcode`\{                 \begingroupcatcode
+    \catcode`\}                 \endgroupcatcode
+    \catcode`\$                 \mathshiftcatcode
+    \catcode`\#                 \parametercatcode
+    \catcode`\%                 \commentcatcode
 \stopcatcodetable
 
 \startcatcodetable \luacatcodes
-    \catcode\tabasciicode      \othercatcode
-    \catcode\endoflineasciicode\othercatcode
-    \catcode\formfeedasciicode \othercatcode
-    \catcode\spaceasciicode    \othercatcode
-    \catcode\endoffileasciicode\ignorecatcode
-    \catcode`\\                \escapecatcode
-    \catcode`\%                \othercatcode
-    \catcode`\#                \othercatcode
-    \catcode`\_                \othercatcode
-    \catcode`\^                \othercatcode
-    \catcode`\&                \othercatcode
-    \catcode`\|                \othercatcode
-    \catcode`\{                \othercatcode
-    \catcode`\}                \othercatcode
-    \catcode`\~                \othercatcode
-    \catcode`\$                \othercatcode
+    \catcode\tabasciicode       \othercatcode
+    \catcode\endoflineasciicode \othercatcode
+    \catcode\formfeedasciicode  \othercatcode
+    \catcode\spaceasciicode     \othercatcode
+    \catcode\endoffileasciicode \ignorecatcode
+    \catcode\caretasciicode     \othercatcode
+    \catcode\underscoreasciicode\othercatcode
+    \catcode\ampersandasciicode \othercatcode
+    \catcode`\\                 \escapecatcode
+    \catcode`\%                 \othercatcode
+    \catcode`\#                 \othercatcode
+    \catcode`\|                 \othercatcode
+    \catcode`\{                 \othercatcode
+    \catcode`\}                 \othercatcode
+    \catcode`\~                 \othercatcode
+    \catcode`\$                 \othercatcode
 \stopcatcodetable
 
 \startcatcodetable \notcatcodes % probably less needed
-    \catcode\tabasciicode      \spacecatcode
-    \catcode\endoflineasciicode\endoflinecatcode
-    \catcode\formfeedasciicode \endoflinecatcode
-    \catcode\spaceasciicode    \spacecatcode
-    \catcode\endoffileasciicode\ignorecatcode
-    \catcode`\~                \othercatcode
-    \catcode`\#                \othercatcode
-    \catcode`\$                \othercatcode
-    \catcode`\%                \othercatcode
-    \catcode`\^                \othercatcode
-    \catcode`\&                \othercatcode
-    \catcode`\_                \othercatcode
-    \catcode`\<                \othercatcode
-    \catcode`\>                \othercatcode
-    \catcode`\{                \othercatcode
-    \catcode`\}                \othercatcode
-    \catcode`\"                \othercatcode
-    \catcode`\'                \othercatcode
-    \catcode`\/                \othercatcode
-    \catcode`\\                \othercatcode
-    \catcode`\|                \othercatcode
+    \catcode\tabasciicode       \spacecatcode
+    \catcode\endoflineasciicode \endoflinecatcode
+    \catcode\formfeedasciicode  \endoflinecatcode
+    \catcode\spaceasciicode     \spacecatcode
+    \catcode\endoffileasciicode \ignorecatcode
+    \catcode\caretasciicode     \othercatcode
+    \catcode\underscoreasciicode\othercatcode
+    \catcode\ampersandasciicode \othercatcode
+    \catcode`\~                 \othercatcode
+    \catcode`\#                 \othercatcode
+    \catcode`\$                 \othercatcode
+    \catcode`\%                 \othercatcode
+    \catcode`\<                 \othercatcode
+    \catcode`\>                 \othercatcode
+    \catcode`\{                 \othercatcode
+    \catcode`\}                 \othercatcode
+    \catcode`\"                 \othercatcode
+    \catcode`\'                 \othercatcode
+    \catcode`\/                 \othercatcode
+    \catcode`\\                 \othercatcode
+    \catcode`\|                 \othercatcode
 \stopcatcodetable
 
 \startcatcodetable \vrbcatcodes % probably less needed
@@ -97,39 +97,39 @@
 \stopcatcodetable
 
 \startcatcodetable \prtcatcodes
-    \catcode\tabasciicode      \spacecatcode
-    \catcode\endoflineasciicode\endoflinecatcode
-    \catcode\formfeedasciicode \endoflinecatcode
-    \catcode\spaceasciicode    \spacecatcode
-    \catcode\endoffileasciicode\ignorecatcode
-    \catcode`\\                \escapecatcode
-    \catcode`\{                \begingroupcatcode
-    \catcode`\}                \endgroupcatcode
-    \catcode`\$                \mathshiftcatcode
-    \catcode`\&                \alignmentcatcode
-    \catcode`\#                \parametercatcode
-    \catcode`\^                \superscriptcatcode
-    \catcode`\_                \subscriptcatcode
-    \catcode`\%                \commentcatcode
-    \catcode`\@                \lettercatcode
-    \catcode`\!                \lettercatcode
-    \catcode`\?                \lettercatcode
-    \catcode`\~                \activecatcode
-    \catcode`\|                \activecatcode
+    \catcode\tabasciicode       \spacecatcode
+    \catcode\endoflineasciicode \endoflinecatcode
+    \catcode\formfeedasciicode  \endoflinecatcode
+    \catcode\spaceasciicode     \spacecatcode
+    \catcode\endoffileasciicode \ignorecatcode
+    \catcode\caretasciicode     \superscriptcatcode
+    \catcode\underscoreasciicode\subscriptcatcode
+    \catcode\ampersandasciicode \alignmentcatcode
+    \catcode`\\                 \escapecatcode
+    \catcode`\{                 \begingroupcatcode
+    \catcode`\}                 \endgroupcatcode
+    \catcode`\$                 \mathshiftcatcode
+    \catcode`\#                 \parametercatcode
+    \catcode`\%                 \commentcatcode
+    \catcode`\@                 \lettercatcode
+    \catcode`\!                 \lettercatcode
+    \catcode`\?                 \lettercatcode
+    \catcode`\~                 \activecatcode
+    \catcode`\|                 \activecatcode
 \stopcatcodetable
 
 %D Because some characters have a special meaning, we provide
 %D shortcuts to their character representation.
 
+\chardef\^=\caretasciicode
+\chardef\_=\underscoreasciicode % but way too wide in lm, so ... until that's fixed:
+\chardef\&=\ampersandasciicode
 \chardef\%=`\%
-\chardef\&=`\&
 \chardef\#=`\#
 \chardef\$=`\$
 \chardef\{=`\{
 \chardef\}=`\}
 \chardef\\=`\\
-\chardef\^=`\^
-\chardef\_=`\_ % but way too wide in lm, so ... until that's fixed:
 
 %def\_{\leavevmode     \kern.06em \vbox{\hrule width.3em}}
 \def\_{\dontleavehmode \kern.06em \vbox{\hrule width.3em}}
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 91cb0357f..99bca8f23 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2011.01.12 10:20}
+\newcontextversion{2011.01.13 10:20}
 
 %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.tex b/tex/context/base/context.tex
index 4b5c54189..986e5122c 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.01.12 10:20}
+\edef\contextversion{2011.01.13 10:20}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/math-dim.lua b/tex/context/base/math-dim.lua
index f21575a1d..604d390da 100644
--- a/tex/context/base/math-dim.lua
+++ b/tex/context/base/math-dim.lua
@@ -9,6 +9,16 @@ if not modules then modules = { } end modules ['math-dim'] = {
 -- Beware: only Taco really understands in depth what these dimensions do so
 -- if you run into problems ...
 
+-- The radical_rule value is also used as a trigger. In luatex the accent
+-- placement happens either the opentype way (using top_accent cum suis) or the
+-- traditional way. In order to determine what method to use the \Umathradicalrule
+-- setting is consulted to determine what method to use. This is more efficient
+-- than analyzing the (potentially spread over multiple families) situation. For
+-- this reason we need to set the radical_rule here. It used to be "<unset>" in
+-- which case the engine takes the rulethickness. In c-speak:
+--
+-- int compat_mode = (radical_rule(cur_style) == undefined_math_parameter) ;
+
 local abs, next = math.abs, next
 
 local defaults = {
@@ -85,7 +95,8 @@ local defaults = {
         ['default']={ "RadicalExtraAscender", "default_rule_thickness" },
      },
     ['radical_rule']={
-        ['default']={ "RadicalRuleThickness", "<not set>" },
+        ['default']={ "RadicalRuleThickness", "default_rule_thickness" },
+     -- ['default']={ "surd_height(f)", "default_rule_thickness" },
      },
     ['radical_vgap']={
         ['default']={ "RadicalVerticalGap", "default_rule_thickness+(abs(default_rule_thickness)/4)" },
diff --git a/tex/context/base/math-vfu.lua b/tex/context/base/math-vfu.lua
index 324ba2b05..d90044687 100644
--- a/tex/context/base/math-vfu.lua
+++ b/tex/context/base/math-vfu.lua
@@ -684,8 +684,8 @@ function vfmath.define(specification,set,variables)
     main.type = "virtual" -- not needed
     mathematics.scaleparameters(main,main,1)
     main.nomath = false
---~ print(table.serialize(characters[0x222B]))
---~ table.print(main.MathConstants)
+ -- table.print(characters[0x222B])
+ -- table.print(main.MathConstants)
     return main
 end
 
diff --git a/tex/context/base/page-imp.mkii b/tex/context/base/page-imp.mkii
index e4ece04a6..11ef561e2 100644
--- a/tex/context/base/page-imp.mkii
+++ b/tex/context/base/page-imp.mkii
@@ -355,7 +355,7 @@
      \pusharrangedpageTWO\poparrangedpagesTWO\handlearrangedpageTWODOWN}
 
 \installpagearrangement 2*4*2 % one defined by Willy Egger:
-  {\dosetuparrangement{2}{2}{4}{3}{2}%
+  {\dosetuparrangement{2}{2}{4}{3}{3}%
      \pusharrangedpageSIXTEENTWO\poparrangedpagesAtoD\relax}
 
 \installpagearrangement 2*2*4 % onother one of Willy Egger
diff --git a/tex/context/base/page-imp.mkiv b/tex/context/base/page-imp.mkiv
index e58bac45d..d1d8a7f4d 100644
--- a/tex/context/base/page-imp.mkiv
+++ b/tex/context/base/page-imp.mkiv
@@ -365,7 +365,7 @@
      \pusharrangedpageTWO\poparrangedpagesTWO\handlearrangedpageTWODOWN}
 
 \installpagearrangement 2*4*2 % one defined by Willy Egger:
-  {\dosetuparrangement{2}{2}{4}{3}{2}%
+  {\dosetuparrangement{2}{2}{4}{3}{3}%
      \pusharrangedpageSIXTEENTWO\poparrangedpagesAtoD\relax}
 
 \installpagearrangement 2*2*4 % onother one of Willy Egger
diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/syst-aux.mkiv
index 406418aea..9c6dff663 100644
--- a/tex/context/base/syst-aux.mkiv
+++ b/tex/context/base/syst-aux.mkiv
@@ -2965,6 +2965,8 @@
 
 \egroup
 
+% This is a first variant, more might be added:
+
 \def\starttexcode{\unprotect}
 \def\stoptexcode {\protect}
 
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 2f174bc11..65f20d760 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  : 01/12/11 10:20:47
+-- merge date  : 01/13/11 10:20:58
 
 do -- begin closure to overcome local limits and interference