2018-01-14 16:05:00

6 files changed, 26 insertions, 3 deletions

diff --git a/tex/context/interface/mkii/keys-nl.xml b/tex/context/interface/mkii/keys-nl.xml
index 8cef8ca55..212685d44 100644
--- a/tex/context/interface/mkii/keys-nl.xml
+++ b/tex/context/interface/mkii/keys-nl.xml
@@ -379,6 +379,7 @@
 		<cd:variable name='norepeat' value='norepeat'/>
 		<cd:variable name='normal' value='normaal'/>
 		<cd:variable name='nospacing' value='geenspatiering'/>
+		<cd:variable name='nostopper' value='geenafsluiter'/>
 		<cd:variable name='not' value='niet'/>
 		<cd:variable name='notation' value='notation'/>
 		<cd:variable name='note' value='note'/>
@@ -627,6 +628,10 @@
 		<cd:constant name='align' value='uitlijnen'/>
 		<cd:constant name='aligncharacter' value='karakteruitlijnen'/>
 		<cd:constant name='alignmentcharacter' value='uitlijnkarakter'/>
+		<cd:constant name='alignmentleftsample' value='alignmentleftsample'/>
+		<cd:constant name='alignmentleftwidth' value='alignmentleftwidth'/>
+		<cd:constant name='alignmentrightsample' value='alignmentrightsample'/>
+		<cd:constant name='alignmentrightwidth' value='alignmentrightwidth'/>
 		<cd:constant name='alignsymbol' value='alignsymbol'/>
 		<cd:constant name='aligntitle' value='titeluitlijnen'/>
 		<cd:constant name='alternative' value='variant'/>
@@ -913,6 +918,7 @@
 		<cd:constant name='leftoffset' value='linkeroffset'/>
 		<cd:constant name='leftquotation' value='linkercitaat'/>
 		<cd:constant name='leftquote' value='linkerciteer'/>
+		<cd:constant name='leftsample' value='leftsample'/>
 		<cd:constant name='leftsentence' value='linkerzin'/>
 		<cd:constant name='leftspeech' value='linkeruitspraak'/>
 		<cd:constant name='leftstyle' value='linkerletter'/>
@@ -984,7 +990,8 @@
 		<cd:constant name='nleft' value='nlinks'/>
 		<cd:constant name='nlines' value='nregels'/>
 		<cd:constant name='norm' value='norm'/>
-		<cd:constant name='note' value='note'/>
+		<cd:constant name='note' value='noot'/>
+		<cd:constant name='notes' value='noten'/>
 		<cd:constant name='nr' value='nr'/>
 		<cd:constant name='nright' value='nrechts'/>
 		<cd:constant name='ntop' value='nboven'/>
@@ -1004,6 +1011,7 @@
 		<cd:constant name='numberset' value='numberset'/>
 		<cd:constant name='numberstarter' value='numberstarter'/>
 		<cd:constant name='numberstopper' value='numberstopper'/>
+		<cd:constant name='numberstrut' value='nummerstrut'/>
 		<cd:constant name='numberstyle' value='nummerletter'/>
 		<cd:constant name='numberwidth' value='nummerbreedte'/>
 		<cd:constant name='nx' value='nx'/>
@@ -1115,6 +1123,7 @@
 		<cd:constant name='rightoffset' value='rechteroffset'/>
 		<cd:constant name='rightquotation' value='rechtercitaat'/>
 		<cd:constant name='rightquote' value='rechterciteer'/>
+		<cd:constant name='rightsample' value='rightsample'/>
 		<cd:constant name='rightsentence' value='rechterzin'/>
 		<cd:constant name='rightspeech' value='rechteruitspraak'/>
 		<cd:constant name='rightstyle' value='rechterletter'/>
@@ -1171,7 +1180,9 @@
 		<cd:constant name='source' value='bron'/>
 		<cd:constant name='space' value='spatie'/>
 		<cd:constant name='spaceafter' value='nawit'/>
+		<cd:constant name='spaceafterside' value='witnazij'/>
 		<cd:constant name='spacebefore' value='voorwit'/>
+		<cd:constant name='spacebeforeside' value='witvoorzij'/>
 		<cd:constant name='spaceinbetween' value='tussenwit'/>
 		<cd:constant name='spacing' value='spatiering'/>
 		<cd:constant name='specification' value='specification'/>
@@ -1236,6 +1247,7 @@
 		<cd:constant name='titledistance' value='titelafstand'/>
 		<cd:constant name='titleleft' value='titellinks'/>
 		<cd:constant name='titleright' value='titelrechts'/>
+		<cd:constant name='titlestrut' value='titelstrut'/>
 		<cd:constant name='titlestyle' value='titelletter'/>
 		<cd:constant name='to' value='aan'/>
 		<cd:constant name='toffset' value='toffset'/>
diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml
index e39caba78..48fcac906 100644
--- a/tex/context/interface/mkiv/context-en.xml
+++ b/tex/context/interface/mkiv/context-en.xml
@@ -249,9 +249,13 @@
      <cd:constant type="stretch"/>
      <cd:constant type="extremestretch"/>
      <cd:constant type="final"/>
+     <cd:constant type="1*final"/>
      <cd:constant type="2*final"/>
      <cd:constant type="3*final"/>
      <cd:constant type="4*final"/>
+     <cd:constant type="more"/>
+     <cd:constant type="1*more"/>
+     <cd:constant type="2*more"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
@@ -7396,6 +7400,7 @@
    </cd:arguments>
   </cd:command>
   <cd:command category="language" file="typo-del.mkiv" level="document" name="subsentence" type="environment"/>
+  <cd:command category="language" file="typo-del.mkiv" level="document" name="midsubsentence"/>
  </cd:interface>
  <cd:interface file="i-description.xml">
   <cd:command category="structure" file="strc-des.mkvi" level="style" name="definedescription">
diff --git a/tex/context/interface/mkiv/i-align.xml b/tex/context/interface/mkiv/i-align.xml
index 55659a12a..669b845b9 100644
--- a/tex/context/interface/mkiv/i-align.xml
+++ b/tex/context/interface/mkiv/i-align.xml
@@ -53,9 +53,13 @@
                 <cd:constant type="stretch"/>
                 <cd:constant type="extremestretch"/>
                 <cd:constant type="final"/>
+                <cd:constant type="1*final"/>
                 <cd:constant type="2*final"/>
                 <cd:constant type="3*final"/>
                 <cd:constant type="4*final"/>
+                <cd:constant type="more"/>
+                <cd:constant type="1*more"/>
+                <cd:constant type="2*more"/>
                 <!--
                     <cd:constant type="cd:name"/>
                 -->
@@ -313,4 +317,4 @@
         </cd:arguments>
     </cd:command>
 
-</cd:interface>
\ No newline at end of file
+</cd:interface>
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 38c4532e4..a5ba5a662 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-delimitedtext.xml b/tex/context/interface/mkiv/i-delimitedtext.xml
index 5017aa02b..c34052644 100644
--- a/tex/context/interface/mkiv/i-delimitedtext.xml
+++ b/tex/context/interface/mkiv/i-delimitedtext.xml
@@ -258,4 +258,6 @@
 
     <cd:command name="subsentence" type="environment" level="document" category="language" file="typo-del.mkiv"/>
 
-</cd:interface>
\ No newline at end of file
+    <cd:command name="midsubsentence" level="document" category="language" file="typo-del.mkiv"/>
+
+</cd:interface>
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 53ce66a29..b4431ff9f 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf