beta 2011.10.28 19:22

14 files changed, 262 insertions, 94 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index d9a812d45..cd19d204a 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.10.28 16:04}
+\newcontextversion{2011.10.28 19:22}
 
 %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 76cbd4681..1782dd8ee 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.10.28 16:04}
+\newcontextversion{2011.10.28 19:22}
 
 %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 78735e220..64e5563cc 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.835419 -65.345581 -28.497253 -65.952789 -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
--61.253204 -62.281128 -76.944183 -38.970108 -100.546051 -25.258499 c
+-54.178864 -59.221588 -71.784378 -33.066238 -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.10.28 16:04</pdfx:ConTeXt.Time>

+            <pdfx:ConTeXt.Time>2011.10.28 19:22</pdfx:ConTeXt.Time>

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

-            <pdfx:ConTeXt.Version>2011.10.28 16:04</pdfx:ConTeXt.Version>

-            <pdfx:ID>s-version.2011-10-28T16:04:32+02:00</pdfx:ID>

+            <pdfx:ConTeXt.Version>2011.10.28 19:22</pdfx:ConTeXt.Version>

+            <pdfx:ID>s-version.2011-10-28T19:22:34+02: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-10-28T16:04:32+02:00</xmp:CreateDate>

-            <xmp:CreatorTool>ConTeXt - 2011.10.28 16:04</xmp:CreatorTool>

-            <xmp:ModifyDate>2011-10-28T16:04:32+02:00</xmp:ModifyDate>

-            <xmp:MetadataDate>2011-10-28T16:04:32+02:00</xmp:MetadataDate>

+            <xmp:CreateDate>2011-10-28T19:22:34+02:00</xmp:CreateDate>

+            <xmp:CreatorTool>ConTeXt - 2011.10.28 19:22</xmp:CreatorTool>

+            <xmp:ModifyDate>2011-10-28T19:22:34+02:00</xmp:ModifyDate>

+            <xmp:MetadataDate>2011-10-28T19:22:34+02: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.10.28 16:04) /ConTeXt.Jobname (s-version) /CreationDate (D:20111028160432+02'00') /Trapped /False /Title <feff0073002d00760065007200730069006f006e> /ConTeXt.Time (2011.10.28 16:04) /ID (s-version.2011-10-28T16:04:32+02:00) /Producer (LuaTeX-0.71.0) /ModDate (D:20111028160432+02'00') /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310030002e00320038002000310036003a00300034>
+/ConTeXt.Url (www.pragma-ade.com) /ConTeXt.Version (2011.10.28 19:22) /ConTeXt.Jobname (s-version) /CreationDate (D:20111028192234+02'00') /Trapped /False /Title <feff0073002d00760065007200730069006f006e> /ConTeXt.Time (2011.10.28 19:22) /ID (s-version.2011-10-28T19:22:34+02:00) /Producer (LuaTeX-0.71.0) /ModDate (D:20111028192234+02'00') /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310030002e00320038002000310039003a00320032>
 /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[<03A77B63EA4C1608D835622C596F9F9B> <03A77B63EA4C1608D835622C596F9F9B>]>>
