beta 2011.11.08 19:35

11 files changed, 110 insertions, 84 deletions

diff --git a/tex/context/base/buff-ini.lua b/tex/context/base/buff-ini.lua
index 65b0135c6..7098679ca 100644
--- a/tex/context/base/buff-ini.lua
+++ b/tex/context/base/buff-ini.lua
@@ -7,9 +7,11 @@ if not modules then modules = { } end modules ['buff-ini'] = {
 }
 
 local trace_run       = false  trackers.register("buffers.run",       function(v) trace_run       = v end)
+local trace_grab      = false  trackers.register("buffers.grab",      function(v) trace_grab      = v end)
 local trace_visualize = false  trackers.register("buffers.visualize", function(v) trace_visualize = v end)
 
-local report_buffers = logs.reporter("buffers","usage")
+local report_buffers  = logs.reporter("buffers","usage")
+local report_grabbing = logs.reporter("buffers","grabbing")
 
 local concat = table.concat
 local type, next = type, next
@@ -127,6 +129,13 @@ function commands.grabbuffer(name,begintag,endtag,bufferdata,catcodes) -- maybe
         nesting = 0
         continue = false
     end
+    if trace_grab then
+        if #bufferdata > 30 then
+            report_grabbing("%s => |%s..%s|",name,sub(bufferdata,1,10),sub(bufferdata,-10,#bufferdata))
+        else
+            report_grabbing("%s => |%s|",name,bufferdata)
+        end
+    end
     local counter = counters[begintag]
     if not counter then
         counter = countnesting(begintag,endtag)
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 2ce1639ba..e02ea2f7e 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.11.08 15:20}
+\newcontextversion{2011.11.08 19:35}
 
 %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 92144049d..8fbf45e73 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.11.08 15:20}
+\newcontextversion{2011.11.08 19:35}
 
 %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 48c6f3de1..2eda631b6 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
@@ -83,7 +83,7 @@ h f
 0.000 0.700 0.700 rg 0.000 0.700 0.700 RG
 -1.345032 -9.998840 m
 29.874359 -90.097046 l
-10.208313 -66.445236 -28.164001 -67.037628 -54.288406 -91.396378 c
+12.909622 -61.943100 -29.662781 -62.600357 -54.288406 -91.396378 c
 -1.345032 -9.998840 l
 h f
 0 g 0 G
@@ -97,7 +97,7 @@ h f
 0.700 0.000 0.700 rg 0.700 0.000 0.700 RG
 -8.674164 -6.355164 m
 -56.902374 -90.097046 l
--55.011398 -59.536789 -72.351151 -33.776230 -100.546051 -25.258499 c
+-48.420502 -57.334106 -68.127991 -28.055984 -100.546051 -25.258499 c
 -8.674164 -6.355164 l
 h f
 0 g 0 G
@@ -163,17 +163,17 @@ stream
         </rdf:Description>

         <rdf:Description rdf:about="" xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/">

             <pdfx:ConTeXt.Jobname>s-version</pdfx:ConTeXt.Jobname>

-            <pdfx:ConTeXt.Time>2011.11.08 15:20</pdfx:ConTeXt.Time>

+            <pdfx:ConTeXt.Time>2011.11.08 19:35</pdfx:ConTeXt.Time>

             <pdfx:ConTeXt.Url>www.pragma-ade.com</pdfx:ConTeXt.Url>

-            <pdfx:ConTeXt.Version>2011.11.08 15:20</pdfx:ConTeXt.Version>

-            <pdfx:ID>s-version.2011-11-08T15:20:21+01:00</pdfx:ID>

+            <pdfx:ConTeXt.Version>2011.11.08 19:35</pdfx:ConTeXt.Version>

+            <pdfx:ID>s-version.2011-11-08T19:35:22+01:00</pdfx:ID>

             <pdfx:PTEX.Fullbanner>This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1</pdfx:PTEX.Fullbanner>

         </rdf:Description>

         <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">

-            <xmp:CreateDate>2011-11-08T15:20:21+01:00</xmp:CreateDate>

