2018-05-24 15:56:00

9 files changed, 114 insertions, 1 deletions

diff --git a/tex/context/interface/mkii/keys-de.xml b/tex/context/interface/mkii/keys-de.xml
index f399f128a..9b742d4b1 100644
--- a/tex/context/interface/mkii/keys-de.xml
+++ b/tex/context/interface/mkii/keys-de.xml
@@ -1280,6 +1280,7 @@
 		<cd:constant name='vcompact' value='vcompact'/>
 		<cd:constant name='vector' value='vector'/>
 		<cd:constant name='veroffset' value='kopfoffset'/>
+		<cd:constant name='vfactor' value='vfaktor'/>
 		<cd:constant name='vfil' value='vfil'/>
 		<cd:constant name='viewerprefix' value='viewerprefix'/>
 		<cd:constant name='voffset' value='voffset'/>
diff --git a/tex/context/interface/mkii/keys-ro.xml b/tex/context/interface/mkii/keys-ro.xml
index c0308086c..b255ae87a 100644
--- a/tex/context/interface/mkii/keys-ro.xml
+++ b/tex/context/interface/mkii/keys-ro.xml
@@ -1280,6 +1280,7 @@
 		<cd:constant name='vcompact' value='vcompact'/>
 		<cd:constant name='vector' value='vector'/>
 		<cd:constant name='veroffset' value='veroffset'/>
+		<cd:constant name='vfactor' value='vfactor'/>
 		<cd:constant name='vfil' value='vfil'/>
 		<cd:constant name='viewerprefix' value='viewerprefix'/>
 		<cd:constant name='voffset' value='voffset'/>
diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml
index 1d66d20df..a1daf81ee 100644
--- a/tex/context/interface/mkiv/context-en.xml
+++ b/tex/context/interface/mkiv/context-en.xml
@@ -5658,6 +5658,16 @@
     <cd:csname/>
    </cd:arguments>
   </cd:command>
+  <cd:command file="mult-aux.mkiv" level="system" name="installmacrostack">
+   <cd:arguments>
+    <cd:csname/>
+   </cd:arguments>
+  </cd:command>
+  <cd:command file="mult-aux.mkiv" level="system" name="installglobalmacrostack">
+   <cd:arguments>
+    <cd:csname/>
+   </cd:arguments>
+  </cd:command>
  </cd:interface>
  <cd:interface file="i-comment.xml">
   <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="definecomment">
@@ -15233,10 +15243,12 @@
   <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="thinspace"/>
   <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="negthinspace"/>
   <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="enspace"/>
+  <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="negenspace"/>
   <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="enskip"/>
   <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="quad"/>
   <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="qquad"/>
   <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="emspace"/>
+  <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="negemspace"/>
   <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="dotfskip">
    <cd:arguments>
     <cd:keywords delimiters="braces">
@@ -16501,6 +16513,7 @@
       <cd:constant type="paper"/>
       <cd:constant type="attachment"/>
       <cd:constant type="layer"/>
+      <cd:constant type="title"/>
      </cd:parameter>
      <cd:parameter name="copies">
       <cd:constant type="cd:number"/>
@@ -33870,6 +33883,88 @@
    </cd:arguments>
   </cd:command>
  </cd:interface>
+ <cd:interface file="i-ruby.xml">
+  <cd:command category="fonts" file="typo-rub.mkiv" level="style" name="defineruby">
+   <cd:arguments>
+    <cd:keywords>
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:keywords optional="yes">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:assignments list="yes" optional="yes">
+     <cd:inherit name="setupruby"/>
+    </cd:assignments>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="fonts" file="typo-rub.mkiv" level="style" name="setupruby">
+   <cd:arguments>
+    <cd:keywords list="yes" optional="yes">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:assignments list="yes">
+     <cd:parameter name="location">
+      <cd:constant default="yes" type="top"/>
+      <cd:constant type="left"/>
+      <cd:constant type="right"/>
+     </cd:parameter>
+     <cd:parameter name="align">
+      <cd:constant type="auto"/>
+      <cd:constant type="flushleft"/>
+      <cd:constant default="yes" type="middle"/>
+      <cd:constant type="flushright"/>
+     </cd:parameter>
+     <cd:parameter name="stretch">
+      <cd:constant type="yes"/>
+      <cd:constant default="yes" type="no"/>
+     </cd:parameter>
+     <cd:parameter name="hoffset">
+      <cd:constant type="cd:dimension"/>
+     </cd:parameter>
+     <cd:parameter name="voffset">
+      <cd:constant type="cd:dimension"/>
+     </cd:parameter>
+     <cd:parameter name="distance">
+      <cd:constant type="none"/>
+      <cd:constant type="cd:dimension"/>
+     </cd:parameter>
+     <cd:parameter name="left">
+      <cd:constant type="cd:command"/>
+     </cd:parameter>
+     <cd:parameter name="right">
+      <cd:constant type="cd:command"/>
+     </cd:parameter>
+     <cd:parameter name="style">
+      <cd:constant type="cd:style"/>
+      <cd:constant type="cd:command"/>
+     </cd:parameter>
+     <cd:parameter name="color">
+      <cd:constant type="cd:color"/>
+     </cd:parameter>
+    </cd:assignments>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="fonts" file="typo-rub.mkiv" level="document" name="ruby">
+   <cd:arguments>
+    <cd:keywords optional="yes">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:text"/>
+    </cd:keywords>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:text"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="fonts" file="typo-rub.mkiv" level="document" name="ruby" type="environment">
+   <cd:arguments>
+    <cd:keywords>
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
+ </cd:interface>
  <cd:interface file="i-scale.xml">
   <cd:command category="graphics" file="grph-trf.mkiv" level="style" name="definescale">
    <cd:arguments>
diff --git a/tex/context/interface/mkiv/i-commandhandler.xml b/tex/context/interface/mkiv/i-commandhandler.xml
index 40da525f3..6accac865 100644
--- a/tex/context/interface/mkiv/i-commandhandler.xml
+++ b/tex/context/interface/mkiv/i-commandhandler.xml
@@ -311,4 +311,16 @@
         </cd:arguments>
     </cd:command>
 
+    <cd:command name="installmacrostack" level="system" file="mult-aux.mkiv">
+        <cd:arguments>
+            <cd:csname/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="installglobalmacrostack" level="system" file="mult-aux.mkiv">
+        <cd:arguments>
+            <cd:csname/>
+        </cd:arguments>
+    </cd:command>
+
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 5668dc50a..77855e8c0 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
diff --git a/tex/context/interface/mkiv/i-context.xml b/tex/context/interface/mkiv/i-context.xml
index 73bd3d4ae..a328b6772 100644
--- a/tex/context/interface/mkiv/i-context.xml
+++ b/tex/context/interface/mkiv/i-context.xml
@@ -188,6 +188,7 @@
     <cd:interfacefile filename="i-renderingwindow.xml"/>
     <cd:interfacefile filename="i-replacement.xml"/>
     <cd:interfacefile filename="i-rotatation.xml"/>
+    <cd:interfacefile filename="i-ruby.xml"/>
     <cd:interfacefile filename="i-scale.xml"/>
     <cd:interfacefile filename="i-script.xml"/>
     <cd:interfacefile filename="i-section.xml"/>
diff --git a/tex/context/interface/mkiv/i-hspace.xml b/tex/context/interface/mkiv/i-hspace.xml
index c1626e7b1..5926d864d 100644
--- a/tex/context/interface/mkiv/i-hspace.xml
+++ b/tex/context/interface/mkiv/i-hspace.xml
@@ -91,6 +91,7 @@
     <cd:command name="negthinspace" level="style" category="whitespace" file="spac-hor.mkiv"/>
 
     <cd:command name="enspace" level="style" category="whitespace" file="spac-hor.mkiv"/>
+    <cd:command name="negenspace" level="style" category="whitespace" file="spac-hor.mkiv"/>
 
     <cd:command name="enskip" level="style" category="whitespace" file="spac-hor.mkiv"/>
 
@@ -99,6 +100,7 @@
     <cd:command name="qquad" level="style" category="whitespace" file="spac-hor.mkiv"/>
 
     <cd:command name="emspace" level="style" category="whitespace" file="spac-hor.mkiv"/>
+    <cd:command name="negemspace" level="style" category="whitespace" file="spac-hor.mkiv"/>
 
     <cd:command name="dotfskip" level="system" category="whitespace" file="spac-hor.mkiv">
         <cd:arguments>
@@ -162,4 +164,4 @@
         </cd:arguments>
     </cd:command>
 
-</cd:interface>
\ No newline at end of file
+</cd:interface>
diff --git a/tex/context/interface/mkiv/i-interactionscreen.xml b/tex/context/interface/mkiv/i-interactionscreen.xml
index bf26cd962..7ead396b8 100644
--- a/tex/context/interface/mkiv/i-interactionscreen.xml
+++ b/tex/context/interface/mkiv/i-interactionscreen.xml
@@ -47,6 +47,7 @@
                     <cd:constant type="paper"/>
                     <cd:constant type="attachment"/>
                     <cd:constant type="layer"/>
+                    <cd:constant type="title"/>
                 </cd:parameter>
                 <cd:parameter name="copies">
                     <cd:constant type="cd:number"/>
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 40ebc7cd2..903c92bb2 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf