beta 2012.07.04 15:55

10 files changed, 73 insertions, 54 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 95d396b14..d0f9866f6 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.07.04 14:44}
+\newcontextversion{2012.07.04 15:55}
 
 %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 7ba8675f5..bf8b6cade 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.07.04 14:44}
+\newcontextversion{2012.07.04 15:55}
 
 %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 508d9771d..188e91821 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 9b8c7fd31..088c7307e 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 ec464bdf8..a04ed8510 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.07.04 14:44}
+\edef\contextversion{2012.07.04 15:55}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index c0fc2ede4..1fe443acd 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.07.04 14:44}
+\edef\contextversion{2012.07.04 15:55}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 95cd32f6a..ccdffb40f 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 1c316874d..4c6aa1ef2 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-flt.mkvi b/tex/context/base/strc-flt.mkvi
index aaed43b34..3b1dc24ae 100644
--- a/tex/context/base/strc-flt.mkvi
+++ b/tex/context/base/strc-flt.mkvi
@@ -152,7 +152,7 @@
 
 %D Definitions:
 
-\let\saveddefinefloat\definefloat
+\let\strc_floats_define_saved\definefloat
 
 \unexpanded\def\definefloat
   {\dotripleempty\strc_floats_define}
@@ -172,7 +172,7 @@
    \definelist[#1]%
    \presetlabeltext[#1=\Word{#1}~]%
    \presetheadtext[#2=\Word{#2}]%
-   \saveddefinefloat[#1]%
+   \strc_floats_define_saved[#1]%
    \strc_floats_define_commands{#1}{#2}}
 
 \def\strc_floats_define_cloned[#1][#2][#3]%
@@ -181,7 +181,7 @@
    \definelist[#1][#3]%
    \presetlabeltext[#1=\Word{#3}~]%
    \presetheadtext[#2=\Word{#2}]%
-   \saveddefinefloat[#1][#3]%
+   \strc_floats_define_saved[#1][#3]%
    \strc_floats_define_commands{#1}{#2}}
 
 \def\strc_floats_define_commands#1#2%
@@ -654,7 +654,7 @@
    \global\d_page_sides_shift      \zeropoint
    \global\d_page_sides_maximum    \zeropoint
    \global\c_page_sides_method     \floatparameter\c!sidemethod
-   \global\c_page_one_float_method\floatparameter\c!textmethod
+   \global\c_page_one_float_method \floatparameter\c!textmethod
    \global\c_page_sides_align      \zerocount
    \global\c_strc_floats_rotation  \zerocount
    \strc_floats_calculate_skips
@@ -1038,10 +1038,10 @@
    \global\c_page_floats_n_of_bottom                 \rootfloatparameter\c!nbottom
    \endgroup}
 
-\unexpanded\def\betweenfloatblanko% assumes that spaceafter is present
+\unexpanded\def\betweenfloatblanko % assumes that spaceafter is present
   {\blank[\rootfloatparameter\c!spacebefore]} % or v!back,....
 
-\def\doplacefloatbox % used elsewhere
+\unexpanded\def\doplacefloatbox % used elsewhere
   {%\forgetall % NO
    \whitespace
    \blank[\rootfloatparameter\c!spacebefore]
@@ -1510,24 +1510,38 @@
 \def\strc_floats_flush_left_caption_hang
   {\hsmash{\llap{\box\b_strc_floats_caption\dotfskip{\floatcaptionparameter\c!distance}}}}
 
-\def\doflushfloatcaptionhang % expanded can go
-  {\expanded{\doifinsetelse{\v!righthanging}{\floatcaptionparameter\c!location}}
+% \def\strc_floats_flush_caption_hang % expanded can go
+%   {\expanded{\doifinsetelse{\v!righthanging}{\floatcaptionparameter\c!location}}
+%      {\strc_floats_flush_right_caption_hang}
+%      {\expanded{\doifinsetelse{\v!lefthanging}{\floatcaptionparameter\c!location}}
+%         {\strc_floats_flush_left_caption_hang}
+%         {\expanded{\doifinsetelse{\v!hang}{\floatcaptionparameter\c!location}}
+%            {\expanded{\doifinsetelse{\v!outer}{\floatcaptionparameter\c!location}}
+%               {\doifrightpagefloatelse{\strc_floats_flush_right_caption_hang}{\strc_floats_flush_left_caption_hang}}
+%               {\expanded{\doifinsetelse{\v!right}{\floatcaptiondirectives}}
+%                  {\strc_floats_flush_right_caption_hang}
+%                  {\strc_floats_flush_left_caption_hang}}}
+%         {\box\b_strc_floats_caption}}}}
+
+\def\strc_floats_flush_caption_hang % expanded can go
+  {\edef\p_strc_floats_caption_location{\floatcaptionparameter\c!location}%
+   \doifinsetelse\v!righthanging\p_strc_floats_caption_location
      {\strc_floats_flush_right_caption_hang}
-     {\expanded{\doifinsetelse{\v!lefthanging}{\floatcaptionparameter\c!location}}
+     {\doifinsetelse\v!lefthanging\p_strc_floats_caption_location
         {\strc_floats_flush_left_caption_hang}
-        {\expanded{\doifinsetelse{\v!hang}{\floatcaptionparameter\c!location}}
-           {\expanded{\doifinsetelse{\v!outer}{\floatcaptionparameter\c!location}}
+        {\doifinsetelse\v!hang\p_strc_floats_caption_location
+           {\doifinsetelse\v!outer\p_strc_floats_caption_location
               {\doifrightpagefloatelse{\strc_floats_flush_right_caption_hang}{\strc_floats_flush_left_caption_hang}}
-              {\expanded{\doifinsetelse{\v!right}{\floatcaptiondirectives}}
+              {\doifinsetelse\v!right\floatcaptiondirectives
                  {\strc_floats_flush_right_caption_hang}
                  {\strc_floats_flush_left_caption_hang}}}
         {\box\b_strc_floats_caption}}}}
 
 \def\strc_floats_build_box_high
-  {\strc_floats_build_box_next{\strc_floats_between_stack\doflushfloatcaptionhang\vfill}}
+  {\strc_floats_build_box_next{\strc_floats_between_stack\strc_floats_flush_caption_hang\vfill}}
 
 \def\strc_floats_build_box_low
-  {\strc_floats_build_box_next{\vfill\doflushfloatcaptionhang\strc_floats_between_stack}}
+  {\strc_floats_build_box_next{\vfill\strc_floats_flush_caption_hang\strc_floats_between_stack}}
 
 \def\strc_floats_build_box_middle
   {\strc_floats_build_box_next{\vfill\box\b_strc_floats_caption\vfill}}
@@ -1548,43 +1562,47 @@
 %     \placelefty{}{} \input tufte \input tufte
 % \stoptext
 
-\def\strc_floats_build_box_top_stack_normal_indeed
-  {\vbox to \ht\b_strc_floats_content\bgroup
-     \vss
-     \d_strc_float_temp_width\wd\b_strc_floats_content
-     \ifconditional\c_strc_floats_par_float
-       \hbox{\strc_floats_locate_side_float{\box\b_strc_floats_caption}}%
-       \strc_floats_between_stack
-       \hbox{\hbox{\box\b_strc_floats_content}}%
-     \else
-       \page_otr_command_set_float_hsize
-       \hbox{\strc_floats_locate_text_float{\box\b_strc_floats_caption}}
-       \strc_floats_between_stack
-       \hbox{\strc_floats_align_content{\box\b_strc_floats_content}}%
-     \fi
-   \egroup}
+\def\strc_floats_build_box_top_stack_normal_overlay
+  {\vbox to \ht\b_strc_floats_content{\vss\strc_floats_build_box_top_stack_normal_content}}
 
-\def\strc_floats_build_box_bottom_stack_normal_indeed
-  {\vbox to \ht\b_strc_floats_content\bgroup
-     \d_strc_float_temp_width\wd\b_strc_floats_content
-     \ifconditional\c_strc_floats_par_float
-       \hbox{\hbox{\box\b_strc_floats_content}}%
-       \strc_floats_between_stack
-       \hbox{\strc_floats_locate_side_float{\box\b_strc_floats_caption}}%
-     \else
-       \page_otr_command_set_float_hsize
-       \hbox{\strc_floats_align_content{\box\b_strc_floats_content}}%
-       \strc_floats_between_stack
-       \hbox{\strc_floats_locate_text_float{\box\b_strc_floats_caption}}%
-     \fi
-     \vss
-   \egroup}
+\def\strc_floats_build_box_top_stack_normal_content
+  {\d_strc_float_temp_width\wd\b_strc_floats_content
+   \ifconditional\c_strc_floats_par_float
+     \hbox{\strc_floats_locate_side_float{\box\b_strc_floats_caption}}%
+     \strc_floats_between_stack
+     \hbox{\hbox{\box\b_strc_floats_content}}%
+   \else
+     \page_otr_command_set_float_hsize
+     \hbox{\strc_floats_locate_text_float{\box\b_strc_floats_caption}}
+     \strc_floats_between_stack
+     \hbox{\strc_floats_align_content{\box\b_strc_floats_content}}%
+   \fi}
+
+\def\strc_floats_build_box_bottom_stack_normal_overlay
+  {\vbox to \ht\b_strc_floats_content{\strc_floats_build_box_bottom_stack_normal_content\vss}}
+
+\def\strc_floats_build_box_bottom_stack_normal_content
+  {\d_strc_float_temp_width\wd\b_strc_floats_content
+   \ifconditional\c_strc_floats_par_float
+     \hbox{\hbox{\box\b_strc_floats_content}}%
+     \strc_floats_between_stack
+     \hbox{\strc_floats_locate_side_float{\box\b_strc_floats_caption}}%
+   \else
+     \page_otr_command_set_float_hsize
+     \hbox{\strc_floats_align_content{\box\b_strc_floats_content}}%
+     \strc_floats_between_stack
+     \hbox{\strc_floats_locate_text_float{\box\b_strc_floats_caption}}%
+   \fi}
 
 \def\strc_floats_build_box_top_stack_normal
-  {\expanded{\doifinset{\v!overlay}{\floatcaptionparameter\c!location}}\strc_floats_build_box_top_stack_normal_indeed}
+  {\doifinsetelse\v!overlay{\floatcaptionparameter\c!location}
+      \strc_floats_build_box_top_stack_normal_overlay
+      \strc_floats_build_box_top_stack_normal_content}
 
 \def\strc_floats_build_box_bottom_stack_normal
-  {\expanded{\doifinset{\v!overlay}{\floatcaptionparameter\c!location}}\strc_floats_build_box_bottom_stack_normal_indeed}
+  {\doifinset\v!overlay{\floatcaptionparameter\c!location}
+    \strc_floats_build_box_bottom_stack_normal_overlay
+    \strc_floats_build_box_bottom_stack_normal_content}
 
 \def\strc_floats_build_box_top_stack_grid
   {\dp\b_strc_floats_caption\strutdepth
@@ -1682,11 +1700,12 @@
      {\strc_floats_set_local_hsize
       \forgetall
       \let\floatcaptionarrangement\s!default
-      \def\docommand##1%
-        {\doifdefined{\??floatbuilder##1}{\def\floatcaptionarrangement{##1}\quitcommalist}}%
-      \processcommacommand[\floatcaptionparameter\c!location]\docommand
+      \processcommacommand[\floatcaptionparameter\c!location]\strc_floats_build_box_step
       \executeifdefined{\??floatbuilder\floatcaptionarrangement}{\getvalue{\??floatbuilder\s!default}}}}
 
+\def\strc_floats_build_box_step#1%
+  {\doifdefined{\??floatbuilder#1}{\def\floatcaptionarrangement{#1}\quitcommalist}}
+
 \def\strc_floats_locate_text_float
   {\let\next\strc_floats_align_caption
    \expanded{\processallactionsinset[\floatcaptionparameter\c!location]}
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 3bdd6a383..27df15a41 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  : 07/04/12 14:44:07
+-- merge date  : 07/04/12 15:55:06
 
 do -- begin closure to overcome local limits and interference