-            <xmp:CreatorTool>ConTeXt - 2011.11.08 15:20</xmp:CreatorTool>

-            <xmp:ModifyDate>2011-11-08T15:20:21+01:00</xmp:ModifyDate>

-            <xmp:MetadataDate>2011-11-08T15:20:21+01:00</xmp:MetadataDate>

+            <xmp:CreateDate>2011-11-08T19:35:22+01:00</xmp:CreateDate>

+            <xmp:CreatorTool>ConTeXt - 2011.11.08 19:35</xmp:CreatorTool>

+            <xmp:ModifyDate>2011-11-08T19:35:22+01:00</xmp:ModifyDate>

+            <xmp:MetadataDate>2011-11-08T19:35:22+01:00</xmp:MetadataDate>

         </rdf:Description>

         <rdf:Description rdf:about="" xmlns:pdf="http://ns.adobe.com/pdf/1.3/">

             <pdf:Keywords/>

@@ -201,7 +201,7 @@ endobj
 endobj
 22 0 obj
 <<
-/ConTeXt.Url (www.pragma-ade.com) /ConTeXt.Version (2011.11.08 15:20) /ConTeXt.Jobname (s-version) /CreationDate (D:20111108152021+01'00') /Trapped /False /Title <feff0073002d00760065007200730069006f006e> /ConTeXt.Time (2011.11.08 15:20) /ID (s-version.2011-11-08T15:20:21+01:00) /Producer (LuaTeX-0.71.0) /ModDate (D:20111108152021+01'00') /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310031002e00300038002000310035003a00320030>
+/ConTeXt.Url (www.pragma-ade.com) /ConTeXt.Version (2011.11.08 19:35) /ConTeXt.Jobname (s-version) /CreationDate (D:20111108193522+01'00') /Trapped /False /Title <feff0073002d00760065007200730069006f006e> /ConTeXt.Time (2011.11.08 19:35) /ID (s-version.2011-11-08T19:35:22+01:00) /Producer (LuaTeX-0.71.0) /ModDate (D:20111108193522+01'00') /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310031002e00300038002000310039003a00330035>
 /PTEX.Fullbanner (This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1)>>
 endobj
 xref
@@ -230,7 +230,7 @@ xref
 0000006116 00000 n 
 0000006268 00000 n 
 trailer
-<</Size 23/Root 21 0 R/Info 22 0 R/ID[<B2FF6E8A784C07DFA4B2F177313E459B> <B2FF6E8A784C07DFA4B2F177313E459B>]>>
+<</Size 23/Root 21 0 R/Info 22 0 R/ID[<B2B9E5A87ED8E1FBD60723E6E278A48B> <B2B9E5A87ED8E1FBD60723E6E278A48B>]>>
 startxref
 6866
 %%EOF
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 50032e008..2f1d39163 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 fd5571e32..6dbf8e7d4 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.11.08 15:20}
+\edef\contextversion{2011.11.08 19:35}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 016520977..41665fd5f 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.11.08 15:20}
+\edef\contextversion{2011.11.08 19:35}
 
 %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 38a8225f3..ac2d7064e 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
@@ -1429,13 +1429,13 @@ endobj
 <</Font<</F47 18 0 R>>/ProcSet[/PDF/Text]>>
 endobj
 22 0 obj
-<</Length 29954     >>
+<</Length 29955     >>
 stream
 0 g 0 G
 0 g 0 G
 BT
 /F47 11.955168 Tf 1 0 0 1 12.3537 968.1015 Tm [<004C005100700032004B002300320060>-515<0033002D>-515<006B007900520052>-515<0040>-515<0068003F0032>-515<0062004200780032>-515<00510037>-515<0055002B0051006000320056>-515<00370042004800320062>-515<006D00620032002F>-515<0042004D>-515<002A0051004D0068003200730069>-515<00550040>-515<0042004D002F0042002B001C006900320062>-515<00320074002B0048006D006200420051004D>-514<00510037>-515<0048001C0060003B0032>-515<002F001C0069001C>-515<003700420048003200620063>-515<0059>-515<0042004D002F0042002B001C006900320062>-515<0042004D002B0048006D006200420051004D>-515<00510037>-515<0048001C0060003B0032>-515<002F001C0069001C>-515<003700420048003200620063>-515<002B0051004B004B0032004D0069>-515<001C004D002F>-515<00620054001C002B00320062>-515<00600032004B005100700032002F00580056>]TJ
-1 0 0 1 139.4968 941.7188 Tm [<006B00790038005200790079>-500<006900320074>-8128<0039006B006B0038003900790039>-500<004B004600420042>-515<0039003300330038003900390052>-515<0059>-12028<006B006B00380033007900380065>-500<004B004600420070>-14065<006B00520038003300520033>-500<004B004600700042>-4156<006B006B00790033006400390039>-500<0048006D001C>-515<0038006500520033003300390079>-515<0059>]TJ
+1 0 0 1 139.4968 941.7188 Tm [<006B00790038005200790079>-500<006900320074>-8128<0039006B006B0038003900790039>-500<004B004600420042>-515<0039003300330038003900390052>-515<0059>-12028<006B006B00380033007900380065>-500<004B004600420070>-14066<006B00520065006A00640039>-500<004B004600700042>-4158<006B006B0079004E00790038004E>-500<0048006D001C>-515<003800650052004E005200380038>-515<0059>]TJ
 ET
 q
 1 0 0 1 12.3537 935.4601 cm
@@ -1572,12 +1572,12 @@ q
 Q
 0 g 0 G
 BT
-/F47 11.955168 Tf 1 0 0 1 948.5307 850.7157 Tm [<003900390033004E0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5307 850.7157 Tm [<00390038006B00790065>]TJ
 ET
 0.725 g 0.725 G
 q
 1 0 0 1 985.2808 850.7157 cm
-0 0 25.2362 8.3103 re f
+0 0 25.4149 8.3103 re f
 Q
 0 g 0 G
 BT
@@ -2481,12 +2481,12 @@ q
 Q
 0 g 0 G
 BT
-/F47 11.955168 Tf 1 0 0 1 825.1318 259.1884 Tm [<00640038003900390039>]TJ
+/F47 11.955168 Tf 1 0 0 1 825.1437 259.1884 Tm [<00640065007900790079>]TJ
 ET
 0.6 0.6 0 rg 0.6 0.6 0 RG
 q
 1 0 0 1 861.8939 259.1884 cm
-0 0 42.413 8.3103 re f
+0 0 42.7267 8.3103 re f
 Q
 0 g 0 G
 BT
@@ -4220,7 +4220,7 @@ endobj
 <</Font<</F47 18 0 R>>/ProcSet[/PDF/Text]>>
 endobj
 28 0 obj
-<</Length 23416     >>
+<</Length 23415     >>
 stream
 0 g 0 G
 0 g 0 G
@@ -4345,7 +4345,7 @@ Q
 0.725 g 0.725 G
 q
 1 0 0 1 437.3827 686.1113 cm
-0 0 11.9552 20.1889 re f
+0 0 11.9552 20.332 re f
 Q
 0.6 g 0.6 G
 q
@@ -5219,7 +5219,7 @@ Q
 0.6 0.6 0 rg 0.6 0.6 0 RG
 q
 1 0 0 1 800.9493 253.7327 cm
-0 0 11.9552 33.9304 re f
+0 0 11.9552 34.1814 re f
 Q
 0.725 g 0.725 G
 q
@@ -5609,14 +5609,14 @@ stream
             <pdfx:ConTeXt.Time/>

             <pdfx:ConTeXt.Url/>

             <pdfx:ConTeXt.Version/>

-            <pdfx:ID>s-inf-01.2011-11-08T15:24:52+01:00</pdfx:ID>

+            <pdfx:ID>s-inf-01.2011-11-08T19:40:05+01:00</pdfx:ID>

             <pdfx:PTEX.Fullbanner>This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1</pdfx:PTEX.Fullbanner>

         </rdf:Description>

         <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">

-            <xmp:CreateDate>2011-11-08T15:24:52+01:00</xmp:CreateDate>

-            <xmp:CreatorTool>ConTeXt - 2011.11.08 15:20</xmp:CreatorTool>

-            <xmp:ModifyDate>2011-11-08T15:24:52+01:00</xmp:ModifyDate>

-            <xmp:MetadataDate>2011-11-08T15:24:52+01:00</xmp:MetadataDate>

+            <xmp:CreateDate>2011-11-08T19:40:05+01:00</xmp:CreateDate>

+            <xmp:CreatorTool>ConTeXt - 2011.11.08 19:35</xmp:CreatorTool>

+            <xmp:ModifyDate>2011-11-08T19:40:05+01:00</xmp:ModifyDate>

+            <xmp:MetadataDate>2011-11-08T19:40:05+01:00</xmp:MetadataDate>

         </rdf:Description>

         <rdf:Description rdf:about="" xmlns:pdf="http://ns.adobe.com/pdf/1.3/">

             <pdf:Keywords/>

@@ -5757,7 +5757,7 @@ endobj
 endobj
 38 0 obj
 <<
-/CreationDate (D:20111108152452+01'00') /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310031002e00300038002000310035003a00320030> /Producer (LuaTeX-0.71.0) /ID (s-inf-01.2011-11-08T15:24:52+01:00) /Trapped /False /ModDate (D:20111108152452+01'00') /Title <feff0073002d0069006e0066002d00300031>
+/CreationDate (D:20111108194005+01'00') /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310031002e00300038002000310039003a00330035> /Producer (LuaTeX-0.71.0) /ID (s-inf-01.2011-11-08T19:40:05+01:00) /Trapped /False /ModDate (D:20111108194005+01'00') /Title <feff0073002d0069006e0066002d00300031>
 /PTEX.Fullbanner (This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1)>>
 endobj
 xref
@@ -5782,15 +5782,15 @@ xref
 0000000015 00000 n 
 0000114502 00000 n 
 0000114825 00000 n 
-0000057535 00000 n 
-0000057334 00000 n 
+0000057536 00000 n 
+0000057335 00000 n 
 0000027324 00000 n 
-0000080960 00000 n 
-0000080759 00000 n 
-0000057595 00000 n 
+0000080961 00000 n 
+0000080760 00000 n 
+0000057596 00000 n 
 0000104693 00000 n 
 0000104492 00000 n 
-0000081020 00000 n 
+0000081021 00000 n 
 0000104753 00000 n 
 0000106975 00000 n 
 0000107255 00000 n 
@@ -5802,7 +5802,7 @@ xref
 0000114920 00000 n 
 0000115072 00000 n 
 trailer
-<</Size 39/Root 37 0 R/Info 38 0 R/ID[<B54EB4162A212DDA3EF53B9DFE1E9256> <B54EB4162A212DDA3EF53B9DFE1E9256>]>>
+<</Size 39/Root 37 0 R/Info 38 0 R/ID[<B385D4CDD36AD831B3D4E0D755022535> <B385D4CDD36AD831B3D4E0D755022535>]>>
 startxref
 115533
 %%EOF
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 43c0a89c5..0b31ef5d0 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
@@ -13928,17 +13928,17 @@ stream
         </rdf:Description>

         <rdf:Description rdf:about="" xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/">

             <pdfx:ConTeXt.Jobname>s-inf-03</pdfx:ConTeXt.Jobname>

-            <pdfx:ConTeXt.Time>2011.11.08 15:25</pdfx:ConTeXt.Time>

+            <pdfx:ConTeXt.Time>2011.11.08 19:40</pdfx:ConTeXt.Time>

             <pdfx:ConTeXt.Url>www.pragma-ade.com</pdfx:ConTeXt.Url>

-            <pdfx:ConTeXt.Version>2011.11.08 15:20</pdfx:ConTeXt.Version>

-            <pdfx:ID>s-inf-03.2011-11-08T15:25:24+01:00</pdfx:ID>

+            <pdfx:ConTeXt.Version>2011.11.08 19:35</pdfx:ConTeXt.Version>

+            <pdfx:ID>s-inf-03.2011-11-08T19:40:37+01:00</pdfx:ID>

             <pdfx:PTEX.Fullbanner>This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1</pdfx:PTEX.Fullbanner>

         </rdf:Description>

         <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">

-            <xmp:CreateDate>2011-11-08T15:25:24+01:00</xmp:CreateDate>

-            <xmp:CreatorTool>ConTeXt - 2011.11.08 15:20</xmp:CreatorTool>

-            <xmp:ModifyDate>2011-11-08T15:25:24+01:00</xmp:ModifyDate>

-            <xmp:MetadataDate>2011-11-08T15:25:24+01:00</xmp:MetadataDate>

+            <xmp:CreateDate>2011-11-08T19:40:37+01:00</xmp:CreateDate>

+            <xmp:CreatorTool>ConTeXt - 2011.11.08 19:35</xmp:CreatorTool>

+            <xmp:ModifyDate>2011-11-08T19:40:37+01:00</xmp:ModifyDate>

+            <xmp:MetadataDate>2011-11-08T19:40:37+01:00</xmp:MetadataDate>

         </rdf:Description>

         <rdf:Description rdf:about="" xmlns:pdf="http://ns.adobe.com/pdf/1.3/">

             <pdf:Keywords/>

@@ -14781,7 +14781,7 @@ endobj
 endobj
 1445 0 obj
 <<
-/ConTeXt.Url (www.pragma-ade.com) /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310031002e00300038002000310035003a00320030> /ConTeXt.Jobname (s-inf-03) /Author <feff00480061006e007300200048006100670065006e0020002d0020006100750074006f006d00610074006900630061006c006c0079002000670065006e006500720061007400650064> /Trapped /False /CreationDate (D:20111108152524+01'00') /Producer (LuaTeX-0.71.0) /Title <feff0043006f006e00540065005800740020004d006b00490056> /ConTeXt.Time (2011.11.08 15:25) /ID (s-inf-03.2011-11-08T15:25:24+01:00) /ConTeXt.Version (2011.11.08 15:20) /ModDate (D:20111108152524+01'00') /Subject <feff004c007500610020006d006f00640075006c0065007300200061006e0064002000660075006e006300740069006f006e0073>
+/ConTeXt.Url (www.pragma-ade.com) /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310031002e00300038002000310039003a00330035> /ConTeXt.Jobname (s-inf-03) /Author <feff00480061006e007300200048006100670065006e0020002d0020006100750074006f006d00610074006900630061006c006c0079002000670065006e006500720061007400650064> /Trapped /False /CreationDate (D:20111108194037+01'00') /Producer (LuaTeX-0.71.0) /Title <feff0043006f006e00540065005800740020004d006b00490056> /ConTeXt.Time (2011.11.08 19:40) /ID (s-inf-03.2011-11-08T19:40:37+01:00) /ConTeXt.Version (2011.11.08 19:35) /ModDate (D:20111108194037+01'00') /Subject <feff004c007500610020006d006f00640075006c0065007300200061006e0064002000660075006e006300740069006f006e0073>
 /PTEX.Fullbanner (This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1)>>
 endobj
 xref
@@ -16233,7 +16233,7 @@ xref
 0000814756 00000 n 
 0000814939 00000 n 
 trailer
-<</Size 1446/Root 1444 0 R/Info 1445 0 R/ID[<6113321A8B8CB829A1BFEBE197B5A45C> <6113321A8B8CB829A1BFEBE197B5A45C>]>>
+<</Size 1446/Root 1444 0 R/Info 1445 0 R/ID[<2113557409CAE6A878F047BB91464E0D> <2113557409CAE6A878F047BB91464E0D>]>>
 startxref
 815824
 %%EOF
diff --git a/tex/context/base/strc-flt.mkvi b/tex/context/base/strc-flt.mkvi
index c247e4941..e330bb5d7 100644
--- a/tex/context/base/strc-flt.mkvi
+++ b/tex/context/base/strc-flt.mkvi
@@ -540,6 +540,7 @@
    \float_check_extra_actions
    \float_analyze_variables_two
    \float_place_packaged_boxes
+   \dostoptagged % tricky ... needs checking
    % we need to carry over the par because of side floats
    \global\sidefloatdownshift \zeropoint
    \global\sidefloatextrashift\zeropoint
@@ -711,7 +712,10 @@
    \float_set_natural_dimensions\floatbox
    \ifdim\htdp\floatbox=\zeropoint
      \showmessage\m!floatblocks{11}\empty
-     \global\setbox\floatbox\vbox{\float_place_empty_box}%
+     \global\setbox\floatbox\vbox
+       {\dostarttagged\t!floatcontent\empty
+        \float_place_empty_box
+        \dostoptagged}%
    \fi
    % deal with lack of caption
    \global\setbox\floatbox\vbox \floatcaptionattribute
@@ -1204,11 +1208,8 @@
         {\dopreparesidewidthcaption}}%
   \dostoptagged}
 
-\def\dosettempcaptionbox
-  {\setbox\float_caption_box\vbox\bgroup
-     %expanded{\setupalign[\v!new,\v!reset,\floatcaptionparameter\c!align,\v!old]}% wrong! see icare
-     \normalexpanded{\noexpand\setupalign[\v!reset,\floatcaptionparameter\c!align]}% i need to check what reset does
-     \let\next}
+\def\float_caption_set_align
+  {\normalexpanded{\noexpand\setupalign[\v!reset,\floatcaptionparameter\c!align]}}
 
 \def\dopreparesideautocaption
   {\scratchdimen\dimexpr\hsize-\wd\float_content_box-\floatparameter\c!margin\relax % was \tfskipsize\relax
@@ -1217,33 +1218,39 @@
        \scratchdimen0.8\scratchdimen
      \fi
    \fi
-   \dosettempcaptionbox
-     {\hsize\scratchdimen
+   \setbox\float_caption_box\vbox
+     {\float_caption_set_align
+      \hsize\scratchdimen
       \float_make_complete_caption}}
 
 \def\dopreparesidewidthcaption
-  {\dosettempcaptionbox
-     {\hsize\floatcaptionparameter\c!width
+  {\setbox\float_caption_box\vbox
+     {\float_caption_set_align
+      \hsize\floatcaptionparameter\c!width
       \float_make_complete_caption}}
 
 \def\dopreparestackcaptionfix
-  {\dosettempcaptionbox
-     {\hsize\floatcaptionparameter\c!minwidth % special effects
+  {\setbox\float_caption_box\vbox
+     {\float_caption_set_align
+      \hsize\floatcaptionparameter\c!minwidth % special effects
       \float_make_complete_caption}}
 
 \def\dopreparestackcaptionmax
-  {\dosettempcaptionbox
-     {\hsize\wd\float_content_box
+  {\setbox\float_caption_box\vbox
+     {\float_caption_set_align
+      \hsize\wd\float_content_box
       \float_make_complete_caption}}
 
 \def\dopreparestackcaptionwid
-  {\dosettempcaptionbox
-     {\hsize\floatcaptionparameter\c!width
+  {\setbox\float_caption_box\vbox
+     {\float_caption_set_align
+      \hsize\floatcaptionparameter\c!width
       \float_make_complete_caption}}
 
 \def\dopreparestackcaptionmin
-  {\dosettempcaptionbox
-     {\hsize\wd\float_content_box
+  {\setbox\float_caption_box\vbox
+     {\float_caption_set_align
+      \hsize\wd\float_content_box
       \doifnothing{\floatcaptionparameter\c!align}\raggedcenter % on purpose overloads align !
       \float_make_complete_caption}}
 
@@ -1254,22 +1261,25 @@
    \edef\captionhsize{\the\wd\float_content_box}%
    \ifdim\captionhsize>\hsize
      % float is wider than \hsize
-     \dosettempcaptionbox
+     \setbox\float_caption_box\vbox
        {\settrialtypesetting
+        \float_caption_set_align
         \hsize\captionhsize
         \notesenabledfalse
         \float_make_complete_caption}%
      \ifdim\ht\scratchbox>\lineheight % more lines
-       \dosettempcaptionbox
-         {\hsize\captionhsize
+       \setbox\float_caption_box\vbox
+         {\float_caption_set_align
+          \hsize\captionhsize
           \advance\hsize -\captionovershoot\relax
           \ifdim\hsize<\captionminwidth\relax
             \hsize\captionhsize
           \fi
           \float_make_complete_caption}%
      \else
-       \dosettempcaptionbox
-         {\hsize\captionhsize
+       \setbox\float_caption_box\vbox
+         {\float_caption_set_align
+          \hsize\captionhsize
           \float_make_complete_caption}%
      \fi
    \else
@@ -1288,21 +1298,24 @@
         \float_make_complete_caption}%
      \ifdim\ht\scratchbox>\lineheight
        % at least an average word longer than a line
-       \dosettempcaptionbox
-         {\scratchdimen\captionhsize
+       \setbox\float_caption_box\vbox
+         {\float_caption_set_align
+          \scratchdimen\captionhsize
           \advance\scratchdimen \captionovershoot
           \ifdim\scratchdimen<\hsize \hsize\scratchdimen \fi
           \float_make_complete_caption}%
      \else
        % just over a line, don't use an overshoot % % % todo: outer/inner and such
        \doifcommonelse{\floatcaptionparameter\c!align}{\v!left,\v!right,\v!flushleft,\v!flushright}
-         {\dosettempcaptionbox
-            {\hsize\captionhsize
+         {\setbox\float_caption_box\vbox
+            {\float_caption_set_align
+             \hsize\captionhsize
              % strange : \raggedcenter
              \float_make_complete_caption}}
          {% nicer
-          \dosettempcaptionbox
-            {\hsize\captionhsize
+          \setbox\float_caption_box\vbox
+            {\float_caption_set_align
+             \hsize\captionhsize
              \doifnothing{\floatcaptionparameter\c!align}\raggedcenter% overloads
              \float_make_complete_caption}}%
      \fi
@@ -1671,9 +1684,11 @@
    \egroup}
 
 \def\prepare_side_float_caption
-  {\doifelse{\floatcaptionparameter\c!width}\v!max
-     {\dosettempcaptionbox
-        {\hsize\wd\float_content_box
+  {\dostarttagged\t!floatcaption\empty
+   \doifelse{\floatcaptionparameter\c!width}\v!max
+     {\setbox\float_caption_box\vbox
+        {\float_caption_set_align
+         \hsize\wd\float_content_box
          \float_make_complete_caption}}%
      {\doifelse{\floatcaptionparameter\c!width}\v!fit
         {\ifdim\wd\float_caption_box>\wd\float_content_box\relax
@@ -1683,11 +1698,13 @@
               \float_make_complete_caption}%
          \else
            \setbox\float_caption_box\hbox to \wd\float_content_box
-             {\hss\box\float_caption_box\hss}%
+             {\hss\hbox{\float_make_complete_caption}\hss}%
          \fi}
-        {\dosettempcaptionbox
-           {\hsize\floatcaptionparameter\c!width % \wd\float_content_box
-            \float_make_complete_caption}}}}
+        {\setbox\float_caption_box\vbox
+           {\float_caption_set_align
+            \hsize\floatcaptionparameter\c!width % \wd\float_content_box
+            \float_make_complete_caption}}}%
+   \dostoptagged}
 
 \def\build_side_float_box
   {\let\float_align_content\relax
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index b008d4daa..e9ab336ca 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  : 11/08/11 15:20:09
+-- merge date  : 11/08/11 19:35:08
 
 do -- begin closure to overcome local limits and interference