beta 2012.10.16 18:23

1 files changed, 52 insertions, 18 deletions

diff --git a/tex/context/base/m-chart.mkvi b/tex/context/base/m-chart.mkvi
index be9890239..4fb57af97 100644
--- a/tex/context/base/m-chart.mkvi
+++ b/tex/context/base/m-chart.mkvi
@@ -76,6 +76,7 @@
    \c!labeloffset=.5\bodyfontsize,
    \c!commentoffset=.5\bodyfontsize,
    \c!exitoffset=\zeropoint,
+ % \c!split=\v!no,
  % \c!maxwidth=,
  % \c!maxheight=,
  % \c!option=,
@@ -115,13 +116,17 @@
    \c!offset=\FLOWshapeparameter\c!offset]
 
 \setupFLOWsplit
-  [\c!state=\v!stop,
-   \c!marking=\v!on,
+  [\c!dx=0,
+   \c!dy=0,
  % \c!command=,
  % \c!before=,
  % \c!after=,
    \c!nx=3,
-   \c!ny=3]
+   \c!ny=4]
+
+\unexpanded\def\beforeFLOWsplit{\FLOWsplitparameter\c!before}
+\unexpanded\def\afterFLOWsplit {\FLOWsplitparameter\c!after}
+\unexpanded\def\handleFLOWsplit{\FLOWsplitparameter\c!command}
 
 \definecolor [FLOWfocuscolor]      [s=.2]
 \definecolor [FLOWlinecolor]       [s=.5]
@@ -198,7 +203,7 @@
   {\dodoubleempty\module_charts_process}
 
 \def\module_charts_process[#name][#settings]%
-  {\vbox\bgroup
+  {\bgroup % \vbox removed
      \insidefloattrue
      \dontcomplain
      \setupFLOWchart[#settings]%
@@ -226,6 +231,7 @@
             labeloffset     = \number\dimexpr\FLOWchartparameter\c!labeloffset,
             commentoffset   = \number\dimexpr\FLOWchartparameter\c!commentoffset,
             exitoffset      = \number\dimexpr\FLOWchartparameter\c!exitoffset,
+            split           = "\FLOWchartparameter\c!split",
         },
         shape = {
             rulethickness   = \number\dimexpr\FLOWshapeparameter\c!rulethickness,
@@ -250,9 +256,10 @@
         set = {
         },
         split = {
-            state           = "\FLOWsplitparameter\c!state",
             nx              = \number\FLOWsplitparameter\c!nx,
             ny              = \number\FLOWsplitparameter\c!ny,
+            dx              = \number\FLOWsplitparameter\c!dx,
+            dy              = \number\FLOWsplitparameter\c!dy,
             command         = "",
             marking         = "\FLOWsplitparameter\c!marking",
             before          = "",
@@ -328,11 +335,14 @@
    align=,
    set=\setups{flowcell:text:place}]
 
+\def\FLOWx{\getvariable{flowcell:text}{x}} % compatibility (for Willi)
+\def\FLOWy{\getvariable{flowcell:text}{y}} % compatibility (for Willi)
+
 % \c!background={\@@FLOWbackground,\FLOWoverlay},
 
 \defineoverlay
-    [flowcell:figure]
-    [\overlayfigure{\getvariable{flowcell:text}{figure}}]
+  [flowcell:figure]
+  [\overlayfigure{\getvariable{flowcell:text}{figure}}]
 
 \startsetups flowcell:text:place
     \begingroup
@@ -401,18 +411,42 @@
 \defineframed[flowcell:mb][flowcell:base][\c!bottom=,\c!align=\v!middle]
 \defineframed[flowcell:cb][flowcell:base][\c!bottom=,\c!align=\v!middle]
 
-% todo: each cell its own setup
+% \startsetups flowcell:text:user
+%     \setupframed
+%       [flowcell:base]
+%       [background=flowcell]
+%     \definelayer
+%       [flowcell]
+%       [width=\namedframedparameter{flowcell:base}{width},
+%        height=\namedframedparameter{flowcell:base}{height}]
+%     \setlayerframed
+%       [flowcell]
+%       [preset=rightbottom,offset=-2.75ex]
+%       [frame=off]
+%       {\tx\FLOWx.\FLOWy}
+% \stopsetups
+%
+% % or:
+%
+% \setupframed
+%   [flowcell:base]
+%   [background={flowcell-1,flowcell-2}]
+%
+% \defineoverlay
+%   [flowcell-1]
+%   [\directsetup{flowcell-1}]
+%
+% \definelayer
+%   [flowcell-2]
+%   [width=\overlaywidth,
+%    height=\overlayheight]
 %
-% \startsetups flowcell
-%   \definelayer
-%     [flowcell]
-%     [width=\FLOWshapewidth,
-%      height=\FLOWshapeheight]
-%   \setlayerframed
-%     [flowcell]
-%     [preset=rightbottom,offset=1ex]
-%     [frame=off]
-%     {\tx(\FLOWx,\FLOWy)}
+% \startsetups flowcell-1
+%     \setlayerframed
+%       [flowcell-2]
+%       [preset=rightbottom,offset=-2.75ex]
+%       [frame=off]
+%       {\tx\FLOWx.\FLOWy}
 % \stopsetups
 
 %D \starttyping