context [current] (20mar18)

git-svn-id: svn://tug.org/texlive/trunk@47050 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 84 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-vspace.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-vspace.xml
index 4618fc00ae0..ce6d5ac083a 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-vspace.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-vspace.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="definevspacingamount" file="spac-ver.mkiv">
+    <cd:command name="definevspacingamount" level="system" category="whitespace" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-dimension-optional"/>
@@ -12,7 +12,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="definevspacing" file="spac-ver.mkiv">
+    <cd:command name="definevspacing" level="system" category="whitespace" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:keywords>
@@ -21,7 +21,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="vspacing" file="spac-ver.mkiv">
+    <cd:command name="vspacing" level="system" category="whitespace" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:constant type="preference"/>
@@ -31,6 +31,7 @@
                 <cd:constant type="enable"/>
                 <cd:constant type="disable"/>
                 <cd:constant type="nowhite"/>
+                <cd:constant type="packed"/>
                 <cd:constant type="back"/>
                 <cd:constant type="overlay"/>
                 <cd:constant type="always"/>
@@ -73,7 +74,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="directvspacing" file="spac-ver.mkiv">
+    <cd:command name="directvspacing" level="system" category="whitespace" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:keywords delimiters="braces" list="yes">
                 <cd:inherit name="vspacing"/>
@@ -81,7 +82,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupvspacing" file="spac-ver.mkiv">
+    <cd:command name="setupvspacing" level="system" category="whitespace" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
                 <cd:inherit name="vspacing"/>
@@ -89,33 +90,97 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="setupblank" file="spac-ver.mkiv">
+    <!--
+
+        <cd:command name="setupblank" level="style" category="whitespace" file="spac-ver.mkiv">
+            <cd:arguments>
+                <cd:keywords list="yes" optional="yes">
+                    <cd:inherit name="vspacing"/>
+                </cd:keywords>
+            </cd:arguments>
+        </cd:command>
+
+        <cd:command name="blank" level="document" category="whitespace" file="spac-ver.mkiv">
+            <cd:arguments>
+                <cd:keywords list="yes" optional="yes">
+                    <cd:inherit name="vspacing"/>
+                </cd:keywords>
+            </cd:arguments>
+        </cd:command>
+
+    -->
+
+    <cd:command name="setupblank" level="style" category="whitespace" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
-                <cd:inherit name="vspacing"/>
+                <cd:inherit name="blank"/>
             </cd:keywords>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="blank" file="spac-ver.mkiv">
+    <cd:command name="blank" level="document" category="whitespace" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:keywords list="yes" optional="yes">
-                <cd:inherit name="vspacing"/>
+                <cd:constant type="preference"/>
+                <cd:constant type="samepage"/>
+                <cd:constant type="max"/>
+                <cd:constant type="force"/>
+                <cd:constant type="enable"/>
+                <cd:constant type="disable"/>
+                <cd:constant type="nowhite"/>
+                <cd:constant type="back"/>
+                <cd:constant type="overlay"/>
+                <cd:constant type="always"/>
+                <cd:constant type="weak"/>
+                <cd:constant type="strong"/>
+                <cd:constant type="default"/>
+                <cd:constant type="before"/>
+                <cd:constant type="inbetween"/>
+                <cd:constant type="after"/>
+                <cd:constant type="fixed"/>
+                <cd:constant type="flexible"/>
+                <cd:constant type="none"/>
+                <cd:constant type="small"/>
+                <cd:constant type="medium"/>
+                <cd:constant type="big"/>
+                <cd:constant type="line"/>
+                <cd:constant type="halfline"/>
+                <cd:constant type="quarterline"/>
+                <cd:constant type="formula"/>
+                <cd:constant type="white"/>
+                <cd:constant type="height"/>
+                <cd:constant type="depth"/>
+                <cd:constant type="standard"/>
+                <cd:constant type="small" prefix="cd:number" method="factor"/>
+                <cd:constant type="medium" prefix="cd:number" method="factor"/>
+                <cd:constant type="big" prefix="cd:number" method="factor"/>
+                <cd:constant type="line" prefix="cd:number" method="factor"/>
+                <cd:constant type="halfline" prefix="cd:number" method="factor"/>
+                <cd:constant type="quarterline" prefix="cd:number" method="factor"/>
+                <cd:constant type="formula" prefix="cd:number" method="factor"/>
+                <cd:constant type="white" prefix="cd:number" method="factor"/>
+                <cd:constant type="height" prefix="cd:number" method="factor"/>
+                <cd:constant type="depth" prefix="cd:number" method="factor"/>
+                <cd:constant type="cd:number" prefix="category" method="range"/>
+                <cd:constant type="cd:number" prefix="order" method="range"/>
+                <cd:constant type="cd:number" prefix="penalty" method="range"/>
+                <cd:constant type="cd:dimension"/>
+                <cd:constant type="cd:name"/>
             </cd:keywords>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="useblankparameter" file="spac-ver.mkiv">
+    <cd:command name="useblankparameter" level="system" category="whitespace" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:csname/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="inhibitblank" file="spac-ver.mkiv"/>
+    <cd:command name="inhibitblank" level="system" category="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="synchronizeblank" file="spac-ver.mkiv"/>
+    <cd:command name="synchronizeblank" level="system" category="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="definevspace" file="spac-ver.mkiv">
+    <cd:command name="definevspace" level="style" category="whitespace" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:resolve name="keyword-name"/>
@@ -123,29 +188,29 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="vspace" file="spac-ver.mkiv">
+    <cd:command name="vspace" level="document" category="whitespace" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name-optional"/>
             <cd:resolve name="keyword-name-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="godown" file="spac-ver.mkiv">
+    <cd:command name="godown" level="document" category="whitespace" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="vglue" file="spac-ver.mkiv">
+    <cd:command name="vglue" level="system" category="whitespace" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:resolve name="string-dimension"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="smallskip" file="spac-ver.mkiv"/>
+    <cd:command name="smallskip" level="system" category="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="medskip" file="spac-ver.mkiv"/>
+    <cd:command name="medskip" level="system" category="whitespace" file="spac-ver.mkiv"/>
 
-    <cd:command name="bigskip" file="spac-ver.mkiv"/>
+    <cd:command name="bigskip" level="system" category="whitespace" file="spac-ver.mkiv"/>
 
 </cd:interface>