beta 2011.08.21 17:39

17 files changed, 37 insertions, 33 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 6bbb35385..52fb50c69 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{2011.08.21 16:42}
+\newcontextversion{2011.08.21 17:39}
 
 %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 d64d35449..d426ed4e0 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{2011.08.21 16:42}
+\newcontextversion{2011.08.21 17:39}
 
 %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-version.pdf b/tex/context/base/context-version.pdf
index 08f6455d4..2150cb835 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index b0c5e221d..d8f365f7d 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 41dc4ce3d..61426070f 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{2011.08.21 16:42}
+\edef\contextversion{2011.08.21 17:39}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index e61511f5e..fa40575fb 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.08.21 16:42}
+\edef\contextversion{2011.08.21 17:39}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/pack-rul.mkiv b/tex/context/base/pack-rul.mkiv
index babcc446a..00d8854f9 100644
--- a/tex/context/base/pack-rul.mkiv
+++ b/tex/context/base/pack-rul.mkiv
@@ -885,7 +885,7 @@
    \getparameters[\@@framed][#2]% here !
    \dodolocalframed}
 
-\def\installinheritedframed#1#2%
+\def\installinheritedframed#1%
   {\normalexpanded{\doinstallinheritedframed
      \expandafter\noexpand\csname current#1\endcsname
      \expandafter\noexpand\csname #1parameter\endcsname
@@ -894,7 +894,7 @@
      \expandafter\noexpand\csname do#1parentparameter\endcsname
      \expandafter\noexpand\csname do#1rootparameter\endcsname
      \expandafter\noexpand\csname inherited#1framed\endcsname
-     \noexpand{#2}}}
+     \noexpand\??oi}} % if needed we can have a variant
 
 \unexpanded\def\doinstallinheritedframed#1#2#3#4#5#6#7#8%
   {\def#5##1##2{\ifx##1\relax#6{##2}\else#4##1{##2}\fi}%
diff --git a/tex/context/base/scrn-bar.mkvi b/tex/context/base/scrn-bar.mkvi
index 5c10e0277..e0b26f087 100644
--- a/tex/context/base/scrn-bar.mkvi
+++ b/tex/context/base/scrn-bar.mkvi
@@ -59,7 +59,7 @@
 
 \installcommandhandler \??ib {interactionbar} \??ib
 
-\presetlocalframed[\namedinteractionbarhash\empty]
+\installinheritedframed {interactionbar}
 
 \unexpanded\def\interactionbar
   {\dodoubleempty\scrn_bar_direct}
@@ -127,23 +127,24 @@
 \def\scrn_bar_buttons_indeed[#settings][#list]%
   {\begingroup
   %\let\menuparameter\interactionbarparameter
-   \setupinteractionbar[#settings]%
+   \setupcurrentinteractionbar[#settings]%
    \scrn_bar_width\interactionbarparameter\c!width
    \ifdim\scrn_bar_width=\zeropoint
      \scrn_bar_width1.5\emwidth
    \fi
    \doifnothing{\interactionbarparameter\c!height}{\letinteractionbarparameter\c!height\v!broad}%
    \doifnothing{\interactionbarparameter\c!depth }{\letinteractionbarparameter\c!depth\!!zeropoint}%%%
-   \setbox2\hbox{\localframed[\currentinteractionbarhash][\c!background=]{\symbol[\interactionparameter\c!symbolset][\v!previouspage]}}%
+   \letinteractionbarparameter\c!background\empty
+   \setbox2\hbox{\inheritedinteractionbarframed{\symbol[\interactionparameter\c!symbolset][\v!previouspage]}}%
    \!!heighta\ht2 % needed because we default to nothing
-   \setupinteractionbar[\c!strut=\v!no]%
+   \letinteractionbarparameter\c!strut\v!no
    \letinteractionparameter\c!width\zeropoint
    \!!counta\zerocount % new, was 1
    \processallactionsinset
      [#list]
-     [   \v!page=>\advance\!!counta 4,
-      \v!subpage=>\advance\!!counta 4,
-      \s!unknown=>\advance\!!counta 1]%
+     [   \v!page=>\advance\!!counta\plusfour,
+      \v!subpage=>\advance\!!counta\plusfour,
+      \s!unknown=>\advance\!!counta\plusone]%
    \ifdim\scrn_bar_width=\zeropoint
      \!!widtha\dimexpr2\emwidth+\scrn_bar_distance\relax
      \!!widthb\dimexpr\!!counta\!!widtha-\scrn_bar_distance\relax
@@ -179,6 +180,8 @@
      [#action]%
    \hss}
 
+% todo: this will be \letblackruleparameter\c!width\!!widtha (faster)
+
 \def\scrn_bar_alternative_a
   {\scrn_bar_width   \interactionbarparameter\c!width
    \scrn_bar_distance\interactionbarparameter\c!distance
diff --git a/tex/context/base/scrn-but.mkvi b/tex/context/base/scrn-but.mkvi
index 3e658a439..67b92ce7a 100644
--- a/tex/context/base/scrn-but.mkvi
+++ b/tex/context/base/scrn-but.mkvi
@@ -46,7 +46,7 @@
 
 \installcommandhandler \??bt {button} \??bt
 
-\installinheritedframed {button} \??oi
+\installinheritedframed {button}
 
 \let\setupbuttons\setupbutton
 
@@ -320,7 +320,7 @@
 
 \installcommandhandler \??am {interactionmenu} \??am
 
-\installinheritedframed {interactionmenu} \??oi
+\installinheritedframed {interactionmenu}
 
 \let\setupinteractionmenus\setupinteractionmenu
 
diff --git a/tex/context/base/scrn-fld.mkvi b/tex/context/base/scrn-fld.mkvi
index e44a10195..452f4ca3c 100644
--- a/tex/context/base/scrn-fld.mkvi
+++ b/tex/context/base/scrn-fld.mkvi
@@ -384,9 +384,9 @@
 \installsetuphandler         \??wc {fieldcontentframed}
 \installsetuphandler         \??wt {fieldtotalframed}
 
-\installinheritedframed {fieldlabelframed}   \??oi
-\installinheritedframed {fieldcontentframed} \??oi
-\installinheritedframed {fieldtotalframed}   \??oi
+\installinheritedframed {fieldlabelframed}
+\installinheritedframed {fieldcontentframed}
+\installinheritedframed {fieldtotalframed}
 
 \unexpanded\def\setupfield {\doquintupleempty\scrn_field_setup_field}
 \unexpanded\def\setupfields{\doquadrupleempty\scrn_field_setup_fields}
@@ -641,7 +641,7 @@
 
 \installcommandhandler \??wh {tooltip} \??wh
 
-\installinheritedframed {tooltip} \??oi
+\installinheritedframed {tooltip}
 
 \setuptooltip
   [\c!location=\v!right,
diff --git a/tex/context/base/scrn-hlp.mkvi b/tex/context/base/scrn-hlp.mkvi
index f729a3c73..f5754bf3c 100644
--- a/tex/context/base/scrn-hlp.mkvi
+++ b/tex/context/base/scrn-hlp.mkvi
@@ -62,14 +62,14 @@
 
 \installcommandhandler \??wp {help} \??wp
 
+\installinheritedframed {help}
+
 \setuphelp
   [\c!frame=\v!off,
    \c!align=\v!normal,
    \c!background=\v!color,
    \c!backgroundcolor=gray]
 
-\presetlocalframed[\namedhelphash\empty]
-
 \appendtoks
     \setuevalue         \currenthelp {\scrn_help_argument{\currenthelp}}%
     \setuevalue{\e!start\currenthelp}{\scrn_help_start   {\currenthelp}}%
@@ -114,8 +114,7 @@
    \fi}
 
 \def\scrn_help_register#text%
-  {\setbox\scrn_help_box\hbox
-     {\localframed[\currenthelphash]{#text}}%
+  {\setbox\scrn_help_box\hbox{\inheritedhelpframed{#text}}%
    \definesymbol
      [\currenthelpname]
      [\copy\scrn_help_box]%
diff --git a/tex/context/base/scrn-wid.mkvi b/tex/context/base/scrn-wid.mkvi
index 86152f0c4..09d42673b 100644
--- a/tex/context/base/scrn-wid.mkvi
+++ b/tex/context/base/scrn-wid.mkvi
@@ -348,7 +348,7 @@
 %
 % test
 
-\installcommandhandler\??cc{comment}\??cc
+\installcommandhandler \??cc {comment} \??cc
 
 \newbox\scrn_comment_box_collect
 \newbox\scrn_comment_box_rendering
@@ -371,8 +371,6 @@
    \c!ny=10,
    \c!location=\v!high]
 
-\presetlocalframed[\namedcommenthash\empty]
-
 \appendtoks
     \setuevalue         \currentcomment {\scrn_comment_argument{\currentcomment}}%
     \setuevalue{\e!start\currentcomment}{\scrn_comment_start   {\currentcomment}}%
@@ -588,8 +586,8 @@
 \def\renderingtype  #tag{\ctxlua{interactions.renderings.var("#tag","type")}}
 \def\renderingoption#tag{\ctxlua{interactions.renderings.var("#tag","option")}}
 
-\def\renderingwidth    {8cm} % will become private
-\def\renderingheight   {6cm} % will become private
+\def\renderingwidth {8cm} % will become private
+\def\renderingheight{6cm} % will become private
 
 \unexpanded\def\definerenderingwindow
   {\dodoubleempty\scrn_rendering_define_window}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index fbd70c042..80ac0ab4b 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 b3b0b2935..e35528060 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-lst.mkiv b/tex/context/base/strc-lst.mkiv
index 8083d61ce..bddf90227 100644
--- a/tex/context/base/strc-lst.mkiv
+++ b/tex/context/base/strc-lst.mkiv
@@ -25,6 +25,8 @@
 
 \installcommandhandler \??li {list} \??li
 
+\installinheritedframed {list}
+
 \def\donestedlistattributes#1#2% will change
   {\dosetlistattributes#1#2%
    \ifx\colorattributehash\empty \else
@@ -850,7 +852,9 @@
 \def\dodofixdlistelementE#1%
   {\dodofixdlistelementEFG
      {\setupinteraction[\c!strut=\v!no]}
-     {\localframed[\currentlisthash][\c!depth=\!!zeropoint,\c!color=]}
+     {\letlistparameter\c!depth\!!zeropoint
+      \letlistparameter\c!color\empty
+      \inheritedlistframed}
      {}}
 
 \def\dodofixdlistelementF#1%
diff --git a/tex/context/base/typo-mar.mkiv b/tex/context/base/typo-mar.mkiv
index 4ca69d8c8..c39ddcba9 100644
--- a/tex/context/base/typo-mar.mkiv
+++ b/tex/context/base/typo-mar.mkiv
@@ -99,10 +99,10 @@
 %D argument concerns the data, the second the framed. Not sharing the setup is
 %D on purpose: location, offset, alignment and other parameters might clash.
 
-\installcommandhandler\??mc{margindata}\??mc
-\installcommandhandler\??mf{marginframed}\??mf
+\installcommandhandler \??mc {margindata}   \??mc
+\installcommandhandler \??mf {marginframed} \??mf
 
-\installinheritedframed {marginframed} \??oi
+\installinheritedframed {marginframed}
 
 \setupmargindata
   [\c!location=\v!left,
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index c170403ef..48444f25b 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  : 08/21/11 16:42:58
+-- merge date  : 08/21/11 17:39:11
 
 do -- begin closure to overcome local limits and interference