summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/interface
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/context/interface')
-rw-r--r--Master/texmf-dist/tex/context/interface/mkii/keys-cs.xml19
-rw-r--r--Master/texmf-dist/tex/context/interface/mkii/keys-de.xml19
-rw-r--r--Master/texmf-dist/tex/context/interface/mkii/keys-en.xml19
-rw-r--r--Master/texmf-dist/tex/context/interface/mkii/keys-fr.xml20
-rw-r--r--Master/texmf-dist/tex/context/interface/mkii/keys-it.xml19
-rw-r--r--Master/texmf-dist/tex/context/interface/mkii/keys-nl.xml19
-rw-r--r--Master/texmf-dist/tex/context/interface/mkii/keys-pe.xml20
-rw-r--r--Master/texmf-dist/tex/context/interface/mkii/keys-ro.xml19
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/context-en.xml2273
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-align.xml1
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-attachment.xml3
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-boxes.xml125
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-capitals.xml18
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-chart.xml3
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-columns.xml10
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-common-argument.xml24
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-common-instance.xml1
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-common-string.xml22
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-common-value.xml127
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-context.pdfbin865151 -> 930546 bytes
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-context.xml2
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-conversion.xml15
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-direction.xml18
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-fittingpage.xml62
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml10
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-graphics.xml2
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-interactionscreen.xml3
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-itemgroup.xml728
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-layout.xml6
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-logo.xml84
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-math.xml56
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-mathfence.xml51
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-mixedcolumns.xml10
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-note.xml51
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-pagegrid.xml24
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-pagenumber.xml34
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-paragraphs.xml1
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdfbin61161 -> 25081 bytes
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-register.xml609
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-section.xml28
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-simplecolumns.xml34
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-symbol.xml13
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-texts.xml331
-rw-r--r--Master/texmf-dist/tex/context/interface/mkiv/i-vspace.xml6
44 files changed, 3603 insertions, 1336 deletions
diff --git a/Master/texmf-dist/tex/context/interface/mkii/keys-cs.xml b/Master/texmf-dist/tex/context/interface/mkii/keys-cs.xml
index f4e65c527f7..3014b72d1f0 100644
--- a/Master/texmf-dist/tex/context/interface/mkii/keys-cs.xml
+++ b/Master/texmf-dist/tex/context/interface/mkii/keys-cs.xml
@@ -150,6 +150,7 @@
<cd:variable name='comment' value='komentar'/>
<cd:variable name='component' value='komponenta'/>
<cd:variable name='compressseparator' value='compressseparator'/>
+ <cd:variable name='compressstopper' value='compressstopper'/>
<cd:variable name='concept' value='koncept'/>
<cd:variable name='construction' value='construction'/>
<cd:variable name='content' value='obsah'/>
@@ -234,8 +235,10 @@
<cd:variable name='handwritten' value='rukopisne'/>
<cd:variable name='hang' value='zaveseni'/>
<cd:variable name='hanging' value='visici'/>
+ <cd:variable name='hangingboth' value='hangingboth'/>
<cd:variable name='head' value='hlavicka'/>
<cd:variable name='header' value='zahlavi'/>
+ <cd:variable name='headintext' value='headintext'/>
<cd:variable name='height' value='vyska'/>
<cd:variable name='helptext' value='textnapovedy'/>
<cd:variable name='hencefore' value='vyse'/>
@@ -376,6 +379,7 @@
<cd:variable name='nohz' value='nohz'/>
<cd:variable name='noline' value='noline'/>
<cd:variable name='nomarking' value='zadneznaceni'/>
+ <cd:variable name='nomenubar' value='nomenubar'/>
<cd:variable name='none' value='zadny'/>
<cd:variable name='nonumber' value='nonumber'/>
<cd:variable name='norepeat' value='norepeat'/>
@@ -479,6 +483,7 @@
<cd:variable name='sectionnumber' value='cislooddilu'/>
<cd:variable name='see' value='viz'/>
<cd:variable name='selectfont' value='selectfont'/>
+ <cd:variable name='separator' value='separator'/>
<cd:variable name='september' value='zari'/>
<cd:variable name='serif' value='serif'/>
<cd:variable name='serifbold' value='serifbold'/>
@@ -572,6 +577,7 @@
<cd:variable name='temporary' value='docasne'/>
<cd:variable name='test' value='test'/>
<cd:variable name='text' value='text'/>
+ <cd:variable name='textnote' value='textnote'/>
<cd:variable name='three' value='tri'/>
<cd:variable name='thursday' value='ctvrtek'/>
<cd:variable name='tight' value='tight'/>
@@ -639,6 +645,7 @@
<cd:constant name='aligntitle' value='zarovnejtitul'/>
<cd:constant name='alternative' value='alternativa'/>
<cd:constant name='anchor' value='anchor'/>
+ <cd:constant name='anchoring' value='anchoring'/>
<cd:constant name='andtext' value='andtext'/>
<cd:constant name='apa' value='apa'/>
<cd:constant name='arguments' value='arguments'/>
@@ -735,7 +742,10 @@
<cd:constant name='component' value='component'/>
<cd:constant name='compoundhyphen' value='compoundhyphen'/>
<cd:constant name='compress' value='compress'/>
+ <cd:constant name='compressdistance' value='compressdistance'/>
+ <cd:constant name='compressmethod' value='compressmethod'/>
<cd:constant name='compressseparator' value='compressseparator'/>
+ <cd:constant name='compressstopper' value='compressstopper'/>
<cd:constant name='concerns' value='concerns'/>
<cd:constant name='connector' value='connector'/>
<cd:constant name='continue' value='pokracovat'/>
@@ -865,6 +875,7 @@
<cd:constant name='hfil' value='hfil'/>
<cd:constant name='hidenumber' value='hidenumber'/>
<cd:constant name='hoffset' value='hoffset'/>
+ <cd:constant name='horizontal' value='horizontalne'/>
<cd:constant name='horoffset' value='horoffset'/>
<cd:constant name='hyphen' value='hyphen'/>
<cd:constant name='hyphens' value='hyphens'/>
@@ -965,9 +976,12 @@
<cd:constant name='menu' value='menu'/>
<cd:constant name='method' value='metoda'/>
<cd:constant name='middle' value='stredni'/>
+ <cd:constant name='middlecolor' value='middlecolor'/>
<cd:constant name='middlecommand' value='middlecommand'/>
<cd:constant name='middlespeech' value='middlespeech'/>
+ <cd:constant name='middlestyle' value='middlestyle'/>
<cd:constant name='middletext' value='strednitext'/>
+ <cd:constant name='middlewidth' value='middlewidth'/>
<cd:constant name='midsentence' value='midsentence'/>
<cd:constant name='min' value='min'/>
<cd:constant name='mindepth' value='mindepth'/>
@@ -1037,6 +1051,7 @@
<cd:constant name='overprint' value='overprint'/>
<cd:constant name='ownerpassword' value='ownerpassword'/>
<cd:constant name='ownnumber' value='vlastnicislo'/>
+ <cd:constant name='packcriterium' value='packcriterium'/>
<cd:constant name='page' value='stranka'/>
<cd:constant name='pageboundaries' value='hranicestranky'/>
<cd:constant name='pagecolor' value='barvastranky'/>
@@ -1046,6 +1061,7 @@
<cd:constant name='pageconversion' value='pageconversion'/>
<cd:constant name='pageconversionset' value='pageconversionset'/>
<cd:constant name='pageleft' value='pageleft'/>
+ <cd:constant name='pagemethod' value='pagemethod'/>
<cd:constant name='pagenumber' value='cislostranky'/>
<cd:constant name='pageprefix' value='pageprefix'/>
<cd:constant name='pageprefixconnector' value='pageprefixconnector'/>
@@ -1285,6 +1301,7 @@
<cd:constant name='vcompact' value='vcompact'/>
<cd:constant name='vector' value='vector'/>
<cd:constant name='veroffset' value='offsethlavicky'/>
+ <cd:constant name='vertical' value='vertikalne'/>
<cd:constant name='vfactor' value='vfaktor'/>
<cd:constant name='vfil' value='vfil'/>
<cd:constant name='viewerprefix' value='viewerprefix'/>
@@ -1295,6 +1312,7 @@
<cd:constant name='white' value='bily'/>
<cd:constant name='width' value='sirka'/>
<cd:constant name='words' value='words'/>
+ <cd:constant name='xanchor' value='xanchor'/>
<cd:constant name='xfactor' value='xfaktor'/>
<cd:constant name='xhtml' value='xhtml'/>
<cd:constant name='xmax' value='xmax'/>
@@ -1302,6 +1320,7 @@
<cd:constant name='xoffset' value='xoffset'/>
<cd:constant name='xscale' value='xmeritko'/>
<cd:constant name='xstep' value='xkrok'/>
+ <cd:constant name='yanchor' value='yanchor'/>
<cd:constant name='yfactor' value='yfaktor'/>
<cd:constant name='ymax' value='ymax'/>
<cd:constant name='yoffset' value='yoffset'/>
diff --git a/Master/texmf-dist/tex/context/interface/mkii/keys-de.xml b/Master/texmf-dist/tex/context/interface/mkii/keys-de.xml
index 701dc246b2b..42d6425447f 100644
--- a/Master/texmf-dist/tex/context/interface/mkii/keys-de.xml
+++ b/Master/texmf-dist/tex/context/interface/mkii/keys-de.xml
@@ -150,6 +150,7 @@
<cd:variable name='comment' value='kommentar'/>
<cd:variable name='component' value='komponente'/>
<cd:variable name='compressseparator' value='compressseparator'/>
+ <cd:variable name='compressstopper' value='compressstopper'/>
<cd:variable name='concept' value='konzept'/>
<cd:variable name='construction' value='construction'/>
<cd:variable name='content' value='inhalt'/>
@@ -234,8 +235,10 @@
<cd:variable name='handwritten' value='handschrift'/>
<cd:variable name='hang' value='haengend'/>
<cd:variable name='hanging' value='haengend'/>
+ <cd:variable name='hangingboth' value='hangingboth'/>
<cd:variable name='head' value='kopf'/>
<cd:variable name='header' value='kopfzeile'/>
+ <cd:variable name='headintext' value='headintext'/>
<cd:variable name='height' value='hoehe'/>
<cd:variable name='helptext' value='hilfetext'/>
<cd:variable name='hencefore' value='vorher'/>
@@ -376,6 +379,7 @@
<cd:variable name='nohz' value='nohz'/>
<cd:variable name='noline' value='noline'/>
<cd:variable name='nomarking' value='keinebeschriftung'/>
+ <cd:variable name='nomenubar' value='nomenubar'/>
<cd:variable name='none' value='kein'/>
<cd:variable name='nonumber' value='nonumber'/>
<cd:variable name='norepeat' value='norepeat'/>
@@ -479,6 +483,7 @@
<cd:variable name='sectionnumber' value='abschnittsnummer'/>
<cd:variable name='see' value='sieh'/>
<cd:variable name='selectfont' value='selectfont'/>
+ <cd:variable name='separator' value='separator'/>
<cd:variable name='september' value='september'/>
<cd:variable name='serif' value='serif'/>
<cd:variable name='serifbold' value='serifbold'/>
@@ -572,6 +577,7 @@
<cd:variable name='temporary' value='temporaer'/>
<cd:variable name='test' value='test'/>
<cd:variable name='text' value='text'/>
+ <cd:variable name='textnote' value='textnote'/>
<cd:variable name='three' value='drei'/>
<cd:variable name='thursday' value='donnerstag'/>
<cd:variable name='tight' value='tight'/>
@@ -639,6 +645,7 @@
<cd:constant name='aligntitle' value='titelausrichten'/>
<cd:constant name='alternative' value='alternative'/>
<cd:constant name='anchor' value='anchor'/>
+ <cd:constant name='anchoring' value='anchoring'/>
<cd:constant name='andtext' value='andtext'/>
<cd:constant name='apa' value='apa'/>
<cd:constant name='arguments' value='arguments'/>
@@ -735,7 +742,10 @@
<cd:constant name='component' value='component'/>
<cd:constant name='compoundhyphen' value='compoundhyphen'/>
<cd:constant name='compress' value='compress'/>
+ <cd:constant name='compressdistance' value='compressdistance'/>
+ <cd:constant name='compressmethod' value='compressmethod'/>
<cd:constant name='compressseparator' value='compressseparator'/>
+ <cd:constant name='compressstopper' value='compressstopper'/>
<cd:constant name='concerns' value='concerns'/>
<cd:constant name='connector' value='connector'/>
<cd:constant name='continue' value='fortsetzen'/>
@@ -865,6 +875,7 @@
<cd:constant name='hfil' value='hfil'/>
<cd:constant name='hidenumber' value='hidenumber'/>
<cd:constant name='hoffset' value='hoffset'/>
+ <cd:constant name='horizontal' value='horizontal'/>
<cd:constant name='horoffset' value='rumpfabstand'/>
<cd:constant name='hyphen' value='hyphen'/>
<cd:constant name='hyphens' value='hyphens'/>
@@ -965,9 +976,12 @@
<cd:constant name='menu' value='menue'/>
<cd:constant name='method' value='methode'/>
<cd:constant name='middle' value='mittig'/>
+ <cd:constant name='middlecolor' value='middlecolor'/>
<cd:constant name='middlecommand' value='middlecommand'/>
<cd:constant name='middlespeech' value='middlespeech'/>
+ <cd:constant name='middlestyle' value='middlestyle'/>
<cd:constant name='middletext' value='mittigertext'/>
+ <cd:constant name='middlewidth' value='middlewidth'/>
<cd:constant name='midsentence' value='midsentence'/>
<cd:constant name='min' value='min'/>
<cd:constant name='mindepth' value='mindepth'/>
@@ -1037,6 +1051,7 @@
<cd:constant name='overprint' value='overprint'/>
<cd:constant name='ownerpassword' value='ownerpassword'/>
<cd:constant name='ownnumber' value='eigenenummer'/>
+ <cd:constant name='packcriterium' value='packcriterium'/>
<cd:constant name='page' value='seite'/>
<cd:constant name='pageboundaries' value='seitenbegrenzung'/>
<cd:constant name='pagecolor' value='seitenfarbe'/>
@@ -1046,6 +1061,7 @@
<cd:constant name='pageconversion' value='pageconversion'/>
<cd:constant name='pageconversionset' value='pageconversionset'/>
<cd:constant name='pageleft' value='pageleft'/>
+ <cd:constant name='pagemethod' value='pagemethod'/>
<cd:constant name='pagenumber' value='seitennummer'/>
<cd:constant name='pageprefix' value='pageprefix'/>
<cd:constant name='pageprefixconnector' value='pageprefixconnector'/>
@@ -1285,6 +1301,7 @@
<cd:constant name='vcompact' value='vcompact'/>
<cd:constant name='vector' value='vector'/>
<cd:constant name='veroffset' value='kopfoffset'/>
+ <cd:constant name='vertical' value='vertikal'/>
<cd:constant name='vfactor' value='vfaktor'/>
<cd:constant name='vfil' value='vfil'/>
<cd:constant name='viewerprefix' value='viewerprefix'/>
@@ -1295,6 +1312,7 @@
<cd:constant name='white' value='weiss'/>
<cd:constant name='width' value='breite'/>
<cd:constant name='words' value='words'/>
+ <cd:constant name='xanchor' value='xanchor'/>
<cd:constant name='xfactor' value='xfaktor'/>
<cd:constant name='xhtml' value='xhtml'/>
<cd:constant name='xmax' value='xmax'/>
@@ -1302,6 +1320,7 @@
<cd:constant name='xoffset' value='xoffset'/>
<cd:constant name='xscale' value='xformat'/>
<cd:constant name='xstep' value='xschritt'/>
+ <cd:constant name='yanchor' value='yanchor'/>
<cd:constant name='yfactor' value='yfaktor'/>
<cd:constant name='ymax' value='ymax'/>
<cd:constant name='yoffset' value='yoffset'/>
diff --git a/Master/texmf-dist/tex/context/interface/mkii/keys-en.xml b/Master/texmf-dist/tex/context/interface/mkii/keys-en.xml
index 686a4dc063c..d8c5c9c8154 100644
--- a/Master/texmf-dist/tex/context/interface/mkii/keys-en.xml
+++ b/Master/texmf-dist/tex/context/interface/mkii/keys-en.xml
@@ -150,6 +150,7 @@
<cd:variable name='comment' value='comment'/>
<cd:variable name='component' value='component'/>
<cd:variable name='compressseparator' value='compressseparator'/>
+ <cd:variable name='compressstopper' value='compressstopper'/>
<cd:variable name='concept' value='concept'/>
<cd:variable name='construction' value='construction'/>
<cd:variable name='content' value='content'/>
@@ -234,8 +235,10 @@
<cd:variable name='handwritten' value='handwritten'/>
<cd:variable name='hang' value='hang'/>
<cd:variable name='hanging' value='hanging'/>
+ <cd:variable name='hangingboth' value='hangingboth'/>
<cd:variable name='head' value='head'/>
<cd:variable name='header' value='header'/>
+ <cd:variable name='headintext' value='headintext'/>
<cd:variable name='height' value='height'/>
<cd:variable name='helptext' value='helptext'/>
<cd:variable name='hencefore' value='hencefore'/>
@@ -376,6 +379,7 @@
<cd:variable name='nohz' value='nohz'/>
<cd:variable name='noline' value='noline'/>
<cd:variable name='nomarking' value='nomarking'/>
+ <cd:variable name='nomenubar' value='nomenubar'/>
<cd:variable name='none' value='none'/>
<cd:variable name='nonumber' value='nonumber'/>
<cd:variable name='norepeat' value='norepeat'/>
@@ -479,6 +483,7 @@
<cd:variable name='sectionnumber' value='sectionnumber'/>
<cd:variable name='see' value='see'/>
<cd:variable name='selectfont' value='selectfont'/>
+ <cd:variable name='separator' value='separator'/>
<cd:variable name='september' value='september'/>
<cd:variable name='serif' value='serif'/>
<cd:variable name='serifbold' value='serifbold'/>
@@ -572,6 +577,7 @@
<cd:variable name='temporary' value='temporary'/>
<cd:variable name='test' value='test'/>
<cd:variable name='text' value='text'/>
+ <cd:variable name='textnote' value='textnote'/>
<cd:variable name='three' value='three'/>
<cd:variable name='thursday' value='thursday'/>
<cd:variable name='tight' value='tight'/>
@@ -639,6 +645,7 @@
<cd:constant name='aligntitle' value='aligntitle'/>
<cd:constant name='alternative' value='alternative'/>
<cd:constant name='anchor' value='anchor'/>
+ <cd:constant name='anchoring' value='anchoring'/>
<cd:constant name='andtext' value='andtext'/>
<cd:constant name='apa' value='apa'/>
<cd:constant name='arguments' value='arguments'/>
@@ -735,7 +742,10 @@
<cd:constant name='component' value='component'/>
<cd:constant name='compoundhyphen' value='compoundhyphen'/>
<cd:constant name='compress' value='compress'/>
+ <cd:constant name='compressdistance' value='compressdistance'/>
+ <cd:constant name='compressmethod' value='compressmethod'/>
<cd:constant name='compressseparator' value='compressseparator'/>
+ <cd:constant name='compressstopper' value='compressstopper'/>
<cd:constant name='concerns' value='concerns'/>
<cd:constant name='connector' value='connector'/>
<cd:constant name='continue' value='continue'/>
@@ -865,6 +875,7 @@
<cd:constant name='hfil' value='hfil'/>
<cd:constant name='hidenumber' value='hidenumber'/>
<cd:constant name='hoffset' value='hoffset'/>
+ <cd:constant name='horizontal' value='horizontal'/>
<cd:constant name='horoffset' value='horoffset'/>
<cd:constant name='hyphen' value='hyphen'/>
<cd:constant name='hyphens' value='hyphens'/>
@@ -965,9 +976,12 @@
<cd:constant name='menu' value='menu'/>
<cd:constant name='method' value='method'/>
<cd:constant name='middle' value='middle'/>
+ <cd:constant name='middlecolor' value='middlecolor'/>
<cd:constant name='middlecommand' value='middlecommand'/>
<cd:constant name='middlespeech' value='middlespeech'/>
+ <cd:constant name='middlestyle' value='middlestyle'/>
<cd:constant name='middletext' value='middletext'/>
+ <cd:constant name='middlewidth' value='middlewidth'/>
<cd:constant name='midsentence' value='midsentence'/>
<cd:constant name='min' value='min'/>
<cd:constant name='mindepth' value='mindepth'/>
@@ -1037,6 +1051,7 @@
<cd:constant name='overprint' value='overprint'/>
<cd:constant name='ownerpassword' value='ownerpassword'/>
<cd:constant name='ownnumber' value='ownnumber'/>
+ <cd:constant name='packcriterium' value='packcriterium'/>
<cd:constant name='page' value='page'/>
<cd:constant name='pageboundaries' value='pageboundaries'/>
<cd:constant name='pagecolor' value='pagecolor'/>
@@ -1046,6 +1061,7 @@
<cd:constant name='pageconversion' value='pageconversion'/>
<cd:constant name='pageconversionset' value='pageconversionset'/>
<cd:constant name='pageleft' value='pageleft'/>
+ <cd:constant name='pagemethod' value='pagemethod'/>
<cd:constant name='pagenumber' value='pagenumber'/>
<cd:constant name='pageprefix' value='pageprefix'/>
<cd:constant name='pageprefixconnector' value='pageprefixconnector'/>
@@ -1285,6 +1301,7 @@
<cd:constant name='vcompact' value='vcompact'/>
<cd:constant name='vector' value='vector'/>
<cd:constant name='veroffset' value='veroffset'/>
+ <cd:constant name='vertical' value='vertical'/>
<cd:constant name='vfactor' value='vfactor'/>
<cd:constant name='vfil' value='vfil'/>
<cd:constant name='viewerprefix' value='viewerprefix'/>
@@ -1295,6 +1312,7 @@
<cd:constant name='white' value='white'/>
<cd:constant name='width' value='width'/>
<cd:constant name='words' value='words'/>
+ <cd:constant name='xanchor' value='xanchor'/>
<cd:constant name='xfactor' value='xfactor'/>
<cd:constant name='xhtml' value='xhtml'/>
<cd:constant name='xmax' value='xmax'/>
@@ -1302,6 +1320,7 @@
<cd:constant name='xoffset' value='xoffset'/>
<cd:constant name='xscale' value='xscale'/>
<cd:constant name='xstep' value='xstep'/>
+ <cd:constant name='yanchor' value='yanchor'/>
<cd:constant name='yfactor' value='yfactor'/>
<cd:constant name='ymax' value='ymax'/>
<cd:constant name='yoffset' value='yoffset'/>
diff --git a/Master/texmf-dist/tex/context/interface/mkii/keys-fr.xml b/Master/texmf-dist/tex/context/interface/mkii/keys-fr.xml
index 452f3316a40..8ba741a608d 100644
--- a/Master/texmf-dist/tex/context/interface/mkii/keys-fr.xml
+++ b/Master/texmf-dist/tex/context/interface/mkii/keys-fr.xml
@@ -150,6 +150,7 @@
<cd:variable name='comment' value='commentaire'/>
<cd:variable name='component' value='composant'/>
<cd:variable name='compressseparator' value='compressseparator'/>
+ <cd:variable name='compressstopper' value='compressstopper'/>
<cd:variable name='concept' value='concept'/>
<cd:variable name='construction' value='construction'/>
<cd:variable name='content' value='contenu'/>
@@ -234,8 +235,10 @@
<cd:variable name='handwritten' value='manuscript'/>
<cd:variable name='hang' value='suspend'/>
<cd:variable name='hanging' value='suspend'/>
+ <cd:variable name='hangingboth' value='hangingboth'/>
<cd:variable name='head' value='tete'/>
<cd:variable name='header' value='entete'/>
+ <cd:variable name='headintext' value='headintext'/>
<cd:variable name='height' value='hauteur'/>
<cd:variable name='helptext' value='texteaide'/>
<cd:variable name='hencefore' value='precedent'/>
@@ -376,6 +379,7 @@
<cd:variable name='nohz' value='nohz'/>
<cd:variable name='noline' value='noline'/>
<cd:variable name='nomarking' value='sansmarquage'/>
+ <cd:variable name='nomenubar' value='nomenubar'/>
<cd:variable name='none' value='rien'/>
<cd:variable name='nonumber' value='sansnumero'/>
<cd:variable name='norepeat' value='norepeat'/>
@@ -479,6 +483,7 @@
<cd:variable name='sectionnumber' value='numerosection'/>
<cd:variable name='see' value='voit'/>
<cd:variable name='selectfont' value='selectfont'/>
+ <cd:variable name='separator' value='separator'/>
<cd:variable name='september' value='septembre'/>
<cd:variable name='serif' value='serif'/>
<cd:variable name='serifbold' value='serifbold'/>
@@ -572,6 +577,7 @@
<cd:variable name='temporary' value='temporaire'/>
<cd:variable name='test' value='test'/>
<cd:variable name='text' value='texte'/>
+ <cd:variable name='textnote' value='textnote'/>
<cd:variable name='three' value='trois'/>
<cd:variable name='thursday' value='jeudi'/>
<cd:variable name='tight' value='tight'/>
@@ -590,6 +596,7 @@
<cd:variable name='understrike' value='understrike'/>
<cd:variable name='understrikes' value='understrikes'/>
<cd:variable name='unframed' value='unframed'/>
+ <cd:variable name='unicode' value='unicode'/>
<cd:variable name='unit' value='unite'/>
<cd:variable name='units' value='unites'/>
<cd:variable name='unknown' value='inconnu'/>
@@ -638,6 +645,7 @@
<cd:constant name='aligntitle' value='alignementtitre'/>
<cd:constant name='alternative' value='alternative'/>
<cd:constant name='anchor' value='anchor'/>
+ <cd:constant name='anchoring' value='anchoring'/>
<cd:constant name='andtext' value='andtext'/>
<cd:constant name='apa' value='apa'/>
<cd:constant name='arguments' value='arguments'/>
@@ -734,7 +742,10 @@
<cd:constant name='component' value='composant'/>
<cd:constant name='compoundhyphen' value='compoundhyphen'/>
<cd:constant name='compress' value='compress'/>
+ <cd:constant name='compressdistance' value='compressdistance'/>
+ <cd:constant name='compressmethod' value='compressmethod'/>
<cd:constant name='compressseparator' value='compressseparator'/>
+ <cd:constant name='compressstopper' value='compressstopper'/>
<cd:constant name='concerns' value='concerns'/>
<cd:constant name='connector' value='connector'/>
<cd:constant name='continue' value='continue'/>
@@ -864,6 +875,7 @@
<cd:constant name='hfil' value='hfil'/>
<cd:constant name='hidenumber' value='hidenumber'/>
<cd:constant name='hoffset' value='decalagehauteur'/>
+ <cd:constant name='horizontal' value='horizontale'/>
<cd:constant name='horoffset' value='horoffset'/>
<cd:constant name='hyphen' value='hyphen'/>
<cd:constant name='hyphens' value='hyphens'/>
@@ -964,9 +976,12 @@
<cd:constant name='menu' value='menu'/>
<cd:constant name='method' value='methode'/>
<cd:constant name='middle' value='milieu'/>
+ <cd:constant name='middlecolor' value='middlecolor'/>
<cd:constant name='middlecommand' value='middlecommand'/>
<cd:constant name='middlespeech' value='middlespeech'/>
+ <cd:constant name='middlestyle' value='middlestyle'/>
<cd:constant name='middletext' value='textecentre'/>
+ <cd:constant name='middlewidth' value='middlewidth'/>
<cd:constant name='midsentence' value='midsentence'/>
<cd:constant name='min' value='min'/>
<cd:constant name='mindepth' value='profondeurmin'/>
@@ -1036,6 +1051,7 @@
<cd:constant name='overprint' value='overprint'/>
<cd:constant name='ownerpassword' value='ownerpassword'/>
<cd:constant name='ownnumber' value='numeroproprio'/>
+ <cd:constant name='packcriterium' value='packcriterium'/>
<cd:constant name='page' value='page'/>
<cd:constant name='pageboundaries' value='limitespage'/>
<cd:constant name='pagecolor' value='couleurpage'/>
@@ -1045,6 +1061,7 @@
<cd:constant name='pageconversion' value='pageconversion'/>
<cd:constant name='pageconversionset' value='pageconversionset'/>
<cd:constant name='pageleft' value='pageleft'/>
+ <cd:constant name='pagemethod' value='pagemethod'/>
<cd:constant name='pagenumber' value='numeropage'/>
<cd:constant name='pageprefix' value='pageprefix'/>
<cd:constant name='pageprefixconnector' value='pageprefixconnector'/>
@@ -1284,6 +1301,7 @@
<cd:constant name='vcompact' value='vcompact'/>
<cd:constant name='vector' value='vector'/>
<cd:constant name='veroffset' value='veroffset'/>
+ <cd:constant name='vertical' value='verticale'/>
<cd:constant name='vfactor' value='vfactor'/>
<cd:constant name='vfil' value='vfil'/>
<cd:constant name='viewerprefix' value='viewerprefix'/>
@@ -1294,6 +1312,7 @@
<cd:constant name='white' value='blanc'/>
<cd:constant name='width' value='largeur'/>
<cd:constant name='words' value='words'/>
+ <cd:constant name='xanchor' value='xanchor'/>
<cd:constant name='xfactor' value='xfactor'/>
<cd:constant name='xhtml' value='xhtml'/>
<cd:constant name='xmax' value='xmax'/>
@@ -1301,6 +1320,7 @@
<cd:constant name='xoffset' value='xoffset'/>
<cd:constant name='xscale' value='xscale'/>
<cd:constant name='xstep' value='xstep'/>
+ <cd:constant name='yanchor' value='yanchor'/>
<cd:constant name='yfactor' value='yfactor'/>
<cd:constant name='ymax' value='ymax'/>
<cd:constant name='yoffset' value='yoffset'/>
diff --git a/Master/texmf-dist/tex/context/interface/mkii/keys-it.xml b/Master/texmf-dist/tex/context/interface/mkii/keys-it.xml
index 2ebcb4a9d99..7ae291cf07d 100644
--- a/Master/texmf-dist/tex/context/interface/mkii/keys-it.xml
+++ b/Master/texmf-dist/tex/context/interface/mkii/keys-it.xml
@@ -150,6 +150,7 @@
<cd:variable name='comment' value='commento'/>
<cd:variable name='component' value='componente'/>
<cd:variable name='compressseparator' value='compressseparator'/>
+ <cd:variable name='compressstopper' value='compressstopper'/>
<cd:variable name='concept' value='concetto'/>
<cd:variable name='construction' value='construction'/>
<cd:variable name='content' value='indice'/>
@@ -234,8 +235,10 @@
<cd:variable name='handwritten' value='grafiamanuale'/>
<cd:variable name='hang' value='sospendi'/>
<cd:variable name='hanging' value='sospeso'/>
+ <cd:variable name='hangingboth' value='hangingboth'/>
<cd:variable name='head' value='testa'/>
<cd:variable name='header' value='intestazione'/>
+ <cd:variable name='headintext' value='headintext'/>
<cd:variable name='height' value='altezza'/>
<cd:variable name='helptext' value='testoaiuto'/>
<cd:variable name='hencefore' value='precedente'/>
@@ -376,6 +379,7 @@
<cd:variable name='nohz' value='nohz'/>
<cd:variable name='noline' value='noline'/>
<cd:variable name='nomarking' value='nomarcature'/>
+ <cd:variable name='nomenubar' value='nomenubar'/>
<cd:variable name='none' value='nessuno'/>
<cd:variable name='nonumber' value='nonumber'/>
<cd:variable name='norepeat' value='norepeat'/>
@@ -479,6 +483,7 @@
<cd:variable name='sectionnumber' value='numerosezione'/>
<cd:variable name='see' value='vedi'/>
<cd:variable name='selectfont' value='selectfont'/>
+ <cd:variable name='separator' value='separator'/>
<cd:variable name='september' value='settembre'/>
<cd:variable name='serif' value='serif'/>
<cd:variable name='serifbold' value='serifbold'/>
@@ -572,6 +577,7 @@
<cd:variable name='temporary' value='temporaneo'/>
<cd:variable name='test' value='test'/>
<cd:variable name='text' value='testo'/>
+ <cd:variable name='textnote' value='textnote'/>
<cd:variable name='three' value='tre'/>
<cd:variable name='thursday' value='giovedi'/>
<cd:variable name='tight' value='tight'/>
@@ -639,6 +645,7 @@
<cd:constant name='aligntitle' value='allineatitolo'/>
<cd:constant name='alternative' value='alternativa'/>
<cd:constant name='anchor' value='anchor'/>
+ <cd:constant name='anchoring' value='anchoring'/>
<cd:constant name='andtext' value='andtext'/>
<cd:constant name='apa' value='apa'/>
<cd:constant name='arguments' value='arguments'/>
@@ -735,7 +742,10 @@
<cd:constant name='component' value='component'/>
<cd:constant name='compoundhyphen' value='compoundhyphen'/>
<cd:constant name='compress' value='compress'/>
+ <cd:constant name='compressdistance' value='compressdistance'/>
+ <cd:constant name='compressmethod' value='compressmethod'/>
<cd:constant name='compressseparator' value='compressseparator'/>
+ <cd:constant name='compressstopper' value='compressstopper'/>
<cd:constant name='concerns' value='concerns'/>
<cd:constant name='connector' value='connector'/>
<cd:constant name='continue' value='continua'/>
@@ -865,6 +875,7 @@
<cd:constant name='hfil' value='hfil'/>
<cd:constant name='hidenumber' value='hidenumber'/>
<cd:constant name='hoffset' value='hoffset'/>
+ <cd:constant name='horizontal' value='orizzontale'/>
<cd:constant name='horoffset' value='horoffset'/>
<cd:constant name='hyphen' value='hyphen'/>
<cd:constant name='hyphens' value='hyphens'/>
@@ -965,9 +976,12 @@
<cd:constant name='menu' value='menu'/>
<cd:constant name='method' value='metodo'/>
<cd:constant name='middle' value='centro'/>
+ <cd:constant name='middlecolor' value='middlecolor'/>
<cd:constant name='middlecommand' value='middlecommand'/>
<cd:constant name='middlespeech' value='middlespeech'/>
+ <cd:constant name='middlestyle' value='middlestyle'/>
<cd:constant name='middletext' value='testocentro'/>
+ <cd:constant name='middlewidth' value='middlewidth'/>
<cd:constant name='midsentence' value='midsentence'/>
<cd:constant name='min' value='min'/>
<cd:constant name='mindepth' value='mindepth'/>
@@ -1037,6 +1051,7 @@
<cd:constant name='overprint' value='overprint'/>
<cd:constant name='ownerpassword' value='ownerpassword'/>
<cd:constant name='ownnumber' value='numeroproprio'/>
+ <cd:constant name='packcriterium' value='packcriterium'/>
<cd:constant name='page' value='pagina'/>
<cd:constant name='pageboundaries' value='limitipagina'/>
<cd:constant name='pagecolor' value='colorepagina'/>
@@ -1046,6 +1061,7 @@
<cd:constant name='pageconversion' value='pageconversion'/>
<cd:constant name='pageconversionset' value='pageconversionset'/>
<cd:constant name='pageleft' value='pageleft'/>
+ <cd:constant name='pagemethod' value='pagemethod'/>
<cd:constant name='pagenumber' value='numeropagina'/>
<cd:constant name='pageprefix' value='pageprefix'/>
<cd:constant name='pageprefixconnector' value='pageprefixconnector'/>
@@ -1285,6 +1301,7 @@
<cd:constant name='vcompact' value='vcompact'/>
<cd:constant name='vector' value='vector'/>
<cd:constant name='veroffset' value='veroffset'/>
+ <cd:constant name='vertical' value='verticale'/>
<cd:constant name='vfactor' value='vfactor'/>
<cd:constant name='vfil' value='vfil'/>
<cd:constant name='viewerprefix' value='viewerprefix'/>
@@ -1295,6 +1312,7 @@
<cd:constant name='white' value='bianco'/>
<cd:constant name='width' value='ampiezza'/>
<cd:constant name='words' value='words'/>
+ <cd:constant name='xanchor' value='xanchor'/>
<cd:constant name='xfactor' value='xfactor'/>
<cd:constant name='xhtml' value='xhtml'/>
<cd:constant name='xmax' value='xmax'/>
@@ -1302,6 +1320,7 @@
<cd:constant name='xoffset' value='xoffset'/>
<cd:constant name='xscale' value='xscale'/>
<cd:constant name='xstep' value='xstep'/>
+ <cd:constant name='yanchor' value='yanchor'/>
<cd:constant name='yfactor' value='yfactor'/>
<cd:constant name='ymax' value='ymax'/>
<cd:constant name='yoffset' value='yoffset'/>
diff --git a/Master/texmf-dist/tex/context/interface/mkii/keys-nl.xml b/Master/texmf-dist/tex/context/interface/mkii/keys-nl.xml
index 06df09bc539..344a874f0cc 100644
--- a/Master/texmf-dist/tex/context/interface/mkii/keys-nl.xml
+++ b/Master/texmf-dist/tex/context/interface/mkii/keys-nl.xml
@@ -150,6 +150,7 @@
<cd:variable name='comment' value='commentaar'/>
<cd:variable name='component' value='onderdeel'/>
<cd:variable name='compressseparator' value='compressseparator'/>
+ <cd:variable name='compressstopper' value='compressstopper'/>
<cd:variable name='concept' value='concept'/>
<cd:variable name='construction' value='construction'/>
<cd:variable name='content' value='inhoud'/>
@@ -234,8 +235,10 @@
<cd:variable name='handwritten' value='handschrift'/>
<cd:variable name='hang' value='hang'/>
<cd:variable name='hanging' value='hangend'/>
+ <cd:variable name='hangingboth' value='beidehangend'/>
<cd:variable name='head' value='kop'/>
<cd:variable name='header' value='hoofd'/>
+ <cd:variable name='headintext' value='kopintekst'/>
<cd:variable name='height' value='hoogte'/>
<cd:variable name='helptext' value='helptekst'/>
<cd:variable name='hencefore' value='hierboven'/>
@@ -376,6 +379,7 @@
<cd:variable name='nohz' value='geenhz'/>
<cd:variable name='noline' value='noline'/>
<cd:variable name='nomarking' value='geenmarkering'/>
+ <cd:variable name='nomenubar' value='geenmenubalk'/>
<cd:variable name='none' value='geen'/>
<cd:variable name='nonumber' value='geennummer'/>
<cd:variable name='norepeat' value='norepeat'/>
@@ -479,6 +483,7 @@
<cd:variable name='sectionnumber' value='sectienummer'/>
<cd:variable name='see' value='zie'/>
<cd:variable name='selectfont' value='selectfont'/>
+ <cd:variable name='separator' value='scheider'/>
<cd:variable name='september' value='september'/>
<cd:variable name='serif' value='serif'/>
<cd:variable name='serifbold' value='serifbold'/>
@@ -572,6 +577,7 @@
<cd:variable name='temporary' value='voorlopig'/>
<cd:variable name='test' value='test'/>
<cd:variable name='text' value='tekst'/>
+ <cd:variable name='textnote' value='tekstnoot'/>
<cd:variable name='three' value='drie'/>
<cd:variable name='thursday' value='donderdag'/>
<cd:variable name='tight' value='krap'/>
@@ -639,6 +645,7 @@
<cd:constant name='aligntitle' value='titeluitlijnen'/>
<cd:constant name='alternative' value='variant'/>
<cd:constant name='anchor' value='anker'/>
+ <cd:constant name='anchoring' value='verankering'/>
<cd:constant name='andtext' value='andtext'/>
<cd:constant name='apa' value='apa'/>
<cd:constant name='arguments' value='argumenten'/>
@@ -735,7 +742,10 @@
<cd:constant name='component' value='component'/>
<cd:constant name='compoundhyphen' value='koppelteken'/>
<cd:constant name='compress' value='comprimeren'/>
+ <cd:constant name='compressdistance' value='compressdistance'/>
+ <cd:constant name='compressmethod' value='compressmethod'/>
<cd:constant name='compressseparator' value='compressseparator'/>
+ <cd:constant name='compressstopper' value='compressstopper'/>
<cd:constant name='concerns' value='betreft'/>
<cd:constant name='connector' value='connector'/>
<cd:constant name='continue' value='doorgaan'/>
@@ -865,6 +875,7 @@
<cd:constant name='hfil' value='hfil'/>
<cd:constant name='hidenumber' value='hidenumber'/>
<cd:constant name='hoffset' value='hoffset'/>
+ <cd:constant name='horizontal' value='horizontaal'/>
<cd:constant name='horoffset' value='rugoffset'/>
<cd:constant name='hyphen' value='hyphen'/>
<cd:constant name='hyphens' value='hyphens'/>
@@ -965,9 +976,12 @@
<cd:constant name='menu' value='menu'/>
<cd:constant name='method' value='methode'/>
<cd:constant name='middle' value='midden'/>
+ <cd:constant name='middlecolor' value='middenkleur'/>
<cd:constant name='middlecommand' value='middencommando'/>
<cd:constant name='middlespeech' value='middenuitspraak'/>
+ <cd:constant name='middlestyle' value='middenletter'/>
<cd:constant name='middletext' value='middentekst'/>
+ <cd:constant name='middlewidth' value='middenbreedte'/>
<cd:constant name='midsentence' value='middenzin'/>
<cd:constant name='min' value='min'/>
<cd:constant name='mindepth' value='mindiepte'/>
@@ -1037,6 +1051,7 @@
<cd:constant name='overprint' value='overprint'/>
<cd:constant name='ownerpassword' value='ownerpassword'/>
<cd:constant name='ownnumber' value='eigennummer'/>
+ <cd:constant name='packcriterium' value='opelkaarcriterium'/>
<cd:constant name='page' value='pagina'/>
<cd:constant name='pageboundaries' value='paginaovergangen'/>
<cd:constant name='pagecolor' value='paginakleur'/>
@@ -1046,6 +1061,7 @@
<cd:constant name='pageconversion' value='pageconversion'/>
<cd:constant name='pageconversionset' value='pageconversionset'/>
<cd:constant name='pageleft' value='pageleft'/>
+ <cd:constant name='pagemethod' value='paginamethode'/>
<cd:constant name='pagenumber' value='paginanummer'/>
<cd:constant name='pageprefix' value='pageprefix'/>
<cd:constant name='pageprefixconnector' value='pageprefixconnector'/>
@@ -1285,6 +1301,7 @@
<cd:constant name='vcompact' value='vcomprimeer'/>
<cd:constant name='vector' value='vector'/>
<cd:constant name='veroffset' value='kopoffset'/>
+ <cd:constant name='vertical' value='vertikaal'/>
<cd:constant name='vfactor' value='vfactor'/>
<cd:constant name='vfil' value='vfil'/>
<cd:constant name='viewerprefix' value='viewerprefix'/>
@@ -1295,6 +1312,7 @@
<cd:constant name='white' value='wit'/>
<cd:constant name='width' value='breedte'/>
<cd:constant name='words' value='words'/>
+ <cd:constant name='xanchor' value='xanker'/>
<cd:constant name='xfactor' value='xfactor'/>
<cd:constant name='xhtml' value='xhtml'/>
<cd:constant name='xmax' value='xmax'/>
@@ -1302,6 +1320,7 @@
<cd:constant name='xoffset' value='xoffset'/>
<cd:constant name='xscale' value='xschaal'/>
<cd:constant name='xstep' value='xstap'/>
+ <cd:constant name='yanchor' value='yanker'/>
<cd:constant name='yfactor' value='yfactor'/>
<cd:constant name='ymax' value='ymax'/>
<cd:constant name='yoffset' value='yoffset'/>
diff --git a/Master/texmf-dist/tex/context/interface/mkii/keys-pe.xml b/Master/texmf-dist/tex/context/interface/mkii/keys-pe.xml
index bd42a83ddc4..9f18d633dcf 100644
--- a/Master/texmf-dist/tex/context/interface/mkii/keys-pe.xml
+++ b/Master/texmf-dist/tex/context/interface/mkii/keys-pe.xml
@@ -150,6 +150,7 @@
<cd:variable name='comment' value='توضیح'/>
<cd:variable name='component' value='مولفه'/>
<cd:variable name='compressseparator' value='compressseparator'/>
+ <cd:variable name='compressstopper' value='compressstopper'/>
<cd:variable name='concept' value='مفهوم'/>
<cd:variable name='construction' value='construction'/>
<cd:variable name='content' value='محتوا'/>
@@ -234,8 +235,10 @@
<cd:variable name='handwritten' value='دست‌نوشته'/>
<cd:variable name='hang' value='بیاویز'/>
<cd:variable name='hanging' value='آویزان'/>
+ <cd:variable name='hangingboth' value='hangingboth'/>
<cd:variable name='head' value='سر'/>
<cd:variable name='header' value='سربرگ'/>
+ <cd:variable name='headintext' value='headintext'/>
<cd:variable name='height' value='ارتفاع'/>
<cd:variable name='helptext' value='متن‌کمکی'/>
<cd:variable name='hencefore' value='hencefore'/>
@@ -376,6 +379,7 @@
<cd:variable name='nohz' value='nohz'/>
<cd:variable name='noline' value='noline'/>
<cd:variable name='nomarking' value='بدون‌نشانه‌گذاری'/>
+ <cd:variable name='nomenubar' value='nomenubar'/>
<cd:variable name='none' value='هیچکدام'/>
<cd:variable name='nonumber' value='بدون‌شماره'/>
<cd:variable name='norepeat' value='norepeat'/>
@@ -479,6 +483,7 @@
<cd:variable name='sectionnumber' value='شماره‌بخش'/>
<cd:variable name='see' value='ببینید'/>
<cd:variable name='selectfont' value='selectfont'/>
+ <cd:variable name='separator' value='separator'/>
<cd:variable name='september' value='سپتامبر'/>
<cd:variable name='serif' value='سریف'/>
<cd:variable name='serifbold' value='serifbold'/>
@@ -572,6 +577,7 @@
<cd:variable name='temporary' value='موقتی'/>
<cd:variable name='test' value='تست'/>
<cd:variable name='text' value='متن'/>
+ <cd:variable name='textnote' value='textnote'/>
<cd:variable name='three' value='سه'/>
<cd:variable name='thursday' value='پنج‌شنبه'/>
<cd:variable name='tight' value='tight'/>
@@ -590,6 +596,7 @@
<cd:variable name='understrike' value='understrike'/>
<cd:variable name='understrikes' value='understrikes'/>
<cd:variable name='unframed' value='unframed'/>
+ <cd:variable name='unicode' value='unicode'/>
<cd:variable name='unit' value='واحد'/>
<cd:variable name='units' value='واحدها'/>
<cd:variable name='unknown' value='ناشناس'/>
@@ -638,6 +645,7 @@
<cd:constant name='aligntitle' value='عنوان‌تنظیم'/>
<cd:constant name='alternative' value='جایگزین'/>
<cd:constant name='anchor' value='anchor'/>
+ <cd:constant name='anchoring' value='anchoring'/>
<cd:constant name='andtext' value='andtext'/>
<cd:constant name='apa' value='apa'/>
<cd:constant name='arguments' value='arguments'/>
@@ -734,7 +742,10 @@
<cd:constant name='component' value='مولفه'/>
<cd:constant name='compoundhyphen' value='compoundhyphen'/>
<cd:constant name='compress' value='فشردن'/>
+ <cd:constant name='compressdistance' value='compressdistance'/>
+ <cd:constant name='compressmethod' value='compressmethod'/>
<cd:constant name='compressseparator' value='compressseparator'/>
+ <cd:constant name='compressstopper' value='compressstopper'/>
<cd:constant name='concerns' value='concerns'/>
<cd:constant name='connector' value='connector'/>
<cd:constant name='continue' value='ادامه'/>
@@ -864,6 +875,7 @@
<cd:constant name='hfil' value='پرکردن‌ارتفاع'/>
<cd:constant name='hidenumber' value='hidenumber'/>
<cd:constant name='hoffset' value='آفست‌ا'/>
+ <cd:constant name='horizontal' value='افقی'/>
<cd:constant name='horoffset' value='آفست‌افق'/>
<cd:constant name='hyphen' value='شکستن'/>
<cd:constant name='hyphens' value='hyphens'/>
@@ -964,9 +976,12 @@
<cd:constant name='menu' value='منو'/>
<cd:constant name='method' value='روش'/>
<cd:constant name='middle' value='میان'/>
+ <cd:constant name='middlecolor' value='middlecolor'/>
<cd:constant name='middlecommand' value='middlecommand'/>
<cd:constant name='middlespeech' value='سخنرانی‌میانی'/>
+ <cd:constant name='middlestyle' value='middlestyle'/>
<cd:constant name='middletext' value='متن‌میانی'/>
+ <cd:constant name='middlewidth' value='middlewidth'/>
<cd:constant name='midsentence' value='جمله‌میانی'/>
<cd:constant name='min' value='کمترین'/>
<cd:constant name='mindepth' value='کمترین‌عمق'/>
@@ -1036,6 +1051,7 @@
<cd:constant name='overprint' value='overprint'/>
<cd:constant name='ownerpassword' value='ownerpassword'/>
<cd:constant name='ownnumber' value='شماره‌خود'/>
+ <cd:constant name='packcriterium' value='packcriterium'/>
<cd:constant name='page' value='صفحه'/>
<cd:constant name='pageboundaries' value='مرزهای‌صفحه'/>
<cd:constant name='pagecolor' value='رنگ‌صفحه'/>
@@ -1045,6 +1061,7 @@
<cd:constant name='pageconversion' value='pageconversion'/>
<cd:constant name='pageconversionset' value='pageconversionset'/>
<cd:constant name='pageleft' value='pageleft'/>
+ <cd:constant name='pagemethod' value='pagemethod'/>
<cd:constant name='pagenumber' value='شماره‌صفحه'/>
<cd:constant name='pageprefix' value='pageprefix'/>
<cd:constant name='pageprefixconnector' value='pageprefixconnector'/>
@@ -1284,6 +1301,7 @@
<cd:constant name='vcompact' value='vcompact'/>
<cd:constant name='vector' value='vector'/>
<cd:constant name='veroffset' value='آفست‌عم'/>
+ <cd:constant name='vertical' value='عمودی'/>
<cd:constant name='vfactor' value='vfactor'/>
<cd:constant name='vfil' value='vfil'/>
<cd:constant name='viewerprefix' value='viewerprefix'/>
@@ -1294,6 +1312,7 @@
<cd:constant name='white' value='سفید'/>
<cd:constant name='width' value='عرض'/>
<cd:constant name='words' value='words'/>
+ <cd:constant name='xanchor' value='xanchor'/>
<cd:constant name='xfactor' value='فاکتورایکس'/>
<cd:constant name='xhtml' value='xhtml'/>
<cd:constant name='xmax' value='xmax'/>
@@ -1301,6 +1320,7 @@
<cd:constant name='xoffset' value='آفست‌ایکس'/>
<cd:constant name='xscale' value='مقیاس‌ایکس'/>
<cd:constant name='xstep' value='گام‌ایکس'/>
+ <cd:constant name='yanchor' value='yanchor'/>
<cd:constant name='yfactor' value='فاکتوروای'/>
<cd:constant name='ymax' value='ymax'/>
<cd:constant name='yoffset' value='آفست‌وای'/>
diff --git a/Master/texmf-dist/tex/context/interface/mkii/keys-ro.xml b/Master/texmf-dist/tex/context/interface/mkii/keys-ro.xml
index 5f165f88be4..0bde14e868c 100644
--- a/Master/texmf-dist/tex/context/interface/mkii/keys-ro.xml
+++ b/Master/texmf-dist/tex/context/interface/mkii/keys-ro.xml
@@ -150,6 +150,7 @@
<cd:variable name='comment' value='comentariu'/>
<cd:variable name='component' value='componenta'/>
<cd:variable name='compressseparator' value='compressseparator'/>
+ <cd:variable name='compressstopper' value='compressstopper'/>
<cd:variable name='concept' value='concept'/>
<cd:variable name='construction' value='construction'/>
<cd:variable name='content' value='cuprins'/>
@@ -234,8 +235,10 @@
<cd:variable name='handwritten' value='scrismanual'/>
<cd:variable name='hang' value='suspenda'/>
<cd:variable name='hanging' value='suspendat'/>
+ <cd:variable name='hangingboth' value='hangingboth'/>
<cd:variable name='head' value='antet'/>
<cd:variable name='header' value='antet'/>
+ <cd:variable name='headintext' value='headintext'/>
<cd:variable name='height' value='inaltime'/>
<cd:variable name='helptext' value='textajutator'/>
<cd:variable name='hencefore' value='precedent'/>
@@ -376,6 +379,7 @@
<cd:variable name='nohz' value='nohz'/>
<cd:variable name='noline' value='noline'/>
<cd:variable name='nomarking' value='faramarcare'/>
+ <cd:variable name='nomenubar' value='nomenubar'/>
<cd:variable name='none' value='niciunul'/>
<cd:variable name='nonumber' value='nonumber'/>
<cd:variable name='norepeat' value='norepeat'/>
@@ -479,6 +483,7 @@
<cd:variable name='sectionnumber' value='numarsetiune'/>
<cd:variable name='see' value='vezi'/>
<cd:variable name='selectfont' value='selectfont'/>
+ <cd:variable name='separator' value='separator'/>
<cd:variable name='september' value='septembrie'/>
<cd:variable name='serif' value='serif'/>
<cd:variable name='serifbold' value='serifbold'/>
@@ -572,6 +577,7 @@
<cd:variable name='temporary' value='temporar'/>
<cd:variable name='test' value='test'/>
<cd:variable name='text' value='text'/>
+ <cd:variable name='textnote' value='textnote'/>
<cd:variable name='three' value='trei'/>
<cd:variable name='thursday' value='joi'/>
<cd:variable name='tight' value='tight'/>
@@ -639,6 +645,7 @@
<cd:constant name='aligntitle' value='alinieretitlu'/>
<cd:constant name='alternative' value='alternativ'/>
<cd:constant name='anchor' value='anchor'/>
+ <cd:constant name='anchoring' value='anchoring'/>
<cd:constant name='andtext' value='andtext'/>
<cd:constant name='apa' value='apa'/>
<cd:constant name='arguments' value='arguments'/>
@@ -735,7 +742,10 @@
<cd:constant name='component' value='component'/>
<cd:constant name='compoundhyphen' value='compoundhyphen'/>
<cd:constant name='compress' value='compress'/>
+ <cd:constant name='compressdistance' value='compressdistance'/>
+ <cd:constant name='compressmethod' value='compressmethod'/>
<cd:constant name='compressseparator' value='compressseparator'/>
+ <cd:constant name='compressstopper' value='compressstopper'/>
<cd:constant name='concerns' value='concerns'/>
<cd:constant name='connector' value='connector'/>
<cd:constant name='continue' value='continua'/>
@@ -865,6 +875,7 @@
<cd:constant name='hfil' value='hfil'/>
<cd:constant name='hidenumber' value='hidenumber'/>
<cd:constant name='hoffset' value='hoffset'/>
+ <cd:constant name='horizontal' value='orizontal'/>
<cd:constant name='horoffset' value='offsetoriz'/>
<cd:constant name='hyphen' value='hyphen'/>
<cd:constant name='hyphens' value='hyphens'/>
@@ -965,9 +976,12 @@
<cd:constant name='menu' value='meniu'/>
<cd:constant name='method' value='metoda'/>
<cd:constant name='middle' value='mijloc'/>
+ <cd:constant name='middlecolor' value='middlecolor'/>
<cd:constant name='middlecommand' value='middlecommand'/>
<cd:constant name='middlespeech' value='middlespeech'/>
+ <cd:constant name='middlestyle' value='middlestyle'/>
<cd:constant name='middletext' value='textmijloc'/>
+ <cd:constant name='middlewidth' value='middlewidth'/>
<cd:constant name='midsentence' value='midsentence'/>
<cd:constant name='min' value='min'/>
<cd:constant name='mindepth' value='mindepth'/>
@@ -1037,6 +1051,7 @@
<cd:constant name='overprint' value='overprint'/>
<cd:constant name='ownerpassword' value='ownerpassword'/>
<cd:constant name='ownnumber' value='numarpropriu'/>
+ <cd:constant name='packcriterium' value='packcriterium'/>
<cd:constant name='page' value='pagina'/>
<cd:constant name='pageboundaries' value='marginipagina'/>
<cd:constant name='pagecolor' value='culoarepagina'/>
@@ -1046,6 +1061,7 @@
<cd:constant name='pageconversion' value='pageconversion'/>
<cd:constant name='pageconversionset' value='pageconversionset'/>
<cd:constant name='pageleft' value='pageleft'/>
+ <cd:constant name='pagemethod' value='pagemethod'/>
<cd:constant name='pagenumber' value='numarpagina'/>
<cd:constant name='pageprefix' value='pageprefix'/>
<cd:constant name='pageprefixconnector' value='pageprefixconnector'/>
@@ -1285,6 +1301,7 @@
<cd:constant name='vcompact' value='vcompact'/>
<cd:constant name='vector' value='vector'/>
<cd:constant name='veroffset' value='veroffset'/>
+ <cd:constant name='vertical' value='vertical'/>
<cd:constant name='vfactor' value='vfactor'/>
<cd:constant name='vfil' value='vfil'/>
<cd:constant name='viewerprefix' value='viewerprefix'/>
@@ -1295,6 +1312,7 @@
<cd:constant name='white' value='alb'/>
<cd:constant name='width' value='latime'/>
<cd:constant name='words' value='words'/>
+ <cd:constant name='xanchor' value='xanchor'/>
<cd:constant name='xfactor' value='xfactor'/>
<cd:constant name='xhtml' value='xhtml'/>
<cd:constant name='xmax' value='xmax'/>
@@ -1302,6 +1320,7 @@
<cd:constant name='xoffset' value='xoffset'/>
<cd:constant name='xscale' value='xscala'/>
<cd:constant name='xstep' value='xstep'/>
+ <cd:constant name='yanchor' value='yanchor'/>
<cd:constant name='yfactor' value='yfactor'/>
<cd:constant name='ymax' value='ymax'/>
<cd:constant name='yoffset' value='yoffset'/>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/context-en.xml b/Master/texmf-dist/tex/context/interface/mkiv/context-en.xml
index 73af42a963d..0ebeb7d8777 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/context-en.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/context-en.xml
@@ -238,6 +238,7 @@
<cd:constant type="lesshyphenation"/>
<cd:constant type="morehyphenation"/>
<cd:constant type="hanging"/>
+ <cd:constant type="hangingboth"/>
<cd:constant type="nothanging"/>
<cd:constant type="hz"/>
<cd:constant type="fullhz"/>
@@ -652,6 +653,9 @@
<cd:parameter name="buffer">
<cd:constant type="cd:buffer"/>
</cd:parameter>
+ <cd:parameter name="type">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
<cd:parameter name="state">
<cd:constant default="yes" type="start"/>
<cd:constant type="stop"/>
@@ -1933,6 +1937,26 @@
<cd:content/>
</cd:arguments>
</cd:command>
+ <cd:command file="supp-box.mkiv" level="system" name="hpackbox">
+ <cd:arguments>
+ <cd:dimension/>
+ </cd:arguments>
+ </cd:command>
+ <cd:command file="supp-box.mkiv" level="system" name="vpackbox">
+ <cd:arguments>
+ <cd:dimension/>
+ </cd:arguments>
+ </cd:command>
+ <cd:command file="supp-box.mkiv" level="system" name="hpackedbox">
+ <cd:arguments>
+ <cd:dimension/>
+ </cd:arguments>
+ </cd:command>
+ <cd:command file="supp-box.mkiv" level="system" name="vpackedbox">
+ <cd:arguments>
+ <cd:dimension/>
+ </cd:arguments>
+ </cd:command>
<cd:command file="supp-box.mkiv" level="system" name="inlinedbox">
<cd:arguments>
<cd:content/>
@@ -2432,7 +2456,7 @@
<cd:content/>
</cd:arguments>
</cd:command>
- <cd:command file="supp-box.mkiv" level="system" name="naturalhbox">
+ <cd:command file="supp-dir.mkiv" level="system" name="naturalhbox">
<cd:arguments>
<cd:keywords delimiters="none" optional="yes">
<cd:constant type="cd:text"/>
@@ -2440,7 +2464,7 @@
<cd:content/>
</cd:arguments>
</cd:command>
- <cd:command file="supp-box.mkiv" level="system" name="naturalvbox">
+ <cd:command file="supp-dir.mkiv" level="system" name="naturalvbox">
<cd:arguments>
<cd:keywords delimiters="none" optional="yes">
<cd:constant type="cd:text"/>
@@ -2448,7 +2472,7 @@
<cd:content/>
</cd:arguments>
</cd:command>
- <cd:command file="supp-box.mkiv" level="system" name="naturalvtop">
+ <cd:command file="supp-dir.mkiv" level="system" name="naturalvtop">
<cd:arguments>
<cd:keywords delimiters="none" optional="yes">
<cd:constant type="cd:text"/>
@@ -2464,7 +2488,7 @@
<cd:content/>
</cd:arguments>
</cd:command>
- <cd:command file="supp-box.mkiv" level="system" name="naturalhpack">
+ <cd:command file="supp-dir.mkiv" level="system" name="naturalhpack">
<cd:arguments>
<cd:keywords delimiters="none" optional="yes">
<cd:constant type="cd:text"/>
@@ -2472,7 +2496,63 @@
<cd:content/>
</cd:arguments>
</cd:command>
- <cd:command file="supp-box.mkiv" level="system" name="naturalvpack">
+ <cd:command file="supp-dir.mkiv" level="system" name="naturalvpack">
+ <cd:arguments>
+ <cd:keywords delimiters="none" optional="yes">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+ <cd:command file="supp-dir.mkiv" level="system" name="naturaltpack">
+ <cd:arguments>
+ <cd:keywords delimiters="none" optional="yes">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+ <cd:command file="supp-dir.mkiv" level="system" name="reversehbox">
+ <cd:arguments>
+ <cd:keywords delimiters="none" optional="yes">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+ <cd:command file="supp-dir.mkiv" level="system" name="reversevbox">
+ <cd:arguments>
+ <cd:keywords delimiters="none" optional="yes">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+ <cd:command file="supp-dir.mkiv" level="system" name="reversevtop">
+ <cd:arguments>
+ <cd:keywords delimiters="none" optional="yes">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+ <cd:command file="supp-dir.mkiv" level="system" name="reversehpack">
+ <cd:arguments>
+ <cd:keywords delimiters="none" optional="yes">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+ <cd:command file="supp-dir.mkiv" level="system" name="reversevpack">
+ <cd:arguments>
+ <cd:keywords delimiters="none" optional="yes">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+ <cd:command file="supp-dir.mkiv" level="system" name="reversetpack">
<cd:arguments>
<cd:keywords delimiters="none" optional="yes">
<cd:constant type="cd:text"/>
@@ -2711,6 +2791,14 @@
<cd:content/>
</cd:arguments>
</cd:command>
+ <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="rtlhbox">
+ <cd:arguments>
+ <cd:keywords delimiters="none" optional="yes">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
<cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorighthbox">
<cd:arguments>
<cd:keywords delimiters="none" optional="yes">
@@ -2719,6 +2807,14 @@
<cd:content/>
</cd:arguments>
</cd:command>
+ <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="ltrhbox">
+ <cd:arguments>
+ <cd:keywords delimiters="none" optional="yes">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
<cd:command category="alignment" file="spac-ali.mkiv" level="system" name="righttoleftvbox">
<cd:arguments>
<cd:keywords delimiters="none" optional="yes">
@@ -2727,6 +2823,14 @@
<cd:content/>
</cd:arguments>
</cd:command>
+ <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="rtlvbox">
+ <cd:arguments>
+ <cd:keywords delimiters="none" optional="yes">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
<cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorightvbox">
<cd:arguments>
<cd:keywords delimiters="none" optional="yes">
@@ -2735,6 +2839,14 @@
<cd:content/>
</cd:arguments>
</cd:command>
+ <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="ltrvbox">
+ <cd:arguments>
+ <cd:keywords delimiters="none" optional="yes">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
<cd:command category="alignment" file="spac-ali.mkiv" level="system" name="righttoleftvtop">
<cd:arguments>
<cd:keywords delimiters="none" optional="yes">
@@ -2743,6 +2855,14 @@
<cd:content/>
</cd:arguments>
</cd:command>
+ <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="rtlvtop">
+ <cd:arguments>
+ <cd:keywords delimiters="none" optional="yes">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
<cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorightvtop">
<cd:arguments>
<cd:keywords delimiters="none" optional="yes">
@@ -2751,6 +2871,14 @@
<cd:content/>
</cd:arguments>
</cd:command>
+ <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="ltrvtop">
+ <cd:arguments>
+ <cd:keywords delimiters="none" optional="yes">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
<cd:command category="alignment" file="spac-ali.mkiv" level="system" name="autodirhbox">
<cd:arguments>
<cd:keywords delimiters="none" optional="yes">
@@ -3574,6 +3702,13 @@
</cd:keywords>
</cd:arguments>
</cd:command>
+ <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="cap">
+ <cd:arguments>
+ <cd:keywords delimiters="braces">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
<cd:command category="fonts" file="typo-cap.mkiv" level="style" name="mixedcaps">
<cd:arguments>
<cd:keywords delimiters="braces">
@@ -3595,6 +3730,20 @@
</cd:keywords>
</cd:arguments>
</cd:command>
+ <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="capital">
+ <cd:arguments>
+ <cd:keywords delimiters="braces">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
+ <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="smallcaps">
+ <cd:arguments>
+ <cd:keywords delimiters="braces">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
<cd:command category="fonts" file="typo-cap.mkiv" level="style" name="uppercased">
<cd:arguments>
<cd:keywords delimiters="braces">
@@ -5190,106 +5339,6 @@
</cd:arguments>
</cd:command>
</cd:interface>
- <cd:interface file="i-columns.xml">
- <cd:command category="columns" file="page-mul.mkiv" level="style" name="setupcolumns">
- <cd:arguments>
- <cd:assignments list="yes">
- <cd:parameter name="n">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:parameter name="distance">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="option">
- <cd:constant type="background"/>
- </cd:parameter>
- <cd:parameter name="offset">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="command">
- <cd:constant type="cd:oneargument"/>
- </cd:parameter>
- <cd:parameter name="height">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="direction">
- <cd:constant type="left"/>
- <cd:constant default="yes" type="right"/>
- </cd:parameter>
- <cd:parameter name="balance">
- <cd:constant default="yes" type="yes"/>
- <cd:constant type="no"/>
- </cd:parameter>
- <cd:parameter name="align">
- <cd:inherit type="setupalign"/>
- </cd:parameter>
- <cd:parameter name="tolerance">
- <cd:inherit type="setuptolerance"/>
- </cd:parameter>
- <cd:parameter name="blank">
- <cd:inherit name="blank"/>
- </cd:parameter>
- <cd:parameter name="ntop">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:parameter name="rule">
- <cd:constant type="on"/>
- <cd:constant default="yes" type="off"/>
- <cd:constant type="cd:command"/>
- </cd:parameter>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
- <cd:command category="columns" file="page-mul.mkiv" level="document" name="columns" type="environment">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupcolumns"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
- <cd:command category="columns" file="page-mul.mkiv" level="style" name="setupcolumnspan">
- <cd:arguments>
- <cd:assignments list="yes">
- <cd:parameter name="n">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:inherit name="setupframed"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
- <cd:command category="columns" file="page-mul.mkiv" level="document" name="columnspan" type="environment">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupcolumnspan"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
- <cd:command category="columns" file="page-mul.mkiv" level="system" name="setsimplecolumnhsize">
- <cd:arguments>
- <cd:assignments list="yes">
- <cd:parameter name="n">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:parameter name="width">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="distance">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="lines">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
- <cd:command category="columns" file="page-mul.mkiv" level="system" name="simplecolumns" type="environment">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setsimplecolumnhsize"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
- </cd:interface>
<cd:interface file="i-combination.xml">
<cd:command category="tables" file="pack-com.mkiv" level="style" name="definecombination">
<cd:arguments>
@@ -6336,7 +6385,7 @@
</cd:command>
<cd:command category="counter language" file="core-con.mkiv" level="document" name="date">
<cd:arguments>
- <cd:assignments list="yes" optional="yes">
+ <cd:assignments list="yes">
<cd:parameter name="d">
<cd:constant type="cd:number"/>
</cd:parameter>
@@ -6493,6 +6542,7 @@
<cd:constant type="set␣2"/>
<cd:constant type="set␣3"/>
<cd:constant type="continued"/>
+ <cd:constant type="zero"/>
<cd:constant type="cd:name"/>
</cd:keywords>
<cd:keywords delimiters="braces">
@@ -6673,6 +6723,16 @@
</cd:keywords>
</cd:arguments>
</cd:command>
+ <cd:command category="counter" file="core-con.mkiv" level="style" name="zeronumberconversion">
+ <cd:arguments>
+ <cd:keywords delimiters="braces">
+ <cd:constant type="cd:number"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
+ <cd:command category="system" file="core-con.mkiv" level="style" name="actualyear"/>
+ <cd:command category="system" file="core-con.mkiv" level="style" name="actualmonth"/>
+ <cd:command category="system" file="core-con.mkiv" level="style" name="actualday"/>
</cd:interface>
<cd:interface file="i-counter.xml">
<cd:command category="counter" file="strc-num.mkiv" level="system" name="definecounter">
@@ -7857,22 +7917,6 @@
</cd:command>
<cd:command category="language alignment" file="typo-dir.mkiv" level="style" name="resetdirection"/>
<cd:command category="alignment" file="supp-dir.mkiv" level="document" name="showdirsinmargin"/>
- <cd:command category="alignment" file="supp-dir.mkiv" level="system" name="istltdir">
- <cd:arguments>
- <cd:keywords delimiters="none">
- <cd:constant type="TLT"/>
- <cd:constant type="TRT"/>
- </cd:keywords>
- </cd:arguments>
- </cd:command>
- <cd:command category="alignment" file="supp-dir.mkiv" level="system" name="istrtdir">
- <cd:arguments>
- <cd:keywords delimiters="none">
- <cd:constant type="TLT"/>
- <cd:constant type="TRT"/>
- </cd:keywords>
- </cd:arguments>
- </cd:command>
</cd:interface>
<cd:interface file="i-document.xml">
<cd:command category="structure" file="file-job.mkvi" level="document" name="text" type="environment"/>
@@ -10068,14 +10112,50 @@
<cd:command category="background layout" file="page-app.mkiv" level="style" name="setupTEXpage">
<cd:arguments>
<cd:assignments list="yes">
- <cd:inherit name="setupfittingpage"/>
+ <cd:parameter name="pagestate">
+ <cd:constant type="start"/>
+ <cd:constant default="yes" type="stop"/>
+ </cd:parameter>
+ <cd:parameter name="command">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="margin">
+ <cd:constant type="page"/>
+ </cd:parameter>
+ <cd:parameter name="scale">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="paper">
+ <cd:constant type="auto"/>
+ <cd:constant default="yes" type="default"/>
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:inherit name="setupframed"/>
</cd:assignments>
</cd:arguments>
</cd:command>
<cd:command category="background layout metapost" file="meta-fig.mkiv" level="style" name="setupMPpage">
<cd:arguments>
<cd:assignments list="yes">
- <cd:inherit name="setupfittingpage"/>
+ <cd:parameter name="pagestate">
+ <cd:constant type="start"/>
+ <cd:constant default="yes" type="stop"/>
+ </cd:parameter>
+ <cd:parameter name="command">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="margin">
+ <cd:constant type="page"/>
+ </cd:parameter>
+ <cd:parameter name="scale">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="paper">
+ <cd:constant type="auto"/>
+ <cd:constant default="yes" type="default"/>
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:inherit name="setupframed"/>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -10311,6 +10391,13 @@
<cd:constant default="yes" type="yes"/>
<cd:constant type="no"/>
</cd:parameter>
+ <cd:parameter name="compress">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="compressdistance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
<cd:inherit name="setupframed"/>
</cd:assignments>
</cd:arguments>
@@ -10397,6 +10484,9 @@
<cd:parameter name="headseparator">
<cd:constant type="cd:text"/>
</cd:parameter>
+ <cd:parameter name="headcommand">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
<cd:parameter name="inbetween">
<cd:constant type="cd:command"/>
</cd:parameter>
@@ -10535,6 +10625,17 @@
<cd:constant type="effective"/>
<cd:constant type="header"/>
<cd:constant type="footer"/>
+ <cd:constant type="tblr"/>
+ <cd:constant type="lrtb"/>
+ <cd:constant type="tbrl"/>
+ <cd:constant type="rltb"/>
+ <cd:constant type="fxtb"/>
+ <cd:constant type="btlr"/>
+ <cd:constant type="lrbt"/>
+ <cd:constant type="btrl"/>
+ <cd:constant type="rlbt"/>
+ <cd:constant type="fxbt"/>
+ <cd:constant type="fixd"/>
</cd:keywords>
<cd:keywords list="yes" optional="yes">
<cd:constant type="cd:reference"/>
@@ -10613,6 +10714,17 @@
<cd:constant type="effective"/>
<cd:constant type="header"/>
<cd:constant type="footer"/>
+ <cd:constant type="tblr"/>
+ <cd:constant type="lrtb"/>
+ <cd:constant type="tbrl"/>
+ <cd:constant type="rltb"/>
+ <cd:constant type="fxtb"/>
+ <cd:constant type="btlr"/>
+ <cd:constant type="lrbt"/>
+ <cd:constant type="btrl"/>
+ <cd:constant type="rlbt"/>
+ <cd:constant type="fxbt"/>
+ <cd:constant type="fixd"/>
</cd:keywords>
<cd:keywords list="yes" optional="yes">
<cd:constant type="cd:reference"/>
@@ -10698,6 +10810,17 @@
<cd:constant type="effective"/>
<cd:constant type="header"/>
<cd:constant type="footer"/>
+ <cd:constant type="tblr"/>
+ <cd:constant type="lrtb"/>
+ <cd:constant type="tbrl"/>
+ <cd:constant type="rltb"/>
+ <cd:constant type="fxtb"/>
+ <cd:constant type="btlr"/>
+ <cd:constant type="lrbt"/>
+ <cd:constant type="btrl"/>
+ <cd:constant type="rlbt"/>
+ <cd:constant type="fxbt"/>
+ <cd:constant type="fixd"/>
</cd:parameter>
<cd:parameter name="reference">
<cd:constant type="cd:reference"/>
@@ -10791,6 +10914,17 @@
<cd:constant type="effective"/>
<cd:constant type="header"/>
<cd:constant type="footer"/>
+ <cd:constant type="tblr"/>
+ <cd:constant type="lrtb"/>
+ <cd:constant type="tbrl"/>
+ <cd:constant type="rltb"/>
+ <cd:constant type="fxtb"/>
+ <cd:constant type="btlr"/>
+ <cd:constant type="lrbt"/>
+ <cd:constant type="btrl"/>
+ <cd:constant type="rlbt"/>
+ <cd:constant type="fxbt"/>
+ <cd:constant type="fixd"/>
</cd:parameter>
<cd:parameter name="reference">
<cd:constant type="cd:reference"/>
@@ -10865,6 +10999,17 @@
<cd:constant type="effective"/>
<cd:constant type="header"/>
<cd:constant type="footer"/>
+ <cd:constant type="tblr"/>
+ <cd:constant type="lrtb"/>
+ <cd:constant type="tbrl"/>
+ <cd:constant type="rltb"/>
+ <cd:constant type="fxtb"/>
+ <cd:constant type="btlr"/>
+ <cd:constant type="lrbt"/>
+ <cd:constant type="btrl"/>
+ <cd:constant type="rlbt"/>
+ <cd:constant type="fxbt"/>
+ <cd:constant type="fixd"/>
</cd:keywords>
<cd:keywords list="yes" optional="yes">
<cd:constant type="cd:reference"/>
@@ -11123,6 +11268,17 @@
<cd:constant type="effective"/>
<cd:constant type="header"/>
<cd:constant type="footer"/>
+ <cd:constant type="tblr"/>
+ <cd:constant type="lrtb"/>
+ <cd:constant type="tbrl"/>
+ <cd:constant type="rltb"/>
+ <cd:constant type="fxtb"/>
+ <cd:constant type="btlr"/>
+ <cd:constant type="lrbt"/>
+ <cd:constant type="btrl"/>
+ <cd:constant type="rlbt"/>
+ <cd:constant type="fxbt"/>
+ <cd:constant type="fixd"/>
</cd:keywords>
<cd:keywords list="yes" optional="yes">
<cd:constant type="cd:reference"/>
@@ -14615,7 +14771,7 @@
<cd:constant type="frame"/>
<cd:constant type="empty"/>
</cd:parameter>
- <cd:parameter name="forgroundcolor">
+ <cd:parameter name="foregroundcolor">
<cd:constant type="cd:color"/>
</cd:parameter>
<cd:parameter name="reset">
@@ -16818,6 +16974,9 @@
<cd:constant type="attachment"/>
<cd:constant type="layer"/>
<cd:constant type="title"/>
+ <cd:constant type="lefttoright"/>
+ <cd:constant type="righttoleft"/>
+ <cd:constant type="nomenubar"/>
</cd:parameter>
<cd:parameter name="copies">
<cd:constant type="cd:number"/>
@@ -17496,6 +17655,7 @@
<cd:constant type="inmargin"/>
<cd:constant type="atmargin"/>
<cd:constant type="intext"/>
+ <cd:constant type="headintext"/>
<cd:constant type="loose"/>
<cd:constant type="fit"/>
<cd:constant type="nofit"/>
@@ -17582,6 +17742,18 @@
<cd:constant type="standard"/>
<cd:constant type="cd:dimension"/>
</cd:parameter>
+ <cd:parameter name="leftmargindistance">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="standard"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rightmargindistance">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="standard"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
<cd:parameter name="align">
<cd:inherit name="setupalign"/>
</cd:parameter>
@@ -17678,6 +17850,9 @@
<cd:parameter name="grid">
<cd:inherit name="definegridsnapping"/>
</cd:parameter>
+ <cd:parameter name="packcriterium">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
<cd:inherit name="setupcounter"/>
</cd:assignments>
</cd:arguments>
@@ -17788,6 +17963,18 @@
<cd:constant type="standard"/>
<cd:constant type="cd:dimension"/>
</cd:parameter>
+ <cd:parameter name="leftmargindistance">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="standard"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rightmargindistance">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="standard"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
<cd:parameter name="align">
<cd:inherit name="setupalign"/>
</cd:parameter>
@@ -17895,7 +18082,214 @@
<cd:constant method="range" prefix="cd:name" type="cd:number"/>
</cd:keywords>
<cd:assignments list="yes">
- <cd:inherit name="setupitemgroup"/>
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="inbetween">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="beforehead">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="afterhead">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="lefttext">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="righttext">
+ <cd:constant type="cd:command"/>
+ </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="factor">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="step">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="width">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="option">
+ <cd:constant type="intro"/>
+ <cd:constant type="random"/>
+ <cd:constant type="continue"/>
+ <cd:constant type="packed"/>
+ <cd:constant type="autointro"/>
+ <cd:constant type="broad"/>
+ <cd:constant type="text"/>
+ <cd:constant type="before"/>
+ <cd:constant type="after"/>
+ <cd:constant type="nowhite"/>
+ <cd:constant type="margin"/>
+ <cd:constant type="inmargin"/>
+ <cd:constant type="atmargin"/>
+ <cd:constant type="intext"/>
+ <cd:constant type="loose"/>
+ <cd:constant type="fit"/>
+ <cd:constant type="nofit"/>
+ <cd:constant type="paragraph"/>
+ <cd:constant type="joinedup"/>
+ <cd:constant type="serried"/>
+ <cd:constant type="stopper"/>
+ <cd:constant type="unpacked"/>
+ <cd:constant type="repeat"/>
+ <cd:constant type="norepeat"/>
+ <cd:constant type="reverse"/>
+ <cd:constant type="columns"/>
+ <cd:constant type="one"/>
+ <cd:constant type="two"/>
+ <cd:constant type="three"/>
+ <cd:constant type="four"/>
+ <cd:constant type="five"/>
+ <cd:constant type="six"/>
+ <cd:constant type="seven"/>
+ <cd:constant type="eight"/>
+ <cd:constant type="nine"/>
+ <cd:constant type="standard"/>
+ <cd:constant method="factor" prefix="cd:number" type="broad"/>
+ <cd:constant method="factor" prefix="cd:number" type="serried"/>
+ <cd:constant type="horizontal"/>
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="margin">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="standard"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="leftmargin">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="standard"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rightmargin">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="standard"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="leftmargindistance">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="standard"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rightmargindistance">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="standard"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="align">
+ <cd:inherit name="setupalign"/>
+ </cd:parameter>
+ <cd:parameter name="indenting">
+ <cd:inherit name="setupindenting"/>
+ </cd:parameter>
+ <cd:parameter name="start">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="symalign">
+ <cd:constant type="left"/>
+ <cd:constant type="middle"/>
+ <cd:constant type="right"/>
+ <cd:constant type="flushleft"/>
+ <cd:constant type="center"/>
+ <cd:constant type="flushright"/>
+ </cd:parameter>
+ <cd:parameter name="symbol">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="indentnext">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="auto"/>
+ </cd:parameter>
+ <cd:parameter name="inner">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="command">
+ <cd:constant type="cd:csname"/>
+ </cd:parameter>
+ <cd:parameter name="items">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="maxwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="itemalign">
+ <cd:constant type="left"/>
+ <cd:constant type="right"/>
+ <cd:constant type="middle"/>
+ <cd:constant type="flushleft"/>
+ <cd:constant type="flushright"/>
+ <cd:constant type="inner"/>
+ <cd:constant type="outer"/>
+ </cd:parameter>
+ <cd:parameter name="alignsymbol">
+ <cd:constant type="yes"/>
+ <cd:constant default="yes" type="no"/>
+ </cd:parameter>
+ <cd:parameter name="textdistance">
+ <cd:constant type="small"/>
+ <cd:constant type="medium"/>
+ <cd:constant type="big"/>
+ <cd:constant type="none"/>
+ <cd:constant default="yes" type="space"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="placestopper">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </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:parameter name="headstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="headcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="marstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="marcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="symstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="symcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="grid">
+ <cd:inherit name="definegridsnapping"/>
+ </cd:parameter>
+ <cd:inherit name="setupcounter"/>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -17910,10 +18304,219 @@
<cd:constant type="cd:number"/>
</cd:keywords>
<cd:keywords list="yes" optional="yes">
- <cd:inherit name="setupitemgroup"/>
+ <cd:constant type="intro"/>
+ <cd:constant type="random"/>
+ <cd:constant type="continue"/>
+ <cd:constant type="packed"/>
+ <cd:constant type="autointro"/>
+ <cd:constant type="broad"/>
+ <cd:constant type="text"/>
+ <cd:constant type="before"/>
+ <cd:constant type="after"/>
+ <cd:constant type="nowhite"/>
+ <cd:constant type="margin"/>
+ <cd:constant type="inmargin"/>
+ <cd:constant type="atmargin"/>
+ <cd:constant type="intext"/>
+ <cd:constant type="headintext"/>
+ <cd:constant type="loose"/>
+ <cd:constant type="fit"/>
+ <cd:constant type="nofit"/>
+ <cd:constant type="paragraph"/>
+ <cd:constant type="joinedup"/>
+ <cd:constant type="serried"/>
+ <cd:constant type="stopper"/>
+ <cd:constant type="nostopper"/>
+ <cd:constant type="unpacked"/>
+ <cd:constant type="repeat"/>
+ <cd:constant type="norepeat"/>
+ <cd:constant type="reverse"/>
+ <cd:constant type="columns"/>
+ <cd:constant type="one"/>
+ <cd:constant type="two"/>
+ <cd:constant type="three"/>
+ <cd:constant type="four"/>
+ <cd:constant type="five"/>
+ <cd:constant type="six"/>
+ <cd:constant type="seven"/>
+ <cd:constant type="eight"/>
+ <cd:constant type="nine"/>
+ <cd:constant type="standard"/>
+ <cd:constant method="factor" prefix="cd:number" type="broad"/>
+ <cd:constant method="factor" prefix="cd:number" type="serried"/>
+ <cd:constant type="horizontal"/>
+ <cd:constant type="cd:name"/>
</cd:keywords>
<cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupitemgroup"/>
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="inbetween">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="beforehead">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="afterhead">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="lefttext">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="righttext">
+ <cd:constant type="cd:command"/>
+ </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="factor">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="step">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="width">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="margin">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="standard"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="leftmargin">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="standard"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rightmargin">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="standard"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="leftmargindistance">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="standard"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rightmargindistance">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="standard"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="align">
+ <cd:inherit name="setupalign"/>
+ </cd:parameter>
+ <cd:parameter name="indenting">
+ <cd:inherit name="setupindenting"/>
+ </cd:parameter>
+ <cd:parameter name="start">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="symalign">
+ <cd:constant type="left"/>
+ <cd:constant type="middle"/>
+ <cd:constant type="right"/>
+ <cd:constant type="flushleft"/>
+ <cd:constant type="center"/>
+ <cd:constant type="flushright"/>
+ </cd:parameter>
+ <cd:parameter name="symbol">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="indentnext">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ <cd:constant type="auto"/>
+ </cd:parameter>
+ <cd:parameter name="inner">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="command">
+ <cd:constant type="cd:csname"/>
+ </cd:parameter>
+ <cd:parameter name="items">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="maxwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="itemalign">
+ <cd:constant type="left"/>
+ <cd:constant type="right"/>
+ <cd:constant type="middle"/>
+ <cd:constant type="flushleft"/>
+ <cd:constant type="flushright"/>
+ <cd:constant type="inner"/>
+ <cd:constant type="outer"/>
+ </cd:parameter>
+ <cd:parameter name="alignsymbol">
+ <cd:constant type="yes"/>
+ <cd:constant default="yes" type="no"/>
+ </cd:parameter>
+ <cd:parameter name="textdistance">
+ <cd:constant type="small"/>
+ <cd:constant type="medium"/>
+ <cd:constant type="big"/>
+ <cd:constant type="none"/>
+ <cd:constant default="yes" type="space"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="placestopper">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </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:parameter name="headstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="headcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="marstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="marcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="symstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="symcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="grid">
+ <cd:inherit name="definegridsnapping"/>
+ </cd:parameter>
+ <cd:parameter name="packcriterium">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:inherit name="setupcounter"/>
</cd:assignments>
</cd:arguments>
<cd:instances>
@@ -19542,6 +20145,10 @@
<cd:parameter name="artoffset">
<cd:constant type="cd:dimension"/>
</cd:parameter>
+ <cd:parameter name="direction">
+ <cd:constant default="yes" type="normal"/>
+ <cd:constant type="reverse"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -20945,28 +21552,16 @@
</cd:interface>
<cd:interface file="i-logo.xml">
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="TeX"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="ConTeXt"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PPCHTeX"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PRAGMA"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LaTeX"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="TaBlE"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PiCTeX"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="AmSTeX"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LamSTeX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="TEX"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="Context"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="ConTeXt"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="CONTEXT"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="MetaFont"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="METAFONT"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="MetaPost"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="METAPOST"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="MetaFun"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="eTeX"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="pdfTeX"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="pdfeTeX"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="Lua"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="luaTeX"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="luajitTeX"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="metaTeX"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="XeTeX"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LuaTeX"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LuajitTeX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="METAFUN"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="MKII"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="MKIV"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="MKVI"/>
@@ -20975,23 +21570,37 @@
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="MPII"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="MPIV"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="MPVI"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="METAFONT"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="METAPOST"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PPCHTeX"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="PPCHTEX"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="CONTEXT"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="METAFUN"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="TEX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PRAGMA"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LaTeX"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="LATEX"/>
- <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PICTEX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="TaBlE"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="TABLE"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PiCTeX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PICTEX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="AmSTeX"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="AMSTEX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LamSTeX"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="LAMSTEX"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="INRSTEX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="eTeX"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="ETEX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="pdfTeX"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="PDFTEX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="pdfeTeX"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="PDFETEX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="Lua"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="luaTeX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LuaTeX"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="LUATEX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="luajitTeX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LuajitTeX"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="LUAJITTEX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="luametaTeX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LuaMetaTeX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LUAMETATEX"/>
+ <cd:command category="symbols" file="cont-log.mkiv" level="document" name="XeTeX"/>
<cd:command category="symbols" file="cont-log.mkiv" level="document" name="XETEX"/>
</cd:interface>
<cd:interface file="i-lohi.xml">
@@ -22282,6 +22891,14 @@
<cd:content/>
</cd:arguments>
</cd:command>
+ <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathematics" variant="assignment">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmathematics"/>
+ </cd:assignments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
<cd:command category="mathematics" file="math-ini.mkiv" level="document" name="math">
<cd:arguments>
<cd:keywords optional="yes">
@@ -22290,6 +22907,14 @@
<cd:content/>
</cd:arguments>
</cd:command>
+ <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="math" variant="assignment">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmathematics"/>
+ </cd:assignments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
<cd:command category="mathematics" file="math-ini.mkiv" level="document" name="m">
<cd:arguments>
<cd:keywords optional="yes">
@@ -22298,6 +22923,14 @@
<cd:content/>
</cd:arguments>
</cd:command>
+ <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="m" variant="assignment">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmathematics"/>
+ </cd:assignments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
<cd:command category="mathematics" file="math-ini.mkiv" level="style" name="definemathcommand">
<cd:arguments>
<cd:keywords>
@@ -22693,6 +23326,8 @@
</cd:keywords>
</cd:arguments>
</cd:command>
+ <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="stackscripts"/>
+ <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="unstackscripts"/>
</cd:interface>
<cd:interface file="i-mathalignment.xml">
<cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="definemathalignment">
@@ -22900,6 +23535,38 @@
<cd:command category="mathematics" file="math-fen.mkiv" level="document" name="fenced">
<cd:arguments>
<cd:keywords>
+ <cd:constant type="parenthesis"/>
+ <cd:constant type="bracket"/>
+ <cd:constant type="brace"/>
+ <cd:constant type="bar"/>
+ <cd:constant type="doublebar"/>
+ <cd:constant type="triplebar"/>
+ <cd:constant type="angle"/>
+ <cd:constant type="doubleangle"/>
+ <cd:constant type="solidus"/>
+ <cd:constant type="ceiling"/>
+ <cd:constant type="floor"/>
+ <cd:constant type="moustache"/>
+ <cd:constant type="uppercorner"/>
+ <cd:constant type="lowercorner"/>
+ <cd:constant type="group"/>
+ <cd:constant type="openbracket"/>
+ <cd:constant type="mirroredparenthesis"/>
+ <cd:constant type="mirroredbracket"/>
+ <cd:constant type="mirroredbrace"/>
+ <cd:constant type="mirroredbar"/>
+ <cd:constant type="mirroreddoublebar"/>
+ <cd:constant type="mirroredtriplebar"/>
+ <cd:constant type="mirroredangle"/>
+ <cd:constant type="mirroreddoubleangle"/>
+ <cd:constant type="mirroredsolidus"/>
+ <cd:constant type="mirroredceiling"/>
+ <cd:constant type="mirroredfloor"/>
+ <cd:constant type="mirroredmoustache"/>
+ <cd:constant type="mirroreduppercorner"/>
+ <cd:constant type="mirroredlowercorner"/>
+ <cd:constant type="mirroredgroup"/>
+ <cd:constant type="mirroredopenbracket"/>
<cd:constant type="cd:name"/>
</cd:keywords>
<cd:content/>
@@ -22909,6 +23576,56 @@
<cd:command category="mathematics" file="math-fen.mkiv" level="document" name="left">
<cd:arguments>
<cd:keywords delimiters="none">
+ <cd:constant type="\\\\\\\\bgroup"/>
+ <cd:constant type="\\\\\\\\egroup"/>
+ <cd:constant type="\\\\\\\\letteropenbrace"/>
+ <cd:constant type="["/>
+ <cd:constant type="]"/>
+ <cd:constant type="("/>
+ <cd:constant type=")"/>
+ <cd:constant type="&lt;"/>
+ <cd:constant type="&gt;"/>
+ <cd:constant type="/"/>
+ <cd:constant type="|"/>
+ <cd:constant type="⌊"/>
+ <cd:constant type="⌋"/>
+ <cd:constant type="⌈"/>
+ <cd:constant type="⌉"/>
+ <cd:constant type="⟨"/>
+ <cd:constant type="⟩"/>
+ <cd:constant type="⟪"/>
+ <cd:constant type="⟫"/>
+ <cd:constant type="‖"/>
+ <cd:constant type="⦀"/>
+ <cd:constant type="⦗"/>
+ <cd:constant type="\\\\\\\\lbrace"/>
+ <cd:constant type="\\\\\\\\lbracket"/>
+ <cd:constant type="\\\\\\\\lbrack"/>
+ <cd:constant type="\\\\\\\\lparenthesis"/>
+ <cd:constant type="\\\\\\\\lparent"/>
+ <cd:constant type="\\\\\\\\lparen"/>
+ <cd:constant type="\\\\\\\\langle"/>
+ <cd:constant type="\\\\\\\\llangle"/>
+ <cd:constant type="\\\\\\\\lVert"/>
+ <cd:constant type="\\\\\\\\vert"/>
+ <cd:constant type="\\\\\\\\solidus"/>
+ <cd:constant type="\\\\\\\\lfloor"/>
+ <cd:constant type="\\\\\\\\lceiling"/>
+ <cd:constant type="\\\\\\\\lceil"/>
+ <cd:constant type="\\\\\\\\ulcorner"/>
+ <cd:constant type="\\\\\\\\llcorner"/>
+ <cd:constant type="\\\\\\\\lmoustache"/>
+ <cd:constant type="\\\\\\\\llbracket"/>
+ <cd:constant type="\\\\\\\\lgroup"/>
+ <cd:constant type="\\\\\\\\linterval"/>
+ <cd:constant type="\\\\\\\\lointerval"/>
+ <cd:constant type="\\\\\\\\llointerval"/>
+ <cd:constant type="\\\\\\\\lrointerval"/>
+ <cd:constant type="\\\\\\\\{"/>
+ <cd:constant type="\\\\\\\\["/>
+ <cd:constant type="\\\\\\\\("/>
+ <cd:constant type="\\\\\\\\&lt;"/>
+ <cd:constant type="\\\\\\\\|"/>
<cd:constant type="cd:character"/>
</cd:keywords>
</cd:arguments>
@@ -22923,6 +23640,56 @@
<cd:command category="mathematics" file="math-fen.mkiv" level="document" name="right">
<cd:arguments>
<cd:keywords delimiters="none">
+ <cd:constant type="\\\\\\\\egroup"/>
+ <cd:constant type="\\\\\\\\bgroup"/>
+ <cd:constant type="\\\\\\\\letterclosebrace"/>
+ <cd:constant type="]"/>
+ <cd:constant type="["/>
+ <cd:constant type=")"/>
+ <cd:constant type="("/>
+ <cd:constant type="&gt;"/>
+ <cd:constant type="&lt;"/>
+ <cd:constant type="/"/>
+ <cd:constant type="|"/>
+ <cd:constant type="⌋"/>
+ <cd:constant type="⌊"/>
+ <cd:constant type="⌉"/>
+ <cd:constant type="⌈"/>
+ <cd:constant type="⟩"/>
+ <cd:constant type="⟨"/>
+ <cd:constant type="⟫"/>
+ <cd:constant type="⟪"/>
+ <cd:constant type="‖"/>
+ <cd:constant type="⦀"/>
+ <cd:constant type="⦘"/>
+ <cd:constant type="\\\\\\\\rbrace"/>
+ <cd:constant type="\\\\\\\\rbracket"/>
+ <cd:constant type="\\\\\\\\rbracket"/>
+ <cd:constant type="\\\\\\\\rparenthesis"/>
+ <cd:constant type="\\\\\\\\rparent"/>
+ <cd:constant type="\\\\\\\\rparen"/>
+ <cd:constant type="\\\\\\\\rangle"/>
+ <cd:constant type="\\\\\\\\rrangle"/>
+ <cd:constant type="\\\\\\\\rVert"/>
+ <cd:constant type="\\\\\\\\vert"/>
+ <cd:constant type="\\\\\\\\solidus"/>
+ <cd:constant type="\\\\\\\\rfloor"/>
+ <cd:constant type="\\\\\\\\rceiling"/>
+ <cd:constant type="\\\\\\\\rceil"/>
+ <cd:constant type="\\\\\\\\urcorner"/>
+ <cd:constant type="\\\\\\\\lrcorner"/>
+ <cd:constant type="\\\\\\\\rmoustache"/>
+ <cd:constant type="\\\\\\\\rrbracket"/>
+ <cd:constant type="\\\\\\\\rgroup"/>
+ <cd:constant type="\\\\\\\\rinterval"/>
+ <cd:constant type="\\\\\\\\rointerval"/>
+ <cd:constant type="\\\\\\\\rlointerval"/>
+ <cd:constant type="\\\\\\\\rrointerval"/>
+ <cd:constant type="\\\\\\\\}"/>
+ <cd:constant type="\\\\\\\\]"/>
+ <cd:constant type="\\\\\\\\)"/>
+ <cd:constant type="\\\\\\\\&gt;"/>
+ <cd:constant type="\\\\\\\\|"/>
<cd:constant type="cd:character"/>
</cd:keywords>
</cd:arguments>
@@ -23042,6 +23809,56 @@
<cd:command category="mathematics" file="math-fen.mkiv" level="document" name="lfence">
<cd:arguments>
<cd:keywords delimiters="braces">
+ <cd:constant type="\\\\\\\\bgroup"/>
+ <cd:constant type="\\\\\\\\egroup"/>
+ <cd:constant type="\\\\\\\\letteropenbrace"/>
+ <cd:constant type="["/>
+ <cd:constant type="]"/>
+ <cd:constant type="("/>
+ <cd:constant type=")"/>
+ <cd:constant type="&lt;"/>
+ <cd:constant type="&gt;"/>
+ <cd:constant type="/"/>
+ <cd:constant type="|"/>
+ <cd:constant type="⌊"/>
+ <cd:constant type="⌋"/>
+ <cd:constant type="⌈"/>
+ <cd:constant type="⌉"/>
+ <cd:constant type="⟨"/>
+ <cd:constant type="⟩"/>
+ <cd:constant type="⟪"/>
+ <cd:constant type="⟫"/>
+ <cd:constant type="‖"/>
+ <cd:constant type="⦀"/>
+ <cd:constant type="⦗"/>
+ <cd:constant type="\\\\\\\\lbrace"/>
+ <cd:constant type="\\\\\\\\lbracket"/>
+ <cd:constant type="\\\\\\\\lbrack"/>
+ <cd:constant type="\\\\\\\\lparenthesis"/>
+ <cd:constant type="\\\\\\\\lparent"/>
+ <cd:constant type="\\\\\\\\lparen"/>
+ <cd:constant type="\\\\\\\\langle"/>
+ <cd:constant type="\\\\\\\\llangle"/>
+ <cd:constant type="\\\\\\\\lVert"/>
+ <cd:constant type="\\\\\\\\vert"/>
+ <cd:constant type="\\\\\\\\solidus"/>
+ <cd:constant type="\\\\\\\\lfloor"/>
+ <cd:constant type="\\\\\\\\lceiling"/>
+ <cd:constant type="\\\\\\\\lceil"/>
+ <cd:constant type="\\\\\\\\ulcorner"/>
+ <cd:constant type="\\\\\\\\llcorner"/>
+ <cd:constant type="\\\\\\\\lmoustache"/>
+ <cd:constant type="\\\\\\\\llbracket"/>
+ <cd:constant type="\\\\\\\\lgroup"/>
+ <cd:constant type="\\\\\\\\linterval"/>
+ <cd:constant type="\\\\\\\\lointerval"/>
+ <cd:constant type="\\\\\\\\llointerval"/>
+ <cd:constant type="\\\\\\\\lrointerval"/>
+ <cd:constant type="\\\\\\\\{"/>
+ <cd:constant type="\\\\\\\\["/>
+ <cd:constant type="\\\\\\\\("/>
+ <cd:constant type="\\\\\\\\&lt;"/>
+ <cd:constant type="\\\\\\\\|"/>
<cd:constant type="cd:character"/>
</cd:keywords>
</cd:arguments>
@@ -23056,6 +23873,56 @@
<cd:command category="mathematics" file="math-fen.mkiv" level="document" name="rfence">
<cd:arguments>
<cd:keywords delimiters="braces">
+ <cd:constant type="\\\\\\\\egroup"/>
+ <cd:constant type="\\\\\\\\bgroup"/>
+ <cd:constant type="\\\\\\\\letterclosebrace"/>
+ <cd:constant type="]"/>
+ <cd:constant type="["/>
+ <cd:constant type=")"/>
+ <cd:constant type="("/>
+ <cd:constant type="&gt;"/>
+ <cd:constant type="&lt;"/>
+ <cd:constant type="/"/>
+ <cd:constant type="|"/>
+ <cd:constant type="⌋"/>
+ <cd:constant type="⌊"/>
+ <cd:constant type="⌉"/>
+ <cd:constant type="⌈"/>
+ <cd:constant type="⟩"/>
+ <cd:constant type="⟨"/>
+ <cd:constant type="⟫"/>
+ <cd:constant type="⟪"/>
+ <cd:constant type="‖"/>
+ <cd:constant type="⦀"/>
+ <cd:constant type="⦘"/>
+ <cd:constant type="\\\\\\\\rbrace"/>
+ <cd:constant type="\\\\\\\\rbracket"/>
+ <cd:constant type="\\\\\\\\rbracket"/>
+ <cd:constant type="\\\\\\\\rparenthesis"/>
+ <cd:constant type="\\\\\\\\rparent"/>
+ <cd:constant type="\\\\\\\\rparen"/>
+ <cd:constant type="\\\\\\\\rangle"/>
+ <cd:constant type="\\\\\\\\rrangle"/>
+ <cd:constant type="\\\\\\\\rVert"/>
+ <cd:constant type="\\\\\\\\vert"/>
+ <cd:constant type="\\\\\\\\solidus"/>
+ <cd:constant type="\\\\\\\\rfloor"/>
+ <cd:constant type="\\\\\\\\rceiling"/>
+ <cd:constant type="\\\\\\\\rceil"/>
+ <cd:constant type="\\\\\\\\urcorner"/>
+ <cd:constant type="\\\\\\\\lrcorner"/>
+ <cd:constant type="\\\\\\\\rmoustache"/>
+ <cd:constant type="\\\\\\\\rrbracket"/>
+ <cd:constant type="\\\\\\\\rgroup"/>
+ <cd:constant type="\\\\\\\\rinterval"/>
+ <cd:constant type="\\\\\\\\rointerval"/>
+ <cd:constant type="\\\\\\\\rlointerval"/>
+ <cd:constant type="\\\\\\\\rrointerval"/>
+ <cd:constant type="\\\\\\\\}"/>
+ <cd:constant type="\\\\\\\\]"/>
+ <cd:constant type="\\\\\\\\)"/>
+ <cd:constant type="\\\\\\\\&gt;"/>
+ <cd:constant type="\\\\\\\\|"/>
<cd:constant type="cd:character"/>
</cd:keywords>
</cd:arguments>
@@ -24424,8 +25291,16 @@
<cd:instances>
<cd:constant value="itemgroupcolumns"/>
<cd:constant value="boxedcolumns"/>
+ <cd:constant value="columns"/>
</cd:instances>
</cd:command>
+ <cd:command category="structure layout" file="page-smp.mkiv" level="style" name="setupcolumns">
+ <cd:arguments>
+ <cd:assignments list="yes">
+ <cd:inherit name="setupmixedcolumns"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
</cd:interface>
<cd:interface file="i-modes.xml">
<cd:command category="structure" file="core-env.mkiv" level="system" name="newmode">
@@ -25656,6 +26531,13 @@
</cd:assignments>
</cd:arguments>
</cd:command>
+ <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupfootnotes">
+ <cd:arguments>
+ <cd:assignments list="yes">
+ <cd:inherit name="setupnote"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
<cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnote">
<cd:arguments>
<cd:keywords>
@@ -25952,6 +26834,54 @@
</cd:keywords>
</cd:arguments>
</cd:command>
+ <cd:command category="structure notes" file="strc-tnt.mkiv" level="style" name="definetextnote">
+ <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="setuptextnote"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+ <cd:command category="structure notes" file="strc-tnt.mkiv" level="style" name="setuptextnote">
+ <cd:arguments>
+ <cd:keywords list="yes" optional="yes">
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ <cd:assignments list="yes">
+ <cd:parameter name="rule">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="note">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="*"/>
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="empty">
+ <cd:constant type="yes"/>
+ <cd:constant default="yes" type="no"/>
+ <cd:constant type="none"/>
+ <cd:constant type="number"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+ <cd:command category="structure notes" file="strc-tnt.mkiv" generated="yes" level="document" name="textnote">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuptextnote"/>
+ </cd:assignments>
+ <cd:keywords delimiters="braces">
+ <cd:constant type="cd:text"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
</cd:interface>
<cd:interface file="i-object.xml">
<cd:command category="pdf" file="pack-obj.mkiv" level="system" name="ifinobject">
@@ -26903,7 +27833,29 @@
<cd:constant type="cd:name"/>
</cd:keywords>
<cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupcolumnsetspan"/>
+ <cd:parameter name="c">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="r">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="method">
+ <cd:constant type="tblr"/>
+ <cd:constant type="lrtb"/>
+ <cd:constant type="tbrl"/>
+ <cd:constant type="rltb"/>
+ <cd:constant type="fxtb"/>
+ <cd:constant type="btlr"/>
+ <cd:constant type="lrbt"/>
+ <cd:constant type="btrl"/>
+ <cd:constant type="rlbt"/>
+ <cd:constant type="fxbt"/>
+ <cd:constant type="fixd"/>
+ </cd:parameter>
+ <cd:parameter name="option">
+ <cd:constant default="yes" type="none"/>
+ <cd:constant type="wide"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -27179,7 +28131,17 @@
<cd:command category="counter" file="strc-pag.mkiv" level="style" name="setuppagenumber">
<cd:arguments>
<cd:assignments list="yes">
- <cd:inherit name="setupuserpagenumber"/>
+ <cd:parameter name="viewerprefix">
+ <cd:constant type="cd:text"/>
+ </cd:parameter>
+ <cd:parameter name="state">
+ <cd:constant type="start"/>
+ <cd:constant type="stop"/>
+ <cd:constant type="none"/>
+ <cd:constant type="keep"/>
+ <cd:constant type="empty"/>
+ </cd:parameter>
+ <cd:inherit name="setupcounter"/>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -28142,6 +29104,7 @@
<cd:command category="tables" file="tabl-mis.mkiv" level="style" name="setupparagraphs" variant="assignment">
<cd:arguments>
<cd:keywords optional="yes">
+ <cd:constant type="cd:name"/>
<cd:constant method="range" prefix="cd:name" type="cd:number"/>
</cd:keywords>
<cd:assignments list="yes">
@@ -33538,6 +34501,7 @@
<cd:constant default="yes" type="no"/>
<cd:constant type="all"/>
<cd:constant type="packed"/>
+ <cd:constant type="text"/>
</cd:parameter>
<cd:parameter name="check">
<cd:constant default="yes" type="yes"/>
@@ -33702,6 +34666,10 @@
<cd:parameter name="numberorder">
<cd:constant default="yes" type="numbers"/>
</cd:parameter>
+ <cd:parameter name="pagemethod">
+ <cd:constant default="yes" type="page"/>
+ <cd:constant type="section"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -33752,6 +34720,8 @@
<cd:constant type="yes"/>
<cd:constant default="yes" type="no"/>
<cd:constant type="all"/>
+ <cd:constant type="packed"/>
+ <cd:constant type="text"/>
</cd:parameter>
<cd:parameter name="check">
<cd:constant default="yes" type="yes"/>
@@ -33916,6 +34886,10 @@
<cd:parameter name="numberorder">
<cd:constant default="yes" type="numbers"/>
</cd:parameter>
+ <cd:parameter name="pagemethod">
+ <cd:constant default="yes" type="page"/>
+ <cd:constant type="section"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -33928,7 +34902,216 @@
<cd:constant type="cd:number"/>
</cd:keywords>
<cd:assignments list="yes">
- <cd:inherit name="setupregister"/>
+ <cd:parameter name="referencemethod">
+ <cd:constant type="forward"/>
+ </cd:parameter>
+ <cd:parameter name="expansion">
+ <cd:constant type="yes"/>
+ <cd:constant default="yes" type="no"/>
+ <cd:constant type="xml"/>
+ </cd:parameter>
+ <cd:parameter name="ownnumber">
+ <cd:constant type="yes"/>
+ <cd:constant default="yes" type="no"/>
+ </cd:parameter>
+ <cd:parameter name="xmlsetup">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="alternative">
+ <cd:constant type="a"/>
+ <cd:constant type="b"/>
+ <cd:constant type="A"/>
+ <cd:constant type="B"/>
+ </cd:parameter>
+ <cd:parameter name="method">
+ <cd:constant type="default"/>
+ <cd:constant type="before"/>
+ <cd:constant type="after"/>
+ <cd:constant type="first"/>
+ <cd:constant type="last"/>
+ <cd:constant type="ch"/>
+ <cd:constant type="mm"/>
+ <cd:constant type="zm"/>
+ <cd:constant type="pm"/>
+ <cd:constant type="mc"/>
+ <cd:constant type="zc"/>
+ <cd:constant type="pc"/>
+ <cd:constant type="uc"/>
+ </cd:parameter>
+ <cd:parameter name="compress">
+ <cd:constant type="yes"/>
+ <cd:constant default="yes" type="no"/>
+ <cd:constant type="all"/>
+ <cd:constant type="packed"/>
+ <cd:constant type="text"/>
+ </cd:parameter>
+ <cd:parameter name="check">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="criterium">
+ <cd:constant type="local"/>
+ <cd:constant type="text"/>
+ <cd:constant type="current"/>
+ <cd:constant type="previous"/>
+ <cd:constant default="yes" type="all"/>
+ <cd:constant type="cd:section"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixseparatorset">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixconversionset">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixstarter">
+ <cd:constant type="cd:command"/>
+ <cd:constant method="apply" prefix="cd:processor" type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixstopper">
+ <cd:constant type="cd:command"/>
+ <cd:constant method="apply" prefix="cd:processor" type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixset">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixsegments">
+ <cd:constant type="cd:number"/>
+ <cd:constant method="range" prefix="cd:number" type="cd:number"/>
+ <cd:constant method="range" prefix="cd:number" type="*"/>
+ <cd:constant method="range" prefix="cd:number" type="all"/>
+ <cd:constant type="cd:section"/>
+ <cd:constant method="range" prefix="cd:section" type="cd:section"/>
+ <cd:constant method="range" prefix="cd:section" type="*"/>
+ <cd:constant method="range" prefix="cd:section" type="all"/>
+ <cd:constant type="current"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixconnector">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefix">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="pageseparatorset">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="pageconversionset">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="pagestarter">
+ <cd:constant type="cd:command"/>
+ <cd:constant method="apply" prefix="cd:processor" type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pagestopper">
+ <cd:constant type="cd:command"/>
+ <cd:constant method="apply" prefix="cd:processor" type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pagesegments">
+ <cd:constant type="cd:number"/>
+ <cd:constant method="range" prefix="cd:number" type="cd:number"/>
+ <cd:constant method="range" prefix="cd:number" type="*"/>
+ <cd:constant method="range" prefix="cd:number" type="all"/>
+ </cd:parameter>
+ <cd:parameter name="maxwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="indicator">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="command">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="textcommand">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="deeptextcommand">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="pagecommand">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="interaction">
+ <cd:constant type="text"/>
+ <cd:constant default="yes" type="pagenumber"/>
+ </cd:parameter>
+ <cd:parameter name="pagenumber">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="symbol">
+ <cd:constant type="a"/>
+ <cd:constant default="yes" type="n"/>
+ <cd:constant type="none"/>
+ <cd:constant type="1"/>
+ <cd:constant type="2"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="language">
+ <cd:constant type="default"/>
+ <cd:constant type="DIN␣5007-1"/>
+ <cd:constant type="DIN␣5007-2"/>
+ <cd:constant type="Duden"/>
+ <cd:constant type="de-DE"/>
+ <cd:constant type="de-CH"/>
+ <cd:constant type="de-AT"/>
+ <cd:constant type="ru-iso9"/>
+ <cd:constant type="ocs-scn"/>
+ <cd:constant type="cd:language"/>
+ </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:parameter name="textstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="textcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="pagestyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pagecolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="pageleft">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageright">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="balance">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="align">
+ <cd:inherit name="setupalign"/>
+ </cd:parameter>
+ <cd:parameter name="numberorder">
+ <cd:constant default="yes" type="numbers"/>
+ </cd:parameter>
+ <cd:parameter name="pagemethod">
+ <cd:constant default="yes" type="page"/>
+ <cd:constant type="section"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -33939,7 +35122,216 @@
<cd:constant method="range" prefix="cd:name" type="cd:number"/>
</cd:keywords>
<cd:assignments list="yes">
- <cd:inherit name="setupregister"/>
+ <cd:parameter name="referencemethod">
+ <cd:constant type="forward"/>
+ </cd:parameter>
+ <cd:parameter name="expansion">
+ <cd:constant type="yes"/>
+ <cd:constant default="yes" type="no"/>
+ <cd:constant type="xml"/>
+ </cd:parameter>
+ <cd:parameter name="ownnumber">
+ <cd:constant type="yes"/>
+ <cd:constant default="yes" type="no"/>
+ </cd:parameter>
+ <cd:parameter name="xmlsetup">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="alternative">
+ <cd:constant type="a"/>
+ <cd:constant type="b"/>
+ <cd:constant type="A"/>
+ <cd:constant type="B"/>
+ </cd:parameter>
+ <cd:parameter name="method">
+ <cd:constant type="default"/>
+ <cd:constant type="before"/>
+ <cd:constant type="after"/>
+ <cd:constant type="first"/>
+ <cd:constant type="last"/>
+ <cd:constant type="ch"/>
+ <cd:constant type="mm"/>
+ <cd:constant type="zm"/>
+ <cd:constant type="pm"/>
+ <cd:constant type="mc"/>
+ <cd:constant type="zc"/>
+ <cd:constant type="pc"/>
+ <cd:constant type="uc"/>
+ </cd:parameter>
+ <cd:parameter name="compress">
+ <cd:constant type="yes"/>
+ <cd:constant default="yes" type="no"/>
+ <cd:constant type="all"/>
+ <cd:constant type="packed"/>
+ <cd:constant type="text"/>
+ </cd:parameter>
+ <cd:parameter name="check">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="criterium">
+ <cd:constant type="local"/>
+ <cd:constant type="text"/>
+ <cd:constant type="current"/>
+ <cd:constant type="previous"/>
+ <cd:constant default="yes" type="all"/>
+ <cd:constant type="cd:section"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixseparatorset">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixconversionset">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixstarter">
+ <cd:constant type="cd:command"/>
+ <cd:constant method="apply" prefix="cd:processor" type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixstopper">
+ <cd:constant type="cd:command"/>
+ <cd:constant method="apply" prefix="cd:processor" type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixset">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixsegments">
+ <cd:constant type="cd:number"/>
+ <cd:constant method="range" prefix="cd:number" type="cd:number"/>
+ <cd:constant method="range" prefix="cd:number" type="*"/>
+ <cd:constant method="range" prefix="cd:number" type="all"/>
+ <cd:constant type="cd:section"/>
+ <cd:constant method="range" prefix="cd:section" type="cd:section"/>
+ <cd:constant method="range" prefix="cd:section" type="*"/>
+ <cd:constant method="range" prefix="cd:section" type="all"/>
+ <cd:constant type="current"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixconnector">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefix">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="pageseparatorset">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="pageconversionset">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="pagestarter">
+ <cd:constant type="cd:command"/>
+ <cd:constant method="apply" prefix="cd:processor" type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pagestopper">
+ <cd:constant type="cd:command"/>
+ <cd:constant method="apply" prefix="cd:processor" type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pagesegments">
+ <cd:constant type="cd:number"/>
+ <cd:constant method="range" prefix="cd:number" type="cd:number"/>
+ <cd:constant method="range" prefix="cd:number" type="*"/>
+ <cd:constant method="range" prefix="cd:number" type="all"/>
+ </cd:parameter>
+ <cd:parameter name="maxwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="indicator">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="command">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="textcommand">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="deeptextcommand">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="pagecommand">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="interaction">
+ <cd:constant type="text"/>
+ <cd:constant default="yes" type="pagenumber"/>
+ </cd:parameter>
+ <cd:parameter name="pagenumber">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="symbol">
+ <cd:constant type="a"/>
+ <cd:constant default="yes" type="n"/>
+ <cd:constant type="none"/>
+ <cd:constant type="1"/>
+ <cd:constant type="2"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="language">
+ <cd:constant type="default"/>
+ <cd:constant type="DIN␣5007-1"/>
+ <cd:constant type="DIN␣5007-2"/>
+ <cd:constant type="Duden"/>
+ <cd:constant type="de-DE"/>
+ <cd:constant type="de-CH"/>
+ <cd:constant type="de-AT"/>
+ <cd:constant type="ru-iso9"/>
+ <cd:constant type="ocs-scn"/>
+ <cd:constant type="cd:language"/>
+ </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:parameter name="textstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="textcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="pagestyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pagecolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="pageleft">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageright">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="balance">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="align">
+ <cd:inherit name="setupalign"/>
+ </cd:parameter>
+ <cd:parameter name="numberorder">
+ <cd:constant default="yes" type="numbers"/>
+ </cd:parameter>
+ <cd:parameter name="pagemethod">
+ <cd:constant default="yes" type="page"/>
+ <cd:constant type="section"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -34034,7 +35426,216 @@
<cd:constant type="cd:number"/>
</cd:keywords>
<cd:assignments list="yes">
- <cd:inherit name="setupregister"/>
+ <cd:parameter name="referencemethod">
+ <cd:constant type="forward"/>
+ </cd:parameter>
+ <cd:parameter name="expansion">
+ <cd:constant type="yes"/>
+ <cd:constant default="yes" type="no"/>
+ <cd:constant type="xml"/>
+ </cd:parameter>
+ <cd:parameter name="ownnumber">
+ <cd:constant type="yes"/>
+ <cd:constant default="yes" type="no"/>
+ </cd:parameter>
+ <cd:parameter name="xmlsetup">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="alternative">
+ <cd:constant type="a"/>
+ <cd:constant type="b"/>
+ <cd:constant type="A"/>
+ <cd:constant type="B"/>
+ </cd:parameter>
+ <cd:parameter name="method">
+ <cd:constant type="default"/>
+ <cd:constant type="before"/>
+ <cd:constant type="after"/>
+ <cd:constant type="first"/>
+ <cd:constant type="last"/>
+ <cd:constant type="ch"/>
+ <cd:constant type="mm"/>
+ <cd:constant type="zm"/>
+ <cd:constant type="pm"/>
+ <cd:constant type="mc"/>
+ <cd:constant type="zc"/>
+ <cd:constant type="pc"/>
+ <cd:constant type="uc"/>
+ </cd:parameter>
+ <cd:parameter name="compress">
+ <cd:constant type="yes"/>
+ <cd:constant default="yes" type="no"/>
+ <cd:constant type="all"/>
+ <cd:constant type="packed"/>
+ <cd:constant type="text"/>
+ </cd:parameter>
+ <cd:parameter name="check">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="criterium">
+ <cd:constant type="local"/>
+ <cd:constant type="text"/>
+ <cd:constant type="current"/>
+ <cd:constant type="previous"/>
+ <cd:constant default="yes" type="all"/>
+ <cd:constant type="cd:section"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixseparatorset">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixconversionset">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixstarter">
+ <cd:constant type="cd:command"/>
+ <cd:constant method="apply" prefix="cd:processor" type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixstopper">
+ <cd:constant type="cd:command"/>
+ <cd:constant method="apply" prefix="cd:processor" type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixset">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixsegments">
+ <cd:constant type="cd:number"/>
+ <cd:constant method="range" prefix="cd:number" type="cd:number"/>
+ <cd:constant method="range" prefix="cd:number" type="*"/>
+ <cd:constant method="range" prefix="cd:number" type="all"/>
+ <cd:constant type="cd:section"/>
+ <cd:constant method="range" prefix="cd:section" type="cd:section"/>
+ <cd:constant method="range" prefix="cd:section" type="*"/>
+ <cd:constant method="range" prefix="cd:section" type="all"/>
+ <cd:constant type="current"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixconnector">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefix">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="pageseparatorset">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="pageconversionset">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="pagestarter">
+ <cd:constant type="cd:command"/>
+ <cd:constant method="apply" prefix="cd:processor" type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pagestopper">
+ <cd:constant type="cd:command"/>
+ <cd:constant method="apply" prefix="cd:processor" type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pagesegments">
+ <cd:constant type="cd:number"/>
+ <cd:constant method="range" prefix="cd:number" type="cd:number"/>
+ <cd:constant method="range" prefix="cd:number" type="*"/>
+ <cd:constant method="range" prefix="cd:number" type="all"/>
+ </cd:parameter>
+ <cd:parameter name="maxwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="indicator">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="command">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="textcommand">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="deeptextcommand">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="pagecommand">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="interaction">
+ <cd:constant type="text"/>
+ <cd:constant default="yes" type="pagenumber"/>
+ </cd:parameter>
+ <cd:parameter name="pagenumber">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="symbol">
+ <cd:constant type="a"/>
+ <cd:constant default="yes" type="n"/>
+ <cd:constant type="none"/>
+ <cd:constant type="1"/>
+ <cd:constant type="2"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="language">
+ <cd:constant type="default"/>
+ <cd:constant type="DIN␣5007-1"/>
+ <cd:constant type="DIN␣5007-2"/>
+ <cd:constant type="Duden"/>
+ <cd:constant type="de-DE"/>
+ <cd:constant type="de-CH"/>
+ <cd:constant type="de-AT"/>
+ <cd:constant type="ru-iso9"/>
+ <cd:constant type="ocs-scn"/>
+ <cd:constant type="cd:language"/>
+ </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:parameter name="textstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="textcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="pagestyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pagecolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="pageleft">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageright">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="balance">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="align">
+ <cd:inherit name="setupalign"/>
+ </cd:parameter>
+ <cd:parameter name="numberorder">
+ <cd:constant default="yes" type="numbers"/>
+ </cd:parameter>
+ <cd:parameter name="pagemethod">
+ <cd:constant default="yes" type="page"/>
+ <cd:constant type="section"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
<cd:instances>
@@ -34057,10 +35658,10 @@
<cd:constant method="apply" prefix="cd:processor" type="cd:text"/>
</cd:keywords>
<cd:index list="yes"/>
- </cd:arguments>
- </cd:command>
- <cd:command category="structure" file="strc-reg.mkiv" level="document" name="stopregister">
- <cd:arguments>
+ <cd:keywords delimiters="none">
+ <cd:constant type="cd:content"/>
+ </cd:keywords>
+ <cd:delimiter name="stopregister"/>
<cd:keywords>
<cd:constant type="cd:name"/>
</cd:keywords>
@@ -34236,10 +35837,10 @@
<cd:constant type="cd:value"/>
</cd:parameter>
</cd:assignments>
- </cd:arguments>
- </cd:command>
- <cd:command category="structure" file="strc-reg.mkiv" level="document" name="stopstructurepageregister">
- <cd:arguments>
+ <cd:keywords delimiters="none">
+ <cd:constant type="cd:content"/>
+ </cd:keywords>
+ <cd:delimiter name="stopstructurepageregister"/>
<cd:keywords>
<cd:constant type="cd:name"/>
</cd:keywords>
@@ -35106,6 +36707,10 @@
<cd:constant type="positive"/>
<cd:constant type="all"/>
</cd:parameter>
+ <cd:parameter name="hidenumber">
+ <cd:constant type="yes"/>
+ <cd:constant default="yes" type="no"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -35299,6 +36904,34 @@
</cd:assignments>
</cd:arguments>
</cd:command>
+ <cd:command category="structure" file="strc-sec.mkiv" level="system" name="placerawheaddata">
+ <cd:arguments>
+ <cd:keywords>
+ <cd:constant type="cd:section"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
+ <cd:command category="structure" file="strc-sec.mkiv" level="system" name="placerawheadtext">
+ <cd:arguments>
+ <cd:keywords>
+ <cd:constant type="cd:section"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
+ <cd:command category="structure" file="strc-sec.mkiv" level="system" name="placerawheadnumber">
+ <cd:arguments>
+ <cd:keywords>
+ <cd:constant type="cd:section"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
+ <cd:command category="structure" file="strc-sec.mkiv" level="document" name="repeathead">
+ <cd:arguments>
+ <cd:keywords>
+ <cd:constant type="cd:section"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
<cd:command category="structure" file="strc-sec.mkiv" level="system" name="definesection">
<cd:arguments>
<cd:keywords>
@@ -36140,6 +37773,33 @@
</cd:arguments>
</cd:command>
</cd:interface>
+ <cd:interface file="i-simplecolumns.xml">
+ <cd:command category="structure layout" file="page-smp.mkiv" level="system" name="setsimplecolumnshsize">
+ <cd:arguments>
+ <cd:assignments list="yes">
+ <cd:parameter name="n">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="width">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="lines">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+ <cd:command category="structure layout" file="page-smp.mkiv" level="system" name="simplecolumns" type="environment">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setsimplecolumnshsize"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+ </cd:interface>
<cd:interface file="i-smash.xml">
<cd:command file="supp-box.mkiv" level="system" name="smashbox">
<cd:arguments>
@@ -36964,6 +38624,16 @@
</cd:keywords>
</cd:arguments>
</cd:command>
+ <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="setupsymbols">
+ <cd:arguments>
+ <cd:assignments list="yes">
+ <cd:parameter name="stylealternative">
+ <cd:constant default="yes" type="text"/>
+ <cd:constant type="math"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
</cd:interface>
<cd:interface file="i-synctex.xml">
<cd:command category="pdf" file="cont-run.mkiv" level="system" name="synctexsetfilename">
@@ -43029,7 +44699,59 @@
<cd:constant type="edge"/>
</cd:keywords>
<cd:assignments list="yes">
- <cd:inherit name="setuplayouttext"/>
+ <cd:parameter name="state">
+ <cd:constant type="start"/>
+ <cd:constant type="stop"/>
+ <cd:constant type="empty"/>
+ <cd:constant type="high"/>
+ <cd:constant type="none"/>
+ <cd:constant default="yes" type="normal"/>
+ <cd:constant type="nomarking"/>
+ <cd:constant type="cd:name"/>
+ </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:parameter name="strut">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="leftstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="rightstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="leftcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="rightcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="width">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="leftwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rightwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -43041,7 +44763,59 @@
<cd:constant type="edge"/>
</cd:keywords>
<cd:assignments list="yes">
- <cd:inherit name="setuplayouttext"/>
+ <cd:parameter name="state">
+ <cd:constant type="start"/>
+ <cd:constant type="stop"/>
+ <cd:constant type="empty"/>
+ <cd:constant type="high"/>
+ <cd:constant type="none"/>
+ <cd:constant default="yes" type="normal"/>
+ <cd:constant type="nomarking"/>
+ <cd:constant type="cd:name"/>
+ </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:parameter name="strut">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="leftstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="rightstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="leftcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="rightcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="width">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="leftwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rightwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -43053,7 +44827,59 @@
<cd:constant type="edge"/>
</cd:keywords>
<cd:assignments list="yes">
- <cd:inherit name="setuplayouttext"/>
+ <cd:parameter name="state">
+ <cd:constant type="start"/>
+ <cd:constant type="stop"/>
+ <cd:constant type="empty"/>
+ <cd:constant type="high"/>
+ <cd:constant type="none"/>
+ <cd:constant default="yes" type="normal"/>
+ <cd:constant type="nomarking"/>
+ <cd:constant type="cd:name"/>
+ </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:parameter name="strut">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="leftstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="rightstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="leftcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="rightcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="width">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="leftwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rightwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -43065,7 +44891,59 @@
<cd:constant type="edge"/>
</cd:keywords>
<cd:assignments list="yes">
- <cd:inherit name="setuplayouttext"/>
+ <cd:parameter name="state">
+ <cd:constant type="start"/>
+ <cd:constant type="stop"/>
+ <cd:constant type="empty"/>
+ <cd:constant type="high"/>
+ <cd:constant type="none"/>
+ <cd:constant default="yes" type="normal"/>
+ <cd:constant type="nomarking"/>
+ <cd:constant type="cd:name"/>
+ </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:parameter name="strut">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="leftstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="rightstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="leftcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="rightcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="width">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="leftwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rightwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -43077,7 +44955,59 @@
<cd:constant type="edge"/>
</cd:keywords>
<cd:assignments list="yes">
- <cd:inherit name="setuplayouttext"/>
+ <cd:parameter name="state">
+ <cd:constant type="start"/>
+ <cd:constant type="stop"/>
+ <cd:constant type="empty"/>
+ <cd:constant type="high"/>
+ <cd:constant type="none"/>
+ <cd:constant default="yes" type="normal"/>
+ <cd:constant type="nomarking"/>
+ <cd:constant type="cd:name"/>
+ </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:parameter name="strut">
+ <cd:constant default="yes" type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="leftstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="rightstyle">
+ <cd:constant type="cd:style"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="leftcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="rightcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="width">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="leftwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rightwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -45800,6 +47730,9 @@
</cd:keywords>
</cd:arguments>
</cd:command>
+ <cd:command category="whitespace" file="typo-wrp.mkiv" level="document" name="crlf"/>
+ <cd:command category="whitespace" file="typo-wrp.mkiv" level="document" name="settestcrlf"/>
+ <cd:command category="whitespace" file="typo-wrp.mkiv" level="document" name="crlfplaceholder"/>
</cd:interface>
<cd:interface file="i-whitespace.xml">
<cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupwhitespace">
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-align.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-align.xml
index 669b845b918..eaebaa698f2 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-align.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-align.xml
@@ -42,6 +42,7 @@
<cd:constant type="lesshyphenation"/>
<cd:constant type="morehyphenation"/>
<cd:constant type="hanging"/>
+ <cd:constant type="hangingboth"/>
<cd:constant type="nothanging"/>
<cd:constant type="hz"/>
<cd:constant type="fullhz"/>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-attachment.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-attachment.xml
index 85cf8843bc4..550cc57ce66 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-attachment.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-attachment.xml
@@ -36,6 +36,9 @@
<cd:parameter name="buffer">
<cd:constant type="cd:buffer"/>
</cd:parameter>
+ <cd:parameter name="type">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
<cd:parameter name="state">
<cd:constant type="start" default="yes"/>
<cd:constant type="stop"/>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-boxes.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-boxes.xml
index e89be4fd06c..8c6c6c74a7a 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-boxes.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-boxes.xml
@@ -259,6 +259,30 @@
</cd:arguments>
</cd:command>
+ <cd:command name="hpackbox" level="system" file="supp-box.mkiv">
+ <cd:arguments>
+ <cd:dimension/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="vpackbox" level="system" file="supp-box.mkiv">
+ <cd:arguments>
+ <cd:dimension/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="hpackedbox" level="system" file="supp-box.mkiv">
+ <cd:arguments>
+ <cd:dimension/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="vpackedbox" level="system" file="supp-box.mkiv">
+ <cd:arguments>
+ <cd:dimension/>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="inlinedbox" level="system" file="supp-box.mkiv">
<cd:arguments>
<cd:content/>
@@ -725,21 +749,21 @@
</cd:arguments>
</cd:command>
- <cd:command name="naturalhbox" level="system" file="supp-box.mkiv">
+ <cd:command name="naturalhbox" level="system" file="supp-dir.mkiv">
<cd:arguments>
<cd:resolve name="string-boxoptions"/>
<cd:content/>
</cd:arguments>
</cd:command>
- <cd:command name="naturalvbox" level="system" file="supp-box.mkiv">
+ <cd:command name="naturalvbox" level="system" file="supp-dir.mkiv">
<cd:arguments>
<cd:resolve name="string-boxoptions"/>
<cd:content/>
</cd:arguments>
</cd:command>
- <cd:command name="naturalvtop" level="system" file="supp-box.mkiv">
+ <cd:command name="naturalvtop" level="system" file="supp-dir.mkiv">
<cd:arguments>
<cd:resolve name="string-boxoptions"/>
<cd:content/>
@@ -753,14 +777,63 @@
</cd:arguments>
</cd:command>
- <cd:command name="naturalhpack" level="system" file="supp-box.mkiv">
+ <cd:command name="naturalhpack" level="system" file="supp-dir.mkiv">
+ <cd:arguments>
+ <cd:resolve name="string-boxoptions"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="naturalvpack" level="system" file="supp-dir.mkiv">
+ <cd:arguments>
+ <cd:resolve name="string-boxoptions"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="naturaltpack" level="system" file="supp-dir.mkiv">
+ <cd:arguments>
+ <cd:resolve name="string-boxoptions"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="reversehbox" level="system" file="supp-dir.mkiv">
+ <cd:arguments>
+ <cd:resolve name="string-boxoptions"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="reversevbox" level="system" file="supp-dir.mkiv">
+ <cd:arguments>
+ <cd:resolve name="string-boxoptions"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="reversevtop" level="system" file="supp-dir.mkiv">
+ <cd:arguments>
+ <cd:resolve name="string-boxoptions"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="reversehpack" level="system" file="supp-dir.mkiv">
+ <cd:arguments>
+ <cd:resolve name="string-boxoptions"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="reversevpack" level="system" file="supp-dir.mkiv">
<cd:arguments>
<cd:resolve name="string-boxoptions"/>
<cd:content/>
</cd:arguments>
</cd:command>
- <cd:command name="naturalvpack" level="system" file="supp-box.mkiv">
+ <cd:command name="reversetpack" level="system" file="supp-dir.mkiv">
<cd:arguments>
<cd:resolve name="string-boxoptions"/>
<cd:content/>
@@ -950,6 +1023,13 @@
</cd:arguments>
</cd:command>
+ <cd:command name="rtlhbox" level="system" category="alignment" file="spac-ali.mkiv">
+ <cd:arguments>
+ <cd:resolve name="string-boxoptions"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="lefttorighthbox" level="system" category="alignment" file="spac-ali.mkiv">
<cd:arguments>
<cd:resolve name="string-boxoptions"/>
@@ -957,6 +1037,13 @@
</cd:arguments>
</cd:command>
+ <cd:command name="ltrhbox" level="system" category="alignment" file="spac-ali.mkiv">
+ <cd:arguments>
+ <cd:resolve name="string-boxoptions"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="righttoleftvbox" level="system" category="alignment" file="spac-ali.mkiv">
<cd:arguments>
<cd:resolve name="string-boxoptions"/>
@@ -964,6 +1051,13 @@
</cd:arguments>
</cd:command>
+ <cd:command name="rtlvbox" level="system" category="alignment" file="spac-ali.mkiv">
+ <cd:arguments>
+ <cd:resolve name="string-boxoptions"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="lefttorightvbox" level="system" category="alignment" file="spac-ali.mkiv">
<cd:arguments>
<cd:resolve name="string-boxoptions"/>
@@ -971,6 +1065,13 @@
</cd:arguments>
</cd:command>
+ <cd:command name="ltrvbox" level="system" category="alignment" file="spac-ali.mkiv">
+ <cd:arguments>
+ <cd:resolve name="string-boxoptions"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="righttoleftvtop" level="system" category="alignment" file="spac-ali.mkiv">
<cd:arguments>
<cd:resolve name="string-boxoptions"/>
@@ -978,6 +1079,13 @@
</cd:arguments>
</cd:command>
+ <cd:command name="rtlvtop" level="system" category="alignment" file="spac-ali.mkiv">
+ <cd:arguments>
+ <cd:resolve name="string-boxoptions"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="lefttorightvtop" level="system" category="alignment" file="spac-ali.mkiv">
<cd:arguments>
<cd:resolve name="string-boxoptions"/>
@@ -985,6 +1093,13 @@
</cd:arguments>
</cd:command>
+ <cd:command name="ltrvtop" level="system" category="alignment" file="spac-ali.mkiv">
+ <cd:arguments>
+ <cd:resolve name="string-boxoptions"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="autodirhbox" level="system" category="alignment" file="spac-ali.mkiv">
<cd:arguments>
<cd:resolve name="string-boxoptions"/>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-capitals.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-capitals.xml
index 4cfb4a08020..6115b1519ba 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-capitals.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-capitals.xml
@@ -167,6 +167,12 @@
</cd:arguments>
</cd:command>
+ <cd:command name="cap" level="style" category="fonts" file="typo-cap.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="mixedcaps" level="style" category="fonts" file="typo-cap.mkiv">
<cd:arguments>
<cd:resolve name="argument-text"/>
@@ -185,6 +191,18 @@
</cd:arguments>
</cd:command>
+ <cd:command name="capital" level="style" category="fonts" file="typo-cap.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="smallcaps" level="style" category="fonts" file="typo-cap.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="uppercased" level="style" category="fonts" file="typo-cap.mkiv">
<cd:arguments>
<cd:resolve name="argument-text"/>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-chart.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-chart.xml
index 2b73f132253..43672efa043 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-chart.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-chart.xml
@@ -119,6 +119,9 @@
<cd:parameter name="offset">
<cd:constant type="cd:dimension"/>
</cd:parameter>
+ <cd:parameter name="clipoffset">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
<cd:parameter name="dx">
<cd:constant type="cd:dimension"/>
</cd:parameter>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-columns.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-columns.xml
index bbc022ac67a..aa290a0a959 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-columns.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-columns.xml
@@ -34,10 +34,10 @@
<cd:constant type="no"/>
</cd:parameter>
<cd:parameter name="align">
- <cd:inherit type="setupalign"/>
+ <cd:inherit name="setupalign"/>
</cd:parameter>
<cd:parameter name="tolerance">
- <cd:inherit type="setuptolerance"/>
+ <cd:inherit name="setuptolerance"/>
</cd:parameter>
<cd:parameter name="blank">
<cd:inherit name="blank"/>
@@ -81,7 +81,7 @@
</cd:arguments>
</cd:command>
- <cd:command name="setsimplecolumnhsize" level="system" category="columns" file="page-mul.mkiv">
+ <cd:command name="setsimplecolumnshsize" level="system" category="columns" file="page-mul.mkiv">
<cd:arguments>
<cd:assignments list="yes">
<cd:parameter name="n">
@@ -103,9 +103,9 @@
<cd:command name="simplecolumns" type="environment" level="system" category="columns" file="page-mul.mkiv">
<cd:arguments>
<cd:assignments list="yes" optional="yes">
- <cd:inherit name="setsimplecolumnhsize"/>
+ <cd:inherit name="setsimplecolumnshsize"/>
</cd:assignments>
</cd:arguments>
</cd:command>
-</cd:interface>
+</cd:interface> \ No newline at end of file
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-common-argument.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-common-argument.xml
index de000148be3..da821c516cc 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-common-argument.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-common-argument.xml
@@ -524,7 +524,7 @@
<!-- * -->
<!-- \... {...} -->
<!-- -->
- <!-- * TOCHAR -->
+ <!-- * TOCHAR -->
<cd:define name="argument-tochar">
<cd:keywords delimiters="braces">
@@ -532,4 +532,26 @@
</cd:keywords>
</cd:define>
+ <!-- * -->
+ <!-- \... {...} -->
+ <!-- -->
+ <!-- * LEFTFENCE -->
+
+ <cd:define name="argument-leftfence">
+ <cd:keywords delimiters="braces">
+ <cd:resolve name="value-leftfence"/>
+ </cd:keywords>
+ </cd:define>
+
+ <!-- * -->
+ <!-- \... {...} -->
+ <!-- -->
+ <!-- * RIGHTFENCE -->
+
+ <cd:define name="argument-rightfence">
+ <cd:keywords delimiters="braces">
+ <cd:resolve name="value-rightfence"/>
+ </cd:keywords>
+ </cd:define>
+
</cd:interface> \ No newline at end of file
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-common-instance.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-common-instance.xml
index dc8cead7925..3d4864de76e 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-common-instance.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-common-instance.xml
@@ -187,6 +187,7 @@
<cd:define name="instance-mixedcolumns">
<cd:constant value="itemgroupcolumns"/>
<cd:constant value="boxedcolumns"/>
+ <cd:constant value="columns"/>
</cd:define>
<cd:define name="instance-note">
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-common-string.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-common-string.xml
index 5ef1fc71a7c..0c0bb2ef356 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-common-string.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-common-string.xml
@@ -169,4 +169,26 @@
</cd:keywords>
</cd:define>
+ <!-- * -->
+ <!-- \... ... -->
+ <!-- -->
+ <!-- * LEFTFENCE -->
+
+ <cd:define name="string-leftfence">
+ <cd:keywords delimiters="none">
+ <cd:resolve name="value-leftfence"/>
+ </cd:keywords>
+ </cd:define>
+
+ <!-- * -->
+ <!-- \... ... -->
+ <!-- -->
+ <!-- * RIGHTFENCE -->
+
+ <cd:define name="string-rightfence">
+ <cd:keywords delimiters="none">
+ <cd:resolve name="value-rightfence"/>
+ </cd:keywords>
+ </cd:define>
+
</cd:interface> \ No newline at end of file
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-common-value.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-common-value.xml
index a6884185ff2..253a03ccf2c 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-common-value.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-common-value.xml
@@ -301,6 +301,17 @@
<cd:constant type="effective"/>
<cd:constant type="header"/>
<cd:constant type="footer"/>
+ <cd:constant type="tblr"/>
+ <cd:constant type="lrtb"/>
+ <cd:constant type="tbrl"/>
+ <cd:constant type="rltb"/>
+ <cd:constant type="fxtb"/>
+ <cd:constant type="btlr"/>
+ <cd:constant type="lrbt"/>
+ <cd:constant type="btrl"/>
+ <cd:constant type="rlbt"/>
+ <cd:constant type="fxbt"/>
+ <cd:constant type="fixd"/>
</cd:define>
<!-- sortorder = ... -->
@@ -770,4 +781,120 @@
<cd:constant type="cd:name"/>
</cd:define>
+ <cd:define name="value-leftfence">
+ <!--
+ <cd:constant type="||"/>
+ <cd:constant type="|||"/>
+ -->
+ <cd:constant type="\bgroup"/>
+ <cd:constant type="\egroup"/>
+ <cd:constant type="\letteropenbrace"/>
+ <cd:constant type="["/>
+ <cd:constant type="]"/>
+ <cd:constant type="("/>
+ <cd:constant type=")"/>
+ <cd:constant type="<"/>
+ <cd:constant type=">"/>
+ <cd:constant type="/"/>
+ <cd:constant type="|"/>
+ <cd:constant type="⌊"/>
+ <cd:constant type="⌋"/>
+ <cd:constant type="⌈"/>
+ <cd:constant type="⌉"/>
+ <cd:constant type="⟨"/>
+ <cd:constant type="⟩"/>
+ <cd:constant type="⟪"/>
+ <cd:constant type="⟫"/>
+ <cd:constant type="‖"/>
+ <cd:constant type="⦀"/>
+ <cd:constant type="⦗"/>
+ <cd:constant type="\lbrace"/>
+ <cd:constant type="\lbracket"/>
+ <cd:constant type="\lbrack"/>
+ <cd:constant type="\lparenthesis"/>
+ <cd:constant type="\lparent"/>
+ <cd:constant type="\lparen"/>
+ <cd:constant type="\langle"/>
+ <cd:constant type="\llangle"/>
+ <cd:constant type="\lVert"/>
+ <cd:constant type="\vert"/>
+ <cd:constant type="\solidus"/>
+ <cd:constant type="\lfloor"/>
+ <cd:constant type="\lceiling"/>
+ <cd:constant type="\lceil"/>
+ <cd:constant type="\ulcorner"/>
+ <cd:constant type="\llcorner"/>
+ <cd:constant type="\lmoustache"/>
+ <cd:constant type="\llbracket"/>
+ <cd:constant type="\lgroup"/>
+ <cd:constant type="\linterval"/>
+ <cd:constant type="\lointerval"/>
+ <cd:constant type="\llointerval"/>
+ <cd:constant type="\lrointerval"/>
+ <cd:constant type="\{"/>
+ <cd:constant type="\["/>
+ <cd:constant type="\("/>
+ <cd:constant type="\<"/>
+ <cd:constant type="\|"/>
+ <cd:constant type="cd:character"/>
+ </cd:define>
+
+ <cd:define name="value-rightfence">
+ <!--
+ <cd:constant type="||"/>
+ <cd:constant type="|||"/>
+ -->
+ <cd:constant type="\egroup"/>
+ <cd:constant type="\bgroup"/>
+ <cd:constant type="\letterclosebrace"/>
+ <cd:constant type="]"/>
+ <cd:constant type="["/>
+ <cd:constant type=")"/>
+ <cd:constant type="("/>
+ <cd:constant type=">"/>
+ <cd:constant type="<"/>
+ <cd:constant type="/"/>
+ <cd:constant type="|"/>
+ <cd:constant type="⌋"/>
+ <cd:constant type="⌊"/>
+ <cd:constant type="⌉"/>
+ <cd:constant type="⌈"/>
+ <cd:constant type="⟩"/>
+ <cd:constant type="⟨"/>
+ <cd:constant type="⟫"/>
+ <cd:constant type="⟪"/>
+ <cd:constant type="‖"/>
+ <cd:constant type="⦀"/>
+ <cd:constant type="⦘"/>
+ <cd:constant type="\rbrace"/>
+ <cd:constant type="\rbracket"/>
+ <cd:constant type="\rbracket"/>
+ <cd:constant type="\rparenthesis"/>
+ <cd:constant type="\rparent"/>
+ <cd:constant type="\rparen"/>
+ <cd:constant type="\rangle"/>
+ <cd:constant type="\rrangle"/>
+ <cd:constant type="\rVert"/>
+ <cd:constant type="\vert"/>
+ <cd:constant type="\solidus"/>
+ <cd:constant type="\rfloor"/>
+ <cd:constant type="\rceiling"/>
+ <cd:constant type="\rceil"/>
+ <cd:constant type="\urcorner"/>
+ <cd:constant type="\lrcorner"/>
+ <cd:constant type="\rmoustache"/>
+ <cd:constant type="\rrbracket"/>
+ <cd:constant type="\rgroup"/>
+ <cd:constant type="\rinterval"/>
+ <cd:constant type="\rointerval"/>
+ <cd:constant type="\rlointerval"/>
+ <cd:constant type="\rrointerval"/>
+ <cd:constant type="\}"/>
+ <cd:constant type="\]"/>
+ <cd:constant type="\)"/>
+ <cd:constant type="\>"/>
+ <cd:constant type="\|"/>
+ <cd:constant type="cd:character"/>
+ </cd:define>
+
</cd:interface>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf b/Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf
index c4450ad71c7..a877fa0eafc 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-context.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-context.xml
index 01adac436e1..53741ad5571 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-context.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-context.xml
@@ -53,7 +53,6 @@
<cd:interfacefile filename="i-clipping.xml"/>
<cd:interfacefile filename="i-collector.xml"/>
<cd:interfacefile filename="i-color.xml"/>
- <cd:interfacefile filename="i-columns.xml"/>
<cd:interfacefile filename="i-combination.xml"/>
<cd:interfacefile filename="i-commandhandler.xml"/>
<cd:interfacefile filename="i-comment.xml"/>
@@ -198,6 +197,7 @@
<cd:interfacefile filename="i-setups.xml"/>
<cd:interfacefile filename="i-shift.xml"/>
<cd:interfacefile filename="i-sidebar.xml"/>
+ <cd:interfacefile filename="i-simplecolumns.xml"/>
<cd:interfacefile filename="i-smash.xml"/>
<cd:interfacefile filename="i-sort.xml"/>
<cd:interfacefile filename="i-soundtrack.xml"/>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-conversion.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-conversion.xml
index a2e97536894..b97b638066a 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-conversion.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-conversion.xml
@@ -360,7 +360,7 @@
<cd:command name="date" level="document" category="counter language" file="core-con.mkiv">
<cd:arguments>
- <cd:assignments list="yes" optional="yes">
+ <cd:assignments list="yes">
<cd:parameter name="d">
<cd:constant type="cd:number"/>
</cd:parameter>
@@ -502,6 +502,7 @@
<cd:constant type="set␣2"/>
<cd:constant type="set␣3"/>
<cd:constant type="continued"/>
+ <cd:constant type="zero"/>
<cd:constant type="cd:name"/>
</cd:keywords>
<cd:resolve name="argument-number"/>
@@ -642,4 +643,14 @@
</cd:arguments>
</cd:command>
-</cd:interface> \ No newline at end of file
+ <cd:command name="zeronumberconversion" level="style" category="counter" file="core-con.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-number"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="actualyear" level="style" category="system" file="core-con.mkiv" />
+ <cd:command name="actualmonth" level="style" category="system" file="core-con.mkiv" />
+ <cd:command name="actualday" level="style" category="system" file="core-con.mkiv" />
+
+</cd:interface>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-direction.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-direction.xml
index 3b2d937a435..87e64e4572d 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-direction.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-direction.xml
@@ -52,22 +52,4 @@
<cd:command name="showdirsinmargin" level="document" category="alignment" file="supp-dir.mkiv"/>
- <cd:command name="istltdir" level="system" category="alignment" file="supp-dir.mkiv">
- <cd:arguments>
- <cd:keywords delimiters="none">
- <cd:constant type="TLT"/>
- <cd:constant type="TRT"/>
- </cd:keywords>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="istrtdir" level="system" category="alignment" file="supp-dir.mkiv">
- <cd:arguments>
- <cd:keywords delimiters="none">
- <cd:constant type="TLT"/>
- <cd:constant type="TRT"/>
- </cd:keywords>
- </cd:arguments>
- </cd:command>
-
</cd:interface> \ No newline at end of file
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-fittingpage.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-fittingpage.xml
index 7fc3a6cffcc..f5daafcf1b0 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-fittingpage.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-fittingpage.xml
@@ -4,6 +4,30 @@
<cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
+ <cd:define name="assignment-setupfittingpage">
+ <cd:assignments list="yes">
+ <cd:parameter name="pagestate">
+ <cd:constant type="start"/>
+ <cd:constant type="stop" default="yes"/>
+ </cd:parameter>
+ <cd:parameter name="command">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="margin">
+ <cd:constant type="page"/>
+ </cd:parameter>
+ <cd:parameter name="scale">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="paper">
+ <cd:constant type="auto"/>
+ <cd:constant type="default" default="yes"/>
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:inherit name="setupframed"/>
+ </cd:assignments>
+ </cd:define>
+
<cd:command name="definefittingpage" level="style" category="background layout" file="page-app.mkiv">
<cd:arguments>
<cd:resolve name="keyword-name"/>
@@ -17,27 +41,7 @@
<cd:command name="setupfittingpage" level="style" category="background layout" file="page-app.mkiv">
<cd:arguments>
<cd:resolve name="keyword-name-list-optional"/>
- <cd:assignments list="yes">
- <cd:parameter name="pagestate">
- <cd:constant type="start"/>
- <cd:constant type="stop" default="yes"/>
- </cd:parameter>
- <cd:parameter name="command">
- <cd:constant type="cd:oneargument"/>
- </cd:parameter>
- <cd:parameter name="margin">
- <cd:constant type="page"/>
- </cd:parameter>
- <cd:parameter name="scale">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:parameter name="paper">
- <cd:constant type="auto"/>
- <cd:constant type="default" default="yes"/>
- <cd:constant type="cd:name"/>
- </cd:parameter>
- <cd:inherit name="setupframed"/>
- </cd:assignments>
+ <cd:resolve name="assignment-setupfittingpage"/>
</cd:arguments>
</cd:command>
@@ -66,17 +70,17 @@
<!--
- <cd:command name="TEXpage" type="environment" level="document" category="background layout" file="page-app.mkiv">
+ <cd:command name="setupTEXpage" level="style" category="background layout" file="page-app.mkiv">
<cd:arguments>
- <cd:assignments list="yes" optional="yes">
+ <cd:assignments list="yes">
<cd:inherit name="setupfittingpage"/>
</cd:assignments>
</cd:arguments>
</cd:command>
- <cd:command name="MPpage" type="environment" level="document" category="background layout metapost" file="meta-fig.mkiv">
+ <cd:command name="setupMPpage" level="style" category="background layout metapost" file="meta-fig.mkiv">
<cd:arguments>
- <cd:assignments list="yes" optional="yes">
+ <cd:assignments list="yes">
<cd:inherit name="setupfittingpage"/>
</cd:assignments>
</cd:arguments>
@@ -86,17 +90,13 @@
<cd:command name="setupTEXpage" level="style" category="background layout" file="page-app.mkiv">
<cd:arguments>
- <cd:assignments list="yes">
- <cd:inherit name="setupfittingpage"/>
- </cd:assignments>
+ <cd:resolve name="assignment-setupfittingpage"/>
</cd:arguments>
</cd:command>
<cd:command name="setupMPpage" level="style" category="background layout metapost" file="meta-fig.mkiv">
<cd:arguments>
- <cd:assignments list="yes">
- <cd:inherit name="setupfittingpage"/>
- </cd:assignments>
+ <cd:resolve name="assignment-setupfittingpage"/>
</cd:arguments>
</cd:command>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml
index 77a0f00a1b6..7714e5ccc23 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-floats.xml
@@ -205,6 +205,13 @@
<cd:constant type="yes" default="yes"/>
<cd:constant type="no"/>
</cd:parameter>
+ <cd:parameter name="compress">
+ <cd:constant type="yes" default="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="compressdistance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
<!-- end root only -->
<cd:inherit name="setupframed"/>
</cd:assignments>
@@ -445,6 +452,9 @@
<cd:parameter name="headseparator">
<cd:constant type="cd:text"/>
</cd:parameter>
+ <cd:parameter name="headcommand">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
<cd:parameter name="inbetween">
<cd:constant type="cd:command"/>
</cd:parameter>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-graphics.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-graphics.xml
index a71291a2a60..924616474af 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-graphics.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-graphics.xml
@@ -159,7 +159,7 @@
<cd:constant type="frame"/>
<cd:constant type="empty"/>
</cd:parameter>
- <cd:parameter name="forgroundcolor">
+ <cd:parameter name="foregroundcolor">
<cd:constant type="cd:color"/>
</cd:parameter>
<cd:parameter name="reset">
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-interactionscreen.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-interactionscreen.xml
index 7ead396b843..2f2d550e99e 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-interactionscreen.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-interactionscreen.xml
@@ -48,6 +48,9 @@
<cd:constant type="attachment"/>
<cd:constant type="layer"/>
<cd:constant type="title"/>
+ <cd:constant type="lefttoright"/>
+ <cd:constant type="righttoleft"/>
+ <cd:constant type="nomenubar"/>
</cd:parameter>
<cd:parameter name="copies">
<cd:constant type="cd:number"/>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-itemgroup.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-itemgroup.xml
index 84cae20bbc0..a3271d12f72 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-itemgroup.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-itemgroup.xml
@@ -4,24 +4,242 @@
<cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
- <cd:command name="defineitemgroup" level="style" category="structure" file="strc-itm.mkvi">
- <cd:arguments>
- <cd:resolve name="keyword-name"/>
- <cd:resolve name="keyword-name-optional"/>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupitemgroup"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="setupitemgroup" level="style" category="structure counter" file="strc-itm.mkvi">
- <cd:arguments>
- <cd:resolve name="keyword-name"/>
- <cd:keywords list="yes" optional="yes">
- <cd:constant type="each"/>
+ <cd:define name="keyword-setupitemgroup">
+ <cd:keywords list="yes" optional="yes">
+ <cd:constant type="intro"/>
+ <cd:constant type="random"/>
+ <cd:constant type="continue"/>
+ <cd:constant type="packed"/>
+ <cd:constant type="autointro"/>
+ <cd:constant type="broad"/>
+ <cd:constant type="text"/>
+ <cd:constant type="before"/>
+ <cd:constant type="after"/>
+ <cd:constant type="nowhite"/>
+ <cd:constant type="margin"/>
+ <cd:constant type="inmargin"/>
+ <cd:constant type="atmargin"/>
+ <cd:constant type="intext"/>
+ <cd:constant type="headintext"/>
+ <cd:constant type="loose"/>
+ <cd:constant type="fit"/>
+ <cd:constant type="nofit"/>
+ <cd:constant type="paragraph"/>
+ <cd:constant type="joinedup"/>
+ <cd:constant type="serried"/>
+ <cd:constant type="stopper"/>
+ <cd:constant type="nostopper"/>
+ <cd:constant type="unpacked"/>
+ <cd:constant type="repeat"/>
+ <cd:constant type="norepeat"/>
+ <cd:constant type="reverse"/>
+ <cd:constant type="columns"/>
+ <cd:constant type="one"/>
+ <cd:constant type="two"/>
+ <cd:constant type="three"/>
+ <cd:constant type="four"/>
+ <cd:constant type="five"/>
+ <cd:constant type="six"/>
+ <cd:constant type="seven"/>
+ <cd:constant type="eight"/>
+ <cd:constant type="nine"/>
+ <cd:constant type="standard"/>
+ <cd:constant type="broad" prefix="cd:number" method="factor"/>
+ <cd:constant type="serried" prefix="cd:number" method="factor"/>
+ <cd:constant type="horizontal"/>
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
+ </cd:define>
+
+ <cd:define name="assignment-setupitemgroup">
+ <cd:assignments list="yes" optional="yes">
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="inbetween">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="beforehead">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="afterhead">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="lefttext">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="righttext">
+ <cd:constant type="cd:command"/>
+ </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="factor">
<cd:constant type="cd:number"/>
- </cd:keywords>
- <cd:keywords list="yes" optional="yes">
+ </cd:parameter>
+ <cd:parameter name="step">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="width">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="margin">
+ <cd:resolve name="value-leftskip"/>
+ </cd:parameter>
+ <cd:parameter name="leftmargin">
+ <cd:resolve name="value-leftskip"/>
+ </cd:parameter>
+ <cd:parameter name="rightmargin">
+ <cd:resolve name="value-rightskip"/>
+ </cd:parameter>
+ <cd:parameter name="leftmargindistance">
+ <cd:resolve name="value-leftskip"/>
+ </cd:parameter>
+ <cd:parameter name="rightmargindistance">
+ <cd:resolve name="value-rightskip"/>
+ </cd:parameter>
+ <cd:parameter name="align">
+ <cd:inherit name="setupalign"/>
+ </cd:parameter>
+ <cd:parameter name="indenting">
+ <cd:inherit name="setupindenting"/>
+ </cd:parameter>
+ <cd:parameter name="start">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="symalign">
+ <cd:constant type="left"/>
+ <cd:constant type="middle"/>
+ <cd:constant type="right"/>
+ <cd:constant type="flushleft"/>
+ <cd:constant type="center"/>
+ <cd:constant type="flushright"/>
+ </cd:parameter>
+ <cd:parameter name="symbol">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="indentnext">
+ <cd:resolve name="value-indentnext"/>
+ </cd:parameter>
+ <cd:parameter name="inner">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="command">
+ <cd:constant type="cd:csname"/>
+ </cd:parameter>
+ <cd:parameter name="items">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="maxwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="itemalign">
+ <cd:resolve name="value-alignsimple"/>
+ </cd:parameter>
+ <cd:parameter name="alignsymbol">
+ <cd:constant type="yes"/>
+ <cd:constant type="no" default="yes"/>
+ </cd:parameter>
+ <cd:parameter name="textdistance">
+ <cd:constant type="small"/>
+ <cd:constant type="medium"/>
+ <cd:constant type="big"/>
+ <cd:constant type="none"/>
+ <cd:constant type="space" default="yes"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="placestopper">
+ <cd:constant type="yes" default="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="style">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="headstyle">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="headcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="marstyle">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="marcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="symstyle">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="symcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="grid">
+ <cd:inherit name="definegridsnapping"/>
+ </cd:parameter>
+ <cd:parameter name="packcriterium">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:inherit name="setupcounter"/>
+ </cd:assignments>
+ </cd:define>
+
+ <cd:define name="mixed-setupitemgroup">
+ <cd:assignments list="yes">
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="inbetween">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="beforehead">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="afterhead">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="lefttext">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="righttext">
+ <cd:constant type="cd:command"/>
+ </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="factor">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="step">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="width">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="option">
<cd:constant type="intro"/>
<cd:constant type="random"/>
<cd:constant type="continue"/>
@@ -43,7 +261,6 @@
<cd:constant type="joinedup"/>
<cd:constant type="serried"/>
<cd:constant type="stopper"/>
- <cd:constant type="nostopper"/>
<cd:constant type="unpacked"/>
<cd:constant type="repeat"/>
<cd:constant type="norepeat"/>
@@ -63,328 +280,139 @@
<cd:constant type="serried" prefix="cd:number" method="factor"/>
<cd:constant type="horizontal"/>
<cd:constant type="cd:name"/>
- </cd:keywords>
+ </cd:parameter>
+ <cd:parameter name="margin">
+ <cd:resolve name="value-leftskip"/>
+ </cd:parameter>
+ <cd:parameter name="leftmargin">
+ <cd:resolve name="value-leftskip"/>
+ </cd:parameter>
+ <cd:parameter name="rightmargin">
+ <cd:resolve name="value-rightskip"/>
+ </cd:parameter>
+ <cd:parameter name="leftmargindistance">
+ <cd:resolve name="value-leftskip"/>
+ </cd:parameter>
+ <cd:parameter name="rightmargindistance">
+ <cd:resolve name="value-rightskip"/>
+ </cd:parameter>
+ <cd:parameter name="align">
+ <cd:inherit name="setupalign"/>
+ </cd:parameter>
+ <cd:parameter name="indenting">
+ <cd:inherit name="setupindenting"/>
+ </cd:parameter>
+ <cd:parameter name="start">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="symalign">
+ <cd:constant type="left"/>
+ <cd:constant type="middle"/>
+ <cd:constant type="right"/>
+ <cd:constant type="flushleft"/>
+ <cd:constant type="center"/>
+ <cd:constant type="flushright"/>
+ </cd:parameter>
+ <cd:parameter name="symbol">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="indentnext">
+ <cd:resolve name="value-indentnext"/>
+ </cd:parameter>
+ <cd:parameter name="inner">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="command">
+ <cd:constant type="cd:csname"/>
+ </cd:parameter>
+ <cd:parameter name="items">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="maxwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="itemalign">
+ <cd:resolve name="value-alignsimple"/>
+ </cd:parameter>
+ <cd:parameter name="alignsymbol">
+ <cd:constant type="yes"/>
+ <cd:constant type="no" default="yes"/>
+ </cd:parameter>
+ <cd:parameter name="textdistance">
+ <cd:constant type="small"/>
+ <cd:constant type="medium"/>
+ <cd:constant type="big"/>
+ <cd:constant type="none"/>
+ <cd:constant type="space" default="yes"/>
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="placestopper">
+ <cd:constant type="yes" default="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="style">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="headstyle">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="headcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="marstyle">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="marcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="symstyle">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="symcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="grid">
+ <cd:inherit name="definegridsnapping"/>
+ </cd:parameter>
+ <cd:inherit name="setupcounter"/>
+ </cd:assignments>
+ </cd:define>
+
+ <cd:command name="defineitemgroup" level="style" category="structure" file="strc-itm.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name"/>
+ <cd:resolve name="keyword-name-optional"/>
<cd:assignments list="yes" optional="yes">
- <cd:parameter name="before">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="after">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="inbetween">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="beforehead">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="afterhead">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="lefttext">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="righttext">
- <cd:constant type="cd:command"/>
- </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="factor">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:parameter name="step">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="width">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="distance">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="margin">
- <cd:resolve name="value-leftskip"/>
- </cd:parameter>
- <cd:parameter name="leftmargin">
- <cd:resolve name="value-leftskip"/>
- </cd:parameter>
- <cd:parameter name="rightmargin">
- <cd:resolve name="value-rightskip"/>
- </cd:parameter>
- <cd:parameter name="align">
- <cd:inherit name="setupalign"/>
- </cd:parameter>
- <cd:parameter name="indenting">
- <cd:inherit name="setupindenting"/>
- </cd:parameter>
- <cd:parameter name="start">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:parameter name="symalign">
- <cd:constant type="left"/>
- <cd:constant type="middle"/>
- <cd:constant type="right"/>
- <cd:constant type="flushleft"/>
- <cd:constant type="center"/>
- <cd:constant type="flushright"/>
- </cd:parameter>
- <cd:parameter name="symbol">
- <cd:constant type="cd:name"/>
- </cd:parameter>
- <cd:parameter name="n">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:parameter name="indentnext">
- <cd:resolve name="value-indentnext"/>
- </cd:parameter>
- <cd:parameter name="inner">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="command">
- <cd:constant type="cd:csname"/>
- </cd:parameter>
- <cd:parameter name="items">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:parameter name="maxwidth">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="itemalign">
- <cd:resolve name="value-alignsimple"/>
- </cd:parameter>
- <cd:parameter name="alignsymbol">
- <cd:constant type="yes"/>
- <cd:constant type="no" default="yes"/>
- </cd:parameter>
- <cd:parameter name="textdistance">
- <cd:constant type="small"/>
- <cd:constant type="medium"/>
- <cd:constant type="big"/>
- <cd:constant type="none"/>
- <cd:constant type="space" default="yes"/>
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="placestopper">
- <cd:constant type="yes" default="yes"/>
- <cd:constant type="no"/>
- </cd:parameter>
- <cd:parameter name="style">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="color">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="headstyle">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="headcolor">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="marstyle">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="marcolor">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="symstyle">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="symcolor">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="grid">
- <cd:inherit name="definegridsnapping"/>
- </cd:parameter>
- <cd:inherit name="setupcounter"/>
+ <cd:inherit name="setupitemgroup"/>
</cd:assignments>
</cd:arguments>
</cd:command>
+ <cd:command name="setupitemgroup" level="style" category="structure counter" file="strc-itm.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name"/>
+ <cd:keywords list="yes" optional="yes">
+ <cd:constant type="each"/>
+ <cd:constant type="cd:number"/>
+ </cd:keywords>
+ <cd:resolve name="keyword-setupitemgroup"/>
+ <cd:resolve name="assignment-setupitemgroup"/>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="setupitemgroup" variant="assignment" level="style" category="structure counter" file="strc-itm.mkvi">
<cd:arguments>
<cd:keywords list="yes" optional="yes">
<cd:constant type="cd:name"/>
<cd:constant type="cd:number" prefix="cd:name" method="range"/>
</cd:keywords>
- <cd:assignments list="yes">
- <cd:parameter name="before">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="after">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="inbetween">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="beforehead">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="afterhead">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="lefttext">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="righttext">
- <cd:constant type="cd:command"/>
- </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="factor">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:parameter name="step">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="width">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="distance">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="option">
- <cd:constant type="intro"/>
- <cd:constant type="random"/>
- <cd:constant type="continue"/>
- <cd:constant type="packed"/>
- <cd:constant type="autointro"/>
- <cd:constant type="broad"/>
- <cd:constant type="text"/>
- <cd:constant type="before"/>
- <cd:constant type="after"/>
- <cd:constant type="nowhite"/>
- <cd:constant type="margin"/>
- <cd:constant type="inmargin"/>
- <cd:constant type="atmargin"/>
- <cd:constant type="intext"/>
- <cd:constant type="loose"/>
- <cd:constant type="fit"/>
- <cd:constant type="nofit"/>
- <cd:constant type="paragraph"/>
- <cd:constant type="joinedup"/>
- <cd:constant type="serried"/>
- <cd:constant type="stopper"/>
- <cd:constant type="unpacked"/>
- <cd:constant type="repeat"/>
- <cd:constant type="norepeat"/>
- <cd:constant type="reverse"/>
- <cd:constant type="columns"/>
- <cd:constant type="one"/>
- <cd:constant type="two"/>
- <cd:constant type="three"/>
- <cd:constant type="four"/>
- <cd:constant type="five"/>
- <cd:constant type="six"/>
- <cd:constant type="seven"/>
- <cd:constant type="eight"/>
- <cd:constant type="nine"/>
- <cd:constant type="standard"/>
- <cd:constant type="broad" prefix="cd:number" method="factor"/>
- <cd:constant type="serried" prefix="cd:number" method="factor"/>
- <cd:constant type="horizontal"/>
- <cd:constant type="cd:name"/>
- </cd:parameter>
- <cd:parameter name="margin">
- <cd:resolve name="value-leftskip"/>
- </cd:parameter>
- <cd:parameter name="leftmargin">
- <cd:resolve name="value-leftskip"/>
- </cd:parameter>
- <cd:parameter name="rightmargin">
- <cd:resolve name="value-rightskip"/>
- </cd:parameter>
- <cd:parameter name="align">
- <cd:inherit name="setupalign"/>
- </cd:parameter>
- <cd:parameter name="indenting">
- <cd:inherit name="setupindenting"/>
- </cd:parameter>
- <cd:parameter name="start">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:parameter name="symalign">
- <cd:constant type="left"/>
- <cd:constant type="middle"/>
- <cd:constant type="right"/>
- <cd:constant type="flushleft"/>
- <cd:constant type="center"/>
- <cd:constant type="flushright"/>
- </cd:parameter>
- <cd:parameter name="symbol">
- <cd:constant type="cd:name"/>
- </cd:parameter>
- <cd:parameter name="n">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:parameter name="indentnext">
- <cd:resolve name="value-indentnext"/>
- </cd:parameter>
- <cd:parameter name="inner">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="command">
- <cd:constant type="cd:csname"/>
- </cd:parameter>
- <cd:parameter name="items">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:parameter name="maxwidth">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="itemalign">
- <cd:resolve name="value-alignsimple"/>
- </cd:parameter>
- <cd:parameter name="alignsymbol">
- <cd:constant type="yes"/>
- <cd:constant type="no" default="yes"/>
- </cd:parameter>
- <cd:parameter name="textdistance">
- <cd:constant type="small"/>
- <cd:constant type="medium"/>
- <cd:constant type="big"/>
- <cd:constant type="none"/>
- <cd:constant type="space" default="yes"/>
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="placestopper">
- <cd:constant type="yes" default="yes"/>
- <cd:constant type="no"/>
- </cd:parameter>
- <cd:parameter name="style">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="color">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="headstyle">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="headcolor">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="marstyle">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="marcolor">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="symstyle">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="symcolor">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="grid">
- <cd:inherit name="definegridsnapping"/>
- </cd:parameter>
- <cd:inherit name="setupcounter"/>
- </cd:assignments>
+ <cd:resolve name="mixed-setupitemgroup"/>
</cd:arguments>
</cd:command>
@@ -394,9 +422,7 @@
<cd:constant type="cd:name"/>
<cd:constant type="cd:number" prefix="cd:name" method="range"/>
</cd:keywords>
- <cd:assignments list="yes">
- <cd:inherit name="setupitemgroup"/>
- </cd:assignments>
+ <cd:resolve name="mixed-setupitemgroup"/>
</cd:arguments>
</cd:command>
@@ -410,12 +436,8 @@
<cd:constant type="each"/>
<cd:constant type="cd:number"/>
</cd:keywords>
- <cd:keywords list="yes" optional="yes">
- <cd:inherit name="setupitemgroup"/>
- </cd:keywords>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupitemgroup"/>
- </cd:assignments>
+ <cd:resolve name="keyword-setupitemgroup"/>
+ <cd:resolve name="assignment-setupitemgroup"/>
</cd:arguments>
<cd:instances>
<cd:resolve name="instance-itemgroup"/>
@@ -570,34 +592,4 @@
</cd:arguments>
</cd:command>
- <!--
-
- <cd:command name="itemize" type="environment" level="document" category="structure" file="strc-itm.mkvi">
- <cd:arguments>
- <cd:keywords list="yes" optional="yes">
- <cd:inherit name="setupitemgroup"/>
- </cd:keywords>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupitemgroup"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="setupitemize" level="style" category="structure" file="strc-itm.mkvi">
- <cd:arguments>
- <cd:keywords list="yes" optional="yes">
- <cd:constant type="each"/>
- <cd:constant type="cd:number"/>
- </cd:keywords>
- <cd:keywords list="yes" optional="yes">
- <cd:inherit name="setupitemgroup"/>
- </cd:keywords>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupitemgroup"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- -->
-
</cd:interface>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-layout.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-layout.xml
index 4370cc4f558..0d256e967db 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-layout.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-layout.xml
@@ -208,6 +208,10 @@
<cd:parameter name="artoffset">
<cd:constant type="cd:dimension"/>
</cd:parameter>
+ <cd:parameter name="direction">
+ <cd:constant type="normal" default="yes"/>
+ <cd:constant type="reverse"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -382,4 +386,4 @@
</cd:arguments>
</cd:command>
-</cd:interface> \ No newline at end of file
+</cd:interface>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-logo.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-logo.xml
index 8f8186a83e4..3208555e079 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-logo.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-logo.xml
@@ -5,101 +5,77 @@
<cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
<cd:command name="TeX" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="ConTeXt" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="PPCHTeX" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="PRAGMA" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="LaTeX" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="TaBlE" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="PiCTeX" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="AmSTeX" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="LamSTeX" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="TEX" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="Context" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="ConTeXt" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="CONTEXT" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="MetaFont" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="METAFONT" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="MetaPost" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="METAPOST" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="MetaFun" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="eTeX" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="pdfTeX" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="pdfeTeX" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="Lua" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="luaTeX" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="luajitTeX" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="metaTeX" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="XeTeX" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="LuaTeX" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="LuajitTeX" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="METAFUN" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="MKII" level="document" category="symbols" file="cont-log.mkiv"/>
-
<cd:command name="MKIV" level="document" category="symbols" file="cont-log.mkiv"/>
-
<cd:command name="MKVI" level="document" category="symbols" file="cont-log.mkiv"/>
-
<cd:command name="MKIX" level="document" category="symbols" file="cont-log.mkiv"/>
-
<cd:command name="MKXI" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="MPII" level="document" category="symbols" file="cont-log.mkiv"/>
-
<cd:command name="MPIV" level="document" category="symbols" file="cont-log.mkiv"/>
-
<cd:command name="MPVI" level="document" category="symbols" file="cont-log.mkiv"/>
- <cd:command name="METAFONT" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="METAPOST" level="document" category="symbols" file="cont-log.mkiv"/>
-
+ <cd:command name="PPCHTeX" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="PPCHTEX" level="document" category="symbols" file="cont-log.mkiv"/>
- <cd:command name="CONTEXT" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="METAFUN" level="document" category="symbols" file="cont-log.mkiv"/>
-
- <cd:command name="TEX" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="PRAGMA" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="LaTeX" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="LATEX" level="document" category="symbols" file="cont-log.mkiv"/>
- <cd:command name="PICTEX" level="document" category="symbols" file="cont-log.mkiv"/>
-
+ <cd:command name="TaBlE" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="TABLE" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="PiCTeX" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="PICTEX" level="document" category="symbols" file="cont-log.mkiv"/>
+
+ <cd:command name="AmSTeX" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="AMSTEX" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="LamSTeX" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="LAMSTEX" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="INRSTEX" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="eTeX" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="ETEX" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="pdfTeX" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="PDFTEX" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="pdfeTeX" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="PDFETEX" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="Lua" level="document" category="symbols" file="cont-log.mkiv"/>
+
+ <cd:command name="luaTeX" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="LuaTeX" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="LUATEX" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="luajitTeX" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="LuajitTeX" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="LUAJITTEX" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="luametaTeX" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="LuaMetaTeX" level="document" category="symbols" file="cont-log.mkiv"/>
+ <cd:command name="LUAMETATEX" level="document" category="symbols" file="cont-log.mkiv"/>
+
+ <cd:command name="XeTeX" level="document" category="symbols" file="cont-log.mkiv"/>
<cd:command name="XETEX" level="document" category="symbols" file="cont-log.mkiv"/>
-</cd:interface> \ No newline at end of file
+</cd:interface>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-math.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-math.xml
index ae8fa1c3e4c..888d2bac509 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-math.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-math.xml
@@ -139,6 +139,15 @@
</cd:arguments>
</cd:command>
+ <cd:command name="mathematics" variant="assignment" level="document" category="mathematics" file="math-ini.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmathematics"/>
+ </cd:assignments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="math" level="document" category="mathematics" file="math-ini.mkiv">
<cd:arguments>
<cd:resolve name="keyword-name-optional"/>
@@ -146,6 +155,15 @@
</cd:arguments>
</cd:command>
+ <cd:command name="math" variant="assignment" level="document" category="mathematics" file="math-ini.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmathematics"/>
+ </cd:assignments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="m" level="document" category="mathematics" file="math-ini.mkiv">
<cd:arguments>
<cd:resolve name="keyword-name-optional"/>
@@ -153,6 +171,15 @@
</cd:arguments>
</cd:command>
+ <cd:command name="m" variant="assignment" level="document" category="mathematics" file="math-ini.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmathematics"/>
+ </cd:assignments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="definemathcommand" level="style" category="mathematics" file="math-ini.mkiv">
<cd:arguments>
<cd:resolve name="keyword-name"/>
@@ -310,6 +337,31 @@
</cd:arguments>
</cd:command>
+ <!--
+
+ <cd:command name="text" level="document" category="mathematics" file="math-ini.mkiv">
+ <cd:arguments>
+ <cd:resolve name="string-boxoptions"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="t" level="document" category="mathematics" file="math-ini.mkiv">
+ <cd:arguments>
+ <cd:resolve name="string-boxoptions"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="w" level="document" category="mathematics" file="math-ini.mkiv">
+ <cd:arguments>
+ <cd:resolve name="string-boxoptions"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ -->
+
<cd:command name="mathtexttf" level="document" category="mathematics" file="math-ini.mkiv">
<cd:arguments>
<cd:resolve name="string-boxoptions"/>
@@ -511,4 +563,8 @@
</cd:arguments>
</cd:command>
+ <cd:command name="stackscripts" level="document" category="mathematics" file="math-ini.mkiv"/>
+
+ <cd:command name="unstackscripts" level="document" category="mathematics" file="math-ini.mkiv"/>
+
</cd:interface> \ No newline at end of file
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-mathfence.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-mathfence.xml
index 5e1abec2b64..a214c3bfd30 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-mathfence.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-mathfence.xml
@@ -69,7 +69,48 @@
<cd:command name="fenced" level="document" category="mathematics" file="math-fen.mkiv">
<cd:arguments>
- <cd:resolve name="keyword-name"/>
+ <cd:keywords>
+ <cd:constant type="parenthesis"/>
+ <cd:constant type="bracket"/>
+ <cd:constant type="brace"/>
+ <cd:constant type="bar"/>
+ <cd:constant type="doublebar"/>
+ <cd:constant type="triplebar"/>
+ <cd:constant type="angle"/>
+ <cd:constant type="doubleangle"/>
+ <cd:constant type="solidus"/>
+ <cd:constant type="ceiling"/>
+ <cd:constant type="floor"/>
+ <cd:constant type="moustache"/>
+ <cd:constant type="uppercorner"/>
+ <cd:constant type="lowercorner"/>
+ <cd:constant type="group"/>
+ <cd:constant type="openbracket"/>
+ <!--
+ <cd:constant type="nothing"/>
+ <cd:constant type="mirrored"/>
+ -->
+ <cd:constant type="mirroredparenthesis"/>
+ <cd:constant type="mirroredbracket"/>
+ <cd:constant type="mirroredbrace"/>
+ <cd:constant type="mirroredbar"/>
+ <cd:constant type="mirroreddoublebar"/>
+ <cd:constant type="mirroredtriplebar"/>
+ <cd:constant type="mirroredangle"/>
+ <cd:constant type="mirroreddoubleangle"/>
+ <cd:constant type="mirroredsolidus"/>
+ <cd:constant type="mirroredceiling"/>
+ <cd:constant type="mirroredfloor"/>
+ <cd:constant type="mirroredmoustache"/>
+ <cd:constant type="mirroreduppercorner"/>
+ <cd:constant type="mirroredlowercorner"/>
+ <cd:constant type="mirroredgroup"/>
+ <cd:constant type="mirroredopenbracket"/>
+ <!--
+ <cd:constant type="mirrorednothing"/>
+ -->
+ <cd:constant type="cd:name"/>
+ </cd:keywords>
<cd:content/>
</cd:arguments>
</cd:command>
@@ -78,7 +119,7 @@
<cd:command name="left" level="document" category="mathematics" file="math-fen.mkiv">
<cd:arguments>
- <cd:resolve name="string-character"/>
+ <cd:resolve name="string-leftfence"/>
</cd:arguments>
</cd:command>
@@ -90,7 +131,7 @@
<cd:command name="right" level="document" category="mathematics" file="math-fen.mkiv">
<cd:arguments>
- <cd:resolve name="string-character"/>
+ <cd:resolve name="string-rightfence"/>
</cd:arguments>
</cd:command>
@@ -192,7 +233,7 @@
<cd:command name="lfence" level="document" category="mathematics" file="math-fen.mkiv">
<cd:arguments>
- <cd:resolve name="argument-character"/>
+ <cd:resolve name="argument-leftfence"/>
</cd:arguments>
</cd:command>
@@ -204,7 +245,7 @@
<cd:command name="rfence" level="document" category="mathematics" file="math-fen.mkiv">
<cd:arguments>
- <cd:resolve name="argument-character"/>
+ <cd:resolve name="argument-rightfence"/>
</cd:arguments>
</cd:command>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-mixedcolumns.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-mixedcolumns.xml
index 4e1ab96258e..701375237ed 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-mixedcolumns.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-mixedcolumns.xml
@@ -131,4 +131,12 @@
-->
-</cd:interface> \ No newline at end of file
+ <cd:command name="setupcolumns" level="style" category="structure layout" file="page-smp.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes">
+ <cd:inherit name="setupmixedcolumns"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+</cd:interface>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-note.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-note.xml
index 03e53a0e3f5..ee1ac5a3181 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-note.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-note.xml
@@ -413,6 +413,14 @@
</cd:arguments>
</cd:command>
+ <cd:command name="setupfootnotes" level="style" category="structure notes" file="strc-not.mkvi">
+ <cd:arguments>
+ <cd:assignments list="yes">
+ <cd:inherit name="setupnote"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="setnote" level="document" category="structure notes" file="strc-not.mkvi">
<cd:arguments>
<cd:resolve name="keyword-name"/>
@@ -708,4 +716,47 @@
-->
+ <cd:command name="definetextnote" level="style" category="structure notes" file="strc-tnt.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name"/>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuptextnote"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setuptextnote" level="style" category="structure notes" file="strc-tnt.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:assignments list="yes">
+ <cd:parameter name="rule">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="note">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="*"/>
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="empty">
+ <cd:constant type="yes"/>
+ <cd:constant type="no" default="yes"/>
+ <cd:constant type="none"/>
+ <cd:constant type="number"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="textnote" generated="yes" level="document" category="structure notes" file="strc-tnt.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuptextnote"/>
+ </cd:assignments>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
</cd:interface> \ No newline at end of file
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pagegrid.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pagegrid.xml
index f25e72f7255..8b2cd86b900 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-pagegrid.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pagegrid.xml
@@ -277,7 +277,29 @@
<cd:arguments>
<cd:resolve name="keyword-name"/>
<cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupcolumnsetspan"/>
+ <cd:parameter name="c">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="r">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="method">
+ <cd:constant type="tblr"/>
+ <cd:constant type="lrtb"/>
+ <cd:constant type="tbrl"/>
+ <cd:constant type="rltb"/>
+ <cd:constant type="fxtb"/>
+ <cd:constant type="btlr"/>
+ <cd:constant type="lrbt"/>
+ <cd:constant type="btrl"/>
+ <cd:constant type="rlbt"/>
+ <cd:constant type="fxbt"/>
+ <cd:constant type="fixd"/>
+ </cd:parameter>
+ <cd:parameter name="option">
+ <cd:constant type="none" default="yes"/>
+ <cd:constant type="wide"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-pagenumber.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-pagenumber.xml
index 4c262db4be6..91c0d8f5948 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-pagenumber.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-pagenumber.xml
@@ -4,6 +4,22 @@
<cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
+ <cd:define name="assignment-setupuserpagenumber">
+ <cd:assignments list="yes">
+ <cd:parameter name="viewerprefix">
+ <cd:constant type="cd:text"/>
+ </cd:parameter>
+ <cd:parameter name="state">
+ <cd:constant type="start"/>
+ <cd:constant type="stop"/>
+ <cd:constant type="none"/>
+ <cd:constant type="keep"/>
+ <cd:constant type="empty"/>
+ </cd:parameter>
+ <cd:inherit name="setupcounter"/>
+ </cd:assignments>
+ </cd:define>
+
<cd:command name="setuprealpagenumber" level="system" category="counter" file="strc-pag.mkiv">
<cd:arguments>
<cd:assignments list="yes">
@@ -14,19 +30,7 @@
<cd:command name="setupuserpagenumber" level="style" category="counter" file="strc-pag.mkiv">
<cd:arguments>
- <cd:assignments list="yes">
- <cd:parameter name="viewerprefix">
- <cd:constant type="cd:text"/>
- </cd:parameter>
- <cd:parameter name="state">
- <cd:constant type="start"/>
- <cd:constant type="stop"/>
- <cd:constant type="none"/>
- <cd:constant type="keep"/>
- <cd:constant type="empty"/>
- </cd:parameter>
- <cd:inherit name="setupcounter"/>
- </cd:assignments>
+ <cd:resolve name="assignment-setupuserpagenumber"/>
</cd:arguments>
</cd:command>
@@ -40,9 +44,7 @@
<cd:command name="setuppagenumber" level="style" category="counter" file="strc-pag.mkiv">
<cd:arguments>
- <cd:assignments list="yes">
- <cd:inherit name="setupuserpagenumber"/>
- </cd:assignments>
+ <cd:resolve name="assignment-setupuserpagenumber"/>
</cd:arguments>
</cd:command>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-paragraphs.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-paragraphs.xml
index 0d8ae3d2e95..e2fc9116e76 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-paragraphs.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-paragraphs.xml
@@ -79,6 +79,7 @@
<cd:command name="setupparagraphs" variant="assignment" level="style" category="tables" file="tabl-mis.mkiv">
<cd:arguments>
<cd:keywords optional="yes">
+ <cd:constant type="cd:name"/>
<cd:constant type="cd:number" prefix="cd:name" method="range"/>
</cd:keywords>
<cd:assignments list="yes">
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf b/Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf
index 8bc3240c452..9d01bdf5ef9 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-register.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-register.xml
index 7ba3a0f7c8e..e8d7ab07dfb 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-register.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-register.xml
@@ -4,6 +4,182 @@
<cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
+ <cd:define name="assignment-setupregister">
+ <cd:assignments list="yes">
+ <cd:parameter name="referencemethod">
+ <cd:constant type="forward"/>
+ </cd:parameter>
+ <cd:parameter name="expansion">
+ <cd:constant type="yes"/>
+ <cd:constant type="no" default="yes"/>
+ <cd:constant type="xml"/>
+ </cd:parameter>
+ <cd:parameter name="ownnumber">
+ <cd:constant type="yes"/>
+ <cd:constant type="no" default="yes"/>
+ </cd:parameter>
+ <cd:parameter name="xmlsetup">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="alternative">
+ <cd:constant type="a"/>
+ <cd:constant type="b"/>
+ <cd:constant type="A"/>
+ <cd:constant type="B"/>
+ </cd:parameter>
+ <cd:parameter name="method">
+ <cd:resolve name="value-sortmethod"/>
+ </cd:parameter>
+ <cd:parameter name="compress">
+ <cd:constant type="yes"/>
+ <cd:constant type="no" default="yes"/>
+ <cd:constant type="all"/>
+ <cd:constant type="packed"/>
+ <cd:constant type="text"/>
+ </cd:parameter>
+ <cd:parameter name="check">
+ <cd:constant type="yes" default="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="criterium">
+ <cd:constant type="local"/>
+ <cd:constant type="text"/>
+ <cd:constant type="current"/>
+ <cd:constant type="previous"/>
+ <cd:constant type="all" default="yes"/>
+ <cd:constant type="cd:section"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixseparatorset">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixconversionset">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixstarter">
+ <cd:resolve name="value-starter"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixstopper">
+ <cd:resolve name="value-stopper"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixset">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixsegments">
+ <cd:resolve name="value-prefixsegments"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefixconnector">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageprefix">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="pageseparatorset">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="pageconversionset">
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="pagestarter">
+ <cd:resolve name="value-starter"/>
+ </cd:parameter>
+ <cd:parameter name="pagestopper">
+ <cd:resolve name="value-stopper"/>
+ </cd:parameter>
+ <cd:parameter name="pagesegments">
+ <cd:resolve name="value-numbersegments"/>
+ </cd:parameter>
+ <cd:parameter name="maxwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="indicator">
+ <cd:constant type="yes" default="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="command">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="textcommand">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="deeptextcommand">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="pagecommand">
+ <cd:constant type="cd:oneargument"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="interaction">
+ <cd:constant type="text"/>
+ <cd:constant type="pagenumber" default="yes"/>
+ </cd:parameter>
+ <cd:parameter name="pagenumber">
+ <cd:constant type="yes" default="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="symbol">
+ <cd:constant type="a"/>
+ <cd:constant type="n" default="yes"/>
+ <cd:constant type="none"/>
+ <cd:constant type="1"/>
+ <cd:constant type="2"/>
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="language">
+ <cd:resolve name="value-sortorder"/>
+ </cd:parameter>
+ <cd:parameter name="style">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="textstyle">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="textcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="pagestyle">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="pagecolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="pageleft">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="pageright">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="balance">
+ <cd:constant type="yes" default="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="align">
+ <cd:inherit name="setupalign"/>
+ </cd:parameter>
+ <cd:parameter name="numberorder">
+ <cd:constant type="numbers" default="yes"/>
+ </cd:parameter>
+ <cd:parameter name="pagemethod">
+ <cd:constant type="page" default="yes"/>
+ <cd:constant type="section"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:define>
+
<cd:command name="defineregister" level="style" category="structure" file="strc-reg.mkiv">
<cd:arguments>
<cd:resolve name="keyword-name"/>
@@ -18,174 +194,7 @@
<cd:arguments>
<cd:resolve name="keyword-name-list-optional"/>
<cd:resolve name="keyword-number-list-optional"/>
- <cd:assignments list="yes">
- <cd:parameter name="referencemethod">
- <cd:constant type="forward"/>
- </cd:parameter>
- <cd:parameter name="expansion">
- <cd:constant type="yes"/>
- <cd:constant type="no" default="yes"/>
- <cd:constant type="xml"/>
- </cd:parameter>
- <cd:parameter name="ownnumber">
- <cd:constant type="yes"/>
- <cd:constant type="no" default="yes"/>
- </cd:parameter>
- <cd:parameter name="xmlsetup">
- <cd:constant type="cd:name"/>
- </cd:parameter>
- <cd:parameter name="alternative">
- <cd:constant type="a"/>
- <cd:constant type="b"/>
- <cd:constant type="A"/>
- <cd:constant type="B"/>
- </cd:parameter>
- <cd:parameter name="method">
- <cd:resolve name="value-sortmethod"/>
- </cd:parameter>
- <cd:parameter name="compress">
- <cd:constant type="yes"/>
- <cd:constant type="no" default="yes"/>
- <cd:constant type="all"/>
- <cd:constant type="packed"/>
- </cd:parameter>
- <cd:parameter name="check">
- <cd:constant type="yes" default="yes"/>
- <cd:constant type="no"/>
- </cd:parameter>
- <cd:parameter name="criterium">
- <cd:constant type="local"/>
- <cd:constant type="text"/>
- <cd:constant type="current"/>
- <cd:constant type="previous"/>
- <cd:constant type="all" default="yes"/>
- <cd:constant type="cd:section"/>
- </cd:parameter>
- <cd:parameter name="pageprefixseparatorset">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="pageprefixconversionset">
- <cd:constant type="cd:name"/>
- </cd:parameter>
- <cd:parameter name="pageprefixstarter">
- <cd:resolve name="value-starter"/>
- </cd:parameter>
- <cd:parameter name="pageprefixstopper">
- <cd:resolve name="value-stopper"/>
- </cd:parameter>
- <cd:parameter name="pageprefixset">
- <cd:constant type="cd:name"/>
- </cd:parameter>
- <cd:parameter name="pageprefixsegments">
- <cd:resolve name="value-prefixsegments"/>
- </cd:parameter>
- <cd:parameter name="pageprefixconnector">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="pageprefix">
- <cd:constant type="yes"/>
- <cd:constant type="no"/>
- </cd:parameter>
- <cd:parameter name="pageseparatorset">
- <cd:constant type="cd:name"/>
- </cd:parameter>
- <cd:parameter name="pageconversionset">
- <cd:constant type="cd:name"/>
- </cd:parameter>
- <cd:parameter name="pagestarter">
- <cd:resolve name="value-starter"/>
- </cd:parameter>
- <cd:parameter name="pagestopper">
- <cd:resolve name="value-stopper"/>
- </cd:parameter>
- <cd:parameter name="pagesegments">
- <cd:resolve name="value-numbersegments"/>
- </cd:parameter>
- <cd:parameter name="maxwidth">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="indicator">
- <cd:constant type="yes" default="yes"/>
- <cd:constant type="no"/>
- </cd:parameter>
- <cd:parameter name="before">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="after">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="command">
- <cd:constant type="cd:oneargument"/>
- </cd:parameter>
- <cd:parameter name="textcommand">
- <cd:constant type="cd:oneargument"/>
- </cd:parameter>
- <cd:parameter name="deeptextcommand">
- <cd:constant type="cd:oneargument"/>
- </cd:parameter>
- <cd:parameter name="pagecommand">
- <cd:constant type="cd:oneargument"/>
- </cd:parameter>
- <cd:parameter name="distance">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="interaction">
- <cd:constant type="text"/>
- <cd:constant type="pagenumber" default="yes"/>
- </cd:parameter>
- <cd:parameter name="pagenumber">
- <cd:constant type="yes" default="yes"/>
- <cd:constant type="no"/>
- </cd:parameter>
- <cd:parameter name="symbol">
- <cd:constant type="a"/>
- <cd:constant type="n" default="yes"/>
- <cd:constant type="none"/>
- <cd:constant type="1"/>
- <cd:constant type="2"/>
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="language">
- <cd:resolve name="value-sortorder"/>
- </cd:parameter>
- <cd:parameter name="style">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="color">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="textstyle">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="textcolor">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="pagestyle">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="pagecolor">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="pageleft">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="pageright">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="n">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:parameter name="balance">
- <cd:constant type="yes" default="yes"/>
- <cd:constant type="no"/>
- </cd:parameter>
- <cd:parameter name="align">
- <cd:inherit name="setupalign"/>
- </cd:parameter>
- <cd:parameter name="numberorder">
- <cd:constant type="numbers" default="yes"/>
- </cd:parameter>
- </cd:assignments>
+ <cd:resolve name="assignment-setupregister"/>
</cd:arguments>
</cd:command>
@@ -195,173 +204,7 @@
<cd:constant type="cd:name"/>
<cd:constant type="cd:number" prefix="cd:name" method="range"/>
</cd:keywords>
- <cd:assignments list="yes">
- <cd:parameter name="referencemethod">
- <cd:constant type="forward"/>
- </cd:parameter>
- <cd:parameter name="expansion">
- <cd:constant type="yes"/>
- <cd:constant type="no" default="yes"/>
- <cd:constant type="xml"/>
- </cd:parameter>
- <cd:parameter name="ownnumber">
- <cd:constant type="yes"/>
- <cd:constant type="no" default="yes"/>
- </cd:parameter>
- <cd:parameter name="xmlsetup">
- <cd:constant type="cd:name"/>
- </cd:parameter>
- <cd:parameter name="alternative">
- <cd:constant type="a"/>
- <cd:constant type="b"/>
- <cd:constant type="A"/>
- <cd:constant type="B"/>
- </cd:parameter>
- <cd:parameter name="method">
- <cd:resolve name="value-sortmethod"/>
- </cd:parameter>
- <cd:parameter name="compress">
- <cd:constant type="yes"/>
- <cd:constant type="no" default="yes"/>
- <cd:constant type="all"/>
- </cd:parameter>
- <cd:parameter name="check">
- <cd:constant type="yes" default="yes"/>
- <cd:constant type="no"/>
- </cd:parameter>
- <cd:parameter name="criterium">
- <cd:constant type="local"/>
- <cd:constant type="text"/>
- <cd:constant type="current"/>
- <cd:constant type="previous"/>
- <cd:constant type="all" default="yes"/>
- <cd:constant type="cd:section"/>
- </cd:parameter>
- <cd:parameter name="pageprefixseparatorset">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="pageprefixconversionset">
- <cd:constant type="cd:name"/>
- </cd:parameter>
- <cd:parameter name="pageprefixstarter">
- <cd:resolve name="value-starter"/>
- </cd:parameter>
- <cd:parameter name="pageprefixstopper">
- <cd:resolve name="value-stopper"/>
- </cd:parameter>
- <cd:parameter name="pageprefixset">
- <cd:constant type="cd:name"/>
- </cd:parameter>
- <cd:parameter name="pageprefixsegments">
- <cd:resolve name="value-prefixsegments"/>
- </cd:parameter>
- <cd:parameter name="pageprefixconnector">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="pageprefix">
- <cd:constant type="yes"/>
- <cd:constant type="no"/>
- </cd:parameter>
- <cd:parameter name="pageseparatorset">
- <cd:constant type="cd:name"/>
- </cd:parameter>
- <cd:parameter name="pageconversionset">
- <cd:constant type="cd:name"/>
- </cd:parameter>
- <cd:parameter name="pagestarter">
- <cd:resolve name="value-starter"/>
- </cd:parameter>
- <cd:parameter name="pagestopper">
- <cd:resolve name="value-stopper"/>
- </cd:parameter>
- <cd:parameter name="pagesegments">
- <cd:resolve name="value-numbersegments"/>
- </cd:parameter>
- <cd:parameter name="maxwidth">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="indicator">
- <cd:constant type="yes" default="yes"/>
- <cd:constant type="no"/>
- </cd:parameter>
- <cd:parameter name="before">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="after">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="command">
- <cd:constant type="cd:oneargument"/>
- </cd:parameter>
- <cd:parameter name="textcommand">
- <cd:constant type="cd:oneargument"/>
- </cd:parameter>
- <cd:parameter name="deeptextcommand">
- <cd:constant type="cd:oneargument"/>
- </cd:parameter>
- <cd:parameter name="pagecommand">
- <cd:constant type="cd:oneargument"/>
- </cd:parameter>
- <cd:parameter name="distance">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="interaction">
- <cd:constant type="text"/>
- <cd:constant type="pagenumber" default="yes"/>
- </cd:parameter>
- <cd:parameter name="pagenumber">
- <cd:constant type="yes" default="yes"/>
- <cd:constant type="no"/>
- </cd:parameter>
- <cd:parameter name="symbol">
- <cd:constant type="a"/>
- <cd:constant type="n" default="yes"/>
- <cd:constant type="none"/>
- <cd:constant type="1"/>
- <cd:constant type="2"/>
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="language">
- <cd:resolve name="value-sortorder"/>
- </cd:parameter>
- <cd:parameter name="style">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="color">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="textstyle">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="textcolor">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="pagestyle">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="pagecolor">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="pageleft">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="pageright">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="n">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:parameter name="balance">
- <cd:constant type="yes" default="yes"/>
- <cd:constant type="no"/>
- </cd:parameter>
- <cd:parameter name="align">
- <cd:inherit name="setupalign"/>
- </cd:parameter>
- <cd:parameter name="numberorder">
- <cd:constant type="numbers" default="yes"/>
- </cd:parameter>
- </cd:assignments>
+ <cd:resolve name="assignment-setupregister"/>
</cd:arguments>
</cd:command>
@@ -369,9 +212,7 @@
<cd:arguments>
<cd:resolve name="keyword-name-list-optional"/>
<cd:resolve name="keyword-number-list-optional"/>
- <cd:assignments list="yes">
- <cd:inherit name="setupregister"/>
- </cd:assignments>
+ <cd:resolve name="assignment-setupregister"/>
</cd:arguments>
</cd:command>
@@ -381,9 +222,7 @@
<cd:constant type="cd:name"/>
<cd:constant type="cd:number" prefix="cd:name" method="range"/>
</cd:keywords>
- <cd:assignments list="yes">
- <cd:inherit name="setupregister"/>
- </cd:assignments>
+ <cd:resolve name="assignment-setupregister"/>
</cd:arguments>
</cd:command>
@@ -478,9 +317,7 @@
</cd:sequence>
<cd:arguments>
<cd:resolve name="keyword-number-list-optional"/>
- <cd:assignments list="yes">
- <cd:inherit name="setupregister"/>
- </cd:assignments>
+ <cd:resolve name="assignment-setupregister"/>
</cd:arguments>
<cd:instances>
<cd:resolve name="instance-register"/>
@@ -489,63 +326,25 @@
<!--
- <cd:command name="index" level="document" category="structure" file="strc-reg.mkiv">
+ <cd:command name="startregister" level="document" category="structure" file="strc-reg.mkiv">
<cd:arguments>
+ <cd:resolve name="keyword-name"/>
+ <cd:resolve name="keyword-name"/>
<cd:keywords optional="yes">
<cd:constant type="cd:text"/>
- <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
</cd:keywords>
- <cd:index list="yes"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="index" variant="ownnumber" level="document" category="structure" file="strc-reg.mkiv">
- <cd:arguments>
<cd:keywords optional="yes">
<cd:constant type="cd:text"/>
<cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
</cd:keywords>
- <cd:resolve name="argument-text"/>
<cd:index list="yes"/>
</cd:arguments>
</cd:command>
- <cd:command name="seeindex" level="document" category="structure" file="strc-reg.mkiv">
- <cd:arguments>
- <cd:keywords optional="yes">
- <cd:constant type="cd:text"/>
- <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
- </cd:keywords>
- <cd:index list="yes"/>
- <cd:keywords delimiters="braces">
- <cd:constant type="cd:text"/>
- <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
- </cd:keywords>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="placeindex" level="document" category="structure" file="strc-reg.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupregister"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="completeindex" level="document" category="structure" file="strc-reg.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupregister"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="setupindex" level="style" category="structure" file="strc-reg.mkiv">
+ <cd:command name="stopregister" level="document" category="structure" file="strc-reg.mkiv">
<cd:arguments>
- <cd:resolve name="keyword-number-list-optional"/>
- <cd:assignments list="yes">
- <cd:inherit name="setupregister"/>
- </cd:assignments>
+ <cd:resolve name="keyword-name"/>
+ <cd:resolve name="keyword-name"/>
</cd:arguments>
</cd:command>
@@ -563,11 +362,8 @@
<cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
</cd:keywords>
<cd:index list="yes"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="stopregister" level="document" category="structure" file="strc-reg.mkiv">
- <cd:arguments>
+ <cd:resolve name="string-content"/>
+ <cd:delimiter name="stopregister"/>
<cd:resolve name="keyword-name"/>
<cd:resolve name="keyword-name"/>
</cd:arguments>
@@ -612,17 +408,34 @@
</cd:arguments>
</cd:command>
+ <!--
+
+ <cd:command name="startstructurepageregister" level="document" category="structure" file="strc-reg.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name"/>
+ <cd:resolve name="keyword-name"/>
+ <cd:resolve name="assignment-registerdata-list"/>
+ <cd:resolve name="assignment-userdata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="stopstructurepageregister" level="document" category="structure" file="strc-reg.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name"/>
+ <cd:resolve name="keyword-name"/>
+ </cd:arguments>
+ </cd:command>
+
+ -->
+
<cd:command name="startstructurepageregister" level="document" category="structure" file="strc-reg.mkiv">
<cd:arguments>
<cd:resolve name="keyword-name"/>
<cd:resolve name="keyword-name"/>
<cd:resolve name="assignment-registerdata-list"/>
<cd:resolve name="assignment-userdata-list-optional"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="stopstructurepageregister" level="document" category="structure" file="strc-reg.mkiv">
- <cd:arguments>
+ <cd:resolve name="string-content"/>
+ <cd:delimiter name="stopstructurepageregister"/>
<cd:resolve name="keyword-name"/>
<cd:resolve name="keyword-name"/>
</cd:arguments>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-section.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-section.xml
index b4229d5fd7f..0ec20a80452 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-section.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-section.xml
@@ -246,6 +246,10 @@
<cd:constant type="positive"/>
<cd:constant type="all"/>
</cd:parameter>
+ <cd:parameter name="hidenumber">
+ <cd:constant type="yes"/>
+ <cd:constant type="no" default="yes"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
@@ -319,6 +323,30 @@
</cd:arguments>
</cd:command>
+ <cd:command name="placerawheaddata" level="system" category="structure" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-section"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="placerawheadtext" level="system" category="structure" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-section"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="placerawheadnumber" level="system" category="structure" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-section"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="repeathead" level="document" category="structure" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-section"/>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="definesection" level="system" category="structure" file="strc-sec.mkiv">
<cd:arguments>
<cd:resolve name="keyword-name"/>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-simplecolumns.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-simplecolumns.xml
new file mode 100644
index 00000000000..caefa9fbbb9
--- /dev/null
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-simplecolumns.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?context-directive job ctxfile x-setups.ctx ?>
+
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
+
+ <cd:command name="setsimplecolumnshsize" level="system" category="structure layout" file="page-smp.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes">
+ <cd:parameter name="n">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="width">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="lines">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="simplecolumns" type="environment" level="system" category="structure layout" file="page-smp.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setsimplecolumnshsize"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+</cd:interface> \ No newline at end of file
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-symbol.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-symbol.xml
index 498684cad77..64a6f27dd17 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-symbol.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-symbol.xml
@@ -147,4 +147,15 @@
</cd:arguments>
</cd:command>
-</cd:interface> \ No newline at end of file
+ <cd:command name="setupsymbols" level="style" category="symbols" file="symb-ini.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes">
+ <cd:parameter name="stylealternative">
+ <cd:constant type="text" default="yes"/>
+ <cd:constant type="math"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+</cd:interface>
diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-texts.xml b/Master/texmf-dist/tex/context/interface/mkiv/i-texts.xml
index f0f515fbc2c..f13d8802115 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-texts.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-texts.xml
@@ -4,97 +4,68 @@
<cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
- <!--
-
- <cd:command name="definelayoutelement" level="system" category="layout" file="page-txt.mkvi">
- <cd:arguments>
- <cd:resolve name="keyword-name"/>
- <cd:resolve name="keyword-name-optional"/>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setuplayoutelement"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="setuplayoutelement" level="system" category="layout" file="page-txt.mkvi">
- <cd:arguments>
- <cd:resolve name="keyword-name-list-optional"/>
- <cd:assignments list="yes">
- <cd:parameter name="state">
- <cd:constant type="start"/>
- <cd:constant type="stop"/>
- <cd:constant type="empty"/>
- <cd:constant type="high"/>
- <cd:constant type="none"/>
- <cd:constant type="normal" default="yes"/>
- <cd:constant type="nomarking"/>
- <cd:constant type="cd:name"/>
- </cd:parameter>
- <cd:parameter name="style">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="color">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="strut">
- <cd:constant type="yes" default="yes"/>
- <cd:constant type="no"/>
- </cd:parameter>
- <cd:parameter name="n">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:parameter name="before">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="after">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="leftstyle">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="rightstyle">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="leftcolor">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="rightcolor">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="width">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="leftwidth">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="rightwidth">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="setuplayouttext" level="system" category="layout" file="page-txt.mkvi">
- <cd:arguments>
- <cd:keywords>
- <cd:constant type="top"/>
- <cd:constant type="header"/>
- <cd:constant type="text"/>
- <cd:constant type="footer"/>
- <cd:constant type="bottom"/>
- </cd:keywords>
- <cd:keywords optional="yes">
- <cd:constant type="text"/>
- <cd:constant type="margin"/>
- <cd:constant type="edge"/>
- </cd:keywords>
- <cd:assignments list="yes">
- <cd:inherit name="setuplayoutelement"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- -->
+ <cd:define name="keyword-setuplayouttext">
+ <cd:keywords optional="yes">
+ <cd:constant type="text"/>
+ <cd:constant type="margin"/>
+ <cd:constant type="edge"/>
+ </cd:keywords>
+ </cd:define>
+
+ <cd:define name="assignment-setuplayouttext">
+ <cd:assignments list="yes">
+ <cd:parameter name="state">
+ <cd:constant type="start"/>
+ <cd:constant type="stop"/>
+ <cd:constant type="empty"/>
+ <cd:constant type="high"/>
+ <cd:constant type="none"/>
+ <cd:constant type="normal" default="yes"/>
+ <cd:constant type="nomarking"/>
+ <cd:constant type="cd:name"/>
+ </cd:parameter>
+ <cd:parameter name="style">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="strut">
+ <cd:constant type="yes" default="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="leftstyle">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="rightstyle">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="leftcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="rightcolor">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="width">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="leftwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rightwidth">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:define>
<cd:command name="setuplayouttext" level="style" category="layout" file="page-txt.mkvi">
<cd:arguments>
@@ -105,197 +76,43 @@
<cd:constant type="footer"/>
<cd:constant type="bottom"/>
</cd:keywords>
- <cd:keywords optional="yes">
- <cd:constant type="text"/>
- <cd:constant type="margin"/>
- <cd:constant type="edge"/>
- </cd:keywords>
- <cd:assignments list="yes">
- <cd:parameter name="state">
- <cd:constant type="start"/>
- <cd:constant type="stop"/>
- <cd:constant type="empty"/>
- <cd:constant type="high"/>
- <cd:constant type="none"/>
- <cd:constant type="normal" default="yes"/>
- <cd:constant type="nomarking"/>
- <cd:constant type="cd:name"/>
- </cd:parameter>
- <cd:parameter name="style">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="color">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="strut">
- <cd:constant type="yes" default="yes"/>
- <cd:constant type="no"/>
- </cd:parameter>
- <cd:parameter name="n">
- <cd:constant type="cd:number"/>
- </cd:parameter>
- <cd:parameter name="before">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="after">
- <cd:constant type="cd:command"/>
- </cd:parameter>
- <cd:parameter name="leftstyle">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="rightstyle">
- <cd:resolve name="value-style"/>
- </cd:parameter>
- <cd:parameter name="leftcolor">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="rightcolor">
- <cd:constant type="cd:color"/>
- </cd:parameter>
- <cd:parameter name="width">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="leftwidth">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- <cd:parameter name="rightwidth">
- <cd:constant type="cd:dimension"/>
- </cd:parameter>
- </cd:assignments>
+ <cd:resolve name="keyword-setuplayouttext"/>
+ <cd:resolve name="assignment-setuplayouttext"/>
</cd:arguments>
</cd:command>
- <!--
-
- <cd:command name="setuptop" level="style" category="layout" file="page-txt.mkvi">
- <cd:arguments>
- <cd:keywords optional="yes">
- <cd:constant type="text"/>
- <cd:constant type="margin"/>
- <cd:constant type="edge"/>
- </cd:keywords>
- <cd:assignments list="yes">
- <cd:inherit name="setuplayoutelement"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="setupheader" level="style" category="layout" file="page-txt.mkvi">
- <cd:arguments>
- <cd:keywords optional="yes">
- <cd:constant type="text"/>
- <cd:constant type="margin"/>
- <cd:constant type="edge"/>
- </cd:keywords>
- <cd:assignments list="yes">
- <cd:inherit name="setuplayoutelement"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="setuptext" level="style" category="layout" file="page-txt.mkvi">
- <cd:arguments>
- <cd:keywords optional="yes">
- <cd:constant type="text"/>
- <cd:constant type="margin"/>
- <cd:constant type="edge"/>
- </cd:keywords>
- <cd:assignments list="yes">
- <cd:inherit name="setuplayoutelement"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="setupfooter" level="style" category="layout" file="page-txt.mkvi">
- <cd:arguments>
- <cd:keywords optional="yes">
- <cd:constant type="text"/>
- <cd:constant type="margin"/>
- <cd:constant type="edge"/>
- </cd:keywords>
- <cd:assignments list="yes">
- <cd:inherit name="setuplayoutelement"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="setupbottom" level="style" category="layout" file="page-txt.mkvi">
- <cd:arguments>
- <cd:keywords optional="yes">
- <cd:constant type="text"/>
- <cd:constant type="margin"/>
- <cd:constant type="edge"/>
- </cd:keywords>
- <cd:assignments list="yes">
- <cd:inherit name="setuplayoutelement"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- -->
-
<cd:command name="setuptop" level="style" category="layout" file="page-txt.mkvi">
<cd:arguments>
- <cd:keywords optional="yes">
- <cd:constant type="text"/>
- <cd:constant type="margin"/>
- <cd:constant type="edge"/>
- </cd:keywords>
- <cd:assignments list="yes">
- <cd:inherit name="setuplayouttext"/>
- </cd:assignments>
+ <cd:resolve name="keyword-setuplayouttext"/>
+ <cd:resolve name="assignment-setuplayouttext"/>
</cd:arguments>
</cd:command>
<cd:command name="setupheader" level="style" category="layout" file="page-txt.mkvi">
<cd:arguments>
- <cd:keywords optional="yes">
- <cd:constant type="text"/>
- <cd:constant type="margin"/>
- <cd:constant type="edge"/>
- </cd:keywords>
- <cd:assignments list="yes">
- <cd:inherit name="setuplayouttext"/>
- </cd:assignments>
+ <cd:resolve name="keyword-setuplayouttext"/>
+ <cd:resolve name="assignment-setuplayouttext"/>
</cd:arguments>
</cd:command>
<cd:command name="setuptext" level="style" category="layout" file="page-txt.mkvi">
<cd:arguments>
- <cd:keywords optional="yes">
- <cd:constant type="text"/>
- <cd:constant type="margin"/>
- <cd:constant type="edge"/>
- </cd:keywords>
- <cd:assignments list="yes">
- <cd:inherit name="setuplayouttext"/>
- </cd:assignments>
+ <cd:resolve name="keyword-setuplayouttext"/>
+ <cd:resolve name="assignment-setuplayouttext"/>
</cd:arguments>
</cd:command>
<cd:command name="setupfooter" level="style" category="layout" file="page-txt.mkvi">
<cd:arguments>
- <cd:keywords optional="yes">
- <cd:constant type="text"/>
- <cd:constant type="margin"/>
- <cd:constant type="edge"/>
- </cd:keywords>
- <cd:assignments list="yes">
- <cd:inherit name="setuplayouttext"/>
- </cd:assignments>
+ <cd:resolve name="keyword-setuplayouttext"/>
+ <cd:resolve name="assignment-setuplayouttext"/>
</cd:arguments>
</cd:command>
<cd:command name="setupbottom" level="style" category="layout" file="page-txt.mkvi">
<cd:arguments>
- <cd:keywords optional="yes">
- <cd:constant type="text"/>
- <cd:constant type="margin"/>
- <cd:constant type="edge"/>
- </cd:keywords>
- <cd:assignments list="yes">
- <cd:inherit name="setuplayouttext"/>
- </cd:assignments>
+ <cd:resolve name="keyword-setuplayouttext"/>
+ <cd:resolve name="assignment-setuplayouttext"/>
</cd:arguments>
</cd:command>
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 5e970d317c6..e79e4e73623 100644
--- a/Master/texmf-dist/tex/context/interface/mkiv/i-vspace.xml
+++ b/Master/texmf-dist/tex/context/interface/mkiv/i-vspace.xml
@@ -140,4 +140,10 @@
</cd:arguments>
</cd:command>
+ <cd:command name="crlf" level="document" category="whitespace" file="typo-wrp.mkiv"/>
+
+ <cd:command name="settestcrlf" level="document" category="whitespace" file="typo-wrp.mkiv"/>
+
+ <cd:command name="crlfplaceholder" level="document" category="whitespace" file="typo-wrp.mkiv"/>
+
</cd:interface>