beta 2012.04.23 21:34

12 files changed, 120 insertions, 36 deletions

diff --git a/tex/context/base/chem-str.mkiv b/tex/context/base/chem-str.mkiv
index 40e631c87..197c13bc6 100644
--- a/tex/context/base/chem-str.mkiv
+++ b/tex/context/base/chem-str.mkiv
@@ -196,7 +196,7 @@
    \ignorespaces}
 
 \appendtoks
-    \setbox\chemicalbox\hbox{\raise\MPlly\onebasepoint\box\chemicalbox}%
+    \setbox\chemicalbox\hbox{\raise\MPlly\box\chemicalbox}%
     \chemicalwidth \wd\chemicalbox
     \chemicalheight\ht\chemicalbox
     \chemicaldepth \dp\chemicalbox
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 8fb40a354..fc75c1445 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{2012.04.23 15:58}
+\newcontextversion{2012.04.23 21:34}
 
 %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 c3ec87d67..24e84ce42 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{2012.04.23 15:58}
+\newcontextversion{2012.04.23 21:34}
 
 %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 0d24263e5..fb49ace64 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 4f24bf5ea..021aab6a3 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 5a707ff4c..8321e1f23 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{2012.04.23 15:58}
+\edef\contextversion{2012.04.23 21:34}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 1de954260..ebbd3bf29 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -23,7 +23,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.04.23 15:58}
+\edef\contextversion{2012.04.23 21:34}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/pack-box.mkiv b/tex/context/base/pack-box.mkiv
index b0af61f05..41a17953b 100644
--- a/tex/context/base/pack-box.mkiv
+++ b/tex/context/base/pack-box.mkiv
@@ -364,7 +364,7 @@
 %  [corner={right,bottom},location={left,top}]
 %  {\framed{gans}}
 %\composedcollector{test}
-
+
 \definecollector
   [caption]
 
