summaryrefslogtreecommitdiff
path: root/tex/context/interface
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2016-10-14 17:42:58 +0200
committerContext Git Mirror Bot <phg42.2a@gmail.com>2016-10-14 17:42:58 +0200
commitd273e996892fcf539d67c9548c90d96c2877507a (patch)
tree94cde76afdd112bd384f03a908ff0371ef27b5c9 /tex/context/interface
parent1964c078d21c5f1d19a84fa6ef5c038f8ee80652 (diff)
downloadcontext-d273e996892fcf539d67c9548c90d96c2877507a.tar.gz
2016-10-14 17:25:00
Diffstat (limited to 'tex/context/interface')
-rw-r--r--tex/context/interface/mkii/cont-nl.xml8
-rw-r--r--tex/context/interface/mkii/keys-cs.xml12
-rw-r--r--tex/context/interface/mkii/keys-de.xml12
-rw-r--r--tex/context/interface/mkii/keys-en.xml12
-rw-r--r--tex/context/interface/mkii/keys-fr.xml12
-rw-r--r--tex/context/interface/mkii/keys-it.xml12
-rw-r--r--tex/context/interface/mkii/keys-nl.xml14
-rw-r--r--tex/context/interface/mkii/keys-pe.xml12
-rw-r--r--tex/context/interface/mkii/keys-ro.xml12
-rw-r--r--tex/context/interface/mkiv/i-common-definitions.xml1
-rw-r--r--tex/context/interface/mkiv/i-common-instance.xml13
-rw-r--r--tex/context/interface/mkiv/i-context.pdfbin839469 -> 839724 bytes
-rw-r--r--tex/context/interface/mkiv/i-enumeration.xml2
-rw-r--r--tex/context/interface/mkiv/i-floats.xml35
-rw-r--r--tex/context/interface/mkiv/i-indent.xml6
-rw-r--r--tex/context/interface/mkiv/i-readme.pdfbin60762 -> 60763 bytes
16 files changed, 143 insertions, 20 deletions
diff --git a/tex/context/interface/mkii/cont-nl.xml b/tex/context/interface/mkii/cont-nl.xml
index ac955ae54..ac0b3a4dd 100644
--- a/tex/context/interface/mkii/cont-nl.xml
+++ b/tex/context/interface/mkii/cont-nl.xml
@@ -1211,7 +1211,7 @@
<cd:command name="localfootnotes" type="environment" file="core-not.tex" category="footnotes">
<cd:sequence>
- <cd:string value="localfootnotes"/>
+ <cd:string value="lokalevoetnoten"/>
</cd:sequence>
</cd:command>
@@ -2740,7 +2740,7 @@
<cd:command name="marginblock" type="environment" file="page-flt.tex">
<cd:sequence>
- <cd:string value="marginblock"/>
+ <cd:string value="margeblok"/>
</cd:sequence>
</cd:command>
@@ -7122,7 +7122,7 @@
<cd:command name="linecorrection" type="environment">
<cd:sequence>
- <cd:string value="linecorrection"/>
+ <cd:string value="regelcorrectie"/>
</cd:sequence>
</cd:command>
@@ -7221,7 +7221,7 @@
<cd:command name="alignment" type="environment" file="core-spa.tex">
<cd:sequence>
- <cd:string value="alignment"/>
+ <cd:string value="uitlijnen"/>
</cd:sequence>
<cd:arguments>
<cd:keywords n="1" optional="yes" list="yes">
diff --git a/tex/context/interface/mkii/keys-cs.xml b/tex/context/interface/mkii/keys-cs.xml
index 9389f61ec..20e14f760 100644
--- a/tex/context/interface/mkii/keys-cs.xml
+++ b/tex/context/interface/mkii/keys-cs.xml
@@ -1326,6 +1326,7 @@
<cd:command name='Words' value='Slova'/>
<cd:command name='about' value='oref'/>
<cd:command name='adaptlayout' value='prizpusobvzhled'/>
+ <cd:command name='alignment' value='alignment'/>
<cd:command name='arg' value='arg'/>
<cd:command name='at' value='pref'/>
<cd:command name='atleftmargin' value='atleftmargin'/>
@@ -1542,11 +1543,13 @@
<cd:command name='leftmargindistance' value='vzdalenostlevemarginalie'/>
<cd:command name='leftmarginwidth' value='sirkalevemarginalie'/>
<cd:command name='leg' value='leg'/>
+ <cd:command name='linecorrection' value='linecorrection'/>
<cd:command name='linewidth' value='tloustkacary'/>
<cd:command name='listheight' value='vyskaseznamu'/>
<cd:command name='listlength' value='delkaseznamu'/>
<cd:command name='listsymbol' value='listsymbol'/>
<cd:command name='listwidth' value='sirkaseznamu'/>
+ <cd:command name='localfootnotes' value='localfootnotes'/>
<cd:command name='logfields' value='zaznamovepole'/>
<cd:command name='lohi' value='nivy'/>
<cd:command name='low' value='nizky'/>
@@ -1555,6 +1558,7 @@
<cd:command name='makeupheight' value='vyskasazby'/>
<cd:command name='makeupwidth' value='sirkasazby'/>
<cd:command name='mar' value='okr'/>
+ <cd:command name='marginblock' value='marginblock'/>
<cd:command name='margindistance' value='vzdalenostmarginalie'/>
<cd:command name='marginrule' value='marginalnilinka'/>
<cd:command name='margintext' value='marginalnitext'/>
@@ -1654,6 +1658,7 @@
<cd:command name='rightmarginwidth' value='sirkapravemarginalie'/>
<cd:command name='romannumerals' value='rimskecislice'/>
<cd:command name='rotate' value='otocit'/>
+ <cd:command name='savebuffer' value='savebuffer'/>
<cd:command name='scale' value='meritko'/>
<cd:command name='screen' value='obrazovka'/>
<cd:command name='selectblocks' value='vyberbloky'/>
@@ -1689,7 +1694,9 @@
<cd:command name='setupcombinations' value='nastavspojeni'/>
<cd:command name='setupcombinedlist' value='nastavkombinovanyseznam'/>
<cd:command name='setupcomment' value='nastavkomentar'/>
+ <cd:command name='setupdescription' value='setupdescription'/>
<cd:command name='setupdescriptions' value='nastavpopisy'/>
+ <cd:command name='setupenumeration' value='setupenumeration'/>
<cd:command name='setupenumerations' value='nastavvycty'/>
<cd:command name='setupexternalfigures' value='nastavexterniobrazy'/>
<cd:command name='setupfield' value='nastavpole'/>
@@ -1704,8 +1711,10 @@
<cd:command name='setupfootnotedefinition' value='nastavdefinicipoznamekpodcarou'/>
<cd:command name='setupfootnotes' value='nastavpoznamkypodcarou'/>
<cd:command name='setupforms' value='setupforms'/>
+ <cd:command name='setupformula' value='setupformula'/>
<cd:command name='setupformulas' value='nastavrovnice'/>
<cd:command name='setupframed' value='nastavoramovani'/>
+ <cd:command name='setupframedtext' value='setupframedtext'/>
<cd:command name='setupframedtexts' value='nastavoramovanetexty'/>
<cd:command name='setuphead' value='nastavnadpis'/>
<cd:command name='setupheader' value='nastavzahlavi'/>
@@ -1734,7 +1743,9 @@
<cd:command name='setuplinewidth' value='nastavsirkucary'/>
<cd:command name='setuplist' value='nastavseznam'/>
<cd:command name='setupmakeup' value='nastavupravu'/>
+ <cd:command name='setupmarginblock' value='setupmarginblock'/>
<cd:command name='setupmarginblocks' value='nastavmarginalniblok'/>
+ <cd:command name='setupmargindata' value='setupmargindata'/>
<cd:command name='setupmarginrules' value='nastavmarginalnilinky'/>
<cd:command name='setupmarking' value='nastavznaceni'/>
<cd:command name='setupmathalignment' value='setupmathalignment'/>
@@ -1913,6 +1924,7 @@
<cd:command name='testcolumn' value='testcolumn'/>
<cd:command name='testpage' value='testpage'/>
<cd:command name='tex' value='tex'/>
+ <cd:command name='textbackground' value='textbackground'/>
<cd:command name='textheight' value='vyskatextu'/>
<cd:command name='textreference' value='odkaznatext'/>
<cd:command name='textrule' value='textovalinka'/>
diff --git a/tex/context/interface/mkii/keys-de.xml b/tex/context/interface/mkii/keys-de.xml
index 685193fd7..c4bf99cff 100644
--- a/tex/context/interface/mkii/keys-de.xml
+++ b/tex/context/interface/mkii/keys-de.xml
@@ -1326,6 +1326,7 @@
<cd:command name='Words' value='Woerter'/>
<cd:command name='about' value='ueber'/>
<cd:command name='adaptlayout' value='passelayoutan'/>
+ <cd:command name='alignment' value='alignment'/>
<cd:command name='arg' value='arg'/>
<cd:command name='at' value='bei'/>
<cd:command name='atleftmargin' value='atleftmargin'/>
@@ -1542,11 +1543,13 @@
<cd:command name='leftmargindistance' value='linkemarginalafstand'/>
<cd:command name='leftmarginwidth' value='linkemarginalbreite'/>
<cd:command name='leg' value='leg'/>
+ <cd:command name='linecorrection' value='linecorrection'/>
<cd:command name='linewidth' value='liniendicke'/>
<cd:command name='listheight' value='listenhoehe'/>
<cd:command name='listlength' value='listenlaenge'/>
<cd:command name='listsymbol' value='listsymbol'/>
<cd:command name='listwidth' value='listenbreite'/>
+ <cd:command name='localfootnotes' value='localfootnotes'/>
<cd:command name='logfields' value='registrierefelder'/>
<cd:command name='lohi' value='tiho'/>
<cd:command name='low' value='tief'/>
@@ -1555,6 +1558,7 @@
<cd:command name='makeupheight' value='satzhoehe'/>
<cd:command name='makeupwidth' value='satzbreite'/>
<cd:command name='mar' value='mar'/>
+ <cd:command name='marginblock' value='marginblock'/>
<cd:command name='margindistance' value='marginalafstand'/>
<cd:command name='marginrule' value='marginallinie'/>
<cd:command name='margintext' value='marginaltext'/>
@@ -1654,6 +1658,7 @@
<cd:command name='rightmarginwidth' value='rechtemarginalbreite'/>
<cd:command name='romannumerals' value='roemischezahlen'/>
<cd:command name='rotate' value='drehen'/>
+ <cd:command name='savebuffer' value='savebuffer'/>
<cd:command name='scale' value='format'/>
<cd:command name='screen' value='bildschirm'/>
<cd:command name='selectblocks' value='waehlebloeckeaus'/>
@@ -1689,7 +1694,9 @@
<cd:command name='setupcombinations' value='stellekombinationein'/>
<cd:command name='setupcombinedlist' value='stellezusammengestelltelisteein'/>
<cd:command name='setupcomment' value='stellekommentarein'/>
+ <cd:command name='setupdescription' value='setupdescription'/>
<cd:command name='setupdescriptions' value='definierebeschreibungen'/>
+ <cd:command name='setupenumeration' value='setupenumeration'/>
<cd:command name='setupenumerations' value='stellebeschreibungein'/>
<cd:command name='setupexternalfigures' value='stelleexterneabbildungenein'/>
<cd:command name='setupfield' value='stellefeldein'/>
@@ -1704,8 +1711,10 @@
<cd:command name='setupfootnotedefinition' value='stellefussnotendefinitionein'/>
<cd:command name='setupfootnotes' value='stellefussnotenein'/>
<cd:command name='setupforms' value='setupforms'/>
+ <cd:command name='setupformula' value='setupformula'/>
<cd:command name='setupformulas' value='stelleformelnein'/>
<cd:command name='setupframed' value='stelleumrahmtein'/>
+ <cd:command name='setupframedtext' value='setupframedtext'/>
<cd:command name='setupframedtexts' value='stelleumrahmtetexteein'/>
<cd:command name='setuphead' value='stelleueberschriftein'/>
<cd:command name='setupheader' value='stellekopfzeileein'/>
@@ -1734,7 +1743,9 @@
<cd:command name='setuplinewidth' value='stellelinienbreiteein'/>
<cd:command name='setuplist' value='stellelisteein'/>
<cd:command name='setupmakeup' value='stelleumbruchein'/>
+ <cd:command name='setupmarginblock' value='setupmarginblock'/>
<cd:command name='setupmarginblocks' value='stellemarginalblockein'/>
+ <cd:command name='setupmargindata' value='setupmargindata'/>
<cd:command name='setupmarginrules' value='stellemarginallinieein'/>
<cd:command name='setupmarking' value='stellebeschriftungein'/>
<cd:command name='setupmathalignment' value='setupmathalignment'/>
@@ -1913,6 +1924,7 @@
<cd:command name='testcolumn' value='testcolumn'/>
<cd:command name='testpage' value='testpage'/>
<cd:command name='tex' value='tex'/>
+ <cd:command name='textbackground' value='textbackground'/>
<cd:command name='textheight' value='texthoehe'/>
<cd:command name='textreference' value='textreferenz'/>
<cd:command name='textrule' value='textlinie'/>
diff --git a/tex/context/interface/mkii/keys-en.xml b/tex/context/interface/mkii/keys-en.xml
index 825a0eea2..3a5d77e53 100644
--- a/tex/context/interface/mkii/keys-en.xml
+++ b/tex/context/interface/mkii/keys-en.xml
@@ -1326,6 +1326,7 @@
<cd:command name='Words' value='Words'/>
<cd:command name='about' value='about'/>
<cd:command name='adaptlayout' value='adaptlayout'/>
+ <cd:command name='alignment' value='alignment'/>
<cd:command name='arg' value='arg'/>
<cd:command name='at' value='at'/>
<cd:command name='atleftmargin' value='atleftmargin'/>
@@ -1542,11 +1543,13 @@
<cd:command name='leftmargindistance' value='leftmargindistance'/>
<cd:command name='leftmarginwidth' value='leftmarginwidth'/>
<cd:command name='leg' value='leg'/>
+ <cd:command name='linecorrection' value='linecorrection'/>
<cd:command name='linewidth' value='linethickness'/>
<cd:command name='listheight' value='listheight'/>
<cd:command name='listlength' value='listlength'/>
<cd:command name='listsymbol' value='listsymbol'/>
<cd:command name='listwidth' value='listwidth'/>
+ <cd:command name='localfootnotes' value='localfootnotes'/>
<cd:command name='logfields' value='logfields'/>
<cd:command name='lohi' value='lohi'/>
<cd:command name='low' value='low'/>
@@ -1555,6 +1558,7 @@
<cd:command name='makeupheight' value='makeupheight'/>
<cd:command name='makeupwidth' value='makeupwidth'/>
<cd:command name='mar' value='mar'/>
+ <cd:command name='marginblock' value='marginblock'/>
<cd:command name='margindistance' value='margindistance'/>
<cd:command name='marginrule' value='marginrule'/>
<cd:command name='margintext' value='margintext'/>
@@ -1654,6 +1658,7 @@
<cd:command name='rightmarginwidth' value='rightmarginwidth'/>
<cd:command name='romannumerals' value='romannumerals'/>
<cd:command name='rotate' value='rotate'/>
+ <cd:command name='savebuffer' value='savebuffer'/>
<cd:command name='scale' value='scale'/>
<cd:command name='screen' value='screen'/>
<cd:command name='selectblocks' value='selectblocks'/>
@@ -1689,7 +1694,9 @@
<cd:command name='setupcombinations' value='setupcombinations'/>
<cd:command name='setupcombinedlist' value='setupcombinedlist'/>
<cd:command name='setupcomment' value='setupcomment'/>
+ <cd:command name='setupdescription' value='setupdescription'/>
<cd:command name='setupdescriptions' value='setupdescriptions'/>
+ <cd:command name='setupenumeration' value='setupenumeration'/>
<cd:command name='setupenumerations' value='setupenumerations'/>
<cd:command name='setupexternalfigures' value='setupexternalfigures'/>
<cd:command name='setupfield' value='setupfield'/>
@@ -1704,8 +1711,10 @@
<cd:command name='setupfootnotedefinition' value='setupfootnotedefinition'/>
<cd:command name='setupfootnotes' value='setupfootnotes'/>
<cd:command name='setupforms' value='setupforms'/>
+ <cd:command name='setupformula' value='setupformula'/>
<cd:command name='setupformulas' value='setupformulae'/>
<cd:command name='setupframed' value='setupframed'/>
+ <cd:command name='setupframedtext' value='setupframedtext'/>
<cd:command name='setupframedtexts' value='setupframedtexts'/>
<cd:command name='setuphead' value='setuphead'/>
<cd:command name='setupheader' value='setupheader'/>
@@ -1734,7 +1743,9 @@
<cd:command name='setuplinewidth' value='setuplinewidth'/>
<cd:command name='setuplist' value='setuplist'/>
<cd:command name='setupmakeup' value='setupmakeup'/>
+ <cd:command name='setupmarginblock' value='setupmarginblock'/>
<cd:command name='setupmarginblocks' value='setupmarginblocks'/>
+ <cd:command name='setupmargindata' value='setupmargindata'/>
<cd:command name='setupmarginrules' value='setupmarginrules'/>
<cd:command name='setupmarking' value='setupmarking'/>
<cd:command name='setupmathalignment' value='setupmathalignment'/>
@@ -1913,6 +1924,7 @@
<cd:command name='testcolumn' value='testcolumn'/>
<cd:command name='testpage' value='testpage'/>
<cd:command name='tex' value='tex'/>
+ <cd:command name='textbackground' value='textbackground'/>
<cd:command name='textheight' value='textheight'/>
<cd:command name='textreference' value='textreference'/>
<cd:command name='textrule' value='textrule'/>
diff --git a/tex/context/interface/mkii/keys-fr.xml b/tex/context/interface/mkii/keys-fr.xml
index 17d564397..00a0864e8 100644
--- a/tex/context/interface/mkii/keys-fr.xml
+++ b/tex/context/interface/mkii/keys-fr.xml
@@ -1326,6 +1326,7 @@
<cd:command name='Words' value='Mots'/>
<cd:command name='about' value='concernant'/>
<cd:command name='adaptlayout' value='adaptedisposition'/>
+ <cd:command name='alignment' value='alignment'/>
<cd:command name='arg' value='arg'/>
<cd:command name='at' value='a'/>
<cd:command name='atleftmargin' value='atleftmargin'/>
@@ -1542,11 +1543,13 @@
<cd:command name='leftmargindistance' value='distancemargegauche'/>
<cd:command name='leftmarginwidth' value='largeurmargegauche'/>
<cd:command name='leg' value='leg'/>
+ <cd:command name='linecorrection' value='linecorrection'/>
<cd:command name='linewidth' value='largeurligne'/>
<cd:command name='listheight' value='hauteurliste'/>
<cd:command name='listlength' value='llongueurliste'/>
<cd:command name='listsymbol' value='listesymbole'/>
<cd:command name='listwidth' value='largeurliste'/>
+ <cd:command name='localfootnotes' value='localfootnotes'/>
<cd:command name='logfields' value='logchamp'/>
<cd:command name='lohi' value='baha'/>
<cd:command name='low' value='bas'/>
@@ -1555,6 +1558,7 @@
<cd:command name='makeupheight' value='hauteurmakeup'/>
<cd:command name='makeupwidth' value='largeurmakeup'/>
<cd:command name='mar' value='mar'/>
+ <cd:command name='marginblock' value='marginblock'/>
<cd:command name='margindistance' value='distancemarge'/>
<cd:command name='marginrule' value='margereglee'/>
<cd:command name='margintext' value='textemarge'/>
@@ -1654,6 +1658,7 @@
<cd:command name='rightmarginwidth' value='largeurmargedroite'/>
<cd:command name='romannumerals' value='chiffresromains'/>
<cd:command name='rotate' value='oriente'/>
+ <cd:command name='savebuffer' value='savebuffer'/>
<cd:command name='scale' value='echelle'/>
<cd:command name='screen' value='ecran'/>
<cd:command name='selectblocks' value='selectionneblocs'/>
@@ -1689,7 +1694,9 @@
<cd:command name='setupcombinations' value='reglecombinaisons'/>
<cd:command name='setupcombinedlist' value='reglelisteimbriquee'/>
<cd:command name='setupcomment' value='reglecommentaire'/>
+ <cd:command name='setupdescription' value='setupdescription'/>
<cd:command name='setupdescriptions' value='regledescriptions'/>
+ <cd:command name='setupenumeration' value='setupenumeration'/>
<cd:command name='setupenumerations' value='regleenumerations'/>
<cd:command name='setupexternalfigures' value='reglefiguresexternes'/>
<cd:command name='setupfield' value='reglechamp'/>
@@ -1704,8 +1711,10 @@
<cd:command name='setupfootnotedefinition' value='definitnotepdp'/>
<cd:command name='setupfootnotes' value='reglenotepdp'/>
<cd:command name='setupforms' value='regleformulaires'/>
+ <cd:command name='setupformula' value='setupformula'/>
<cd:command name='setupformulas' value='regleformules'/>
<cd:command name='setupframed' value='regleencadre'/>
+ <cd:command name='setupframedtext' value='setupframedtext'/>
<cd:command name='setupframedtexts' value='setupframedtexts'/>
<cd:command name='setuphead' value='regletete'/>
<cd:command name='setupheader' value='regleentete'/>
@@ -1734,7 +1743,9 @@
<cd:command name='setuplinewidth' value='regleepaisseurligne'/>
<cd:command name='setuplist' value='regleliste'/>
<cd:command name='setupmakeup' value='reglemakeup'/>
+ <cd:command name='setupmarginblock' value='setupmarginblock'/>
<cd:command name='setupmarginblocks' value='regleblocmarge'/>
+ <cd:command name='setupmargindata' value='setupmargindata'/>
<cd:command name='setupmarginrules' value='reglemargereglee'/>
<cd:command name='setupmarking' value='reglemarquage'/>
<cd:command name='setupmathalignment' value='setupmathalignment'/>
@@ -1913,6 +1924,7 @@
<cd:command name='testcolumn' value='testcolumn'/>
<cd:command name='testpage' value='testpage'/>
<cd:command name='tex' value='tex'/>
+ <cd:command name='textbackground' value='textbackground'/>
<cd:command name='textheight' value='hauteurtexte'/>
<cd:command name='textreference' value='referencetexte'/>
<cd:command name='textrule' value='ligneregleetexte'/>
diff --git a/tex/context/interface/mkii/keys-it.xml b/tex/context/interface/mkii/keys-it.xml
index 5e771719d..f15c27393 100644
--- a/tex/context/interface/mkii/keys-it.xml
+++ b/tex/context/interface/mkii/keys-it.xml
@@ -1326,6 +1326,7 @@
<cd:command name='Words' value='Parole'/>
<cd:command name='about' value='intorno'/>
<cd:command name='adaptlayout' value='adattalayout'/>
+ <cd:command name='alignment' value='alignment'/>
<cd:command name='arg' value='arg'/>
<cd:command name='at' value='al'/>
<cd:command name='atleftmargin' value='atleftmargin'/>
@@ -1542,11 +1543,13 @@
<cd:command name='leftmargindistance' value='distanzamarginesinistro'/>
<cd:command name='leftmarginwidth' value='ampiezzamarginesinistro'/>
<cd:command name='leg' value='leg'/>
+ <cd:command name='linecorrection' value='linecorrection'/>
<cd:command name='linewidth' value='spessoreriga'/>
<cd:command name='listheight' value='altezzaelenco'/>
<cd:command name='listlength' value='lunghezzaelenco'/>
<cd:command name='listsymbol' value='listsymbol'/>
<cd:command name='listwidth' value='ampiezzaelenco'/>
+ <cd:command name='localfootnotes' value='localfootnotes'/>
<cd:command name='logfields' value='logcampi'/>
<cd:command name='lohi' value='pedap'/>
<cd:command name='low' value='ped'/>
@@ -1555,6 +1558,7 @@
<cd:command name='makeupheight' value='altezzamakeup'/>
<cd:command name='makeupwidth' value='ampiezzamakeup'/>
<cd:command name='mar' value='mar'/>
+ <cd:command name='marginblock' value='marginblock'/>
<cd:command name='margindistance' value='distanzamargine'/>
<cd:command name='marginrule' value='lineamargine'/>
<cd:command name='margintext' value='testoinmargine'/>
@@ -1654,6 +1658,7 @@
<cd:command name='rightmarginwidth' value='ampiezzamarginedestro'/>
<cd:command name='romannumerals' value='numeriromani'/>
<cd:command name='rotate' value='ruota'/>
+ <cd:command name='savebuffer' value='savebuffer'/>
<cd:command name='scale' value='scala'/>
<cd:command name='screen' value='schermo'/>
<cd:command name='selectblocks' value='selezionablocchi'/>
@@ -1689,7 +1694,9 @@
<cd:command name='setupcombinations' value='impostacombinazioni'/>
<cd:command name='setupcombinedlist' value='impostaelencocombinato'/>
<cd:command name='setupcomment' value='impostacommento'/>
+ <cd:command name='setupdescription' value='setupdescription'/>
<cd:command name='setupdescriptions' value='impostadescrizioni'/>
+ <cd:command name='setupenumeration' value='setupenumeration'/>
<cd:command name='setupenumerations' value='impostaenumerazioni'/>
<cd:command name='setupexternalfigures' value='impostafigureesterne'/>
<cd:command name='setupfield' value='impostacampo'/>
@@ -1704,8 +1711,10 @@
<cd:command name='setupfootnotedefinition' value='impostadefinizionenotepdp'/>
<cd:command name='setupfootnotes' value='impostanotepdp'/>
<cd:command name='setupforms' value='impostaforms'/>
+ <cd:command name='setupformula' value='setupformula'/>
<cd:command name='setupformulas' value='impostaformule'/>
<cd:command name='setupframed' value='impostaincorniciato'/>
+ <cd:command name='setupframedtext' value='setupframedtext'/>
<cd:command name='setupframedtexts' value='impostatestiincorniciati'/>
<cd:command name='setuphead' value='impostatesta'/>
<cd:command name='setupheader' value='impostainstestazione'/>
@@ -1734,7 +1743,9 @@
<cd:command name='setuplinewidth' value='impostaampiezzariga'/>
<cd:command name='setuplist' value='impostaelenco'/>
<cd:command name='setupmakeup' value='impostamakeup'/>
+ <cd:command name='setupmarginblock' value='setupmarginblock'/>
<cd:command name='setupmarginblocks' value='impostablocchimargine'/>
+ <cd:command name='setupmargindata' value='setupmargindata'/>
<cd:command name='setupmarginrules' value='impostalineemargine'/>
<cd:command name='setupmarking' value='impostamarcatura'/>
<cd:command name='setupmathalignment' value='setupmathalignment'/>
@@ -1913,6 +1924,7 @@
<cd:command name='testcolumn' value='testcolumn'/>
<cd:command name='testpage' value='testpage'/>
<cd:command name='tex' value='tex'/>
+ <cd:command name='textbackground' value='textbackground'/>
<cd:command name='textheight' value='altezzatesto'/>
<cd:command name='textreference' value='riferimentotesto'/>
<cd:command name='textrule' value='lineatesto'/>
diff --git a/tex/context/interface/mkii/keys-nl.xml b/tex/context/interface/mkii/keys-nl.xml
index c3b3b5d78..df5485bbe 100644
--- a/tex/context/interface/mkii/keys-nl.xml
+++ b/tex/context/interface/mkii/keys-nl.xml
@@ -142,7 +142,7 @@
<cd:variable name='color' value='kleur'/>
<cd:variable name='column' value='kolom'/>
<cd:variable name='columns' value='kolommen'/>
- <cd:variable name='combination' value='combination'/>
+ <cd:variable name='combination' value='combinatie'/>
<cd:variable name='command' value='commando'/>
<cd:variable name='commands' value='commandos'/>
<cd:variable name='comment' value='commentaar'/>
@@ -1326,6 +1326,7 @@
<cd:command name='Words' value='Woorden'/>
<cd:command name='about' value='about'/>
<cd:command name='adaptlayout' value='paslayoutaan'/>
+ <cd:command name='alignment' value='uitlijnen'/>
<cd:command name='arg' value='arg'/>
<cd:command name='at' value='op'/>
<cd:command name='atleftmargin' value='oplinkermarge'/>
@@ -1542,11 +1543,13 @@
<cd:command name='leftmargindistance' value='linkermargeafstand'/>
<cd:command name='leftmarginwidth' value='linkermargebreedte'/>
<cd:command name='leg' value='leg'/>
+ <cd:command name='linecorrection' value='regelcorrectie'/>
<cd:command name='linewidth' value='lijndikte'/>
<cd:command name='listheight' value='lijsthoogte'/>
<cd:command name='listlength' value='lijstlengte'/>
<cd:command name='listsymbol' value='lijstsymbool'/>
<cd:command name='listwidth' value='lijstbreedte'/>
+ <cd:command name='localfootnotes' value='lokalevoetnoten'/>
<cd:command name='logfields' value='registreervelden'/>
<cd:command name='lohi' value='laho'/>
<cd:command name='low' value='laag'/>
@@ -1555,6 +1558,7 @@
<cd:command name='makeupheight' value='zethoogte'/>
<cd:command name='makeupwidth' value='zetbreedte'/>
<cd:command name='mar' value='mar'/>
+ <cd:command name='marginblock' value='margeblok'/>
<cd:command name='margindistance' value='margeafstand'/>
<cd:command name='marginrule' value='kantlijn'/>
<cd:command name='margintext' value='margetekst'/>
@@ -1654,6 +1658,7 @@
<cd:command name='rightmarginwidth' value='rechtermargebreedte'/>
<cd:command name='romannumerals' value='romeins'/>
<cd:command name='rotate' value='roteer'/>
+ <cd:command name='savebuffer' value='bewaarbuffer'/>
<cd:command name='scale' value='schaal'/>
<cd:command name='screen' value='scherm'/>
<cd:command name='selectblocks' value='selecteerblokken'/>
@@ -1689,7 +1694,9 @@
<cd:command name='setupcombinations' value='stelcombinatiesin'/>
<cd:command name='setupcombinedlist' value='stelsamengesteldelijstin'/>
<cd:command name='setupcomment' value='stelcommentaarin'/>
+ <cd:command name='setupdescription' value='steldoordefinierenin'/>
<cd:command name='setupdescriptions' value='steldoordefinierenin'/>
+ <cd:command name='setupenumeration' value='steldoornummerenin'/>
<cd:command name='setupenumerations' value='steldoornummerenin'/>
<cd:command name='setupexternalfigures' value='stelexternefigurenin'/>
<cd:command name='setupfield' value='stelveldin'/>
@@ -1704,8 +1711,10 @@
<cd:command name='setupfootnotedefinition' value='stelvoetnootdefinitiein'/>
<cd:command name='setupfootnotes' value='stelvoetnotenin'/>
<cd:command name='setupforms' value='stelformulierenin'/>
+ <cd:command name='setupformula' value='stelformulein'/>
<cd:command name='setupformulas' value='stelformulesin'/>
<cd:command name='setupframed' value='stelomlijndin'/>
+ <cd:command name='setupframedtext' value='stelkadertekstin'/>
<cd:command name='setupframedtexts' value='stelkadertekstenin'/>
<cd:command name='setuphead' value='stelkopin'/>
<cd:command name='setupheader' value='stelhoofdin'/>
@@ -1734,7 +1743,9 @@
<cd:command name='setuplinewidth' value='stellijndiktein'/>
<cd:command name='setuplist' value='stellijstin'/>
<cd:command name='setupmakeup' value='stelopmaakin'/>
+ <cd:command name='setupmarginblock' value='stelmargeblokkenin'/>
<cd:command name='setupmarginblocks' value='stelmargeblokkenin'/>
+ <cd:command name='setupmargindata' value='stelinmargein'/>
<cd:command name='setupmarginrules' value='stelkantlijnin'/>
<cd:command name='setupmarking' value='stelmarkeringin'/>
<cd:command name='setupmathalignment' value='stelwiskundeuitlijnenin'/>
@@ -1913,6 +1924,7 @@
<cd:command name='testcolumn' value='testkolom'/>
<cd:command name='testpage' value='testpagina'/>
<cd:command name='tex' value='tex'/>
+ <cd:command name='textbackground' value='tekstachtergrond'/>
<cd:command name='textheight' value='teksthoogte'/>
<cd:command name='textreference' value='tekstreferentie'/>
<cd:command name='textrule' value='tekstlijn'/>
diff --git a/tex/context/interface/mkii/keys-pe.xml b/tex/context/interface/mkii/keys-pe.xml
index 9d86aa689..75d2d8772 100644
--- a/tex/context/interface/mkii/keys-pe.xml
+++ b/tex/context/interface/mkii/keys-pe.xml
@@ -1326,6 +1326,7 @@
<cd:command name='Words' value='Words'/>
<cd:command name='about' value='درمورد'/>
<cd:command name='adaptlayout' value='تنظیم‌طرح‌بندی'/>
+ <cd:command name='alignment' value='alignment'/>
<cd:command name='arg' value='افزودن'/>
<cd:command name='at' value='در'/>
<cd:command name='atleftmargin' value='درحاشیه‌چپ'/>
@@ -1542,11 +1543,13 @@
<cd:command name='leftmargindistance' value='فاصله‌حاشیه‌چپ'/>
<cd:command name='leftmarginwidth' value='عرض‌حاشیه‌چپ'/>
<cd:command name='leg' value='پا'/>
+ <cd:command name='linecorrection' value='linecorrection'/>
<cd:command name='linewidth' value='عرض‌خط'/>
<cd:command name='listheight' value='ارتفاع‌خط'/>
<cd:command name='listlength' value='طول‌لیست'/>
<cd:command name='listsymbol' value='نمادلیست'/>
<cd:command name='listwidth' value='عرض‌لیست'/>
+ <cd:command name='localfootnotes' value='localfootnotes'/>
<cd:command name='logfields' value='میدانهای‌گزارش'/>
<cd:command name='lohi' value='پابا'/>
<cd:command name='low' value='پایین'/>
@@ -1555,6 +1558,7 @@
<cd:command name='makeupheight' value='ارتفاع‌آرایش'/>
<cd:command name='makeupwidth' value='عرض‌آرایش'/>
<cd:command name='mar' value='حاش'/>
+ <cd:command name='marginblock' value='marginblock'/>
<cd:command name='margindistance' value='فاصله‌حاشیه'/>
<cd:command name='marginrule' value='خط‌حاشیه'/>
<cd:command name='margintext' value='متن‌حاشیه'/>
@@ -1654,6 +1658,7 @@
<cd:command name='rightmarginwidth' value='عرض‌حاشیه‌راست'/>
<cd:command name='romannumerals' value='اعدادلاتین'/>
<cd:command name='rotate' value='دوران'/>
+ <cd:command name='savebuffer' value='savebuffer'/>
<cd:command name='scale' value='مقیاس'/>
<cd:command name='screen' value='پرده'/>
<cd:command name='selectblocks' value='انتخاب‌بلوکها'/>
@@ -1689,7 +1694,9 @@
<cd:command name='setupcombinations' value='بارگذاری‌ترکیب‌ها'/>
<cd:command name='setupcombinedlist' value='بارگذاری‌لیست‌ترکیبی'/>
<cd:command name='setupcomment' value='بارگذاری‌توضیح'/>
+ <cd:command name='setupdescription' value='setupdescription'/>
<cd:command name='setupdescriptions' value='بارگذاری‌شرح'/>
+ <cd:command name='setupenumeration' value='setupenumeration'/>
<cd:command name='setupenumerations' value='بارگذاری‌شماره‌گذاریها'/>
<cd:command name='setupexternalfigures' value='بارگذاری‌شکلهای‌خارجی'/>
<cd:command name='setupfield' value='بارگذاری‌میدان'/>
@@ -1704,8 +1711,10 @@
<cd:command name='setupfootnotedefinition' value='بارگذاری‌تعریف‌پانوشت'/>
<cd:command name='setupfootnotes' value='بارگذاری‌پانوشتها'/>
<cd:command name='setupforms' value='بارگذاری‌طرح'/>
+ <cd:command name='setupformula' value='setupformula'/>
<cd:command name='setupformulas' value='بارگذاری‌فرمولها'/>
<cd:command name='setupframed' value='بارگذاری‌قالبی'/>
+ <cd:command name='setupframedtext' value='setupframedtext'/>
<cd:command name='setupframedtexts' value='بارگذاری‌متن‌قالبی'/>
<cd:command name='setuphead' value='بارگذاری‌سر'/>
<cd:command name='setupheader' value='بارگذاری‌سربرگ'/>
@@ -1734,7 +1743,9 @@
<cd:command name='setuplinewidth' value='بارگذاری‌عرض‌خط'/>
<cd:command name='setuplist' value='بارگذاری‌لیست'/>
<cd:command name='setupmakeup' value='بارگذاری‌آرایش'/>
+ <cd:command name='setupmarginblock' value='setupmarginblock'/>
<cd:command name='setupmarginblocks' value='بارگذاری‌بلوکهای‌حاشیه'/>
+ <cd:command name='setupmargindata' value='setupmargindata'/>
<cd:command name='setupmarginrules' value='بارگذاری‌خطهای‌حاشیه'/>
<cd:command name='setupmarking' value='بارگذاری‌نشانه‌گذاری'/>
<cd:command name='setupmathalignment' value='بارگذاری‌تنظیم‌ریاضی'/>
@@ -1913,6 +1924,7 @@
<cd:command name='testcolumn' value='ستون‌امتحان'/>
<cd:command name='testpage' value='صفحه‌تست'/>
<cd:command name='tex' value='تک'/>
+ <cd:command name='textbackground' value='textbackground'/>
<cd:command name='textheight' value='ارتفاع‌متن'/>
<cd:command name='textreference' value='مرجع‌متن'/>
<cd:command name='textrule' value='خط‌متن'/>
diff --git a/tex/context/interface/mkii/keys-ro.xml b/tex/context/interface/mkii/keys-ro.xml
index f810eaf57..45c2e0ce0 100644
--- a/tex/context/interface/mkii/keys-ro.xml
+++ b/tex/context/interface/mkii/keys-ro.xml
@@ -1326,6 +1326,7 @@
<cd:command name='Words' value='Cuvinte'/>
<cd:command name='about' value='despre'/>
<cd:command name='adaptlayout' value='adapteazaaspect'/>
+ <cd:command name='alignment' value='alignment'/>
<cd:command name='arg' value='arg'/>
<cd:command name='at' value='la'/>
<cd:command name='atleftmargin' value='atleftmargin'/>
@@ -1542,11 +1543,13 @@
<cd:command name='leftmargindistance' value='distantamarginestanga'/>
<cd:command name='leftmarginwidth' value='latimemarginestanga'/>
<cd:command name='leg' value='leg'/>
+ <cd:command name='linecorrection' value='linecorrection'/>
<cd:command name='linewidth' value='grosimelinie'/>
<cd:command name='listheight' value='inaltimelista'/>
<cd:command name='listlength' value='lungimelista'/>
<cd:command name='listsymbol' value='listsymbol'/>
<cd:command name='listwidth' value='latimelista'/>
+ <cd:command name='localfootnotes' value='localfootnotes'/>
<cd:command name='logfields' value='logcampuri'/>
<cd:command name='lohi' value='jossus'/>
<cd:command name='low' value='jos'/>
@@ -1555,6 +1558,7 @@
<cd:command name='makeupheight' value='inaltimemakeup'/>
<cd:command name='makeupwidth' value='latimemakeup'/>
<cd:command name='mar' value='mar'/>
+ <cd:command name='marginblock' value='marginblock'/>
<cd:command name='margindistance' value='distantamargine'/>
<cd:command name='marginrule' value='liniemargine'/>
<cd:command name='margintext' value='textmarginal'/>
@@ -1654,6 +1658,7 @@
<cd:command name='rightmarginwidth' value='latimemarginedreapta'/>
<cd:command name='romannumerals' value='numereromane'/>
<cd:command name='rotate' value='roteste'/>
+ <cd:command name='savebuffer' value='savebuffer'/>
<cd:command name='scale' value='scala'/>
<cd:command name='screen' value='ecran'/>
<cd:command name='selectblocks' value='selecteazablocuri'/>
@@ -1689,7 +1694,9 @@
<cd:command name='setupcombinations' value='seteazacombinari'/>
<cd:command name='setupcombinedlist' value='seteazalistacombinata'/>
<cd:command name='setupcomment' value='seteazacomentariu'/>
+ <cd:command name='setupdescription' value='setupdescription'/>
<cd:command name='setupdescriptions' value='seteazadescriere'/>
+ <cd:command name='setupenumeration' value='setupenumeration'/>
<cd:command name='setupenumerations' value='seteazaenumerare'/>
<cd:command name='setupexternalfigures' value='seteazafiguriexterne'/>
<cd:command name='setupfield' value='seteazacamp'/>
@@ -1704,8 +1711,10 @@
<cd:command name='setupfootnotedefinition' value='seteazadefinireanotasubsol'/>
<cd:command name='setupfootnotes' value='seteazanotasubsol'/>
<cd:command name='setupforms' value='seteazaformulare'/>
+ <cd:command name='setupformula' value='setupformula'/>
<cd:command name='setupformulas' value='seteazaformule'/>
<cd:command name='setupframed' value='seteazainconjurat'/>
+ <cd:command name='setupframedtext' value='setupframedtext'/>
<cd:command name='setupframedtexts' value='definestetexteinconjurate'/>
<cd:command name='setuphead' value='seteazatitlu'/>
<cd:command name='setupheader' value='seteazaantet'/>
@@ -1734,7 +1743,9 @@
<cd:command name='setuplinewidth' value='seteazagrosimelinie'/>
<cd:command name='setuplist' value='seteazalista'/>
<cd:command name='setupmakeup' value='seteazamakeup'/>
+ <cd:command name='setupmarginblock' value='setupmarginblock'/>
<cd:command name='setupmarginblocks' value='seteazablocurimarginale'/>
+ <cd:command name='setupmargindata' value='setupmargindata'/>
<cd:command name='setupmarginrules' value='seteazaliniimargine'/>
<cd:command name='setupmarking' value='seteazamarcaje'/>
<cd:command name='setupmathalignment' value='setupmathalignment'/>
@@ -1913,6 +1924,7 @@
<cd:command name='testcolumn' value='testcolumn'/>
<cd:command name='testpage' value='testpage'/>
<cd:command name='tex' value='tex'/>
+ <cd:command name='textbackground' value='textbackground'/>
<cd:command name='textheight' value='inaltimetext'/>
<cd:command name='textreference' value='referintatext'/>
<cd:command name='textrule' value='riglatext'/>
diff --git a/tex/context/interface/mkiv/i-common-definitions.xml b/tex/context/interface/mkiv/i-common-definitions.xml
index 5ca20c016..9f6d461f9 100644
--- a/tex/context/interface/mkiv/i-common-definitions.xml
+++ b/tex/context/interface/mkiv/i-common-definitions.xml
@@ -7,5 +7,6 @@
<cd:interfacefile filename="i-common-keyword.xml"/>
<cd:interfacefile filename="i-common-string.xml"/>
<cd:interfacefile filename="i-common-value.xml"/>
+ <cd:interfacefile filename="i-common-instance.xml"/>
</cd:interface>
diff --git a/tex/context/interface/mkiv/i-common-instance.xml b/tex/context/interface/mkiv/i-common-instance.xml
new file mode 100644
index 000000000..57591d3bb
--- /dev/null
+++ b/tex/context/interface/mkiv/i-common-instance.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
+
+ <cd:define name="instance-float">
+ <cd:constant value="chemical"/>
+ <cd:constant value="figure"/>
+ <cd:constant value="table"/>
+ <cd:constant value="intermezzo"/>
+ <cd:constant value="graphic"/>
+ </cd:define>
+
+</cd:interface>
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 6caf60cc2..da61b5008 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
Binary files differ
diff --git a/tex/context/interface/mkiv/i-enumeration.xml b/tex/context/interface/mkiv/i-enumeration.xml
index 9ff9ed0e4..70823cff3 100644
--- a/tex/context/interface/mkiv/i-enumeration.xml
+++ b/tex/context/interface/mkiv/i-enumeration.xml
@@ -4,7 +4,7 @@
<cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
- <cd:command name="defineenumerations" file="strc-enu.mkvi">
+ <cd:command name="defineenumeration" file="strc-enu.mkvi">
<cd:arguments>
<cd:resolve name="keyword-name"/>
<cd:resolve name="keyword-name-optional"/>
diff --git a/tex/context/interface/mkiv/i-floats.xml b/tex/context/interface/mkiv/i-floats.xml
index 54d78adab..d53956355 100644
--- a/tex/context/interface/mkiv/i-floats.xml
+++ b/tex/context/interface/mkiv/i-floats.xml
@@ -12,6 +12,9 @@
<cd:inherit name="setupfloat"/>
</cd:assignments>
</cd:arguments>
+ <cd:instances>
+ <cd:resolve name="instance-float"/>
+ </cd:instances>
</cd:command>
<cd:command name="definefloat" variant="name" file="strc-flt.mkvi">
@@ -20,6 +23,9 @@
<cd:resolve name="keyword-plural-optional"/>
<cd:resolve name="keyword-singular-optional"/>
</cd:arguments>
+ <cd:instances>
+ <cd:resolve name="instance-float"/>
+ </cd:instances>
</cd:command>
<cd:command name="setupfloat" file="strc-flt.mkvi">
@@ -337,11 +343,7 @@
<cd:content/>
</cd:arguments>
<cd:instances>
- <cd:constant value="chemical"/>
- <cd:constant value="figure"/>
- <cd:constant value="table"/>
- <cd:constant value="intermezzo"/>
- <cd:constant value="graphic"/>
+ <cd:resolve name="instance-float"/>
</cd:instances>
</cd:command>
@@ -365,14 +367,21 @@
<cd:resolve name="assignment-userdata-list-optional"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="chemical"/>
- <cd:constant value="figure"/>
- <cd:constant value="table"/>
- <cd:constant value="intermezzo"/>
- <cd:constant value="graphic"/>
+ <cd:resolve name="instance-float"/>
</cd:instances>
</cd:command>
+ <cd:command name="placefloat" generated="yes" variant="instance" file="strc-flt.mkvi">
+ <cd:sequence>
+ <cd:string value="place"/>
+ <cd:instance/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:resolve name="assignment-floatdata-list-optional"/>
+ <cd:resolve name="assignment-userdata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="placefloat" type="environment" file="strc-flt.mkvi">
<cd:arguments>
<cd:resolve name="keyword-singular"/>
@@ -465,7 +474,9 @@
</cd:arguments>
</cd:command>
- <cd:command name="placefigure" file="strc-flt.mkvi">
+ <!--
+
+ <cd:command file="strc-flt.mkvi" name="placefigure">
<cd:arguments>
<cd:resolve name="keyword-floatlocation-list-optional"/>
<cd:resolve name="keyword-reference-list-optional"/>
@@ -474,6 +485,8 @@
</cd:arguments>
</cd:command>
+ -->
+
<cd:command name="placefigure" type="environment" file="strc-flt.mkvi">
<cd:arguments>
<cd:resolve name="assignment-floatdata-list-optional"/>
diff --git a/tex/context/interface/mkiv/i-indent.xml b/tex/context/interface/mkiv/i-indent.xml
index 0ad0b9a45..7e2fb5ca3 100644
--- a/tex/context/interface/mkiv/i-indent.xml
+++ b/tex/context/interface/mkiv/i-indent.xml
@@ -62,11 +62,11 @@
</cd:arguments>
</cd:command>
- <cd:command name="indentation" file="spac-hor.mkiv"/>
+ <cd:command name="indentation" file="spac-hor.mkiv" coreprimitive="yes"/>
- <cd:command name="noindentation" file="spac-hor.mkiv"/>
+ <cd:command name="noindentation" file="spac-hor.mkiv" coreprimitive="yes"/>
- <cd:command name="doindentation" file="spac-hor.mkiv"/>
+ <cd:command name="doindentation" file="spac-hor.mkiv" coreprimitive="yes"/>
<cd:command name="checknextindentation" file="spac-hor.mkiv">
<cd:arguments>
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 878a42111..d10fd15a6 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
Binary files differ