beta 2010.12.15 13:04

15 files changed, 159 insertions, 22 deletions

diff --git a/tex/context/base/char-ini.mkiv b/tex/context/base/char-ini.mkiv
index 65140604e..ba31e6b95 100644
--- a/tex/context/base/char-ini.mkiv
+++ b/tex/context/base/char-ini.mkiv
@@ -66,6 +66,7 @@
         {   % activate catcodes
             \number\ctxcatcodes,
             \number\notcatcodes,
+            \number\prtcatcodes, % new
 %           \number\xmlcatcodesn,
 %           \number\xmlcatcodese,
 %           \number\xmlcatcodesr,
diff --git a/tex/context/base/colo-ini.mkiv b/tex/context/base/colo-ini.mkiv
index d6ded253c..2d45c8edd 100644
--- a/tex/context/base/colo-ini.mkiv
+++ b/tex/context/base/colo-ini.mkiv
@@ -837,7 +837,7 @@
    \ifx\@@rastervalue\empty
      \let\@@rastervalue\@@rsscreen
    \fi
-   \ctxlua{commands.setrastercolor("_raster_",\@@rastervalue))}} % sets attribute
+   \ctxlua{commands.setrastercolor("_raster_",\@@rastervalue)}} % sets attribute
 
 \def\dodefinefastcolor[#1][#2]% still not fast but ok
   {\ctxlua{commands.defineprocesscolor("#1","#2",false,\iffreezecolors true\else false\fi)}%
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index d767b1f03..6ed9c0cc9 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2010.12.13 22:59}
+\newcontextversion{2010.12.15 13:04}
 
 %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.tex b/tex/context/base/context.tex
index dfecbb321..c1a49aefc 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2010.12.13 22:59}
+\edef\contextversion{2010.12.15 13:04}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/page-com.mkiv b/tex/context/base/page-com.mkiv
index 6c6d741a8..5035280ac 100644
--- a/tex/context/base/page-com.mkiv
+++ b/tex/context/base/page-com.mkiv
@@ -113,4 +113,4 @@
    \c!height=5cm,
    \c!width=10cm]
 
-\endinput
+\protect \endinput
diff --git a/tex/context/base/v-nested.mkiv b/tex/context/base/v-nested.mkiv
index aa68483a3..e1d582d81 100644
--- a/tex/context/base/v-nested.mkiv
+++ b/tex/context/base/v-nested.mkiv
@@ -18,4 +18,4 @@
 \unexpanded\def\donestedtypingstart{\bgroup\swaptypeface{}}
 \unexpanded\def\donestedtypingstop {\egroup{}}
 
-\unprotect \endinput
+\protect \endinput
diff --git a/tex/context/interface/cont-cs.xml b/tex/context/interface/cont-cs.xml
index 5d689a769..65e243cc8 100644
--- a/tex/context/interface/cont-cs.xml
+++ b/tex/context/interface/cont-cs.xml
@@ -4910,8 +4910,14 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="misto">
+          <cd:constant type="zde"/>
+          <cd:constant type="zadny"/>
+        </cd:parameter>
+      </cd:assignments>
       <cd:content n="3"/>
+      <cd:content n="4"/>
     </cd:arguments>
   </cd:command>
 
@@ -4924,7 +4930,13 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="misto">
+          <cd:constant type="zde"/>
+          <cd:constant type="zadny"/>
+        </cd:parameter>
+      </cd:assignments>
+      <cd:content n="3"/>
     </cd:arguments>
   </cd:command>
 
@@ -5160,6 +5172,11 @@
         <cd:parameter name="maxsirka">
           <cd:constant type="cd:dimension"/>
         </cd:parameter>
+        <cd:parameter name="order">
+          <cd:constant type="prikaz"/>
+          <cd:constant type="vse"/>
+          <cd:constant type="normalni"/>
+        </cd:parameter>
         <cd:inherit name="nastavoramovani" n="2"/>
       </cd:assignments>
     </cd:arguments>
diff --git a/tex/context/interface/cont-de.xml b/tex/context/interface/cont-de.xml
index 2bdfb751c..cb5624e06 100644
--- a/tex/context/interface/cont-de.xml
+++ b/tex/context/interface/cont-de.xml
@@ -4910,8 +4910,14 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="platz">
+          <cd:constant type="hier"/>
+          <cd:constant type="kein"/>
+        </cd:parameter>
+      </cd:assignments>
       <cd:content n="3"/>
+      <cd:content n="4"/>
     </cd:arguments>
   </cd:command>
 
@@ -4924,7 +4930,13 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="platz">
+          <cd:constant type="hier"/>
+          <cd:constant type="kein"/>
+        </cd:parameter>
+      </cd:assignments>
+      <cd:content n="3"/>
     </cd:arguments>
   </cd:command>
 
@@ -5160,6 +5172,11 @@
         <cd:parameter name="maxbreite">
           <cd:constant type="cd:dimension"/>
         </cd:parameter>
+        <cd:parameter name="order">
+          <cd:constant type="befehl"/>
+          <cd:constant type="alles"/>
+          <cd:constant type="normal"/>
+        </cd:parameter>
         <cd:inherit name="stelleumrahmtein" n="2"/>
       </cd:assignments>
     </cd:arguments>
diff --git a/tex/context/interface/cont-en.xml b/tex/context/interface/cont-en.xml
index 28f2d724b..b15c133aa 100644
--- a/tex/context/interface/cont-en.xml
+++ b/tex/context/interface/cont-en.xml
@@ -4910,8 +4910,14 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="location">
+          <cd:constant type="here"/>
+          <cd:constant type="none"/>
+        </cd:parameter>
+      </cd:assignments>
       <cd:content n="3"/>
+      <cd:content n="4"/>
     </cd:arguments>
   </cd:command>
 
@@ -4924,7 +4930,13 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="location">
+          <cd:constant type="here"/>
+          <cd:constant type="none"/>
+        </cd:parameter>
+      </cd:assignments>
+      <cd:content n="3"/>
     </cd:arguments>
   </cd:command>
 
@@ -5160,6 +5172,11 @@
         <cd:parameter name="maxwidth">
           <cd:constant type="cd:dimension"/>
         </cd:parameter>
+        <cd:parameter name="order">
+          <cd:constant type="command"/>
+          <cd:constant type="all"/>
+          <cd:constant type="normal"/>
+        </cd:parameter>
         <cd:inherit name="setupframed" n="2"/>
       </cd:assignments>
     </cd:arguments>
diff --git a/tex/context/interface/cont-fr.xml b/tex/context/interface/cont-fr.xml
index 5317c19ce..ebd32fd5d 100644
--- a/tex/context/interface/cont-fr.xml
+++ b/tex/context/interface/cont-fr.xml
@@ -4910,8 +4910,14 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="emplacement">
+          <cd:constant type="ici"/>
+          <cd:constant type="rien"/>
+        </cd:parameter>
+      </cd:assignments>
       <cd:content n="3"/>
+      <cd:content n="4"/>
     </cd:arguments>
   </cd:command>
 
@@ -4924,7 +4930,13 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="emplacement">
+          <cd:constant type="ici"/>
+          <cd:constant type="rien"/>
+        </cd:parameter>
+      </cd:assignments>
+      <cd:content n="3"/>
     </cd:arguments>
   </cd:command>
 
@@ -5160,6 +5172,11 @@
         <cd:parameter name="largeurmax">
           <cd:constant type="cd:dimension"/>
         </cd:parameter>
+        <cd:parameter name="order">
+          <cd:constant type="commande"/>
+          <cd:constant type="tout"/>
+          <cd:constant type="normal"/>
+        </cd:parameter>
         <cd:inherit name="regleencadre" n="2"/>
       </cd:assignments>
     </cd:arguments>
diff --git a/tex/context/interface/cont-it.xml b/tex/context/interface/cont-it.xml
index 8e14050d2..3052b7bb4 100644
--- a/tex/context/interface/cont-it.xml
+++ b/tex/context/interface/cont-it.xml
@@ -4910,8 +4910,14 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="luogo">
+          <cd:constant type="qui"/>
+          <cd:constant type="nessuno"/>
+        </cd:parameter>
+      </cd:assignments>
       <cd:content n="3"/>
+      <cd:content n="4"/>
     </cd:arguments>
   </cd:command>
 
@@ -4924,7 +4930,13 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="luogo">
+          <cd:constant type="qui"/>
+          <cd:constant type="nessuno"/>
+        </cd:parameter>
+      </cd:assignments>
+      <cd:content n="3"/>
     </cd:arguments>
   </cd:command>
 
@@ -5160,6 +5172,11 @@
         <cd:parameter name="ampiezzamax">
           <cd:constant type="cd:dimension"/>
         </cd:parameter>
+        <cd:parameter name="order">
+          <cd:constant type="comando"/>
+          <cd:constant type="tutti"/>
+          <cd:constant type="normale"/>
+        </cd:parameter>
         <cd:inherit name="impostaincorniciato" n="2"/>
       </cd:assignments>
     </cd:arguments>
diff --git a/tex/context/interface/cont-nl.xml b/tex/context/interface/cont-nl.xml
index a3cc591ac..8fb7a0e41 100644
--- a/tex/context/interface/cont-nl.xml
+++ b/tex/context/interface/cont-nl.xml
@@ -4910,8 +4910,14 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="plaats">
+          <cd:constant type="hier"/>
+          <cd:constant type="geen"/>
+        </cd:parameter>
+      </cd:assignments>
       <cd:content n="3"/>
+      <cd:content n="4"/>
     </cd:arguments>
   </cd:command>
 
@@ -4924,7 +4930,13 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="plaats">
+          <cd:constant type="hier"/>
+          <cd:constant type="geen"/>
+        </cd:parameter>
+      </cd:assignments>
+      <cd:content n="3"/>
     </cd:arguments>
   </cd:command>
 
@@ -5160,6 +5172,11 @@
         <cd:parameter name="maxbreedte">
           <cd:constant type="cd:dimension"/>
         </cd:parameter>
+        <cd:parameter name="order">
+          <cd:constant type="commando"/>
+          <cd:constant type="alles"/>
+          <cd:constant type="normaal"/>
+        </cd:parameter>
         <cd:inherit name="stelomlijndin" n="2"/>
       </cd:assignments>
     </cd:arguments>
diff --git a/tex/context/interface/cont-pe.xml b/tex/context/interface/cont-pe.xml
index 25ce62678..4c03573dd 100644
--- a/tex/context/interface/cont-pe.xml
+++ b/tex/context/interface/cont-pe.xml
@@ -4910,8 +4910,14 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="مکان">
+          <cd:constant type="اینجا"/>
+          <cd:constant type="هیچکدام"/>
+        </cd:parameter>
+      </cd:assignments>
       <cd:content n="3"/>
+      <cd:content n="4"/>
     </cd:arguments>
   </cd:command>
 
@@ -4924,7 +4930,13 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="مکان">
+          <cd:constant type="اینجا"/>
+          <cd:constant type="هیچکدام"/>
+        </cd:parameter>
+      </cd:assignments>
+      <cd:content n="3"/>
     </cd:arguments>
   </cd:command>
 
@@ -5160,6 +5172,11 @@
         <cd:parameter name="بیشترین‌عرض">
           <cd:constant type="cd:dimension"/>
         </cd:parameter>
+        <cd:parameter name="order">
+          <cd:constant type="فرمان"/>
+          <cd:constant type="همه"/>
+          <cd:constant type="نرمال"/>
+        </cd:parameter>
         <cd:inherit name="بارگذاری‌قالبی" n="2"/>
       </cd:assignments>
     </cd:arguments>
diff --git a/tex/context/interface/cont-ro.xml b/tex/context/interface/cont-ro.xml
index de44c2a6b..d0ddaa9b4 100644
--- a/tex/context/interface/cont-ro.xml
+++ b/tex/context/interface/cont-ro.xml
@@ -4910,8 +4910,14 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="locatie">
+          <cd:constant type="aici"/>
+          <cd:constant type="niciunul"/>
+        </cd:parameter>
+      </cd:assignments>
       <cd:content n="3"/>
+      <cd:content n="4"/>
     </cd:arguments>
   </cd:command>
 
@@ -4924,7 +4930,13 @@
         <cd:constant type="cd:section"/>
         <cd:constant type="cd:name"/>
       </cd:keywords>
-      <cd:content n="2"/>
+      <cd:assignments n="2" list="yes">
+        <cd:parameter name="locatie">
+          <cd:constant type="aici"/>
+          <cd:constant type="niciunul"/>
+        </cd:parameter>
+      </cd:assignments>
+      <cd:content n="3"/>
     </cd:arguments>
   </cd:command>
 
@@ -5160,6 +5172,11 @@
         <cd:parameter name="latimemaxima">
           <cd:constant type="cd:dimension"/>
         </cd:parameter>
+        <cd:parameter name="order">
+          <cd:constant type="comanda"/>
+          <cd:constant type="tot"/>
+          <cd:constant type="normal"/>
+        </cd:parameter>
         <cd:inherit name="seteazainconjurat" n="2"/>
       </cd:assignments>
     </cd:arguments>
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index e2abae9eb..bcfee0a3f 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 12/13/10 22:59:02
+-- merge date  : 12/15/10 13:04:36
 
 do -- begin closure to overcome local limits and interference