@@ -379,7 +379,7 @@
         {\flushnextbox}%
       \setcollector
         [caption][#1]
-        {\getparameters[\??du][#2]%
+        {\getparameters[\??du][\c!style=,\c!color=,#2]%
          \dousestyleparameter\@@dustyle
          \setupinterlinespace
          \framed % watch the special setting of kader/overlay
@@ -407,38 +407,110 @@
 %   {gans}
 %   {\externalfigure[koe][width=3cm]}
 
-\definelayer
-  [caption]
+% lean and mean:
+%
+% \installcorenamespace {layeredtext}
+%
+% \newdimen\d_pack_layeredtexts_width
+% \newdimen\d_pack_layeredtexts_height
+%
+% \definelayer
+%   [\??layeredtextlayer]
+%
+% \setuplayer
+%   [\??layeredtextlayer]%
+%   [\c!width=\d_pack_layeredtexts_width,\c!height=\d_pack_layeredtexts_height]%
+%
+% \unexpanded\def\layeredtext
+%   {\dodoubleempty\dolayeredtext}
+%
+% \def\dolayeredtext[#1][#2]#3%
+%   {\bgroup
+%    \dowithnextbox
+%      {\d_pack_layeredtexts_width \wd\nextbox
+%       \d_pack_layeredtexts_height\ht\nextbox
+%       \begingroup % preserve \nextbox
+%       \setlayer
+%         [\??layeredtextlayer]%
+%         [#1]%
+%         {\getparameters[\??du][\c!style=,\c!color=,#2]%
+%          \dousestyleparameter\@@dustyle
+%          \setupinterlinespace
+%          \framed
+%            [\c!frame=\v!overlay,\c!foregroundcolor=\@@ducolor,\c!foregroundstyle=\@@dustyle,#2]%
+%            {#3}}%
+%       \endgroup
+%       \framed
+%         [\c!offset=\v!overlay,
+%          \c!frame=\v!off,
+%          \c!background={\v!foreground,\??layeredtextlayer},
+%          \c!width=\d_pack_layeredtexts_width,
+%          \c!height=\d_pack_layeredtexts_height]%
+%         {\flushnextbox}%
+%       \egroup}%
+%      \hbox}
+%
+% maybe faster but more code:
+
+\installcorenamespace {layeredtext}
+\installcorenamespace {layeredtextlayer}
+\installcorenamespace {layeredtextframed}
+
+\installsimpleframedcommandhandler \??layeredtext {layeredtext} \??layeredtext
+
+\newdimen\d_pack_layeredtexts_width
+\newdimen\d_pack_layeredtexts_height
+
+\definelayer % private
+  [\??layeredtextlayer]
 
-\def\layeredtext
-  {\dodoubleempty\dolayeredtext}
+\setuplayer % private
+  [\??layeredtextlayer]
+  [\c!width=\d_pack_layeredtexts_width,
+   \c!height=\d_pack_layeredtexts_height]
 
-\def\dolayeredtext[#1][#2]#3%
+\defineframed % private
+  [\??layeredtextframed]
+  [\c!offset=\v!overlay,
+   \c!frame=\v!off,
+   \c!background={\v!foreground,\??layeredtextlayer},
+   \c!width=\d_pack_layeredtexts_width,
+   \c!height=\d_pack_layeredtexts_height]
+
+\setuplayeredtext % public (the attached data, usually small stuff, not the main thing)
+  [\c!frame=\v!overlay,
+   \c!color=,
+   \c!style=,
+   \c!foregroundcolor=\layeredtextparameter\c!color,
+   \c!foregroundstyle=\layeredtextparameter\c!style]
+
+\unexpanded\def\layeredtext
   {\bgroup
+   \let\currentlayeredtext\empty
+   \dodoubleempty\pack_layeredtexts_place}
+
+\unexpanded\def\placelayeredtext[#1]%
+  {\bgroup
+   \edef\currentlayeredtext{#1}%
+   \dodoubleempty\pack_layeredtexts_place}
+
+\def\pack_layeredtexts_place[#1][#2]#3% layersettings content(framed)settings content
+  {\setupcurrentlayeredtext[#2]%
    \dowithnextbox
-     {\!!widtha \nextboxwd
-      \!!heighta\nextboxht
-      \bgroup % preserve \nextbox
-      \setuplayer
-        [caption]
-        [\c!width=\!!widtha,\c!height=\!!heighta]%
+     {\d_pack_layeredtexts_width \wd\nextbox
+      \d_pack_layeredtexts_height\ht\nextbox
+      \begingroup % preserve \nextbox
       \setlayer
-        [caption]
-        [#1]
-        {\getparameters[\??du][#2]%
-         \dousestyleparameter\@@dustyle
-         \setupinterlinespace
-         \framed
-           [\c!frame=\v!overlay,\c!foregroundcolor=\@@ducolor,\c!foregroundstyle=\@@dustyle,#2]
-           {#3}}%
-      \egroup
-      \framed
-        [\c!offset=\v!overlay,
-         \c!frame=\v!off,
-         \c!background={\v!foreground,caption},
-         \c!width=\!!widtha,
-         \c!height=\!!heighta]
-        {\flushnextbox}%
+        [\??layeredtextlayer]%
+        [#1]%
+        {\setfalse\fontattributeisset
+         \uselayeredtextstyleparameter\c!style
+         \ifconditional\fontattributeisset
+           \setupinterlinespace
+         \fi
+         \inheritedlayeredtextframed{#3}}%
+      \endgroup
+      \placeframed[\??layeredtextframed]{\flushnextbox}%
       \egroup}%
      \hbox}
 
@@ -764,6 +836,16 @@
   [\v!middle\v!right]
   [\c!location=\v!left,\c!corner=\v!right,\c!dy=.5\layerheight]
 
+% left and right hanging:
+
+\definelayerpreset
+  [\v!left\v!top\v!left]
+  [\c!location={\v!left,\v!bottom},\c!corner={\v!left,\v!top}]
+
+\definelayerpreset
+  [\v!right\v!top\v!right]
+  [\c!location={\v!right,\v!bottom},\c!corner={\v!right,\v!top}]
+
 \installcorenamespace{alignedboxes}
 
 \unexpanded\def\alignedbox{\dosingleempty\pack_boxes_aligned_box}
diff --git a/tex/context/base/pack-rul.mkiv b/tex/context/base/pack-rul.mkiv
index 29741d189..e6dfa8d5f 100644
--- a/tex/context/base/pack-rul.mkiv
+++ b/tex/context/base/pack-rul.mkiv
@@ -2621,7 +2621,7 @@
 
 \newcount\c_framed_crap
 
-\def\pack_framed_defined_process[#1]% official (not much checking, todo: parent)
+\unexpanded\def\pack_framed_defined_process[#1]% official (not much checking, todo: parent)
   {\bgroup
    \ifcsname\??ol:#1\endcsname
      \expandafter\let\expandafter\c_framed_temp\csname\??ol:#1\endcsname
@@ -2632,6 +2632,8 @@
    \expandafter\def\csname\??ol#1:\the\c_framed_temp\s!parent\endcsname{\??ol#1}% \inheritlocalframed
    \dodoubleempty\pack_framed_process[\??ol#1:\the\c_framed_temp]}
 
+\let\placeframed\pack_framed_defined_process % new per 2012/04/23
+
 %D We can do:
 %D
 %D \starttyping
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 5db71ebeb..86fea9868 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 c53a0179f..d16400c6d 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 c4939d8ba..fbe7a47d6 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  : 04/23/12 15:58:30
+-- merge date  : 04/23/12 21:34:35
 
 do -- begin closure to overcome local limits and interference