+<</Size 23/Root 21 0 R/Info 22 0 R/ID[<82BBD61F703EE63C8B48DCE3D2F14E51> <82BBD61F703EE63C8B48DCE3D2F14E51>]>>
 startxref
 6866
 %%EOF
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index acb09bd39..77cdcb4dd 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 08dc32014..dcf9cf65a 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.10.28 16:04}
+\edef\contextversion{2011.10.28 19:22}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 7bfad2220..f3bc5653f 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.10.28 16:04}
+\edef\contextversion{2011.10.28 19:22}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/m-ntb-to-xtb.mkiv b/tex/context/base/m-ntb-to-xtb.mkiv
new file mode 100644
index 000000000..55b4ab259
--- /dev/null
+++ b/tex/context/base/m-ntb-to-xtb.mkiv
@@ -0,0 +1,5 @@
+\loadmkvifile{tabl-xnt}
+
+\mapTABLEtoxtable
+
+\endinput
diff --git a/tex/context/base/mult-def.lua b/tex/context/base/mult-def.lua
index 1b672630f..84f823f53 100644
--- a/tex/context/base/mult-def.lua
+++ b/tex/context/base/mult-def.lua
@@ -6461,6 +6461,9 @@ return {
   },
  },
  ["constants"]={
+  ["buffer"]={
+   ["en"]="buffer",
+  },
   ["labeloffset"]={
    ["en"]="labeloffset",
   },
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 81a7c47e7..af848452f 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
@@ -1,13 +1,13 @@
 %PDF-1.6
 %ÐÔÅØ
 17 0 obj
-<</Length 26712     >>
+<</Length 26715     >>
 stream
 0 g 0 G
 0 g 0 G
 BT
 /F47 11.955168 Tf 1 0 0 1 0 955.7478 Tm [<0050002B00690051002300320060>-515<006B0033002D>-515<006B007900520052>-515<0040>-515<0068003F0032>-515<004D006D004B002300320060>-515<00510037>-515<00370042004800320062>-515<006D00620032002F>-515<0042004D>-515<002A0051004D0068003200730069>-515<00550023001C00620032>-515<004B0051002F006D004800320062>-515<001C004D002F>-515<00620069007600480032006200560058>]TJ
-1 0 0 1 151.7827 929.3652 Tm [<00650079>-500<006900320074>-22910<003800790064>-500<004B004600420042>-21091<006A0065006A>-500<004B004600420070>-17258<006B006A>-500<004B004600700042>-5873<006A00380079>-500<0048006D001C>]TJ
+1 0 0 1 151.7827 929.3652 Tm [<00650079>-500<006900320074>-22910<003800790064>-500<004B004600420042>-21091<006A00650038>-500<004B004600420070>-17258<006B0039>-500<004B004600700042>-5873<006A00380079>-500<0048006D001C>]TJ
 ET
 q
 1 0 0 1 0 923.1064 cm
@@ -576,12 +576,12 @@ q
 Q
 0 g 0 G
 BT
-/F47 11.955168 Tf 1 0 0 1 769.8132 520.9572 Tm [<0052004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 769.8013 520.9572 Tm [<006B0079>]TJ
 ET
 0.8 0 0 rg 0.8 0 0 RG
 q
 1 0 0 1 788.0927 520.9572 cm
-0 0 98.7593 8.3103 re f
+0 0 103.9583 8.3103 re f
 Q
 0 g 0 G
 BT
@@ -1170,12 +1170,12 @@ q
 Q
 0 g 0 G
 BT
-/F47 11.955168 Tf 1 0 0 1 1025.1976 189.1248 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1025.1976 189.1248 Tm [<006B>]TJ
 ET
 0.6 0.6 0 rg 0.6 0.6 0 RG
 q
 1 0 0 1 1037.3321 189.1248 cm
-0 0 5.199 8.3103 re f
+0 0 10.3944 8.3103 re f
 Q
 0 g 0 G
 BT
@@ -1386,12 +1386,12 @@ q
 Q
 0 g 0 G
 BT
-/F47 11.955168 Tf 1 0 0 1 769.8013 44.8498 Tm [<00520064>]TJ
+/F47 11.955168 Tf 1 0 0 1 769.8013 44.8498 Tm [<00520033>]TJ
 ET
 0.8 0 0 rg 0.8 0 0 RG
 q
 1 0 0 1 788.0927 44.8498 cm
-0 0 88.3649 8.3103 re f
+0 0 93.5639 8.3103 re f
 Q
 0 g 0 G
 BT
@@ -1435,7 +1435,7 @@ stream
 0 g 0 G
 BT
 /F47 11.955168 Tf 1 0 0 1 0 955.7478 Tm [<0050002B00690051002300320060>-515<006B0033002D>-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 127.1431 929.3652 Tm [<006B00790038005200790079>-500<006900320074>-8238<0039006B006B00380039004E0079>-500<004B004600420042>-515<0039003300330065007900380038>-515<0059>-12282<006B006B004E004E006B00520052>-500<004B004600420070>-14906<005200650079006A006B004E>-500<004B004600700042>-4191<006B005200330065005200640052>-500<0048006D001C>-515<00380038004E00650038006B0079>-515<0059>]TJ
+1 0 0 1 127.1431 929.3652 Tm [<006B00790038005200790079>-500<006900320074>-8238<0039006B006B00380039004E0079>-500<004B004600420042>-515<0039003300330065007900380038>-515<0059>-12283<006B006B004E004E006A0038004E>-500<004B004600420070>-14905<00520065006A007900330033>-500<004B004600700042>-4191<006B005200330065005200640052>-500<0048006D001C>-515<00380038004E0065003800380079>-515<0059>]TJ
 ET
 q
 1 0 0 1 0 923.1064 cm
@@ -2004,12 +2004,12 @@ q
 Q
 0 g 0 G
 BT
-/F47 11.955168 Tf 1 0 0 1 581.3941 520.9572 Tm [<0039006A006A00380038>]TJ
+/F47 11.955168 Tf 1 0 0 1 581.3941 520.9572 Tm [<0039006A003900790039>]TJ
 ET
 0.8 0 0 rg 0.8 0 0 RG
 q
 1 0 0 1 618.1562 520.9572 cm
-0 0 24.7363 8.3103 re f
+0 0 24.7655 8.3103 re f
 Q
 0 g 0 G
 BT
@@ -2598,12 +2598,12 @@ q
 Q
 0 g 0 G
 BT
-/F47 11.955168 Tf 1 0 0 1 833.289 189.1248 Tm [<00650038006B0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 833.289 189.1248 Tm [<004E006B0033006A>]TJ
 ET
 0.6 0.6 0 rg 0.6 0.6 0 RG
 q
 1 0 0 1 863.8822 189.1248 cm
-0 0 3.7214 8.3103 re f
+0 0 5.2975 8.3103 re f
 Q
 0 g 0 G
 BT
@@ -2814,12 +2814,12 @@ q
 Q
 0 g 0 G
 BT
-/F47 11.955168 Tf 1 0 0 1 581.43 44.8498 Tm [<004E006500390065006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 581.43 44.8498 Tm [<004E006500380065006B>]TJ
 ET
 0.8 0 0 rg 0.8 0 0 RG
 q
 1 0 0 1 618.1562 44.8498 cm
-0 0 55.0402 8.3103 re f
+0 0 55.0949 8.3103 re f
 Q
 0 g 0 G
 BT
@@ -3420,7 +3420,7 @@ Q
 0.8 0 0 rg 0.8 0 0 RG
 q
 1 0 0 1 701.5361 457.5684 cm
-0 0 11.9552 79.0074 re f
+0 0 11.9552 83.1666 re f
 Q
 0.6 0.6 0 rg 0.6 0.6 0 RG
 q
@@ -3957,7 +3957,7 @@ Q
 0.6 0.6 0 rg 0.6 0.6 0 RG
 q
 1 0 0 1 1089.013 241.3791 cm
-0 0 11.9552 4.1592 re f
+0 0 11.9552 8.3155 re f
 Q
 0.725 g 0.725 G
 q
@@ -4167,7 +4167,7 @@ Q
 0.8 0 0 rg 0.8 0 0 RG
 q
 1 0 0 1 476.2231 25.1898 cm
-0 0 11.9552 70.6919 re f
+0 0 11.9552 74.8511 re f
 Q
 0.725 g 0.725 G
 q
@@ -4220,7 +4220,7 @@ endobj
 <</Font<</F47 18 0 R>>/ProcSet[/PDF/Text]>>
 endobj
 28 0 obj
-<</Length 23423     >>
+<</Length 23422     >>
 stream
 0 g 0 G
 0 g 0 G
@@ -4783,7 +4783,7 @@ Q
 0.8 0 0 rg 0.8 0 0 RG
 q
 1 0 0 1 701.5361 457.5684 cm
-0 0 11.9552 19.7891 re f
+0 0 11.9552 19.8124 re f
 Q
 0.6 0.6 0 rg 0.6 0.6 0 RG
 q
@@ -5320,7 +5320,7 @@ Q
 0.6 0.6 0 rg 0.6 0.6 0 RG
 q
 1 0 0 1 1089.013 241.3791 cm
-0 0 11.9552 2.9771 re f
+0 0 11.9552 4.238 re f
 Q
 0.725 g 0.725 G
 q
@@ -5530,7 +5530,7 @@ Q
 0.8 0 0 rg 0.8 0 0 RG
 q
 1 0 0 1 476.2231 25.1898 cm
-0 0 11.9552 44.0321 re f
+0 0 11.9552 44.0759 re f
 Q
 0.725 g 0.725 G
 q
@@ -5586,7 +5586,7 @@ endobj
 <</Type /Metadata /Subtype /XML
 /Length 2135      >>
 stream
-<?xpacket begin="" id="awayuiahjldwlbbsvhneltin"?>
+<?xpacket begin="" id="anmfmfxjwqdwtojeatmmchwh"?>
 
 <x:xmpmeta xmlns:x="adobe:ns:meta/">

     <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">

@@ -5609,14 +5609,14 @@ stream
             <pdfx:ConTeXt.Time/>

             <pdfx:ConTeXt.Url/>

             <pdfx:ConTeXt.Version/>

-            <pdfx:ID>s-inf-01.2011-10-28T16:08:54+02:00</pdfx:ID>

+            <pdfx:ID>s-inf-01.2011-10-28T19:27:09+02: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-10-28T16:08:54+02:00</xmp:CreateDate>

-            <xmp:CreatorTool>ConTeXt - 2011.10.28 16:04</xmp:CreatorTool>

-            <xmp:ModifyDate>2011-10-28T16:08:54+02:00</xmp:ModifyDate>

-            <xmp:MetadataDate>2011-10-28T16:08:54+02:00</xmp:MetadataDate>

+            <xmp:CreateDate>2011-10-28T19:27:09+02:00</xmp:CreateDate>

+            <xmp:CreatorTool>ConTeXt - 2011.10.28 19:22</xmp:CreatorTool>

+            <xmp:ModifyDate>2011-10-28T19:27:09+02:00</xmp:ModifyDate>

+            <xmp:MetadataDate>2011-10-28T19:27:09+02:00</xmp:MetadataDate>

         </rdf:Description>

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

             <pdf:Keywords/>

@@ -5624,8 +5624,8 @@ stream
             <pdf:Trapped>False</pdf:Trapped>

         </rdf:Description>

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

-            <xmpMM:DocumentID>uuid:20e3bd83-4157-8bc8-f63f-ceab2da96d43</xmpMM:DocumentID>

-            <xmpMM:InstanceID>uuid:d8a9d837-4532-8b9a-7f81-3af7b2e55809</xmpMM:InstanceID>

+            <xmpMM:DocumentID>uuid:aecd671d-46ef-a6e8-56fb-b73b8887006d</xmpMM:DocumentID>

+            <xmpMM:InstanceID>uuid:0fbb4db3-45d8-84ec-5bbb-f471b95fd3bf</xmpMM:InstanceID>

         </rdf:Description>

     </rdf:RDF>

 </x:xmpmeta>
@@ -5756,7 +5756,7 @@ endobj
 endobj
 38 0 obj
 <<
-/CreationDate (D:20111028160854+02'00') /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310030002e00320038002000310036003a00300034> /Producer (LuaTeX-0.71.0) /ID (s-inf-01.2011-10-28T16:08:54+02:00) /Trapped /False /ModDate (D:20111028160854+02'00') /Title <feff0073002d0069006e0066002d00300031>
+/CreationDate (D:20111028192709+02'00') /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310030002e00320038002000310039003a00320032> /Producer (LuaTeX-0.71.0) /ID (s-inf-01.2011-10-28T19:27:09+02:00) /Trapped /False /ModDate (D:20111028192709+02'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
@@ -5776,32 +5776,32 @@ xref
 0000000013 00000 f 
 0000000014 00000 f 
 0000000000 00000 f 
-0000026985 00000 n 
-0000026783 00000 n 
+0000026988 00000 n 
+0000026786 00000 n 
 0000000015 00000 n 
-0000113950 00000 n 
-0000114273 00000 n 
-0000056990 00000 n 
-0000056788 00000 n 
-0000027045 00000 n 
-0000080432 00000 n 
-0000080231 00000 n 
-0000057050 00000 n 
-0000104172 00000 n 
-0000103971 00000 n 
-0000080492 00000 n 
-0000104232 00000 n 
-0000106454 00000 n 
-0000106737 00000 n 
-0000106810 00000 n 
-0000112380 00000 n 
-0000112597 00000 n 
-0000114089 00000 n 
-0000114347 00000 n 
-0000114368 00000 n 
-0000114520 00000 n 
+0000113952 00000 n 
+0000114275 00000 n 
+0000056993 00000 n 
+0000056791 00000 n 
+0000027048 00000 n 
+0000080435 00000 n 
+0000080234 00000 n 
+0000057053 00000 n 
+0000104174 00000 n 
+0000103973 00000 n 
+0000080495 00000 n 
+0000104234 00000 n 
+0000106456 00000 n 
+0000106739 00000 n 
+0000106812 00000 n 
+0000112382 00000 n 
+0000112599 00000 n 
+0000114091 00000 n 
+0000114349 00000 n 
+0000114370 00000 n 
+0000114522 00000 n 
 trailer
-<</Size 39/Root 37 0 R/Info 38 0 R/ID[<9CF5644B1C188322F282FE1DEA949752> <9CF5644B1C188322F282FE1DEA949752>]>>
+<</Size 39/Root 37 0 R/Info 38 0 R/ID[<F4F8F2FC930553DE1CA6E0863715C7A7> <F4F8F2FC930553DE1CA6E0863715C7A7>]>>
 startxref
-114981
+114983
 %%EOF
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 9a59f9df0..8e4f79b17 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
@@ -13824,17 +13824,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.10.28 16:09</pdfx:ConTeXt.Time>

+            <pdfx:ConTeXt.Time>2011.10.28 19:27</pdfx:ConTeXt.Time>

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

-            <pdfx:ConTeXt.Version>2011.10.28 16:04</pdfx:ConTeXt.Version>

-            <pdfx:ID>s-inf-03.2011-10-28T16:09:26+02:00</pdfx:ID>

+            <pdfx:ConTeXt.Version>2011.10.28 19:22</pdfx:ConTeXt.Version>

+            <pdfx:ID>s-inf-03.2011-10-28T19:27:40+02: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-10-28T16:09:26+02:00</xmp:CreateDate>

-            <xmp:CreatorTool>ConTeXt - 2011.10.28 16:04</xmp:CreatorTool>

-            <xmp:ModifyDate>2011-10-28T16:09:26+02:00</xmp:ModifyDate>

-            <xmp:MetadataDate>2011-10-28T16:09:26+02:00</xmp:MetadataDate>

+            <xmp:CreateDate>2011-10-28T19:27:40+02:00</xmp:CreateDate>

+            <xmp:CreatorTool>ConTeXt - 2011.10.28 19:22</xmp:CreatorTool>

+            <xmp:ModifyDate>2011-10-28T19:27:40+02:00</xmp:ModifyDate>

+            <xmp:MetadataDate>2011-10-28T19:27:40+02:00</xmp:MetadataDate>

         </rdf:Description>

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

             <pdf:Keywords/>

@@ -14677,7 +14677,7 @@ endobj
 endobj
 1438 0 obj
 <<
-/ConTeXt.Url (www.pragma-ade.com) /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310030002e00320038002000310036003a00300034> /ConTeXt.Jobname (s-inf-03) /Author <feff00480061006e007300200048006100670065006e0020002d0020006100750074006f006d00610074006900630061006c006c0079002000670065006e006500720061007400650064> /Trapped /False /CreationDate (D:20111028160926+02'00') /Producer (LuaTeX-0.71.0) /Title <feff0043006f006e00540065005800740020004d006b00490056> /ConTeXt.Time (2011.10.28 16:09) /ID (s-inf-03.2011-10-28T16:09:26+02:00) /ConTeXt.Version (2011.10.28 16:04) /ModDate (D:20111028160926+02'00') /Subject <feff004c007500610020006d006f00640075006c0065007300200061006e0064002000660075006e006300740069006f006e0073>
+/ConTeXt.Url (www.pragma-ade.com) /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310030002e00320038002000310039003a00320032> /ConTeXt.Jobname (s-inf-03) /Author <feff00480061006e007300200048006100670065006e0020002d0020006100750074006f006d00610074006900630061006c006c0079002000670065006e006500720061007400650064> /Trapped /False /CreationDate (D:20111028192740+02'00') /Producer (LuaTeX-0.71.0) /Title <feff0043006f006e00540065005800740020004d006b00490056> /ConTeXt.Time (2011.10.28 19:27) /ID (s-inf-03.2011-10-28T19:27:40+02:00) /ConTeXt.Version (2011.10.28 19:22) /ModDate (D:20111028192740+02'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
@@ -16122,7 +16122,7 @@ xref
 0000807909 00000 n 
 0000808092 00000 n 
 trailer
-<</Size 1439/Root 1437 0 R/Info 1438 0 R/ID[<453140A6455247F98F94E8DF06FED7D4> <453140A6455247F98F94E8DF06FED7D4>]>>
+<</Size 1439/Root 1437 0 R/Info 1438 0 R/ID[<45A8F73A9096896A166DD704E6D04DB4> <45A8F73A9096896A166DD704E6D04DB4>]>>
 startxref
 808977
 %%EOF
diff --git a/tex/context/base/tabl-xnt.mkvi b/tex/context/base/tabl-xnt.mkvi
new file mode 100644
index 000000000..238bb6a28
--- /dev/null
+++ b/tex/context/base/tabl-xnt.mkvi
@@ -0,0 +1,127 @@
+% macros=mkvi
+
+%D \module
+%D   [       file=tabl-xtb,
+%D        version=2011.10.28,
+%D          title=\CONTEXT\ Table Macros,
+%D       subtitle=Natural to Xtreme Tables,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\writestatus{loading}{ConTeXt Table Macros / Natural to Xtreme Tables}
+
+\unprotect
+
+%D Don't expect wonders but it might come in handy:
+%D
+%D \starttyping
+%D \mapTABLEtoxtable
+%D \restoreTABLEfromxtable
+%D \stoptyping
+%D
+%D We stick to a simple example:
+%D
+%D \startbuffer
+%D \bTABLE
+%D   \bTR
+%D     \bTD[width=1cm,background=color,backgroundcolor=red] one \eTD
+%D     \bTD[width=2cm] two \eTD
+%D   \eTR
+%D   \bTR
+%D     \bTD alpha \eTD
+%D     \bTD beta  \eTD
+%D   \eTR
+%D \eTABLE
+%D \stopbuffer
+%D
+%D \typebuffer
+%D
+%D \startbuffer
+%D \startlinecorrection
+%D \getbuffer
+%D \stoplinecorrection
+%D
+%D \startlinecorrection
+%D \mapTABLEtoxtable \getbuffer
+%D \stoplinecorrection
+%D \stopbuffer
+%D
+%D \typebuffer \getbuffer
+
+\let\normal_x_table_bTABLEhead\bTABLEhead
+\let\normal_x_table_eTABLEhead\eTABLEhead
+\let\normal_x_table_bTABLEnext\bTABLEnext
+\let\normal_x_table_eTABLEnext\eTABLEnext
+\let\normal_x_table_bTABLEfoot\bTABLEfoot
+\let\normal_x_table_eTABLEfoot\eTABLEfoot
+\let\normal_x_table_bTABLEbody\bTABLEbody
+\let\normal_x_table_eTABLEbody\eTABLEbody
+\let\normal_x_table_bTR       \bTR
+\let\normal_x_table_eTR       \eTR
+\let\normal_x_table_bTD       \bTD
+\let\normal_x_table_eTD       \eTD
+\let\normal_x_table_bTH       \bTH
+\let\normal_x_table_eTH       \eTH
+\let\normal_x_table_setupTABLE\setupTABLE
+\let\normal_x_table_bTABLE    \bTABLE
+\let\normal_x_table_eTABLE    \eTABLE
+
+\unexpanded\def\restoreTABLEfromxtable
+  {\let\bTABLEhead\normal_x_table_bTABLEhead
+   \let\eTABLEhead\normal_x_table_eTABLEhead
+   \let\bTABLEnext\normal_x_table_bTABLEnext
+   \let\eTABLEnext\normal_x_table_eTABLEnext
+   \let\bTABLEfoot\normal_x_table_bTABLEfoot
+   \let\eTABLEfoot\normal_x_table_eTABLEfoot
+   \let\bTABLEbody\normal_x_table_bTABLEbody
+   \let\eTABLEbody\normal_x_table_eTABLEbody
+   \let\bTR       \normal_x_table_bTR
+   \let\eTR       \normal_x_table_eTR
+   \let\bTD       \normal_x_table_bTD
+   \let\eTD       \normal_x_table_eTD
+   \let\bTH       \normal_x_table_bTH
+   \let\eTH       \normal_x_table_eTH
+   \let\setupTABLE\normal_x_table_setupTABLE
+   \let\bTABLE    \normal_x_table_bTABLE
+   \let\eTABLE    \normal_x_table_eTABLE}
+
+\unexpanded\def\mapTABLEtoxtable
+  {\let\bTABLEhead\startxtablehead
+   \let\eTABLEhead\stopxtablehead
+   \let\bTABLEnext\startxtablefoot
+   \let\eTABLEnext\stopxtablefoot
+   \let\bTABLEfoot\startxtablefoot
+   \let\eTABLEfoot\stopxtablefoot
+   \let\bTABLEbody\startxtablebody
+   \let\eTABLEbody\stopxtablebody
+   \let\bTR       \startxrow
+   \let\eTR       \stopxrow
+   \let\bTD       \startxcell
+   \let\eTD       \stopxcell
+   \let\bTH       \startxcell
+   \let\eTH       \stopxcell
+   \let\setupTABLE\setup_x_table_TABLE
+   \let\bTABLE    \start_x_table_TABLE
+   \let\eTABLE    \stop_x_table_TABLE}
+
+\unexpanded\def\setup_x_table_TABLE{\dosingleempty\do_setup_x_table_TABLE}
+\unexpanded\def\start_x_table_TABLE{\dosingleempty\do_start_x_table_TABLE}
+\unexpanded\def\stop_x_table_TABLE {\stopxtable}
+
+\def\do_setup_x_table_TABLE[#settings]%
+  {\iffirstargument
+     \setupxtable[#settings]%
+   \fi}
+
+\def\do_start_x_table_TABLE[#settings]%
+  {\bgroup
+   \x_table_prepare{#settings}%
+   \edef\x_table_current_buffer{\x_table_default_buffer}%
+   \dodowithbuffer\x_table_current_buffer{bTABLE}{eTABLE}\relax\x_table_process}
+
+\protect \endinput
diff --git a/tex/context/base/tabl-xtb.mkvi b/tex/context/base/tabl-xtb.mkvi
index 2d47c2c73..8fcda9e19 100644
--- a/tex/context/base/tabl-xtb.mkvi
+++ b/tex/context/base/tabl-xtb.mkvi
@@ -58,7 +58,7 @@
 % - maybe correction when non float usage
 % - tagging needs to be checked
 % - maybe only tag the box
-
+%
 % option=stretch         : equal distribution
 % option={stretch,width} : proportional distribution
 
@@ -130,21 +130,36 @@
 
 \let\stopxtable\relax
 
+\def\x_table_default_buffer{x_table_\number\x_table_nesting}
+
 \unexpanded\def\start_x_table[#settings]% maybe two arguments: [tag][settings] | [tag] | [settings]
   {\bgroup
-   \advance\x_table_nesting\plusone
+   \x_table_prepare{#settings}%
+   \edef\x_table_current_buffer{\x_table_default_buffer}%
+   \dodowithbuffer{\x_table_current_buffer}{startxtable}{stopxtable}\relax\x_table_process}
+
+\unexpanded\def\processxtablebuffer
+  {\dosingleempty\process_x_table_buffer}
+
+\let\normal_start_x_table\start_x_table
+
+\def\process_x_table_buffer[#name]%
+  {\bgroup
+   \let\start_x_table\start_process_x_table_buffer
+   \edef\x_table_current_buffer{#name}%
+   \x_table_process}
+
+\def\start_process_x_table_buffer[#settings]%
+  {\x_table_prepare{#settings}%
+   \let\start_x_table\normal_start_x_table}
+
+\def\x_table_prepare#settings% assumes \iffirstargument to be set
+  {\advance\x_table_nesting\plusone
    \dostarttagged\t!table\empty
    \forgetall
    \iffirstargument
      \set_checked_x_table{#settings}%
-   \fi
-   \normalexpanded
-     {\dodowithbuffer
-        {x_table:\number\x_table_nesting}%
-        {\e!start\v!xtable}%
-        {\e!stop\v!xtable}
-        \relax
-       \x_table_process}} % name start stop before after
+   \fi}
 
 \unexpanded\def\x_table_process
   {\setbox\scratchbox\vbox{\xtableparameter\c!spaceinbetween}%
@@ -164,7 +179,7 @@
      \let\start_x_cell\start_x_cell_one
      \let\stop_x_cell \stop_x_cell_one
      \settrialtypesetting
-     \doprocesstexbuffer{x_table:\number\x_table_nesting}\relax
+     \doprocesstexbuffer\x_table_current_buffer\relax
      \ctxcommand{x_table_reflow()}%
      \relax
    \endgroup
@@ -173,7 +188,7 @@
      \let\stop_x_row  \stop_x_row_two
      \let\start_x_cell\start_x_cell_two
      \let\stop_x_cell \stop_x_cell_two
-     \doprocesstexbuffer{x_table:\number\x_table_nesting}\relax
+     \doprocesstexbuffer\x_table_current_buffer\relax
      \ctxcommand{x_table_construct()}%
      \relax
    \endgroup
@@ -188,7 +203,7 @@
    \fi\fi
    \ctxcommand{x_table_cleanup()}%
    \dostoptagged
-   \resetbuffer[x_table:\number\x_table_nesting]%
+   \resetbuffer[\x_table_current_buffer]%
    \egroup}
 
 \let\extratxtablesplitheight\zeropoint % might disappear so don't depend on it
diff --git a/tex/context/base/x-entities.mkiv b/tex/context/base/x-entities.mkiv
new file mode 100644
index 000000000..3dd02118a
--- /dev/null
+++ b/tex/context/base/x-entities.mkiv
@@ -0,0 +1,18 @@
+%D \module
+%D   [       file=x-entities,
+%D        version=2008.05.29,
+%D          title=\CONTEXT\ XML Modules,
+%D       subtitle=\HTML\ entities,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\writestatus{loading}{ConTeXt XML Macros / HTML entities}
+
+\ctxlua{characters.registerentities()}
+
+\endinput
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index e07ee2fa9..c5fdcf05b 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  : 10/28/11 16:04:20
+-- merge date  : 10/28/11 19:22:22
 
 do -- begin closure to overcome local limits and interference