stable 2004.11.16

80 files changed, 17711 insertions, 4921 deletions

diff --git a/context/data/cont-cz-scite.properties b/context/data/cont-cz-scite.properties
index 35cba275e..d254f1b90 100644
--- a/context/data/cont-cz-scite.properties
+++ b/context/data/cont-cz-scite.properties
@@ -1,96 +1,96 @@
 keywordclass.macros.context.cz=\
-    zapisdoseznamuodkazu uzijbloky vpravo stopprodukt nastavradkovani stoplegenda \
-    zarovnanonastred vyberpapir nastavzahlavi opissoubor nastavblok cernelinky \
-    uplnyrejstrik nastavprechodstrany uzijexternizvuk hlavnijazyk stoplokalnipoznamkypodcarou placerule \
-    umistilegendu startcitace parovastrana stopsynchronizace premistinamrizku definujodstavce \
-    ukazpodpery positiontext nastavtextpopisku nastavzarovnani umistizalozky zapisdoseznamu \
-    nastavmarginalnilinky typebuffer jmeno uzijspeciality stopspojeni tvrdemezery \
-    startoramovanytext dvoustrannypapir nadruhyokraj ziskejbuffer startspojeni nokap \
-    klonujpole odkazujici*obrazek nastavhornitexty podtrzeni zrcadlit vysoky \
-    startprehled strana definetextposition nastavinterakci nastavprofily Kaps \
-    ukazbarvu ukazpole nastavtoleranci stoptabelator nastavrovnice stopnezhustene \
-    Kap nastavcislovaniodstavcu nastavtexthlavicky stopumistovani nastavbilamista stopradek \
-    umistivedlesebe startradek nastavtext startbuffer nastavpopisky vyplnovyradek \
-    startradky podpodsekce zarovnanovlevo ran nastavoramovanetexty umistipoznamkypodcarou \
-    stoporamovanytext startobraz stopuprava ref nastavopis ukazexterniobrazy \
-    nastavmarginalie startprojekt uzijodkazy nastavmeziradkovoumezeru startprodukt nastavpoznamkypodcarou \
-    startprekryv jdinabox nastavpaletu komentar stopkorekceradku orez \
-    stopprotejsek oramovanytext nastavtabulky nastavspojeni nastavoramovani tlacitko \
-    prizpusobvzhled vlevo uzijsymbol nastavseznam umistiseznam definetextvariable \
-    stopdokument startlokalnipoznamkypodcarou stopodstavec definujblok jazyk kapitola \
-    texthlavicky startprostredi zadnedalsibloky definujsynonyma nastavumisteniprotejsku stopzarovnavani \
-    definujrejstrik nastavbarvy propojenydokument uzijexternisoubory nastavsirkucary definujpopisek \
-    nastavtextyupati emptylines umistipodrovnici sym startkorekceradku stopbuffer \
-    bublinkovanapoveda tab listsymbol definujprekryv uzijexterniobraz uzijadresar \
-    umistiseznamsynonyma startumistovani nastavkombinovanyseznam citovat stopsloupce nastavinterakcnilistu \
-    uzijURL MESIC nastavdeleniplvoucichobjektu tenkelinky stopinteraktivnimenu nastavkapitalky \
-    zadnyseznam pol rimskecislice stopprofil nastavpodcislostrany porovnejpaletu \
-    dodrzujprofil definetype otocit vyplnovepole zaznamovepole prizpusobivepole \
-    textpopisku definujoramovanytext nadpis stanovcislonadpisu nejakyradek umistilokalnipoznamkypodcarou \
-    nastavtextyzahlavi startodlozit stanovcharakteristickuseznamu chem umistiseznamodkazu cernalinka \
-    stopjmenozlom nastavpozadi nastavtenkelinky definujkombinovanyseznam znaceni definujzasobnikpoli \
-    uzijmodul zpracujstranu zadnehorniadolniradky pole meritko nastavumistovani \
-    bydliste porovnejskupinubarev roztazene nastavsystem nadtrzeno zadnezahlaviaupati \
-    stoplokalnihoprostredi ziskejznaceni setuppaper pref vyberverzi startlokalni \
-    definujpreskok definujstartstop znaceni*obrazek zlomek cast startodstavec \
-    stopitemgroup aktualnicislonadpisu preskrtnuto nastavmarginalniblok startmarginalnilinka startplvouciobjekttext \
-    startkomponenta definujlogo nastavseznamodkazu textovalinka definujtext mezera \
-    sedabarva dodrzujverziprofilu stopzuzeni nacistsynonyma stopskryt nastavsekci \
-    znak nastavpole jdina opis nastavinterakcniobrazovku resetznaceni \
-    interakcnilista definujtabelaci stopbarva nastavotoceni starttabelator nastavcislostrany \
-    vlasovalinka poznamkapodcarou ukazzakladnifont definujseznam inouter umistiseznamplvouciobjekty \
-    instalacejazyka nastavplvouciobjekty vizrejstrik nastavvzhled pis marginalnitext \
-    nastavupati zadnebilemisto uzijexternidokument rejstrik definujopis startzarovnavani \
-    zarovnanovpravo definerawfont citace bilemisto definujpopis umistiloga \
-    uplnyseznamtridit nastavtextovelinky interakcnitlacitka startlegenda oramovani polozky \
-    pod sekce startrejstrik ukazupravu startcislovaniradku reset \
-    nastavcislovani nastavspodek startsadasymbolu nastavprogramy Znaky stopcislovaniradku \
-    stoptyping program nastavupravu nastavdefinicipoznamekpodcarou vsedniden stoptextovalinka \
-    definujodkaz ukazsadusymbolu starttabulka rozpojeneznaceni stopprostredi korekcebilehomista \
-    VSEDNIDEN symbol podpodtema vyplnovelinky uplnyseznamsynonyma konvertujcislo \
-    jdidolu nastavpopisy tlacitkomenu stopprekryv propojenyrejstrik nastavprostredizakladnihofontu \
-    definujvystup nastavkomentar nivy definujkonverzi stopcitace nastavexterniobrazy \
-    switchtorawfont startpozadi ukazramecek startitemgroup starttyping arg \
-    slovovpravo stoptabulka nacisttridit KAP startpopis startzhustene \
-    nastavdolnitexty zpracujbloky zhustene stopobraz nastavcislovaniradku podtema \
-    umistirovnici synchronizovat dodatek popisky startsynchronizace odkaz \
-    prelozit stopfakt odstavec setupforms startlokalnihoprostredi titul \
-    rezervovatplvouciobjekt definujprofil definujprostredizakladnihofontu tecky stopsadasymbolu ukazvzhled \
-    externiobraz definujprogram umistinadsebe nastavodstavce stoplokalni umistiseznamtridit \
-    uzijkodovani SLOVA stopprojekt odsazovani startrovnice Slovo \
-    ininner nekde zapisdorejstriku ukazvytisk vyplnenytext startjmenozlom \
-    nastavbarvu nastavsadusymbolu aktualnidatum sloupec startmarginalniblok ukazpaletu \
-    stopverze nastavvystup ukaznastaveni definujoramovani scitani startsloupce \
-    startzuzeni stopkomponenta zasobnikpoli nastavtype nastavcislovanistran nastavnadpis \
-    zadneodsazovani footnotetext nastavorez nastavsloupce nastavbloksekce zadneznaceni \
-    nastavtab setuprule synchronizacnilista odkaznastranu nastavpolozky textvariable \
-    bypassblocks nastavplvouciobjekt nastavurl nastavsynonyma zadnamezera definujseznamodkazu \
-    stopodlozit definujznaceni zachovejbloky ukazmrizku dalsioddil nastavpopisek \
-    nop trid verze zapismeziseznam podsekce zablokujinterakcnimenu \
-    typstrany definujskupinubarev uplnykombinovanyseznam nastavvycty publikace definujformatodkazu \
-    umistiplvouciobjekt nastavsynchronizacnilistu nastavrejstrik definujsekci stopradky pozice \
-    stopkomentar nastavzakladnifont definujvycet oref startverze cislonadpisu \
-    preskrtnuti uplnyseznamplvouciobjekty nastavtexttexty tex definujplvouciobjekt tema \
-    Slova umistinamrizku setupitemgroup oznacovani startkomentar settextvariable \
-    preskoc Rimskecislice znaky podtrzeno zadnytest umistirejstrik \
-    definujfont nastavvyplnoveradky schovejbloky definujpodpole definujpole definujbarvu \
-    startfakt odkaznatext vyberbloky tref stopzhustene definujvelikostpapiru \
-    definujpaletu nastavverze setupstrut startdokument oznacverzi nastavrastr \
-    nastavvyplnovelinky pozadi nastavtrideni stopplvouciobjekttext marginalnilinka ukazskupinubarev \
-    nastavusporadani nastavlegendu vradku setuptextposition umistikombinovanyseznam synonymum \
-    obrazovka zalozka nastavznaceni crlf stopvycet datum \
-    stopmarginalniblok nastavodkazovani nastavpreskok starttabulky hl uzijexternisoubor \
-    nastavzuzeni kopirujpole uzijprikazy startskryt definujverzi definerule \
-    propojenerejstrik nastavcislonadpisu tenkalinka nastavjazyk nadtrzeni definujbuffer \
-    nastavradky setuptextvariable forceblocks nastavnadpisy zaramovani startuprava \
-    mrizka nastavcernelinky Znak propojeneznaceni barva startprofil \
-    naokraj rozdelplvouciobjekt nastavtlacitka definujbloksekce nastavsynchronizaci stoptabulky \
-    kap mesic nastavhorejsek nastavpublikace zref stredoveky \
-    definujobrazeksymbol stoppozadi definujsablonutabulky prepninazakladnifont nastavvsechnapole cisla \
-    nastavpodtrzeni SLOVO odkaznadatum ukazpostredizakladnihofontu starttextovalinka definujinterakcnimenu \
-    definujodsazovani nastavtabelaci nastavdelitko nastavodsazovani oznaceni vl \
-    definujtrideni stoprovnice startvycet spodek startbarva nizky \
-    poznamka stopprehled nastrane definujnadpis nastavcitaci startinteraktivnimenu \
-    nastavvelikostpapiru startnezhustene zadnedalsisoubory stoppopis polozka startprotejsek \
-    stopmarginalnilinka definujzakladnifont definuj okr dodrzujverzi definujsymbol \
-    popis nastavbuffer matematika placetextvariable definujupravu vycet 
+    zapisdoseznamuodkazu uzijbloky vpravo nastavradkovani zarovnanonastred vyberpapir \
+    nastavzahlavi opissoubor stoptable nastavblok cernelinky subject \
+    nastavprechodstrany uzijexternizvuk hlavnijazyk placerule umistilegendu startcitace \
+    parovastrana title stopnamemakeup premistinamrizku definujodstavce ukazpodpery \
+    positiontext nastavtextpopisku nastavzarovnani umistizalozky seeregister zapisdoseznamu \
+    nastavmarginalnilinky typebuffer uzijspeciality part tvrdemezery dvoustrannypapir \
+    nadruhyokraj startparagraph ziskejbuffer klonujpole nastavhornitexty podtrzeni \
+    zrcadlit vysoky stopfigure stoplocalfootnotes strana definetextposition \
+    nastavinterakci stopcolumns nastavprofily ukazbarvu ukazpole nastavtoleranci \
+    stophiding startlokalne nastavcislovaniodstavcu nastavtexthlavicky stopopposite stopproduct \
+    nastavbilamista startoverview umistivedlesebe nastavtext startbuffer nastavpopisky \
+    vyplnovyradek zarovnanovlevo ran nastavoramovanetexty umistipoznamkypodcarou stopsynchronization \
+    ref nastavopis ukazexterniobrazy stopnarrower stopunpacked nastavmarginalie \
+    description startprojekt uzijodkazy nastavmeziradkovoumezeru nastavpoznamkypodcarou jdinabox \
+    nastavpaletu komentar orez nastavtabulky labeling nastavspojeni \
+    nastavoramovani tlacitko prizpusobvzhled vlevo uzijsymbol completelistofsorts \
+    nastavseznam umistiseznam definetextvariable definujblok jazyk stoplegend \
+    stoptabulate setupformulae texthlavicky startprostredi zadnedalsibloky definujsynonyma \
+    stoplocalenvironment nastavumisteniprotejsku definujrejstrik startline nastavbarvy propojenydokument \
+    uzijexternisoubory stopframedtext nastavsirkucary definujpopisek nastavtextyupati emptylines \
+    umistipodrovnici sym stopbuffer bublinkovanapoveda tab listsymbol \
+    definujprekryv uzijexterniobraz startdocument subsubject Cap nastavkombinovanyseznam \
+    citovat nastavinterakcnilistu uzijURL MESIC nastavdeleniplvoucichobjektu tenkelinky \
+    placelistofsynonyms stopinteraktivnimenu nastavkapitalky zadnyseznam pol rimskecislice \
+    stoplinecorrection nastavpodcislostrany porovnejpaletu dodrzujprofil definetype otocit \
+    vyplnovepole zaznamovepole prizpusobivepole synonym textpopisku definujoramovanytext \
+    nadpis stanovcislonadpisu nejakyradek umistilokalnipoznamkypodcarou nastavtextyzahlavi startfigure \
+    stanovcharakteristickuseznamu chem umistiseznamodkazu cernalinka nastavpozadi completeregister \
+    nastavtenkelinky startzlom definujkombinovanyseznam znaceni definujzasobnikpoli uzijmodul \
+    zpracujstranu zadnehorniadolniradky pole meritko nastavumistovani stoplokalne \
+    sort startlinecorrection startcombination bydliste startregister porovnejskupinubarev \
+    CAP roztazene nastavsystem subsubsection stoptables nadtrzeno \
+    zadnezahlaviaupati ziskejznaceni setuppaper pref vyberverzi definujpreskok \
+    definujstartstop zlomek stopitemgroup startfloattext aktualnicislonadpisu preskrtnuto \
+    nastavmarginalniblok startmarginalnilinka startkomponenta definujlogo nastavseznamodkazu textovalinka \
+    definujtext completelistoffloats mezera sedabarva dodrzujverziprofilu nastavsekci \
+    znak nastavpole jdina stoplinenumbering opis nastavinterakcniobrazovku \
+    enumeration resetznaceni interakcnilista definujtabelaci stopbarva nastavotoceni \
+    nastavcislostrany vlasovalinka poznamkapodcarou ukazzakladnifont definujseznam inouter \
+    stopmarginblock instalacejazyka nastavplvouciobjekty stopline nastavvzhled pis \
+    marginalnitext startcolumns nastavupati zadnebilemisto uzijexternidokument definujopis \
+    zarovnanovpravo subsubsubject definerawfont citace bilemisto definujpopis \
+    umistiloga stopformula nastavtextovelinky interakcnitlacitka startunpacked oramovani \
+    polozky completelistofsynonyms stopparagraph ukazupravu reset nastavcislovani \
+    nastavspodek nastavprogramy Znaky indentation stopprofile nocap \
+    chapter stoptyping program nastavupravu nastavdefinicipoznamekpodcarou vsedniden \
+    stoptextovalinka definujodkaz ukazsadusymbolu rozpojeneznaceni stopprostredi korekcebilehomista \
+    VSEDNIDEN symbol vyplnovelinky konvertujcislo jdidolu nastavpopisy \
+    propojenyrejstrik nastavprostredizakladnihofontu definujvystup completecombinedlist stoppositioning nastavkomentar \
+    loadsorts nivy definujkonverzi placefloat stopcitace nastavexterniobrazy \
+    switchtorawfont startpozadi ukazramecek startitemgroup starttyping paragraph \
+    arg slovovpravo startproduct startzhustene nastavdolnitexty zpracujbloky \
+    zhustene startopposite nastavcislovaniradku umistirovnici synchronizovat popisky \
+    odkaz prelozit stopfakt stopfloattext setupforms register \
+    definujprofil definujprostredizakladnihofontu tecky ukazvzhled nextsection placelistoffloats \
+    externiobraz definujprogram umistinadsebe nastavodstavce uzijkodovani startnamemakeup \
+    SLOVA stopprojekt odsazovani Slovo ininner nekde \
+    section startmarginblock zapisdorejstriku ukazvytisk vyplnenytext coupledregister \
+    nastavbarvu startprofile nastavsadusymbolu starttabulate aktualnidatum stopcombination \
+    sloupec ukazpaletu stopverze nastavvystup ukaznastaveni startenumeration \
+    definujoramovani scitani stopkomponenta zasobnikpoli nastavtype nastavcislovanistran \
+    nastavnadpis placelistofsorts zadneodsazovani stopoverview footnotetext nastavorez \
+    nastavsloupce nastavbloksekce zadneznaceni nastavtab setuprule subsection \
+    synchronizacnilista odkaznastranu nastavpolozky textvariable bypassblocks nastavplvouciobjekt \
+    nastavurl nastavsynonyma zadnamezera definujseznamodkazu definujznaceni zachovejbloky \
+    ukazmrizku nastavpopisek nop starttable starttables stopzlom \
+    framedtext verze zapismeziseznam stopdocument zablokujinterakcnimenu typstrany \
+    definujskupinubarev nastavvycty publikace definujformatodkazu starthiding nastavsynchronizacnilistu \
+    nastavrejstrik definujsekci stopoverlay pozice stopkomentar nastavzakladnifont \
+    appendix definujvycet oref startverze cislonadpisu preskrtnuti \
+    nastavtexttexty tex startdescription definujplvouciobjekt name Slova \
+    umistinamrizku setupitemgroup startkomentar settextvariable preskoc Rimskecislice \
+    znaky podtrzeno zadnytest umistirejstrik definujfont nastavvyplnoveradky \
+    schovejbloky definujpodpole definujpole definujbarvu startpositioning startlegend \
+    startfakt stopdescription odkaznatext startalignment vyberbloky tref \
+    stopzhustene definujvelikostpapiru definujpaletu nastavverze setupstrut usedirectory \
+    oznacverzi nastavrastr startformula nastavvyplnovelinky pozadi nastavtrideni \
+    stoppostponing startframedtext stopenumeration startnarrower marginalnilinka startsynchronization \
+    ukazskupinubarev nastavusporadani nastavlegendu vradku setuptextposition umistikombinovanyseznam \
+    obrazovka zalozka nastavznaceni crlf datum startpostponing \
+    nastavodkazovani nastavpreskok hl uzijexternisoubor nastavzuzeni kopirujpole \
+    uzijprikazy definujverzi definerule nastavcislonadpisu tenkalinka nastavjazyk \
+    nadtrzeni definujbuffer nastavradky startoverlay setuptextvariable forceblocks \
+    nastavnadpisy zaramovani mrizka nastavcernelinky Znak loadsynonyms \
+    propojeneznaceni barva naokraj cap rozdelplvouciobjekt nastavtlacitka \
+    definujbloksekce startsymbolset nastavsynchronizaci mesic nastavhorejsek nastavpublikace \
+    zref reservefloat definujobrazeksymbol stoppozadi definujsablonutabulky prepninazakladnifont \
+    nastavvsechnapole cisla nastavpodtrzeni SLOVO odkaznadatum ukazpostredizakladnihofontu \
+    starttextovalinka stopalignment definujinterakcnimenu stopsymbolset Caps stoplines \
+    definujodsazovani nastavtabelaci nastavdelitko nastavodsazovani vl definujtrideni \
+    spodek startbarva nizky poznamka nastrane definujnadpis \
+    nastavcitaci startlocalenvironment startlocalfootnotes startinteraktivnimenu nastavvelikostpapiru zadnedalsisoubory \
+    polozka stopmarginalnilinka definujzakladnifont startlines definuj mediaeval \
+    okr dodrzujverzi definujsymbol nastavbuffer matematika placetextvariable \
+    definujupravu startlinenumbering sub 
diff --git a/context/data/cont-cz.tws b/context/data/cont-cz.tws
index aa3846b3e..8ea3373ad 100644
--- a/context/data/cont-cz.tws
+++ b/context/data/cont-cz.tws
@@ -3138,12 +3138,6 @@ val:*cislo::
 stopsetup
 
 startsetup
-com:bydliste:
-typ:arg/:
-val:*text::
-stopsetup
-
-startsetup
 com:polozky:
 typ:vars/args/:
 ivr:nastavpolozky::
diff --git a/context/data/cont-de-scite.properties b/context/data/cont-de-scite.properties
index 592cd22c1..14d64604b 100644
--- a/context/data/cont-de-scite.properties
+++ b/context/data/cont-de-scite.properties
@@ -1,97 +1,96 @@
 keywordclass.macros.context.de=\
-    stellepapierformatein doppelseite platziereauflistenvongleitobjekte stellesynchronisationsbalkenein startlokal stopprodukt \
-    seitentyp definieresymbol stoplokalefussnoten verwendereferenzen wohnort definierereferenzliste \
-    marginaltext definierefeld stelleueberschriftein WOERTER placerule stelleuntenein \
-    definieren labeltext gefuelltezeile benutzekodierung bei stellefussnotendefinitionein \
-    stopueberblick positiontext beschriftung bestimmelistencharakeristika keinzeilenobenundunten unterstrichen \
-    synchronisationsbalken bruch stellekopfzeileein startbeschreibung verbergebloecke stellepufferein \
-    startzeilennumerierung amgitterausrichten stoptextlinie nokap holepuffer startnameumbruch \
-    wortrechts in startfarbe inzeile platziereregister stelleknopfein \
-    waehlepapieraus bemerkung stellezeilenein stopgegenueber amgitterneuausrichten keinedateienmehr \
-    stellehintergruendeein imrechten definetextposition stopzitat stellelinienbreiteein klonierefeld \
-    stellesynonymein zurbox Kaps tooltip programm benutzeverzeichnis \
-    stelleinteraktionsbildschirmein startenger kopierefeld stopabbildung Kap zeigefarbe \
-    konvertierezahl einzug startformel Wort beschriften korrigierezwischenraum \
-    inanderermarginale definieretabulator keinebloeckemehr stellegefuelltesrechteckein stelleinteraktionsbalkenein stelleanordnenein \
-    holebeschriftung stellezwischenraumein ueberstreichen stelleengerein ran stoppuffer \
-    stellemarginallinieein ref verknuepfregister definierestartstop vollendeauflistenvonsynonyme startspalten \
-    startprojekt keinekopfundfusszeilen stelletextobenein stellespracheein startprodukt kommentar \
-    platzierenebeneinander stellefelderin notiz stopinteraktionsmenue stellespaltenein platzierereferenzliste \
-    stoptabulator pos mittelalterlich stopausrichtung definetextvariable stopdokument \
-    unterunterthema startverschieben zeigepalette showsymbolset startverbergen startausrichtung \
-    irgendwo linksbuendig stellekopfzeilentextein unterstreichen stelleduennerumrissein siehregister \
-    kopf stelleseitennummerein startabsatz stellekombinationein einziehen festesspatium \
-    rechtsbuendig stopsynchronisation stoplegende installieresprache heutigesdatum emptylines \
-    sym verknuepfebeschriftung stelleprofilein tab stopfarbe starttextlinie \
-    stelleabschnittein definierefeldstapel listsymbol stellemarginalblockein startzeile tippedatei \
-    definierepalette von starttippen Buchstabe stelleumrahmtein format \
-    passendfeld einezeile duennelinie ausfuellfeld stopzeilen startinteraktionsmenue \
-    wechselezumfliesstext stelletabein stopprofil definetype stelleabsaetzeein doppelseitigespapier \
-    stellebindestrichein synonym stoptabelle zeigefliesstextumgebung stopkleinerdurchschuss but \
-    stopgleitobjekttext stopgrosserdurchschuss stellegefuelltezeileein stoptippen chem definieretabellenvorlage \
-    behaltebloecke verwendebefehl feld stellepaletteein tippen platzierekombiniereliste \
-    stelletextumrissein ueberstrichen stelletippenein bookmark startgleitobjekttext startregister \
-    stellelayoutein stelletoleranzein stellefarbenein definiereinteraktionsmenue startgegenueber tief \
-    rechteck startkomponente startlegende stellegleitobjekteein nachunten vergleichefarbengruppe \
-    stelletabellenein setuppaper ueber definiereabschnittsblock schreibezwischenliste stopumbruch \
-    nichteinziehen tiho position starttabelle stopitemgroup stelleseitenuebergangein \
-    stelletipein marginallinie unterunterabsatz farbe textlinie startsynchronisation \
-    stoplokal zitieren definierepapierformat verweisdatum hoch stellereferenzlisteein \
-    definieretext buchstabe tip definiereeinzug stellenummerierungein stellespatiumein \
-    its stellezeilennumerierungein stelleumrahmtetexteein verweis stellesynchronisationein definieresortieren \
-    waehleversionaus stopverschieben startkommentar monat zeigeeinstellungen stopumgebung \
-    startversion inouter unterabsatz verwendesymbole durchgestrichen verwendeexteresdokument \
-    stelledrehenein startzitat stelleurlein platzieregleitobjekt publikation definiereschrift \
-    imlinken folgendeabschnitt definiereregister stelleformelnein stelleeinzuegein stellefusszeilentextein \
-    spalte stopabsatz definerawfont umrahmtertext kapitel platziereunterformel \
-    stelleausgabeein zeigefarbengruppe startmarginallinie definierenummerierung bearbeitebloecke keintest \
-    definierebeschreibungen stopkomponente ladensortieren ruecksetztenbeschriftung definierelogo registrierefelder \
-    stopmarginalblock ausschnitt menueknopf definiereprogramme definierefarbengruppe stellebeschriftungein \
-    platziereauflistenvonsynonyme buchstaben punkt platzierefussnoten stopnummerierung stellekopfzahlein \
-    defineoutput definieresubfeld stoplokaleumgebung startabbildung keinzwischenraum definieregleitobjekt \
-    titel stopzeile stelletextein anhang seitenreferenz symbol \
-    durchstreichen WOCHENTAG gefuelltesrechteck Woerter nummerierung stelleexterneabbildungenein \
-    folgeprofil stopversion keinebeschriftung startmarginalblock version stelleinteraktionein \
-    verknuepftregister referenz switchtorawfont stellezitierenein stophintergrund unterthema \
-    stopkommentar vollendekombiniereliste stelleregisterein startitemgroup zeigefliesstext stelleueberschriftenein \
-    stellefusszeileein arg definiereliste zentriert platziereliste KAP \
-    starttabellen definierefliesstext stellegegenueberplatzierenein schreibezurreferenzliste stopformel startzeilenkorrektur \
-    startpuffer stellelabeltextein stelletextuntenein definieresynonyme definierefliesstextumgebung definiereblanko \
-    absatz startumbruch setupforms register stellebilderunterschriftein platzierelegende \
-    startgegeben stelleblankoein stellelisteein startumrahmtertext starthintergrund stoppositionieren \
-    reservierengleitobjekt stellepostenein spiegeln verwendemodul stopprojekt stellesystemein \
-    startumgebung unter textreferenz stellegleitobjektein beschreibung definiereabbsymbol \
-    ininner roemischezahlen definierereferenz stellepublikationein feldstapel platziereuntereinander \
-    hintergrund verwendeexternedateien startlokaleumgebung uebersetzten stopnameumbruch stellerechteckein \
-    Buchstaben footnotetext MONAT definierefarbe zeigelayout stopzeilenkorrektur \
-    verwendeexternedatei stellepositionierenein setuprule definiereumrahmt definierebeschreibung definierezusammengestellteliste \
-    keineliste startlokalefussnoten ruecksetzten schreibezumregister textvariable bypassblocks \
+    stellepapierformatein doppelseite stellesynchronisationsbalkenein startlokal seitentyp definieresymbol \
+    verwendereferenzen stoptable wohnort subject definierereferenzliste marginaltext \
+    definierefeld stelleueberschriftein WOERTER placerule stelleuntenein title \
+    definieren stopnamemakeup labeltext gefuelltezeile benutzekodierung bei \
+    stellefussnotendefinitionein positiontext beschriftung bestimmelistencharakeristika seeregister keinzeilenobenundunten \
+    unterstrichen synchronisationsbalken part bruch stellekopfzeileein verbergebloecke \
+    stellepufferein amgitterausrichten stoptextlinie startparagraph holepuffer wortrechts \
+    in startfarbe inzeile platziereregister stelleknopfein waehlepapieraus \
+    stellezeilenein stopfigure stoplocalfootnotes amgitterneuausrichten keinedateienmehr stellehintergruendeein \
+    imrechten type definetextposition stopzitat stellelinienbreiteein klonierefeld \
+    stellesynonymein zurbox stopcolumns tooltip programm stelleinteraktionsbildschirmein \
+    kopierefeld stophiding zeigefarbe konvertierezahl stopopposite Wort \
+    stopproduct startoverview korrigierezwischenraum inanderermarginale definieretabulator keinebloeckemehr \
+    stellegefuelltesrechteckein startbuffer stelleinteraktionsbalkenein stelleanordnenein holebeschriftung stellezwischenraumein \
+    ueberstreichen stelleengerein ran stellemarginallinieein stopsynchronization ref \
+    stopnarrower stopunpacked verknuepfregister definierestartstop description startprojekt \
+    keinekopfundfusszeilen stelletextobenein stellespracheein kommentar platzierenebeneinander stellefelderin \
+    notiz stopinteraktionsmenue stellespaltenein platzierereferenzliste pos labeling \
+    completelistofsorts definetextvariable zeigepalette showsymbolset stoplegend stoptabulate \
+    setupformulae irgendwo linksbuendig stellekopfzeilentextein unterstreichen stelleduennerumrissein \
+    kopf stelleseitennummerein stoplocalenvironment stellekombinationein einziehen startline \
+    festesspatium stopframedtext rechtsbuendig installieresprache heutigesdatum emptylines \
+    sym stopbuffer verknuepfebeschriftung stelleprofilein tab stopfarbe \
+    starttextlinie stelleabschnittein definierefeldstapel listsymbol stellemarginalblockein startdocument \
+    subsubject Cap tippedatei definierepalette von Buchstabe \
+    stelleumrahmtein format passendfeld einezeile duennelinie placelistofsynonyms \
+    ausfuellfeld startinteraktionsmenue wechselezumfliesstext stelletabein stoplinecorrection definetype \
+    stelleabsaetzeein doppelseitigespapier stellebindestrichein synonym zeigefliesstextumgebung stopkleinerdurchschuss \
+    but startfigure stellegefuelltezeileein chem definieretabellenvorlage behaltebloecke \
+    completeregister verwendebefehl feld stopgeg stellepaletteein stelletextumrissein \
+    ueberstrichen sort stelletippenein bookmark startlinecorrection startcombination \
+    startregister stellelayoutein CAP stelletoleranzein stellefarbenein definiereinteraktionsmenue \
+    tief rechteck subsubsection stoptables startkomponente stellegleitobjekteein \
+    nachunten vergleichefarbengruppe stelletabellenein setuppaper ueber definiereabschnittsblock \
+    schreibezwischenliste stopumbruch nichteinziehen tiho position stopitemgroup \
+    stelleseitenuebergangein stelletipein marginallinie farbe textlinie startfloattext \
+    stoplokal zitieren definierepapierformat verweisdatum hoch completelistoffloats \
+    stellereferenzlisteein definieretext buchstabe tip definiereeinzug stellenummerierungein \
+    stellespatiumein its stellezeilennumerierungein stelleumrahmtetexteein verweis stellesynchronisationein \
+    definieresortieren stoplinenumbering enumeration waehleversionaus startkommentar monat \
+    zeigeeinstellungen stopumgebung startversion inouter verwendesymbole stopmarginblock \
+    durchgestrichen verwendeexteresdokument stelledrehenein startzitat stelleurlein stopline \
+    publikation definiereschrift imlinken startcolumns definiereregister stelleeinzuegein \
+    stellefusszeilentextein spalte subsubsubject definerawfont platziereunterformel stelleausgabeein \
+    stopformula zeigefarbengruppe startmarginallinie definierenummerierung bearbeitebloecke keintest \
+    definierebeschreibungen stopkomponente startunpacked ruecksetztenbeschriftung definierelogo registrierefelder \
+    ausschnitt completelistofsynonyms stopparagraph definiereprogramme definierefarbengruppe stellebeschriftungein \
+    buchstaben punkt platzierefussnoten stellekopfzahlein defineoutput definieresubfeld \
+    indentation stopprofile nocap chapter startgeg stoptyping \
+    keinzwischenraum definieregleitobjekt stelletextein seitenreferenz symbol durchstreichen \
+    WOCHENTAG gefuelltesrechteck Woerter stelleexterneabbildungenein folgeprofil completecombinedlist \
+    stopversion stoppositioning keinebeschriftung loadsorts placefloat version \
+    stelleinteraktionein referenz switchtorawfont stellezitierenein stophintergrund stopkommentar \
+    stelleregisterein startitemgroup zeigefliesstext starttyping stelleueberschriftenein paragraph \
+    stellefusszeileein arg definiereliste zentriert startproduct platziereliste \
+    definierefliesstext stellegegenueberplatzierenein schreibezurreferenzliste startopposite stellelabeltextein stelletextuntenein \
+    definieresynonyme definierefliesstextumgebung stopfloattext definiereblanko startumbruch setupforms \
+    register stellebilderunterschriftein platzierelegende stelleblankoein nextsection placelistoffloats \
+    stellelisteein starthintergrund stellepostenein spiegeln verwendemodul startnamemakeup \
+    stopprojekt stellesystemein startumgebung textreferenz stellegleitobjektein definiereabbsymbol \
+    ininner section roemischezahlen definierereferenz stellepublikationein startmarginblock \
+    feldstapel coupledregister startprofile starttabulate platziereuntereinander hintergrund \
+    stopcombination verwendeexternedateien startenumeration uebersetzten stellerechteckein Buchstaben \
+    placelistofsorts stopoverview footnotetext MONAT definierefarbe zeigelayout \
+    verwendeexternedatei stellepositionierenein setuprule subsection definiereumrahmt definierebeschreibung \
+    definierezusammengestellteliste keineliste ruecksetzten schreibezumregister textvariable bypassblocks \
     verwendeURL platzierezusammengestellteliste platzierelokalefussnoten zu wochentag rechtecke \
-    startueberblick bestimmekopfnummer nop platzierebookmarks passelayoutan imumriss \
-    entknuepfebeschriftung stelleabschnittsblockein labels definieretippen stelleprogrammein definierebeschriftung \
-    definierepuffer zeigerahmen stellefeldein stellebildunterschriftein stoptabellen stopoverlay \
-    stellefarbeein stellezeilenabstandein vergleichepalette stelleblockein hauptsprache stelleausschnittein \
-    stopumrahmtertext blanko stelleueberschrifttextein tex definiereabschnitt zeigeumbruch \
-    definierelabel definiereumbruch interaktionsbalken name stelletabulatorein setupitemgroup \
-    settextvariable startnummerierung stellehintergrundein stopverbergen stelleseitennummeriernungein stopgegeben \
-    zeigeexterneabbildungen beschrifteversion benutzespezielles zeigestruts definierekonversion zusatz \
-    heutigeskopfnummer sortiere stopzeilennumerierung vollendeauflistenvongleitobjekte setupstrut startdokument \
-    verknuepfedokument stelleabsatznummerierungein kleinerdurchschuss stellerasterein starttabulator WORT \
-    posten stellefussnotenein seite umrahmt startzeilen setuptextposition \
+    bestimmekopfnummer nop platzierebookmarks passelayoutan starttable starttables \
+    imumriss framedtext entknuepfebeschriftung stelleabschnittsblockein labels definieretippen \
+    stopdocument stelleprogrammein definierebeschriftung definierepuffer starthiding zeigerahmen \
+    stellefeldein stellebildunterschriftein stopoverlay stellefarbeein stellezeilenabstandein vergleichepalette \
+    stelleblockein hauptsprache appendix stelleausschnittein blanko stelleueberschrifttextein \
+    tex definiereabschnitt startdescription zeigeumbruch definierelabel definiereumbruch \
+    interaktionsbalken name stelletabulatorein setupitemgroup settextvariable stellehintergrundein \
+    stelleseitennummeriernungein zeigeexterneabbildungen beschrifteversion startpositioning startlegend benutzespezielles \
+    zeigestruts stopdescription startalignment definierekonversion zusatz heutigeskopfnummer \
+    setupstrut verknuepfedokument usedirectory stelleabsatznummerierungein startformula kleinerdurchschuss \
+    stellerasterein stoppostponing startframedtext stopenumeration WORT posten \
+    startnarrower startsynchronization stellefussnotenein seite umrahmt setuptextposition \
     stelleumbruchein drehen folgeversion crlf folgeprofilversion datum \
-    definiereprofil zeigefelder knopf stopmarginallinie graufarbe schreibezurliste \
-    externeabbildung hl synchronisieren stellelegendeein definerule stelleinmarginalieein \
-    kopfnummer ausfuelltext vollendeauflistenvonsortieren startgrosserdurchschuss definiereoverlay platziereauflistenvonsortieren \
-    definiereabsaetze beschriftung*abbildung ziffern stellezusammengestelltelisteein startoverlay setuptextvariable \
-    definiereversion zwischenraum forceblocks stelleunterstreichenein sprache stopspalten \
-    definiereueberschrift stellesymbolsetein mathematik startprofil waehlebloeckeaus tippepuffer \
-    startpositionieren zitat startsymbolset definiereblock bildschirm stopbeschreibung \
-    stellebeschreibungein thema kap definierereferenzformat stellefliesstextumgebungein inaktiviereinteraktionsmenue \
-    spatium gitter zeigegitter stelleplatziegeteiltegleitobjekt stopenger stopkombination \
-    platzierelogo startkleinerdurchschuss teil Roemischezahlen ueberschrifttext stelleversionein \
-    stopsymbolset stelleeinziehenein gestreckt haarlinie vl platziereformel \
-    duennerumriss stelleversalienein verwendeexterneabbildung stellesortierenein stellenobenein mar \
-    interaktionsknopfe verwendeexternestonstueck aufseite bearbeiteseite ladensynonyme stelleausrichtungein \
-    teilegleitobjekt zeigedruck stellekommentarein stellereferenzierenein stelleunterseitennummerein definiereumrahmtertext \
-    stelletexttexteein keinspatium inmarginalie vollenderegister fussnote stellefliesstextein \
-    startkombination placetextvariable referieren*abbildung verwendebloecke 
+    startpostponing definiereprofil zeigefelder knopf stopmarginallinie graufarbe \
+    schreibezurliste externeabbildung hl synchronisieren stellelegendeein definerule \
+    stelleinmarginalieein kopfnummer ausfuelltext definiereoverlay definiereabsaetze ziffern \
+    stellezusammengestelltelisteein startoverlay setuptextvariable definiereversion zwischenraum forceblocks \
+    stelleunterstreichenein sprache loadsynonyms definiereueberschrift stellesymbolsetein mathematik \
+    cap waehlebloeckeaus tippepuffer zitat startsymbolset definiereblock \
+    bildschirm stellebeschreibungein definierereferenzformat stellefliesstextumgebungein inaktiviereinteraktionsmenue spatium \
+    gitter reservefloat zeigegitter stelleplatziegeteiltegleitobjekt platzierelogo startkleinerdurchschuss \
+    stopalignment Roemischezahlen ueberschrifttext stelleversionein stopsymbolset Caps \
+    stoplines stelleeinziehenein gestreckt haarlinie vl platziereformel \
+    duennerumriss stelleversalienein verwendeexterneabbildung stellesortierenein startlocalenvironment stellenobenein \
+    mar interaktionsknopfe startlocalfootnotes verwendeexternestonstueck aufseite bearbeiteseite \
+    stelleausrichtungein teilegleitobjekt zeigedruck stellekommentarein stellereferenzierenein stelleunterseitennummerein \
+    definiereumrahmtertext startlines stelletexttexteein keinspatium inmarginalie mediaeval \
+    fussnote stellefliesstextein placetextvariable startlinenumbering sub verwendebloecke 
diff --git a/context/data/cont-de.tws b/context/data/cont-de.tws
index 10548af75..a162a3259 100644
--- a/context/data/cont-de.tws
+++ b/context/data/cont-de.tws
@@ -3138,12 +3138,6 @@ val:*Nummer::
 stopsetup
 
 startsetup
-com:wohnort:
-typ:arg/:
-val:*Text::
-stopsetup
-
-startsetup
 com:posten:
 typ:vars/args/:
 ivr:stellepostenein::
diff --git a/context/data/cont-en.tws b/context/data/cont-en.tws
index 6464f145c..adc1bef06 100644
--- a/context/data/cont-en.tws
+++ b/context/data/cont-en.tws
@@ -3138,12 +3138,6 @@ val:*number::
 stopsetup
 
 startsetup
-com:domicile:
-typ:arg/:
-val:*text::
-stopsetup
-
-startsetup
 com:items:
 typ:vars/args/:
 ivr:setupitems::
diff --git a/context/data/cont-it-scite.properties b/context/data/cont-it-scite.properties
index a7cbd0270..023f1e024 100644
--- a/context/data/cont-it-scite.properties
+++ b/context/data/cont-it-scite.properties
@@ -1,79 +1,96 @@
 keywordclass.macros.context.it=\
-    nocap notapdp definiscielenco impostatestifondo impostaoggettimobili impostacombinazioni \
-    nientelineecimafondo usablocco etichettatura spaziobianco bastablocchi impostadescrizioni \
-    reimpostamarcatura definiscienumerazione parte frazione sincronizza caricasinonimi \
-    completoelencocombinato accoppiatoregistro griglia scriviinregistro impostabloccosezione impostapdp \
-    chim domicilio testoinstestazioni impostarigovuoto impostatab ruota \
-    impostamaiuscole sopralinee vaia logcampi impostafontdeltesto impostapulsanti \
-    impostacolori marcatura typebuffer impostainmargine definiscirientro daqualcheparte \
-    definiscisottocampo lettera impostadefinizionenotepdp impostasinonimi accoppiacarta impostamakeup \
-    usafiguraesterna nientespazio definiscicampo seguiprofilo impostatesto arg \
-    elemento impostaoutput completoregistro definiscifont definiscitestoincorniciato enumerazione \
-    in definiscilinea impostatesticima definiscielencocombinato bastafile data \
-    definiscirigovuoto impostatabulato impostaurl definiscilistariferimenti impostatype type \
-    circondato marcaversione impostaspaziobianco mettisegnalibro citazione impostacolore \
-    impostaversioni tooltip impostafigureesterne impostalegenda impostatestiincorniciati usasimboli \
-    copiacampo referring*figura mettiformula nientelineintestazionepdp completoelencodioggettimobili lineesottili \
-    spostaagriglia impostainterazione definiscimakeup vaiabox impostarigheriempimento definisci \
-    definisciconversione incorniciato impostasottolinea lineanera impostatestoetichette inaltromargine \
-    numerotesta definiscisovrapposizione impostaelencocombinato variabiletesto programma impostatyping \
-    qualcheriga allineacentro menzione usariferimenti Parole selezionacarta \
-    ran mostraimpostazioni camporiempimento elaborapagina PAROLA impaccato \
-    scriviinlistariferimenti mettielencodisinonimi mettielencodioggettimobili impostanumerazione usadocumentoesterno indestra \
-    al impostacampo campi mostracornice nienterientro definiscifontgrezzo \
-    definisciincorniciato marcatura*figura impostaclippling definiscicapoversi forzablocchi convertinumero \
-    impostaspaziatura prendibuffer pulsantinterazione impostaordinamento ininner rientro \
-    mostramakeup impostamenzione versione impostaspezzamentooggettomobile testoetichetta tipopagina \
-    medievale impostaincorniciato typ impostacaption impostatesta typefile \
-    sbarrato Lettera impostanumerazionecapoversi cambiaafontdeltesto impostamarcatura usaspecialita \
-    mettiingriglia apagina mostrastampa impostasfondo numerotestacorrente mettielenco \
-    impostalineemargine mettiloghi mostracampi sim disabilitamenuinterazione definiscimarcatura \
-    impostalineetesto nientemarcatura impostabarrasincronizzazione barrainterazione nientespaziobianco definisciriferimento \
-    impostapiustretto completoelencodisinonimi definisciformatoriferimento saltablocchi completoelencodisorts commento \
-    sottocapoverso pubblicazione vaigiu lineasottile scriviinelenco passaafontgrezzo \
-    Lettere schermo mettioggettomobile descrizione impostatestotesti usaURL \
-    emptylines nop vediregistro lettere impostariferimento impostalinea \
-    inmargine sottosottoargomento tab listsymbol definiscivariabiletesto selezionaversione \
-    rigovuoto adattalayout impostacolonne Cap seguiversioneprofilo fondo \
-    riferimentotesto numeri mettinotepdplocali correggispaziobianco adding clonacampo \
-    colonna impostablocco successivosezione impostaelementi da impostatransizionepagina \
-    impostanumerosottopagina usacartella impostarighe elementi riferimento tieniblocchi \
-    numeriromani tex iniziaregistro paroladestra impostacapoversi impostalineeriempimento \
-    definiscicolore notest sottolinea mettilistariferimenti setupitemgroup titolo \
-    accoppiadocumento elaborablocchi definiscidimensionicarta usacomandi definisciambientefontdeltesto determinacarattersticheelenco \
-    nota start mettivariabiletesto impostalistariferimenti testoincorniciato matematica \
-    impostasistema definiscitesto definisciposizionetesto impostaoggettomobile impostabarrainterazione scala \
-    definiscietichetta clip usafileesterni impostatavolozza impostaallineamento impostaprofili \
-    mettielencocombinato impostacaptions impostaforms impostaprogrammi spezzaoggettomobile mostrastruts \
-    impostarientri adattacampo riservaoggettomobile sort MESE mostrafontdeltesto \
-    testonotapdp lingua coloregrigio CAP pedap figuraesterna \
-    definiscibuffer mostragruppocolori impostanotepdp usacodifica definisciordinamento appendice \
-    sottoargomento mostratavolozza mese PAROLE intorno setuppaper \
-    etichette mettifiancoafianco impostasegnosillabazione impostaposizionetesto definiscifontdeltesto scrividentroelenco \
-    crlf sotto separamarcatura impostalineesottili datareferral rigariempimento \
-    simbolo rif definiscisinonimi ped definiscimenuinterazione posizione \
-    impostarientro inriga definisciregistro hl definiscitesta segnalibro \
-    mostrafiguresterne mettielencodisorts accoppiaregistro linguaprincipale impostalingua installalingua \
-    mostracolore mostrasetsimboli impostaenumerazioni impostacommento allineasinistra selezionablocchi \
-    registro impostaregistro impostasincronizzazione definisciiniziatermina pulsante impostaposizionamento \
-    posizionatesto capoverso impostaampiezzariga lineamargine impostatestointestazioni impostatestipdp \
-    impostaformule impostatestiintestazioni riferimentopagina impostanumerazionerighe impostainstestazione impostasezione \
-    sopralinea mettilinea seguiversione impostainterlinea definisciversion cap \
-    impostapubblicazioni mostraambientefontdeltesto definiscistackcampi pulsantemenu reimposta mettiunosullaltro \
-    definisciprogramma testoinmargine lineatesto lineeriempimento capitolo stackcampi \
-    ap inouter mostragriglia testa definiscigruppocolori definiscidescrizione \
-    allineadestra Parola impostavariabiletesto definiscibloccosezione usamodulo Numeriromani \
-    argomento capello definiscitabulato impostatolleranza impostaelenco impostablocchimargine \
-    riflessione definiscitype sottosottocapoverso impostaparranging impostanumeropagina datadioggi \
-    sfondo nienteelenco definiscisimbolo determinanumerotesta usafileesterno definiscioggettomobile \
-    definisciblocco Caps colore definiscityping impostalayout sinonimo \
-    lineenere GIORNOSETTIMANA definiscioutput impostacima vl punti \
-    mostralyout caricasorts definiscilogo confrontagruppocolori mettisottoformula impostabuffer \
-    prendimarcatura impostalineenere impostacampi mettinotepdp sottolinee impostasetsimboli \
-    spazio barrasincronizzazione impostatabelle mar definiscitavolozza impostasfondi \
-    usacolonnasonoraesterna impostaambientefontdeltesto referral insinistra impostarotazione impostanumerotesta \
-    definisciprofilo nascondiblocchi accoppiapagina traduci testoriempimento pagina \
-    mettilegenda spazifissi setvariabiletesto stirato sbarrati impostafondo \
-    impostaschermointerazione definiscimodellotabella impostaposizionamentoopposti impostaschermi giornosettimana nome \
-    impostadimensionicarta definiscisezione stop confrontatavolozza impostastrut impostateste \
-    definiscifigurasimbolo impostanumerazionepagina accoppiamarcatura mettiregistro el 
+    startcolore notapdp definiscielenco impostatestifondo stoptable impostaoggettimobili \
+    impostacombinazioni spaziobianco subject frazione sincronizza title \
+    scriviinregistro stopnamemakeup impostabloccosezione impostapdp impostarigovuoto ruota \
+    impostamaiuscole sopralinee vaia logcampi impostafontdeltesto marcatura \
+    seeregister typebuffer definiscirientro part lettera impostasinonimi \
+    usafiguraesterna definiscicampo startparagraph impostatesto elemento impostaoutput \
+    definiscitestoincorniciato in definiscilinea definiscielencocombinato stopfigure stoplocalfootnotes \
+    impostatabulato impostaurl type marcaversione impostaspaziobianco stopcolumns \
+    mettisegnalibro impostacolore tooltip stopversione impostafigureesterne copiacampo \
+    mettiformula nientelineintestazionepdp stophiding spostaagriglia stopopposite definiscimakeup \
+    stopproduct startoverview incorniciato impostasottolinea impostatestoetichette inaltromargine \
+    numerotesta startbuffer definiscisovrapposizione impostaelencocombinato variabiletesto programma \
+    allineacentro menzione usariferimenti Parole selezionacarta ran \
+    mostraimpostazioni camporiempimento PAROLA stopsynchronization impostanumerazione usadocumentoesterno \
+    stopnarrower stopunpacked indestra description impostacampo definiscifontgrezzo \
+    definisciincorniciato impostaclippling definiscicapoversi forzablocchi convertinumero impostaspaziatura \
+    prendibuffer mostramakeup impostamenzione tipopagina impostaincorniciato typ \
+    labeling impostatesta sbarrato impostanumerazionecapoversi cambiaafontdeltesto impostamarcatura \
+    usaspecialita apagina mostrastampa completelistofsorts impostasfondo mettielenco \
+    mettiloghi stoplegend stoptabulate setupformulae definiscimarcatura impostalineetesto \
+    nientemarcatura barrainterazione definisciriferimento impostapiustretto stoplocalenvironment definisciformatoriferimento \
+    saltablocchi startcomponenet startline stopframedtext vaigiu lineasottile \
+    scriviinelenco passaafontgrezzo Lettere emptylines impostariferimento stopbuffer \
+    inmargine tab listsymbol stopcolore definiscivariabiletesto startdocument \
+    impostacolonne subsubject Cap fondo riferimentotesto correggispaziobianco \
+    clonacampo colonna impostaelementi placelistofsynonyms da impostanumerosottopagina \
+    numeriromani startfatto paroladestra impostacapoversi stoplinecorrection startlineamargine \
+    impostalineeriempimento sottolinea accoppiadocumento stopmakeup synonym elaborablocchi \
+    mettivariabiletesto impostalistariferimenti startfigure impostasistema definisciposizionetesto scala \
+    stopfatto usafileesterni completeregister impostaprofili impostacaptions startmakeup \
+    startlocale mostrastruts adattacampo sort MESE startlinecorrection \
+    mostrafontdeltesto testonotapdp startcombination startregister lingua coloregrigio \
+    CAP pedap figuraesterna definiscibuffer mostragruppocolori subsubsection \
+    stoptables usacodifica definisciordinamento mostratavolozza mese PAROLE \
+    intorno startversione setuppaper etichette impostasegnosillabazione impostaposizionetesto \
+    definiscifontdeltesto datareferral simbolo rif definiscisinonimi posizione \
+    stoplocale inriga definisciregistro stopitemgroup definiscitesta startimpaccato \
+    accoppiaregistro impostalingua stopcitazione startfloattext impostaenumerazioni selezionablocchi \
+    impostaregistro startsfondo pulsante completelistoffloats impostatestiintestazioni startmenuinterattivo \
+    impostanumerazionerighe mettilinea seguiversione impostainterlinea definisciversion impostapubblicazioni \
+    mostraambientefontdeltesto definiscistackcampi stoplinenumbering enumeration reimposta ap \
+    startprogetto inouter definiscigruppocolori stopmarginblock definiscidescrizione usamodulo \
+    startambiente capello definiscitabulato impostatolleranza impostaelenco stopmenuinterattivo \
+    definiscitype impostanumeropagina stopline datadioggi sfondo determinanumerotesta \
+    usafileesterno definiscioggettomobile definisciblocco startcolumns impostalayout lineenere \
+    GIORNOSETTIMANA definiscioutput definiscilogo subsubsubject mettisottoformula impostabuffer \
+    impostalineenere impostacampi impostasetsimboli spazio barrasincronizzazione stopformula \
+    definiscitavolozza impostasfondi usacolonnasonoraesterna startunpacked nascondiblocchi completelistofsynonyms \
+    pagina stopparagraph mettilegenda stirato sbarrati impostafondo \
+    definiscimodellotabella impostaschermi startcitazione definiscisezione impostastrut impostateste \
+    impostanumerazionepagina accoppiamarcatura mettiregistro el indentation startcommento \
+    stopprofile nocap chapter stoptyping nientelineecimafondo usablocco \
+    bastablocchi impostadescrizioni definiscienumerazione reimpostamarcatura griglia chim \
+    testoinstestazioni completecombinedlist domicilio stoppositioning impostatab loadsorts \
+    impostapulsanti impostacolori placefloat daqualcheparte impostainmargine definiscisottocampo \
+    impostadefinizionenotepdp impostamakeup accoppiacarta startitemgroup starttyping paragraph \
+    nientespazio seguiprofilo arg definiscifont startproduct impostatesticima \
+    bastafile data definiscirigovuoto definiscilistariferimenti impostatype circondato \
+    startopposite citazione impostaversioni impostalegenda impostatestiincorniciati usasimboli \
+    lineesottili stopfloattext impostainterazione vaiabox impostarigheriempimento register \
+    stopimpaccato definisciconversione definisci lineanera nextsection placelistoffloats \
+    impostatyping qualcheriga startnamemakeup elaborapagina impaccato scriviinlistariferimenti \
+    al campi mostracornice nienterientro ininner impostaordinamento \
+    pulsantinterazione section rientro testoetichetta startmarginblock impostaspezzamentooggettomobile \
+    versione coupledregister startprofile impostacaption starttabulate Lettera \
+    typefile stopcombination mettiingriglia startenumeration impostalineemargine numerotestacorrente \
+    mostracampi sim disabilitamenuinterazione placelistofsorts stopoverview impostabarrasincronizzazione \
+    nientespaziobianco subsection commento pubblicazione schermo impostatestotesti \
+    usaURL nop starttable starttables startlineatesto lettere \
+    impostalinea framedtext selezionaversione stopdocument adattalayout rigovuoto \
+    seguiversioneprofilo numeri mettinotepdplocali starthiding adding stopoverlay \
+    impostablocco appendix impostatransizionepagina impostarighe elementi riferimento \
+    tieniblocchi tex startdescription name notest definiscicolore \
+    mettilistariferimenti setupitemgroup definiscidimensionicarta usacomandi definisciambientefontdeltesto determinacarattersticheelenco \
+    nota matematica definiscitesto impostaoggettomobile impostabarrainterazione definiscietichetta \
+    startpositioning clip impostatavolozza startlegend impostaallineamento mettielencocombinato \
+    impostaforms stopdescription startalignment impostaprogrammi spezzaoggettomobile impostarientri \
+    stopprogetto usedirectory startformula stoppostponing impostanotepdp startframedtext \
+    stopenumeration startnarrower startsynchronization mettifiancoafianco scrividentroelenco crlf \
+    separamarcatura impostalineesottili rigariempimento startpostponing stopsfondo ped \
+    impostarientro definiscimenuinterazione stoplineatesto hl stopcommento segnalibro \
+    stopcomponenet mostrafiguresterne linguaprincipale installalingua mostrasetsimboli mostracolore \
+    impostacommento allineasinistra impostasincronizzazione definisciiniziatermina startoverlay impostaposizionamento \
+    posizionatesto impostatestipdp impostatestointestazioni lineamargine impostaampiezzariga loadsynonyms \
+    riferimentopagina impostainstestazione sopralinea impostasezione stopambiente cap \
+    startsymbolset mettiunosullaltro definisciprogramma testoinmargine lineeriempimento lineatesto \
+    stackcampi mostragriglia testa reservefloat allineadestra Parola \
+    impostavariabiletesto definiscibloccosezione Numeriromani impostablocchimargine stopalignment riflessione \
+    impostaparranging nienteelenco definiscisimbolo stopsymbolset colore Caps \
+    stoplines definiscityping impostacima vl mostralyout punti \
+    confrontagruppocolori prendimarcatura mettinotepdp sottolinee stoplineamargine startlocalenvironment \
+    impostatabelle mar startlocalfootnotes impostaambientefontdeltesto referral insinistra \
+    impostanumerotesta impostarotazione traduci accoppiapagina definisciprofilo testoriempimento \
+    spazifissi setvariabiletesto startlines impostaposizionamentoopposti impostaschermointerazione mediaeval \
+    giornosettimana impostadimensionicarta confrontatavolozza definiscifigurasimbolo startlinenumbering sub 
diff --git a/context/data/cont-it.tws b/context/data/cont-it.tws
index 66024f86b..85a9fb775 100644
--- a/context/data/cont-it.tws
+++ b/context/data/cont-it.tws
@@ -3138,12 +3138,6 @@ val:*numero::
 stopsetup
 
 startsetup
-com:domicilio:
-typ:arg/:
-val:*testo::
-stopsetup
-
-startsetup
 com:elementi:
 typ:vars/args/:
 ivr:impostaelementi::
diff --git a/context/data/cont-nl-scite.properties b/context/data/cont-nl-scite.properties
index 976151e8b..671d9da4a 100644
--- a/context/data/cont-nl-scite.properties
+++ b/context/data/cont-nl-scite.properties
@@ -1,97 +1,96 @@
 keywordclass.macros.context.nl=\
-    stopachtergrond stopkantlijn stelkapitalenin voetnoottekst stelsynchronisatiein startdoordefinitie \
-    stoptabel alinea stopprodukt stoplegenda koppelpagina gebruikspecials \
-    stopmargeblok definieerplaatsblok paragraaf stelinmargein uitgerekt stelpublicatiesin \
-    tooninstellingen gebruikexternefiles plaatslegenda steltekstin stelhoofdtekstenin markeerversie \
-    citeer breuk stopregel symbool invullijnen kenmerkdatum \
-    koppeldocument definieerkorps geenlijst typebuffer haalbuffer kleur \
-    stopregelcorrectie stelcombinatiesin definieeralineas commentaar woonplaats stopsmaller \
-    stellegendain startsynchronisatie stelvoetin nokap stopkolommen tekstlijn \
-    in definieerpapierformaat startdoornummering inspringen stelkolommenin onderstrepen \
-    installeertaal steltypein type steldunnelijnenin Romeins oppagina \
-    Kaps inrechter starttekstlijn koppelmarkering regelmidden startcitaat \
-    stelkoptekstin Kap reserveerblok stelboventekstenin stelregelsin definieertabulatie \
-    stelmargeblokkenin stelvoetnotenin Woord stellabeltekstin startbuffer programma \
-    switchnaarkorps stelpositionerenin taal definieersymbool ran gebruikexternfiguur \
-    stelpaletin inbinnen ref stelpaginanummeringin stopregels registreervelden \
-    stopnaamopmaak woordrechts onderwerp startversie startprodukt deel \
-    toonkleurgroep overstreep invulveld overstrepen steltabin volgversie \
-    stoptekstlijn stelkopin definieerblanko typ grijskleur startregels \
-    stopregelnummeren stelhoofdin definieerkleur stelveldin volledigeregister gekoppelderegister \
-    startverbergen onderstreep volledigesamengesteldelijst romeins stelspatieringin stelsynchronisatiebalkin \
-    stelonderin stelopmaakin stelpapierformaatin about plaatsformule definieerkop \
-    refereer*figuur stelkleurin steltaalin definieeromlijnd steltekstvariabelein stellijnin \
-    stelinteractiebalkin stelregisterin noot steluitvoerin subparagraaf sym \
-    schrijftussenlijst stelbovenin definieerkadertekst stopbuffer definieermarkering steltabulatiein \
-    inregel tab blokjes stopcommentaar stelsynoniemenin stelblokjesin \
-    startdocument eenregel definieertypen stelitemsin startgegeven stopcitaat \
-    bepaalkopnummer ergens volledigelijstmetblokken kolom stelinterliniein stelinvulregelsin \
-    MAAND plaatsopgrid vergelijkkleurgroep steltekstpositiein kadertekst converteernummer \
-    vastespaties definieerlijst starttabel plaatslijn stelondertekstenin startvanelkaar \
-    startuitlijnen but startachtergrond versie stelformulesin gebruikmodule \
-    margetekst toonlayout chem definieerbuffer doorlabelen suggestie \
-    gebruikblokken stelsorterenin startregelnummeren steltypenin startkantlijn opelkaar \
-    ontkoppelmarkering startinteractiemenu kantlijn blokkeerinteractiemenu positioneer definieertype \
-    bookmark startregister stelinvullijnenin inlinker toonkorps toonpalet \
-    veld stelonderstrepenin cijfers toonvelden stopgegeven gebruikgebied \
-    stelveldenin labeltekst startopmaak doordefinieren kentekstvariabeletoe steltolerantiein \
-    geenfilesmeer toonkleur stopitemgroup weekdag stopomgeving stelprofielenin \
-    definieerregister letters definieerfiguursymbool doorsprong stopbloktekst button \
-    koppelregister stoponderdeel laadsorteren bijlage interactiebuttons stelinteractieschermin \
-    sorteer volgprofiel geenspatie definieerinteractiemenu its stelkorpsin \
-    steluitlijnenin doorlabel kloonveld laadsynoniemen starttabulatie plaatsbeeldmerken \
-    lijstsymbool spiegel steldoornummerenin gebruikcommandos toonkorpsomgeving toelichting \
-    corrigeerwitruimte naam stelbuttonsin startsmaller stoppositioneren plaatssamengesteldelijst \
-    stopinteractiemenu roteer stopfiguur plaatslijstmetblokken doorspringen definerawfont \
-    toonprint definieerbeeldmerk stelversiesin volledigelijstmetsorteren starttypen startlegenda \
-    startoverzicht paginareferentie steltabellenin pagina gebruiksymbolen stelarrangerenin \
-    reset plaatsregister doordefinitie schrijfnaarlijst vertaal selecteerversie \
-    steldoorspringenin huidigedatum volledigelijstmetsynoniemen definieerkorpsomgeving definieeroverlay startprofiel \
-    vergelijkpalet schaal stellijstin startformule definieerprofiel schrijfnaarreferentielijst \
-    hoog plaatstekstvariabele stoptabulatie hoofdtaal titel rooster \
-    plaatslijst WEEKDAG letter stelpaginanummerin passendveld geenhoofdenvoetregels \
-    stelsamengesteldelijstin stelreferentielijstin Letter regelrechts uit stelblokin \
-    doornummering stopcombinatie naarbox subsubonderwerp definieertabelvorm startregel \
-    soortpagina plaatsreferentielijst stelmarkeringin switchtorawfont definieerprogramma invulregel \
-    startitemgroup stelachtergrondin arg stopdoordefinitie witruimte stelkoppenin \
-    WOORD referentie KAP starttabellen gebruikexterngeluidsfragment stelteksttekstenin \
-    stopdoornummering definieertekstvariabele wiskunde subsubparagraaf positioneertekst stelformulierenin \
-    startnaast stoplokalevoetnoten bepaallijstkenmerken koptekst definieerstartstop stelalineasin \
-    passeerblokken definieerreferentielijst kopnummer citaat synchroniseer stelvoettekstenin \
-    achtergrond register stopprofiel definieeropmaak WOORDEN stelprogrammasin \
-    stopoverzicht startdeelomgeving paslayoutaan gebruikexternefile haalmarkering tekstvariabele \
-    schrijfnaarregister dunnelijn stelomlijndin Woorden stelciterenin publicatie \
-    stoptypen stelblokkopjesin volgprofielversie volgendesectie startopelkaar haarlijn \
-    definieeruitvoer stopvanelkaar stelkadertekstenin geentest stopopelkaar startlokalevoetnoten \
-    omlijnd typefile startkolommen nietinspringen geenmarkering stelplaatsbloksplitsenin \
-    definieersorteren selecteerblokken stelkoppeltekenin startcombinatie plaatsvoetnoten stopdeelomgeving \
-    usecodering stoplokaal verbergblokken startpositioneren stelsysteemin stelstrutin \
-    synchronisatiebalk hoofdstuk Letters stopversie verwerkpagina markeer \
-    inmarge nop steldoordefinierenin definieertekst startonderdeel startbloktekst \
+    stopachtergrond stopkantlijn stelkapitalenin voetnoottekst stelsynchronisatiein koppelpagina \
+    stoptable gebruikspecials subject definieerplaatsblok stelinmargein uitgerekt \
+    title stopnamemakeup stelpublicatiesin tooninstellingen gebruikexternefiles plaatslegenda \
+    steltekstin stelhoofdtekstenin markeerversie citeer breuk symbool \
+    invullijnen kenmerkdatum koppeldocument definieerkorps geenlijst seeregister \
+    typebuffer haalbuffer kleur part stelcombinatiesin definieeralineas \
+    commentaar startparagraph woonplaats stellegendain stelvoetin tekstlijn \
+    in definieerpapierformaat inspringen stelkolommenin stopfigure onderstrepen \
+    stoplocalfootnotes installeertaal steltypein type steldunnelijnenin Romeins \
+    stopcolumns oppagina inrechter starttekstlijn koppelmarkering regelmidden \
+    startcitaat stelkoptekstin stophiding stopopposite stelboventekstenin stopproduct \
+    startoverview stelregelsin definieertabulatie stelmargeblokkenin stelvoetnotenin Woord \
+    stellabeltekstin startbuffer programma switchnaarkorps stelpositionerenin taal \
+    definieersymbool ran gebruikexternfiguur stelpaletin inbinnen stopsynchronization \
+    ref stelpaginanummeringin stopnarrower stopunpacked description registreervelden \
+    woordrechts startversie toonkleurgroep overstreep invulveld overstrepen \
+    steltabin volgversie stoptekstlijn stelkopin definieerblanko typ \
+    labeling grijskleur completelistofsorts stelhoofdin definieerkleur stelveldin \
+    stoplegend stoptabulate onderstreep setupformulae romeins stelspatieringin \
+    stelsynchronisatiebalkin stelonderin stelopmaakin stelpapierformaatin about stoplocalenvironment \
+    plaatsformule definieerkop stelkleurin steltaalin definieeromlijnd steltekstvariabelein \
+    stellijnin stelinteractiebalkin stelregisterin startline stopframedtext noot \
+    steluitvoerin sym schrijftussenlijst stelbovenin definieerkadertekst stopbuffer \
+    definieermarkering steltabulatiein inregel tab blokjes stopcommentaar \
+    stelsynoniemenin stelblokjesin startdocument eenregel subsubject definieertypen \
+    Cap stelitemsin stopcitaat bepaalkopnummer ergens kolom \
+    stelinterliniein placelistofsynonyms stelinvulregelsin MAAND plaatsopgrid vergelijkkleurgroep \
+    steltekstpositiein converteernummer vastespaties stoplinecorrection definieerlijst plaatslijn \
+    stelondertekstenin synonym but startachtergrond versie gebruikmodule \
+    margetekst startfigure toonlayout chem definieerbuffer doorlabelen \
+    suggestie gebruikblokken stelsorterenin stopgeg steltypenin startkantlijn \
+    opelkaar ontkoppelmarkering startinteractiemenu sort kantlijn blokkeerinteractiemenu \
+    positioneer definieertype bookmark startlinecorrection startcombination startregister \
+    CAP stelinvullijnenin inlinker toonkorps toonpalet veld \
+    stelonderstrepenin subsubsection stoptables cijfers toonvelden stelveldenin \
+    labeltekst startopmaak doordefinieren kentekstvariabeletoe steltolerantiein geenfilesmeer \
+    toonkleur stopitemgroup weekdag stopomgeving stelprofielenin definieerregister \
+    letters definieerfiguursymbool startfloattext button koppelregister stoponderdeel \
+    completelistoffloats interactiebuttons stelinteractieschermin volgprofiel geenspatie definieerinteractiemenu \
+    its stelkorpsin stoplinenumbering steluitlijnenin enumeration kloonveld \
+    plaatsbeeldmerken lijstsymbool spiegel stopmarginblock steldoornummerenin gebruikcommandos \
+    toonkorpsomgeving corrigeerwitruimte stelbuttonsin stopline plaatssamengesteldelijst stopinteractiemenu \
+    roteer startcolumns subsubsubject doorspringen definerawfont toonprint \
+    definieerbeeldmerk stelversiesin stopformula startunpacked paginareferentie steltabellenin \
+    completelistofsynonyms pagina gebruiksymbolen stopparagraph stelarrangerenin reset \
+    plaatsregister schrijfnaarlijst vertaal selecteerversie steldoorspringenin huidigedatum \
+    definieerkorpsomgeving definieeroverlay vergelijkpalet schaal stellijstin definieerprofiel \
+    schrijfnaarreferentielijst hoog indentation plaatstekstvariabele stopprofile nocap \
+    chapter startgeg hoofdtaal stoptyping rooster plaatslijst \
+    WEEKDAG letter stelpaginanummerin passendveld geenhoofdenvoetregels stelsamengesteldelijstin \
+    stelreferentielijstin completecombinedlist Letter regelrechts stoppositioning uit \
+    stelblokin naarbox definieertabelvorm soortpagina loadsorts plaatsreferentielijst \
+    stelmarkeringin switchtorawfont definieerprogramma invulregel startitemgroup starttyping \
+    paragraph stelachtergrondin arg witruimte stelkoppenin WOORD \
+    referentie startproduct gebruikexterngeluidsfragment stelteksttekstenin definieertekstvariabele stoplokale \
+    wiskunde positioneertekst stelformulierenin startopposite bepaallijstkenmerken koptekst \
+    definieerstartstop stelalineasin passeerblokken definieerreferentielijst kopnummer stopfloattext \
+    citaat synchroniseer stelvoettekstenin achtergrond register definieeropmaak \
+    WOORDEN plaatsplaatsblok nextsection placelistoffloats stelprogrammasin paslayoutaan \
+    gebruikexternefile haalmarkering tekstvariabele schrijfnaarregister startnamemakeup dunnelijn \
+    stelomlijndin Woorden stelciterenin publicatie stelblokkopjesin volgprofielversie \
+    startopelkaar haarlijn definieeruitvoer section stelkadertekstenin geentest \
+    startmarginblock stopopelkaar coupledregister startprofile omlijnd starttabulate \
+    typefile stopcombination nietinspringen startenumeration geenmarkering stelplaatsbloksplitsenin \
+    definieersorteren selecteerblokken stelkoppeltekenin placelistofsorts stopoverview plaatsvoetnoten \
+    usecodering verbergblokken subsection stelsysteemin stelstrutin synchronisatiebalk \
+    Letters stopversie verwerkpagina markeer inmarge nop \
+    starttable starttables steldoordefinierenin definieertekst startonderdeel framedtext \
     stelblokkopjein stelsectiein toongrid labels stopdocument plaatsnaastelkaar \
-    stopuitstellen regellinks splitsplaatsblok definieersectieblok gebruikreferenties stoptabellen \
-    startnaamopmaak stopoverlay stopsynchronisatie copieerveld stelwitruimtein items \
-    som definieerreferentie blanko stelkantlijnin stelkorpsomgevingin tex \
-    stelachtergrondenin plaatssubformule stelnummerenin definieer stelplaatsblokin stopnaast \
-    doorstrepen stopverbergen definieerconversie gebruikexterndocument stopkleur geenwitruimte \
-    inlijnd clip startomgeving plaatslijstmetsorteren definieerveldstapel subonderwerp \
-    plaatslokalevoetnoten plaatsblok plaatslijstmetsynoniemen definieersectie startlokaal stopalinea \
-    selecteerpapier gebruikURL stelcommentaarin startalinea stelitemgroepin stopuitlijnen \
-    stopformule naar forceerblokken stellayoutin interactiebalk crlf \
-    datum definieerveld omlaag toonkader plaatsonderelkaar laho \
-    koppelpapier hl stopopmaak stopsymboolset doorstreep stelsubpaginanummerin \
-    stopkadertekst definieersynoniemen startfiguur laag startkadertekst inbuiten \
-    startoverlay stelrefererenin stelrastersin definieerblok spatie stelkleurenin \
-    definieerlijn stelclipin stelroterenin stelurlin toevoegen inanderemarge \
-    stelbufferin definieerfont geenbovenenonderregels stelregelnummerenin kap synoniem \
-    startuitstellen externfiguur stelnaastplaatsenin invultekst stelinspringenin markeer*figuur \
-    startregelcorrectie stelplaatsblokkenin stelblankoin toonexternefiguren resetmarkering stelparagraafnummerenin \
-    scherm kenmerk huidigekopnummer definieerkleurgroep doornummeren stelpaginaovergangenin \
-    stelsectieblokin plaatsbookmarks zieregister verwerkblokken vl startproject \
-    kop toonsymboolset definieerreferentieformaat tekstreferentie startsymboolset definieerversie \
-    stopproject stelexternefigurenin handhaafblokken mar stelkopnummerin voetnoot \
-    steltekstlijnenin startcommentaar definieerpalet verplaatsopgrid op legeregels \
-    definieertekstpositie toonstruts geenblokkenmeer blokje stelvoetnootdefinitiein punten \
-    stelinteractiein stelsymboolsetin toonopmaak definieersamengesteldelijst mediaeval veldstapel \
-    stellijndiktein startkleur stelpapierin stelsmallerin startmargeblok sub \
-    definieersubveld maand dunnelijnen 
+    regellinks splitsplaatsblok starthiding definieersectieblok gebruikreferenties stopoverlay \
+    copieerveld stelwitruimtein items som appendix definieerreferentie \
+    blanko stelkantlijnin stelkorpsomgevingin tex stelachtergrondenin startdescription \
+    plaatssubformule name stelnummerenin definieer stelplaatsblokin doorstrepen \
+    definieerconversie gebruikexterndocument stopkleur geenwitruimte inlijnd startpositioning \
+    clip startlegend startomgeving definieerveldstapel stopdescription startalignment \
+    plaatslokalevoetnoten definieersectie volledigregister usedirectory selecteerpapier gebruikURL \
+    stelcommentaarin startformula stelitemgroepin stoppostponing startframedtext stopenumeration \
+    startnarrower naar startsynchronization forceerblokken stellayoutin interactiebalk \
+    crlf datum startpostponing definieerveld omlaag toonkader \
+    plaatsonderelkaar laho koppelpapier hl stopopmaak doorstreep \
+    stelsubpaginanummerin definieersynoniemen laag inbuiten startoverlay stelrefererenin \
+    stelrastersin definieerblok spatie stelkleurenin definieerlijn loadsynonyms \
+    stelclipin stelroterenin stelurlin toevoegen inanderemarge cap \
+    stelbufferin definieerfont geenbovenenonderregels startsymbolset stelregelnummerenin externfiguur \
+    stelnaastplaatsenin reservefloat invultekst stelinspringenin stelplaatsblokkenin stelblankoin \
+    toonexternefiguren resetmarkering stelparagraafnummerenin stopalignment scherm startlokale \
+    kenmerk stopsymbolset huidigekopnummer definieerkleurgroep Caps stoplines \
+    doornummeren stelpaginaovergangenin stelsectieblokin plaatsbookmarks verwerkblokken vl \
+    startproject kop toonsymboolset definieerreferentieformaat tekstreferentie definieerversie \
+    stopproject startlocalenvironment stelexternefigurenin handhaafblokken mar stelkopnummerin \
+    startlocalfootnotes voetnoot steltekstlijnenin startcommentaar definieerpalet verplaatsopgrid \
+    op legeregels definieertekstpositie toonstruts geenblokkenmeer blokje \
+    stelvoetnootdefinitiein punten stelinteractiein stelsymboolsetin startlines toonopmaak \
+    definieersamengesteldelijst mediaeval veldstapel stellijndiktein startkleur stelpapierin \
+    stelsmallerin startlinenumbering sub definieersubveld maand dunnelijnen 
diff --git a/context/data/cont-nl.tws b/context/data/cont-nl.tws
index 0ca9d0523..0f3e8b20b 100644
--- a/context/data/cont-nl.tws
+++ b/context/data/cont-nl.tws
@@ -3138,12 +3138,6 @@ val:*getal::
 stopsetup
 
 startsetup
-com:woonplaats:
-typ:arg/:
-val:*tekst::
-stopsetup
-
-startsetup
 com:items:
 typ:vars/args/:
 ivr:stelitemsin::
diff --git a/context/data/cont-ro-scite.properties b/context/data/cont-ro-scite.properties
index 28c783e6c..60e14f91e 100644
--- a/context/data/cont-ro-scite.properties
+++ b/context/data/cont-ro-scite.properties
@@ -1,97 +1,96 @@
 keywordclass.macros.context.ro=\
-    seteazasortare seteazaurl stoptabel plaseazapegrid afiseazasetari stoplegenda \
-    definestefont punelistadesinonime stoplocal faraaliniat definesteenumerare seteazafloats \
-    seteazatextejos punevariabilatext stopnotesubsollocale folosestespeciale textmarginal faraliniisussijos \
-    zidinsaptamana definestemediulfonttext stopmeniuinteractiune seteazatabulatori definestelistacombinata punedeasuprafiecareia \
-    startcomentariu minicitat punerigla puneformula nokap seteazatitluri \
-    startfigura urmeazaversiuneprofil in paginadubla gatablocuri scrieinlista \
-    startnotesubsollocale numereromane seteazadefinireanotasubsol type stopenumerare buton \
-    seteazaecraninteractiune stopblocmarginal potrivestecamp Kaps cuplatregistru tooltip \
-    limba determinacaracteristicilelistei CUVANT referring*figura startcomponenta Cuvant \
-    punelistadeobiectemobile definestetextinconjurat grid stopversiune Kap aliniatcentru \
-    startoverview startimpachetat supralinie seteazafonttext seteazainconjurat Cuvinte \
-    startbuffer definesteblanc trecilafonttext seteazalegenda startlocal ran \
-    afiseazapaleta variabilatext incarcasinonime ref seteazaspatiuinterliniar referintatext \
-    selecteazablocuri marginal reflexie seteazapublicatii completlistacombinata butoaneinteractiune \
-    seteazarotare seteazabarainteractiune startlinie culoaregri startriglatext undeva \
-    typ definestedimensiunehartie enumerare setareoutput remarca decupleazamarcaje \
+    seteazasortare seteazaurl plaseazapegrid afiseazasetari definestefont stoptable \
+    stoplocal faraaliniat definesteenumerare subject seteazafloats seteazatextejos \
+    title stopnamemakeup punevariabilatext folosestespeciale textmarginal faraliniisussijos \
+    zidinsaptamana definestemediulfonttext seeregister part stopmeniuinteractiune seteazatabulatori \
+    definestelistacombinata punedeasuprafiecareia startcomentariu minicitat punerigla startparagraph \
+    puneformula seteazatitluri urmeazaversiuneprofil in paginadubla gatablocuri \
+    scrieinlista stopfigure stoplocalfootnotes numereromane seteazadefinireanotasubsol type \
+    buton seteazaecraninteractiune stopcolumns potrivestecamp tooltip limba \
+    determinacaracteristicilelistei CUVANT startcomponenta Cuvant definestetextinconjurat grid \
+    stopversiune stophiding stopopposite aliniatcentru stopproduct startoverview \
+    startimpachetat supralinie seteazafonttext seteazainconjurat Cuvinte startbuffer \
+    definesteblanc trecilafonttext seteazalegenda startlocal ran afiseazapaleta \
+    variabilatext stopsynchronization ref stopnarrower stopunpacked seteazaspatiuinterliniar \
+    description referintatext selecteazablocuri marginal reflexie seteazapublicatii \
+    butoaneinteractiune seteazarotare seteazabarainteractiune culoaregri startriglatext undeva \
+    typ labeling definestedimensiunehartie setareoutput completelistofsorts decupleazamarcaje \
     barainteractiune instalarelimba seteazapaleta LUNA reseteazamarcaje seteazastrut \
-    CUVINTE stoptabulate definesteculoare despre subsubsectiune setarebarasincronizare \
-    simbol definesteversiune seteazanumerotarelinii marcaje stopcitat punelistacombinata \
-    afiseazastruts seteazasectiune seteazablocsectiune stopproiect referinta selecteazaversiune \
-    puncte nutesta emptylines seteazatext firdepar stopbuffer \
-    definesteinconjurare definestelistareferinte tab sublinii listsymbol dezactiveazameniuinteractiune \
-    seteazaaspect startdocument faralista notasubsol definestetabulatori seteazabutoane \
-    saripesteblocuri definestesortare seteazaliniesilabe startaliniere adubuffer capitol \
-    seteazanumerotareparagrafe folosestebloc stopriglatext seteazadescriere seteazacamp seteazasus \
-    startprodus seteazalista stopprofil stoptabele definetype starttabel \
-    startsetsimboluri stopmakeup lapagina but startobiectmobiltext seteazaaranjareapag \
-    injos definesteoverlay chem scala subsubiect startmediu \
-    la seteazaantet definestereferinte liniemargine startmakeup etichete \
-    determinanumartitlu marcheazaversiune definestegrupculori seteazajos startsincronizare citat \
-    setarelimba seteazatranzitiepagina fractie domiciliu definesteprogram seteazaliniimargine \
-    stoplinie camp dute seteazatabele paragraf puneregistru \
+    CUVINTE stoplegend stoptabulate setupformulae definesteculoare despre \
+    setarebarasincronizare simbol definesteversiune seteazanumerotarelinii marcaje stopcitat \
+    stoplocalenvironment punelistacombinata startline afiseazastruts seteazasectiune seteazablocsectiune \
+    stopproiect stopframedtext referinta selecteazaversiune puncte nutesta \
+    emptylines seteazatext firdepar stopbuffer definesteinconjurare definestelistareferinte \
+    tab sublinii listsymbol dezactiveazameniuinteractiune seteazaaspect startdocument \
+    subsubject Cap faralista notasubsol definestetabulatori seteazabutoane \
+    saripesteblocuri definestesortare seteazaliniesilabe placelistofsynonyms adubuffer seteazanumerotareparagrafe \
+    folosestebloc stopriglatext seteazadescriere seteazacamp seteazasus stoplinecorrection \
+    seteazalista definetype stopmakeup synonym lapagina but \
+    seteazaaranjareapag injos definesteoverlay startfigure chem scala \
+    startmediu la seteazaantet completeregister definestereferinte liniemargine \
+    startmakeup etichete determinanumartitlu marcheazaversiune definestegrupculori sort \
+    seteazajos startlinecorrection startcombination startregister CAP citat \
+    setarelimba seteazatranzitiepagina fractie subsubsection stoptables domiciliu \
+    definesteprogram seteazaliniimargine camp dute seteazatabele puneregistru \
     setuppaper seteazaculoare numartitlucurent stopliniemargine cupleazamarcaje seteazacombinari \
     seteazaliniesubtire definestebloc framed seteazaversiuni definesterigla definestesablontabel \
-    startproiect stopitemgroup etichetare stopfapt folosestereferinte seteazasubsol \
-    seteazalegendele datareferit mutapegrid aliniat spatiu seteazafundal \
-    stopsincronizare definestesinonim completlistadesortari seteazatyping definestebuffer seteazatexteticheta \
-    afiseazafonttext afiseazaculoare folosestedirector jos definesteconversie impartefloat \
-    titlu punelista seteazaspatiu inouter punelogouri urmeazaprofil \
-    seteazanumerotarepagina inframed seteazadimensiunihartie starttabele folosestefisiereexterne traduce \
-    completlistadeobiectemobile startlinii afiseazafiguriexterne scrieintreliste spatiualb startopozit \
-    numere seteazaliniiumplere ascundeblocuri punelistareferinte afiseazacampuri setarepozitie \
-    startcoloane punenotesubsollocale tippagina seteazareferinte startascundere stopnumerotarelinii \
-    comparapaleta stopformula seteazaminicitat folosestedocumentextern sortare riglatext \
-    startlegenda seteazaecrane seteazaelemente pagina comentariu punesubformula \
-    folosestecomenzi reset definestemarcaje startregistru seteazarigleumplere Litere \
-    sectiune stopcoloane corecteazaspatiualb textinconjurat seteazanumartitlu stopobiectmobiltext \
-    el stoptextinconjurat afiseazamediufonttext definestesubcamp definestepozitietext stoptyping \
-    program seteazafloat scriebuffer adapteazaaspect intins linieneagra \
-    textumplere limbaprincipala seteazatexteantet faraspatiualb startmeniuinteractiune starttextinconjurat \
-    parte seteazaaliniate subsubsubiect startversiune seteazamajuscule seteazaalinierea \
-    fundal startfundal copiazacamp punenotesubsol marcaje*figura semncarte \
-    cupleazaregistru ecran blanc stopcombinare seteazaparagrafe seteazablanc \
+    startproiect stopitemgroup folosestereferinte seteazasubsol seteazalegendele startfloattext \
+    datareferit mutapegrid aliniat spatiu completelistoffloats seteazafundal \
+    definestesinonim seteazatyping definestebuffer stoplinenumbering seteazatexteticheta afiseazafonttext \
+    enumeration afiseazaculoare jos definesteconversie impartefloat titlu \
+    punelista seteazaspatiu inouter punelogouri stopmarginblock urmeazaprofil \
+    seteazanumerotarepagina inframed seteazadimensiunihartie folosestefisiereexterne stopline traduce \
+    startcolumns afiseazafiguriexterne scrieintreliste spatiualb numere seteazaliniiumplere \
+    ascundeblocuri punelistareferinte afiseazacampuri subsubsubject setarepozitie punenotesubsollocale \
+    tippagina seteazareferinte comparapaleta stopformula seteazaminicitat folosestedocumentextern \
+    riglatext startunpacked seteazaecrane seteazaelemente completelistofsynonyms pagina \
+    stopparagraph comentariu punesubformula folosestecomenzi reset definestemarcaje \
+    seteazarigleumplere Litere corecteazaspatiualb seteazanumartitlu el afiseazamediufonttext \
+    definestesubcamp indentation definestepozitietext stopprofile nocap chapter \
+    stoptyping program seteazafloat scriebuffer adapteazaaspect intins \
+    linieneagra textumplere limbaprincipala seteazatexteantet faraspatiualb startmeniuinteractiune \
+    seteazaaliniate startversiune seteazamajuscule seteazaalinierea fundal completecombinedlist \
+    startfundal stoppositioning copiazacamp punenotesubsol loadsorts semncarte \
+    placefloat cupleazaregistru ecran blanc seteazaparagrafe seteazablanc \
     definestevariabilatext liniipeste seteazaimpartireafloat folosestemuzicaexterna stivacampuri startitemgroup \
-    starttyping seteazaspatiualb farafisiere arg roteste cloneazacamp \
-    liniepeste KAP trecilafontraw definestemeniuinteractiune afiseazarama Litera \
-    stopfundal data seteazarigla seteazafundaluri litere folosestesimboluri \
-    faraliniiantetsisubsol startliniemargine linieumplere seteazagrosimelinie definestefonttext stopascundere \
-    definesteblocsectiune defineste texttitlu liniinegre apendix startenumerare \
-    seteazamarcaje element publicatie setaresincronizare definestesimbol afiseazagrupculoare \
-    litera ininner seteazaaliniat stopparagraf stopculoare seteazacomentariu \
-    definesteformatreferinte numartitlu starttabulate typefile definestestartstop definestepaleta \
-    definesteparagraf scrieinlistareferinte seteazanumarpagina rezervatobiectmobil seteazanumerotare afiseazatiparire \
-    stoppozitionare seteazabuffer definestefloat rigleumplere sim definesteantet \
-    startpozitionare medieval stopoverview footnotetext stopneimpachetat definestestivacampuri \
-    urmatorulsectiune veziregistru logcampuri inlinie startdescriere seteazamediulfonttext \
-    sublinie barasincronizare nume stopsetsimboluri punefatainfata seteazasublinie \
-    definesteeticheta jossus nop stopmediu definestealiat definestetyping \
-    startcorectielinie definestetexteinconjurate seteazatextesubsol liniesubtire stopdocument stoplinii \
-    sincronizeaza startcitat Numereromane ZIDINSAPTAMANA descriere seteazaingust \
-    stopoverlay seteazaplasareaopozita setvariabilatext definestefontraw punelistadesortari seteazamakeup \
-    olinie indreapta instanga seteazasistem stopcomentariu tex \
-    cuvantdreapta stopdescriere pastreazablocuri datacurenta seteazalistareferinte setupitemgroup \
-    seteazacoloane startnumerotarelinii nota stopnumemakeup faramarcaje matematica \
-    convertestenumar selecteazahartie referit clip impachetat inalt \
-    folosestefisierextern startblocmarginal seteazaclipping seteazatoleranta startfapt stopopozit \
-    seteazaregistru adauga definestedescriere startcombinare punelegenda afiseazagrid \
-    startparagraf startformula butonmeniu registru stoppostponing cupleazadocument \
-    campumplere seteazalinii crlf stopingust startpostponing afiseazasetsimboluri \
-    folosestecodificarea plaseazasemnecarte seteazanotasubsol indentare versiune hl \
-    completlistadesinonime dutebox definesteoutput inaltamargine seteazatitlu stopaliniere \
-    folosestefiguraexterna seteazasinonime completregistru afiseazaaspect texteticheta incarcasortari \
-    seteazatab definestelogo startoverlay stopcorectielinie subiect seteazaprofile \
-    subsectiune definestelista coloana definesteprofil referintapagina puneobiectmobil \
-    seteazablocurimarginale luna seteazarigletext seteazatexttitlu startingust startprofil \
-    proceseazapagina seteazaliniinegre pozitietext seteazaformulare seteazacampuri startneimpachetat \
-    startculoare kap stopimpachetat adumarcaje seteazasimbol definestesimbolfigura \
-    seteazabloc sinonim barasus seteazaculori hartiedubla seteazatype \
-    aliniatdreapta faraspatiu seteazafiguriexterne definestemakeup seteazaenumerare seteazapozitietext \
-    spatiifixate vl stopprodus scrieinregistru seteazainteractiunea stopcomponenta \
-    pozitie stopfigura seteazatextesus forteazablocuri definestesectiune definesteregistru \
-    folosesteURL seteazavariabilatext mar stopmediulocal culoare figuraexterna \
-    seteazanumarsubpagina proceseazabloc din seteazatextetext seteazamarginal seteazaprograme \
-    folosestemodul liniisubtiri aliniatstanga comparagrupculoare seteazalistacombinata startnumemakeup \
-    definestecamp startmediulocal afiseazamakeup seteazaformule sub urmeazaversiune \
-    definestetext 
+    starttyping seteazaspatiualb paragraph farafisiere arg roteste \
+    cloneazacamp startproduct liniepeste trecilafontraw definestemeniuinteractiune afiseazarama \
+    Litera stopfundal data seteazarigla seteazafundaluri litere \
+    folosestesimboluri faraliniiantetsisubsol startliniemargine startopposite linieumplere seteazagrosimelinie \
+    definestefonttext stopfloattext register definesteblocsectiune defineste texttitlu \
+    nextsection placelistoffloats liniinegre seteazamarcaje startnamemakeup element \
+    publicatie setaresincronizare definestesimbol afiseazagrupculoare litera ininner \
+    section seteazaaliniat startmarginblock coupledregister stopculoare startprofile \
+    seteazacomentariu definesteformatreferinte numartitlu starttabulate typefile definestestartstop \
+    stopcombination definestepaleta definesteparagraf startfact startenumeration scrieinlistareferinte \
+    seteazanumarpagina seteazanumerotare afiseazatiparire seteazabuffer definestefloat rigleumplere \
+    sim definesteantet placelistofsorts stopoverview footnotetext definestestivacampuri \
+    logcampuri subsection inlinie seteazamediulfonttext sublinie barasincronizare \
+    punefatainfata seteazasublinie definesteeticheta jossus nop starttable \
+    starttables stopmediu definestealiat definestetyping framedtext definestetexteinconjurate \
+    seteazatextesubsol liniesubtire stopdocument sincronizeaza startcitat Numereromane \
+    starthiding ZIDINSAPTAMANA seteazaingust stopoverlay seteazaplasareaopozita setvariabilatext \
+    definestefontraw seteazamakeup olinie appendix indreapta instanga \
+    seteazasistem stopcomentariu tex cuvantdreapta startdescription pastreazablocuri \
+    datacurenta name seteazalistareferinte setupitemgroup seteazacoloane nota \
+    faramarcaje matematica convertestenumar selecteazahartie stopfact startpositioning \
+    referit clip startlegend impachetat inalt folosestefisierextern \
+    seteazaclipping stopdescription startalignment seteazatoleranta seteazaregistru adauga \
+    definestedescriere punelegenda afiseazagrid usedirectory startformula stoppostponing \
+    startframedtext stopenumeration startnarrower startsynchronization cupleazadocument campumplere \
+    seteazalinii crlf startpostponing afiseazasetsimboluri folosestecodificarea plaseazasemnecarte \
+    seteazanotasubsol versiune hl dutebox definesteoutput inaltamargine \
+    seteazatitlu folosestefiguraexterna seteazasinonime afiseazaaspect texteticheta seteazatab \
+    definestelogo startoverlay seteazaprofile definestelista coloana definesteprofil \
+    referintapagina loadsynonyms seteazablocurimarginale luna seteazarigletext seteazatexttitlu \
+    cap proceseazapagina seteazaliniinegre pozitietext seteazaformulare seteazacampuri \
+    startsymbolset startculoare stopimpachetat adumarcaje seteazasimbol definestesimbolfigura \
+    seteazabloc reservefloat barasus seteazaculori hartiedubla seteazatype \
+    aliniatdreapta stopalignment faraspatiu seteazafiguriexterne definestemakeup stopsymbolset \
+    Caps stoplines seteazaenumerare seteazapozitietext spatiifixate vl \
+    scrieinregistru seteazainteractiunea stopcomponenta pozitie seteazatextesus forteazablocuri \
+    definestesectiune definesteregistru folosesteURL seteazavariabilatext startlocalenvironment mar \
+    culoare startlocalfootnotes figuraexterna seteazanumarsubpagina proceseazabloc din \
+    seteazatextetext seteazamarginal seteazaprograme folosestemodul liniisubtiri startlines \
+    aliniatstanga comparagrupculoare mediaeval seteazalistacombinata definestecamp afiseazamakeup \
+    startlinenumbering sub urmeazaversiune definestetext 
diff --git a/context/data/cont-ro.tws b/context/data/cont-ro.tws
index fab916dc5..6518bf31b 100644
--- a/context/data/cont-ro.tws
+++ b/context/data/cont-ro.tws
@@ -3138,12 +3138,6 @@ val:*numar::
 stopsetup
 
 startsetup
-com:domiciliu:
-typ:arg/:
-val:*text::
-stopsetup
-
-startsetup
 com:element:
 typ:vars/args/:
 ivr:seteazaelemente::
diff --git a/metapost/context/base/mp-fobg.mp b/metapost/context/base/mp-fobg.mp
new file mode 100644
index 000000000..712efe751
--- /dev/null
+++ b/metapost/context/base/mp-fobg.mp
@@ -0,0 +1,88 @@
+%D \module
+%D   [       file=mp-fobg.mp,
+%D        version=2004.03.12,
+%D          title=\CONTEXT\ \METAPOST\ graphics,
+%D       subtitle=Formatting Objects,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See licen-en.pdf for
+%C details.
+
+if unknown context_tool :    input mp-tool ; fi ;
+if   known context_fobg : endinput         ; fi ;
+
+boolean context_fobg ; context_fobg := true ;
+
+FoNone   := 0 ; FoHidden := 1 ; FoDotted := 2 ; FoDashed := 3 ; FoSolid  := 4 ;
+FoDouble := 5 ; FoGroove := 6 ; FoRidge  := 7 ; FoInset  := 8 ; FoOutset := 9 ;
+FoAll    := 0 ; FoTop    := 1 ; FoBottom := 2 ; FoLeft   := 3 ; FoRight  := 4 ;
+FoMedium := .5pt ; FoThin := FoMedium/2 ; FoThick := FoMedium*2 ;
+
+color FoBackgroundColor, FoNoColor, FoLineColor[] ; FoNoColor := (-1,-1,-1) ;
+numeric FoLineWidth[], FoLineStyle[] ;
+boolean FoFrame, FoBackground, FoSplit ;
+
+FoFrame := FoBackground := FoSplit := false ;
+FoBackgroundColor := white ;
+FoDashFactor := .5 ;
+FoDotFactor := .375 ;
+
+for i = FoAll upto FoRight :
+  FoLineColor[i] := black ;
+  FoLineWidth[i] := .5pt ;
+  FoLineStyle[i] := FoNone ;
+endfor ;
+
+def DrawFoFrame(expr n, p) =
+  drawoptions(withcolor FoLineColor[n] withpen pencircle scaled FoLineWidth[n]) ;
+  if     FoLineStyle[n] = FoNone   :
+    % nothing
+  elseif FoLineStyle[n] = FoHidden :
+    % nothing
+  elseif FoLineStyle[n] = FoDotted :
+    draw p dashed (withdots scaled (FoDotFactor*FoLineWidth[n])) ;
+  elseif FoLineStyle[n] = FoDashed :
+    draw p dashed (evenly scaled (FoDashFactor*FoLineWidth[n])) ;
+  elseif FoLineStyle[n] = FoSolid  :
+    draw p ;
+  elseif FoLineStyle[n] = FoDouble :
+    draw p enlarged  FoLineWidth[n] ; draw p enlarged -FoLineWidth[n] ;
+  elseif FoLineStyle[n] = FoGroove :
+    draw p ;
+    draw p withpen pencircle scaled .5FoLineWidth[n] withcolor (inverted FoLineColor[n] softened .5) ;
+  elseif FoLineStyle[n] = FoRidge  :
+    draw p withcolor  (inverted FoLineColor[n] softened .5) ;
+    draw p withpen pencircle scaled .5FoLineWidth[n] ;
+  elseif FoLineStyle[n] = FoInset  :
+    draw p ; draw p inset 2.5FoLineWidth[n] ;
+  elseif FoLineStyle[n] = FoOutset :
+    draw p ; draw p outset 2.5FoLineWidth[n] ;
+ fi ;
+enddef ;
+
+primarydef p outset d =
+  ((lrcorner p -- urcorner p -- ulcorner p -- llcorner p -- cycle)
+      shifted (d*(-1,1)) cutbefore topboundary p) cutafter leftboundary p
+enddef ;
+
+primarydef p inset d =
+  ((ulcorner p -- llcorner p -- lrcorner p -- urcorner p -- cycle)
+      shifted (d*(1,-1)) cutbefore bottomboundary p) cutafter rightboundary p
+enddef ;
+
+vardef equalpaths(expr p, q) =
+  if length(p) = length(q) :
+    save ok ; boolean ok ; ok := true ;
+    for i = 0 upto length(p)-1 :
+      ok := ok and (round(point i of p) = round(point i of q)) ;
+    endfor ;
+    ok
+  else :
+    false
+  fi
+enddef ;
+
+endinput ;
diff --git a/scripts/context/perl/texexec.pl b/scripts/context/perl/texexec.pl
index 523c2b1be..277e2f810 100644
--- a/scripts/context/perl/texexec.pl
+++ b/scripts/context/perl/texexec.pl
@@ -148,6 +148,7 @@ my $PrintFormat      = 'standard';
 my $ProducePdfT      = 0;
 my $ProducePdfM      = 0;
 my $ProducePdfX      = 0;
+my $ProducePdfXTX    = 0;
 my $Input            = "";
 my $Result           = '';
 my $Suffix           = '';
@@ -189,6 +190,7 @@ my $NoMapFiles       = 0 ;
 my $Foxet            = 0 ;
 my $TheEnginePath    = 0 ;
 my $Paranoid         = 0 ;
+my $NotParanoid      = 0 ;
 
 my $StartLine        = 0 ;
 my $StartColumn      = 0 ;
@@ -245,6 +247,7 @@ my $MakeMpy = '';
     "pdf"            => \$ProducePdfT,
     "pdm"            => \$ProducePdfM,
     "pdx"            => \$ProducePdfX,
+    "xtx"            => \$ProducePdfXTX,
     "pdfarrange"     => \$PdfArrange,
     "pdfselect"      => \$PdfSelect,
     "pdfcombine"     => \$PdfCombine,
@@ -294,6 +297,7 @@ my $MakeMpy = '';
     "foxet"          => \$Foxet,
     "engine"         => \$TheEnginePath,
     "paranoid"       => \$Paranoid,
+    "notparanoid"    => \$NotParanoid,
     #### experiment
     "startline=s"    => \$StartLine,
     "startcolumn=s"  => \$StartColumn,
@@ -328,9 +332,13 @@ if ($Paranoid) {
     $ENV{shell_escape} = 'f' ;
     $ENV{openout_any}  = 'p' ;
     $ENV{openin_any}   = 'p' ;
+} elsif ($NotParanoid) {
+    $ENV{shell_escape} = 't' ;
+    $ENV{openout_any}  = 'p' ;
+    $ENV{openin_any}   = 'a' ;
 }
 
-if (($ENV{openout_any} eq 'p') || ($ENV{openin_any} eq 'p')) {
+if ($ENV{openin_any} eq 'p') {
     $Paranoid = 1 ; # extra test in order to set readlevel
 }
 
@@ -346,10 +354,11 @@ if ($ScreenSaver) {
 }
 
 if ( $DoMPTeX || $DoMPXTeX ) {
-    $RunOnce     = 1;
-    $ProducePdfT = 0;
-    $ProducePdfX = 0;
-    $ProducePdfM = 0;
+    $RunOnce       = 1;
+    $ProducePdfT   = 0;
+    $ProducePdfX   = 0;
+    $ProducePdfM   = 0;
+    $ProducePdfXTX = 0;
 }
 
 if ( $PdfArrange || $PdfSelect || $PdfCopy || $PdfCombine ) {
@@ -357,9 +366,15 @@ if ( $PdfArrange || $PdfSelect || $PdfCopy || $PdfCombine ) {
     $RunOnce     = 1;
 }
 
-if    ($ProducePdfT) { $OutputFormat = "pdftex" }
-elsif ($ProducePdfM) { $OutputFormat = "dvipdfm" }
-elsif ($ProducePdfX) { $OutputFormat = "dvipdfmx" }
+if    ($ProducePdfT)   { $OutputFormat = "pdftex" }
+elsif ($ProducePdfM)   { $OutputFormat = "dvipdfm" }
+elsif ($ProducePdfX)   { $OutputFormat = "dvipdfmx" }
+elsif ($ProducePdfXTX) { $OutputFormat = "xetex" }
+
+if ( $ProducePdfXTX ) {
+    $TeXProgram = 'xetex'  ; # ignore the default pdfetex engine
+    $PassOn .= ' -no-pdf ' ; # Adam Lindsay's preference
+}
 
 if ($AutoPdf) {
     $PdfOpen = $PdfClose = 1 ;
@@ -388,7 +403,7 @@ if ( ( $LogFile ne '' ) && ( $LogFile =~ /\w+\.log$/io ) ) {
     *STDERR = *LOGFILE;
 }
 
-my $Program = " TeXExec 5.2.2 - ConTeXt / PRAGMA ADE 1997-2004";
+my $Program = " TeXExec 5.2.3 - ConTeXt / PRAGMA ADE 1997-2004";
 
 print "\n$Program\n\n";
 
@@ -849,6 +864,7 @@ $OutputFormats{dviwindo} = "dviwindo";
 $OutputFormats{dviview}  = "dviview";
 $OutputFormats{dvipdfm}  = "dvipdfm";
 $OutputFormats{dvipdfmx} = "dvipdfmx";
+$OutputFormats{xetex}    = "xetex";
 
 my @ConTeXtFormats = ( "nl", "en", "de", "cz", "uk", "it", "ro", "xx" );
 
@@ -1335,9 +1351,10 @@ sub ScanTeXPreamble {
 
     # handy later on
 
-    $ProducePdfT = ($OutputFormat eq "pdftex") ;
-    $ProducePdfM = ($OutputFormat eq "dvipdfm") ;
-    $ProducePdfX = ($OutputFormat eq "dvipdfmx") ;
+    $ProducePdfT   = ($OutputFormat eq "pdftex") ;
+    $ProducePdfM   = ($OutputFormat eq "dvipdfm") ;
+    $ProducePdfX   = ($OutputFormat eq "dvipdfmx") ;
+    $ProducePdfXTX = ($OutputFormat eq "xetex") ;
 }
 
 sub ScanContent {
@@ -1865,6 +1882,8 @@ if ($JobSuffix =~ /\_fo$/i) {
                 system("dvipdfmx -f dvipdfmx.map -d 4 $JobName") ;
             } elsif ($ProducePdfM) {
                 system("dvipdfm $JobName") ;
+            } elsif ($ProducePdfXTX) {
+                system("xdv2pdf $JobName.xdv") ;
             }
             PopResult($JobName);
         }
@@ -2387,6 +2406,7 @@ sub RunFiles {
     } else {
         my $JobSuffix = "tex";
         foreach my $JobName (@ARGV) {
+            next if ($JobName =~ /^\-/io) ;
             # start experiment - full name spec including suffix is prerequisite
             if (($StartLine>0) && ($EndLine>=$StartLine) && (-e $JobName)) {
                 if (open(INP,$JobName) && open(OUT,'>texexec.tex')) {
diff --git a/scripts/context/perl/texutil.pl b/scripts/context/perl/texutil.pl
index bcee7dbdb..fa3f78919 100644
--- a/scripts/context/perl/texutil.pl
+++ b/scripts/context/perl/texutil.pl
@@ -2752,7 +2752,7 @@ sub PurgeFiles # no my in foreach
     foreach $suffix (@texnonesuffixes)
       { foreach (@files)
           { if (/(.*)\.$suffix$/i)
-              { if ((-e "$1.tex")||(-e "$1.xml"))
+              { if ((-e "$1.tex")||(-e "$1.xml")||(-e "$1.fo"))
                   { KeepContextFile($_) }
                 else
                   { $strippedname = $1 ;
@@ -2815,7 +2815,7 @@ sub FilterPages # temp feature / no reporting
        close(PDF) ;
        close(TUO) } }
 
-sub GenerateSciteApi # ugly, not generic, but fast
+sub GenerateSciteApi # ugly, not generic, but fast, will become xsltproc based
   { my $filename = $ARGV[0] ;
     my $commands = 0 ;
     my $environments = 0 ;
diff --git a/scripts/context/ruby/ctxtools.rb b/scripts/context/ruby/ctxtools.rb
index 36b34f30e..59243aee0 100644
--- a/scripts/context/ruby/ctxtools.rb
+++ b/scripts/context/ruby/ctxtools.rb
@@ -19,6 +19,26 @@ require 'ftools'
 require 'xmpl/switch'
 require 'exa/logger'
 
+class String
+
+    def i_translate(element, attribute, category)
+        self.gsub!(/(<#{element}.*?#{attribute}=)([\"\'])(.*?)\2/) do
+            if category.key?($3) then
+                "#{$1}#{$2}#{category[$3]}#{$2}"
+            else
+                "#{$1}#{$2}#{$3}#{$2}" # unchanged
+            end
+        end
+    end
+
+    def i_load(element, category)
+        self.scan(/<#{element}.*?name=([\"\'])(.*?)\1.*?value=\1(.*?)\1/) do
+            category[$2] = $3
+        end
+    end
+
+end
+
 class Commands
 
     include CommandBase
@@ -78,12 +98,108 @@ class Commands
 
     end
 
+    def translateinterface
+
+        # since we know what kind of file we're dealign with,
+        # we do it quick and dirty instead of using rexml or
+        # xslt
+
+        interfaces = @commandline.arguments
+
+        if interfaces.empty? then
+            interfaces = ['cz','de','it','nl','ro']
+        else
+            interfaces.delete('en')
+        end
+
+        interfaces.flatten.each do |interface|
+
+            variables, constants, strings, list, data = Hash.new, Hash.new, Hash.new, '', ''
+
+            keyfile, intfile, outfile = "keys-#{interface}.xml", "cont-en.xml", "cont-#{interface}.xml"
+
+            report("generating #{keyfile}")
+
+            begin
+                one = "texexec --make --alone --all #{interface}"
+                two = "texexec --batch --silent --interface=#{interface} x-set-01"
+                if @commandline.option("force") then
+                    system(one)
+                    system(two)
+                elsif not system(two) then
+                    system(one)
+                    system(two)
+                end
+            rescue
+            end
+
+                unless File.file?(keyfile) then
+                report("no #{keyfile} generated")
+                next
+            end
+
+            report("loading #{keyfile}")
+
+            begin
+                list = IO.read(keyfile)
+            rescue
+                list = empty
+            end
+
+            if list.empty? then
+                report("error in loading #{keyfile}")
+                next
+            end
+
+            list.i_load('cd:variable', variables)
+            list.i_load('cd:constant', constants)
+            list.i_load('cd:command' , strings)
+            list.i_load('cd:element' , strings)
+
+            report("loading #{intfile}")
+
+            begin
+                data = IO.read(intfile)
+            rescue
+                data = empty
+            end
+
+            if data.empty? then
+                report("error in loading #{intfile}")
+                next
+            end
+
+            report("translating interface en to #{interface}")
+
+            data.i_translate('cd:string'   , 'value', strings)
+            data.i_translate('cd:variable' , 'value', variables)
+            data.i_translate('cd:parameter', 'name' , constants)
+            data.i_translate('cd:constant' , 'type' , variables)
+            data.i_translate('cd:variable' , 'type' , variables)
+            data.i_translate('cd:inherit'  , 'name' , strings)
+            data.i_translate('cd:command'  , 'name' , strings)
+
+            report("saving #{outfile}")
+
+            begin
+                if f = File.open(outfile, 'w') then
+                    f.write(data)
+                    f.close
+                end
+            rescue
+            end
+
+        end
+
+    end
+
 end
 
 logger      = EXA::ExaLogger.new(banner.shift)
 commandline = CommandLine.new
 
 commandline.registeraction('touchcontextfile', '')
+commandline.registeraction('translateinterface', '')
 
 commandline.registeraction('help')
 commandline.registeraction('version')
diff --git a/scripts/context/ruby/exa/logger.rb b/scripts/context/ruby/exa/logger.rb
index fc5212fc0..0bbd67f24 100644
--- a/scripts/context/ruby/exa/logger.rb
+++ b/scripts/context/ruby/exa/logger.rb
@@ -88,6 +88,10 @@ module EXA
             @@verbose = true
         end
 
+        def silent
+            @@verbose = false
+        end
+
         def verbose?
             @@verbose
         end
@@ -101,4 +105,4 @@ module EXA
 
     end
 
-end
\ No newline at end of file
+end
diff --git a/scripts/context/ruby/texmfstart.rb b/scripts/context/ruby/texmfstart.rb
index 67aba9dbe..47e8ff25d 100644
--- a/scripts/context/ruby/texmfstart.rb
+++ b/scripts/context/ruby/texmfstart.rb
@@ -162,6 +162,15 @@ def expanded(arg)
     end
 end
 
+def runcommand(command)
+    if $execute then
+        report("using 'exec' instead of 'system' call") if $verbose
+        exec(command)
+    else
+        system(command)
+    end
+end
+
 def runoneof(application,fullname,browserpermitted)
     if browserpermitted && launch(fullname) then
         return true
@@ -175,7 +184,7 @@ def runoneof(application,fullname,browserpermitted)
                 return true
             else
                 applications.each do |a|
-                    if system([a,fullname,expanded($arguments)].join(' ')) then
+                    if runcommand([a,fullname,expanded($arguments)].join(' ')) then
                         return true
                     end
                 end
@@ -185,14 +194,14 @@ def runoneof(application,fullname,browserpermitted)
                 print [fullname,expanded($arguments)].join(' ')
                 return true
             else
-                return system([fullname,expanded($arguments)].join(' '))
+                return runcommand([fullname,expanded($arguments)].join(' '))
             end
         else
             if $report then
                 print [applications,fullname,expanded($arguments)].join(' ')
                 return true
             else
-                return system([applications,fullname,expanded($arguments)].join(' '))
+                return runcommand([applications,fullname,expanded($arguments)].join(' '))
             end
         end
         return false
@@ -208,7 +217,7 @@ def usage
     print("\n")
     print("usage    : texmfstart [switches] filename [optional arguments]\n")
     print("\n")
-    print("switches : --verbose --report --browser --direct\n")
+    print("switches : --verbose --report --browser --direct --execute\n")
     print("           --program --file   --page    --arguments\n")
     print("           --make    --lmake  --wmake\n")
     print("\n")
@@ -431,7 +440,7 @@ end
 
 def direct(fullname)
     begin
-        return system([fullname.sub(/^bin\:/, ''),expanded($arguments)].join(' '))
+        return runcommand([fullname.sub(/^bin\:/, ''),expanded($arguments)].join(' '))
     rescue
         return false
     end
@@ -486,6 +495,7 @@ $browser     = $directives['browser']   || false
 $report      = $directives['report']    || false
 $verbose     = $directives['verbose']   || false
 $arguments   = $directives['arguments'] || ''
+$execute     = $directives['execute']   || $directives['exec'] || false
 
 $make        = $directives['make']      || false
 $unix        = $directives['unix']      || false
diff --git a/tex/context/base/colo-pra.tex b/tex/context/base/colo-pra.tex
index 228df546a..b7717cb75 100644
--- a/tex/context/base/colo-pra.tex
+++ b/tex/context/base/colo-pra.tex
@@ -8,30 +8,34 @@
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
 %D This module is not meant for third party use and defines
 %D some \PRAGMA\ specific colors.
 
-% huisstijl
+% company colors
 
-\definecolor [pragmaburcolor]   [r=1,g=0.62,b=0.06] % (Pantone 138 CV) 
+\definecolor [pragmaburcolor]   [r=1,g=.62,b=.06] % (Pantone 138 CV)
 \definecolor [pragmaburkleur]   [pragmaburcolor]
 
-\definecolor [pragmaadecolor]   [r=1,g=0.62,b=0.06] % (Pantone 138 CV) 
+\definecolor [pragmaadecolor]   [r=1,g=.62,b=.06] % (Pantone 138 CV)
 \definecolor [pragmaadekleur]   [pragmaadecolor]
 
-\definecolor [pragmapodcolor]   [r=.6,g=.7,b=.8]    % (rather mathematic)
+\definecolor [pragmapodcolor]   [r=.6,g=.7,b=.8]  % (no pantone here)
 \definecolor [pragmapodkleur]   [pragmapodcolor]
 
 \definecolor [pragmacolor]      [pragmaburcolor]
 \definecolor [pragmakleur]      [pragmaburcolor]
 
-\definecolor [texprettyone]     [r=.8, g=0,  b=0]  % red
-\definecolor [texprettytwo]     [r=0,  g=.6, b=0]  % green
-\definecolor [texprettythree]   [r=.0, g=.0, b=.9] % blue
-\definecolor [texprettyfour]    [r=.8, g=.8, b=.6] % yellow
+% pretty printing
+
+\definecolor [texprettyone]     [r=.8,g=0, b=0]  % red
+\definecolor [texprettytwo]     [r=0, g=.6,b=0]  % green
+\definecolor [texprettythree]   [r=.0,g=.0,b=.9] % blue
+\definecolor [texprettyfour]    [r=.8,g=.8,b=.6] % yellow
+
+% all kind of colors
 
 \definecolor [BackgroundColor]  [r=1,  g=1,  b=.7]
 \definecolor [InteractionColor] [r=.1, g=.5, b=.8]
@@ -39,26 +43,35 @@
 \definecolor [AchtergrondKleur] [BackgroundColor]
 \definecolor [InteractieKleur]  [InteractionColor]
 
-\definecolor [DemoRed]          [r=1, g=.6, b=.6]
+\definecolor [DemoRed]          [r=1,g=.6,b=.6]
 \definecolor [DemoRood]         [DemoRed]
 
-\definecolor [DemoBlue]         [r=.6, g=.8, b=1]
+\definecolor [DemoBlue]         [r=.6,g=.8,b=1]
 \definecolor [DemoBlauw]        [DemoBlue]
 
 \definecolor [DemoYellow]       [BackgroundColor]
 \definecolor [DemoGeel]         [BackgroundColor]
 
-% demonstratiekleuren
+% more colors
+
+\definecolor [cyaan:x]          [r=.3,g=.85,b=1]
+\definecolor [cyaan:y]          [r=.4,g=.80,b=1]
+\definecolor [cyaan:z]          [r=.5,g=.75,b=1]
 
-\definecolor [cyaan:x]       [r=.3,  g=.85, b=1]
-\definecolor [cyaan:y]       [r=.4,  g=.8,  b=1]
-\definecolor [cyaan:z]       [r=.5,  g=.75, b=1]
+% even more colors
 
-% schermkleuren
+\definecolor [screenred]     [r=.8]
+\definecolor [screengreen]   [g=.8]
+\definecolor [screenblue]    [r=.8]
+\definecolor [screencyan]    [g=.8,b=.8]
+\definecolor [screenmagenta] [r=.8,b=.8]
+\definecolor [screenyellow]  [r=.8,g=.8]
 
-\definecolor [schermgroen]   [r=0,   g=.8,  b=0]
-\definecolor [schermrood]    [r=.8,  g=0,   b=0]
-\definecolor [schermcyaan]   [r=0,   g=.8,  b=.8]
-\definecolor [schermgeel]    [r=.9,  g=.9,  b=0]
+\definecolor [schermrood]    [screenred]
+\definecolor [schermgroen]   [screengreen]
+\definecolor [schermblauw]   [screenblue]
+\definecolor [schermcyaan]   [screencyan]
+\definecolor [schermmagenta] [screenmagenta]
+\definecolor [schermgeel]    [screenyellow]
 
 \endinput
diff --git a/tex/context/base/cont-fil.tex b/tex/context/base/cont-fil.tex
index 0dab749fe..b6d3fba65 100644
--- a/tex/context/base/cont-fil.tex
+++ b/tex/context/base/cont-fil.tex
@@ -32,8 +32,8 @@
 \definefilesynonym [xml-pretty]      [xml-02]
 \definefilesynonym [xml-analyze]     [xml-11]
 
-\definefilesynonym [int-load]        [set-01]
-\definefilesynonym [int-make]        [set-02]
+\definefilesynonym [int-load]        [set-11]
+\definefilesynonym [int-make]        [set-12]
 
 \definefilesynonym [fig-base]        [fig-00]
 \definefilesynonym [fig-make]        [fig-01]
diff --git a/tex/context/base/cont-log.tex b/tex/context/base/cont-log.tex
index 488e0a735..92b04e9c9 100644
--- a/tex/context/base/cont-log.tex
+++ b/tex/context/base/cont-log.tex
@@ -220,10 +220,12 @@
 \def\eTeX     {\mathematics{\varepsilon}-\TeX}
 \def\pdfTeX   {pdf\TeX}
 \def\pdfeTeX  {pdfe-\TeX}
+\def\XeTeX    {X\lower.5ex\hbox{\kern-.15em\mirror{E}}\kern-.1667em\TeX} % Adam Lindsay
 
 \let\ETEX     \eTeX
 \let\PDFTEX   \pdfTeX
 \let\PDFETEX  \pdfeTeX
+\let\PDFETEX  \XeTeX
 
 \def\XML      {XML}
 \def\MATHML   {MathML}
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 7e8b87e61..3db368588 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -23,6 +23,63 @@
 
 \ifx\normalcompound\undefined \let\normalcompound=| \fi
 
+\bgroup \catcode`\<=\active
+
+% usage: \expanded{\rescanXMLatttributes{fo:table-cell}}
+
+\gdef\rescanXMLattributes  #1{\noexpand\dogetXMLarguments{#1}\currentXMLarguments>}
+\gdef\parseXMLattributes #1#2{\dogetXMLarguments{#1}#2>}
+
+\egroup
+
+\def\setupTBLcell#1#2% cell over col over row
+  {\setupTBLsection % already forgotten
+   \getvalue{\@@tblprefix\c!y\v!each}%
+   \getvalue{\@@tblprefix\c!x\v!each}%
+   \getvalue{\@@tblprefix\c!y\v!oddeven{#1}}%
+   \getvalue{\@@tblprefix\c!x\v!oddeven{#2}}%
+   \getvalue{\@@tblprefix\c!x\v!oddeven{#2}\c!y\v!oddeven{#1}}%
+   \ifnum#1=\plusone
+     \getvalue{\@@tblprefix\c!y\v!first}%
+     \executeifdefined{\@@tblprefix\c!x#2\c!y\v!first}\donothing
+   \fi
+   \ifnum#2=\plusone
+     \getvalue{\@@tblprefix\c!x\v!first}%
+     \executeifdefined{\@@tblprefix\c!x\v!first\c!y#1}\donothing
+   \fi
+   \ifnum#1=\maximumrow\relax
+     \getvalue{\@@tblprefix\c!y\v!last}%
+     \executeifdefined{\@@tblprefix\c!x#2\c!y\v!last}\donothing
+   \fi
+   \ifnum#2=\maximumcol\relax
+     \getvalue{\@@tblprefix\c!x\v!last}%
+     \executeifdefined{\@@tblprefix\c!x\v!last\c!y#1}\donothing
+   \fi
+   \ifnum#1=\maximumrow\relax\ifnum#2=\maximumcol\relax
+     \getvalue{\@@tblprefix\c!x\v!last\c!y\v!last}%
+   \fi\fi
+   \ifnum#1=\plusone \ifnum#2=\plusone
+     \getvalue{\@@tblprefix\c!x\v!first\c!y\v!first}%
+   \fi\fi
+   \ifnum#1>\noftblhdnxlines\else
+     \executeifdefined{\@@tblprefix\v!header\v!each}\donothing
+     \executeifdefined{\@@tblprefix\v!header#2}\donothing
+   \fi
+   \executeifdefined{\@@tblprefix\c!y#1}\donothing
+\getvalue{\@@tbl\@@tbl\c!extras}\letvalue{\@@tbl\@@tbl\c!extras}\relax
+   \executeifdefined{\@@tblprefix\c!x#2}\donothing
+\getvalue{\@@tbl\@@tbl\c!extras}\letvalue{\@@tbl\@@tbl\c!extras}\relax
+   \executeifdefined{\@@tblprefix\c!x#2\c!y#1}\donothing
+   \global\letcscsname\@@tblsplitafter\csname\@@tbl\@@tbl\c!after\endcsname
+   \relax}
+
+\newbox\@@dlhbox
+
+\def\dontleavehmode
+  {\ifhmode\else \ifmmode\else
+     \setbox\@@dlhbox\hbox{\mathsurround\zeropoint\everymath\emptytoks$ $}\unhbox\@@dlhbox
+   \fi \fi}
+
 % in xtag-ini:
 
 \def\doexecuteXMLhexcharacter#1\relax{\getXMLcharacter{"#1}}
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index da8c8f28a..1caa66994 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -31,7 +31,7 @@
 %D 2004.8.30 the low level interface is english. Watch out and adapt
 %D your styles an modules.
 
-\def\contextversion{2004.10.28}
+\def\contextversion{2004.11.16}
 
 %D Welcome to the main module. When this module is ran through
 %D \type{initex} or \type {tex -i} or \type {whatevertex} using
@@ -81,6 +81,7 @@
 
 \input syst-etx.tex % english / etex
 \input syst-omg.tex % english / omega-aleph
+\input syst-xtx.tex % english / xetex
 \input syst-gen.tex % english
 \input syst-ext.tex % english
 \input syst-new.tex % english
@@ -97,6 +98,7 @@
 
 \input supp-ini.tex % english
 \input supp-fil.tex % english
+\input supp-dir.tex % english
 
 %D After this we're ready for the multi||lingual interface
 %D modules.
diff --git a/tex/context/base/core-box.tex b/tex/context/base/core-box.tex
index c1bfaefc6..7a36706bc 100644
--- a/tex/context/base/core-box.tex
+++ b/tex/context/base/core-box.tex
@@ -382,7 +382,7 @@
   {\bgroup
    \doifassignmentelse{#1}
      {\getparameters[\s!dummy][\c!alternative=\v!a,#1]%
-      \doifelse\dummyvariant\v!a
+      \doifelse\dummyalternative\v!a
         {\egroup\collectedtext}%
         {\egroup\layeredtext  }%
       [#1][#2]}%
diff --git a/tex/context/base/core-ini.tex b/tex/context/base/core-ini.tex
index ef7523953..3dde16abc 100644
--- a/tex/context/base/core-ini.tex
+++ b/tex/context/base/core-ini.tex
@@ -23,6 +23,9 @@
 
 \appendtoks \flushnotes                  \to \everypar
 \appendtoks \synchronizesidefloats       \to \everypar
+
+\appendtoks \checkinlinedirection        \to \everypar
+
 \appendtoks \checkindentation            \to \everypar
 \appendtoks \showparagraphnumber         \to \everypar
 \appendtoks \flushmargincontents         \to \everypar
diff --git a/tex/context/base/core-not.tex b/tex/context/base/core-not.tex
index a697b708e..5cde5fb57 100644
--- a/tex/context/base/core-not.tex
+++ b/tex/context/base/core-not.tex
@@ -148,10 +148,15 @@
 %D \setupfootnotes[conversion=set 2]
 %D \stoptyping
 
+% experiment: (compare scope=text and scope=page)
+%
+% \definenote[mynote][way=bytext,location=text,width=\leftmarginwidth,scope=page,rule=,before=,after=,factor=0]
+% \setuptexttexts[margin][\vbox to \textheight{\placenotes[mynote]\vfill}][]
+
 \def\definenote
   {\dodoubleempty\dodefinenote}
 
-% maybe we should inherit
+% maybe we should inherit (todo)
 
 \def\dodefinenote[#1][#2]%
   {\def\currentnote{#1}%
@@ -205,6 +210,7 @@
         \c!textcolor=,
         \c!interaction=\v!yes,
         \c!factor=,
+        \c!scope=, % \v!text \v!page
         \c!n=1]%
     \definenumber
       [\currentnote]
@@ -230,7 +236,7 @@
        [\??vn\currentnote][#2]%
      \processaction
        [\noteparameter\c!rule]
-       [    \v!on=>\letvalue{\??vn\c!rule:\currentnote}\normalnoterule,
+       [     \v!on=>\letvalue{\??vn\c!rule:\currentnote}\normalnoterule,
             \v!off=>\letvalue{\??vn\c!rule:\currentnote}\relax,
         \s!default=>\letvalue{\??vn\c!rule:\currentnote}\relax,
         \s!unknown=>\setvalue{\??vn\c!rule:\currentnote}{\noteparameter\c!rule}]%
@@ -589,6 +595,7 @@
    \fi
    \ignorespaces
    \localnoteinsert\currentnoteins\bgroup
+\doif{\noteparameter\c!scope}\v!page{\floatingpenalty\maxdimen}% experiment
      \penalty\notepenalty
      \forgetall
      \setnotebodyfont
diff --git a/tex/context/base/core-ntb.tex b/tex/context/base/core-ntb.tex
index 65a9a92be..9edc7b431 100644
--- a/tex/context/base/core-ntb.tex
+++ b/tex/context/base/core-ntb.tex
@@ -227,6 +227,7 @@
 
 \def\setupTBLcell#1#2% cell over col over row
   {\setupTBLsection % already forgotten
+\getvalue{\@@tblprefix\c!each\v!each}%
    \getvalue{\@@tblprefix\c!y\v!each}%
    \getvalue{\@@tblprefix\c!x\v!each}%
    \getvalue{\@@tblprefix\c!y\v!oddeven{#1}}%
@@ -653,7 +654,7 @@
      \setbox\scratchbox\vbox{\trialtypesettingtrue \the\tbltoks}%
    \fi\fi\fi\fi
    \let\handleTBLcell\dohandleTBLcellD
-   \chardef\TBLpass2
+   \chardef\TBLpass\plustwo
    \def\makeTBL##1##2% meer in cellD
      {\dimen2\zeropoint
       \globalpushmacro\colTBL
@@ -672,7 +673,7 @@
    \checktblheightsone
    \checktblheightstwo
    \let\handleTBLcell\dohandleTBLcellE
-   \chardef\TBLpass3
+   \chardef\TBLpass\plusthree
    \def\makeTBL##1##2%
      {% height
       \globalpushmacro\rowTBL
diff --git a/tex/context/base/core-rul.tex b/tex/context/base/core-rul.tex
index 6a45e1294..06ca596d6 100644
--- a/tex/context/base/core-rul.tex
+++ b/tex/context/base/core-rul.tex
@@ -642,7 +642,7 @@
       \c!topframe,\c!bottomframe,\c!leftframe,\c!rightframe,%
       \c!rulethickness,\c!frameoffset,\c!background,\c!component,%
       \c!backgroundoffset,\c!backgroundscreen,\c!backgroundcolor,%
-      \c!align,\c!bottom,\c!top,\c!strut,\c!location,\c!setups]%
+      \c!align,\c!bottom,\c!top,\c!strut,\c!location,\c!setups,\c!extras]%
    \copyparameters[#1\c!background][#1]%
      [\c!radius,\c!corner,\c!depth]%
    \copyparameters[#1\c!frame][#1]%
@@ -711,6 +711,8 @@
    \ifsecondargument % faster
      \getparameters[\@@framed][#2]% here !
    \fi
+   % new, experimental dirty hook
+   \framedparameter\c!extras
    % we need to register the (outer) color
    \startregistercolor[\framedparameter\c!foregroundcolor]%
    % to get the right spacing
@@ -3104,6 +3106,8 @@
       \c!right=,
       #2]}
 
+\let\setuplocalframed\getparameters
+
 \def\setupframedcontent
   {\dodoubleempty\dosetupframedcontent}
 
diff --git a/tex/context/base/core-sec.tex b/tex/context/base/core-sec.tex
index bb27285d4..caf59baa0 100644
--- a/tex/context/base/core-sec.tex
+++ b/tex/context/base/core-sec.tex
@@ -2182,10 +2182,10 @@
    \c!margin=\zeropoint,
    \c!command=]
 
-\definesectionblock [\v!bodypart] [\v!bodymatter] [\c!number=\v!yes]
-\definesectionblock [\v!appendix]    [\v!appendices]     [\c!number=\v!yes]
-\definesectionblock [\v!frontpart]  [\v!frontmatter]  [\c!number=\v!no]
-\definesectionblock [\v!backpart] [\v!backmatter] [\c!number=\v!no]
+\definesectionblock [\v!bodypart]    [\v!bodymatter] [\c!number=\v!yes]
+\definesectionblock [\v!appendix]    [\v!appendices] [\c!number=\v!yes]
+\definesectionblock [\v!frontpart]  [\v!frontmatter] [\c!number=\v!no]
+\definesectionblock [\v!backpart]    [\v!backmatter] [\c!number=\v!no]
 
 \definesection[\v!sectionlevel-1]   % deel
 \definesection[\v!sectionlevel-2]   % hoofdstuk
@@ -2351,7 +2351,7 @@
 \setuplist [\v!chapter]             [\c!width=2em]
 \setuplist [\v!section]             [\c!width=3em]
 \setuplist [\v!subsection]          [\c!width=4em]
-\setuplist [\v!subsubsection]      [\c!width=5em]
+\setuplist [\v!subsubsection]       [\c!width=5em]
 \setuplist [\v!subsubsubsection]    [\c!width=6em]
 \setuplist [\v!subsubsubsubsection] [\c!width=7em]
 
diff --git a/tex/context/base/core-spa.tex b/tex/context/base/core-spa.tex
index f429e874f..30f8c5351 100644
--- a/tex/context/base/core-spa.tex
+++ b/tex/context/base/core-spa.tex
@@ -1097,11 +1097,11 @@
 \def\complexsetupindenting[#1]%
   {\processallactionsinset
      [#1]
-     [   \v!first=>\indentfirstparagraphtrue,
-       \v!next=>\indentfirstparagraphfalse,
-        \s!default=>\simplesetupindenting,
-        \s!unknown=>\edef\currentindentation{\commalistelement}%
-                    \simplesetupindenting]}
+     [  \v!first=>\indentfirstparagraphtrue,
+         \v!next=>\indentfirstparagraphfalse,
+      \s!default=>\simplesetupindenting,
+      \s!unknown=>\edef\currentindentation{\commalistelement}%
+                  \simplesetupindenting]}
 
 \def\simplesetupindenting
   {\assigndimension\currentindentation\ctxparindent{1em}{1.5em}{2em}%
@@ -1110,25 +1110,31 @@
 \def\indenting % watch out: \dodo and no \do
   {\dosingleargument\dodoindenting}
 
-\def\dodoindenting[#1]%
+\def\dodoindenting[#1]% oeps, we needed a commalist handler here!
+  {\edef\currentindenting{#1}%
+   \processcommacommand[#1]\dododoindenting}
+
+\def\dododoindenting#1%
   {\executeifdefined{\??in:#1}\donothing}
 
+\let\currentindenting\empty
+
 \def\defineindentingmethod[#1]#2%
   {\setvalue{\??in:#1}{#2}}
 
-\defineindentingmethod [\v!no]      {\parindent\ctxparindent\noindent}
-\defineindentingmethod [\v!not]     {\parindent\ctxparindent\noindent}
+\defineindentingmethod [\v!no]     {\parindent\ctxparindent\noindent}
+\defineindentingmethod [\v!not]    {\parindent\ctxparindent\noindent}
 
-\defineindentingmethod [\v!first]   {\indentfirstparagraphtrue}
-\defineindentingmethod [\v!next] {\indentfirstparagraphfalse}
+\defineindentingmethod [\v!first]  {\indentfirstparagraphtrue}
+\defineindentingmethod [\v!next]   {\indentfirstparagraphfalse}
 
-\defineindentingmethod [\v!yes]       {\parindent\ctxparindent\relax}   % no \indent !
-\defineindentingmethod [\v!always]   {\parindent\ctxparindent\relax}   % no \indent !
+\defineindentingmethod [\v!yes]    {\parindent\ctxparindent\relax}   % no \indent !
+\defineindentingmethod [\v!always] {\parindent\ctxparindent\relax}   % no \indent !
 
-\defineindentingmethod [\v!never]    {\parindent\zeropoint\relax} % no \indent !
+\defineindentingmethod [\v!never]  {\parindent\zeropoint\relax} % no \indent !
 
-\def\noindenting{\indenting[\v!no,\v!next]} % was \nietinspringen
-\def\doindenting{\indenting[\v!yes,\v!first]}    % was \welinspringen
+\def\noindenting{\indenting[\v!no,\v!next]}   % was \nietinspringen
+\def\doindenting{\indenting[\v!yes,\v!first]} % was \welinspringen
 
 \def\dochecknextindentation#1% internal one
   {\checknextindentation[\getvalue{#1\c!indentnext}]}
@@ -1964,8 +1970,9 @@
 \def\dosetupstrut[#1]% yet undocumented, todo: fontstrut
   {\processaction
      [#1]
-     [     \v!yes=>\setstrut,
-            \v!no=>\setnostrut,
+     [    \v!yes=>\setstrut,
+         \v!auto=>\setautostrut,
+           \v!no=>\setnostrut,
           \v!cap=>\setcapstrut,
           \v!fit=>\setfontstrut,
          \v!line=>\setstrut,
@@ -1976,6 +1983,20 @@
   {\def\strutwidth{.8pt}%
    \setstrut}
 
+\def\autostrutfactor{1.1}
+
+\def\setautostrut
+  {\begingroup
+   \setbox\scratchbox\copy\strutbox
+   \setstrut
+   \ifdim\ht\strutbox>\autostrutfactor\ht\scratchbox
+     \endgroup \setstrut
+   \else\ifdim\dp\strutbox>\autostrutfactor\dp\scratchbox
+     \endgroup \setstrut
+   \else
+     \endgroup
+   \fi\fi}
+
 % simple version
 %
 % \def\begstrut
@@ -2261,7 +2282,7 @@
          \v!middle=>\global\advance\ctxmidskip   \@@slmiddle,
           \v!right=>\global\advance\ctxrightskip \@@slright,
            \v!none=>,
-        \s!unknown=>\global\advance\ctxmidskip \commalistelement]}
+        \s!unknown=>\global\advance\ctxmidskip   \commalistelement]}
 
 \def\donarrower[#1]%
   {\processaction
@@ -2277,7 +2298,7 @@
    \bgroup
    \global\ctxleftskip \zeropoint
    \global\ctxrightskip\zeropoint
-   \global\ctxmidskip\zeropoint
+   \global\ctxmidskip  \zeropoint
    \processcommalistwithparameters[#1]\donarrower
    \advance\leftskip  \ctxleftskip
    \advance\rightskip \ctxrightskip
diff --git a/tex/context/base/core-ver.tex b/tex/context/base/core-ver.tex
index dcd26e718..f5b477849 100644
--- a/tex/context/base/core-ver.tex
+++ b/tex/context/base/core-ver.tex
@@ -150,7 +150,7 @@
    \ExpandFirstAfter\processaction
      [\getvalue{#1\c!lines}]
      [        \v!yes=>\obeybreakpoints,
-      \v!hyphenated=>\obeyhyphens]%
+       \v!hyphenated=>\obeyhyphens]%
    %
    \ExpandFirstAfter\processaction
      [\getvalue{#1\c!option}]
@@ -158,10 +158,10 @@
           \v!color=>\setupprettiesintype{TEX}%
                     \let\obeycharacters\setupprettytype
                     \let\obeytabs\ignoretabs,
-        \v!normal=>\let\obeycharacters\setupgroupedtype,
-      \v!commands=>\def\obeycharacters{\setupcommandsintype{#1}}%
+         \v!normal=>\let\obeycharacters\setupgroupedtype,
+       \v!commands=>\def\obeycharacters{\setupcommandsintype{#1}}%
                     \let\obeytabs\ignoretabs,
-         \v!slanted=>\let\obeycharacters\setupslantedtype
+        \v!slanted=>\let\obeycharacters\setupslantedtype
                     \let\obeytabs\ignoretabs,
         \s!unknown=>\setupprettiesintype{\getvalue{#1\c!option}}%
                     \let\obeycharacters\setupprettytype
@@ -789,27 +789,27 @@
 %D alternative escape character.
 
 \setuptyping
-  [          \c!before=\blank,
-               \c!after=\blank,
-            \c!bodyfont=,
-            \c!color=,
+  [       \c!before=\blank,
+           \c!after=\blank,
+        \c!bodyfont=,
+           \c!color=,
            \c!space=\v!off,
-           \c!page=\v!no,
-              \c!tab=\s!ascii,
-            \c!option=\v!none,
-            \c!palet=colorpretty,
+            \c!page=\v!no,
+             \c!tab=\s!ascii,
+          \c!option=\v!none,
+           \c!palet=colorpretty,
             \c!text=\v!no,
            \c!style=\tttf,
         \c!icommand=\ttsl,
         \c!vcommand=,
         \c!ccommand=\tttf,
- \c!indentnext=\v!yes,
-            \c!margin=\!!zeropoint,
-        \c!evenmargin=\!!zeropoint,
-      \c!oddmargin=\!!zeropoint,
+      \c!indentnext=\v!yes,
+          \c!margin=\!!zeropoint,
+      \c!evenmargin=\!!zeropoint,
+       \c!oddmargin=\!!zeropoint,
            \c!blank=\v!line,
-           \c!escape=/, % beware \string\ , should also be accepted
-           \c!numbering=\v!no,
+          \c!escape=/, % beware \string\ , should also be accepted
+       \c!numbering=\v!no,
            \c!lines=]
 
 %D \macros
diff --git a/tex/context/base/enco-def.tex b/tex/context/base/enco-def.tex
index 422c52826..78e1df7d7 100644
--- a/tex/context/base/enco-def.tex
+++ b/tex/context/base/enco-def.tex
@@ -390,8 +390,10 @@
 
 % some more
 
-\def\hyphen  {\softhyphen}
-\def\cwm     {\compoundwordmark}
+\def\hyphen            {\softhyphen}
+\def\cwm               {\compoundwordmark}
+\def\nonbreakinghyphen {\hyphen}
+\def\breakinghyphen    {\hyphen\prewordbreak}
 
 % quotes
 
diff --git a/tex/context/base/font-uni.tex b/tex/context/base/font-uni.tex
index 381fa2fdf..d6b340ec3 100644
--- a/tex/context/base/font-uni.tex
+++ b/tex/context/base/font-uni.tex
@@ -180,6 +180,19 @@
    \handleunicodeglyph
    \egroup}
 
+%D In \XETEX, unicode support is straightforward, so we
+%D simply output a \type {\char} with a 16||bit number.
+%D
+%D \starttyping
+%D \def\uchar#1#2{\char\numexpr(#2+(#1*256))\relax}
+%D \stoptyping
+
+\beginXETEX \uchar
+
+  \unexpanded\def\uchar#1#2{\char\numexpr#2+#1*\@cclvi\relax}
+
+\endXETEX
+
 \def\dohandleucflowglyph
 %  {\unicodeposition=\unicodeone\unicodetwo\relax
   {\unicodeposition\unicodeone\unicodetwo\relax
diff --git a/tex/context/base/java-exa.tex b/tex/context/base/java-exa.tex
index 47ea96f23..21b366174 100644
--- a/tex/context/base/java-exa.tex
+++ b/tex/context/base/java-exa.tex
@@ -89,7 +89,7 @@
                 console.println("url before check: "+url) ;
             }
 %            url = url.replace(/(http:\\\/\\\/.+)(\\\/.*$)/, "$1") ;
-            url = url.replace(/(http:\\\/\\\/.+?)(\\\/.*$)/, "$1") ;
+            url = url.replace(/(https*:\\\/\\\/.+?)(\\\/.*$)/, "$1/exarequest") ;
             if (example_log) {
                 console.println("url after check: "+url) ;
             }
diff --git a/tex/context/base/mult-con.tex b/tex/context/base/mult-con.tex
index 5054a5bb0..fe2c647f9 100644
--- a/tex/context/base/mult-con.tex
+++ b/tex/context/base/mult-con.tex
@@ -1459,6 +1459,18 @@ textlayer: tekstlaag                 textlayer
 
 \stopconstants
 
+%D This one is a private one, used for very dirty hooks.
+
+\startconstants            dutch                     english
+                           german                    czech
+                           italian                   romanian
+
+                   extras: extras                    extras
+                           extras                    extras
+                           extras                    extras
+
+\stopconstants
+
 %D \stopcompressdefinitions
 
 %D The keywords of values are very language specific and
@@ -1684,6 +1696,9 @@ textlayer: tekstlaag                 textlayer
                    italic: italic                    italic
                            italic                    kurziva
                            corsivo                   italic
+                  inherit: erf                       inherit
+                           inherit                   inherit
+                           inherit                   inherit % new
                    inleft: inlinker                  inleft
                            imlinken                  vlevo
                            insinistra                instanga
diff --git a/tex/context/base/mult-ini.tex b/tex/context/base/mult-ini.tex
index 5e0b68e36..95c89b228 100644
--- a/tex/context/base/mult-ini.tex
+++ b/tex/context/base/mult-ini.tex
@@ -1184,21 +1184,16 @@
       {\ifx\next#2%
          \flushinterfaceelementline
          \flushinterfaceelementline
-         \let\next\gobbleoneargument
+         \def\next####1{#2}% was: \let\next\gobbleoneargument
        \else\ifx\next\par
-         \long\def\next####1%
-           {\dogetinterfaceobjects}%
+         \long\def\next####1{\dogetinterfaceobjects}%
        \else\ifx\next\empty
-         \def\next####1%
-           {\dogetinterfaceobjects}%
+         \def\next####1{\dogetinterfaceobjects}%
        \else
-         \def\next####1 %
-           {\dogetinterfaceobject[####1:\relax]%
-            \dogetinterfaceobjects}%
+         \def\next####1 {\dogetinterfaceobject[####1:\relax]\dogetinterfaceobjects}%
        \fi\fi\fi
        \next}%
-   \def\dogetinterfaceobjects
-     {\futurelet\next\dodogetinterfaceobjects}%
+   \def\dogetinterfaceobjects{\futurelet\next\dodogetinterfaceobjects}%
    \dogetinterfaceobjects}
 
 \def\dogetinterfacetemplate[#1:#2]%
@@ -1244,15 +1239,17 @@
 %D Anno 2003 I've forgotten why the \type {\c!internal} is
 %D still in there; it's probably a left over from an experiment.
 
+%D Once we're gone XML we can drop some of the extra mappings.
+
 \let\c!internal!y \string
 \def\c!internal!n {-}
 \let\c!internal!  \c!internal!y
 
 \def\setinterfaceconstant#1#2%
   {\setvalue{\c!prefix!#1}{\c!internal!#1}%
-   \doifelse{#2}\nointerfaceobject
+   \doifelse{#2}\nointerfaceobject % ?
      {\debuggerinfo{constant}{#1 defined as #1 by default}%
-      \setvalue{\k!prefix!#2}{#1}}
+      }% \setvalue{\k!prefix!#1}{#1}} % was #2 -> #1
      {\debuggerinfo{constant}{#1 defined as #2}%
       \ifinterfacetranslation
         \setvalue{\x!prefix!#1}{#2}%
@@ -1273,11 +1270,11 @@
   {\doifdefined{#1}{\doifvaluesomething{#1}{\doifnotvalue{#1}{#2}
      {\writestatus{problems}{set #1 to #2 overloads \getvalue{#1}}}}}}
 
-\def\startvariables
-  {\startinterfaceobjects\setinterfacevariable\stopvariables}
+\def\startvariables{\startinterfaceobjects\setinterfacevariable\stopvariables}
+\def\startconstants{\startinterfaceobjects\setinterfaceconstant\stopconstants}
 
-\def\startconstants
-  {\startinterfaceobjects\setinterfaceconstant\stopconstants}
+\let\stopvariables\relax
+\let\stopconstants\relax
 
 %D \macros
 %D   {defineinterfaceconstant}
@@ -1318,8 +1315,9 @@
        {\setvalue{\y!prefix!#1}{#2}}%
    \fi}
 
-\def\startsetupvariables
-  {\startinterfaceobjects\setinterfacesetupvariable\stopsetupvariables}
+\def\startsetupvariables{\startinterfaceobjects\setinterfacesetupvariable\stopsetupvariables}
+
+\let\stopsetupvariables\relax
 
 %D \macros
 %D   {startelements}
@@ -1368,8 +1366,9 @@
        {\debuggerinfo{element}{#1 defined as #2}%
         \setvalue{\e!prefix!#1}{#2}}}}
 
-\def\startelements
-  {\startinterfaceobjects\setinterfaceelement\stopelements}
+\def\startelements{\startinterfaceobjects\setinterfaceelement\stopelements}
+
+\let\stopelements\relax
 
 %D \macros
 %D   {startcommands}
@@ -1410,8 +1409,9 @@
         \@EA\def\csname#2\@EA\endcsname\@EA{\csname#1\endcsname}}% ugly but faster
       \setinterfacesetupvariable{#1}{#2}}}
 
-\def\startcommands
-  {\startinterfaceobjects\setinterfacecommand\stopcommands}
+\def\startcommands{\startinterfaceobjects\setinterfacecommand\stopcommands}
+
+\let\stopcommands\relax
 
 %D \macros
 %D   {getinterfaceconstant, getinterfacevariable}
diff --git a/tex/context/base/page-flt.tex b/tex/context/base/page-flt.tex
index 20a72ebdc..94fd2e0e5 100644
--- a/tex/context/base/page-flt.tex
+++ b/tex/context/base/page-flt.tex
@@ -723,7 +723,7 @@
    \fi}
 
 % In \dofloatinfomessage wordt {{ }} gebruikt omdat anders
-% binnen \startuitstellen...\stopuitstellen geen goede
+% binnen \startpostponing...\stoppostponing geen goede
 % melding in de marge volgt: \ifinner is dan namelijk true.
 
 \def\dofloatinfomessage#1#2#3%
@@ -1846,7 +1846,7 @@
 
 \newcounter\nofpostponedblocks
 
-\newif\ifinuitstellen
+\newif\ifinpostponing
 
 \newevery\everytopofpage\relax
 
@@ -1872,7 +1872,7 @@
 \newtoks   \postponedpageblocks
 \newcounter\nofpostponedpageblocks
 
-% \ifinuitstellen: handhaven, want gebruikt in stijlen ! ! ! ! !
+% \ifinpostponing: handhaven, want gebruikt in stijlen ! ! ! ! !
 
 \def\dopostponeblock
   {\bgroup % new may 2004
@@ -1883,24 +1883,24 @@
      \unvbox\collectedpagefloats
    \fi
    \donefalse
-   \ifinuitstellen \else
+   \ifinpostponing \else
      \ifcase\nofpostponedblocks     \else \donetrue \fi
      \ifcase\nofpostponedpageblocks \else \donetrue \fi
    \fi
    \ifdone
      \bgroup % we need the color/font switch, else problems inside split verbatim
-     \setnormalcatcodes % uitstellen in verbatim
+     \setnormalcatcodes % postponing in verbatim
      \edef\savedtopofpagecolor{\topofpagecolor}%
      \doifsomething\savedtopofpagecolor\restorecolormode % \stopcolormode
      \restoreglobalbodyfont                        % The \nof-test is
      \global\pagetotal\zeropoint                   % recently added and
-     \global\inuitstellentrue                      % definitely needed else
+     \global\inpostponingtrue                      % definitely needed else
      \the\postponedpageblocks                      % we can loose or disorder
      \dorecurse\nofpostponedblocks                 % floats; anyhow, this
        {\getbuffer[pbuf-\recurselevel]}           % mechanism is still
      \doflushfloats % new but potential dangerous  % suboptimal and needs a
      \doglobal\newcounter\nofpostponedblocks       % proper analysis
-     \global\inuitstellenfalse
+     \global\inpostponingfalse
      \doifsomething\savedtopofpagecolor\startcolormode\savedtopofpagecolor
      \egroup
    \fi
diff --git a/tex/context/base/page-lay.tex b/tex/context/base/page-lay.tex
index d8dfeaca1..61c5ee736 100644
--- a/tex/context/base/page-lay.tex
+++ b/tex/context/base/page-lay.tex
@@ -341,7 +341,7 @@
 
 \def\dodosetuppapersize[#1][#2]%
   {\ifsecondargument
-     \dododosetuppapersize[#1][#2]%
+     \expanded{\dododosetuppapersize[#1][#2]}%
      \calculatehsizes
      \calculatevsizes
      \recalculatelogos
@@ -442,10 +442,9 @@
 % \newtoks \everybeforelayout \relax
 % \newtoks \everyafterlayout  \relax
 
-
 \def\recalculatelayout
   {\doifsomething{\layoutparameter\c!page\layoutparameter\c!paper}
-     {\dododosetuppapersize[\layoutparameter\c!page][\layoutparameter\c!paper]}%
+     {\expanded{\dododosetuppapersize[\layoutparameter\c!page][\layoutparameter\c!paper]}}%
    \dorecalculatelayout}
 
 \def\dorecalculatelayout
diff --git a/tex/context/base/page-mar.tex b/tex/context/base/page-mar.tex
index 2cb6d8785..e0961d4e4 100644
--- a/tex/context/base/page-mar.tex
+++ b/tex/context/base/page-mar.tex
@@ -213,6 +213,7 @@
       \c!hoffset=\zeropoint,
       \c!style=\@@imstyle,
       \c!color=\@@imcolor,
+      \c!strut=\@@imstrut,
       \c!location=\@@imlocation,
       \c!align=\@@imalign,
       \c!before=\@@imbefore,
@@ -249,18 +250,18 @@
    \doifvaluesomething{\??im\margincontenttag\c!align} % watch {} around set
      {\edef\margincontentalign{{\getvalue{\??im\margincontenttag\c!align},\margincontentalign}}}%
    %
-   \expanded{\getparameters
-     [\??im\margincontenttag]
-     [\c!strut=\v!no,\c!offset=\v!overlay,\c!align=\margincontentalign]}%
+   \expanded{\getparameters[\??im\margincontenttag][\c!align=\margincontentalign]}%
    %
+   \edef\margincontentstrut{\getvalue{\??im\margincontenttag\c!strut}}%
    \savestrut %
    \setbox\scratchbox\vbox\localframed
      [\??im\margincontenttag]
+     [\c!strut=\v!no,\c!offset=\v!overlay] % strut handled internally
      {\decrement\margincontentlines
       \dorecurse\margincontentlines{\savedstrut\endgraf\nointerlineskip}% ! savedstrut
       \@@imbefore
       \dostartattributes{\??im\margincontenttag}\c!style\c!color\empty
-        \setstrut % yes or no
+        \dosetupstrut[\margincontentstrut]% was: \setstrut % yes or no
         \begstrut#3\endstrut\endgraf
         \xdef\margincontentstrutheight{\the\strutht}% so that it's known outside the framed
       \dostopattributes
@@ -741,6 +742,7 @@
 \setupinmargin
   [\c!style=\v!bold,
    \c!color=,
+   \c!strut=\v!auto,
    \c!location=\v!both,
    \c!align=\v!inner,
    \c!stack=\v!no,
diff --git a/tex/context/base/setupb.tex b/tex/context/base/setupb.tex
index 1959f5d8e..cd8588a9b 100644
--- a/tex/context/base/setupb.tex
+++ b/tex/context/base/setupb.tex
@@ -6675,11 +6675,11 @@
   \value[\c!number!][]
 \stopsetup
 
-\startsetup
-  \command[\y!domicile]
-  \type[\c!arg!]
-  \value[\c!text!][]
-\stopsetup
+% \startsetup
+%   \command[\y!domicile]
+%   \type[\c!arg!]
+%   \value[\c!text!][]
+% \stopsetup
 
 \startsetup
   \command
diff --git a/tex/context/base/setupe.tex b/tex/context/base/setupe.tex
index 29ef61c61..9fef6e512 100644
--- a/tex/context/base/setupe.tex
+++ b/tex/context/base/setupe.tex
@@ -152,7 +152,7 @@
   {\immediate\openout\scratchwrite=cont-\currentlanguage.xml
    \doline{\string<?xml version="1.0"?>}
    \doline{}
-   \dostring{}{}{interface \SETUPnamespace\space name="context"}}
+   \dostring{}{}{interface \SETUPnamespace\space name="context" language="\currentlanguage" version="\contextversion"}}
 
 \def\stopsetupfile
   {\doline{}
diff --git a/tex/context/base/spec-def.tex b/tex/context/base/spec-def.tex
index 863f355ee..e949dd17e 100644
--- a/tex/context/base/spec-def.tex
+++ b/tex/context/base/spec-def.tex
@@ -960,6 +960,9 @@
 \defineoutput [dpx]      [dpx]
 \defineoutput [acrobat]  [pdf,ps,tr]
 
+\defineoutput [xetex]    [dvi,xtx]
+\defineoutput [xtx]      [dvi,xtx]
+
 %D Please let me know if we need more. From now on we default
 %D to:
 
diff --git a/tex/context/base/spec-xtx.tex b/tex/context/base/spec-xtx.tex
index 56a61631c..a8f0c0d48 100644
--- a/tex/context/base/spec-xtx.tex
+++ b/tex/context/base/spec-xtx.tex
@@ -1,110 +1,151 @@
-%D \module
-%D   [       file=spec-xtx,
-%D        version=2004.*.*,
-%D          title=\CONTEXT\ Special Macros,
-%D       subtitle=DVIPDFMx support,
-%D         author={Adam Lindsay \& Hans Hagen \& \unknown},
-%D           date=\currentdate,
-%D      copyright={Adam Lindsay \& Hans Hagen}]
+%D \module
%D   [       file=spec-xtx,
%D        version=2004.11.08,
%D          title=\CONTEXT\ Special Macros,
%D       subtitle=\XETEX\ support,
%D         author={Adam Lindsay \& Hans Hagen \& \unknown},
%D           date=\currentdate,
%D      copyright={Adam Lindsay \& Hans Hagen}]
 
 \unprotect
 
-\startspecials[xetex]
+\startspecials[xetex][reset,dpx]
 
-%D Rotation looks fine. Scaling and mirroring are also fine.
+%D Actually, there's an intermediate ``\type{xdv}''
+%D output format, but by default, it's tranparently
+%D converted to \PDF\ by \XETEX.
 
-\definespecial\dostartrotation  #1{\special{x:gsave}\special{x:rotate #1}}
-\definespecial\dostartscaling #1#2{\special{x:gsave}\special{x:scale  #1 #2}}
-\definespecial\dostartmirroring   {\special{x:gsave}\special{x:scale  -1 1}}
+\def\jobsuffix{pdf}
 
-\definespecial\dostoprotation {\special{x:grestore}}
-\definespecial\dostopscaling  {\special{x:grestore}}
-\definespecial\dostopmirroring{\special{x:grestore}}
+%D Rotation looks fine.
 
-\ifx\colorhexcomponent\undefined
+\definespecial\dostartrotation#1%
+  {\special{x:gsave}\special{x:rotate #1}}
 
-    % this will be added to colo-hex.tex
+\definespecial\dostoprotation%
+  {\special{x:grestore}}
 
-\else
+%D Scaling and mirroring are also fine.
 
-    % because we intercept the zero condition, the .23pt in 1.23pt will disappear in the
-    % ifcase zero part branch
+\definespecial\dostartscaling#1#2%
+  {\special{x:gsave}\special{x:scale #1 #2}}
 
-    \def\colorhexcomponent#1%
-      {\ifdim#1\points<.005\points
-         00\else\lchexnumbers{\the\dimexpr(255\dimexpr(#1\points)\relax+.5\points)\relax}%
-       \fi}
+\definespecial\dostopscaling%
+  {\special{x:grestore}}
 
-    % the faster one
+\definespecial\dostartmirroring%
+  {\special{x:gsave}\special{x:scale -1 1}}
 
-    \newdimen\hex@color@a \hex@color@a=.005pt
-    \newdimen\hex@color@b \hex@color@b=.5pt
-    \chardef \hex@color@c             =255
+\definespecial\dostopmirroring%
+  {\special{x:grestore}}
 
-    \def\colorhexcomponent#1%
-      {\ifdim#1\points<\hex@color@a
-         00\else\lchexnumbers{\the\dimexpr(#1\points*\hex@color@c+\hex@color@b)\relax}%
-       \fi}
+%D Colors are done with the \DVIPDFMX\ color model, which are
+%D inherited.
 
-\fi
+%D Although hex colors were accommodated by Hans, we'll try the
+%D more familiar \DVIPDFMX\ ones. One good side-effect of the
+%D previous approach
+%D was that it kept track of the color state (transparency
+%D in XeTeX is accomplished setting the color to an RGBA quadruple,
+%D rather than an RGB triple). So transparency will need another
+%D plan.
 
+% \macros
+%   {dostarttransparency,dostoptransparency}
 %
+% \starttypen
+% \dostarttransparency{fraction}{type}
+% \dostoptransparency
+% \stoptypen
+%
+% Although in \CONTEXT\ transparency is closely integrated
+% in the color drivers, in the end it is an independent
+% feature.
 
-\definespecial\dostartrgbcolormode#1#2#3%
-  {\bgroup
-   \edef\hexcolorstring{\colorhexcomponent{#1}\colorhexcomponent{#2}\colorhexcomponent{#3}}%
-   \special{x:textcolor=\hexcolorstring}%
-   \special{x:rulecolor=\hexcolorstring}%
-   \egroup}
-
-\definespecial\dostopcolormode
-  {\special{x:textcolor=000000}%
-   \special{x:rulecolor=000000}}
-
-%D Whadda you mean by 'corected;, this hex color model is crazy. Why does
-%D \XETEX\ provide high end font support but only hex rgb colors -)
-
-%D once colors are ``corrected'' by Hans, transparency should
-%D follow fairly easily. A good side-effect of the above approach
-%D is that we need to keep track of the color state (transparency
-%D in \XETEX\ is accomplished setting the color to an RGBA quadruple,
-%D rather than an RGB triple)
-
-%D File/graphic insertion is fouled up. I don't know why, but
-%D the externalfile misses its designated box/frame. It's also not
-%D finding files without the help of a \TEXUTIL\ file.
-
-%D Maybe \XETEX\ should provide a way to report the figure dimensions,
-%D I suppose it can ask the QuickTime Driver.
-
-%D However it gets resolved, the following is the basic schema
-%D of file inclusion for \XETEX. \type {\XeTeXpicfile} supports
-%D rotation, as well, but it seems less important for \CONTEXT.
-%D \XETEX\ uses QuickTime file import, which means a huge number of
-%D file import options.
+%\installspecial [\dostarttransparency] [or] [2]
+%\installspecial [\dostoptransparency]  [or] [0]
 
-%D More importantly and interestingly, there is \type
-%D {XeTeXpdffile}, which supports a \type {page} option.
+%D \XETEX\ supports \type{\doPDFdestination} and
+%D \type{\doPDFbookmark} inherited straight from \DVIPDFMX.
 
 \definespecial\doinsertfile#1#2#3#4#5#6#7#8#9%
   {\bgroup
    \dodoinsertfile{xtx}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}{#9}%
    \egroup}
 
-\definefileinsertion{xtx}{jpg}{\handlepdfimage}
-\definefileinsertion{xtx}{png}{\handlepdfimage}
-\definefileinsertion{xtx}{pdf}{\handlepdfimage}
-\definefileinsertion{xtx}{gif}{\handlepdfimage}
-\definefileinsertion{xtx}{tif}{\handlepdfimage}
+\definefileinsertion{xtx}{jpg}{\xtxhandleotherimage}
+\definefileinsertion{xtx}{png}{\xtxhandleotherimage}
+\definefileinsertion{xtx}{gif}{\xtxhandleotherimage}
+\definefileinsertion{xtx}{tif}{\xtxhandleotherimage}
+\definefileinsertion{xtx}{pdf}{\xtxhandlepdfimage  }
 
-% do we need it this way? either provide width and height or provide scales,
-% best provide the dimensions
+\def\xtxhandleotherimage#1#2#3#4#5#6#7#8#9%
+  {\bgroup % not needed, we load this under a normal catcode regime; \catcode`\"=11
+   \XeTeXpicfile "#1" width #7 height #8\relax%
+   \donetrue
+   \egroup}
 
-% \def\handlepdfimage#1#2#3#4#5#6#7#8#9%
-%   {\XeTeXpicfile "#1" width #7 height #8 xscaled #3 yscaled #4\relax}
+\def\xtxhandlepdfimage#1#2#3#4#5#6#7#8#9%
+  {\bgroup % not needed, we load this under a normal catcode regime; \catcode`\"=11
+   \checkpdfimagepagenumber{#9}
+   \XeTeXpdffile "#1" \pdfimagepagenumber\space width #7 height #8  \relax%
+   \donetrue
+   \egroup}
 
-\def\handlepdfimage#1#2#3#4#5#6#7#8#9%
-  {\XeTeXpicfile "#1" width #7 height #8\relax}
+\def\checkpdfimagepagenumber#1%
+  {\let\pdfimagepagenumber\empty
+   \getfromcommacommand[#1][1]%
+   \doifnumberelse\commalistelement
+     {\ifcase\commalistelement\else
+        \edef\pdfimagepagenumber{page \commalistelement}%
+        %\message{(pdf image \pdfimagepagenumber)}%
+      \fi}
+     {}}
+
+% \type{\getfiguredimensionsA} calls this one.
+% \type{\executedtrue} means it was able to get the desired
+% dogetfiguresizeBLAH method for the image type.
+% \type{\donetrue} means that the image was successfully
+% measured to be more than zero points.
+
+\def\dogetXTXfiguresize#1#2#3#4#5#6#7%
+    {#4\zeropoint
+     #5\zeropoint
+     \setbox\foundexternalfigure\vbox{\XeTeXpicfile "#2"}%
+     #6\wd\foundexternalfigure
+     #7\ht\foundexternalfigure
+     \ifdim\wd\foundexternalfigure=\zeropoint % \ifzeropt\wd\foundexternalfigure
+       #1{#2}{#3}{#4}{#5}{#6}{#7}%
+     \fi}
+
+\def\dogetXTXpdfsize#1#2#3#4#5#6#7%
+    {#4\zeropoint
+     #5\zeropoint
+     \checkpdfimagepagenumber{#3}
+     \setbox\foundexternalfigure\vbox{\XeTeXpdffile "#2" \pdfimagepagenumber}% \relax not needed
+     #6\wd\foundexternalfigure
+     #7\ht\foundexternalfigure
+     \ifdim\wd\foundexternalfigure=\zeropoint % \ifzeropt\wd\foundexternalfigure
+       #1{#2}{#3}{#4}{#5}{#6}{#7}%
+     \fi}
+
+\let\normaldogetfiguresizepng=\dogetfiguresizepng
+\let\normaldogetfiguresizetif=\dogetfiguresizetif
+\let\normaldogetfiguresizejpg=\dogetfiguresizejpg
+\let\normaldogetfiguresizegif=\dogetfiguresizegif
+\let\normaldogetfiguresizepdf=\dogetfiguresizepdf
+
+\def\dogetfiguresizepng{\dogetXTXfiguresize\normaldogetfiguresizepng}
+\def\dogetfiguresizejpg{\dogetXTXfiguresize\normaldogetfiguresizejpg}
+\def\dogetfiguresizegif{\dogetXTXfiguresize\normaldogetfiguresizegif}
+\def\dogetfiguresizetif{\dogetXTXfiguresize\normaldogetfiguresizetif}
+\def\dogetfiguresizepdf{\dogetXTXpdfsize\normaldogetfiguresizepdf}
+
+\appendtoksonce
+  \let\dogetfiguresizepng\normaldogetfiguresizepng
+  \let\dogetfiguresizetif\normaldogetfiguresizetif
+  \let\dogetfiguresizejpg\normaldogetfiguresizejpg
+  \let\dogetfiguresizegif\normaldogetfiguresizegif
+  \let\dogetfiguresizepdf\normaldogetfiguresizepdf
+\to \everyresetspecials
+
+%D The figure object system caused no end of headaches. They all
+%D went away with this single line:
+
+\setupexternalfigures[\c!object=\v!no]
 
 \stopspecials
 
diff --git a/tex/context/base/supp-dir.tex b/tex/context/base/supp-dir.tex
new file mode 100644
index 000000000..fa4bfa6f7
--- /dev/null
+++ b/tex/context/base/supp-dir.tex
@@ -0,0 +1,42 @@
+%D \module
+%D   [       file=supp-dir,
+%D        version=2004.11.11,
+%D          title=\CONTEXT\ Support Macros,
+%D       subtitle=Directional Things,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D Inspired by and needed for Adam Lindsay's \XETEX\ efforts:
+%D
+%D \starttyping
+%D \starttext
+%D   \input tufte \par
+%D   \pardir TRT \input tufte \par \input tufte \par
+%D   \pardir TLT \input tufte \par
+%D \stoptext
+%D \stoptyping
+
+\unprotect
+
+\chardef\inlinedirection\zerocount % 0==notset 1==LR 2==RL
+
+\beginETEX \beginL
+
+  \def\pardir#1#2#3% messages end up in a higher level command
+    {\global\TeXXeTstate\plusone
+     \if#2L\chardef\inlinedirection\plusone\else
+     \if#2R\chardef\inlinedirection\plustwo\fi\fi}
+
+ %\appendtoks \checkinlinedirection \to \everypar % see core-ini.tex
+
+  \def\checkinlinedirection
+    {\ifcase\inlinedirection\or\beginL\or\beginR\fi}
+
+\endETEX
+
+\protect \endinput
diff --git a/tex/context/base/supp-mps.tex b/tex/context/base/supp-mps.tex
index f9ae07acc..48c681643 100644
--- a/tex/context/base/supp-mps.tex
+++ b/tex/context/base/supp-mps.tex
@@ -1395,7 +1395,7 @@
      \doprocessfile\scratchread{#1}\handleMPcolor
      \immediate\closeout\scratchwrite
      \ifdone
-       \immediate\openout\scratchwrite=\convertMPcolorpath#1
+       \immediate\openout\scratchwrite=\convertMPcolorpath#1\relax
        \doprocessfile\scratchread{\convertMPcolorpath \convertMPcolorfile}\handleMPcopy
        \immediate\closeout\scratchwrite
        \message{done]}%
@@ -1638,9 +1638,7 @@
    \bgroup
    \enableincludeMPgraphics
    \presetMPdefinitions % in case #2 has measures
-   \doifelse{#1}{-}
-     {\convertargument#2\to\asciiA}
-     {\long\def\asciiA{#2}}%
+   \doifelse{#1}{-}{\convertargument#2\to\asciiA}{\long\def\asciiA{#2}}%
    \long\xdef\MPdrawingdata{\MPdrawingdata\asciiA}%
    \egroup}
 
diff --git a/tex/context/base/symb-uni.tex b/tex/context/base/symb-uni.tex
new file mode 100644
index 000000000..b33d9a159
--- /dev/null
+++ b/tex/context/base/symb-uni.tex
@@ -0,0 +1,1123 @@
+%D \module
+%D   [       file=symb-uni,
+%D        version=2004.11.15,
+%D          title=\CONTEXT\ Symbol Libraries,
+%D       subtitle=Unicode Symbols,
+%D         author=Adam T. Lindsay,
+%D           date=\currentdate,
+%D      copyright={Adam T. Lindsay / PRAGMA}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C prepared by Adam T. Lindsay.
+
+%D The content of this file originates from the Unicode standard, via some
+%D original XSLT scripts and some hand-editing. This file is open for use
+%D with the ConTeXt typesetting system.
+%D
+%D Adam considers the symbol names and categories to be stable, as they're
+%D directly derived from the Unicode standard.
+%D
+%D \startitemize[packed]
+%D \item Originated 2004-01-05 by Adam T. Lindsay
+%D \item Updated 2004-01-16 with Unicode vector 0x27xx and some in
+%D       215x and 246x
+%D \item Updated 2004-11-15 to include default fonts for MacOSX and
+%D       \XETEX.
+%D \stopitemize
+%D
+%D The following macros adapt to default fonts (that contain the characters)
+%D in MacOSX. The font selection mechanism is likely to change once \XETEX\
+%D correctly supports \type{\doiffontcharelse}.
+
+\doifundefinedelse{XeTeXversion}
+  {\let\USymbChar    \uchar
+   \let\USymbCharTwo \uchar
+   \let\USymbCharZapf\uchar}
+  {\def\USymbChar    #1#2{\bgroup\UnicodeSymbolFont    \uchar{#1}{#2}\relax\egroup}
+   \def\USymbCharTwo #1#2{\bgroup\UnicodeSymbolFontTwo \uchar{#1}{#2}\relax\egroup}
+   \def\USymbCharZapf#1#2{\bgroup\UnicodeSymbolFontZapf\uchar{#1}{#2}\relax\egroup}
+   \doifundefined{UnicodeSymbolFont}    {\definefont[UnicodeSymbolFont]    [{"Apple Symbols"} sa 1]}
+   \doifundefined{UnicodeSymbolFontTwo} {\definefont[UnicodeSymbolFontTwo] [{"Lucida Grande"} sa 1]}
+   \doifundefined{UnicodeSymbolFontZapf}{\definefont[UnicodeSymbolFontZapf][{"Zapf Dingbats"} sa 1]}}
+
+\startsymbolset[Unicode Additional Punctuation] % 0x2000: Requires UnicodeRegular20
+
+   \definesymbol[Caret][\USymbChar{32}{56}] % CARET
+   \definesymbol[ReferenceMark][\USymbChar{32}{59}] % REFERENCE MARK
+   \definesymbol[DoubleExclamationMark][\USymbChar{32}{60}] % DOUBLE EXCLAMATION MARK
+   \definesymbol[Interrobang][\USymbChar{32}{61}] % INTERROBANG
+   \definesymbol[Overline][\USymbChar{32}{62}] % OVERLINE
+   \definesymbol[Undertie][\USymbChar{32}{63}] % UNDERTIE
+   \definesymbol[CharacterTie][\USymbChar{32}{64}] % CHARACTER TIE
+   \definesymbol[CaretInsertionPoint][\USymbChar{32}{65}] % CARET INSERTION POINT
+   \definesymbol[Asterism][\USymbChar{32}{66}] % ASTERISM
+   \definesymbol[HyphenBullet][\USymbChar{32}{67}] % HYPHEN BULLET
+   \definesymbol[FractionSlash][\USymbChar{32}{68}] % FRACTION SLASH
+   \definesymbol[LeftSquareBracketWithQuill][\USymbChar{32}{69}] % LEFT SQUARE BRACKET WITH QUILL
+   \definesymbol[RightSquareBracketWithQuill][\USymbChar{32}{70}] % RIGHT SQUARE BRACKET WITH QUILL
+   \definesymbol[QuestionExclamationMark][\USymbChar{32}{72}] % QUESTION EXCLAMATION MARK
+   \definesymbol[ExclamationQuestionMark][\USymbChar{32}{73}] % EXCLAMATION QUESTION MARK
+   \definesymbol[TironianSignEt][\USymbChar{32}{74}] % TIRONIAN SIGN ET
+   \definesymbol[ReversedPilcrowSign][\USymbChar{32}{75}] % REVERSED PILCROW SIGN
+   \definesymbol[BlackLeftwardsBullet][\USymbChar{32}{76}] % BLACK LEFTWARDS BULLET
+   \definesymbol[BlackRightwardsBullet][\USymbChar{32}{77}] % BLACK RIGHTWARDS BULLET
+
+\stopsymbolset
+
+\startsymbolset[Unicode Currency] % 0x20A0: Requires UnicodeRegular20
+
+   \definesymbol[Euro-currencySign][\USymbChar{32}{160}] % EURO-CURRENCY SIGN
+   \definesymbol[ColonSign][\USymbChar{32}{161}] % COLON SIGN
+   \definesymbol[CruzeiroSign][\USymbChar{32}{162}] % CRUZEIRO SIGN
+   \definesymbol[FrenchFrancSign][\USymbChar{32}{163}] % FRENCH FRANC SIGN
+   \definesymbol[LiraSign][\USymbChar{32}{164}] % LIRA SIGN
+   \definesymbol[MillSign][\USymbChar{32}{165}] % MILL SIGN
+   \definesymbol[NairaSign][\USymbChar{32}{166}] % NAIRA SIGN
+   \definesymbol[PesetaSign][\USymbChar{32}{167}] % PESETA SIGN
+   \definesymbol[RupeeSign][\USymbChar{32}{168}] % RUPEE SIGN
+   \definesymbol[WonSign][\USymbChar{32}{169}] % WON SIGN
+   \definesymbol[NewSheqelSign][\USymbChar{32}{170}] % NEW SHEQEL SIGN
+   \definesymbol[DongSign][\USymbChar{32}{171}] % DONG SIGN
+   \definesymbol[EuroSign][\USymbChar{32}{172}] % EURO SIGN
+   \definesymbol[KipSign][\USymbChar{32}{173}] % KIP SIGN
+   \definesymbol[TugrikSign][\USymbChar{32}{174}] % TUGRIK SIGN
+   \definesymbol[DrachmaSign][\USymbChar{32}{175}] % DRACHMA SIGN
+   \definesymbol[GermanPennySign][\USymbChar{32}{176}] % [Unassigned U+20B0]
+   \definesymbol[PfennigSign][\USymbChar{32}{176}] % Unofficial duplicate
+   \definesymbol[PesoSign][\USymbChar{32}{177}] % [Unassigned U+20B1]
+
+\stopsymbolset
+
+
+\startsymbolset[Unicode Letterlike] % 0x2100: Requires UnicodeRegular21
+
+   \definesymbol[DegreeCelsius][\USymbChar{33}{3}] % DEGREE CELSIUS
+   \definesymbol[EulerConstant][\USymbChar{33}{7}] % EULER CONSTANT
+   \definesymbol[Scruple][\USymbChar{33}{8}] % SCRUPLE
+   \definesymbol[DegreeFahrenheit][\USymbChar{33}{9}] % DEGREE FAHRENHEIT
+   \definesymbol[PlanckConstant][\USymbChar{33}{14}] % PLANCK CONSTANT
+   \definesymbol[PlanckConstantOverTwoPi][\USymbChar{33}{15}] % PLANCK CONSTANT OVER TWO PI
+   \definesymbol[LBBarSymbol][\USymbChar{33}{20}] % L B BAR SYMBOL
+   \definesymbol[Versicle][\USymbChar{33}{35}] % VERSICLE
+   \definesymbol[OunceSign][\USymbChar{33}{37}] % OUNCE SIGN
+   \definesymbol[OhmSign][\USymbChar{33}{38}] % OHM SIGN
+   \definesymbol[InvertedOhmSign][\USymbChar{33}{39}] % INVERTED OHM SIGN
+   \definesymbol[KelvinSign][\USymbChar{33}{42}] % KELVIN SIGN
+   \definesymbol[AngstromSign][\USymbChar{33}{43}] % ANGSTROM SIGN
+   \definesymbol[EstimatedSymbol][\USymbChar{33}{46}] % ESTIMATED SYMBOL
+
+\stopsymbolset
+
+\startsymbolset[Unicode Letterlike Additional] % 0x2100: Requires UnicodeRegular21
+
+   \definesymbol[AccountOf][\USymbChar{33}{0}] % ACCOUNT OF
+   \definesymbol[AddressedToTheSubject][\USymbChar{33}{1}] % ADDRESSED TO THE SUBJECT
+   \definesymbol[CareOf][\USymbChar{33}{5}] % CARE OF
+   \definesymbol[CadaUna][\USymbChar{33}{6}] % CADA UNA
+   \definesymbol[CentreLineSymbol][\USymbChar{33}{4}] % CENTRE LINE SYMBOL
+   \definesymbol[NumeroSign][\USymbChar{33}{22}] % NUMERO SIGN
+   \definesymbol[SoundRecordingCopyright][\USymbChar{33}{23}] % SOUND RECORDING COPYRIGHT
+   \definesymbol[PrescriptionTake][\USymbChar{33}{30}] % PRESCRIPTION TAKE
+   \definesymbol[Response][\USymbChar{33}{31}] % RESPONSE
+   \definesymbol[ServiceMark][\USymbChar{33}{32}] % SERVICE MARK
+   \definesymbol[TelephoneSign][\USymbChar{33}{33}] % TELEPHONE SIGN
+   \definesymbol[TradeMarkSign][\USymbChar{33}{34}] % TRADE MARK SIGN
+   \definesymbol[InformationSource][\USymbChar{33}{57}] % INFORMATION SOURCE
+   \definesymbol[PropertyLine][\USymbChar{33}{74}] % [Unassigned U+214A]
+
+\stopsymbolset
+
+\startsymbolset[Unicode Script Letterlike] % 0x2100: Requires UnicodeRegular21
+
+   \definesymbol[ScriptSmallG][\USymbChar{33}{10}] % SCRIPT SMALL G
+   \definesymbol[ScriptCapitalH][\USymbChar{33}{11}] % SCRIPT CAPITAL H
+   \definesymbol[ScriptCapitalI][\USymbChar{33}{16}] % SCRIPT CAPITAL I
+   \definesymbol[ScriptCapitalL][\USymbChar{33}{18}] % SCRIPT CAPITAL L
+   \definesymbol[ScriptSmallL][\USymbChar{33}{19}] % SCRIPT SMALL L
+   \definesymbol[ScriptCapitalP][\USymbChar{33}{24}] % SCRIPT CAPITAL P
+   \definesymbol[ScriptCapitalR][\USymbChar{33}{27}] % SCRIPT CAPITAL R
+   \definesymbol[ScriptSmallE][\USymbChar{33}{47}] % SCRIPT SMALL E
+   \definesymbol[ScriptCapitalE][\USymbChar{33}{48}] % SCRIPT CAPITAL E
+   \definesymbol[ScriptCapitalF][\USymbChar{33}{49}] % SCRIPT CAPITAL F
+   \definesymbol[ScriptCapitalB][\USymbChar{33}{44}] % SCRIPT CAPITAL B
+   \definesymbol[ScriptCapitalM][\USymbChar{33}{51}] % SCRIPT CAPITAL M
+   \definesymbol[ScriptSmallO][\USymbChar{33}{52}] % SCRIPT SMALL O
+
+\stopsymbolset
+
+\startsymbolset[Unicode Hebrew Letterlike] % 0x2100: Requires UnicodeRegular21
+
+   \definesymbol[AlefSymbol][\USymbChar{33}{53}] % ALEF SYMBOL
+   \definesymbol[BetSymbol][\USymbChar{33}{54}] % BET SYMBOL
+   \definesymbol[GimelSymbol][\USymbChar{33}{55}] % GIMEL SYMBOL
+   \definesymbol[DaletSymbol][\USymbChar{33}{56}] % DALET SYMBOL
+
+\stopsymbolset
+
+\startsymbolset[Unicode Turned Letterlike] % 0x2100: Requires UnicodeRegular21
+
+   \definesymbol[RotatedCapitalQ][\USymbChar{33}{58}] % ROTATED CAPITAL Q
+   \definesymbol[TurnedSansSerifCapitalG][\USymbChar{33}{65}] % [Unassigned U+2141]
+   \definesymbol[TurnedSansSerifCapitalL][\USymbChar{33}{66}] % [Unassigned U+2142]
+   \definesymbol[ReversedSansSerifCapitalL][\USymbChar{33}{67}] % [Unassigned U+2143]
+   \definesymbol[TurnedSansSerifCapitalY][\USymbChar{33}{68}] % [Unassigned U+2144]
+   \definesymbol[TurnedAmpersand][\USymbChar{33}{75}] % [Unassigned U+214B]
+   \definesymbol[TurnedGreekSmallLetterIota][\USymbChar{33}{41}] % TURNED GREEK SMALL LETTER IOTA
+   \definesymbol[TurnedCapitalF][\USymbChar{33}{50}] % TURNED CAPITAL F
+
+\stopsymbolset
+
+\startsymbolset[Unicode Black-letter Letterlike] % 0x2100: Requires UnicodeRegular21
+
+   \definesymbol[BlackLetterCapitalH][\USymbChar{33}{12}] % BLACK-LETTER CAPITAL H
+   \definesymbol[BlackLetterCapitalI][\USymbChar{33}{17}] % BLACK-LETTER CAPITAL I
+   \definesymbol[BlackLetterCapitalR][\USymbChar{33}{28}] % BLACK-LETTER CAPITAL R
+   \definesymbol[BlackLetterCapitalZ][\USymbChar{33}{40}] % BLACK-LETTER CAPITAL Z
+   \definesymbol[BlackLetterCapitalC][\USymbChar{33}{45}] % BLACK-LETTER CAPITAL C
+
+\stopsymbolset
+
+\startsymbolset[Unicode Double-struck Letterlike Math] % 0x2100: Requires UnicodeRegular21
+
+   \definesymbol[DoubleStruckCapitalC][\USymbChar{33}{2}] % DOUBLE-STRUCK CAPITAL C
+   \definesymbol[DoubleStruckCapitalH][\USymbChar{33}{13}] % DOUBLE-STRUCK CAPITAL H
+   \definesymbol[DoubleStruckCapitalN][\USymbChar{33}{21}] % DOUBLE-STRUCK CAPITAL N
+   \definesymbol[DoubleStruckCapitalP][\USymbChar{33}{25}] % DOUBLE-STRUCK CAPITAL P
+   \definesymbol[DoubleStruckCapitalQ][\USymbChar{33}{26}] % DOUBLE-STRUCK CAPITAL Q
+   \definesymbol[DoubleStruckCapitalR][\USymbChar{33}{29}] % DOUBLE-STRUCK CAPITAL R
+   \definesymbol[DoubleStruckCapitalZ][\USymbChar{33}{36}] % DOUBLE-STRUCK CAPITAL Z
+   \definesymbol[DoubleStruckSmallGamma][\USymbChar{33}{61}] % [Unassigned U+213D]
+   \definesymbol[DoubleStruckCapitalGamma][\USymbChar{33}{62}] % [Unassigned U+213E]
+   \definesymbol[DoubleStruckCapitalPi][\USymbChar{33}{63}] % [Unassigned U+213F]
+   \definesymbol[DoubleStruckNArySummation][\USymbChar{33}{64}] % [Unassigned U+2140]
+   \definesymbol[DoubleStruckItalicCapitalD][\USymbChar{33}{69}] % [Unassigned U+2145]
+   \definesymbol[DoubleStruckItalicSmallD][\USymbChar{33}{70}] % [Unassigned U+2146]
+   \definesymbol[DoubleStruckItalicSmallE][\USymbChar{33}{71}] % [Unassigned U+2147]
+   \definesymbol[DoubleStruckItalicSmallI][\USymbChar{33}{72}] % [Unassigned U+2148]
+   \definesymbol[DoubleStruckItalicSmallJ][\USymbChar{33}{73}] % [Unassigned U+2149]
+
+\stopsymbolset
+
+\startsymbolset[Unicode Roman Numerals] % 0x2150: Requires UnicodeRegular21
+
+   \definesymbol[RomanNumeralOne][\USymbCharTwo{33}{96}] % ROMAN NUMERAL ONE
+   \definesymbol[RomanNumeralTwo][\USymbCharTwo{33}{97}] % ROMAN NUMERAL TWO
+   \definesymbol[RomanNumeralThree][\USymbCharTwo{33}{98}] % ROMAN NUMERAL THREE
+   \definesymbol[RomanNumeralFour][\USymbCharTwo{33}{99}] % ROMAN NUMERAL FOUR
+   \definesymbol[RomanNumeralFive][\USymbCharTwo{33}{100}] % ROMAN NUMERAL FIVE
+   \definesymbol[RomanNumeralSix][\USymbCharTwo{33}{101}] % ROMAN NUMERAL SIX
+   \definesymbol[RomanNumeralSeven][\USymbCharTwo{33}{102}] % ROMAN NUMERAL SEVEN
+   \definesymbol[RomanNumeralEight][\USymbCharTwo{33}{103}] % ROMAN NUMERAL EIGHT
+   \definesymbol[RomanNumeralNine][\USymbCharTwo{33}{104}] % ROMAN NUMERAL NINE
+   \definesymbol[RomanNumeralTen][\USymbCharTwo{33}{105}] % ROMAN NUMERAL TEN
+   \definesymbol[RomanNumeralEleven][\USymbCharTwo{33}{106}] % ROMAN NUMERAL ELEVEN
+   \definesymbol[RomanNumeralTwelve][\USymbCharTwo{33}{107}] % ROMAN NUMERAL TWELVE
+   \definesymbol[RomanNumeralFifty][\USymbCharTwo{33}{108}] % ROMAN NUMERAL FIFTY
+   \definesymbol[RomanNumeralOneHundred][\USymbCharTwo{33}{109}] % ROMAN NUMERAL ONE HUNDRED
+   \definesymbol[RomanNumeralFiveHundred][\USymbCharTwo{33}{110}] % ROMAN NUMERAL FIVE HUNDRED
+   \definesymbol[RomanNumeralOneThousand][\USymbCharTwo{33}{111}] % ROMAN NUMERAL ONE THOUSAND
+   \definesymbol[RomanNumeralOneThousandCD][\USymbCharTwo{33}{128}] % ROMAN NUMERAL ONE THOUSAND C D
+   \definesymbol[RomanNumeralFiveThousand][\USymbCharTwo{33}{129}] % ROMAN NUMERAL FIVE THOUSAND
+   \definesymbol[RomanNumeralTenThousand][\USymbCharTwo{33}{130}] % ROMAN NUMERAL TEN THOUSAND
+   \definesymbol[RomanNumeralReversedOneHundred][\USymbCharTwo{33}{131}] % ROMAN NUMERAL REVERSED ONE HUNDRED
+
+\stopsymbolset
+
+\startsymbolset[Unicode Small Roman Numerals] % 0x2150: Requires UnicodeRegular21
+
+   \definesymbol[SmallRomanNumeralOne][\USymbCharTwo{33}{112}] % SMALL ROMAN NUMERAL ONE
+   \definesymbol[SmallRomanNumeralTwo][\USymbCharTwo{33}{113}] % SMALL ROMAN NUMERAL TWO
+   \definesymbol[SmallRomanNumeralThree][\USymbCharTwo{33}{114}] % SMALL ROMAN NUMERAL THREE
+   \definesymbol[SmallRomanNumeralFour][\USymbCharTwo{33}{115}] % SMALL ROMAN NUMERAL FOUR
+   \definesymbol[SmallRomanNumeralFive][\USymbCharTwo{33}{116}] % SMALL ROMAN NUMERAL FIVE
+   \definesymbol[SmallRomanNumeralSix][\USymbCharTwo{33}{117}] % SMALL ROMAN NUMERAL SIX
+   \definesymbol[SmallRomanNumeralSeven][\USymbCharTwo{33}{118}] % SMALL ROMAN NUMERAL SEVEN
+   \definesymbol[SmallRomanNumeralEight][\USymbCharTwo{33}{119}] % SMALL ROMAN NUMERAL EIGHT
+   \definesymbol[SmallRomanNumeralNine][\USymbCharTwo{33}{120}] % SMALL ROMAN NUMERAL NINE
+   \definesymbol[SmallRomanNumeralTen][\USymbCharTwo{33}{121}] % SMALL ROMAN NUMERAL TEN
+   \definesymbol[SmallRomanNumeralEleven][\USymbCharTwo{33}{122}] % SMALL ROMAN NUMERAL ELEVEN
+   \definesymbol[SmallRomanNumeralTwelve][\USymbCharTwo{33}{123}] % SMALL ROMAN NUMERAL TWELVE
+   \definesymbol[SmallRomanNumeralFifty][\USymbCharTwo{33}{124}] % SMALL ROMAN NUMERAL FIFTY
+   \definesymbol[SmallRomanNumeralOneHundred][\USymbCharTwo{33}{125}] % SMALL ROMAN NUMERAL ONE HUNDRED
+   \definesymbol[SmallRomanNumeralFiveHundred][\USymbCharTwo{33}{126}] % SMALL ROMAN NUMERAL FIVE HUNDRED
+   \definesymbol[SmallRomanNumeralOneThousand][\USymbCharTwo{33}{127}] % SMALL ROMAN NUMERAL ONE THOUSAND
+
+\stopsymbolset
+
+\startsymbolset[Unicode Arrows] % 0x2190: Requires UnicodeRegular21
+
+   \definesymbol[LeftwardsArrow][\USymbChar{33}{144}] % LEFTWARDS ARROW
+   \definesymbol[UpwardsArrow][\USymbChar{33}{145}] % UPWARDS ARROW
+   \definesymbol[RightwardsArrow][\USymbChar{33}{146}] % RIGHTWARDS ARROW
+   \definesymbol[DownwardsArrow][\USymbChar{33}{147}] % DOWNWARDS ARROW
+   \definesymbol[LeftRightArrow][\USymbChar{33}{148}] % LEFT RIGHT ARROW
+   \definesymbol[UpDownArrow][\USymbChar{33}{149}] % UP DOWN ARROW
+   \definesymbol[NorthWestArrow][\USymbChar{33}{150}] % NORTH WEST ARROW
+   \definesymbol[NorthEastArrow][\USymbChar{33}{151}] % NORTH EAST ARROW
+   \definesymbol[SouthEastArrow][\USymbChar{33}{152}] % SOUTH EAST ARROW
+   \definesymbol[SouthWestArrow][\USymbChar{33}{153}] % SOUTH WEST ARROW
+   \definesymbol[LeftwardsArrowWithStroke][\USymbChar{33}{154}] % LEFTWARDS ARROW WITH STROKE
+   \definesymbol[RightwardsArrowWithStroke][\USymbChar{33}{155}] % RIGHTWARDS ARROW WITH STROKE
+   \definesymbol[LeftwardsWaveArrow][\USymbChar{33}{156}] % LEFTWARDS WAVE ARROW
+   \definesymbol[RightwardsWaveArrow][\USymbChar{33}{157}] % RIGHTWARDS WAVE ARROW
+   \definesymbol[LeftwardsTwoHeadedArrow][\USymbChar{33}{158}] % LEFTWARDS TWO HEADED ARROW
+   \definesymbol[UpwardsTwoHeadedArrow][\USymbChar{33}{159}] % UPWARDS TWO HEADED ARROW
+   \definesymbol[RightwardsTwoHeadedArrow][\USymbChar{33}{160}] % RIGHTWARDS TWO HEADED ARROW
+   \definesymbol[DownwardsTwoHeadedArrow][\USymbChar{33}{161}] % DOWNWARDS TWO HEADED ARROW
+   \definesymbol[LeftwardsArrowWithTail][\USymbChar{33}{162}] % LEFTWARDS ARROW WITH TAIL
+   \definesymbol[RightwardsArrowWithTail][\USymbChar{33}{163}] % RIGHTWARDS ARROW WITH TAIL
+   \definesymbol[LeftwardsArrowFromBar][\USymbChar{33}{164}] % LEFTWARDS ARROW FROM BAR
+   \definesymbol[UpwardsArrowFromBar][\USymbChar{33}{165}] % UPWARDS ARROW FROM BAR
+   \definesymbol[RightwardsArrowFromBar][\USymbChar{33}{166}] % RIGHTWARDS ARROW FROM BAR
+   \definesymbol[DownwardsArrowFromBar][\USymbChar{33}{167}] % DOWNWARDS ARROW FROM BAR
+   \definesymbol[UpDownArrowWithBase][\USymbChar{33}{168}] % UP DOWN ARROW WITH BASE
+   \definesymbol[LeftwardsArrowWithHook][\USymbChar{33}{169}] % LEFTWARDS ARROW WITH HOOK
+   \definesymbol[RightwardsArrowWithHook][\USymbChar{33}{170}] % RIGHTWARDS ARROW WITH HOOK
+   \definesymbol[LeftwardsArrowWithLoop][\USymbChar{33}{171}] % LEFTWARDS ARROW WITH LOOP
+   \definesymbol[RightwardsArrowWithLoop][\USymbChar{33}{172}] % RIGHTWARDS ARROW WITH LOOP
+   \definesymbol[LeftRightWaveArrow][\USymbChar{33}{173}] % LEFT RIGHT WAVE ARROW
+   \definesymbol[LeftRightArrowWithStroke][\USymbChar{33}{174}] % LEFT RIGHT ARROW WITH STROKE
+   \definesymbol[DownwardsZigzagArrow][\USymbChar{33}{175}] % DOWNWARDS ZIGZAG ARROW
+   \definesymbol[UpwardsArrowWithTipLeftwards][\USymbChar{33}{176}] % UPWARDS ARROW WITH TIP LEFTWARDS
+   \definesymbol[UpwardsArrowWithTipRightwards][\USymbChar{33}{177}] % UPWARDS ARROW WITH TIP RIGHTWARDS
+   \definesymbol[DownwardsArrowWithTipLeftwards][\USymbChar{33}{178}] % DOWNWARDS ARROW WITH TIP LEFTWARDS
+   \definesymbol[DownwardsArrowWithTipRightwards][\USymbChar{33}{179}] % DOWNWARDS ARROW WITH TIP RIGHTWARDS
+   \definesymbol[RightwardsArrowWithCornerDownwards][\USymbChar{33}{180}] % RIGHTWARDS ARROW WITH CORNER DOWNWARDS
+   \definesymbol[DownwardsArrowWithCornerLeftwards][\USymbChar{33}{181}] % DOWNWARDS ARROW WITH CORNER LEFTWARDS
+   \definesymbol[AnticlockwiseTopSemicircleArrow][\USymbChar{33}{182}] % ANTICLOCKWISE TOP SEMICIRCLE ARROW
+   \definesymbol[ClockwiseTopSemicircleArrow][\USymbChar{33}{183}] % CLOCKWISE TOP SEMICIRCLE ARROW
+   \definesymbol[NorthWestArrowToLongBar][\USymbChar{33}{184}] % NORTH WEST ARROW TO LONG BAR
+   \definesymbol[AnticlockwiseOpenCircleArrow][\USymbChar{33}{186}] % ANTICLOCKWISE OPEN CIRCLE ARROW
+   \definesymbol[ClockwiseOpenCircleArrow][\USymbChar{33}{187}] % CLOCKWISE OPEN CIRCLE ARROW
+   \definesymbol[LeftwardsHarpoonWithBarbUpwards][\USymbChar{33}{188}] % LEFTWARDS HARPOON WITH BARB UPWARDS
+   \definesymbol[LeftwardsHarpoonWithBarbDownwards][\USymbChar{33}{189}] % LEFTWARDS HARPOON WITH BARB DOWNWARDS
+   \definesymbol[UpwardsHarpoonWithBarbRightwards][\USymbChar{33}{190}] % UPWARDS HARPOON WITH BARB RIGHTWARDS
+   \definesymbol[UpwardsHarpoonWithBarbLeftwards][\USymbChar{33}{191}] % UPWARDS HARPOON WITH BARB LEFTWARDS
+   \definesymbol[RightwardsHarpoonWithBarbUpwards][\USymbChar{33}{192}] % RIGHTWARDS HARPOON WITH BARB UPWARDS
+   \definesymbol[RightwardsHarpoonWithBarbDownwards][\USymbChar{33}{193}] % RIGHTWARDS HARPOON WITH BARB DOWNWARDS
+   \definesymbol[DownwardsHarpoonWithBarbRightwards][\USymbChar{33}{194}] % DOWNWARDS HARPOON WITH BARB RIGHTWARDS
+   \definesymbol[DownwardsHarpoonWithBarbLeftwards][\USymbChar{33}{195}] % DOWNWARDS HARPOON WITH BARB LEFTWARDS
+   \definesymbol[LeftwardsSquiggleArrow][\USymbChar{33}{220}] % LEFTWARDS SQUIGGLE ARROW
+   \definesymbol[RightwardsSquiggleArrow][\USymbChar{33}{221}] % RIGHTWARDS SQUIGGLE ARROW
+   \definesymbol[UpwardsArrowWithDoubleStroke][\USymbChar{33}{222}] % UPWARDS ARROW WITH DOUBLE STROKE
+   \definesymbol[DownwardsArrowWithDoubleStroke][\USymbChar{33}{223}] % DOWNWARDS ARROW WITH DOUBLE STROKE
+   \definesymbol[LeftwardsDashedArrow][\USymbChar{33}{224}] % LEFTWARDS DASHED ARROW
+   \definesymbol[UpwardsDashedArrow][\USymbChar{33}{225}] % UPWARDS DASHED ARROW
+   \definesymbol[RightwardsDashedArrow][\USymbChar{33}{226}] % RIGHTWARDS DASHED ARROW
+   \definesymbol[DownwardsDashedArrow][\USymbChar{33}{227}] % DOWNWARDS DASHED ARROW
+   \definesymbol[LeftwardsArrowToBar][\USymbChar{33}{228}] % LEFTWARDS ARROW TO BAR
+   \definesymbol[RightwardsArrowToBar][\USymbChar{33}{229}] % RIGHTWARDS ARROW TO BAR
+   \definesymbol[LeftwardsWhiteArrow][\USymbChar{33}{230}] % LEFTWARDS WHITE ARROW
+   \definesymbol[UpwardsWhiteArrow][\USymbChar{33}{231}] % UPWARDS WHITE ARROW
+   \definesymbol[RightwardsWhiteArrow][\USymbChar{33}{232}] % RIGHTWARDS WHITE ARROW
+   \definesymbol[DownwardsWhiteArrow][\USymbChar{33}{233}] % DOWNWARDS WHITE ARROW
+   \definesymbol[UpwardsWhiteArrowFromBar][\USymbChar{33}{234}] % UPWARDS WHITE ARROW FROM BAR
+   \definesymbol[UpwardsWhiteArrowOnPedestal][\USymbChar{33}{235}] % UPWARDS WHITE ARROW ON PEDESTAL
+   \definesymbol[UpwardsWhiteArrowOnPedestalWithHorizontalBar][\USymbChar{33}{236}] % UPWARDS WHITE ARROW ON PEDESTAL WITH HORIZONTAL BAR
+   \definesymbol[UpwardsWhiteArrowOnPedestalWithVerticalBar][\USymbChar{33}{237}] % UPWARDS WHITE ARROW ON PEDESTAL WITH VERTICAL BAR
+   \definesymbol[RightwardsWhiteArrowFromWall][\USymbChar{33}{240}] % RIGHTWARDS WHITE ARROW FROM WALL
+   \definesymbol[NorthWestArrowToCorner][\USymbChar{33}{241}] % NORTH WEST ARROW TO CORNER
+   \definesymbol[SouthEastArrowToCorner][\USymbChar{33}{242}] % SOUTH EAST ARROW TO CORNER
+   \definesymbol[UpDownWhiteArrow][\USymbChar{33}{243}] % UP DOWN WHITE ARROW
+
+\stopsymbolset
+
+\startsymbolset[Unicode Multi Arrows] % 0x2190: Requires UnicodeRegular21
+
+   \definesymbol[LeftwardsArrowToBarOverRightwardsArrowToBar][\USymbChar{33}{185}] % LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR
+   \definesymbol[RightwardsArrowOverLeftwardsArrow][\USymbChar{33}{196}] % RIGHTWARDS ARROW OVER LEFTWARDS ARROW
+   \definesymbol[UpwardsArrowLeftwardsOfDownwardsArrow][\USymbChar{33}{197}] % UPWARDS ARROW LEFTWARDS OF DOWNWARDS ARROW
+   \definesymbol[LeftwardsArrowOverRightwardsArrow][\USymbChar{33}{198}] % LEFTWARDS ARROW OVER RIGHTWARDS ARROW
+   \definesymbol[LeftwardsPairedArrows][\USymbChar{33}{199}] % LEFTWARDS PAIRED ARROWS
+   \definesymbol[UpwardsPairedArrows][\USymbChar{33}{200}] % UPWARDS PAIRED ARROWS
+   \definesymbol[RightwardsPairedArrows][\USymbChar{33}{201}] % RIGHTWARDS PAIRED ARROWS
+   \definesymbol[DownwardsPairedArrows][\USymbChar{33}{202}] % DOWNWARDS PAIRED ARROWS
+   \definesymbol[LeftwardsHarpoonOverRightwardsHarpoon][\USymbChar{33}{203}] % LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON
+   \definesymbol[RightwardsHarpoonOverLeftwardsHarpoon][\USymbChar{33}{204}] % RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON
+   \definesymbol[LeftwardsDoubleArrowWithStroke][\USymbChar{33}{205}] % LEFTWARDS DOUBLE ARROW WITH STROKE
+   \definesymbol[LeftRightDoubleArrowWithStroke][\USymbChar{33}{206}] % LEFT RIGHT DOUBLE ARROW WITH STROKE
+   \definesymbol[RightwardsDoubleArrowWithStroke][\USymbChar{33}{207}] % RIGHTWARDS DOUBLE ARROW WITH STROKE
+   \definesymbol[LeftwardsDoubleArrow][\USymbChar{33}{208}] % LEFTWARDS DOUBLE ARROW
+   \definesymbol[UpwardsDoubleArrow][\USymbChar{33}{209}] % UPWARDS DOUBLE ARROW
+   \definesymbol[RightwardsDoubleArrow][\USymbChar{33}{210}] % RIGHTWARDS DOUBLE ARROW
+   \definesymbol[DownwardsDoubleArrow][\USymbChar{33}{211}] % DOWNWARDS DOUBLE ARROW
+   \definesymbol[LeftRightDoubleArrow][\USymbChar{33}{212}] % LEFT RIGHT DOUBLE ARROW
+   \definesymbol[UpDownDoubleArrow][\USymbChar{33}{213}] % UP DOWN DOUBLE ARROW
+   \definesymbol[NorthWestDoubleArrow][\USymbChar{33}{214}] % NORTH WEST DOUBLE ARROW
+   \definesymbol[NorthEastDoubleArrow][\USymbChar{33}{215}] % NORTH EAST DOUBLE ARROW
+   \definesymbol[SouthEastDoubleArrow][\USymbChar{33}{216}] % SOUTH EAST DOUBLE ARROW
+   \definesymbol[SouthWestDoubleArrow][\USymbChar{33}{217}] % SOUTH WEST DOUBLE ARROW
+   \definesymbol[LeftwardsTripleArrow][\USymbChar{33}{218}] % LEFTWARDS TRIPLE ARROW
+   \definesymbol[RightwardsTripleArrow][\USymbChar{33}{219}] % RIGHTWARDS TRIPLE ARROW
+   \definesymbol[UpwardsWhiteDoubleArrow][\USymbChar{33}{238}] % UPWARDS WHITE DOUBLE ARROW
+   \definesymbol[UpwardsWhiteDoubleArrowOnPedestal][\USymbChar{33}{239}] % UPWARDS WHITE DOUBLE ARROW ON PEDESTAL
+
+\stopsymbolset
+
+
+\startsymbolset[Unicode Optical Character Recognition] % 0x2440: Requires UnicodeRegular24
+
+   \definesymbol[OcrHook][\USymbChar{36}{64}] % OCR HOOK
+   \definesymbol[OcrChair][\USymbChar{36}{65}] % OCR CHAIR
+   \definesymbol[OcrFork][\USymbChar{36}{66}] % OCR FORK
+   \definesymbol[OcrInvertedFork][\USymbChar{36}{67}] % OCR INVERTED FORK
+   \definesymbol[OcrBeltBuckle][\USymbChar{36}{68}] % OCR BELT BUCKLE
+   \definesymbol[OcrBowTie][\USymbChar{36}{69}] % OCR BOW TIE
+   \definesymbol[OcrBranchBankIdentification][\USymbChar{36}{70}] % OCR BRANCH BANK IDENTIFICATION
+   \definesymbol[OcrAmountOfCheck][\USymbChar{36}{71}] % OCR AMOUNT OF CHECK
+   \definesymbol[OcrDash][\USymbChar{36}{72}] % OCR DASH
+   \definesymbol[OcrCustomerAccountNumber][\USymbChar{36}{73}] % OCR CUSTOMER ACCOUNT NUMBER
+   \definesymbol[OcrDoubleBackslash][\USymbChar{36}{74}] % OCR DOUBLE BACKSLASH
+
+\stopsymbolset
+
+
+\startsymbolset[Unicode Box Drawing] % 0x2500: Requires UnicodeRegular25
+
+   \definesymbol[LightHorizontal][\USymbChar{37}{0}] % BOX DRAWINGS LIGHT HORIZONTAL
+   \definesymbol[HeavyHorizontal][\USymbChar{37}{1}] % BOX DRAWINGS HEAVY HORIZONTAL
+   \definesymbol[LightVertical][\USymbChar{37}{2}] % BOX DRAWINGS LIGHT VERTICAL
+   \definesymbol[HeavyVertical][\USymbChar{37}{3}] % BOX DRAWINGS HEAVY VERTICAL
+   \definesymbol[LightTripleDashHorizontal][\USymbChar{37}{4}] % BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL
+   \definesymbol[HeavyTripleDashHorizontal][\USymbChar{37}{5}] % BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL
+   \definesymbol[LightTripleDashVertical][\USymbChar{37}{6}] % BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL
+   \definesymbol[HeavyTripleDashVertical][\USymbChar{37}{7}] % BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL
+   \definesymbol[LightQuadrupleDashHorizontal][\USymbChar{37}{8}] % BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL
+   \definesymbol[HeavyQuadrupleDashHorizontal][\USymbChar{37}{9}] % BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL
+   \definesymbol[LightQuadrupleDashVertical][\USymbChar{37}{10}] % BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL
+   \definesymbol[HeavyQuadrupleDashVertical][\USymbChar{37}{11}] % BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL
+   \definesymbol[LightDownAndRight][\USymbChar{37}{12}] % BOX DRAWINGS LIGHT DOWN AND RIGHT
+   \definesymbol[DownLightAndRightHeavy][\USymbChar{37}{13}] % BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY
+   \definesymbol[DownHeavyAndRightLight][\USymbChar{37}{14}] % BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT
+   \definesymbol[HeavyDownAndRight][\USymbChar{37}{15}] % BOX DRAWINGS HEAVY DOWN AND RIGHT
+   \definesymbol[LightDownAndLeft][\USymbChar{37}{16}] % BOX DRAWINGS LIGHT DOWN AND LEFT
+   \definesymbol[DownLightAndLeftHeavy][\USymbChar{37}{17}] % BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY
+   \definesymbol[DownHeavyAndLeftLight][\USymbChar{37}{18}] % BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT
+   \definesymbol[HeavyDownAndLeft][\USymbChar{37}{19}] % BOX DRAWINGS HEAVY DOWN AND LEFT
+   \definesymbol[LightUpAndRight][\USymbChar{37}{20}] % BOX DRAWINGS LIGHT UP AND RIGHT
+   \definesymbol[UpLightAndRightHeavy][\USymbChar{37}{21}] % BOX DRAWINGS UP LIGHT AND RIGHT HEAVY
+   \definesymbol[UpHeavyAndRightLight][\USymbChar{37}{22}] % BOX DRAWINGS UP HEAVY AND RIGHT LIGHT
+   \definesymbol[HeavyUpAndRight][\USymbChar{37}{23}] % BOX DRAWINGS HEAVY UP AND RIGHT
+   \definesymbol[LightUpAndLeft][\USymbChar{37}{24}] % BOX DRAWINGS LIGHT UP AND LEFT
+   \definesymbol[UpLightAndLeftHeavy][\USymbChar{37}{25}] % BOX DRAWINGS UP LIGHT AND LEFT HEAVY
+   \definesymbol[UpHeavyAndLeftLight][\USymbChar{37}{26}] % BOX DRAWINGS UP HEAVY AND LEFT LIGHT
+   \definesymbol[HeavyUpAndLeft][\USymbChar{37}{27}] % BOX DRAWINGS HEAVY UP AND LEFT
+   \definesymbol[LightVerticalAndRight][\USymbChar{37}{28}] % BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+   \definesymbol[VerticalLightAndRightHeavy][\USymbChar{37}{29}] % BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY
+   \definesymbol[UpHeavyAndRightDownLight][\USymbChar{37}{30}] % BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT
+   \definesymbol[DownHeavyAndRightUpLight][\USymbChar{37}{31}] % BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT
+   \definesymbol[VerticalHeavyAndRightLight][\USymbChar{37}{32}] % BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT
+   \definesymbol[DownLightAndRightUpHeavy][\USymbChar{37}{33}] % BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY
+   \definesymbol[UpLightAndRightDownHeavy][\USymbChar{37}{34}] % BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY
+   \definesymbol[HeavyVerticalAndRight][\USymbChar{37}{35}] % BOX DRAWINGS HEAVY VERTICAL AND RIGHT
+   \definesymbol[LightVerticalAndLeft][\USymbChar{37}{36}] % BOX DRAWINGS LIGHT VERTICAL AND LEFT
+   \definesymbol[VerticalLightAndLeftHeavy][\USymbChar{37}{37}] % BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY
+   \definesymbol[UpHeavyAndLeftDownLight][\USymbChar{37}{38}] % BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT
+   \definesymbol[DownHeavyAndLeftUpLight][\USymbChar{37}{39}] % BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT
+   \definesymbol[VerticalHeavyAndLeftLight][\USymbChar{37}{40}] % BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT
+   \definesymbol[DownLightAndLeftUpHeavy][\USymbChar{37}{41}] % BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY
+   \definesymbol[UpLightAndLeftDownHeavy][\USymbChar{37}{42}] % BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY
+   \definesymbol[HeavyVerticalAndLeft][\USymbChar{37}{43}] % BOX DRAWINGS HEAVY VERTICAL AND LEFT
+   \definesymbol[LightDownAndHorizontal][\USymbChar{37}{44}] % BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+   \definesymbol[LeftHeavyAndRightDownLight][\USymbChar{37}{45}] % BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT
+   \definesymbol[RightHeavyAndLeftDownLight][\USymbChar{37}{46}] % BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT
+   \definesymbol[DownLightAndHorizontalHeavy][\USymbChar{37}{47}] % BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY
+   \definesymbol[DownHeavyAndHorizontalLight][\USymbChar{37}{48}] % BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT
+   \definesymbol[RightLightAndLeftDownHeavy][\USymbChar{37}{49}] % BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY
+   \definesymbol[LeftLightAndRightDownHeavy][\USymbChar{37}{50}] % BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY
+   \definesymbol[HeavyDownAndHorizontal][\USymbChar{37}{51}] % BOX DRAWINGS HEAVY DOWN AND HORIZONTAL
+   \definesymbol[LightUpAndHorizontal][\USymbChar{37}{52}] % BOX DRAWINGS LIGHT UP AND HORIZONTAL
+   \definesymbol[LeftHeavyAndRightUpLight][\USymbChar{37}{53}] % BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT
+   \definesymbol[RightHeavyAndLeftUpLight][\USymbChar{37}{54}] % BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT
+   \definesymbol[UpLightAndHorizontalHeavy][\USymbChar{37}{55}] % BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY
+   \definesymbol[UpHeavyAndHorizontalLight][\USymbChar{37}{56}] % BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT
+   \definesymbol[RightLightAndLeftUpHeavy][\USymbChar{37}{57}] % BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY
+   \definesymbol[LeftLightAndRightUpHeavy][\USymbChar{37}{58}] % BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY
+   \definesymbol[HeavyUpAndHorizontal][\USymbChar{37}{59}] % BOX DRAWINGS HEAVY UP AND HORIZONTAL
+   \definesymbol[LightVerticalAndHorizontal][\USymbChar{37}{60}] % BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+   \definesymbol[LeftHeavyAndRightVerticalLight][\USymbChar{37}{61}] % BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT
+   \definesymbol[RightHeavyAndLeftVerticalLight][\USymbChar{37}{62}] % BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT
+   \definesymbol[VerticalLightAndHorizontalHeavy][\USymbChar{37}{63}] % BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY
+   \definesymbol[UpHeavyAndDownHorizontalLight][\USymbChar{37}{64}] % BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT
+   \definesymbol[DownHeavyAndUpHorizontalLight][\USymbChar{37}{65}] % BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT
+   \definesymbol[VerticalHeavyAndHorizontalLight][\USymbChar{37}{66}] % BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT
+   \definesymbol[LeftUpHeavyAndRightDownLight][\USymbChar{37}{67}] % BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT
+   \definesymbol[RightUpHeavyAndLeftDownLight][\USymbChar{37}{68}] % BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT
+   \definesymbol[LeftDownHeavyAndRightUpLight][\USymbChar{37}{69}] % BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT
+   \definesymbol[RightDownHeavyAndLeftUpLight][\USymbChar{37}{70}] % BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT
+   \definesymbol[DownLightAndUpHorizontalHeavy][\USymbChar{37}{71}] % BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY
+   \definesymbol[UpLightAndDownHorizontalHeavy][\USymbChar{37}{72}] % BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY
+   \definesymbol[RightLightAndLeftVerticalHeavy][\USymbChar{37}{73}] % BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY
+   \definesymbol[LeftLightAndRightVerticalHeavy][\USymbChar{37}{74}] % BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY
+   \definesymbol[HeavyVerticalAndHorizontal][\USymbChar{37}{75}] % BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL
+   \definesymbol[LightArcDownAndRight][\USymbChar{37}{109}] % BOX DRAWINGS LIGHT ARC DOWN AND RIGHT
+   \definesymbol[LightArcDownAndLeft][\USymbChar{37}{110}] % BOX DRAWINGS LIGHT ARC DOWN AND LEFT
+   \definesymbol[LightArcUpAndLeft][\USymbChar{37}{111}] % BOX DRAWINGS LIGHT ARC UP AND LEFT
+   \definesymbol[LightArcUpAndRight][\USymbChar{37}{112}] % BOX DRAWINGS LIGHT ARC UP AND RIGHT
+   \definesymbol[LightDiagonalUpperRightToLowerLeft][\USymbChar{37}{113}] % BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT
+   \definesymbol[LightDiagonalUpperLeftToLowerRight][\USymbChar{37}{114}] % BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT
+   \definesymbol[LightDiagonalCross][\USymbChar{37}{115}] % BOX DRAWINGS LIGHT DIAGONAL CROSS
+   \definesymbol[LightLeft][\USymbChar{37}{116}] % BOX DRAWINGS LIGHT LEFT
+   \definesymbol[LightUp][\USymbChar{37}{117}] % BOX DRAWINGS LIGHT UP
+   \definesymbol[LightRight][\USymbChar{37}{118}] % BOX DRAWINGS LIGHT RIGHT
+   \definesymbol[LightDown][\USymbChar{37}{119}] % BOX DRAWINGS LIGHT DOWN
+   \definesymbol[HeavyLeft][\USymbChar{37}{120}] % BOX DRAWINGS HEAVY LEFT
+   \definesymbol[HeavyUp][\USymbChar{37}{121}] % BOX DRAWINGS HEAVY UP
+   \definesymbol[HeavyRight][\USymbChar{37}{122}] % BOX DRAWINGS HEAVY RIGHT
+   \definesymbol[HeavyDown][\USymbChar{37}{123}] % BOX DRAWINGS HEAVY DOWN
+   \definesymbol[LightLeftAndHeavyRight][\USymbChar{37}{124}] % BOX DRAWINGS LIGHT LEFT AND HEAVY RIGHT
+   \definesymbol[LightUpAndHeavyDown][\USymbChar{37}{125}] % BOX DRAWINGS LIGHT UP AND HEAVY DOWN
+   \definesymbol[HeavyLeftAndLightRight][\USymbChar{37}{126}] % BOX DRAWINGS HEAVY LEFT AND LIGHT RIGHT
+   \definesymbol[HeavyUpAndLightDown][\USymbChar{37}{127}] % BOX DRAWINGS HEAVY UP AND LIGHT DOWN
+
+\stopsymbolset
+
+\startsymbolset[Unicode Circled Digits] % 0x2460: Requires UnicodeRegular24
+
+   \definesymbol[CircledOne][\USymbCharZapf{36}{96}] % CIRCLED DIGIT ONE
+   \definesymbol[CircledTwo][\USymbCharZapf{36}{97}] % CIRCLED DIGIT TWO
+   \definesymbol[CircledThree][\USymbCharZapf{36}{98}] % CIRCLED DIGIT THREE
+   \definesymbol[CircledFour][\USymbCharZapf{36}{99}] % CIRCLED DIGIT FOUR
+   \definesymbol[CircledFive][\USymbCharZapf{36}{100}] % CIRCLED DIGIT FIVE
+   \definesymbol[CircledSix][\USymbCharZapf{36}{101}] % CIRCLED DIGIT SIX
+   \definesymbol[CircledSeven][\USymbCharZapf{36}{102}] % CIRCLED DIGIT SEVEN
+   \definesymbol[CircledEight][\USymbCharZapf{36}{103}] % CIRCLED DIGIT EIGHT
+   \definesymbol[CircledNine][\USymbCharZapf{36}{104}] % CIRCLED DIGIT NINE
+   \definesymbol[CircledTen][\USymbCharZapf{36}{105}] % CIRCLED NUMBER TEN
+
+\stopsymbolset
+
+\startsymbolset[Unicode Double Box Drawing] % 0x2500: Requires UnicodeRegular25
+
+   \definesymbol[LightDoubleDashHorizontal][\USymbChar{37}{76}] % BOX DRAWINGS LIGHT DOUBLE DASH HORIZONTAL
+   \definesymbol[HeavyDoubleDashHorizontal][\USymbChar{37}{77}] % BOX DRAWINGS HEAVY DOUBLE DASH HORIZONTAL
+   \definesymbol[LightDoubleDashVertical][\USymbChar{37}{78}] % BOX DRAWINGS LIGHT DOUBLE DASH VERTICAL
+   \definesymbol[HeavyDoubleDashVertical][\USymbChar{37}{79}] % BOX DRAWINGS HEAVY DOUBLE DASH VERTICAL
+   \definesymbol[DoubleHorizontal][\USymbChar{37}{80}] % BOX DRAWINGS DOUBLE HORIZONTAL
+   \definesymbol[DoubleVertical][\USymbChar{37}{81}] % BOX DRAWINGS DOUBLE VERTICAL
+   \definesymbol[DownSingleAndRightDouble][\USymbChar{37}{82}] % BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
+   \definesymbol[DownDoubleAndRightSingle][\USymbChar{37}{83}] % BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
+   \definesymbol[DoubleDownAndRight][\USymbChar{37}{84}] % BOX DRAWINGS DOUBLE DOWN AND RIGHT
+   \definesymbol[DownSingleAndLeftDouble][\USymbChar{37}{85}] % BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
+   \definesymbol[DownDoubleAndLeftSingle][\USymbChar{37}{86}] % BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
+   \definesymbol[DoubleDownAndLeft][\USymbChar{37}{87}] % BOX DRAWINGS DOUBLE DOWN AND LEFT
+   \definesymbol[UpSingleAndRightDouble][\USymbChar{37}{88}] % BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
+   \definesymbol[UpDoubleAndRightSingle][\USymbChar{37}{89}] % BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
+   \definesymbol[DoubleUpAndRight][\USymbChar{37}{90}] % BOX DRAWINGS DOUBLE UP AND RIGHT
+   \definesymbol[UpSingleAndLeftDouble][\USymbChar{37}{91}] % BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
+   \definesymbol[UpDoubleAndLeftSingle][\USymbChar{37}{92}] % BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
+   \definesymbol[DoubleUpAndLeft][\USymbChar{37}{93}] % BOX DRAWINGS DOUBLE UP AND LEFT
+   \definesymbol[VerticalSingleAndRightDouble][\USymbChar{37}{94}] % BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
+   \definesymbol[VerticalDoubleAndRightSingle][\USymbChar{37}{95}] % BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
+   \definesymbol[DoubleVerticalAndRight][\USymbChar{37}{96}] % BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+   \definesymbol[VerticalSingleAndLeftDouble][\USymbChar{37}{97}] % BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
+   \definesymbol[VerticalDoubleAndLeftSingle][\USymbChar{37}{98}] % BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
+   \definesymbol[DoubleVerticalAndLeft][\USymbChar{37}{99}] % BOX DRAWINGS DOUBLE VERTICAL AND LEFT
+   \definesymbol[DownSingleAndHorizontalDouble][\USymbChar{37}{100}] % BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
+   \definesymbol[DownDoubleAndHorizontalSingle][\USymbChar{37}{101}] % BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
+   \definesymbol[DoubleDownAndHorizontal][\USymbChar{37}{102}] % BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+   \definesymbol[UpSingleAndHorizontalDouble][\USymbChar{37}{103}] % BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
+   \definesymbol[UpDoubleAndHorizontalSingle][\USymbChar{37}{104}] % BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
+   \definesymbol[DoubleUpAndHorizontal][\USymbChar{37}{105}] % BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+   \definesymbol[VerticalSingleAndHorizontalDouble][\USymbChar{37}{106}] % BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
+   \definesymbol[VerticalDoubleAndHorizontalSingle][\USymbChar{37}{107}] % BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
+   \definesymbol[DoubleVerticalAndHorizontal][\USymbChar{37}{108}] % BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
+
+\stopsymbolset
+
+\startsymbolset[Unicode Block Elements] % 0x2580: Requires UnicodeRegular25
+
+   \definesymbol[UpperHalfBlock][\USymbChar{37}{128}] % UPPER HALF BLOCK
+   \definesymbol[LowerOneEighthBlock][\USymbChar{37}{129}] % LOWER ONE EIGHTH BLOCK
+   \definesymbol[LowerOneQuarterBlock][\USymbChar{37}{130}] % LOWER ONE QUARTER BLOCK
+   \definesymbol[LowerThreeEighthsBlock][\USymbChar{37}{131}] % LOWER THREE EIGHTHS BLOCK
+   \definesymbol[LowerHalfBlock][\USymbChar{37}{132}] % LOWER HALF BLOCK
+   \definesymbol[LowerFiveEighthsBlock][\USymbChar{37}{133}] % LOWER FIVE EIGHTHS BLOCK
+   \definesymbol[LowerThreeQuartersBlock][\USymbChar{37}{134}] % LOWER THREE QUARTERS BLOCK
+   \definesymbol[LowerSevenEighthsBlock][\USymbChar{37}{135}] % LOWER SEVEN EIGHTHS BLOCK
+   \definesymbol[FullBlock][\USymbChar{37}{136}] % FULL BLOCK
+   \definesymbol[LeftSevenEighthsBlock][\USymbChar{37}{137}] % LEFT SEVEN EIGHTHS BLOCK
+   \definesymbol[LeftThreeQuartersBlock][\USymbChar{37}{138}] % LEFT THREE QUARTERS BLOCK
+   \definesymbol[LeftFiveEighthsBlock][\USymbChar{37}{139}] % LEFT FIVE EIGHTHS BLOCK
+   \definesymbol[LeftHalfBlock][\USymbChar{37}{140}] % LEFT HALF BLOCK
+   \definesymbol[LeftThreeEighthsBlock][\USymbChar{37}{141}] % LEFT THREE EIGHTHS BLOCK
+   \definesymbol[LeftOneQuarterBlock][\USymbChar{37}{142}] % LEFT ONE QUARTER BLOCK
+   \definesymbol[LeftOneEighthBlock][\USymbChar{37}{143}] % LEFT ONE EIGHTH BLOCK
+   \definesymbol[RightHalfBlock][\USymbChar{37}{144}] % RIGHT HALF BLOCK
+   \definesymbol[UpperOneEighthBlock][\USymbChar{37}{148}] % UPPER ONE EIGHTH BLOCK
+   \definesymbol[RightOneEighthBlock][\USymbChar{37}{149}] % RIGHT ONE EIGHTH BLOCK
+
+\stopsymbolset
+
+\startsymbolset[Unicode Shade Characters] % 0x2580: Requires UnicodeRegular25
+
+   \definesymbol[LightShade][\USymbChar{37}{145}] % LIGHT SHADE
+   \definesymbol[MediumShade][\USymbChar{37}{146}] % MEDIUM SHADE
+   \definesymbol[DarkShade][\USymbChar{37}{147}] % DARK SHADE
+
+\stopsymbolset
+
+\startsymbolset[Unicode Terminal Graphics] % 0x2580: Requires UnicodeRegular25
+
+   \definesymbol[QuadrantLowerLeft][\USymbChar{37}{150}] % [Unassigned U+2596]
+   \definesymbol[QuadrantLowerRight][\USymbChar{37}{151}] % [Unassigned U+2597]
+   \definesymbol[QuadrantUpperLeft][\USymbChar{37}{152}] % [Unassigned U+2598]
+   \definesymbol[QuadrantUpperLeftAndLowerLeftAndLowerRight][\USymbChar{37}{153}] % [Unassigned U+2599]
+   \definesymbol[QuadrantUpperLeftAndLowerRight][\USymbChar{37}{154}] % [Unassigned U+259A]
+   \definesymbol[QuadrantUpperLeftAndUpperRightandLowerLeft][\USymbChar{37}{155}] % [Unassigned U+259B]
+   \definesymbol[QuadrantUpperLeftAndUpperRightAndLowerRight][\USymbChar{37}{156}] % [Unassigned U+259C]
+   \definesymbol[QuadrantUpperRight][\USymbChar{37}{157}] % [Unassigned U+259D]
+   \definesymbol[QuadrantUpperRightAndLowerLeft][\USymbChar{37}{158}] % [Unassigned U+259E]
+   \definesymbol[QuadrantUpperRightAndLowerLeftAndLowerRight][\USymbChar{37}{159}] % [Unassigned U+259F]
+
+\stopsymbolset
+
+\startsymbolset[Unicode Geometric Shapes] % 0x25A0: Requires UnicodeRegular25
+
+   \definesymbol[BlackSquare][\USymbChar{37}{160}] % BLACK SQUARE
+   \definesymbol[WhiteSquare][\USymbChar{37}{161}] % WHITE SQUARE
+   \definesymbol[WhiteSquareWithRoundedCorners][\USymbChar{37}{162}] % WHITE SQUARE WITH ROUNDED CORNERS
+   \definesymbol[WhiteSquareContainingBlackSmallSquare][\USymbChar{37}{163}] % WHITE SQUARE CONTAINING BLACK SMALL SQUARE
+   \definesymbol[SquareWithHorizontalFill][\USymbChar{37}{164}] % SQUARE WITH HORIZONTAL FILL
+   \definesymbol[SquareWithVerticalFill][\USymbChar{37}{165}] % SQUARE WITH VERTICAL FILL
+   \definesymbol[SquareWithOrthogonalCrosshatchFill][\USymbChar{37}{166}] % SQUARE WITH ORTHOGONAL CROSSHATCH FILL
+   \definesymbol[SquareWithUpperLeftToLowerRightFill][\USymbChar{37}{167}] % SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL
+   \definesymbol[SquareWithUpperRightToLowerLeftFill][\USymbChar{37}{168}] % SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL
+   \definesymbol[SquareWithDiagonalCrosshatchFill][\USymbChar{37}{169}] % SQUARE WITH DIAGONAL CROSSHATCH FILL
+   \definesymbol[BlackSmallSquare][\USymbChar{37}{170}] % BLACK SMALL SQUARE
+   \definesymbol[WhiteSmallSquare][\USymbChar{37}{171}] % WHITE SMALL SQUARE
+   \definesymbol[BlackRectangle][\USymbChar{37}{172}] % BLACK RECTANGLE
+   \definesymbol[WhiteRectangle][\USymbChar{37}{173}] % WHITE RECTANGLE
+   \definesymbol[BlackVerticalRectangle][\USymbChar{37}{174}] % BLACK VERTICAL RECTANGLE
+   \definesymbol[WhiteVerticalRectangle][\USymbChar{37}{175}] % WHITE VERTICAL RECTANGLE
+   \definesymbol[BlackParallelogram][\USymbChar{37}{176}] % BLACK PARALLELOGRAM
+   \definesymbol[WhiteParallelogram][\USymbChar{37}{177}] % WHITE PARALLELOGRAM
+   \definesymbol[BlackUpPointingTriangle][\USymbChar{37}{178}] % BLACK UP-POINTING TRIANGLE
+   \definesymbol[WhiteUpPointingTriangle][\USymbChar{37}{179}] % WHITE UP-POINTING TRIANGLE
+   \definesymbol[BlackUpPointingSmallTriangle][\USymbChar{37}{180}] % BLACK UP-POINTING SMALL TRIANGLE
+   \definesymbol[WhiteUpPointingSmallTriangle][\USymbChar{37}{181}] % WHITE UP-POINTING SMALL TRIANGLE
+   \definesymbol[BlackRightPointingTriangle][\USymbChar{37}{182}] % BLACK RIGHT-POINTING TRIANGLE
+   \definesymbol[WhiteRightPointingTriangle][\USymbChar{37}{183}] % WHITE RIGHT-POINTING TRIANGLE
+   \definesymbol[BlackRightPointingSmallTriangle][\USymbChar{37}{184}] % BLACK RIGHT-POINTING SMALL TRIANGLE
+   \definesymbol[WhiteRightPointingSmallTriangle][\USymbChar{37}{185}] % WHITE RIGHT-POINTING SMALL TRIANGLE
+   \definesymbol[BlackRightPointingPointer][\USymbChar{37}{186}] % BLACK RIGHT-POINTING POINTER
+   \definesymbol[WhiteRightPointingPointer][\USymbChar{37}{187}] % WHITE RIGHT-POINTING POINTER
+   \definesymbol[BlackDownPointingTriangle][\USymbChar{37}{188}] % BLACK DOWN-POINTING TRIANGLE
+   \definesymbol[WhiteDownPointingTriangle][\USymbChar{37}{189}] % WHITE DOWN-POINTING TRIANGLE
+   \definesymbol[BlackDownPointingSmallTriangle][\USymbChar{37}{190}] % BLACK DOWN-POINTING SMALL TRIANGLE
+   \definesymbol[WhiteDownPointingSmallTriangle][\USymbChar{37}{191}] % WHITE DOWN-POINTING SMALL TRIANGLE
+   \definesymbol[BlackLeftPointingTriangle][\USymbChar{37}{192}] % BLACK LEFT-POINTING TRIANGLE
+   \definesymbol[WhiteLeftPointingTriangle][\USymbChar{37}{193}] % WHITE LEFT-POINTING TRIANGLE
+   \definesymbol[BlackLeftPointingSmallTriangle][\USymbChar{37}{194}] % BLACK LEFT-POINTING SMALL TRIANGLE
+   \definesymbol[WhiteLeftPointingSmallTriangle][\USymbChar{37}{195}] % WHITE LEFT-POINTING SMALL TRIANGLE
+   \definesymbol[BlackLeftPointingPointer][\USymbChar{37}{196}] % BLACK LEFT-POINTING POINTER
+   \definesymbol[WhiteLeftPointingPointer][\USymbChar{37}{197}] % WHITE LEFT-POINTING POINTER
+   \definesymbol[BlackDiamond][\USymbChar{37}{198}] % BLACK DIAMOND
+   \definesymbol[WhiteDiamond][\USymbChar{37}{199}] % WHITE DIAMOND
+   \definesymbol[WhiteDiamondContainingBlackSmallDiamond][\USymbChar{37}{200}] % WHITE DIAMOND CONTAINING BLACK SMALL DIAMOND
+   \definesymbol[Fisheye][\USymbChar{37}{201}] % FISHEYE
+   \definesymbol[Lozenge][\USymbChar{37}{202}] % LOZENGE
+   \definesymbol[WhiteCircle][\USymbChar{37}{203}] % WHITE CIRCLE
+   \definesymbol[DottedCircle][\USymbChar{37}{204}] % DOTTED CIRCLE
+   \definesymbol[CircleWithVerticalFill][\USymbChar{37}{205}] % CIRCLE WITH VERTICAL FILL
+   \definesymbol[Bullseye][\USymbChar{37}{206}] % BULLSEYE
+   \definesymbol[BlackCircle][\USymbChar{37}{207}] % BLACK CIRCLE
+   \definesymbol[CircleWithLeftHalfBlack][\USymbChar{37}{208}] % CIRCLE WITH LEFT HALF BLACK
+   \definesymbol[CircleWithRightHalfBlack][\USymbChar{37}{209}] % CIRCLE WITH RIGHT HALF BLACK
+   \definesymbol[CircleWithLowerHalfBlack][\USymbChar{37}{210}] % CIRCLE WITH LOWER HALF BLACK
+   \definesymbol[CircleWithUpperHalfBlack][\USymbChar{37}{211}] % CIRCLE WITH UPPER HALF BLACK
+   \definesymbol[CircleWithUpperRightQuadrantBlack][\USymbChar{37}{212}] % CIRCLE WITH UPPER RIGHT QUADRANT BLACK
+   \definesymbol[CircleWithAllButUpperLeftQuadrantBlack][\USymbChar{37}{213}] % CIRCLE WITH ALL BUT UPPER LEFT QUADRANT BLACK
+   \definesymbol[LeftHalfBlackCircle][\USymbChar{37}{214}] % LEFT HALF BLACK CIRCLE
+   \definesymbol[RightHalfBlackCircle][\USymbChar{37}{215}] % RIGHT HALF BLACK CIRCLE
+   \definesymbol[InverseBullet][\USymbChar{37}{216}] % INVERSE BULLET
+   \definesymbol[InverseWhiteCircle][\USymbChar{37}{217}] % INVERSE WHITE CIRCLE
+   \definesymbol[UpperHalfInverseWhiteCircle][\USymbChar{37}{218}] % UPPER HALF INVERSE WHITE CIRCLE
+   \definesymbol[LowerHalfInverseWhiteCircle][\USymbChar{37}{219}] % LOWER HALF INVERSE WHITE CIRCLE
+   \definesymbol[UpperLeftQuadrantCircularArc][\USymbChar{37}{220}] % UPPER LEFT QUADRANT CIRCULAR ARC
+   \definesymbol[UpperRightQuadrantCircularArc][\USymbChar{37}{221}] % UPPER RIGHT QUADRANT CIRCULAR ARC
+   \definesymbol[LowerRightQuadrantCircularArc][\USymbChar{37}{222}] % LOWER RIGHT QUADRANT CIRCULAR ARC
+   \definesymbol[LowerLeftQuadrantCircularArc][\USymbChar{37}{223}] % LOWER LEFT QUADRANT CIRCULAR ARC
+   \definesymbol[LowerHalfCircle][\USymbChar{37}{225}] % LOWER HALF CIRCLE
+   \definesymbol[BlackLowerRightTriangle][\USymbChar{37}{226}] % BLACK LOWER RIGHT TRIANGLE
+   \definesymbol[BlackLowerLeftTriangle][\USymbChar{37}{227}] % BLACK LOWER LEFT TRIANGLE
+   \definesymbol[BlackUpperLeftTriangle][\USymbChar{37}{228}] % BLACK UPPER LEFT TRIANGLE
+   \definesymbol[BlackUpperRightTriangle][\USymbChar{37}{229}] % BLACK UPPER RIGHT TRIANGLE
+   \definesymbol[WhiteBullet][\USymbChar{37}{230}] % WHITE BULLET
+   \definesymbol[SquareWithLeftHalfBlack][\USymbChar{37}{231}] % SQUARE WITH LEFT HALF BLACK
+   \definesymbol[SquareWithRightHalfBlack][\USymbChar{37}{232}] % SQUARE WITH RIGHT HALF BLACK
+   \definesymbol[SquareWithUpperLeftDiagonalHalfBlack][\USymbChar{37}{233}] % SQUARE WITH UPPER LEFT DIAGONAL HALF BLACK
+   \definesymbol[SquareWithLowerRightDiagonalHalfBlack][\USymbChar{37}{234}] % SQUARE WITH LOWER RIGHT DIAGONAL HALF BLACK
+   \definesymbol[WhiteSquareWithVerticalBisectingLine][\USymbChar{37}{235}] % WHITE SQUARE WITH VERTICAL BISECTING LINE
+   \definesymbol[WhiteUpPointingTriangleWithDot][\USymbChar{37}{236}] % WHITE UP-POINTING TRIANGLE WITH DOT
+   \definesymbol[UpPointingTriangleWithLeftHalfBlack][\USymbChar{37}{237}] % UP-POINTING TRIANGLE WITH LEFT HALF BLACK
+   \definesymbol[UpPointingTriangleWithRightHalfBlack][\USymbChar{37}{238}] % UP-POINTING TRIANGLE WITH RIGHT HALF BLACK
+   \definesymbol[LargeCircle][\USymbChar{37}{239}] % LARGE CIRCLE
+   \definesymbol[UpperLeftTriangle][\USymbChar{37}{248}] % [Unassigned U+25F8]
+   \definesymbol[UpperRightTriangle][\USymbChar{37}{249}] % [Unassigned U+25F9]
+   \definesymbol[LowerLeftTriangle][\USymbChar{37}{250}] % [Unassigned U+25FA]
+   \definesymbol[WhiteMediumSquare][\USymbChar{37}{251}] % [Unassigned U+25FB]
+   \definesymbol[BlackMediumSquare][\USymbChar{37}{252}] % [Unassigned U+25FC]
+   \definesymbol[WhiteMediumSmallSquare][\USymbChar{37}{253}] % [Unassigned U+25FD]
+   \definesymbol[BlackMediumSmallSquare][\USymbChar{37}{254}] % [Unassigned U+25FE]
+   \definesymbol[LowerRightTriangle][\USymbChar{37}{255}] % [Unassigned U+25FF]
+
+\stopsymbolset
+
+\startsymbolset[Unicode Control Code Graphics] % 0x25A0: Requires UnicodeRegular25
+
+   \definesymbol[WhiteSquareWithUpperLeftQuadrant][\USymbChar{37}{240}] % WHITE SQUARE WITH UPPER LEFT QUADRANT
+   \definesymbol[WhiteSquareWithLowerLeftQuadrant][\USymbChar{37}{241}] % WHITE SQUARE WITH LOWER LEFT QUADRANT
+   \definesymbol[WhiteSquareWithLowerRightQuadrant][\USymbChar{37}{242}] % WHITE SQUARE WITH LOWER RIGHT QUADRANT
+   \definesymbol[WhiteSquareWithUpperRightQuadrant][\USymbChar{37}{243}] % WHITE SQUARE WITH UPPER RIGHT QUADRANT
+   \definesymbol[WhiteCircleWithUpperLeftQuadrant][\USymbChar{37}{244}] % WHITE CIRCLE WITH UPPER LEFT QUADRANT
+   \definesymbol[WhiteCircleWithLowerLeftQuadrant][\USymbChar{37}{245}] % WHITE CIRCLE WITH LOWER LEFT QUADRANT
+   \definesymbol[WhiteCircleWithLowerRightQuadrant][\USymbChar{37}{246}] % WHITE CIRCLE WITH LOWER RIGHT QUADRANT
+   \definesymbol[WhiteCircleWithUpperRightQuadrant][\USymbChar{37}{247}] % WHITE CIRCLE WITH UPPER RIGHT QUADRANT
+
+\stopsymbolset
+
+\startsymbolset[Unicode Weather and Astrological] % 0x2600: Requires UnicodeRegular26
+
+   \definesymbol[BlackSunWithRays][\USymbChar{38}{0}] % BLACK SUN WITH RAYS
+   \definesymbol[Cloud][\USymbChar{38}{1}] % CLOUD
+   \definesymbol[Umbrella][\USymbChar{38}{2}] % UMBRELLA
+   \definesymbol[Snowman][\USymbChar{38}{3}] % SNOWMAN
+   \definesymbol[Comet][\USymbChar{38}{4}] % COMET
+   \definesymbol[BlackStar][\USymbChar{38}{5}] % BLACK STAR
+   \definesymbol[WhiteStar][\USymbChar{38}{6}] % WHITE STAR
+   \definesymbol[Lightning][\USymbChar{38}{7}] % LIGHTNING
+   \definesymbol[Thunderstorm][\USymbChar{38}{8}] % THUNDERSTORM
+   \definesymbol[Sun][\USymbChar{38}{9}] % SUN
+   \definesymbol[AscendingNode][\USymbChar{38}{10}] % ASCENDING NODE
+   \definesymbol[DescendingNode][\USymbChar{38}{11}] % DESCENDING NODE
+   \definesymbol[Conjunction][\USymbChar{38}{12}] % CONJUNCTION
+   \definesymbol[Opposition][\USymbChar{38}{13}] % OPPOSITION
+   \definesymbol[FirstQuarterMoon][\USymbChar{38}{61}] % FIRST QUARTER MOON
+   \definesymbol[LastQuarterMoon][\USymbChar{38}{62}] % LAST QUARTER MOON
+   \definesymbol[Mercury][\USymbChar{38}{63}] % MERCURY
+   \definesymbol[FemaleSign][\USymbChar{38}{64}] % FEMALE SIGN
+   \definesymbol[Earth][\USymbChar{38}{65}] % EARTH
+   \definesymbol[MaleSign][\USymbChar{38}{66}] % MALE SIGN
+   \definesymbol[Jupiter][\USymbChar{38}{67}] % JUPITER
+   \definesymbol[Saturn][\USymbChar{38}{68}] % SATURN
+   \definesymbol[Uranus][\USymbChar{38}{69}] % URANUS
+   \definesymbol[Neptune][\USymbChar{38}{70}] % NEPTUNE
+   \definesymbol[Pluto][\USymbChar{38}{71}] % PLUTO
+
+\stopsymbolset
+
+\startsymbolset[Unicode Miscellaneous] % 0x2600: Requires UnicodeRegular26
+
+   \definesymbol[BlackTelephone][\USymbChar{38}{14}] % BLACK TELEPHONE
+   \definesymbol[WhiteTelephone][\USymbChar{38}{15}] % WHITE TELEPHONE
+   \definesymbol[BallotBox][\USymbChar{38}{16}] % BALLOT BOX
+   \definesymbol[BallotBoxWithCheck][\USymbChar{38}{17}] % BALLOT BOX WITH CHECK
+   \definesymbol[BallotBoxWithX][\USymbChar{38}{18}] % BALLOT BOX WITH X
+   \definesymbol[Saltire][\USymbChar{38}{19}] % SALTIRE
+   \definesymbol[ReversedRotatedFloralHeartBullet][\USymbChar{38}{25}] % REVERSED ROTATED FLORAL HEART BULLET
+   \definesymbol[WheelOfDharma][\USymbChar{38}{56}] % WHEEL OF DHARMA
+   \definesymbol[WhiteFrowningFace][\USymbChar{38}{57}] % WHITE FROWNING FACE
+   \definesymbol[WhiteSmilingFace][\USymbChar{38}{58}] % WHITE SMILING FACE
+   \definesymbol[BlackSmilingFace][\USymbChar{38}{59}] % BLACK SMILING FACE
+   \definesymbol[WhiteSunWithRays][\USymbChar{38}{60}] % WHITE SUN WITH RAYS
+   \definesymbol[HotSprings][\USymbChar{38}{104}] % HOT SPRINGS
+
+\stopsymbolset
+
+\startsymbolset[Unicode Japanese Chess] % 0x2600: Requires UnicodeRegular26
+
+   \definesymbol[WhiteShogiPiece][\USymbChar{38}{22}] % [Unassigned U+2616]
+   \definesymbol[BlackShogiPiece][\USymbChar{38}{23}] % [Unassigned U+2617]
+
+\stopsymbolset
+
+\startsymbolset[Unicode Pointing Hand] % 0x2600: Requires UnicodeRegular26
+
+   \definesymbol[BlackLeftPointingIndex][\USymbChar{38}{26}] % BLACK LEFT POINTING INDEX
+   \definesymbol[BlackRightPointingIndex][\USymbChar{38}{27}] % BLACK RIGHT POINTING INDEX
+   \definesymbol[WhiteLeftPointingIndex][\USymbChar{38}{28}] % WHITE LEFT POINTING INDEX
+   \definesymbol[WhiteUpPointingIndex][\USymbChar{38}{29}] % WHITE UP POINTING INDEX
+   \definesymbol[WhiteRightPointingIndex][\USymbChar{38}{30}] % WHITE RIGHT POINTING INDEX
+   \definesymbol[WhiteDownPointingIndex][\USymbChar{38}{31}] % WHITE DOWN POINTING INDEX
+
+\stopsymbolset
+
+\startsymbolset[Unicode Warning Signs] % 0x2600: Requires UnicodeRegular26
+
+   \definesymbol[SkullAndCrossbones][\USymbChar{38}{32}] % SKULL AND CROSSBONES
+   \definesymbol[CautionSign][\USymbChar{38}{33}] % CAUTION SIGN
+   \definesymbol[RadioactiveSign][\USymbChar{38}{34}] % RADIOACTIVE SIGN
+   \definesymbol[BiohazardSign][\USymbChar{38}{35}] % BIOHAZARD SIGN
+
+\stopsymbolset
+
+\startsymbolset[Unicode Healing Signs] % 0x2600: Requires UnicodeRegular26
+   \definesymbol[Caduceus][\USymbChar{38}{36}] % CADUCEUS
+   \definesymbol[Ankh][\USymbChar{38}{37}] % ANKH
+\stopsymbolset
+
+\startsymbolset[Unicode Religious and Political] % 0x2600: Requires UnicodeRegular26 and 27
+
+   \definesymbol[OrthodoxCross][\USymbChar{38}{38}] % ORTHODOX CROSS
+   \definesymbol[ChiRho][\USymbChar{38}{39}] % CHI RHO
+   \definesymbol[CrossOfLorraine][\USymbChar{38}{40}] % CROSS OF LORRAINE
+   \definesymbol[CrossOfJerusalem][\USymbChar{38}{41}] % CROSS OF JERUSALEM
+   \definesymbol[StarAndCrescent][\USymbChar{38}{42}] % STAR AND CRESCENT
+   \definesymbol[FarsiSymbol][\USymbChar{38}{43}] % FARSI SYMBOL
+   \definesymbol[AdiShakti][\USymbChar{38}{44}] % ADI SHAKTI
+   \definesymbol[HammerAndSickle][\USymbChar{38}{45}] % HAMMER AND SICKLE
+   \definesymbol[PeaceSymbol][\USymbChar{38}{46}] % PEACE SYMBOL
+   \definesymbol[YinYang][\USymbChar{38}{47}] % YIN YANG
+   \definesymbol[WestSyriacCross][\USymbChar{38}{112}] % WEST SYRIAC CROSS
+   \definesymbol[EastSyriacCross][\USymbChar{38}{113}] % EAST SYRIAC CROSS
+% 27xx starts here
+   \definesymbol[OutlinedGreekCross][\USymbCharZapf{39}{25}] % OUTLINED GREEK CROSS
+   \definesymbol[HeavyGreekCross][\USymbCharZapf{39}{26}] % HEAVY GREEK CROSS
+   \definesymbol[OpenCentreCross][\USymbCharZapf{39}{27}] % OPEN CENTRE CROSS
+   \definesymbol[HeavyOpenCentreCross][\USymbCharZapf{39}{28}] % HEAVY OPEN CENTRE CROSS
+   \definesymbol[LatinCross][\USymbCharZapf{39}{29}] % LATIN CROSS
+   \definesymbol[ShadowedWhiteLatinCross][\USymbCharZapf{39}{30}] % SHADOWED WHITE LATIN CROSS
+   \definesymbol[OutlinedLatinCross][\USymbCharZapf{39}{31}] % OUTLINED LATIN CROSS
+   \definesymbol[MalteseCross][\USymbCharZapf{39}{32}] % MALTESE CROSS
+   \definesymbol[StarOfDavid][\USymbCharZapf{39}{33}] % STAR OF DAVID
+
+
+\stopsymbolset
+
+\startsymbolset[Unicode Trigram] % 0x2600: Requires UnicodeRegular26
+
+   \definesymbol[TrigramForHeaven][\USymbChar{38}{48}] % TRIGRAM FOR HEAVEN
+   \definesymbol[TrigramForLake][\USymbChar{38}{49}] % TRIGRAM FOR LAKE
+   \definesymbol[TrigramForFire][\USymbChar{38}{50}] % TRIGRAM FOR FIRE
+   \definesymbol[TrigramForThunder][\USymbChar{38}{51}] % TRIGRAM FOR THUNDER
+   \definesymbol[TrigramForWind][\USymbChar{38}{52}] % TRIGRAM FOR WIND
+   \definesymbol[TrigramForWater][\USymbChar{38}{53}] % TRIGRAM FOR WATER
+   \definesymbol[TrigramForMountain][\USymbChar{38}{54}] % TRIGRAM FOR MOUNTAIN
+   \definesymbol[TrigramForEarth][\USymbChar{38}{55}] % TRIGRAM FOR EARTH
+
+\stopsymbolset
+
+\startsymbolset[Unicode Zodiac] % 0x2600: Requires UnicodeRegular26
+
+   \definesymbol[Aries][\USymbChar{38}{72}] % ARIES
+   \definesymbol[Taurus][\USymbChar{38}{73}] % TAURUS
+   \definesymbol[Gemini][\USymbChar{38}{74}] % GEMINI
+   \definesymbol[Cancer][\USymbChar{38}{75}] % CANCER
+   \definesymbol[Leo][\USymbChar{38}{76}] % LEO
+   \definesymbol[Virgo][\USymbChar{38}{77}] % VIRGO
+   \definesymbol[Libra][\USymbChar{38}{78}] % LIBRA
+   \definesymbol[Scorpius][\USymbChar{38}{79}] % SCORPIUS
+   \definesymbol[Sagittarius][\USymbChar{38}{80}] % SAGITTARIUS
+   \definesymbol[Capricorn][\USymbChar{38}{81}] % CAPRICORN
+   \definesymbol[Aquarius][\USymbChar{38}{82}] % AQUARIUS
+   \definesymbol[Pisces][\USymbChar{38}{83}] % PISCES
+
+\stopsymbolset
+
+\startsymbolset[Unicode Chess] % 0x2600: Requires UnicodeRegular26
+
+   \definesymbol[WhiteChessKing][\USymbChar{38}{84}] % WHITE CHESS KING
+   \definesymbol[WhiteChessQueen][\USymbChar{38}{85}] % WHITE CHESS QUEEN
+   \definesymbol[WhiteChessRook][\USymbChar{38}{86}] % WHITE CHESS ROOK
+   \definesymbol[WhiteChessBishop][\USymbChar{38}{87}] % WHITE CHESS BISHOP
+   \definesymbol[WhiteChessKnight][\USymbChar{38}{88}] % WHITE CHESS KNIGHT
+   \definesymbol[WhiteChessPawn][\USymbChar{38}{89}] % WHITE CHESS PAWN
+   \definesymbol[BlackChessKing][\USymbChar{38}{90}] % BLACK CHESS KING
+   \definesymbol[BlackChessQueen][\USymbChar{38}{91}] % BLACK CHESS QUEEN
+   \definesymbol[BlackChessRook][\USymbChar{38}{92}] % BLACK CHESS ROOK
+   \definesymbol[BlackChessBishop][\USymbChar{38}{93}] % BLACK CHESS BISHOP
+   \definesymbol[BlackChessKnight][\USymbChar{38}{94}] % BLACK CHESS KNIGHT
+   \definesymbol[BlackChessPawn][\USymbChar{38}{95}] % BLACK CHESS PAWN
+
+\stopsymbolset
+
+\startsymbolset[Unicode Playing Card] % 0x2600: Requires UnicodeRegular26
+
+   \definesymbol[BlackSpadeSuit][\USymbChar{38}{96}] % BLACK SPADE SUIT
+   \definesymbol[WhiteHeartSuit][\USymbChar{38}{97}] % WHITE HEART SUIT
+   \definesymbol[WhiteDiamondSuit][\USymbChar{38}{98}] % WHITE DIAMOND SUIT
+   \definesymbol[BlackClubSuit][\USymbChar{38}{99}] % BLACK CLUB SUIT
+   \definesymbol[WhiteSpadeSuit][\USymbChar{38}{100}] % WHITE SPADE SUIT
+   \definesymbol[BlackHeartSuit][\USymbChar{38}{101}] % BLACK HEART SUIT
+   \definesymbol[BlackDiamondSuit][\USymbChar{38}{102}] % BLACK DIAMOND SUIT
+   \definesymbol[WhiteClubSuit][\USymbChar{38}{103}] % WHITE CLUB SUIT
+
+\stopsymbolset
+
+\startsymbolset[Unicode Musical] % 0x2600: Requires UnicodeRegular26
+
+   \definesymbol[QuarterNote][\USymbChar{38}{105}] % QUARTER NOTE
+   \definesymbol[EighthNote][\USymbChar{38}{106}] % EIGHTH NOTE
+   \definesymbol[BeamedEighthNotes][\USymbChar{38}{107}] % BEAMED EIGHTH NOTES
+   \definesymbol[BeamedSixteenthNotes][\USymbChar{38}{108}] % BEAMED SIXTEENTH NOTES
+   \definesymbol[MusicFlatSign][\USymbChar{38}{109}] % MUSIC FLAT SIGN
+   \definesymbol[MusicNaturalSign][\USymbChar{38}{110}] % MUSIC NATURAL SIGN
+   \definesymbol[MusicSharpSign][\USymbChar{38}{111}] % MUSIC SHARP SIGN
+
+\stopsymbolset
+
+\startsymbolset[Unicode Recycling] % 0x2600: Requires UnicodeRegular26
+
+   \definesymbol[UniversalRecycling][\USymbChar{38}{114}] % [Unassigned U+2672]
+   \definesymbol[Type1Plastics][\USymbChar{38}{115}] % [Unassigned U+2673]
+   \definesymbol[Type2Plastics][\USymbChar{38}{116}] % [Unassigned U+2674]
+   \definesymbol[Type3Plastics][\USymbChar{38}{117}] % [Unassigned U+2675]
+   \definesymbol[Type4Plastics][\USymbChar{38}{118}] % [Unassigned U+2676]
+   \definesymbol[Type5Plastics][\USymbChar{38}{119}] % [Unassigned U+2677]
+   \definesymbol[Type6Plastics][\USymbChar{38}{120}] % [Unassigned U+2678]
+   \definesymbol[Type7Plastics][\USymbChar{38}{121}] % [Unassigned U+2679]
+   \definesymbol[GenericMaterials][\USymbChar{38}{122}] % [Unassigned U+267A]
+   \definesymbol[BlackUniversalRecycling][\USymbChar{38}{123}] % [Unassigned U+267B]
+   \definesymbol[RecycledPaper][\USymbChar{38}{124}] % [Unassigned U+267C]
+   \definesymbol[PartiallyRecycledPaper][\USymbChar{38}{125}] % [Unassigned U+267D]
+
+\stopsymbolset
+
+\startsymbolset[Unicode Dice] % 0x2600: Requires UnicodeRegular26
+
+   \definesymbol[DieFace1][\USymbChar{38}{128}] % [Unassigned U+2680]
+   \definesymbol[DieFace2][\USymbChar{38}{129}] % [Unassigned U+2681]
+   \definesymbol[DieFace3][\USymbChar{38}{130}] % [Unassigned U+2682]
+   \definesymbol[DieFace4][\USymbChar{38}{131}] % [Unassigned U+2683]
+   \definesymbol[DieFace5][\USymbChar{38}{132}] % [Unassigned U+2684]
+   \definesymbol[DieFace6][\USymbChar{38}{133}] % [Unassigned U+2685]
+
+\stopsymbolset
+
+\startsymbolset[Unicode Go Markers] % 0x2600: Requires UnicodeRegular26
+
+   \definesymbol[WhiteCircleWithDotRight][\USymbChar{38}{134}] % [Unassigned U+2686]
+   \definesymbol[WhiteCircleWithTwoDots][\USymbChar{38}{135}] % [Unassigned U+2687]
+   \definesymbol[BlackCircleWithWhiteDotRight][\USymbChar{38}{136}] % [Unassigned U+2688]
+   \definesymbol[BlackCircleWithTwoWhiteDots][\USymbChar{38}{137}] % [Unassigned U+2689]
+
+\stopsymbolset
+
+\startsymbolset[Unicode Scissors] % 0x2700: Requires UnicodeRegular27
+
+   \definesymbol[UpperBladeScissors][\USymbCharZapf{39}{1}] % UPPER BLADE SCISSORS
+   \definesymbol[BlackScissors][\USymbCharZapf{39}{2}] % BLACK SCISSORS
+   \definesymbol[LowerBladeScissors][\USymbCharZapf{39}{3}] % LOWER BLADE SCISSORS
+   \definesymbol[WhiteScissors][\USymbCharZapf{39}{4}] % WHITE SCISSORS
+
+\stopsymbolset
+
+\startsymbolset[Unicode Dingbats] % 0x2700: Requires UnicodeRegular27
+
+   \definesymbol[TelephoneLocationSign][\USymbCharZapf{39}{6}] % TELEPHONE LOCATION SIGN
+   \definesymbol[TapeDrive][\USymbCharZapf{39}{7}] % TAPE DRIVE
+   \definesymbol[Airplane][\USymbCharZapf{39}{8}] % AIRPLANE
+   \definesymbol[Envelope][\USymbCharZapf{39}{9}] % ENVELOPE
+   \definesymbol[VictoryHand][\USymbCharZapf{39}{12}] % VICTORY HAND
+   \definesymbol[WritingHand][\USymbCharZapf{39}{13}] % WRITING HAND
+   \definesymbol[LowerRightPencil][\USymbCharZapf{39}{14}] % LOWER RIGHT PENCIL
+   \definesymbol[Pencil][\USymbCharZapf{39}{15}] % PENCIL
+   \definesymbol[UpperRightPencil][\USymbCharZapf{39}{16}] % UPPER RIGHT PENCIL
+   \definesymbol[WhiteNib][\USymbCharZapf{39}{17}] % WHITE NIB
+   \definesymbol[BlackNib][\USymbCharZapf{39}{18}] % BLACK NIB
+   \definesymbol[BlackDiamondMinusWhiteX][\USymbCharZapf{39}{86}] % BLACK DIAMOND MINUS WHITE X
+
+\stopsymbolset
+
+\startsymbolset[Unicode Checks and Xs] % 0x2700: Requires UnicodeRegular27
+
+   \definesymbol[CheckMark][\USymbCharZapf{39}{19}] % CHECK MARK
+   \definesymbol[HeavyCheckMark][\USymbCharZapf{39}{20}] % HEAVY CHECK MARK
+   \definesymbol[MultiplicationX][\USymbCharZapf{39}{21}] % MULTIPLICATION X
+   \definesymbol[HeavyMultiplicationX][\USymbCharZapf{39}{22}] % HEAVY MULTIPLICATION X
+   \definesymbol[BallotX][\USymbCharZapf{39}{23}] % BALLOT X
+   \definesymbol[HeavyBallotX][\USymbCharZapf{39}{24}] % HEAVY BALLOT X
+
+\stopsymbolset
+
+\startsymbolset[Unicode Stars] % 0x2700: Requires UnicodeRegular27
+
+   \definesymbol[FourTeardropSpokedAsterisk][\USymbCharZapf{39}{34}] % FOUR TEARDROP-SPOKED ASTERISK
+   \definesymbol[FourBalloonSpokedAsterisk][\USymbCharZapf{39}{35}] % FOUR BALLOON-SPOKED ASTERISK
+   \definesymbol[HeavyFourBalloonSpokedAsterisk][\USymbCharZapf{39}{36}] % HEAVY FOUR BALLOON-SPOKED ASTERISK
+   \definesymbol[FourClubSpokedAsterisk][\USymbCharZapf{39}{37}] % FOUR CLUB-SPOKED ASTERISK
+   \definesymbol[BlackFourPointedStar][\USymbCharZapf{39}{38}] % BLACK FOUR POINTED STAR
+   \definesymbol[WhiteFourPointedStar][\USymbCharZapf{39}{39}] % WHITE FOUR POINTED STAR
+   \definesymbol[StressOutlinedWhiteStar][\USymbCharZapf{39}{41}] % STRESS OUTLINED WHITE STAR
+   \definesymbol[CircledWhiteStar][\USymbCharZapf{39}{42}] % CIRCLED WHITE STAR
+   \definesymbol[OpenCentreBlackStar][\USymbCharZapf{39}{43}] % OPEN CENTRE BLACK STAR
+   \definesymbol[BlackCentreWhiteStar][\USymbCharZapf{39}{44}] % BLACK CENTRE WHITE STAR
+   \definesymbol[OutlinedBlackStar][\USymbCharZapf{39}{45}] % OUTLINED BLACK STAR
+   \definesymbol[HeavyOutlinedBlackStar][\USymbCharZapf{39}{46}] % HEAVY OUTLINED BLACK STAR
+   \definesymbol[PinwheelStar][\USymbCharZapf{39}{47}] % PINWHEEL STAR
+   \definesymbol[ShadowedWhiteStar][\USymbCharZapf{39}{48}] % SHADOWED WHITE STAR
+   \definesymbol[HeavyAsterisk][\USymbCharZapf{39}{49}] % HEAVY ASTERISK
+   \definesymbol[OpenCentreAsterisk][\USymbCharZapf{39}{50}] % OPEN CENTRE ASTERISK
+   \definesymbol[EightSpokedAsterisk][\USymbCharZapf{39}{51}] % EIGHT SPOKED ASTERISK
+   \definesymbol[EightPointedBlackStar][\USymbCharZapf{39}{52}] % EIGHT POINTED BLACK STAR
+   \definesymbol[EightPointedPinwheelStar][\USymbCharZapf{39}{53}] % EIGHT POINTED PINWHEEL STAR
+   \definesymbol[SixPointedBlackStar][\USymbCharZapf{39}{54}] % SIX POINTED BLACK STAR
+   \definesymbol[EightPointedRectilinearBlackStar][\USymbCharZapf{39}{55}] % EIGHT POINTED RECTILINEAR BLACK STAR
+   \definesymbol[HeavyEightPointedRectilinearBlackStar][\USymbCharZapf{39}{56}] % HEAVY EIGHT POINTED RECTILINEAR BLACK STAR
+   \definesymbol[TwelvePointedBlackStar][\USymbCharZapf{39}{57}] % TWELVE POINTED BLACK STAR
+   \definesymbol[SixteenPointedAsterisk][\USymbCharZapf{39}{58}] % SIXTEEN POINTED ASTERISK
+   \definesymbol[TeardropSpokedAsterisk][\USymbCharZapf{39}{59}] % TEARDROP-SPOKED ASTERISK
+   \definesymbol[OpenCentreTeardropSpokedAsterisk][\USymbCharZapf{39}{60}] % OPEN CENTRE TEARDROP-SPOKED ASTERISK
+   \definesymbol[HeavyTeardropSpokedAsterisk][\USymbCharZapf{39}{61}] % HEAVY TEARDROP-SPOKED ASTERISK
+   \definesymbol[SixPetalledBlackAndWhiteFlorette][\USymbCharZapf{39}{62}] % SIX PETALLED BLACK AND WHITE FLORETTE
+   \definesymbol[BlackFlorette][\USymbCharZapf{39}{63}] % BLACK FLORETTE
+   \definesymbol[WhiteFlorette][\USymbCharZapf{39}{64}] % WHITE FLORETTE
+   \definesymbol[EightPetalledOutlinedBlackFlorette][\USymbCharZapf{39}{65}] % EIGHT PETALLED OUTLINED BLACK FLORETTE
+   \definesymbol[CircledOpenCentreEightPointedStar][\USymbCharZapf{39}{66}] % CIRCLED OPEN CENTRE EIGHT POINTED STAR
+   \definesymbol[HeavyTeardropSpokedPinwheelAsterisk][\USymbCharZapf{39}{67}] % HEAVY TEARDROP-SPOKED PINWHEEL ASTERISK
+   \definesymbol[Sparkle][\USymbCharZapf{39}{71}] % SPARKLE
+   \definesymbol[HeavySparkle][\USymbCharZapf{39}{72}] % HEAVY SPARKLE
+   \definesymbol[Balloon-spokedAsterisk][\USymbCharZapf{39}{73}] % BALLOON-SPOKED ASTERISK
+   \definesymbol[EightTeardrop-spokedPropellerAsterisk][\USymbCharZapf{39}{74}] % EIGHT TEARDROP-SPOKED PROPELLER ASTERISK
+   \definesymbol[HeavyEightTeardrop-spokedPropellerAsterisk][\USymbCharZapf{39}{75}] % HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK
+
+\stopsymbolset
+
+\startsymbolset[Unicode Snowflakes] % 0x2700: Requires UnicodeRegular27
+
+   \definesymbol[Snowflake][\USymbCharZapf{39}{68}] % SNOWFLAKE
+   \definesymbol[TightTrifoliateSnowflake][\USymbCharZapf{39}{69}] % TIGHT TRIFOLIATE SNOWFLAKE
+   \definesymbol[HeavyChevronSnowflake][\USymbCharZapf{39}{70}] % HEAVY CHEVRON SNOWFLAKE
+
+\stopsymbolset
+
+\startsymbolset[Unicode Shadowed Shapes] % 0x2700: Requires UnicodeRegular27
+
+   \definesymbol[ShadowedWhiteCircle][\USymbCharZapf{39}{77}] % SHADOWED WHITE CIRCLE
+   \definesymbol[LowerRightDrop-shadowedWhiteSquare][\USymbCharZapf{39}{79}] % LOWER RIGHT DROP-SHADOWED WHITE SQUARE
+   \definesymbol[UpperRightDrop-shadowedWhiteSquare][\USymbCharZapf{39}{80}] % UPPER RIGHT DROP-SHADOWED WHITE SQUARE
+   \definesymbol[LowerRightShadowedWhiteSquare][\USymbCharZapf{39}{81}] % LOWER RIGHT SHADOWED WHITE SQUARE
+   \definesymbol[UpperRightShadowedWhiteSquare][\USymbCharZapf{39}{82}] % UPPER RIGHT SHADOWED WHITE SQUARE
+
+\stopsymbolset
+
+\startsymbolset[Unicode Bars] % 0x2700: Requires UnicodeRegular27
+
+   \definesymbol[LightVerticalBar][\USymbCharZapf{39}{88}] % LIGHT VERTICAL BAR
+   \definesymbol[MediumVerticalBar][\USymbCharZapf{39}{89}] % MEDIUM VERTICAL BAR
+   \definesymbol[HeavyVerticalBar][\USymbCharZapf{39}{90}] % HEAVY VERTICAL BAR
+
+\stopsymbolset
+
+\startsymbolset[Unicode Dingbat Punctuation] % 0x2700: Requires UnicodeRegular27
+
+   \definesymbol[HeavySingleTurnedCommaQuotationMark][\USymbCharZapf{39}{91}] % HEAVY SINGLE TURNED COMMA QUOTATION MARK ORNAMENT
+   \definesymbol[HeavySingleCommaQuotationMark][\USymbCharZapf{39}{92}] % HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT
+   \definesymbol[HeavyDoubleTurnedCommaQuotationMark][\USymbCharZapf{39}{93}] % HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT
+   \definesymbol[HeavyDoubleCommaQuotationMark][\USymbCharZapf{39}{94}] % HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT
+   \definesymbol[CurvedStemParagraphSign][\USymbCharZapf{39}{97}] % CURVED STEM PARAGRAPH SIGN ORNAMENT
+   \definesymbol[HeavyExclamationMark][\USymbCharZapf{39}{98}] % HEAVY EXCLAMATION MARK ORNAMENT
+   \definesymbol[HeavyHeartExclamationMark][\USymbCharZapf{39}{99}] % HEAVY HEART EXCLAMATION MARK ORNAMENT
+
+\stopsymbolset
+
+\startsymbolset[Unicode Hearts] % 0x2700: Requires UnicodeRegular27
+
+   \definesymbol[HeavyBlackHeart][\USymbCharZapf{39}{100}] % HEAVY BLACK HEART
+   \definesymbol[RotatedHeavyBlackHeartBullet][\USymbCharZapf{39}{101}] % ROTATED HEAVY BLACK HEART BULLET
+   \definesymbol[FloralHeart][\USymbCharZapf{39}{102}] % FLORAL HEART
+   \definesymbol[RotatedFloralHeartBullet][\USymbCharZapf{39}{103}] % ROTATED FLORAL HEART BULLET
+
+\stopsymbolset
+
+\startsymbolset[Unicode Negative Circled Digits] % 0x2700: Requires UnicodeRegular27
+
+   \definesymbol[CircledOne][\USymbCharZapf{39}{118}] % DINGBAT NEGATIVE CIRCLED DIGIT ONE
+   \definesymbol[CircledTwo][\USymbCharZapf{39}{119}] % DINGBAT NEGATIVE CIRCLED DIGIT TWO
+   \definesymbol[CircledThree][\USymbCharZapf{39}{120}] % DINGBAT NEGATIVE CIRCLED DIGIT THREE
+   \definesymbol[CircledFour][\USymbCharZapf{39}{121}] % DINGBAT NEGATIVE CIRCLED DIGIT FOUR
+   \definesymbol[CircledFive][\USymbCharZapf{39}{122}] % DINGBAT NEGATIVE CIRCLED DIGIT FIVE
+   \definesymbol[CircledSix][\USymbCharZapf{39}{123}] % DINGBAT NEGATIVE CIRCLED DIGIT SIX
+   \definesymbol[CircledSeven][\USymbCharZapf{39}{124}] % DINGBAT NEGATIVE CIRCLED DIGIT SEVEN
+   \definesymbol[CircledEight][\USymbCharZapf{39}{125}] % DINGBAT NEGATIVE CIRCLED DIGIT EIGHT
+   \definesymbol[CircledNine][\USymbCharZapf{39}{126}] % DINGBAT NEGATIVE CIRCLED DIGIT NINE
+   \definesymbol[CircledTen][\USymbCharZapf{39}{127}] % DINGBAT NEGATIVE CIRCLED NUMBER TEN
+
+\stopsymbolset
+
+\startsymbolset[Unicode Circled Sans-serif Digits] % 0x2700: Requires UnicodeRegular27
+
+   \definesymbol[CircledOne][\USymbCharZapf{39}{128}] % DINGBAT CIRCLED SANS-SERIF DIGIT ONE
+   \definesymbol[CircledTwo][\USymbCharZapf{39}{129}] % DINGBAT CIRCLED SANS-SERIF DIGIT TWO
+   \definesymbol[CircledThree][\USymbCharZapf{39}{130}] % DINGBAT CIRCLED SANS-SERIF DIGIT THREE
+   \definesymbol[CircledFour][\USymbCharZapf{39}{131}] % DINGBAT CIRCLED SANS-SERIF DIGIT FOUR
+   \definesymbol[CircledFive][\USymbCharZapf{39}{132}] % DINGBAT CIRCLED SANS-SERIF DIGIT FIVE
+   \definesymbol[CircledSix][\USymbCharZapf{39}{133}] % DINGBAT CIRCLED SANS-SERIF DIGIT SIX
+   \definesymbol[CircledSeven][\USymbCharZapf{39}{134}] % DINGBAT CIRCLED SANS-SERIF DIGIT SEVEN
+   \definesymbol[CircledEight][\USymbCharZapf{39}{135}] % DINGBAT CIRCLED SANS-SERIF DIGIT EIGHT
+   \definesymbol[CircledNine][\USymbCharZapf{39}{136}] % DINGBAT CIRCLED SANS-SERIF DIGIT NINE
+   \definesymbol[CircledTen][\USymbCharZapf{39}{137}] % DINGBAT CIRCLED SANS-SERIF NUMBER TEN
+
+\stopsymbolset
+
+\startsymbolset[Unicode Negative Circled Sans-serif Digits] % 0x2700: Requires UnicodeRegular27
+
+   \definesymbol[CircledOne][\USymbCharZapf{39}{138}] % DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ONE
+   \definesymbol[CircledTwo][\USymbCharZapf{39}{139}] % DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT TWO
+   \definesymbol[CircledThree][\USymbCharZapf{39}{140}] % DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT THREE
+   \definesymbol[CircledFour][\USymbCharZapf{39}{141}] % DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FOUR
+   \definesymbol[CircledFive][\USymbCharZapf{39}{142}] % DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FIVE
+   \definesymbol[CircledSix][\USymbCharZapf{39}{143}] % DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SIX
+   \definesymbol[CircledSeven][\USymbCharZapf{39}{144}] % DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SEVEN
+   \definesymbol[CircledEight][\USymbCharZapf{39}{145}] % DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT EIGHT
+   \definesymbol[CircledNine][\USymbCharZapf{39}{146}] % DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT NINE
+   \definesymbol[CircledTen][\USymbCharZapf{39}{147}] % DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN
+
+\stopsymbolset
+
+\startsymbolset[Unicode Dingbat Arrows] % 0x2700: Requires UnicodeRegular27
+
+   \definesymbol[HeavyWideHeadedRightwardsArrow][\USymbCharZapf{39}{148}] % HEAVY WIDE-HEADED RIGHTWARDS ARROW
+   \definesymbol[HeavySouthEastArrow][\USymbCharZapf{39}{152}] % HEAVY SOUTH EAST ARROW
+   \definesymbol[HeavyRightwardsArrow][\USymbCharZapf{39}{153}] % HEAVY RIGHTWARDS ARROW
+   \definesymbol[HeavyNorthEastArrow][\USymbCharZapf{39}{154}] % HEAVY NORTH EAST ARROW
+   \definesymbol[DraftingPointRightwardsArrow][\USymbCharZapf{39}{155}] % DRAFTING POINT RIGHTWARDS ARROW
+   \definesymbol[HeavyRoundTippedRightwardsArrow][\USymbCharZapf{39}{156}] % HEAVY ROUND-TIPPED RIGHTWARDS ARROW
+   \definesymbol[TriangleHeadedRightwardsArrow][\USymbCharZapf{39}{157}] % TRIANGLE-HEADED RIGHTWARDS ARROW
+   \definesymbol[HeavyTriangleHeadedRightwardsArrow][\USymbCharZapf{39}{158}] % HEAVY TRIANGLE-HEADED RIGHTWARDS ARROW
+   \definesymbol[DashedTriangleHeadedRightwardsArrow][\USymbCharZapf{39}{159}] % DASHED TRIANGLE-HEADED RIGHTWARDS ARROW
+   \definesymbol[HeavyDashedTriangleHeadedRightwardsArrow][\USymbCharZapf{39}{160}] % HEAVY DASHED TRIANGLE-HEADED RIGHTWARDS ARROW
+   \definesymbol[BlackRightwardsArrow][\USymbCharZapf{39}{161}] % BLACK RIGHTWARDS ARROW
+   \definesymbol[3DTopLightedRightwardsArrowhead][\USymbCharZapf{39}{162}] % THREE-D TOP-LIGHTED RIGHTWARDS ARROWHEAD
+   \definesymbol[3DBottomLightedRightwardsArrowhead][\USymbCharZapf{39}{163}] % THREE-D BOTTOM-LIGHTED RIGHTWARDS ARROWHEAD
+   \definesymbol[BlackRightwardsArrowhead][\USymbCharZapf{39}{164}] % BLACK RIGHTWARDS ARROWHEAD
+   \definesymbol[HeavyBlackCurvedDownwardsAndRightwardsArrow][\USymbCharZapf{39}{165}] % HEAVY BLACK CURVED DOWNWARDS AND RIGHTWARDS ARROW
+   \definesymbol[HeavyBlackCurvedUpwardsAndRightwardsArrow][\USymbCharZapf{39}{166}] % HEAVY BLACK CURVED UPWARDS AND RIGHTWARDS ARROW
+   \definesymbol[SquatBlackRightwardsArrow][\USymbCharZapf{39}{167}] % SQUAT BLACK RIGHTWARDS ARROW
+   \definesymbol[HeavyConcavePointedBlackRightwardsArrow][\USymbCharZapf{39}{168}] % HEAVY CONCAVE-POINTED BLACK RIGHTWARDS ARROW
+   \definesymbol[CircledHeavyWhiteRightwardsArrow][\USymbCharZapf{39}{178}] % CIRCLED HEAVY WHITE RIGHTWARDS ARROW
+   \definesymbol[OpenOutlinedRightwardsArrow][\USymbCharZapf{39}{190}] % OPEN-OUTLINED RIGHTWARDS ARROW
+
+\stopsymbolset
+
+\startsymbolset[Unicode Shadowed Arrows] % 0x2700: Requires UnicodeRegular27
+
+   \definesymbol[RightShadedWhiteRightwardsArrow][\USymbCharZapf{39}{169}] % RIGHT-SHADED WHITE RIGHTWARDS ARROW
+   \definesymbol[LeftShadedWhiteRightwardsArrow][\USymbCharZapf{39}{170}] % LEFT-SHADED WHITE RIGHTWARDS ARROW
+   \definesymbol[BackTiltedShadowedWhiteRightwardsArrow][\USymbCharZapf{39}{171}] % BACK-TILTED SHADOWED WHITE RIGHTWARDS ARROW
+   \definesymbol[FrontTiltedShadowedWhiteRightwardsArrow][\USymbCharZapf{39}{172}] % FRONT-TILTED SHADOWED WHITE RIGHTWARDS ARROW
+   \definesymbol[HeavyLowerRightShadowedWhiteRightwardsArrow][\USymbCharZapf{39}{173}] % HEAVY LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
+   \definesymbol[HeavyUpperRightShadowedWhiteRightwardsArrow][\USymbCharZapf{39}{174}] % HEAVY UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
+   \definesymbol[NotchedLowerRightShadowedWhiteRightwardsArrow][\USymbCharZapf{39}{175}] % NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
+   \definesymbol[NotchedUpperRightShadowedWhiteRightwardsArrow][\USymbCharZapf{39}{177}] % NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
+
+\stopsymbolset
+
+\startsymbolset[Unicode Tailed Arrows] % 0x2700: Requires UnicodeRegular27
+
+   \definesymbol[WhiteFeatheredRightwardsArrow][\USymbCharZapf{39}{179}] % WHITE-FEATHERED RIGHTWARDS ARROW
+   \definesymbol[BlackFeatheredSouthEastArrow][\USymbCharZapf{39}{180}] % BLACK-FEATHERED SOUTH EAST ARROW
+   \definesymbol[BlackFeatheredRightwardsArrow][\USymbCharZapf{39}{181}] % BLACK-FEATHERED RIGHTWARDS ARROW
+   \definesymbol[BlackFeatheredNorthEastArrow][\USymbCharZapf{39}{182}] % BLACK-FEATHERED NORTH EAST ARROW
+   \definesymbol[HeavyBlack-featheredSouthEastArrow][\USymbCharZapf{39}{183}] % HEAVY BLACK-FEATHERED SOUTH EAST ARROW
+   \definesymbol[HeavyBlackFeatheredRightwardsArrow][\USymbCharZapf{39}{184}] % HEAVY BLACK-FEATHERED RIGHTWARDS ARROW
+   \definesymbol[HeavyBlackFeatheredNorthEastArrow][\USymbCharZapf{39}{185}] % HEAVY BLACK-FEATHERED NORTH EAST ARROW
+   \definesymbol[TeardropBarbedRightwardsArrow][\USymbCharZapf{39}{186}] % TEARDROP-BARBED RIGHTWARDS ARROW
+   \definesymbol[HeavyTeardropShankedRightwardsArrow][\USymbCharZapf{39}{187}] % HEAVY TEARDROP-SHANKED RIGHTWARDS ARROW
+   \definesymbol[WedgeTailedRightwardsArrow][\USymbCharZapf{39}{188}] % WEDGE-TAILED RIGHTWARDS ARROW
+   \definesymbol[HeavyWedgeTailedRightwardsArrow][\USymbCharZapf{39}{189}] % HEAVY WEDGE-TAILED RIGHTWARDS ARROW
+
+\stopsymbolset
+
+\endinput
diff --git a/tex/context/base/syst-etx.tex b/tex/context/base/syst-etx.tex
index 80a24b250..bef56cb69 100644
--- a/tex/context/base/syst-etx.tex
+++ b/tex/context/base/syst-etx.tex
@@ -258,15 +258,13 @@
 
 \beginETEX \ifcsname
 
-\def\begcsname#1\endcsname
-  {\ifcsname#1\endcsname\csname#1\endcsname\fi}
+  \def\begcsname#1\endcsname{\ifcsname#1\endcsname\csname#1\endcsname\fi}
 
 \endETEX
 
 \beginTEX
 
-\def\begcsname#1\endcsname
-  {\csname#1\endcsname}
+  \def\begcsname#1\endcsname{\csname#1\endcsname}
 
 \endTEX
 
diff --git a/tex/context/base/syst-prm.tex b/tex/context/base/syst-prm.tex
index bb34cb4d8..3214a5bb2 100644
--- a/tex/context/base/syst-prm.tex
+++ b/tex/context/base/syst-prm.tex
@@ -2,27 +2,27 @@
 %D   [       file=syst-prm,
 %D        version=1999.03.17,
 %D          title=\CONTEXT\ System Macros,
-%D       subtitle=Primitive Behavior, 
+%D       subtitle=Primitive Behavior,
 %D         author=Hans Hagen,
 %D           date=\currentdate,
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
-\unprotect 
+\unprotect
 
-%D Saved primitives are preceded by \type {\normal}, as in: 
+%D Saved primitives are preceded by \type {\normal}, as in:
 
 \let\normalfmtversion\fmtversion
 
-%D When applicable, we also load the \ETEX\ source and 
-%D definition files. 
+%D When applicable, we also load the \ETEX\ source and
+%D definition files.
 
-\bgroup \obeylines 
+\bgroup \obeylines
 
-\ifx\eTeXversion\undefined 
+\ifx\eTeXversion\undefined
 
   \long\gdef\beginETEX#1\endETEX%
     {}
@@ -30,7 +30,7 @@
   \gdef\beginTEX%
     {\bgroup\obeylines\dobeginTEX}
 
-  \gdef\dobeginTEX#1 
+  \gdef\dobeginTEX#1
     {\egroup}
 
   \global\let\endTEX\relax
@@ -40,64 +40,92 @@
   \long\gdef\beginTEX#1\endTEX%
     {}
 
-  \gdef\beginETEX% 
+  \gdef\beginETEX%
     {\bgroup\obeylines\dobeginETEX}
 
-  \gdef\dobeginETEX#1 
+  \gdef\dobeginETEX#1
     {\egroup\immediate\write16%
        {system (E-TEX) : [line \the\inputlineno] \detokenize{#1}}}
 
   \global\let\endETEX\relax
 
-\fi 
+\fi
 
-\ifx\OmegaVersion\undefined 
+\ifx\OmegaVersion\undefined
 
   \long\gdef\beginOMEGA#1\endOMEGA%
     {}
 
 \else
 
-  \gdef\beginOMEGA% 
+  \gdef\beginOMEGA%
     {\bgroup\obeylines\dobeginOMEGA}
 
-  \gdef\dobeginOMEGA#1 
-    {\egroup\immediate\write16%
-       {system (OMEGA) : [line \the\inputlineno] \string#1}}
+  \ifx\detokenize\undefined
+
+    \gdef\dobeginOMEGA#1
+      {\egroup\immediate\write16%
+         {system (OMEGA) : [line \the\inputlineno] \string#1 }} % we assume an argument
+
+  \else
+
+    \gdef\dobeginOMEGA#1
+      {\egroup\immediate\write16%
+         {system (OMEGA) : [line \the\inputlineno] \detokenize{#1}}} % we assume aleph
+
+  \fi
 
   \global\let\endOMEGA\relax
 
 \fi
 
+\ifx\XeTeXversion\undefined
+
+  \long\gdef\beginXETEX#1\endXETEX%
+    {}
+
+\else
+
+  \gdef\beginXETEX%
+    {\bgroup\obeylines\dobeginXETEX}
+
+  \gdef\dobeginXETEX#1
+    {\egroup\immediate\write16%
+       {system (XETEX) : [line \the\inputlineno] \detokenize{#1}}}
+
+  \global\let\endXETEX\relax
+
+\fi
+
 \egroup
 
-%D Let's get rid of this one: 
+%D Let's get rid of this one:
 
-\def\wlog#1{} 
+\def\wlog#1{}
 
 %D Just for tracing purposes we set:
 
 \tracingstats=1
 
-%D We don't like outer commands, and we always want access 
-%D to the original \type {\input} primitive. 
+%D We don't like outer commands, and we always want access
+%D to the original \type {\input} primitive.
 
 \let\normalouter = \outer  \let\outer\relax
-\let\normalinput = \input  
+\let\normalinput = \input
 
-%D We need to make sure that we start up in \DVI\ mode, so, 
-%D after testing for running \PDFTEX, we default to \DVI.  
+%D We need to make sure that we start up in \DVI\ mode, so,
+%D after testing for running \PDFTEX, we default to \DVI.
 
 \ifx\pdftexversion\undefined \newcount\pdfoutput \fi \pdfoutput=0
 
-%D To circumvent dependencies, we can postpone certain 
-%D initializations to dumping time, by appending them to the 
-%D \type {\everydump} token register. 
+%D To circumvent dependencies, we can postpone certain
+%D initializations to dumping time, by appending them to the
+%D \type {\everydump} token register.
 
-\newtoks \everydump 
+\newtoks \everydump
 
-\let\normaldump \dump 
+\let\normaldump \dump
 
 \def\dump{\the\everydump\normaldump}
 
-\protect \endinput 
+\protect \endinput
diff --git a/tex/context/base/syst-xtx.tex b/tex/context/base/syst-xtx.tex
new file mode 100644
index 000000000..1593e5eb0
--- /dev/null
+++ b/tex/context/base/syst-xtx.tex
@@ -0,0 +1,23 @@
+%D \module
+%D   [       file=syst-xtx,
+%D        version=2004.09.11,
+%D          title=\CONTEXT\ System Macros,
+%D       subtitle=\XETEX\ specifics,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\ifx\XeTeXversion\undefined \endinput \fi
+
+\unprotect
+
+%D For the moment, the only thing needed is to load are the
+%D mappings from lower to uppercase characters.
+
+\input xplain.tex
+
+\protect \endinput
diff --git a/tex/context/base/type-akb.tex b/tex/context/base/type-akb.tex
index 196b13be5..dd02c157b 100644
--- a/tex/context/base/type-akb.tex
+++ b/tex/context/base/type-akb.tex
@@ -5,7 +5,7 @@
 %D       subtitle=Adobe's Famous Gang of Fonts,
 %D         author=Patrick Gundlach,
 %D           date=\currentdate,
-%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%D      copyright={Patrick Gundlach / PRAGMA}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
diff --git a/tex/context/base/type-exa.tex b/tex/context/base/type-exa.tex
index b9dfd0049..222faa0d7 100644
--- a/tex/context/base/type-exa.tex
+++ b/tex/context/base/type-exa.tex
@@ -31,7 +31,7 @@
 
 \stoptypescript
 
-\starttypescript [postscript] [texnansi,ec,8r]
+\starttypescript [postscript] [texnansi,ec,8r,uc]
 
   \definetypeface [postscript] [rm] [serif] [times]     [default] [encoding=\typescripttwo]
   \definetypeface [postscript] [mm] [math]  [times]     [default]
@@ -40,7 +40,7 @@
 
 \stoptypescript
 
-\starttypescript [times] [texnansi,ec,8r]
+\starttypescript [times] [texnansi,ec,8r,uc]
 
   \definetypeface [times] [rm] [serif] [times]     [default] [encoding=\typescripttwo]
   \definetypeface [times] [ss] [sans]  [helvetica] [default] [rscale=.9,encoding=\typescripttwo]
@@ -51,7 +51,7 @@
 
 \stoptypescript
 
-\starttypescript [palatino] [texnansi,ec,8r]
+\starttypescript [palatino] [texnansi,ec,8r,uc]
 
   \definetypeface [palatino] [rm] [serif] [palatino] [default] [encoding=\typescripttwo]
   \definetypeface [palatino] [mm] [math]  [palatino] [default] [encoding=default]
@@ -81,17 +81,17 @@
 
 % \stoptypescript
 
-\starttypescript [lucida,lucidabfm] [texnansi,ec,8r]
+\starttypescript [lucida,lucidabfm] [texnansi,ec,8r,uc]
 
   \definetypeface [lucida] [rm] [serif]       [lucida] [default] [encoding=\typescripttwo]
   \definetypeface [lucida] [ss] [sans]        [lucida] [default] [encoding=\typescripttwo]
   \definetypeface [lucida] [tt] [mono]        [lucida] [default] [encoding=\typescripttwo]
   \definetypeface [lucida] [hw] [handwriting] [lucida] [default] [encoding=\typescripttwo]
-  %definetypeface [lucida] [cg] [calligraphy] [lucida] [default] [encoding=\typescripttwo]
+  \definetypeface [lucida] [cg] [calligraphy] [lucida] [default] [encoding=\typescripttwo]
 
 \stoptypescript
 
-\starttypescript [lucida] [texnansi,ec,8r]
+\starttypescript [lucida] [texnansi,ec,8r,uc]
 
   \definetypeface [lucida] [mm] [math]        [lucida] [default] [encoding=\typescripttwo]
 
diff --git a/tex/context/base/type-fsf.tex b/tex/context/base/type-fsf.tex
index f8a2aff78..264420abf 100644
--- a/tex/context/base/type-fsf.tex
+++ b/tex/context/base/type-fsf.tex
@@ -98,4 +98,4 @@
   \loadmapfile[\typefaceencoding-fontsite-garamond.map]
 \stoptypescript
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/type-ghz.tex b/tex/context/base/type-ghz.tex
index ad429aa1d..2b4fe2d76 100644
--- a/tex/context/base/type-ghz.tex
+++ b/tex/context/base/type-ghz.tex
@@ -133,4 +133,4 @@
   \loadmapfile[\typefaceencoding-linotype-palatino.map]
 \stoptypescript
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/type-ini.tex b/tex/context/base/type-ini.tex
index b4fc331d3..5466eeaab 100644
--- a/tex/context/base/type-ini.tex
+++ b/tex/context/base/type-ini.tex
@@ -21,7 +21,9 @@
 \let\typescriptfiles\empty
 
 \unexpanded\def\usetypescriptfile[#1]%
-  {\addtocommalist{#1}\typescriptfiles}
+  {\doifelse{#1}\v!reset
+     {\let\typescriptfiles\empty}
+     {\addtocommalist{#1}\typescriptfiles}}
 
 \usetypescriptfile[\f!typeprefix syn] % font file synonyms
 \usetypescriptfile[\f!typeprefix enc] % files and encodings
diff --git a/tex/context/base/type-xtx.tex b/tex/context/base/type-xtx.tex
new file mode 100644
index 000000000..65266fea1
--- /dev/null
+++ b/tex/context/base/type-xtx.tex
@@ -0,0 +1,496 @@
+%D \module
+%D   [       file=type-xtx,
+%D        version=2004.11.15, % prereleased earlier
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=\XETEX's font treasures,
+%D         author=Adam T. Lindsay,
+%D           date=\currentdate,
+%D      copyright={Adam T. Lindsay / PRAGMA}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D Here are some fonts definitions that can get you started with
+%D \XETEX (for more details see Adam's MyWay documents).
+%D
+%D Most typescripts in this file are mostly independent of the other
+%D typescript files. Generally, you can speed things up a lot by
+%D eliminating all but one of \CONTEXT's typescript files:
+%D
+%D \starttyping
+%D \usetypescriptfiles[reset]     % HH: watch out, new feature, since
+%D \usetypescriptfiles[type-siz]  % I disliked the low level redef.
+%D \stoptyping
+%D
+%D The exceptions are the \quotation {legacy} fonts Times, Palatino,
+%D Courier, and Helvetica, which also depend on \type {type-syn}.
+%D
+%D These following six typescripts call the basic four variants on any
+%D given font, given the name of the \quotation {Regular} variant in the
+%D name slot. These typescripts default to a Unicode encoding,
+%D accepts sizes \quotation {default} and \quotation {dtp}, and are
+%D activated with the identifiers \quotation {Xserif}, \quotation {Xsans},
+%D and \quotation {Xmono}. They can have relative scaling within the
+%D typeface. Any of the following work:
+%D
+%D \starttyping
+%D \definetypeface[basic][rm][Xserif][Baskerville]
+%D \definetypeface[basic][ss][Xsans] [Optima Regular][default][encoding=uc,rscale=.87]
+%D \definetypeface[basic][tt][Xmono] [Courier]       [default]
+%D \stoptyping
+%D
+%D Activate the typeface with:
+%D
+%D \starttyping
+%D \setupbodyfont[basic]
+%D \stoptyping
+
+\starttypescript[Xserif][all][name]
+
+\definefontsynonym[Dummy]          ['\typescripttwo:mapping=tex-text']   [encoding=uc]
+\definefontsynonym[DummyItalic]    ['\typescripttwo/I:mapping=tex-text'] [encoding=uc]
+\definefontsynonym[DummyBold]      ['\typescripttwo/B:mapping=tex-text'] [encoding=uc]
+\definefontsynonym[DummyBoldItalic]['\typescripttwo/BI:mapping=tex-text'][encoding=uc]
+
+\definefontsynonym[Serif]           [Dummy]
+\definefontsynonym[SerifBold]       [DummyBold]
+\definefontsynonym[SerifItalic]     [DummyItalic]
+\definefontsynonym[SerifBoldItalic] [DummyBoldItalic]
+\definefontsynonym[SerifSlanted]    [DummyItalic]
+\definefontsynonym[SerifBoldSlanted][DummyBoldItalic]
+\definefontsynonym[SerifCaps]       [Dummy]
+
+\stoptypescript
+
+\starttypescript[Xsans][all][name]
+
+\definefontsynonym[DummySans]          ['\typescripttwo:mapping=tex-text']   [encoding=uc]
+\definefontsynonym[DummySansItalic]    ['\typescripttwo/I:mapping=tex-text'] [encoding=uc]
+\definefontsynonym[DummySansBold]      ['\typescripttwo/B:mapping=tex-text'] [encoding=uc]
+\definefontsynonym[DummySansBoldItalic]['\typescripttwo/BI:mapping=tex-text'][encoding=uc]
+
+\definefontsynonym[Sans]           [DummySans]
+\definefontsynonym[SansBold]       [DummySansBold]
+\definefontsynonym[SansItalic]     [DummySansItalic]
+\definefontsynonym[SansBoldItalic] [DummySansBoldItalic]
+\definefontsynonym[SansSlanted]    [DummySansItalic]
+\definefontsynonym[SansBoldSlanted][DummySansBoldItalic]
+\definefontsynonym[SansCaps]       [DummySans]
+
+\stoptypescript
+
+\starttypescript[Xmono][all][name]
+
+\definefontsynonym[DummyMono]          ['\typescripttwo']   [encoding=uc]
+\definefontsynonym[DummyMonoItalic]    ['\typescripttwo/I'] [encoding=uc]
+\definefontsynonym[DummyMonoBold]      ['\typescripttwo/B'] [encoding=uc]
+\definefontsynonym[DummyMonoBoldItalic]['\typescripttwo/BI'][encoding=uc]
+
+\definefontsynonym[Mono]           [DummyMono]
+\definefontsynonym[MonoBold]       [DummyMonoBold]
+\definefontsynonym[MonoItalic]     [DummyMonoItalic]
+\definefontsynonym[MonoBoldItalic] [DummyMonoBoldItalic]
+\definefontsynonym[MonoSlanted]    [DummyMonoItalic]
+\definefontsynonym[MonoBoldSlanted][DummyMonoBoldItalic]
+\definefontsynonym[MonoCaps]       [DummyMono]
+
+\stoptypescript
+
+\starttypescript[Xserif][default][size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [rm] [default]
+\stoptypescript
+
+\starttypescript[Xsans][default][size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [ss] [default]
+\stoptypescript
+
+\starttypescript [Xmono][default][size]
+  \definebodyfont
+    [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt]
+    [tt] [default]
+\stoptypescript
+
+\starttypescript[Xserif][dtp][size]
+  \definebodyfont
+    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
+    [rm] [default]
+\stoptypescript
+
+\starttypescript[Xsans][dtp][size]
+  \definebodyfont
+    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
+    [ss] [default]
+\stoptypescript
+
+\starttypescript[Xmono][dtp][size]
+  \definebodyfont
+    [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt]
+    [tt] [default]
+\stoptypescript
+
+%D The following are \quotation {legacy} named fonts. Times, Palatino,
+%D and Helvetica are familiar to most users of modern \TEX\
+%D systems. These versions are accessed via the Unicode encoding
+%D enabled by \XETEX. There is no attempt to match metrics with
+%D the actual legacy fonts. These are simply familiar names.
+
+%D These typescripts, unlike others in this file, depend on those in
+%D \type{type-pre}.
+
+\starttypescript[serif][times][uc]
+
+\definefontsynonym[Times-Roman]     ['Times Roman:mapping=tex-text']       [encoding=uc]
+\definefontsynonym[Times-Italic]    ['Times Italic:mapping=tex-text']      [encoding=uc]
+\definefontsynonym[Times-Bold]      ['Times Bold:mapping=tex-text']        [encoding=uc]
+\definefontsynonym[Times-BoldItalic]['Times Bold Italic:mapping=tex-text;'][encoding=uc]
+
+\stoptypescript
+
+%D Book Antiqua is Mac OS X's Palatino clone.
+
+\starttypescript[serif][palatino][uc]
+
+\definefontsynonym[Palatino]            ['Book Antiqua:mapping=tex-text']            [encoding=uc]
+\definefontsynonym[Palatino-Italic]     ['Book Antiqua Italic:mapping=tex-text']     [encoding=uc]
+\definefontsynonym[Palatino-Bold]       ['Book Antiqua Bold:mapping=tex-text']       [encoding=uc]
+\definefontsynonym[Palatino-BoldItalic] ['Book Antiqua Bold Italic:mapping=tex-text'][encoding=uc]
+
+\definefontsynonym[Palatino-Slanted]    [Palatino-Italic]
+\definefontsynonym[Palatino-BoldSlanted][Palatino-BoldItalic]
+\definefontsynonym[Palatino-Caps]       [Palatino]
+
+\stoptypescript
+
+%D The default Helvetica doesn't have an oblique variant, so we'll
+%D go ahead and name Helvertica Neue here.
+
+\starttypescript[sans][helvetica][uc]
+
+\definefontsynonym[Helvetica]            ['Helvetica Neue:mapping=tex-text']            [encoding=uc]
+\definefontsynonym[Helvetica-Oblique]    ['Helvetica Neue Italic:mapping=tex-text']     [encoding=uc]
+\definefontsynonym[Helvetica-Bold]       ['Helvetica Neue Bold:mapping=tex-text']       [encoding=uc]
+\definefontsynonym[Helvetica-BoldOblique]['Helvetica Neue Bold Italic:mapping=tex-text'][encoding=uc]
+
+\stoptypescript
+
+%D Courier, as delivered on MacOSX 10.3, doesn't have an oblique
+%D variant, either. Unfortunately, none of the default Mono fonts in
+%D MacOSX have oblique|/|italic versions!
+
+\starttypescript[mono][courier][uc]
+
+\definefontsynonym[Courier]            ['Courier:mapping=tex-text']     [encoding=uc]
+\definefontsynonym[Courier-Oblique]    [Courier]
+\definefontsynonym[Courier-Bold]       ['Courier Bold:mapping=tex-text'][encoding=uc]
+\definefontsynonym[Courier-BoldOblique][Courier-Bold]
+
+\stoptypescript
+
+%D The following fonts go beyond the usual four variants that
+%D are accessible via the above wildcard typescripts, so they
+%D get a more expanded treatment here:
+
+\starttypescript[serif][hoefler][uc]
+
+\definefontsynonym[Hoefler]      ['Hoefler Text:mapping=tex-text;
+                   Ligatures=Diphthongs']  [encoding=uc]
+\definefontsynonym[HoeflerItalic]['Hoefler Text Italic:mapping=tex-text;
+                   Ligatures=Diphthongs']  [encoding=uc]
+\definefontsynonym[HoeflerBlack] ['Hoefler Text Black:mapping=tex-text;
+                   Ligatures=Diphthongs']  [encoding=uc]
+\definefontsynonym[HoeflerBlackItalic]['Hoefler Text Black Italic:mapping=tex-text;
+                   Ligatures=Diphthongs']  [encoding=uc]
+\definefontsynonym[HoeflerSmCap] ['Hoefler Text:mapping=tex-text;
+                   Ligatures=Diphthongs;
+                   Letter Case=Small Caps'][encoding=uc]
+\stoptypescript
+
+\starttypescript[serif][hoefler][name]
+
+\definefontsynonym[Serif]           [Hoefler]
+\definefontsynonym[SerifBold]       [HoeflerBlack]
+\definefontsynonym[SerifItalic]     [HoeflerItalic]
+\definefontsynonym[SerifBoldItalic] [HoeflerBlackItalic]
+\definefontsynonym[SerifSlanted]    [HoeflerItalic]
+\definefontsynonym[SerifBoldSlanted][HoeflerBlackItalic]
+\definefontsynonym[SerifCaps]       [HoeflerSmCap]
+
+\stoptypescript
+
+\starttypescript[sans][lucidagrande][uc]
+
+\definefontsynonym[LucidaGrande]    ['Lucida Grande:mapping=tex-text']     [encoding=uc]
+\definefontsynonym[LucidaGrandeBold]['Lucida Grande Bold:mapping=tex-text'][encoding=uc]
+
+\stoptypescript
+
+\starttypescript[sans][lucidagrande][name]
+
+\definefontsynonym[Sans]           [LucidaGrande]
+\definefontsynonym[SansBold]       [LucidaGrandeBold]
+\definefontsynonym[SansItalic]     [LucidaGrande]
+\definefontsynonym[SansBoldItalic] [LucidaGrandeBold]
+\definefontsynonym[SansSlanted]    [LucidaGrande]
+\definefontsynonym[SansBoldSlanted][LucidaGrandeBold]
+\definefontsynonym[SansCaps]       [LucidaGrande]
+
+\stoptypescript
+
+\starttypescript[sans][optima][uc]
+\definefontsynonym[Optima]          ['Optima Regular:mapping=tex-text']    [encoding=uc]
+\definefontsynonym[OptimaItalic]    ['Optima Italic:mapping=tex-text']     [encoding=uc]
+\definefontsynonym[OptimaBold]      ['Optima Bold:mapping=tex-text']       [encoding=uc]
+\definefontsynonym[OptimaBoldItalic]['Optima Bold Italic:mapping=tex-text'][encoding=uc]
+\definefontsynonym[OptimaBlack]     ['Optima ExtraBlack:mapping=tex-text'] [encoding=uc]
+\stoptypescript
+
+\starttypescript[sans][optima][name]
+
+\definefontsynonym[Sans]           [Optima]
+\definefontsynonym[SansBold]       [OptimaBold]
+\definefontsynonym[SansItalic]     [OptimaItalic]
+\definefontsynonym[SansBoldItalic] [OptimaBoldItalic]
+\definefontsynonym[SansSlanted]    [OptimaItalic]
+\definefontsynonym[SansBoldSlanted][OptimaBoldItalic]
+\definefontsynonym[SansCaps]       [Optima]
+
+\stoptypescript
+
+\starttypescript[sans][gillsans,gillsanslt][uc]
+
+\definefontsynonym[GillSans]           ['Gill Sans:mapping=tex-text']             [encoding=uc]
+\definefontsynonym[GillSansItalic]     ['Gill Sans Italic:mapping=tex-text']      [encoding=uc]
+\definefontsynonym[GillSansBold]       ['Gill Sans Bold:mapping=tex-text']        [encoding=uc]
+\definefontsynonym[GillSansBoldItalic] ['Gill Sans Bold Italic:mapping=tex-text'] [encoding=uc]
+\definefontsynonym[GillSansLight]      ['Gill Sans Light:mapping=tex-text']       [encoding=uc]
+\definefontsynonym[GillSansLightItalic]['Gill Sans Light Italic:mapping=tex-text'][encoding=uc]
+
+\stoptypescript
+
+\starttypescript[sans][gillsans][name]
+
+\definefontsynonym[Sans]           [GillSans]
+\definefontsynonym[SansBold]       [GillSansBold]
+\definefontsynonym[SansItalic]     [GillSansItalic]
+\definefontsynonym[SansBoldItalic] [GillSansBoldItalic]
+\definefontsynonym[SansSlanted]    [GillSansItalic]
+\definefontsynonym[SansBoldSlanted][GillSansBoldItalic]
+\definefontsynonym[SansCaps]       [GillSans]
+
+\stoptypescript
+
+\starttypescript[sans][gillsanslt][name]
+
+\definefontsynonym[Sans]           [GillSansLight]
+\definefontsynonym[SansBold]       [GillSans]
+\definefontsynonym[SansItalic]     [GillSansLightItalic]
+\definefontsynonym[SansBoldItalic] [GillSansItalic]
+\definefontsynonym[SansSlanted]    [GillSansLightItalic]
+\definefontsynonym[SansBoldSlanted][GillSansItalic]
+\definefontsynonym[SansCaps]       [GillSansLight]
+
+\stoptypescript
+
+\starttypescript[serif,handwriting][zapfino][uc]
+
+\definefontsynonym[ZapfinoOne]  ['Zapfino:mapping=tex-text']                  [encoding=uc]
+\definefontsynonym[ZapfinoTwo]  ['Zapfino:mapping=tex-text;
+                                 Stylistic Variants=First variant glyph set'] [encoding=uc]
+\definefontsynonym[ZapfinoThree]['Zapfino:mapping=tex-text;
+                                 Stylistic Variants=Second variant glyph set'][encoding=uc]
+\definefontsynonym[ZapfinoFour] ['Zapfino:mapping=tex-text;
+                                 Stylistic Variants=Third variant glyph set'] [encoding=uc]
+\stoptypescript
+
+\starttypescript[handwriting][zapfino][name]
+
+\definefontsynonym[Handwriting][ZapfinoOne]
+
+\stoptypescript
+
+\starttypescript[serif][zapfino][name]
+
+\definefontsynonym[Serif]           [ZapfinoOne]
+\definefontsynonym[SerifBold]       [ZapfinoThree]
+\definefontsynonym[SerifItalic]     [ZapfinoTwo]
+\definefontsynonym[SerifBoldItalic] [ZapfinoTwo]
+\definefontsynonym[SerifSlanted]    [ZapfinoThree]
+\definefontsynonym[SerifBoldSlanted][ZapfinoThree]
+\definefontsynonym[SerifCaps]       [ZapfinoOne]
+
+\stoptypescript
+
+\starttypescript[serif,calligraphy][applechancery][uc]
+
+\definefontsynonym[AppleChanceryOne]    ['Apple Chancery:mapping=tex-text;
+                   Number Case=Old Styles']                [encoding=uc]
+\definefontsynonym[AppleChanceryTwo]    ['Apple Chancery:mapping=tex-text;
+                   Number Case=Old Styles;
+                   Design Complexity=Elegant Design Level'][encoding=uc]
+\definefontsynonym[AppleChanceryThree]  ['Apple Chancery:mapping=tex-text;
+                   Number Case=Old Styles;
+                   Design Complexity=Flourishes Set A']    [encoding=uc]
+\definefontsynonym[AppleChanceryFour]   ['Apple Chancery:mapping=tex-text;
+                   Number Case=Old Styles;
+                   Design Complexity=Flourishes Set B']    [encoding=uc]
+\definefontsynonym[AppleChanceryCaps]   ['Apple Chancery:mapping=tex-text;
+                   Number Case=Old Styles;
+                   Letter Case=Small Caps']                [encoding=uc]
+\definefontsynonym[AppleChanceryCapsTwo]['Apple Chancery:mapping=tex-text;
+                   Number Case=Old Styles;
+                   Letter Case=Small Caps;
+                   Design Complexity=Flourishes Set B']    [encoding=uc]
+\stoptypescript
+
+\starttypescript[calligraphy][applechancery][name]
+
+\definefontsynonym[Calligraphy][AppleChanceryOne]
+
+\stoptypescript
+
+\starttypescript[serif][applechancery][name]
+
+\definefontsynonym[Serif]           [AppleChanceryOne]
+\definefontsynonym[SerifBold]       [AppleChanceryThree]
+\definefontsynonym[SerifItalic]     [AppleChanceryTwo]
+\definefontsynonym[SerifBoldItalic] [AppleChanceryFour]
+\definefontsynonym[SerifSlanted]    [AppleChanceryThree]
+\definefontsynonym[SerifBoldSlanted][AppleChanceryFour]
+\definefontsynonym[SerifCaps]       [AppleChanceryCaps]
+
+\stoptypescript
+
+% MS Office 2004 for Mac has impressive Unicode coverage in
+% many of its fonts.
+
+\starttypescript[serif][timesnewroman][uc]
+
+\definefontsynonym[MSTimes]          ['Times New Roman:mapping=tex-text']            [encoding=uc]
+\definefontsynonym[MSTimesItalic]    ['Times New Roman Italic:mapping=tex-text']     [encoding=uc]
+\definefontsynonym[MSTimesBold]      ['Times New Roman Bold:mapping=tex-text']       [encoding=uc]
+\definefontsynonym[MSTimesBoldItalic]['Times New Roman Bold Italic:mapping=tex-text'][encoding=uc]
+
+\stoptypescript
+
+\starttypescript[serif][timesnewroman][name]
+
+\definefontsynonym[Serif]           [MSTimes]
+\definefontsynonym[SerifBold]       [MSTimesBold]
+\definefontsynonym[SerifItalic]     [MSTimesItalic]
+\definefontsynonym[SerifBoldItalic] [MSTimesBoldItalic]
+\definefontsynonym[SerifSlanted]    [MSTimesItalic]
+\definefontsynonym[SerifBoldSlanted][MSTimesBoldItalic]
+\definefontsynonym[SerifCaps]       [MSTimes]
+
+\stoptypescript
+
+\starttypescript[sans][arial][uc]
+
+\definefontsynonym[Arial]          ['Arial:mapping=tex-text']            [encoding=uc]
+\definefontsynonym[ArialItalic]    ['Arial Italic:mapping=tex-text']     [encoding=uc]
+\definefontsynonym[ArialBold]      ['Arial Bold:mapping=tex-text']       [encoding=uc]
+\definefontsynonym[ArialBoldItalic]['Arial Bold Italic:mapping=tex-text'][encoding=uc]
+
+\stoptypescript
+
+\starttypescript[sans][arial][name]
+
+\definefontsynonym[Sans]           [Arial]
+\definefontsynonym[SansBold]       [ArialBold]
+\definefontsynonym[SansItalic]     [ArialItalic]
+\definefontsynonym[SansBoldItalic] [ArialBoldItalic]
+\definefontsynonym[SansSlanted]    [ArialItalic]
+\definefontsynonym[SansBoldSlanted][ArialBoldItalic]
+\definefontsynonym[SansCaps]       [Arial]
+
+\stoptypescript
+
+%D MS Office comes with an installation of the Lucida family in
+%D TrueType form. It's nice, except\dots\ no math, no slanted, no caps
+%D and some other auxiliary fonts.
+
+\starttypescript [serif] [lucida] [uc]
+
+  \definefontsynonym [LucidaBright]              ['Lucida Bright:mapping=tex-text']         [encoding=uc]
+  \definefontsynonym [LucidaBright-Demi]         ['Lucida Bright Demibold:mapping=tex-text'][encoding=uc]
+  \definefontsynonym [LucidaBright-DemiItalic]   ['Lucida Bright Demibold:mapping=tex-text'][encoding=uc]
+  \definefontsynonym [LucidaBright-Italic]       ['Lucida Bright:mapping=tex-text']         [encoding=uc]
+
+  \definefontsynonym [LucidaBrightSmallcaps]     [LucidaBright]
+  \definefontsynonym [LucidaBrightSmallcaps-Demi][LucidaBright-Demi]
+  \definefontsynonym [LucidaBright-Oblique]      [LucidaBright-Italic]
+
+\stoptypescript
+
+\starttypescript [sans] [lucida] [uc]
+  \definefontsynonym [LucidaSans]           ['Lucida Sans Regular:mapping=tex-text']        [encoding=uc]
+  \definefontsynonym [LucidaSans-Demi]      ['Lucida Sans Demibold Roman:mapping=tex-text'] [encoding=uc]
+  \definefontsynonym [LucidaSans-DemiItalic]['Lucida Sans Demibold Italic:mapping=tex-text'][encoding=uc]
+  \definefontsynonym [LucidaSans-Italic]    ['Lucida Sans Italic:mapping=tex-text']         [encoding=uc]
+
+  \definefontsynonym [LucidaSans-Bold]      [LucidaSans-Demi]
+  \definefontsynonym [LucidaSans-BoldItalic][LucidaSans-DemiItalic]
+
+\stoptypescript
+
+\starttypescript [mono] [lucida] [uc]
+
+  \definefontsynonym [LucidaSans-Typewriter]           ['Lucida Sans Typewriter Regular']     [encoding=uc]
+  \definefontsynonym [LucidaSans-TypewriterBold]       ['Lucida Sans Typewriter Bold']        [encoding=uc]
+  \definefontsynonym [LucidaSans-TypewriterBoldOblique]['Lucida Sans Typewriter Bold Oblique'][encoding=uc]
+  \definefontsynonym [LucidaSans-TypewriterOblique]    ['Lucida Sans Typewriter Oblique']     [encoding=uc]
+
+\stoptypescript
+
+\starttypescript [calligraphy] [lucida] [uc]
+
+  \definefontsynonym[LucidaCalligraphy-Italic]['Lucida Calligraphy Italic:mapping=tex-text'][encoding=uc]
+
+\stoptypescript
+
+% No casual that I know of
+
+\starttypescript[handwriting][lucida][uc]
+
+  \definefontsynonym[LucidaHandwriting-Italic]['Lucida Handwriting Italic:mapping=tex-text'][encoding=uc]
+
+\stoptypescript
+
+\starttypescript[fax][lucida][uc]
+
+  \definefontsynonym[LucidaFax]           ['Lucida Fax Regular:mapping=tex-text']        [encoding=uc]
+  \definefontsynonym[LucidaFax-Demi]      ['Lucida Fax Demibold:mapping=tex-text']       [encoding=uc]
+  \definefontsynonym[LucidaFax-DemiItalic]['Lucida Fax Demibold Italic:mapping=tex-text'][encoding=uc]
+  \definefontsynonym[LucidaFax-Italic]    ['Lucida Fax Italic:mapping=tex-text']         [encoding=uc]
+
+\stoptypescript
+
+%D Gentium is from SIL, the fine makers of \XETEX, and it's not only
+%D very complete with Roman and Italic Unicode support, but very
+%D attractive.
+
+\starttypescript[serif][gentium][uc]
+
+\definefontsynonym[Gentium]      ['Gentium:mapping=tex-text']       [encoding=uc]
+\definefontsynonym[GentiumItalic]['Gentium Italic:mapping=tex-text'][encoding=uc]
+
+\stoptypescript
+
+\starttypescript[serif][gentium][name]
+
+\definefontsynonym[Serif]           [Gentium]
+\definefontsynonym[SerifBold]       [Gentium]
+\definefontsynonym[SerifItalic]     [GentiumItalic]
+\definefontsynonym[SerifBoldItalic] [GentiumItalic]
+\definefontsynonym[SerifSlanted]    [GentiumItalic]
+\definefontsynonym[SerifBoldSlanted][GentiumItalic]
+\definefontsynonym[SerifCaps]       [Gentium]
+
+\stoptypescript
+
+\endinput
diff --git a/tex/context/base/unic-001.tex b/tex/context/base/unic-001.tex
index 5a7a59fc1..f68ca7ec9 100644
--- a/tex/context/base/unic-001.tex
+++ b/tex/context/base/unic-001.tex
@@ -13,138 +13,138 @@
 
 \unprotect
 
-\startunicodevector 1
-  \ifcase#1\or
-    \@@unknownchar\or
-    Abreve\or
-    abreve\or
-    Aogonek\or
-    aogonek\or
-    Cacute\or
-    cacute\or
-    Ccircumflex\or
-    ccircumflex\or
-    Cdotaccent\or
-    cdotaccent\or
-    Ccaron\or
-    ccaron\or
-    Dcaron\or
-    dcaron\or
-    Dstroke\or
-    dstroke\or
-    Emacron\or
-    emacron\or
-    Ebreve\or
-    ebreve\or
-    Edotaccent\or
-    edotaccent\or
-    Eogonek\or
-    eogonek\or
-    Ecaron\or
-    ecaron\or
-    Gcircumflex\or
-    gcircumflex\or
-    Gbreve\or
-    gbreve\or
-    Gdotaccent\or
-    gdotaccent\or
-    \@@unknownchar\or % Gcedilla\or
-    \@@unknownchar\or % gcedilla\or
-    Hcircumflex\or
-    hcircumflex\or
-    Hstroke\or
-    hstroke\or
-    Itilde\or
-    itilde\or
-    Imacron\or
-    imacron\or
-    Ibreve\or
-    ibreve\or
-    Iogonek\or
-    iogonek\or
-    Idotaccent\or
-    dotlessi\or
-    IJligature\or
-    ijligature\or
-    Jcircumflex\or
-    jcircumflex\or
-    Kcedilla\or
-    kcedilla\or
-    \@@unknownchar\or % kra\or
-    Lacute\or
-    lacute\or
-    Lcedilla\or
-    lcedilla\or
-    Lcaron\or
-    lcaron\or
-    \@@unknownchar\or % Ldotmiddle\or
-    \@@unknownchar\or % ldotmiddle\or
-    Lstroke\or
-    lstroke\or
-    Nacute\or
-    nacute\or
-    Ncedilla\or
-    ncedilla\or
-    Ncaron\or
-    ncaron\or
-    napostrophe\or
-    Neng\or
-    neng\or
-    Omacron\or
-    omacron\or
-    Obreve\or
-    obreve\or
-    Ohungarumlaut\or
-    ohungarumlaut\or
-    OEligature\or
-    oeligature\or
-    Racute\or
-    racute\or
-    Rcedilla\or
-    rcedilla\or
-    Rcaron\or
-    rcaron\or
-    Sacute\or
-    sacute\or
-    Scircumflex\or
-    scircumflex\or
-    Scedilla\or
-    scedilla\or
-    Scaron\or
-    scaron\or
-    Tcedilla\or
-    tcedilla\or
-    Tcaron\or
-    tcaron\or
-    Tstroke\or
-    tstroke\or
-    Utilde\or
-    utilde\or
-    Umacron\or
-    umacron\or
-    Ubreve\or
-    ubreve\or
-    Uring\or
-    uring\or
-    Uhungarumlaut\or
-    uhungarumlaut\or
-    Uogonek\or
-    uogonek\or
-    Wcircumflex\or
-    wcircumflex\or
-    Ycircumflex\or
-    ycircumflex\or
-    Ydiaeresis\or
-    Zacute\or
-    zacute\or
-    Zdotaccent\or
-    zdotaccent\or
-    Zcaron\or
-    zcaron\or
-    \@@unknownchar\else % slong\else
-    \@@unknownchar
-  \fi
-\stopunicodevector
+% \startunicodevector 1
+%   \ifcase#1\or
+%     \@@unknownchar\or
+%     Abreve\or
+%     abreve\or
+%     Aogonek\or
+%     aogonek\or
+%     Cacute\or
+%     cacute\or
+%     Ccircumflex\or
+%     ccircumflex\or
+%     Cdotaccent\or
+%     cdotaccent\or
+%     Ccaron\or
+%     ccaron\or
+%     Dcaron\or
+%     dcaron\or
+%     Dstroke\or
+%     dstroke\or
+%     Emacron\or
+%     emacron\or
+%     Ebreve\or
+%     ebreve\or
+%     Edotaccent\or
+%     edotaccent\or
+%     Eogonek\or
+%     eogonek\or
+%     Ecaron\or
+%     ecaron\or
+%     Gcircumflex\or
+%     gcircumflex\or
+%     Gbreve\or
+%     gbreve\or
+%     Gdotaccent\or
+%     gdotaccent\or
+%     \@@unknownchar\or % Gcedilla\or
+%     \@@unknownchar\or % gcedilla\or
+%     Hcircumflex\or
+%     hcircumflex\or
+%     Hstroke\or
+%     hstroke\or
+%     Itilde\or
+%     itilde\or
+%     Imacron\or
+%     imacron\or
+%     Ibreve\or
+%     ibreve\or
+%     Iogonek\or
+%     iogonek\or
+%     Idotaccent\or
+%     dotlessi\or
+%     IJligature\or
+%     ijligature\or
+%     Jcircumflex\or
+%     jcircumflex\or
+%     Kcedilla\or
+%     kcedilla\or
+%     \@@unknownchar\or % kra\or
+%     Lacute\or
+%     lacute\or
+%     Lcedilla\or
+%     lcedilla\or
+%     Lcaron\or
+%     lcaron\or
+%     \@@unknownchar\or % Ldotmiddle\or
+%     \@@unknownchar\or % ldotmiddle\or
+%     Lstroke\or
+%     lstroke\or
+%     Nacute\or
+%     nacute\or
+%     Ncedilla\or
+%     ncedilla\or
+%     Ncaron\or
+%     ncaron\or
+%     napostrophe\or
+%     Neng\or
+%     neng\or
+%     Omacron\or
+%     omacron\or
+%     Obreve\or
+%     obreve\or
+%     Ohungarumlaut\or
+%     ohungarumlaut\or
+%     OEligature\or
+%     oeligature\or
+%     Racute\or
+%     racute\or
+%     Rcedilla\or
+%     rcedilla\or
+%     Rcaron\or
+%     rcaron\or
+%     Sacute\or
+%     sacute\or
+%     Scircumflex\or
+%     scircumflex\or
+%     Scedilla\or
+%     scedilla\or
+%     Scaron\or
+%     scaron\or
+%     Tcedilla\or
+%     tcedilla\or
+%     Tcaron\or
+%     tcaron\or
+%     Tstroke\or
+%     tstroke\or
+%     Utilde\or
+%     utilde\or
+%     Umacron\or
+%     umacron\or
+%     Ubreve\or
+%     ubreve\or
+%     Uring\or
+%     uring\or
+%     Uhungarumlaut\or
+%     uhungarumlaut\or
+%     Uogonek\or
+%     uogonek\or
+%     Wcircumflex\or
+%     wcircumflex\or
+%     Ycircumflex\or
+%     ycircumflex\or
+%     Ydiaeresis\or
+%     Zacute\or
+%     zacute\or
+%     Zdotaccent\or
+%     zdotaccent\or
+%     Zcaron\or
+%     zcaron\or
+%     \@@unknownchar\else % slong\else
+%     \@@unknownchar
+%   \fi
+% \stopunicodevector
 
 %D Faster, watch how we avoid zero and \TEX's
 %D automatically added \type {\relax}.
@@ -279,7 +279,26 @@
     \zdotaccent    \or
     \Zcaron        \or
     \zcaron        \or
-    \unknownchar   \else % \slong \else
+    \unknownchar   \or % 127 \slong \else
+    \unknownchar   \or
+    \unknownchar   \or
+    \unknownchar   \or
+    \unknownchar   \or
+    \unknownchar   \or
+    \unknownchar   \or
+    \unknownchar   \or
+    \unknownchar   \or
+    \unknownchar   \or
+    \unknownchar   \or
+    \unknownchar   \or
+    \unknownchar   \or
+    \unknownchar   \or
+    \unknownchar   \or
+    \unknownchar   \or
+    \unknownchar   \or
+    \unknownchar   \or
+    \unknownchar   \or
+    \textflorin    \or % 146
     \unknownchar
   \fi
 \stopunicodevector
diff --git a/tex/context/base/unic-002.tex b/tex/context/base/unic-002.tex
index 40475b297..f8626e6e4 100644
--- a/tex/context/base/unic-002.tex
+++ b/tex/context/base/unic-002.tex
@@ -13,20 +13,20 @@
 
 \unprotect
 
-\startunicodevector 2
-  \ifcase\numexpr(#1-198)
-    textcircumflex\or
-    textcaron\else
-  \ifcase\numexpr(#1-216)
-    textbreve\or
-    textdotaccent\or
-    \@@unknownchar\or
-    textogonek\or
-    texttilde\or
-    texthungarumlaut\else
-    \@@unknownchar
-  \fi\fi
-\stopunicodevector
+% \startunicodevector 2
+%   \ifcase\numexpr(#1-198)
+%     textcircumflex\or
+%     textcaron\else
+%   \ifcase\numexpr(#1-216)
+%     textbreve\or
+%     textdotaccent\or
+%     \@@unknownchar\or
+%     textogonek\or
+%     texttilde\or
+%     texthungarumlaut\else
+%     \@@unknownchar
+%   \fi\fi
+% \stopunicodevector
 
 % ugly but faster
 
diff --git a/tex/context/base/unic-032.tex b/tex/context/base/unic-032.tex
index f2061823a..2b7366e59 100644
--- a/tex/context/base/unic-032.tex
+++ b/tex/context/base/unic-032.tex
@@ -13,38 +13,38 @@
 
 \unprotect
 
-\startunicodevector 32
-  \ifcase\numexpr(#1-19)
-    endash\or
-    emdash\or
-    \@@unknownchar\or
-    \@@unknownchar\or
-    \@@unknownchar\or
-    quoteleft\or
-    quoteright\or
-    quotesinglebase\or
-    \@@unknownchar\or
-    quotedblleft\or
-    quotedblright\or
-    quotedblbase\or
-    \@@unknownchar\or
-    textdag\or
-    textddag\or
-    textbullet\or
-    \@@unknownchar\or
-    \@@unknownchar\or
-    \@@unknownchar\or
-    textellipsis\else
-  \ifcase\numexpr(#1-48)
-    perthousand\else
-  \ifcase\numexpr(#1-57)
-    \@@unknownchar\or   % SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-    \@@unknownchar\else % SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-  \ifcase\numexpr(#1-172)
-    texteuro\else
-    \@@unknownchar
-  \fi\fi\fi\fi
-\stopunicodevector
+% \startunicodevector 32
+%   \ifcase\numexpr(#1-19)
+%     endash\or
+%     emdash\or
+%     \@@unknownchar\or
+%     \@@unknownchar\or
+%     \@@unknownchar\or
+%     quoteleft\or
+%     quoteright\or
+%     quotesinglebase\or
+%     \@@unknownchar\or
+%     quotedblleft\or
+%     quotedblright\or
+%     quotedblbase\or
+%     \@@unknownchar\or
+%     textdag\or
+%     textddag\or
+%     textbullet\or
+%     \@@unknownchar\or
+%     \@@unknownchar\or
+%     \@@unknownchar\or
+%     textellipsis\else
+%   \ifcase\numexpr(#1-48)
+%     perthousand\else
+%   \ifcase\numexpr(#1-57)
+%     \@@unknownchar\or   % SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+%     \@@unknownchar\else % SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+%   \ifcase\numexpr(#1-172)
+%     texteuro\else
+%     \@@unknownchar
+%   \fi\fi\fi\fi
+% \stopunicodevector
 
 %D More efficient:
 
@@ -147,57 +147,57 @@
 
 \startunicodevector 32
   \ifcase\numexpr(#1)
-    \strippedcsname \enspace         \or % U+2000  	EN QUAD
-    \strippedcsname \emspace         \or % U+2001 	EM QUAD
-    \strippedcsname \enspace         \or % U+2002 	EN SPACE
-    \strippedcsname \emspace         \or % U+2003 	EM SPACE
-    \strippedcsname \unknownchar     \or % U+2004 	THREE-PER-EM SPACE
-    \strippedcsname \unknownchar     \or % U+2005 	FOUR-PER-EM SPACE
-    \strippedcsname \unknownchar     \or % U+2006 	SIX-PER-EM SPACE
-    \strippedcsname \unknownchar     \or % U+2007 	FIGURE SPACE
-    \strippedcsname \unknownchar     \or % U+2008 	PUNCTUATION SPACE
-    \strippedcsname \unknownchar     \or % U+2009 	THIN SPACE
-    \strippedcsname \unknownchar     \or % U+200A 	HAIR SPACE
-    \strippedcsname \unknownchar     \or % U+200B 	ZERO WIDTH SPACE
-    \strippedcsname \unknownchar     \or % U+200C 	ZERO WIDTH NON-JOINER
-    \strippedcsname \unknownchar     \or % U+200D 	ZERO WIDTH JOINER
-    \strippedcsname \unknownchar     \or % U+200E 	LEFT-TO-RIGHT MARK
-    \strippedcsname \unknownchar     \or % U+200F 	RIGHT-TO-LEFT MARK
-    \strippedcsname \unknownchar     \or % U+2010 	HYPHEN
-    \strippedcsname \unknownchar     \or % U+2011 	NON-BREAKING HYPHEN
-    \strippedcsname \unknownchar     \or % U+2012 	FIGURE DASH
+    \strippedcsname \enspace          \or % U+2000  	EN QUAD
+    \strippedcsname \emspace          \or % U+2001 	EM QUAD
+    \strippedcsname \enspace          \or % U+2002 	EN SPACE
+    \strippedcsname \emspace          \or % U+2003 	EM SPACE
+    \strippedcsname \unknownchar      \or % U+2004 	THREE-PER-EM SPACE
+    \strippedcsname \unknownchar      \or % U+2005 	FOUR-PER-EM SPACE
+    \strippedcsname \unknownchar      \or % U+2006 	SIX-PER-EM SPACE
+    \strippedcsname \unknownchar      \or % U+2007 	FIGURE SPACE
+    \strippedcsname \unknownchar      \or % U+2008 	PUNCTUATION SPACE
+    \strippedcsname \unknownchar      \or % U+2009 	THIN SPACE
+    \strippedcsname \unknownchar      \or % U+200A 	HAIR SPACE
+    \strippedcsname \unknownchar      \or % U+200B 	ZERO WIDTH SPACE
+    \strippedcsname \unknownchar      \or % U+200C 	ZERO WIDTH NON-JOINER
+    \strippedcsname \unknownchar      \or % U+200D 	ZERO WIDTH JOINER
+    \strippedcsname \unknownchar      \or % U+200E 	LEFT-TO-RIGHT MARK
+    \strippedcsname \unknownchar      \or % U+200F 	RIGHT-TO-LEFT MARK
+    \strippedcsname \breakinghyphen   \or % U+2010 	HYPHEN
+    \strippedcsname \nonbreakinghyphen\or % U+2011 	NON-BREAKING HYPHEN
+    \strippedcsname \endash           \or % U+2012 	FIGURE DASH
   % \ifcase\numexpr(#1-19)
-    \strippedcsname \endash          \or % U+2013 	EN DASH
-    \strippedcsname \emdash          \or % U+2014 	EM DASH
-    \strippedcsname \unknownchar     \or % U+2015 	HORIZONTAL BAR
-    \strippedcsname \unknownchar     \or % U+2016 	DOUBLE VERTICAL LINE
-    \strippedcsname \unknownchar     \or % U+2017 	DOUBLE LOW LINE
-    \strippedcsname \quoteleft       \or
-    \strippedcsname \quoteright      \or
-    \strippedcsname \quotesinglebase \or
-    \strippedcsname \unknownchar     \or
-    \strippedcsname \quotedblleft    \or
-    \strippedcsname \quotedblright   \or
-    \strippedcsname \quotedblbase    \or
-    \strippedcsname \unknownchar     \or
-    \strippedcsname \textdag         \or
-    \strippedcsname \textddag        \or
-    \strippedcsname \textbullet      \or
-    \strippedcsname \unknownchar     \or
-    \strippedcsname \unknownchar     \or
-    \strippedcsname \unknownchar     \or
-    \strippedcsname \textellipsis    \else
+    \strippedcsname \endash           \or % U+2013 	EN DASH
+    \strippedcsname \emdash           \or % U+2014 	EM DASH
+    \strippedcsname \unknownchar      \or % U+2015 	HORIZONTAL BAR
+    \strippedcsname \unknownchar      \or % U+2016 	DOUBLE VERTICAL LINE
+    \strippedcsname \unknownchar      \or % U+2017 	DOUBLE LOW LINE
+    \strippedcsname \quoteleft        \or
+    \strippedcsname \quoteright       \or
+    \strippedcsname \quotesinglebase  \or
+    \strippedcsname \unknownchar      \or
+    \strippedcsname \quotedblleft     \or
+    \strippedcsname \quotedblright    \or
+    \strippedcsname \quotedblbase     \or
+    \strippedcsname \unknownchar      \or
+    \strippedcsname \textdag          \or
+    \strippedcsname \textddag         \or
+    \strippedcsname \textbullet       \or
+    \strippedcsname \unknownchar      \or
+    \strippedcsname \unknownchar      \or
+    \strippedcsname \unknownchar      \or
+    \strippedcsname \textellipsis     \else
   \ifcase\numexpr(#1-48)
-    \strippedcsname \perthousand     \or   % U+2030 PER MILLE SIGN
-    \strippedcsname \unknownchar     \or   % U+2031 PER TEN THOUSAND SIGN
-    \strippedcsname \prime           \or   % U+2032 PRIME
-    \strippedcsname \doubleprime     \or   % U+2033 DOUBLE PRIME
-    \strippedcsname \tripleprime     \else % U+2034 TRIPLE PRIME
+    \strippedcsname \perthousand      \or   % U+2030 PER MILLE SIGN
+    \strippedcsname \unknownchar      \or   % U+2031 PER TEN THOUSAND SIGN
+    \strippedcsname \prime            \or   % U+2032 PRIME
+    \strippedcsname \doubleprime      \or   % U+2033 DOUBLE PRIME
+    \strippedcsname \tripleprime      \else % U+2034 TRIPLE PRIME
   \ifcase\numexpr(#1-57)
-    \strippedcsname \unknownchar     \or   % SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-    \strippedcsname \unknownchar     \else % SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+    \strippedcsname \unknownchar      \or   % SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+    \strippedcsname \unknownchar      \else % SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
   \ifcase\numexpr(#1-172)
-    \strippedcsname \texteuro        \else
+    \strippedcsname \texteuro         \else
     \strippedcsname \unknownchar
   \fi\fi\fi\fi
 \stopunicodevector
diff --git a/tex/context/base/unic-ini.tex b/tex/context/base/unic-ini.tex
index 8125bab2d..6cc498475 100644
--- a/tex/context/base/unic-ini.tex
+++ b/tex/context/base/unic-ini.tex
@@ -257,11 +257,20 @@
      \expandafter\utfunihashchar  \or
      \expandafter\utfunihashsplit \or
      \expandafter\utfunihashboth  \or
-     \@EA\string\@EA\unicodechar  \or
+     \expandafter\utfuniglyphname \or
      \expandafter\utfunientity    \else
      \expandafter\utfunihash
   \fi}
 
+%D \startbuffer
+%D \enableregime[utf] \dostepwiserecurse{0}{8}{1}
+%D   {\recurselevel:
+%D    \chardef\utfunicodetracer=\recurselevel aap‒noot coördinatie – één
+%D    \crlf}
+%D \stopbuffer
+%D
+%D \typebuffer \start \getbuffer \stop
+
 %D \macros
 %D   {unicodehexnumber}
 %D
@@ -379,6 +388,17 @@
 
 \let\utfunihash\utfunihashglyph
 
+%D We also need:
+
+\def\utfuniglyphname#1%
+  {{\tttf
+    \expandafter\string\csname
+      \ifnum#1<\utf@i
+        \strippedcsname\unicodeasciicharacter\endcsname{#1}%
+      \else
+        \@EA\doutfunihash\@EA{\number\utfdiv{#1}}{#1}\endcsname
+      \fi}}
+
 %D The combined presentation is implemented by:
 
 \def\utfunihashchar #1%
diff --git a/tex/context/base/x-fe.tex b/tex/context/base/x-fe.tex
index 5748c8ff0..302960d0c 100644
--- a/tex/context/base/x-fe.tex
+++ b/tex/context/base/x-fe.tex
@@ -1,8 +1,8 @@
 %D \module
 %D   [      file=x-fe,
 %D        version=2004.03.12, % based on earlier experiments
-%D          title=\CONTEXT\ XML Modules,
-%D       subtitle=Formatting Objects Extensions,
+%D          title=\FOXET,
+%D       subtitle=Simple Extensions,
 %D         author=Hans Hagen,
 %D           date=\currentdate,
 %D      copyright={PRAGMA ADE / Hans Hagen \& Ton Otten}]
@@ -96,7 +96,23 @@
 
 \defineXMLargument
   [fe:message]
-  {\writestatus{XML-FO}}
+  [category=XML-FO]
+  {\writestatus{\XMLop{category}}}
+
+%D Handy
+
+\defineXMLargument
+  [fe:trace]
+  [attribute=,option=]
+  {\showXMLinh{\XMLop{attribute}}%
+   \XMLval{fe:trace}{\XMLop{option}}{}}
+
+\mapXMLvalue
+  {fe:trace}
+  {font}
+  {\hbox\bgroup\infofont[%
+   \xFOfont/\xFOfontsize/\xFOfontsizeadjust/\xFOfontfamily/\xFOfontweight/\xFOfontstyle/\xFOfontvariant:\FOfontdefinition
+   ]\egroup}
 
 %D Extensions:
 
@@ -119,4 +135,9 @@
   \XMLval{fe:testgrid}{\XMLop{fe:testgrid}}{}
 \stopsetups
 
+%D Private (testing)
+
+\defineXMLcommand[fe:synchronizeoutput]{\synchronizeoutput}
+
+
 \protect \endinput
diff --git a/tex/context/base/x-fo.tex b/tex/context/base/x-fo.tex
index 094bb71fc..04555fbdd 100644
--- a/tex/context/base/x-fo.tex
+++ b/tex/context/base/x-fo.tex
@@ -1,7 +1,7 @@
 %D \module
 %D   [      file=x-fo,
 %D        version=2004.03.12, % based on earlier experiments
-%D          title=\CONTEXT\ XML Modules,
+%D          title=\FOXET,
 %D       subtitle=Formatting Objects,
 %D         author=Hans Hagen,
 %D           date=\currentdate,
@@ -11,12 +11,23 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+% \showframe
+
+% This is a first implementation, maybe I will write another one with mixed
+% element indifferent vars and something 'when set, act upon it, and forget',
+% for instance: in each element check if font set, if so, change font and
+% reset font attributes. I'm not sure if this is wise.
+
 % todo: global assignment in order to limit restore
 % todo: combine mp graphics (see end) saves 30%
 % todo: using contants and variables (for internal use)
 
+% todo: language at more levels
+
 % beware: aftergroup vs egroup/endgroup
 
+\input xtag-run
+
 \unprotect
 
 % syst-new.tex
@@ -66,6 +77,16 @@
 \chardef\XMLtokensreduction = 2
 \chardef\XMLcdatamethod     = 2
 
+%D For the purpose of testing.
+
+\startmode[fo-verbose]
+  \def\writeFOstatus{\writestatus{XML-FO}}
+\stopmode
+
+\startnotmode[fo-verbose]
+  \let\writeFOstatus\gobbleoneargument
+\stopnotmode
+
 %D For the moment we stick to utf-8.
 
 \useXMLfilter[utf]
@@ -117,7 +138,7 @@
    location=middle]
 
 \setuppagenumbering
-  [alternative=doublesided,
+  [alternative={doublesided,singlesided}, % sic
    location=]
 
 \setuptolerance
@@ -256,10 +277,10 @@
    font-family=,% Times,
    font-selection-strategy=,
    font-size=,% 12pt,
-   font-size-adjust=1,
-   font-style=normal,
-   font-variant=normal,
-   font-weight=normal]
+   font-size-adjust=, % 1,
+   font-style=, % normal,
+   font-variant=, % normal,
+   font-weight=] % normal]
 
 \defineXMLattributeset
   [fo:hyphenation]
@@ -592,7 +613,7 @@
 %D is needed in order to comfortably fetch attribute values from
 %D ancestors.
 
-\startXMLcompiling
+\startXMLcompiling[inherit]
 
 %D Element: fo:root
 
@@ -609,6 +630,7 @@ leader-pattern-width=12pt,
 
 \startsetups fo:root:start
   \starttext \beginXMLelement \startXMLignore
+  \doifsomething{\XMLop{language}}{\mainlanguage[\XMLop{language}]}% todo, everywhere
 \stopsetups
 
 \startsetups fo:root:stop
@@ -721,13 +743,23 @@ leader-pattern-width=12pt,
 
   \setpercentdimen\FOcolumngap{\XMLpar{fo:region-body}{column-gap}{12pt}}
 
-  \definecolumnset
+  % we need to freeze the lineheight here
+
+  \expanded{\definecolumnset
     [fo:set]
     [n=\XMLpar{fo:region-body}{column-count}{1},
-     distance=\FOcolumngap]
+     distance=\FOcolumngap]}
+
+  \expanded{\definecolumnsetspan
+    [fo:set]
+    [n=\XMLpar{fo:region-body}{column-count}{1}]}
 
   \directsetup{fo:font:setup} % else problems
 
+  \directsetup{fo:line-height:setup}
+
+%   \parseXMLattributes{fo:flow}{line-height='normal'}
+
   \startcolumnset[fo:set]
 
   % \startcolumns[\XMLpar{fo:region-body}{column-count}{1}]
@@ -851,7 +883,7 @@ leader-pattern-width=12pt,
 
 \startsetups fo:simple-page-master:stop
 
-  \writestatus{XML-FO}{defining papersize '\directsetup{fo:layout:kind}'}
+  \writeFOstatus{defining papersize '\directsetup{fo:layout:kind}'}
 
   \expanded
     {\definepapersize
@@ -863,25 +895,32 @@ leader-pattern-width=12pt,
   \checkFOmargin  {fo:region-body}
   \checkFOmargin  {fo:simple-page-master-do}
 
-  \writestatus{XML-FO}{defining layout '\directsetup{fo:layout:kind}'}
+  \writeFOstatus{defining layout '\directsetup{fo:layout:kind}'}
+
+  \FOscratchMT\paperheight \setpercentdimen\FOscratchMT{\XMLpar{fo:simple-page-master-do}{margin-top}   \zeropoint}
+  \FOscratchMB\paperheight \setpercentdimen\FOscratchMB{\XMLpar{fo:simple-page-master-do}{margin-bottom}\zeropoint}
+  \FOscratchML\paperwidth  \setpercentdimen\FOscratchML{\XMLpar{fo:simple-page-master-do}{margin-left}  \zeropoint}
+  \FOscratchMR\paperwidth  \setpercentdimen\FOscratchMR{\XMLpar{fo:simple-page-master-do}{margin-right} \zeropoint}
+
+  \FOscratchRB\paperheight \setpercentdimen\FOscratchRB{\XMLpar{fo:region-body}{margin-top}   \zeropoint}
+  \FOscratchRA\paperheight \setpercentdimen\FOscratchRA{\XMLpar{fo:region-body}{margin-bottom}\zeropoint}
+  \FOscratchRS\paperwidth  \setpercentdimen\FOscratchRS{\XMLpar{fo:region-body}{margin-left}  \zeropoint}
+  \FOscratchRE\paperwidth  \setpercentdimen\FOscratchRE{\XMLpar{fo:region-body}{margin-right} \zeropoint}
+
+  \FOscratchPB\paperheight \setpercentdimen\FOscratchPB{\XMLpar{fo:region-body}{padding-top}   \zeropoint}
+  \FOscratchPA\paperheight \setpercentdimen\FOscratchPA{\XMLpar{fo:region-body}{padding-bottom}\zeropoint}
+  \FOscratchPS\paperwidth  \setpercentdimen\FOscratchPS{\XMLpar{fo:region-body}{padding-left}  \zeropoint}
+  \FOscratchPE\paperwidth  \setpercentdimen\FOscratchPE{\XMLpar{fo:region-body}{padding-right} \zeropoint}
 
   \expanded
     {\definelayout
        [\directsetup{fo:layout:kind}]
        [       page={\directsetup{fo:layout:kind},\XMLval{fo:reference-orientation}{\XMLop{reference-orientation}}{}},
               paper=\directsetup{fo:layout:kind},
-          backspace=\the\dimexpr(\XMLpar{fo:simple-page-master-do}{margin-left}{0pt}+
-                                 \XMLpar{fo:region-body}{padding-left}{0pt}+
-                                 \XMLpar{fo:region-body}{margin-left}{0pt}),
-           cutspace=\the\dimexpr(\XMLpar{fo:simple-page-master-do}{margin-right}{0pt}+
-                                 \XMLpar{fo:region-body}{padding-right}{0pt}+
-                                 \XMLpar{fo:region-body}{margin-right}{0pt}),
-           topspace=\the\dimexpr(\XMLpar{fo:simple-page-master-do}{margin-top}{0pt}+
-                                 \XMLpar{fo:region-body}{padding-top}{0pt}+
-                                 \XMLpar{fo:region-body}{margin-top}{0pt}),
-        bottomspace=\the\dimexpr(\XMLpar{fo:simple-page-master-do}{margin-top}{0pt}+
-                                 \XMLpar{fo:region-body}{padding-bottom}{0pt}+
-                                 \XMLpar{fo:region-body}{margin-bottom}{0pt})]}
+          backspace=\the\dimexpr(\FOscratchML+\FOscratchPS+\FOscratchRS),
+           cutspace=\the\dimexpr(\FOscratchMR+\FOscratchPE+\FOscratchRE),
+           topspace=\the\dimexpr(\FOscratchMT+\FOscratchPB+\FOscratchRB),
+        bottomspace=\the\dimexpr(\FOscratchMB+\FOscratchPA+\FOscratchRA)]}
 
   \expanded{\setuplayout[\directsetup{fo:layout:kind}]}
 
@@ -890,7 +929,7 @@ leader-pattern-width=12pt,
 
   \startexpanded
     \noexpand \startlocalsetups[layout:\directsetup{fo:layout:kind}]
-    \noexpand   \writestatus{XML-FO}{processing simple page master '\XMLpar{fo:simple-page-master-do}{master-name}{any}'}
+    \noexpand   \writeFOstatus{processing simple page master '\XMLpar{fo:simple-page-master-do}{master-name}{any}'}
     \noexpand   \resetsetups[fo:simple-page-master:start]
     \noexpand   \resetsetups[fo:simple-page-master:stop]
     \noexpand   \flushXMLelement{fo:simple-page-master:\XMLpar{fo:simple-page-master-do}{master-name}{any}}
@@ -900,7 +939,7 @@ leader-pattern-width=12pt,
 \stopsetups
 
 % \defineXMLcommand[fo:simple-page-master-do-do]
-%   {\writestatus{XML-FO}{setting up master \XMLop{master-name} in page body}}
+%   {\writeFOstatus{setting up master \XMLop{master-name} in page body}}
 
 %D Element: fo:region-body
 
@@ -921,7 +960,7 @@ leader-pattern-width=12pt,
   {\directsetup{fo:region-body:process}}
 
 \startsetups fo:region-body:process
-  \writestatus{XML-FO}{refreshing region-body parameters}
+  \writeFOstatus{refreshing region-body parameters}
 \stopsetups
 
 % todo: naar realfolio handelen ipv folio
@@ -994,7 +1033,7 @@ leader-pattern-width=12pt,
   {\directsetup{fo:region-before:process}}
 
 \startsetups fo:region-before:process
-  \writestatus{XML-FO}{refreshing region-before parameters}
+  \writeFOstatus{refreshing region-before parameters}
 \stopsetups
 
 \defineXMLprocess
@@ -1094,10 +1133,9 @@ leader-pattern-width=12pt,
 
 \stopsetups
 
-\newdimen\FOscratchML \newdimen\FOscratchMR
-\newdimen\FOscratchMT \newdimen\FOscratchMB
-\newdimen\FOscratchRB \newdimen\FOscratchRA
-\newdimen\FOscratchRS \newdimen\FOscratchRE
+\newdimen\FOscratchML \newdimen\FOscratchMR \newdimen\FOscratchMT \newdimen\FOscratchMB
+\newdimen\FOscratchPB \newdimen\FOscratchPA \newdimen\FOscratchPS \newdimen\FOscratchPE
+\newdimen\FOscratchRB \newdimen\FOscratchRA \newdimen\FOscratchRS \newdimen\FOscratchRE
 
 \mapXMLvalue {fo:background-repeat} {no-repeat} {0}
 \mapXMLvalue {fo:background-repeat} {repeat}    {1}
@@ -1195,7 +1233,7 @@ leader-pattern-width=12pt,
   [background=text]
 
 \def\FOregionbuilder#1#2#3#4#5#6% #1=location #2=preset #3=x #4=y #5=width #6=height
-  {\writestatus{XML-FO}{building region #1}%
+  {\writeFOstatus{building region #1}%
    \defineoverlay
      [image]
      [{\framed
@@ -1233,17 +1271,17 @@ leader-pattern-width=12pt,
 
   \checkFOmargin{fo:simple-page-master-do}
 
-  \FOscratchML \XMLpar{fo:simple-page-master-do}{margin-left}  \zeropoint
-  \FOscratchMR \XMLpar{fo:simple-page-master-do}{margin-right} \zeropoint
-  \FOscratchMT \XMLpar{fo:simple-page-master-do}{margin-top}   \zeropoint
-  \FOscratchMB \XMLpar{fo:simple-page-master-do}{margin-bottom}\zeropoint
+  \FOscratchMT\paperheight \setpercentdimen\FOscratchMT{\XMLpar{fo:simple-page-master-do}{margin-top}   \zeropoint}
+  \FOscratchMB\paperheight \setpercentdimen\FOscratchMB{\XMLpar{fo:simple-page-master-do}{margin-bottom}\zeropoint}
+  \FOscratchML\paperwidth  \setpercentdimen\FOscratchML{\XMLpar{fo:simple-page-master-do}{margin-left}  \zeropoint}
+  \FOscratchMR\paperwidth  \setpercentdimen\FOscratchMR{\XMLpar{fo:simple-page-master-do}{margin-right} \zeropoint}
 
   \doif{\XMLpar{fo:region-body}{fe:z-order}{above}}{below}{\directsetup{fo:regions:process:body}}
 
-  \FOscratchRB \XMLpar{fo:region-before}        {extent}       \zeropoint
-  \FOscratchRA \XMLpar{fo:region-after}         {extent}       \zeropoint
-  \FOscratchRS \XMLpar{fo:region-start}         {extent}       \zeropoint
-  \FOscratchRE \XMLpar{fo:region-end}           {extent}       \zeropoint
+  \FOscratchRB\paperheight \setpercentdimen\FOscratchRB{\XMLpar{fo:region-before}{extent}\zeropoint}
+  \FOscratchRA\paperheight \setpercentdimen\FOscratchRA{\XMLpar{fo:region-after} {extent}\zeropoint}
+  \FOscratchRS\paperwidth  \setpercentdimen\FOscratchRS{\XMLpar{fo:region-start} {extent}\zeropoint}
+  \FOscratchRE\paperwidth  \setpercentdimen\FOscratchRE{\XMLpar{fo:region-end}   {extent}\zeropoint}
 
   \doifelse{\XMLpar{fo:region-before}{precedence}{false}}{true}
     {\doifelse{\XMLpar{fo:region-after}{precedence}{false}}{true}
@@ -1257,14 +1295,38 @@ leader-pattern-width=12pt,
 
 \stopsetups
 
+\newdimen\FOscratchEB
+\newdimen\FOscratchEA
+
+\chardef\FOregionmode\zerocount
+
+\startmode[fo-pt]
+  \chardef\FOregionmode\plusone  % fotex mode -)
+\stopmode
+
+\startsetups fo:regions:modes
+
+  \ifcase\FOregionmode
+    \FOscratchEB\zeropoint
+    \FOscratchEA\zeropoint
+  \or
+    \FOscratchEB\paperheight \setpercentdimen\FOscratchEB{\XMLpar{fo:region-before}{extent}\zeropoint}
+    \FOscratchEA\paperheight \setpercentdimen\FOscratchEA{\XMLpar{fo:region-after} {extent}\zeropoint}
+  \else
+    \FOscratchEB\zeropoint
+    \FOscratchEA\zeropoint
+  \fi
+
+\stopsetups
+
 \startsetups fo:regions:process:body
 
   \bgroup
 
-  \FOscratchRB \XMLpar{fo:region-body}{margin-top}   \zeropoint
-  \FOscratchRA \XMLpar{fo:region-body}{margin-bottom}\zeropoint
-  \FOscratchRS \XMLpar{fo:region-body}{margin-left}  \zeropoint
-  \FOscratchRE \XMLpar{fo:region-body}{margin-right} \zeropoint
+  \FOscratchRB\paperheight \setpercentdimen\FOscratchRB{\XMLpar{fo:region-body}{margin-top}   \zeropoint}
+  \FOscratchRA\paperheight \setpercentdimen\FOscratchRA{\XMLpar{fo:region-body}{margin-bottom}\zeropoint}
+  \FOscratchRS\paperwidth  \setpercentdimen\FOscratchRS{\XMLpar{fo:region-body}{margin-left}  \zeropoint}
+  \FOscratchRE\paperwidth  \setpercentdimen\FOscratchRE{\XMLpar{fo:region-body}{margin-right} \zeropoint}
 
   \FOregionbuilder
     {region-body}
@@ -1280,13 +1342,15 @@ leader-pattern-width=12pt,
 
 \startsetups fo:regions:process:true:true
 
+  \directsetup{fo:regions:modes}
+
   \ifdim\FOscratchRB>\zeropoint \FOregionbuilder
       {region-before}{lefttop}
-      {\FOscratchML}{\FOscratchMT}
+      {\FOscratchML}{\FOscratchMT-\FOscratchEB}
       {\paperwidth-\FOscratchML-\FOscratchMR}{\FOscratchRB}
   \fi \ifdim\FOscratchRA>\zeropoint \FOregionbuilder
       {region-after}{leftbottom}
-      {\FOscratchML}{\FOscratchMB}
+      {\FOscratchML}{\FOscratchMB-\FOscratchEA}
       {\paperwidth-\FOscratchML-\FOscratchMR}{\FOscratchRA}
   \fi \ifdim\FOscratchRS>\zeropoint \FOregionbuilder
       {region-start}{lefttop}
@@ -1302,13 +1366,15 @@ leader-pattern-width=12pt,
 
 \startsetups fo:regions:process:false:true
 
+  \directsetup{fo:regions:modes}
+
   \ifdim\FOscratchRB>\zeropoint \FOregionbuilder
       {region-before}{lefttop}
-      {\FOscratchML+\FOscratchRS}{\FOscratchMT}
+      {\FOscratchML+\FOscratchRS}{\FOscratchMT-\FOscratchEB}
       {\paperwidth-\FOscratchML-\FOscratchMR-\FOscratchRS-\FOscratchRE}{\FOscratchRB}
   \fi \ifdim\FOscratchRA>\zeropoint \FOregionbuilder
       {region-after}{leftbottom}
-      {\FOscratchML}{\FOscratchMB}
+      {\FOscratchML}{\FOscratchMB-\FOscratchEA}
       {\paperwidth-\FOscratchML-\FOscratchMR}{\FOscratchRA}
   \fi \ifdim\FOscratchRS>\zeropoint \FOregionbuilder
       {region-start}{lefttop}
@@ -1324,13 +1390,15 @@ leader-pattern-width=12pt,
 
 \startsetups fo:regions:process:true:false
 
+  \directsetup{fo:regions:modes}
+
   \ifdim\FOscratchRB>\zeropoint \FOregionbuilder
       {region-before}{lefttop}
-      {\FOscratchML}{\FOscratchMT}
+      {\FOscratchML}{\FOscratchMT-\FOscratchEB}
       {\paperwidth-\FOscratchML-\FOscratchMR}{\FOscratchRB}
   \fi \ifdim\FOscratchRA>\zeropoint \FOregionbuilder
       {region-after}{leftbottom}
-      {\FOscratchML+\FOscratchRS}{\FOscratchMB}
+      {\FOscratchML+\FOscratchRS}{\FOscratchMB-\FOscratchEA}
       {\paperwidth-\FOscratchML-\FOscratchMR-\FOscratchRS-\FOscratchRE}{\FOscratchRA}
   \fi \ifdim\FOscratchRS>\zeropoint \FOregionbuilder
       {region-start}{lefttop}
@@ -1346,13 +1414,15 @@ leader-pattern-width=12pt,
 
 \startsetups fo:regions:process:false:false
 
+  \directsetup{fo:regions:modes}
+
   \ifdim\FOscratchRB>\zeropoint \FOregionbuilder
       {region-before}{lefttop}
-      {\FOscratchML+\FOscratchRS}{\FOscratchMT}
+      {\FOscratchML+\FOscratchRS}{\FOscratchMT-\FOscratchEB}
       {\paperwidth-\FOscratchML-\FOscratchMR-\FOscratchRS-\FOscratchRE}{\FOscratchRB}
   \fi \ifdim\FOscratchRA>\zeropoint \FOregionbuilder
       {region-after}{leftbottom}
-      {\FOscratchML+\FOscratchRS}{\FOscratchMB}
+      {\FOscratchML+\FOscratchRS}{\FOscratchMB-\FOscratchEA}
       {\paperwidth-\FOscratchML-\FOscratchMR-\FOscratchRS-\FOscratchRE}{\FOscratchRA}
   \fi \ifdim\FOscratchRS>\zeropoint \FOregionbuilder
       {region-start}{lefttop}
@@ -1368,7 +1438,7 @@ leader-pattern-width=12pt,
 
 \startsetups fo:before:each:page
 
-  \writestatus{XML-FO}{setting up layout \currentlayout}
+  \writeFOstatus{setting up layout \currentlayout}
   \directsetup{layout:\currentlayout}
   \directsetup{fo:regions:process}
 
@@ -1417,6 +1487,10 @@ leader-pattern-width=12pt,
 
   \endgraf
 
+  \writeFOstatus{fo:block in line \the\inputlineno}
+
+\doif{\XMLpar{fo:block}{span}{}}{all}{\ifinsidecolumns \startcolumnsetspan[fo:set] \fi}
+
   \begingroup
 
   \directsetup{fe:setup}
@@ -1435,7 +1509,7 @@ leader-pattern-width=12pt,
 
   \directsetup{fo:line-height:setup}
 
-  \directsetup{fo:indent:setup}
+  \directsetup{fo:indent:setup}% hier ?
 
   \doifsomething{\XMLop{background-color}}
     {\checkhexcolor[\XMLop{background-color}]
@@ -1467,6 +1541,7 @@ leader-pattern-width=12pt,
 
   \directsetup{fo:hyphenation:setup}
   \directsetup{fo:align:setup}
+  \directsetup{fo:margin:setup}
 
   \doif{\XMLop{wrap-option}}{no-wrap}
     {\obeylines}
@@ -1474,9 +1549,9 @@ leader-pattern-width=12pt,
   \doif{\XMLop{white-space-collapse}}{false}
     {\obeyspaces}
 
-  \doifsomething{\XMLop{text-indent}}
-    {\expanded{\setupindenting[\XMLop{text-indent}]}
-     \indenting[always]}
+  % todo : remember old one and do like fonts
+
+  \directsetup{fo:textindent:setup}
 
 \stopsetups
 
@@ -1494,8 +1569,23 @@ leader-pattern-width=12pt,
 
   \endgroup
 
+  \doif{\XMLpar{fo:block}{span}{}}{all}{\ifinsidecolumns \stopcolumnsetspan \fi}
+
 \stopsetups
 
+\startsetups fo:textindent:setup
+
+  \edefXMLinh\xFOtextindent{text-indent}
+
+  \doifsomething\xFOtextindent
+    {\scratchdimen\hsize
+     \setpercentdimen\scratchdimen\xFOtextindent
+     \expanded{\setupindenting[\the\scratchdimen]}}
+
+\stopsetups
+
+\indenting[always] % can be zero points
+
 % todo: map
 
 \mapXMLvalue {fo:break} {column}    {\column}
@@ -1508,7 +1598,7 @@ leader-pattern-width=12pt,
 % nasty interference with accumulated skips
 
 \mapXMLvalue {fo:keep-next}  {auto}   {}
-\mapXMLvalue {fo:keep-next}  {always} {\allowbreak}
+\mapXMLvalue {fo:keep-next}  {always} {\nobreak}
 
 \mapXMLvalue {fo:keep-prev}  {auto}   {}
 \mapXMLvalue {fo:keep-prev}  {always} {\nobreak}
@@ -1525,10 +1615,7 @@ leader-pattern-width=12pt,
 
   \XMLval{fo:break}{\XMLop{break-before}}{}
 
-% test
-%
-% \FOsavedlastskip \lastskip
-% \ifdim\FOsavedlastskip>\zeropoint \vskip-\FOsavedlastskip \fi
+  \FOsavedlastskip \lastskip \ifdim\FOsavedlastskip>\zeropoint \vskip-\FOsavedlastskip \fi
 
   \XMLval{fo:keep-start}{\XMLop{keep-together}}\empty
   \XMLval{fo:keep-start}{\XMLop{keep-together.within-column}}\empty
@@ -1538,9 +1625,7 @@ leader-pattern-width=12pt,
   \XMLval{fo:keep-prev} {\XMLop{keep-with-previous.within-column}}\empty
   \XMLval{fo:keep-prev} {\XMLop{keep-with-previous.within-page}}\empty
 
-% test
-%
-% \ifdim\FOsavedlastskip>\zeropoint \vskip\FOsavedlastskip \fi
+  \ifdim\FOsavedlastskip>\zeropoint \vskip\FOsavedlastskip \fi
 
   \doFObeforeskip\currentXMLelement
 
@@ -1548,10 +1633,9 @@ leader-pattern-width=12pt,
 
 \startsetups fo:break-and-space:after
 
-  \doFOafterskip\currentXMLelement
+%   \doFOafterskip\currentXMLelement
 
-% \FOsavedlastskip \lastskip
-% \ifdim\FOsavedlastskip>\zeropoint \vskip-\FOsavedlastskip \fi
+  \FOsavedlastskip \lastskip \ifdim\FOsavedlastskip>\zeropoint \vskip-\FOsavedlastskip \fi
 
   \XMLval{fo:keep-stop}{\XMLop{keep-together}}\empty
   \XMLval{fo:keep-stop}{\XMLop{keep-together.within-column}}\empty
@@ -1561,7 +1645,9 @@ leader-pattern-width=12pt,
   \XMLval{fo:keep-next}{\XMLop{keep-with-next.within-column}}\empty
   \XMLval{fo:keep-next}{\XMLop{keep-with-next.within-page}}\empty
 
-% \ifdim\FOsavedlastskip>\zeropoint \vskip\FOsavedlastskip \fi
+  \ifdim\FOsavedlastskip>\zeropoint \vskip\FOsavedlastskip \fi
+
+  \doFOafterskip\currentXMLelement
 
   \XMLval{fo:break}{\XMLop{break-after}}{}
 
@@ -1580,19 +1666,27 @@ leader-pattern-width=12pt,
   \doifsomething{\XMLop{start-indent}}{\advance\leftskip \XMLop{start-indent}\relax}
   \doifsomething{\XMLop{end-indent}}  {\advance\rightskip\XMLop{end-indent}  \relax}
 
+%    \FOattributeT
+%    \FOattributeR
+%    \FOattributeB
+%    \FOattributeL
+
+
 \stopsetups
 
 \mapXMLvalue {fo:align} {center} {\raggedcenter}
 \mapXMLvalue {fo:align} {left}   {\raggedright}
 \mapXMLvalue {fo:align} {right}  {\raggedleft}
 \mapXMLvalue {fo:align} {begin}  {\raggedright}
+\mapXMLvalue {fo:align} {start}  {\raggedright}
 \mapXMLvalue {fo:align} {end}    {\raggedleft}
 
 \mapXMLvalue {fo:align-key} {center} {middle}
-\mapXMLvalue {fo:align-key} {left}   {right}
-\mapXMLvalue {fo:align-key} {right}  {left}
-\mapXMLvalue {fo:align-key} {begin}  {right}
-\mapXMLvalue {fo:align-key} {end}    {left}
+\mapXMLvalue {fo:align-key} {left}   {flushleft}
+\mapXMLvalue {fo:align-key} {right}  {flushright}
+\mapXMLvalue {fo:align-key} {begin}  {flushleft}
+\mapXMLvalue {fo:align-key} {start}  {flushleft}
+\mapXMLvalue {fo:align-key} {end}    {flushright}
 
 \startsetups fo:align:setup
 
@@ -1600,6 +1694,20 @@ leader-pattern-width=12pt,
 
 \stopsetups
 
+\startsetups fo:margin:setup
+
+  \checkFOmargin{fo:block}
+
+  \FOscratchML \XMLpar{fo:block}{margin-left}  \zeropoint
+  \FOscratchMR \XMLpar{fo:block}{margin-right} \zeropoint
+  \FOscratchMT \XMLpar{fo:block}{margin-top}   \zeropoint
+  \FOscratchMB \XMLpar{fo:block}{margin-bottom}\zeropoint
+
+  \advance\leftskip \FOscratchML
+  \advance\rightskip\FOscratchMR
+
+\stopsetups
+
 % todo: font-stretch
 %
 % ultra-condensed
@@ -1627,22 +1735,37 @@ leader-pattern-width=12pt,
 
 % evt class Times Helvetica
 
-\definefontsynonym [FO:Times]                 [Times-Roman]
-\definefontsynonym [FO:Times:bold]            [Times-Bold]
-\definefontsynonym [FO:Times:italic]          [Times-Italic]
-\definefontsynonym [FO:Times:bold:italic]     [Times-BoldItalic]
+\definefontsynonym [FO:Times]                             [Times-Roman]
+\definefontsynonym [FO:Times:bold]                        [Times-Bold]
+\definefontsynonym [FO:Times:italic]                      [Times-Italic]
+\definefontsynonym [FO:Times:bold:italic]                 [Times-BoldItalic]
+
+\definefontsynonym [FO:Times:small-caps]                  [Times-Roman]
+\definefontsynonym [FO:Times:bold:small-caps]             [Times-Bold]
+\definefontsynonym [FO:Times:italic:small-caps]           [Times-Italic]
+\definefontsynonym [FO:Times:bold:italic:small-caps]      [Times-BoldItalic]
+
+\definefontsynonym [FO:Helvetica]                         [Helvetica]
+\definefontsynonym [FO:Helvetica:bold]                    [Helvetica-Bold]
+\definefontsynonym [FO:Helvetica:italic]                  [Helvetica-Italic]
+\definefontsynonym [FO:Helvetica:bold:italic]             [Helvetica-BoldItalic]
 
-\definefontsynonym [FO:Helvetica]             [Helvetica]
-\definefontsynonym [FO:Helvetica:bold]        [Helvetica-Bold]
-\definefontsynonym [FO:Helvetica:italic]      [Helvetica-Italic]
-\definefontsynonym [FO:Helvetica:bold:italic] [Helvetica-BoldItalic]
+\definefontsynonym [FO:Helvetica:small-caps]              [Helvetica]
+\definefontsynonym [FO:Helvetica:bold:small-caps]         [Helvetica-Bold]
+\definefontsynonym [FO:Helvetica:italic:small-caps]       [Helvetica-Italic]
+\definefontsynonym [FO:Helvetica:bold:italic:small-caps]  [Helvetica-BoldItalic]
 
-\definefontsynonym [FO:Courier]               [Courier]
-\definefontsynonym [FO:Courier:bold]          [Courier-Bold]
-\definefontsynonym [FO:Courier:italic]        [Courier-Oblique]
-\definefontsynonym [FO:Courier:bold:italic]   [Courier-BoldOblique]
+\definefontsynonym [FO:Courier]                           [Courier]
+\definefontsynonym [FO:Courier:bold]                      [Courier-Bold]
+\definefontsynonym [FO:Courier:italic]                    [Courier-Oblique]
+\definefontsynonym [FO:Courier:bold:italic]               [Courier-BoldOblique]
 
-\definefontsynonym [FO:Symbol]                [ZapfDingbats]
+\definefontsynonym [FO:Courier:small-caps]                [Courier]
+\definefontsynonym [FO:Courier:bold:small-caps]           [Courier-Bold]
+\definefontsynonym [FO:Courier:italic:small-caps]         [Courier-Oblique]
+\definefontsynonym [FO:Courier:bold:italic:small-caps]    [Courier-BoldOblique]
+
+\definefontsynonym [FO:Symbol]                            [ZapfDingbats]
 
 \definefontsynonym [FO:Computer-Modern-Typewriter]        [ComputerModernMono]
 \definefontsynonym [FO:Computer-Modern-Typewriter:italic] [ComputerModernMono-Slanted]
@@ -1670,7 +1793,7 @@ leader-pattern-width=12pt,
   \dFOfontsize=\bodyfontsize
 
   \def\FOfontsize      {10pt}% {12pt}
-  \def\FOfontfamily    {}% {Times}
+  \def\FOfontfamily    {Times}
   \def\FOfontweight    {normal}
   \def\FOfontstyle     {normal}
   \def\FOfontvariant   {normal}
@@ -1685,10 +1808,16 @@ leader-pattern-width=12pt,
 
 \stopsetups
 
+\def\FOfontdefinition{}
+\def\FOfontname      {}
+
 \directsetup{fo:fonts:reset}
 
+% test for \FOfontvariant: normal or else
+
 \def\setFOfontname
   {\edef\xFOfontname{FO:\FOfontfamily:\FOfontweight:\FOfontstyle:\FOfontvariant}%
+   %\begingroup\infofont\xFOfontname]\endgroup
    \doifelsefontsynonym\xFOfontname
      {\let\FOfontname\xFOfontname}
      {\edef\xFOfontname{FO:\FOfontfamily:\FOfontweight:\FOfontstyle}%
@@ -1707,12 +1836,12 @@ leader-pattern-width=12pt,
 
 % \unprotected \def\doifelseFOfontsynonym#1#2#3#4#5% family weight style variant default
 %   {\edef\FOfontname
-%      {\ifcsname\??ff\fontclass FO:#1:#2:#3:#4\endcsname   FO:#1:#2:#3:#4%
-%       \else\ifcsname\??ff\fontclass FO:#1:#2:#3\endcsname FO:#1:#2:#3%
-%       \else\ifcsname\??ff\fontclass FO:#1:#3\endcsname    FO:#1:#3%
-%       \else\ifcsname\??ff\fontclass FO:#1:#2\endcsname    FO:#1:#2%
-%       \else\ifcsname\??ff\fontclass FO:#1\endcsname       FO:#1%
-%       \else                                               #5%
+%      {\ifcsname     \??ff\fontclass FO:#1:#2:#3:#4\endcsname FO:#1:#2:#3:#4%
+%       \else\ifcsname\??ff\fontclass FO:#1:#2:#3\endcsname    FO:#1:#2:#3%
+%       \else\ifcsname\??ff\fontclass FO:#1:#3\endcsname       FO:#1:#3%
+%       \else\ifcsname\??ff\fontclass FO:#1:#2\endcsname       FO:#1:#2%
+%       \else\ifcsname\??ff\fontclass FO:#1\endcsname          FO:#1%
+%       \else                                                  #5%
 %       \fi\fi\fi\fi\fi}}
 
 \startsetups fo:font:family:check
@@ -1737,6 +1866,14 @@ leader-pattern-width=12pt,
   \edefXMLinh\xFOfontstyle     {font-style}
   \edefXMLinh\xFOfontvariant   {font-variant}
 
+%   \edef\xFOfont          {\XMLpar{fo}{font}{}}
+%   \edef\xFOfontsize      {\XMLpar{fo}{font-size}{}}
+%   \edef\xFOfontsizeadjust{\XMLpar{fo}{font-size-adjust}{}}
+%   \edef\xFOfontfamily    {\XMLpar{fo}{font-family}{}}
+%   \edef\xFOfontweight    {\XMLpar{fo}{font-weight}{}}
+%   \edef\xFOfontstyle     {\XMLpar{fo}{font-style}{}}
+%   \edef\xFOfontvariant   {\XMLpar{fo}{font-variant}{}}
+
   \donefalse
 
   \ifx\xFOfont\empty \else \ifx\xFOfont\relax \else
@@ -1751,13 +1888,6 @@ leader-pattern-width=12pt,
       {\setpercentdimen\dFOfontsize\FOfontsize}
   \fi \fi
 
-  \ifx\xFOfontsize\empty \else
-    \let\FOfontsize\xFOfontsize
-    \doifXMLvalelse{fo:font-size}\FOfontsize
-      {\XMLval{fo:font-size}\FOfontsize\empty}
-      {\setpercentdimen\dFOfontsize\FOfontsize}
-  \fi
-
   \ifx\xFOfontsizeadjust\empty \else
     \doifelse\xFOfontsizeadjust{none}
       {\def\FOfontsizeadjust{1}}
@@ -1779,17 +1909,23 @@ leader-pattern-width=12pt,
 
   \ifdone
     \setFOfontname
-    \ifx\FOfontname\empty \else
+    \ifx\FOfontname\empty % klopt dit
+      \edef\xFOfontdefinition{\purefontname{\font} at \the\dimexpr(\FOfontsizeadjust\dFOfontsize)}
+%        \let\xFOfontdefinition\empty
+    \else
       \edef\xFOfontdefinition{\FOfontname\space at \the\dimexpr(\FOfontsizeadjust\dFOfontsize)}
     \fi
   \else
     \edef\xFOfontdefinition{\purefontname{\font} at \the\dimexpr(\FOfontsizeadjust\dFOfontsize)}
   \fi
 
-  \ifx\xFOfontdefinition\empty \else \ifx\FOfontdefinition\xFOfontdefinition \else
-    \let\FOfontdefinition\xFOfontdefinition
-    \expanded{\definedfont[\FOfontdefinition]}
-  \fi \fi
+  \ifx\xFOfontdefinition\empty \else
+    \ifx\FOfontdefinition\xFOfontdefinition
+    \else
+      \let\FOfontdefinition\xFOfontdefinition
+      \expanded{\definedfont[\FOfontdefinition]}
+    \fi
+  \fi
 
 \stopsetups
 
@@ -1807,6 +1943,10 @@ leader-pattern-width=12pt,
   \edefXMLinh\xFOtextaltitude{text-altitude}
   \edefXMLinh\xFOlineheight  {line-height}
 
+%   \edef\xFOtextdepth   {\XMLpar{fo}{text-depth}{}}
+%   \edef\xFOtextaltitude{\XMLpar{fo}{text-altitude}{}}
+%   \edef\xFOlineheight  {\XMLpar{fo}{line-height}{}}
+
   \ifx\xFOtextdepth\empty \else \ifx\xFOtextdepth\FOtextdepth \else
     \let\FOtextdepth\xFOtextdepth
     \doifnot\FOtextdepth{use-font-metrics}
@@ -1823,6 +1963,8 @@ leader-pattern-width=12pt,
        \setupinterlinespace[minheight=\dFOaltitude]}
   \fi \fi
 
+\ifinsidecolumns \else
+
   \ifx\xFOlineheight\empty \else \ifx\xFOlineheight\FOlineheight \else
     \let\FOlineheight\xFOlineheight
     \doifelse\FOlineheight{normal}
@@ -1834,6 +1976,8 @@ leader-pattern-width=12pt,
           \setupinterlinespace[line=\dFOlineheight]}}
   \fi \fi
 
+\fi
+
 \stopsetups
 
 \let\orphanpenalty  \clubpenalty
@@ -1851,6 +1995,10 @@ leader-pattern-width=12pt,
   \edefXMLinh\xFOwidows    {widows}
   \edefXMLinh\xFOorphans   {orphans}
 
+%   \edef\xFOhyphenate {\XMLpar{fo}{hyphenate}{}}
+%   \edef\xFOwidows    {\XMLpar{fo}{widows}{}}
+%   \edef\xFOorphans   {\XMLpar{fo}{orphans}{}}
+
   \ifx\xFOhyphenate\empty \else
     \XMLval{fo:hyphens}{\xFOhyphenate}\empty
   \fi
@@ -2122,20 +2270,26 @@ leader-pattern-width=12pt,
 
   \doifelsenothing{\XMLop{content-height}}
     {\FOgraphicheight\zeropoint}
-    {\doifelse{\XMLop{content-height}}{auto}
-       {\FOgraphicheight\zeropoint}
-       {\FOgraphicheight\lineheight
-        \setpercentdimen\FOgraphicheight{\XMLop{content-height}}}}
+    {\doifelse{\XMLop{content-height}}{scale-to-fit}% is this official ?
+       {\FOgraphicwidth\zeropoint}
+       {\doifelse{\XMLop{content-height}}{auto}
+          {\FOgraphicheight\zeropoint}
+          {\FOgraphicheight\lineheight
+           \setpercentdimen\FOgraphicheight{\XMLop{content-height}}}}}
 
   \doifelsenothing{\XMLop{content-width}}
     {\FOgraphicwidth\zeropoint}
-    {\doifelse{\XMLop{content-width}}{auto}
-       {\FOgraphicheight\zeropoint}
-       {\FOgraphicwidth1em
-        \setpercentdimen\FOgraphicwidth {\XMLop{content-width}}}}
+    {\doifelse{\XMLop{content-width}}{scale-to-fit}% is this official ?
+       {\FOgraphicwidth\zeropoint}
+       {\doifelse{\XMLop{content-width}}{auto}
+          {\FOgraphicwidth\zeropoint}
+          {\FOgraphicwidth1em
+           \setpercentdimen\FOgraphicwidth {\XMLop{content-width}}}}}
 
   % leeg maken vars gaat ook goed, dan een \externalfigure
 
+  % todo : height/width scale-to-fit: factor=...
+
   \setbox\scratchbox\hbox
     {\setFOimagename{\XMLpar{fo:external-graphic}{src}{dummy}}
      \ifdim\FOgraphicheight>\zeropoint
@@ -2247,6 +2401,8 @@ leader-pattern-width=12pt,
 
   \dontleavehmode
 
+  \doFOreference{fo:inline}
+
   \begingroup
 
   \directsetup{fe:setup}
@@ -2478,12 +2634,11 @@ leader-pattern-width=12pt,
 
 \startsetups fo:leader:process
 
-  % \tracebackXMLattribute{leader-pattern-width}
+%   \tracebackXMLattribute{leader-pattern-width}
 
   \strut \leaders
 
-%     \hbox to \XMLop{leader-pattern-width}
-%       {\hss\XMLval{fo:leader-pattern}{\XMLop{leader-pattern}}{\hfill}\hss}
+%   \edefXMLinh \FOlepatwd {leader-pattern-width}
 
     \hbox to \XMLinh{leader-pattern-width}
       {\hss\XMLval{fo:leader-pattern}{\XMLinh{leader-pattern}}{\hfill}\hss}
@@ -2534,15 +2689,17 @@ leader-pattern-width=12pt,
        \globallet\FOpnrefnumber\folio
      \else
         \global\advance\FOpnrefcounter\plusone
-        \pagereference[pnref:\the\FOpnrefcounter]%
+        \pagereference[pnref:\the\FOpnrefcounter]
         \doifreferencefoundelse{pnref:\the\FOpnrefcounter}
-          {\globallet\FOpnrefnumber\currentfolioreference}%
-          {\globallet\FOpnrefnumber\folio}%
+          {\globallet\FOpnrefnumber\currentfolioreference}
+          {\globallet\FOpnrefnumber\folio}
      \fi
      \expanded{\handletokens\XMLpar{fo:page-sequence}{format}{}}\with{\handleFOformat{\FOpnrefnumber}}}
 
 \stopsetups
 
+\defineconversion[1][\numbers]
+
 \def\handleFOformat#1#2%
   {\convertargument#2\to\ascii
    \doifconversiondefinedelse\ascii{\convertnumber\ascii{#1}}{#2}}
@@ -2651,6 +2808,7 @@ leader-pattern-width=12pt,
    table-layout=,
    table-omit-footer-at-break=,
    table-omit-header-at-break=,
+% text-indent=0pt, % yes or no?
    width=]
   {\beginXMLelement
    \bTABLE % [option=stretch] %
@@ -2659,6 +2817,7 @@ leader-pattern-width=12pt,
    \endXMLelement}
 
 \newdimen\FOtableW
+\newdimen\FOtableH
 
 \defineXMLsingular
   [fo:table-column]
@@ -2673,14 +2832,7 @@ leader-pattern-width=12pt,
    number-columns-repeated=,
    number-columns-spanned=,
    visibility=]
-  {\doifelsenothing{\XMLop{column-number}}
-     {\increment\FOtablecolumn}
-     {\edef\FOtablecolumn{\XMLop{column-number}}%
-      \expanded{\setupTABLE[column][\FOtablecolumn][n=\FOtablecolumn]}}%
-   \doifsomething{\XMLop{column-width}}
-     {\setlocalhsize\FOtableW\localhsize
-      \setpercentdimen\FOtableW{\XMLop{column-width}}%
-      \expanded{\setupTABLE[column][\FOtablecolumn][width=\FOtableW]}}}
+  {\directsetup{fo:table-column:action}}
 
 % \XMLattributeset{fo:aural},
 % intrusion-displace=,
@@ -2771,8 +2923,39 @@ leader-pattern-width=12pt,
    keep-with-next=,
    keep-with-previous=,
    visibility=]
-  {\beginXMLelement\bTR\inTABLErowtrue}
-  {\eTR\inTABLErowfalse\endXMLelement}
+  {\beginXMLelement
+   \directsetup{fo:table-row:start}%
+   \expanded{\bTR[\the\scratchtoks]}%
+   \beginXMLelement}
+  {\endXMLelement
+   \eTR
+   \directsetup{fo:table-row:stop}
+   \endXMLelement}
+
+\startsetups fo:table-row:start
+
+   \inTABLErowtrue
+
+   \scratchtoks\emptytoks
+
+   \doifsomething{\XMLop{height}}
+     {\FOtableH\textheight
+      \setpercentdimen\FOtableH{\XMLop{height}}
+      \appendetoks
+        height=\the\FOtableH
+      \to \scratchtoks}
+
+   \appendetoks
+     ,extras={\rescanXMLattributes{fo:table-row}}
+   \to\scratchtoks
+
+\stopsetups
+
+\startsetups fo:table-row:stop
+
+   \inTABLErowfalse
+
+\stopsetups
 
 % \XMLattributeset{fo:aural},
 % display-align=,
@@ -2780,6 +2963,8 @@ leader-pattern-width=12pt,
 % empty-cells=,
 
 \newif\ifinTABLErow
+\newdimen\FOtablecellwidth
+\newdimen\FOtablecellheight
 
 \defineXMLnested
   [fo:table-cell]
@@ -2800,26 +2985,135 @@ leader-pattern-width=12pt,
    number-rows-spanned=1,
    starts-row=,
    width=]
-  {\doif{\XMLop{starts-row}}{true}
-     {\ifinTABLErow\eTR\inTABLErowfalse\fi}%
-   \ifinTABLErow\else\bTR\inTABLErowtrue\fi
-   \doifelsenothing{\XMLop{background-color}}
-     {\let\FoTableBG\empty}
-     {\checkhexcolor[\XMLop{background-color}]%
-      \doifcolorelse{\XMLop{background-color}}
-        {\def\FoTableBG{color}}
-        {\setXMLpar{fo:table-cell}{background-color}{}%
-         \let\FoTableBG\empty}}%
-   \expanded{\bTD[nx=\XMLop{number-columns-spanned},ny=\XMLop{number-rows-spanned},%
-     offset=\XMLop{padding},n=\XMLop{column-number},
-     align={normal,lohi},background=\FoTableBG,backgroundcolor=\XMLop{background-color}]}%
-   % better as align=...
-   \setups{fo:align:setup}%
-   \ignorespaces}
-  {\removeunwantedspaces
+  {\directsetup{fo:table-cell:start}%
+   \expanded{\bTD[\the\scratchtoks]}%
+   \beginXMLelement}
+  {\endXMLelement
    \eTD
-   \doif{\XMLop{ends-row}}{true}
-     {\eTR\inTABLErowfalse}}
+   \directsetup{fo:table-cell:stop}}
+
+\startsetups fo:table-column:action
+
+  \doifelsenothing{\XMLop{column-number}}
+    {\increment\FOtablecolumn}
+    {\edef\FOtablecolumn{\XMLop{column-number}}
+     \expanded{\setupTABLE[column][\FOtablecolumn][n=\FOtablecolumn]}}
+
+  \doifsomething{\XMLop{column-width}}
+    {%\setlocalhsize
+     %\FOtableW\localhsize
+     \FOtableW\textwidth % hm, we need to set localhsize earlier
+     \setpercentdimen\FOtableW{\XMLop{column-width}}
+     \expanded{\setupTABLE[column][\FOtablecolumn][width=\the\FOtableW]}}
+
+  \doif{\XMLop{border-style}}{none}
+    {\expanded{\setupTABLE[column][\FOtablecolumn][frame=off]}}
+
+  \doifelsenothing{\XMLop{display-align}}
+    {\doifsomething{\XMLop{text-align}}
+       {\expanded{\setupTABLE[column][\FOtablecolumn]
+            [align=\XMLpav{fo:align-key}{fo:table-column}{text-align}{normal}]}}}
+    {\doifsomething{\XMLop{text-align}}
+        {\expanded{\setupTABLE[column][\FOtablecolumn]
+            [align={\XMLpav{fo:display-align}{fo:table-column}{display-align}{high},\XMLpav{fo:align-key}{fo:table-column}{text-align}{normal}}]}}
+        {\expanded{\setupTABLE[column][\FOtablecolumn]
+            [align=\XMLpav{fo:display-align}{fo:table-column}{display-align}{high}]}}}
+
+\expanded{\setupTABLE[column][\FOtablecolumn][extras={\rescanXMLattributes{fo:table-column}}]}
+
+\stopsetups
+
+\startsetups fo:table-cell:start
+
+  \doif{\XMLop{starts-row}}{true}{\ifinTABLErow\eTR\inTABLErowfalse\fi}
+
+  \ifinTABLErow\else\bTR\inTABLErowtrue\fi
+
+  \doifelsenothing{\XMLop{background-color}}
+    {\let\FoTableBG\empty}
+    {\checkhexcolor[\XMLop{background-color}]
+     \doifcolorelse{\XMLop{background-color}}
+       {\def\FoTableBG{color}}
+       {\setXMLpar{fo:table-cell}{background-color}{}
+        \let\FoTableBG\empty}}
+
+%   \doifelse{\XMLpar{fo:table-cell}{width}{}}{}
+%     {\def\pFOtablewidth{fit}}
+%     {\FOtablecellwidth\textwidth % probably must be localhsize or frozen at an outer level
+%      \setpercentdimen\FOtablecellwidth{\XMLpar{fo:table-cell}{width}{0pt}}%
+%      \edef\pFOtablewidth{\the\FOtablecellwidth}}%
+
+%   \doifelse{\XMLpar{fo:table-cell}{height}{}}{}
+%     {\def\pFOtableheight{fit}}
+%     {\FOtablecellheight\textheight % probably must be localhsize or frozen at an outer level
+%      \setpercentdimen\FOtablecellheight{\XMLpar{fo:table-cell}{height}{0pt}}%
+%      \edef\pFOtableheight{\the\FOtablecellheight}}%
+
+  \scratchtoks\emptytoks \appendetoks
+%     style=\noexpand\directsetup{fo:font:setup}, % else not expanded
+    nx=\XMLop{number-columns-spanned},
+    ny=\XMLop{number-rows-spanned},
+    n=\XMLop{column-number},
+    background=\FoTableBG
+  \to \scratchtoks
+
+  \doifnot{\XMLop{border-style}}{none}
+    {\appendetoks
+       ,frame=on
+     \to\scratchtoks}
+
+  \doifsomething{\XMLop{background-color}}
+    {\appendetoks
+       ,backgroundcolor=\XMLop{background-color}
+     \to \scratchtoks}
+
+  % todo : padding
+
+  \doifsomething{\XMLop{padding}}
+    {\appendetoks
+       ,offset=\XMLop{padding}
+     \to \scratchtoks}
+
+  % todo: interference with presets in column (outer level) -> \setupcolumn[column] ...;
+  % misschien meerdere align switches
+
+  \doifelsenothing{\XMLop{display-align}}
+    {\doifsomething{\XMLop{text-align}}
+       {\appendetoks
+          ,align=\XMLpav{fo:align-key}{fo:table-cell}{text-align}{normal}
+        \to \scratchtoks}}
+    {\doifsomething{\XMLop{text-align}}
+       {\appendetoks
+          ,align={\XMLpav{fo:display-align}{fo:table-cell}{display-align}{high},\XMLpav{fo:align-key}{fo:table-cell}{text-align}{normal}},
+        \to \scratchtoks}
+       {\appendetoks
+          ,align=\XMLpav{fo:display-align}{fo:table-cell}{display-align}{high}
+        \to \scratchtoks}}
+
+   \appendetoks
+     ,extras={\rescanXMLattributes{fo:table-cell}}
+   \to\scratchtoks
+
+\stopsetups
+
+% \startsetups fo:table-cell:setup
+
+%   [\XMLpar{fo:table-cell}{text-indent}{}]
+
+%   \edefXMLinhpar\xFOtextindent{fo:table-cell}{text-indent}
+
+%   \doifsomething\xFOtextindent
+%     {\scratchdimen\hsize
+%      \setpercentdimen\scratchdimen\xFOtextindent
+%      \expanded{\setupindenting[\the\scratchdimen]}}
+
+% \stopsetups
+
+\startsetups fo:table-cell:stop
+
+  \doif{\XMLop{ends-row}}{true}{\eTR\inTABLErowfalse}
+
+\stopsetups
 
 %D Element: fo:list-block fo:list-item fo:list-body fo:list-item-label
 
@@ -2842,6 +3136,7 @@ leader-pattern-width=12pt,
    break-before=,
    keep-with-next=,
 %  space-between-list-rows=, % ? mentioned in bradley
+text-indent=0pt, % yes
    keep-with-previous=]
   {\beginXMLelement\directsetup{fo:list:start}}
   {\directsetup{fo:list:stop}\endXMLelement}
@@ -2931,9 +3226,14 @@ leader-pattern-width=12pt,
 
   % 24pt en 6pt in fo:root instellen
 
+  % \tracebackXMLattribute{provisional-distance-between-starts}
+
   \edefXMLinh \FOprodis {provisional-distance-between-starts}
   \edefXMLinh \FOprolab {provisional-label-separation}
 
+%   \edef\FOprodis{\XMLpar{fo}{provisional-distance-between-starts}{}}
+%   \edef\FOprolab{\XMLpar{fo}{provisional-label-separation}{}}
+
   \edef\FOprodis{\ifx\FOprodis\empty24pt\else\FOprodis\fi}
   \edef\FOprolab{\ifx\FOprolab\empty 6pt\else\FOprolab\fi}
 
@@ -2999,6 +3299,8 @@ leader-pattern-width=12pt,
 
 \stopsetups
 
+% todo: textindent
+
 \startsetups fo:list-item:display
 
   \endgraf
@@ -3007,8 +3309,8 @@ leader-pattern-width=12pt,
   \advance\rightskip\FOlistitembodyrightskip
 
   \dontleavehmode \valign\bgroup\forgetall\vss##\vss\cr
-    \iftracingFO\ruledvtop\else\vbox\fi{\hsize\FOlistitemlabelhsize\XMLflush{fo:list-item-label}}\cr
-    \iftracingFO\ruledvtop\else\vbox\fi{\hsize\FOlistitembodyhsize \XMLflush{fo:list-item-body}}\cr
+    \iftracingFO\ruledvtop\else\vbox\fi{\hsize\FOlistitemlabelhsize\directsetup{fo:list-item-label:setup}\XMLflush{fo:list-item-label}}\cr
+    \iftracingFO\ruledvtop\else\vbox\fi{\hsize\FOlistitembodyhsize \directsetup{fo:list-item-body:setup}\XMLflush{fo:list-item-body}}\cr
   \egroup
 
 % \dontleavehmode \placesidebyside % or maybe paired boxes (legends)
@@ -3019,17 +3321,44 @@ leader-pattern-width=12pt,
 
 \stopsetups
 
+\newtoks\savedeverypar \savedeverypar\everypar
+
 \startsetups fo:list-item:text
 
+  \everypar\savedeverypar % \appendtoksonce\insertparagraphintro\to\everypar % hack, binnen footnote ...
+
   \advance\leftskip \FOlistitembodyleftskip
   \advance\rightskip\FOlistitembodyrightskip
 
   \setupparagraphintro[first][\directsetup{fo:list-item-label:process}]
   \setupparagraphintro[next] [\begstrut\resetpenalties\clubpenalties]
+  \directsetup{fo:list-item-body:setup}
   \XMLflush{fo:list-item-body}\endstrut
 
 \stopsetups
 
+\startsetups fo:list-item-label:setups
+
+  \edefXMLinhpar\xFOtextindent{fo:item-label}{text-indent}
+
+  \doifsomething\xFOtextindent
+    {\scratchdimen\hsize
+     \setpercentdimen\scratchdimen\xFOtextindent
+     \expanded{\setupindenting[\the\scratchdimen]}}
+
+\stopsetups
+
+\startsetups fo:list-item-body:setups
+
+  \edefXMLinh\xFOtextindent{fo:item-body}{text-indent}
+
+  \doifsomething\xFOtextindent
+    {\scratchdimen\hsize
+     \setpercentdimen\scratchdimen\xFOtextindent
+     \expanded{\setupindenting[\the\scratchdimen]}}
+
+\stopsetups
+
 \newbox\FOitembox
 
 \startsetups fo:list-item-label:process
@@ -3038,6 +3367,7 @@ leader-pattern-width=12pt,
     \forgetall
     \postponefootnotes
     \hsize\FOlistitemlabelhsize
+    \directsetup{fo:list-item-label:setup}
     \XMLflush{fo:list-item-label}
   \egroup
   \getnoflines{\dimexpr(\ht\FOitembox+\dp\FOitembox)}
@@ -3492,6 +3822,10 @@ leader-pattern-width=12pt,
   {\the\FOreferences
    \global\FOreferences\emptytoks}
 
+\def\doFOreference#1%
+  {\doifsomething{\XMLpar{#1}{id}{}}
+     {\expanded{\reference[\XMLpar{#1}{id}{}]{\XMLpar{fo:page-sequence}{format}{}}}}}
+
 \appendtoks \flushFOreferences \to \everypar
 \appendtoks \flushFOreferences \to \neverypar % check !
 
@@ -3499,70 +3833,8 @@ leader-pattern-width=12pt,
 
 %D Graphics: static frames
 
-% can become mp-foeg
-
 \startMPinclusions
-  FoNone   := 0 ; FoHidden := 1 ; FoDotted := 2 ; FoDashed := 3 ; FoSolid  := 4 ;
-  FoDouble := 5 ; FoGroove := 6 ; FoRidge  := 7 ; FoInset  := 8 ; FoOutset := 9 ;
-  FoAll    := 0 ; FoTop    := 1 ; FoBottom := 2 ; FoLeft   := 3 ; FoRight  := 4 ;
-  FoMedium := .5pt ; FoThin := FoMedium/2 ; FoThick := FoMedium*2 ;
-  color FoBackgroundColor, FoNoColor, FoLineColor[] ; FoNoColor := (-1,-1,-1) ;
-  numeric FoLineWidth[], FoLineStyle[] ;
-  boolean FoFrame, FoBackground, FoSplit ;
-  FoFrame := FoBackground := FoSplit := false ;
-  FoBackgroundColor := white ;
-  FoDashFactor := .5 ;
-  FoDotFactor := .375 ;
-  for i = FoAll upto FoRight :
-    FoLineColor[i] := black ;
-    FoLineWidth[i] := .5pt ;
-    FoLineStyle[i] := FoNone ;
-  endfor ;
-  def DrawFoFrame(expr n, p) =
-      drawoptions(withcolor FoLineColor[n] withpen pencircle scaled FoLineWidth[n]) ;
-      if     FoLineStyle[n] = FoNone   :
-        % nothing
-      elseif FoLineStyle[n] = FoHidden :
-        % nothing
-      elseif FoLineStyle[n] = FoDotted :
-        draw p dashed (withdots scaled (FoDotFactor*FoLineWidth[n])) ;
-      elseif FoLineStyle[n] = FoDashed :
-        draw p dashed (evenly scaled (FoDashFactor*FoLineWidth[n])) ;
-      elseif FoLineStyle[n] = FoSolid  :
-        draw p ;
-      elseif FoLineStyle[n] = FoDouble :
-        draw p enlarged  FoLineWidth[n] ; draw p enlarged -FoLineWidth[n] ;
-      elseif FoLineStyle[n] = FoGroove :
-        draw p ;
-        draw p withpen pencircle scaled .5FoLineWidth[n] withcolor (inverted FoLineColor[n] softened .5) ;
-      elseif FoLineStyle[n] = FoRidge  :
-        draw p withcolor  (inverted FoLineColor[n] softened .5) ;
-        draw p withpen pencircle scaled .5FoLineWidth[n] ;
-      elseif FoLineStyle[n] = FoInset  :
-        draw p ; draw p inset 2.5FoLineWidth[n] ;
-      elseif FoLineStyle[n] = FoOutset :
-        draw p ; draw p outset 2.5FoLineWidth[n] ;
-     fi ;
-  enddef ;
-  primarydef p outset d =
-    ((lrcorner p -- urcorner p -- ulcorner p -- llcorner p -- cycle)
-        shifted (d*(-1,1)) cutbefore topboundary p) cutafter leftboundary p
-  enddef ;
-  primarydef p inset d =
-    ((ulcorner p -- llcorner p -- lrcorner p -- urcorner p -- cycle)
-        shifted (d*(1,-1)) cutbefore bottomboundary p) cutafter rightboundary p
-  enddef ;
-  vardef equalpaths(expr p, q) =
-    if length(p) = length(q) :
-      save ok ; boolean ok ; ok := true ;
-      for i = 0 upto length(p)-1 :
-        ok := ok and (round(point i of p) = round(point i of q)) ;
-      endfor ;
-      ok
-    else :
-      false
-    fi
-  enddef ;
+  input mp-fobg.mp ;
 \stopMPinclusions
 
 \def\unknownMPcolor{FoNoColor}
@@ -3635,12 +3907,16 @@ leader-pattern-width=12pt,
 \startuseMPgraphic{region-start}  \includeMPgraphic{region-do} \stopuseMPgraphic
 \startuseMPgraphic{region-end}    \includeMPgraphic{region-do} \stopuseMPgraphic
 
+\startnotmode[fo-no-bg]
+
 \defineoverlay[region-body-graphic]  [\useMPgraphic{region-body}{location=body}]
 \defineoverlay[region-before-graphic][\useMPgraphic{region-before}{location=before}]
 \defineoverlay[region-after-graphic] [\useMPgraphic{region-after}{location=after}]
 \defineoverlay[region-start-graphic] [\useMPgraphic{region-start}{location=start}]
 \defineoverlay[region-end-graphic]   [\useMPgraphic{region-end}{location=end}]
 
+\stopnotmode
+
 % more efficient: todo: relocate and move to page background
 
 % \def\FoRegionWidth#1#2%
diff --git a/tex/context/base/x-foxet.tex b/tex/context/base/x-foxet.tex
index e58d93c60..78cc0efb7 100644
--- a/tex/context/base/x-foxet.tex
+++ b/tex/context/base/x-foxet.tex
@@ -8,6 +8,8 @@
 
 \usemodule[fo,fe,fx,fu,fs,mathml]
 
+\usemodule[fp] % passivetex bonus
+
 % \autoXMLnamespace[mml,mm,mathml]
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/x-set-01.tex b/tex/context/base/x-set-01.tex
new file mode 100644
index 000000000..65fd78865
--- /dev/null
+++ b/tex/context/base/x-set-01.tex
@@ -0,0 +1,75 @@
+%D \module
+%D   [       file=x-set-01,
+%D        version=2004.10.31,
+%D         remark=setupx.tex: 1998.07.20 and later,
+%D          title=\CONTEXT\ Setup Mappings,
+%D       subtitle=Macro Definitions,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\unprotect
+
+\def\SETUPnamespace{xmlns:cd="http://www.pragma-ade.com/commands"}
+
+\bgroup \catcode`\<=\@@other
+
+\unexpanded\gdef\dostring#1#2#3%
+  {\immediate\write\scratchwrite{#1<#2cd:#3>}}
+
+\gdef\doline#1%
+  {\immediate\write\scratchwrite{#1}}
+
+\egroup
+
+\def\startsetupfile
+  {\immediate\openout\scratchwrite=keys-\currentlanguage.xml
+   \doline{\string<?xml version="1.0"?>}
+   \doline{}
+   \dostring{}{}{interface \SETUPnamespace\space name="context" language="\currentlanguage" version="\contextversion"}}
+
+\def\stopsetupfile
+  {\doline{}
+   \dostring{}{/}{interface}
+   \immediate\closeout\scratchwrite}
+
+\def\interfacecomponenttoxml#1#2#3%
+  {\doifelse{#3}\nointerfaceobject
+     {\dostring{\space\space\space\space}{}{#1 name="#2" value="#2"/}}
+     {\dostring{\space\space\space\space}{}{#1 name="#2" value="#3"/}}}
+
+\def\setinterfaceconstant{\interfacecomponenttoxml{constant}}
+\def\setinterfacevariable{\interfacecomponenttoxml{variable}}
+\def\setinterfaceelement {\interfacecomponenttoxml{element}}
+\def\setinterfacecommand {\interfacecomponenttoxml{command}}
+
+\def\startinterfacexmlcomponent{\doline{}\dostring{\space\space}{}} % #1
+\def\stopinterfacexmlcomponent {\dostring{\space\space}{/}} % #1
+
+\let\normalstartvariables\startvariables \let\normalstopvariables\stopvariables
+\let\normalstartconstants\startconstants \let\normalstopconstants\stopconstants
+\let\normalstartcommands \startcommands  \let\normalstopcommands \stopcommands
+\let\normalstartelements \startelements  \let\normalstopelements \stopelements
+
+\def\startvariables{\startinterfacexmlcomponent{variables}\normalstartvariables}
+\def\startconstants{\startinterfacexmlcomponent{constants}\normalstartconstants}
+\def\startcommands {\startinterfacexmlcomponent{commands} \normalstartcommands }
+\def\startelements {\startinterfacexmlcomponent{elements} \normalstartelements }
+
+\def\stopvariables{\stopinterfacexmlcomponent{variables}\normalstopvariables}
+\def\stopconstants{\stopinterfacexmlcomponent{constants}\normalstopconstants}
+\def\stopcommands {\stopinterfacexmlcomponent{commands} \normalstopcommands }
+\def\stopelements {\stopinterfacexmlcomponent{elements} \normalstopelements }
+
+\protect
+
+\starttext
+  \startsetupfile
+    \input mult-con.tex
+    \input mult-com.tex
+  \stopsetupfile
+\stoptext
diff --git a/tex/context/base/x-set-02.tex b/tex/context/base/x-set-02.tex
new file mode 100644
index 000000000..05f1616c6
--- /dev/null
+++ b/tex/context/base/x-set-02.tex
@@ -0,0 +1,33 @@
+%D \module
+%D   [       file=x-set-02,
+%D        version=2004.10.31,
+%D         remark=setupx.tex: 1998.07.20 and later,
+%D          title=\CONTEXT\ Setup Mappings,
+%D       subtitle=Macro Definitions,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\unprotect \bgroup \catcode`\<=\@@other
+
+\def\setinterfacecomponent#1#2#3%
+  {\doifelse{#3}\nointerfaceobject
+     {\setgvalue{\string<#1\string:#2\string>}{#2}}
+     {\setgvalue{\string<#1\string:#2\string>}{#3}}}
+
+\gdef\getinterfacecomponent#1#2%
+  {\executeifdefined{\string<#1\string:#2\string>}{#2}}
+
+\def\setinterfaceconstant{\setinterfacecomponent{constant}} % constant
+\def\setinterfacevariable{\setinterfacecomponent{variable}} % variable
+\def\setinterfaceelement {\setinterfacecomponent{string}}   % element
+\def\setinterfacecommand {\setinterfacecomponent{string}}   % command
+
+\input mult-con.tex
+\input mult-com.tex
+
+\egroup \protect \endinput
diff --git a/tex/context/base/x-set-11.tex b/tex/context/base/x-set-11.tex
new file mode 100644
index 000000000..2e4363159
--- /dev/null
+++ b/tex/context/base/x-set-11.tex
@@ -0,0 +1,743 @@
+%D \module
+%D   [       file=x-set-01,
+%D        version=2004.10.31,
+%D         remark=setupx.tex: 1998.07.20 and later,
+%D          title=\CONTEXT\ Setup Definitions,
+%D       subtitle=Macro Definitions,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% module x-set-02 loads the mapping, after that we can say:
+%
+% \getinterfacecomponent{constant|variable|string}{tag}
+
+\usemodule[set-02]
+
+\unprotect
+
+% general
+
+\def\setupnumfont  {}
+\def\setuptxtfont  {}
+\def\setupintfont#1{\uppercase{#1}}
+\def\setupvarfont  {\sl}
+\def\setupoptfont  {\sl}
+\def\setupalwcolor {}
+\def\setupoptcolor {darkgray}
+
+\defineXMLenvironmentsave [cd:content] [list=,state=]
+  {\simpleSETUPargument{content}\blank[\v!halfline]\ignorespaces}
+  {\ignorespaces}
+
+\startmessages  dutch  library: setup
+        title:  setup
+      formula:  formule
+       number:  getal
+         list:  lijst
+    dimension:  maat
+         mark:  markering
+    reference:  verwijzing
+      command:  commando
+         file:  file
+         name:  naam
+   identifier:  naam
+         text:  tekst
+      section:  sectie
+     singular:  naam enkelvoud
+       plural:  naam meervoud
+       matrix:  n*m
+          see:  zie
+     inherits:  erft van
+            1:  de karakters < en > zijn globaal actief!
+            2:  -- wordt verwerkt
+            3:  -- is niet gedefinieerd
+            4:  -- wordt nogmaals verwerkt
+     optional:  optioneel
+  displaymath:  formule
+        index:  ingang
+         math:  formule
+      nothing:  leeg
+         file:  file
+     position:  positie
+    reference:  verwijzing
+       csname:  naam
+  destination:  bestemming
+      triplet:  triplet
+         word:  woord
+      content:  tekst
+\stopmessages
+
+\startmessages  english  library: setup
+        title:  setup
+      formula:  formula
+       number:  number
+         list:  list
+    dimension:  dimension
+         mark:  mark
+    reference:  reference
+      command:  command
+         file:  file
+         name:  name
+   identifier:  identifier
+         text:  text
+      section:  section
+     singular:  singular name
+       plural:  plural name
+       matrix:  n*m
+          see:  see
+     inherits:  inherits from
+            1:  the characters < and > are globally active!
+            2:  -- is processed
+            3:  -- is undefined
+            4:  -- is processed again
+     optional:  optioneel
+  displaymath:  formula
+        index:  entry
+         math:  formula
+      nothing:  empty
+         file:  file
+     position:  position
+    reference:  reference
+       csname:  name
+  destination:  destination
+      triplet:  triplet
+         word:  word
+      content:  text
+\stopmessages
+
+\startmessages  german library: setup
+        title:  Setup
+      formula:  Formel
+       number:  Nummer
+         list:  Liste
+    dimension:  Dimension
+         mark:  Beschriftung
+    reference:  Referenz
+      command:  Befehl
+         file:  Datei
+         name:  Name
+   identifier:  Name
+         text:  Text
+      section:  Abschnitt
+     singular:  singular
+       plural:  plural
+       matrix:  n*m
+          see:  siehe
+     inherits:  inherits from
+            1:  Die Zeichen < und > gelten global!
+            2:  -- wird verarbeitet
+            3:  -- ist undefiniert
+            4:  -- ist mehrmals verarbeitet
+     optional:  optioneel
+  displaymath:  formula
+        index:  entry
+         math:  formula
+      nothing:  empty
+         file:  file
+     position:  position
+    reference:  reference
+       csname:  name
+  destination:  destination
+      triplet:  triplet
+         word:  word
+      content:  text
+\stopmessages
+
+\startmessages  czech  library: setup
+        title:  setup
+      formula:  rovnice
+       number:  cislo
+         list:  seznam
+    dimension:  dimenze
+         mark:  znacka
+    reference:  reference
+      command:  prikaz
+         file:  soubor
+         name:  jmeno
+   identifier:  jmeno
+         text:  text
+      section:  sekce
+     singular:  jmeno v singularu
+       plural:  jmeno v pluralu
+       matrix:  n*m
+          see:  viz
+     inherits:  inherits from
+            1:  znaky < a > jsou globalne aktivni!
+            2:  -- je zpracovano
+            3:  -- je nedefinovano
+            4:  -- je zpracovano znovu
+     optional:  optioneel
+  displaymath:  formula
+        index:  entry
+         math:  formula
+      nothing:  empty
+         file:  file
+     position:  position
+    reference:  reference
+       csname:  name
+  destination:  destination
+      triplet:  triplet
+         word:  word
+      content:  text
+\stopmessages
+
+\startmessages  italian library: setup
+        title:  setup
+      formula:  formula
+       number:  number
+         list:  list
+    dimension:  dimension
+         mark:  mark
+    reference:  reference
+      command:  command
+         file:  file
+         name:  name
+   identifier:  name
+         text:  text
+      section:  section
+     singular:  singular name
+       plural:  plural name
+       matrix:  n*m
+          see:  see
+     inherits:  inherits from
+            1:  the characters < and > are globally active!
+            2:  -- is processed
+            3:  -- is undefined
+            4:  -- is processed again
+     optional:  optioneel
+  displaymath:  formula
+        index:  entry
+         math:  formula
+      nothing:  empty
+         file:  file
+     position:  position
+    reference:  reference
+       csname:  name
+  destination:  destination
+      triplet:  triplet
+         word:  word
+      content:  text
+\stopmessages
+
+\startmessages  romanian library: setup
+        title:  setari
+      formula:  formula
+       number:  numar
+         list:  lista
+    dimension:  dimensiune
+         mark:  marcaj
+    reference:  referinta
+      command:  comanda
+         file:  fisier
+         name:  nume
+   identifier:  nume
+         text:  text
+      section:  sectiune
+     singular:  nume singular
+       plural:  nume pluram
+       matrix:  n*m
+          see:  vezi
+     inherits:  inherits from
+            1:  caracterele < si > sunt active global!
+            2:  este procesat --
+            3:  -- este nedefinit
+            4:  -- este procesat din nou
+     optional:  optioneel
+  displaymath:  formula
+        index:  entry
+         math:  formula
+      nothing:  empty
+         file:  file
+     position:  position
+    reference:  reference
+       csname:  name
+  destination:  destination
+      triplet:  triplet
+         word:  word
+      content:  text
+\stopmessages
+
+\def\c!setup!internal!#1%
+  {{\dogetmessage{setup}{#1}%
+    \expanded{\setupintfont{\currentmessagetext}}}}
+
+\def\c!setup!text!#1%
+  {{\dogetmessage{setup}{#1}%
+    \setupvarfont{\currentmessagetext}}}
+
+\def\c!setup!command!#1%
+  {{\setupvarfont{\texescape...#1}}}
+
+\def\??stp{@@stp}
+
+\defineregister
+  [texmacro]
+  [texmacros]
+
+\definesorting
+  [texcommand]
+  [texcommands]
+
+\setupsorting
+  [texcommand]
+  [\c!command=\@@stpcommand,
+   \c!criterium=\@@stpcriterium]
+
+\definesorting
+  [eachtexcommand]
+  [alltexcommands]
+
+\setupsorting
+  [eachtexcommand]
+  [\c!command=\@@stpcommand,
+   \c!criterium=\v!all]
+
+\pushmacro\setuptext
+
+\defineframedtext
+  [setuptext]
+  [\c!width=\hsize,
+   \c!height=\v!fit,
+   \c!align=\v!right,
+   \c!offset=0.75em]
+
+\popmacro\setuptext
+
+\newif\ifshortsetup
+
+\def\setup     {\shortsetupfalse\dosetup}
+\def\shortsetup{\shortsetuptrue\dosetup}
+\def\setupsetup{\dodoubleargument\getparameters[\??stp]}
+
+\setupsetup
+  [\c!before=,
+   \c!after=,
+   \c!command=\setup,
+   \c!criterium=\v!used]
+
+% verwijzing: 0 geen verwijzingen plaatsen / wel genereren
+%             1 alleen bij zie plaatsen / wel genereren
+%             2 alle verwijzingen plaatsen / niet genereren
+%             3 bij zie commando klikken / wel genereren
+
+\setupsetup
+  [\c!reference=0]
+
+\def\placesetup
+  {\bgroup
+   \getvalue{\e!place\e!listof texcommands}
+   \egroup}
+
+\def\placeeverysetup % for fun purposes only
+  {\bgroup
+   \setupsetup[\c!reference=2]%
+   \setupreferencing[\c!state=\v!stop]%
+   \getvalue{\e!place\e!listof alltexcommands}%
+   \egroup}
+
+\let\plaatssetup    \placesetup
+\let\plaatselkesetup\placeeverysetup
+
+\def\dosetup#1{{\enableXML\flushXMLelement{stp:#1}}}
+
+\defineXMLenvironment [cd:command] [name=,type=,generated=,interactive=]
+  {}
+  {\showSETUPrecord}
+
+\def\showSETUPrecord
+  {\getvalue{startsetuptext}
+     \tttf
+     \nohyphens
+     \veryraggedright
+     \startXMLmapping [one]
+       \doglobal\newcounter\currentSETUPargument
+       \global\let\maximumSETUPargument\currentSETUPargument
+       \bgroup
+         \doifXMLop{generated}{yes}{\ttsl}%
+         \doifelseXMLop{type}{environment}
+           {\tex{\e!start}}{\tex{}}\ignorespaces
+         \XMLflush{cd:sequence}\ignorespaces
+       \egroup
+       \doifelseXMLempty{cd:arguments}
+         {}
+         {\bgroup
+            \setbox0=\hbox{\XMLflush{cd:arguments}}%
+            \global\let\maximumSETUPargument\currentSETUPargument
+            \doglobal\newcounter\currentSETUPargument
+            \ignorespaces\XMLflush{cd:arguments}%
+            \doif{\XMLpar{cd:command}{type}{}}{environment}
+              {\hskip.5em\unknown\hskip.5em
+               \tex{\e!stop}\ignorespaces\XMLflush{cd:sequence}}%
+            \endgraf
+          \egroup
+         %\bgroup
+         %  \tx
+         %  \doif{\XMLpar{cd:command}{interactive}{}}{yes}      {\quad INTERACTIVE}%
+         %  \doif{\XMLpar{cd:command}{interactive}{}}{exclusive}{\quad INTERACTIVE ONLY}%
+         %\egroup
+        \startXMLmapping [two]
+          \bgroup
+            \doglobal\newcounter\currentSETUPargument
+            \blank[\v!line]
+            \switchtobodyfont[small] % kan sneller
+            \ignorespaces\XMLflush{cd:arguments}\endgraf
+          \egroup
+        \stopXMLmapping}
+     \stopXMLmapping
+   \getvalue{stopsetuptext}}
+
+\defineXMLenvironmentsave [cd:sequence]  \ignorespaces \ignorespaces
+\defineXMLenvironmentsave [cd:arguments] \ignorespaces \ignorespaces
+
+%D This is the first pass; here we generate the top line.
+
+\newcounter\currentSETUPargument
+\def\currentSETUPwidth{0pt}
+
+% environmentsave ?
+
+\startXMLmapping [one]
+
+\defineXMLenvironmentsave [cd:string] [value=]
+  {\getinterfacecomponent{string}{\XMLop{value}}\ignorespaces}
+  {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:variable] [value=]
+  {{\expanded{\setupintfont{\getinterfacecomponent{variable}{\XMLop{value}}}}}\ignorespaces}
+  {\ignorespaces}
+
+% moet een standaard type worden
+
+\defineXMLenvironmentsave [cd:assignments] [list=,state=]
+  {\showSETUPassignment\ignorespaces} {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:keywords] [list=,state=]
+  {\showSETUPkeyword\ignorespaces} {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:content] [list=,state=]
+  {\showSETUPcontent\ignorespaces} {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:displaymath] [list=,state=]
+  {\showSETUPdisplaymath\ignorespaces} {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:index] [list=,state=]
+  {\showSETUPindex\ignorespaces} {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:math] [list=,state=]
+  {\showSETUPmath\ignorespaces} {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:nothing] [list=,state=]
+  {\showSETUPnothing\ignorespaces} {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:file] [list=,state=]
+  {\showSETUPfile\ignorespaces} {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:position] [list=,state=]
+  {\showSETUPposition\ignorespaces} {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:reference] [list=,state=]
+  {\showSETUPreference\ignorespaces} {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:csname] [list=,state=]
+  {\showSETUPcsname\ignorespaces} {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:destination] [list=,state=]
+  {\showSETUPdestination\ignorespaces} {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:triplet] [list=,state=]
+  {\showSETUPtriplet\ignorespaces} {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:word] [list=,state=]
+  {\showSETUPword\ignorespaces} {\ignorespaces}
+
+\stopXMLmapping
+
+%D This is the second pass; here we generate the table.
+
+\startXMLmapping [two]
+
+\def\startfirstSETUPcolumn#1%
+  {\bgroup
+   \advance\leftskip 2em
+   \noindent\llap{\hbox to 2em{#1\hss}}}
+
+\def\stopfirstSETUPcolumn
+  {\endgraf
+   \egroup}
+
+\def\startsecondSETUPcolumn#1#2%
+  {\bgroup
+   \advance\hangindent \currentSETUPwidth
+   \advance\hangindent 2.5em
+   \noindent \hbox to \hangindent{#1\hss\hbox to 2.5em{\hss#2\hss}}}
+
+\def\stopsecondSETUPcolumn
+  {\endgraf
+   \egroup}
+
+\def\secondSETUPcolumn#1#2%
+  {\startsecondSETUPcolumn{#1}{#2}\stopsecondSETUPcolumn}
+
+\def\previousSETUPargument{\currentSETUPargument}
+
+\defineXMLenvironmentsave [cd:assignments]
+  {}
+  {\xdef\currentSETUPwidth{0pt}%
+   \bgroup
+   \defineXMLenvironment [cd:parameter] [name=]
+     {\setbox0=\hbox{\potentialXMLentity{\getinterfacecomponent{constant}{\XMLop{name}}}}%
+      \ifdim\wd0>\currentSETUPwidth\xdef\currentSETUPwidth{\the\wd0}\fi}%
+     {}
+   \setbox0=\vbox{\XMLflush{cd:assignments}}%
+   \egroup
+   \startfirstSETUPcolumn{\showSETUPnumber}%
+     \doifelseXMLempty{cd:assignments}
+       {\secondSETUPcolumn{\c!setup!text!{see} \previousSETUPargument}{}}
+       {\ignorespaces
+        \XMLflush{cd:assignments}%
+        \let\previousSETUPargument\currentSETUPargument}%
+   \stopfirstSETUPcolumn
+   \blank[\v!halfline]
+   \ignorespaces}
+
+\defineXMLenvironmentsave [cd:keywords]
+  {}
+  {\startfirstSETUPcolumn{\showSETUPnumber}%
+     \doifelseXMLempty{cd:keywords}
+       {\secondSETUPcolumn{see \previousSETUPargument}{}}
+       {\ignorespaces
+        \XMLflush{cd:keywords}%
+        \let\previousSETUPargument\currentSETUPargument}%
+   \stopfirstSETUPcolumn
+   \blank[\v!halfline]
+   \ignorespaces}
+
+\defineXMLenvironment [cd:parameter] [name=]
+  {\startsecondSETUPcolumn{\potentialXMLentity{\getinterfacecomponent{constant}{\XMLop{name}}}}{=}%
+   \ignorespaces}
+  {\stopsecondSETUPcolumn
+   \ignorespaces}
+
+\defineXMLenvironmentsave [cd:constant] [type=,default=]
+  {\doifXMLop{default}{yes}{\underbar}%
+     {\potentialXMLentity{\getinterfacecomponent{variable}{\XMLop{type}}}}\quad\ignorespaces}
+  {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:variable] [type=]
+  {\potentialXMLentity{\getinterfacecomponent{variable}{\XMLop{type}}}\quad\ignorespaces}
+  {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:inherit] [name=]
+  {\secondSETUPcolumn{\c!setup!text!{inherits} \tex{}\getinterfacecomponent{string}{\XMLop{name}}}{}\ignorespaces}
+  {\ignorespaces}
+
+\def\simpleSETUPargument#1%
+  {\startfirstSETUPcolumn{\showSETUPnumber}%
+      \c!setup!internal!{#1}%
+   \stopfirstSETUPcolumn}
+
+\defineXMLenvironmentsave [cd:content] [list=,state=]
+  {\simpleSETUPargument{content}\blank[\v!halfline]\ignorespaces}
+  {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:displaymath] [list=,state=]
+  {\simpleSETUPargument{display math}\blank[\v!halfline]\ignorespaces}
+  {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:index] [list=,state=]
+  {\simpleSETUPargument{index}\blank[\v!halfline]\ignorespaces}
+  {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:math] [list=,state=]
+  {\simpleSETUPargument{math}\blank[\v!halfline]\ignorespaces}
+  {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:nothing] [list=,state=]
+  {\simpleSETUPargument{nothing}\blank[\v!halfline]\ignorespaces}
+  {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:file] [list=,state=]
+  {\simpleSETUPargument{file name}\blank[\v!halfline]\ignorespaces}
+  {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:position] [list=,state=]
+  {\simpleSETUPargument{position}\blank[\v!halfline]\ignorespaces}
+  {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:reference] [list=,state=]
+  {\simpleSETUPargument{reference}\blank[\v!halfline]\ignorespaces}
+  {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:csname] [list=,state=]
+  {\simpleSETUPargument{csname}\blank[\v!halfline]\ignorespaces}
+  {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:destination] [list=,state=]
+  {\simpleSETUPargument{destination}\blank[\v!halfline]\ignorespaces}
+  {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:triplet] [list=,state=]
+  {\simpleSETUPargument{triplet}\blank[\v!halfline]\ignorespaces}
+  {\ignorespaces}
+
+\defineXMLenvironmentsave [cd:word] [list=,state=]
+  {\simpleSETUPargument{word}\blank[\v!halfline]\ignorespaces}
+  {\ignorespaces}
+
+\stopXMLmapping
+
+\defineXMLentity [cd:command]        {\c!setup!internal!{command}}
+\defineXMLentity [cd:dimension]      {\c!setup!internal!{dimension}}
+\defineXMLentity [cd:file]           {\c!setup!internal!{file}}
+\defineXMLentity [cd:name]           {\c!setup!internal!{identifier}}
+\defineXMLentity [cd:character]      {\c!setup!internal!{character}}
+\defineXMLentity [cd:mark]           {\c!setup!internal!{mark}}
+\defineXMLentity [cd:number]         {\c!setup!internal!{number}}
+\defineXMLentity [cd:reference]      {\c!setup!internal!{reference}}
+\defineXMLentity [cd:plural]         {\c!setup!internal!{plural}}
+\defineXMLentity [cd:singular]       {\c!setup!internal!{singular}}
+\defineXMLentity [cd:text]           {\c!setup!internal!{text}}
+\defineXMLentity [cd:formula]        {\c!setup!internal!{formula}}
+\defineXMLentity [cd:file]           {\c!setup!internal!{file}}
+\defineXMLentity [cd:matrix]         {\c!setup!internal!{matrix}}
+\defineXMLentity [cd:list]           {\c!setup!internal!{list}}
+\defineXMLentity [cd:section]        {\c!setup!internal!{section}}
+
+\defineXMLentity [cd:noargument]     {\c!setup!command!{}}
+\defineXMLentity [cd:oneargument]    {\c!setup!command!{\#1}}
+\defineXMLentity [cd:twoarguments]   {\c!setup!command!{\#1\#2}}
+\defineXMLentity [cd:threearguments] {\c!setup!command!{\#1\#2\#3}}
+
+%D Todo:
+
+\defineXMLprocess [cd:choice]
+
+%D Auxiliary.
+
+\unexpanded\def\showSETUP#1#2%
+  {\bgroup
+   \doglobal\increment\currentSETUPargument
+   \setbox0=\hbox
+     {\doifelseXMLop{list}{yes}{#2}{#1}}%
+   \setbox2=\hbox to \wd0
+     {\hss
+      \raise1ex\hbox
+        {\tx\ifcase\maximumSETUPargument\relax
+           \or*\else\currentSETUPargument
+         \fi}%
+      \hss}%
+   \setbox4=\hbox to \wd0
+     {\hss
+      \lower2ex\hbox
+        \bgroup
+          \txx\doifXMLop{optional}{yes}{\c!setup!internal!{optional}}%
+        \egroup
+      \hss}%
+   \ht2\ht\strutbox
+   \dp4\dp\strutbox
+   \hskip.5em\hsmash{\box0}\hsmash{\box4}\box2%
+   \egroup}
+
+\def\showSETUPnumber
+  {\doglobal\increment\currentSETUPargument
+   \hbox to 2em
+     {\ifcase\maximumSETUPargument\relax
+        \or*\else\currentSETUPargument
+      \fi
+      \hss}}
+
+\def\showSETUPassignment {\showSETUP
+  {[.\lower.5ex\hbox{=}.]}
+  {[..,.\lower.5ex\hbox{=}.,..]}}
+
+\def\showSETUPkeyword {\showSETUP
+  {[...]}
+  {[...,...]}}
+
+\def\showSETUPargument {\showSETUP
+  {\leftargument..\rightargument}
+  {\leftargument..,...,..\rightargument}}
+
+\def\showSETUPdisplaymath {\showSETUP
+  {\$\$...\$\$}
+  {\$\$...\$\$}}
+
+\def\showSETUPindex {\showSETUP
+  {\leftargument...\rightargument}
+  {\leftargument..+...+..\rightargument}}
+
+\def\showSETUPmath {\showSETUP
+  {\$...\$}
+  {\$...\$}}
+
+\def\showSETUPnothing {\showSETUP
+  {...}
+  {}}
+
+\def\showSETUPfile {\showSETUP
+  {~...~}
+  {}}
+
+\def\showSETUPposition {\showSETUP
+  {(...)}
+  {(...,...)}}
+
+\def\showSETUPreference {\showSETUP
+  {[...]}
+  {[...,...]}}
+
+\def\showSETUPcsname {\showSETUP
+  {{\c!setup!command!{}}}
+  {}}
+
+\def\showSETUPdestination {\showSETUP
+  {[\leftargument..[ref]\rightargument]}
+  {[..,\leftargument..[ref,..]\rightargument,..]}}
+
+\def\showSETUPtriplet {\showSETUP
+  {[x:y:z=]}
+  {[x:y:z=,..]}}
+
+\def\showSETUPword {\showSETUP
+  {\leftargument...\rightargument}
+  {\leftargument.. ... ..\rightargument}}
+
+\def\showSETUPcontent {\showSETUP
+  {\leftargument...\rightargument}
+  {\leftargument.. ... ..\rightargument}}
+
+%\def\c!par!{\c!setup!internal!{endofpar}}
+%\def\c!repeat!{\c!opt!{{\setupvarfont n}*}}
+%\showSETUP\def\c!par!{\texescape par}
+%\showSETUP\def\c!sep!{\texescape\texescape}
+%\def\c!par!{\addtypespec{delimiter}{par}}       % \par
+%\def\c!sep!{\addtypespec{separator}{backslash}} % \\
+%\def\c!repeat!{}
+%\def\c!tex!#1{\addtypespec{command}{#1}\doanother{tex}}
+
+\startXMLmapping[zero]
+
+\defineXMLenvironmentsave [cd:command] [name=,type=,generated=,interactive=]
+  {}
+  {\doifelseXMLop{type}{environment}
+     {\edef\currentSETUPname{start\getinterfacecomponent{string}{\XMLop{name}}}}
+     {\edef\currentSETUPname{\getinterfacecomponent{string}{\XMLop{name}}}}%
+   \doifXMLop{generated}{yes}
+     {\edef\currentSETUPname{\currentSETUPname*}}%
+   \doglobal\saveXMLdatainelement{stp:\currentSETUPname}{cd:command}{cd:command}%
+   \expanded{\eachtexcommand[stp:x:\currentSETUPname]{\currentSETUPname}}%
+   \expanded{\texcommand    [stp:y:\currentSETUPname]{\currentSETUPname}}}
+
+\stopXMLmapping
+
+\def\loadsetups
+  {\startXMLmapping[zero]
+   \processXMLfilegrouped{cont-en.xml}
+   \stopXMLmapping}
+
+\protect \endinput
diff --git a/tex/context/base/x-set-12.tex b/tex/context/base/x-set-12.tex
new file mode 100644
index 000000000..a0fbbd22d
--- /dev/null
+++ b/tex/context/base/x-set-12.tex
@@ -0,0 +1,211 @@
+%D \module
+%D   [       file=x-set-02,
+%D        version=2004.10.31,
+%D         remark=setupx.tex: 1998.07.20 and later,
+%D          title=\CONTEXT\ Setup Definitions,
+%D       subtitle=Macro Definitions,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\usemodule[set-11]
+
+\unprotect
+
+\loadsetups
+
+\startinterface dutch    \definecolor[LocalColor][green]     \stopinterface
+\startinterface english  \definecolor[LocalColor][red]       \stopinterface
+\startinterface german   \definecolor[LocalColor][blue]      \stopinterface
+\startinterface czech    \definecolor[LocalColor][magenta]   \stopinterface
+\startinterface italian  \definecolor[LocalColor][cyan]      \stopinterface
+\startinterface romanian \definecolor[LocalColor][yellow]    \stopinterface
+
+\startinterface english  \definecolor[TitleColor][g=.5,b=.5] \stopinterface
+\startinterface dutch    \definecolor[TitleColor][r=.5,b=.5] \stopinterface
+\startinterface german   \definecolor[TitleColor][r=.5,g=.5] \stopinterface
+\startinterface italian  \definecolor[TitleColor][r=.5]      \stopinterface
+\startinterface czech    \definecolor[TitleColor][g=.5]      \stopinterface
+\startinterface romanian \definecolor[TitleColor][b=.5]      \stopinterface
+
+\definecolor [lightgray] [s=.9]
+\definecolor [darkgray]  [s=.1]
+
+\usetypescript[palatino][\defaultencoding]
+\setupbodyfont[palatino,9pt]
+
+\setupcolors
+  [\c!state=\v!start]
+
+\defineoverlay
+  [cover]
+  [\hbox to \paperwidth{\hss\reuseMPgraphic{cover+back}}]
+
+\defineoverlay
+  [back]
+  [\hbox to \paperwidth{\reuseMPgraphic{cover+back}\hss}]
+
+\startreusableMPgraphic{cover+back}
+  numeric h, w ; path p, q, r ; color f, d ; pair s ;
+  h := OverlayHeight ; w := 2*OverlayWidth ;
+  r := unitsquare xyscaled (w,h) ;
+  fill r withcolor \MPcolor{lightgray} ;
+  set_grid(w,h,w/8,w/16) ;
+  forever :
+    s := center r randomized (w,h) ;
+    if new_on_grid(xpart s, ypart s) :
+      s := (dx,dy) ;
+      p := fullsquare xyscaled(w/4,w/8) ;
+      q := (-4w,ypart ulcorner p) --
+           .5[ulcorner p, urcorner p] --
+           (4w,ypart urcorner p) ;
+      q := q shifted (0,-w/24) ;
+      p := p randomized (w/40,w/40) ;
+      q := q randomized (0,w/100) ;
+      q := q cutafter  (p cutafter  point 3 of p) ;
+      q := q cutbefore (p cutbefore point 3 of p) ;
+      d := .5[\MPcolor{LocalColor},\MPcolor{lightgray}] randomized (.5,.9) ;
+      f := \MPcolor{lightgray} randomized (.5,.9) ;
+      pickup pencircle scaled (w/100) ;
+      fill p shifted s withcolor f ;
+      draw p shifted s withcolor d ;
+      draw q shifted s withcolor d ;
+    fi ;
+    exitif grid_full ;
+  endfor ;
+  setbounds currentpicture to r ;
+\stopreusableMPgraphic
+
+\definelayout
+  [titlepage]
+  [\c!backspace=1cm,
+   \c!topspace=1cm,
+   \c!width=\v!middle,
+   \c!height=\v!middle,
+   \c!header=0pt,
+   \c!footer=0pt]
+
+\setuplayout
+  [\c!backspace=2cm,
+   \c!topspace=1.5cm,
+   \c!header=0cm,
+   \c!footer=0cm,
+   \c!width=\v!middle,
+   \c!height=\v!middle]
+
+\setuppagenumbering
+  [\c!alternative=\v!doublesided]
+
+\setupsetup
+  [\c!criterium=\v!all,
+   \c!reference=0]
+
+\setupframedtexts
+  [setuptext]
+  [\c!frame=\v!on,
+   \c!rulethickness=1pt,
+   \c!framecolor=TitleColor]
+
+\setupunderbar
+  [\c!rulethickness=1pt,
+   \c!rulecolor=TitleColor]
+
+\starttext
+
+\setupbackgrounds
+  [\v!rightpage]
+  [\c!background=cover]
+
+\setuplayout
+  [titlepage]
+
+\startmakeup[\v!standard]
+  \dontcomplain
+  \startcolor[TitleColor]
+  \definedfont[RegularBold at 100pt]\setstrut
+  \setupalign[\v!left]
+  \strut Con\TeX t \par
+  \definedfont[RegularBold at 50pt]\setstrut
+  \startinterface dutch    \strut commando's   \par \stopinterface
+  \startinterface english  \strut commands     \par \stopinterface
+  \startinterface german   \strut befehle      \par \stopinterface
+  \startinterface czech    \strut prikaz\'y    \par \stopinterface
+  \startinterface italian  \strut comandi      \par \stopinterface
+  \startinterface romanian \strut comenzile    \par \stopinterface
+  \vfill
+  \definedfont[RegularBold at 150pt]\setstrut
+  \startinterface dutch    NL\stopinterface
+  \startinterface english  EN\stopinterface
+  \startinterface german   DE\stopinterface
+  \startinterface czech    CZ\stopinterface
+  \startinterface italian  IT\stopinterface
+  \startinterface romanian RO\stopinterface
+  \stopcolor
+\stopmakeup
+
+\setuplayout % needed ?
+
+\setupbackgrounds
+  [\v!rightpage]
+  [\c!background=]
+
+\startmakeup[\v!standard]
+  \dontcomplain
+  \startcolor[TitleColor]
+  \definedfont[RegularBold at 100pt]\setstrut
+  \setupalign[\v!left]
+  \strut Con\TeX t \par
+  \definedfont[RegularBold at 50pt]\setstrut
+  \startinterface dutch    \strut commando's     \par \stopinterface
+  \startinterface english  \strut commands       \par \stopinterface
+  \startinterface german   \strut befehle        \par \stopinterface
+  \startinterface czech    \strut prikaz\'y      \par \stopinterface
+  \startinterface italian  \strut comandi        \par \stopinterface
+  \startinterface romanian \strut comenzile      \par \stopinterface
+  \vfill
+  \definedfont[RegularBold at 24pt]\setupinterlinespace
+  \startinterface dutch    \strut nl / nederlands     \par \stopinterface
+  \startinterface english  \strut en / english        \par \stopinterface
+  \startinterface german   \strut de / deutsch        \par \stopinterface
+  \startinterface czech    \strut cz / \^cesk\'y      \par \stopinterface
+  \startinterface italian  \strut it / italiano       \par \stopinterface
+  \startinterface romanian \strut ro / rom\^{a}n\u{a} \par \stopinterface
+  \par \strut \currentdate \par
+  \stopcolor
+\stopmakeup
+
+\protect
+
+\placeeverysetup
+
+\unprotect
+
+\page[\v!yes,\v!blank,\v!right,\v!left]
+
+\setuplayout
+  [titlepage]
+
+\setupbackgrounds
+  [\v!leftpage]
+  [\c!background=back]
+
+\startmakeup[\v!standard][\c!page=]
+  \dontcomplain
+  \startcolor[TitleColor]
+  \definedfont[RegularBold at 24pt]\setupinterlinespace
+  \setupalign[\v!left]
+  \vfill
+  PRAGMA ADE \par
+  Ridderstraat 27 \par
+  8061GH Hasselt NL \par
+  www.pragma-ade.com \par
+  \stopcolor
+\stopmakeup
+
+\protect
+
+\stoptext
diff --git a/tex/context/base/xtag-ini.tex b/tex/context/base/xtag-ini.tex
index 0e08bc083..c064deca8 100644
--- a/tex/context/base/xtag-ini.tex
+++ b/tex/context/base/xtag-ini.tex
@@ -179,7 +179,6 @@
 \edef\@@XMLdepth       {\@@XML dep} % used to track nesting
 \edef\@@XMLdopth       {\@@XML dop} % used to track nesting
 \edef\@@XMLsave        {\@@XML sav} % namespace for saved elements
-\edef\@@XMLglobal      {\@@XML glb} % global assignment
 
 \iffalse % slightly faster
 
@@ -200,7 +199,6 @@
 \edef\@@XMLdepth       {\@@XML n} % used to track nesting
 \edef\@@XMLdopth       {\@@XML o} % used to track nesting
 \edef\@@XMLsave        {\@@XML p} % namespace for saved elements
-\edef\@@XMLglobal      {\@@XML x} % global assignment
 
 \fi
 
@@ -906,50 +904,29 @@
 % use begin/end, the backtracking stops when a non-empty value is
 % encountered; maybe we will add some keyword (inherit) some day
 
-% \def\XMLinh#1% will recurse so no trickery can be used
-%   {\ifcsname\@@XMLvariable:\XMLpureancestor\plusone:#1\endcsname
-%      \@EA\@EA\csname\@@XMLvariable:\XMLpureancestor\plusone:#1\endcsname
-%    \fi}
-
-\def\XMLinh#1%
-  {\@EA\ifx\csname\@@XMLvariable:\currentXMLelement:#1\endcsname\empty
+\def\XMLinhpar#1#2%
+  {\@EA\ifx\csname\@@XMLvariable:#1:#2\endcsname\empty
      \@EA\pXMLinh
    \else
-     \csname\@@XMLvariable:\currentXMLelement:#1\endcsname
+     \csname\@@XMLvariable:#1:#2\endcsname
      \@EA\gobbletwoarguments
-   \fi\XMLdepth{#1}}
+   \fi\XMLdepth{#2}}
+
+\def\XMLinh
+  {\XMLinhpar\currentXMLelement}
 
 \def\pXMLinh#1%
   {\@EA\ppXMLinh\@EA{\the\numexpr(#1-\plusone)}}
 
-% \def\ppXMLinh#1#2%
-%   {\ifcsname\@@XMLvariable:\csname\@@XMLdepth:#1\endcsname:#2\endcsname
-%      \@EA\ifx\csname\@@XMLvariable:\csname\@@XMLdepth:#1\endcsname:#2\endcsname\empty
-%        \@EAEAEA\pppXMLinh
-%      \else
-%        \csname\@@XMLvariable:\csname\@@XMLdepth:#1\endcsname:#2\endcsname
-%        \@EAEAEA\gobbletwoarguments
-%      \fi
-%    \else
-%      \@EA\pppXMLinh
-%    \fi{#1}{#2}}
-
-% \def\pppXMLinh#1%
-%   {\ifnum#1>\zerocount
-%      \@EA\pXMLinh
-%    \else
-%      \@EA\gobbletwoarguments
-%    \fi{#1}}
-
 \def\ppXMLinh#1#2%
-  {\@EA\ifx\csname\@@XMLvariable:\csname\@@XMLdepth:#1\endcsname:#2\endcsname\empty
+  {\@EA\ifx\csname\@@XMLvariable:#1:#2\endcsname\empty
      \ifnum#1>\plusone
        \@EAEAEA\pXMLinh
      \else
        \@EAEAEA\gobbletwoarguments
      \fi
    \else
-     \csname\@@XMLvariable:\csname\@@XMLdepth:#1\endcsname:#2\endcsname
+     \csname\@@XMLvariable:#1:#2\endcsname
      \@EA\gobbletwoarguments
    \fi{#1}{#2}}
 
@@ -971,6 +948,9 @@
 \def\edefXMLinh#1#2% \macro{att}
   {\edef#1{\XMLinh{#2}}}
 
+\def\edefXMLinhpar#1#2#3% \macro{tag}{att}
+  {\edef#1{\XMLinhpar{#2}{#3}}}
+
 % \def\doifXMLopdef#1#2% \macro{att}
 %   {\ifcsname\@@XMLvariable:\ownXMLelement:#1\endcsname
 %      \@EA\let\@EA#1\csname\@@XMLvariable:\ownXMLelement:#1\endcsname
@@ -980,6 +960,7 @@
 %    \fi}
 
 \fetchruntimecommand \tracebackXMLattribute {\f!xtagprefix\s!run}
+\fetchruntimecommand \showXMLinh            {\f!xtagprefix\s!run}
 
 % \defineXMLenvironment[one]
 %   {\beginXMLelement}
@@ -1595,23 +1576,29 @@
 \let\dodocopyXMLargument\relax
 
 \def\dododocopyXMLargument
-  {\@EA\@EA\@EA\let\@EA\@EA
-     \csname\@@XMLvariable:\csname\@@XMLglobal:\currentXMLelement\endcsname:\@@XMLname\endcsname
-     \csname\@@XMLvariable:\@@XMLclass                                     :\@@XMLname\endcsname}
+  {\@EA\let\csname\@@XMLvariable:\the\numexpr(\XMLdepth+1):\@@XMLname\@EA\endcsname
+     \csname\@@XMLvariable:\@@XMLclass:\@@XMLname\endcsname}
 
 \def\copyXMLargumentindeed
-  {\def\dodocopyXMLargument{\ifcsname\@@XMLglobal:\currentXMLelement\endcsname\dododocopyXMLargument\fi}%
+  {\let\dodocopyXMLargument\dododocopyXMLargument
    \let\copyXMLargumentindeed\relax}
 
 \def\dodosetXMLargumentA
   {\@EA\def\csname\@@XMLvariable:\@@XMLclass:\@@XMLname\endcsname}
 
+% \def\dodosetXMLargumentB#1%
+%   {\@EA\edef\csname\@@XMLmap:\@@XMLmapmap\endcsname
+%       {\@EA\ifx\csname\@@XMLmap:\@@XMLmapmap\endcsname\empty\else
+%          \csname\@@XMLmap:\@@XMLmapmap\endcsname,%
+%        \fi
+%        \@@XMLname=#1}}
+
 \def\dodosetXMLargumentB#1%
   {\@EA\edef\csname\@@XMLmap:\@@XMLmapmap\endcsname
       {\@EA\ifx\csname\@@XMLmap:\@@XMLmapmap\endcsname\empty\else
          \csname\@@XMLmap:\@@XMLmapmap\endcsname,%
        \fi
-       \@@XMLname=#1}}
+       \@@XMLname={#1}}} % {} is needed for aa='bb,cc'
 
 \appendtoks
   \resetXMLarguments{\rawXMLnamespace\rawXMLidentifier}%
@@ -1757,7 +1744,7 @@
    \@EA\let\csname\@@XMLelement:/#1\endcsname\donothing
    \long\@EA\def\csname\@@XMLelement:#1/\endcsname{\@EA\let\csname\@@XMLdata:#1\endcsname\longempty}}
 
-\gdef\redoXMLsave#1%
+\long\gdef\redoXMLsave#1%
   {\long\@EA\def\@EA\next\@EA##\@EA1\@EA<\@EA/\currentXMLelement>%
      {\long\@EA\def\csname\@@XMLdata:#1\endcsname{##1}}%
    \next}
@@ -1774,7 +1761,7 @@
    \@EA\let\csname\@@XMLelement:/#1\endcsname\donothing
    \long\@EA\def\csname\@@XMLelement:#1/\endcsname{\global\@EA\let\csname\@@XMLdata:#1\endcsname\longempty}}
 
-\gdef\redoXMLgsave#1%
+\long\gdef\redoXMLgsave#1%
   {\long\@EA\def\@EA\next\@EA##\@EA1\@EA<\@EA/\currentXMLelement>%
      {\long\@EA\gdef\csname\@@XMLdata:#1\endcsname{##1}}%
    \next}
@@ -1787,7 +1774,7 @@
 
 % maybe \globalnext
 
-\gdef\redoXMLenvironmentsave#1#2#3%
+\long\gdef\redoXMLenvironmentsave#1#2#3%
   {\long\@EA\def\@EA\next\@EA##\@EA1\@EA<\@EA/\currentXMLelement>%
      {#2\long\@EA\def\csname\@@XMLdata:#1\endcsname{##1}#3}%
    \next}
@@ -1798,7 +1785,7 @@
    \@EA\let\csname\@@XMLelement:/#1\endcsname\donothing
    \long\@EA\def\csname\@@XMLelement:#1/\endcsname{#2\global\@EA\let\csname\@@XMLdata:#1\endcsname\longempty#3}}
 
-\gdef\redoXMLenvironmentgsave#1#2#3%
+\long\gdef\redoXMLenvironmentgsave#1#2#3%
   {\long\@EA\def\@EA\next\@EA##\@EA1\@EA<\@EA/\currentXMLelement>%
      {#2\long\@EA\gdef\csname\@@XMLdata:#1\endcsname{##1}#3}%
    \next}
@@ -1989,16 +1976,19 @@
 % \long\def\prepareXMLargument#1#2#3%
 %   {\scratchtoks\@EA\@EA\@EA{\@EA\the\@EA\scratchtoks\@EA\def\csname\@@XMLvariable:#1:#2\endcsname{#3}}}
 
-\let\@@globalprefix\empty
+% \let\@@globalprefix\empty
 
 \long\def\prepareXMLargument#1#2#3%
   {\expanded{\scratchtoks
      {\the\scratchtoks
       \def\@EA\noexpand\csname\@@XMLvariable:#1:#2\endcsname{#3}%
-      \ifx\@@globalprefix\empty\else
-        \let\@EA\noexpand\csname\@@XMLvariable:\@@globalprefix:#2\endcsname
-            \@EA\noexpand\csname\@@XMLvariable:#1:#2\endcsname
-      \fi}}}
+\noexpand\@EA\let\noexpand\csname\@@XMLvariable:\noexpand\the\numexpr(\XMLdepth+1):#2\endcsname
+\@EA\noexpand\csname\@@XMLvariable:#1:#2\endcsname
+%       \ifx\@@globalprefix\empty\else
+%         \let\@EA\noexpand\csname\@@XMLvariable:\@@globalprefix:#2\endcsname
+%             \@EA\noexpand\csname\@@XMLvariable:#1:#2\endcsname
+%       \fi}}}
+}}}
 
 \long\def\setXMLargumentsN#1#2#3% element [tag] settings
   {\doifassignmentelse{#2}
@@ -2009,11 +1999,8 @@
 
 \long\def\setXMLargumentsP#1#2#3% element settings empty (we cannot test for assignment)
   {\letbeundefined{\@@XMLmap:#1}%
-   \ifx\@@globalprefix\empty\else
-     \@EA\let\csname\@@XMLglobal:#1\endcsname\@@globalprefix
-   \fi
    \bgroup
-%     \def\XMLinheritance{\noexpand\XMLinheritance}
+     %def\XMLinheritance{\noexpand\XMLinheritance}
      \def\XMLop##1{\noexpand\XMLpar{#1}{##1}{}}%
      \def\XMLpar{\noexpand\XMLpar}%
      \def\XMLanc{\noexpand\XMLanc}%
@@ -2045,24 +2032,24 @@
      \expandafter\setXMLargumentsP
    \fi}
 
-\def\docopyXMLargument
-  {\@EA\@EA\@EA\let\@EA\@EA
-     \csname\@@XMLvariable:\csname\@@XMLglobal:\currentXMLelement\endcsname:\@@XMLname\endcsname
-     \csname\@@XMLvariable:\@@XMLclass                                     :\@@XMLname\endcsname}
-
 \def\startXMLcompiling
   {\dosingleargument\dostartXMLcompiling}
 
+% \def\dostartXMLcompiling[#1]%
+%   {\iffirstargument
+%      \copyXMLargumentindeed % when needed, from now on -)
+%      \def\@@globalprefix{#1}%
+%    \fi
+%    \chardef\@@precompile\plusone}
+
 \def\dostartXMLcompiling[#1]%
-  {\iffirstargument
-     \copyXMLargumentindeed % when needed, from now on -)
-     \def\@@globalprefix{#1}%
-   \fi
+  {\doif{#1}\v!inherit
+     \copyXMLargumentindeed
    \chardef\@@precompile\plusone}
 
 \def\stopXMLcompiling
   {\chardef\@@precompile\zerocount
-   \let\@@globalprefix\empty}
+   }%\let\@@globalprefix\empty}
 
 %D Interesting what kind of things are needed \unknown
 
@@ -2365,50 +2352,6 @@
      \@EA\thirdofthreearguments
    \fi{#1}}
 
-%D Experimental: local and global attributes, don't ask -)
-%D
-%D \starttyping
-%D \gXMLpar{element}{global}{attribute}{default}
-%D \gXMLatt{element}{attribute}
-%D \lXMLatt{element}{attribute}
-%D \lcXMLatt{atribute}
-%D \gcXMLatt{atribute}
-%D \stoptyping
-
-\def\gXMLpar#1#2#3#4% #2 can be auto: \csname\@@XMLglobal:#1\endcsname
-  {\ifcsname\@@XMLvariable:#1:#3\endcsname
-     \csname\@@XMLvariable:#1:#3\endcsname
-   \else\ifcsname\@@XMLvariable:#2:#3\endcsname
-     \csname\@@XMLvariable:#2:#3\endcsname
-   \else
-     #4%
-   \fi\fi}
-
-\def\gXMLatt#1#2% element tag
-  {\csname
-     \ifcsname\@@XMLvariable:#1:#2\endcsname
-       \@@XMLvariable:#1:#2%
-     \else\ifcsname\@@XMLglobal:#1\endcsname
-       \ifcsname\@@XMLvariable:\csname\@@XMLglobal:#1\endcsname:#2\endcsname
-         \@@XMLvariable:\csname\@@XMLglobal:#1\endcsname:#2%
-       \else
-         \s!empty
-       \fi
-     \else
-       \s!empty
-     \fi\fi
-   \endcsname}
-
-\def\lXMLatt#1#2% element tag
-  {\ifcsname\@@XMLvariable:#1:#2\endcsname
-     \csname\@@XMLvariable:#1:#2\endcsname
-   \else
-     \s!empty
-   \fi}
-
-\def\gcXMLatt{\gXMLatt\currentXMLelement} % tag
-\def\lcXMLatt{\lXMLatt\currentXMLelement} % tag
-
 %D Experimental (not sure if this will stay):
 %D
 %D \starttyping
@@ -2505,9 +2448,6 @@
 
 \def\doifXMLvarelse#1#2% geen etex, \relax too
   {\ifcsname\@@XMLvariable:#1:#2\endcsname
-%\expandafter\ifx\csname\@@XMLvariable:#1:#2\endcsname\relax
-%  \message{#1 #2 -> relax}\wait
-%\fi
      \expandafter\ifx\csname\@@XMLvariable:#1:#2\endcsname\empty
        \@EAEAEA\secondoftwoarguments
      \else
diff --git a/tex/context/base/xtag-mmp.tex b/tex/context/base/xtag-mmp.tex
index 84b421053..659b267bf 100644
--- a/tex/context/base/xtag-mmp.tex
+++ b/tex/context/base/xtag-mmp.tex
@@ -11,6 +11,48 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+% under reconstruction
+%
+% \starttext
+% \usemodule[mathml] \useXMLfilter[utf]
+% \unprotect
+%
+% \remapXMLsequence [mover]      [CPA] \MMLpOVER
+% \remapXMLsequence [munder]     [CPA] \MMLpUNDER
+%
+% \def\MMLpUNDER#1#2%
+%   {\getXMLarguments{munder}{accent="false" #1}%
+%    \withnexttwoXMLRelements\doMMLpUNDER#2}
+%
+% \def\MMLpOVER#1#2%
+%   {\getXMLarguments{mover}{accent="false" #1}%
+%    \withnexttwoXMLRelements\doMMLpOVER #2}
+%
+% \def\doMMLpUNDER
+%   {\doifelse{\XMLpar{munder}{accent}{}}{true}
+%      {\secondXMLRelement\firstXMLRelement}
+%      {\mathop{\vtop{\m@th\ialign{\hss##\hss\crcr
+%         \disabledelimiter\doMMLfiller\firstXMLRelement
+%         \crcr\noalign{\kern3\p@\nointerlineskip}%
+%         \disabledelimiter\doMMLfiller\secondXMLRelement
+%        \crcr\noalign{\kern3\p@}}}}\limits}}
+%
+% \def\doMMLpOVER
+%   {\doifelse{\XMLpar{mover}{accent}{}}{true}
+%      {\secondXMLRelement\firstXMLRelement}
+%      {\mathop{\vbox{\m@th\ialign{\hss##\hss\crcr\noalign{\kern3\p@}%
+%         \disabledelimiter\doMMLfiller\secondXMLRelement
+%         \crcr\noalign{\kern3\p@\nointerlineskip}%
+%         \disabledelimiter\doMMLfiller\firstXMLRelement
+%         \crcr}}}\limits}}
+%
+% \protect
+%
+% Normal: \startXMLdata<math><mover              ><mi>a</mi><mo>¯</mo></mover></math>\stopXMLdata \par
+% Accent: \startXMLdata<math><mover accent="true"><mi>x</mi><mo>¯</mo></mover></math>\stopXMLdata \par
+%
+% \stoptext
+
 \writestatus{loading}{Context XML Macros (presentational math ml)}
 
 \unprotect
@@ -262,14 +304,14 @@
     \popmacro\doMMLfiller
     \dodoMMLfiller}
 
-\def\doMMLpUNDER%
+\def\doMMLpUNDER
   {\mathop{\vtop{\m@th\ialign{\hss##\hss\crcr
      \disabledelimiter\doMMLfiller\firstXMLRelement
      \crcr\noalign{\kern3\p@\nointerlineskip}%
      \disabledelimiter\doMMLfiller\secondXMLRelement
      \crcr\noalign{\kern3\p@}}}}\limits}
 
-\def\doMMLpOVER%%
+\def\doMMLpOVER
   {\mathop{\vbox{\m@th\ialign{\hss##\hss\crcr\noalign{\kern3\p@}%
      \disabledelimiter\doMMLfiller\secondXMLRelement
      \crcr\noalign{\kern3\p@\nointerlineskip}%
diff --git a/tex/context/base/xtag-run.tex b/tex/context/base/xtag-run.tex
index 639b6df53..6d1d3078d 100644
--- a/tex/context/base/xtag-run.tex
+++ b/tex/context/base/xtag-run.tex
@@ -100,11 +100,12 @@
        \ifcase\@XMLnofelements\else\@@xfinbetween\fi
      \fi
    \fi
-   % no, too fragile: \hangindent2em
+   % no, too fragile:
+% \ifnum\XMLlevel>1\hangindent2em\fi
    \ifcase\kindofXMLelement\or\or
      \getvalue{\@@XMLshow::\currentXMLelement}\relax
    \fi
-   \indent
+   \dontleavehmode % \indent
    \bgroup
      % \localcolortrue
      \advance\XMLlevel \minusone
@@ -154,7 +155,9 @@
 \gdef\someXMLword{\@XMLlevel+\@XMLelement1\@XMLlevel-}
 
 \gdef\@XMLindent#1%
-  {\ifnum\XMLlevel>0\advance\leftskip#11em\relax\fi}
+  {\ifnum\XMLlevel>\zerocount
+     \advance\leftskip#11em\relax
+   \fi}
 
 \gdef\nextXMLtext{\blank\@XMLlevel+\@XMLelement1\par\@XMLindent+}
 \gdef\prevXMLtext{\par\@XMLindent-\@XMLelement0\par\@XMLlevel-\blank}
@@ -169,7 +172,7 @@
   {\def\docommando##1{#1[##1]#2#3\letvalue{\@@XMLshow:##1}\empty}%
    \processcommalist[#4]\docommando}
 
-\gdef\showXMLign[#1]%
+\gdef\showXMLinh[#1]%
   {\setXMLshow\defineXMLignore     \relax\relax[#1]%
    \setXMLshow\defineXMLsingular   \relax\relax[#1]}
 
@@ -302,4 +305,13 @@
       \fi}%
     \egroup}
 
+\gdef\showXMLinh#1%
+  {\doifsomething{#1}
+     {\bgroup\infofont[%
+      \dorecurse\XMLdepth
+%          {\csname\@@XMLvariable:\csname\@@XMLdepth:\recurselevel\endcsname:#1\endcsname
+         {\csname\@@XMLvariable:\recurselevel:#1\endcsname
+         \ifnum\recurselevel<\XMLdepth->\fi}%
+      ]\egroup}}
+
 \protect \endinput
diff --git a/context/data/cont-cz.xml b/tex/context/interface/cont-cz.xml
index d142cb851..0c81fd8ad 100644
--- a/context/data/cont-cz.xml
+++ b/tex/context/interface/cont-cz.xml
@@ -2,7 +2,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context">
 
-<cd:command name="instalacejazyka">
+<cd:command name="instalacejazyka" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="instalacejazyka"/>
   </cd:sequence>
@@ -56,7 +56,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavjazyk">
+<cd:command name="nastavjazyk" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="nastavjazyk"/>
   </cd:sequence>
@@ -95,7 +95,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="hlavnijazyk">
+<cd:command name="hlavnijazyk" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="hlavnijazyk"/>
   </cd:sequence>
@@ -113,7 +113,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="prelozit">
+<cd:command name="prelozit" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="prelozit"/>
   </cd:sequence>
@@ -126,7 +126,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uzijkodovani">
+<cd:command name="uzijkodovani" file="enco-ini.tex">
   <cd:sequence>
     <cd:string value="uzijkodovani"/>
   </cd:sequence>
@@ -137,7 +137,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uzijspeciality">
+<cd:command name="uzijspeciality" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="uzijspeciality"/>
   </cd:sequence>
@@ -149,7 +149,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujvystup">
+<cd:command name="definujvystup" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="definujvystup"/>
   </cd:sequence>
@@ -163,7 +163,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavvystup">
+<cd:command name="nastavvystup" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="nastavvystup"/>
   </cd:sequence>
@@ -174,7 +174,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujprostredizakladnihofontu">
+<cd:command name="definujprostredizakladnihofontu" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definujprostredizakladnihofontu"/>
   </cd:sequence>
@@ -183,7 +183,7 @@
       <cd:constant type="5pt"/>
       <cd:constant type="..."/>
       <cd:constant type="12pt"/>
-      <cd:constant type="default"/>
+      <cd:constant type="implicitni"/>
     </cd:keywords>
     <cd:assignments list="yes">
       <cd:parameter name="text">
@@ -211,7 +211,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavprostredizakladnihofontu">
+<cd:command name="nastavprostredizakladnihofontu" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="nastavprostredizakladnihofontu"/>
   </cd:sequence>
@@ -236,7 +236,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujzakladnifont">
+<cd:command name="definujzakladnifont" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definujzakladnifont"/>
   </cd:sequence>
@@ -245,7 +245,7 @@
       <cd:constant type="5pt"/>
       <cd:constant type="..."/>
       <cd:constant type="12pt"/>
-      <cd:constant type="default"/>
+      <cd:constant type="implicitni"/>
     </cd:keywords>
     <cd:keywords>
       <cd:constant type="rm"/>
@@ -335,7 +335,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="prepninazakladnifont">
+<cd:command name="prepninazakladnifont" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="prepninazakladnifont"/>
   </cd:sequence>
@@ -351,7 +351,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujfont">
+<cd:command name="definujfont" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definujfont"/>
   </cd:sequence>
@@ -365,7 +365,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupstrut">
+<cd:command name="setupstrut" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="setupstrut"/>
   </cd:sequence>
@@ -379,7 +379,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavbarvu">
+<cd:command name="nastavbarvu" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="nastavbarvu"/>
   </cd:sequence>
@@ -390,7 +390,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavbarvy">
+<cd:command name="nastavbarvy" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="nastavbarvy"/>
   </cd:sequence>
@@ -448,7 +448,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujbarvu">
+<cd:command name="definujbarvu" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definujbarvu"/>
   </cd:sequence>
@@ -485,7 +485,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="barva" type="environment">
+<cd:command name="barva" type="environment" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="barva"/>
   </cd:sequence>
@@ -496,7 +496,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="barva">
+<cd:command name="barva" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="barva"/>
   </cd:sequence>
@@ -508,7 +508,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sedabarva">
+<cd:command name="sedabarva" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="sedabarva"/>
   </cd:sequence>
@@ -530,7 +530,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujpaletu">
+<cd:command name="definujpaletu" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definujpaletu"/>
   </cd:sequence>
@@ -546,7 +546,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavpaletu">
+<cd:command name="nastavpaletu" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="nastavpaletu"/>
   </cd:sequence>
@@ -557,7 +557,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujskupinubarev">
+<cd:command name="definujskupinubarev" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definujskupinubarev"/>
   </cd:sequence>
@@ -605,7 +605,7 @@
       <cd:constant type="vertikalne"/>
       <cd:constant type="jmeno"/>
       <cd:constant type="hodnota"/>
-      <cd:constant type="cislo"/>
+      <cd:variable type="cd:number"/>
     </cd:keywords>
   </cd:arguments>
 </cd:command>
@@ -632,13 +632,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ukazupravu">
+<cd:command name="ukazupravu" file="supp-vis.tex">
   <cd:sequence>
     <cd:string value="ukazupravu"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definetype">
+<cd:command name="definetype" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="definetype"/>
   </cd:sequence>
@@ -652,7 +652,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavtype">
+<cd:command name="nastavtype" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="nastavtype"/>
   </cd:sequence>
@@ -674,7 +674,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="barva">
@@ -684,7 +684,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="opis">
+<cd:command name="opis" file="verb-ini.tex">
   <cd:sequence>
     <cd:string value="opis"/>
   </cd:sequence>
@@ -693,7 +693,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="pis">
+<cd:command name="pis" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="pis"/>
   </cd:sequence>
@@ -702,7 +702,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tex">
+<cd:command name="tex" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="tex"/>
   </cd:sequence>
@@ -711,7 +711,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="arg">
+<cd:command name="arg" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="arg"/>
   </cd:sequence>
@@ -720,7 +720,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujopis">
+<cd:command name="definujopis" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="definujopis"/>
   </cd:sequence>
@@ -736,7 +736,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavopis">
+<cd:command name="nastavopis" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="nastavopis"/>
   </cd:sequence>
@@ -816,7 +816,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="barva">
@@ -842,7 +842,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="opissoubor">
+<cd:command name="opissoubor" file="verb-ini.tex">
   <cd:sequence>
     <cd:string value="opissoubor"/>
   </cd:sequence>
@@ -854,7 +854,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavpoznamkypodcarou">
+<cd:command name="nastavpoznamkypodcarou" file="core-not.tex">
   <cd:sequence>
     <cd:string value="nastavpoznamkypodcarou"/>
   </cd:sequence>
@@ -868,8 +868,8 @@
         <cd:constant type="Rimskecislice"/>
       </cd:parameter>
       <cd:parameter name="zpusob">
-        <cd:constant type="skrztext"/>
-        <cd:constant type="skrzcd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="misto">
         <cd:constant type="stranka"/>
@@ -910,7 +910,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="vzdalenost">
@@ -944,7 +944,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="barvatextu">
@@ -962,7 +962,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavdefinicipoznamekpodcarou">
+<cd:command name="nastavdefinicipoznamekpodcarou" file="core-not.tex">
   <cd:sequence>
     <cd:string value="nastavdefinicipoznamekpodcarou"/>
   </cd:sequence>
@@ -973,7 +973,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="poznamkapodcarou">
+<cd:command name="poznamkapodcarou" file="core-not.tex">
   <cd:sequence>
     <cd:string value="poznamkapodcarou"/>
   </cd:sequence>
@@ -983,7 +983,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="footnotetext">
+<cd:command name="footnotetext" file="core-not.tex">
   <cd:sequence>
     <cd:string value="footnotetext"/>
   </cd:sequence>
@@ -993,7 +993,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="poznamka">
+<cd:command name="poznamka" file="core-not.tex">
   <cd:sequence>
     <cd:string value="poznamka"/>
   </cd:sequence>
@@ -1002,15 +1002,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="lokalnipoznamkypodcarou" type="environment">
+<cd:command name="localfootnotes" type="environment">
   <cd:sequence>
-    <cd:string value="lokalnipoznamkypodcarou"/>
+    <cd:string value="localfootnotes"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umistilokalnipoznamkypodcarou">
+<cd:command name="umistilokalnipoznamkypodcarou" file="core-not.tex">
   <cd:sequence>
     <cd:string value="umistilokalnipoznamkypodcarou"/>
   </cd:sequence>
@@ -1021,7 +1021,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umistipoznamkypodcarou">
+<cd:command name="umistipoznamkypodcarou" file="core-not.tex">
   <cd:sequence>
     <cd:string value="umistipoznamkypodcarou"/>
   </cd:sequence>
@@ -1032,7 +1032,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavpodtrzeni">
+<cd:command name="nastavpodtrzeni" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="nastavpodtrzeni"/>
   </cd:sequence>
@@ -1059,7 +1059,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="podtrzeno">
+<cd:command name="podtrzeno" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="podtrzeno"/>
   </cd:sequence>
@@ -1068,7 +1068,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="podtrzeni">
+<cd:command name="podtrzeni" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="podtrzeni"/>
   </cd:sequence>
@@ -1077,7 +1077,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nadtrzeno">
+<cd:command name="nadtrzeno" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="nadtrzeno"/>
   </cd:sequence>
@@ -1086,7 +1086,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nadtrzeni">
+<cd:command name="nadtrzeni" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="nadtrzeni"/>
   </cd:sequence>
@@ -1095,7 +1095,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="preskrtnuto">
+<cd:command name="preskrtnuto" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="preskrtnuto"/>
   </cd:sequence>
@@ -1104,7 +1104,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="preskrtnuti">
+<cd:command name="preskrtnuti" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="preskrtnuti"/>
   </cd:sequence>
@@ -1113,7 +1113,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="rimskecislice">
+<cd:command name="rimskecislice" file="core-con.tex">
   <cd:sequence>
     <cd:string value="rimskecislice"/>
   </cd:sequence>
@@ -1122,7 +1122,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Rimskecislice">
+<cd:command name="Rimskecislice" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Rimskecislice"/>
   </cd:sequence>
@@ -1131,7 +1131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="cisla">
+<cd:command name="cisla" file="core-con.tex">
   <cd:sequence>
     <cd:string value="cisla"/>
   </cd:sequence>
@@ -1140,7 +1140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="znak">
+<cd:command name="znak" file="core-con.tex">
   <cd:sequence>
     <cd:string value="znak"/>
   </cd:sequence>
@@ -1149,7 +1149,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Znak">
+<cd:command name="Znak" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Znak"/>
   </cd:sequence>
@@ -1158,7 +1158,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="znaky">
+<cd:command name="znaky" file="core-con.tex">
   <cd:sequence>
     <cd:string value="znaky"/>
   </cd:sequence>
@@ -1167,7 +1167,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Znaky">
+<cd:command name="Znaky" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Znaky"/>
   </cd:sequence>
@@ -1176,16 +1176,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stredoveky">
+<cd:command name="mediaeval" file="core-con.tex">
   <cd:sequence>
-    <cd:string value="stredoveky"/>
+    <cd:string value="mediaeval"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mesic">
+<cd:command name="mesic" file="core-con.tex">
   <cd:sequence>
     <cd:string value="mesic"/>
   </cd:sequence>
@@ -1194,7 +1194,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="MESIC">
+<cd:command name="MESIC" file="core-con.tex">
   <cd:sequence>
     <cd:string value="MESIC"/>
   </cd:sequence>
@@ -1203,7 +1203,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vsedniden">
+<cd:command name="vsedniden" file="core-con.tex">
   <cd:sequence>
     <cd:string value="vsedniden"/>
   </cd:sequence>
@@ -1212,7 +1212,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="VSEDNIDEN">
+<cd:command name="VSEDNIDEN" file="core-con.tex">
   <cd:sequence>
     <cd:string value="VSEDNIDEN"/>
   </cd:sequence>
@@ -1221,7 +1221,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavkapitalky">
+<cd:command name="nastavkapitalky" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="nastavkapitalky"/>
   </cd:sequence>
@@ -1239,52 +1239,52 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kap">
+<cd:command name="cap" file="core-fnt.tex">
   <cd:sequence>
-    <cd:string value="kap"/>
+    <cd:string value="cap"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nokap">
+<cd:command name="nocap">
   <cd:sequence>
-    <cd:string value="nokap"/>
+    <cd:string value="nocap"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="KAP">
+<cd:command name="CAP">
   <cd:sequence>
-    <cd:string value="KAP"/>
+    <cd:string value="CAP"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Kap">
+<cd:command name="Cap">
   <cd:sequence>
-    <cd:string value="Kap"/>
+    <cd:string value="Cap"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Kaps">
+<cd:command name="Caps">
   <cd:sequence>
-    <cd:string value="Kaps"/>
+    <cd:string value="Caps"/>
   </cd:sequence>
   <cd:arguments>
     <cd:word list="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="SLOVO">
+<cd:command name="SLOVO" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="SLOVO"/>
   </cd:sequence>
@@ -1293,7 +1293,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="SLOVA">
+<cd:command name="SLOVA" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="SLOVA"/>
   </cd:sequence>
@@ -1302,7 +1302,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Slovo">
+<cd:command name="Slovo" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="Slovo"/>
   </cd:sequence>
@@ -1311,7 +1311,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Slova">
+<cd:command name="Slova" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="Slova"/>
   </cd:sequence>
@@ -1320,7 +1320,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="roztazene">
+<cd:command name="roztazene" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="roztazene"/>
   </cd:sequence>
@@ -1329,7 +1329,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujsymbol">
+<cd:command name="definujsymbol" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="definujsymbol"/>
   </cd:sequence>
@@ -1343,7 +1343,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujobrazeksymbol">
+<cd:command name="definujobrazeksymbol" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="definujobrazeksymbol"/>
   </cd:sequence>
@@ -1360,7 +1360,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="symbol">
+<cd:command name="symbol" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="symbol"/>
   </cd:sequence>
@@ -1374,9 +1374,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sadasymbolu" type="environment">
+<cd:command name="symbolset" type="environment">
   <cd:sequence>
-    <cd:string value="sadasymbolu"/>
+    <cd:string value="symbolset"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -1385,7 +1385,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavsadusymbolu">
+<cd:command name="nastavsadusymbolu" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="nastavsadusymbolu"/>
   </cd:sequence>
@@ -1396,7 +1396,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uzijsymbol">
+<cd:command name="uzijsymbol" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="uzijsymbol"/>
   </cd:sequence>
@@ -1418,7 +1418,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujkonverzi">
+<cd:command name="definujkonverzi" file="core-con.tex">
   <cd:sequence>
     <cd:string value="definujkonverzi"/>
   </cd:sequence>
@@ -1433,7 +1433,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="konvertujcislo">
+<cd:command name="konvertujcislo" file="core-con.tex">
   <cd:sequence>
     <cd:string value="konvertujcislo"/>
   </cd:sequence>
@@ -1443,7 +1443,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavtexthlavicky">
+<cd:command name="nastavtexthlavicky" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="nastavtexthlavicky"/>
   </cd:sequence>
@@ -1466,7 +1466,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavtextpopisku">
+<cd:command name="nastavtextpopisku" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="nastavtextpopisku"/>
   </cd:sequence>
@@ -1489,7 +1489,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="texthlavicky">
+<cd:command name="texthlavicky" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="texthlavicky"/>
   </cd:sequence>
@@ -1507,7 +1507,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavmarginalnilinky">
+<cd:command name="nastavmarginalnilinky" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="nastavmarginalnilinky"/>
   </cd:sequence>
@@ -1546,7 +1546,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavsirkucary">
+<cd:command name="nastavsirkucary" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="nastavsirkucary"/>
   </cd:sequence>
@@ -1557,7 +1557,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavoramovani">
+<cd:command name="nastavoramovani" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="nastavoramovani"/>
   </cd:sequence>
@@ -1701,7 +1701,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="oramovani">
+<cd:command name="oramovani" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="oramovani"/>
   </cd:sequence>
@@ -1713,7 +1713,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zaramovani">
+<cd:command name="zaramovani" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="zaramovani"/>
   </cd:sequence>
@@ -1725,7 +1725,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tenkelinky">
+<cd:command name="tenkelinky" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="tenkelinky"/>
   </cd:sequence>
@@ -1736,7 +1736,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavtenkelinky">
+<cd:command name="nastavtenkelinky" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="nastavtenkelinky"/>
   </cd:sequence>
@@ -1795,19 +1795,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vlasovalinka">
+<cd:command name="vlasovalinka" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="vlasovalinka"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="tenkalinka">
+<cd:command name="tenkalinka" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="tenkalinka"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definujoramovanytext">
+<cd:command name="definujoramovanytext" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="definujoramovanytext"/>
   </cd:sequence>
@@ -1821,7 +1821,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujoramovani">
+<cd:command name="definujoramovani" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="definujoramovani"/>
   </cd:sequence>
@@ -1835,7 +1835,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavoramovanetexty">
+<cd:command name="nastavoramovanetexty" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="nastavoramovanetexty"/>
   </cd:sequence>
@@ -1854,7 +1854,7 @@
         <cd:constant type="sklonene"/>
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="vlevo">
@@ -1896,7 +1896,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="oramovanytext" type="environment" generated="yes">
+<cd:command name="framedtext" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="oramovanytext"/>
   </cd:sequence>
@@ -1913,7 +1913,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="oramovanytext" generated="yes">
+<cd:command name="framedtext" generated="yes">
   <cd:sequence>
     <cd:variable value="oramovanytext"/>
   </cd:sequence>
@@ -1938,7 +1938,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="nastavpozadi">
+<cd:command name="nastavpozadi" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="nastavpozadi"/>
   </cd:sequence>
@@ -1997,7 +1997,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavvyplnovelinky">
+<cd:command name="nastavvyplnovelinky" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="nastavvyplnovelinky"/>
   </cd:sequence>
@@ -2024,7 +2024,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="n">
@@ -2054,7 +2054,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavvyplnoveradky">
+<cd:command name="nastavvyplnoveradky" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="nastavvyplnoveradky"/>
   </cd:sequence>
@@ -2079,7 +2079,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavtextovelinky">
+<cd:command name="nastavtextovelinky" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="nastavtextovelinky"/>
   </cd:sequence>
@@ -2121,7 +2121,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="barvalinky">
@@ -2131,7 +2131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="textovalinka">
+<cd:command name="textovalinka" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="textovalinka"/>
   </cd:sequence>
@@ -2144,7 +2144,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="textovalinka" type="environment">
+<cd:command name="textovalinka" type="environment" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="textovalinka"/>
   </cd:sequence>
@@ -2157,7 +2157,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="cernalinka">
+<cd:command name="cernalinka" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="cernalinka"/>
   </cd:sequence>
@@ -2168,7 +2168,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="cernelinky">
+<cd:command name="cernelinky" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="cernelinky"/>
   </cd:sequence>
@@ -2179,7 +2179,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavcernelinky">
+<cd:command name="nastavcernelinky" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="nastavcernelinky"/>
   </cd:sequence>
@@ -2211,7 +2211,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujprekryv">
+<cd:command name="definujprekryv" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="definujprekryv"/>
   </cd:sequence>
@@ -2236,7 +2236,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="reset">
+<cd:command name="reset" file="core-num.tex">
   <cd:sequence>
     <cd:string value="reset"/>
   </cd:sequence>
@@ -2253,15 +2253,15 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="lokalnihoprostredi" type="environment">
+<cd:command name="localenvironment" type="environment">
   <cd:sequence>
-    <cd:string value="lokalnihoprostredi"/>
+    <cd:string value="localenvironment"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavsystem">
+<cd:command name="nastavsystem" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="nastavsystem"/>
   </cd:sequence>
@@ -2287,9 +2287,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uzijadresar">
+<cd:command name="usedirectory">
   <cd:sequence>
-    <cd:string value="uzijadresar"/>
+    <cd:string value="usedirectory"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords list="yes">
@@ -2299,7 +2299,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nizky">
+<cd:command name="nizky" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="nizky"/>
   </cd:sequence>
@@ -2308,7 +2308,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vysoky">
+<cd:command name="vysoky" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="vysoky"/>
   </cd:sequence>
@@ -2317,7 +2317,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nivy">
+<cd:command name="nivy" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="nivy"/>
   </cd:sequence>
@@ -2343,7 +2343,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zarovnanovlevo">
+<cd:command name="zarovnanovlevo" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="zarovnanovlevo"/>
   </cd:sequence>
@@ -2352,7 +2352,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zarovnanovpravo">
+<cd:command name="zarovnanovpravo" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="zarovnanovpravo"/>
   </cd:sequence>
@@ -2361,7 +2361,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zarovnanonastred">
+<cd:command name="zarovnanonastred" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="zarovnanonastred"/>
   </cd:sequence>
@@ -2370,7 +2370,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="slovovpravo">
+<cd:command name="slovovpravo" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="slovovpravo"/>
   </cd:sequence>
@@ -2379,7 +2379,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="naokraj">
+<cd:command name="naokraj" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="naokraj"/>
   </cd:sequence>
@@ -2394,7 +2394,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nadruhyokraj">
+<cd:command name="nadruhyokraj" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="nadruhyokraj"/>
   </cd:sequence>
@@ -2475,7 +2475,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="ukazpodpery">
+<cd:command name="ukazpodpery" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="ukazpodpery"/>
   </cd:sequence>
@@ -2493,7 +2493,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="marginalnitext">
+<cd:command name="marginalnitext" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="marginalnitext"/>
   </cd:sequence>
@@ -2508,7 +2508,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavmarginalniblok">
+<cd:command name="nastavmarginalniblok" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="nastavmarginalniblok"/>
   </cd:sequence>
@@ -2527,7 +2527,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="sirka">
@@ -2564,17 +2564,17 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="marginalniblok" type="environment">
+<cd:command name="marginblock" type="environment">
   <cd:sequence>
-    <cd:string value="marginalniblok"/>
+    <cd:string value="marginblock"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="cast">
+<cd:command name="part" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="cast"/>
+    <cd:string value="part"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2582,9 +2582,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="titul">
+<cd:command name="title" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="titul"/>
+    <cd:string value="title"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2592,9 +2592,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kapitola">
+<cd:command name="chapter" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="kapitola"/>
+    <cd:string value="chapter"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2602,9 +2602,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sekce">
+<cd:command name="section" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="sekce"/>
+    <cd:string value="section"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2612,9 +2612,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="podsekce">
+<cd:command name="subsection" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="podsekce"/>
+    <cd:string value="subsection"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2622,9 +2622,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="podpodsekce">
+<cd:command name="subsubsection" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="podpodsekce"/>
+    <cd:string value="subsubsection"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2632,9 +2632,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tema">
+<cd:command name="subject" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="tema"/>
+    <cd:string value="subject"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2642,9 +2642,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="podtema">
+<cd:command name="subsubject" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="podtema"/>
+    <cd:string value="subsubject"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2652,9 +2652,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="podpodtema">
+<cd:command name="subsubsubject" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="podpodtema"/>
+    <cd:string value="subsubsubject"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2662,9 +2662,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="dodatek">
+<cd:command name="appendix" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="dodatek"/>
+    <cd:string value="appendix"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2672,7 +2672,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tref">
+<cd:command name="tref" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="tref"/>
   </cd:sequence>
@@ -2704,7 +2704,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nekde">
+<cd:command name="nekde" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="nekde"/>
   </cd:sequence>
@@ -2715,7 +2715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastrane">
+<cd:command name="nastrane" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="nastrane"/>
   </cd:sequence>
@@ -2724,7 +2724,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ref">
+<cd:command name="ref" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="ref"/>
   </cd:sequence>
@@ -2740,7 +2740,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="odkaznatext">
+<cd:command name="odkaznatext" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="odkaznatext"/>
   </cd:sequence>
@@ -2750,7 +2750,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="odkaznastranu">
+<cd:command name="odkaznastranu" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="odkaznastranu"/>
   </cd:sequence>
@@ -2759,7 +2759,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="odkaz">
+<cd:command name="odkaz" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="odkaz"/>
   </cd:sequence>
@@ -2769,7 +2769,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uzijodkazy">
+<cd:command name="uzijodkazy" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="uzijodkazy"/>
   </cd:sequence>
@@ -2780,7 +2780,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujodkaz">
+<cd:command name="definujodkaz" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definujodkaz"/>
   </cd:sequence>
@@ -2792,7 +2792,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujformatodkazu">
+<cd:command name="definujformatodkazu" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definujformatodkazu"/>
   </cd:sequence>
@@ -2839,7 +2839,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="jdidolu">
+<cd:command name="jdidolu" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="jdidolu"/>
   </cd:sequence>
@@ -2850,37 +2850,37 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="bilemisto">
+<cd:command name="bilemisto" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="bilemisto"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="zadnebilemisto">
+<cd:command name="zadnebilemisto" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="zadnebilemisto"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="crlf">
+<cd:command name="crlf" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="crlf"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="mezera">
+<cd:command name="mezera" file="syst-pln.tex">
   <cd:sequence>
     <cd:string value="mezera"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="tvrdemezery">
+<cd:command name="tvrdemezery" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="tvrdemezery"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="emptylines">
+<cd:command name="emptylines" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="emptylines"/>
   </cd:sequence>
@@ -2891,19 +2891,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zadnamezera">
+<cd:command name="zadnamezera" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="zadnamezera"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="zhustene">
+<cd:command name="zhustene" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="zhustene"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="nastavpopisy">
+<cd:command name="nastavpopisy" file="core-des.tex">
   <cd:sequence>
     <cd:string value="nastavpopisy"/>
   </cd:sequence>
@@ -2919,7 +2919,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="pismeno">
@@ -2929,7 +2929,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="barva">
@@ -3004,7 +3004,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavvycty">
+<cd:command name="nastavvycty" file="core-des.tex">
   <cd:sequence>
     <cd:string value="nastavvycty"/>
   </cd:sequence>
@@ -3018,7 +3018,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujvycet">
+<cd:command name="definujvycet" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definujvycet"/>
   </cd:sequence>
@@ -3035,24 +3035,24 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vycet" generated="yes">
+<cd:command name="enumeration" generated="yes">
   <cd:sequence>
-    <cd:variable value="vycet"/>
+    <cd:variable value="enumeration"/>
   </cd:sequence>
   <cd:arguments>
     <cd:nothing interactive="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vycet" type="environment" generated="yes">
+<cd:command name="enumeration" type="environment" generated="yes">
   <cd:sequence>
-    <cd:variable value="vycet"/>
+    <cd:variable value="enumeration"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujpopis">
+<cd:command name="definujpopis" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definujpopis"/>
   </cd:sequence>
@@ -3066,9 +3066,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="popis" generated="yes">
+<cd:command name="description" generated="yes">
   <cd:sequence>
-    <cd:variable value="popis"/>
+    <cd:variable value="description"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
@@ -3076,16 +3076,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="popis" type="environment" generated="yes">
+<cd:command name="description" type="environment" generated="yes">
   <cd:sequence>
-    <cd:variable value="popis"/>
+    <cd:variable value="description"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavodsazovani">
+<cd:command name="nastavodsazovani" file="core-des.tex">
   <cd:sequence>
     <cd:string value="nastavodsazovani"/>
   </cd:sequence>
@@ -3101,7 +3101,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stylhlavicky">
@@ -3111,7 +3111,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="sirka">
@@ -3140,7 +3140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujodsazovani">
+<cd:command name="definujodsazovani" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definujodsazovani"/>
   </cd:sequence>
@@ -3154,16 +3154,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="odsazovani" generated="yes">
+<cd:command name="indentation" generated="yes" file="core-spa.tex">
   <cd:sequence>
-    <cd:variable value="odsazovani"/>
+    <cd:variable value="indentation"/>
   </cd:sequence>
   <cd:arguments>
     <cd:nothing/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujpopisek">
+<cd:command name="definujpopisek" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definujpopisek"/>
   </cd:sequence>
@@ -3180,8 +3180,8 @@
         <cd:constant type="dotextu"/>
       </cd:parameter>
       <cd:parameter name="zpusob">
-        <cd:constant type="skrztext"/>
-        <cd:constant type="skrzcd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="dobloku">
         <cd:constant type="ano"/>
@@ -3194,7 +3194,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="barvahlavicky">
@@ -3210,16 +3210,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="oznacovani" generated="yes">
+<cd:command name="labeling" generated="yes">
   <cd:sequence>
-    <cd:variable value="oznacovani"/>
+    <cd:variable value="labeling"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavsloupce">
+<cd:command name="nastavsloupce" file="page-mul.tex">
   <cd:sequence>
     <cd:string value="nastavsloupce"/>
   </cd:sequence>
@@ -3278,9 +3278,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sloupce" type="environment">
+<cd:command name="columns" type="environment">
   <cd:sequence>
-    <cd:string value="sloupce"/>
+    <cd:string value="columns"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments optional="yes" list="yes">
@@ -3289,7 +3289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujtext">
+<cd:command name="definujtext" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="definujtext"/>
   </cd:sequence>
@@ -3313,7 +3313,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavzahlavi">
+<cd:command name="nastavzahlavi" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="nastavzahlavi"/>
   </cd:sequence>
@@ -3345,7 +3345,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stylvlevo">
@@ -3355,7 +3355,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stylvpravo">
@@ -3365,7 +3365,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="sirkavlevo">
@@ -3384,7 +3384,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavupati">
+<cd:command name="nastavupati" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="nastavupati"/>
   </cd:sequence>
@@ -3398,7 +3398,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavtext">
+<cd:command name="nastavtext" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="nastavtext"/>
   </cd:sequence>
@@ -3412,7 +3412,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavhorejsek">
+<cd:command name="nastavhorejsek" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="nastavhorejsek"/>
   </cd:sequence>
@@ -3426,7 +3426,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavspodek">
+<cd:command name="nastavspodek" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="nastavspodek"/>
   </cd:sequence>
@@ -3440,19 +3440,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zadnezahlaviaupati">
+<cd:command name="zadnezahlaviaupati" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="zadnezahlaviaupati"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="zadnehorniadolniradky">
+<cd:command name="zadnehorniadolniradky" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="zadnehorniadolniradky"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="nastavtextyzahlavi">
+<cd:command name="nastavtextyzahlavi" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="nastavtextyzahlavi"/>
   </cd:sequence>
@@ -3479,7 +3479,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavtextyupati">
+<cd:command name="nastavtextyupati" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="nastavtextyupati"/>
   </cd:sequence>
@@ -3506,7 +3506,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavtexttexty">
+<cd:command name="nastavtexttexty" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="nastavtexttexty"/>
   </cd:sequence>
@@ -3533,7 +3533,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavhornitexty">
+<cd:command name="nastavhornitexty" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="nastavhornitexty"/>
   </cd:sequence>
@@ -3560,7 +3560,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavdolnitexty">
+<cd:command name="nastavdolnitexty" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="nastavdolnitexty"/>
   </cd:sequence>
@@ -3587,7 +3587,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujznaceni">
+<cd:command name="definujznaceni" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="definujznaceni"/>
   </cd:sequence>
@@ -3601,7 +3601,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="propojeneznaceni">
+<cd:command name="propojeneznaceni" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="propojeneznaceni"/>
   </cd:sequence>
@@ -3615,7 +3615,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="rozpojeneznaceni">
+<cd:command name="rozpojeneznaceni" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="rozpojeneznaceni"/>
   </cd:sequence>
@@ -3626,7 +3626,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="resetznaceni">
+<cd:command name="resetznaceni" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="resetznaceni"/>
   </cd:sequence>
@@ -3637,7 +3637,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavznaceni">
+<cd:command name="nastavznaceni" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="nastavznaceni"/>
   </cd:sequence>
@@ -3661,7 +3661,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="znaceni">
+<cd:command name="znaceni" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="znaceni"/>
   </cd:sequence>
@@ -3673,7 +3673,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ziskejznaceni">
+<cd:command name="ziskejznaceni" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="ziskejznaceni"/>
   </cd:sequence>
@@ -3692,7 +3692,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zadneznaceni">
+<cd:command name="zadneznaceni" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="zadneznaceni"/>
   </cd:sequence>
@@ -3701,7 +3701,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavvzhled">
+<cd:command name="nastavvzhled" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="nastavvzhled"/>
   </cd:sequence>
@@ -3787,7 +3787,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="barva">
@@ -3865,7 +3865,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="prizpusobvzhled">
+<cd:command name="prizpusobvzhled" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="prizpusobvzhled"/>
   </cd:sequence>
@@ -3885,13 +3885,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ukazmrizku">
+<cd:command name="ukazmrizku" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="ukazmrizku"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="umistinamrizku">
+<cd:command name="umistinamrizku" file="core-grd.tex">
   <cd:sequence>
     <cd:string value="umistinamrizku"/>
   </cd:sequence>
@@ -3903,7 +3903,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="premistinamrizku">
+<cd:command name="premistinamrizku" file="core-grd.tex">
   <cd:sequence>
     <cd:string value="premistinamrizku"/>
   </cd:sequence>
@@ -3912,9 +3912,9 @@
       <cd:constant type="vrsek"/>
       <cd:constant type="obe"/>
       <cd:constant type="spodek"/>
-      <cd:constant type="-vrsek"/>
-      <cd:constant type="-obe"/>
-      <cd:constant type="-spodek"/>
+      <cd:constant type="-top"/>
+      <cd:constant type="-both"/>
+      <cd:constant type="-bottom"/>
       <cd:variable type="cd:text"/>
       <cd:constant type="vysoko"/>
       <cd:constant type="nastred"/>
@@ -3949,9 +3949,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="produkt" type="environment">
+<cd:command name="product" type="environment">
   <cd:sequence>
-    <cd:string value="produkt"/>
+    <cd:string value="product"/>
   </cd:sequence>
   <cd:arguments>
     <cd:file/>
@@ -3991,7 +3991,7 @@
       <cd:parameter name="vyska">
         <cd:constant type="cd:number"/>
       </cd:parameter>
-      <cd:parameter name="podlehloubky">
+      <cd:parameter name="hloubka">
         <cd:constant type="cd:number"/>
       </cd:parameter>
       <cd:parameter name="radek">
@@ -4008,7 +4008,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavcislovanistran">
+<cd:command name="nastavcislovanistran" file="page-num.tex">
   <cd:sequence>
     <cd:string value="nastavcislovanistran"/>
   </cd:sequence>
@@ -4043,7 +4043,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="vlevo">
@@ -4053,8 +4053,8 @@
         <cd:constant type="cd:text"/>
       </cd:parameter>
       <cd:parameter name="zpusob">
-        <cd:constant type="skrztext"/>
-        <cd:constant type="skrzcd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="text">
         <cd:constant type="cd:text"/>
@@ -4090,7 +4090,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavzuzeni">
+<cd:command name="nastavzuzeni" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="nastavzuzeni"/>
   </cd:sequence>
@@ -4109,7 +4109,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definuj">
+<cd:command name="definuj" file="syst-ext.tex">
   <cd:sequence>
     <cd:string value="definuj"/>
   </cd:sequence>
@@ -4122,7 +4122,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uzijprikazy">
+<cd:command name="uzijprikazy" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="uzijprikazy"/>
   </cd:sequence>
@@ -4131,7 +4131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujstartstop">
+<cd:command name="definujstartstop" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="definujstartstop"/>
   </cd:sequence>
@@ -4153,7 +4153,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="prikazy">
@@ -4163,7 +4163,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavnadpisy">
+<cd:command name="nastavnadpisy" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="nastavnadpisy"/>
   </cd:sequence>
@@ -4171,7 +4171,7 @@
     <cd:assignments list="yes">
       <cd:parameter name="cislooddilu">
         <cd:constant type="ano"/>
-        <cd:constant type="cislo"/>
+        <cd:variable type="cd:number"/>
         <cd:constant type="ne"/>
       </cd:parameter>
       <cd:parameter name="alternativa">
@@ -4215,7 +4215,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavpopisky">
+<cd:command name="nastavpopisky" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="nastavpopisky"/>
   </cd:sequence>
@@ -4246,7 +4246,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="pismeno">
@@ -4256,7 +4256,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="cislo">
@@ -4280,8 +4280,8 @@
         <cd:constant type="Rimskecislice"/>
       </cd:parameter>
       <cd:parameter name="zpusob">
-        <cd:constant type="skrztext"/>
-        <cd:constant type="skrzcd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="oddelovac">
         <cd:constant type="cd:text"/>
@@ -4296,7 +4296,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavpopisek">
+<cd:command name="nastavpopisek" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="nastavpopisek"/>
   </cd:sequence>
@@ -4310,7 +4310,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavplvouciobjekty">
+<cd:command name="nastavplvouciobjekty" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="nastavplvouciobjekty"/>
   </cd:sequence>
@@ -4394,7 +4394,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavdeleniplvoucichobjektu">
+<cd:command name="nastavdeleniplvoucichobjektu" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="nastavdeleniplvoucichobjektu"/>
   </cd:sequence>
@@ -4414,7 +4414,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="rozdelplvouciobjekt">
+<cd:command name="rozdelplvouciobjekt" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="rozdelplvouciobjekt"/>
   </cd:sequence>
@@ -4427,7 +4427,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavumisteniprotejsku">
+<cd:command name="nastavumisteniprotejsku" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="nastavumisteniprotejsku"/>
   </cd:sequence>
@@ -4450,15 +4450,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="protejsek" type="environment">
+<cd:command name="opposite" type="environment">
   <cd:sequence>
-    <cd:string value="protejsek"/>
+    <cd:string value="opposite"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavdelitko">
+<cd:command name="nastavdelitko" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="nastavdelitko"/>
   </cd:sequence>
@@ -4478,7 +4478,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavumistovani">
+<cd:command name="nastavumistovani" file="page-lyr.tex">
   <cd:sequence>
     <cd:string value="nastavumistovani"/>
   </cd:sequence>
@@ -4519,15 +4519,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umistovani" type="environment">
+<cd:command name="positioning" type="environment">
   <cd:sequence>
-    <cd:string value="umistovani"/>
+    <cd:string value="positioning"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mrizka">
+<cd:command name="mrizka" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="mrizka"/>
   </cd:sequence>
@@ -4584,7 +4584,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="strana">
+<cd:command name="strana" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="strana"/>
   </cd:sequence>
@@ -4611,7 +4611,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavodkazovani">
+<cd:command name="nastavodkazovani" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="nastavodkazovani"/>
   </cd:sequence>
@@ -4667,7 +4667,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavurl">
+<cd:command name="nastavurl" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="nastavurl"/>
   </cd:sequence>
@@ -4680,7 +4680,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="urlalternativa">
@@ -4697,7 +4697,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zapisdoseznamuodkazu">
+<cd:command name="zapisdoseznamuodkazu" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="zapisdoseznamuodkazu"/>
   </cd:sequence>
@@ -4721,7 +4721,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujseznamodkazu">
+<cd:command name="definujseznamodkazu" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definujseznamodkazu"/>
   </cd:sequence>
@@ -4735,7 +4735,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavseznamodkazu">
+<cd:command name="nastavseznamodkazu" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="nastavseznamodkazu"/>
   </cd:sequence>
@@ -4767,7 +4767,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zapisdoseznamu">
+<cd:command name="zapisdoseznamu" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="zapisdoseznamu"/>
   </cd:sequence>
@@ -4781,7 +4781,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zapismeziseznam">
+<cd:command name="zapismeziseznam" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="zapismeziseznam"/>
   </cd:sequence>
@@ -4794,7 +4794,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zadnyseznam">
+<cd:command name="zadnyseznam" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="zadnyseznam"/>
   </cd:sequence>
@@ -4803,7 +4803,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="listsymbol">
+<cd:command name="listsymbol" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="listsymbol"/>
   </cd:sequence>
@@ -4815,7 +4815,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umistiseznam">
+<cd:command name="umistiseznam" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="umistiseznam"/>
   </cd:sequence>
@@ -4829,7 +4829,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stanovcharakteristickuseznamu">
+<cd:command name="stanovcharakteristickuseznamu" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="stanovcharakteristickuseznamu"/>
   </cd:sequence>
@@ -4843,7 +4843,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umistikombinovanyseznam">
+<cd:command name="umistikombinovanyseznam" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="umistikombinovanyseznam"/>
   </cd:sequence>
@@ -4857,7 +4857,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujseznam">
+<cd:command name="definujseznam" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definujseznam"/>
   </cd:sequence>
@@ -4874,7 +4874,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavseznam">
+<cd:command name="nastavseznam" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="nastavseznam"/>
   </cd:sequence>
@@ -4893,7 +4893,7 @@
         <cd:constant type="c"/>
         <cd:constant type="..."/>
         <cd:constant type="zadny"/>
-        <cd:constant type="prikaz"/>
+        <cd:variable type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="propojeni">
         <cd:constant type="zap"/>
@@ -4916,7 +4916,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stylcisla">
@@ -4926,7 +4926,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="styltextu">
@@ -4936,7 +4936,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stylstranky">
@@ -4946,7 +4946,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="barva">
@@ -4965,7 +4965,7 @@
         <cd:constant type="cd:oneargument"/>
       </cd:parameter>
       <cd:parameter name="interakce">
-        <cd:constant type="cislooddilu"/>
+        <cd:variable type="cd:sectionnumber"/>
         <cd:variable type="cd:text"/>
         <cd:constant type="cislostranky"/>
         <cd:constant type="vse"/>
@@ -5042,7 +5042,7 @@
       <cd:parameter name="expanzen">
         <cd:constant type="ano"/>
         <cd:constant type="ne"/>
-        <cd:constant type="prikaz"/>
+        <cd:variable type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="maxsirka">
         <cd:constant type="cd:dimension"/>
@@ -5052,7 +5052,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujkombinovanyseznam">
+<cd:command name="definujkombinovanyseznam" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definujkombinovanyseznam"/>
   </cd:sequence>
@@ -5069,7 +5069,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavkombinovanyseznam">
+<cd:command name="nastavkombinovanyseznam" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="nastavkombinovanyseznam"/>
   </cd:sequence>
@@ -5091,10 +5091,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umistikombinovanyseznam" generated="yes">
+<cd:command name="umistikombinovanyseznam" generated="yes" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="umisti"/>
-    <cd:variable value="kombinovanyseznam"/>
+    <cd:variable value="combinedlist"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -5106,10 +5106,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uplnykombinovanyseznam" generated="yes">
+<cd:command name="completecombinedlist" generated="yes">
   <cd:sequence>
     <cd:string value="uplny"/>
-    <cd:variable value="kombinovanyseznam"/>
+    <cd:variable value="combinedlist"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -5121,15 +5121,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavcislovani">
+<cd:command name="nastavcislovani" file="core-num.tex">
   <cd:sequence>
     <cd:string value="nastavcislovani"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments list="yes">
       <cd:parameter name="zpusob">
-        <cd:constant type="skrztext"/>
-        <cd:constant type="skrzcd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="status">
         <cd:constant type="start"/>
@@ -5139,9 +5139,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavrovnice">
+<cd:command name="setupformulae">
   <cd:sequence>
-    <cd:string value="nastavrovnice"/>
+    <cd:string value="setupformulae"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments list="yes">
@@ -5199,7 +5199,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="publikace">
+<cd:command name="publikace" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="publikace"/>
   </cd:sequence>
@@ -5208,7 +5208,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavpublikace">
+<cd:command name="nastavpublikace" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="nastavpublikace"/>
   </cd:sequence>
@@ -5223,7 +5223,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavradky">
+<cd:command name="nastavradky" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="nastavradky"/>
   </cd:sequence>
@@ -5248,15 +5248,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="radky" type="environment">
+<cd:command name="lines" type="environment">
   <cd:sequence>
-    <cd:string value="radky"/>
+    <cd:string value="lines"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavcislovaniodstavcu">
+<cd:command name="nastavcislovaniodstavcu" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="nastavcislovaniodstavcu"/>
   </cd:sequence>
@@ -5275,7 +5275,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="vzdalenost">
@@ -5285,7 +5285,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavcislovaniradku">
+<cd:command name="nastavcislovaniradku" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="nastavcislovaniradku"/>
   </cd:sequence>
@@ -5319,7 +5319,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="prefix">
@@ -5333,9 +5333,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="cislovaniradku" type="environment">
+<cd:command name="linenumbering" type="environment">
   <cd:sequence>
-    <cd:string value="cislovaniradku"/>
+    <cd:string value="linenumbering"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -5344,16 +5344,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="radek" type="environment">
+<cd:command name="line" type="environment">
   <cd:sequence>
-    <cd:string value="radek"/>
+    <cd:string value="line"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nejakyradek">
+<cd:command name="nejakyradek" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="nejakyradek"/>
   </cd:sequence>
@@ -5362,7 +5362,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vradku">
+<cd:command name="vradku" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="vradku"/>
   </cd:sequence>
@@ -5371,7 +5371,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavmarginalie">
+<cd:command name="nastavmarginalie" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="nastavmarginalie"/>
   </cd:sequence>
@@ -5394,7 +5394,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="pred">
@@ -5437,7 +5437,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavcislostrany">
+<cd:command name="nastavcislostrany" file="page-num.tex">
   <cd:sequence>
     <cd:string value="nastavcislostrany"/>
   </cd:sequence>
@@ -5455,15 +5455,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavpodcislostrany">
+<cd:command name="nastavpodcislostrany" file="page-num.tex">
   <cd:sequence>
     <cd:string value="nastavpodcislostrany"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments list="yes">
       <cd:parameter name="zpusob">
-        <cd:constant type="skrztext"/>
-        <cd:constant type="skrzcd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="status">
         <cd:constant type="start"/>
@@ -5493,7 +5493,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujpreskok">
+<cd:command name="definujpreskok" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="definujpreskok"/>
   </cd:sequence>
@@ -5507,7 +5507,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujvelikostpapiru">
+<cd:command name="definujvelikostpapiru" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="definujvelikostpapiru"/>
   </cd:sequence>
@@ -5532,7 +5532,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuppaper">
+<cd:command name="setuppaper" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="setuppaper"/>
   </cd:sequence>
@@ -5570,7 +5570,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavvelikostpapiru">
+<cd:command name="nastavvelikostpapiru" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="nastavvelikostpapiru"/>
   </cd:sequence>
@@ -5610,7 +5610,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavusporadani">
+<cd:command name="nastavusporadani" file="page-imp.tex">
   <cd:sequence>
     <cd:string value="nastavusporadani"/>
   </cd:sequence>
@@ -5656,7 +5656,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujlogo">
+<cd:command name="definujlogo" file="page-log.tex">
   <cd:sequence>
     <cd:string value="definujlogo"/>
   </cd:sequence>
@@ -5694,7 +5694,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umistiloga">
+<cd:command name="umistiloga" file="page-log.tex">
   <cd:sequence>
     <cd:string value="umistiloga"/>
   </cd:sequence>
@@ -5740,7 +5740,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujbloksekce">
+<cd:command name="definujbloksekce" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definujbloksekce"/>
   </cd:sequence>
@@ -5754,7 +5754,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavbloksekce">
+<cd:command name="nastavbloksekce" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="nastavbloksekce"/>
   </cd:sequence>
@@ -5781,7 +5781,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujsekci">
+<cd:command name="definujsekci" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definujsekci"/>
   </cd:sequence>
@@ -5792,7 +5792,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavsekci">
+<cd:command name="nastavsekci" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="nastavsekci"/>
   </cd:sequence>
@@ -5819,7 +5819,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavnadpis">
+<cd:command name="nastavnadpis" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="nastavnadpis"/>
   </cd:sequence>
@@ -5835,7 +5835,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="styltextu">
@@ -5845,7 +5845,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stylcisla">
@@ -5855,7 +5855,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="barva">
@@ -5939,7 +5939,7 @@
       <cd:parameter name="zvysujicicislo">
         <cd:constant type="ano"/>
         <cd:constant type="ne"/>
-        <cd:constant type="seznam"/>
+        <cd:variable type="cd:list"/>
         <cd:constant type="cd:file"/>
       </cd:parameter>
       <cd:parameter name="resetnumber">
@@ -5951,7 +5951,7 @@
       </cd:parameter>
       <cd:parameter name="expanzen">
         <cd:constant type="ano"/>
-        <cd:constant type="prikaz"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="ne"/>
       </cd:parameter>
       <cd:parameter name="textmarginalie">
@@ -5963,7 +5963,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavcislonadpisu">
+<cd:command name="nastavcislonadpisu" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="nastavcislonadpisu"/>
   </cd:sequence>
@@ -5990,7 +5990,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stanovcislonadpisu">
+<cd:command name="stanovcislonadpisu" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="stanovcislonadpisu"/>
   </cd:sequence>
@@ -6001,20 +6001,20 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="aktualnicislonadpisu">
+<cd:command name="aktualnicislonadpisu" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="aktualnicislonadpisu"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="dalsioddil" generated="yes">
+<cd:command name="nextsection" generated="yes" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="dalsi"/>
-    <cd:variable value="oddil"/>
+    <cd:variable value="sekce"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definujnadpis">
+<cd:command name="definujnadpis" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definujnadpis"/>
   </cd:sequence>
@@ -6028,7 +6028,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupitemgroup">
+<cd:command name="setupitemgroup" file="core-itm.tex">
   <cd:sequence>
     <cd:string value="setupitemgroup"/>
   </cd:sequence>
@@ -6052,7 +6052,7 @@
       <cd:constant type="naokraji"/>
       <cd:constant type="autouvod"/>
       <cd:constant type="uvolnene"/>
-      <cd:constant type="sekce"/>
+      <cd:variable type="cd:section"/>
       <cd:constant type="dotextu"/>
     </cd:keywords>
     <cd:assignments optional="yes" list="yes">
@@ -6114,7 +6114,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stylsnacky">
@@ -6124,7 +6124,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stylsymboly">
@@ -6134,7 +6134,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="predel">
@@ -6251,16 +6251,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="pod">
+<cd:command name="sub">
   <cd:sequence>
-    <cd:string value="pod"/>
+    <cd:string value="sub"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sym">
+<cd:command name="sym" file="core-itm.tex">
   <cd:sequence>
     <cd:string value="sym"/>
   </cd:sequence>
@@ -6275,7 +6275,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definujrejstrik">
+<cd:command name="definujrejstrik" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="definujrejstrik"/>
   </cd:sequence>
@@ -6289,7 +6289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavrejstrik">
+<cd:command name="nastavrejstrik" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="nastavrejstrik"/>
   </cd:sequence>
@@ -6319,7 +6319,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stylstranky">
@@ -6329,7 +6329,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="styltextu">
@@ -6339,7 +6339,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="indikator">
@@ -6377,7 +6377,7 @@
       </cd:parameter>
       <cd:parameter name="expanzen">
         <cd:constant type="ano"/>
-        <cd:constant type="prikaz"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="ne"/>
       </cd:parameter>
       <cd:parameter name="odkazujici">
@@ -6409,7 +6409,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="rejstrik" generated="yes">
+<cd:command name="register" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:variable value="rejstrik"/>
   </cd:sequence>
@@ -6421,7 +6421,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="startrejstrik" generated="yes">
+<cd:command name="startregister" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="start"/>
     <cd:variable value="rejstrik"/>
@@ -6434,7 +6434,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zapisdorejstriku">
+<cd:command name="zapisdorejstriku" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="zapisdorejstriku"/>
   </cd:sequence>
@@ -6449,7 +6449,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="propojenerejstrik" generated="yes">
+<cd:command name="coupledregister" generated="yes">
   <cd:sequence>
     <cd:string value="propojene"/>
     <cd:variable value="rejstrik"/>
@@ -6462,7 +6462,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="propojenyrejstrik">
+<cd:command name="propojenyrejstrik" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="propojenyrejstrik"/>
   </cd:sequence>
@@ -6473,7 +6473,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umistirejstrik">
+<cd:command name="umistirejstrik" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="umistirejstrik"/>
   </cd:sequence>
@@ -6487,7 +6487,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vizrejstrik" generated="yes">
+<cd:command name="seeregister" generated="yes">
   <cd:sequence>
     <cd:string value="viz"/>
     <cd:variable value="rejstrik"/>
@@ -6501,7 +6501,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uplnyrejstrik" generated="yes">
+<cd:command name="completeregister" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="uplny"/>
     <cd:variable value="rejstrik"/>
@@ -6513,7 +6513,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umistirejstrik" generated="yes">
+<cd:command name="umistirejstrik" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="umisti"/>
     <cd:variable value="rejstrik"/>
@@ -6525,7 +6525,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujsynonyma">
+<cd:command name="definujsynonyma" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="definujsynonyma"/>
   </cd:sequence>
@@ -6545,7 +6545,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavsynonyma">
+<cd:command name="nastavsynonyma" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="nastavsynonyma"/>
   </cd:sequence>
@@ -6561,7 +6561,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stylsynonyma">
@@ -6571,7 +6571,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="misto">
@@ -6600,7 +6600,7 @@
       </cd:parameter>
       <cd:parameter name="expanzen">
         <cd:constant type="ano"/>
-        <cd:constant type="prikaz"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="ne"/>
       </cd:parameter>
       <cd:parameter name="prikaz">
@@ -6610,9 +6610,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="synonymum" generated="yes">
+<cd:command name="synonym" generated="yes">
   <cd:sequence>
-    <cd:variable value="synonymum"/>
+    <cd:variable value="synonym"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -6623,28 +6623,28 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uplnyseznamsynonyma" generated="yes">
+<cd:command name="completelistofsynonyms" generated="yes">
   <cd:sequence>
-    <cd:string value="uplnyseznam"/>
-    <cd:variable value="synonyma"/>
+    <cd:string value="completelistof"/>
+    <cd:variable value="synonyms"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="umistiseznamsynonyma" generated="yes">
+<cd:command name="placelistofsynonyms" generated="yes">
   <cd:sequence>
-    <cd:string value="umistiseznam"/>
-    <cd:variable value="synonyma"/>
+    <cd:string value="placelistof"/>
+    <cd:variable value="synonyms"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="nacistsynonyma" generated="yes">
+<cd:command name="loadsynonyms" generated="yes">
   <cd:sequence>
     <cd:string value="nacist"/>
-    <cd:variable value="synonyma"/>
+    <cd:variable value="synonyms"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definujtrideni">
+<cd:command name="definujtrideni" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="definujtrideni"/>
   </cd:sequence>
@@ -6661,7 +6661,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavtrideni">
+<cd:command name="nastavtrideni" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="nastavtrideni"/>
   </cd:sequence>
@@ -6694,21 +6694,21 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="expanzen">
         <cd:constant type="ano"/>
-        <cd:constant type="prikaz"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="ne"/>
       </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="trid" generated="yes">
+<cd:command name="sort" generated="yes">
   <cd:sequence>
-    <cd:variable value="trid"/>
+    <cd:variable value="sort"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -6718,28 +6718,28 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uplnyseznamtridit" generated="yes">
+<cd:command name="completelistofsorts" generated="yes">
   <cd:sequence>
-    <cd:string value="uplnyseznam"/>
-    <cd:variable value="tridit"/>
+    <cd:string value="completelistof"/>
+    <cd:variable value="sorts"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="umistiseznamtridit" generated="yes">
+<cd:command name="placelistofsorts" generated="yes">
   <cd:sequence>
-    <cd:string value="umistiseznam"/>
-    <cd:variable value="tridit"/>
+    <cd:string value="placelistof"/>
+    <cd:variable value="sorts"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="nacisttridit" generated="yes">
+<cd:command name="loadsorts" generated="yes">
   <cd:sequence>
     <cd:string value="nacist"/>
-    <cd:variable value="tridit"/>
+    <cd:variable value="sorts"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definujupravu">
+<cd:command name="definujupravu" file="page-mak.tex">
   <cd:sequence>
     <cd:string value="definujupravu"/>
   </cd:sequence>
@@ -6753,9 +6753,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uprava" type="environment">
+<cd:command name="zlom" type="environment">
   <cd:sequence>
-    <cd:string value="uprava"/>
+    <cd:string value="zlom"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -6767,7 +6767,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavupravu">
+<cd:command name="nastavupravu" file="page-mak.tex">
   <cd:sequence>
     <cd:string value="nastavupravu"/>
   </cd:sequence>
@@ -6844,7 +6844,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="jmenozlom" type="environment" generated="yes">
+<cd:command name="namemakeup" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="jmeno"/>
     <cd:string value="zlom"/>
@@ -6877,7 +6877,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="datum">
+<cd:command name="datum" file="core-con.tex">
   <cd:sequence>
     <cd:string value="datum"/>
   </cd:sequence>
@@ -6898,13 +6898,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="odkaznadatum">
+<cd:command name="odkaznadatum" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="odkaznadatum"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="odsazovani">
+<cd:command name="odsazovani" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="odsazovani"/>
   </cd:sequence>
@@ -6921,13 +6921,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zadneodsazovani">
+<cd:command name="zadneodsazovani" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="zadneodsazovani"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="preskoc">
+<cd:command name="preskoc" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="preskoc"/>
   </cd:sequence>
@@ -6944,7 +6944,7 @@
       <cd:constant type="reset"/>
       <cd:constant type="radek"/>
       <cd:constant type="pulradku"/>
-      <cd:constant type="rovnice"/>
+      <cd:variable type="cd:formula"/>
       <cd:constant type="fixne"/>
       <cd:constant type="prizpusobive"/>
       <cd:constant type="zadny"/>
@@ -6952,7 +6952,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zhustene" type="environment">
+<cd:command name="zhustene" type="environment" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="zhustene"/>
   </cd:sequence>
@@ -6963,23 +6963,23 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nezhustene" type="environment">
+<cd:command name="unpacked" type="environment">
   <cd:sequence>
-    <cd:string value="nezhustene"/>
+    <cd:string value="unpacked"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="korekceradku" type="environment">
+<cd:command name="linecorrection" type="environment">
   <cd:sequence>
-    <cd:string value="korekceradku"/>
+    <cd:string value="linecorrection"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="korekcebilehomista">
+<cd:command name="korekcebilehomista" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="korekcebilehomista"/>
   </cd:sequence>
@@ -6988,25 +6988,25 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="odlozit" type="environment">
+<cd:command name="postponing" type="environment">
   <cd:sequence>
-    <cd:string value="odlozit"/>
+    <cd:string value="postponing"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="lokalni" type="environment">
+<cd:command name="lokalne" type="environment">
   <cd:sequence>
-    <cd:string value="lokalni"/>
+    <cd:string value="lokalne"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zuzeni" type="environment">
+<cd:command name="narrower" type="environment">
   <cd:sequence>
-    <cd:string value="zuzeni"/>
+    <cd:string value="narrower"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes" list="yes">
@@ -7017,15 +7017,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="skryt" type="environment">
+<cd:command name="hiding" type="environment">
   <cd:sequence>
-    <cd:string value="skryt"/>
+    <cd:string value="hiding"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavzarovnani">
+<cd:command name="nastavzarovnani" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="nastavzarovnani"/>
   </cd:sequence>
@@ -7051,9 +7051,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zarovnavani" type="environment">
+<cd:command name="alignment" type="environment">
   <cd:sequence>
-    <cd:string value="zarovnavani"/>
+    <cd:string value="alignment"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -7074,7 +7074,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavtoleranci">
+<cd:command name="nastavtoleranci" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="nastavtoleranci"/>
   </cd:sequence>
@@ -7092,7 +7092,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="typstrany">
+<cd:command name="typstrany" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="typstrany"/>
   </cd:sequence>
@@ -7103,7 +7103,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zpracujstranu">
+<cd:command name="zpracujstranu" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="zpracujstranu"/>
   </cd:sequence>
@@ -7118,7 +7118,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="parovastrana">
+<cd:command name="parovastrana" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="parovastrana"/>
   </cd:sequence>
@@ -7140,7 +7140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="pozice">
+<cd:command name="pozice" file="page-lyr.tex">
   <cd:sequence>
     <cd:string value="pozice"/>
   </cd:sequence>
@@ -7150,7 +7150,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavrastr">
+<cd:command name="nastavrastr" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="nastavrastr"/>
   </cd:sequence>
@@ -7174,7 +7174,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavpozadi">
+<cd:command name="nastavpozadi" file="page-bck.tex">
   <cd:sequence>
     <cd:string value="nastavpozadi"/>
   </cd:sequence>
@@ -7201,7 +7201,7 @@
       <cd:parameter name="status">
         <cd:constant type="start"/>
         <cd:constant type="stop"/>
-        <cd:constant type="opakovat"/>
+        <cd:variable type="cd:repeat"/>
       </cd:parameter>
       <cd:inherit name="nastavoramovani"/>
     </cd:assignments>
@@ -7230,7 +7230,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="typebuffer">
+<cd:command name="typebuffer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="typebuffer"/>
   </cd:sequence>
@@ -7241,7 +7241,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujbuffer">
+<cd:command name="definujbuffer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="definujbuffer"/>
   </cd:sequence>
@@ -7252,7 +7252,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavbuffer">
+<cd:command name="nastavbuffer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="nastavbuffer"/>
   </cd:sequence>
@@ -7274,7 +7274,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujblok">
+<cd:command name="definujblok" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="definujblok"/>
   </cd:sequence>
@@ -7285,13 +7285,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zadnedalsibloky">
+<cd:command name="zadnedalsibloky" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="zadnedalsibloky"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="schovejbloky">
+<cd:command name="schovejbloky" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="schovejbloky"/>
   </cd:sequence>
@@ -7305,7 +7305,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zachovejbloky">
+<cd:command name="zachovejbloky" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="zachovejbloky"/>
   </cd:sequence>
@@ -7320,7 +7320,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uzijbloky">
+<cd:command name="uzijbloky" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="uzijbloky"/>
   </cd:sequence>
@@ -7334,7 +7334,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zpracujbloky">
+<cd:command name="zpracujbloky" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="zpracujbloky"/>
   </cd:sequence>
@@ -7348,7 +7348,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="bypassblocks">
+<cd:command name="bypassblocks" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="bypassblocks"/>
   </cd:sequence>
@@ -7376,7 +7376,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vyberbloky">
+<cd:command name="vyberbloky" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="vyberbloky"/>
   </cd:sequence>
@@ -7396,7 +7396,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavblok">
+<cd:command name="nastavblok" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="nastavblok"/>
   </cd:sequence>
@@ -7421,7 +7421,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="soubor">
@@ -7431,7 +7431,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="rovnice" type="environment" generated="yes">
+<cd:command name="formula" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="rovnice"/>
   </cd:sequence>
@@ -7439,7 +7439,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="matematika">
+<cd:command name="matematika" file="supp-mat.tex">
   <cd:sequence>
     <cd:string value="matematika"/>
   </cd:sequence>
@@ -7448,7 +7448,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umistirovnici">
+<cd:command name="umistirovnici" file="core-mat.tex">
   <cd:sequence>
     <cd:string value="umistirovnici"/>
   </cd:sequence>
@@ -7459,7 +7459,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umistipodrovnici">
+<cd:command name="umistipodrovnici" file="core-mat.tex">
   <cd:sequence>
     <cd:string value="umistipodrovnici"/>
   </cd:sequence>
@@ -7470,10 +7470,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umistiplvouciobjekt" generated="yes">
+<cd:command name="placefloat" generated="yes" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="umisti"/>
-    <cd:variable value="plvouciobjekt"/>
+    <cd:variable value="float"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -7496,7 +7496,7 @@
       <cd:constant type="outeredge"/>
       <cd:constant type="uvnitr"/>
       <cd:constant type="vnejsi"/>
-      <cd:constant type="line"/>
+      <cd:constant type="radek"/>
       <cd:constant type="vysoko"/>
       <cd:constant type="nizko"/>
       <cd:constant type="prizpusobive"/>
@@ -7516,10 +7516,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="rezervovatplvouciobjekt" generated="yes">
+<cd:command name="reservefloat" generated="yes">
   <cd:sequence>
     <cd:string value="rezervovat"/>
-    <cd:variable value="plvouciobjekt"/>
+    <cd:variable value="float"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments optional="yes" list="yes">
@@ -7542,7 +7542,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujplvouciobjekt">
+<cd:command name="definujplvouciobjekt" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="definujplvouciobjekt"/>
   </cd:sequence>
@@ -7556,7 +7556,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavplvouciobjekt">
+<cd:command name="nastavplvouciobjekt" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="nastavplvouciobjekt"/>
   </cd:sequence>
@@ -7602,9 +7602,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plvouciobjekttext" type="environment" generated="yes">
+<cd:command name="floattext" type="environment" generated="yes">
   <cd:sequence>
-    <cd:variable value="plvouciobjekt"/>
+    <cd:variable value="float"/>
     <cd:string value="text"/>
   </cd:sequence>
   <cd:arguments>
@@ -7623,25 +7623,25 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umistiseznamplvouciobjekty" generated="yes">
+<cd:command name="placelistoffloats" generated="yes">
   <cd:sequence>
-    <cd:string value="umistiseznam"/>
-    <cd:variable value="plvouciobjekty"/>
+    <cd:string value="placelistof"/>
+    <cd:variable value="floats"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uplnyseznamplvouciobjekty" generated="yes">
+<cd:command name="completelistoffloats" generated="yes">
   <cd:sequence>
-    <cd:string value="uplnyseznam"/>
-    <cd:variable value="plvouciobjekty"/>
+    <cd:string value="completelistof"/>
+    <cd:variable value="floats"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="odkaz">
+<cd:command name="odkaz" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="odkaz"/>
   </cd:sequence>
@@ -7694,7 +7694,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="chem">
+<cd:command name="chem" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="chem"/>
   </cd:sequence>
@@ -7705,7 +7705,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zlomek">
+<cd:command name="zlomek" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="zlomek"/>
   </cd:sequence>
@@ -7715,7 +7715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tecky">
+<cd:command name="tecky" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="tecky"/>
   </cd:sequence>
@@ -7747,7 +7747,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavpolozky">
+<cd:command name="nastavpolozky" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="nastavpolozky"/>
   </cd:sequence>
@@ -7796,7 +7796,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="citace" type="environment">
+<cd:command name="citace" type="environment" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="citace"/>
   </cd:sequence>
@@ -7809,7 +7809,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="citace">
+<cd:command name="citace" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="citace"/>
   </cd:sequence>
@@ -7818,7 +7818,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="citovat">
+<cd:command name="citovat" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="citovat"/>
   </cd:sequence>
@@ -7827,7 +7827,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavcitaci">
+<cd:command name="nastavcitaci" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="nastavcitaci"/>
   </cd:sequence>
@@ -7846,7 +7846,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="barva">
@@ -7873,7 +7873,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujodstavce">
+<cd:command name="definujodstavce" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="definujodstavce"/>
   </cd:sequence>
@@ -7921,13 +7921,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="odstavec" generated="yes">
+<cd:command name="paragraph" generated="yes">
   <cd:sequence>
     <cd:variable value="odstavec"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="odstavec" type="environment" generated="yes">
+<cd:command name="paragraph" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="odstavec"/>
   </cd:sequence>
@@ -7935,7 +7935,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavodstavce">
+<cd:command name="nastavodstavce" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="nastavodstavce"/>
   </cd:sequence>
@@ -7955,7 +7955,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="sirka">
@@ -8000,7 +8000,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavtab">
+<cd:command name="nastavtab" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="nastavtab"/>
   </cd:sequence>
@@ -8019,7 +8019,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="misto">
@@ -8040,9 +8040,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="dokument" type="environment">
+<cd:command name="document" type="environment">
   <cd:sequence>
-    <cd:string value="dokument"/>
+    <cd:string value="document"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8062,7 +8062,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujtabelaci">
+<cd:command name="definujtabelaci" file="core-tbl.tex">
   <cd:sequence>
     <cd:string value="definujtabelaci"/>
   </cd:sequence>
@@ -8079,7 +8079,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tabelator" type="environment" generated="yes">
+<cd:command name="tabulate" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="tabelator"/>
   </cd:sequence>
@@ -8093,7 +8093,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavtabelaci">
+<cd:command name="nastavtabelaci" file="core-tbl.tex">
   <cd:sequence>
     <cd:string value="nastavtabelaci"/>
   </cd:sequence>
@@ -8162,7 +8162,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavtabulky">
+<cd:command name="nastavtabulky" file="core-tab.tex">
   <cd:sequence>
     <cd:string value="nastavtabulky"/>
   </cd:sequence>
@@ -8245,9 +8245,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tabulka" type="environment">
+<cd:command name="table" type="environment">
   <cd:sequence>
-    <cd:string value="tabulka"/>
+    <cd:string value="table"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8257,9 +8257,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tabulky" type="environment">
+<cd:command name="tables" type="environment">
   <cd:sequence>
-    <cd:string value="tabulky"/>
+    <cd:string value="tables"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8269,7 +8269,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujsablonutabulky">
+<cd:command name="definujsablonutabulky" file="core-tab.tex">
   <cd:sequence>
     <cd:string value="definujsablonutabulky"/>
   </cd:sequence>
@@ -8289,7 +8289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uzijexternisoubory">
+<cd:command name="uzijexternisoubory" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="uzijexternisoubory"/>
   </cd:sequence>
@@ -8312,7 +8312,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uzijexternisoubor">
+<cd:command name="uzijexternisoubor" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="uzijexternisoubor"/>
   </cd:sequence>
@@ -8338,7 +8338,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uzijexterniobraz">
+<cd:command name="uzijexterniobraz" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="uzijexterniobraz"/>
   </cd:sequence>
@@ -8423,7 +8423,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="externiobraz">
+<cd:command name="externiobraz" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="externiobraz"/>
   </cd:sequence>
@@ -8437,7 +8437,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavexterniobrazy">
+<cd:command name="nastavexterniobrazy" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="nastavexterniobrazy"/>
   </cd:sequence>
@@ -8481,7 +8481,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ukazexterniobrazy">
+<cd:command name="ukazexterniobrazy" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="ukazexterniobrazy"/>
   </cd:sequence>
@@ -8496,7 +8496,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uzijexternizvuk">
+<cd:command name="uzijexternizvuk" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="uzijexternizvuk"/>
   </cd:sequence>
@@ -8510,18 +8510,18 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="jmeno">
+<cd:command name="name" file="syst-gen.tex">
   <cd:sequence>
-    <cd:string value="jmeno"/>
+    <cd:string value="name"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="legenda" type="environment">
+<cd:command name="legend" type="environment">
   <cd:sequence>
-    <cd:string value="legenda"/>
+    <cd:string value="legend"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -8540,15 +8540,15 @@
     <cd:string value="fakt"/>
   </cd:sequence>
   <cd:arguments>
-    <cd:tex command="fakt"/>
+    <cd:tex command="fact"/>
     <cd:nothing/>
     <cd:nothing separator="backslash"/>
     <cd:nothing separator="backslash"/>
-    <cd:tex separator="backslash" command="fakt"/>
+    <cd:tex separator="backslash" command="fact"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="otocit">
+<cd:command name="otocit" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="otocit"/>
   </cd:sequence>
@@ -8560,7 +8560,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavotoceni">
+<cd:command name="nastavotoceni" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="nastavotoceni"/>
   </cd:sequence>
@@ -8581,7 +8581,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zrcadlit">
+<cd:command name="zrcadlit" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="zrcadlit"/>
   </cd:sequence>
@@ -8590,7 +8590,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="meritko">
+<cd:command name="meritko" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="meritko"/>
   </cd:sequence>
@@ -8607,7 +8607,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavspojeni">
+<cd:command name="nastavspojeni" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="nastavspojeni"/>
   </cd:sequence>
@@ -8634,11 +8634,11 @@
         <cd:constant type="prizpusobive"/>
       </cd:parameter>
       <cd:parameter name="misto">
-        <cd:constant type="top"/>
-        <cd:constant type="middle"/>
-        <cd:constant type="bottom"/>
-        <cd:constant type="left"/>
-        <cd:constant type="right"/>
+        <cd:constant type="vrsek"/>
+        <cd:constant type="nastred"/>
+        <cd:constant type="spodek"/>
+        <cd:constant type="vlevo"/>
+        <cd:constant type="vpravo"/>
       </cd:parameter>
       <cd:parameter name="zarovnani">
         <cd:constant type="ne"/>
@@ -8654,7 +8654,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male...cd:command"/>
+        <cd:constant type="small...cd:command"/>
       </cd:parameter>
       <cd:parameter name="barva">
         <cd:constant type="cd:name"/>
@@ -8663,9 +8663,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="spojeni" type="environment">
+<cd:command name="combination" type="environment">
   <cd:sequence>
-    <cd:string value="spojeni"/>
+    <cd:string value="combination"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8674,7 +8674,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umistivedlesebe">
+<cd:command name="umistivedlesebe" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="umistivedlesebe"/>
   </cd:sequence>
@@ -8684,7 +8684,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umistinadsebe">
+<cd:command name="umistinadsebe" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="umistinadsebe"/>
   </cd:sequence>
@@ -8694,9 +8694,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="prekryv" type="environment">
+<cd:command name="overlay" type="environment">
   <cd:sequence>
-    <cd:string value="prekryv"/>
+    <cd:string value="overlay"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
@@ -8704,9 +8704,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="prehled" type="environment">
+<cd:command name="overview" type="environment">
   <cd:sequence>
-    <cd:string value="prehled"/>
+    <cd:string value="overview"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords list="yes">
@@ -8715,7 +8715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavinterakcniobrazovku">
+<cd:command name="nastavinterakcniobrazovku" file="core-int.tex">
   <cd:sequence>
     <cd:string value="nastavinterakcniobrazovku"/>
   </cd:sequence>
@@ -8757,7 +8757,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="obrazovka">
+<cd:command name="obrazovka" file="core-int.tex">
   <cd:sequence>
     <cd:string value="obrazovka"/>
   </cd:sequence>
@@ -8765,7 +8765,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavprechodstrany">
+<cd:command name="nastavprechodstrany" file="core-int.tex">
   <cd:sequence>
     <cd:string value="nastavprechodstrany"/>
   </cd:sequence>
@@ -8777,7 +8777,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavinterakci">
+<cd:command name="nastavinterakci" file="core-nav.tex">
   <cd:sequence>
     <cd:string value="nastavinterakci"/>
   </cd:sequence>
@@ -8841,7 +8841,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male...cd:command"/>
+        <cd:constant type="small...cd:command"/>
       </cd:parameter>
       <cd:parameter name="barva">
         <cd:constant type="cd:name"/>
@@ -8871,7 +8871,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujinterakcnimenu">
+<cd:command name="definujinterakcnimenu" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definujinterakcnimenu"/>
   </cd:sequence>
@@ -8915,7 +8915,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male...cd:command"/>
+        <cd:constant type="small...cd:command"/>
       </cd:parameter>
       <cd:parameter name="barva">
         <cd:constant type="cd:name"/>
@@ -8957,7 +8957,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujinterakcnimenu">
+<cd:command name="definujinterakcnimenu" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definujinterakcnimenu"/>
   </cd:sequence>
@@ -8993,7 +8993,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zablokujinterakcnimenu">
+<cd:command name="zablokujinterakcnimenu" file="core-int.tex">
   <cd:sequence>
     <cd:string value="zablokujinterakcnimenu"/>
   </cd:sequence>
@@ -9009,7 +9009,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uzijexternidokument">
+<cd:command name="uzijexternidokument" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="uzijexternidokument"/>
   </cd:sequence>
@@ -9018,7 +9018,7 @@
       <cd:constant type="cd:name"/>
     </cd:keywords>
     <cd:keywords>
-      <cd:constant type="file"/>
+      <cd:constant type="soubor"/>
     </cd:keywords>
     <cd:keywords>
       <cd:constant type="cd:text"/>
@@ -9026,7 +9026,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uzijURL">
+<cd:command name="uzijURL" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="uzijURL"/>
   </cd:sequence>
@@ -9038,7 +9038,7 @@
       <cd:constant type="cd:text"/>
     </cd:keywords>
     <cd:keywords>
-      <cd:constant type="file"/>
+      <cd:constant type="soubor"/>
     </cd:keywords>
     <cd:keywords>
       <cd:constant type="cd:text"/>
@@ -9046,7 +9046,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="propojenydokument">
+<cd:command name="propojenydokument" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="propojenydokument"/>
   </cd:sequence>
@@ -9055,7 +9055,7 @@
       <cd:constant type="cd:name"/>
     </cd:keywords>
     <cd:keywords>
-      <cd:constant type="file"/>
+      <cd:constant type="soubor"/>
     </cd:keywords>
     <cd:keywords>
       <cd:constant type="cd:name"/>
@@ -9063,7 +9063,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zref">
+<cd:command name="zref" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="zref"/>
   </cd:sequence>
@@ -9083,7 +9083,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="interakcnitlacitka">
+<cd:command name="interakcnitlacitka" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="interakcnitlacitka"/>
   </cd:sequence>
@@ -9097,7 +9097,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavinterakcnilistu">
+<cd:command name="nastavinterakcnilistu" file="core-int.tex">
   <cd:sequence>
     <cd:string value="nastavinterakcnilistu"/>
   </cd:sequence>
@@ -9122,12 +9122,12 @@
       </cd:parameter>
       <cd:parameter name="sirka">
         <cd:constant type="cd:dimension"/>
-        <cd:constant type="height"/>
+        <cd:constant type="vyska"/>
         <cd:constant type="prizpusobive"/>
       </cd:parameter>
       <cd:parameter name="vyska">
         <cd:constant type="cd:dimension"/>
-        <cd:constant type="height"/>
+        <cd:constant type="vyska"/>
         <cd:constant type="prizpusobive"/>
       </cd:parameter>
       <cd:parameter name="hloubka">
@@ -9147,7 +9147,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="synchronizovat">
+<cd:command name="synchronizovat" file="core-int.tex">
   <cd:sequence>
     <cd:string value="synchronizovat"/>
   </cd:sequence>
@@ -9155,15 +9155,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="synchronizace" type="environment">
+<cd:command name="synchronization" type="environment">
   <cd:sequence>
-    <cd:string value="synchronizace"/>
+    <cd:string value="synchronization"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavsynchronizacnilistu">
+<cd:command name="nastavsynchronizacnilistu" file="core-int.tex">
   <cd:sequence>
     <cd:string value="nastavsynchronizacnilistu"/>
   </cd:sequence>
@@ -9175,7 +9175,7 @@
       </cd:parameter>
       <cd:parameter name="sirka">
         <cd:constant type="cd:dimension"/>
-        <cd:constant type="height"/>
+        <cd:constant type="vyska"/>
         <cd:constant type="prizpusobive"/>
       </cd:parameter>
       <cd:parameter name="vyska">
@@ -9188,7 +9188,7 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="barva">
@@ -9199,7 +9199,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="synchronizacnilista">
+<cd:command name="synchronizacnilista" file="core-int.tex">
   <cd:sequence>
     <cd:string value="synchronizacnilista"/>
   </cd:sequence>
@@ -9217,7 +9217,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavsynchronizaci">
+<cd:command name="nastavsynchronizaci" file="core-int.tex">
   <cd:sequence>
     <cd:string value="nastavsynchronizaci"/>
   </cd:sequence>
@@ -9231,7 +9231,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujprofil">
+<cd:command name="definujprofil" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definujprofil"/>
   </cd:sequence>
@@ -9245,7 +9245,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavprofily">
+<cd:command name="nastavprofily" file="core-int.tex">
   <cd:sequence>
     <cd:string value="nastavprofily"/>
   </cd:sequence>
@@ -9258,9 +9258,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="profil" type="environment">
+<cd:command name="profile" type="environment">
   <cd:sequence>
-    <cd:string value="profil"/>
+    <cd:string value="profile"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords interactive="exclusive" list="yes">
@@ -9269,7 +9269,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="dodrzujprofil">
+<cd:command name="dodrzujprofil" file="core-int.tex">
   <cd:sequence>
     <cd:string value="dodrzujprofil"/>
   </cd:sequence>
@@ -9281,7 +9281,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umistizalozky">
+<cd:command name="umistizalozky" file="core-int.tex">
   <cd:sequence>
     <cd:string value="umistizalozky"/>
   </cd:sequence>
@@ -9317,7 +9317,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavverze">
+<cd:command name="nastavverze" file="core-int.tex">
   <cd:sequence>
     <cd:string value="nastavverze"/>
   </cd:sequence>
@@ -9333,14 +9333,14 @@
         <cd:constant type="tucnesklonene"/>
         <cd:constant type="opis"/>
         <cd:constant type="kap"/>
-        <cd:constant type="male..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="oznacverzi">
+<cd:command name="oznacverzi" file="core-int.tex">
   <cd:sequence>
     <cd:string value="oznacverzi"/>
   </cd:sequence>
@@ -9348,13 +9348,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vyberverzi">
+<cd:command name="vyberverzi" file="core-int.tex">
   <cd:sequence>
     <cd:string value="vyberverzi"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definujverzi">
+<cd:command name="definujverzi" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definujverzi"/>
   </cd:sequence>
@@ -9368,7 +9368,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="dodrzujverzi">
+<cd:command name="dodrzujverzi" file="core-int.tex">
   <cd:sequence>
     <cd:string value="dodrzujverzi"/>
   </cd:sequence>
@@ -9380,7 +9380,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="dodrzujverziprofilu">
+<cd:command name="dodrzujverziprofilu" file="core-int.tex">
   <cd:sequence>
     <cd:string value="dodrzujverziprofilu"/>
   </cd:sequence>
@@ -9395,7 +9395,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujprogram">
+<cd:command name="definujprogram" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definujprogram"/>
   </cd:sequence>
@@ -9412,7 +9412,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavprogramy">
+<cd:command name="nastavprogramy" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="nastavprogramy"/>
   </cd:sequence>
@@ -9425,7 +9425,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="program">
+<cd:command name="program" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="program"/>
   </cd:sequence>
@@ -9436,9 +9436,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="obraz" type="environment">
+<cd:command name="figure" type="environment">
   <cd:sequence>
-    <cd:string value="obraz"/>
+    <cd:string value="figure"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords interactive="exclusive">
@@ -9459,47 +9459,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="odkazujici*obrazek">
-  <cd:sequence>
-    <cd:string value="odkazujici*obrazek"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:position list="yes"/>
-    <cd:position list="yes"/>
-    <cd:keywords>
-      <cd:constant type="cd:number"/>
-    </cd:keywords>
-  </cd:arguments>
-</cd:command>
+<!-- referring*figure skipped -->
 
-<cd:command name="znaceni*obrazek">
-  <cd:sequence>
-    <cd:string value="znaceni*obrazek"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:position list="yes"/>
-    <cd:position list="yes"/>
-    <cd:keywords>
-      <cd:constant type="cd:number"/>
-    </cd:keywords>
-  </cd:arguments>
-</cd:command>
+<!-- marking*figure skipped -->
 
-<cd:command name="oznaceni">
-  <cd:sequence>
-    <cd:string value="oznaceni"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:position/>
-    <cd:position/>
-    <cd:assignments list="yes">
-      <cd:constant type="cd:number"/>
-    </cd:assignments>
-    <cd:content/>
-  </cd:arguments>
-</cd:command>
+<!-- remark skipped -->
 
-<cd:command name="jdina">
+<cd:command name="jdina" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="jdina"/>
   </cd:sequence>
@@ -9510,7 +9476,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="jdinabox">
+<cd:command name="jdinabox" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="jdinabox"/>
   </cd:sequence>
@@ -9533,7 +9499,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavtlacitka">
+<cd:command name="nastavtlacitka" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="nastavtlacitka"/>
   </cd:sequence>
@@ -9548,23 +9514,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tlacitkomenu">
-  <cd:sequence>
-    <cd:string value="tlacitkomenu"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:keywords interactive="exclusive" optional="yes">
-      <cd:inherit name="nastavoramovani"/>
-    </cd:keywords>
-    <cd:assignments optional="yes" list="yes">
-      <cd:constant type="cd:text"/>
-    </cd:assignments>
-    <cd:content/>
-    <cd:reference list="yes"/>
-  </cd:arguments>
-</cd:command>
+<!-- menubutton skipped -->
 
-<cd:command name="nastavkomentar">
+<cd:command name="nastavkomentar" file="core-int.tex">
   <cd:sequence>
     <cd:string value="nastavkomentar"/>
   </cd:sequence>
@@ -9643,7 +9595,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujpole">
+<cd:command name="definujpole" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definujpole"/>
   </cd:sequence>
@@ -9666,7 +9618,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujpodpole">
+<cd:command name="definujpodpole" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definujpodpole"/>
   </cd:sequence>
@@ -9683,7 +9635,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kopirujpole">
+<cd:command name="kopirujpole" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="kopirujpole"/>
   </cd:sequence>
@@ -9697,7 +9649,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="klonujpole">
+<cd:command name="klonujpole" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="klonujpole"/>
   </cd:sequence>
@@ -9717,7 +9669,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="pole">
+<cd:command name="pole" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="pole"/>
   </cd:sequence>
@@ -9728,7 +9680,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="prizpusobivepole">
+<cd:command name="prizpusobivepole" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="prizpusobivepole"/>
   </cd:sequence>
@@ -9739,7 +9691,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vyplnovepole">
+<cd:command name="vyplnovepole" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="vyplnovepole"/>
   </cd:sequence>
@@ -9751,7 +9703,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="bublinkovanapoveda">
+<cd:command name="bublinkovanapoveda" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="bublinkovanapoveda"/>
   </cd:sequence>
@@ -9766,7 +9718,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ukazpole">
+<cd:command name="ukazpole" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="ukazpole"/>
   </cd:sequence>
@@ -9777,13 +9729,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zaznamovepole">
+<cd:command name="zaznamovepole" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="zaznamovepole"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="nastavpole">
+<cd:command name="nastavpole" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="nastavpole"/>
   </cd:sequence>
@@ -9807,7 +9759,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavvsechnapole">
+<cd:command name="nastavvsechnapole" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="nastavvsechnapole"/>
   </cd:sequence>
@@ -9904,7 +9856,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupforms">
+<cd:command name="setupforms" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="setupforms"/>
   </cd:sequence>
@@ -9918,7 +9870,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definujzasobnikpoli">
+<cd:command name="definujzasobnikpoli" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definujzasobnikpoli"/>
   </cd:sequence>
@@ -9935,7 +9887,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zasobnikpoli">
+<cd:command name="zasobnikpoli" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="zasobnikpoli"/>
   </cd:sequence>
@@ -9952,7 +9904,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="orez">
+<cd:command name="orez" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="orez"/>
   </cd:sequence>
@@ -9964,7 +9916,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nastavorez">
+<cd:command name="nastavorez" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="nastavorez"/>
   </cd:sequence>
@@ -10253,7 +10205,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupstrut">
+<cd:command name="setupstrut" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="setupstrut"/>
   </cd:sequence>
diff --git a/context/data/cont-de.xml b/tex/context/interface/cont-de.xml
index deca6259c..cf4b8fc9c 100644
--- a/context/data/cont-de.xml
+++ b/tex/context/interface/cont-de.xml
@@ -2,7 +2,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context">
 
-<cd:command name="installieresprache">
+<cd:command name="installieresprache" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="installieresprache"/>
   </cd:sequence>
@@ -56,7 +56,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellespracheein">
+<cd:command name="stellespracheein" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="stellespracheein"/>
   </cd:sequence>
@@ -95,7 +95,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="hauptsprache">
+<cd:command name="hauptsprache" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="hauptsprache"/>
   </cd:sequence>
@@ -113,7 +113,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uebersetzten">
+<cd:command name="uebersetzten" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="uebersetzten"/>
   </cd:sequence>
@@ -126,7 +126,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="benutzekodierung">
+<cd:command name="benutzekodierung" file="enco-ini.tex">
   <cd:sequence>
     <cd:string value="benutzekodierung"/>
   </cd:sequence>
@@ -137,19 +137,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="benutzespezielles">
+<cd:command name="benutzespezielles" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="benutzespezielles"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords list="yes">
-      <cd:constant type="reset"/>
+      <cd:constant type="zuruecksetzten"/>
       <cd:constant type="cd:name"/>
     </cd:keywords>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineoutput">
+<cd:command name="defineoutput" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="defineoutput"/>
   </cd:sequence>
@@ -163,7 +163,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleausgabeein">
+<cd:command name="stelleausgabeein" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="stelleausgabeein"/>
   </cd:sequence>
@@ -174,7 +174,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierefliesstextumgebung">
+<cd:command name="definierefliesstextumgebung" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definierefliesstextumgebung"/>
   </cd:sequence>
@@ -211,7 +211,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellefliesstextumgebungein">
+<cd:command name="stellefliesstextumgebungein" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="stellefliesstextumgebungein"/>
   </cd:sequence>
@@ -236,7 +236,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierefliesstext">
+<cd:command name="definierefliesstext" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definierefliesstext"/>
   </cd:sequence>
@@ -335,7 +335,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="wechselezumfliesstext">
+<cd:command name="wechselezumfliesstext" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="wechselezumfliesstext"/>
   </cd:sequence>
@@ -351,7 +351,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiereschrift">
+<cd:command name="definiereschrift" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definiereschrift"/>
   </cd:sequence>
@@ -365,7 +365,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupstrut">
+<cd:command name="setupstrut" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="setupstrut"/>
   </cd:sequence>
@@ -379,7 +379,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellefarbeein">
+<cd:command name="stellefarbeein" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="stellefarbeein"/>
   </cd:sequence>
@@ -390,7 +390,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellefarbenein">
+<cd:command name="stellefarbenein" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="stellefarbenein"/>
   </cd:sequence>
@@ -448,7 +448,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierefarbe">
+<cd:command name="definierefarbe" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definierefarbe"/>
   </cd:sequence>
@@ -485,7 +485,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="farbe" type="environment">
+<cd:command name="farbe" type="environment" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="farbe"/>
   </cd:sequence>
@@ -496,7 +496,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="farbe">
+<cd:command name="farbe" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="farbe"/>
   </cd:sequence>
@@ -508,7 +508,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="graufarbe">
+<cd:command name="graufarbe" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="graufarbe"/>
   </cd:sequence>
@@ -530,7 +530,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierepalette">
+<cd:command name="definierepalette" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definierepalette"/>
   </cd:sequence>
@@ -546,7 +546,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellepaletteein">
+<cd:command name="stellepaletteein" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="stellepaletteein"/>
   </cd:sequence>
@@ -557,7 +557,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierefarbengruppe">
+<cd:command name="definierefarbengruppe" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definierefarbengruppe"/>
   </cd:sequence>
@@ -605,7 +605,7 @@
       <cd:constant type="vertikal"/>
       <cd:constant type="name"/>
       <cd:constant type="wert"/>
-      <cd:constant type="nummer"/>
+      <cd:variable type="cd:number"/>
     </cd:keywords>
   </cd:arguments>
 </cd:command>
@@ -632,13 +632,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zeigeumbruch">
+<cd:command name="zeigeumbruch" file="supp-vis.tex">
   <cd:sequence>
     <cd:string value="zeigeumbruch"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definetype">
+<cd:command name="definetype" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="definetype"/>
   </cd:sequence>
@@ -652,7 +652,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelletipein">
+<cd:command name="stelletipein" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="stelletipein"/>
   </cd:sequence>
@@ -674,7 +674,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="farbe">
@@ -684,16 +684,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tippen">
+<cd:command name="type" file="verb-ini.tex">
   <cd:sequence>
-    <cd:string value="tippen"/>
+    <cd:string value="type"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tip">
+<cd:command name="tip" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="tip"/>
   </cd:sequence>
@@ -702,7 +702,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tex">
+<cd:command name="tex" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="tex"/>
   </cd:sequence>
@@ -711,7 +711,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="arg">
+<cd:command name="arg" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="arg"/>
   </cd:sequence>
@@ -720,7 +720,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieretippen">
+<cd:command name="definieretippen" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="definieretippen"/>
   </cd:sequence>
@@ -736,7 +736,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelletippenein">
+<cd:command name="stelletippenein" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="stelletippenein"/>
   </cd:sequence>
@@ -816,7 +816,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="farbe">
@@ -834,7 +834,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tippen" type="environment" generated="yes">
+<cd:command name="typing" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="tippen"/>
   </cd:sequence>
@@ -842,7 +842,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tippedatei">
+<cd:command name="tippedatei" file="verb-ini.tex">
   <cd:sequence>
     <cd:string value="tippedatei"/>
   </cd:sequence>
@@ -854,7 +854,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellefussnotenein">
+<cd:command name="stellefussnotenein" file="core-not.tex">
   <cd:sequence>
     <cd:string value="stellefussnotenein"/>
   </cd:sequence>
@@ -868,8 +868,8 @@
         <cd:constant type="Roemischezahlen"/>
       </cd:parameter>
       <cd:parameter name="art">
-        <cd:constant type="protext"/>
-        <cd:constant type="procd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="platz">
         <cd:constant type="seite"/>
@@ -910,7 +910,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="abstand">
@@ -944,7 +944,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="textfarbe">
@@ -962,7 +962,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellefussnotendefinitionein">
+<cd:command name="stellefussnotendefinitionein" file="core-not.tex">
   <cd:sequence>
     <cd:string value="stellefussnotendefinitionein"/>
   </cd:sequence>
@@ -973,7 +973,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="fussnote">
+<cd:command name="fussnote" file="core-not.tex">
   <cd:sequence>
     <cd:string value="fussnote"/>
   </cd:sequence>
@@ -983,7 +983,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="footnotetext">
+<cd:command name="footnotetext" file="core-not.tex">
   <cd:sequence>
     <cd:string value="footnotetext"/>
   </cd:sequence>
@@ -993,7 +993,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="notiz">
+<cd:command name="notiz" file="core-not.tex">
   <cd:sequence>
     <cd:string value="notiz"/>
   </cd:sequence>
@@ -1002,15 +1002,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="lokalefussnoten" type="environment">
+<cd:command name="localfootnotes" type="environment">
   <cd:sequence>
-    <cd:string value="lokalefussnoten"/>
+    <cd:string value="localfootnotes"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="platzierelokalefussnoten">
+<cd:command name="platzierelokalefussnoten" file="core-not.tex">
   <cd:sequence>
     <cd:string value="platzierelokalefussnoten"/>
   </cd:sequence>
@@ -1021,7 +1021,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="platzierefussnoten">
+<cd:command name="platzierefussnoten" file="core-not.tex">
   <cd:sequence>
     <cd:string value="platzierefussnoten"/>
   </cd:sequence>
@@ -1032,7 +1032,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleunterstreichenein">
+<cd:command name="stelleunterstreichenein" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="stelleunterstreichenein"/>
   </cd:sequence>
@@ -1059,7 +1059,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="unterstrichen">
+<cd:command name="unterstrichen" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="unterstrichen"/>
   </cd:sequence>
@@ -1068,7 +1068,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="unterstreichen">
+<cd:command name="unterstreichen" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="unterstreichen"/>
   </cd:sequence>
@@ -1077,7 +1077,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ueberstrichen">
+<cd:command name="ueberstrichen" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="ueberstrichen"/>
   </cd:sequence>
@@ -1086,7 +1086,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ueberstreichen">
+<cd:command name="ueberstreichen" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="ueberstreichen"/>
   </cd:sequence>
@@ -1095,7 +1095,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="durchgestrichen">
+<cd:command name="durchgestrichen" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="durchgestrichen"/>
   </cd:sequence>
@@ -1104,7 +1104,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="durchstreichen">
+<cd:command name="durchstreichen" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="durchstreichen"/>
   </cd:sequence>
@@ -1113,7 +1113,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="roemischezahlen">
+<cd:command name="roemischezahlen" file="core-con.tex">
   <cd:sequence>
     <cd:string value="roemischezahlen"/>
   </cd:sequence>
@@ -1122,7 +1122,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Roemischezahlen">
+<cd:command name="Roemischezahlen" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Roemischezahlen"/>
   </cd:sequence>
@@ -1131,7 +1131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ziffern">
+<cd:command name="ziffern" file="core-con.tex">
   <cd:sequence>
     <cd:string value="ziffern"/>
   </cd:sequence>
@@ -1140,7 +1140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="buchstabe">
+<cd:command name="buchstabe" file="core-con.tex">
   <cd:sequence>
     <cd:string value="buchstabe"/>
   </cd:sequence>
@@ -1149,7 +1149,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Buchstabe">
+<cd:command name="Buchstabe" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Buchstabe"/>
   </cd:sequence>
@@ -1158,7 +1158,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="buchstaben">
+<cd:command name="buchstaben" file="core-con.tex">
   <cd:sequence>
     <cd:string value="buchstaben"/>
   </cd:sequence>
@@ -1167,7 +1167,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Buchstaben">
+<cd:command name="Buchstaben" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Buchstaben"/>
   </cd:sequence>
@@ -1176,16 +1176,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mittelalterlich">
+<cd:command name="mediaeval" file="core-con.tex">
   <cd:sequence>
-    <cd:string value="mittelalterlich"/>
+    <cd:string value="mediaeval"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="monat">
+<cd:command name="monat" file="core-con.tex">
   <cd:sequence>
     <cd:string value="monat"/>
   </cd:sequence>
@@ -1194,7 +1194,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="MONAT">
+<cd:command name="MONAT" file="core-con.tex">
   <cd:sequence>
     <cd:string value="MONAT"/>
   </cd:sequence>
@@ -1203,7 +1203,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="wochentag">
+<cd:command name="wochentag" file="core-con.tex">
   <cd:sequence>
     <cd:string value="wochentag"/>
   </cd:sequence>
@@ -1212,7 +1212,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="WOCHENTAG">
+<cd:command name="WOCHENTAG" file="core-con.tex">
   <cd:sequence>
     <cd:string value="WOCHENTAG"/>
   </cd:sequence>
@@ -1221,7 +1221,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleversalienein">
+<cd:command name="stelleversalienein" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="stelleversalienein"/>
   </cd:sequence>
@@ -1239,52 +1239,52 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kap">
+<cd:command name="cap" file="core-fnt.tex">
   <cd:sequence>
-    <cd:string value="kap"/>
+    <cd:string value="cap"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nokap">
+<cd:command name="nocap">
   <cd:sequence>
-    <cd:string value="nokap"/>
+    <cd:string value="nocap"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="KAP">
+<cd:command name="CAP">
   <cd:sequence>
-    <cd:string value="KAP"/>
+    <cd:string value="CAP"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Kap">
+<cd:command name="Cap">
   <cd:sequence>
-    <cd:string value="Kap"/>
+    <cd:string value="Cap"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Kaps">
+<cd:command name="Caps">
   <cd:sequence>
-    <cd:string value="Kaps"/>
+    <cd:string value="Caps"/>
   </cd:sequence>
   <cd:arguments>
     <cd:word list="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="WORT">
+<cd:command name="WORT" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="WORT"/>
   </cd:sequence>
@@ -1293,7 +1293,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="WOERTER">
+<cd:command name="WOERTER" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="WOERTER"/>
   </cd:sequence>
@@ -1302,7 +1302,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Wort">
+<cd:command name="Wort" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="Wort"/>
   </cd:sequence>
@@ -1311,7 +1311,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Woerter">
+<cd:command name="Woerter" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="Woerter"/>
   </cd:sequence>
@@ -1320,7 +1320,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gestreckt">
+<cd:command name="gestreckt" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="gestreckt"/>
   </cd:sequence>
@@ -1329,7 +1329,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieresymbol">
+<cd:command name="definieresymbol" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="definieresymbol"/>
   </cd:sequence>
@@ -1343,7 +1343,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiereabbsymbol">
+<cd:command name="definiereabbsymbol" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="definiereabbsymbol"/>
   </cd:sequence>
@@ -1360,7 +1360,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="symbol">
+<cd:command name="symbol" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="symbol"/>
   </cd:sequence>
@@ -1385,7 +1385,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellesymbolsetein">
+<cd:command name="stellesymbolsetein" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="stellesymbolsetein"/>
   </cd:sequence>
@@ -1396,7 +1396,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verwendesymbole">
+<cd:command name="verwendesymbole" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="verwendesymbole"/>
   </cd:sequence>
@@ -1418,7 +1418,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierekonversion">
+<cd:command name="definierekonversion" file="core-con.tex">
   <cd:sequence>
     <cd:string value="definierekonversion"/>
   </cd:sequence>
@@ -1433,7 +1433,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="konvertierezahl">
+<cd:command name="konvertierezahl" file="core-con.tex">
   <cd:sequence>
     <cd:string value="konvertierezahl"/>
   </cd:sequence>
@@ -1443,7 +1443,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleueberschrifttextein">
+<cd:command name="stelleueberschrifttextein" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="stelleueberschrifttextein"/>
   </cd:sequence>
@@ -1466,7 +1466,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellelabeltextein">
+<cd:command name="stellelabeltextein" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="stellelabeltextein"/>
   </cd:sequence>
@@ -1489,7 +1489,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ueberschrifttext">
+<cd:command name="ueberschrifttext" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="ueberschrifttext"/>
   </cd:sequence>
@@ -1507,7 +1507,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellemarginallinieein">
+<cd:command name="stellemarginallinieein" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stellemarginallinieein"/>
   </cd:sequence>
@@ -1546,7 +1546,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellelinienbreiteein">
+<cd:command name="stellelinienbreiteein" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stellelinienbreiteein"/>
   </cd:sequence>
@@ -1557,7 +1557,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleumrahmtein">
+<cd:command name="stelleumrahmtein" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stelleumrahmtein"/>
   </cd:sequence>
@@ -1701,7 +1701,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umrahmt">
+<cd:command name="umrahmt" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="umrahmt"/>
   </cd:sequence>
@@ -1713,7 +1713,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="imumriss">
+<cd:command name="imumriss" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="imumriss"/>
   </cd:sequence>
@@ -1725,7 +1725,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="duennerumriss">
+<cd:command name="duennerumriss" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="duennerumriss"/>
   </cd:sequence>
@@ -1736,7 +1736,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleduennerumrissein">
+<cd:command name="stelleduennerumrissein" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stelleduennerumrissein"/>
   </cd:sequence>
@@ -1795,19 +1795,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="haarlinie">
+<cd:command name="haarlinie" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="haarlinie"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="duennelinie">
+<cd:command name="duennelinie" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="duennelinie"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definiereumrahmtertext">
+<cd:command name="definiereumrahmtertext" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="definiereumrahmtertext"/>
   </cd:sequence>
@@ -1821,7 +1821,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiereumrahmt">
+<cd:command name="definiereumrahmt" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="definiereumrahmt"/>
   </cd:sequence>
@@ -1835,7 +1835,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleumrahmtetexteein">
+<cd:command name="stelleumrahmtetexteein" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stelleumrahmtetexteein"/>
   </cd:sequence>
@@ -1854,7 +1854,7 @@
         <cd:constant type="geneigt"/>
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="links">
@@ -1896,7 +1896,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umrahmtertext" type="environment" generated="yes">
+<cd:command name="framedtext" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="umrahmtertext"/>
   </cd:sequence>
@@ -1913,7 +1913,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="umrahmtertext" generated="yes">
+<cd:command name="framedtext" generated="yes">
   <cd:sequence>
     <cd:variable value="umrahmtertext"/>
   </cd:sequence>
@@ -1938,7 +1938,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="stellehintergrundein">
+<cd:command name="stellehintergrundein" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stellehintergrundein"/>
   </cd:sequence>
@@ -1997,7 +1997,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellegefuelltesrechteckein">
+<cd:command name="stellegefuelltesrechteckein" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stellegefuelltesrechteckein"/>
   </cd:sequence>
@@ -2024,7 +2024,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="n">
@@ -2054,7 +2054,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellegefuelltezeileein">
+<cd:command name="stellegefuelltezeileein" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stellegefuelltezeileein"/>
   </cd:sequence>
@@ -2079,7 +2079,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelletextumrissein">
+<cd:command name="stelletextumrissein" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stelletextumrissein"/>
   </cd:sequence>
@@ -2121,7 +2121,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="linienfarbe">
@@ -2131,7 +2131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="textlinie">
+<cd:command name="textlinie" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="textlinie"/>
   </cd:sequence>
@@ -2144,7 +2144,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="textlinie" type="environment">
+<cd:command name="textlinie" type="environment" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="textlinie"/>
   </cd:sequence>
@@ -2157,7 +2157,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="rechteck">
+<cd:command name="rechteck" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="rechteck"/>
   </cd:sequence>
@@ -2168,7 +2168,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="rechtecke">
+<cd:command name="rechtecke" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="rechtecke"/>
   </cd:sequence>
@@ -2179,7 +2179,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellerechteckein">
+<cd:command name="stellerechteckein" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stellerechteckein"/>
   </cd:sequence>
@@ -2211,7 +2211,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiereoverlay">
+<cd:command name="definiereoverlay" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="definiereoverlay"/>
   </cd:sequence>
@@ -2236,7 +2236,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ruecksetzten">
+<cd:command name="ruecksetzten" file="core-num.tex">
   <cd:sequence>
     <cd:string value="ruecksetzten"/>
   </cd:sequence>
@@ -2253,15 +2253,15 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="lokaleumgebung" type="environment">
+<cd:command name="localenvironment" type="environment">
   <cd:sequence>
-    <cd:string value="lokaleumgebung"/>
+    <cd:string value="localenvironment"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellesystemein">
+<cd:command name="stellesystemein" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="stellesystemein"/>
   </cd:sequence>
@@ -2287,9 +2287,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="benutzeverzeichnis">
+<cd:command name="usedirectory">
   <cd:sequence>
-    <cd:string value="benutzeverzeichnis"/>
+    <cd:string value="usedirectory"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords list="yes">
@@ -2299,7 +2299,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tief">
+<cd:command name="tief" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="tief"/>
   </cd:sequence>
@@ -2308,7 +2308,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="hoch">
+<cd:command name="hoch" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="hoch"/>
   </cd:sequence>
@@ -2317,7 +2317,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tiho">
+<cd:command name="tiho" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="tiho"/>
   </cd:sequence>
@@ -2343,7 +2343,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="linksbuendig">
+<cd:command name="linksbuendig" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="linksbuendig"/>
   </cd:sequence>
@@ -2352,7 +2352,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="rechtsbuendig">
+<cd:command name="rechtsbuendig" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="rechtsbuendig"/>
   </cd:sequence>
@@ -2361,7 +2361,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zentriert">
+<cd:command name="zentriert" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="zentriert"/>
   </cd:sequence>
@@ -2370,7 +2370,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="wortrechts">
+<cd:command name="wortrechts" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="wortrechts"/>
   </cd:sequence>
@@ -2379,7 +2379,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inmarginalie">
+<cd:command name="inmarginalie" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="inmarginalie"/>
   </cd:sequence>
@@ -2394,7 +2394,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inanderermarginale">
+<cd:command name="inanderermarginale" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="inanderermarginale"/>
   </cd:sequence>
@@ -2475,7 +2475,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="zeigestruts">
+<cd:command name="zeigestruts" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="zeigestruts"/>
   </cd:sequence>
@@ -2493,7 +2493,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="marginaltext">
+<cd:command name="marginaltext" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="marginaltext"/>
   </cd:sequence>
@@ -2508,7 +2508,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellemarginalblockein">
+<cd:command name="stellemarginalblockein" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="stellemarginalblockein"/>
   </cd:sequence>
@@ -2527,7 +2527,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="breite">
@@ -2564,17 +2564,17 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="marginalblock" type="environment">
+<cd:command name="marginblock" type="environment">
   <cd:sequence>
-    <cd:string value="marginalblock"/>
+    <cd:string value="marginblock"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="teil">
+<cd:command name="part" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="teil"/>
+    <cd:string value="part"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2582,9 +2582,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="titel">
+<cd:command name="title" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="titel"/>
+    <cd:string value="title"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2592,9 +2592,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kapitel">
+<cd:command name="chapter" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="kapitel"/>
+    <cd:string value="chapter"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2602,9 +2602,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="absatz">
+<cd:command name="section" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="absatz"/>
+    <cd:string value="section"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2612,9 +2612,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="unterabsatz">
+<cd:command name="subsection" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="unterabsatz"/>
+    <cd:string value="subsection"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2622,9 +2622,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="unterunterabsatz">
+<cd:command name="subsubsection" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="unterunterabsatz"/>
+    <cd:string value="subsubsection"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2632,9 +2632,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="thema">
+<cd:command name="subject" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="thema"/>
+    <cd:string value="subject"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2642,9 +2642,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="unterthema">
+<cd:command name="subsubject" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="unterthema"/>
+    <cd:string value="subsubject"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2652,9 +2652,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="unterunterthema">
+<cd:command name="subsubsubject" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="unterunterthema"/>
+    <cd:string value="subsubsubject"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2662,9 +2662,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="anhang">
+<cd:command name="appendix" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="anhang"/>
+    <cd:string value="appendix"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2672,7 +2672,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="in">
+<cd:command name="in" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="in"/>
   </cd:sequence>
@@ -2704,7 +2704,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="irgendwo">
+<cd:command name="irgendwo" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="irgendwo"/>
   </cd:sequence>
@@ -2715,7 +2715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="aufseite">
+<cd:command name="aufseite" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="aufseite"/>
   </cd:sequence>
@@ -2724,7 +2724,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ref">
+<cd:command name="ref" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="ref"/>
   </cd:sequence>
@@ -2740,7 +2740,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="textreferenz">
+<cd:command name="textreferenz" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="textreferenz"/>
   </cd:sequence>
@@ -2750,7 +2750,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seitenreferenz">
+<cd:command name="seitenreferenz" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="seitenreferenz"/>
   </cd:sequence>
@@ -2759,7 +2759,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="referenz">
+<cd:command name="referenz" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="referenz"/>
   </cd:sequence>
@@ -2769,7 +2769,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verwendereferenzen">
+<cd:command name="verwendereferenzen" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="verwendereferenzen"/>
   </cd:sequence>
@@ -2780,7 +2780,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierereferenz">
+<cd:command name="definierereferenz" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definierereferenz"/>
   </cd:sequence>
@@ -2792,7 +2792,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierereferenzformat">
+<cd:command name="definierereferenzformat" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definierereferenzformat"/>
   </cd:sequence>
@@ -2839,7 +2839,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nachunten">
+<cd:command name="nachunten" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="nachunten"/>
   </cd:sequence>
@@ -2850,37 +2850,37 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zwischenraum">
+<cd:command name="zwischenraum" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="zwischenraum"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="keinzwischenraum">
+<cd:command name="keinzwischenraum" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="keinzwischenraum"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="crlf">
+<cd:command name="crlf" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="crlf"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="spatium">
+<cd:command name="spatium" file="syst-pln.tex">
   <cd:sequence>
     <cd:string value="spatium"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="festesspatium">
+<cd:command name="festesspatium" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="festesspatium"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="emptylines">
+<cd:command name="emptylines" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="emptylines"/>
   </cd:sequence>
@@ -2891,19 +2891,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="keinspatium">
+<cd:command name="keinspatium" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="keinspatium"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="kleinerdurchschuss">
+<cd:command name="kleinerdurchschuss" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="kleinerdurchschuss"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definierebeschreibungen">
+<cd:command name="definierebeschreibungen" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definierebeschreibungen"/>
   </cd:sequence>
@@ -2919,7 +2919,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stil">
@@ -2929,7 +2929,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="farbe">
@@ -3004,7 +3004,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellebeschreibungein">
+<cd:command name="stellebeschreibungein" file="core-des.tex">
   <cd:sequence>
     <cd:string value="stellebeschreibungein"/>
   </cd:sequence>
@@ -3018,7 +3018,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierenummerierung">
+<cd:command name="definierenummerierung" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definierenummerierung"/>
   </cd:sequence>
@@ -3035,24 +3035,24 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nummerierung" generated="yes">
+<cd:command name="enumeration" generated="yes">
   <cd:sequence>
-    <cd:variable value="nummerierung"/>
+    <cd:variable value="enumeration"/>
   </cd:sequence>
   <cd:arguments>
     <cd:nothing interactive="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nummerierung" type="environment" generated="yes">
+<cd:command name="enumeration" type="environment" generated="yes">
   <cd:sequence>
-    <cd:variable value="nummerierung"/>
+    <cd:variable value="enumeration"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierebeschreibung">
+<cd:command name="definierebeschreibung" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definierebeschreibung"/>
   </cd:sequence>
@@ -3066,9 +3066,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="beschreibung" generated="yes">
+<cd:command name="description" generated="yes">
   <cd:sequence>
-    <cd:variable value="beschreibung"/>
+    <cd:variable value="description"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
@@ -3076,16 +3076,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="beschreibung" type="environment" generated="yes">
+<cd:command name="description" type="environment" generated="yes">
   <cd:sequence>
-    <cd:variable value="beschreibung"/>
+    <cd:variable value="description"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleeinzuegein">
+<cd:command name="stelleeinzuegein" file="core-des.tex">
   <cd:sequence>
     <cd:string value="stelleeinzuegein"/>
   </cd:sequence>
@@ -3101,7 +3101,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="kopfstil">
@@ -3111,7 +3111,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="breite">
@@ -3140,7 +3140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiereeinzug">
+<cd:command name="definiereeinzug" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definiereeinzug"/>
   </cd:sequence>
@@ -3154,16 +3154,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="einzug" generated="yes">
+<cd:command name="indentation" generated="yes" file="core-spa.tex">
   <cd:sequence>
-    <cd:variable value="einzug"/>
+    <cd:variable value="indentation"/>
   </cd:sequence>
   <cd:arguments>
     <cd:nothing/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierelabel">
+<cd:command name="definierelabel" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definierelabel"/>
   </cd:sequence>
@@ -3180,8 +3180,8 @@
         <cd:constant type="imtext"/>
       </cd:parameter>
       <cd:parameter name="art">
-        <cd:constant type="protext"/>
-        <cd:constant type="procd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="blockauf">
         <cd:constant type="ja"/>
@@ -3194,7 +3194,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="kopffarbe">
@@ -3210,16 +3210,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="beschriften" generated="yes">
+<cd:command name="labeling" generated="yes">
   <cd:sequence>
-    <cd:variable value="beschriften"/>
+    <cd:variable value="labeling"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellespaltenein">
+<cd:command name="stellespaltenein" file="page-mul.tex">
   <cd:sequence>
     <cd:string value="stellespaltenein"/>
   </cd:sequence>
@@ -3278,9 +3278,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="spalten" type="environment">
+<cd:command name="columns" type="environment">
   <cd:sequence>
-    <cd:string value="spalten"/>
+    <cd:string value="columns"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments optional="yes" list="yes">
@@ -3289,7 +3289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieretext">
+<cd:command name="definieretext" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="definieretext"/>
   </cd:sequence>
@@ -3313,7 +3313,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellekopfzeileein">
+<cd:command name="stellekopfzeileein" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stellekopfzeileein"/>
   </cd:sequence>
@@ -3345,7 +3345,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="linkerstil">
@@ -3355,7 +3355,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="rechterstil">
@@ -3365,7 +3365,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="linkerbreite">
@@ -3384,7 +3384,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellefusszeileein">
+<cd:command name="stellefusszeileein" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stellefusszeileein"/>
   </cd:sequence>
@@ -3398,7 +3398,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelletextein">
+<cd:command name="stelletextein" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stelletextein"/>
   </cd:sequence>
@@ -3412,7 +3412,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellenobenein">
+<cd:command name="stellenobenein" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stellenobenein"/>
   </cd:sequence>
@@ -3426,7 +3426,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleuntenein">
+<cd:command name="stelleuntenein" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stelleuntenein"/>
   </cd:sequence>
@@ -3440,19 +3440,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="keinekopfundfusszeilen">
+<cd:command name="keinekopfundfusszeilen" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="keinekopfundfusszeilen"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="keinzeilenobenundunten">
+<cd:command name="keinzeilenobenundunten" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="keinzeilenobenundunten"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="stellekopfzeilentextein">
+<cd:command name="stellekopfzeilentextein" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stellekopfzeilentextein"/>
   </cd:sequence>
@@ -3479,7 +3479,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellefusszeilentextein">
+<cd:command name="stellefusszeilentextein" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stellefusszeilentextein"/>
   </cd:sequence>
@@ -3506,7 +3506,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelletexttexteein">
+<cd:command name="stelletexttexteein" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stelletexttexteein"/>
   </cd:sequence>
@@ -3533,7 +3533,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelletextobenein">
+<cd:command name="stelletextobenein" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stelletextobenein"/>
   </cd:sequence>
@@ -3560,7 +3560,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelletextuntenein">
+<cd:command name="stelletextuntenein" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stelletextuntenein"/>
   </cd:sequence>
@@ -3587,7 +3587,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierebeschriftung">
+<cd:command name="definierebeschriftung" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="definierebeschriftung"/>
   </cd:sequence>
@@ -3601,7 +3601,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verknuepfebeschriftung">
+<cd:command name="verknuepfebeschriftung" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="verknuepfebeschriftung"/>
   </cd:sequence>
@@ -3615,7 +3615,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="entknuepfebeschriftung">
+<cd:command name="entknuepfebeschriftung" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="entknuepfebeschriftung"/>
   </cd:sequence>
@@ -3626,7 +3626,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ruecksetztenbeschriftung">
+<cd:command name="ruecksetztenbeschriftung" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="ruecksetztenbeschriftung"/>
   </cd:sequence>
@@ -3637,7 +3637,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellebeschriftungein">
+<cd:command name="stellebeschriftungein" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="stellebeschriftungein"/>
   </cd:sequence>
@@ -3661,7 +3661,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="beschriftung">
+<cd:command name="beschriftung" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="beschriftung"/>
   </cd:sequence>
@@ -3673,7 +3673,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="holebeschriftung">
+<cd:command name="holebeschriftung" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="holebeschriftung"/>
   </cd:sequence>
@@ -3692,7 +3692,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="keinebeschriftung">
+<cd:command name="keinebeschriftung" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="keinebeschriftung"/>
   </cd:sequence>
@@ -3701,7 +3701,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellelayoutein">
+<cd:command name="stellelayoutein" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="stellelayoutein"/>
   </cd:sequence>
@@ -3787,7 +3787,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="farbe">
@@ -3865,7 +3865,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="passelayoutan">
+<cd:command name="passelayoutan" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="passelayoutan"/>
   </cd:sequence>
@@ -3885,13 +3885,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zeigegitter">
+<cd:command name="zeigegitter" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="zeigegitter"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="amgitterausrichten">
+<cd:command name="amgitterausrichten" file="core-grd.tex">
   <cd:sequence>
     <cd:string value="amgitterausrichten"/>
   </cd:sequence>
@@ -3903,7 +3903,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="amgitterneuausrichten">
+<cd:command name="amgitterneuausrichten" file="core-grd.tex">
   <cd:sequence>
     <cd:string value="amgitterneuausrichten"/>
   </cd:sequence>
@@ -3912,9 +3912,9 @@
       <cd:constant type="oben"/>
       <cd:constant type="beide"/>
       <cd:constant type="unten"/>
-      <cd:constant type="-oben"/>
-      <cd:constant type="-beide"/>
-      <cd:constant type="-unten"/>
+      <cd:constant type="-top"/>
+      <cd:constant type="-both"/>
+      <cd:constant type="-bottom"/>
       <cd:variable type="cd:text"/>
       <cd:constant type="hoch"/>
       <cd:constant type="mittig"/>
@@ -3949,9 +3949,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="produkt" type="environment">
+<cd:command name="product" type="environment">
   <cd:sequence>
-    <cd:string value="produkt"/>
+    <cd:string value="product"/>
   </cd:sequence>
   <cd:arguments>
     <cd:file/>
@@ -4008,7 +4008,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleseitennummeriernungein">
+<cd:command name="stelleseitennummeriernungein" file="page-num.tex">
   <cd:sequence>
     <cd:string value="stelleseitennummeriernungein"/>
   </cd:sequence>
@@ -4043,7 +4043,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="links">
@@ -4053,8 +4053,8 @@
         <cd:constant type="cd:text"/>
       </cd:parameter>
       <cd:parameter name="art">
-        <cd:constant type="protext"/>
-        <cd:constant type="procd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="text">
         <cd:constant type="cd:text"/>
@@ -4090,7 +4090,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleengerein">
+<cd:command name="stelleengerein" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="stelleengerein"/>
   </cd:sequence>
@@ -4109,7 +4109,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieren">
+<cd:command name="definieren" file="syst-ext.tex">
   <cd:sequence>
     <cd:string value="definieren"/>
   </cd:sequence>
@@ -4122,7 +4122,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verwendebefehl">
+<cd:command name="verwendebefehl" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="verwendebefehl"/>
   </cd:sequence>
@@ -4131,7 +4131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierestartstop">
+<cd:command name="definierestartstop" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="definierestartstop"/>
   </cd:sequence>
@@ -4153,7 +4153,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="befehle">
@@ -4163,7 +4163,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleueberschriftenein">
+<cd:command name="stelleueberschriftenein" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="stelleueberschriftenein"/>
   </cd:sequence>
@@ -4171,7 +4171,7 @@
     <cd:assignments list="yes">
       <cd:parameter name="abschnittsnummer">
         <cd:constant type="ja"/>
-        <cd:constant type="nummer"/>
+        <cd:variable type="cd:number"/>
         <cd:constant type="nein"/>
       </cd:parameter>
       <cd:parameter name="alternative">
@@ -4215,7 +4215,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellebilderunterschriftein">
+<cd:command name="stellebilderunterschriftein" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="stellebilderunterschriftein"/>
   </cd:sequence>
@@ -4246,7 +4246,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stil">
@@ -4256,7 +4256,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="nummer">
@@ -4280,8 +4280,8 @@
         <cd:constant type="Roemischezahlen"/>
       </cd:parameter>
       <cd:parameter name="art">
-        <cd:constant type="protext"/>
-        <cd:constant type="procd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="seperator">
         <cd:constant type="cd:text"/>
@@ -4296,7 +4296,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellebildunterschriftein">
+<cd:command name="stellebildunterschriftein" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="stellebildunterschriftein"/>
   </cd:sequence>
@@ -4310,7 +4310,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellegleitobjekteein">
+<cd:command name="stellegleitobjekteein" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="stellegleitobjekteein"/>
   </cd:sequence>
@@ -4394,7 +4394,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleplatziegeteiltegleitobjekt">
+<cd:command name="stelleplatziegeteiltegleitobjekt" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="stelleplatziegeteiltegleitobjekt"/>
   </cd:sequence>
@@ -4414,7 +4414,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="teilegleitobjekt">
+<cd:command name="teilegleitobjekt" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="teilegleitobjekt"/>
   </cd:sequence>
@@ -4427,7 +4427,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellegegenueberplatzierenein">
+<cd:command name="stellegegenueberplatzierenein" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="stellegegenueberplatzierenein"/>
   </cd:sequence>
@@ -4450,15 +4450,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gegenueber" type="environment">
+<cd:command name="opposite" type="environment">
   <cd:sequence>
-    <cd:string value="gegenueber"/>
+    <cd:string value="opposite"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellebindestrichein">
+<cd:command name="stellebindestrichein" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="stellebindestrichein"/>
   </cd:sequence>
@@ -4478,7 +4478,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellepositionierenein">
+<cd:command name="stellepositionierenein" file="page-lyr.tex">
   <cd:sequence>
     <cd:string value="stellepositionierenein"/>
   </cd:sequence>
@@ -4519,15 +4519,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="positionieren" type="environment">
+<cd:command name="positioning" type="environment">
   <cd:sequence>
-    <cd:string value="positionieren"/>
+    <cd:string value="positioning"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gitter">
+<cd:command name="gitter" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="gitter"/>
   </cd:sequence>
@@ -4584,7 +4584,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seite">
+<cd:command name="seite" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="seite"/>
   </cd:sequence>
@@ -4611,7 +4611,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellereferenzierenein">
+<cd:command name="stellereferenzierenein" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="stellereferenzierenein"/>
   </cd:sequence>
@@ -4667,7 +4667,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleurlein">
+<cd:command name="stelleurlein" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="stelleurlein"/>
   </cd:sequence>
@@ -4680,7 +4680,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="urlalternative">
@@ -4697,7 +4697,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="schreibezurreferenzliste">
+<cd:command name="schreibezurreferenzliste" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="schreibezurreferenzliste"/>
   </cd:sequence>
@@ -4721,7 +4721,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierereferenzliste">
+<cd:command name="definierereferenzliste" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definierereferenzliste"/>
   </cd:sequence>
@@ -4735,7 +4735,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellereferenzlisteein">
+<cd:command name="stellereferenzlisteein" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="stellereferenzlisteein"/>
   </cd:sequence>
@@ -4767,7 +4767,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="schreibezurliste">
+<cd:command name="schreibezurliste" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="schreibezurliste"/>
   </cd:sequence>
@@ -4781,7 +4781,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="schreibezwischenliste">
+<cd:command name="schreibezwischenliste" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="schreibezwischenliste"/>
   </cd:sequence>
@@ -4794,7 +4794,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="keineliste">
+<cd:command name="keineliste" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="keineliste"/>
   </cd:sequence>
@@ -4803,7 +4803,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="listsymbol">
+<cd:command name="listsymbol" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="listsymbol"/>
   </cd:sequence>
@@ -4815,7 +4815,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="platziereliste">
+<cd:command name="platziereliste" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="platziereliste"/>
   </cd:sequence>
@@ -4829,7 +4829,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="bestimmelistencharakeristika">
+<cd:command name="bestimmelistencharakeristika" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="bestimmelistencharakeristika"/>
   </cd:sequence>
@@ -4843,7 +4843,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="platzierezusammengestellteliste">
+<cd:command name="platzierezusammengestellteliste" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="platzierezusammengestellteliste"/>
   </cd:sequence>
@@ -4857,7 +4857,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiereliste">
+<cd:command name="definiereliste" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definiereliste"/>
   </cd:sequence>
@@ -4874,7 +4874,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellelisteein">
+<cd:command name="stellelisteein" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="stellelisteein"/>
   </cd:sequence>
@@ -4893,7 +4893,7 @@
         <cd:constant type="c"/>
         <cd:constant type="..."/>
         <cd:constant type="kein"/>
-        <cd:constant type="befehl"/>
+        <cd:variable type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="verknuepfung">
         <cd:constant type="an"/>
@@ -4916,7 +4916,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="nummernstil">
@@ -4926,7 +4926,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="textstil">
@@ -4936,7 +4936,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="seitenstil">
@@ -4946,7 +4946,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="farbe">
@@ -4965,7 +4965,7 @@
         <cd:constant type="cd:oneargument"/>
       </cd:parameter>
       <cd:parameter name="interaktion">
-        <cd:constant type="abschnittsnummer"/>
+        <cd:variable type="cd:sectionnumber"/>
         <cd:variable type="cd:text"/>
         <cd:constant type="seitennummer"/>
         <cd:constant type="alles"/>
@@ -5042,7 +5042,7 @@
       <cd:parameter name="expansion">
         <cd:constant type="ja"/>
         <cd:constant type="nein"/>
-        <cd:constant type="befehl"/>
+        <cd:variable type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="maxbreite">
         <cd:constant type="cd:dimension"/>
@@ -5052,7 +5052,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierezusammengestellteliste">
+<cd:command name="definierezusammengestellteliste" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definierezusammengestellteliste"/>
   </cd:sequence>
@@ -5069,7 +5069,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellezusammengestelltelisteein">
+<cd:command name="stellezusammengestelltelisteein" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="stellezusammengestelltelisteein"/>
   </cd:sequence>
@@ -5091,10 +5091,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="platzierekombiniereliste" generated="yes">
+<cd:command name="platzierezusammengestellteliste" generated="yes" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="platziere"/>
-    <cd:variable value="kombiniereliste"/>
+    <cd:variable value="combinedlist"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -5106,10 +5106,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vollendekombiniereliste" generated="yes">
+<cd:command name="completecombinedlist" generated="yes">
   <cd:sequence>
     <cd:string value="vollende"/>
-    <cd:variable value="kombiniereliste"/>
+    <cd:variable value="combinedlist"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -5121,15 +5121,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellenummerierungein">
+<cd:command name="stellenummerierungein" file="core-num.tex">
   <cd:sequence>
     <cd:string value="stellenummerierungein"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments list="yes">
       <cd:parameter name="art">
-        <cd:constant type="protext"/>
-        <cd:constant type="procd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="status">
         <cd:constant type="start"/>
@@ -5139,9 +5139,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleformelnein">
+<cd:command name="setupformulae">
   <cd:sequence>
-    <cd:string value="stelleformelnein"/>
+    <cd:string value="setupformulae"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments list="yes">
@@ -5199,7 +5199,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="publikation">
+<cd:command name="publikation" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="publikation"/>
   </cd:sequence>
@@ -5208,7 +5208,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellepublikationein">
+<cd:command name="stellepublikationein" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="stellepublikationein"/>
   </cd:sequence>
@@ -5223,7 +5223,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellezeilenein">
+<cd:command name="stellezeilenein" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="stellezeilenein"/>
   </cd:sequence>
@@ -5248,15 +5248,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zeilen" type="environment">
+<cd:command name="lines" type="environment">
   <cd:sequence>
-    <cd:string value="zeilen"/>
+    <cd:string value="lines"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleabsatznummerierungein">
+<cd:command name="stelleabsatznummerierungein" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="stelleabsatznummerierungein"/>
   </cd:sequence>
@@ -5275,7 +5275,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="abstand">
@@ -5285,7 +5285,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellezeilennumerierungein">
+<cd:command name="stellezeilennumerierungein" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="stellezeilennumerierungein"/>
   </cd:sequence>
@@ -5319,7 +5319,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="prefix">
@@ -5333,9 +5333,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zeilennumerierung" type="environment">
+<cd:command name="linenumbering" type="environment">
   <cd:sequence>
-    <cd:string value="zeilennumerierung"/>
+    <cd:string value="linenumbering"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -5344,16 +5344,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zeile" type="environment">
+<cd:command name="line" type="environment">
   <cd:sequence>
-    <cd:string value="zeile"/>
+    <cd:string value="line"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="einezeile">
+<cd:command name="einezeile" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="einezeile"/>
   </cd:sequence>
@@ -5362,7 +5362,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inzeile">
+<cd:command name="inzeile" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="inzeile"/>
   </cd:sequence>
@@ -5371,7 +5371,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleinmarginalieein">
+<cd:command name="stelleinmarginalieein" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="stelleinmarginalieein"/>
   </cd:sequence>
@@ -5394,7 +5394,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="vor">
@@ -5437,7 +5437,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleseitennummerein">
+<cd:command name="stelleseitennummerein" file="page-num.tex">
   <cd:sequence>
     <cd:string value="stelleseitennummerein"/>
   </cd:sequence>
@@ -5455,15 +5455,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleunterseitennummerein">
+<cd:command name="stelleunterseitennummerein" file="page-num.tex">
   <cd:sequence>
     <cd:string value="stelleunterseitennummerein"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments list="yes">
       <cd:parameter name="art">
-        <cd:constant type="protext"/>
-        <cd:constant type="procd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="status">
         <cd:constant type="start"/>
@@ -5493,7 +5493,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiereblanko">
+<cd:command name="definiereblanko" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="definiereblanko"/>
   </cd:sequence>
@@ -5507,7 +5507,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierepapierformat">
+<cd:command name="definierepapierformat" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="definierepapierformat"/>
   </cd:sequence>
@@ -5532,7 +5532,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuppaper">
+<cd:command name="setuppaper" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="setuppaper"/>
   </cd:sequence>
@@ -5570,7 +5570,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellepapierformatein">
+<cd:command name="stellepapierformatein" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="stellepapierformatein"/>
   </cd:sequence>
@@ -5610,7 +5610,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleanordnenein">
+<cd:command name="stelleanordnenein" file="page-imp.tex">
   <cd:sequence>
     <cd:string value="stelleanordnenein"/>
   </cd:sequence>
@@ -5656,7 +5656,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierelogo">
+<cd:command name="definierelogo" file="page-log.tex">
   <cd:sequence>
     <cd:string value="definierelogo"/>
   </cd:sequence>
@@ -5694,7 +5694,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="platzierelogo">
+<cd:command name="platzierelogo" file="page-log.tex">
   <cd:sequence>
     <cd:string value="platzierelogo"/>
   </cd:sequence>
@@ -5740,7 +5740,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiereabschnittsblock">
+<cd:command name="definiereabschnittsblock" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definiereabschnittsblock"/>
   </cd:sequence>
@@ -5754,7 +5754,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleabschnittsblockein">
+<cd:command name="stelleabschnittsblockein" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="stelleabschnittsblockein"/>
   </cd:sequence>
@@ -5781,7 +5781,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiereabschnitt">
+<cd:command name="definiereabschnitt" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definiereabschnitt"/>
   </cd:sequence>
@@ -5792,7 +5792,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleabschnittein">
+<cd:command name="stelleabschnittein" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="stelleabschnittein"/>
   </cd:sequence>
@@ -5819,7 +5819,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleueberschriftein">
+<cd:command name="stelleueberschriftein" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="stelleueberschriftein"/>
   </cd:sequence>
@@ -5835,7 +5835,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="textstil">
@@ -5845,7 +5845,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="nummernstil">
@@ -5855,7 +5855,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="farbe">
@@ -5939,7 +5939,7 @@
       <cd:parameter name="nummererhoehen">
         <cd:constant type="ja"/>
         <cd:constant type="nein"/>
-        <cd:constant type="liste"/>
+        <cd:variable type="cd:list"/>
         <cd:constant type="cd:file"/>
       </cd:parameter>
       <cd:parameter name="resetnumber">
@@ -5951,7 +5951,7 @@
       </cd:parameter>
       <cd:parameter name="expansion">
         <cd:constant type="ja"/>
-        <cd:constant type="befehl"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="nein"/>
       </cd:parameter>
       <cd:parameter name="marginaltext">
@@ -5963,7 +5963,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellekopfzahlein">
+<cd:command name="stellekopfzahlein" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="stellekopfzahlein"/>
   </cd:sequence>
@@ -5990,7 +5990,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="bestimmekopfnummer">
+<cd:command name="bestimmekopfnummer" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="bestimmekopfnummer"/>
   </cd:sequence>
@@ -6001,20 +6001,20 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="heutigeskopfnummer">
+<cd:command name="heutigeskopfnummer" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="heutigeskopfnummer"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="folgendeabschnitt" generated="yes">
+<cd:command name="nextsection" generated="yes" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="folgende"/>
-    <cd:variable value="abschnitt"/>
+    <cd:variable value="absatz"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definiereueberschrift">
+<cd:command name="definiereueberschrift" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definiereueberschrift"/>
   </cd:sequence>
@@ -6028,7 +6028,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupitemgroup">
+<cd:command name="setupitemgroup" file="core-itm.tex">
   <cd:sequence>
     <cd:string value="setupitemgroup"/>
   </cd:sequence>
@@ -6052,7 +6052,7 @@
       <cd:constant type="imrand"/>
       <cd:constant type="autointro"/>
       <cd:constant type="lose"/>
-      <cd:constant type="absatz"/>
+      <cd:variable type="cd:section"/>
       <cd:constant type="imtext"/>
     </cd:keywords>
     <cd:assignments optional="yes" list="yes">
@@ -6114,7 +6114,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="beschrstil">
@@ -6124,7 +6124,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="symstil">
@@ -6134,7 +6134,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="abschnitttrenner">
@@ -6251,16 +6251,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="unter">
+<cd:command name="sub">
   <cd:sequence>
-    <cd:string value="unter"/>
+    <cd:string value="sub"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sym">
+<cd:command name="sym" file="core-itm.tex">
   <cd:sequence>
     <cd:string value="sym"/>
   </cd:sequence>
@@ -6275,7 +6275,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definiereregister">
+<cd:command name="definiereregister" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="definiereregister"/>
   </cd:sequence>
@@ -6289,7 +6289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleregisterein">
+<cd:command name="stelleregisterein" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="stelleregisterein"/>
   </cd:sequence>
@@ -6319,7 +6319,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="seitenstil">
@@ -6329,7 +6329,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="textstil">
@@ -6339,7 +6339,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="indikator">
@@ -6377,7 +6377,7 @@
       </cd:parameter>
       <cd:parameter name="expansion">
         <cd:constant type="ja"/>
-        <cd:constant type="befehl"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="nein"/>
       </cd:parameter>
       <cd:parameter name="referieren">
@@ -6409,7 +6409,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="register" generated="yes">
+<cd:command name="register" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:variable value="register"/>
   </cd:sequence>
@@ -6421,7 +6421,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="startregister" generated="yes">
+<cd:command name="startregister" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="start"/>
     <cd:variable value="register"/>
@@ -6434,7 +6434,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="schreibezumregister">
+<cd:command name="schreibezumregister" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="schreibezumregister"/>
   </cd:sequence>
@@ -6449,7 +6449,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verknuepftregister" generated="yes">
+<cd:command name="coupledregister" generated="yes">
   <cd:sequence>
     <cd:string value="verknuepft"/>
     <cd:variable value="register"/>
@@ -6462,7 +6462,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verknuepfregister">
+<cd:command name="verknuepfregister" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="verknuepfregister"/>
   </cd:sequence>
@@ -6473,7 +6473,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="platziereregister">
+<cd:command name="platziereregister" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="platziereregister"/>
   </cd:sequence>
@@ -6487,7 +6487,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="siehregister" generated="yes">
+<cd:command name="seeregister" generated="yes">
   <cd:sequence>
     <cd:string value="sieh"/>
     <cd:variable value="register"/>
@@ -6501,7 +6501,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vollenderegister" generated="yes">
+<cd:command name="completeregister" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="vollende"/>
     <cd:variable value="register"/>
@@ -6513,7 +6513,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="platziereregister" generated="yes">
+<cd:command name="platziereregister" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="platziere"/>
     <cd:variable value="register"/>
@@ -6525,7 +6525,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieresynonyme">
+<cd:command name="definieresynonyme" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="definieresynonyme"/>
   </cd:sequence>
@@ -6545,7 +6545,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellesynonymein">
+<cd:command name="stellesynonymein" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="stellesynonymein"/>
   </cd:sequence>
@@ -6561,7 +6561,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="synonymstil">
@@ -6571,7 +6571,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="platz">
@@ -6600,7 +6600,7 @@
       </cd:parameter>
       <cd:parameter name="expansion">
         <cd:constant type="ja"/>
-        <cd:constant type="befehl"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="nein"/>
       </cd:parameter>
       <cd:parameter name="befehl">
@@ -6623,28 +6623,28 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vollendeauflistenvonsynonyme" generated="yes">
+<cd:command name="completelistofsynonyms" generated="yes">
   <cd:sequence>
-    <cd:string value="vollendeauflistenvon"/>
-    <cd:variable value="synonyme"/>
+    <cd:string value="completelistof"/>
+    <cd:variable value="synonyms"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="platziereauflistenvonsynonyme" generated="yes">
+<cd:command name="placelistofsynonyms" generated="yes">
   <cd:sequence>
-    <cd:string value="platziereauflistenvon"/>
-    <cd:variable value="synonyme"/>
+    <cd:string value="placelistof"/>
+    <cd:variable value="synonyms"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="ladensynonyme" generated="yes">
+<cd:command name="loadsynonyms" generated="yes">
   <cd:sequence>
     <cd:string value="laden"/>
-    <cd:variable value="synonyme"/>
+    <cd:variable value="synonyms"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definieresortieren">
+<cd:command name="definieresortieren" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="definieresortieren"/>
   </cd:sequence>
@@ -6661,7 +6661,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellesortierenein">
+<cd:command name="stellesortierenein" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="stellesortierenein"/>
   </cd:sequence>
@@ -6694,21 +6694,21 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="expansion">
         <cd:constant type="ja"/>
-        <cd:constant type="befehl"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="nein"/>
       </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sortiere" generated="yes">
+<cd:command name="sort" generated="yes">
   <cd:sequence>
-    <cd:variable value="sortiere"/>
+    <cd:variable value="sort"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -6718,28 +6718,28 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vollendeauflistenvonsortieren" generated="yes">
+<cd:command name="completelistofsorts" generated="yes">
   <cd:sequence>
-    <cd:string value="vollendeauflistenvon"/>
-    <cd:variable value="sortieren"/>
+    <cd:string value="completelistof"/>
+    <cd:variable value="sorts"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="platziereauflistenvonsortieren" generated="yes">
+<cd:command name="placelistofsorts" generated="yes">
   <cd:sequence>
-    <cd:string value="platziereauflistenvon"/>
-    <cd:variable value="sortieren"/>
+    <cd:string value="placelistof"/>
+    <cd:variable value="sorts"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="ladensortieren" generated="yes">
+<cd:command name="loadsorts" generated="yes">
   <cd:sequence>
     <cd:string value="laden"/>
-    <cd:variable value="sortieren"/>
+    <cd:variable value="sorts"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definiereumbruch">
+<cd:command name="definiereumbruch" file="page-mak.tex">
   <cd:sequence>
     <cd:string value="definiereumbruch"/>
   </cd:sequence>
@@ -6767,7 +6767,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleumbruchein">
+<cd:command name="stelleumbruchein" file="page-mak.tex">
   <cd:sequence>
     <cd:string value="stelleumbruchein"/>
   </cd:sequence>
@@ -6844,7 +6844,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nameumbruch" type="environment" generated="yes">
+<cd:command name="namemakeup" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="name"/>
     <cd:string value="umbruch"/>
@@ -6877,7 +6877,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="datum">
+<cd:command name="datum" file="core-con.tex">
   <cd:sequence>
     <cd:string value="datum"/>
   </cd:sequence>
@@ -6898,13 +6898,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verweisdatum">
+<cd:command name="verweisdatum" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="verweisdatum"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="einziehen">
+<cd:command name="einziehen" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="einziehen"/>
   </cd:sequence>
@@ -6921,13 +6921,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nichteinziehen">
+<cd:command name="nichteinziehen" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="nichteinziehen"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="blanko">
+<cd:command name="blanko" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="blanko"/>
   </cd:sequence>
@@ -6944,7 +6944,7 @@
       <cd:constant type="zuruecksetzten"/>
       <cd:constant type="zeile"/>
       <cd:constant type="halbezeile"/>
-      <cd:constant type="formel"/>
+      <cd:variable type="cd:formula"/>
       <cd:constant type="fest"/>
       <cd:constant type="flexibel"/>
       <cd:constant type="kein"/>
@@ -6952,7 +6952,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kleinerdurchschuss" type="environment">
+<cd:command name="kleinerdurchschuss" type="environment" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="kleinerdurchschuss"/>
   </cd:sequence>
@@ -6963,23 +6963,23 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="grosserdurchschuss" type="environment">
+<cd:command name="unpacked" type="environment">
   <cd:sequence>
-    <cd:string value="grosserdurchschuss"/>
+    <cd:string value="unpacked"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zeilenkorrektur" type="environment">
+<cd:command name="linecorrection" type="environment">
   <cd:sequence>
-    <cd:string value="zeilenkorrektur"/>
+    <cd:string value="linecorrection"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="korrigierezwischenraum">
+<cd:command name="korrigierezwischenraum" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="korrigierezwischenraum"/>
   </cd:sequence>
@@ -6988,9 +6988,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verschieben" type="environment">
+<cd:command name="postponing" type="environment">
   <cd:sequence>
-    <cd:string value="verschieben"/>
+    <cd:string value="postponing"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
@@ -7004,9 +7004,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="enger" type="environment">
+<cd:command name="narrower" type="environment">
   <cd:sequence>
-    <cd:string value="enger"/>
+    <cd:string value="narrower"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes" list="yes">
@@ -7017,15 +7017,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verbergen" type="environment">
+<cd:command name="hiding" type="environment">
   <cd:sequence>
-    <cd:string value="verbergen"/>
+    <cd:string value="hiding"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleausrichtungein">
+<cd:command name="stelleausrichtungein" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="stelleausrichtungein"/>
   </cd:sequence>
@@ -7051,9 +7051,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ausrichtung" type="environment">
+<cd:command name="alignment" type="environment">
   <cd:sequence>
-    <cd:string value="ausrichtung"/>
+    <cd:string value="alignment"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -7074,7 +7074,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelletoleranzein">
+<cd:command name="stelletoleranzein" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="stelletoleranzein"/>
   </cd:sequence>
@@ -7092,7 +7092,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seitentyp">
+<cd:command name="seitentyp" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="seitentyp"/>
   </cd:sequence>
@@ -7103,7 +7103,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="bearbeiteseite">
+<cd:command name="bearbeiteseite" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="bearbeiteseite"/>
   </cd:sequence>
@@ -7118,7 +7118,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="doppelseite">
+<cd:command name="doppelseite" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="doppelseite"/>
   </cd:sequence>
@@ -7140,7 +7140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="position">
+<cd:command name="position" file="page-lyr.tex">
   <cd:sequence>
     <cd:string value="position"/>
   </cd:sequence>
@@ -7150,7 +7150,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellerasterein">
+<cd:command name="stellerasterein" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stellerasterein"/>
   </cd:sequence>
@@ -7174,7 +7174,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellehintergruendeein">
+<cd:command name="stellehintergruendeein" file="page-bck.tex">
   <cd:sequence>
     <cd:string value="stellehintergruendeein"/>
   </cd:sequence>
@@ -7201,14 +7201,14 @@
       <cd:parameter name="status">
         <cd:constant type="start"/>
         <cd:constant type="stop"/>
-        <cd:constant type="wiederholen"/>
+        <cd:variable type="cd:repeat"/>
       </cd:parameter>
       <cd:inherit name="stelleumrahmtein"/>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="puffer" type="environment" generated="yes">
+<cd:command name="buffer" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="puffer"/>
   </cd:sequence>
@@ -7230,7 +7230,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tippepuffer">
+<cd:command name="tippepuffer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="tippepuffer"/>
   </cd:sequence>
@@ -7241,7 +7241,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierepuffer">
+<cd:command name="definierepuffer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="definierepuffer"/>
   </cd:sequence>
@@ -7252,7 +7252,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellepufferein">
+<cd:command name="stellepufferein" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="stellepufferein"/>
   </cd:sequence>
@@ -7274,7 +7274,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiereblock">
+<cd:command name="definiereblock" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="definiereblock"/>
   </cd:sequence>
@@ -7285,13 +7285,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="keinebloeckemehr">
+<cd:command name="keinebloeckemehr" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="keinebloeckemehr"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="verbergebloecke">
+<cd:command name="verbergebloecke" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="verbergebloecke"/>
   </cd:sequence>
@@ -7305,7 +7305,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="behaltebloecke">
+<cd:command name="behaltebloecke" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="behaltebloecke"/>
   </cd:sequence>
@@ -7320,7 +7320,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verwendebloecke">
+<cd:command name="verwendebloecke" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="verwendebloecke"/>
   </cd:sequence>
@@ -7334,7 +7334,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="bearbeitebloecke">
+<cd:command name="bearbeitebloecke" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="bearbeitebloecke"/>
   </cd:sequence>
@@ -7348,7 +7348,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="bypassblocks">
+<cd:command name="bypassblocks" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="bypassblocks"/>
   </cd:sequence>
@@ -7376,7 +7376,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="waehlebloeckeaus">
+<cd:command name="waehlebloeckeaus" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="waehlebloeckeaus"/>
   </cd:sequence>
@@ -7396,7 +7396,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleblockein">
+<cd:command name="stelleblockein" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="stelleblockein"/>
   </cd:sequence>
@@ -7421,7 +7421,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="datei">
@@ -7431,7 +7431,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="formel" type="environment" generated="yes">
+<cd:command name="formula" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="formel"/>
   </cd:sequence>
@@ -7439,7 +7439,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mathematik">
+<cd:command name="mathematik" file="supp-mat.tex">
   <cd:sequence>
     <cd:string value="mathematik"/>
   </cd:sequence>
@@ -7448,7 +7448,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="platziereformel">
+<cd:command name="platziereformel" file="core-mat.tex">
   <cd:sequence>
     <cd:string value="platziereformel"/>
   </cd:sequence>
@@ -7459,7 +7459,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="platziereunterformel">
+<cd:command name="platziereunterformel" file="core-mat.tex">
   <cd:sequence>
     <cd:string value="platziereunterformel"/>
   </cd:sequence>
@@ -7470,10 +7470,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="platzieregleitobjekt" generated="yes">
+<cd:command name="placefloat" generated="yes" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="platziere"/>
-    <cd:variable value="gleitobjekt"/>
+    <cd:variable value="float"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -7496,7 +7496,7 @@
       <cd:constant type="outeredge"/>
       <cd:constant type="innen"/>
       <cd:constant type="aussen"/>
-      <cd:constant type="line"/>
+      <cd:constant type="zeile"/>
       <cd:constant type="hoch"/>
       <cd:constant type="tief"/>
       <cd:constant type="passend"/>
@@ -7516,10 +7516,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="reservierengleitobjekt" generated="yes">
+<cd:command name="reservefloat" generated="yes">
   <cd:sequence>
     <cd:string value="reservieren"/>
-    <cd:variable value="gleitobjekt"/>
+    <cd:variable value="float"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments optional="yes" list="yes">
@@ -7542,7 +7542,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieregleitobjekt">
+<cd:command name="definieregleitobjekt" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="definieregleitobjekt"/>
   </cd:sequence>
@@ -7556,7 +7556,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellegleitobjektein">
+<cd:command name="stellegleitobjektein" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="stellegleitobjektein"/>
   </cd:sequence>
@@ -7602,9 +7602,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gleitobjekttext" type="environment" generated="yes">
+<cd:command name="floattext" type="environment" generated="yes">
   <cd:sequence>
-    <cd:variable value="gleitobjekt"/>
+    <cd:variable value="float"/>
     <cd:string value="text"/>
   </cd:sequence>
   <cd:arguments>
@@ -7623,25 +7623,25 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="platziereauflistenvongleitobjekte" generated="yes">
+<cd:command name="placelistoffloats" generated="yes">
   <cd:sequence>
-    <cd:string value="platziereauflistenvon"/>
-    <cd:variable value="gleitobjekte"/>
+    <cd:string value="placelistof"/>
+    <cd:variable value="floats"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vollendeauflistenvongleitobjekte" generated="yes">
+<cd:command name="completelistoffloats" generated="yes">
   <cd:sequence>
-    <cd:string value="vollendeauflistenvon"/>
-    <cd:variable value="gleitobjekte"/>
+    <cd:string value="completelistof"/>
+    <cd:variable value="floats"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verweis">
+<cd:command name="verweis" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="verweis"/>
   </cd:sequence>
@@ -7694,7 +7694,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="chem">
+<cd:command name="chem" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="chem"/>
   </cd:sequence>
@@ -7705,7 +7705,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="bruch">
+<cd:command name="bruch" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="bruch"/>
   </cd:sequence>
@@ -7715,7 +7715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="punkt">
+<cd:command name="punkt" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="punkt"/>
   </cd:sequence>
@@ -7747,7 +7747,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellepostenein">
+<cd:command name="stellepostenein" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="stellepostenein"/>
   </cd:sequence>
@@ -7796,7 +7796,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zitat" type="environment">
+<cd:command name="zitat" type="environment" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="zitat"/>
   </cd:sequence>
@@ -7809,7 +7809,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zitat">
+<cd:command name="zitat" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="zitat"/>
   </cd:sequence>
@@ -7818,7 +7818,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zitieren">
+<cd:command name="zitieren" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="zitieren"/>
   </cd:sequence>
@@ -7827,7 +7827,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellezitierenein">
+<cd:command name="stellezitierenein" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="stellezitierenein"/>
   </cd:sequence>
@@ -7846,7 +7846,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="farbe">
@@ -7873,7 +7873,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiereabsaetze">
+<cd:command name="definiereabsaetze" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="definiereabsaetze"/>
   </cd:sequence>
@@ -7921,13 +7921,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="absatz" generated="yes">
+<cd:command name="paragraph" generated="yes">
   <cd:sequence>
     <cd:variable value="absatz"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="absatz" type="environment" generated="yes">
+<cd:command name="paragraph" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="absatz"/>
   </cd:sequence>
@@ -7935,7 +7935,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleabsaetzeein">
+<cd:command name="stelleabsaetzeein" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="stelleabsaetzeein"/>
   </cd:sequence>
@@ -7955,7 +7955,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="breite">
@@ -8000,7 +8000,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelletabein">
+<cd:command name="stelletabein" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="stelletabein"/>
   </cd:sequence>
@@ -8019,7 +8019,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="platz">
@@ -8040,9 +8040,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="dokument" type="environment">
+<cd:command name="document" type="environment">
   <cd:sequence>
-    <cd:string value="dokument"/>
+    <cd:string value="document"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8062,7 +8062,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieretabulator">
+<cd:command name="definieretabulator" file="core-tbl.tex">
   <cd:sequence>
     <cd:string value="definieretabulator"/>
   </cd:sequence>
@@ -8079,7 +8079,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tabulator" type="environment" generated="yes">
+<cd:command name="tabulate" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="tabulator"/>
   </cd:sequence>
@@ -8093,7 +8093,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelletabulatorein">
+<cd:command name="stelletabulatorein" file="core-tbl.tex">
   <cd:sequence>
     <cd:string value="stelletabulatorein"/>
   </cd:sequence>
@@ -8162,7 +8162,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelletabellenein">
+<cd:command name="stelletabellenein" file="core-tab.tex">
   <cd:sequence>
     <cd:string value="stelletabellenein"/>
   </cd:sequence>
@@ -8245,9 +8245,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tabelle" type="environment">
+<cd:command name="table" type="environment">
   <cd:sequence>
-    <cd:string value="tabelle"/>
+    <cd:string value="table"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8257,9 +8257,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tabellen" type="environment">
+<cd:command name="tables" type="environment">
   <cd:sequence>
-    <cd:string value="tabellen"/>
+    <cd:string value="tables"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8269,7 +8269,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieretabellenvorlage">
+<cd:command name="definieretabellenvorlage" file="core-tab.tex">
   <cd:sequence>
     <cd:string value="definieretabellenvorlage"/>
   </cd:sequence>
@@ -8289,7 +8289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verwendeexternedateien">
+<cd:command name="verwendeexternedateien" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="verwendeexternedateien"/>
   </cd:sequence>
@@ -8312,7 +8312,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verwendeexternedatei">
+<cd:command name="verwendeexternedatei" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="verwendeexternedatei"/>
   </cd:sequence>
@@ -8338,7 +8338,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verwendeexterneabbildung">
+<cd:command name="verwendeexterneabbildung" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="verwendeexterneabbildung"/>
   </cd:sequence>
@@ -8423,7 +8423,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="externeabbildung">
+<cd:command name="externeabbildung" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="externeabbildung"/>
   </cd:sequence>
@@ -8437,7 +8437,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleexterneabbildungenein">
+<cd:command name="stelleexterneabbildungenein" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="stelleexterneabbildungenein"/>
   </cd:sequence>
@@ -8481,7 +8481,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zeigeexterneabbildungen">
+<cd:command name="zeigeexterneabbildungen" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="zeigeexterneabbildungen"/>
   </cd:sequence>
@@ -8496,7 +8496,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verwendeexternestonstueck">
+<cd:command name="verwendeexternestonstueck" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="verwendeexternestonstueck"/>
   </cd:sequence>
@@ -8510,7 +8510,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="name">
+<cd:command name="name" file="syst-gen.tex">
   <cd:sequence>
     <cd:string value="name"/>
   </cd:sequence>
@@ -8519,9 +8519,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="legende" type="environment">
+<cd:command name="legend" type="environment">
   <cd:sequence>
-    <cd:string value="legende"/>
+    <cd:string value="legend"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -8535,20 +8535,20 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gegeben" type="environment">
+<cd:command name="geg" type="environment">
   <cd:sequence>
-    <cd:string value="gegeben"/>
+    <cd:string value="geg"/>
   </cd:sequence>
   <cd:arguments>
-    <cd:tex command="geg"/>
+    <cd:tex command="fact"/>
     <cd:nothing/>
     <cd:nothing separator="backslash"/>
     <cd:nothing separator="backslash"/>
-    <cd:tex separator="backslash" command="geg"/>
+    <cd:tex separator="backslash" command="fact"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="drehen">
+<cd:command name="drehen" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="drehen"/>
   </cd:sequence>
@@ -8560,7 +8560,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelledrehenein">
+<cd:command name="stelledrehenein" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="stelledrehenein"/>
   </cd:sequence>
@@ -8581,7 +8581,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="spiegeln">
+<cd:command name="spiegeln" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="spiegeln"/>
   </cd:sequence>
@@ -8590,7 +8590,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="format">
+<cd:command name="format" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="format"/>
   </cd:sequence>
@@ -8607,7 +8607,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellekombinationein">
+<cd:command name="stellekombinationein" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="stellekombinationein"/>
   </cd:sequence>
@@ -8634,11 +8634,11 @@
         <cd:constant type="passend"/>
       </cd:parameter>
       <cd:parameter name="platz">
-        <cd:constant type="top"/>
-        <cd:constant type="middle"/>
-        <cd:constant type="bottom"/>
-        <cd:constant type="left"/>
-        <cd:constant type="right"/>
+        <cd:constant type="oben"/>
+        <cd:constant type="mittig"/>
+        <cd:constant type="unten"/>
+        <cd:constant type="links"/>
+        <cd:constant type="rechts"/>
       </cd:parameter>
       <cd:parameter name="ausrichtung">
         <cd:constant type="nein"/>
@@ -8654,7 +8654,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein...cd:command"/>
+        <cd:constant type="small...cd:command"/>
       </cd:parameter>
       <cd:parameter name="farbe">
         <cd:constant type="cd:name"/>
@@ -8663,9 +8663,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kombination" type="environment">
+<cd:command name="combination" type="environment">
   <cd:sequence>
-    <cd:string value="kombination"/>
+    <cd:string value="combination"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8674,7 +8674,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="platzierenebeneinander">
+<cd:command name="platzierenebeneinander" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="platzierenebeneinander"/>
   </cd:sequence>
@@ -8684,7 +8684,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="platziereuntereinander">
+<cd:command name="platziereuntereinander" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="platziereuntereinander"/>
   </cd:sequence>
@@ -8704,9 +8704,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ueberblick" type="environment">
+<cd:command name="overview" type="environment">
   <cd:sequence>
-    <cd:string value="ueberblick"/>
+    <cd:string value="overview"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords list="yes">
@@ -8715,7 +8715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleinteraktionsbildschirmein">
+<cd:command name="stelleinteraktionsbildschirmein" file="core-int.tex">
   <cd:sequence>
     <cd:string value="stelleinteraktionsbildschirmein"/>
   </cd:sequence>
@@ -8757,7 +8757,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="bildschirm">
+<cd:command name="bildschirm" file="core-int.tex">
   <cd:sequence>
     <cd:string value="bildschirm"/>
   </cd:sequence>
@@ -8765,7 +8765,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleseitenuebergangein">
+<cd:command name="stelleseitenuebergangein" file="core-int.tex">
   <cd:sequence>
     <cd:string value="stelleseitenuebergangein"/>
   </cd:sequence>
@@ -8777,7 +8777,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleinteraktionein">
+<cd:command name="stelleinteraktionein" file="core-nav.tex">
   <cd:sequence>
     <cd:string value="stelleinteraktionein"/>
   </cd:sequence>
@@ -8841,7 +8841,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein...cd:command"/>
+        <cd:constant type="small...cd:command"/>
       </cd:parameter>
       <cd:parameter name="farbe">
         <cd:constant type="cd:name"/>
@@ -8871,7 +8871,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiereinteraktionsmenue">
+<cd:command name="definiereinteraktionsmenue" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definiereinteraktionsmenue"/>
   </cd:sequence>
@@ -8915,7 +8915,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein...cd:command"/>
+        <cd:constant type="small...cd:command"/>
       </cd:parameter>
       <cd:parameter name="farbe">
         <cd:constant type="cd:name"/>
@@ -8957,7 +8957,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiereinteraktionsmenue">
+<cd:command name="definiereinteraktionsmenue" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definiereinteraktionsmenue"/>
   </cd:sequence>
@@ -8993,7 +8993,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inaktiviereinteraktionsmenue">
+<cd:command name="inaktiviereinteraktionsmenue" file="core-int.tex">
   <cd:sequence>
     <cd:string value="inaktiviereinteraktionsmenue"/>
   </cd:sequence>
@@ -9009,7 +9009,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verwendeexteresdokument">
+<cd:command name="verwendeexteresdokument" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="verwendeexteresdokument"/>
   </cd:sequence>
@@ -9018,7 +9018,7 @@
       <cd:constant type="cd:name"/>
     </cd:keywords>
     <cd:keywords>
-      <cd:constant type="file"/>
+      <cd:constant type="datei"/>
     </cd:keywords>
     <cd:keywords>
       <cd:constant type="cd:text"/>
@@ -9026,7 +9026,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verwendeURL">
+<cd:command name="verwendeURL" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="verwendeURL"/>
   </cd:sequence>
@@ -9038,7 +9038,7 @@
       <cd:constant type="cd:text"/>
     </cd:keywords>
     <cd:keywords>
-      <cd:constant type="file"/>
+      <cd:constant type="datei"/>
     </cd:keywords>
     <cd:keywords>
       <cd:constant type="cd:text"/>
@@ -9046,7 +9046,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verknuepfedokument">
+<cd:command name="verknuepfedokument" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="verknuepfedokument"/>
   </cd:sequence>
@@ -9055,7 +9055,7 @@
       <cd:constant type="cd:name"/>
     </cd:keywords>
     <cd:keywords>
-      <cd:constant type="file"/>
+      <cd:constant type="datei"/>
     </cd:keywords>
     <cd:keywords>
       <cd:constant type="cd:name"/>
@@ -9063,7 +9063,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="von">
+<cd:command name="von" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="von"/>
   </cd:sequence>
@@ -9083,7 +9083,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="interaktionsknopfe">
+<cd:command name="interaktionsknopfe" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="interaktionsknopfe"/>
   </cd:sequence>
@@ -9097,7 +9097,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleinteraktionsbalkenein">
+<cd:command name="stelleinteraktionsbalkenein" file="core-int.tex">
   <cd:sequence>
     <cd:string value="stelleinteraktionsbalkenein"/>
   </cd:sequence>
@@ -9122,12 +9122,12 @@
       </cd:parameter>
       <cd:parameter name="breite">
         <cd:constant type="cd:dimension"/>
-        <cd:constant type="height"/>
+        <cd:constant type="hoehe"/>
         <cd:constant type="passend"/>
       </cd:parameter>
       <cd:parameter name="hoehe">
         <cd:constant type="cd:dimension"/>
-        <cd:constant type="height"/>
+        <cd:constant type="hoehe"/>
         <cd:constant type="passend"/>
       </cd:parameter>
       <cd:parameter name="tiefe">
@@ -9147,7 +9147,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="synchronisieren">
+<cd:command name="synchronisieren" file="core-int.tex">
   <cd:sequence>
     <cd:string value="synchronisieren"/>
   </cd:sequence>
@@ -9155,15 +9155,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="synchronisation" type="environment">
+<cd:command name="synchronization" type="environment">
   <cd:sequence>
-    <cd:string value="synchronisation"/>
+    <cd:string value="synchronization"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellesynchronisationsbalkenein">
+<cd:command name="stellesynchronisationsbalkenein" file="core-int.tex">
   <cd:sequence>
     <cd:string value="stellesynchronisationsbalkenein"/>
   </cd:sequence>
@@ -9175,7 +9175,7 @@
       </cd:parameter>
       <cd:parameter name="breite">
         <cd:constant type="cd:dimension"/>
-        <cd:constant type="height"/>
+        <cd:constant type="hoehe"/>
         <cd:constant type="passend"/>
       </cd:parameter>
       <cd:parameter name="hoehe">
@@ -9188,7 +9188,7 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="farbe">
@@ -9199,7 +9199,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="synchronisationsbalken">
+<cd:command name="synchronisationsbalken" file="core-int.tex">
   <cd:sequence>
     <cd:string value="synchronisationsbalken"/>
   </cd:sequence>
@@ -9217,7 +9217,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellesynchronisationein">
+<cd:command name="stellesynchronisationein" file="core-int.tex">
   <cd:sequence>
     <cd:string value="stellesynchronisationein"/>
   </cd:sequence>
@@ -9231,7 +9231,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiereprofil">
+<cd:command name="definiereprofil" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definiereprofil"/>
   </cd:sequence>
@@ -9245,7 +9245,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleprofilein">
+<cd:command name="stelleprofilein" file="core-int.tex">
   <cd:sequence>
     <cd:string value="stelleprofilein"/>
   </cd:sequence>
@@ -9258,9 +9258,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="profil" type="environment">
+<cd:command name="profile" type="environment">
   <cd:sequence>
-    <cd:string value="profil"/>
+    <cd:string value="profile"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords interactive="exclusive" list="yes">
@@ -9269,7 +9269,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="folgeprofil">
+<cd:command name="folgeprofil" file="core-int.tex">
   <cd:sequence>
     <cd:string value="folgeprofil"/>
   </cd:sequence>
@@ -9281,7 +9281,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="platzierebookmarks">
+<cd:command name="platzierebookmarks" file="core-int.tex">
   <cd:sequence>
     <cd:string value="platzierebookmarks"/>
   </cd:sequence>
@@ -9317,7 +9317,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleversionein">
+<cd:command name="stelleversionein" file="core-int.tex">
   <cd:sequence>
     <cd:string value="stelleversionein"/>
   </cd:sequence>
@@ -9333,14 +9333,14 @@
         <cd:constant type="fettgeneigt"/>
         <cd:constant type="tippen"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="beschrifteversion">
+<cd:command name="beschrifteversion" file="core-int.tex">
   <cd:sequence>
     <cd:string value="beschrifteversion"/>
   </cd:sequence>
@@ -9348,13 +9348,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="waehleversionaus">
+<cd:command name="waehleversionaus" file="core-int.tex">
   <cd:sequence>
     <cd:string value="waehleversionaus"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definiereversion">
+<cd:command name="definiereversion" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definiereversion"/>
   </cd:sequence>
@@ -9368,7 +9368,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="folgeversion">
+<cd:command name="folgeversion" file="core-int.tex">
   <cd:sequence>
     <cd:string value="folgeversion"/>
   </cd:sequence>
@@ -9380,7 +9380,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="folgeprofilversion">
+<cd:command name="folgeprofilversion" file="core-int.tex">
   <cd:sequence>
     <cd:string value="folgeprofilversion"/>
   </cd:sequence>
@@ -9395,7 +9395,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiereprogramme">
+<cd:command name="definiereprogramme" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definiereprogramme"/>
   </cd:sequence>
@@ -9412,7 +9412,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleprogrammein">
+<cd:command name="stelleprogrammein" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="stelleprogrammein"/>
   </cd:sequence>
@@ -9425,7 +9425,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="programm">
+<cd:command name="programm" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="programm"/>
   </cd:sequence>
@@ -9436,9 +9436,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="abbildung" type="environment">
+<cd:command name="figure" type="environment">
   <cd:sequence>
-    <cd:string value="abbildung"/>
+    <cd:string value="figure"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords interactive="exclusive">
@@ -9459,47 +9459,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="referieren*abbildung">
-  <cd:sequence>
-    <cd:string value="referieren*abbildung"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:position list="yes"/>
-    <cd:position list="yes"/>
-    <cd:keywords>
-      <cd:constant type="cd:number"/>
-    </cd:keywords>
-  </cd:arguments>
-</cd:command>
+<!-- referring*figure skipped -->
 
-<cd:command name="beschriftung*abbildung">
-  <cd:sequence>
-    <cd:string value="beschriftung*abbildung"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:position list="yes"/>
-    <cd:position list="yes"/>
-    <cd:keywords>
-      <cd:constant type="cd:number"/>
-    </cd:keywords>
-  </cd:arguments>
-</cd:command>
+<!-- marking*figure skipped -->
 
-<cd:command name="bemerkung">
-  <cd:sequence>
-    <cd:string value="bemerkung"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:position/>
-    <cd:position/>
-    <cd:assignments list="yes">
-      <cd:constant type="cd:number"/>
-    </cd:assignments>
-    <cd:content/>
-  </cd:arguments>
-</cd:command>
+<!-- remark skipped -->
 
-<cd:command name="zu">
+<cd:command name="zu" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="zu"/>
   </cd:sequence>
@@ -9510,7 +9476,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zurbox">
+<cd:command name="zurbox" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="zurbox"/>
   </cd:sequence>
@@ -9533,7 +9499,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleknopfein">
+<cd:command name="stelleknopfein" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="stelleknopfein"/>
   </cd:sequence>
@@ -9548,23 +9514,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="menueknopf">
-  <cd:sequence>
-    <cd:string value="menueknopf"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:keywords interactive="exclusive" optional="yes">
-      <cd:inherit name="stelleumrahmtein"/>
-    </cd:keywords>
-    <cd:assignments optional="yes" list="yes">
-      <cd:constant type="cd:text"/>
-    </cd:assignments>
-    <cd:content/>
-    <cd:reference list="yes"/>
-  </cd:arguments>
-</cd:command>
+<!-- menubutton skipped -->
 
-<cd:command name="stellekommentarein">
+<cd:command name="stellekommentarein" file="core-int.tex">
   <cd:sequence>
     <cd:string value="stellekommentarein"/>
   </cd:sequence>
@@ -9643,7 +9595,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierefeld">
+<cd:command name="definierefeld" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definierefeld"/>
   </cd:sequence>
@@ -9666,7 +9618,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieresubfeld">
+<cd:command name="definieresubfeld" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definieresubfeld"/>
   </cd:sequence>
@@ -9683,7 +9635,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kopierefeld">
+<cd:command name="kopierefeld" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="kopierefeld"/>
   </cd:sequence>
@@ -9697,7 +9649,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="klonierefeld">
+<cd:command name="klonierefeld" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="klonierefeld"/>
   </cd:sequence>
@@ -9717,7 +9669,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="feld">
+<cd:command name="feld" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="feld"/>
   </cd:sequence>
@@ -9728,7 +9680,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="passendfeld">
+<cd:command name="passendfeld" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="passendfeld"/>
   </cd:sequence>
@@ -9739,7 +9691,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ausfuellfeld">
+<cd:command name="ausfuellfeld" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="ausfuellfeld"/>
   </cd:sequence>
@@ -9751,7 +9703,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tooltip">
+<cd:command name="tooltip" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="tooltip"/>
   </cd:sequence>
@@ -9766,7 +9718,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zeigefelder">
+<cd:command name="zeigefelder" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="zeigefelder"/>
   </cd:sequence>
@@ -9777,13 +9729,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="registrierefelder">
+<cd:command name="registrierefelder" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="registrierefelder"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="stellefeldein">
+<cd:command name="stellefeldein" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="stellefeldein"/>
   </cd:sequence>
@@ -9807,7 +9759,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellefelderin">
+<cd:command name="stellefelderin" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="stellefelderin"/>
   </cd:sequence>
@@ -9904,7 +9856,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupforms">
+<cd:command name="setupforms" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="setupforms"/>
   </cd:sequence>
@@ -9918,7 +9870,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definierefeldstapel">
+<cd:command name="definierefeldstapel" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definierefeldstapel"/>
   </cd:sequence>
@@ -9935,7 +9887,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="feldstapel">
+<cd:command name="feldstapel" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="feldstapel"/>
   </cd:sequence>
@@ -9952,7 +9904,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ausschnitt">
+<cd:command name="ausschnitt" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="ausschnitt"/>
   </cd:sequence>
@@ -9964,7 +9916,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelleausschnittein">
+<cd:command name="stelleausschnittein" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="stelleausschnittein"/>
   </cd:sequence>
@@ -10253,7 +10205,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupstrut">
+<cd:command name="setupstrut" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="setupstrut"/>
   </cd:sequence>
diff --git a/context/data/cont-en.xml b/tex/context/interface/cont-en.xml
index 086f38434..60b13dd7e 100644
--- a/context/data/cont-en.xml
+++ b/tex/context/interface/cont-en.xml
@@ -2,7 +2,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context">
 
-<cd:command name="installlanguage">
+<cd:command name="installlanguage" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="installlanguage"/>
   </cd:sequence>
@@ -56,7 +56,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuplanguage">
+<cd:command name="setuplanguage" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="setuplanguage"/>
   </cd:sequence>
@@ -95,7 +95,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mainlanguage">
+<cd:command name="mainlanguage" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="mainlanguage"/>
   </cd:sequence>
@@ -113,7 +113,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="translate">
+<cd:command name="translate" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="translate"/>
   </cd:sequence>
@@ -126,7 +126,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="useencoding">
+<cd:command name="useencoding" file="enco-ini.tex">
   <cd:sequence>
     <cd:string value="useencoding"/>
   </cd:sequence>
@@ -137,7 +137,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usespecials">
+<cd:command name="usespecials" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="usespecials"/>
   </cd:sequence>
@@ -149,7 +149,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineoutput">
+<cd:command name="defineoutput" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="defineoutput"/>
   </cd:sequence>
@@ -163,7 +163,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupoutput">
+<cd:command name="setupoutput" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="setupoutput"/>
   </cd:sequence>
@@ -174,7 +174,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definebodyfontenvironment">
+<cd:command name="definebodyfontenvironment" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definebodyfontenvironment"/>
   </cd:sequence>
@@ -211,7 +211,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupbodyfontenvironment">
+<cd:command name="setupbodyfontenvironment" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="setupbodyfontenvironment"/>
   </cd:sequence>
@@ -236,7 +236,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definebodyfont">
+<cd:command name="definebodyfont" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definebodyfont"/>
   </cd:sequence>
@@ -335,7 +335,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="switchtobodyfont">
+<cd:command name="switchtobodyfont" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="switchtobodyfont"/>
   </cd:sequence>
@@ -351,7 +351,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definefont">
+<cd:command name="definefont" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definefont"/>
   </cd:sequence>
@@ -365,7 +365,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupstrut">
+<cd:command name="setupstrut" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="setupstrut"/>
   </cd:sequence>
@@ -379,7 +379,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupcolor">
+<cd:command name="setupcolor" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="setupcolor"/>
   </cd:sequence>
@@ -390,7 +390,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupcolors">
+<cd:command name="setupcolors" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="setupcolors"/>
   </cd:sequence>
@@ -448,7 +448,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definecolor">
+<cd:command name="definecolor" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definecolor"/>
   </cd:sequence>
@@ -485,7 +485,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="color" type="environment">
+<cd:command name="color" type="environment" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="color"/>
   </cd:sequence>
@@ -496,7 +496,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="color">
+<cd:command name="color" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="color"/>
   </cd:sequence>
@@ -508,7 +508,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="graycolor">
+<cd:command name="graycolor" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="graycolor"/>
   </cd:sequence>
@@ -530,7 +530,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definepalet">
+<cd:command name="definepalet" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definepalet"/>
   </cd:sequence>
@@ -546,7 +546,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuppalet">
+<cd:command name="setuppalet" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="setuppalet"/>
   </cd:sequence>
@@ -557,7 +557,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definecolorgroup">
+<cd:command name="definecolorgroup" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definecolorgroup"/>
   </cd:sequence>
@@ -632,13 +632,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="showmakeup">
+<cd:command name="showmakeup" file="supp-vis.tex">
   <cd:sequence>
     <cd:string value="showmakeup"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definetype">
+<cd:command name="definetype" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="definetype"/>
   </cd:sequence>
@@ -652,7 +652,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuptype">
+<cd:command name="setuptype" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="setuptype"/>
   </cd:sequence>
@@ -684,7 +684,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="type">
+<cd:command name="type" file="verb-ini.tex">
   <cd:sequence>
     <cd:string value="type"/>
   </cd:sequence>
@@ -693,7 +693,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="typ">
+<cd:command name="typ" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="typ"/>
   </cd:sequence>
@@ -702,7 +702,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tex">
+<cd:command name="tex" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="tex"/>
   </cd:sequence>
@@ -711,7 +711,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="arg">
+<cd:command name="arg" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="arg"/>
   </cd:sequence>
@@ -720,7 +720,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definetyping">
+<cd:command name="definetyping" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="definetyping"/>
   </cd:sequence>
@@ -736,7 +736,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuptyping">
+<cd:command name="setuptyping" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="setuptyping"/>
   </cd:sequence>
@@ -842,7 +842,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="typefile">
+<cd:command name="typefile" file="verb-ini.tex">
   <cd:sequence>
     <cd:string value="typefile"/>
   </cd:sequence>
@@ -854,7 +854,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupfootnotes">
+<cd:command name="setupfootnotes" file="core-not.tex">
   <cd:sequence>
     <cd:string value="setupfootnotes"/>
   </cd:sequence>
@@ -962,7 +962,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupfootnotedefinition">
+<cd:command name="setupfootnotedefinition" file="core-not.tex">
   <cd:sequence>
     <cd:string value="setupfootnotedefinition"/>
   </cd:sequence>
@@ -973,7 +973,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="footnote">
+<cd:command name="footnote" file="core-not.tex">
   <cd:sequence>
     <cd:string value="footnote"/>
   </cd:sequence>
@@ -983,7 +983,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="footnotetext">
+<cd:command name="footnotetext" file="core-not.tex">
   <cd:sequence>
     <cd:string value="footnotetext"/>
   </cd:sequence>
@@ -993,7 +993,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="note">
+<cd:command name="note" file="core-not.tex">
   <cd:sequence>
     <cd:string value="note"/>
   </cd:sequence>
@@ -1010,7 +1010,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="placelocalfootnotes">
+<cd:command name="placelocalfootnotes" file="core-not.tex">
   <cd:sequence>
     <cd:string value="placelocalfootnotes"/>
   </cd:sequence>
@@ -1021,7 +1021,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="placefootnotes">
+<cd:command name="placefootnotes" file="core-not.tex">
   <cd:sequence>
     <cd:string value="placefootnotes"/>
   </cd:sequence>
@@ -1032,7 +1032,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupunderbar">
+<cd:command name="setupunderbar" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="setupunderbar"/>
   </cd:sequence>
@@ -1059,7 +1059,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="underbar">
+<cd:command name="underbar" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="underbar"/>
   </cd:sequence>
@@ -1068,7 +1068,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="underbars">
+<cd:command name="underbars" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="underbars"/>
   </cd:sequence>
@@ -1077,7 +1077,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="overbar">
+<cd:command name="overbar" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="overbar"/>
   </cd:sequence>
@@ -1086,7 +1086,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="overbars">
+<cd:command name="overbars" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="overbars"/>
   </cd:sequence>
@@ -1095,7 +1095,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="overstrike">
+<cd:command name="overstrike" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="overstrike"/>
   </cd:sequence>
@@ -1104,7 +1104,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="overstrikes">
+<cd:command name="overstrikes" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="overstrikes"/>
   </cd:sequence>
@@ -1113,7 +1113,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="romannumerals">
+<cd:command name="romannumerals" file="core-con.tex">
   <cd:sequence>
     <cd:string value="romannumerals"/>
   </cd:sequence>
@@ -1122,7 +1122,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Romannumerals">
+<cd:command name="Romannumerals" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Romannumerals"/>
   </cd:sequence>
@@ -1131,7 +1131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="numbers">
+<cd:command name="numbers" file="core-con.tex">
   <cd:sequence>
     <cd:string value="numbers"/>
   </cd:sequence>
@@ -1140,7 +1140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="character">
+<cd:command name="character" file="core-con.tex">
   <cd:sequence>
     <cd:string value="character"/>
   </cd:sequence>
@@ -1149,7 +1149,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Character">
+<cd:command name="Character" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Character"/>
   </cd:sequence>
@@ -1158,7 +1158,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="characters">
+<cd:command name="characters" file="core-con.tex">
   <cd:sequence>
     <cd:string value="characters"/>
   </cd:sequence>
@@ -1167,7 +1167,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Characters">
+<cd:command name="Characters" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Characters"/>
   </cd:sequence>
@@ -1176,7 +1176,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mediaeval">
+<cd:command name="mediaeval" file="core-con.tex">
   <cd:sequence>
     <cd:string value="mediaeval"/>
   </cd:sequence>
@@ -1185,7 +1185,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="month">
+<cd:command name="month" file="core-con.tex">
   <cd:sequence>
     <cd:string value="month"/>
   </cd:sequence>
@@ -1194,7 +1194,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="MONTH">
+<cd:command name="MONTH" file="core-con.tex">
   <cd:sequence>
     <cd:string value="MONTH"/>
   </cd:sequence>
@@ -1203,7 +1203,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="weekday">
+<cd:command name="weekday" file="core-con.tex">
   <cd:sequence>
     <cd:string value="weekday"/>
   </cd:sequence>
@@ -1212,7 +1212,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="WEEKDAY">
+<cd:command name="WEEKDAY" file="core-con.tex">
   <cd:sequence>
     <cd:string value="WEEKDAY"/>
   </cd:sequence>
@@ -1221,7 +1221,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupcapitals">
+<cd:command name="setupcapitals" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="setupcapitals"/>
   </cd:sequence>
@@ -1239,7 +1239,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="cap">
+<cd:command name="cap" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="cap"/>
   </cd:sequence>
@@ -1284,7 +1284,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="WORD">
+<cd:command name="WORD" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="WORD"/>
   </cd:sequence>
@@ -1293,7 +1293,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="WORDS">
+<cd:command name="WORDS" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="WORDS"/>
   </cd:sequence>
@@ -1302,7 +1302,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Word">
+<cd:command name="Word" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="Word"/>
   </cd:sequence>
@@ -1311,7 +1311,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Words">
+<cd:command name="Words" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="Words"/>
   </cd:sequence>
@@ -1320,7 +1320,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stretched">
+<cd:command name="stretched" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="stretched"/>
   </cd:sequence>
@@ -1329,7 +1329,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesymbol">
+<cd:command name="definesymbol" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="definesymbol"/>
   </cd:sequence>
@@ -1343,7 +1343,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definefiguresymbol">
+<cd:command name="definefiguresymbol" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="definefiguresymbol"/>
   </cd:sequence>
@@ -1360,7 +1360,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="symbol">
+<cd:command name="symbol" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="symbol"/>
   </cd:sequence>
@@ -1385,7 +1385,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupsymbolset">
+<cd:command name="setupsymbolset" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="setupsymbolset"/>
   </cd:sequence>
@@ -1396,7 +1396,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usesymbols">
+<cd:command name="usesymbols" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="usesymbols"/>
   </cd:sequence>
@@ -1418,7 +1418,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineconversion">
+<cd:command name="defineconversion" file="core-con.tex">
   <cd:sequence>
     <cd:string value="defineconversion"/>
   </cd:sequence>
@@ -1433,7 +1433,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="convertnumber">
+<cd:command name="convertnumber" file="core-con.tex">
   <cd:sequence>
     <cd:string value="convertnumber"/>
   </cd:sequence>
@@ -1443,7 +1443,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupheadtext">
+<cd:command name="setupheadtext" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="setupheadtext"/>
   </cd:sequence>
@@ -1466,7 +1466,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuplabeltext">
+<cd:command name="setuplabeltext" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="setuplabeltext"/>
   </cd:sequence>
@@ -1489,7 +1489,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="headtext">
+<cd:command name="headtext" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="headtext"/>
   </cd:sequence>
@@ -1507,7 +1507,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupmarginrules">
+<cd:command name="setupmarginrules" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="setupmarginrules"/>
   </cd:sequence>
@@ -1546,7 +1546,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuplinewidth">
+<cd:command name="setuplinewidth" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="setuplinewidth"/>
   </cd:sequence>
@@ -1557,7 +1557,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupframed">
+<cd:command name="setupframed" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="setupframed"/>
   </cd:sequence>
@@ -1701,7 +1701,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="framed">
+<cd:command name="framed" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="framed"/>
   </cd:sequence>
@@ -1713,7 +1713,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inframed">
+<cd:command name="inframed" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="inframed"/>
   </cd:sequence>
@@ -1725,7 +1725,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="thinrules">
+<cd:command name="thinrules" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="thinrules"/>
   </cd:sequence>
@@ -1736,7 +1736,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupthinrules">
+<cd:command name="setupthinrules" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="setupthinrules"/>
   </cd:sequence>
@@ -1795,19 +1795,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="hairline">
+<cd:command name="hairline" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="hairline"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="thinrule">
+<cd:command name="thinrule" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="thinrule"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="defineframedtext">
+<cd:command name="defineframedtext" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="defineframedtext"/>
   </cd:sequence>
@@ -1821,7 +1821,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineframed">
+<cd:command name="defineframed" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="defineframed"/>
   </cd:sequence>
@@ -1835,7 +1835,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupframedtexts">
+<cd:command name="setupframedtexts" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="setupframedtexts"/>
   </cd:sequence>
@@ -1938,7 +1938,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="setupbackground">
+<cd:command name="setupbackground" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="setupbackground"/>
   </cd:sequence>
@@ -1997,7 +1997,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupfillinrules">
+<cd:command name="setupfillinrules" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="setupfillinrules"/>
   </cd:sequence>
@@ -2054,7 +2054,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupfillinlines">
+<cd:command name="setupfillinlines" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="setupfillinlines"/>
   </cd:sequence>
@@ -2079,7 +2079,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuptextrules">
+<cd:command name="setuptextrules" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="setuptextrules"/>
   </cd:sequence>
@@ -2131,7 +2131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="textrule">
+<cd:command name="textrule" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="textrule"/>
   </cd:sequence>
@@ -2144,7 +2144,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="textrule" type="environment">
+<cd:command name="textrule" type="environment" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="textrule"/>
   </cd:sequence>
@@ -2157,7 +2157,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="blackrule">
+<cd:command name="blackrule" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="blackrule"/>
   </cd:sequence>
@@ -2168,7 +2168,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="blackrules">
+<cd:command name="blackrules" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="blackrules"/>
   </cd:sequence>
@@ -2179,7 +2179,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupblackrules">
+<cd:command name="setupblackrules" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="setupblackrules"/>
   </cd:sequence>
@@ -2211,7 +2211,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineoverlay">
+<cd:command name="defineoverlay" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="defineoverlay"/>
   </cd:sequence>
@@ -2236,7 +2236,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="reset">
+<cd:command name="reset" file="core-num.tex">
   <cd:sequence>
     <cd:string value="reset"/>
   </cd:sequence>
@@ -2261,7 +2261,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupsystem">
+<cd:command name="setupsystem" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="setupsystem"/>
   </cd:sequence>
@@ -2299,7 +2299,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="low">
+<cd:command name="low" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="low"/>
   </cd:sequence>
@@ -2308,7 +2308,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="high">
+<cd:command name="high" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="high"/>
   </cd:sequence>
@@ -2317,7 +2317,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="lohi">
+<cd:command name="lohi" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="lohi"/>
   </cd:sequence>
@@ -2343,7 +2343,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="leftaligned">
+<cd:command name="leftaligned" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="leftaligned"/>
   </cd:sequence>
@@ -2352,7 +2352,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="rightaligned">
+<cd:command name="rightaligned" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="rightaligned"/>
   </cd:sequence>
@@ -2361,7 +2361,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="midaligned">
+<cd:command name="midaligned" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="midaligned"/>
   </cd:sequence>
@@ -2370,7 +2370,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="wordright">
+<cd:command name="wordright" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="wordright"/>
   </cd:sequence>
@@ -2379,7 +2379,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inmargin">
+<cd:command name="inmargin" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="inmargin"/>
   </cd:sequence>
@@ -2394,7 +2394,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inothermargin">
+<cd:command name="inothermargin" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="inothermargin"/>
   </cd:sequence>
@@ -2475,7 +2475,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="showstruts">
+<cd:command name="showstruts" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="showstruts"/>
   </cd:sequence>
@@ -2493,7 +2493,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="margintext">
+<cd:command name="margintext" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="margintext"/>
   </cd:sequence>
@@ -2508,7 +2508,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupmarginblocks">
+<cd:command name="setupmarginblocks" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="setupmarginblocks"/>
   </cd:sequence>
@@ -2572,7 +2572,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="part">
+<cd:command name="part" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="part"/>
   </cd:sequence>
@@ -2582,7 +2582,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="title">
+<cd:command name="title" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="title"/>
   </cd:sequence>
@@ -2592,7 +2592,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="chapter">
+<cd:command name="chapter" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="chapter"/>
   </cd:sequence>
@@ -2602,7 +2602,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="section">
+<cd:command name="section" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="section"/>
   </cd:sequence>
@@ -2612,7 +2612,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="subsection">
+<cd:command name="subsection" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="subsection"/>
   </cd:sequence>
@@ -2622,7 +2622,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="subsubsection">
+<cd:command name="subsubsection" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="subsubsection"/>
   </cd:sequence>
@@ -2632,7 +2632,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="subject">
+<cd:command name="subject" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="subject"/>
   </cd:sequence>
@@ -2642,7 +2642,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="subsubject">
+<cd:command name="subsubject" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="subsubject"/>
   </cd:sequence>
@@ -2652,7 +2652,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="subsubsubject">
+<cd:command name="subsubsubject" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="subsubsubject"/>
   </cd:sequence>
@@ -2662,7 +2662,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="appendix">
+<cd:command name="appendix" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="appendix"/>
   </cd:sequence>
@@ -2672,7 +2672,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="in">
+<cd:command name="in" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="in"/>
   </cd:sequence>
@@ -2704,7 +2704,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="somewhere">
+<cd:command name="somewhere" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="somewhere"/>
   </cd:sequence>
@@ -2715,7 +2715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="atpage">
+<cd:command name="atpage" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="atpage"/>
   </cd:sequence>
@@ -2724,7 +2724,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ref">
+<cd:command name="ref" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="ref"/>
   </cd:sequence>
@@ -2740,7 +2740,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="textreference">
+<cd:command name="textreference" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="textreference"/>
   </cd:sequence>
@@ -2750,7 +2750,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="pagereference">
+<cd:command name="pagereference" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="pagereference"/>
   </cd:sequence>
@@ -2759,7 +2759,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="reference">
+<cd:command name="reference" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="reference"/>
   </cd:sequence>
@@ -2769,7 +2769,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usereferences">
+<cd:command name="usereferences" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="usereferences"/>
   </cd:sequence>
@@ -2780,7 +2780,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definereference">
+<cd:command name="definereference" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definereference"/>
   </cd:sequence>
@@ -2792,7 +2792,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definereferenceformat">
+<cd:command name="definereferenceformat" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definereferenceformat"/>
   </cd:sequence>
@@ -2839,7 +2839,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="godown">
+<cd:command name="godown" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="godown"/>
   </cd:sequence>
@@ -2850,37 +2850,37 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="whitespace">
+<cd:command name="whitespace" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="whitespace"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="nowhitespace">
+<cd:command name="nowhitespace" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="nowhitespace"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="crlf">
+<cd:command name="crlf" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="crlf"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="space">
+<cd:command name="space" file="syst-pln.tex">
   <cd:sequence>
     <cd:string value="space"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="fixedspaces">
+<cd:command name="fixedspaces" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="fixedspaces"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="emptylines">
+<cd:command name="emptylines" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="emptylines"/>
   </cd:sequence>
@@ -2891,19 +2891,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nospace">
+<cd:command name="nospace" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="nospace"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="packed">
+<cd:command name="packed" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="packed"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="setupdescriptions">
+<cd:command name="setupdescriptions" file="core-des.tex">
   <cd:sequence>
     <cd:string value="setupdescriptions"/>
   </cd:sequence>
@@ -3004,7 +3004,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupenumerations">
+<cd:command name="setupenumerations" file="core-des.tex">
   <cd:sequence>
     <cd:string value="setupenumerations"/>
   </cd:sequence>
@@ -3018,7 +3018,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineenumeration">
+<cd:command name="defineenumeration" file="core-des.tex">
   <cd:sequence>
     <cd:string value="defineenumeration"/>
   </cd:sequence>
@@ -3052,7 +3052,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definedescription">
+<cd:command name="definedescription" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definedescription"/>
   </cd:sequence>
@@ -3085,7 +3085,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupindentations">
+<cd:command name="setupindentations" file="core-des.tex">
   <cd:sequence>
     <cd:string value="setupindentations"/>
   </cd:sequence>
@@ -3140,7 +3140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineindenting">
+<cd:command name="defineindenting" file="core-des.tex">
   <cd:sequence>
     <cd:string value="defineindenting"/>
   </cd:sequence>
@@ -3154,7 +3154,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="indentation" generated="yes">
+<cd:command name="indentation" generated="yes" file="core-spa.tex">
   <cd:sequence>
     <cd:variable value="indentation"/>
   </cd:sequence>
@@ -3163,7 +3163,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definelabel">
+<cd:command name="definelabel" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definelabel"/>
   </cd:sequence>
@@ -3219,7 +3219,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupcolumns">
+<cd:command name="setupcolumns" file="page-mul.tex">
   <cd:sequence>
     <cd:string value="setupcolumns"/>
   </cd:sequence>
@@ -3289,7 +3289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definetext">
+<cd:command name="definetext" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="definetext"/>
   </cd:sequence>
@@ -3313,7 +3313,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupheader">
+<cd:command name="setupheader" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="setupheader"/>
   </cd:sequence>
@@ -3384,7 +3384,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupfooter">
+<cd:command name="setupfooter" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="setupfooter"/>
   </cd:sequence>
@@ -3398,7 +3398,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuptext">
+<cd:command name="setuptext" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="setuptext"/>
   </cd:sequence>
@@ -3412,7 +3412,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuptop">
+<cd:command name="setuptop" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="setuptop"/>
   </cd:sequence>
@@ -3426,7 +3426,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupbottom">
+<cd:command name="setupbottom" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="setupbottom"/>
   </cd:sequence>
@@ -3440,19 +3440,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="noheaderandfooterlines">
+<cd:command name="noheaderandfooterlines" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="noheaderandfooterlines"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="notopandbottomlines">
+<cd:command name="notopandbottomlines" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="notopandbottomlines"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="setupheadertexts">
+<cd:command name="setupheadertexts" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="setupheadertexts"/>
   </cd:sequence>
@@ -3479,7 +3479,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupfootertexts">
+<cd:command name="setupfootertexts" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="setupfootertexts"/>
   </cd:sequence>
@@ -3506,7 +3506,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuptexttexts">
+<cd:command name="setuptexttexts" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="setuptexttexts"/>
   </cd:sequence>
@@ -3533,7 +3533,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuptoptexts">
+<cd:command name="setuptoptexts" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="setuptoptexts"/>
   </cd:sequence>
@@ -3560,7 +3560,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupbottomtexts">
+<cd:command name="setupbottomtexts" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="setupbottomtexts"/>
   </cd:sequence>
@@ -3587,7 +3587,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definemarking">
+<cd:command name="definemarking" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="definemarking"/>
   </cd:sequence>
@@ -3601,7 +3601,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="couplemarking">
+<cd:command name="couplemarking" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="couplemarking"/>
   </cd:sequence>
@@ -3615,7 +3615,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="decouplemarking">
+<cd:command name="decouplemarking" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="decouplemarking"/>
   </cd:sequence>
@@ -3626,7 +3626,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="resetmarking">
+<cd:command name="resetmarking" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="resetmarking"/>
   </cd:sequence>
@@ -3637,7 +3637,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupmarking">
+<cd:command name="setupmarking" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="setupmarking"/>
   </cd:sequence>
@@ -3661,7 +3661,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="marking">
+<cd:command name="marking" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="marking"/>
   </cd:sequence>
@@ -3673,7 +3673,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="getmarking">
+<cd:command name="getmarking" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="getmarking"/>
   </cd:sequence>
@@ -3692,7 +3692,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nomarking">
+<cd:command name="nomarking" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="nomarking"/>
   </cd:sequence>
@@ -3701,7 +3701,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuplayout">
+<cd:command name="setuplayout" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="setuplayout"/>
   </cd:sequence>
@@ -3865,7 +3865,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="adaptlayout">
+<cd:command name="adaptlayout" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="adaptlayout"/>
   </cd:sequence>
@@ -3885,13 +3885,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="showgrid">
+<cd:command name="showgrid" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="showgrid"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="placeongrid">
+<cd:command name="placeongrid" file="core-grd.tex">
   <cd:sequence>
     <cd:string value="placeongrid"/>
   </cd:sequence>
@@ -3903,7 +3903,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="moveongrid">
+<cd:command name="moveongrid" file="core-grd.tex">
   <cd:sequence>
     <cd:string value="moveongrid"/>
   </cd:sequence>
@@ -4008,7 +4008,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuppagenumbering">
+<cd:command name="setuppagenumbering" file="page-num.tex">
   <cd:sequence>
     <cd:string value="setuppagenumbering"/>
   </cd:sequence>
@@ -4090,7 +4090,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupnarrower">
+<cd:command name="setupnarrower" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="setupnarrower"/>
   </cd:sequence>
@@ -4109,7 +4109,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="define">
+<cd:command name="define" file="syst-ext.tex">
   <cd:sequence>
     <cd:string value="define"/>
   </cd:sequence>
@@ -4122,7 +4122,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usecommands">
+<cd:command name="usecommands" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="usecommands"/>
   </cd:sequence>
@@ -4131,7 +4131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestartstop">
+<cd:command name="definestartstop" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="definestartstop"/>
   </cd:sequence>
@@ -4163,7 +4163,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupheads">
+<cd:command name="setupheads" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="setupheads"/>
   </cd:sequence>
@@ -4215,7 +4215,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupcaptions">
+<cd:command name="setupcaptions" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="setupcaptions"/>
   </cd:sequence>
@@ -4296,7 +4296,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupcaption">
+<cd:command name="setupcaption" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="setupcaption"/>
   </cd:sequence>
@@ -4310,7 +4310,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupfloats">
+<cd:command name="setupfloats" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="setupfloats"/>
   </cd:sequence>
@@ -4394,7 +4394,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupfloatsplitting">
+<cd:command name="setupfloatsplitting" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="setupfloatsplitting"/>
   </cd:sequence>
@@ -4414,7 +4414,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="splitfloat">
+<cd:command name="splitfloat" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="splitfloat"/>
   </cd:sequence>
@@ -4427,7 +4427,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupoppositeplacing">
+<cd:command name="setupoppositeplacing" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="setupoppositeplacing"/>
   </cd:sequence>
@@ -4458,7 +4458,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuphyphenmark">
+<cd:command name="setuphyphenmark" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="setuphyphenmark"/>
   </cd:sequence>
@@ -4478,7 +4478,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuppositioning">
+<cd:command name="setuppositioning" file="page-lyr.tex">
   <cd:sequence>
     <cd:string value="setuppositioning"/>
   </cd:sequence>
@@ -4527,7 +4527,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="grid">
+<cd:command name="grid" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="grid"/>
   </cd:sequence>
@@ -4584,7 +4584,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="page">
+<cd:command name="page" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="page"/>
   </cd:sequence>
@@ -4611,7 +4611,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupreferencing">
+<cd:command name="setupreferencing" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="setupreferencing"/>
   </cd:sequence>
@@ -4667,7 +4667,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupurl">
+<cd:command name="setupurl" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="setupurl"/>
   </cd:sequence>
@@ -4697,7 +4697,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="writetoreferencelist">
+<cd:command name="writetoreferencelist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="writetoreferencelist"/>
   </cd:sequence>
@@ -4721,7 +4721,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definereferencelist">
+<cd:command name="definereferencelist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definereferencelist"/>
   </cd:sequence>
@@ -4735,7 +4735,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupreferencelist">
+<cd:command name="setupreferencelist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="setupreferencelist"/>
   </cd:sequence>
@@ -4767,7 +4767,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="writetolist">
+<cd:command name="writetolist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="writetolist"/>
   </cd:sequence>
@@ -4781,7 +4781,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="writebetweenlist">
+<cd:command name="writebetweenlist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="writebetweenlist"/>
   </cd:sequence>
@@ -4794,7 +4794,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nolist">
+<cd:command name="nolist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="nolist"/>
   </cd:sequence>
@@ -4803,7 +4803,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="listsymbol">
+<cd:command name="listsymbol" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="listsymbol"/>
   </cd:sequence>
@@ -4815,7 +4815,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="placelist">
+<cd:command name="placelist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="placelist"/>
   </cd:sequence>
@@ -4829,7 +4829,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="determinelistcharacteristics">
+<cd:command name="determinelistcharacteristics" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="determinelistcharacteristics"/>
   </cd:sequence>
@@ -4843,7 +4843,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="placecombinedlist">
+<cd:command name="placecombinedlist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="placecombinedlist"/>
   </cd:sequence>
@@ -4857,7 +4857,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definelist">
+<cd:command name="definelist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definelist"/>
   </cd:sequence>
@@ -4874,7 +4874,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuplist">
+<cd:command name="setuplist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="setuplist"/>
   </cd:sequence>
@@ -5052,7 +5052,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definecombinedlist">
+<cd:command name="definecombinedlist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definecombinedlist"/>
   </cd:sequence>
@@ -5069,7 +5069,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupcombinedlist">
+<cd:command name="setupcombinedlist" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="setupcombinedlist"/>
   </cd:sequence>
@@ -5091,7 +5091,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="placecombinedlist" generated="yes">
+<cd:command name="placecombinedlist" generated="yes" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="place"/>
     <cd:variable value="combinedlist"/>
@@ -5121,7 +5121,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupnumbering">
+<cd:command name="setupnumbering" file="core-num.tex">
   <cd:sequence>
     <cd:string value="setupnumbering"/>
   </cd:sequence>
@@ -5199,7 +5199,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="publication">
+<cd:command name="publication" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="publication"/>
   </cd:sequence>
@@ -5208,7 +5208,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuppublications">
+<cd:command name="setuppublications" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="setuppublications"/>
   </cd:sequence>
@@ -5223,7 +5223,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuplines">
+<cd:command name="setuplines" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="setuplines"/>
   </cd:sequence>
@@ -5256,7 +5256,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupparagraphnumbering">
+<cd:command name="setupparagraphnumbering" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="setupparagraphnumbering"/>
   </cd:sequence>
@@ -5285,7 +5285,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuplinenumbering">
+<cd:command name="setuplinenumbering" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="setuplinenumbering"/>
   </cd:sequence>
@@ -5353,7 +5353,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="someline">
+<cd:command name="someline" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="someline"/>
   </cd:sequence>
@@ -5362,7 +5362,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inline">
+<cd:command name="inline" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="inline"/>
   </cd:sequence>
@@ -5371,7 +5371,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupinmargin">
+<cd:command name="setupinmargin" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="setupinmargin"/>
   </cd:sequence>
@@ -5437,7 +5437,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuppagenumber">
+<cd:command name="setuppagenumber" file="page-num.tex">
   <cd:sequence>
     <cd:string value="setuppagenumber"/>
   </cd:sequence>
@@ -5455,7 +5455,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupsubpagenumber">
+<cd:command name="setupsubpagenumber" file="page-num.tex">
   <cd:sequence>
     <cd:string value="setupsubpagenumber"/>
   </cd:sequence>
@@ -5493,7 +5493,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineblank">
+<cd:command name="defineblank" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="defineblank"/>
   </cd:sequence>
@@ -5507,7 +5507,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definepapersize">
+<cd:command name="definepapersize" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="definepapersize"/>
   </cd:sequence>
@@ -5532,7 +5532,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuppaper">
+<cd:command name="setuppaper" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="setuppaper"/>
   </cd:sequence>
@@ -5570,7 +5570,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuppapersize">
+<cd:command name="setuppapersize" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="setuppapersize"/>
   </cd:sequence>
@@ -5610,7 +5610,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuparranging">
+<cd:command name="setuparranging" file="page-imp.tex">
   <cd:sequence>
     <cd:string value="setuparranging"/>
   </cd:sequence>
@@ -5656,7 +5656,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definelogo">
+<cd:command name="definelogo" file="page-log.tex">
   <cd:sequence>
     <cd:string value="definelogo"/>
   </cd:sequence>
@@ -5694,7 +5694,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="placelogos">
+<cd:command name="placelogos" file="page-log.tex">
   <cd:sequence>
     <cd:string value="placelogos"/>
   </cd:sequence>
@@ -5740,7 +5740,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesectionblock">
+<cd:command name="definesectionblock" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definesectionblock"/>
   </cd:sequence>
@@ -5754,7 +5754,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupsectionblock">
+<cd:command name="setupsectionblock" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="setupsectionblock"/>
   </cd:sequence>
@@ -5781,7 +5781,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesection">
+<cd:command name="definesection" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definesection"/>
   </cd:sequence>
@@ -5792,7 +5792,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupsection">
+<cd:command name="setupsection" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="setupsection"/>
   </cd:sequence>
@@ -5819,7 +5819,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuphead">
+<cd:command name="setuphead" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="setuphead"/>
   </cd:sequence>
@@ -5963,7 +5963,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupheadnumber">
+<cd:command name="setupheadnumber" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="setupheadnumber"/>
   </cd:sequence>
@@ -5990,7 +5990,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="determineheadnumber">
+<cd:command name="determineheadnumber" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="determineheadnumber"/>
   </cd:sequence>
@@ -6001,20 +6001,20 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="currentheadnumber">
+<cd:command name="currentheadnumber" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="currentheadnumber"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="nextsection" generated="yes">
+<cd:command name="nextsection" generated="yes" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="next"/>
     <cd:variable value="section"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definehead">
+<cd:command name="definehead" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definehead"/>
   </cd:sequence>
@@ -6028,7 +6028,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupitemgroup">
+<cd:command name="setupitemgroup" file="core-itm.tex">
   <cd:sequence>
     <cd:string value="setupitemgroup"/>
   </cd:sequence>
@@ -6260,7 +6260,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sym">
+<cd:command name="sym" file="core-itm.tex">
   <cd:sequence>
     <cd:string value="sym"/>
   </cd:sequence>
@@ -6275,7 +6275,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="defineregister">
+<cd:command name="defineregister" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="defineregister"/>
   </cd:sequence>
@@ -6289,7 +6289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupregister">
+<cd:command name="setupregister" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="setupregister"/>
   </cd:sequence>
@@ -6409,7 +6409,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="register" generated="yes">
+<cd:command name="register" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:variable value="register"/>
   </cd:sequence>
@@ -6421,7 +6421,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="startregister" generated="yes">
+<cd:command name="startregister" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="start"/>
     <cd:variable value="register"/>
@@ -6434,7 +6434,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="writetoregister">
+<cd:command name="writetoregister" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="writetoregister"/>
   </cd:sequence>
@@ -6462,7 +6462,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="coupleregister">
+<cd:command name="coupleregister" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="coupleregister"/>
   </cd:sequence>
@@ -6473,7 +6473,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="placeregister">
+<cd:command name="placeregister" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="placeregister"/>
   </cd:sequence>
@@ -6501,7 +6501,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="completeregister" generated="yes">
+<cd:command name="completeregister" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="complete"/>
     <cd:variable value="register"/>
@@ -6513,7 +6513,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="placeregister" generated="yes">
+<cd:command name="placeregister" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="place"/>
     <cd:variable value="register"/>
@@ -6525,7 +6525,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesynonyms">
+<cd:command name="definesynonyms" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="definesynonyms"/>
   </cd:sequence>
@@ -6545,7 +6545,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupsynonyms">
+<cd:command name="setupsynonyms" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="setupsynonyms"/>
   </cd:sequence>
@@ -6644,7 +6644,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definesorting">
+<cd:command name="definesorting" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="definesorting"/>
   </cd:sequence>
@@ -6661,7 +6661,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupsorting">
+<cd:command name="setupsorting" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="setupsorting"/>
   </cd:sequence>
@@ -6739,7 +6739,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definemakeup">
+<cd:command name="definemakeup" file="page-mak.tex">
   <cd:sequence>
     <cd:string value="definemakeup"/>
   </cd:sequence>
@@ -6767,7 +6767,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupmakeup">
+<cd:command name="setupmakeup" file="page-mak.tex">
   <cd:sequence>
     <cd:string value="setupmakeup"/>
   </cd:sequence>
@@ -6877,7 +6877,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="date">
+<cd:command name="date" file="core-con.tex">
   <cd:sequence>
     <cd:string value="date"/>
   </cd:sequence>
@@ -6898,13 +6898,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="referraldate">
+<cd:command name="referraldate" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="referraldate"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="indenting">
+<cd:command name="indenting" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="indenting"/>
   </cd:sequence>
@@ -6921,13 +6921,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="noindenting">
+<cd:command name="noindenting" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="noindenting"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="blank">
+<cd:command name="blank" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="blank"/>
   </cd:sequence>
@@ -6952,7 +6952,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="packed" type="environment">
+<cd:command name="packed" type="environment" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="packed"/>
   </cd:sequence>
@@ -6979,7 +6979,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="correctwhitespace">
+<cd:command name="correctwhitespace" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="correctwhitespace"/>
   </cd:sequence>
@@ -7025,7 +7025,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupalign">
+<cd:command name="setupalign" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="setupalign"/>
   </cd:sequence>
@@ -7074,7 +7074,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuptolerance">
+<cd:command name="setuptolerance" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="setuptolerance"/>
   </cd:sequence>
@@ -7092,7 +7092,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="pagetype">
+<cd:command name="pagetype" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="pagetype"/>
   </cd:sequence>
@@ -7103,7 +7103,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="processpage">
+<cd:command name="processpage" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="processpage"/>
   </cd:sequence>
@@ -7118,7 +7118,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="couplepage">
+<cd:command name="couplepage" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="couplepage"/>
   </cd:sequence>
@@ -7140,7 +7140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="position">
+<cd:command name="position" file="page-lyr.tex">
   <cd:sequence>
     <cd:string value="position"/>
   </cd:sequence>
@@ -7150,7 +7150,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupscreens">
+<cd:command name="setupscreens" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="setupscreens"/>
   </cd:sequence>
@@ -7174,7 +7174,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupbackgrounds">
+<cd:command name="setupbackgrounds" file="page-bck.tex">
   <cd:sequence>
     <cd:string value="setupbackgrounds"/>
   </cd:sequence>
@@ -7230,7 +7230,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="typebuffer">
+<cd:command name="typebuffer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="typebuffer"/>
   </cd:sequence>
@@ -7241,7 +7241,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definebuffer">
+<cd:command name="definebuffer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="definebuffer"/>
   </cd:sequence>
@@ -7252,7 +7252,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupbuffer">
+<cd:command name="setupbuffer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="setupbuffer"/>
   </cd:sequence>
@@ -7274,7 +7274,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineblock">
+<cd:command name="defineblock" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="defineblock"/>
   </cd:sequence>
@@ -7285,13 +7285,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nomoreblocks">
+<cd:command name="nomoreblocks" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="nomoreblocks"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="hideblocks">
+<cd:command name="hideblocks" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="hideblocks"/>
   </cd:sequence>
@@ -7305,7 +7305,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="keepblocks">
+<cd:command name="keepblocks" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="keepblocks"/>
   </cd:sequence>
@@ -7320,7 +7320,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="useblocks">
+<cd:command name="useblocks" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="useblocks"/>
   </cd:sequence>
@@ -7334,7 +7334,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="processblocks">
+<cd:command name="processblocks" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="processblocks"/>
   </cd:sequence>
@@ -7348,7 +7348,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="bypassblocks">
+<cd:command name="bypassblocks" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="bypassblocks"/>
   </cd:sequence>
@@ -7376,7 +7376,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="selectblocks">
+<cd:command name="selectblocks" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="selectblocks"/>
   </cd:sequence>
@@ -7396,7 +7396,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupblock">
+<cd:command name="setupblock" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="setupblock"/>
   </cd:sequence>
@@ -7439,7 +7439,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mathematics">
+<cd:command name="mathematics" file="supp-mat.tex">
   <cd:sequence>
     <cd:string value="mathematics"/>
   </cd:sequence>
@@ -7448,7 +7448,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="placeformula">
+<cd:command name="placeformula" file="core-mat.tex">
   <cd:sequence>
     <cd:string value="placeformula"/>
   </cd:sequence>
@@ -7459,7 +7459,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="placesubformula">
+<cd:command name="placesubformula" file="core-mat.tex">
   <cd:sequence>
     <cd:string value="placesubformula"/>
   </cd:sequence>
@@ -7470,7 +7470,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="placefloat" generated="yes">
+<cd:command name="placefloat" generated="yes" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="place"/>
     <cd:variable value="float"/>
@@ -7542,7 +7542,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definefloat">
+<cd:command name="definefloat" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="definefloat"/>
   </cd:sequence>
@@ -7556,7 +7556,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupfloat">
+<cd:command name="setupfloat" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="setupfloat"/>
   </cd:sequence>
@@ -7641,7 +7641,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="referral">
+<cd:command name="referral" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="referral"/>
   </cd:sequence>
@@ -7694,7 +7694,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="chem">
+<cd:command name="chem" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="chem"/>
   </cd:sequence>
@@ -7705,7 +7705,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="fraction">
+<cd:command name="fraction" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="fraction"/>
   </cd:sequence>
@@ -7715,7 +7715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="periods">
+<cd:command name="periods" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="periods"/>
   </cd:sequence>
@@ -7747,7 +7747,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupitems">
+<cd:command name="setupitems" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="setupitems"/>
   </cd:sequence>
@@ -7796,7 +7796,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="quotation" type="environment">
+<cd:command name="quotation" type="environment" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="quotation"/>
   </cd:sequence>
@@ -7809,7 +7809,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="quotation">
+<cd:command name="quotation" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="quotation"/>
   </cd:sequence>
@@ -7818,7 +7818,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="quote">
+<cd:command name="quote" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="quote"/>
   </cd:sequence>
@@ -7827,7 +7827,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupquote">
+<cd:command name="setupquote" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="setupquote"/>
   </cd:sequence>
@@ -7873,7 +7873,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineparagraphs">
+<cd:command name="defineparagraphs" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="defineparagraphs"/>
   </cd:sequence>
@@ -7935,7 +7935,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupparagraphs">
+<cd:command name="setupparagraphs" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="setupparagraphs"/>
   </cd:sequence>
@@ -8000,7 +8000,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuptab">
+<cd:command name="setuptab" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="setuptab"/>
   </cd:sequence>
@@ -8062,7 +8062,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definetabulate">
+<cd:command name="definetabulate" file="core-tbl.tex">
   <cd:sequence>
     <cd:string value="definetabulate"/>
   </cd:sequence>
@@ -8093,7 +8093,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuptabulate">
+<cd:command name="setuptabulate" file="core-tbl.tex">
   <cd:sequence>
     <cd:string value="setuptabulate"/>
   </cd:sequence>
@@ -8162,7 +8162,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuptables">
+<cd:command name="setuptables" file="core-tab.tex">
   <cd:sequence>
     <cd:string value="setuptables"/>
   </cd:sequence>
@@ -8269,7 +8269,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definetabletemplate">
+<cd:command name="definetabletemplate" file="core-tab.tex">
   <cd:sequence>
     <cd:string value="definetabletemplate"/>
   </cd:sequence>
@@ -8289,7 +8289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="useexternalfiles">
+<cd:command name="useexternalfiles" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="useexternalfiles"/>
   </cd:sequence>
@@ -8312,7 +8312,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="useexternalfile">
+<cd:command name="useexternalfile" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="useexternalfile"/>
   </cd:sequence>
@@ -8338,7 +8338,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="useexternalfigure">
+<cd:command name="useexternalfigure" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="useexternalfigure"/>
   </cd:sequence>
@@ -8423,7 +8423,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="externalfigure">
+<cd:command name="externalfigure" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="externalfigure"/>
   </cd:sequence>
@@ -8437,7 +8437,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupexternalfigures">
+<cd:command name="setupexternalfigures" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="setupexternalfigures"/>
   </cd:sequence>
@@ -8481,7 +8481,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="showexternalfigures">
+<cd:command name="showexternalfigures" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="showexternalfigures"/>
   </cd:sequence>
@@ -8496,7 +8496,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="useexternalsoundtrack">
+<cd:command name="useexternalsoundtrack" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="useexternalsoundtrack"/>
   </cd:sequence>
@@ -8510,7 +8510,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="name">
+<cd:command name="name" file="syst-gen.tex">
   <cd:sequence>
     <cd:string value="name"/>
   </cd:sequence>
@@ -8548,7 +8548,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="rotate">
+<cd:command name="rotate" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="rotate"/>
   </cd:sequence>
@@ -8560,7 +8560,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuprotate">
+<cd:command name="setuprotate" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="setuprotate"/>
   </cd:sequence>
@@ -8581,7 +8581,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mirror">
+<cd:command name="mirror" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="mirror"/>
   </cd:sequence>
@@ -8590,7 +8590,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="scale">
+<cd:command name="scale" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="scale"/>
   </cd:sequence>
@@ -8607,7 +8607,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupcombinations">
+<cd:command name="setupcombinations" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="setupcombinations"/>
   </cd:sequence>
@@ -8674,7 +8674,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="placesidebyside">
+<cd:command name="placesidebyside" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="placesidebyside"/>
   </cd:sequence>
@@ -8684,7 +8684,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="placeontopofeachother">
+<cd:command name="placeontopofeachother" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="placeontopofeachother"/>
   </cd:sequence>
@@ -8715,7 +8715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupinteractionscreen">
+<cd:command name="setupinteractionscreen" file="core-int.tex">
   <cd:sequence>
     <cd:string value="setupinteractionscreen"/>
   </cd:sequence>
@@ -8757,7 +8757,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="screen">
+<cd:command name="screen" file="core-int.tex">
   <cd:sequence>
     <cd:string value="screen"/>
   </cd:sequence>
@@ -8765,7 +8765,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuppagetransitions">
+<cd:command name="setuppagetransitions" file="core-int.tex">
   <cd:sequence>
     <cd:string value="setuppagetransitions"/>
   </cd:sequence>
@@ -8777,7 +8777,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupinteraction">
+<cd:command name="setupinteraction" file="core-nav.tex">
   <cd:sequence>
     <cd:string value="setupinteraction"/>
   </cd:sequence>
@@ -8871,7 +8871,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineinteractionmenu">
+<cd:command name="defineinteractionmenu" file="core-int.tex">
   <cd:sequence>
     <cd:string value="defineinteractionmenu"/>
   </cd:sequence>
@@ -8957,7 +8957,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineinteractionmenu">
+<cd:command name="defineinteractionmenu" file="core-int.tex">
   <cd:sequence>
     <cd:string value="defineinteractionmenu"/>
   </cd:sequence>
@@ -8993,7 +8993,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="disableinteractionmenu">
+<cd:command name="disableinteractionmenu" file="core-int.tex">
   <cd:sequence>
     <cd:string value="disableinteractionmenu"/>
   </cd:sequence>
@@ -9009,7 +9009,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="useexternaldocument">
+<cd:command name="useexternaldocument" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="useexternaldocument"/>
   </cd:sequence>
@@ -9026,7 +9026,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="useURL">
+<cd:command name="useURL" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="useURL"/>
   </cd:sequence>
@@ -9046,7 +9046,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="coupledocument">
+<cd:command name="coupledocument" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="coupledocument"/>
   </cd:sequence>
@@ -9063,7 +9063,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="from">
+<cd:command name="from" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="from"/>
   </cd:sequence>
@@ -9083,7 +9083,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="interactionbuttons">
+<cd:command name="interactionbuttons" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="interactionbuttons"/>
   </cd:sequence>
@@ -9097,7 +9097,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupinteractionbar">
+<cd:command name="setupinteractionbar" file="core-int.tex">
   <cd:sequence>
     <cd:string value="setupinteractionbar"/>
   </cd:sequence>
@@ -9147,7 +9147,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="synchronize">
+<cd:command name="synchronize" file="core-int.tex">
   <cd:sequence>
     <cd:string value="synchronize"/>
   </cd:sequence>
@@ -9163,7 +9163,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupsynchronizationbar">
+<cd:command name="setupsynchronizationbar" file="core-int.tex">
   <cd:sequence>
     <cd:string value="setupsynchronizationbar"/>
   </cd:sequence>
@@ -9199,7 +9199,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="synchronizationbar">
+<cd:command name="synchronizationbar" file="core-int.tex">
   <cd:sequence>
     <cd:string value="synchronizationbar"/>
   </cd:sequence>
@@ -9217,7 +9217,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupsynchronization">
+<cd:command name="setupsynchronization" file="core-int.tex">
   <cd:sequence>
     <cd:string value="setupsynchronization"/>
   </cd:sequence>
@@ -9231,7 +9231,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineprofile">
+<cd:command name="defineprofile" file="core-int.tex">
   <cd:sequence>
     <cd:string value="defineprofile"/>
   </cd:sequence>
@@ -9245,7 +9245,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupprofiles">
+<cd:command name="setupprofiles" file="core-int.tex">
   <cd:sequence>
     <cd:string value="setupprofiles"/>
   </cd:sequence>
@@ -9269,7 +9269,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="followprofile">
+<cd:command name="followprofile" file="core-int.tex">
   <cd:sequence>
     <cd:string value="followprofile"/>
   </cd:sequence>
@@ -9281,7 +9281,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="placebookmarks">
+<cd:command name="placebookmarks" file="core-int.tex">
   <cd:sequence>
     <cd:string value="placebookmarks"/>
   </cd:sequence>
@@ -9317,7 +9317,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupversions">
+<cd:command name="setupversions" file="core-int.tex">
   <cd:sequence>
     <cd:string value="setupversions"/>
   </cd:sequence>
@@ -9340,7 +9340,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="markversion">
+<cd:command name="markversion" file="core-int.tex">
   <cd:sequence>
     <cd:string value="markversion"/>
   </cd:sequence>
@@ -9348,13 +9348,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="selectversion">
+<cd:command name="selectversion" file="core-int.tex">
   <cd:sequence>
     <cd:string value="selectversion"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="defineversion">
+<cd:command name="defineversion" file="core-int.tex">
   <cd:sequence>
     <cd:string value="defineversion"/>
   </cd:sequence>
@@ -9368,7 +9368,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="followversion">
+<cd:command name="followversion" file="core-int.tex">
   <cd:sequence>
     <cd:string value="followversion"/>
   </cd:sequence>
@@ -9380,7 +9380,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="followprofileversion">
+<cd:command name="followprofileversion" file="core-int.tex">
   <cd:sequence>
     <cd:string value="followprofileversion"/>
   </cd:sequence>
@@ -9395,7 +9395,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineprogram">
+<cd:command name="defineprogram" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="defineprogram"/>
   </cd:sequence>
@@ -9412,7 +9412,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupprograms">
+<cd:command name="setupprograms" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="setupprograms"/>
   </cd:sequence>
@@ -9425,7 +9425,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="program">
+<cd:command name="program" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="program"/>
   </cd:sequence>
@@ -9465,7 +9465,7 @@
 
 <!-- remark skipped -->
 
-<cd:command name="goto">
+<cd:command name="goto" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="goto"/>
   </cd:sequence>
@@ -9476,7 +9476,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gotobox">
+<cd:command name="gotobox" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="gotobox"/>
   </cd:sequence>
@@ -9499,7 +9499,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupbuttons">
+<cd:command name="setupbuttons" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="setupbuttons"/>
   </cd:sequence>
@@ -9516,7 +9516,7 @@
 
 <!-- menubutton skipped -->
 
-<cd:command name="setupcomment">
+<cd:command name="setupcomment" file="core-int.tex">
   <cd:sequence>
     <cd:string value="setupcomment"/>
   </cd:sequence>
@@ -9595,7 +9595,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definefield">
+<cd:command name="definefield" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definefield"/>
   </cd:sequence>
@@ -9618,7 +9618,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesubfield">
+<cd:command name="definesubfield" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definesubfield"/>
   </cd:sequence>
@@ -9635,7 +9635,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="copyfield">
+<cd:command name="copyfield" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="copyfield"/>
   </cd:sequence>
@@ -9649,7 +9649,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="clonefield">
+<cd:command name="clonefield" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="clonefield"/>
   </cd:sequence>
@@ -9669,7 +9669,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="field">
+<cd:command name="field" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="field"/>
   </cd:sequence>
@@ -9680,7 +9680,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="fitfield">
+<cd:command name="fitfield" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="fitfield"/>
   </cd:sequence>
@@ -9691,7 +9691,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="fillinfield">
+<cd:command name="fillinfield" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="fillinfield"/>
   </cd:sequence>
@@ -9703,7 +9703,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tooltip">
+<cd:command name="tooltip" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="tooltip"/>
   </cd:sequence>
@@ -9718,7 +9718,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="showfields">
+<cd:command name="showfields" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="showfields"/>
   </cd:sequence>
@@ -9729,13 +9729,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="logfields">
+<cd:command name="logfields" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="logfields"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="setupfield">
+<cd:command name="setupfield" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="setupfield"/>
   </cd:sequence>
@@ -9759,7 +9759,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupfields">
+<cd:command name="setupfields" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="setupfields"/>
   </cd:sequence>
@@ -9856,7 +9856,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupforms">
+<cd:command name="setupforms" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="setupforms"/>
   </cd:sequence>
@@ -9870,7 +9870,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definefieldstack">
+<cd:command name="definefieldstack" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definefieldstack"/>
   </cd:sequence>
@@ -9887,7 +9887,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="fieldstack">
+<cd:command name="fieldstack" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="fieldstack"/>
   </cd:sequence>
@@ -9904,7 +9904,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="clip">
+<cd:command name="clip" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="clip"/>
   </cd:sequence>
@@ -9916,7 +9916,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupclipping">
+<cd:command name="setupclipping" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="setupclipping"/>
   </cd:sequence>
@@ -10205,7 +10205,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupstrut">
+<cd:command name="setupstrut" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="setupstrut"/>
   </cd:sequence>
diff --git a/context/data/cont-it.xml b/tex/context/interface/cont-it.xml
index 658ad493b..0984e65c4 100644
--- a/context/data/cont-it.xml
+++ b/tex/context/interface/cont-it.xml
@@ -2,7 +2,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context">
 
-<cd:command name="installalingua">
+<cd:command name="installalingua" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="installalingua"/>
   </cd:sequence>
@@ -56,7 +56,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostalingua">
+<cd:command name="impostalingua" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="impostalingua"/>
   </cd:sequence>
@@ -95,7 +95,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="linguaprincipale">
+<cd:command name="linguaprincipale" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="linguaprincipale"/>
   </cd:sequence>
@@ -113,7 +113,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="traduci">
+<cd:command name="traduci" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="traduci"/>
   </cd:sequence>
@@ -126,7 +126,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usacodifica">
+<cd:command name="usacodifica" file="enco-ini.tex">
   <cd:sequence>
     <cd:string value="usacodifica"/>
   </cd:sequence>
@@ -137,19 +137,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usaspecialita">
+<cd:command name="usaspecialita" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="usaspecialita"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords list="yes">
-      <cd:constant type="reset"/>
+      <cd:constant type="reimposta"/>
       <cd:constant type="cd:name"/>
     </cd:keywords>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscioutput">
+<cd:command name="definiscioutput" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="definiscioutput"/>
   </cd:sequence>
@@ -163,7 +163,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaoutput">
+<cd:command name="impostaoutput" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="impostaoutput"/>
   </cd:sequence>
@@ -174,7 +174,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definisciambientefontdeltesto">
+<cd:command name="definisciambientefontdeltesto" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definisciambientefontdeltesto"/>
   </cd:sequence>
@@ -183,7 +183,7 @@
       <cd:constant type="5pt"/>
       <cd:constant type="..."/>
       <cd:constant type="12pt"/>
-      <cd:constant type="default"/>
+      <cd:constant type="implicito"/>
     </cd:keywords>
     <cd:assignments list="yes">
       <cd:parameter name="testo">
@@ -211,7 +211,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaambientefontdeltesto">
+<cd:command name="impostaambientefontdeltesto" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="impostaambientefontdeltesto"/>
   </cd:sequence>
@@ -236,7 +236,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscifontdeltesto">
+<cd:command name="definiscifontdeltesto" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definiscifontdeltesto"/>
   </cd:sequence>
@@ -245,7 +245,7 @@
       <cd:constant type="5pt"/>
       <cd:constant type="..."/>
       <cd:constant type="12pt"/>
-      <cd:constant type="default"/>
+      <cd:constant type="implicito"/>
     </cd:keywords>
     <cd:keywords>
       <cd:constant type="rm"/>
@@ -335,7 +335,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="cambiaafontdeltesto">
+<cd:command name="cambiaafontdeltesto" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="cambiaafontdeltesto"/>
   </cd:sequence>
@@ -351,7 +351,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscifont">
+<cd:command name="definiscifont" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definiscifont"/>
   </cd:sequence>
@@ -365,7 +365,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostastrut">
+<cd:command name="impostastrut" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="impostastrut"/>
   </cd:sequence>
@@ -379,7 +379,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostacolore">
+<cd:command name="impostacolore" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="impostacolore"/>
   </cd:sequence>
@@ -390,7 +390,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostacolori">
+<cd:command name="impostacolori" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="impostacolori"/>
   </cd:sequence>
@@ -448,7 +448,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscicolore">
+<cd:command name="definiscicolore" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definiscicolore"/>
   </cd:sequence>
@@ -485,8 +485,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="colore" type="environment" file="colo-ini.tex">
   <cd:sequence>
+    <cd:string value="colore"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -495,7 +496,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="colore">
+<cd:command name="colore" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="colore"/>
   </cd:sequence>
@@ -507,7 +508,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="coloregrigio">
+<cd:command name="coloregrigio" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="coloregrigio"/>
   </cd:sequence>
@@ -529,7 +530,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscitavolozza">
+<cd:command name="definiscitavolozza" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definiscitavolozza"/>
   </cd:sequence>
@@ -545,7 +546,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatavolozza">
+<cd:command name="impostatavolozza" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="impostatavolozza"/>
   </cd:sequence>
@@ -556,7 +557,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscigruppocolori">
+<cd:command name="definiscigruppocolori" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definiscigruppocolori"/>
   </cd:sequence>
@@ -604,7 +605,7 @@
       <cd:constant type="verticale"/>
       <cd:constant type="nome"/>
       <cd:constant type="valore"/>
-      <cd:constant type="numero"/>
+      <cd:variable type="cd:number"/>
     </cd:keywords>
   </cd:arguments>
 </cd:command>
@@ -631,13 +632,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mostramakeup">
+<cd:command name="mostramakeup" file="supp-vis.tex">
   <cd:sequence>
     <cd:string value="mostramakeup"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definiscitype">
+<cd:command name="definiscitype" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="definiscitype"/>
   </cd:sequence>
@@ -651,7 +652,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatype">
+<cd:command name="impostatype" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="impostatype"/>
   </cd:sequence>
@@ -673,7 +674,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="colore">
@@ -683,7 +684,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="type">
+<cd:command name="type" file="verb-ini.tex">
   <cd:sequence>
     <cd:string value="type"/>
   </cd:sequence>
@@ -692,7 +693,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="typ">
+<cd:command name="typ" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="typ"/>
   </cd:sequence>
@@ -701,7 +702,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tex">
+<cd:command name="tex" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="tex"/>
   </cd:sequence>
@@ -710,7 +711,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="arg">
+<cd:command name="arg" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="arg"/>
   </cd:sequence>
@@ -719,7 +720,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscityping">
+<cd:command name="definiscityping" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="definiscityping"/>
   </cd:sequence>
@@ -735,7 +736,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatyping">
+<cd:command name="impostatyping" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="impostatyping"/>
   </cd:sequence>
@@ -815,7 +816,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="colore">
@@ -833,14 +834,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="typing" type="environment" generated="yes">
   <cd:sequence>
+    <cd:variable value="typing"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="typefile">
+<cd:command name="typefile" file="verb-ini.tex">
   <cd:sequence>
     <cd:string value="typefile"/>
   </cd:sequence>
@@ -852,7 +854,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostanotepdp">
+<cd:command name="impostanotepdp" file="core-not.tex">
   <cd:sequence>
     <cd:string value="impostanotepdp"/>
   </cd:sequence>
@@ -866,12 +868,12 @@
         <cd:constant type="Numeriromani"/>
       </cd:parameter>
       <cd:parameter name="modo">
-        <cd:constant type="datesto"/>
-        <cd:constant type="dacd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="luogo">
         <cd:constant type="pagina"/>
-        <cd:constant type="testo"/>
+        <cd:variable type="cd:text"/>
         <cd:constant type="colonne"/>
         <cd:constant type="firstcolumn"/>
         <cd:constant type="lastcolumn"/>
@@ -908,7 +910,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="distanza">
@@ -942,7 +944,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="coloretesto">
@@ -960,7 +962,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostadefinizionenotepdp">
+<cd:command name="impostadefinizionenotepdp" file="core-not.tex">
   <cd:sequence>
     <cd:string value="impostadefinizionenotepdp"/>
   </cd:sequence>
@@ -971,7 +973,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="notapdp">
+<cd:command name="notapdp" file="core-not.tex">
   <cd:sequence>
     <cd:string value="notapdp"/>
   </cd:sequence>
@@ -981,7 +983,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="testonotapdp">
+<cd:command name="testonotapdp" file="core-not.tex">
   <cd:sequence>
     <cd:string value="testonotapdp"/>
   </cd:sequence>
@@ -991,7 +993,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nota">
+<cd:command name="nota" file="core-not.tex">
   <cd:sequence>
     <cd:string value="nota"/>
   </cd:sequence>
@@ -1000,14 +1002,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="localfootnotes" type="environment">
   <cd:sequence>
+    <cd:string value="localfootnotes"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mettinotepdplocali">
+<cd:command name="mettinotepdplocali" file="core-not.tex">
   <cd:sequence>
     <cd:string value="mettinotepdplocali"/>
   </cd:sequence>
@@ -1018,7 +1021,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mettinotepdp">
+<cd:command name="mettinotepdp" file="core-not.tex">
   <cd:sequence>
     <cd:string value="mettinotepdp"/>
   </cd:sequence>
@@ -1029,7 +1032,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostasottolinea">
+<cd:command name="impostasottolinea" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="impostasottolinea"/>
   </cd:sequence>
@@ -1056,7 +1059,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sottolinea">
+<cd:command name="sottolinea" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="sottolinea"/>
   </cd:sequence>
@@ -1065,7 +1068,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sottolinee">
+<cd:command name="sottolinee" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="sottolinee"/>
   </cd:sequence>
@@ -1074,7 +1077,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sopralinea">
+<cd:command name="sopralinea" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="sopralinea"/>
   </cd:sequence>
@@ -1083,7 +1086,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sopralinee">
+<cd:command name="sopralinee" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="sopralinee"/>
   </cd:sequence>
@@ -1092,7 +1095,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sbarrato">
+<cd:command name="sbarrato" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="sbarrato"/>
   </cd:sequence>
@@ -1101,7 +1104,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sbarrati">
+<cd:command name="sbarrati" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="sbarrati"/>
   </cd:sequence>
@@ -1110,7 +1113,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="numeriromani">
+<cd:command name="numeriromani" file="core-con.tex">
   <cd:sequence>
     <cd:string value="numeriromani"/>
   </cd:sequence>
@@ -1119,7 +1122,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Numeriromani">
+<cd:command name="Numeriromani" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Numeriromani"/>
   </cd:sequence>
@@ -1128,7 +1131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="numeri">
+<cd:command name="numeri" file="core-con.tex">
   <cd:sequence>
     <cd:string value="numeri"/>
   </cd:sequence>
@@ -1137,7 +1140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="lettera">
+<cd:command name="lettera" file="core-con.tex">
   <cd:sequence>
     <cd:string value="lettera"/>
   </cd:sequence>
@@ -1146,7 +1149,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Lettera">
+<cd:command name="Lettera" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Lettera"/>
   </cd:sequence>
@@ -1155,7 +1158,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="lettere">
+<cd:command name="lettere" file="core-con.tex">
   <cd:sequence>
     <cd:string value="lettere"/>
   </cd:sequence>
@@ -1164,7 +1167,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Lettere">
+<cd:command name="Lettere" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Lettere"/>
   </cd:sequence>
@@ -1173,16 +1176,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="medievale">
+<cd:command name="mediaeval" file="core-con.tex">
   <cd:sequence>
-    <cd:string value="medievale"/>
+    <cd:string value="mediaeval"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mese">
+<cd:command name="mese" file="core-con.tex">
   <cd:sequence>
     <cd:string value="mese"/>
   </cd:sequence>
@@ -1191,7 +1194,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="MESE">
+<cd:command name="MESE" file="core-con.tex">
   <cd:sequence>
     <cd:string value="MESE"/>
   </cd:sequence>
@@ -1200,7 +1203,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="giornosettimana">
+<cd:command name="giornosettimana" file="core-con.tex">
   <cd:sequence>
     <cd:string value="giornosettimana"/>
   </cd:sequence>
@@ -1209,7 +1212,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="GIORNOSETTIMANA">
+<cd:command name="GIORNOSETTIMANA" file="core-con.tex">
   <cd:sequence>
     <cd:string value="GIORNOSETTIMANA"/>
   </cd:sequence>
@@ -1218,7 +1221,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostamaiuscole">
+<cd:command name="impostamaiuscole" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="impostamaiuscole"/>
   </cd:sequence>
@@ -1236,7 +1239,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="cap">
+<cd:command name="cap" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="cap"/>
   </cd:sequence>
@@ -1281,7 +1284,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="PAROLA">
+<cd:command name="PAROLA" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="PAROLA"/>
   </cd:sequence>
@@ -1290,7 +1293,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="PAROLE">
+<cd:command name="PAROLE" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="PAROLE"/>
   </cd:sequence>
@@ -1299,7 +1302,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Parola">
+<cd:command name="Parola" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="Parola"/>
   </cd:sequence>
@@ -1308,7 +1311,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Parole">
+<cd:command name="Parole" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="Parole"/>
   </cd:sequence>
@@ -1317,7 +1320,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stirato">
+<cd:command name="stirato" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="stirato"/>
   </cd:sequence>
@@ -1326,7 +1329,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscisimbolo">
+<cd:command name="definiscisimbolo" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="definiscisimbolo"/>
   </cd:sequence>
@@ -1340,7 +1343,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscifigurasimbolo">
+<cd:command name="definiscifigurasimbolo" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="definiscifigurasimbolo"/>
   </cd:sequence>
@@ -1357,7 +1360,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="simbolo">
+<cd:command name="simbolo" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="simbolo"/>
   </cd:sequence>
@@ -1371,8 +1374,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="symbolset" type="environment">
   <cd:sequence>
+    <cd:string value="symbolset"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -1381,7 +1385,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostasetsimboli">
+<cd:command name="impostasetsimboli" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="impostasetsimboli"/>
   </cd:sequence>
@@ -1392,7 +1396,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usasimboli">
+<cd:command name="usasimboli" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="usasimboli"/>
   </cd:sequence>
@@ -1414,7 +1418,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definisciconversione">
+<cd:command name="definisciconversione" file="core-con.tex">
   <cd:sequence>
     <cd:string value="definisciconversione"/>
   </cd:sequence>
@@ -1429,7 +1433,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="convertinumero">
+<cd:command name="convertinumero" file="core-con.tex">
   <cd:sequence>
     <cd:string value="convertinumero"/>
   </cd:sequence>
@@ -1439,7 +1443,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatestointestazioni">
+<cd:command name="impostatestointestazioni" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="impostatestointestazioni"/>
   </cd:sequence>
@@ -1462,7 +1466,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatestoetichette">
+<cd:command name="impostatestoetichette" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="impostatestoetichette"/>
   </cd:sequence>
@@ -1485,7 +1489,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="testoinstestazioni">
+<cd:command name="testoinstestazioni" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="testoinstestazioni"/>
   </cd:sequence>
@@ -1503,7 +1507,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostalineemargine">
+<cd:command name="impostalineemargine" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="impostalineemargine"/>
   </cd:sequence>
@@ -1519,8 +1523,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="lineamargine" type="environment">
   <cd:sequence>
+    <cd:string value="lineamargine"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -1541,7 +1546,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaampiezzariga">
+<cd:command name="impostaampiezzariga" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="impostaampiezzariga"/>
   </cd:sequence>
@@ -1552,7 +1557,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaincorniciato">
+<cd:command name="impostaincorniciato" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="impostaincorniciato"/>
   </cd:sequence>
@@ -1696,7 +1701,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="incorniciato">
+<cd:command name="incorniciato" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="incorniciato"/>
   </cd:sequence>
@@ -1708,7 +1713,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="circondato">
+<cd:command name="circondato" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="circondato"/>
   </cd:sequence>
@@ -1720,7 +1725,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="lineesottili">
+<cd:command name="lineesottili" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="lineesottili"/>
   </cd:sequence>
@@ -1731,7 +1736,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostalineesottili">
+<cd:command name="impostalineesottili" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="impostalineesottili"/>
   </cd:sequence>
@@ -1790,19 +1795,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="capello">
+<cd:command name="capello" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="capello"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="lineasottile">
+<cd:command name="lineasottile" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="lineasottile"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definiscitestoincorniciato">
+<cd:command name="definiscitestoincorniciato" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="definiscitestoincorniciato"/>
   </cd:sequence>
@@ -1816,7 +1821,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definisciincorniciato">
+<cd:command name="definisciincorniciato" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="definisciincorniciato"/>
   </cd:sequence>
@@ -1830,7 +1835,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatestiincorniciati">
+<cd:command name="impostatestiincorniciati" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="impostatestiincorniciati"/>
   </cd:sequence>
@@ -1849,7 +1854,7 @@
         <cd:constant type="inclinato"/>
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="sinistra">
@@ -1891,8 +1896,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="framedtext" type="environment" generated="yes">
   <cd:sequence>
+    <cd:variable value="testoincorniciato"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -1907,7 +1913,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="testoincorniciato" generated="yes">
+<cd:command name="framedtext" generated="yes">
   <cd:sequence>
     <cd:variable value="testoincorniciato"/>
   </cd:sequence>
@@ -1918,8 +1924,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="sfondo" type="environment">
   <cd:sequence>
+    <cd:string value="sfondo"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
@@ -1931,7 +1938,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="impostasfondo">
+<cd:command name="impostasfondo" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="impostasfondo"/>
   </cd:sequence>
@@ -1990,7 +1997,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostalineeriempimento">
+<cd:command name="impostalineeriempimento" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="impostalineeriempimento"/>
   </cd:sequence>
@@ -2017,7 +2024,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="n">
@@ -2047,7 +2054,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostarigheriempimento">
+<cd:command name="impostarigheriempimento" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="impostarigheriempimento"/>
   </cd:sequence>
@@ -2072,7 +2079,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostalineetesto">
+<cd:command name="impostalineetesto" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="impostalineetesto"/>
   </cd:sequence>
@@ -2114,7 +2121,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="colorelinea">
@@ -2124,7 +2131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="lineatesto">
+<cd:command name="lineatesto" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="lineatesto"/>
   </cd:sequence>
@@ -2137,8 +2144,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="lineatesto" type="environment" file="core-rul.tex">
   <cd:sequence>
+    <cd:string value="lineatesto"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -2149,7 +2157,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="lineanera">
+<cd:command name="lineanera" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="lineanera"/>
   </cd:sequence>
@@ -2160,7 +2168,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="lineenere">
+<cd:command name="lineenere" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="lineenere"/>
   </cd:sequence>
@@ -2171,7 +2179,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostalineenere">
+<cd:command name="impostalineenere" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="impostalineenere"/>
   </cd:sequence>
@@ -2203,7 +2211,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscisovrapposizione">
+<cd:command name="definiscisovrapposizione" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="definiscisovrapposizione"/>
   </cd:sequence>
@@ -2228,7 +2236,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="reimposta">
+<cd:command name="reimposta" file="core-num.tex">
   <cd:sequence>
     <cd:string value="reimposta"/>
   </cd:sequence>
@@ -2245,14 +2253,15 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="localenvironment" type="environment">
   <cd:sequence>
+    <cd:string value="localenvironment"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostasistema">
+<cd:command name="impostasistema" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="impostasistema"/>
   </cd:sequence>
@@ -2278,9 +2287,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usacartella">
+<cd:command name="usedirectory">
   <cd:sequence>
-    <cd:string value="usacartella"/>
+    <cd:string value="usedirectory"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords list="yes">
@@ -2290,7 +2299,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ped">
+<cd:command name="ped" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="ped"/>
   </cd:sequence>
@@ -2299,7 +2308,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ap">
+<cd:command name="ap" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="ap"/>
   </cd:sequence>
@@ -2308,7 +2317,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="pedap">
+<cd:command name="pedap" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="pedap"/>
   </cd:sequence>
@@ -2327,14 +2336,14 @@
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
-      <cd:constant type="testo"/>
+      <cd:variable type="cd:text"/>
       <cd:constant type="margine"/>
       <cd:constant type="bordo"/>
     </cd:keywords>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="allineasinistra">
+<cd:command name="allineasinistra" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="allineasinistra"/>
   </cd:sequence>
@@ -2343,7 +2352,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="allineadestra">
+<cd:command name="allineadestra" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="allineadestra"/>
   </cd:sequence>
@@ -2352,7 +2361,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="allineacentro">
+<cd:command name="allineacentro" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="allineacentro"/>
   </cd:sequence>
@@ -2361,7 +2370,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="paroladestra">
+<cd:command name="paroladestra" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="paroladestra"/>
   </cd:sequence>
@@ -2370,7 +2379,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inmargine">
+<cd:command name="inmargine" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="inmargine"/>
   </cd:sequence>
@@ -2385,7 +2394,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inaltromargine">
+<cd:command name="inaltromargine" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="inaltromargine"/>
   </cd:sequence>
@@ -2466,7 +2475,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="mostrastruts">
+<cd:command name="mostrastruts" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="mostrastruts"/>
   </cd:sequence>
@@ -2484,7 +2493,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="testoinmargine">
+<cd:command name="testoinmargine" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="testoinmargine"/>
   </cd:sequence>
@@ -2499,7 +2508,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostablocchimargine">
+<cd:command name="impostablocchimargine" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="impostablocchimargine"/>
   </cd:sequence>
@@ -2518,7 +2527,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="ampiezza">
@@ -2555,16 +2564,17 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="marginblock" type="environment">
   <cd:sequence>
+    <cd:string value="marginblock"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="parte">
+<cd:command name="part" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="parte"/>
+    <cd:string value="part"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2572,9 +2582,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="titolo">
+<cd:command name="title" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="titolo"/>
+    <cd:string value="title"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2582,9 +2592,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="capitolo">
+<cd:command name="chapter" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="capitolo"/>
+    <cd:string value="chapter"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2592,9 +2602,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="capoverso">
+<cd:command name="section" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="capoverso"/>
+    <cd:string value="section"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2602,9 +2612,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sottocapoverso">
+<cd:command name="subsection" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="sottocapoverso"/>
+    <cd:string value="subsection"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2612,9 +2622,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sottosottocapoverso">
+<cd:command name="subsubsection" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="sottosottocapoverso"/>
+    <cd:string value="subsubsection"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2622,9 +2632,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="argomento">
+<cd:command name="subject" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="argomento"/>
+    <cd:string value="subject"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2632,9 +2642,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sottoargomento">
+<cd:command name="subsubject" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="sottoargomento"/>
+    <cd:string value="subsubject"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2642,9 +2652,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sottosottoargomento">
+<cd:command name="subsubsubject" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="sottosottoargomento"/>
+    <cd:string value="subsubsubject"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2652,9 +2662,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="appendice">
+<cd:command name="appendix" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="appendice"/>
+    <cd:string value="appendix"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2662,7 +2672,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="in">
+<cd:command name="in" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="in"/>
   </cd:sequence>
@@ -2694,7 +2704,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="daqualcheparte">
+<cd:command name="daqualcheparte" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="daqualcheparte"/>
   </cd:sequence>
@@ -2705,7 +2715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="apagina">
+<cd:command name="apagina" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="apagina"/>
   </cd:sequence>
@@ -2714,7 +2724,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="rif">
+<cd:command name="rif" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="rif"/>
   </cd:sequence>
@@ -2730,7 +2740,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="riferimentotesto">
+<cd:command name="riferimentotesto" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="riferimentotesto"/>
   </cd:sequence>
@@ -2740,7 +2750,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="riferimentopagina">
+<cd:command name="riferimentopagina" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="riferimentopagina"/>
   </cd:sequence>
@@ -2749,7 +2759,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="riferimento">
+<cd:command name="riferimento" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="riferimento"/>
   </cd:sequence>
@@ -2759,7 +2769,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usariferimenti">
+<cd:command name="usariferimenti" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="usariferimenti"/>
   </cd:sequence>
@@ -2770,7 +2780,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definisciriferimento">
+<cd:command name="definisciriferimento" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definisciriferimento"/>
   </cd:sequence>
@@ -2782,7 +2792,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definisciformatoriferimento">
+<cd:command name="definisciformatoriferimento" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definisciformatoriferimento"/>
   </cd:sequence>
@@ -2829,7 +2839,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vaigiu">
+<cd:command name="vaigiu" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="vaigiu"/>
   </cd:sequence>
@@ -2840,37 +2850,37 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="spaziobianco">
+<cd:command name="spaziobianco" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="spaziobianco"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="nientespaziobianco">
+<cd:command name="nientespaziobianco" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="nientespaziobianco"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="crlf">
+<cd:command name="crlf" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="crlf"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="spazio">
+<cd:command name="spazio" file="syst-pln.tex">
   <cd:sequence>
     <cd:string value="spazio"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="spazifissi">
+<cd:command name="spazifissi" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="spazifissi"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="emptylines">
+<cd:command name="emptylines" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="emptylines"/>
   </cd:sequence>
@@ -2881,19 +2891,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nientespazio">
+<cd:command name="nientespazio" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="nientespazio"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="impaccato">
+<cd:command name="impaccato" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="impaccato"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="impostadescrizioni">
+<cd:command name="impostadescrizioni" file="core-des.tex">
   <cd:sequence>
     <cd:string value="impostadescrizioni"/>
   </cd:sequence>
@@ -2909,7 +2919,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stile">
@@ -2919,7 +2929,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="colore">
@@ -2994,7 +3004,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaenumerazioni">
+<cd:command name="impostaenumerazioni" file="core-des.tex">
   <cd:sequence>
     <cd:string value="impostaenumerazioni"/>
   </cd:sequence>
@@ -3008,7 +3018,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscienumerazione">
+<cd:command name="definiscienumerazione" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definiscienumerazione"/>
   </cd:sequence>
@@ -3025,23 +3035,24 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="enumerazione" generated="yes">
+<cd:command name="enumeration" generated="yes">
   <cd:sequence>
-    <cd:variable value="enumerazione"/>
+    <cd:variable value="enumeration"/>
   </cd:sequence>
   <cd:arguments>
     <cd:nothing interactive="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="enumeration" type="environment" generated="yes">
   <cd:sequence>
+    <cd:variable value="enumeration"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscidescrizione">
+<cd:command name="definiscidescrizione" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definiscidescrizione"/>
   </cd:sequence>
@@ -3055,9 +3066,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="descrizione" generated="yes">
+<cd:command name="description" generated="yes">
   <cd:sequence>
-    <cd:variable value="descrizione"/>
+    <cd:variable value="description"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
@@ -3065,15 +3076,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="description" type="environment" generated="yes">
   <cd:sequence>
+    <cd:variable value="description"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostarientri">
+<cd:command name="impostarientri" file="core-des.tex">
   <cd:sequence>
     <cd:string value="impostarientri"/>
   </cd:sequence>
@@ -3089,7 +3101,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stiletesta">
@@ -3099,7 +3111,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="ampiezza">
@@ -3128,7 +3140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscirientro">
+<cd:command name="definiscirientro" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definiscirientro"/>
   </cd:sequence>
@@ -3142,16 +3154,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="rientro" generated="yes">
+<cd:command name="indentation" generated="yes" file="core-spa.tex">
   <cd:sequence>
-    <cd:variable value="rientro"/>
+    <cd:variable value="indentation"/>
   </cd:sequence>
   <cd:arguments>
     <cd:nothing/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscietichetta">
+<cd:command name="definiscietichetta" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definiscietichetta"/>
   </cd:sequence>
@@ -3168,8 +3180,8 @@
         <cd:constant type="intesto"/>
       </cd:parameter>
       <cd:parameter name="modo">
-        <cd:constant type="datesto"/>
-        <cd:constant type="dacd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="blockway">
         <cd:constant type="si"/>
@@ -3182,7 +3194,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="coloretesta">
@@ -3198,16 +3210,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="etichettatura" generated="yes">
+<cd:command name="labeling" generated="yes">
   <cd:sequence>
-    <cd:variable value="etichettatura"/>
+    <cd:variable value="labeling"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostacolonne">
+<cd:command name="impostacolonne" file="page-mul.tex">
   <cd:sequence>
     <cd:string value="impostacolonne"/>
   </cd:sequence>
@@ -3243,7 +3255,7 @@
       <cd:parameter name="allinea">
         <cd:constant type="si"/>
         <cd:constant type="no"/>
-        <cd:constant type="testo"/>
+        <cd:variable type="cd:text"/>
       </cd:parameter>
       <cd:parameter name="rigovuoto">
         <cd:constant type="fisso"/>
@@ -3266,8 +3278,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="columns" type="environment">
   <cd:sequence>
+    <cd:string value="columns"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments optional="yes" list="yes">
@@ -3276,7 +3289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscitesto">
+<cd:command name="definiscitesto" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="definiscitesto"/>
   </cd:sequence>
@@ -3300,13 +3313,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostainstestazione">
+<cd:command name="impostainstestazione" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="impostainstestazione"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
-      <cd:constant type="testo" default="yes"/>
+      <cd:variable type="cd:text" default="yes"/>
       <cd:constant type="margine"/>
       <cd:constant type="bordo"/>
     </cd:keywords>
@@ -3332,7 +3345,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stilesinistra">
@@ -3342,7 +3355,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stiledestra">
@@ -3352,7 +3365,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="ampiezzasinistra">
@@ -3371,7 +3384,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostapdp">
+<cd:command name="impostapdp" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="impostapdp"/>
   </cd:sequence>
@@ -3385,7 +3398,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatesto">
+<cd:command name="impostatesto" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="impostatesto"/>
   </cd:sequence>
@@ -3399,7 +3412,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostacima">
+<cd:command name="impostacima" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="impostacima"/>
   </cd:sequence>
@@ -3413,7 +3426,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostafondo">
+<cd:command name="impostafondo" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="impostafondo"/>
   </cd:sequence>
@@ -3427,25 +3440,25 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nientelineintestazionepdp">
+<cd:command name="nientelineintestazionepdp" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="nientelineintestazionepdp"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="nientelineecimafondo">
+<cd:command name="nientelineecimafondo" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="nientelineecimafondo"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="impostatestiintestazioni">
+<cd:command name="impostatestiintestazioni" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="impostatestiintestazioni"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
-      <cd:constant type="testo" default="yes"/>
+      <cd:variable type="cd:text" default="yes"/>
       <cd:constant type="margine"/>
       <cd:constant type="bordo"/>
     </cd:keywords>
@@ -3466,13 +3479,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatestipdp">
+<cd:command name="impostatestipdp" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="impostatestipdp"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
-      <cd:constant type="testo" default="yes"/>
+      <cd:variable type="cd:text" default="yes"/>
       <cd:constant type="margine"/>
       <cd:constant type="bordo"/>
     </cd:keywords>
@@ -3493,13 +3506,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatestotesti">
+<cd:command name="impostatestotesti" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="impostatestotesti"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
-      <cd:constant type="testo" default="yes"/>
+      <cd:variable type="cd:text" default="yes"/>
       <cd:constant type="margine"/>
       <cd:constant type="bordo"/>
     </cd:keywords>
@@ -3520,13 +3533,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatesticima">
+<cd:command name="impostatesticima" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="impostatesticima"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
-      <cd:constant type="testo" default="yes"/>
+      <cd:variable type="cd:text" default="yes"/>
       <cd:constant type="margine"/>
       <cd:constant type="bordo"/>
     </cd:keywords>
@@ -3547,13 +3560,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatestifondo">
+<cd:command name="impostatestifondo" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="impostatestifondo"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
-      <cd:constant type="testo" default="yes"/>
+      <cd:variable type="cd:text" default="yes"/>
       <cd:constant type="margine"/>
       <cd:constant type="bordo"/>
     </cd:keywords>
@@ -3574,7 +3587,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscimarcatura">
+<cd:command name="definiscimarcatura" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="definiscimarcatura"/>
   </cd:sequence>
@@ -3588,7 +3601,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="accoppiamarcatura">
+<cd:command name="accoppiamarcatura" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="accoppiamarcatura"/>
   </cd:sequence>
@@ -3602,7 +3615,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="separamarcatura">
+<cd:command name="separamarcatura" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="separamarcatura"/>
   </cd:sequence>
@@ -3613,7 +3626,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="reimpostamarcatura">
+<cd:command name="reimpostamarcatura" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="reimpostamarcatura"/>
   </cd:sequence>
@@ -3624,7 +3637,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostamarcatura">
+<cd:command name="impostamarcatura" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="impostamarcatura"/>
   </cd:sequence>
@@ -3648,7 +3661,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="marcatura">
+<cd:command name="marcatura" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="marcatura"/>
   </cd:sequence>
@@ -3660,7 +3673,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="prendimarcatura">
+<cd:command name="prendimarcatura" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="prendimarcatura"/>
   </cd:sequence>
@@ -3679,7 +3692,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nientemarcatura">
+<cd:command name="nientemarcatura" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="nientemarcatura"/>
   </cd:sequence>
@@ -3688,7 +3701,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostalayout">
+<cd:command name="impostalayout" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="impostalayout"/>
   </cd:sequence>
@@ -3774,7 +3787,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="colore">
@@ -3785,7 +3798,7 @@
         <cd:constant type="disattivo"/>
         <cd:constant type="colore"/>
         <cd:constant type="schermo"/>
-        <cd:constant type="testo"/>
+        <cd:variable type="cd:text"/>
       </cd:parameter>
       <cd:parameter name="luogo">
         <cd:constant type="sinistra"/>
@@ -3852,7 +3865,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="adattalayout">
+<cd:command name="adattalayout" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="adattalayout"/>
   </cd:sequence>
@@ -3872,13 +3885,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mostragriglia">
+<cd:command name="mostragriglia" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="mostragriglia"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="mettiingriglia">
+<cd:command name="mettiingriglia" file="core-grd.tex">
   <cd:sequence>
     <cd:string value="mettiingriglia"/>
   </cd:sequence>
@@ -3890,7 +3903,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="spostaagriglia">
+<cd:command name="spostaagriglia" file="core-grd.tex">
   <cd:sequence>
     <cd:string value="spostaagriglia"/>
   </cd:sequence>
@@ -3899,10 +3912,10 @@
       <cd:constant type="cima"/>
       <cd:constant type="entrambi"/>
       <cd:constant type="fondo"/>
-      <cd:constant type="-cima"/>
-      <cd:constant type="-entrambi"/>
-      <cd:constant type="-fondo"/>
-      <cd:constant type="testo"/>
+      <cd:constant type="-top"/>
+      <cd:constant type="-both"/>
+      <cd:constant type="-bottom"/>
+      <cd:variable type="cd:text"/>
       <cd:constant type="alto"/>
       <cd:constant type="centro"/>
       <cd:constant type="basso"/>
@@ -3918,32 +3931,36 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="progetto" type="environment">
   <cd:sequence>
+    <cd:string value="progetto"/>
   </cd:sequence>
   <cd:arguments>
     <cd:file/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="ambiente" type="environment">
   <cd:sequence>
+    <cd:string value="ambiente"/>
   </cd:sequence>
   <cd:arguments>
     <cd:file/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="product" type="environment">
   <cd:sequence>
+    <cd:string value="product"/>
   </cd:sequence>
   <cd:arguments>
     <cd:file/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="componenet" type="environment">
   <cd:sequence>
+    <cd:string value="componenet"/>
   </cd:sequence>
   <cd:arguments>
     <cd:file/>
@@ -3991,7 +4008,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostanumerazionepagina">
+<cd:command name="impostanumerazionepagina" file="page-num.tex">
   <cd:sequence>
     <cd:string value="impostanumerazionepagina"/>
   </cd:sequence>
@@ -4026,7 +4043,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="sinistra">
@@ -4036,8 +4053,8 @@
         <cd:constant type="cd:text"/>
       </cd:parameter>
       <cd:parameter name="modo">
-        <cd:constant type="datesto"/>
-        <cd:constant type="dacd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="testo">
         <cd:constant type="cd:text"/>
@@ -4073,7 +4090,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostapiustretto">
+<cd:command name="impostapiustretto" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="impostapiustretto"/>
   </cd:sequence>
@@ -4092,7 +4109,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definisci">
+<cd:command name="definisci" file="syst-ext.tex">
   <cd:sequence>
     <cd:string value="definisci"/>
   </cd:sequence>
@@ -4105,7 +4122,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usacomandi">
+<cd:command name="usacomandi" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="usacomandi"/>
   </cd:sequence>
@@ -4114,7 +4131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definisciiniziatermina">
+<cd:command name="definisciiniziatermina" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="definisciiniziatermina"/>
   </cd:sequence>
@@ -4136,7 +4153,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="comandi">
@@ -4146,7 +4163,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostateste">
+<cd:command name="impostateste" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="impostateste"/>
   </cd:sequence>
@@ -4154,14 +4171,14 @@
     <cd:assignments list="yes">
       <cd:parameter name="numerosezione">
         <cd:constant type="si"/>
-        <cd:constant type="numero"/>
+        <cd:variable type="cd:number"/>
         <cd:constant type="no"/>
       </cd:parameter>
       <cd:parameter name="alternativa">
         <cd:constant type="normale"/>
         <cd:constant type="margine"/>
         <cd:constant type="centro"/>
-        <cd:constant type="testo"/>
+        <cd:variable type="cd:text"/>
         <cd:constant type="capoverso"/>
       </cd:parameter>
       <cd:parameter name="separatore">
@@ -4198,7 +4215,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostacaptions">
+<cd:command name="impostacaptions" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="impostacaptions"/>
   </cd:sequence>
@@ -4229,7 +4246,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stile">
@@ -4239,7 +4256,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="numero">
@@ -4263,8 +4280,8 @@
         <cd:constant type="Numeriromani"/>
       </cd:parameter>
       <cd:parameter name="modo">
-        <cd:constant type="datesto"/>
-        <cd:constant type="dacd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="separatore">
         <cd:constant type="cd:text"/>
@@ -4279,7 +4296,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostacaption">
+<cd:command name="impostacaption" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="impostacaption"/>
   </cd:sequence>
@@ -4293,7 +4310,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaoggettimobili">
+<cd:command name="impostaoggettimobili" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="impostaoggettimobili"/>
   </cd:sequence>
@@ -4377,7 +4394,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaspezzamentooggettomobile">
+<cd:command name="impostaspezzamentooggettomobile" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="impostaspezzamentooggettomobile"/>
   </cd:sequence>
@@ -4397,7 +4414,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="spezzaoggettomobile">
+<cd:command name="spezzaoggettomobile" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="spezzaoggettomobile"/>
   </cd:sequence>
@@ -4410,7 +4427,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaposizionamentoopposti">
+<cd:command name="impostaposizionamentoopposti" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="impostaposizionamentoopposti"/>
   </cd:sequence>
@@ -4433,14 +4450,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="opposite" type="environment">
   <cd:sequence>
+    <cd:string value="opposite"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostasegnosillabazione">
+<cd:command name="impostasegnosillabazione" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="impostasegnosillabazione"/>
   </cd:sequence>
@@ -4460,7 +4478,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaposizionamento">
+<cd:command name="impostaposizionamento" file="page-lyr.tex">
   <cd:sequence>
     <cd:string value="impostaposizionamento"/>
   </cd:sequence>
@@ -4501,14 +4519,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="positioning" type="environment">
   <cd:sequence>
+    <cd:string value="positioning"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="griglia">
+<cd:command name="griglia" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="griglia"/>
   </cd:sequence>
@@ -4565,7 +4584,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="pagina">
+<cd:command name="pagina" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="pagina"/>
   </cd:sequence>
@@ -4592,7 +4611,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostariferimento">
+<cd:command name="impostariferimento" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="impostariferimento"/>
   </cd:sequence>
@@ -4613,7 +4632,7 @@
       </cd:parameter>
       <cd:parameter name="interazione">
         <cd:constant type="etichetta"/>
-        <cd:constant type="testo"/>
+        <cd:variable type="cd:text"/>
         <cd:constant type="tutti"/>
         <cd:constant type="simbolo"/>
       </cd:parameter>
@@ -4648,7 +4667,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaurl">
+<cd:command name="impostaurl" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="impostaurl"/>
   </cd:sequence>
@@ -4661,7 +4680,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="alternativaurl">
@@ -4678,7 +4697,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="scriviinlistariferimenti">
+<cd:command name="scriviinlistariferimenti" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="scriviinlistariferimenti"/>
   </cd:sequence>
@@ -4702,7 +4721,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscilistariferimenti">
+<cd:command name="definiscilistariferimenti" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definiscilistariferimenti"/>
   </cd:sequence>
@@ -4716,7 +4735,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostalistariferimenti">
+<cd:command name="impostalistariferimenti" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="impostalistariferimenti"/>
   </cd:sequence>
@@ -4748,7 +4767,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="scriviinelenco">
+<cd:command name="scriviinelenco" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="scriviinelenco"/>
   </cd:sequence>
@@ -4762,7 +4781,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="scrividentroelenco">
+<cd:command name="scrividentroelenco" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="scrividentroelenco"/>
   </cd:sequence>
@@ -4775,7 +4794,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nienteelenco">
+<cd:command name="nienteelenco" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="nienteelenco"/>
   </cd:sequence>
@@ -4784,7 +4803,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="listsymbol">
+<cd:command name="listsymbol" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="listsymbol"/>
   </cd:sequence>
@@ -4796,7 +4815,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mettielenco">
+<cd:command name="mettielenco" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="mettielenco"/>
   </cd:sequence>
@@ -4810,7 +4829,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="determinacarattersticheelenco">
+<cd:command name="determinacarattersticheelenco" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="determinacarattersticheelenco"/>
   </cd:sequence>
@@ -4824,7 +4843,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mettielencocombinato">
+<cd:command name="mettielencocombinato" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="mettielencocombinato"/>
   </cd:sequence>
@@ -4838,7 +4857,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscielenco">
+<cd:command name="definiscielenco" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definiscielenco"/>
   </cd:sequence>
@@ -4855,7 +4874,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaelenco">
+<cd:command name="impostaelenco" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="impostaelenco"/>
   </cd:sequence>
@@ -4874,7 +4893,7 @@
         <cd:constant type="c"/>
         <cd:constant type="..."/>
         <cd:constant type="nessuno"/>
-        <cd:constant type="comando"/>
+        <cd:variable type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="accoppiamento">
         <cd:constant type="attivo"/>
@@ -4897,7 +4916,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stilenumero">
@@ -4907,7 +4926,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stiletesto">
@@ -4917,7 +4936,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stilepagina">
@@ -4927,7 +4946,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="colore">
@@ -4946,8 +4965,8 @@
         <cd:constant type="cd:oneargument"/>
       </cd:parameter>
       <cd:parameter name="interazione">
-        <cd:constant type="numerosezione"/>
-        <cd:constant type="testo"/>
+        <cd:variable type="cd:sectionnumber"/>
+        <cd:variable type="cd:text"/>
         <cd:constant type="numeropagina"/>
         <cd:constant type="tutti"/>
       </cd:parameter>
@@ -5023,7 +5042,7 @@
       <cd:parameter name="espansione">
         <cd:constant type="si"/>
         <cd:constant type="no"/>
-        <cd:constant type="comando"/>
+        <cd:variable type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="ampiezzamax">
         <cd:constant type="cd:dimension"/>
@@ -5033,7 +5052,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscielencocombinato">
+<cd:command name="definiscielencocombinato" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definiscielencocombinato"/>
   </cd:sequence>
@@ -5050,7 +5069,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaelencocombinato">
+<cd:command name="impostaelencocombinato" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="impostaelencocombinato"/>
   </cd:sequence>
@@ -5072,10 +5091,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mettielencocombinato" generated="yes">
+<cd:command name="mettielencocombinato" generated="yes" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="metti"/>
-    <cd:variable value="elencocombinato"/>
+    <cd:variable value="combinedlist"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -5087,10 +5106,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="completoelencocombinato" generated="yes">
+<cd:command name="completecombinedlist" generated="yes">
   <cd:sequence>
     <cd:string value="completo"/>
-    <cd:variable value="elencocombinato"/>
+    <cd:variable value="combinedlist"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -5102,15 +5121,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostanumerazione">
+<cd:command name="impostanumerazione" file="core-num.tex">
   <cd:sequence>
     <cd:string value="impostanumerazione"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments list="yes">
       <cd:parameter name="modo">
-        <cd:constant type="datesto"/>
-        <cd:constant type="dacd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="stato">
         <cd:constant type="inizia"/>
@@ -5120,9 +5139,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaformule">
+<cd:command name="setupformulae">
   <cd:sequence>
-    <cd:string value="impostaformule"/>
+    <cd:string value="setupformulae"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments list="yes">
@@ -5180,7 +5199,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="pubblicazione">
+<cd:command name="pubblicazione" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="pubblicazione"/>
   </cd:sequence>
@@ -5189,7 +5208,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostapubblicazioni">
+<cd:command name="impostapubblicazioni" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="impostapubblicazioni"/>
   </cd:sequence>
@@ -5204,7 +5223,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostarighe">
+<cd:command name="impostarighe" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="impostarighe"/>
   </cd:sequence>
@@ -5229,14 +5248,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="lines" type="environment">
   <cd:sequence>
+    <cd:string value="lines"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostanumerazionecapoversi">
+<cd:command name="impostanumerazionecapoversi" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="impostanumerazionecapoversi"/>
   </cd:sequence>
@@ -5255,7 +5275,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="distanza">
@@ -5265,7 +5285,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostanumerazionerighe">
+<cd:command name="impostanumerazionerighe" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="impostanumerazionerighe"/>
   </cd:sequence>
@@ -5277,7 +5297,7 @@
         <cd:constant type="Lettere"/>
         <cd:constant type="numeriromani"/>
         <cd:constant type="Numeriromani"/>
-        <cd:constant type="testo"/>
+        <cd:variable type="cd:text"/>
       </cd:parameter>
       <cd:parameter name="inizia">
         <cd:constant type="cd:number"/>
@@ -5299,7 +5319,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="prefisso">
@@ -5313,8 +5333,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="linenumbering" type="environment">
   <cd:sequence>
+    <cd:string value="linenumbering"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -5323,15 +5344,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="line" type="environment">
   <cd:sequence>
+    <cd:string value="line"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="qualcheriga">
+<cd:command name="qualcheriga" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="qualcheriga"/>
   </cd:sequence>
@@ -5340,7 +5362,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inriga">
+<cd:command name="inriga" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="inriga"/>
   </cd:sequence>
@@ -5349,7 +5371,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostainmargine">
+<cd:command name="impostainmargine" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="impostainmargine"/>
   </cd:sequence>
@@ -5372,7 +5394,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="prima">
@@ -5415,7 +5437,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostanumeropagina">
+<cd:command name="impostanumeropagina" file="page-num.tex">
   <cd:sequence>
     <cd:string value="impostanumeropagina"/>
   </cd:sequence>
@@ -5433,15 +5455,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostanumerosottopagina">
+<cd:command name="impostanumerosottopagina" file="page-num.tex">
   <cd:sequence>
     <cd:string value="impostanumerosottopagina"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments list="yes">
       <cd:parameter name="modo">
-        <cd:constant type="datesto"/>
-        <cd:constant type="dacd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="stato">
         <cd:constant type="inizia"/>
@@ -5471,7 +5493,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscirigovuoto">
+<cd:command name="definiscirigovuoto" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="definiscirigovuoto"/>
   </cd:sequence>
@@ -5485,7 +5507,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscidimensionicarta">
+<cd:command name="definiscidimensionicarta" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="definiscidimensionicarta"/>
   </cd:sequence>
@@ -5510,7 +5532,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuppaper">
+<cd:command name="setuppaper" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="setuppaper"/>
   </cd:sequence>
@@ -5548,7 +5570,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostadimensionicarta">
+<cd:command name="impostadimensionicarta" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="impostadimensionicarta"/>
   </cd:sequence>
@@ -5588,7 +5610,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaparranging">
+<cd:command name="impostaparranging" file="page-imp.tex">
   <cd:sequence>
     <cd:string value="impostaparranging"/>
   </cd:sequence>
@@ -5634,7 +5656,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscilogo">
+<cd:command name="definiscilogo" file="page-log.tex">
   <cd:sequence>
     <cd:string value="definiscilogo"/>
   </cd:sequence>
@@ -5672,7 +5694,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mettiloghi">
+<cd:command name="mettiloghi" file="page-log.tex">
   <cd:sequence>
     <cd:string value="mettiloghi"/>
   </cd:sequence>
@@ -5718,7 +5740,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscibloccosezione">
+<cd:command name="definiscibloccosezione" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definiscibloccosezione"/>
   </cd:sequence>
@@ -5732,7 +5754,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostabloccosezione">
+<cd:command name="impostabloccosezione" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="impostabloccosezione"/>
   </cd:sequence>
@@ -5759,7 +5781,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscisezione">
+<cd:command name="definiscisezione" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definiscisezione"/>
   </cd:sequence>
@@ -5770,7 +5792,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostasezione">
+<cd:command name="impostasezione" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="impostasezione"/>
   </cd:sequence>
@@ -5797,7 +5819,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatesta">
+<cd:command name="impostatesta" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="impostatesta"/>
   </cd:sequence>
@@ -5813,7 +5835,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stiletesto">
@@ -5823,7 +5845,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stilenumero">
@@ -5833,7 +5855,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="colore">
@@ -5893,7 +5915,7 @@
         <cd:constant type="normale"/>
         <cd:constant type="inmargine"/>
         <cd:constant type="centro"/>
-        <cd:constant type="testo"/>
+        <cd:variable type="cd:text"/>
       </cd:parameter>
       <cd:parameter name="comando">
         <cd:constant type="cd:twoarguments"/>
@@ -5917,7 +5939,7 @@
       <cd:parameter name="incrementanumero">
         <cd:constant type="si"/>
         <cd:constant type="no"/>
-        <cd:constant type="elenco"/>
+        <cd:variable type="cd:list"/>
         <cd:constant type="cd:file"/>
       </cd:parameter>
       <cd:parameter name="resetnumber">
@@ -5929,7 +5951,7 @@
       </cd:parameter>
       <cd:parameter name="espansione">
         <cd:constant type="si"/>
-        <cd:constant type="comando"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="no"/>
       </cd:parameter>
       <cd:parameter name="testomargine">
@@ -5941,7 +5963,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostanumerotesta">
+<cd:command name="impostanumerotesta" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="impostanumerotesta"/>
   </cd:sequence>
@@ -5968,7 +5990,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="determinanumerotesta">
+<cd:command name="determinanumerotesta" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="determinanumerotesta"/>
   </cd:sequence>
@@ -5979,20 +6001,20 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="numerotestacorrente">
+<cd:command name="numerotestacorrente" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="numerotestacorrente"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="successivosezione" generated="yes">
+<cd:command name="nextsection" generated="yes" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="successivo"/>
-    <cd:variable value="sezione"/>
+    <cd:variable value="capoverso"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definiscitesta">
+<cd:command name="definiscitesta" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definiscitesta"/>
   </cd:sequence>
@@ -6006,7 +6028,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupitemgroup">
+<cd:command name="setupitemgroup" file="core-itm.tex">
   <cd:sequence>
     <cd:string value="setupitemgroup"/>
   </cd:sequence>
@@ -6030,7 +6052,7 @@
       <cd:constant type="inmargine"/>
       <cd:constant type="autointro"/>
       <cd:constant type="lento"/>
-      <cd:constant type="capoverso"/>
+      <cd:variable type="cd:section"/>
       <cd:constant type="intesto"/>
     </cd:keywords>
     <cd:assignments optional="yes" list="yes">
@@ -6092,7 +6114,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stilemarcatura">
@@ -6102,7 +6124,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stilesimbolo">
@@ -6112,7 +6134,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stopper">
@@ -6137,8 +6159,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="itemgroup" type="environment" generated="yes">
   <cd:sequence>
+    <cd:variable value="itemgroup"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -6228,16 +6251,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sotto">
+<cd:command name="sub">
   <cd:sequence>
-    <cd:string value="sotto"/>
+    <cd:string value="sub"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sim">
+<cd:command name="sim" file="core-itm.tex">
   <cd:sequence>
     <cd:string value="sim"/>
   </cd:sequence>
@@ -6252,7 +6275,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definisciregistro">
+<cd:command name="definisciregistro" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="definisciregistro"/>
   </cd:sequence>
@@ -6266,7 +6289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaregistro">
+<cd:command name="impostaregistro" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="impostaregistro"/>
   </cd:sequence>
@@ -6296,7 +6319,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stilepagina">
@@ -6306,7 +6329,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stiletesto">
@@ -6316,7 +6339,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="indicatore">
@@ -6350,11 +6373,11 @@
       </cd:parameter>
       <cd:parameter name="interazione">
         <cd:constant type="numeropagina"/>
-        <cd:constant type="testo"/>
+        <cd:variable type="cd:text"/>
       </cd:parameter>
       <cd:parameter name="espansione">
         <cd:constant type="si"/>
-        <cd:constant type="comando"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="no"/>
       </cd:parameter>
       <cd:parameter name="referencing">
@@ -6386,7 +6409,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="registro" generated="yes">
+<cd:command name="register" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:variable value="registro"/>
   </cd:sequence>
@@ -6398,7 +6421,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="iniziaregistro" generated="yes">
+<cd:command name="startregister" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="inizia"/>
     <cd:variable value="registro"/>
@@ -6411,7 +6434,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="scriviinregistro">
+<cd:command name="scriviinregistro" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="scriviinregistro"/>
   </cd:sequence>
@@ -6426,7 +6449,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="accoppiatoregistro" generated="yes">
+<cd:command name="coupledregister" generated="yes">
   <cd:sequence>
     <cd:string value="accoppiato"/>
     <cd:variable value="registro"/>
@@ -6439,7 +6462,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="accoppiaregistro">
+<cd:command name="accoppiaregistro" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="accoppiaregistro"/>
   </cd:sequence>
@@ -6450,7 +6473,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mettiregistro">
+<cd:command name="mettiregistro" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="mettiregistro"/>
   </cd:sequence>
@@ -6464,7 +6487,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vediregistro" generated="yes">
+<cd:command name="seeregister" generated="yes">
   <cd:sequence>
     <cd:string value="vedi"/>
     <cd:variable value="registro"/>
@@ -6478,7 +6501,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="completoregistro" generated="yes">
+<cd:command name="completeregister" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="completo"/>
     <cd:variable value="registro"/>
@@ -6490,7 +6513,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mettiregistro" generated="yes">
+<cd:command name="mettiregistro" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="metti"/>
     <cd:variable value="registro"/>
@@ -6502,7 +6525,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscisinonimi">
+<cd:command name="definiscisinonimi" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="definiscisinonimi"/>
   </cd:sequence>
@@ -6522,7 +6545,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostasinonimi">
+<cd:command name="impostasinonimi" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="impostasinonimi"/>
   </cd:sequence>
@@ -6538,7 +6561,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stilesinonimi">
@@ -6548,7 +6571,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="luogo">
@@ -6577,7 +6600,7 @@
       </cd:parameter>
       <cd:parameter name="espansione">
         <cd:constant type="si"/>
-        <cd:constant type="comando"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="no"/>
       </cd:parameter>
       <cd:parameter name="comando">
@@ -6587,9 +6610,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sinonimo" generated="yes">
+<cd:command name="synonym" generated="yes">
   <cd:sequence>
-    <cd:variable value="sinonimo"/>
+    <cd:variable value="synonym"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -6600,28 +6623,28 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="completoelencodisinonimi" generated="yes">
+<cd:command name="completelistofsynonyms" generated="yes">
   <cd:sequence>
-    <cd:string value="completoelencodi"/>
-    <cd:variable value="sinonimi"/>
+    <cd:string value="completelistof"/>
+    <cd:variable value="synonyms"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="mettielencodisinonimi" generated="yes">
+<cd:command name="placelistofsynonyms" generated="yes">
   <cd:sequence>
-    <cd:string value="mettielencodi"/>
-    <cd:variable value="sinonimi"/>
+    <cd:string value="placelistof"/>
+    <cd:variable value="synonyms"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="caricasinonimi" generated="yes">
+<cd:command name="loadsynonyms" generated="yes">
   <cd:sequence>
     <cd:string value="carica"/>
-    <cd:variable value="sinonimi"/>
+    <cd:variable value="synonyms"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definisciordinamento">
+<cd:command name="definisciordinamento" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="definisciordinamento"/>
   </cd:sequence>
@@ -6638,7 +6661,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaordinamento">
+<cd:command name="impostaordinamento" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="impostaordinamento"/>
   </cd:sequence>
@@ -6671,12 +6694,12 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="espansione">
         <cd:constant type="si"/>
-        <cd:constant type="comando"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="no"/>
       </cd:parameter>
     </cd:assignments>
@@ -6695,28 +6718,28 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="completoelencodisorts" generated="yes">
+<cd:command name="completelistofsorts" generated="yes">
   <cd:sequence>
-    <cd:string value="completoelencodi"/>
+    <cd:string value="completelistof"/>
     <cd:variable value="sorts"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="mettielencodisorts" generated="yes">
+<cd:command name="placelistofsorts" generated="yes">
   <cd:sequence>
-    <cd:string value="mettielencodi"/>
+    <cd:string value="placelistof"/>
     <cd:variable value="sorts"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="caricasorts" generated="yes">
+<cd:command name="loadsorts" generated="yes">
   <cd:sequence>
     <cd:string value="carica"/>
     <cd:variable value="sorts"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definiscimakeup">
+<cd:command name="definiscimakeup" file="page-mak.tex">
   <cd:sequence>
     <cd:string value="definiscimakeup"/>
   </cd:sequence>
@@ -6730,8 +6753,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="makeup" type="environment">
   <cd:sequence>
+    <cd:string value="makeup"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -6743,7 +6767,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostamakeup">
+<cd:command name="impostamakeup" file="page-mak.tex">
   <cd:sequence>
     <cd:string value="impostamakeup"/>
   </cd:sequence>
@@ -6820,8 +6844,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="namemakeup" type="environment" generated="yes">
   <cd:sequence>
+    <cd:variable value="nome"/>
+    <cd:string value="makeup"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
@@ -6851,7 +6877,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="data">
+<cd:command name="data" file="core-con.tex">
   <cd:sequence>
     <cd:string value="data"/>
   </cd:sequence>
@@ -6872,13 +6898,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="datareferral">
+<cd:command name="datareferral" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="datareferral"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="rientro">
+<cd:command name="rientro" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="rientro"/>
   </cd:sequence>
@@ -6895,13 +6921,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nienterientro">
+<cd:command name="nienterientro" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="nienterientro"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="rigovuoto">
+<cd:command name="rigovuoto" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="rigovuoto"/>
   </cd:sequence>
@@ -6926,8 +6952,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="impaccato" type="environment" file="core-spa.tex">
   <cd:sequence>
+    <cd:string value="impaccato"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -6936,21 +6963,23 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="unpacked" type="environment">
   <cd:sequence>
+    <cd:string value="unpacked"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="linecorrection" type="environment">
   <cd:sequence>
+    <cd:string value="linecorrection"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="correggispaziobianco">
+<cd:command name="correggispaziobianco" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="correggispaziobianco"/>
   </cd:sequence>
@@ -6959,22 +6988,25 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="postponing" type="environment">
   <cd:sequence>
+    <cd:string value="postponing"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="locale" type="environment">
   <cd:sequence>
+    <cd:string value="locale"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="narrower" type="environment">
   <cd:sequence>
+    <cd:string value="narrower"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes" list="yes">
@@ -6985,14 +7017,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="hiding" type="environment">
   <cd:sequence>
+    <cd:string value="hiding"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaallineamento">
+<cd:command name="impostaallineamento" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="impostaallineamento"/>
   </cd:sequence>
@@ -7018,8 +7051,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="alignment" type="environment">
   <cd:sequence>
+    <cd:string value="alignment"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -7040,7 +7074,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatolleranza">
+<cd:command name="impostatolleranza" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="impostatolleranza"/>
   </cd:sequence>
@@ -7058,7 +7092,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tipopagina">
+<cd:command name="tipopagina" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="tipopagina"/>
   </cd:sequence>
@@ -7069,7 +7103,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="elaborapagina">
+<cd:command name="elaborapagina" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="elaborapagina"/>
   </cd:sequence>
@@ -7084,7 +7118,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="accoppiapagina">
+<cd:command name="accoppiapagina" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="accoppiapagina"/>
   </cd:sequence>
@@ -7106,7 +7140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="posizione">
+<cd:command name="posizione" file="page-lyr.tex">
   <cd:sequence>
     <cd:string value="posizione"/>
   </cd:sequence>
@@ -7116,7 +7150,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaschermi">
+<cd:command name="impostaschermi" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="impostaschermi"/>
   </cd:sequence>
@@ -7140,7 +7174,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostasfondi">
+<cd:command name="impostasfondi" file="page-bck.tex">
   <cd:sequence>
     <cd:string value="impostasfondi"/>
   </cd:sequence>
@@ -7148,7 +7182,7 @@
     <cd:keywords optional="yes">
       <cd:constant type="cima"/>
       <cd:constant type="intestazione"/>
-      <cd:constant type="testo"/>
+      <cd:variable type="cd:text"/>
       <cd:constant type="piedipagina"/>
       <cd:constant type="fondo"/>
       <cd:constant type="pagina"/>
@@ -7159,7 +7193,7 @@
     <cd:keywords optional="yes" list="yes">
       <cd:constant type="bordosinistro"/>
       <cd:constant type="marginesinistro"/>
-      <cd:constant type="testo"/>
+      <cd:variable type="cd:text"/>
       <cd:constant type="marginedestro"/>
       <cd:constant type="bordodestro"/>
     </cd:keywords>
@@ -7167,15 +7201,16 @@
       <cd:parameter name="stato">
         <cd:constant type="inizia"/>
         <cd:constant type="termina"/>
-        <cd:constant type="ripeti"/>
+        <cd:variable type="cd:repeat"/>
       </cd:parameter>
       <cd:inherit name="impostaincorniciato"/>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="buffer" type="environment" generated="yes">
   <cd:sequence>
+    <cd:variable value="buffer"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -7195,7 +7230,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="typebuffer">
+<cd:command name="typebuffer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="typebuffer"/>
   </cd:sequence>
@@ -7206,7 +7241,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscibuffer">
+<cd:command name="definiscibuffer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="definiscibuffer"/>
   </cd:sequence>
@@ -7217,7 +7252,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostabuffer">
+<cd:command name="impostabuffer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="impostabuffer"/>
   </cd:sequence>
@@ -7239,7 +7274,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definisciblocco">
+<cd:command name="definisciblocco" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="definisciblocco"/>
   </cd:sequence>
@@ -7250,13 +7285,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="bastablocchi">
+<cd:command name="bastablocchi" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="bastablocchi"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="nascondiblocchi">
+<cd:command name="nascondiblocchi" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="nascondiblocchi"/>
   </cd:sequence>
@@ -7270,7 +7305,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tieniblocchi">
+<cd:command name="tieniblocchi" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="tieniblocchi"/>
   </cd:sequence>
@@ -7285,7 +7320,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usablocco">
+<cd:command name="usablocco" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="usablocco"/>
   </cd:sequence>
@@ -7299,7 +7334,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="elaborablocchi">
+<cd:command name="elaborablocchi" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="elaborablocchi"/>
   </cd:sequence>
@@ -7313,7 +7348,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="saltablocchi">
+<cd:command name="saltablocchi" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="saltablocchi"/>
   </cd:sequence>
@@ -7341,7 +7376,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="selezionablocchi">
+<cd:command name="selezionablocchi" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="selezionablocchi"/>
   </cd:sequence>
@@ -7361,7 +7396,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostablocco">
+<cd:command name="impostablocco" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="impostablocco"/>
   </cd:sequence>
@@ -7386,7 +7421,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="file">
@@ -7396,14 +7431,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="formula" type="environment" generated="yes">
   <cd:sequence>
+    <cd:variable value="formula"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="matematica">
+<cd:command name="matematica" file="supp-mat.tex">
   <cd:sequence>
     <cd:string value="matematica"/>
   </cd:sequence>
@@ -7412,7 +7448,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mettiformula">
+<cd:command name="mettiformula" file="core-mat.tex">
   <cd:sequence>
     <cd:string value="mettiformula"/>
   </cd:sequence>
@@ -7423,7 +7459,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mettisottoformula">
+<cd:command name="mettisottoformula" file="core-mat.tex">
   <cd:sequence>
     <cd:string value="mettisottoformula"/>
   </cd:sequence>
@@ -7434,10 +7470,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mettioggettomobile" generated="yes">
+<cd:command name="placefloat" generated="yes" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="metti"/>
-    <cd:variable value="oggettomobile"/>
+    <cd:variable value="float"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -7460,7 +7496,7 @@
       <cd:constant type="bordoesterno"/>
       <cd:constant type="interno"/>
       <cd:constant type="esterno"/>
-      <cd:constant type="line"/>
+      <cd:constant type="riga"/>
       <cd:constant type="alto"/>
       <cd:constant type="basso"/>
       <cd:constant type="adatta"/>
@@ -7480,10 +7516,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="riservaoggettomobile" generated="yes">
+<cd:command name="reservefloat" generated="yes">
   <cd:sequence>
     <cd:string value="riserva"/>
-    <cd:variable value="oggettomobile"/>
+    <cd:variable value="float"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments optional="yes" list="yes">
@@ -7506,7 +7542,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscioggettomobile">
+<cd:command name="definiscioggettomobile" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="definiscioggettomobile"/>
   </cd:sequence>
@@ -7520,7 +7556,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaoggettomobile">
+<cd:command name="impostaoggettomobile" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="impostaoggettomobile"/>
   </cd:sequence>
@@ -7566,8 +7602,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="floattext" type="environment" generated="yes">
   <cd:sequence>
+    <cd:variable value="float"/>
+    <cd:string value="testo"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -7585,25 +7623,25 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mettielencodioggettimobili" generated="yes">
+<cd:command name="placelistoffloats" generated="yes">
   <cd:sequence>
-    <cd:string value="mettielencodi"/>
-    <cd:variable value="oggettimobili"/>
+    <cd:string value="placelistof"/>
+    <cd:variable value="floats"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="completoelencodioggettimobili" generated="yes">
+<cd:command name="completelistoffloats" generated="yes">
   <cd:sequence>
-    <cd:string value="completoelencodi"/>
-    <cd:variable value="oggettimobili"/>
+    <cd:string value="completelistof"/>
+    <cd:variable value="floats"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="referral">
+<cd:command name="referral" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="referral"/>
   </cd:sequence>
@@ -7656,7 +7694,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="chim">
+<cd:command name="chim" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="chim"/>
   </cd:sequence>
@@ -7667,7 +7705,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="frazione">
+<cd:command name="frazione" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="frazione"/>
   </cd:sequence>
@@ -7677,7 +7715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="punti">
+<cd:command name="punti" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="punti"/>
   </cd:sequence>
@@ -7709,7 +7747,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaelementi">
+<cd:command name="impostaelementi" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="impostaelementi"/>
   </cd:sequence>
@@ -7758,8 +7796,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="citazione" type="environment" file="core-mis.tex">
   <cd:sequence>
+    <cd:string value="citazione"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords list="yes">
@@ -7770,7 +7809,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="citazione">
+<cd:command name="citazione" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="citazione"/>
   </cd:sequence>
@@ -7779,7 +7818,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="menzione">
+<cd:command name="menzione" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="menzione"/>
   </cd:sequence>
@@ -7788,7 +7827,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostamenzione">
+<cd:command name="impostamenzione" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="impostamenzione"/>
   </cd:sequence>
@@ -7807,14 +7846,14 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="colore">
         <cd:constant type="cd:name"/>
       </cd:parameter>
       <cd:parameter name="luogo">
-        <cd:constant type="testo"/>
+        <cd:variable type="cd:text"/>
         <cd:constant type="margine"/>
       </cd:parameter>
     </cd:assignments>
@@ -7834,7 +7873,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscicapoversi">
+<cd:command name="definiscicapoversi" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="definiscicapoversi"/>
   </cd:sequence>
@@ -7882,20 +7921,21 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="capoverso" generated="yes">
+<cd:command name="paragraph" generated="yes">
   <cd:sequence>
     <cd:variable value="capoverso"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="paragraph" type="environment" generated="yes">
   <cd:sequence>
+    <cd:variable value="capoverso"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostacapoversi">
+<cd:command name="impostacapoversi" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="impostacapoversi"/>
   </cd:sequence>
@@ -7915,7 +7955,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="ampiezza">
@@ -7960,7 +8000,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatab">
+<cd:command name="impostatab" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="impostatab"/>
   </cd:sequence>
@@ -7979,7 +8019,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="luogo">
@@ -8000,8 +8040,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="document" type="environment">
   <cd:sequence>
+    <cd:string value="document"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8021,7 +8062,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscitabulato">
+<cd:command name="definiscitabulato" file="core-tbl.tex">
   <cd:sequence>
     <cd:string value="definiscitabulato"/>
   </cd:sequence>
@@ -8038,8 +8079,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="tabulate" type="environment" generated="yes">
   <cd:sequence>
+    <cd:variable value="tabulato"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -8051,7 +8093,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatabulato">
+<cd:command name="impostatabulato" file="core-tbl.tex">
   <cd:sequence>
     <cd:string value="impostatabulato"/>
   </cd:sequence>
@@ -8120,7 +8162,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatabelle">
+<cd:command name="impostatabelle" file="core-tab.tex">
   <cd:sequence>
     <cd:string value="impostatabelle"/>
   </cd:sequence>
@@ -8203,8 +8245,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="table" type="environment">
   <cd:sequence>
+    <cd:string value="table"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8214,8 +8257,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="tables" type="environment">
   <cd:sequence>
+    <cd:string value="tables"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8225,7 +8269,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscimodellotabella">
+<cd:command name="definiscimodellotabella" file="core-tab.tex">
   <cd:sequence>
     <cd:string value="definiscimodellotabella"/>
   </cd:sequence>
@@ -8245,7 +8289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usafileesterni">
+<cd:command name="usafileesterni" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="usafileesterni"/>
   </cd:sequence>
@@ -8268,7 +8312,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usafileesterno">
+<cd:command name="usafileesterno" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="usafileesterno"/>
   </cd:sequence>
@@ -8294,7 +8338,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usafiguraesterna">
+<cd:command name="usafiguraesterna" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="usafiguraesterna"/>
   </cd:sequence>
@@ -8379,7 +8423,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="figuraesterna">
+<cd:command name="figuraesterna" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="figuraesterna"/>
   </cd:sequence>
@@ -8393,7 +8437,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostafigureesterne">
+<cd:command name="impostafigureesterne" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="impostafigureesterne"/>
   </cd:sequence>
@@ -8437,7 +8481,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mostrafiguresterne">
+<cd:command name="mostrafiguresterne" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="mostrafiguresterne"/>
   </cd:sequence>
@@ -8452,7 +8496,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usacolonnasonoraesterna">
+<cd:command name="usacolonnasonoraesterna" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="usacolonnasonoraesterna"/>
   </cd:sequence>
@@ -8466,17 +8510,18 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nome">
+<cd:command name="name" file="syst-gen.tex">
   <cd:sequence>
-    <cd:string value="nome"/>
+    <cd:string value="name"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="legend" type="environment">
   <cd:sequence>
+    <cd:string value="legend"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -8490,19 +8535,20 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="fatto" type="environment">
   <cd:sequence>
+    <cd:string value="fatto"/>
   </cd:sequence>
   <cd:arguments>
-    <cd:tex command="fatto"/>
+    <cd:tex command="fact"/>
     <cd:nothing/>
     <cd:nothing separator="backslash"/>
     <cd:nothing separator="backslash"/>
-    <cd:tex separator="backslash" command="fatto"/>
+    <cd:tex separator="backslash" command="fact"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ruota">
+<cd:command name="ruota" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="ruota"/>
   </cd:sequence>
@@ -8514,7 +8560,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostarotazione">
+<cd:command name="impostarotazione" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="impostarotazione"/>
   </cd:sequence>
@@ -8535,7 +8581,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="riflessione">
+<cd:command name="riflessione" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="riflessione"/>
   </cd:sequence>
@@ -8544,7 +8590,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="scala">
+<cd:command name="scala" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="scala"/>
   </cd:sequence>
@@ -8561,7 +8607,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostacombinazioni">
+<cd:command name="impostacombinazioni" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="impostacombinazioni"/>
   </cd:sequence>
@@ -8588,11 +8634,11 @@
         <cd:constant type="adatta"/>
       </cd:parameter>
       <cd:parameter name="luogo">
-        <cd:constant type="top"/>
-        <cd:constant type="middle"/>
-        <cd:constant type="bottom"/>
-        <cd:constant type="left"/>
-        <cd:constant type="right"/>
+        <cd:constant type="cima"/>
+        <cd:constant type="centro"/>
+        <cd:constant type="fondo"/>
+        <cd:constant type="sinistra"/>
+        <cd:constant type="destra"/>
       </cd:parameter>
       <cd:parameter name="allinea">
         <cd:constant type="no"/>
@@ -8608,7 +8654,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo...cd:command"/>
+        <cd:constant type="small...cd:command"/>
       </cd:parameter>
       <cd:parameter name="colore">
         <cd:constant type="cd:name"/>
@@ -8617,8 +8663,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="combination" type="environment">
   <cd:sequence>
+    <cd:string value="combination"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8627,7 +8674,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mettifiancoafianco">
+<cd:command name="mettifiancoafianco" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="mettifiancoafianco"/>
   </cd:sequence>
@@ -8637,7 +8684,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mettiunosullaltro">
+<cd:command name="mettiunosullaltro" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="mettiunosullaltro"/>
   </cd:sequence>
@@ -8647,8 +8694,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="overlay" type="environment">
   <cd:sequence>
+    <cd:string value="overlay"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
@@ -8656,8 +8704,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="overview" type="environment">
   <cd:sequence>
+    <cd:string value="overview"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords list="yes">
@@ -8666,7 +8715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaschermointerazione">
+<cd:command name="impostaschermointerazione" file="core-int.tex">
   <cd:sequence>
     <cd:string value="impostaschermointerazione"/>
   </cd:sequence>
@@ -8708,7 +8757,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="schermo">
+<cd:command name="schermo" file="core-int.tex">
   <cd:sequence>
     <cd:string value="schermo"/>
   </cd:sequence>
@@ -8716,7 +8765,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostatransizionepagina">
+<cd:command name="impostatransizionepagina" file="core-int.tex">
   <cd:sequence>
     <cd:string value="impostatransizionepagina"/>
   </cd:sequence>
@@ -8728,7 +8777,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostainterazione">
+<cd:command name="impostainterazione" file="core-nav.tex">
   <cd:sequence>
     <cd:string value="impostainterazione"/>
   </cd:sequence>
@@ -8792,7 +8841,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo...cd:command"/>
+        <cd:constant type="small...cd:command"/>
       </cd:parameter>
       <cd:parameter name="colore">
         <cd:constant type="cd:name"/>
@@ -8822,7 +8871,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscimenuinterazione">
+<cd:command name="definiscimenuinterazione" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definiscimenuinterazione"/>
   </cd:sequence>
@@ -8866,7 +8915,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo...cd:command"/>
+        <cd:constant type="small...cd:command"/>
       </cd:parameter>
       <cd:parameter name="colore">
         <cd:constant type="cd:name"/>
@@ -8908,7 +8957,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscimenuinterazione">
+<cd:command name="definiscimenuinterazione" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definiscimenuinterazione"/>
   </cd:sequence>
@@ -8933,8 +8982,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="menuinterattivo" type="environment">
   <cd:sequence>
+    <cd:string value="menuinterattivo"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords interactive="exclusive">
@@ -8943,7 +8993,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="disabilitamenuinterazione">
+<cd:command name="disabilitamenuinterazione" file="core-int.tex">
   <cd:sequence>
     <cd:string value="disabilitamenuinterazione"/>
   </cd:sequence>
@@ -8959,7 +9009,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usadocumentoesterno">
+<cd:command name="usadocumentoesterno" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="usadocumentoesterno"/>
   </cd:sequence>
@@ -8976,7 +9026,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usaURL">
+<cd:command name="usaURL" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="usaURL"/>
   </cd:sequence>
@@ -8996,7 +9046,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="accoppiadocumento">
+<cd:command name="accoppiadocumento" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="accoppiadocumento"/>
   </cd:sequence>
@@ -9013,7 +9063,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="da">
+<cd:command name="da" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="da"/>
   </cd:sequence>
@@ -9033,7 +9083,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="pulsantinterazione">
+<cd:command name="pulsantinterazione" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="pulsantinterazione"/>
   </cd:sequence>
@@ -9047,7 +9097,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostabarrainterazione">
+<cd:command name="impostabarrainterazione" file="core-int.tex">
   <cd:sequence>
     <cd:string value="impostabarrainterazione"/>
   </cd:sequence>
@@ -9072,12 +9122,12 @@
       </cd:parameter>
       <cd:parameter name="ampiezza">
         <cd:constant type="cd:dimension"/>
-        <cd:constant type="height"/>
+        <cd:constant type="altezza"/>
         <cd:constant type="adatta"/>
       </cd:parameter>
       <cd:parameter name="altezza">
         <cd:constant type="cd:dimension"/>
-        <cd:constant type="height"/>
+        <cd:constant type="altezza"/>
         <cd:constant type="adatta"/>
       </cd:parameter>
       <cd:parameter name="profondita">
@@ -9097,7 +9147,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sincronizza">
+<cd:command name="sincronizza" file="core-int.tex">
   <cd:sequence>
     <cd:string value="sincronizza"/>
   </cd:sequence>
@@ -9105,14 +9155,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="synchronization" type="environment">
   <cd:sequence>
+    <cd:string value="synchronization"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostabarrasincronizzazione">
+<cd:command name="impostabarrasincronizzazione" file="core-int.tex">
   <cd:sequence>
     <cd:string value="impostabarrasincronizzazione"/>
   </cd:sequence>
@@ -9124,7 +9175,7 @@
       </cd:parameter>
       <cd:parameter name="ampiezza">
         <cd:constant type="cd:dimension"/>
-        <cd:constant type="height"/>
+        <cd:constant type="altezza"/>
         <cd:constant type="adatta"/>
       </cd:parameter>
       <cd:parameter name="altezza">
@@ -9137,7 +9188,7 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="colore">
@@ -9148,7 +9199,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="barrasincronizzazione">
+<cd:command name="barrasincronizzazione" file="core-int.tex">
   <cd:sequence>
     <cd:string value="barrasincronizzazione"/>
   </cd:sequence>
@@ -9166,7 +9217,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostasincronizzazione">
+<cd:command name="impostasincronizzazione" file="core-int.tex">
   <cd:sequence>
     <cd:string value="impostasincronizzazione"/>
   </cd:sequence>
@@ -9180,7 +9231,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definisciprofilo">
+<cd:command name="definisciprofilo" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definisciprofilo"/>
   </cd:sequence>
@@ -9194,7 +9245,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaprofili">
+<cd:command name="impostaprofili" file="core-int.tex">
   <cd:sequence>
     <cd:string value="impostaprofili"/>
   </cd:sequence>
@@ -9207,8 +9258,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="profile" type="environment">
   <cd:sequence>
+    <cd:string value="profile"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords interactive="exclusive" list="yes">
@@ -9217,7 +9269,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seguiprofilo">
+<cd:command name="seguiprofilo" file="core-int.tex">
   <cd:sequence>
     <cd:string value="seguiprofilo"/>
   </cd:sequence>
@@ -9229,7 +9281,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mettisegnalibro">
+<cd:command name="mettisegnalibro" file="core-int.tex">
   <cd:sequence>
     <cd:string value="mettisegnalibro"/>
   </cd:sequence>
@@ -9254,8 +9306,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="versione" type="environment">
   <cd:sequence>
+    <cd:string value="versione"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords interactive="exclusive" list="yes">
@@ -9264,7 +9317,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaversioni">
+<cd:command name="impostaversioni" file="core-int.tex">
   <cd:sequence>
     <cd:string value="impostaversioni"/>
   </cd:sequence>
@@ -9280,14 +9333,14 @@
         <cd:constant type="grassettoinclinato"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="piccolo..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="marcaversione">
+<cd:command name="marcaversione" file="core-int.tex">
   <cd:sequence>
     <cd:string value="marcaversione"/>
   </cd:sequence>
@@ -9295,13 +9348,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="selezionaversione">
+<cd:command name="selezionaversione" file="core-int.tex">
   <cd:sequence>
     <cd:string value="selezionaversione"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definisciversion">
+<cd:command name="definisciversion" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definisciversion"/>
   </cd:sequence>
@@ -9315,7 +9368,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seguiversione">
+<cd:command name="seguiversione" file="core-int.tex">
   <cd:sequence>
     <cd:string value="seguiversione"/>
   </cd:sequence>
@@ -9327,7 +9380,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seguiversioneprofilo">
+<cd:command name="seguiversioneprofilo" file="core-int.tex">
   <cd:sequence>
     <cd:string value="seguiversioneprofilo"/>
   </cd:sequence>
@@ -9342,7 +9395,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definisciprogramma">
+<cd:command name="definisciprogramma" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definisciprogramma"/>
   </cd:sequence>
@@ -9359,7 +9412,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaprogrammi">
+<cd:command name="impostaprogrammi" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="impostaprogrammi"/>
   </cd:sequence>
@@ -9372,7 +9425,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="programma">
+<cd:command name="programma" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="programma"/>
   </cd:sequence>
@@ -9383,8 +9436,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="figure" type="environment">
   <cd:sequence>
+    <cd:string value="figure"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords interactive="exclusive">
@@ -9405,47 +9459,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="referring*figura">
-  <cd:sequence>
-    <cd:string value="referring*figura"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:position list="yes"/>
-    <cd:position list="yes"/>
-    <cd:keywords>
-      <cd:constant type="cd:number"/>
-    </cd:keywords>
-  </cd:arguments>
-</cd:command>
+<!-- referring*figure skipped -->
 
-<cd:command name="marcatura*figura">
-  <cd:sequence>
-    <cd:string value="marcatura*figura"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:position list="yes"/>
-    <cd:position list="yes"/>
-    <cd:keywords>
-      <cd:constant type="cd:number"/>
-    </cd:keywords>
-  </cd:arguments>
-</cd:command>
+<!-- marking*figure skipped -->
 
-<cd:command name="commento">
-  <cd:sequence>
-    <cd:string value="commento"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:position/>
-    <cd:position/>
-    <cd:assignments list="yes">
-      <cd:constant type="cd:number"/>
-    </cd:assignments>
-    <cd:content/>
-  </cd:arguments>
-</cd:command>
+<!-- remark skipped -->
 
-<cd:command name="vaia">
+<cd:command name="vaia" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="vaia"/>
   </cd:sequence>
@@ -9456,7 +9476,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vaiabox">
+<cd:command name="vaiabox" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="vaiabox"/>
   </cd:sequence>
@@ -9479,7 +9499,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostapulsanti">
+<cd:command name="impostapulsanti" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="impostapulsanti"/>
   </cd:sequence>
@@ -9494,23 +9514,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="pulsantemenu">
-  <cd:sequence>
-    <cd:string value="pulsantemenu"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:keywords interactive="exclusive" optional="yes">
-      <cd:inherit name="impostaincorniciato"/>
-    </cd:keywords>
-    <cd:assignments optional="yes" list="yes">
-      <cd:constant type="cd:text"/>
-    </cd:assignments>
-    <cd:content/>
-    <cd:reference list="yes"/>
-  </cd:arguments>
-</cd:command>
+<!-- menubutton skipped -->
 
-<cd:command name="impostacommento">
+<cd:command name="impostacommento" file="core-int.tex">
   <cd:sequence>
     <cd:string value="impostacommento"/>
   </cd:sequence>
@@ -9560,8 +9566,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="" type="environment">
+<cd:command name="commento" type="environment">
   <cd:sequence>
+    <cd:string value="commento"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -9588,7 +9595,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscicampo">
+<cd:command name="definiscicampo" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definiscicampo"/>
   </cd:sequence>
@@ -9611,7 +9618,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscisottocampo">
+<cd:command name="definiscisottocampo" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definiscisottocampo"/>
   </cd:sequence>
@@ -9628,7 +9635,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="copiacampo">
+<cd:command name="copiacampo" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="copiacampo"/>
   </cd:sequence>
@@ -9642,7 +9649,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="clonacampo">
+<cd:command name="clonacampo" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="clonacampo"/>
   </cd:sequence>
@@ -9662,7 +9669,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="campi">
+<cd:command name="campi" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="campi"/>
   </cd:sequence>
@@ -9673,7 +9680,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="adattacampo">
+<cd:command name="adattacampo" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="adattacampo"/>
   </cd:sequence>
@@ -9684,7 +9691,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="camporiempimento">
+<cd:command name="camporiempimento" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="camporiempimento"/>
   </cd:sequence>
@@ -9696,7 +9703,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tooltip">
+<cd:command name="tooltip" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="tooltip"/>
   </cd:sequence>
@@ -9711,7 +9718,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mostracampi">
+<cd:command name="mostracampi" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="mostracampi"/>
   </cd:sequence>
@@ -9722,13 +9729,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="logcampi">
+<cd:command name="logcampi" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="logcampi"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="impostacampo">
+<cd:command name="impostacampo" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="impostacampo"/>
   </cd:sequence>
@@ -9752,7 +9759,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostacampi">
+<cd:command name="impostacampi" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="impostacampi"/>
   </cd:sequence>
@@ -9849,7 +9856,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaforms">
+<cd:command name="impostaforms" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="impostaforms"/>
   </cd:sequence>
@@ -9863,7 +9870,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definiscistackcampi">
+<cd:command name="definiscistackcampi" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definiscistackcampi"/>
   </cd:sequence>
@@ -9880,7 +9887,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stackcampi">
+<cd:command name="stackcampi" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="stackcampi"/>
   </cd:sequence>
@@ -9897,7 +9904,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="clip">
+<cd:command name="clip" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="clip"/>
   </cd:sequence>
@@ -9909,7 +9916,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostaclippling">
+<cd:command name="impostaclippling" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="impostaclippling"/>
   </cd:sequence>
@@ -10198,7 +10205,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impostastrut">
+<cd:command name="impostastrut" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="impostastrut"/>
   </cd:sequence>
diff --git a/context/data/cont-nl.xml b/tex/context/interface/cont-nl.xml
index 170efa343..de51ef7d3 100644
--- a/context/data/cont-nl.xml
+++ b/tex/context/interface/cont-nl.xml
@@ -2,7 +2,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context">
 
-<cd:command name="installeertaal">
+<cd:command name="installeertaal" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="installeertaal"/>
   </cd:sequence>
@@ -56,7 +56,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="steltaalin">
+<cd:command name="steltaalin" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="steltaalin"/>
   </cd:sequence>
@@ -95,7 +95,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="hoofdtaal">
+<cd:command name="hoofdtaal" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="hoofdtaal"/>
   </cd:sequence>
@@ -113,7 +113,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vertaal">
+<cd:command name="vertaal" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="vertaal"/>
   </cd:sequence>
@@ -126,7 +126,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="usecodering">
+<cd:command name="usecodering" file="enco-ini.tex">
   <cd:sequence>
     <cd:string value="usecodering"/>
   </cd:sequence>
@@ -137,7 +137,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gebruikspecials">
+<cd:command name="gebruikspecials" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="gebruikspecials"/>
   </cd:sequence>
@@ -149,7 +149,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieeruitvoer">
+<cd:command name="definieeruitvoer" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="definieeruitvoer"/>
   </cd:sequence>
@@ -163,7 +163,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="steluitvoerin">
+<cd:command name="steluitvoerin" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="steluitvoerin"/>
   </cd:sequence>
@@ -174,7 +174,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerkorpsomgeving">
+<cd:command name="definieerkorpsomgeving" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definieerkorpsomgeving"/>
   </cd:sequence>
@@ -211,7 +211,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelkorpsomgevingin">
+<cd:command name="stelkorpsomgevingin" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="stelkorpsomgevingin"/>
   </cd:sequence>
@@ -236,7 +236,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerkorps">
+<cd:command name="definieerkorps" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definieerkorps"/>
   </cd:sequence>
@@ -335,7 +335,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="switchnaarkorps">
+<cd:command name="switchnaarkorps" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="switchnaarkorps"/>
   </cd:sequence>
@@ -351,7 +351,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerfont">
+<cd:command name="definieerfont" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definieerfont"/>
   </cd:sequence>
@@ -365,7 +365,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelstrutin">
+<cd:command name="stelstrutin" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="stelstrutin"/>
   </cd:sequence>
@@ -379,7 +379,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelkleurin">
+<cd:command name="stelkleurin" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="stelkleurin"/>
   </cd:sequence>
@@ -390,7 +390,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelkleurenin">
+<cd:command name="stelkleurenin" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="stelkleurenin"/>
   </cd:sequence>
@@ -448,7 +448,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerkleur">
+<cd:command name="definieerkleur" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definieerkleur"/>
   </cd:sequence>
@@ -485,7 +485,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kleur" type="environment">
+<cd:command name="kleur" type="environment" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="kleur"/>
   </cd:sequence>
@@ -496,7 +496,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kleur">
+<cd:command name="kleur" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="kleur"/>
   </cd:sequence>
@@ -508,7 +508,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="grijskleur">
+<cd:command name="grijskleur" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="grijskleur"/>
   </cd:sequence>
@@ -530,7 +530,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerpalet">
+<cd:command name="definieerpalet" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definieerpalet"/>
   </cd:sequence>
@@ -546,7 +546,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelpaletin">
+<cd:command name="stelpaletin" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="stelpaletin"/>
   </cd:sequence>
@@ -557,7 +557,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerkleurgroep">
+<cd:command name="definieerkleurgroep" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definieerkleurgroep"/>
   </cd:sequence>
@@ -605,7 +605,7 @@
       <cd:constant type="vertikaal"/>
       <cd:constant type="naam"/>
       <cd:constant type="waarde"/>
-      <cd:constant type="nummer"/>
+      <cd:variable type="cd:number"/>
     </cd:keywords>
   </cd:arguments>
 </cd:command>
@@ -632,13 +632,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="toonopmaak">
+<cd:command name="toonopmaak" file="supp-vis.tex">
   <cd:sequence>
     <cd:string value="toonopmaak"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definieertype">
+<cd:command name="definieertype" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="definieertype"/>
   </cd:sequence>
@@ -652,7 +652,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="steltypein">
+<cd:command name="steltypein" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="steltypein"/>
   </cd:sequence>
@@ -674,7 +674,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="kleur">
@@ -684,7 +684,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="type">
+<cd:command name="type" file="verb-ini.tex">
   <cd:sequence>
     <cd:string value="type"/>
   </cd:sequence>
@@ -693,7 +693,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="typ">
+<cd:command name="typ" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="typ"/>
   </cd:sequence>
@@ -702,7 +702,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tex">
+<cd:command name="tex" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="tex"/>
   </cd:sequence>
@@ -711,7 +711,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="arg">
+<cd:command name="arg" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="arg"/>
   </cd:sequence>
@@ -720,7 +720,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieertypen">
+<cd:command name="definieertypen" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="definieertypen"/>
   </cd:sequence>
@@ -736,7 +736,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="steltypenin">
+<cd:command name="steltypenin" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="steltypenin"/>
   </cd:sequence>
@@ -816,7 +816,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="kleur">
@@ -834,7 +834,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="typen" type="environment" generated="yes">
+<cd:command name="typing" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="typen"/>
   </cd:sequence>
@@ -842,7 +842,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="typefile">
+<cd:command name="typefile" file="verb-ini.tex">
   <cd:sequence>
     <cd:string value="typefile"/>
   </cd:sequence>
@@ -854,7 +854,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelvoetnotenin">
+<cd:command name="stelvoetnotenin" file="core-not.tex">
   <cd:sequence>
     <cd:string value="stelvoetnotenin"/>
   </cd:sequence>
@@ -868,12 +868,12 @@
         <cd:constant type="Romeins"/>
       </cd:parameter>
       <cd:parameter name="wijze">
-        <cd:constant type="pertekst"/>
-        <cd:constant type="percd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="plaats">
         <cd:constant type="pagina"/>
-        <cd:constant type="tekst"/>
+        <cd:variable type="cd:text"/>
         <cd:constant type="kolommen"/>
         <cd:constant type="eerstekolom"/>
         <cd:constant type="laatstekolom"/>
@@ -910,7 +910,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="afstand">
@@ -944,7 +944,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="tekstkleur">
@@ -962,7 +962,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelvoetnootdefinitiein">
+<cd:command name="stelvoetnootdefinitiein" file="core-not.tex">
   <cd:sequence>
     <cd:string value="stelvoetnootdefinitiein"/>
   </cd:sequence>
@@ -973,7 +973,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="voetnoot">
+<cd:command name="voetnoot" file="core-not.tex">
   <cd:sequence>
     <cd:string value="voetnoot"/>
   </cd:sequence>
@@ -983,7 +983,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="voetnoottekst">
+<cd:command name="voetnoottekst" file="core-not.tex">
   <cd:sequence>
     <cd:string value="voetnoottekst"/>
   </cd:sequence>
@@ -993,7 +993,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="noot">
+<cd:command name="noot" file="core-not.tex">
   <cd:sequence>
     <cd:string value="noot"/>
   </cd:sequence>
@@ -1002,15 +1002,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="lokalevoetnoten" type="environment">
+<cd:command name="localfootnotes" type="environment">
   <cd:sequence>
-    <cd:string value="lokalevoetnoten"/>
+    <cd:string value="localfootnotes"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plaatslokalevoetnoten">
+<cd:command name="plaatslokalevoetnoten" file="core-not.tex">
   <cd:sequence>
     <cd:string value="plaatslokalevoetnoten"/>
   </cd:sequence>
@@ -1021,7 +1021,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plaatsvoetnoten">
+<cd:command name="plaatsvoetnoten" file="core-not.tex">
   <cd:sequence>
     <cd:string value="plaatsvoetnoten"/>
   </cd:sequence>
@@ -1032,7 +1032,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelonderstrepenin">
+<cd:command name="stelonderstrepenin" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="stelonderstrepenin"/>
   </cd:sequence>
@@ -1059,7 +1059,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="onderstreep">
+<cd:command name="onderstreep" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="onderstreep"/>
   </cd:sequence>
@@ -1068,7 +1068,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="onderstrepen">
+<cd:command name="onderstrepen" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="onderstrepen"/>
   </cd:sequence>
@@ -1077,7 +1077,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="overstreep">
+<cd:command name="overstreep" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="overstreep"/>
   </cd:sequence>
@@ -1086,7 +1086,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="overstrepen">
+<cd:command name="overstrepen" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="overstrepen"/>
   </cd:sequence>
@@ -1095,7 +1095,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="doorstreep">
+<cd:command name="doorstreep" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="doorstreep"/>
   </cd:sequence>
@@ -1104,7 +1104,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="doorstrepen">
+<cd:command name="doorstrepen" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="doorstrepen"/>
   </cd:sequence>
@@ -1113,7 +1113,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="romeins">
+<cd:command name="romeins" file="core-con.tex">
   <cd:sequence>
     <cd:string value="romeins"/>
   </cd:sequence>
@@ -1122,7 +1122,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Romeins">
+<cd:command name="Romeins" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Romeins"/>
   </cd:sequence>
@@ -1131,7 +1131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="cijfers">
+<cd:command name="cijfers" file="core-con.tex">
   <cd:sequence>
     <cd:string value="cijfers"/>
   </cd:sequence>
@@ -1140,7 +1140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="letter">
+<cd:command name="letter" file="core-con.tex">
   <cd:sequence>
     <cd:string value="letter"/>
   </cd:sequence>
@@ -1149,7 +1149,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Letter">
+<cd:command name="Letter" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Letter"/>
   </cd:sequence>
@@ -1158,7 +1158,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="letters">
+<cd:command name="letters" file="core-con.tex">
   <cd:sequence>
     <cd:string value="letters"/>
   </cd:sequence>
@@ -1167,7 +1167,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Letters">
+<cd:command name="Letters" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Letters"/>
   </cd:sequence>
@@ -1176,7 +1176,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mediaeval">
+<cd:command name="mediaeval" file="core-con.tex">
   <cd:sequence>
     <cd:string value="mediaeval"/>
   </cd:sequence>
@@ -1185,7 +1185,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="maand">
+<cd:command name="maand" file="core-con.tex">
   <cd:sequence>
     <cd:string value="maand"/>
   </cd:sequence>
@@ -1194,7 +1194,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="MAAND">
+<cd:command name="MAAND" file="core-con.tex">
   <cd:sequence>
     <cd:string value="MAAND"/>
   </cd:sequence>
@@ -1203,7 +1203,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="weekdag">
+<cd:command name="weekdag" file="core-con.tex">
   <cd:sequence>
     <cd:string value="weekdag"/>
   </cd:sequence>
@@ -1212,7 +1212,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="WEEKDAG">
+<cd:command name="WEEKDAG" file="core-con.tex">
   <cd:sequence>
     <cd:string value="WEEKDAG"/>
   </cd:sequence>
@@ -1221,7 +1221,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelkapitalenin">
+<cd:command name="stelkapitalenin" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="stelkapitalenin"/>
   </cd:sequence>
@@ -1239,52 +1239,52 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kap">
+<cd:command name="cap" file="core-fnt.tex">
   <cd:sequence>
-    <cd:string value="kap"/>
+    <cd:string value="cap"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nokap">
+<cd:command name="nocap">
   <cd:sequence>
-    <cd:string value="nokap"/>
+    <cd:string value="nocap"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="KAP">
+<cd:command name="CAP">
   <cd:sequence>
-    <cd:string value="KAP"/>
+    <cd:string value="CAP"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Kap">
+<cd:command name="Cap">
   <cd:sequence>
-    <cd:string value="Kap"/>
+    <cd:string value="Cap"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Kaps">
+<cd:command name="Caps">
   <cd:sequence>
-    <cd:string value="Kaps"/>
+    <cd:string value="Caps"/>
   </cd:sequence>
   <cd:arguments>
     <cd:word list="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="WOORD">
+<cd:command name="WOORD" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="WOORD"/>
   </cd:sequence>
@@ -1293,7 +1293,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="WOORDEN">
+<cd:command name="WOORDEN" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="WOORDEN"/>
   </cd:sequence>
@@ -1302,7 +1302,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Woord">
+<cd:command name="Woord" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="Woord"/>
   </cd:sequence>
@@ -1311,7 +1311,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Woorden">
+<cd:command name="Woorden" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="Woorden"/>
   </cd:sequence>
@@ -1320,7 +1320,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uitgerekt">
+<cd:command name="uitgerekt" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="uitgerekt"/>
   </cd:sequence>
@@ -1329,7 +1329,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieersymbool">
+<cd:command name="definieersymbool" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="definieersymbool"/>
   </cd:sequence>
@@ -1343,7 +1343,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerfiguursymbool">
+<cd:command name="definieerfiguursymbool" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="definieerfiguursymbool"/>
   </cd:sequence>
@@ -1360,7 +1360,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="symbool">
+<cd:command name="symbool" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="symbool"/>
   </cd:sequence>
@@ -1374,9 +1374,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="symboolset" type="environment">
+<cd:command name="symbolset" type="environment">
   <cd:sequence>
-    <cd:string value="symboolset"/>
+    <cd:string value="symbolset"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -1385,7 +1385,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelsymboolsetin">
+<cd:command name="stelsymboolsetin" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="stelsymboolsetin"/>
   </cd:sequence>
@@ -1396,7 +1396,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gebruiksymbolen">
+<cd:command name="gebruiksymbolen" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="gebruiksymbolen"/>
   </cd:sequence>
@@ -1418,7 +1418,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerconversie">
+<cd:command name="definieerconversie" file="core-con.tex">
   <cd:sequence>
     <cd:string value="definieerconversie"/>
   </cd:sequence>
@@ -1433,7 +1433,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="converteernummer">
+<cd:command name="converteernummer" file="core-con.tex">
   <cd:sequence>
     <cd:string value="converteernummer"/>
   </cd:sequence>
@@ -1443,7 +1443,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelkoptekstin">
+<cd:command name="stelkoptekstin" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="stelkoptekstin"/>
   </cd:sequence>
@@ -1466,7 +1466,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellabeltekstin">
+<cd:command name="stellabeltekstin" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="stellabeltekstin"/>
   </cd:sequence>
@@ -1489,7 +1489,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="koptekst">
+<cd:command name="koptekst" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="koptekst"/>
   </cd:sequence>
@@ -1507,7 +1507,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelkantlijnin">
+<cd:command name="stelkantlijnin" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stelkantlijnin"/>
   </cd:sequence>
@@ -1546,7 +1546,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellijndiktein">
+<cd:command name="stellijndiktein" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stellijndiktein"/>
   </cd:sequence>
@@ -1557,7 +1557,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelomlijndin">
+<cd:command name="stelomlijndin" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stelomlijndin"/>
   </cd:sequence>
@@ -1701,7 +1701,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="omlijnd">
+<cd:command name="omlijnd" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="omlijnd"/>
   </cd:sequence>
@@ -1713,7 +1713,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inlijnd">
+<cd:command name="inlijnd" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="inlijnd"/>
   </cd:sequence>
@@ -1725,7 +1725,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="dunnelijnen">
+<cd:command name="dunnelijnen" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="dunnelijnen"/>
   </cd:sequence>
@@ -1736,7 +1736,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="steldunnelijnenin">
+<cd:command name="steldunnelijnenin" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="steldunnelijnenin"/>
   </cd:sequence>
@@ -1795,19 +1795,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="haarlijn">
+<cd:command name="haarlijn" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="haarlijn"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="dunnelijn">
+<cd:command name="dunnelijn" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="dunnelijn"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definieerkadertekst">
+<cd:command name="definieerkadertekst" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="definieerkadertekst"/>
   </cd:sequence>
@@ -1821,7 +1821,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieeromlijnd">
+<cd:command name="definieeromlijnd" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="definieeromlijnd"/>
   </cd:sequence>
@@ -1835,7 +1835,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelkadertekstenin">
+<cd:command name="stelkadertekstenin" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stelkadertekstenin"/>
   </cd:sequence>
@@ -1854,7 +1854,7 @@
         <cd:constant type="schuin"/>
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="links">
@@ -1896,7 +1896,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kadertekst" type="environment" generated="yes">
+<cd:command name="framedtext" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="kadertekst"/>
   </cd:sequence>
@@ -1913,7 +1913,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kadertekst" generated="yes">
+<cd:command name="framedtext" generated="yes">
   <cd:sequence>
     <cd:variable value="kadertekst"/>
   </cd:sequence>
@@ -1938,7 +1938,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="stelachtergrondin">
+<cd:command name="stelachtergrondin" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stelachtergrondin"/>
   </cd:sequence>
@@ -1997,7 +1997,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelinvullijnenin">
+<cd:command name="stelinvullijnenin" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stelinvullijnenin"/>
   </cd:sequence>
@@ -2024,7 +2024,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="n">
@@ -2054,7 +2054,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelinvulregelsin">
+<cd:command name="stelinvulregelsin" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stelinvulregelsin"/>
   </cd:sequence>
@@ -2079,7 +2079,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="steltekstlijnenin">
+<cd:command name="steltekstlijnenin" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="steltekstlijnenin"/>
   </cd:sequence>
@@ -2121,7 +2121,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="lijnkleur">
@@ -2131,7 +2131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tekstlijn">
+<cd:command name="tekstlijn" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="tekstlijn"/>
   </cd:sequence>
@@ -2144,7 +2144,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tekstlijn" type="environment">
+<cd:command name="tekstlijn" type="environment" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="tekstlijn"/>
   </cd:sequence>
@@ -2157,7 +2157,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="blokje">
+<cd:command name="blokje" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="blokje"/>
   </cd:sequence>
@@ -2168,7 +2168,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="blokjes">
+<cd:command name="blokjes" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="blokjes"/>
   </cd:sequence>
@@ -2179,7 +2179,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelblokjesin">
+<cd:command name="stelblokjesin" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stelblokjesin"/>
   </cd:sequence>
@@ -2211,7 +2211,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieeroverlay">
+<cd:command name="definieeroverlay" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="definieeroverlay"/>
   </cd:sequence>
@@ -2236,7 +2236,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="reset">
+<cd:command name="reset" file="core-num.tex">
   <cd:sequence>
     <cd:string value="reset"/>
   </cd:sequence>
@@ -2253,15 +2253,15 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="deelomgeving" type="environment">
+<cd:command name="localenvironment" type="environment">
   <cd:sequence>
-    <cd:string value="deelomgeving"/>
+    <cd:string value="localenvironment"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelsysteemin">
+<cd:command name="stelsysteemin" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="stelsysteemin"/>
   </cd:sequence>
@@ -2287,9 +2287,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gebruikgebied">
+<cd:command name="usedirectory">
   <cd:sequence>
-    <cd:string value="gebruikgebied"/>
+    <cd:string value="usedirectory"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords list="yes">
@@ -2299,7 +2299,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="laag">
+<cd:command name="laag" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="laag"/>
   </cd:sequence>
@@ -2308,7 +2308,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="hoog">
+<cd:command name="hoog" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="hoog"/>
   </cd:sequence>
@@ -2317,7 +2317,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="laho">
+<cd:command name="laho" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="laho"/>
   </cd:sequence>
@@ -2336,14 +2336,14 @@
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
-      <cd:constant type="tekst"/>
+      <cd:variable type="cd:text"/>
       <cd:constant type="marge"/>
       <cd:constant type="rand"/>
     </cd:keywords>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="regellinks">
+<cd:command name="regellinks" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="regellinks"/>
   </cd:sequence>
@@ -2352,7 +2352,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="regelrechts">
+<cd:command name="regelrechts" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="regelrechts"/>
   </cd:sequence>
@@ -2361,7 +2361,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="regelmidden">
+<cd:command name="regelmidden" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="regelmidden"/>
   </cd:sequence>
@@ -2370,7 +2370,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="woordrechts">
+<cd:command name="woordrechts" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="woordrechts"/>
   </cd:sequence>
@@ -2379,7 +2379,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inmarge">
+<cd:command name="inmarge" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="inmarge"/>
   </cd:sequence>
@@ -2394,7 +2394,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inanderemarge">
+<cd:command name="inanderemarge" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="inanderemarge"/>
   </cd:sequence>
@@ -2475,7 +2475,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="toonstruts">
+<cd:command name="toonstruts" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="toonstruts"/>
   </cd:sequence>
@@ -2493,7 +2493,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="margetekst">
+<cd:command name="margetekst" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="margetekst"/>
   </cd:sequence>
@@ -2508,7 +2508,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelmargeblokkenin">
+<cd:command name="stelmargeblokkenin" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="stelmargeblokkenin"/>
   </cd:sequence>
@@ -2527,7 +2527,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="breedte">
@@ -2564,17 +2564,17 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="margeblok" type="environment">
+<cd:command name="marginblock" type="environment">
   <cd:sequence>
-    <cd:string value="margeblok"/>
+    <cd:string value="marginblock"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="deel">
+<cd:command name="part" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="deel"/>
+    <cd:string value="part"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2582,9 +2582,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="titel">
+<cd:command name="title" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="titel"/>
+    <cd:string value="title"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2592,9 +2592,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="hoofdstuk">
+<cd:command name="chapter" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="hoofdstuk"/>
+    <cd:string value="chapter"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2602,9 +2602,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="paragraaf">
+<cd:command name="section" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="paragraaf"/>
+    <cd:string value="section"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2612,9 +2612,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="subparagraaf">
+<cd:command name="subsection" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="subparagraaf"/>
+    <cd:string value="subsection"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2622,9 +2622,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="subsubparagraaf">
+<cd:command name="subsubsection" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="subsubparagraaf"/>
+    <cd:string value="subsubsection"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2632,9 +2632,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="onderwerp">
+<cd:command name="subject" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="onderwerp"/>
+    <cd:string value="subject"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2642,9 +2642,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="subonderwerp">
+<cd:command name="subsubject" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="subonderwerp"/>
+    <cd:string value="subsubject"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2652,9 +2652,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="subsubonderwerp">
+<cd:command name="subsubsubject" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="subsubonderwerp"/>
+    <cd:string value="subsubsubject"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2662,9 +2662,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="bijlage">
+<cd:command name="appendix" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="bijlage"/>
+    <cd:string value="appendix"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2672,7 +2672,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="in">
+<cd:command name="in" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="in"/>
   </cd:sequence>
@@ -2704,7 +2704,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ergens">
+<cd:command name="ergens" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="ergens"/>
   </cd:sequence>
@@ -2715,7 +2715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="oppagina">
+<cd:command name="oppagina" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="oppagina"/>
   </cd:sequence>
@@ -2724,7 +2724,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ref">
+<cd:command name="ref" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="ref"/>
   </cd:sequence>
@@ -2740,7 +2740,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tekstreferentie">
+<cd:command name="tekstreferentie" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="tekstreferentie"/>
   </cd:sequence>
@@ -2750,7 +2750,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="paginareferentie">
+<cd:command name="paginareferentie" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="paginareferentie"/>
   </cd:sequence>
@@ -2759,7 +2759,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="referentie">
+<cd:command name="referentie" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="referentie"/>
   </cd:sequence>
@@ -2769,7 +2769,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gebruikreferenties">
+<cd:command name="gebruikreferenties" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="gebruikreferenties"/>
   </cd:sequence>
@@ -2780,7 +2780,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerreferentie">
+<cd:command name="definieerreferentie" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definieerreferentie"/>
   </cd:sequence>
@@ -2792,7 +2792,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerreferentieformaat">
+<cd:command name="definieerreferentieformaat" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definieerreferentieformaat"/>
   </cd:sequence>
@@ -2839,7 +2839,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="omlaag">
+<cd:command name="omlaag" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="omlaag"/>
   </cd:sequence>
@@ -2850,37 +2850,37 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="witruimte">
+<cd:command name="witruimte" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="witruimte"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="geenwitruimte">
+<cd:command name="geenwitruimte" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="geenwitruimte"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="crlf">
+<cd:command name="crlf" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="crlf"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="spatie">
+<cd:command name="spatie" file="syst-pln.tex">
   <cd:sequence>
     <cd:string value="spatie"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="vastespaties">
+<cd:command name="vastespaties" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="vastespaties"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="legeregels">
+<cd:command name="legeregels" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="legeregels"/>
   </cd:sequence>
@@ -2891,19 +2891,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="geenspatie">
+<cd:command name="geenspatie" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="geenspatie"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="opelkaar">
+<cd:command name="opelkaar" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="opelkaar"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="steldoordefinierenin">
+<cd:command name="steldoordefinierenin" file="core-des.tex">
   <cd:sequence>
     <cd:string value="steldoordefinierenin"/>
   </cd:sequence>
@@ -2919,7 +2919,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="letter">
@@ -2929,7 +2929,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="kleur">
@@ -3004,7 +3004,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="steldoornummerenin">
+<cd:command name="steldoornummerenin" file="core-des.tex">
   <cd:sequence>
     <cd:string value="steldoornummerenin"/>
   </cd:sequence>
@@ -3018,7 +3018,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="doornummeren">
+<cd:command name="doornummeren" file="core-des.tex">
   <cd:sequence>
     <cd:string value="doornummeren"/>
   </cd:sequence>
@@ -3035,24 +3035,24 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="doornummering" generated="yes">
+<cd:command name="enumeration" generated="yes">
   <cd:sequence>
-    <cd:variable value="doornummering"/>
+    <cd:variable value="enumeration"/>
   </cd:sequence>
   <cd:arguments>
     <cd:nothing interactive="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="doornummering" type="environment" generated="yes">
+<cd:command name="enumeration" type="environment" generated="yes">
   <cd:sequence>
-    <cd:variable value="doornummering"/>
+    <cd:variable value="enumeration"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="doordefinieren">
+<cd:command name="doordefinieren" file="core-des.tex">
   <cd:sequence>
     <cd:string value="doordefinieren"/>
   </cd:sequence>
@@ -3066,9 +3066,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="doordefinitie" generated="yes">
+<cd:command name="description" generated="yes">
   <cd:sequence>
-    <cd:variable value="doordefinitie"/>
+    <cd:variable value="description"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
@@ -3076,16 +3076,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="doordefinitie" type="environment" generated="yes">
+<cd:command name="description" type="environment" generated="yes">
   <cd:sequence>
-    <cd:variable value="doordefinitie"/>
+    <cd:variable value="description"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="steldoorspringenin">
+<cd:command name="steldoorspringenin" file="core-des.tex">
   <cd:sequence>
     <cd:string value="steldoorspringenin"/>
   </cd:sequence>
@@ -3101,7 +3101,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="kopletter">
@@ -3111,7 +3111,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="breedte">
@@ -3140,7 +3140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="doorspringen">
+<cd:command name="doorspringen" file="core-des.tex">
   <cd:sequence>
     <cd:string value="doorspringen"/>
   </cd:sequence>
@@ -3154,16 +3154,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="doorsprong" generated="yes">
+<cd:command name="indentation" generated="yes" file="core-spa.tex">
   <cd:sequence>
-    <cd:variable value="doorsprong"/>
+    <cd:variable value="indentation"/>
   </cd:sequence>
   <cd:arguments>
     <cd:nothing/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="doorlabelen">
+<cd:command name="doorlabelen" file="core-des.tex">
   <cd:sequence>
     <cd:string value="doorlabelen"/>
   </cd:sequence>
@@ -3180,8 +3180,8 @@
         <cd:constant type="intekst"/>
       </cd:parameter>
       <cd:parameter name="wijze">
-        <cd:constant type="pertekst"/>
-        <cd:constant type="percd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="blokwijze">
         <cd:constant type="ja"/>
@@ -3194,7 +3194,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="kopkleur">
@@ -3210,16 +3210,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="doorlabel" generated="yes">
+<cd:command name="labeling" generated="yes">
   <cd:sequence>
-    <cd:variable value="doorlabel"/>
+    <cd:variable value="labeling"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelkolommenin">
+<cd:command name="stelkolommenin" file="page-mul.tex">
   <cd:sequence>
     <cd:string value="stelkolommenin"/>
   </cd:sequence>
@@ -3255,7 +3255,7 @@
       <cd:parameter name="uitlijnen">
         <cd:constant type="ja"/>
         <cd:constant type="nee"/>
-        <cd:constant type="tekst"/>
+        <cd:variable type="cd:text"/>
       </cd:parameter>
       <cd:parameter name="blanko">
         <cd:constant type="vast"/>
@@ -3278,9 +3278,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kolommen" type="environment">
+<cd:command name="columns" type="environment">
   <cd:sequence>
-    <cd:string value="kolommen"/>
+    <cd:string value="columns"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments optional="yes" list="yes">
@@ -3289,7 +3289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieertekst">
+<cd:command name="definieertekst" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="definieertekst"/>
   </cd:sequence>
@@ -3313,13 +3313,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelhoofdin">
+<cd:command name="stelhoofdin" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stelhoofdin"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
-      <cd:constant type="tekst" default="yes"/>
+      <cd:variable type="cd:text" default="yes"/>
       <cd:constant type="marge"/>
       <cd:constant type="rand"/>
     </cd:keywords>
@@ -3345,7 +3345,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="linkerletter">
@@ -3355,7 +3355,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="rechterletter">
@@ -3365,7 +3365,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="linkerbreedte">
@@ -3384,7 +3384,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelvoetin">
+<cd:command name="stelvoetin" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stelvoetin"/>
   </cd:sequence>
@@ -3398,7 +3398,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="steltekstin">
+<cd:command name="steltekstin" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="steltekstin"/>
   </cd:sequence>
@@ -3412,7 +3412,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelbovenin">
+<cd:command name="stelbovenin" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stelbovenin"/>
   </cd:sequence>
@@ -3426,7 +3426,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelonderin">
+<cd:command name="stelonderin" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stelonderin"/>
   </cd:sequence>
@@ -3440,25 +3440,25 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="geenhoofdenvoetregels">
+<cd:command name="geenhoofdenvoetregels" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="geenhoofdenvoetregels"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="geenbovenenonderregels">
+<cd:command name="geenbovenenonderregels" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="geenbovenenonderregels"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="stelhoofdtekstenin">
+<cd:command name="stelhoofdtekstenin" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stelhoofdtekstenin"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
-      <cd:constant type="tekst" default="yes"/>
+      <cd:variable type="cd:text" default="yes"/>
       <cd:constant type="marge"/>
       <cd:constant type="rand"/>
     </cd:keywords>
@@ -3479,13 +3479,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelvoettekstenin">
+<cd:command name="stelvoettekstenin" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stelvoettekstenin"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
-      <cd:constant type="tekst" default="yes"/>
+      <cd:variable type="cd:text" default="yes"/>
       <cd:constant type="marge"/>
       <cd:constant type="rand"/>
     </cd:keywords>
@@ -3506,13 +3506,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelteksttekstenin">
+<cd:command name="stelteksttekstenin" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stelteksttekstenin"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
-      <cd:constant type="tekst" default="yes"/>
+      <cd:variable type="cd:text" default="yes"/>
       <cd:constant type="marge"/>
       <cd:constant type="rand"/>
     </cd:keywords>
@@ -3533,13 +3533,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelboventekstenin">
+<cd:command name="stelboventekstenin" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stelboventekstenin"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
-      <cd:constant type="tekst" default="yes"/>
+      <cd:variable type="cd:text" default="yes"/>
       <cd:constant type="marge"/>
       <cd:constant type="rand"/>
     </cd:keywords>
@@ -3560,13 +3560,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelondertekstenin">
+<cd:command name="stelondertekstenin" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="stelondertekstenin"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
-      <cd:constant type="tekst" default="yes"/>
+      <cd:variable type="cd:text" default="yes"/>
       <cd:constant type="marge"/>
       <cd:constant type="rand"/>
     </cd:keywords>
@@ -3587,7 +3587,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieermarkering">
+<cd:command name="definieermarkering" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="definieermarkering"/>
   </cd:sequence>
@@ -3601,7 +3601,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="koppelmarkering">
+<cd:command name="koppelmarkering" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="koppelmarkering"/>
   </cd:sequence>
@@ -3615,7 +3615,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ontkoppelmarkering">
+<cd:command name="ontkoppelmarkering" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="ontkoppelmarkering"/>
   </cd:sequence>
@@ -3626,7 +3626,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="resetmarkering">
+<cd:command name="resetmarkering" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="resetmarkering"/>
   </cd:sequence>
@@ -3637,7 +3637,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelmarkeringin">
+<cd:command name="stelmarkeringin" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="stelmarkeringin"/>
   </cd:sequence>
@@ -3661,7 +3661,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="markeer">
+<cd:command name="markeer" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="markeer"/>
   </cd:sequence>
@@ -3673,7 +3673,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="haalmarkering">
+<cd:command name="haalmarkering" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="haalmarkering"/>
   </cd:sequence>
@@ -3692,7 +3692,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="geenmarkering">
+<cd:command name="geenmarkering" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="geenmarkering"/>
   </cd:sequence>
@@ -3701,7 +3701,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellayoutin">
+<cd:command name="stellayoutin" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="stellayoutin"/>
   </cd:sequence>
@@ -3787,7 +3787,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="kleur">
@@ -3798,7 +3798,7 @@
         <cd:constant type="uit"/>
         <cd:constant type="kleur"/>
         <cd:constant type="raster"/>
-        <cd:constant type="tekst"/>
+        <cd:variable type="cd:text"/>
       </cd:parameter>
       <cd:parameter name="plaats">
         <cd:constant type="links"/>
@@ -3865,7 +3865,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="paslayoutaan">
+<cd:command name="paslayoutaan" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="paslayoutaan"/>
   </cd:sequence>
@@ -3885,13 +3885,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="toongrid">
+<cd:command name="toongrid" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="toongrid"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="plaatsopgrid">
+<cd:command name="plaatsopgrid" file="core-grd.tex">
   <cd:sequence>
     <cd:string value="plaatsopgrid"/>
   </cd:sequence>
@@ -3903,7 +3903,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verplaatsopgrid">
+<cd:command name="verplaatsopgrid" file="core-grd.tex">
   <cd:sequence>
     <cd:string value="verplaatsopgrid"/>
   </cd:sequence>
@@ -3912,10 +3912,10 @@
       <cd:constant type="boven"/>
       <cd:constant type="beide"/>
       <cd:constant type="onder"/>
-      <cd:constant type="-boven"/>
-      <cd:constant type="-beide"/>
-      <cd:constant type="-onder"/>
-      <cd:constant type="tekst"/>
+      <cd:constant type="-top"/>
+      <cd:constant type="-both"/>
+      <cd:constant type="-bottom"/>
+      <cd:variable type="cd:text"/>
       <cd:constant type="hoog"/>
       <cd:constant type="midden"/>
       <cd:constant type="laag"/>
@@ -3949,9 +3949,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="produkt" type="environment">
+<cd:command name="product" type="environment">
   <cd:sequence>
-    <cd:string value="produkt"/>
+    <cd:string value="product"/>
   </cd:sequence>
   <cd:arguments>
     <cd:file/>
@@ -4008,7 +4008,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelpaginanummeringin">
+<cd:command name="stelpaginanummeringin" file="page-num.tex">
   <cd:sequence>
     <cd:string value="stelpaginanummeringin"/>
   </cd:sequence>
@@ -4043,7 +4043,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="links">
@@ -4053,8 +4053,8 @@
         <cd:constant type="cd:text"/>
       </cd:parameter>
       <cd:parameter name="wijze">
-        <cd:constant type="pertekst"/>
-        <cd:constant type="percd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="tekst">
         <cd:constant type="cd:text"/>
@@ -4090,7 +4090,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelsmallerin">
+<cd:command name="stelsmallerin" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="stelsmallerin"/>
   </cd:sequence>
@@ -4109,7 +4109,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieer">
+<cd:command name="definieer" file="syst-ext.tex">
   <cd:sequence>
     <cd:string value="definieer"/>
   </cd:sequence>
@@ -4122,7 +4122,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gebruikcommandos">
+<cd:command name="gebruikcommandos" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="gebruikcommandos"/>
   </cd:sequence>
@@ -4131,7 +4131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerstartstop">
+<cd:command name="definieerstartstop" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="definieerstartstop"/>
   </cd:sequence>
@@ -4153,7 +4153,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="commandos">
@@ -4163,7 +4163,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelkoppenin">
+<cd:command name="stelkoppenin" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="stelkoppenin"/>
   </cd:sequence>
@@ -4171,14 +4171,14 @@
     <cd:assignments list="yes">
       <cd:parameter name="sectienummer">
         <cd:constant type="ja"/>
-        <cd:constant type="nummer"/>
+        <cd:variable type="cd:number"/>
         <cd:constant type="nee"/>
       </cd:parameter>
       <cd:parameter name="variant">
         <cd:constant type="normaal"/>
         <cd:constant type="marge"/>
         <cd:constant type="midden"/>
-        <cd:constant type="tekst"/>
+        <cd:variable type="cd:text"/>
         <cd:constant type="alinea"/>
       </cd:parameter>
       <cd:parameter name="scheider">
@@ -4215,7 +4215,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelblokkopjesin">
+<cd:command name="stelblokkopjesin" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="stelblokkopjesin"/>
   </cd:sequence>
@@ -4246,7 +4246,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="letter">
@@ -4256,7 +4256,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="nummer">
@@ -4280,8 +4280,8 @@
         <cd:constant type="Romeins"/>
       </cd:parameter>
       <cd:parameter name="wijze">
-        <cd:constant type="pertekst"/>
-        <cd:constant type="percd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="scheider">
         <cd:constant type="cd:text"/>
@@ -4296,7 +4296,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelblokkopjein">
+<cd:command name="stelblokkopjein" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="stelblokkopjein"/>
   </cd:sequence>
@@ -4310,7 +4310,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelplaatsblokkenin">
+<cd:command name="stelplaatsblokkenin" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="stelplaatsblokkenin"/>
   </cd:sequence>
@@ -4394,7 +4394,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelplaatsbloksplitsenin">
+<cd:command name="stelplaatsbloksplitsenin" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="stelplaatsbloksplitsenin"/>
   </cd:sequence>
@@ -4414,7 +4414,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="splitsplaatsblok">
+<cd:command name="splitsplaatsblok" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="splitsplaatsblok"/>
   </cd:sequence>
@@ -4427,7 +4427,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelnaastplaatsenin">
+<cd:command name="stelnaastplaatsenin" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="stelnaastplaatsenin"/>
   </cd:sequence>
@@ -4450,15 +4450,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="naast" type="environment">
+<cd:command name="opposite" type="environment">
   <cd:sequence>
-    <cd:string value="naast"/>
+    <cd:string value="opposite"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelkoppeltekenin">
+<cd:command name="stelkoppeltekenin" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="stelkoppeltekenin"/>
   </cd:sequence>
@@ -4478,7 +4478,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelpositionerenin">
+<cd:command name="stelpositionerenin" file="page-lyr.tex">
   <cd:sequence>
     <cd:string value="stelpositionerenin"/>
   </cd:sequence>
@@ -4519,15 +4519,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="positioneren" type="environment">
+<cd:command name="positioning" type="environment">
   <cd:sequence>
-    <cd:string value="positioneren"/>
+    <cd:string value="positioning"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="rooster">
+<cd:command name="rooster" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="rooster"/>
   </cd:sequence>
@@ -4584,7 +4584,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="pagina">
+<cd:command name="pagina" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="pagina"/>
   </cd:sequence>
@@ -4611,7 +4611,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelrefererenin">
+<cd:command name="stelrefererenin" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="stelrefererenin"/>
   </cd:sequence>
@@ -4632,7 +4632,7 @@
       </cd:parameter>
       <cd:parameter name="interactie">
         <cd:constant type="label"/>
-        <cd:constant type="tekst"/>
+        <cd:variable type="cd:text"/>
         <cd:constant type="alles"/>
         <cd:constant type="symbool"/>
       </cd:parameter>
@@ -4667,7 +4667,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelurlin">
+<cd:command name="stelurlin" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="stelurlin"/>
   </cd:sequence>
@@ -4680,7 +4680,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="urlvariant">
@@ -4697,7 +4697,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="schrijfnaarreferentielijst">
+<cd:command name="schrijfnaarreferentielijst" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="schrijfnaarreferentielijst"/>
   </cd:sequence>
@@ -4721,7 +4721,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerreferentielijst">
+<cd:command name="definieerreferentielijst" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definieerreferentielijst"/>
   </cd:sequence>
@@ -4735,7 +4735,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelreferentielijstin">
+<cd:command name="stelreferentielijstin" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="stelreferentielijstin"/>
   </cd:sequence>
@@ -4767,7 +4767,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="schrijfnaarlijst">
+<cd:command name="schrijfnaarlijst" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="schrijfnaarlijst"/>
   </cd:sequence>
@@ -4781,7 +4781,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="schrijftussenlijst">
+<cd:command name="schrijftussenlijst" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="schrijftussenlijst"/>
   </cd:sequence>
@@ -4794,7 +4794,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="geenlijst">
+<cd:command name="geenlijst" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="geenlijst"/>
   </cd:sequence>
@@ -4803,7 +4803,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="lijstsymbool">
+<cd:command name="lijstsymbool" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="lijstsymbool"/>
   </cd:sequence>
@@ -4815,7 +4815,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plaatslijst">
+<cd:command name="plaatslijst" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="plaatslijst"/>
   </cd:sequence>
@@ -4829,7 +4829,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="bepaallijstkenmerken">
+<cd:command name="bepaallijstkenmerken" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="bepaallijstkenmerken"/>
   </cd:sequence>
@@ -4843,7 +4843,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plaatssamengesteldelijst">
+<cd:command name="plaatssamengesteldelijst" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="plaatssamengesteldelijst"/>
   </cd:sequence>
@@ -4857,7 +4857,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerlijst">
+<cd:command name="definieerlijst" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definieerlijst"/>
   </cd:sequence>
@@ -4874,7 +4874,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stellijstin">
+<cd:command name="stellijstin" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="stellijstin"/>
   </cd:sequence>
@@ -4893,7 +4893,7 @@
         <cd:constant type="c"/>
         <cd:constant type="..."/>
         <cd:constant type="geen"/>
-        <cd:constant type="commando"/>
+        <cd:variable type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="koppeling">
         <cd:constant type="aan"/>
@@ -4916,7 +4916,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="nummerletter">
@@ -4926,7 +4926,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="tekstletter">
@@ -4936,7 +4936,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="paginaletter">
@@ -4946,7 +4946,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="kleur">
@@ -4965,8 +4965,8 @@
         <cd:constant type="cd:oneargument"/>
       </cd:parameter>
       <cd:parameter name="interactie">
-        <cd:constant type="sectienummer"/>
-        <cd:constant type="tekst"/>
+        <cd:variable type="cd:sectionnumber"/>
+        <cd:variable type="cd:text"/>
         <cd:constant type="paginanummer"/>
         <cd:constant type="alles"/>
       </cd:parameter>
@@ -5042,7 +5042,7 @@
       <cd:parameter name="expansie">
         <cd:constant type="ja"/>
         <cd:constant type="nee"/>
-        <cd:constant type="commando"/>
+        <cd:variable type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="maxbreedte">
         <cd:constant type="cd:dimension"/>
@@ -5052,7 +5052,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieersamengesteldelijst">
+<cd:command name="definieersamengesteldelijst" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definieersamengesteldelijst"/>
   </cd:sequence>
@@ -5069,7 +5069,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelsamengesteldelijstin">
+<cd:command name="stelsamengesteldelijstin" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="stelsamengesteldelijstin"/>
   </cd:sequence>
@@ -5091,10 +5091,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plaatssamengesteldelijst" generated="yes">
+<cd:command name="plaatssamengesteldelijst" generated="yes" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="plaats"/>
-    <cd:variable value="samengesteldelijst"/>
+    <cd:variable value="combinedlist"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -5106,10 +5106,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="volledigesamengesteldelijst" generated="yes">
+<cd:command name="completecombinedlist" generated="yes">
   <cd:sequence>
     <cd:string value="volledige"/>
-    <cd:variable value="samengesteldelijst"/>
+    <cd:variable value="combinedlist"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -5121,15 +5121,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelnummerenin">
+<cd:command name="stelnummerenin" file="core-num.tex">
   <cd:sequence>
     <cd:string value="stelnummerenin"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments list="yes">
       <cd:parameter name="wijze">
-        <cd:constant type="pertekst"/>
-        <cd:constant type="percd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="status">
         <cd:constant type="start"/>
@@ -5139,9 +5139,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelformulesin">
+<cd:command name="setupformulae">
   <cd:sequence>
-    <cd:string value="stelformulesin"/>
+    <cd:string value="setupformulae"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments list="yes">
@@ -5199,7 +5199,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="publicatie">
+<cd:command name="publicatie" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="publicatie"/>
   </cd:sequence>
@@ -5208,7 +5208,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelpublicatiesin">
+<cd:command name="stelpublicatiesin" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="stelpublicatiesin"/>
   </cd:sequence>
@@ -5223,7 +5223,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelregelsin">
+<cd:command name="stelregelsin" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="stelregelsin"/>
   </cd:sequence>
@@ -5248,15 +5248,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="regels" type="environment">
+<cd:command name="lines" type="environment">
   <cd:sequence>
-    <cd:string value="regels"/>
+    <cd:string value="lines"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelparagraafnummerenin">
+<cd:command name="stelparagraafnummerenin" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="stelparagraafnummerenin"/>
   </cd:sequence>
@@ -5275,7 +5275,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="afstand">
@@ -5285,7 +5285,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelregelnummerenin">
+<cd:command name="stelregelnummerenin" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="stelregelnummerenin"/>
   </cd:sequence>
@@ -5297,7 +5297,7 @@
         <cd:constant type="Letters"/>
         <cd:constant type="romeins"/>
         <cd:constant type="Romeins"/>
-        <cd:constant type="tekst"/>
+        <cd:variable type="cd:text"/>
       </cd:parameter>
       <cd:parameter name="start">
         <cd:constant type="cd:number"/>
@@ -5319,7 +5319,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="prefix">
@@ -5333,9 +5333,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="regelnummeren" type="environment">
+<cd:command name="linenumbering" type="environment">
   <cd:sequence>
-    <cd:string value="regelnummeren"/>
+    <cd:string value="linenumbering"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -5344,16 +5344,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="regel" type="environment">
+<cd:command name="line" type="environment">
   <cd:sequence>
-    <cd:string value="regel"/>
+    <cd:string value="line"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="eenregel">
+<cd:command name="eenregel" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="eenregel"/>
   </cd:sequence>
@@ -5362,7 +5362,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inregel">
+<cd:command name="inregel" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="inregel"/>
   </cd:sequence>
@@ -5371,7 +5371,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelinmargein">
+<cd:command name="stelinmargein" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="stelinmargein"/>
   </cd:sequence>
@@ -5394,7 +5394,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="voor">
@@ -5437,7 +5437,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelpaginanummerin">
+<cd:command name="stelpaginanummerin" file="page-num.tex">
   <cd:sequence>
     <cd:string value="stelpaginanummerin"/>
   </cd:sequence>
@@ -5455,15 +5455,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelsubpaginanummerin">
+<cd:command name="stelsubpaginanummerin" file="page-num.tex">
   <cd:sequence>
     <cd:string value="stelsubpaginanummerin"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments list="yes">
       <cd:parameter name="wijze">
-        <cd:constant type="pertekst"/>
-        <cd:constant type="percd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="status">
         <cd:constant type="start"/>
@@ -5493,7 +5493,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerblanko">
+<cd:command name="definieerblanko" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="definieerblanko"/>
   </cd:sequence>
@@ -5507,7 +5507,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerpapierformaat">
+<cd:command name="definieerpapierformaat" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="definieerpapierformaat"/>
   </cd:sequence>
@@ -5532,7 +5532,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelpapierin">
+<cd:command name="stelpapierin" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="stelpapierin"/>
   </cd:sequence>
@@ -5570,7 +5570,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelpapierformaatin">
+<cd:command name="stelpapierformaatin" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="stelpapierformaatin"/>
   </cd:sequence>
@@ -5610,7 +5610,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelarrangerenin">
+<cd:command name="stelarrangerenin" file="page-imp.tex">
   <cd:sequence>
     <cd:string value="stelarrangerenin"/>
   </cd:sequence>
@@ -5656,7 +5656,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerbeeldmerk">
+<cd:command name="definieerbeeldmerk" file="page-log.tex">
   <cd:sequence>
     <cd:string value="definieerbeeldmerk"/>
   </cd:sequence>
@@ -5694,7 +5694,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plaatsbeeldmerken">
+<cd:command name="plaatsbeeldmerken" file="page-log.tex">
   <cd:sequence>
     <cd:string value="plaatsbeeldmerken"/>
   </cd:sequence>
@@ -5740,7 +5740,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieersectieblok">
+<cd:command name="definieersectieblok" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definieersectieblok"/>
   </cd:sequence>
@@ -5754,7 +5754,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelsectieblokin">
+<cd:command name="stelsectieblokin" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="stelsectieblokin"/>
   </cd:sequence>
@@ -5781,7 +5781,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieersectie">
+<cd:command name="definieersectie" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definieersectie"/>
   </cd:sequence>
@@ -5792,7 +5792,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelsectiein">
+<cd:command name="stelsectiein" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="stelsectiein"/>
   </cd:sequence>
@@ -5819,7 +5819,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelkopin">
+<cd:command name="stelkopin" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="stelkopin"/>
   </cd:sequence>
@@ -5835,7 +5835,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="tekstletter">
@@ -5845,7 +5845,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="nummerletter">
@@ -5855,7 +5855,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="kleur">
@@ -5915,7 +5915,7 @@
         <cd:constant type="normaal"/>
         <cd:constant type="inmarge"/>
         <cd:constant type="midden"/>
-        <cd:constant type="tekst"/>
+        <cd:variable type="cd:text"/>
       </cd:parameter>
       <cd:parameter name="commando">
         <cd:constant type="cd:twoarguments"/>
@@ -5939,7 +5939,7 @@
       <cd:parameter name="verhoognummer">
         <cd:constant type="ja"/>
         <cd:constant type="nee"/>
-        <cd:constant type="lijst"/>
+        <cd:variable type="cd:list"/>
         <cd:constant type="cd:file"/>
       </cd:parameter>
       <cd:parameter name="resetnummer">
@@ -5951,7 +5951,7 @@
       </cd:parameter>
       <cd:parameter name="expansie">
         <cd:constant type="ja"/>
-        <cd:constant type="commando"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="nee"/>
       </cd:parameter>
       <cd:parameter name="margetekst">
@@ -5963,7 +5963,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelkopnummerin">
+<cd:command name="stelkopnummerin" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="stelkopnummerin"/>
   </cd:sequence>
@@ -5990,7 +5990,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="bepaalkopnummer">
+<cd:command name="bepaalkopnummer" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="bepaalkopnummer"/>
   </cd:sequence>
@@ -6001,20 +6001,20 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="huidigekopnummer">
+<cd:command name="huidigekopnummer" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="huidigekopnummer"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="volgendesectie" generated="yes">
+<cd:command name="nextsection" generated="yes" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="volgende"/>
-    <cd:variable value="sectie"/>
+    <cd:variable value="paragraaf"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definieerkop">
+<cd:command name="definieerkop" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definieerkop"/>
   </cd:sequence>
@@ -6028,7 +6028,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelitemgroepin">
+<cd:command name="stelitemgroepin" file="core-itm.tex">
   <cd:sequence>
     <cd:string value="stelitemgroepin"/>
   </cd:sequence>
@@ -6052,7 +6052,7 @@
       <cd:constant type="inmarge"/>
       <cd:constant type="autointro"/>
       <cd:constant type="los"/>
-      <cd:constant type="paragraaf"/>
+      <cd:variable type="cd:section"/>
       <cd:constant type="intekst"/>
     </cd:keywords>
     <cd:assignments optional="yes" list="yes">
@@ -6114,7 +6114,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="marletter">
@@ -6124,7 +6124,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="symletter">
@@ -6134,7 +6134,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="afsluiter">
@@ -6260,7 +6260,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sym">
+<cd:command name="sym" file="core-itm.tex">
   <cd:sequence>
     <cd:string value="sym"/>
   </cd:sequence>
@@ -6275,7 +6275,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definieerregister">
+<cd:command name="definieerregister" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="definieerregister"/>
   </cd:sequence>
@@ -6289,7 +6289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelregisterin">
+<cd:command name="stelregisterin" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="stelregisterin"/>
   </cd:sequence>
@@ -6319,7 +6319,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="paginaletter">
@@ -6329,7 +6329,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="tekstletter">
@@ -6339,7 +6339,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="aanduiding">
@@ -6373,11 +6373,11 @@
       </cd:parameter>
       <cd:parameter name="interactie">
         <cd:constant type="paginanummer"/>
-        <cd:constant type="tekst"/>
+        <cd:variable type="cd:text"/>
       </cd:parameter>
       <cd:parameter name="expansie">
         <cd:constant type="ja"/>
-        <cd:constant type="commando"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="nee"/>
       </cd:parameter>
       <cd:parameter name="refereren">
@@ -6409,7 +6409,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="register" generated="yes">
+<cd:command name="register" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:variable value="register"/>
   </cd:sequence>
@@ -6421,7 +6421,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="startregister" generated="yes">
+<cd:command name="startregister" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="start"/>
     <cd:variable value="register"/>
@@ -6434,7 +6434,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="schrijfnaarregister">
+<cd:command name="schrijfnaarregister" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="schrijfnaarregister"/>
   </cd:sequence>
@@ -6449,7 +6449,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gekoppelderegister" generated="yes">
+<cd:command name="coupledregister" generated="yes">
   <cd:sequence>
     <cd:string value="gekoppelde"/>
     <cd:variable value="register"/>
@@ -6462,7 +6462,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="koppelregister">
+<cd:command name="koppelregister" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="koppelregister"/>
   </cd:sequence>
@@ -6473,7 +6473,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plaatsregister">
+<cd:command name="plaatsregister" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="plaatsregister"/>
   </cd:sequence>
@@ -6487,7 +6487,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zieregister" generated="yes">
+<cd:command name="seeregister" generated="yes">
   <cd:sequence>
     <cd:string value="zie"/>
     <cd:variable value="register"/>
@@ -6501,7 +6501,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="volledigeregister" generated="yes">
+<cd:command name="volledigregister" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="volledige"/>
     <cd:variable value="register"/>
@@ -6513,7 +6513,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plaatsregister" generated="yes">
+<cd:command name="plaatsregister" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="plaats"/>
     <cd:variable value="register"/>
@@ -6525,7 +6525,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieersynoniemen">
+<cd:command name="definieersynoniemen" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="definieersynoniemen"/>
   </cd:sequence>
@@ -6545,7 +6545,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelsynoniemenin">
+<cd:command name="stelsynoniemenin" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="stelsynoniemenin"/>
   </cd:sequence>
@@ -6561,7 +6561,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="synoniemletter">
@@ -6571,7 +6571,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="plaats">
@@ -6600,7 +6600,7 @@
       </cd:parameter>
       <cd:parameter name="expansie">
         <cd:constant type="ja"/>
-        <cd:constant type="commando"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="nee"/>
       </cd:parameter>
       <cd:parameter name="commando">
@@ -6610,9 +6610,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="synoniem" generated="yes">
+<cd:command name="synonym" generated="yes">
   <cd:sequence>
-    <cd:variable value="synoniem"/>
+    <cd:variable value="synonym"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -6623,28 +6623,28 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="volledigelijstmetsynoniemen" generated="yes">
+<cd:command name="completelistofsynonyms" generated="yes">
   <cd:sequence>
-    <cd:string value="volledigelijstmet"/>
-    <cd:variable value="synoniemen"/>
+    <cd:string value="completelistof"/>
+    <cd:variable value="synonyms"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="plaatslijstmetsynoniemen" generated="yes">
+<cd:command name="placelistofsynonyms" generated="yes">
   <cd:sequence>
-    <cd:string value="plaatslijstmet"/>
-    <cd:variable value="synoniemen"/>
+    <cd:string value="placelistof"/>
+    <cd:variable value="synonyms"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="laadsynoniemen" generated="yes">
+<cd:command name="loadsynonyms" generated="yes">
   <cd:sequence>
     <cd:string value="laad"/>
-    <cd:variable value="synoniemen"/>
+    <cd:variable value="synonyms"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definieersorteren">
+<cd:command name="definieersorteren" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="definieersorteren"/>
   </cd:sequence>
@@ -6661,7 +6661,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelsorterenin">
+<cd:command name="stelsorterenin" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="stelsorterenin"/>
   </cd:sequence>
@@ -6694,21 +6694,21 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="expansie">
         <cd:constant type="ja"/>
-        <cd:constant type="commando"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="nee"/>
       </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sorteer" generated="yes">
+<cd:command name="sort" generated="yes">
   <cd:sequence>
-    <cd:variable value="sorteer"/>
+    <cd:variable value="sort"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -6718,28 +6718,28 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="volledigelijstmetsorteren" generated="yes">
+<cd:command name="completelistofsorts" generated="yes">
   <cd:sequence>
-    <cd:string value="volledigelijstmet"/>
-    <cd:variable value="sorteren"/>
+    <cd:string value="completelistof"/>
+    <cd:variable value="sorts"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="plaatslijstmetsorteren" generated="yes">
+<cd:command name="placelistofsorts" generated="yes">
   <cd:sequence>
-    <cd:string value="plaatslijstmet"/>
-    <cd:variable value="sorteren"/>
+    <cd:string value="placelistof"/>
+    <cd:variable value="sorts"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="laadsorteren" generated="yes">
+<cd:command name="loadsorts" generated="yes">
   <cd:sequence>
     <cd:string value="laad"/>
-    <cd:variable value="sorteren"/>
+    <cd:variable value="sorts"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definieeropmaak">
+<cd:command name="definieeropmaak" file="page-mak.tex">
   <cd:sequence>
     <cd:string value="definieeropmaak"/>
   </cd:sequence>
@@ -6767,7 +6767,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelopmaakin">
+<cd:command name="stelopmaakin" file="page-mak.tex">
   <cd:sequence>
     <cd:string value="stelopmaakin"/>
   </cd:sequence>
@@ -6844,7 +6844,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="naamopmaak" type="environment" generated="yes">
+<cd:command name="namemakeup" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="naam"/>
     <cd:string value="opmaak"/>
@@ -6877,7 +6877,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="datum">
+<cd:command name="datum" file="core-con.tex">
   <cd:sequence>
     <cd:string value="datum"/>
   </cd:sequence>
@@ -6898,13 +6898,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kenmerkdatum">
+<cd:command name="kenmerkdatum" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="kenmerkdatum"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="inspringen">
+<cd:command name="inspringen" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="inspringen"/>
   </cd:sequence>
@@ -6921,13 +6921,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nietinspringen">
+<cd:command name="nietinspringen" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="nietinspringen"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="blanko">
+<cd:command name="blanko" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="blanko"/>
   </cd:sequence>
@@ -6944,7 +6944,7 @@
       <cd:constant type="reset"/>
       <cd:constant type="regel"/>
       <cd:constant type="halveregel"/>
-      <cd:constant type="formule"/>
+      <cd:variable type="cd:formula"/>
       <cd:constant type="vast"/>
       <cd:constant type="flexibel"/>
       <cd:constant type="geen"/>
@@ -6952,7 +6952,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="opelkaar" type="environment">
+<cd:command name="opelkaar" type="environment" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="opelkaar"/>
   </cd:sequence>
@@ -6963,23 +6963,23 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="vanelkaar" type="environment">
+<cd:command name="unpacked" type="environment">
   <cd:sequence>
-    <cd:string value="vanelkaar"/>
+    <cd:string value="unpacked"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="regelcorrectie" type="environment">
+<cd:command name="linecorrection" type="environment">
   <cd:sequence>
-    <cd:string value="regelcorrectie"/>
+    <cd:string value="linecorrection"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="corrigeerwitruimte">
+<cd:command name="corrigeerwitruimte" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="corrigeerwitruimte"/>
   </cd:sequence>
@@ -6988,25 +6988,25 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uitstellen" type="environment">
+<cd:command name="postponing" type="environment">
   <cd:sequence>
-    <cd:string value="uitstellen"/>
+    <cd:string value="postponing"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="lokaal" type="environment">
+<cd:command name="lokale" type="environment">
   <cd:sequence>
-    <cd:string value="lokaal"/>
+    <cd:string value="lokale"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="smaller" type="environment">
+<cd:command name="narrower" type="environment">
   <cd:sequence>
-    <cd:string value="smaller"/>
+    <cd:string value="narrower"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes" list="yes">
@@ -7017,15 +7017,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verbergen" type="environment">
+<cd:command name="hiding" type="environment">
   <cd:sequence>
-    <cd:string value="verbergen"/>
+    <cd:string value="hiding"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="steluitlijnenin">
+<cd:command name="steluitlijnenin" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="steluitlijnenin"/>
   </cd:sequence>
@@ -7051,9 +7051,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uitlijnen" type="environment">
+<cd:command name="alignment" type="environment">
   <cd:sequence>
-    <cd:string value="uitlijnen"/>
+    <cd:string value="alignment"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -7074,7 +7074,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="steltolerantiein">
+<cd:command name="steltolerantiein" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="steltolerantiein"/>
   </cd:sequence>
@@ -7092,7 +7092,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="soortpagina">
+<cd:command name="soortpagina" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="soortpagina"/>
   </cd:sequence>
@@ -7103,7 +7103,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verwerkpagina">
+<cd:command name="verwerkpagina" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="verwerkpagina"/>
   </cd:sequence>
@@ -7118,7 +7118,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="koppelpagina">
+<cd:command name="koppelpagina" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="koppelpagina"/>
   </cd:sequence>
@@ -7140,7 +7140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="positioneer">
+<cd:command name="positioneer" file="page-lyr.tex">
   <cd:sequence>
     <cd:string value="positioneer"/>
   </cd:sequence>
@@ -7150,7 +7150,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelrastersin">
+<cd:command name="stelrastersin" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="stelrastersin"/>
   </cd:sequence>
@@ -7174,7 +7174,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelachtergrondenin">
+<cd:command name="stelachtergrondenin" file="page-bck.tex">
   <cd:sequence>
     <cd:string value="stelachtergrondenin"/>
   </cd:sequence>
@@ -7182,7 +7182,7 @@
     <cd:keywords optional="yes">
       <cd:constant type="boven"/>
       <cd:constant type="hoofd"/>
-      <cd:constant type="tekst"/>
+      <cd:variable type="cd:text"/>
       <cd:constant type="voet"/>
       <cd:constant type="onder"/>
       <cd:constant type="pagina"/>
@@ -7193,7 +7193,7 @@
     <cd:keywords optional="yes" list="yes">
       <cd:constant type="linkerrand"/>
       <cd:constant type="linkermarge"/>
-      <cd:constant type="tekst"/>
+      <cd:variable type="cd:text"/>
       <cd:constant type="rechtermarge"/>
       <cd:constant type="rechterrand"/>
     </cd:keywords>
@@ -7201,7 +7201,7 @@
       <cd:parameter name="status">
         <cd:constant type="start"/>
         <cd:constant type="stop"/>
-        <cd:constant type="herhaal"/>
+        <cd:variable type="cd:repeat"/>
       </cd:parameter>
       <cd:inherit name="stelomlijndin"/>
     </cd:assignments>
@@ -7230,7 +7230,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="typebuffer">
+<cd:command name="typebuffer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="typebuffer"/>
   </cd:sequence>
@@ -7241,7 +7241,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerbuffer">
+<cd:command name="definieerbuffer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="definieerbuffer"/>
   </cd:sequence>
@@ -7252,7 +7252,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelbufferin">
+<cd:command name="stelbufferin" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="stelbufferin"/>
   </cd:sequence>
@@ -7274,7 +7274,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerblok">
+<cd:command name="definieerblok" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="definieerblok"/>
   </cd:sequence>
@@ -7285,13 +7285,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="geenblokkenmeer">
+<cd:command name="geenblokkenmeer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="geenblokkenmeer"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="verbergblokken">
+<cd:command name="verbergblokken" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="verbergblokken"/>
   </cd:sequence>
@@ -7305,7 +7305,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="handhaafblokken">
+<cd:command name="handhaafblokken" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="handhaafblokken"/>
   </cd:sequence>
@@ -7320,7 +7320,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gebruikblokken">
+<cd:command name="gebruikblokken" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="gebruikblokken"/>
   </cd:sequence>
@@ -7334,7 +7334,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="verwerkblokken">
+<cd:command name="verwerkblokken" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="verwerkblokken"/>
   </cd:sequence>
@@ -7348,7 +7348,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="passeerblokken">
+<cd:command name="passeerblokken" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="passeerblokken"/>
   </cd:sequence>
@@ -7376,7 +7376,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="selecteerblokken">
+<cd:command name="selecteerblokken" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="selecteerblokken"/>
   </cd:sequence>
@@ -7396,7 +7396,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelblokin">
+<cd:command name="stelblokin" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="stelblokin"/>
   </cd:sequence>
@@ -7421,7 +7421,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="file">
@@ -7431,7 +7431,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="formule" type="environment" generated="yes">
+<cd:command name="formula" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="formule"/>
   </cd:sequence>
@@ -7439,7 +7439,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="wiskunde">
+<cd:command name="wiskunde" file="supp-mat.tex">
   <cd:sequence>
     <cd:string value="wiskunde"/>
   </cd:sequence>
@@ -7448,7 +7448,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plaatsformule">
+<cd:command name="plaatsformule" file="core-mat.tex">
   <cd:sequence>
     <cd:string value="plaatsformule"/>
   </cd:sequence>
@@ -7459,7 +7459,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plaatssubformule">
+<cd:command name="plaatssubformule" file="core-mat.tex">
   <cd:sequence>
     <cd:string value="plaatssubformule"/>
   </cd:sequence>
@@ -7470,10 +7470,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plaatsblok" generated="yes">
+<cd:command name="plaatsplaatsblok" generated="yes" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="plaats"/>
-    <cd:variable value="blok"/>
+    <cd:variable value="float"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -7496,7 +7496,7 @@
       <cd:constant type="buitenrand"/>
       <cd:constant type="binnen"/>
       <cd:constant type="buiten"/>
-      <cd:constant type="line"/>
+      <cd:constant type="regel"/>
       <cd:constant type="hoog"/>
       <cd:constant type="laag"/>
       <cd:constant type="passend"/>
@@ -7516,10 +7516,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="reserveerblok" generated="yes">
+<cd:command name="reservefloat" generated="yes">
   <cd:sequence>
     <cd:string value="reserveer"/>
-    <cd:variable value="blok"/>
+    <cd:variable value="float"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments optional="yes" list="yes">
@@ -7542,7 +7542,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerplaatsblok">
+<cd:command name="definieerplaatsblok" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="definieerplaatsblok"/>
   </cd:sequence>
@@ -7556,7 +7556,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelplaatsblokin">
+<cd:command name="stelplaatsblokin" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="stelplaatsblokin"/>
   </cd:sequence>
@@ -7602,9 +7602,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="bloktekst" type="environment" generated="yes">
+<cd:command name="floattext" type="environment" generated="yes">
   <cd:sequence>
-    <cd:variable value="blok"/>
+    <cd:variable value="float"/>
     <cd:string value="tekst"/>
   </cd:sequence>
   <cd:arguments>
@@ -7623,25 +7623,25 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plaatslijstmetblokken" generated="yes">
+<cd:command name="placelistoffloats" generated="yes">
   <cd:sequence>
-    <cd:string value="plaatslijstmet"/>
-    <cd:variable value="blokken"/>
+    <cd:string value="placelistof"/>
+    <cd:variable value="floats"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="volledigelijstmetblokken" generated="yes">
+<cd:command name="completelistoffloats" generated="yes">
   <cd:sequence>
-    <cd:string value="volledigelijstmet"/>
-    <cd:variable value="blokken"/>
+    <cd:string value="completelistof"/>
+    <cd:variable value="floats"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kenmerk">
+<cd:command name="kenmerk" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="kenmerk"/>
   </cd:sequence>
@@ -7694,7 +7694,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="chem">
+<cd:command name="chem" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="chem"/>
   </cd:sequence>
@@ -7705,7 +7705,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="breuk">
+<cd:command name="breuk" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="breuk"/>
   </cd:sequence>
@@ -7715,7 +7715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="punten">
+<cd:command name="punten" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="punten"/>
   </cd:sequence>
@@ -7747,7 +7747,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelitemsin">
+<cd:command name="stelitemsin" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="stelitemsin"/>
   </cd:sequence>
@@ -7796,7 +7796,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="citaat" type="environment">
+<cd:command name="citaat" type="environment" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="citaat"/>
   </cd:sequence>
@@ -7809,7 +7809,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="citaat">
+<cd:command name="citaat" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="citaat"/>
   </cd:sequence>
@@ -7818,7 +7818,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="citeer">
+<cd:command name="citeer" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="citeer"/>
   </cd:sequence>
@@ -7827,7 +7827,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelciterenin">
+<cd:command name="stelciterenin" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="stelciterenin"/>
   </cd:sequence>
@@ -7846,14 +7846,14 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="kleur">
         <cd:constant type="cd:name"/>
       </cd:parameter>
       <cd:parameter name="plaats">
-        <cd:constant type="tekst"/>
+        <cd:variable type="cd:text"/>
         <cd:constant type="marge"/>
       </cd:parameter>
     </cd:assignments>
@@ -7873,7 +7873,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieeralineas">
+<cd:command name="definieeralineas" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="definieeralineas"/>
   </cd:sequence>
@@ -7921,13 +7921,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="alinea" generated="yes">
+<cd:command name="paragraph" generated="yes">
   <cd:sequence>
     <cd:variable value="alinea"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="alinea" type="environment" generated="yes">
+<cd:command name="paragraph" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="alinea"/>
   </cd:sequence>
@@ -7935,7 +7935,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelalineasin">
+<cd:command name="stelalineasin" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="stelalineasin"/>
   </cd:sequence>
@@ -7955,7 +7955,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="breedte">
@@ -8000,7 +8000,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="steltabin">
+<cd:command name="steltabin" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="steltabin"/>
   </cd:sequence>
@@ -8019,7 +8019,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="plaats">
@@ -8062,7 +8062,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieertabulatie">
+<cd:command name="definieertabulatie" file="core-tbl.tex">
   <cd:sequence>
     <cd:string value="definieertabulatie"/>
   </cd:sequence>
@@ -8079,7 +8079,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tabulatie" type="environment" generated="yes">
+<cd:command name="tabulate" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="tabulatie"/>
   </cd:sequence>
@@ -8093,7 +8093,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="steltabulatiein">
+<cd:command name="steltabulatiein" file="core-tbl.tex">
   <cd:sequence>
     <cd:string value="steltabulatiein"/>
   </cd:sequence>
@@ -8162,7 +8162,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="steltabellenin">
+<cd:command name="steltabellenin" file="core-tab.tex">
   <cd:sequence>
     <cd:string value="steltabellenin"/>
   </cd:sequence>
@@ -8245,9 +8245,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tabel" type="environment">
+<cd:command name="table" type="environment">
   <cd:sequence>
-    <cd:string value="tabel"/>
+    <cd:string value="table"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8257,9 +8257,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tabellen" type="environment">
+<cd:command name="tables" type="environment">
   <cd:sequence>
-    <cd:string value="tabellen"/>
+    <cd:string value="tables"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8269,7 +8269,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieertabelvorm">
+<cd:command name="definieertabelvorm" file="core-tab.tex">
   <cd:sequence>
     <cd:string value="definieertabelvorm"/>
   </cd:sequence>
@@ -8289,7 +8289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gebruikexternefiles">
+<cd:command name="gebruikexternefiles" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="gebruikexternefiles"/>
   </cd:sequence>
@@ -8312,7 +8312,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gebruikexternefile">
+<cd:command name="gebruikexternefile" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="gebruikexternefile"/>
   </cd:sequence>
@@ -8338,7 +8338,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gebruikexternfiguur">
+<cd:command name="gebruikexternfiguur" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="gebruikexternfiguur"/>
   </cd:sequence>
@@ -8423,7 +8423,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="externfiguur">
+<cd:command name="externfiguur" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="externfiguur"/>
   </cd:sequence>
@@ -8437,7 +8437,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelexternefigurenin">
+<cd:command name="stelexternefigurenin" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="stelexternefigurenin"/>
   </cd:sequence>
@@ -8481,7 +8481,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="toonexternefiguren">
+<cd:command name="toonexternefiguren" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="toonexternefiguren"/>
   </cd:sequence>
@@ -8496,7 +8496,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gebruikexterngeluidsfragment">
+<cd:command name="gebruikexterngeluidsfragment" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="gebruikexterngeluidsfragment"/>
   </cd:sequence>
@@ -8510,18 +8510,18 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="naam">
+<cd:command name="name" file="syst-gen.tex">
   <cd:sequence>
-    <cd:string value="naam"/>
+    <cd:string value="name"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="legenda" type="environment">
+<cd:command name="legend" type="environment">
   <cd:sequence>
-    <cd:string value="legenda"/>
+    <cd:string value="legend"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -8535,20 +8535,20 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gegeven" type="environment">
+<cd:command name="geg" type="environment">
   <cd:sequence>
-    <cd:string value="gegeven"/>
+    <cd:string value="geg"/>
   </cd:sequence>
   <cd:arguments>
-    <cd:tex command="geg"/>
+    <cd:tex command="fact"/>
     <cd:nothing/>
     <cd:nothing separator="backslash"/>
     <cd:nothing separator="backslash"/>
-    <cd:tex separator="backslash" command="geg"/>
+    <cd:tex separator="backslash" command="fact"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="roteer">
+<cd:command name="roteer" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="roteer"/>
   </cd:sequence>
@@ -8560,7 +8560,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelroterenin">
+<cd:command name="stelroterenin" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="stelroterenin"/>
   </cd:sequence>
@@ -8581,7 +8581,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="spiegel">
+<cd:command name="spiegel" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="spiegel"/>
   </cd:sequence>
@@ -8590,7 +8590,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="schaal">
+<cd:command name="schaal" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="schaal"/>
   </cd:sequence>
@@ -8607,7 +8607,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelcombinatiesin">
+<cd:command name="stelcombinatiesin" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="stelcombinatiesin"/>
   </cd:sequence>
@@ -8634,11 +8634,11 @@
         <cd:constant type="passend"/>
       </cd:parameter>
       <cd:parameter name="plaats">
-        <cd:constant type="top"/>
-        <cd:constant type="middle"/>
-        <cd:constant type="bottom"/>
-        <cd:constant type="left"/>
-        <cd:constant type="right"/>
+        <cd:constant type="boven"/>
+        <cd:constant type="midden"/>
+        <cd:constant type="onder"/>
+        <cd:constant type="links"/>
+        <cd:constant type="rechts"/>
       </cd:parameter>
       <cd:parameter name="uitlijnen">
         <cd:constant type="nee"/>
@@ -8654,7 +8654,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein...cd:command"/>
+        <cd:constant type="small...cd:command"/>
       </cd:parameter>
       <cd:parameter name="kleur">
         <cd:constant type="cd:name"/>
@@ -8663,9 +8663,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="combinatie" type="environment">
+<cd:command name="combination" type="environment">
   <cd:sequence>
-    <cd:string value="combinatie"/>
+    <cd:string value="combination"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8674,7 +8674,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plaatsnaastelkaar">
+<cd:command name="plaatsnaastelkaar" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="plaatsnaastelkaar"/>
   </cd:sequence>
@@ -8684,7 +8684,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plaatsonderelkaar">
+<cd:command name="plaatsonderelkaar" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="plaatsonderelkaar"/>
   </cd:sequence>
@@ -8704,9 +8704,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="overzicht" type="environment">
+<cd:command name="overview" type="environment">
   <cd:sequence>
-    <cd:string value="overzicht"/>
+    <cd:string value="overview"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords list="yes">
@@ -8715,7 +8715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelinteractieschermin">
+<cd:command name="stelinteractieschermin" file="core-int.tex">
   <cd:sequence>
     <cd:string value="stelinteractieschermin"/>
   </cd:sequence>
@@ -8757,7 +8757,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="scherm">
+<cd:command name="scherm" file="core-int.tex">
   <cd:sequence>
     <cd:string value="scherm"/>
   </cd:sequence>
@@ -8765,7 +8765,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelpaginaovergangenin">
+<cd:command name="stelpaginaovergangenin" file="core-int.tex">
   <cd:sequence>
     <cd:string value="stelpaginaovergangenin"/>
   </cd:sequence>
@@ -8777,7 +8777,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelinteractiein">
+<cd:command name="stelinteractiein" file="core-nav.tex">
   <cd:sequence>
     <cd:string value="stelinteractiein"/>
   </cd:sequence>
@@ -8841,7 +8841,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein...cd:command"/>
+        <cd:constant type="small...cd:command"/>
       </cd:parameter>
       <cd:parameter name="kleur">
         <cd:constant type="cd:name"/>
@@ -8871,7 +8871,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerinteractiemenu">
+<cd:command name="definieerinteractiemenu" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definieerinteractiemenu"/>
   </cd:sequence>
@@ -8915,7 +8915,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein...cd:command"/>
+        <cd:constant type="small...cd:command"/>
       </cd:parameter>
       <cd:parameter name="kleur">
         <cd:constant type="cd:name"/>
@@ -8957,7 +8957,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerinteractiemenu">
+<cd:command name="definieerinteractiemenu" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definieerinteractiemenu"/>
   </cd:sequence>
@@ -8993,7 +8993,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="blokkeerinteractiemenu">
+<cd:command name="blokkeerinteractiemenu" file="core-int.tex">
   <cd:sequence>
     <cd:string value="blokkeerinteractiemenu"/>
   </cd:sequence>
@@ -9009,7 +9009,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gebruikexterndocument">
+<cd:command name="gebruikexterndocument" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="gebruikexterndocument"/>
   </cd:sequence>
@@ -9026,7 +9026,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gebruikURL">
+<cd:command name="gebruikURL" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="gebruikURL"/>
   </cd:sequence>
@@ -9046,7 +9046,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="koppeldocument">
+<cd:command name="koppeldocument" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="koppeldocument"/>
   </cd:sequence>
@@ -9063,7 +9063,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="uit">
+<cd:command name="uit" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="uit"/>
   </cd:sequence>
@@ -9083,7 +9083,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="interactiebuttons">
+<cd:command name="interactiebuttons" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="interactiebuttons"/>
   </cd:sequence>
@@ -9097,7 +9097,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelinteractiebalkin">
+<cd:command name="stelinteractiebalkin" file="core-int.tex">
   <cd:sequence>
     <cd:string value="stelinteractiebalkin"/>
   </cd:sequence>
@@ -9122,12 +9122,12 @@
       </cd:parameter>
       <cd:parameter name="breedte">
         <cd:constant type="cd:dimension"/>
-        <cd:constant type="height"/>
+        <cd:constant type="hoogte"/>
         <cd:constant type="passend"/>
       </cd:parameter>
       <cd:parameter name="hoogte">
         <cd:constant type="cd:dimension"/>
-        <cd:constant type="height"/>
+        <cd:constant type="hoogte"/>
         <cd:constant type="passend"/>
       </cd:parameter>
       <cd:parameter name="diepte">
@@ -9147,7 +9147,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="synchroniseer">
+<cd:command name="synchroniseer" file="core-int.tex">
   <cd:sequence>
     <cd:string value="synchroniseer"/>
   </cd:sequence>
@@ -9155,15 +9155,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="synchronisatie" type="environment">
+<cd:command name="synchronization" type="environment">
   <cd:sequence>
-    <cd:string value="synchronisatie"/>
+    <cd:string value="synchronization"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelsynchronisatiebalkin">
+<cd:command name="stelsynchronisatiebalkin" file="core-int.tex">
   <cd:sequence>
     <cd:string value="stelsynchronisatiebalkin"/>
   </cd:sequence>
@@ -9175,7 +9175,7 @@
       </cd:parameter>
       <cd:parameter name="breedte">
         <cd:constant type="cd:dimension"/>
-        <cd:constant type="height"/>
+        <cd:constant type="hoogte"/>
         <cd:constant type="passend"/>
       </cd:parameter>
       <cd:parameter name="hoogte">
@@ -9188,7 +9188,7 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="kleur">
@@ -9199,7 +9199,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="synchronisatiebalk">
+<cd:command name="synchronisatiebalk" file="core-int.tex">
   <cd:sequence>
     <cd:string value="synchronisatiebalk"/>
   </cd:sequence>
@@ -9217,7 +9217,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelsynchronisatiein">
+<cd:command name="stelsynchronisatiein" file="core-int.tex">
   <cd:sequence>
     <cd:string value="stelsynchronisatiein"/>
   </cd:sequence>
@@ -9231,7 +9231,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerprofiel">
+<cd:command name="definieerprofiel" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definieerprofiel"/>
   </cd:sequence>
@@ -9245,7 +9245,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelprofielenin">
+<cd:command name="stelprofielenin" file="core-int.tex">
   <cd:sequence>
     <cd:string value="stelprofielenin"/>
   </cd:sequence>
@@ -9258,9 +9258,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="profiel" type="environment">
+<cd:command name="profile" type="environment">
   <cd:sequence>
-    <cd:string value="profiel"/>
+    <cd:string value="profile"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords interactive="exclusive" list="yes">
@@ -9269,7 +9269,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="volgprofiel">
+<cd:command name="volgprofiel" file="core-int.tex">
   <cd:sequence>
     <cd:string value="volgprofiel"/>
   </cd:sequence>
@@ -9281,7 +9281,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plaatsbookmarks">
+<cd:command name="plaatsbookmarks" file="core-int.tex">
   <cd:sequence>
     <cd:string value="plaatsbookmarks"/>
   </cd:sequence>
@@ -9317,7 +9317,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelversiesin">
+<cd:command name="stelversiesin" file="core-int.tex">
   <cd:sequence>
     <cd:string value="stelversiesin"/>
   </cd:sequence>
@@ -9333,14 +9333,14 @@
         <cd:constant type="vetschuin"/>
         <cd:constant type="type"/>
         <cd:constant type="kap"/>
-        <cd:constant type="klein..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="markeerversie">
+<cd:command name="markeerversie" file="core-int.tex">
   <cd:sequence>
     <cd:string value="markeerversie"/>
   </cd:sequence>
@@ -9348,13 +9348,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="selecteerversie">
+<cd:command name="selecteerversie" file="core-int.tex">
   <cd:sequence>
     <cd:string value="selecteerversie"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definieerversie">
+<cd:command name="definieerversie" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definieerversie"/>
   </cd:sequence>
@@ -9368,7 +9368,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="volgversie">
+<cd:command name="volgversie" file="core-int.tex">
   <cd:sequence>
     <cd:string value="volgversie"/>
   </cd:sequence>
@@ -9380,7 +9380,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="volgprofielversie">
+<cd:command name="volgprofielversie" file="core-int.tex">
   <cd:sequence>
     <cd:string value="volgprofielversie"/>
   </cd:sequence>
@@ -9395,7 +9395,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerprogramma">
+<cd:command name="definieerprogramma" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definieerprogramma"/>
   </cd:sequence>
@@ -9412,7 +9412,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelprogrammasin">
+<cd:command name="stelprogrammasin" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="stelprogrammasin"/>
   </cd:sequence>
@@ -9425,7 +9425,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="programma">
+<cd:command name="programma" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="programma"/>
   </cd:sequence>
@@ -9436,9 +9436,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="figuur" type="environment">
+<cd:command name="figure" type="environment">
   <cd:sequence>
-    <cd:string value="figuur"/>
+    <cd:string value="figure"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords interactive="exclusive">
@@ -9459,47 +9459,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="refereer*figuur">
-  <cd:sequence>
-    <cd:string value="refereer*figuur"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:position list="yes"/>
-    <cd:position list="yes"/>
-    <cd:keywords>
-      <cd:constant type="cd:number"/>
-    </cd:keywords>
-  </cd:arguments>
-</cd:command>
+<!-- referring*figure skipped -->
 
-<cd:command name="markeer*figuur">
-  <cd:sequence>
-    <cd:string value="markeer*figuur"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:position list="yes"/>
-    <cd:position list="yes"/>
-    <cd:keywords>
-      <cd:constant type="cd:number"/>
-    </cd:keywords>
-  </cd:arguments>
-</cd:command>
+<!-- marking*figure skipped -->
 
-<cd:command name="toelichting">
-  <cd:sequence>
-    <cd:string value="toelichting"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:position/>
-    <cd:position/>
-    <cd:assignments list="yes">
-      <cd:constant type="cd:number"/>
-    </cd:assignments>
-    <cd:content/>
-  </cd:arguments>
-</cd:command>
+<!-- remark skipped -->
 
-<cd:command name="naar">
+<cd:command name="naar" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="naar"/>
   </cd:sequence>
@@ -9510,7 +9476,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="naarbox">
+<cd:command name="naarbox" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="naarbox"/>
   </cd:sequence>
@@ -9533,7 +9499,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelbuttonsin">
+<cd:command name="stelbuttonsin" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="stelbuttonsin"/>
   </cd:sequence>
@@ -9550,7 +9516,7 @@
 
 <!-- menubutton skipped -->
 
-<cd:command name="stelcommentaarin">
+<cd:command name="stelcommentaarin" file="core-int.tex">
   <cd:sequence>
     <cd:string value="stelcommentaarin"/>
   </cd:sequence>
@@ -9629,7 +9595,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerveld">
+<cd:command name="definieerveld" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definieerveld"/>
   </cd:sequence>
@@ -9652,7 +9618,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieersubveld">
+<cd:command name="definieersubveld" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definieersubveld"/>
   </cd:sequence>
@@ -9669,7 +9635,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="copieerveld">
+<cd:command name="copieerveld" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="copieerveld"/>
   </cd:sequence>
@@ -9683,7 +9649,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kloonveld">
+<cd:command name="kloonveld" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="kloonveld"/>
   </cd:sequence>
@@ -9703,7 +9669,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="veld">
+<cd:command name="veld" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="veld"/>
   </cd:sequence>
@@ -9714,7 +9680,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="passendveld">
+<cd:command name="passendveld" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="passendveld"/>
   </cd:sequence>
@@ -9725,7 +9691,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="invulveld">
+<cd:command name="invulveld" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="invulveld"/>
   </cd:sequence>
@@ -9737,7 +9703,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="suggestie">
+<cd:command name="suggestie" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="suggestie"/>
   </cd:sequence>
@@ -9752,7 +9718,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="toonvelden">
+<cd:command name="toonvelden" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="toonvelden"/>
   </cd:sequence>
@@ -9763,13 +9729,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="registreervelden">
+<cd:command name="registreervelden" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="registreervelden"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="stelveldin">
+<cd:command name="stelveldin" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="stelveldin"/>
   </cd:sequence>
@@ -9793,7 +9759,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelveldenin">
+<cd:command name="stelveldenin" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="stelveldenin"/>
   </cd:sequence>
@@ -9890,7 +9856,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelformulierenin">
+<cd:command name="stelformulierenin" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="stelformulierenin"/>
   </cd:sequence>
@@ -9904,7 +9870,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definieerveldstapel">
+<cd:command name="definieerveldstapel" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definieerveldstapel"/>
   </cd:sequence>
@@ -9921,7 +9887,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="veldstapel">
+<cd:command name="veldstapel" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="veldstapel"/>
   </cd:sequence>
@@ -9938,7 +9904,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="clip">
+<cd:command name="clip" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="clip"/>
   </cd:sequence>
@@ -9950,7 +9916,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelclipin">
+<cd:command name="stelclipin" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="stelclipin"/>
   </cd:sequence>
@@ -10239,7 +10205,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stelstrutin">
+<cd:command name="stelstrutin" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="stelstrutin"/>
   </cd:sequence>
diff --git a/context/data/cont-ro.xml b/tex/context/interface/cont-ro.xml
index e1bd8a115..416b6b962 100644
--- a/context/data/cont-ro.xml
+++ b/tex/context/interface/cont-ro.xml
@@ -2,7 +2,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context">
 
-<cd:command name="instalarelimba">
+<cd:command name="instalarelimba" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="instalarelimba"/>
   </cd:sequence>
@@ -56,7 +56,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setarelimba">
+<cd:command name="setarelimba" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="setarelimba"/>
   </cd:sequence>
@@ -95,7 +95,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="limbaprincipala">
+<cd:command name="limbaprincipala" file="lang-ini.tex">
   <cd:sequence>
     <cd:string value="limbaprincipala"/>
   </cd:sequence>
@@ -113,7 +113,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="traduce">
+<cd:command name="traduce" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="traduce"/>
   </cd:sequence>
@@ -126,7 +126,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="folosestecodificarea">
+<cd:command name="folosestecodificarea" file="enco-ini.tex">
   <cd:sequence>
     <cd:string value="folosestecodificarea"/>
   </cd:sequence>
@@ -137,7 +137,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="folosestespeciale">
+<cd:command name="folosestespeciale" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="folosestespeciale"/>
   </cd:sequence>
@@ -149,7 +149,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesteoutput">
+<cd:command name="definesteoutput" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="definesteoutput"/>
   </cd:sequence>
@@ -163,7 +163,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setareoutput">
+<cd:command name="setareoutput" file="spec-ini.tex">
   <cd:sequence>
     <cd:string value="setareoutput"/>
   </cd:sequence>
@@ -174,7 +174,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestemediulfonttext">
+<cd:command name="definestemediulfonttext" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definestemediulfonttext"/>
   </cd:sequence>
@@ -183,7 +183,7 @@
       <cd:constant type="5pt"/>
       <cd:constant type="..."/>
       <cd:constant type="12pt"/>
-      <cd:constant type="default"/>
+      <cd:constant type="implicit"/>
     </cd:keywords>
     <cd:assignments list="yes">
       <cd:parameter name="text">
@@ -211,7 +211,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazamediulfonttext">
+<cd:command name="seteazamediulfonttext" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="seteazamediulfonttext"/>
   </cd:sequence>
@@ -236,7 +236,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestefonttext">
+<cd:command name="definestefonttext" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definestefonttext"/>
   </cd:sequence>
@@ -245,7 +245,7 @@
       <cd:constant type="5pt"/>
       <cd:constant type="..."/>
       <cd:constant type="12pt"/>
-      <cd:constant type="default"/>
+      <cd:constant type="implicit"/>
     </cd:keywords>
     <cd:keywords>
       <cd:constant type="rm"/>
@@ -335,7 +335,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="trecilafonttext">
+<cd:command name="trecilafonttext" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="trecilafonttext"/>
   </cd:sequence>
@@ -351,7 +351,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestefont">
+<cd:command name="definestefont" file="font-ini.tex">
   <cd:sequence>
     <cd:string value="definestefont"/>
   </cd:sequence>
@@ -365,7 +365,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazastrut">
+<cd:command name="seteazastrut" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="seteazastrut"/>
   </cd:sequence>
@@ -379,7 +379,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaculoare">
+<cd:command name="seteazaculoare" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="seteazaculoare"/>
   </cd:sequence>
@@ -390,7 +390,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaculori">
+<cd:command name="seteazaculori" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="seteazaculori"/>
   </cd:sequence>
@@ -448,7 +448,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesteculoare">
+<cd:command name="definesteculoare" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definesteculoare"/>
   </cd:sequence>
@@ -485,7 +485,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="culoare" type="environment">
+<cd:command name="culoare" type="environment" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="culoare"/>
   </cd:sequence>
@@ -496,7 +496,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="culoare">
+<cd:command name="culoare" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="culoare"/>
   </cd:sequence>
@@ -508,7 +508,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="culoaregri">
+<cd:command name="culoaregri" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="culoaregri"/>
   </cd:sequence>
@@ -530,7 +530,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestepaleta">
+<cd:command name="definestepaleta" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definestepaleta"/>
   </cd:sequence>
@@ -546,7 +546,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazapaleta">
+<cd:command name="seteazapaleta" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="seteazapaleta"/>
   </cd:sequence>
@@ -557,7 +557,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestegrupculori">
+<cd:command name="definestegrupculori" file="colo-ini.tex">
   <cd:sequence>
     <cd:string value="definestegrupculori"/>
   </cd:sequence>
@@ -605,7 +605,7 @@
       <cd:constant type="vertical"/>
       <cd:constant type="nume"/>
       <cd:constant type="valoare"/>
-      <cd:constant type="numar"/>
+      <cd:variable type="cd:number"/>
     </cd:keywords>
   </cd:arguments>
 </cd:command>
@@ -632,13 +632,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="afiseazamakeup">
+<cd:command name="afiseazamakeup" file="supp-vis.tex">
   <cd:sequence>
     <cd:string value="afiseazamakeup"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definetype">
+<cd:command name="definetype" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="definetype"/>
   </cd:sequence>
@@ -652,7 +652,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazatype">
+<cd:command name="seteazatype" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="seteazatype"/>
   </cd:sequence>
@@ -674,7 +674,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="culoare">
@@ -684,7 +684,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="type">
+<cd:command name="type" file="verb-ini.tex">
   <cd:sequence>
     <cd:string value="type"/>
   </cd:sequence>
@@ -693,7 +693,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="typ">
+<cd:command name="typ" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="typ"/>
   </cd:sequence>
@@ -702,7 +702,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tex">
+<cd:command name="tex" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="tex"/>
   </cd:sequence>
@@ -711,7 +711,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="arg">
+<cd:command name="arg" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="arg"/>
   </cd:sequence>
@@ -720,7 +720,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestetyping">
+<cd:command name="definestetyping" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="definestetyping"/>
   </cd:sequence>
@@ -736,7 +736,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazatyping">
+<cd:command name="seteazatyping" file="core-ver.tex">
   <cd:sequence>
     <cd:string value="seteazatyping"/>
   </cd:sequence>
@@ -816,7 +816,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="culoare">
@@ -842,7 +842,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="typefile">
+<cd:command name="typefile" file="verb-ini.tex">
   <cd:sequence>
     <cd:string value="typefile"/>
   </cd:sequence>
@@ -854,7 +854,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazanotasubsol">
+<cd:command name="seteazanotasubsol" file="core-not.tex">
   <cd:sequence>
     <cd:string value="seteazanotasubsol"/>
   </cd:sequence>
@@ -868,8 +868,8 @@
         <cd:constant type="Numereromane"/>
       </cd:parameter>
       <cd:parameter name="mod">
-        <cd:constant type="detext"/>
-        <cd:constant type="decd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="locatie">
         <cd:constant type="pagina"/>
@@ -910,7 +910,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="distanta">
@@ -944,7 +944,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="culoaretext">
@@ -962,7 +962,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazadefinireanotasubsol">
+<cd:command name="seteazadefinireanotasubsol" file="core-not.tex">
   <cd:sequence>
     <cd:string value="seteazadefinireanotasubsol"/>
   </cd:sequence>
@@ -973,7 +973,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="notasubsol">
+<cd:command name="notasubsol" file="core-not.tex">
   <cd:sequence>
     <cd:string value="notasubsol"/>
   </cd:sequence>
@@ -983,7 +983,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="footnotetext">
+<cd:command name="footnotetext" file="core-not.tex">
   <cd:sequence>
     <cd:string value="footnotetext"/>
   </cd:sequence>
@@ -993,7 +993,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nota">
+<cd:command name="nota" file="core-not.tex">
   <cd:sequence>
     <cd:string value="nota"/>
   </cd:sequence>
@@ -1002,15 +1002,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="notesubsollocale" type="environment">
+<cd:command name="localfootnotes" type="environment">
   <cd:sequence>
-    <cd:string value="notesubsollocale"/>
+    <cd:string value="localfootnotes"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="punenotesubsollocale">
+<cd:command name="punenotesubsollocale" file="core-not.tex">
   <cd:sequence>
     <cd:string value="punenotesubsollocale"/>
   </cd:sequence>
@@ -1021,7 +1021,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="punenotesubsol">
+<cd:command name="punenotesubsol" file="core-not.tex">
   <cd:sequence>
     <cd:string value="punenotesubsol"/>
   </cd:sequence>
@@ -1032,7 +1032,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazasublinie">
+<cd:command name="seteazasublinie" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="seteazasublinie"/>
   </cd:sequence>
@@ -1059,7 +1059,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sublinie">
+<cd:command name="sublinie" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="sublinie"/>
   </cd:sequence>
@@ -1068,7 +1068,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sublinii">
+<cd:command name="sublinii" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="sublinii"/>
   </cd:sequence>
@@ -1077,7 +1077,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="barasus">
+<cd:command name="barasus" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="barasus"/>
   </cd:sequence>
@@ -1086,7 +1086,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="supralinie">
+<cd:command name="supralinie" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="supralinie"/>
   </cd:sequence>
@@ -1095,7 +1095,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="liniepeste">
+<cd:command name="liniepeste" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="liniepeste"/>
   </cd:sequence>
@@ -1104,7 +1104,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="liniipeste">
+<cd:command name="liniipeste" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="liniipeste"/>
   </cd:sequence>
@@ -1113,7 +1113,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="numereromane">
+<cd:command name="numereromane" file="core-con.tex">
   <cd:sequence>
     <cd:string value="numereromane"/>
   </cd:sequence>
@@ -1122,7 +1122,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Numereromane">
+<cd:command name="Numereromane" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Numereromane"/>
   </cd:sequence>
@@ -1131,7 +1131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="numere">
+<cd:command name="numere" file="core-con.tex">
   <cd:sequence>
     <cd:string value="numere"/>
   </cd:sequence>
@@ -1140,7 +1140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="litera">
+<cd:command name="litera" file="core-con.tex">
   <cd:sequence>
     <cd:string value="litera"/>
   </cd:sequence>
@@ -1149,7 +1149,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Litera">
+<cd:command name="Litera" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Litera"/>
   </cd:sequence>
@@ -1158,7 +1158,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="litere">
+<cd:command name="litere" file="core-con.tex">
   <cd:sequence>
     <cd:string value="litere"/>
   </cd:sequence>
@@ -1167,7 +1167,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Litere">
+<cd:command name="Litere" file="core-con.tex">
   <cd:sequence>
     <cd:string value="Litere"/>
   </cd:sequence>
@@ -1176,16 +1176,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="medieval">
+<cd:command name="mediaeval" file="core-con.tex">
   <cd:sequence>
-    <cd:string value="medieval"/>
+    <cd:string value="mediaeval"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="luna">
+<cd:command name="luna" file="core-con.tex">
   <cd:sequence>
     <cd:string value="luna"/>
   </cd:sequence>
@@ -1194,7 +1194,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="LUNA">
+<cd:command name="LUNA" file="core-con.tex">
   <cd:sequence>
     <cd:string value="LUNA"/>
   </cd:sequence>
@@ -1203,7 +1203,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="zidinsaptamana">
+<cd:command name="zidinsaptamana" file="core-con.tex">
   <cd:sequence>
     <cd:string value="zidinsaptamana"/>
   </cd:sequence>
@@ -1212,7 +1212,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ZIDINSAPTAMANA">
+<cd:command name="ZIDINSAPTAMANA" file="core-con.tex">
   <cd:sequence>
     <cd:string value="ZIDINSAPTAMANA"/>
   </cd:sequence>
@@ -1221,7 +1221,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazamajuscule">
+<cd:command name="seteazamajuscule" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="seteazamajuscule"/>
   </cd:sequence>
@@ -1239,52 +1239,52 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="kap">
+<cd:command name="cap" file="core-fnt.tex">
   <cd:sequence>
-    <cd:string value="kap"/>
+    <cd:string value="cap"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nokap">
+<cd:command name="nocap">
   <cd:sequence>
-    <cd:string value="nokap"/>
+    <cd:string value="nocap"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="KAP">
+<cd:command name="CAP">
   <cd:sequence>
-    <cd:string value="KAP"/>
+    <cd:string value="CAP"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Kap">
+<cd:command name="Cap">
   <cd:sequence>
-    <cd:string value="Kap"/>
+    <cd:string value="Cap"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Kaps">
+<cd:command name="Caps">
   <cd:sequence>
-    <cd:string value="Kaps"/>
+    <cd:string value="Caps"/>
   </cd:sequence>
   <cd:arguments>
     <cd:word list="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="CUVANT">
+<cd:command name="CUVANT" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="CUVANT"/>
   </cd:sequence>
@@ -1293,7 +1293,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="CUVINTE">
+<cd:command name="CUVINTE" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="CUVINTE"/>
   </cd:sequence>
@@ -1302,7 +1302,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Cuvant">
+<cd:command name="Cuvant" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="Cuvant"/>
   </cd:sequence>
@@ -1311,7 +1311,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="Cuvinte">
+<cd:command name="Cuvinte" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="Cuvinte"/>
   </cd:sequence>
@@ -1320,7 +1320,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="intins">
+<cd:command name="intins" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="intins"/>
   </cd:sequence>
@@ -1329,7 +1329,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestesimbol">
+<cd:command name="definestesimbol" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="definestesimbol"/>
   </cd:sequence>
@@ -1343,7 +1343,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestesimbolfigura">
+<cd:command name="definestesimbolfigura" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="definestesimbolfigura"/>
   </cd:sequence>
@@ -1360,7 +1360,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="simbol">
+<cd:command name="simbol" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="simbol"/>
   </cd:sequence>
@@ -1374,9 +1374,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setsimboluri" type="environment">
+<cd:command name="symbolset" type="environment">
   <cd:sequence>
-    <cd:string value="setsimboluri"/>
+    <cd:string value="symbolset"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -1385,7 +1385,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazasimbol">
+<cd:command name="seteazasimbol" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="seteazasimbol"/>
   </cd:sequence>
@@ -1396,7 +1396,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="folosestesimboluri">
+<cd:command name="folosestesimboluri" file="symb-ini.tex">
   <cd:sequence>
     <cd:string value="folosestesimboluri"/>
   </cd:sequence>
@@ -1418,7 +1418,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesteconversie">
+<cd:command name="definesteconversie" file="core-con.tex">
   <cd:sequence>
     <cd:string value="definesteconversie"/>
   </cd:sequence>
@@ -1433,7 +1433,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="convertestenumar">
+<cd:command name="convertestenumar" file="core-con.tex">
   <cd:sequence>
     <cd:string value="convertestenumar"/>
   </cd:sequence>
@@ -1443,7 +1443,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazatexttitlu">
+<cd:command name="seteazatexttitlu" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="seteazatexttitlu"/>
   </cd:sequence>
@@ -1466,7 +1466,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazatexteticheta">
+<cd:command name="seteazatexteticheta" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="seteazatexteticheta"/>
   </cd:sequence>
@@ -1489,7 +1489,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="texttitlu">
+<cd:command name="texttitlu" file="lang-lab.tex">
   <cd:sequence>
     <cd:string value="texttitlu"/>
   </cd:sequence>
@@ -1507,7 +1507,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaliniimargine">
+<cd:command name="seteazaliniimargine" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="seteazaliniimargine"/>
   </cd:sequence>
@@ -1546,7 +1546,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazagrosimelinie">
+<cd:command name="seteazagrosimelinie" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="seteazagrosimelinie"/>
   </cd:sequence>
@@ -1557,7 +1557,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazainconjurat">
+<cd:command name="seteazainconjurat" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="seteazainconjurat"/>
   </cd:sequence>
@@ -1701,7 +1701,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="framed">
+<cd:command name="framed" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="framed"/>
   </cd:sequence>
@@ -1713,7 +1713,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inframed">
+<cd:command name="inframed" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="inframed"/>
   </cd:sequence>
@@ -1725,7 +1725,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="liniisubtiri">
+<cd:command name="liniisubtiri" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="liniisubtiri"/>
   </cd:sequence>
@@ -1736,7 +1736,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaliniesubtire">
+<cd:command name="seteazaliniesubtire" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="seteazaliniesubtire"/>
   </cd:sequence>
@@ -1795,19 +1795,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="firdepar">
+<cd:command name="firdepar" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="firdepar"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="liniesubtire">
+<cd:command name="liniesubtire" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="liniesubtire"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definestetextinconjurat">
+<cd:command name="definestetextinconjurat" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="definestetextinconjurat"/>
   </cd:sequence>
@@ -1821,7 +1821,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesteinconjurare">
+<cd:command name="definesteinconjurare" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="definesteinconjurare"/>
   </cd:sequence>
@@ -1835,7 +1835,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestetexteinconjurate">
+<cd:command name="definestetexteinconjurate" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="definestetexteinconjurate"/>
   </cd:sequence>
@@ -1854,7 +1854,7 @@
         <cd:constant type="inclinat"/>
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stanga">
@@ -1896,7 +1896,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="textinconjurat" type="environment" generated="yes">
+<cd:command name="framedtext" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="textinconjurat"/>
   </cd:sequence>
@@ -1913,7 +1913,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="textinconjurat" generated="yes">
+<cd:command name="framedtext" generated="yes">
   <cd:sequence>
     <cd:variable value="textinconjurat"/>
   </cd:sequence>
@@ -1938,7 +1938,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="seteazafundal">
+<cd:command name="seteazafundal" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="seteazafundal"/>
   </cd:sequence>
@@ -1997,7 +1997,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazarigleumplere">
+<cd:command name="seteazarigleumplere" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="seteazarigleumplere"/>
   </cd:sequence>
@@ -2024,7 +2024,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="n">
@@ -2054,7 +2054,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaliniiumplere">
+<cd:command name="seteazaliniiumplere" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="seteazaliniiumplere"/>
   </cd:sequence>
@@ -2079,7 +2079,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazarigletext">
+<cd:command name="seteazarigletext" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="seteazarigletext"/>
   </cd:sequence>
@@ -2121,7 +2121,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="culoarerigla">
@@ -2131,7 +2131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="riglatext">
+<cd:command name="riglatext" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="riglatext"/>
   </cd:sequence>
@@ -2144,7 +2144,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="riglatext" type="environment">
+<cd:command name="riglatext" type="environment" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="riglatext"/>
   </cd:sequence>
@@ -2157,7 +2157,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="linieneagra">
+<cd:command name="linieneagra" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="linieneagra"/>
   </cd:sequence>
@@ -2168,7 +2168,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="liniinegre">
+<cd:command name="liniinegre" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="liniinegre"/>
   </cd:sequence>
@@ -2179,7 +2179,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaliniinegre">
+<cd:command name="seteazaliniinegre" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="seteazaliniinegre"/>
   </cd:sequence>
@@ -2211,7 +2211,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesteoverlay">
+<cd:command name="definesteoverlay" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="definesteoverlay"/>
   </cd:sequence>
@@ -2236,7 +2236,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="reset">
+<cd:command name="reset" file="core-num.tex">
   <cd:sequence>
     <cd:string value="reset"/>
   </cd:sequence>
@@ -2253,15 +2253,15 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="mediulocal" type="environment">
+<cd:command name="localenvironment" type="environment">
   <cd:sequence>
-    <cd:string value="mediulocal"/>
+    <cd:string value="localenvironment"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazasistem">
+<cd:command name="seteazasistem" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="seteazasistem"/>
   </cd:sequence>
@@ -2287,9 +2287,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="folosestedirector">
+<cd:command name="usedirectory">
   <cd:sequence>
-    <cd:string value="folosestedirector"/>
+    <cd:string value="usedirectory"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords list="yes">
@@ -2299,7 +2299,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="jos">
+<cd:command name="jos" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="jos"/>
   </cd:sequence>
@@ -2308,7 +2308,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inalt">
+<cd:command name="inalt" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="inalt"/>
   </cd:sequence>
@@ -2317,7 +2317,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="jossus">
+<cd:command name="jossus" file="core-fnt.tex">
   <cd:sequence>
     <cd:string value="jossus"/>
   </cd:sequence>
@@ -2343,7 +2343,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="aliniatstanga">
+<cd:command name="aliniatstanga" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="aliniatstanga"/>
   </cd:sequence>
@@ -2352,7 +2352,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="aliniatdreapta">
+<cd:command name="aliniatdreapta" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="aliniatdreapta"/>
   </cd:sequence>
@@ -2361,7 +2361,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="aliniatcentru">
+<cd:command name="aliniatcentru" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="aliniatcentru"/>
   </cd:sequence>
@@ -2370,7 +2370,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="cuvantdreapta">
+<cd:command name="cuvantdreapta" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="cuvantdreapta"/>
   </cd:sequence>
@@ -2379,7 +2379,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="marginal">
+<cd:command name="marginal" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="marginal"/>
   </cd:sequence>
@@ -2394,7 +2394,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inaltamargine">
+<cd:command name="inaltamargine" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="inaltamargine"/>
   </cd:sequence>
@@ -2475,7 +2475,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="afiseazastruts">
+<cd:command name="afiseazastruts" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="afiseazastruts"/>
   </cd:sequence>
@@ -2493,7 +2493,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="textmarginal">
+<cd:command name="textmarginal" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="textmarginal"/>
   </cd:sequence>
@@ -2508,7 +2508,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazablocurimarginale">
+<cd:command name="seteazablocurimarginale" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="seteazablocurimarginale"/>
   </cd:sequence>
@@ -2527,7 +2527,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="latime">
@@ -2564,17 +2564,17 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="blocmarginal" type="environment">
+<cd:command name="marginblock" type="environment">
   <cd:sequence>
-    <cd:string value="blocmarginal"/>
+    <cd:string value="marginblock"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="parte">
+<cd:command name="part" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="parte"/>
+    <cd:string value="part"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2582,9 +2582,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="titlu">
+<cd:command name="title" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="titlu"/>
+    <cd:string value="title"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2592,9 +2592,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="capitol">
+<cd:command name="chapter" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="capitol"/>
+    <cd:string value="chapter"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2602,9 +2602,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sectiune">
+<cd:command name="section" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="sectiune"/>
+    <cd:string value="section"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2612,9 +2612,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="subsectiune">
+<cd:command name="subsection" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="subsectiune"/>
+    <cd:string value="subsection"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2622,9 +2622,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="subsubsectiune">
+<cd:command name="subsubsection" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="subsubsectiune"/>
+    <cd:string value="subsubsection"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2632,9 +2632,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="subiect">
+<cd:command name="subject" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="subiect"/>
+    <cd:string value="subject"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2642,9 +2642,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="subsubiect">
+<cd:command name="subsubject" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="subsubiect"/>
+    <cd:string value="subsubject"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2652,9 +2652,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="subsubsubiect">
+<cd:command name="subsubsubject" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="subsubsubiect"/>
+    <cd:string value="subsubsubject"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2662,9 +2662,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="apendix">
+<cd:command name="appendix" file="core-sec.tex">
   <cd:sequence>
-    <cd:string value="apendix"/>
+    <cd:string value="appendix"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes" list="yes"/>
@@ -2672,7 +2672,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="in">
+<cd:command name="in" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="in"/>
   </cd:sequence>
@@ -2704,7 +2704,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="undeva">
+<cd:command name="undeva" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="undeva"/>
   </cd:sequence>
@@ -2715,7 +2715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="lapagina">
+<cd:command name="lapagina" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="lapagina"/>
   </cd:sequence>
@@ -2724,7 +2724,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ref">
+<cd:command name="ref" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="ref"/>
   </cd:sequence>
@@ -2740,7 +2740,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="referintatext">
+<cd:command name="referintatext" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="referintatext"/>
   </cd:sequence>
@@ -2750,7 +2750,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="referintapagina">
+<cd:command name="referintapagina" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="referintapagina"/>
   </cd:sequence>
@@ -2759,7 +2759,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="referinta">
+<cd:command name="referinta" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="referinta"/>
   </cd:sequence>
@@ -2769,7 +2769,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="folosestereferinte">
+<cd:command name="folosestereferinte" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="folosestereferinte"/>
   </cd:sequence>
@@ -2780,7 +2780,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestereferinte">
+<cd:command name="definestereferinte" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definestereferinte"/>
   </cd:sequence>
@@ -2792,7 +2792,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesteformatreferinte">
+<cd:command name="definesteformatreferinte" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definesteformatreferinte"/>
   </cd:sequence>
@@ -2839,7 +2839,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="injos">
+<cd:command name="injos" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="injos"/>
   </cd:sequence>
@@ -2850,37 +2850,37 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="spatiualb">
+<cd:command name="spatiualb" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="spatiualb"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="faraspatiualb">
+<cd:command name="faraspatiualb" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="faraspatiualb"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="crlf">
+<cd:command name="crlf" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="crlf"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="spatiu">
+<cd:command name="spatiu" file="syst-pln.tex">
   <cd:sequence>
     <cd:string value="spatiu"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="spatiifixate">
+<cd:command name="spatiifixate" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="spatiifixate"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="emptylines">
+<cd:command name="emptylines" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="emptylines"/>
   </cd:sequence>
@@ -2891,19 +2891,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="faraspatiu">
+<cd:command name="faraspatiu" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="faraspatiu"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="impachetat">
+<cd:command name="impachetat" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="impachetat"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="seteazadescriere">
+<cd:command name="seteazadescriere" file="core-des.tex">
   <cd:sequence>
     <cd:string value="seteazadescriere"/>
   </cd:sequence>
@@ -2919,7 +2919,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stil">
@@ -2929,7 +2929,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="culoare">
@@ -3004,7 +3004,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaenumerare">
+<cd:command name="seteazaenumerare" file="core-des.tex">
   <cd:sequence>
     <cd:string value="seteazaenumerare"/>
   </cd:sequence>
@@ -3018,7 +3018,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesteenumerare">
+<cd:command name="definesteenumerare" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definesteenumerare"/>
   </cd:sequence>
@@ -3035,24 +3035,24 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="enumerare" generated="yes">
+<cd:command name="enumeration" generated="yes">
   <cd:sequence>
-    <cd:variable value="enumerare"/>
+    <cd:variable value="enumeration"/>
   </cd:sequence>
   <cd:arguments>
     <cd:nothing interactive="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="enumerare" type="environment" generated="yes">
+<cd:command name="enumeration" type="environment" generated="yes">
   <cd:sequence>
-    <cd:variable value="enumerare"/>
+    <cd:variable value="enumeration"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestedescriere">
+<cd:command name="definestedescriere" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definestedescriere"/>
   </cd:sequence>
@@ -3066,9 +3066,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="descriere" generated="yes">
+<cd:command name="description" generated="yes">
   <cd:sequence>
-    <cd:variable value="descriere"/>
+    <cd:variable value="description"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
@@ -3076,16 +3076,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="descriere" type="environment" generated="yes">
+<cd:command name="description" type="environment" generated="yes">
   <cd:sequence>
-    <cd:variable value="descriere"/>
+    <cd:variable value="description"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaaliniate">
+<cd:command name="seteazaaliniate" file="core-des.tex">
   <cd:sequence>
     <cd:string value="seteazaaliniate"/>
   </cd:sequence>
@@ -3101,7 +3101,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stiltitlu">
@@ -3111,7 +3111,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="latime">
@@ -3140,7 +3140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestealiat">
+<cd:command name="definestealiat" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definestealiat"/>
   </cd:sequence>
@@ -3154,16 +3154,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="indentare" generated="yes">
+<cd:command name="indentation" generated="yes" file="core-spa.tex">
   <cd:sequence>
-    <cd:variable value="indentare"/>
+    <cd:variable value="indentation"/>
   </cd:sequence>
   <cd:arguments>
     <cd:nothing/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesteeticheta">
+<cd:command name="definesteeticheta" file="core-des.tex">
   <cd:sequence>
     <cd:string value="definesteeticheta"/>
   </cd:sequence>
@@ -3180,8 +3180,8 @@
         <cd:constant type="intext"/>
       </cd:parameter>
       <cd:parameter name="mod">
-        <cd:constant type="detext"/>
-        <cd:constant type="decd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="blockway">
         <cd:constant type="da"/>
@@ -3194,7 +3194,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="culoaretitlu">
@@ -3210,16 +3210,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="etichetare" generated="yes">
+<cd:command name="labeling" generated="yes">
   <cd:sequence>
-    <cd:variable value="etichetare"/>
+    <cd:variable value="labeling"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference optional="yes"/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazacoloane">
+<cd:command name="seteazacoloane" file="page-mul.tex">
   <cd:sequence>
     <cd:string value="seteazacoloane"/>
   </cd:sequence>
@@ -3278,9 +3278,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="coloane" type="environment">
+<cd:command name="columns" type="environment">
   <cd:sequence>
-    <cd:string value="coloane"/>
+    <cd:string value="columns"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments optional="yes" list="yes">
@@ -3289,7 +3289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestetext">
+<cd:command name="definestetext" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="definestetext"/>
   </cd:sequence>
@@ -3313,7 +3313,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaantet">
+<cd:command name="seteazaantet" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="seteazaantet"/>
   </cd:sequence>
@@ -3345,7 +3345,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stilstanga">
@@ -3355,7 +3355,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stildreapta">
@@ -3365,7 +3365,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="latimestanga">
@@ -3384,7 +3384,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazasubsol">
+<cd:command name="seteazasubsol" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="seteazasubsol"/>
   </cd:sequence>
@@ -3398,7 +3398,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazatext">
+<cd:command name="seteazatext" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="seteazatext"/>
   </cd:sequence>
@@ -3412,7 +3412,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazasus">
+<cd:command name="seteazasus" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="seteazasus"/>
   </cd:sequence>
@@ -3426,7 +3426,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazajos">
+<cd:command name="seteazajos" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="seteazajos"/>
   </cd:sequence>
@@ -3440,19 +3440,19 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="faraliniiantetsisubsol">
+<cd:command name="faraliniiantetsisubsol" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="faraliniiantetsisubsol"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="faraliniisussijos">
+<cd:command name="faraliniisussijos" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="faraliniisussijos"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="seteazatexteantet">
+<cd:command name="seteazatexteantet" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="seteazatexteantet"/>
   </cd:sequence>
@@ -3479,7 +3479,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazatextesubsol">
+<cd:command name="seteazatextesubsol" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="seteazatextesubsol"/>
   </cd:sequence>
@@ -3506,7 +3506,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazatextetext">
+<cd:command name="seteazatextetext" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="seteazatextetext"/>
   </cd:sequence>
@@ -3533,7 +3533,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazatextesus">
+<cd:command name="seteazatextesus" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="seteazatextesus"/>
   </cd:sequence>
@@ -3560,7 +3560,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazatextejos">
+<cd:command name="seteazatextejos" file="page-txt.tex">
   <cd:sequence>
     <cd:string value="seteazatextejos"/>
   </cd:sequence>
@@ -3587,7 +3587,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestemarcaje">
+<cd:command name="definestemarcaje" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="definestemarcaje"/>
   </cd:sequence>
@@ -3601,7 +3601,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="cupleazamarcaje">
+<cd:command name="cupleazamarcaje" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="cupleazamarcaje"/>
   </cd:sequence>
@@ -3615,7 +3615,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="decupleazamarcaje">
+<cd:command name="decupleazamarcaje" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="decupleazamarcaje"/>
   </cd:sequence>
@@ -3626,7 +3626,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="reseteazamarcaje">
+<cd:command name="reseteazamarcaje" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="reseteazamarcaje"/>
   </cd:sequence>
@@ -3637,7 +3637,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazamarcaje">
+<cd:command name="seteazamarcaje" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="seteazamarcaje"/>
   </cd:sequence>
@@ -3661,7 +3661,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="marcaje">
+<cd:command name="marcaje" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="marcaje"/>
   </cd:sequence>
@@ -3673,7 +3673,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="adumarcaje">
+<cd:command name="adumarcaje" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="adumarcaje"/>
   </cd:sequence>
@@ -3692,7 +3692,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="faramarcaje">
+<cd:command name="faramarcaje" file="core-mar.tex">
   <cd:sequence>
     <cd:string value="faramarcaje"/>
   </cd:sequence>
@@ -3701,7 +3701,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaaspect">
+<cd:command name="seteazaaspect" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="seteazaaspect"/>
   </cd:sequence>
@@ -3787,7 +3787,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="culoare">
@@ -3865,7 +3865,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="adapteazaaspect">
+<cd:command name="adapteazaaspect" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="adapteazaaspect"/>
   </cd:sequence>
@@ -3885,13 +3885,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="afiseazagrid">
+<cd:command name="afiseazagrid" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="afiseazagrid"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="plaseazapegrid">
+<cd:command name="plaseazapegrid" file="core-grd.tex">
   <cd:sequence>
     <cd:string value="plaseazapegrid"/>
   </cd:sequence>
@@ -3903,7 +3903,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="mutapegrid">
+<cd:command name="mutapegrid" file="core-grd.tex">
   <cd:sequence>
     <cd:string value="mutapegrid"/>
   </cd:sequence>
@@ -3912,9 +3912,9 @@
       <cd:constant type="sus"/>
       <cd:constant type="ambele"/>
       <cd:constant type="subsol"/>
-      <cd:constant type="-sus"/>
-      <cd:constant type="-ambele"/>
-      <cd:constant type="-subsol"/>
+      <cd:constant type="-top"/>
+      <cd:constant type="-both"/>
+      <cd:constant type="-bottom"/>
       <cd:variable type="cd:text"/>
       <cd:constant type="inalt"/>
       <cd:constant type="centru"/>
@@ -3949,9 +3949,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="produs" type="environment">
+<cd:command name="product" type="environment">
   <cd:sequence>
-    <cd:string value="produs"/>
+    <cd:string value="product"/>
   </cd:sequence>
   <cd:arguments>
     <cd:file/>
@@ -3991,7 +3991,7 @@
       <cd:parameter name="inaltime">
         <cd:constant type="cd:number"/>
       </cd:parameter>
-      <cd:parameter name="adancime">
+      <cd:parameter name="inaltime">
         <cd:constant type="cd:number"/>
       </cd:parameter>
       <cd:parameter name="linie">
@@ -4000,7 +4000,7 @@
       <cd:parameter name="sus">
         <cd:constant type="cd:number"/>
       </cd:parameter>
-      <cd:parameter name="subsol">
+      <cd:parameter name="jos">
         <cd:constant type="cd:number"/>
       </cd:parameter>
     </cd:assignments>
@@ -4008,7 +4008,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazanumerotarepagina">
+<cd:command name="seteazanumerotarepagina" file="page-num.tex">
   <cd:sequence>
     <cd:string value="seteazanumerotarepagina"/>
   </cd:sequence>
@@ -4043,7 +4043,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stanga">
@@ -4053,8 +4053,8 @@
         <cd:constant type="cd:text"/>
       </cd:parameter>
       <cd:parameter name="mod">
-        <cd:constant type="detext"/>
-        <cd:constant type="decd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="text">
         <cd:constant type="cd:text"/>
@@ -4090,7 +4090,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaingust">
+<cd:command name="seteazaingust" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="seteazaingust"/>
   </cd:sequence>
@@ -4109,7 +4109,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="defineste">
+<cd:command name="defineste" file="syst-ext.tex">
   <cd:sequence>
     <cd:string value="defineste"/>
   </cd:sequence>
@@ -4122,7 +4122,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="folosestecomenzi">
+<cd:command name="folosestecomenzi" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="folosestecomenzi"/>
   </cd:sequence>
@@ -4131,7 +4131,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestestartstop">
+<cd:command name="definestestartstop" file="core-sys.tex">
   <cd:sequence>
     <cd:string value="definestestartstop"/>
   </cd:sequence>
@@ -4153,7 +4153,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="comenzi">
@@ -4163,7 +4163,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazatitluri">
+<cd:command name="seteazatitluri" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="seteazatitluri"/>
   </cd:sequence>
@@ -4171,7 +4171,7 @@
     <cd:assignments list="yes">
       <cd:parameter name="numarsectiune">
         <cd:constant type="da"/>
-        <cd:constant type="numar"/>
+        <cd:variable type="cd:number"/>
         <cd:constant type="nu"/>
       </cd:parameter>
       <cd:parameter name="alternativ">
@@ -4215,7 +4215,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazalegendele">
+<cd:command name="seteazalegendele" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="seteazalegendele"/>
   </cd:sequence>
@@ -4246,7 +4246,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stil">
@@ -4256,7 +4256,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="numar">
@@ -4280,8 +4280,8 @@
         <cd:constant type="Numereromane"/>
       </cd:parameter>
       <cd:parameter name="mod">
-        <cd:constant type="detext"/>
-        <cd:constant type="decd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="separator">
         <cd:constant type="cd:text"/>
@@ -4296,7 +4296,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazalegenda">
+<cd:command name="seteazalegenda" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="seteazalegenda"/>
   </cd:sequence>
@@ -4310,7 +4310,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazafloats">
+<cd:command name="seteazafloats" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="seteazafloats"/>
   </cd:sequence>
@@ -4394,7 +4394,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaimpartireafloat">
+<cd:command name="seteazaimpartireafloat" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="seteazaimpartireafloat"/>
   </cd:sequence>
@@ -4414,7 +4414,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impartefloat">
+<cd:command name="impartefloat" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="impartefloat"/>
   </cd:sequence>
@@ -4427,7 +4427,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaplasareaopozita">
+<cd:command name="seteazaplasareaopozita" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="seteazaplasareaopozita"/>
   </cd:sequence>
@@ -4450,15 +4450,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="opozit" type="environment">
+<cd:command name="opposite" type="environment">
   <cd:sequence>
-    <cd:string value="opozit"/>
+    <cd:string value="opposite"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaliniesilabe">
+<cd:command name="seteazaliniesilabe" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="seteazaliniesilabe"/>
   </cd:sequence>
@@ -4478,7 +4478,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setarepozitie">
+<cd:command name="setarepozitie" file="page-lyr.tex">
   <cd:sequence>
     <cd:string value="setarepozitie"/>
   </cd:sequence>
@@ -4519,15 +4519,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="pozitionare" type="environment">
+<cd:command name="positioning" type="environment">
   <cd:sequence>
-    <cd:string value="pozitionare"/>
+    <cd:string value="positioning"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="grid">
+<cd:command name="grid" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="grid"/>
   </cd:sequence>
@@ -4584,7 +4584,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="pagina">
+<cd:command name="pagina" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="pagina"/>
   </cd:sequence>
@@ -4600,7 +4600,7 @@
       <cd:constant type="dezactivat"/>
       <cd:constant type="ultim"/>
       <cd:constant type="cvadrupul"/>
-      <cd:variable type="cd:par"/>
+      <cd:constant type="par"/>
       <cd:constant type="impar"/>
       <cd:constant type="blank"/>
       <cd:constant type="gol"/>
@@ -4611,7 +4611,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazareferinte">
+<cd:command name="seteazareferinte" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="seteazareferinte"/>
   </cd:sequence>
@@ -4667,7 +4667,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaurl">
+<cd:command name="seteazaurl" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="seteazaurl"/>
   </cd:sequence>
@@ -4680,7 +4680,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="urlalternativ">
@@ -4697,7 +4697,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="scrieinlistareferinte">
+<cd:command name="scrieinlistareferinte" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="scrieinlistareferinte"/>
   </cd:sequence>
@@ -4721,7 +4721,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestelistareferinte">
+<cd:command name="definestelistareferinte" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definestelistareferinte"/>
   </cd:sequence>
@@ -4735,7 +4735,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazalistareferinte">
+<cd:command name="seteazalistareferinte" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="seteazalistareferinte"/>
   </cd:sequence>
@@ -4767,7 +4767,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="scrieinlista">
+<cd:command name="scrieinlista" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="scrieinlista"/>
   </cd:sequence>
@@ -4781,7 +4781,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="scrieintreliste">
+<cd:command name="scrieintreliste" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="scrieintreliste"/>
   </cd:sequence>
@@ -4794,7 +4794,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="faralista">
+<cd:command name="faralista" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="faralista"/>
   </cd:sequence>
@@ -4803,7 +4803,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="listsymbol">
+<cd:command name="listsymbol" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="listsymbol"/>
   </cd:sequence>
@@ -4815,7 +4815,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="punelista">
+<cd:command name="punelista" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="punelista"/>
   </cd:sequence>
@@ -4829,7 +4829,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="determinacaracteristicilelistei">
+<cd:command name="determinacaracteristicilelistei" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="determinacaracteristicilelistei"/>
   </cd:sequence>
@@ -4843,7 +4843,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="punelistacombinata">
+<cd:command name="punelistacombinata" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="punelistacombinata"/>
   </cd:sequence>
@@ -4857,7 +4857,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestelista">
+<cd:command name="definestelista" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definestelista"/>
   </cd:sequence>
@@ -4874,7 +4874,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazalista">
+<cd:command name="seteazalista" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="seteazalista"/>
   </cd:sequence>
@@ -4893,7 +4893,7 @@
         <cd:constant type="c"/>
         <cd:constant type="..."/>
         <cd:constant type="niciunul"/>
-        <cd:constant type="comanda"/>
+        <cd:variable type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="cuplare">
         <cd:constant type="on"/>
@@ -4916,7 +4916,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stilnumar">
@@ -4926,7 +4926,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stiltext">
@@ -4936,7 +4936,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stilpagina">
@@ -4946,7 +4946,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="culoare">
@@ -4965,7 +4965,7 @@
         <cd:constant type="cd:oneargument"/>
       </cd:parameter>
       <cd:parameter name="interactiune">
-        <cd:constant type="numarsetiune"/>
+        <cd:variable type="cd:sectionnumber"/>
         <cd:variable type="cd:text"/>
         <cd:constant type="numarpagina"/>
         <cd:constant type="tot"/>
@@ -5042,7 +5042,7 @@
       <cd:parameter name="expansiune">
         <cd:constant type="da"/>
         <cd:constant type="nu"/>
-        <cd:constant type="comanda"/>
+        <cd:variable type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="latimemaxima">
         <cd:constant type="cd:dimension"/>
@@ -5052,7 +5052,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestelistacombinata">
+<cd:command name="definestelistacombinata" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="definestelistacombinata"/>
   </cd:sequence>
@@ -5069,7 +5069,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazalistacombinata">
+<cd:command name="seteazalistacombinata" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="seteazalistacombinata"/>
   </cd:sequence>
@@ -5091,10 +5091,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="punelistacombinata" generated="yes">
+<cd:command name="punelistacombinata" generated="yes" file="core-lst.tex">
   <cd:sequence>
     <cd:string value="pune"/>
-    <cd:variable value="listacombinata"/>
+    <cd:variable value="combinedlist"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -5106,10 +5106,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="completlistacombinata" generated="yes">
+<cd:command name="completecombinedlist" generated="yes">
   <cd:sequence>
     <cd:string value="complet"/>
-    <cd:variable value="listacombinata"/>
+    <cd:variable value="combinedlist"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -5121,15 +5121,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazanumerotare">
+<cd:command name="seteazanumerotare" file="core-num.tex">
   <cd:sequence>
     <cd:string value="seteazanumerotare"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments list="yes">
       <cd:parameter name="mod">
-        <cd:constant type="detext"/>
-        <cd:constant type="decd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="stare">
         <cd:constant type="start"/>
@@ -5139,9 +5139,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaformule">
+<cd:command name="setupformulae">
   <cd:sequence>
-    <cd:string value="seteazaformule"/>
+    <cd:string value="setupformulae"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments list="yes">
@@ -5199,7 +5199,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="publicatie">
+<cd:command name="publicatie" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="publicatie"/>
   </cd:sequence>
@@ -5208,7 +5208,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazapublicatii">
+<cd:command name="seteazapublicatii" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="seteazapublicatii"/>
   </cd:sequence>
@@ -5223,7 +5223,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazalinii">
+<cd:command name="seteazalinii" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="seteazalinii"/>
   </cd:sequence>
@@ -5241,22 +5241,22 @@
       <cd:parameter name="aliniat">
         <cd:constant type="da"/>
         <cd:constant type="nu"/>
-        <cd:variable type="cd:par"/>
+        <cd:constant type="par"/>
         <cd:constant type="impar"/>
       </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="linii" type="environment">
+<cd:command name="lines" type="environment">
   <cd:sequence>
-    <cd:string value="linii"/>
+    <cd:string value="lines"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazanumerotareparagrafe">
+<cd:command name="seteazanumerotareparagrafe" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="seteazanumerotareparagrafe"/>
   </cd:sequence>
@@ -5275,7 +5275,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="distanta">
@@ -5285,7 +5285,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazanumerotarelinii">
+<cd:command name="seteazanumerotarelinii" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="seteazanumerotarelinii"/>
   </cd:sequence>
@@ -5319,7 +5319,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="prefix">
@@ -5333,9 +5333,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="numerotarelinii" type="environment">
+<cd:command name="linenumbering" type="environment">
   <cd:sequence>
-    <cd:string value="numerotarelinii"/>
+    <cd:string value="linenumbering"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -5344,16 +5344,16 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="linie" type="environment">
+<cd:command name="line" type="environment">
   <cd:sequence>
-    <cd:string value="linie"/>
+    <cd:string value="line"/>
   </cd:sequence>
   <cd:arguments>
     <cd:reference/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="olinie">
+<cd:command name="olinie" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="olinie"/>
   </cd:sequence>
@@ -5362,7 +5362,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="inlinie">
+<cd:command name="inlinie" file="page-lin.tex">
   <cd:sequence>
     <cd:string value="inlinie"/>
   </cd:sequence>
@@ -5371,7 +5371,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazamarginal">
+<cd:command name="seteazamarginal" file="page-mar.tex">
   <cd:sequence>
     <cd:string value="seteazamarginal"/>
   </cd:sequence>
@@ -5394,7 +5394,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="inainte">
@@ -5437,7 +5437,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazanumarpagina">
+<cd:command name="seteazanumarpagina" file="page-num.tex">
   <cd:sequence>
     <cd:string value="seteazanumarpagina"/>
   </cd:sequence>
@@ -5455,15 +5455,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazanumarsubpagina">
+<cd:command name="seteazanumarsubpagina" file="page-num.tex">
   <cd:sequence>
     <cd:string value="seteazanumarsubpagina"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments list="yes">
       <cd:parameter name="mod">
-        <cd:constant type="detext"/>
-        <cd:constant type="decd:section"/>
+        <cd:constant type="bytext"/>
+        <cd:constant type="bycd:section"/>
       </cd:parameter>
       <cd:parameter name="stare">
         <cd:constant type="start"/>
@@ -5493,7 +5493,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesteblanc">
+<cd:command name="definesteblanc" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="definesteblanc"/>
   </cd:sequence>
@@ -5507,7 +5507,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestedimensiunehartie">
+<cd:command name="definestedimensiunehartie" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="definestedimensiunehartie"/>
   </cd:sequence>
@@ -5532,7 +5532,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setuppaper">
+<cd:command name="setuppaper" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="setuppaper"/>
   </cd:sequence>
@@ -5570,7 +5570,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazadimensiunihartie">
+<cd:command name="seteazadimensiunihartie" file="page-lay.tex">
   <cd:sequence>
     <cd:string value="seteazadimensiunihartie"/>
   </cd:sequence>
@@ -5610,7 +5610,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaaranjareapag">
+<cd:command name="seteazaaranjareapag" file="page-imp.tex">
   <cd:sequence>
     <cd:string value="seteazaaranjareapag"/>
   </cd:sequence>
@@ -5656,7 +5656,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestelogo">
+<cd:command name="definestelogo" file="page-log.tex">
   <cd:sequence>
     <cd:string value="definestelogo"/>
   </cd:sequence>
@@ -5694,7 +5694,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="punelogouri">
+<cd:command name="punelogouri" file="page-log.tex">
   <cd:sequence>
     <cd:string value="punelogouri"/>
   </cd:sequence>
@@ -5740,7 +5740,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesteblocsectiune">
+<cd:command name="definesteblocsectiune" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definesteblocsectiune"/>
   </cd:sequence>
@@ -5754,7 +5754,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazablocsectiune">
+<cd:command name="seteazablocsectiune" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="seteazablocsectiune"/>
   </cd:sequence>
@@ -5781,7 +5781,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestesectiune">
+<cd:command name="definestesectiune" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definestesectiune"/>
   </cd:sequence>
@@ -5792,7 +5792,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazasectiune">
+<cd:command name="seteazasectiune" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="seteazasectiune"/>
   </cd:sequence>
@@ -5819,7 +5819,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazatitlu">
+<cd:command name="seteazatitlu" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="seteazatitlu"/>
   </cd:sequence>
@@ -5835,7 +5835,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stiltext">
@@ -5845,7 +5845,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stilnumar">
@@ -5855,7 +5855,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="culoare">
@@ -5939,7 +5939,7 @@
       <cd:parameter name="numarincrement">
         <cd:constant type="da"/>
         <cd:constant type="nu"/>
-        <cd:constant type="lista"/>
+        <cd:variable type="cd:list"/>
         <cd:constant type="cd:file"/>
       </cd:parameter>
       <cd:parameter name="resetnumber">
@@ -5951,7 +5951,7 @@
       </cd:parameter>
       <cd:parameter name="expansiune">
         <cd:constant type="da"/>
-        <cd:constant type="comanda"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="nu"/>
       </cd:parameter>
       <cd:parameter name="textmargine">
@@ -5963,7 +5963,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazanumartitlu">
+<cd:command name="seteazanumartitlu" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="seteazanumartitlu"/>
   </cd:sequence>
@@ -5990,7 +5990,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="determinanumartitlu">
+<cd:command name="determinanumartitlu" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="determinanumartitlu"/>
   </cd:sequence>
@@ -6001,20 +6001,20 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="numartitlucurent">
+<cd:command name="numartitlucurent" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="numartitlucurent"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="urmatorulsectiune" generated="yes">
+<cd:command name="nextsection" generated="yes" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="urmatorul"/>
     <cd:variable value="sectiune"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definesteantet">
+<cd:command name="definesteantet" file="core-sec.tex">
   <cd:sequence>
     <cd:string value="definesteantet"/>
   </cd:sequence>
@@ -6028,7 +6028,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setupitemgroup">
+<cd:command name="setupitemgroup" file="core-itm.tex">
   <cd:sequence>
     <cd:string value="setupitemgroup"/>
   </cd:sequence>
@@ -6052,7 +6052,7 @@
       <cd:constant type="inmargine"/>
       <cd:constant type="autointro"/>
       <cd:constant type="larg"/>
-      <cd:constant type="sectiune"/>
+      <cd:variable type="cd:section"/>
       <cd:constant type="intext"/>
     </cd:keywords>
     <cd:assignments optional="yes" list="yes">
@@ -6114,7 +6114,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stilmarcaj">
@@ -6124,7 +6124,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stilsimbol">
@@ -6134,7 +6134,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stopper">
@@ -6260,7 +6260,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sim">
+<cd:command name="sim" file="core-itm.tex">
   <cd:sequence>
     <cd:string value="sim"/>
   </cd:sequence>
@@ -6275,7 +6275,7 @@
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definesteregistru">
+<cd:command name="definesteregistru" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="definesteregistru"/>
   </cd:sequence>
@@ -6289,7 +6289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaregistru">
+<cd:command name="seteazaregistru" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="seteazaregistru"/>
   </cd:sequence>
@@ -6319,7 +6319,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stilpagina">
@@ -6329,7 +6329,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stiltext">
@@ -6339,7 +6339,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="indicator">
@@ -6377,7 +6377,7 @@
       </cd:parameter>
       <cd:parameter name="expansiune">
         <cd:constant type="da"/>
-        <cd:constant type="comanda"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="nu"/>
       </cd:parameter>
       <cd:parameter name="referinta">
@@ -6409,7 +6409,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="registru" generated="yes">
+<cd:command name="register" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:variable value="registru"/>
   </cd:sequence>
@@ -6421,7 +6421,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="startregistru" generated="yes">
+<cd:command name="startregister" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="start"/>
     <cd:variable value="registru"/>
@@ -6434,7 +6434,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="scrieinregistru">
+<cd:command name="scrieinregistru" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="scrieinregistru"/>
   </cd:sequence>
@@ -6449,7 +6449,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="cuplatregistru" generated="yes">
+<cd:command name="coupledregister" generated="yes">
   <cd:sequence>
     <cd:string value="cuplat"/>
     <cd:variable value="registru"/>
@@ -6462,7 +6462,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="cupleazaregistru">
+<cd:command name="cupleazaregistru" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="cupleazaregistru"/>
   </cd:sequence>
@@ -6473,7 +6473,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="puneregistru">
+<cd:command name="puneregistru" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="puneregistru"/>
   </cd:sequence>
@@ -6487,7 +6487,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="veziregistru" generated="yes">
+<cd:command name="seeregister" generated="yes">
   <cd:sequence>
     <cd:string value="vezi"/>
     <cd:variable value="registru"/>
@@ -6501,7 +6501,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="completregistru" generated="yes">
+<cd:command name="completeregister" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="complet"/>
     <cd:variable value="registru"/>
@@ -6513,7 +6513,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="puneregistru" generated="yes">
+<cd:command name="puneregistru" generated="yes" file="core-reg.tex">
   <cd:sequence>
     <cd:string value="pune"/>
     <cd:variable value="registru"/>
@@ -6525,7 +6525,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestesinonim">
+<cd:command name="definestesinonim" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="definestesinonim"/>
   </cd:sequence>
@@ -6545,7 +6545,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazasinonime">
+<cd:command name="seteazasinonime" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="seteazasinonime"/>
   </cd:sequence>
@@ -6561,7 +6561,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="stilsinonim">
@@ -6571,7 +6571,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="locatie">
@@ -6600,7 +6600,7 @@
       </cd:parameter>
       <cd:parameter name="expansiune">
         <cd:constant type="da"/>
-        <cd:constant type="comanda"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="nu"/>
       </cd:parameter>
       <cd:parameter name="comanda">
@@ -6610,9 +6610,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sinonim" generated="yes">
+<cd:command name="synonym" generated="yes">
   <cd:sequence>
-    <cd:variable value="sinonim"/>
+    <cd:variable value="synonym"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -6623,28 +6623,28 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="completlistadesinonime" generated="yes">
+<cd:command name="completelistofsynonyms" generated="yes">
   <cd:sequence>
-    <cd:string value="completlistade"/>
-    <cd:variable value="sinonime"/>
+    <cd:string value="completelistof"/>
+    <cd:variable value="synonyms"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="punelistadesinonime" generated="yes">
+<cd:command name="placelistofsynonyms" generated="yes">
   <cd:sequence>
-    <cd:string value="punelistade"/>
-    <cd:variable value="sinonime"/>
+    <cd:string value="placelistof"/>
+    <cd:variable value="synonyms"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="incarcasinonime" generated="yes">
+<cd:command name="loadsynonyms" generated="yes">
   <cd:sequence>
     <cd:string value="incarca"/>
-    <cd:variable value="sinonime"/>
+    <cd:variable value="synonyms"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definestesortare">
+<cd:command name="definestesortare" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="definestesortare"/>
   </cd:sequence>
@@ -6661,7 +6661,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazasortare">
+<cd:command name="seteazasortare" file="core-syn.tex">
   <cd:sequence>
     <cd:string value="seteazasortare"/>
   </cd:sequence>
@@ -6694,21 +6694,21 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="expansiune">
         <cd:constant type="da"/>
-        <cd:constant type="comanda"/>
+        <cd:variable type="cd:command"/>
         <cd:constant type="nu"/>
       </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sortare" generated="yes">
+<cd:command name="sort" generated="yes">
   <cd:sequence>
-    <cd:variable value="sortare"/>
+    <cd:variable value="sort"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -6718,28 +6718,28 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="completlistadesortari" generated="yes">
+<cd:command name="completelistofsorts" generated="yes">
   <cd:sequence>
-    <cd:string value="completlistade"/>
-    <cd:variable value="sortari"/>
+    <cd:string value="completelistof"/>
+    <cd:variable value="sorts"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="punelistadesortari" generated="yes">
+<cd:command name="placelistofsorts" generated="yes">
   <cd:sequence>
-    <cd:string value="punelistade"/>
-    <cd:variable value="sortari"/>
+    <cd:string value="placelistof"/>
+    <cd:variable value="sorts"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="incarcasortari" generated="yes">
+<cd:command name="loadsorts" generated="yes">
   <cd:sequence>
     <cd:string value="incarca"/>
-    <cd:variable value="sortari"/>
+    <cd:variable value="sorts"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definestemakeup">
+<cd:command name="definestemakeup" file="page-mak.tex">
   <cd:sequence>
     <cd:string value="definestemakeup"/>
   </cd:sequence>
@@ -6767,7 +6767,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazamakeup">
+<cd:command name="seteazamakeup" file="page-mak.tex">
   <cd:sequence>
     <cd:string value="seteazamakeup"/>
   </cd:sequence>
@@ -6844,7 +6844,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="numemakeup" type="environment" generated="yes">
+<cd:command name="namemakeup" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="nume"/>
     <cd:string value="makeup"/>
@@ -6877,7 +6877,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="data">
+<cd:command name="data" file="core-con.tex">
   <cd:sequence>
     <cd:string value="data"/>
   </cd:sequence>
@@ -6898,13 +6898,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="datareferit">
+<cd:command name="datareferit" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="datareferit"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="aliniat">
+<cd:command name="aliniat" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="aliniat"/>
   </cd:sequence>
@@ -6921,13 +6921,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="faraaliniat">
+<cd:command name="faraaliniat" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="faraaliniat"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="blanc">
+<cd:command name="blanc" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="blanc"/>
   </cd:sequence>
@@ -6952,7 +6952,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="impachetat" type="environment">
+<cd:command name="impachetat" type="environment" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="impachetat"/>
   </cd:sequence>
@@ -6963,23 +6963,23 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="neimpachetat" type="environment">
+<cd:command name="unpacked" type="environment">
   <cd:sequence>
-    <cd:string value="neimpachetat"/>
+    <cd:string value="unpacked"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="corectielinie" type="environment">
+<cd:command name="linecorrection" type="environment">
   <cd:sequence>
-    <cd:string value="corectielinie"/>
+    <cd:string value="linecorrection"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="corecteazaspatiualb">
+<cd:command name="corecteazaspatiualb" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="corecteazaspatiualb"/>
   </cd:sequence>
@@ -7004,9 +7004,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ingust" type="environment">
+<cd:command name="narrower" type="environment">
   <cd:sequence>
-    <cd:string value="ingust"/>
+    <cd:string value="narrower"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes" list="yes">
@@ -7017,15 +7017,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ascundere" type="environment">
+<cd:command name="hiding" type="environment">
   <cd:sequence>
-    <cd:string value="ascundere"/>
+    <cd:string value="hiding"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaalinierea">
+<cd:command name="seteazaalinierea" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="seteazaalinierea"/>
   </cd:sequence>
@@ -7051,9 +7051,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="aliniere" type="environment">
+<cd:command name="alignment" type="environment">
   <cd:sequence>
-    <cd:string value="aliniere"/>
+    <cd:string value="alignment"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -7074,7 +7074,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazatoleranta">
+<cd:command name="seteazatoleranta" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="seteazatoleranta"/>
   </cd:sequence>
@@ -7092,7 +7092,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tippagina">
+<cd:command name="tippagina" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="tippagina"/>
   </cd:sequence>
@@ -7103,7 +7103,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="proceseazapagina">
+<cd:command name="proceseazapagina" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="proceseazapagina"/>
   </cd:sequence>
@@ -7118,7 +7118,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="paginadubla">
+<cd:command name="paginadubla" file="page-ini.tex">
   <cd:sequence>
     <cd:string value="paginadubla"/>
   </cd:sequence>
@@ -7140,7 +7140,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="pozitie">
+<cd:command name="pozitie" file="page-lyr.tex">
   <cd:sequence>
     <cd:string value="pozitie"/>
   </cd:sequence>
@@ -7150,7 +7150,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaecrane">
+<cd:command name="seteazaecrane" file="core-rul.tex">
   <cd:sequence>
     <cd:string value="seteazaecrane"/>
   </cd:sequence>
@@ -7174,7 +7174,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazafundaluri">
+<cd:command name="seteazafundaluri" file="page-bck.tex">
   <cd:sequence>
     <cd:string value="seteazafundaluri"/>
   </cd:sequence>
@@ -7201,7 +7201,7 @@
       <cd:parameter name="stare">
         <cd:constant type="start"/>
         <cd:constant type="stop"/>
-        <cd:constant type="repetat"/>
+        <cd:variable type="cd:repeat"/>
       </cd:parameter>
       <cd:inherit name="seteazainconjurat"/>
     </cd:assignments>
@@ -7230,7 +7230,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="scriebuffer">
+<cd:command name="scriebuffer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="scriebuffer"/>
   </cd:sequence>
@@ -7241,7 +7241,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestebuffer">
+<cd:command name="definestebuffer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="definestebuffer"/>
   </cd:sequence>
@@ -7252,7 +7252,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazabuffer">
+<cd:command name="seteazabuffer" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="seteazabuffer"/>
   </cd:sequence>
@@ -7274,7 +7274,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestebloc">
+<cd:command name="definestebloc" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="definestebloc"/>
   </cd:sequence>
@@ -7285,13 +7285,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="gatablocuri">
+<cd:command name="gatablocuri" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="gatablocuri"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="ascundeblocuri">
+<cd:command name="ascundeblocuri" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="ascundeblocuri"/>
   </cd:sequence>
@@ -7305,7 +7305,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="pastreazablocuri">
+<cd:command name="pastreazablocuri" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="pastreazablocuri"/>
   </cd:sequence>
@@ -7320,7 +7320,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="folosestebloc">
+<cd:command name="folosestebloc" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="folosestebloc"/>
   </cd:sequence>
@@ -7334,7 +7334,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="proceseazabloc">
+<cd:command name="proceseazabloc" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="proceseazabloc"/>
   </cd:sequence>
@@ -7348,7 +7348,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="saripesteblocuri">
+<cd:command name="saripesteblocuri" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="saripesteblocuri"/>
   </cd:sequence>
@@ -7376,7 +7376,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="selecteazablocuri">
+<cd:command name="selecteazablocuri" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="selecteazablocuri"/>
   </cd:sequence>
@@ -7396,7 +7396,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazabloc">
+<cd:command name="seteazabloc" file="core-buf.tex">
   <cd:sequence>
     <cd:string value="seteazabloc"/>
   </cd:sequence>
@@ -7421,7 +7421,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="fisier">
@@ -7439,7 +7439,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="matematica">
+<cd:command name="matematica" file="supp-mat.tex">
   <cd:sequence>
     <cd:string value="matematica"/>
   </cd:sequence>
@@ -7448,7 +7448,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="puneformula">
+<cd:command name="puneformula" file="core-mat.tex">
   <cd:sequence>
     <cd:string value="puneformula"/>
   </cd:sequence>
@@ -7459,7 +7459,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="punesubformula">
+<cd:command name="punesubformula" file="core-mat.tex">
   <cd:sequence>
     <cd:string value="punesubformula"/>
   </cd:sequence>
@@ -7470,10 +7470,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="puneobiectmobil" generated="yes">
+<cd:command name="placefloat" generated="yes" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="pune"/>
-    <cd:variable value="obiectmobil"/>
+    <cd:variable value="float"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -7496,7 +7496,7 @@
       <cd:constant type="outeredge"/>
       <cd:constant type="intern"/>
       <cd:constant type="extern"/>
-      <cd:constant type="line"/>
+      <cd:constant type="linie"/>
       <cd:constant type="inalt"/>
       <cd:constant type="jos"/>
       <cd:constant type="ajustat"/>
@@ -7516,10 +7516,10 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="rezervatobiectmobil" generated="yes">
+<cd:command name="reservefloat" generated="yes">
   <cd:sequence>
     <cd:string value="rezervat"/>
-    <cd:variable value="obiectmobil"/>
+    <cd:variable value="float"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments optional="yes" list="yes">
@@ -7542,7 +7542,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestefloat">
+<cd:command name="definestefloat" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="definestefloat"/>
   </cd:sequence>
@@ -7556,7 +7556,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazafloat">
+<cd:command name="seteazafloat" file="page-flt.tex">
   <cd:sequence>
     <cd:string value="seteazafloat"/>
   </cd:sequence>
@@ -7602,9 +7602,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="obiectmobiltext" type="environment" generated="yes">
+<cd:command name="floattext" type="environment" generated="yes">
   <cd:sequence>
-    <cd:variable value="obiectmobil"/>
+    <cd:variable value="float"/>
     <cd:string value="text"/>
   </cd:sequence>
   <cd:arguments>
@@ -7623,25 +7623,25 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="punelistadeobiectemobile" generated="yes">
+<cd:command name="placelistoffloats" generated="yes">
   <cd:sequence>
-    <cd:string value="punelistade"/>
-    <cd:variable value="obiectemobile"/>
+    <cd:string value="placelistof"/>
+    <cd:variable value="floats"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="completlistadeobiectemobile" generated="yes">
+<cd:command name="completelistoffloats" generated="yes">
   <cd:sequence>
-    <cd:string value="completlistade"/>
-    <cd:variable value="obiectemobile"/>
+    <cd:string value="completelistof"/>
+    <cd:variable value="floats"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="referit">
+<cd:command name="referit" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="referit"/>
   </cd:sequence>
@@ -7694,7 +7694,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="chem">
+<cd:command name="chem" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="chem"/>
   </cd:sequence>
@@ -7705,7 +7705,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="fractie">
+<cd:command name="fractie" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="fractie"/>
   </cd:sequence>
@@ -7715,7 +7715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="puncte">
+<cd:command name="puncte" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="puncte"/>
   </cd:sequence>
@@ -7747,7 +7747,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaelemente">
+<cd:command name="seteazaelemente" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="seteazaelemente"/>
   </cd:sequence>
@@ -7796,7 +7796,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="citat" type="environment">
+<cd:command name="citat" type="environment" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="citat"/>
   </cd:sequence>
@@ -7809,7 +7809,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="citat">
+<cd:command name="citat" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="citat"/>
   </cd:sequence>
@@ -7818,7 +7818,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="minicitat">
+<cd:command name="minicitat" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="minicitat"/>
   </cd:sequence>
@@ -7827,7 +7827,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaminicitat">
+<cd:command name="seteazaminicitat" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="seteazaminicitat"/>
   </cd:sequence>
@@ -7846,7 +7846,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="culoare">
@@ -7873,7 +7873,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesteparagraf">
+<cd:command name="definesteparagraf" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="definesteparagraf"/>
   </cd:sequence>
@@ -7921,13 +7921,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="paragraf" generated="yes">
+<cd:command name="paragraph" generated="yes">
   <cd:sequence>
     <cd:variable value="paragraf"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="paragraf" type="environment" generated="yes">
+<cd:command name="paragraph" type="environment" generated="yes">
   <cd:sequence>
     <cd:variable value="paragraf"/>
   </cd:sequence>
@@ -7935,7 +7935,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaparagrafe">
+<cd:command name="seteazaparagrafe" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="seteazaparagrafe"/>
   </cd:sequence>
@@ -7955,7 +7955,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="latime">
@@ -8000,7 +8000,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazatab">
+<cd:command name="seteazatab" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="seteazatab"/>
   </cd:sequence>
@@ -8019,7 +8019,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="locatie">
@@ -8062,7 +8062,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestetabulatori">
+<cd:command name="definestetabulatori" file="core-tbl.tex">
   <cd:sequence>
     <cd:string value="definestetabulatori"/>
   </cd:sequence>
@@ -8093,7 +8093,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazatabulatori">
+<cd:command name="seteazatabulatori" file="core-tbl.tex">
   <cd:sequence>
     <cd:string value="seteazatabulatori"/>
   </cd:sequence>
@@ -8162,7 +8162,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazatabele">
+<cd:command name="seteazatabele" file="core-tab.tex">
   <cd:sequence>
     <cd:string value="seteazatabele"/>
   </cd:sequence>
@@ -8245,9 +8245,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tabel" type="environment">
+<cd:command name="table" type="environment">
   <cd:sequence>
-    <cd:string value="tabel"/>
+    <cd:string value="table"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8257,9 +8257,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tabele" type="environment">
+<cd:command name="tables" type="environment">
   <cd:sequence>
-    <cd:string value="tabele"/>
+    <cd:string value="tables"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8269,7 +8269,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestesablontabel">
+<cd:command name="definestesablontabel" file="core-tab.tex">
   <cd:sequence>
     <cd:string value="definestesablontabel"/>
   </cd:sequence>
@@ -8289,7 +8289,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="folosestefisiereexterne">
+<cd:command name="folosestefisiereexterne" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="folosestefisiereexterne"/>
   </cd:sequence>
@@ -8312,7 +8312,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="folosestefisierextern">
+<cd:command name="folosestefisierextern" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="folosestefisierextern"/>
   </cd:sequence>
@@ -8338,7 +8338,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="folosestefiguraexterna">
+<cd:command name="folosestefiguraexterna" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="folosestefiguraexterna"/>
   </cd:sequence>
@@ -8423,7 +8423,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="figuraexterna">
+<cd:command name="figuraexterna" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="figuraexterna"/>
   </cd:sequence>
@@ -8437,7 +8437,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazafiguriexterne">
+<cd:command name="seteazafiguriexterne" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="seteazafiguriexterne"/>
   </cd:sequence>
@@ -8446,7 +8446,7 @@
       <cd:parameter name="optiune">
         <cd:constant type="incadrat"/>
         <cd:constant type="gol"/>
-        <cd:variable type="cd:text"/>
+        <cd:constant type="text"/>
       </cd:parameter>
       <cd:parameter name="obiect">
         <cd:constant type="da"/>
@@ -8481,7 +8481,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="afiseazafiguriexterne">
+<cd:command name="afiseazafiguriexterne" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="afiseazafiguriexterne"/>
   </cd:sequence>
@@ -8496,7 +8496,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="folosestemuzicaexterna">
+<cd:command name="folosestemuzicaexterna" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="folosestemuzicaexterna"/>
   </cd:sequence>
@@ -8510,18 +8510,18 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="nume">
+<cd:command name="name" file="syst-gen.tex">
   <cd:sequence>
-    <cd:string value="nume"/>
+    <cd:string value="name"/>
   </cd:sequence>
   <cd:arguments>
     <cd:content/>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="legenda" type="environment">
+<cd:command name="legend" type="environment">
   <cd:sequence>
-    <cd:string value="legenda"/>
+    <cd:string value="legend"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords optional="yes">
@@ -8535,9 +8535,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="fapt" type="environment">
+<cd:command name="fact" type="environment">
   <cd:sequence>
-    <cd:string value="fapt"/>
+    <cd:string value="fact"/>
   </cd:sequence>
   <cd:arguments>
     <cd:tex command="fact"/>
@@ -8548,7 +8548,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="roteste">
+<cd:command name="roteste" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="roteste"/>
   </cd:sequence>
@@ -8560,7 +8560,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazarotare">
+<cd:command name="seteazarotare" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="seteazarotare"/>
   </cd:sequence>
@@ -8581,7 +8581,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="reflexie">
+<cd:command name="reflexie" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="reflexie"/>
   </cd:sequence>
@@ -8590,7 +8590,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="scala">
+<cd:command name="scala" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="scala"/>
   </cd:sequence>
@@ -8607,7 +8607,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazacombinari">
+<cd:command name="seteazacombinari" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="seteazacombinari"/>
   </cd:sequence>
@@ -8634,11 +8634,11 @@
         <cd:constant type="ajustat"/>
       </cd:parameter>
       <cd:parameter name="locatie">
-        <cd:constant type="top"/>
-        <cd:constant type="middle"/>
-        <cd:constant type="bottom"/>
-        <cd:constant type="left"/>
-        <cd:constant type="right"/>
+        <cd:constant type="sus"/>
+        <cd:constant type="centru"/>
+        <cd:constant type="subsol"/>
+        <cd:constant type="stanga"/>
+        <cd:constant type="dreapta"/>
       </cd:parameter>
       <cd:parameter name="aliniere">
         <cd:constant type="nu"/>
@@ -8654,7 +8654,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic...cd:command"/>
+        <cd:constant type="small...cd:command"/>
       </cd:parameter>
       <cd:parameter name="culoare">
         <cd:constant type="cd:name"/>
@@ -8663,9 +8663,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="combinare" type="environment">
+<cd:command name="combination" type="environment">
   <cd:sequence>
-    <cd:string value="combinare"/>
+    <cd:string value="combination"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords>
@@ -8674,7 +8674,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="punefatainfata">
+<cd:command name="punefatainfata" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="punefatainfata"/>
   </cd:sequence>
@@ -8684,7 +8684,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="punedeasuprafiecareia">
+<cd:command name="punedeasuprafiecareia" file="core-mis.tex">
   <cd:sequence>
     <cd:string value="punedeasuprafiecareia"/>
   </cd:sequence>
@@ -8715,7 +8715,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaecraninteractiune">
+<cd:command name="seteazaecraninteractiune" file="core-int.tex">
   <cd:sequence>
     <cd:string value="seteazaecraninteractiune"/>
   </cd:sequence>
@@ -8757,7 +8757,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="ecran">
+<cd:command name="ecran" file="core-int.tex">
   <cd:sequence>
     <cd:string value="ecran"/>
   </cd:sequence>
@@ -8765,7 +8765,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazatranzitiepagina">
+<cd:command name="seteazatranzitiepagina" file="core-int.tex">
   <cd:sequence>
     <cd:string value="seteazatranzitiepagina"/>
   </cd:sequence>
@@ -8777,7 +8777,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazainteractiunea">
+<cd:command name="seteazainteractiunea" file="core-nav.tex">
   <cd:sequence>
     <cd:string value="seteazainteractiunea"/>
   </cd:sequence>
@@ -8841,7 +8841,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic...cd:command"/>
+        <cd:constant type="small...cd:command"/>
       </cd:parameter>
       <cd:parameter name="culoare">
         <cd:constant type="cd:name"/>
@@ -8871,7 +8871,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestemeniuinteractiune">
+<cd:command name="definestemeniuinteractiune" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definestemeniuinteractiune"/>
   </cd:sequence>
@@ -8915,7 +8915,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic...cd:command"/>
+        <cd:constant type="small...cd:command"/>
       </cd:parameter>
       <cd:parameter name="culoare">
         <cd:constant type="cd:name"/>
@@ -8957,7 +8957,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestemeniuinteractiune">
+<cd:command name="definestemeniuinteractiune" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definestemeniuinteractiune"/>
   </cd:sequence>
@@ -8993,7 +8993,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="dezactiveazameniuinteractiune">
+<cd:command name="dezactiveazameniuinteractiune" file="core-int.tex">
   <cd:sequence>
     <cd:string value="dezactiveazameniuinteractiune"/>
   </cd:sequence>
@@ -9009,7 +9009,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="folosestedocumentextern">
+<cd:command name="folosestedocumentextern" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="folosestedocumentextern"/>
   </cd:sequence>
@@ -9018,7 +9018,7 @@
       <cd:constant type="cd:name"/>
     </cd:keywords>
     <cd:keywords>
-      <cd:constant type="file"/>
+      <cd:constant type="fisier"/>
     </cd:keywords>
     <cd:keywords>
       <cd:constant type="cd:text"/>
@@ -9026,7 +9026,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="folosesteURL">
+<cd:command name="folosesteURL" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="folosesteURL"/>
   </cd:sequence>
@@ -9038,7 +9038,7 @@
       <cd:constant type="cd:text"/>
     </cd:keywords>
     <cd:keywords>
-      <cd:constant type="file"/>
+      <cd:constant type="fisier"/>
     </cd:keywords>
     <cd:keywords>
       <cd:constant type="cd:text"/>
@@ -9046,7 +9046,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="cupleazadocument">
+<cd:command name="cupleazadocument" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="cupleazadocument"/>
   </cd:sequence>
@@ -9055,7 +9055,7 @@
       <cd:constant type="cd:name"/>
     </cd:keywords>
     <cd:keywords>
-      <cd:constant type="file"/>
+      <cd:constant type="fisier"/>
     </cd:keywords>
     <cd:keywords>
       <cd:constant type="cd:name"/>
@@ -9063,7 +9063,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="din">
+<cd:command name="din" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="din"/>
   </cd:sequence>
@@ -9083,7 +9083,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="butoaneinteractiune">
+<cd:command name="butoaneinteractiune" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="butoaneinteractiune"/>
   </cd:sequence>
@@ -9097,7 +9097,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazabarainteractiune">
+<cd:command name="seteazabarainteractiune" file="core-int.tex">
   <cd:sequence>
     <cd:string value="seteazabarainteractiune"/>
   </cd:sequence>
@@ -9122,12 +9122,12 @@
       </cd:parameter>
       <cd:parameter name="latime">
         <cd:constant type="cd:dimension"/>
-        <cd:constant type="height"/>
+        <cd:constant type="inaltime"/>
         <cd:constant type="ajustat"/>
       </cd:parameter>
       <cd:parameter name="inaltime">
         <cd:constant type="cd:dimension"/>
-        <cd:constant type="height"/>
+        <cd:constant type="inaltime"/>
         <cd:constant type="ajustat"/>
       </cd:parameter>
       <cd:parameter name="inaltime">
@@ -9147,7 +9147,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sincronizeaza">
+<cd:command name="sincronizeaza" file="core-int.tex">
   <cd:sequence>
     <cd:string value="sincronizeaza"/>
   </cd:sequence>
@@ -9155,15 +9155,15 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="sincronizare" type="environment">
+<cd:command name="synchronization" type="environment">
   <cd:sequence>
-    <cd:string value="sincronizare"/>
+    <cd:string value="synchronization"/>
   </cd:sequence>
   <cd:arguments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setarebarasincronizare">
+<cd:command name="setarebarasincronizare" file="core-int.tex">
   <cd:sequence>
     <cd:string value="setarebarasincronizare"/>
   </cd:sequence>
@@ -9175,7 +9175,7 @@
       </cd:parameter>
       <cd:parameter name="latime">
         <cd:constant type="cd:dimension"/>
-        <cd:constant type="height"/>
+        <cd:constant type="inaltime"/>
         <cd:constant type="ajustat"/>
       </cd:parameter>
       <cd:parameter name="inaltime">
@@ -9188,7 +9188,7 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
       <cd:parameter name="culoare">
@@ -9199,7 +9199,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="barasincronizare">
+<cd:command name="barasincronizare" file="core-int.tex">
   <cd:sequence>
     <cd:string value="barasincronizare"/>
   </cd:sequence>
@@ -9217,7 +9217,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="setaresincronizare">
+<cd:command name="setaresincronizare" file="core-int.tex">
   <cd:sequence>
     <cd:string value="setaresincronizare"/>
   </cd:sequence>
@@ -9231,7 +9231,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesteprofil">
+<cd:command name="definesteprofil" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definesteprofil"/>
   </cd:sequence>
@@ -9245,22 +9245,22 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaprofile">
+<cd:command name="seteazaprofile" file="core-int.tex">
   <cd:sequence>
     <cd:string value="seteazaprofile"/>
   </cd:sequence>
   <cd:arguments>
     <cd:assignments interactive="exclusive" list="yes">
       <cd:parameter name="optiune">
-        <cd:variable type="cd:text"/>
+        <cd:constant type="text"/>
       </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="profil" type="environment">
+<cd:command name="profile" type="environment">
   <cd:sequence>
-    <cd:string value="profil"/>
+    <cd:string value="profile"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords interactive="exclusive" list="yes">
@@ -9269,7 +9269,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="urmeazaprofil">
+<cd:command name="urmeazaprofil" file="core-int.tex">
   <cd:sequence>
     <cd:string value="urmeazaprofil"/>
   </cd:sequence>
@@ -9281,7 +9281,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="plaseazasemnecarte">
+<cd:command name="plaseazasemnecarte" file="core-int.tex">
   <cd:sequence>
     <cd:string value="plaseazasemnecarte"/>
   </cd:sequence>
@@ -9317,7 +9317,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaversiuni">
+<cd:command name="seteazaversiuni" file="core-int.tex">
   <cd:sequence>
     <cd:string value="seteazaversiuni"/>
   </cd:sequence>
@@ -9333,14 +9333,14 @@
         <cd:constant type="aldininclinat"/>
         <cd:constant type="type"/>
         <cd:constant type="cap"/>
-        <cd:constant type="mic..."/>
+        <cd:constant type="small..."/>
         <cd:constant type="cd:command"/>
       </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
 
-<cd:command name="marcheazaversiune">
+<cd:command name="marcheazaversiune" file="core-int.tex">
   <cd:sequence>
     <cd:string value="marcheazaversiune"/>
   </cd:sequence>
@@ -9348,13 +9348,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="selecteazaversiune">
+<cd:command name="selecteazaversiune" file="core-int.tex">
   <cd:sequence>
     <cd:string value="selecteazaversiune"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="definesteversiune">
+<cd:command name="definesteversiune" file="core-int.tex">
   <cd:sequence>
     <cd:string value="definesteversiune"/>
   </cd:sequence>
@@ -9368,7 +9368,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="urmeazaversiune">
+<cd:command name="urmeazaversiune" file="core-int.tex">
   <cd:sequence>
     <cd:string value="urmeazaversiune"/>
   </cd:sequence>
@@ -9380,7 +9380,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="urmeazaversiuneprofil">
+<cd:command name="urmeazaversiuneprofil" file="core-int.tex">
   <cd:sequence>
     <cd:string value="urmeazaversiuneprofil"/>
   </cd:sequence>
@@ -9395,7 +9395,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definesteprogram">
+<cd:command name="definesteprogram" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="definesteprogram"/>
   </cd:sequence>
@@ -9412,7 +9412,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaprograme">
+<cd:command name="seteazaprograme" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="seteazaprograme"/>
   </cd:sequence>
@@ -9425,7 +9425,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="program">
+<cd:command name="program" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="program"/>
   </cd:sequence>
@@ -9436,9 +9436,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="figura" type="environment">
+<cd:command name="figure" type="environment">
   <cd:sequence>
-    <cd:string value="figura"/>
+    <cd:string value="figure"/>
   </cd:sequence>
   <cd:arguments>
     <cd:keywords interactive="exclusive">
@@ -9459,47 +9459,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="referring*figura">
-  <cd:sequence>
-    <cd:string value="referring*figura"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:position list="yes"/>
-    <cd:position list="yes"/>
-    <cd:keywords>
-      <cd:constant type="cd:number"/>
-    </cd:keywords>
-  </cd:arguments>
-</cd:command>
+<!-- referring*figure skipped -->
 
-<cd:command name="marcaje*figura">
-  <cd:sequence>
-    <cd:string value="marcaje*figura"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:position list="yes"/>
-    <cd:position list="yes"/>
-    <cd:keywords>
-      <cd:constant type="cd:number"/>
-    </cd:keywords>
-  </cd:arguments>
-</cd:command>
+<!-- marking*figure skipped -->
 
-<cd:command name="remarca">
-  <cd:sequence>
-    <cd:string value="remarca"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:position/>
-    <cd:position/>
-    <cd:assignments list="yes">
-      <cd:constant type="cd:number"/>
-    </cd:assignments>
-    <cd:content/>
-  </cd:arguments>
-</cd:command>
+<!-- remark skipped -->
 
-<cd:command name="dute">
+<cd:command name="dute" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="dute"/>
   </cd:sequence>
@@ -9510,7 +9476,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="dutebox">
+<cd:command name="dutebox" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="dutebox"/>
   </cd:sequence>
@@ -9533,7 +9499,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazabutoane">
+<cd:command name="seteazabutoane" file="core-ref.tex">
   <cd:sequence>
     <cd:string value="seteazabutoane"/>
   </cd:sequence>
@@ -9548,23 +9514,9 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="butonmeniu">
-  <cd:sequence>
-    <cd:string value="butonmeniu"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:keywords interactive="exclusive" optional="yes">
-      <cd:inherit name="seteazainconjurat"/>
-    </cd:keywords>
-    <cd:assignments optional="yes" list="yes">
-      <cd:constant type="cd:text"/>
-    </cd:assignments>
-    <cd:content/>
-    <cd:reference list="yes"/>
-  </cd:arguments>
-</cd:command>
+<!-- menubutton skipped -->
 
-<cd:command name="seteazacomentariu">
+<cd:command name="seteazacomentariu" file="core-int.tex">
   <cd:sequence>
     <cd:string value="seteazacomentariu"/>
   </cd:sequence>
@@ -9643,7 +9595,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestecamp">
+<cd:command name="definestecamp" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definestecamp"/>
   </cd:sequence>
@@ -9666,7 +9618,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestesubcamp">
+<cd:command name="definestesubcamp" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definestesubcamp"/>
   </cd:sequence>
@@ -9683,7 +9635,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="copiazacamp">
+<cd:command name="copiazacamp" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="copiazacamp"/>
   </cd:sequence>
@@ -9697,7 +9649,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="cloneazacamp">
+<cd:command name="cloneazacamp" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="cloneazacamp"/>
   </cd:sequence>
@@ -9717,7 +9669,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="camp">
+<cd:command name="camp" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="camp"/>
   </cd:sequence>
@@ -9728,7 +9680,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="potrivestecamp">
+<cd:command name="potrivestecamp" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="potrivestecamp"/>
   </cd:sequence>
@@ -9739,7 +9691,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="campumplere">
+<cd:command name="campumplere" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="campumplere"/>
   </cd:sequence>
@@ -9751,7 +9703,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="tooltip">
+<cd:command name="tooltip" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="tooltip"/>
   </cd:sequence>
@@ -9766,7 +9718,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="afiseazacampuri">
+<cd:command name="afiseazacampuri" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="afiseazacampuri"/>
   </cd:sequence>
@@ -9777,13 +9729,13 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="logcampuri">
+<cd:command name="logcampuri" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="logcampuri"/>
   </cd:sequence>
 </cd:command>
 
-<cd:command name="seteazacamp">
+<cd:command name="seteazacamp" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="seteazacamp"/>
   </cd:sequence>
@@ -9807,7 +9759,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazacampuri">
+<cd:command name="seteazacampuri" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="seteazacampuri"/>
   </cd:sequence>
@@ -9904,7 +9856,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaformulare">
+<cd:command name="seteazaformulare" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="seteazaformulare"/>
   </cd:sequence>
@@ -9918,7 +9870,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="definestestivacampuri">
+<cd:command name="definestestivacampuri" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="definestestivacampuri"/>
   </cd:sequence>
@@ -9935,7 +9887,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="stivacampuri">
+<cd:command name="stivacampuri" file="core-fld.tex">
   <cd:sequence>
     <cd:string value="stivacampuri"/>
   </cd:sequence>
@@ -9952,7 +9904,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="clip">
+<cd:command name="clip" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="clip"/>
   </cd:sequence>
@@ -9964,7 +9916,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazaclipping">
+<cd:command name="seteazaclipping" file="core-fig.tex">
   <cd:sequence>
     <cd:string value="seteazaclipping"/>
   </cd:sequence>
@@ -10253,7 +10205,7 @@
   </cd:arguments>
 </cd:command>
 
-<cd:command name="seteazastrut">
+<cd:command name="seteazastrut" file="core-spa.tex">
   <cd:sequence>
     <cd:string value="seteazastrut"/>
   </cd:sequence>
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
new file mode 100644
index 000000000..45e6fbaeb
--- /dev/null
+++ b/tex/context/interface/keys-cz.xml
@@ -0,0 +1,1576 @@
+<?xml version="1.0"?>
+
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2004.11.16">
+
+  <cd:variables>
+    <cd:variable name="one" value="jedna"/>
+    <cd:variable name="two" value="dve"/>
+    <cd:variable name="three" value="tri"/>
+    <cd:variable name="four" value="ctyri"/>
+    <cd:variable name="five" value="pet"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="sunday" value="nedele"/>
+    <cd:variable name="monday" value="pondeli"/>
+    <cd:variable name="tuesday" value="utery"/>
+    <cd:variable name="wednesday" value="streda"/>
+    <cd:variable name="thursday" value="ctvrtek"/>
+    <cd:variable name="friday" value="patek"/>
+    <cd:variable name="saturday" value="sobota"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="january" value="leden"/>
+    <cd:variable name="february" value="unor"/>
+    <cd:variable name="march" value="brezen"/>
+    <cd:variable name="april" value="duben"/>
+    <cd:variable name="may" value="kveten"/>
+    <cd:variable name="june" value="cerven"/>
+    <cd:variable name="july" value="cervenec"/>
+    <cd:variable name="august" value="srpen"/>
+    <cd:variable name="september" value="zari"/>
+    <cd:variable name="october" value="rijen"/>
+    <cd:variable name="november" value="listopad"/>
+    <cd:variable name="december" value="prosinec"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="atpage" value="nastrance"/>
+    <cd:variable name="hencefore" value="vyse"/>
+    <cd:variable name="hereafter" value="nize"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="sectionlevel" value="oddil"/>
+    <cd:variable name="part" value="cast"/>
+    <cd:variable name="chapter" value="kapitola"/>
+    <cd:variable name="subject" value="tema"/>
+    <cd:variable name="section" value="sekce"/>
+    <cd:variable name="title" value="titul"/>
+    <cd:variable name="margintitle" value="titulmarginalie"/>
+    <cd:variable name="content" value="obsah"/>
+    <cd:variable name="contents" value="obsah"/>
+    <cd:variable name="appendix" value="dodatek"/>
+    <cd:variable name="appendices" value="dodatky"/>
+    <cd:variable name="bodypart" value="hlavnicast"/>
+    <cd:variable name="bodymatter" value="hlavnicasti"/>
+    <cd:variable name="frontpart" value="prednicast"/>
+    <cd:variable name="frontmatter" value="prednicasti"/>
+    <cd:variable name="backpart" value="epilog"/>
+    <cd:variable name="backmatter" value="epilogy"/>
+    <cd:variable name="footnote" value="poznamkapodcarou"/>
+    <cd:variable name="system" value="system"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="subsection" value="podsekce"/>
+    <cd:variable name="subsubsection" value="podpodsekce"/>
+    <cd:variable name="subsubsubsection" value="podpodpodsekce"/>
+    <cd:variable name="subsubsubsubsection" value="podpodpodpodsekce"/>
+    <cd:variable name="subsubsubsubsubsection" value="podpodpodpodpodsekce"/>
+    <cd:variable name="subsubject" value="podtema"/>
+    <cd:variable name="subsubsubject" value="podpodtema"/>
+    <cd:variable name="subsubsubsubject" value="podpodpodtema"/>
+    <cd:variable name="subsubsubsubsubject" value="podpodpodpodtema"/>
+    <cd:variable name="subsubsubsubsubsubject" value="podpodpodpodpodtema"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="flushleft" value="flushleft"/>
+    <cd:variable name="flushright" value="flushright"/>
+    <cd:variable name="center" value="center"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="typing" value="typing"/>
+    <cd:variable name="file" value="soubor"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="formula" value="rovnice"/>
+    <cd:variable name="formulae" value="rovnice"/>
+    <cd:variable name="figure" value="obrazek"/>
+    <cd:variable name="figures" value="obrazky"/>
+    <cd:variable name="table" value="tabulka"/>
+    <cd:variable name="tables" value="tabulky"/>
+    <cd:variable name="graphic" value="graf"/>
+    <cd:variable name="graphics" value="grafy"/>
+    <cd:variable name="intermezzo" value="intermezzo"/>
+    <cd:variable name="intermezzi" value="intermezzi"/>
+    <cd:variable name="index" value="rejstrik"/>
+    <cd:variable name="indices" value="rejstriky"/>
+    <cd:variable name="abbreviation" value="zkratka"/>
+    <cd:variable name="abbreviations" value="zkratky"/>
+    <cd:variable name="logo" value="logo"/>
+    <cd:variable name="logos" value="loga"/>
+    <cd:variable name="unit" value="jednotka"/>
+    <cd:variable name="units" value="jednotky"/>
+    <cd:variable name="line" value="radek"/>
+    <cd:variable name="lines" value="radky"/>
+    <cd:variable name="framedtext" value="oramovanytext"/>
+    <cd:variable name="quotation" value="citace"/>
+    <cd:variable name="quote" value="citovat"/>
+    <cd:variable name="speech" value="speech"/>
+    <cd:variable name="itemize" value="vycet"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="leftquotation" value="citacevlevo"/>
+    <cd:constant name="rightquotation" value="citacevpravo"/>
+    <cd:constant name="leftquote" value="citovatvlevo"/>
+    <cd:constant name="rightquote" value="citovatvpravo"/>
+    <cd:constant name="midsentence" value="midsentence"/>
+    <cd:constant name="leftsentence" value="vetavlevo"/>
+    <cd:constant name="rightsentence" value="vetavpravo"/>
+    <cd:constant name="leftsubsentence" value="podvetavlevo"/>
+    <cd:constant name="rightsubsentence" value="podvetavpravo"/>
+    <cd:constant name="leftspeech" value="leftspeech"/>
+    <cd:constant name="middlespeech" value="middlespeech"/>
+    <cd:constant name="rightspeech" value="rightspeech"/>
+    <cd:constant name="limittext" value="limittext"/>
+    <cd:constant name="date" value="datum"/>
+    <cd:constant name="spacebefore" value="mezerapred"/>
+    <cd:constant name="spaceinbetween" value="spaceinbetween"/>
+    <cd:constant name="spaceafter" value="mezeraza"/>
+    <cd:constant name="sidespacebefore" value="bocnimezerapred"/>
+    <cd:constant name="sidespaceafter" value="bocnimezeraza"/>
+    <cd:constant name="to" value="na"/>
+    <cd:constant name="indicator" value="indikator"/>
+    <cd:constant name="background" value="pozadi"/>
+    <cd:constant name="backgrounddepth" value="hloubkapozadi"/>
+    <cd:constant name="backgroundcorner" value="rohpozadi"/>
+    <cd:constant name="splitcolor" value="splitcolor"/>
+    <cd:constant name="backgroundcolor" value="barvapozadi"/>
+    <cd:constant name="foregroundcolor" value="foregroundcolor"/>
+    <cd:constant name="foregroundstyle" value="foregroundstyle"/>
+    <cd:constant name="clipoffset" value="clipoffset"/>
+    <cd:constant name="backgroundoffset" value="offsetpozadi"/>
+    <cd:constant name="backgroundscreen" value="rastrpozadi"/>
+    <cd:constant name="backgroundradius" value="polomerpozadi"/>
+    <cd:constant name="address" value="adresa"/>
+    <cd:constant name="stopper" value="predel"/>
+    <cd:constant name="distance" value="vzdalenost"/>
+    <cd:constant name="paragraph" value="odstavec"/>
+    <cd:constant name="axis" value="osa"/>
+    <cd:constant name="author" value="autor"/>
+    <cd:constant name="auto" value="auto"/>
+    <cd:constant name="autofile" value="autofile"/>
+    <cd:constant name="balance" value="rovnovaha"/>
+    <cd:constant name="wfactor" value="sfaktor"/>
+    <cd:constant name="inner" value="vnitrni"/>
+    <cd:constant name="blank" value="prazdny"/>
+    <cd:constant name="obstruction" value="prekazka"/>
+    <cd:constant name="blockway" value="dobloku"/>
+    <cd:constant name="bottomspace" value="bottomspace"/>
+    <cd:constant name="top" value="vrsek"/>
+    <cd:constant name="topdistance" value="vzdalenostvrsku"/>
+    <cd:constant name="topframe" value="rameceknahore"/>
+    <cd:constant name="topoffset" value="offsetvrsku"/>
+    <cd:constant name="topstate" value="statusvrsku"/>
+    <cd:constant name="width" value="sirka"/>
+    <cd:constant name="maxwidth" value="maxsirka"/>
+    <cd:constant name="minwidth" value="minsirka"/>
+    <cd:constant name="source" value="zdroj"/>
+    <cd:constant name="command" value="prikaz"/>
+    <cd:constant name="commands" value="prikazy"/>
+    <cd:constant name="component" value="component"/>
+    <cd:constant name="contrastcolor" value="kontrastnibarva"/>
+    <cd:constant name="conversion" value="konverze"/>
+    <cd:constant name="headconversion" value="konverzehlavicky"/>
+    <cd:constant name="headlabel" value="popisekhlavicky"/>
+    <cd:constant name="criterium" value="kriterium"/>
+    <cd:constant name="date" value="datum"/>
+    <cd:constant name="default" value="implicitni"/>
+    <cd:constant name="depth" value="hloubka"/>
+    <cd:constant name="depthcorrection" value="korekcehloubky"/>
+    <cd:constant name="continue" value="pokracovat"/>
+    <cd:constant name="doublesided" value="oboustranne"/>
+    <cd:constant name="dummy" value="dummy"/>
+    <cd:constant name="unit" value="jednotka"/>
+    <cd:constant name="ownnumber" value="vlastnicislo"/>
+    <cd:constant name="evenmargin" value="sudamarginalie"/>
+    <cd:constant name="expansion" value="expanzen"/>
+    <cd:constant name="factor" value="faktor"/>
+    <cd:constant name="convertfile" value="konverzesouboru"/>
+    <cd:constant name="file" value="soubor"/>
+    <cd:constant name="inputfile" value="inputfile"/>
+    <cd:constant name="size" value="velikost"/>
+    <cd:constant name="autofocus" value="autoostreni"/>
+    <cd:constant name="focus" value="zaostreni"/>
+    <cd:constant name="directory" value="adresar"/>
+    <cd:constant name="grid" value="mrizka"/>
+    <cd:constant name="big" value="velky"/>
+    <cd:constant name="get" value="ziskat"/>
+    <cd:constant name="hang" value="zaveseni"/>
+    <cd:constant name="repeat" value="opakovat"/>
+    <cd:constant name="hfactor" value="vfaktor"/>
+    <cd:constant name="corner" value="roh"/>
+    <cd:constant name="hoffset" value="hoffset"/>
+    <cd:constant name="frames" value="ramecky"/>
+    <cd:constant name="header" value="zahlavi"/>
+    <cd:constant name="headerdistance" value="vzdalenostzahlavi"/>
+    <cd:constant name="headerstate" value="statuszahlavi"/>
+    <cd:constant name="height" value="vyska"/>
+    <cd:constant name="maxheight" value="maxvyska"/>
+    <cd:constant name="minheight" value="minvyska"/>
+    <cd:constant name="mindepth" value="mindepth"/>
+    <cd:constant name="current" value="aktualni"/>
+    <cd:constant name="in" value="v"/>
+    <cd:constant name="indenting" value="odsazovani"/>
+    <cd:constant name="interaction" value="interakce"/>
+    <cd:constant name="interlinespace" value="meziradkovamezera"/>
+    <cd:constant name="items" value="polozky"/>
+    <cd:constant name="frame" value="ramecek"/>
+    <cd:constant name="framedepth" value="hloubkaramecku"/>
+    <cd:constant name="framecorner" value="rohramecku"/>
+    <cd:constant name="framecolor" value="barvaramecku"/>
+    <cd:constant name="frameoffset" value="offsetramecku"/>
+    <cd:constant name="frameradius" value="polomerramecku"/>
+    <cd:constant name="marginedge" value="textovahrana"/>
+    <cd:constant name="marginedgetext" value="textmarginalnihookraje"/>
+    <cd:constant name="aligncharacter" value="aligncharacter"/>
+    <cd:constant name="alignmentcharacter" value="alignmentcharacter"/>
+    <cd:constant name="small" value="male"/>
+    <cd:constant name="color" value="barva"/>
+    <cd:constant name="column" value="sloupec"/>
+    <cd:constant name="columns" value="sloupce"/>
+    <cd:constant name="columndistance" value="vzdalenostsloupcu"/>
+    <cd:constant name="headcommand" value="headcommand"/>
+    <cd:constant name="headcolor" value="barvahlavicky"/>
+    <cd:constant name="headstyle" value="stylhlavicky"/>
+    <cd:constant name="afterhead" value="pohlavicce"/>
+    <cd:constant name="veroffset" value="offsethlavicky"/>
+    <cd:constant name="coupling" value="propojeni"/>
+    <cd:constant name="couplingway" value="zpusobpropojeni"/>
+    <cd:constant name="beforehead" value="predhlavickou"/>
+    <cd:constant name="topspace" value="svrchnimezera"/>
+    <cd:constant name="bodyfont" value="zakladnifont"/>
+    <cd:constant name="label" value="popisek"/>
+    <cd:constant name="empty" value="prazdne"/>
+    <cd:constant name="style" value="pismeno"/>
+    <cd:constant name="rule" value="linka"/>
+    <cd:constant name="rulethickness" value="tloustkalinky"/>
+    <cd:constant name="rulecolor" value="barvalinky"/>
+    <cd:constant name="list" value="seznam"/>
+    <cd:constant name="leftwidth" value="sirkavlevo"/>
+    <cd:constant name="leftframe" value="ramecekvlevo"/>
+    <cd:constant name="leftcolor" value="barvavlevo"/>
+    <cd:constant name="leftstyle" value="stylvlevo"/>
+    <cd:constant name="leftmargin" value="levyokraj"/>
+    <cd:constant name="leftmargindistance" value="vzdalenostlevehookraje"/>
+    <cd:constant name="leftoffset" value="levyoffset"/>
+    <cd:constant name="leftedge" value="levahrana"/>
+    <cd:constant name="leftedgedistance" value="vzdalenostlevehrany"/>
+    <cd:constant name="lefttext" value="textvlevo"/>
+    <cd:constant name="left" value="vlevo"/>
+    <cd:constant name="nleft" value="nvlevo"/>
+    <cd:constant name="logo" value="logo"/>
+    <cd:constant name="logos" value="loga"/>
+    <cd:constant name="local" value="lokalne"/>
+    <cd:constant name="margin" value="marginalie"/>
+    <cd:constant name="margindistance" value="vzdalenostokraje"/>
+    <cd:constant name="margintext" value="textmarginalie"/>
+    <cd:constant name="marking" value="znaceni"/>
+    <cd:constant name="marcolor" value="barvaznacky"/>
+    <cd:constant name="marstyle" value="stylsnacky"/>
+    <cd:constant name="menu" value="menu"/>
+    <cd:constant name="splitmethod" value="splitmethod"/>
+    <cd:constant name="textmethod" value="textmethod"/>
+    <cd:constant name="sidemethod" value="sidemethod"/>
+    <cd:constant name="method" value="metoda"/>
+    <cd:constant name="middle" value="stredni"/>
+    <cd:constant name="middletext" value="strednitext"/>
+    <cd:constant name="max" value="max"/>
+    <cd:constant name="min" value="min"/>
+    <cd:constant name="sample" value="vzor"/>
+    <cd:constant name="after" value="po"/>
+    <cd:constant name="name" value="jmeno"/>
+    <cd:constant name="commandafter" value="prikazpo"/>
+    <cd:constant name="ntop" value="nvrsek"/>
+    <cd:constant name="level" value="uroven"/>
+    <cd:constant name="levels" value="urovne"/>
+    <cd:constant name="nbottom" value="nspodek"/>
+    <cd:constant name="norm" value="norm"/>
+    <cd:constant name="nlines" value="nradky"/>
+    <cd:constant name="number" value="cislo"/>
+    <cd:constant name="numbercommand" value="ciselnyprikaz"/>
+    <cd:constant name="numbering" value="cislovani"/>
+    <cd:constant name="numbercolor" value="barvacisla"/>
+    <cd:constant name="numberstyle" value="stylcisla"/>
+    <cd:constant name="numberseparator" value="oddelovaccisla"/>
+    <cd:constant name="object" value="objekt"/>
+    <cd:constant name="offset" value="offset"/>
+    <cd:constant name="bottom" value="spodek"/>
+    <cd:constant name="bottomdistance" value="vzdalenostspodku"/>
+    <cd:constant name="bottomframe" value="ramecekdole"/>
+    <cd:constant name="bottomoffset" value="offsetspodku"/>
+    <cd:constant name="bottomstate" value="statusspodku"/>
+    <cd:constant name="oddmargin" value="lichyokraj"/>
+    <cd:constant name="at" value="u"/>
+    <cd:constant name="option" value="volba"/>
+    <cd:constant name="page" value="stranka"/>
+    <cd:constant name="pagecommand" value="strankovyprikaz"/>
+    <cd:constant name="pagecolor" value="barvastranky"/>
+    <cd:constant name="pagestyle" value="stylstranky"/>
+    <cd:constant name="pagenumber" value="cislostranky"/>
+    <cd:constant name="pageboundaries" value="hranicestranky"/>
+    <cd:constant name="pagestate" value="pagestate"/>
+    <cd:constant name="palet" value="paleta"/>
+    <cd:constant name="paper" value="papir"/>
+    <cd:constant name="location" value="misto"/>
+    <cd:constant name="placestopper" value="predelmista"/>
+    <cd:constant name="place" value="umistit"/>
+    <cd:constant name="placehead" value="umistihlavicku"/>
+    <cd:constant name="position" value="position"/>
+    <cd:constant name="prefix" value="prefix"/>
+    <cd:constant name="preset" value="prednastaveni"/>
+    <cd:constant name="preview" value="nahled"/>
+    <cd:constant name="process" value="process"/>
+    <cd:constant name="spot" value="spot"/>
+    <cd:constant name="dot" value="tecka"/>
+    <cd:constant name="arrow" value="sipka"/>
+    <cd:constant name="edge" value="hrana"/>
+    <cd:constant name="edgedistance" value="vzdalenosthrany"/>
+    <cd:constant name="screen" value="rastr"/>
+    <cd:constant name="rightwidth" value="sirkavpravo"/>
+    <cd:constant name="rightframe" value="ramecekvpravo"/>
+    <cd:constant name="rightcolor" value="barvavpravo"/>
+    <cd:constant name="rightstyle" value="stylvpravo"/>
+    <cd:constant name="rightmargin" value="pravyokraj"/>
+    <cd:constant name="rightmargindistance" value="vzdalenostpravehookraje"/>
+    <cd:constant name="rightoffset" value="pravyoffset"/>
+    <cd:constant name="rightedge" value="pravahrana"/>
+    <cd:constant name="rightedgedistance" value="vzdalenostpravehrany"/>
+    <cd:constant name="righttext" value="textvpravo"/>
+    <cd:constant name="right" value="vpravo"/>
+    <cd:constant name="nright" value="nvpravo"/>
+    <cd:constant name="reduction" value="redukce"/>
+    <cd:constant name="referencing" value="odkazujici"/>
+    <cd:constant name="line" value="radek"/>
+    <cd:constant name="linecorrection" value="korekceradku"/>
+    <cd:constant name="lines" value="radky"/>
+    <cd:constant name="stretch" value="natahnout"/>
+    <cd:constant name="resolution" value="rozliseni"/>
+    <cd:constant name="rotation" value="rotace"/>
+    <cd:constant name="orientation" value="orientation"/>
+    <cd:constant name="horoffset" value="horoffset"/>
+    <cd:constant name="backspace" value="zpetnamezera"/>
+    <cd:constant name="direction" value="smer"/>
+    <cd:constant name="scale" value="meritko"/>
+    <cd:constant name="separator" value="oddelovac"/>
+    <cd:constant name="display" value="obrazovka"/>
+    <cd:constant name="scope" value="rozsah"/>
+    <cd:constant name="section" value="oddil"/>
+    <cd:constant name="sectionnumber" value="cislooddilu"/>
+    <cd:constant name="setups" value="setups"/>
+    <cd:constant name="cutspace" value="cutspace"/>
+    <cd:constant name="family" value="rodina"/>
+    <cd:constant name="space" value="mezera"/>
+    <cd:constant name="spacing" value="mezerovani"/>
+    <cd:constant name="split" value="split"/>
+    <cd:constant name="splitoffset" value="splitoffset"/>
+    <cd:constant name="indentnext" value="odsadpristi"/>
+    <cd:constant name="step" value="krok"/>
+    <cd:constant name="stack" value="stack"/>
+    <cd:constant name="start" value="start"/>
+    <cd:constant name="state" value="status"/>
+    <cd:constant name="stop" value="stop"/>
+    <cd:constant name="radius" value="polomer"/>
+    <cd:constant name="dash" value="pomlcka"/>
+    <cd:constant name="sub" value="pod"/>
+    <cd:constant name="subtitle" value="podtitulek"/>
+    <cd:constant name="symbol" value="symbol"/>
+    <cd:constant name="symbolset" value="sadasymbolu"/>
+    <cd:constant name="symcolor" value="barvasymbolu"/>
+    <cd:constant name="symstyle" value="stylsymboly"/>
+    <cd:constant name="synonym" value="synonymum"/>
+    <cd:constant name="synonymcolor" value="barvasynonyma"/>
+    <cd:constant name="synonymstyle" value="stylsynonyma"/>
+    <cd:constant name="tab" value="tab"/>
+    <cd:constant name="sign" value="znak"/>
+    <cd:constant name="text" value="text"/>
+    <cd:constant name="textwidth" value="sirkatextu"/>
+    <cd:constant name="textcommand" value="textovyprikaz"/>
+    <cd:constant name="textsize" value="velikosttextu"/>
+    <cd:constant name="textcolor" value="barvatextu"/>
+    <cd:constant name="textstyle" value="styltextu"/>
+    <cd:constant name="textseparator" value="oddelovactextu"/>
+    <cd:constant name="textstate" value="statustextu"/>
+    <cd:constant name="title" value="titul"/>
+    <cd:constant name="aligntitle" value="zarovnejtitul"/>
+    <cd:constant name="tolerance" value="tolerance"/>
+    <cd:constant name="inbetween" value="mezi"/>
+    <cd:constant name="type" value="typ"/>
+    <cd:constant name="align" value="zarovnani"/>
+    <cd:constant name="urlspace" value="prostorurl"/>
+    <cd:constant name="urlalternative" value="urlalternativa"/>
+    <cd:constant name="from" value="z"/>
+    <cd:constant name="alternative" value="alternativa"/>
+    <cd:constant name="increment" value="zvysit"/>
+    <cd:constant name="incrementnumber" value="zvysujicicislo"/>
+    <cd:constant name="resetnumber" value="resetnumber"/>
+    <cd:constant name="reference" value="odkaz"/>
+    <cd:constant name="unknownreference" value="neznamyodkaz"/>
+    <cd:constant name="footer" value="upati"/>
+    <cd:constant name="footerdistance" value="vzdalenostupati"/>
+    <cd:constant name="footerstate" value="statusupati"/>
+    <cd:constant name="voffset" value="voffset"/>
+    <cd:constant name="next" value="dalsi"/>
+    <cd:constant name="before" value="pred"/>
+    <cd:constant name="commandbefore" value="predchoziprikaz"/>
+    <cd:constant name="previous" value="predchozi"/>
+    <cd:constant name="previousnumber" value="predchozicislo"/>
+    <cd:constant name="delay" value="prodleva"/>
+    <cd:constant name="way" value="zpusob"/>
+    <cd:constant name="random" value="nahodne"/>
+    <cd:constant name="white" value="bily"/>
+    <cd:constant name="xfactor" value="xfaktor"/>
+    <cd:constant name="xmax" value="xmax"/>
+    <cd:constant name="xoffset" value="xoffset"/>
+    <cd:constant name="xscale" value="xmeritko"/>
+    <cd:constant name="xstep" value="xkrok"/>
+    <cd:constant name="yfactor" value="yfaktor"/>
+    <cd:constant name="ymax" value="ymax"/>
+    <cd:constant name="yoffset" value="yoffset"/>
+    <cd:constant name="yscale" value="ymeritko"/>
+    <cd:constant name="ystep" value="ykrok"/>
+    <cd:constant name="samepage" value="stejnastranka"/>
+    <cd:constant name="sidealign" value="sidealign"/>
+    <cd:constant name="side" value="pocitat"/>
+    <cd:constant name="fieldlayer" value="fieldlayer"/>
+    <cd:constant name="textlayer" value="textlayer"/>
+    <cd:constant name="fieldbackgroundcolor" value="barvapozadipole"/>
+    <cd:constant name="fieldframecolor" value="barvarameckupole"/>
+    <cd:constant name="fieldoffset" value="offsetpole"/>
+    <cd:constant name="openaction" value="otevriakci"/>
+    <cd:constant name="closeaction" value="zavriakci"/>
+    <cd:constant name="openpageaction" value="akceotevrenistranky"/>
+    <cd:constant name="closepageaction" value="akcezavrenistranky"/>
+    <cd:constant name="clickin" value="klikuvnitr"/>
+    <cd:constant name="clickout" value="klikvne"/>
+    <cd:constant name="regionin" value="oblastuvnitr"/>
+    <cd:constant name="regionout" value="oblastvne"/>
+    <cd:constant name="focusin" value="focusin"/>
+    <cd:constant name="focusout" value="focusout"/>
+    <cd:constant name="afterkey" value="klavesapo"/>
+    <cd:constant name="format" value="formatovat"/>
+    <cd:constant name="validate" value="validovat"/>
+    <cd:constant name="calculate" value="pocitat"/>
+    <cd:constant name="click" value="klik"/>
+    <cd:constant name="vcommand" value="vprikaz"/>
+    <cd:constant name="icommand" value="iprikaz"/>
+    <cd:constant name="ccommand" value="cprikaz"/>
+    <cd:constant name="textdistance" value="textdistance"/>
+    <cd:constant name="textmargin" value="textmargin"/>
+    <cd:constant name="keyword" value="keyword"/>
+  </cd:constants>
+
+  <cd:constants>
+    <cd:constant name="extras" value="extras"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="on" value="zap"/>
+    <cd:variable name="serried" value="semknuto"/>
+    <cd:variable name="joinedup" value="spojeno"/>
+    <cd:variable name="absolute" value="absolutni"/>
+    <cd:variable name="background" value="pozadi"/>
+    <cd:variable name="backward" value="zpet"/>
+    <cd:variable name="subbackward" value="podzpet"/>
+    <cd:variable name="action" value="akce"/>
+    <cd:variable name="stopper" value="predel"/>
+    <cd:variable name="paragraph" value="odstavec"/>
+    <cd:variable name="all" value="vse"/>
+    <cd:variable name="always" value="vzdy"/>
+    <cd:variable name="auto" value="auto"/>
+    <cd:variable name="autointro" value="autouvod"/>
+    <cd:variable name="both" value="obe"/>
+    <cd:variable name="inner" value="uvnitr"/>
+    <cd:variable name="blank" value="prazdny"/>
+    <cd:variable name="disable" value="zablokovat"/>
+    <cd:variable name="top" value="vrsek"/>
+    <cd:variable name="wide" value="siroce"/>
+    <cd:variable name="width" value="sirka"/>
+    <cd:variable name="outer" value="vnejsi"/>
+    <cd:variable name="numbers" value="cisla"/>
+    <cd:variable name="Numbers" value="Cisla"/>
+    <cd:variable name="command" value="prikaz"/>
+    <cd:variable name="commands" value="prikazy"/>
+    <cd:variable name="concept" value="koncept"/>
+    <cd:variable name="day" value="den"/>
+    <cd:variable name="date" value="datum"/>
+    <cd:variable name="default" value="implicitni"/>
+    <cd:variable name="final" value="finalni"/>
+    <cd:variable name="depth" value="podlehloubky"/>
+    <cd:variable name="doublesided" value="dvoustranny"/>
+    <cd:variable name="first" value="prvni"/>
+    <cd:variable name="each" value="kazdy"/>
+    <cd:variable name="singlesided" value="jednostranne"/>
+    <cd:variable name="somewhere" value="nekde"/>
+    <cd:variable name="nowhere" value="nikde"/>
+    <cd:variable name="even" value="sude"/>
+    <cd:variable name="external" value="externi"/>
+    <cd:variable name="file" value="soubor"/>
+    <cd:variable name="flexible" value="prizpusobive"/>
+    <cd:variable name="force" value="sila"/>
+    <cd:variable name="used" value="uzito"/>
+    <cd:variable name="none" value="zadny"/>
+    <cd:variable name="nomarking" value="zadneznaceni"/>
+    <cd:variable name="nonumber" value="nonumber"/>
+    <cd:variable name="nowhite" value="zadnabila"/>
+    <cd:variable name="rotated" value="otoceno"/>
+    <cd:variable name="mirrored" value="zrcadleno"/>
+    <cd:variable name="global" value="globalne"/>
+    <cd:variable name="grid" value="mrizka"/>
+    <cd:variable name="big" value="velke"/>
+    <cd:variable name="bigbodyfont" value="bigbodyfont"/>
+    <cd:variable name="bigpreference" value="vysokapriorita"/>
+    <cd:variable name="gray" value="seda"/>
+    <cd:variable name="halfline" value="pulradku"/>
+    <cd:variable name="keep" value="drzet"/>
+    <cd:variable name="hanging" value="visici"/>
+    <cd:variable name="repeat" value="opakovat"/>
+    <cd:variable name="fix" value="fixuj"/>
+    <cd:variable name="here" value="zde"/>
+    <cd:variable name="header" value="zahlavi"/>
+    <cd:variable name="high" value="vysoko"/>
+    <cd:variable name="height" value="vyska"/>
+    <cd:variable name="horizontal" value="horizontalne"/>
+    <cd:variable name="current" value="aktualni"/>
+    <cd:variable name="hz" value="hz"/>
+    <cd:variable name="nohz" value="nohz"/>
+    <cd:variable name="italic" value="kurziva"/>
+    <cd:variable name="inherit" value="inherit"/>
+    <cd:variable name="inleft" value="vlevo"/>
+    <cd:variable name="inmargin" value="naokraji"/>
+    <cd:variable name="inright" value="vpravo"/>
+    <cd:variable name="interaction" value="interakce"/>
+    <cd:variable name="intext" value="dotextu"/>
+    <cd:variable name="intro" value="uvod"/>
+    <cd:variable name="its" value="pol"/>
+    <cd:variable name="yes" value="ano"/>
+    <cd:variable name="year" value="rok"/>
+    <cd:variable name="frame" value="ramecek"/>
+    <cd:variable name="marginedge" value="textovahrana"/>
+    <cd:variable name="cap" value="kap"/>
+    <cd:variable name="capital" value="kapitalky"/>
+    <cd:variable name="referral" value="znacka"/>
+    <cd:variable name="small" value="male"/>
+    <cd:variable name="smallnormal" value="malenormalni"/>
+    <cd:variable name="smallslanted" value="malesklonene"/>
+    <cd:variable name="smallslantedbold" value="malesklonenetucne"/>
+    <cd:variable name="smallitalic" value="malekurzivni"/>
+    <cd:variable name="smallitalicbold" value="malekurzivnitucne"/>
+    <cd:variable name="smalltype" value="maletype"/>
+    <cd:variable name="smallbold" value="maletucne"/>
+    <cd:variable name="smallboldslanted" value="maletucnesklonene"/>
+    <cd:variable name="smallbolditalic" value="maletucnekurzivni"/>
+    <cd:variable name="smallbodyfont" value="smallbodyfont"/>
+    <cd:variable name="color" value="barevne"/>
+    <cd:variable name="column" value="column"/>
+    <cd:variable name="columns" value="sloupce"/>
+    <cd:variable name="head" value="hlavicka"/>
+    <cd:variable name="low" value="nizko"/>
+    <cd:variable name="last" value="posledni"/>
+    <cd:variable name="label" value="popisek"/>
+    <cd:variable name="lohi" value="nivy"/>
+    <cd:variable name="tall" value="vysoko"/>
+    <cd:variable name="empty" value="prazdne"/>
+    <cd:variable name="Character" value="Pismeno"/>
+    <cd:variable name="character" value="pismeno"/>
+    <cd:variable name="Characters" value="Pismena"/>
+    <cd:variable name="characters" value="pismena"/>
+    <cd:variable name="landscape" value="nasirku"/>
+    <cd:variable name="rule" value="linka"/>
+    <cd:variable name="list" value="seznam"/>
+    <cd:variable name="leftmargin" value="levyokraj"/>
+    <cd:variable name="leftpage" value="levastranka"/>
+    <cd:variable name="leftedge" value="levahrana"/>
+    <cd:variable name="left" value="vlevo"/>
+    <cd:variable name="local" value="lokalne"/>
+    <cd:variable name="new" value="novy"/>
+    <cd:variable name="MONTH" value="MESIC"/>
+    <cd:variable name="month" value="mesic"/>
+    <cd:variable name="mar" value="mar"/>
+    <cd:variable name="margin" value="marginalie"/>
+    <cd:variable name="max" value="max"/>
+    <cd:variable name="min" value="min"/>
+    <cd:variable name="mediaeval" value="stredoveky"/>
+    <cd:variable name="medium" value="stredni"/>
+    <cd:variable name="middle" value="nastred"/>
+    <cd:variable name="after" value="po"/>
+    <cd:variable name="name" value="jmeno"/>
+    <cd:variable name="opposite" value="naproti"/>
+    <cd:variable name="no" value="ne"/>
+    <cd:variable name="negative" value="negativ"/>
+    <cd:variable name="positive" value="positiv"/>
+    <cd:variable name="not" value="ne"/>
+    <cd:variable name="never" value="nikdy"/>
+    <cd:variable name="normal" value="normalni"/>
+    <cd:variable name="number" value="cislo"/>
+    <cd:variable name="offset" value="offset"/>
+    <cd:variable name="unknown" value="neznamy"/>
+    <cd:variable name="bottom" value="spodek"/>
+    <cd:variable name="odd" value="liche"/>
+    <cd:variable name="packed" value="zhustene"/>
+    <cd:variable name="unpacked" value="rozbalene"/>
+    <cd:variable name="makeup" value="zlom"/>
+    <cd:variable name="atmargin" value="naokraji"/>
+    <cd:variable name="overlay" value="prekryv"/>
+    <cd:variable name="page" value="stranka"/>
+    <cd:variable name="pagenumber" value="cislostranky"/>
+    <cd:variable name="paper" value="papir"/>
+    <cd:variable name="display" value="obrazovka"/>
+    <cd:variable name="reverse" value="reverse"/>
+    <cd:variable name="fit" value="prizpusobive"/>
+    <cd:variable name="postscript" value="postscript"/>
+    <cd:variable name="preview" value="nahled"/>
+    <cd:variable name="program" value="program"/>
+    <cd:variable name="process" value="process"/>
+    <cd:variable name="spot" value="spot"/>
+    <cd:variable name="dot" value="tecka"/>
+    <cd:variable name="ran" value="rozsah"/>
+    <cd:variable name="edge" value="hrana"/>
+    <cd:variable name="screen" value="rastr"/>
+    <cd:variable name="rectangular" value="pravouhly"/>
+    <cd:variable name="rightmargin" value="pravyokraj"/>
+    <cd:variable name="rightpage" value="pravastranka"/>
+    <cd:variable name="rightedge" value="pravahrana"/>
+    <cd:variable name="right" value="vpravo"/>
+    <cd:variable name="line" value="radek"/>
+    <cd:variable name="register" value="rejstrik"/>
+    <cd:variable name="relative" value="relativni"/>
+    <cd:variable name="reset" value="reset"/>
+    <cd:variable name="Romannumerals" value="Rimskecislice"/>
+    <cd:variable name="romannumerals" value="rimskecislice"/>
+    <cd:variable name="greek" value="recky"/>
+    <cd:variable name="Greek" value="Recky"/>
+    <cd:variable name="round" value="zaobleny"/>
+    <cd:variable name="rotate" value="otoc"/>
+    <cd:variable name="stretch" value="natahnout"/>
+    <cd:variable name="backspace" value="zpetnamezera"/>
+    <cd:variable name="broad" value="siroky"/>
+    <cd:variable name="row" value="row"/>
+    <cd:variable name="slanted" value="sklonene"/>
+    <cd:variable name="slantedbold" value="sklonenetucne"/>
+    <cd:variable name="synchronize" value="synchronize"/>
+    <cd:variable name="italicbold" value="kurzivnitucne"/>
+    <cd:variable name="sectionnumber" value="cislooddilu"/>
+    <cd:variable name="narrow" value="uzky"/>
+    <cd:variable name="cutspace" value="cutspace"/>
+    <cd:variable name="tolerant" value="tolerantni"/>
+    <cd:variable name="space" value="mezera"/>
+    <cd:variable name="standard" value="standardni"/>
+    <cd:variable name="start" value="start"/>
+    <cd:variable name="stop" value="stop"/>
+    <cd:variable name="strict" value="striktni"/>
+    <cd:variable name="strut" value="strut"/>
+    <cd:variable name="sub" value="pod"/>
+    <cd:variable name="sym" value="sym"/>
+    <cd:variable name="symbol" value="symbol"/>
+    <cd:variable name="text" value="text"/>
+    <cd:variable name="back" value="zpet"/>
+    <cd:variable name="test" value="test"/>
+    <cd:variable name="inbetween" value="mezi"/>
+    <cd:variable name="type" value="type"/>
+    <cd:variable name="off" value="vyp"/>
+    <cd:variable name="url" value="url"/>
+    <cd:variable name="URL" value="URL"/>
+    <cd:variable name="fixed" value="fixne"/>
+    <cd:variable name="loose" value="uvolnene"/>
+    <cd:variable name="continue" value="pokracovat"/>
+    <cd:variable name="vertical" value="vertikalne"/>
+    <cd:variable name="bold" value="tucne"/>
+    <cd:variable name="boldslanted" value="tucnesklonene"/>
+    <cd:variable name="bolditalic" value="tucnekurzivni"/>
+    <cd:variable name="quadruple" value="ctyrnasobny"/>
+    <cd:variable name="footer" value="upati"/>
+    <cd:variable name="next" value="dalsi"/>
+    <cd:variable name="before" value="pred"/>
+    <cd:variable name="foreground" value="popredi"/>
+    <cd:variable name="preference" value="nastaveni"/>
+    <cd:variable name="temporary" value="docasne"/>
+    <cd:variable name="forward" value="vpred"/>
+    <cd:variable name="subforward" value="podvpred"/>
+    <cd:variable name="previous" value="predchozi"/>
+    <cd:variable name="value" value="hodnota"/>
+    <cd:variable name="week" value="tyden"/>
+    <cd:variable name="weekday" value="vsedniden"/>
+    <cd:variable name="WEEKDAY" value="VSEDNIDEN"/>
+    <cd:variable name="random" value="nahodny"/>
+    <cd:variable name="white" value="bily"/>
+    <cd:variable name="very" value="velmi"/>
+    <cd:variable name="verytolerant" value="velmitolerantni"/>
+    <cd:variable name="verystrict" value="velmistriktni"/>
+    <cd:variable name="see" value="viz"/>
+    <cd:variable name="smallcaps" value="kapitalky"/>
+    <cd:variable name="WORD" value="SLOVO"/>
+    <cd:variable name="firstpage" value="prvnistranka"/>
+    <cd:variable name="firstcolumn" value="firstcolumn"/>
+    <cd:variable name="previouspage" value="predchozistranka"/>
+    <cd:variable name="nextpage" value="dalsistranka"/>
+    <cd:variable name="lastpage" value="poslednistrana"/>
+    <cd:variable name="lastcolumn" value="lastcolumn"/>
+    <cd:variable name="lastpagenumber" value="lastpagenumber"/>
+    <cd:variable name="subpage" value="podstranka"/>
+    <cd:variable name="firstsubpage" value="prvnipodstranka"/>
+    <cd:variable name="previoussubpage" value="predchozipodstranka"/>
+    <cd:variable name="nextsubpage" value="dalsipodstranka"/>
+    <cd:variable name="lastsubpage" value="poslaednipodstranka"/>
+    <cd:variable name="nextevenpage" value="dalsisudastranka"/>
+    <cd:variable name="nextoddpage" value="dalsilichastranka"/>
+    <cd:variable name="previousevenpage" value="predchozisudastranka"/>
+    <cd:variable name="previousoddpage" value="predchozilichastranka"/>
+    <cd:variable name="readonly" value="pouzeprocteni"/>
+    <cd:variable name="required" value="pozadovane"/>
+    <cd:variable name="protected" value="chranene"/>
+    <cd:variable name="sorted" value="tridene"/>
+    <cd:variable name="unavailable" value="nedostupne"/>
+    <cd:variable name="hidden" value="skryte"/>
+    <cd:variable name="printable" value="tisknutelne"/>
+    <cd:variable name="bookmark" value="zalozka"/>
+    <cd:variable name="nocheck" value="nocheck"/>
+    <cd:variable name="innermargin" value="innermargin"/>
+    <cd:variable name="outermargin" value="outermargin"/>
+    <cd:variable name="inneredge" value="inneredge"/>
+    <cd:variable name="outeredge" value="outeredge"/>
+    <cd:variable name="controls" value="controls"/>
+    <cd:variable name="nothanging" value="nothanging"/>
+    <cd:variable name="hyphenated" value="hyphenated"/>
+    <cd:variable name="nothyphenated" value="nothyphenated"/>
+    <cd:variable name="overprint" value="overprint"/>
+    <cd:variable name="knockout" value="knockout"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="controls" value="controls"/>
+    <cd:constant name="global" value="globalne"/>
+    <cd:constant name="overprint" value="overprint"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="conversion" value="konverze"/>
+    <cd:variable name="by" value="skrz"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="dx" value="dx"/>
+    <cd:constant name="dy" value="dy"/>
+    <cd:constant name="nx" value="nx"/>
+    <cd:constant name="ny" value="ny"/>
+    <cd:constant name="nr" value="nr"/>
+    <cd:constant name="nl" value="nl"/>
+    <cd:constant name="nc" value="nc"/>
+    <cd:constant name="sx" value="sx"/>
+    <cd:constant name="sy" value="sy"/>
+    <cd:constant name="n" value="n"/>
+    <cd:constant name="vfil" value="vfil"/>
+    <cd:constant name="hfil" value="hfil"/>
+    <cd:constant name="strut" value="strut"/>
+    <cd:constant name="reset" value="reset"/>
+    <cd:constant name="set" value="set"/>
+    <cd:constant name="escape" value="escape"/>
+    <cd:constant name="apa" value="apa"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="calligraphic" value="kaligraficke"/>
+    <cd:variable name="handwritten" value="rukopisne"/>
+    <cd:variable name="sansserif" value="bezserifu"/>
+    <cd:variable name="roman" value="antikva"/>
+    <cd:variable name="teletype" value="strojopis"/>
+    <cd:variable name="type" value="opis"/>
+    <cd:variable name="serif" value="serif"/>
+    <cd:variable name="regular" value="pravidelne"/>
+    <cd:variable name="support" value="podpora"/>
+    <cd:variable name="sans" value="sans"/>
+    <cd:variable name="mono" value="mono"/>
+  </cd:variables>
+
+  <cd:elements>
+    <cd:element name="begin" value="zacatek"/>
+    <cd:element name="end" value="konec"/>
+    <cd:element name="coupled" value="propojene"/>
+    <cd:element name="get" value="ziskat"/>
+    <cd:element name="currentlocal" value="aktualnelokalni"/>
+    <cd:element name="endsetup" value="endsetup"/>
+    <cd:element name="load" value="nacist"/>
+    <cd:element name="emptyone" value="leer"/>
+    <cd:element name="emptytwo" value="prazdne"/>
+    <cd:element name="list" value="seznam"/>
+    <cd:element name="listof" value="seznam"/>
+    <cd:element name="local" value="lokalne"/>
+    <cd:element name="place" value="umisti"/>
+    <cd:element name="reserve" value="rezervovat"/>
+    <cd:element name="start" value="start"/>
+    <cd:element name="setup" value="nastaveni"/>
+    <cd:element name="stop" value="stop"/>
+    <cd:element name="increment" value="zvysit"/>
+    <cd:element name="next" value="dalsi"/>
+    <cd:element name="complete" value="uplny"/>
+    <cd:element name="previous" value="predchozi"/>
+    <cd:element name="previouslocal" value="predchozilokalni"/>
+    <cd:element name="see" value="viz"/>
+    <cd:element name="type" value="opis"/>
+    <cd:element name="makeup" value="zlom"/>
+    <cd:element name="text" value="text"/>
+  </cd:elements>
+
+  <cd:variables>
+    <cd:variable name="buffer" value="buffer"/>
+    <cd:variable name="linenote" value="linenote"/>
+    <cd:variable name="comment" value="komentar"/>
+    <cd:variable name="interactionmenu" value="interaktivnimenu"/>
+    <cd:variable name="postponing" value="odlozit"/>
+    <cd:variable name="hiding" value="skryt"/>
+    <cd:variable name="tabulate" value="tabelator"/>
+    <cd:variable name="tabulatehead" value="tabulatehead"/>
+    <cd:variable name="tabulatetail" value="tabulatetail"/>
+    <cd:variable name="fact" value="fakt"/>
+    <cd:variable name="legend" value="legenda"/>
+    <cd:variable name="formula" value="rovnice"/>
+    <cd:variable name="tablehead" value="zahlavitabulky"/>
+    <cd:variable name="tabletail" value="konectabulky"/>
+    <cd:variable name="setups" value="einstellungen"/>
+    <cd:variable name="helptext" value="textnapovedy"/>
+    <cd:variable name="localenvironment" value="lokalnihoprostredi"/>
+    <cd:variable name="sectionblockenvironment" value="sectionblockenvironment"/>
+    <cd:variable name="pagecomment" value="komentarstranky"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="FirstPage" value="PrvniStrana"/>
+    <cd:variable name="PreviousPage" value="PredchoziStrana"/>
+    <cd:variable name="NextPage" value="DalsiStrana"/>
+    <cd:variable name="LastPage" value="PosledniStrana"/>
+    <cd:variable name="PreviousJump" value="PredchoziSkok"/>
+    <cd:variable name="NextJump" value="NasledujiciSkok"/>
+    <cd:variable name="SwapViewer" value="ZmenitProhlizec"/>
+    <cd:variable name="ExitViewer" value="UkoncitProhlizec"/>
+    <cd:variable name="CloseDocument" value="ZavritDokument"/>
+    <cd:variable name="SaveDocument" value="UlozitDokument"/>
+    <cd:variable name="SaveNamedDocument" value="SaveNamedDocument"/>
+    <cd:variable name="OpenNamedDocument" value="OpenNamedDocument"/>
+    <cd:variable name="ViewerHelp" value="NapovedaProhlizece"/>
+    <cd:variable name="PrintDocument" value="VytisknoutDokument"/>
+    <cd:variable name="SearchDocument" value="ProhledatDokument"/>
+    <cd:variable name="SearchAgain" value="HledatZnovu"/>
+    <cd:variable name="Query" value="Query"/>
+    <cd:variable name="QueryAgain" value="QueryAgain"/>
+    <cd:variable name="GotoPage" value="JdiNaStranku"/>
+    <cd:variable name="StartMovie" value="SpustitFilm"/>
+    <cd:variable name="StopMovie" value="ZastavitFilm"/>
+    <cd:variable name="PauseMovie" value="PozastavitFilm"/>
+    <cd:variable name="ResumeMovie" value="PokracovatFilm"/>
+    <cd:variable name="StartSound" value="StartZvuk"/>
+    <cd:variable name="StopSound" value="StopZvuk"/>
+    <cd:variable name="PauseSound" value="PozastavitZvuk"/>
+    <cd:variable name="ResumeSound" value="PokracovatZvuk"/>
+    <cd:variable name="StartRendering" value="StartRendering"/>
+    <cd:variable name="StopRendering" value="StopRendering"/>
+    <cd:variable name="PauseRendering" value="PauseRendering"/>
+    <cd:variable name="ResumeRendering" value="ResumeRendering"/>
+    <cd:variable name="SaveForm" value="UlozitFormular"/>
+    <cd:variable name="LoadForm" value="NacistFormular"/>
+    <cd:variable name="ResetForm" value="ResetFormulare"/>
+    <cd:variable name="SubmitForm" value="PoslatFormular"/>
+    <cd:variable name="HideField" value="SkryjPole"/>
+    <cd:variable name="ShowField" value="UkazPole"/>
+    <cd:variable name="FitWidth" value="FitWidth"/>
+    <cd:variable name="FitHeight" value="FitHeight"/>
+    <cd:variable name="HideLayer" value="HideLayer"/>
+    <cd:variable name="VideLayer" value="VideLayer"/>
+    <cd:variable name="ToggleLayer" value="ToggleLayer"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="New" value="Novy"/>
+    <cd:variable name="Balloon" value="Bublinka"/>
+    <cd:variable name="Addition" value="Pridavek"/>
+    <cd:variable name="Help" value="Napoveda"/>
+    <cd:variable name="Paragraph" value="Odstavec"/>
+    <cd:variable name="Key" value="Klavesa"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="bet" value="bet"/>
+    <cd:constant name="dat" value="dat"/>
+    <cd:constant name="ken" value="ken"/>
+    <cd:constant name="ref" value="ref"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="formeel" value="formeel"/>
+    <cd:variable name="informeel" value="informeel"/>
+    <cd:variable name="rekening" value="rekening"/>
+    <cd:variable name="sticker" value="sticker"/>
+    <cd:variable name="sheet" value="sheet"/>
+    <cd:variable name="brief" value="brief"/>
+    <cd:variable name="ls" value="ls"/>
+  </cd:variables>
+
+  <cd:commands>
+    <cd:command name="language" value="jazyk"/>
+    <cd:command name="mainlanguage" value="hlavnijazyk"/>
+    <cd:command name="translate" value="prelozit"/>
+    <cd:command name="installlanguage" value="instalacejazyka"/>
+    <cd:command name="setuplanguage" value="nastavjazyk"/>
+    <cd:command name="showmakeup" value="ukazupravu"/>
+    <cd:command name="useencoding" value="uzijkodovani"/>
+    <cd:command name="usespecials" value="uzijspeciality"/>
+    <cd:command name="defineoutput" value="definujvystup"/>
+    <cd:command name="setupoutput" value="nastavvystup"/>
+    <cd:command name="defineaccent" value="definujakcent"/>
+    <cd:command name="definecharacter" value="definujznak"/>
+    <cd:command name="definecommand" value="definujprikaz"/>
+    <cd:command name="startcoding" value="startkodovani"/>
+    <cd:command name="stopcoding" value="stopkodovani"/>
+    <cd:command name="definebodyfontenvironment" value="definujprostredizakladnihofontu"/>
+    <cd:command name="setupbodyfontenvironment" value="nastavprostredizakladnihofontu"/>
+    <cd:command name="definebodyfont" value="definujzakladnifont"/>
+    <cd:command name="definefont" value="definujfont"/>
+    <cd:command name="definefontsynonym" value="definujsynonumumfontu"/>
+    <cd:command name="definestyle" value="definujstyl"/>
+    <cd:command name="definefontstyle" value="definujstylfontu"/>
+    <cd:command name="setupstrut" value="setupstrut"/>
+    <cd:command name="setuptype" value="nastavtype"/>
+    <cd:command name="type" value="opis"/>
+    <cd:command name="typ" value="pis"/>
+    <cd:command name="arg" value="arg"/>
+    <cd:command name="tex" value="tex"/>
+    <cd:command name="definetyping" value="definujopis"/>
+    <cd:command name="definetype" value="definetype"/>
+    <cd:command name="setuptyping" value="nastavopis"/>
+    <cd:command name="typefile" value="opissoubor"/>
+    <cd:command name="setupfootnotes" value="nastavpoznamkypodcarou"/>
+    <cd:command name="setupfootnotedefinition" value="nastavdefinicipoznamekpodcarou"/>
+    <cd:command name="note" value="poznamka"/>
+    <cd:command name="footnote" value="poznamkapodcarou"/>
+    <cd:command name="footnotetext" value="footnotetext"/>
+    <cd:command name="startlocalfootnotes" value="startlokalnipoznamkypodcarou"/>
+    <cd:command name="stoplocalfootnotes" value="stoplokalnipoznamkypodcarou"/>
+    <cd:command name="placelocalfootnotes" value="umistilokalnipoznamkypodcarou"/>
+    <cd:command name="placefootnotes" value="umistipoznamkypodcarou"/>
+    <cd:command name="currentdate" value="aktualnidatum"/>
+    <cd:command name="date" value="datum"/>
+    <cd:command name="weekday" value="vsedniden"/>
+    <cd:command name="WEEKDAY" value="VSEDNIDEN"/>
+    <cd:command name="month" value="mesic"/>
+    <cd:command name="MONTH" value="MESIC"/>
+    <cd:command name="Numbers" value="Cisla"/>
+    <cd:command name="numbers" value="cisla"/>
+    <cd:command name="romannumerals" value="rimskecislice"/>
+    <cd:command name="Romannumerals" value="Rimskecislice"/>
+    <cd:command name="character" value="znak"/>
+    <cd:command name="Character" value="Znak"/>
+    <cd:command name="characters" value="znaky"/>
+    <cd:command name="Characters" value="Znaky"/>
+    <cd:command name="unknown" value="neznamo"/>
+    <cd:command name="definesymbol" value="definujsymbol"/>
+    <cd:command name="definefiguresymbol" value="definujobrazeksymbol"/>
+    <cd:command name="symbol" value="symbol"/>
+    <cd:command name="setupsymbolset" value="nastavsadusymbolu"/>
+    <cd:command name="showsymbolset" value="ukazsadusymbolu"/>
+    <cd:command name="startsymbolset" value="startsadasymbolu"/>
+    <cd:command name="usesymbols" value="uzijsymbol"/>
+    <cd:command name="defineconversion" value="definujkonverzi"/>
+    <cd:command name="convertnumber" value="konvertujcislo"/>
+    <cd:command name="setupcapitals" value="nastavkapitalky"/>
+    <cd:command name="smallcapped" value="kap"/>
+    <cd:command name="notsmallcapped" value="nokap"/>
+    <cd:command name="CAPPED" value="KAP"/>
+    <cd:command name="SmallCapped" value="Kap"/>
+    <cd:command name="SmallCaps" value="Kaps"/>
+    <cd:command name="WORD" value="SLOVO"/>
+    <cd:command name="WORDS" value="SLOVA"/>
+    <cd:command name="Word" value="Slovo"/>
+    <cd:command name="Words" value="Slova"/>
+    <cd:command name="stretched" value="roztazene"/>
+    <cd:command name="overstrike" value="preskrtnuto"/>
+    <cd:command name="overstrikes" value="preskrtnuti"/>
+    <cd:command name="overbar" value="nadtrzeno"/>
+    <cd:command name="overbars" value="nadtrzeni"/>
+    <cd:command name="underbar" value="podtrzeno"/>
+    <cd:command name="underbars" value="podtrzeni"/>
+    <cd:command name="setupunderbar" value="nastavpodtrzeni"/>
+    <cd:command name="setupbodyfont" value="nastavzakladnifont"/>
+    <cd:command name="switchtobodyfont" value="prepninazakladnifont"/>
+    <cd:command name="showbodyfont" value="ukazzakladnifont"/>
+    <cd:command name="showbodyfontenvironment" value="ukazpostredizakladnihofontu"/>
+    <cd:command name="headtext" value="texthlavicky"/>
+    <cd:command name="labeltext" value="textpopisku"/>
+    <cd:command name="LABELTEXT" value="TEXTPOPISKU"/>
+    <cd:command name="setupheadtext" value="nastavtexthlavicky"/>
+    <cd:command name="setuplabeltext" value="nastavtextpopisku"/>
+    <cd:command name="marginrule" value="marginalnilinka"/>
+    <cd:command name="startmarginrule" value="startmarginalnilinka"/>
+    <cd:command name="stopmarginrule" value="stopmarginalnilinka"/>
+    <cd:command name="setupmarginrules" value="nastavmarginalnilinky"/>
+    <cd:command name="blackrule" value="cernalinka"/>
+    <cd:command name="blackrules" value="cernelinky"/>
+    <cd:command name="setupblackrules" value="nastavcernelinky"/>
+    <cd:command name="setupscreens" value="nastavrastr"/>
+    <cd:command name="framed" value="oramovani"/>
+    <cd:command name="inframed" value="zaramovani"/>
+    <cd:command name="mframed" value="maoramovani"/>
+    <cd:command name="inmframed" value="mazaramovani"/>
+    <cd:command name="setupframed" value="nastavoramovani"/>
+    <cd:command name="setuplinewidth" value="nastavsirkucary"/>
+    <cd:command name="setupthinrules" value="nastavtenkelinky"/>
+    <cd:command name="thinrule" value="tenkalinka"/>
+    <cd:command name="thinrules" value="tenkelinky"/>
+    <cd:command name="hairline" value="vlasovalinka"/>
+    <cd:command name="vl" value="vl"/>
+    <cd:command name="hl" value="hl"/>
+    <cd:command name="defineframed" value="definujoramovani"/>
+    <cd:command name="defineframedtext" value="definujoramovanytext"/>
+    <cd:command name="setupframedtexts" value="nastavoramovanetexty"/>
+    <cd:command name="defineoverlay" value="definujprekryv"/>
+    <cd:command name="definelayer" value="definelayer"/>
+    <cd:command name="background" value="pozadi"/>
+    <cd:command name="startbackground" value="startpozadi"/>
+    <cd:command name="stopbackground" value="stoppozadi"/>
+    <cd:command name="setupbackground" value="nastavpozadi"/>
+    <cd:command name="fillinrules" value="vyplnovelinky"/>
+    <cd:command name="setupfillinrules" value="nastavvyplnovelinky"/>
+    <cd:command name="fillintext" value="vyplnenytext"/>
+    <cd:command name="setupfillinlines" value="nastavvyplnoveradky"/>
+    <cd:command name="fillinline" value="vyplnovyradek"/>
+    <cd:command name="setuptextrules" value="nastavtextovelinky"/>
+    <cd:command name="textrule" value="textovalinka"/>
+    <cd:command name="starttextrule" value="starttextovalinka"/>
+    <cd:command name="stoptextrule" value="stoptextovalinka"/>
+    <cd:command name="usemodule" value="uzijmodul"/>
+    <cd:command name="usemodules" value="uzijmoduly"/>
+    <cd:command name="starttext" value="starttext"/>
+    <cd:command name="stoptext" value="stoptext"/>
+    <cd:command name="margintitle" value="marginalninadpis"/>
+    <cd:command name="marginword" value="marginalnislovo"/>
+    <cd:command name="margintext" value="marginalnitext"/>
+    <cd:command name="inleft" value="vlevo"/>
+    <cd:command name="inmargin" value="naokraj"/>
+    <cd:command name="inothermargin" value="nadruhyokraj"/>
+    <cd:command name="inright" value="vpravo"/>
+    <cd:command name="ininner" value="ininner"/>
+    <cd:command name="inouter" value="inouter"/>
+    <cd:command name="startmarginblock" value="startmarginalniblok"/>
+    <cd:command name="stopmarginblock" value="stopmarginalniblok"/>
+    <cd:command name="defineinmargin" value="defineinmargin"/>
+    <cd:command name="setupinmargin" value="nastavmarginalie"/>
+    <cd:command name="setupmarginblocks" value="nastavmarginalniblok"/>
+    <cd:command name="inleftedge" value="nalevo"/>
+    <cd:command name="inleftmargin" value="nalevyokraj"/>
+    <cd:command name="inrightmargin" value="napravyokraj"/>
+    <cd:command name="inrightedge" value="napravo"/>
+    <cd:command name="atleftmargin" value="atleftmargin"/>
+    <cd:command name="atrightmargin" value="atrightmargin"/>
+    <cd:command name="wordright" value="slovovpravo"/>
+    <cd:command name="defineblank" value="definujpreskok"/>
+    <cd:command name="blank" value="preskoc"/>
+    <cd:command name="setupblank" value="nastavpreskok"/>
+    <cd:command name="correctwhitespace" value="korekcebilehomista"/>
+    <cd:command name="fixedspaces" value="tvrdemezery"/>
+    <cd:command name="fixedspace" value="tvrdamezera"/>
+    <cd:command name="nospace" value="zadnamezera"/>
+    <cd:command name="space" value="mezera"/>
+    <cd:command name="nowhitespace" value="zadnebilemisto"/>
+    <cd:command name="packed" value="zhustene"/>
+    <cd:command name="startpacked" value="startzhustene"/>
+    <cd:command name="stoppacked" value="stopzhustene"/>
+    <cd:command name="startunpacked" value="startnezhustene"/>
+    <cd:command name="stopunpacked" value="stopnezhustene"/>
+    <cd:command name="startlinecorrection" value="startkorekceradku"/>
+    <cd:command name="stoplinecorrection" value="stopkorekceradku"/>
+    <cd:command name="godown" value="jdidolu"/>
+    <cd:command name="whitespace" value="bilemisto"/>
+    <cd:command name="noindenting" value="zadneodsazovani"/>
+    <cd:command name="indenting" value="odsazovani"/>
+    <cd:command name="setupindenting" value="nastavodsazovani"/>
+    <cd:command name="startalignment" value="startzarovnavani"/>
+    <cd:command name="stopalignment" value="stopzarovnavani"/>
+    <cd:command name="startlines" value="startradky"/>
+    <cd:command name="stoplines" value="stopradky"/>
+    <cd:command name="setupparagraphnumbering" value="nastavcislovaniodstavcu"/>
+    <cd:command name="setuplinenumbering" value="nastavcislovaniradku"/>
+    <cd:command name="startlinenumbering" value="startcislovaniradku"/>
+    <cd:command name="stoplinenumbering" value="stopcislovaniradku"/>
+    <cd:command name="startline" value="startradek"/>
+    <cd:command name="stopline" value="stopradek"/>
+    <cd:command name="someline" value="nejakyradek"/>
+    <cd:command name="inline" value="vradku"/>
+    <cd:command name="crlf" value="crlf"/>
+    <cd:command name="emptylines" value="emptylines"/>
+    <cd:command name="setuplines" value="nastavradky"/>
+    <cd:command name="startnarrower" value="startzuzeni"/>
+    <cd:command name="stopnarrower" value="stopzuzeni"/>
+    <cd:command name="setupnarrower" value="nastavzuzeni"/>
+    <cd:command name="definetabulate" value="definujtabelaci"/>
+    <cd:command name="setuptabulate" value="nastavtabelaci"/>
+    <cd:command name="starttable" value="starttabulka"/>
+    <cd:command name="stoptable" value="stoptabulka"/>
+    <cd:command name="starttables" value="starttabulky"/>
+    <cd:command name="stoptables" value="stoptabulky"/>
+    <cd:command name="setuptables" value="nastavtabulky"/>
+    <cd:command name="definetabletemplate" value="definujsablonutabulky"/>
+    <cd:command name="page" value="strana"/>
+    <cd:command name="testcolumn" value="testcolumn"/>
+    <cd:command name="testpage" value="testpage"/>
+    <cd:command name="couplepage" value="parovastrana"/>
+    <cd:command name="pagetype" value="typstrany"/>
+    <cd:command name="processpage" value="zpracujstranu"/>
+    <cd:command name="couplepaper" value="dvoustrannypapir"/>
+    <cd:command name="selectpaper" value="vyberpapir"/>
+    <cd:command name="screen" value="obrazovka"/>
+    <cd:command name="definesection" value="definujsekci"/>
+    <cd:command name="definesectionblock" value="definujbloksekce"/>
+    <cd:command name="setupsectionblock" value="nastavbloksekce"/>
+    <cd:command name="setupsection" value="nastavsekci"/>
+    <cd:command name="notopandbottomlines" value="zadnehorniadolniradky"/>
+    <cd:command name="noheaderandfooterlines" value="zadnezahlaviaupati"/>
+    <cd:command name="setuptop" value="nastavhorejsek"/>
+    <cd:command name="setuptoptexts" value="nastavhornitexty"/>
+    <cd:command name="setupheader" value="nastavzahlavi"/>
+    <cd:command name="setupheadertexts" value="nastavtextyzahlavi"/>
+    <cd:command name="setuppagenumbering" value="nastavcislovanistran"/>
+    <cd:command name="getnumber" value="getnumber"/>
+    <cd:command name="incrementnumber" value="zvysujicicislo"/>
+    <cd:command name="decrementnumber" value="decrementnumber"/>
+    <cd:command name="resetnumber" value="resetnumber"/>
+    <cd:command name="setnumber" value="setnumber"/>
+    <cd:command name="setupnumber" value="setupnumber"/>
+    <cd:command name="setupbottom" value="nastavspodek"/>
+    <cd:command name="setupbottomtexts" value="nastavdolnitexty"/>
+    <cd:command name="setupfooter" value="nastavupati"/>
+    <cd:command name="setupfootertexts" value="nastavtextyupati"/>
+    <cd:command name="setuppagenumber" value="nastavcislostrany"/>
+    <cd:command name="setupsubpagenumber" value="nastavpodcislostrany"/>
+    <cd:command name="subpagenumber" value="subpagenumber"/>
+    <cd:command name="setuptext" value="nastavtext"/>
+    <cd:command name="setuptexttexts" value="nastavtexttexty"/>
+    <cd:command name="definetext" value="definujtext"/>
+    <cd:command name="pagenumber" value="cislostrany"/>
+    <cd:command name="completepagenumber" value="completepagenumber"/>
+    <cd:command name="placepagenumber" value="placepagenumber"/>
+    <cd:command name="items" value="polozky"/>
+    <cd:command name="setupitems" value="nastavpolozky"/>
+    <cd:command name="leftaligned" value="zarovnanovlevo"/>
+    <cd:command name="midaligned" value="zarovnanonastred"/>
+    <cd:command name="rightaligned" value="zarovnanovpravo"/>
+    <cd:command name="startcolumns" value="startsloupce"/>
+    <cd:command name="stopcolumns" value="stopsloupce"/>
+    <cd:command name="setupcolumns" value="nastavsloupce"/>
+    <cd:command name="column" value="sloupec"/>
+    <cd:command name="head" value="nadpis"/>
+    <cd:command name="but" value="spodek"/>
+    <cd:command name="item" value="polozka"/>
+    <cd:command name="nop" value="nop"/>
+    <cd:command name="mar" value="okr"/>
+    <cd:command name="sym" value="sym"/>
+    <cd:command name="its" value="pol"/>
+    <cd:command name="ran" value="ran"/>
+    <cd:command name="headsym" value="headsym"/>
+    <cd:command name="defineitemgroup" value="defineitemgroup"/>
+    <cd:command name="setupitemgroup" value="setupitemgroup"/>
+    <cd:command name="setupitemgroups" value="setupitemgroups"/>
+    <cd:command name="definehead" value="definujnadpis"/>
+    <cd:command name="setuphead" value="nastavnadpis"/>
+    <cd:command name="setupheads" value="nastavnadpisy"/>
+    <cd:command name="setupheadnumber" value="nastavcislonadpisu"/>
+    <cd:command name="headnumber" value="cislonadpisu"/>
+    <cd:command name="currentheadnumber" value="aktualnicislonadpisu"/>
+    <cd:command name="determineheadnumber" value="stanovcislonadpisu"/>
+    <cd:command name="resetmarking" value="resetznaceni"/>
+    <cd:command name="setupmarking" value="nastavznaceni"/>
+    <cd:command name="definemarking" value="definujznaceni"/>
+    <cd:command name="nomarking" value="zadneznaceni"/>
+    <cd:command name="marking" value="znaceni"/>
+    <cd:command name="decouplemarking" value="rozpojeneznaceni"/>
+    <cd:command name="couplemarking" value="propojeneznaceni"/>
+    <cd:command name="getmarking" value="ziskejznaceni"/>
+    <cd:command name="definelayout" value="definelayout"/>
+    <cd:command name="setuplayout" value="nastavvzhled"/>
+    <cd:command name="adaptlayout" value="prizpusobvzhled"/>
+    <cd:command name="placeongrid" value="umistinamrizku"/>
+    <cd:command name="moveongrid" value="premistinamrizku"/>
+    <cd:command name="showsetups" value="ukaznastaveni"/>
+    <cd:command name="showframe" value="ukazramecek"/>
+    <cd:command name="showgrid" value="ukazmrizku"/>
+    <cd:command name="showlayout" value="ukazvzhled"/>
+    <cd:command name="showprint" value="ukazvytisk"/>
+    <cd:command name="showstruts" value="ukazpodpery"/>
+    <cd:command name="definepapersize" value="definujvelikostpapiru"/>
+    <cd:command name="setuppapersize" value="nastavvelikostpapiru"/>
+    <cd:command name="setuppaper" value="setuppaper"/>
+    <cd:command name="setuparranging" value="nastavusporadani"/>
+    <cd:command name="version" value="verze"/>
+    <cd:command name="setupbackgrounds" value="nastavpozadi"/>
+    <cd:command name="setupalign" value="nastavzarovnani"/>
+    <cd:command name="setupwhitespace" value="nastavbilamista"/>
+    <cd:command name="setupinteraction" value="nastavinterakci"/>
+    <cd:command name="setupinteractionmenu" value="nastavinterakcnimenu"/>
+    <cd:command name="defineinteractionmenu" value="definujinterakcnimenu"/>
+    <cd:command name="disableinteractionmenu" value="zablokujinterakcnimenu"/>
+    <cd:command name="interactionmenu" value="interaktivnimenu"/>
+    <cd:command name="interactionbuttons" value="interakcnitlacitka"/>
+    <cd:command name="interactionbar" value="interakcnilista"/>
+    <cd:command name="setupinteractionbar" value="nastavinterakcnilistu"/>
+    <cd:command name="setupinteractionscreen" value="nastavinterakcniobrazovku"/>
+    <cd:command name="placebookmarks" value="umistizalozky"/>
+    <cd:command name="bookmark" value="zalozka"/>
+    <cd:command name="definelogo" value="definujlogo"/>
+    <cd:command name="placelogos" value="umistiloga"/>
+    <cd:command name="definecolor" value="definujbarvu"/>
+    <cd:command name="definecolorgroup" value="definujskupinubarev"/>
+    <cd:command name="definepalet" value="definujpaletu"/>
+    <cd:command name="graycolor" value="sedabarva"/>
+    <cd:command name="color" value="barva"/>
+    <cd:command name="startcolor" value="startbarva"/>
+    <cd:command name="stopcolor" value="stopbarva"/>
+    <cd:command name="setupcolors" value="nastavbarvy"/>
+    <cd:command name="setupcolor" value="nastavbarvu"/>
+    <cd:command name="setuppalet" value="nastavpaletu"/>
+    <cd:command name="showcolor" value="ukazbarvu"/>
+    <cd:command name="showcolorgroup" value="ukazskupinubarev"/>
+    <cd:command name="showpalet" value="ukazpaletu"/>
+    <cd:command name="comparecolorgroup" value="porovnejskupinubarev"/>
+    <cd:command name="comparepalet" value="porovnejpaletu"/>
+    <cd:command name="colorvalue" value="hodnotabarvy"/>
+    <cd:command name="greyvalue" value="hodnotasedi"/>
+    <cd:command name="startraster" value="startrastr"/>
+    <cd:command name="stopraster" value="stoprastr"/>
+    <cd:command name="defineblock" value="definujblok"/>
+    <cd:command name="setupblock" value="nastavblok"/>
+    <cd:command name="useblocks" value="uzijbloky"/>
+    <cd:command name="processblocks" value="zpracujbloky"/>
+    <cd:command name="keepblocks" value="zachovejbloky"/>
+    <cd:command name="selectblocks" value="vyberbloky"/>
+    <cd:command name="hideblocks" value="schovejbloky"/>
+    <cd:command name="bypassblocks" value="bypassblocks"/>
+    <cd:command name="forceblocks" value="forceblocks"/>
+    <cd:command name="nomoreblocks" value="zadnedalsibloky"/>
+    <cd:command name="definelist" value="definujseznam"/>
+    <cd:command name="definecombinedlist" value="definujkombinovanyseznam"/>
+    <cd:command name="listsymbol" value="listsymbol"/>
+    <cd:command name="placelist" value="umistiseznam"/>
+    <cd:command name="plaatsruwelijst" value="placerawlist"/>
+    <cd:command name="placecombinedlist" value="umistikombinovanyseznam"/>
+    <cd:command name="writetolist" value="zapisdoseznamu"/>
+    <cd:command name="writebetweenlist" value="zapismeziseznam"/>
+    <cd:command name="immediatetolist" value="immediatetolist"/>
+    <cd:command name="immediatebetweenlist" value="immediatebetweenlist"/>
+    <cd:command name="setuplist" value="nastavseznam"/>
+    <cd:command name="setupcombinedlist" value="nastavkombinovanyseznam"/>
+    <cd:command name="determinelistcharacteristics" value="stanovcharakteristickuseznamu"/>
+    <cd:command name="listlength" value="delkaseznamu"/>
+    <cd:command name="listwidth" value="sirkaseznamu"/>
+    <cd:command name="listheight" value="vyskaseznamu"/>
+    <cd:command name="nolist" value="zadnyseznam"/>
+    <cd:command name="definereferencelist" value="definujseznamodkazu"/>
+    <cd:command name="placereferencelist" value="umistiseznamodkazu"/>
+    <cd:command name="writetoreferencelist" value="zapisdoseznamuodkazu"/>
+    <cd:command name="setupreferencelist" value="nastavseznamodkazu"/>
+    <cd:command name="definefloat" value="definujplvouciobjekt"/>
+    <cd:command name="setupfloat" value="nastavplvouciobjekt"/>
+    <cd:command name="setupfloats" value="nastavplvouciobjekty"/>
+    <cd:command name="splitfloat" value="rozdelplvouciobjekt"/>
+    <cd:command name="setupfloatsplitting" value="nastavdeleniplvoucichobjektu"/>
+    <cd:command name="placefloat" value="placefloat"/>
+    <cd:command name="movesidefloat" value="movesidefloat"/>
+    <cd:command name="defineplacement" value="defineplacement"/>
+    <cd:command name="setupplacement" value="setupplacement"/>
+    <cd:command name="definecombination" value="definecombination"/>
+    <cd:command name="startcombination" value="startspojeni"/>
+    <cd:command name="stopcombination" value="stopspojeni"/>
+    <cd:command name="placesidebyside" value="umistivedlesebe"/>
+    <cd:command name="placeontopofeachother" value="umistinadsebe"/>
+    <cd:command name="setupcaption" value="nastavpopisek"/>
+    <cd:command name="setupcaptions" value="nastavpopisky"/>
+    <cd:command name="setupcombinations" value="nastavspojeni"/>
+    <cd:command name="startoverlay" value="startprekryv"/>
+    <cd:command name="stopoverlay" value="stopprekryv"/>
+    <cd:command name="defineregister" value="definujrejstrik"/>
+    <cd:command name="coupleregister" value="propojenyrejstrik"/>
+    <cd:command name="setupregister" value="nastavrejstrik"/>
+    <cd:command name="writetoregister" value="zapisdorejstriku"/>
+    <cd:command name="completeregister" value="completeregister"/>
+    <cd:command name="placeregister" value="umistirejstrik"/>
+    <cd:command name="determineregistercharacteristics" value="urcicharakteristikurejstriku"/>
+    <cd:command name="definesorting" value="definujtrideni"/>
+    <cd:command name="definesynonyms" value="definujsynonyma"/>
+    <cd:command name="setupsorting" value="nastavtrideni"/>
+    <cd:command name="setupsynonyms" value="nastavsynonyma"/>
+    <cd:command name="startsynchronization" value="startsynchronizace"/>
+    <cd:command name="stopsynchronization" value="stopsynchronizace"/>
+    <cd:command name="setupsynchronizationbar" value="nastavsynchronizacnilistu"/>
+    <cd:command name="setupsynchronization" value="nastavsynchronizaci"/>
+    <cd:command name="synchronizationbar" value="synchronizacnilista"/>
+    <cd:command name="synchronize" value="synchronizovat"/>
+    <cd:command name="useexternaldocument" value="uzijexternidokument"/>
+    <cd:command name="useURL" value="uzijURL"/>
+    <cd:command name="useurl" value="uzijurl"/>
+    <cd:command name="setupurl" value="nastavurl"/>
+    <cd:command name="coupledocument" value="propojenydokument"/>
+    <cd:command name="setupprograms" value="nastavprogramy"/>
+    <cd:command name="defineprogram" value="definujprogram"/>
+    <cd:command name="program" value="program"/>
+    <cd:command name="setuppagetransitions" value="nastavprechodstrany"/>
+    <cd:command name="defineprofile" value="definujprofil"/>
+    <cd:command name="defineversion" value="definujverzi"/>
+    <cd:command name="markversion" value="oznacverzi"/>
+    <cd:command name="selectversion" value="vyberverzi"/>
+    <cd:command name="startprofile" value="startprofil"/>
+    <cd:command name="startversion" value="startverze"/>
+    <cd:command name="setupprofiles" value="nastavprofily"/>
+    <cd:command name="setupversions" value="nastavverze"/>
+    <cd:command name="stopprofile" value="stopprofil"/>
+    <cd:command name="stopversion" value="stopverze"/>
+    <cd:command name="followprofile" value="dodrzujprofil"/>
+    <cd:command name="followprofileversion" value="dodrzujverziprofilu"/>
+    <cd:command name="followversion" value="dodrzujverzi"/>
+    <cd:command name="definedescription" value="definujpopis"/>
+    <cd:command name="definelabel" value="definujpopisek"/>
+    <cd:command name="defineenumeration" value="definujvycet"/>
+    <cd:command name="defineindenting" value="definujodsazovani"/>
+    <cd:command name="setupdescriptions" value="nastavpopisy"/>
+    <cd:command name="setupenumerations" value="nastavvycty"/>
+    <cd:command name="setupindentations" value="nastavodsazovani"/>
+    <cd:command name="setuptab" value="nastavtab"/>
+    <cd:command name="tab" value="tab"/>
+    <cd:command name="setupexternalfigures" value="nastavexterniobrazy"/>
+    <cd:command name="showexternalfigures" value="ukazexterniobrazy"/>
+    <cd:command name="externalfigure" value="externiobraz"/>
+    <cd:command name="useexternalfigure" value="uzijexterniobraz"/>
+    <cd:command name="startfigure" value="startobraz"/>
+    <cd:command name="referring" value="odkazujici"/>
+    <cd:command name="remark" value="oznaceni"/>
+    <cd:command name="colorbar" value="barevnalista"/>
+    <cd:command name="grid" value="mrizka"/>
+    <cd:command name="button" value="tlacitko"/>
+    <cd:command name="menubutton" value="tlacitkomenu"/>
+    <cd:command name="setupbuttons" value="nastavtlacitka"/>
+    <cd:command name="usereferences" value="uzijodkazy"/>
+    <cd:command name="reflijst" value="seznamodkazu"/>
+    <cd:command name="stelreferentielijstin" value="nastavseznamodkazu"/>
+    <cd:command name="setupreferencing" value="nastavodkazovani"/>
+    <cd:command name="textreference" value="odkaznatext"/>
+    <cd:command name="pagereference" value="odkaznastranu"/>
+    <cd:command name="reference" value="odkaz"/>
+    <cd:command name="definereference" value="definujodkaz"/>
+    <cd:command name="definereferenceformat" value="definujformatodkazu"/>
+    <cd:command name="useJSscripts" value="uzijJSscripts"/>
+    <cd:command name="from" value="zref"/>
+    <cd:command name="in" value="tref"/>
+    <cd:command name="at" value="pref"/>
+    <cd:command name="about" value="oref"/>
+    <cd:command name="goto" value="jdina"/>
+    <cd:command name="atpage" value="nastrane"/>
+    <cd:command name="somewhere" value="nekde"/>
+    <cd:command name="navigating" value="navigating"/>
+    <cd:command name="ref" value="ref"/>
+    <cd:command name="gotobox" value="jdinabox"/>
+    <cd:command name="gotopage" value="jdinastranu"/>
+    <cd:command name="placeformula" value="umistirovnici"/>
+    <cd:command name="placesubformula" value="umistipodrovnici"/>
+    <cd:command name="moveformula" value="moveformula"/>
+    <cd:command name="setupformulas" value="nastavrovnice"/>
+    <cd:command name="formulanumber" value="cislorovnice"/>
+    <cd:command name="subformulanumber" value="cislopodrovnice"/>
+    <cd:command name="leg" value="leg"/>
+    <cd:command name="fact" value="fakt"/>
+    <cd:command name="mathematics" value="matematika"/>
+    <cd:command name="dimension" value="rozmer"/>
+    <cd:command name="nodimension" value="zadnyrozmer"/>
+    <cd:command name="startenvironment" value="startprostredi"/>
+    <cd:command name="stopenvironment" value="stopprostredi"/>
+    <cd:command name="startcomponent" value="startkomponenta"/>
+    <cd:command name="stopcomponent" value="stopkomponenta"/>
+    <cd:command name="startproduct" value="startprodukt"/>
+    <cd:command name="stopproduct" value="stopprodukt"/>
+    <cd:command name="startproject" value="startprojekt"/>
+    <cd:command name="stopproject" value="stopprojekt"/>
+    <cd:command name="setups" value="nastaveni"/>
+    <cd:command name="project" value="projekt"/>
+    <cd:command name="component" value="komponenta"/>
+    <cd:command name="produxt" value="produkt"/>
+    <cd:command name="environment" value="prostredi"/>
+    <cd:command name="nomorefiles" value="zadnedalsisoubory"/>
+    <cd:command name="getbuffer" value="ziskejbuffer"/>
+    <cd:command name="setupbuffer" value="nastavbuffer"/>
+    <cd:command name="typebuffer" value="typebuffer"/>
+    <cd:command name="definebuffer" value="definujbuffer"/>
+    <cd:command name="unitmeaning" value="vyznam"/>
+    <cd:command name="infull" value="plnezneni"/>
+    <cd:command name="quotation" value="citace"/>
+    <cd:command name="quote" value="citovat"/>
+    <cd:command name="startquotation" value="startcitace"/>
+    <cd:command name="stopquotation" value="stopcitace"/>
+    <cd:command name="setupquote" value="nastavcitaci"/>
+    <cd:command name="define" value="definuj"/>
+    <cd:command name="redo" value="opakovat"/>
+    <cd:command name="usecommands" value="uzijprikazy"/>
+    <cd:command name="definestartstop" value="definujstartstop"/>
+    <cd:command name="setupstartstop" value="setupstartstop"/>
+    <cd:command name="startlocal" value="startlokalni"/>
+    <cd:command name="stoplocal" value="stoplokalni"/>
+    <cd:command name="startglobal" value="startglobalni"/>
+    <cd:command name="stopglobal" value="stopglobalni"/>
+    <cd:command name="macroname" value="jmeno"/>
+    <cd:command name="definemakeup" value="definujupravu"/>
+    <cd:command name="setupmakeup" value="nastavupravu"/>
+    <cd:command name="startmakeup" value="startuprava"/>
+    <cd:command name="stopmakeup" value="stopuprava"/>
+    <cd:command name="useexternalsoundtrack" value="uzijexternizvuk"/>
+    <cd:command name="useexternalfile" value="uzijexternisoubor"/>
+    <cd:command name="useexternalfiles" value="uzijexternisoubory"/>
+    <cd:command name="referral" value="odkaz"/>
+    <cd:command name="referraldate" value="odkaznadatum"/>
+    <cd:command name="high" value="vysoky"/>
+    <cd:command name="lohi" value="nivy"/>
+    <cd:command name="low" value="nizky"/>
+    <cd:command name="fraction" value="zlomek"/>
+    <cd:command name="chem" value="chem"/>
+    <cd:command name="startopposite" value="startprotejsek"/>
+    <cd:command name="stopopposite" value="stopprotejsek"/>
+    <cd:command name="setupoppositeplacing" value="nastavumisteniprotejsku"/>
+    <cd:command name="startpositioning" value="startumistovani"/>
+    <cd:command name="stoppositioning" value="stopumistovani"/>
+    <cd:command name="position" value="pozice"/>
+    <cd:command name="setuppositioning" value="nastavumistovani"/>
+    <cd:command name="rotate" value="otocit"/>
+    <cd:command name="setuprotate" value="nastavotoceni"/>
+    <cd:command name="mirror" value="zrcadlit"/>
+    <cd:command name="scale" value="meritko"/>
+    <cd:command name="setupnumbering" value="nastavcislovani"/>
+    <cd:command name="reset" value="reset"/>
+    <cd:command name="setuppublications" value="nastavpublikace"/>
+    <cd:command name="publication" value="publikace"/>
+    <cd:command name="definehbox" value="definujhbox"/>
+    <cd:command name="adding" value="scitani"/>
+    <cd:command name="periods" value="tecky"/>
+    <cd:command name="setuphyphenmark" value="nastavdelitko"/>
+    <cd:command name="setupinterlinespace" value="nastavmeziradkovoumezeru"/>
+    <cd:command name="setupspacing" value="nastavradkovani"/>
+    <cd:command name="setuptolerance" value="nastavtoleranci"/>
+    <cd:command name="setupsystem" value="nastavsystem"/>
+    <cd:command name="usepath" value="uzijadresar"/>
+    <cd:command name="defineparagraphs" value="definujodstavce"/>
+    <cd:command name="setupparagraphs" value="nastavodstavce"/>
+    <cd:command name="donttest" value="zadnytest"/>
+    <cd:command name="setupcomment" value="nastavkomentar"/>
+    <cd:command name="comment" value="komentar"/>
+    <cd:command name="definefield" value="definujpole"/>
+    <cd:command name="definemainfield" value="definujhlavnipole"/>
+    <cd:command name="definesubfield" value="definujpodpole"/>
+    <cd:command name="clonefield" value="klonujpole"/>
+    <cd:command name="copyfield" value="kopirujpole"/>
+    <cd:command name="setupfield" value="nastavpole"/>
+    <cd:command name="setupfields" value="nastavvsechnapole"/>
+    <cd:command name="field" value="pole"/>
+    <cd:command name="fitfield" value="prizpusobivepole"/>
+    <cd:command name="logfields" value="zaznamovepole"/>
+    <cd:command name="showfields" value="ukazpole"/>
+    <cd:command name="tooltip" value="bublinkovanapoveda"/>
+    <cd:command name="fillinfield" value="vyplnovepole"/>
+    <cd:command name="definefieldstack" value="definujzasobnikpoli"/>
+    <cd:command name="fieldstack" value="zasobnikpoli"/>
+    <cd:command name="setupforms" value="setupforms"/>
+    <cd:command name="setupclipping" value="nastavorez"/>
+    <cd:command name="clip" value="orez"/>
+    <cd:command name="placelegend" value="umistilegendu"/>
+    <cd:command name="setuplegend" value="nastavlegendu"/>
+    <cd:command name="setuppagecomment" value="nastavkomentarstrany"/>
+    <cd:command name="setupstrut" value="setupstrut"/>
+    <cd:command name="definerule" value="definerule"/>
+    <cd:command name="placerule" value="placerule"/>
+    <cd:command name="setuprule" value="setuprule"/>
+    <cd:command name="definetextvariable" value="definetextvariable"/>
+    <cd:command name="setuptextvariable" value="setuptextvariable"/>
+    <cd:command name="settextvariable" value="settextvariable"/>
+    <cd:command name="placetextvariable" value="placetextvariable"/>
+    <cd:command name="textvariable" value="textvariable"/>
+    <cd:command name="definetextposition" value="definetextposition"/>
+    <cd:command name="setuptextposition" value="setuptextposition"/>
+    <cd:command name="positiontext" value="positiontext"/>
+    <cd:command name="definerawfont" value="definerawfont"/>
+    <cd:command name="switchtorawfont" value="switchtorawfont"/>
+    <cd:command name="placeheadtext" value="placeheadtext"/>
+    <cd:command name="placeheadnumber" value="placeheadnumber"/>
+    <cd:command name="definepagebreak" value="definepagebreak"/>
+    <cd:command name="definecolumnbreak" value="definecolumnbreak"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="setupitemgroups" value="nastavvycty"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="topheight" value="vyskahorejsku"/>
+    <cd:command name="topdistance" value="vzdalenosthorejsku"/>
+    <cd:command name="headerheight" value="vyskazahlavi"/>
+    <cd:command name="headerdistance" value="vzdalenostzahlavi"/>
+    <cd:command name="textheight" value="vyskatextu"/>
+    <cd:command name="footerdistance" value="vzdalenostupati"/>
+    <cd:command name="footerheight" value="vyskaupati"/>
+    <cd:command name="bottomdistance" value="vzdalenostspodku"/>
+    <cd:command name="bottomheight" value="vyskaspodku"/>
+    <cd:command name="marginwidth" value="sirkamarginalie"/>
+    <cd:command name="leftmarginwidth" value="sirkalevemarginalie"/>
+    <cd:command name="rightmarginwidth" value="sirkapravemarginalie"/>
+    <cd:command name="margindistance" value="vzdalenostmarginalie"/>
+    <cd:command name="leftmargindistance" value="vzdalenostlevemarginalie"/>
+    <cd:command name="rightmargindistance" value="vzdalenostpravemarginalie"/>
+    <cd:command name="edgewidth" value="sirkaokraje"/>
+    <cd:command name="leftedgewidth" value="sirkalevehookraje"/>
+    <cd:command name="rightedgewidth" value="sirkapravehookraje"/>
+    <cd:command name="edgedistance" value="vzdalenostokraje"/>
+    <cd:command name="leftedgedistance" value="vzdalenostlevehookraje"/>
+    <cd:command name="rightedgedistance" value="vzdalenostpravehookraje"/>
+    <cd:command name="innermarginwidth" value="innermarginwidth"/>
+    <cd:command name="outermarginwidth" value="outermarginwidth"/>
+    <cd:command name="innermargindistance" value="innermargindistance"/>
+    <cd:command name="outermargindistance" value="outermargindistance"/>
+    <cd:command name="inneredgewidth" value="inneredgewidth"/>
+    <cd:command name="outeredgewidth" value="outeredgewidth"/>
+    <cd:command name="inneredgedistance" value="inneredgedistance"/>
+    <cd:command name="outeredgedistance" value="outeredgedistance"/>
+    <cd:command name="textwidth" value="sirkatextu"/>
+    <cd:command name="makeupwidth" value="sirkasazby"/>
+    <cd:command name="makeupheight" value="vyskasazby"/>
+    <cd:command name="topspace" value="odsazenishora"/>
+    <cd:command name="bottomspace" value="bottomspace"/>
+    <cd:command name="backspace" value="odsazenizleva"/>
+    <cd:command name="cutspace" value="cutspace"/>
+    <cd:command name="paperwidth" value="sirkapapiru"/>
+    <cd:command name="paperheight" value="vyskapapiru"/>
+    <cd:command name="printpaperwidth" value="sirkatiskpapiru"/>
+    <cd:command name="printpaperheight" value="vyskatiskpapiru"/>
+    <cd:command name="pageoffset" value="pageoffset"/>
+    <cd:command name="pagedepth" value="pagedepth"/>
+    <cd:command name="headlevel" value="hlavniuroven"/>
+    <cd:command name="linewidth" value="tloustkacary"/>
+    <cd:command name="totalnumberofpages" value="celkovypocetstran"/>
+    <cd:command name="numberofsubpages" value="numberofsubpages"/>
+    <cd:command name="useXMLfilter" value="useXMLfilter"/>
+    <cd:command name="definecolumnset" value="definecolumnset"/>
+    <cd:command name="setupcolumnset" value="setupcolumnset"/>
+    <cd:command name="startcolumnset" value="startcolumnset"/>
+    <cd:command name="stopcolumnset" value="stopcolumnset"/>
+    <cd:command name="setupcolumnsetlines" value="setupcolumnsetlines"/>
+    <cd:command name="setupcolumnsetstart" value="setupcolumnsetstart"/>
+    <cd:command name="startcolumnmakeup" value="startcolumnmakeup"/>
+    <cd:command name="stopcolumnmakeup" value="stopcolumnmakeup"/>
+    <cd:command name="usetypescript" value="usetypescript"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="startdocument" value="startdokument"/>
+    <cd:command name="stopdocument" value="stopdokument"/>
+    <cd:command name="startoverzicht" value="startprehled"/>
+    <cd:command name="stopoverzicht" value="stopprehled"/>
+    <cd:command name="label" value="poppisek"/>
+    <cd:command name="labels" value="popisky"/>
+    <cd:command name="domicile" value="bydliste"/>
+  </cd:commands>
+
+</cd:interface>
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
new file mode 100644
index 000000000..75a9707b8
--- /dev/null
+++ b/tex/context/interface/keys-de.xml
@@ -0,0 +1,1576 @@
+<?xml version="1.0"?>
+
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2004.11.16">
+
+  <cd:variables>
+    <cd:variable name="one" value="eins"/>
+    <cd:variable name="two" value="zwei"/>
+    <cd:variable name="three" value="drei"/>
+    <cd:variable name="four" value="vier"/>
+    <cd:variable name="five" value="fuenf"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="sunday" value="sonntag"/>
+    <cd:variable name="monday" value="montag"/>
+    <cd:variable name="tuesday" value="dienstag"/>
+    <cd:variable name="wednesday" value="mittwoch"/>
+    <cd:variable name="thursday" value="donnerstag"/>
+    <cd:variable name="friday" value="freitag"/>
+    <cd:variable name="saturday" value="samstag"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="january" value="Januar"/>
+    <cd:variable name="february" value="Februar"/>
+    <cd:variable name="march" value="Maerz"/>
+    <cd:variable name="april" value="April"/>
+    <cd:variable name="may" value="Mai"/>
+    <cd:variable name="june" value="Juni"/>
+    <cd:variable name="july" value="Juli"/>
+    <cd:variable name="august" value="August"/>
+    <cd:variable name="september" value="September"/>
+    <cd:variable name="october" value="Oktober"/>
+    <cd:variable name="november" value="November"/>
+    <cd:variable name="december" value="Dezember"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="atpage" value="aufseite"/>
+    <cd:variable name="hencefore" value="vorher"/>
+    <cd:variable name="hereafter" value="nachher"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="sectionlevel" value="abschnitt"/>
+    <cd:variable name="part" value="teil"/>
+    <cd:variable name="chapter" value="kapitel"/>
+    <cd:variable name="subject" value="thema"/>
+    <cd:variable name="section" value="absatz"/>
+    <cd:variable name="title" value="titel"/>
+    <cd:variable name="margintitle" value="marginaltitel"/>
+    <cd:variable name="content" value="inhalt"/>
+    <cd:variable name="contents" value="inhalte"/>
+    <cd:variable name="appendix" value="anhang"/>
+    <cd:variable name="appendices" value="anhaenge"/>
+    <cd:variable name="bodypart" value="haupttext"/>
+    <cd:variable name="bodymatter" value="haupttexte"/>
+    <cd:variable name="frontpart" value="einleitung"/>
+    <cd:variable name="frontmatter" value="einleitungen"/>
+    <cd:variable name="backpart" value="epilog"/>
+    <cd:variable name="backmatter" value="epiloge"/>
+    <cd:variable name="footnote" value="fussnote"/>
+    <cd:variable name="system" value="systeme"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="subsection" value="unterabsatz"/>
+    <cd:variable name="subsubsection" value="unterunterabsatz"/>
+    <cd:variable name="subsubsubsection" value="unterunterunterabsatz"/>
+    <cd:variable name="subsubsubsubsection" value="unterunterunterunterabsatz"/>
+    <cd:variable name="subsubsubsubsubsection" value="unterunterunterunterunterabsatz"/>
+    <cd:variable name="subsubject" value="unterthema"/>
+    <cd:variable name="subsubsubject" value="unterunterthema"/>
+    <cd:variable name="subsubsubsubject" value="unterunterunterthema"/>
+    <cd:variable name="subsubsubsubsubject" value="unterunterunterunterthema"/>
+    <cd:variable name="subsubsubsubsubsubject" value="unterunterunterunterunterthema"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="flushleft" value="flushleft"/>
+    <cd:variable name="flushright" value="flushright"/>
+    <cd:variable name="center" value="center"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="typing" value="tippen"/>
+    <cd:variable name="file" value="datei"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="formula" value="formel"/>
+    <cd:variable name="formulae" value="formeln"/>
+    <cd:variable name="figure" value="abbildung"/>
+    <cd:variable name="figures" value="abbildungen"/>
+    <cd:variable name="table" value="tabelle"/>
+    <cd:variable name="tables" value="tabellen"/>
+    <cd:variable name="graphic" value="grafik"/>
+    <cd:variable name="graphics" value="grafiken"/>
+    <cd:variable name="intermezzo" value="intermezzo"/>
+    <cd:variable name="intermezzi" value="intermezzi"/>
+    <cd:variable name="index" value="index"/>
+    <cd:variable name="indices" value="indizies"/>
+    <cd:variable name="abbreviation" value="abkuerzung"/>
+    <cd:variable name="abbreviations" value="abkuerzungen"/>
+    <cd:variable name="logo" value="logo"/>
+    <cd:variable name="logos" value="logos"/>
+    <cd:variable name="unit" value="einheit"/>
+    <cd:variable name="units" value="einheiten"/>
+    <cd:variable name="line" value="zeile"/>
+    <cd:variable name="lines" value="zeilen"/>
+    <cd:variable name="framedtext" value="umrahmtertext"/>
+    <cd:variable name="quotation" value="zitat"/>
+    <cd:variable name="quote" value="zitieren"/>
+    <cd:variable name="speech" value="speech"/>
+    <cd:variable name="itemize" value="aufzaehlung"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="leftquotation" value="linkerzitat"/>
+    <cd:constant name="rightquotation" value="rechterzitat"/>
+    <cd:constant name="leftquote" value="linkerzitieren"/>
+    <cd:constant name="rightquote" value="rechterzitieren"/>
+    <cd:constant name="midsentence" value="midsentence"/>
+    <cd:constant name="leftsentence" value="linkersatz"/>
+    <cd:constant name="rightsentence" value="rechtersatz"/>
+    <cd:constant name="leftsubsentence" value="linkersubsatz"/>
+    <cd:constant name="rightsubsentence" value="rechtersubsatz"/>
+    <cd:constant name="leftspeech" value="leftspeech"/>
+    <cd:constant name="middlespeech" value="middlespeech"/>
+    <cd:constant name="rightspeech" value="rightspeech"/>
+    <cd:constant name="limittext" value="limittext"/>
+    <cd:constant name="date" value="datum"/>
+    <cd:constant name="spacebefore" value="vorspatium"/>
+    <cd:constant name="spaceinbetween" value="spaceinbetween"/>
+    <cd:constant name="spaceafter" value="nachspatium"/>
+    <cd:constant name="sidespacebefore" value="nebenvorspatium"/>
+    <cd:constant name="sidespaceafter" value="nebennachspatium"/>
+    <cd:constant name="to" value="zu"/>
+    <cd:constant name="indicator" value="indikator"/>
+    <cd:constant name="background" value="hintergrund"/>
+    <cd:constant name="backgrounddepth" value="hintergrundtiefe"/>
+    <cd:constant name="backgroundcorner" value="hintergrundwinkel"/>
+    <cd:constant name="splitcolor" value="splitcolor"/>
+    <cd:constant name="backgroundcolor" value="hintergrundfarbe"/>
+    <cd:constant name="foregroundcolor" value="foregroundcolor"/>
+    <cd:constant name="foregroundstyle" value="foregroundstyle"/>
+    <cd:constant name="clipoffset" value="clipoffset"/>
+    <cd:constant name="backgroundoffset" value="hintergrundoffset"/>
+    <cd:constant name="backgroundscreen" value="hintergrundraster"/>
+    <cd:constant name="backgroundradius" value="hintergrundradius"/>
+    <cd:constant name="address" value="adresse"/>
+    <cd:constant name="stopper" value="abschnitttrenner"/>
+    <cd:constant name="distance" value="abstand"/>
+    <cd:constant name="paragraph" value="absatz"/>
+    <cd:constant name="axis" value="achsen"/>
+    <cd:constant name="author" value="autor"/>
+    <cd:constant name="auto" value="auto"/>
+    <cd:constant name="autofile" value="autofile"/>
+    <cd:constant name="balance" value="ausgleichen"/>
+    <cd:constant name="wfactor" value="bfaktor"/>
+    <cd:constant name="inner" value="innen"/>
+    <cd:constant name="blank" value="blanko"/>
+    <cd:constant name="obstruction" value="gesperrt"/>
+    <cd:constant name="blockway" value="blockauf"/>
+    <cd:constant name="bottomspace" value="bottomspace"/>
+    <cd:constant name="top" value="oben"/>
+    <cd:constant name="topdistance" value="obenabstand"/>
+    <cd:constant name="topframe" value="obenrahmen"/>
+    <cd:constant name="topoffset" value="obenoffset"/>
+    <cd:constant name="topstate" value="statusoben"/>
+    <cd:constant name="width" value="breite"/>
+    <cd:constant name="maxwidth" value="maxbreite"/>
+    <cd:constant name="minwidth" value="minbreite"/>
+    <cd:constant name="source" value="quelle"/>
+    <cd:constant name="command" value="befehl"/>
+    <cd:constant name="commands" value="befehle"/>
+    <cd:constant name="component" value="component"/>
+    <cd:constant name="contrastcolor" value="kontrastfarbe"/>
+    <cd:constant name="conversion" value="konversion"/>
+    <cd:constant name="headconversion" value="headconversion"/>
+    <cd:constant name="headlabel" value="headlabel"/>
+    <cd:constant name="criterium" value="kriterium"/>
+    <cd:constant name="date" value="datum"/>
+    <cd:constant name="default" value="default"/>
+    <cd:constant name="depth" value="tiefe"/>
+    <cd:constant name="depthcorrection" value="tiefekorrektur"/>
+    <cd:constant name="continue" value="fortsetzen"/>
+    <cd:constant name="doublesided" value="doppelseitig"/>
+    <cd:constant name="dummy" value="dummy"/>
+    <cd:constant name="unit" value="einheit"/>
+    <cd:constant name="ownnumber" value="eigenenummer"/>
+    <cd:constant name="evenmargin" value="geraderand"/>
+    <cd:constant name="expansion" value="expansion"/>
+    <cd:constant name="factor" value="faktor"/>
+    <cd:constant name="convertfile" value="konvertieredatei"/>
+    <cd:constant name="file" value="datei"/>
+    <cd:constant name="inputfile" value="inputfile"/>
+    <cd:constant name="size" value="groesse"/>
+    <cd:constant name="autofocus" value="autofocus"/>
+    <cd:constant name="focus" value="focus"/>
+    <cd:constant name="directory" value="verzeichnis"/>
+    <cd:constant name="grid" value="gritter"/>
+    <cd:constant name="big" value="gross"/>
+    <cd:constant name="get" value="hole"/>
+    <cd:constant name="hang" value="haengend"/>
+    <cd:constant name="repeat" value="wiederholen"/>
+    <cd:constant name="hfactor" value="hfaktor"/>
+    <cd:constant name="corner" value="winkel"/>
+    <cd:constant name="hoffset" value="hoffset"/>
+    <cd:constant name="frames" value="umrahmen"/>
+    <cd:constant name="header" value="kopfzeile"/>
+    <cd:constant name="headerdistance" value="kopfzeilenabstand"/>
+    <cd:constant name="headerstate" value="kopfzeilenstatus"/>
+    <cd:constant name="height" value="hoehe"/>
+    <cd:constant name="maxheight" value="maxhoehe"/>
+    <cd:constant name="minheight" value="minhoehe"/>
+    <cd:constant name="mindepth" value="mindepth"/>
+    <cd:constant name="current" value="aktuell"/>
+    <cd:constant name="in" value="in"/>
+    <cd:constant name="indenting" value="einziehen"/>
+    <cd:constant name="interaction" value="interaktion"/>
+    <cd:constant name="interlinespace" value="zeilenabstande"/>
+    <cd:constant name="items" value="posten"/>
+    <cd:constant name="frame" value="rahmen"/>
+    <cd:constant name="framedepth" value="rahmentiefe"/>
+    <cd:constant name="framecorner" value="rahmenwinkel"/>
+    <cd:constant name="framecolor" value="rahmenfarbe"/>
+    <cd:constant name="frameoffset" value="rahmenoffset"/>
+    <cd:constant name="frameradius" value="rahmenradius"/>
+    <cd:constant name="marginedge" value="marginalkante"/>
+    <cd:constant name="marginedgetext" value="marginalkantetext"/>
+    <cd:constant name="aligncharacter" value="aligncharacter"/>
+    <cd:constant name="alignmentcharacter" value="alignmentcharacter"/>
+    <cd:constant name="small" value="klein"/>
+    <cd:constant name="color" value="farbe"/>
+    <cd:constant name="column" value="spalte"/>
+    <cd:constant name="columns" value="spalten"/>
+    <cd:constant name="columndistance" value="spaltenabstand"/>
+    <cd:constant name="headcommand" value="headcommand"/>
+    <cd:constant name="headcolor" value="kopffarbe"/>
+    <cd:constant name="headstyle" value="kopfstil"/>
+    <cd:constant name="afterhead" value="nachkopf"/>
+    <cd:constant name="veroffset" value="kopfoffset"/>
+    <cd:constant name="coupling" value="verknuepfung"/>
+    <cd:constant name="couplingway" value="verkopplungsart"/>
+    <cd:constant name="beforehead" value="vorkopf"/>
+    <cd:constant name="topspace" value="kopfspatium"/>
+    <cd:constant name="bodyfont" value="fliesstext"/>
+    <cd:constant name="label" value="label"/>
+    <cd:constant name="empty" value="leer"/>
+    <cd:constant name="style" value="stil"/>
+    <cd:constant name="rule" value="linie"/>
+    <cd:constant name="rulethickness" value="liniendicke"/>
+    <cd:constant name="rulecolor" value="linienfarbe"/>
+    <cd:constant name="list" value="liste"/>
+    <cd:constant name="leftwidth" value="linkerbreite"/>
+    <cd:constant name="leftframe" value="linkerrahmen"/>
+    <cd:constant name="leftcolor" value="linkerfarbe"/>
+    <cd:constant name="leftstyle" value="linkerstil"/>
+    <cd:constant name="leftmargin" value="linkerrand"/>
+    <cd:constant name="leftmargindistance" value="linkerrandabstand"/>
+    <cd:constant name="leftoffset" value="linkeroffset"/>
+    <cd:constant name="leftedge" value="linkekante"/>
+    <cd:constant name="leftedgedistance" value="linkerkantenabstand"/>
+    <cd:constant name="lefttext" value="linkertext"/>
+    <cd:constant name="left" value="links"/>
+    <cd:constant name="nleft" value="nlinks"/>
+    <cd:constant name="logo" value="logo"/>
+    <cd:constant name="logos" value="logos"/>
+    <cd:constant name="local" value="lokal"/>
+    <cd:constant name="margin" value="marginalie"/>
+    <cd:constant name="margindistance" value="marginalabstand"/>
+    <cd:constant name="margintext" value="marginaltext"/>
+    <cd:constant name="marking" value="beschriftung"/>
+    <cd:constant name="marcolor" value="beschrfarbe"/>
+    <cd:constant name="marstyle" value="beschrstil"/>
+    <cd:constant name="menu" value="menue"/>
+    <cd:constant name="splitmethod" value="splitmethod"/>
+    <cd:constant name="textmethod" value="textmethod"/>
+    <cd:constant name="sidemethod" value="sidemethod"/>
+    <cd:constant name="method" value="methode"/>
+    <cd:constant name="middle" value="mittig"/>
+    <cd:constant name="middletext" value="mittigertext"/>
+    <cd:constant name="max" value="max"/>
+    <cd:constant name="min" value="min"/>
+    <cd:constant name="sample" value="muster"/>
+    <cd:constant name="after" value="nach"/>
+    <cd:constant name="name" value="name"/>
+    <cd:constant name="commandafter" value="zumbefehl"/>
+    <cd:constant name="ntop" value="noben"/>
+    <cd:constant name="level" value="niveau"/>
+    <cd:constant name="levels" value="niveaus"/>
+    <cd:constant name="nbottom" value="nunten"/>
+    <cd:constant name="norm" value="norm"/>
+    <cd:constant name="nlines" value="zzeile"/>
+    <cd:constant name="number" value="nummer"/>
+    <cd:constant name="numbercommand" value="nummerbefehl"/>
+    <cd:constant name="numbering" value="nummerierung"/>
+    <cd:constant name="numbercolor" value="nummernfarbe"/>
+    <cd:constant name="numberstyle" value="nummernstil"/>
+    <cd:constant name="numberseparator" value="nummernseperator"/>
+    <cd:constant name="object" value="objekt"/>
+    <cd:constant name="offset" value="offset"/>
+    <cd:constant name="bottom" value="unten"/>
+    <cd:constant name="bottomdistance" value="abstandunten"/>
+    <cd:constant name="bottomframe" value="untenrahmen"/>
+    <cd:constant name="bottomoffset" value="untenoffset"/>
+    <cd:constant name="bottomstate" value="untenstatus"/>
+    <cd:constant name="oddmargin" value="ungeraderand"/>
+    <cd:constant name="at" value="bei"/>
+    <cd:constant name="option" value="option"/>
+    <cd:constant name="page" value="seite"/>
+    <cd:constant name="pagecommand" value="seitenbefehl"/>
+    <cd:constant name="pagecolor" value="seitenfarbe"/>
+    <cd:constant name="pagestyle" value="seitenstil"/>
+    <cd:constant name="pagenumber" value="seitennummer"/>
+    <cd:constant name="pageboundaries" value="seitenbegrenzung"/>
+    <cd:constant name="pagestate" value="pagestate"/>
+    <cd:constant name="palet" value="palette"/>
+    <cd:constant name="paper" value="papier"/>
+    <cd:constant name="location" value="platz"/>
+    <cd:constant name="placestopper" value="setzetrenner"/>
+    <cd:constant name="place" value="platziere"/>
+    <cd:constant name="placehead" value="setzekopf"/>
+    <cd:constant name="position" value="position"/>
+    <cd:constant name="prefix" value="prefix"/>
+    <cd:constant name="preset" value="voreinstellung"/>
+    <cd:constant name="preview" value="vorschau"/>
+    <cd:constant name="process" value="process"/>
+    <cd:constant name="spot" value="spot"/>
+    <cd:constant name="dot" value="punkt"/>
+    <cd:constant name="arrow" value="pfeil"/>
+    <cd:constant name="edge" value="kante"/>
+    <cd:constant name="edgedistance" value="kantenabstand"/>
+    <cd:constant name="screen" value="raster"/>
+    <cd:constant name="rightwidth" value="rechterbreite"/>
+    <cd:constant name="rightframe" value="rechterrahmen"/>
+    <cd:constant name="rightcolor" value="rechterfarbe"/>
+    <cd:constant name="rightstyle" value="rechterstil"/>
+    <cd:constant name="rightmargin" value="rechterrand"/>
+    <cd:constant name="rightmargindistance" value="rechterrandabstand"/>
+    <cd:constant name="rightoffset" value="rechterabstand"/>
+    <cd:constant name="rightedge" value="rechtekante"/>
+    <cd:constant name="rightedgedistance" value="rechterkantenabstand"/>
+    <cd:constant name="righttext" value="rechtertext"/>
+    <cd:constant name="right" value="rechts"/>
+    <cd:constant name="nright" value="nrechts"/>
+    <cd:constant name="reduction" value="reduktion"/>
+    <cd:constant name="referencing" value="referieren"/>
+    <cd:constant name="line" value="zeile"/>
+    <cd:constant name="linecorrection" value="zeilekorrektur"/>
+    <cd:constant name="lines" value="zeilen"/>
+    <cd:constant name="stretch" value="strecken"/>
+    <cd:constant name="resolution" value="aufloesung"/>
+    <cd:constant name="rotation" value="rotation"/>
+    <cd:constant name="orientation" value="orientation"/>
+    <cd:constant name="horoffset" value="rumpfabstand"/>
+    <cd:constant name="backspace" value="rumpfspatium"/>
+    <cd:constant name="direction" value="richtung"/>
+    <cd:constant name="scale" value="format"/>
+    <cd:constant name="separator" value="seperator"/>
+    <cd:constant name="display" value="bildschirm"/>
+    <cd:constant name="scope" value="bereich"/>
+    <cd:constant name="section" value="abschnitt"/>
+    <cd:constant name="sectionnumber" value="abschnittsnummer"/>
+    <cd:constant name="setups" value="setups"/>
+    <cd:constant name="cutspace" value="cutspace"/>
+    <cd:constant name="family" value="familie"/>
+    <cd:constant name="space" value="spatium"/>
+    <cd:constant name="spacing" value="spatiumausgleich"/>
+    <cd:constant name="split" value="split"/>
+    <cd:constant name="splitoffset" value="splitoffset"/>
+    <cd:constant name="indentnext" value="ziehefolgendeein"/>
+    <cd:constant name="step" value="schritt"/>
+    <cd:constant name="stack" value="stack"/>
+    <cd:constant name="start" value="start"/>
+    <cd:constant name="state" value="status"/>
+    <cd:constant name="stop" value="stop"/>
+    <cd:constant name="radius" value="radius"/>
+    <cd:constant name="dash" value="strich"/>
+    <cd:constant name="sub" value="unter"/>
+    <cd:constant name="subtitle" value="untertitel"/>
+    <cd:constant name="symbol" value="symbol"/>
+    <cd:constant name="symbolset" value="symbolset"/>
+    <cd:constant name="symcolor" value="symfarbe"/>
+    <cd:constant name="symstyle" value="symstil"/>
+    <cd:constant name="synonym" value="synonym"/>
+    <cd:constant name="synonymcolor" value="synonymfarbe"/>
+    <cd:constant name="synonymstyle" value="synonymstil"/>
+    <cd:constant name="tab" value="tab"/>
+    <cd:constant name="sign" value="zeichen"/>
+    <cd:constant name="text" value="text"/>
+    <cd:constant name="textwidth" value="textbreite"/>
+    <cd:constant name="textcommand" value="textbefehl"/>
+    <cd:constant name="textsize" value="textgroesse"/>
+    <cd:constant name="textcolor" value="textfarbe"/>
+    <cd:constant name="textstyle" value="textstil"/>
+    <cd:constant name="textseparator" value="textseparator"/>
+    <cd:constant name="textstate" value="textstatus"/>
+    <cd:constant name="title" value="titel"/>
+    <cd:constant name="aligntitle" value="titelausrichten"/>
+    <cd:constant name="tolerance" value="toleranz"/>
+    <cd:constant name="inbetween" value="zwischen"/>
+    <cd:constant name="type" value="typ"/>
+    <cd:constant name="align" value="ausrichtung"/>
+    <cd:constant name="urlspace" value="urlspatium"/>
+    <cd:constant name="urlalternative" value="urlalternative"/>
+    <cd:constant name="from" value="von"/>
+    <cd:constant name="alternative" value="alternative"/>
+    <cd:constant name="increment" value="erhoehen"/>
+    <cd:constant name="incrementnumber" value="nummererhoehen"/>
+    <cd:constant name="resetnumber" value="resetnumber"/>
+    <cd:constant name="reference" value="referenz"/>
+    <cd:constant name="unknownreference" value="unbekantereferenz"/>
+    <cd:constant name="footer" value="fusszeile"/>
+    <cd:constant name="footerdistance" value="fusszeilenabstand"/>
+    <cd:constant name="footerstate" value="fusszeilenstatus"/>
+    <cd:constant name="voffset" value="voffset"/>
+    <cd:constant name="next" value="folgende"/>
+    <cd:constant name="before" value="vor"/>
+    <cd:constant name="commandbefore" value="vorbefehl"/>
+    <cd:constant name="previous" value="vorige"/>
+    <cd:constant name="previousnumber" value="vorigenummer"/>
+    <cd:constant name="delay" value="wartezeit"/>
+    <cd:constant name="way" value="art"/>
+    <cd:constant name="random" value="zufaellig"/>
+    <cd:constant name="white" value="weiss"/>
+    <cd:constant name="xfactor" value="xfaktor"/>
+    <cd:constant name="xmax" value="xmax"/>
+    <cd:constant name="xoffset" value="xoffset"/>
+    <cd:constant name="xscale" value="xformat"/>
+    <cd:constant name="xstep" value="xschritt"/>
+    <cd:constant name="yfactor" value="yfaktor"/>
+    <cd:constant name="ymax" value="ymax"/>
+    <cd:constant name="yoffset" value="yoffset"/>
+    <cd:constant name="yscale" value="yformat"/>
+    <cd:constant name="ystep" value="yschritt"/>
+    <cd:constant name="samepage" value="selbeseite"/>
+    <cd:constant name="sidealign" value="sidealign"/>
+    <cd:constant name="side" value="objektabstand"/>
+    <cd:constant name="fieldlayer" value="fieldlayer"/>
+    <cd:constant name="textlayer" value="textlayer"/>
+    <cd:constant name="fieldbackgroundcolor" value="feldhintergrundfarbe"/>
+    <cd:constant name="fieldframecolor" value="feldrahmenfarbe"/>
+    <cd:constant name="fieldoffset" value="feldoffset"/>
+    <cd:constant name="openaction" value="oeffenaktion"/>
+    <cd:constant name="closeaction" value="schliessenaktion"/>
+    <cd:constant name="openpageaction" value="openpageaction"/>
+    <cd:constant name="closepageaction" value="closepageaction"/>
+    <cd:constant name="clickin" value="klickin"/>
+    <cd:constant name="clickout" value="klickaus"/>
+    <cd:constant name="regionin" value="regionin"/>
+    <cd:constant name="regionout" value="regionaus"/>
+    <cd:constant name="focusin" value="focusin"/>
+    <cd:constant name="focusout" value="focusout"/>
+    <cd:constant name="afterkey" value="nachtaste"/>
+    <cd:constant name="format" value="formatieren"/>
+    <cd:constant name="validate" value="validieren"/>
+    <cd:constant name="calculate" value="berechnen"/>
+    <cd:constant name="click" value="klick"/>
+    <cd:constant name="vcommand" value="vbefehl"/>
+    <cd:constant name="icommand" value="ibefehl"/>
+    <cd:constant name="ccommand" value="cbefehl"/>
+    <cd:constant name="textdistance" value="textdistance"/>
+    <cd:constant name="textmargin" value="textmargin"/>
+    <cd:constant name="keyword" value="keyword"/>
+  </cd:constants>
+
+  <cd:constants>
+    <cd:constant name="extras" value="extras"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="on" value="an"/>
+    <cd:variable name="serried" value="kleinerabstand"/>
+    <cd:variable name="joinedup" value="keinabstand"/>
+    <cd:variable name="absolute" value="absolut"/>
+    <cd:variable name="background" value="hintergrund"/>
+    <cd:variable name="backward" value="rueckwaerts"/>
+    <cd:variable name="subbackward" value="unterrueckwaerts"/>
+    <cd:variable name="action" value="aktion"/>
+    <cd:variable name="stopper" value="trenner"/>
+    <cd:variable name="paragraph" value="absatz"/>
+    <cd:variable name="all" value="alles"/>
+    <cd:variable name="always" value="immer"/>
+    <cd:variable name="auto" value="auto"/>
+    <cd:variable name="autointro" value="autointro"/>
+    <cd:variable name="both" value="beide"/>
+    <cd:variable name="inner" value="innen"/>
+    <cd:variable name="blank" value="blanko"/>
+    <cd:variable name="disable" value="sperren"/>
+    <cd:variable name="top" value="oben"/>
+    <cd:variable name="wide" value="breit"/>
+    <cd:variable name="width" value="breite"/>
+    <cd:variable name="outer" value="aussen"/>
+    <cd:variable name="numbers" value="ziffern"/>
+    <cd:variable name="Numbers" value="Ziffern"/>
+    <cd:variable name="command" value="befehl"/>
+    <cd:variable name="commands" value="befehle"/>
+    <cd:variable name="concept" value="konzept"/>
+    <cd:variable name="day" value="tag"/>
+    <cd:variable name="date" value="datum"/>
+    <cd:variable name="default" value="default"/>
+    <cd:variable name="final" value="endfassung"/>
+    <cd:variable name="depth" value="tiefe"/>
+    <cd:variable name="doublesided" value="doppelseitig"/>
+    <cd:variable name="first" value="erste"/>
+    <cd:variable name="each" value="jede"/>
+    <cd:variable name="singlesided" value="einzelseitig"/>
+    <cd:variable name="somewhere" value="irgendwo"/>
+    <cd:variable name="nowhere" value="nirgens"/>
+    <cd:variable name="even" value="gerade"/>
+    <cd:variable name="external" value="extern"/>
+    <cd:variable name="file" value="datei"/>
+    <cd:variable name="flexible" value="flexibel"/>
+    <cd:variable name="force" value="zwinge"/>
+    <cd:variable name="used" value="verwende"/>
+    <cd:variable name="none" value="kein"/>
+    <cd:variable name="nomarking" value="keinebeschriftung"/>
+    <cd:variable name="nonumber" value="nonumber"/>
+    <cd:variable name="nowhite" value="keinweiss"/>
+    <cd:variable name="rotated" value="gedreht"/>
+    <cd:variable name="mirrored" value="gespiegelt"/>
+    <cd:variable name="global" value="global"/>
+    <cd:variable name="grid" value="gritter"/>
+    <cd:variable name="big" value="gross"/>
+    <cd:variable name="bigbodyfont" value="bigbodyfont"/>
+    <cd:variable name="bigpreference" value="grosszuegig"/>
+    <cd:variable name="gray" value="grau"/>
+    <cd:variable name="halfline" value="halbezeile"/>
+    <cd:variable name="keep" value="behalte"/>
+    <cd:variable name="hanging" value="haengend"/>
+    <cd:variable name="repeat" value="wiederholen"/>
+    <cd:variable name="fix" value="stellewiederher"/>
+    <cd:variable name="here" value="hier"/>
+    <cd:variable name="header" value="kopfzeile"/>
+    <cd:variable name="high" value="hoch"/>
+    <cd:variable name="height" value="hoehe"/>
+    <cd:variable name="horizontal" value="horizontal"/>
+    <cd:variable name="current" value="aktuell"/>
+    <cd:variable name="hz" value="hz"/>
+    <cd:variable name="nohz" value="nohz"/>
+    <cd:variable name="italic" value="italic"/>
+    <cd:variable name="inherit" value="inherit"/>
+    <cd:variable name="inleft" value="imlinken"/>
+    <cd:variable name="inmargin" value="imrand"/>
+    <cd:variable name="inright" value="imrechten"/>
+    <cd:variable name="interaction" value="interaktion"/>
+    <cd:variable name="intext" value="imtext"/>
+    <cd:variable name="intro" value="intro"/>
+    <cd:variable name="its" value="its"/>
+    <cd:variable name="yes" value="ja"/>
+    <cd:variable name="year" value="jahr"/>
+    <cd:variable name="frame" value="rahmen"/>
+    <cd:variable name="marginedge" value="marginalkante"/>
+    <cd:variable name="cap" value="kap"/>
+    <cd:variable name="capital" value="versalien"/>
+    <cd:variable name="referral" value="merkmal"/>
+    <cd:variable name="small" value="klein"/>
+    <cd:variable name="smallnormal" value="kleinnormal"/>
+    <cd:variable name="smallslanted" value="kleingeneigt"/>
+    <cd:variable name="smallslantedbold" value="kleingeneigtfett"/>
+    <cd:variable name="smallitalic" value="kleinitalic"/>
+    <cd:variable name="smallitalicbold" value="kleinitalicfett"/>
+    <cd:variable name="smalltype" value="kleintippen"/>
+    <cd:variable name="smallbold" value="kleinfett"/>
+    <cd:variable name="smallboldslanted" value="kleinfettgeneigt"/>
+    <cd:variable name="smallbolditalic" value="kleinfettitalic"/>
+    <cd:variable name="smallbodyfont" value="smallbodyfont"/>
+    <cd:variable name="color" value="farbe"/>
+    <cd:variable name="column" value="column"/>
+    <cd:variable name="columns" value="spalten"/>
+    <cd:variable name="head" value="kopf"/>
+    <cd:variable name="low" value="tief"/>
+    <cd:variable name="last" value="letzte"/>
+    <cd:variable name="label" value="label"/>
+    <cd:variable name="lohi" value="hoti"/>
+    <cd:variable name="tall" value="lang"/>
+    <cd:variable name="empty" value="leer"/>
+    <cd:variable name="Character" value="Buchstabe"/>
+    <cd:variable name="character" value="buchstabe"/>
+    <cd:variable name="Characters" value="Buchstaben"/>
+    <cd:variable name="characters" value="buchstaben"/>
+    <cd:variable name="landscape" value="querformat"/>
+    <cd:variable name="rule" value="linie"/>
+    <cd:variable name="list" value="liste"/>
+    <cd:variable name="leftmargin" value="linkerrand"/>
+    <cd:variable name="leftpage" value="linkerseite"/>
+    <cd:variable name="leftedge" value="linkekante"/>
+    <cd:variable name="left" value="links"/>
+    <cd:variable name="local" value="lokal"/>
+    <cd:variable name="new" value="neu"/>
+    <cd:variable name="MONTH" value="MONAT"/>
+    <cd:variable name="month" value="monat"/>
+    <cd:variable name="mar" value="mar"/>
+    <cd:variable name="margin" value="marginalie"/>
+    <cd:variable name="max" value="max"/>
+    <cd:variable name="min" value="min"/>
+    <cd:variable name="mediaeval" value="mittelalterlich"/>
+    <cd:variable name="medium" value="mittel"/>
+    <cd:variable name="middle" value="mittig"/>
+    <cd:variable name="after" value="nach"/>
+    <cd:variable name="name" value="name"/>
+    <cd:variable name="opposite" value="gegenueber"/>
+    <cd:variable name="no" value="nein"/>
+    <cd:variable name="negative" value="negativ"/>
+    <cd:variable name="positive" value="positiv"/>
+    <cd:variable name="not" value="nicht"/>
+    <cd:variable name="never" value="nie"/>
+    <cd:variable name="normal" value="normal"/>
+    <cd:variable name="number" value="nummer"/>
+    <cd:variable name="offset" value="offset"/>
+    <cd:variable name="unknown" value="unbekannt"/>
+    <cd:variable name="bottom" value="unten"/>
+    <cd:variable name="odd" value="ungerade"/>
+    <cd:variable name="packed" value="gepackt"/>
+    <cd:variable name="unpacked" value="ungepackt"/>
+    <cd:variable name="makeup" value="umbruch"/>
+    <cd:variable name="atmargin" value="amrand"/>
+    <cd:variable name="overlay" value="overlay"/>
+    <cd:variable name="page" value="seite"/>
+    <cd:variable name="pagenumber" value="seitennummer"/>
+    <cd:variable name="paper" value="papier"/>
+    <cd:variable name="display" value="bildschirm"/>
+    <cd:variable name="reverse" value="reverse"/>
+    <cd:variable name="fit" value="passend"/>
+    <cd:variable name="postscript" value="postscript"/>
+    <cd:variable name="preview" value="vorschau"/>
+    <cd:variable name="program" value="programm"/>
+    <cd:variable name="process" value="process"/>
+    <cd:variable name="spot" value="spot"/>
+    <cd:variable name="dot" value="punkt"/>
+    <cd:variable name="ran" value="ran"/>
+    <cd:variable name="edge" value="kante"/>
+    <cd:variable name="screen" value="raster"/>
+    <cd:variable name="rectangular" value="rechteckig"/>
+    <cd:variable name="rightmargin" value="rechterrand"/>
+    <cd:variable name="rightpage" value="rechterseite"/>
+    <cd:variable name="rightedge" value="rechterkante"/>
+    <cd:variable name="right" value="rechts"/>
+    <cd:variable name="line" value="zeile"/>
+    <cd:variable name="register" value="register"/>
+    <cd:variable name="relative" value="relativ"/>
+    <cd:variable name="reset" value="zuruecksetzten"/>
+    <cd:variable name="Romannumerals" value="Roemischezahlen"/>
+    <cd:variable name="romannumerals" value="roemischezahlen"/>
+    <cd:variable name="greek" value="griechisch"/>
+    <cd:variable name="Greek" value="Griechisch"/>
+    <cd:variable name="round" value="rund"/>
+    <cd:variable name="rotate" value="drehe"/>
+    <cd:variable name="stretch" value="strecken"/>
+    <cd:variable name="backspace" value="rumpfspatium"/>
+    <cd:variable name="broad" value="breit"/>
+    <cd:variable name="row" value="row"/>
+    <cd:variable name="slanted" value="geneigt"/>
+    <cd:variable name="slantedbold" value="geneigtfett"/>
+    <cd:variable name="synchronize" value="synchronize"/>
+    <cd:variable name="italicbold" value="italicfett"/>
+    <cd:variable name="sectionnumber" value="abschnittsnummer"/>
+    <cd:variable name="narrow" value="schmall"/>
+    <cd:variable name="cutspace" value="cutspace"/>
+    <cd:variable name="tolerant" value="tolerant"/>
+    <cd:variable name="space" value="spatium"/>
+    <cd:variable name="standard" value="standard"/>
+    <cd:variable name="start" value="start"/>
+    <cd:variable name="stop" value="stop"/>
+    <cd:variable name="strict" value="streng"/>
+    <cd:variable name="strut" value="strut"/>
+    <cd:variable name="sub" value="unter"/>
+    <cd:variable name="sym" value="sym"/>
+    <cd:variable name="symbol" value="symbol"/>
+    <cd:variable name="text" value="text"/>
+    <cd:variable name="back" value="zurueck"/>
+    <cd:variable name="test" value="test"/>
+    <cd:variable name="inbetween" value="zwischen"/>
+    <cd:variable name="type" value="tippen"/>
+    <cd:variable name="off" value="aus"/>
+    <cd:variable name="url" value="url"/>
+    <cd:variable name="URL" value="URL"/>
+    <cd:variable name="fixed" value="fest"/>
+    <cd:variable name="loose" value="lose"/>
+    <cd:variable name="continue" value="fortsetzten"/>
+    <cd:variable name="vertical" value="vertikal"/>
+    <cd:variable name="bold" value="fett"/>
+    <cd:variable name="boldslanted" value="fettgeneigt"/>
+    <cd:variable name="bolditalic" value="fettitalic"/>
+    <cd:variable name="quadruple" value="viertel"/>
+    <cd:variable name="footer" value="fusszeile"/>
+    <cd:variable name="next" value="folgende"/>
+    <cd:variable name="before" value="vor"/>
+    <cd:variable name="foreground" value="vordergrund"/>
+    <cd:variable name="preference" value="einstellung"/>
+    <cd:variable name="temporary" value="temporaer"/>
+    <cd:variable name="forward" value="vorwaerts"/>
+    <cd:variable name="subforward" value="untervorwaerts"/>
+    <cd:variable name="previous" value="vorig"/>
+    <cd:variable name="value" value="wert"/>
+    <cd:variable name="week" value="woche"/>
+    <cd:variable name="weekday" value="wochentag"/>
+    <cd:variable name="WEEKDAY" value="WOCHENTAG"/>
+    <cd:variable name="random" value="zufaellig"/>
+    <cd:variable name="white" value="weiss"/>
+    <cd:variable name="very" value="sehr"/>
+    <cd:variable name="verytolerant" value="sehrtolerant"/>
+    <cd:variable name="verystrict" value="sehrstreng"/>
+    <cd:variable name="see" value="sieh"/>
+    <cd:variable name="smallcaps" value="smallcaps"/>
+    <cd:variable name="WORD" value="WORT"/>
+    <cd:variable name="firstpage" value="ersteseite"/>
+    <cd:variable name="firstcolumn" value="firstcolumn"/>
+    <cd:variable name="previouspage" value="vorigeseite"/>
+    <cd:variable name="nextpage" value="folgendeseite"/>
+    <cd:variable name="lastpage" value="letzteseite"/>
+    <cd:variable name="lastcolumn" value="lastcolumn"/>
+    <cd:variable name="lastpagenumber" value="lastpagenumber"/>
+    <cd:variable name="subpage" value="unterseite"/>
+    <cd:variable name="firstsubpage" value="ersteunterseite"/>
+    <cd:variable name="previoussubpage" value="vorigeunterseite"/>
+    <cd:variable name="nextsubpage" value="folgendeunterseite"/>
+    <cd:variable name="lastsubpage" value="letzteunterseite"/>
+    <cd:variable name="nextevenpage" value="naechstegeradeseite"/>
+    <cd:variable name="nextoddpage" value="naechsteungeradeseite"/>
+    <cd:variable name="previousevenpage" value="vorigegeradeseite"/>
+    <cd:variable name="previousoddpage" value="vorigeungeradeseite"/>
+    <cd:variable name="readonly" value="nurlesbar"/>
+    <cd:variable name="required" value="obligatorisch"/>
+    <cd:variable name="protected" value="geschuetzt"/>
+    <cd:variable name="sorted" value="sortiert"/>
+    <cd:variable name="unavailable" value="nichtverfuegbar"/>
+    <cd:variable name="hidden" value="versteckt"/>
+    <cd:variable name="printable" value="druckbar"/>
+    <cd:variable name="bookmark" value="bookmark"/>
+    <cd:variable name="nocheck" value="nocheck"/>
+    <cd:variable name="innermargin" value="innermargin"/>
+    <cd:variable name="outermargin" value="outermargin"/>
+    <cd:variable name="inneredge" value="inneredge"/>
+    <cd:variable name="outeredge" value="outeredge"/>
+    <cd:variable name="controls" value="controls"/>
+    <cd:variable name="nothanging" value="nothanging"/>
+    <cd:variable name="hyphenated" value="hyphenate"/>
+    <cd:variable name="nothyphenated" value="nothyphenated"/>
+    <cd:variable name="overprint" value="overprint"/>
+    <cd:variable name="knockout" value="knockout"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="controls" value="controls"/>
+    <cd:constant name="global" value="global"/>
+    <cd:constant name="overprint" value="overprint"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="conversion" value="konversion"/>
+    <cd:variable name="by" value="pro"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="dx" value="dx"/>
+    <cd:constant name="dy" value="dy"/>
+    <cd:constant name="nx" value="nx"/>
+    <cd:constant name="ny" value="ny"/>
+    <cd:constant name="nr" value="nr"/>
+    <cd:constant name="nl" value="nl"/>
+    <cd:constant name="nc" value="nc"/>
+    <cd:constant name="sx" value="sx"/>
+    <cd:constant name="sy" value="sy"/>
+    <cd:constant name="n" value="n"/>
+    <cd:constant name="vfil" value="vfil"/>
+    <cd:constant name="hfil" value="hfil"/>
+    <cd:constant name="strut" value="strut"/>
+    <cd:constant name="reset" value="reset"/>
+    <cd:constant name="set" value="set"/>
+    <cd:constant name="escape" value="escape"/>
+    <cd:constant name="apa" value="apa"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="calligraphic" value="kalligraphie"/>
+    <cd:variable name="handwritten" value="handschrift"/>
+    <cd:variable name="sansserif" value="grotesk"/>
+    <cd:variable name="roman" value="antiqua"/>
+    <cd:variable name="teletype" value="fernschreiber"/>
+    <cd:variable name="type" value="tippen"/>
+    <cd:variable name="serif" value="serif"/>
+    <cd:variable name="regular" value="regular"/>
+    <cd:variable name="support" value="support"/>
+    <cd:variable name="sans" value="sans"/>
+    <cd:variable name="mono" value="mono"/>
+  </cd:variables>
+
+  <cd:elements>
+    <cd:element name="begin" value="anfang"/>
+    <cd:element name="end" value="ende"/>
+    <cd:element name="coupled" value="verknuepft"/>
+    <cd:element name="get" value="get"/>
+    <cd:element name="currentlocal" value="aktuelllokal"/>
+    <cd:element name="endsetup" value="ein"/>
+    <cd:element name="load" value="laden"/>
+    <cd:element name="emptyone" value="vuoto"/>
+    <cd:element name="emptytwo" value="leer"/>
+    <cd:element name="list" value="auflisten"/>
+    <cd:element name="listof" value="auflistenvon"/>
+    <cd:element name="local" value="lokal"/>
+    <cd:element name="place" value="platziere"/>
+    <cd:element name="reserve" value="reservieren"/>
+    <cd:element name="start" value="start"/>
+    <cd:element name="setup" value="stelle"/>
+    <cd:element name="stop" value="stop"/>
+    <cd:element name="increment" value="erhoehen"/>
+    <cd:element name="next" value="folgende"/>
+    <cd:element name="complete" value="vollende"/>
+    <cd:element name="previous" value="vorige"/>
+    <cd:element name="previouslocal" value="voriglokal"/>
+    <cd:element name="see" value="sieh"/>
+    <cd:element name="type" value="type"/>
+    <cd:element name="makeup" value="umbruch"/>
+    <cd:element name="text" value="text"/>
+  </cd:elements>
+
+  <cd:variables>
+    <cd:variable name="buffer" value="puffer"/>
+    <cd:variable name="linenote" value="linenote"/>
+    <cd:variable name="comment" value="kommentar"/>
+    <cd:variable name="interactionmenu" value="interaktionsmenue"/>
+    <cd:variable name="postponing" value="verschieben"/>
+    <cd:variable name="hiding" value="verbergen"/>
+    <cd:variable name="tabulate" value="tabulator"/>
+    <cd:variable name="tabulatehead" value="tabulatehead"/>
+    <cd:variable name="tabulatetail" value="tabulatetail"/>
+    <cd:variable name="fact" value="gegeben"/>
+    <cd:variable name="legend" value="legende"/>
+    <cd:variable name="formula" value="formel"/>
+    <cd:variable name="tablehead" value="tabellenueberschrift"/>
+    <cd:variable name="tabletail" value="tabellenende"/>
+    <cd:variable name="setups" value="impostazioni"/>
+    <cd:variable name="helptext" value="hilfetext"/>
+    <cd:variable name="localenvironment" value="lokaleumgebung"/>
+    <cd:variable name="sectionblockenvironment" value="sectionblockenvironment"/>
+    <cd:variable name="pagecomment" value="pagecomment"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="FirstPage" value="ErsteSeite"/>
+    <cd:variable name="PreviousPage" value="VorigeSeite"/>
+    <cd:variable name="NextPage" value="FolgendeSeite"/>
+    <cd:variable name="LastPage" value="LetzteSeite"/>
+    <cd:variable name="PreviousJump" value="VorigerSprung"/>
+    <cd:variable name="NextJump" value="NaechsterSprung"/>
+    <cd:variable name="SwapViewer" value="WechseleViewer"/>
+    <cd:variable name="ExitViewer" value="BeendeViewer"/>
+    <cd:variable name="CloseDocument" value="SchliesseDokument"/>
+    <cd:variable name="SaveDocument" value="SpeichereDokument"/>
+    <cd:variable name="SaveNamedDocument" value="SaveNamedDocument"/>
+    <cd:variable name="OpenNamedDocument" value="OpenNamedDocument"/>
+    <cd:variable name="ViewerHelp" value="ViewerHilfe"/>
+    <cd:variable name="PrintDocument" value="DruckeDokument"/>
+    <cd:variable name="SearchDocument" value="DokumentDurchsuchen"/>
+    <cd:variable name="SearchAgain" value="WeiterSuchen"/>
+    <cd:variable name="Query" value="Query"/>
+    <cd:variable name="QueryAgain" value="QueryAgain"/>
+    <cd:variable name="GotoPage" value="GotoPage"/>
+    <cd:variable name="StartMovie" value="StartFilm"/>
+    <cd:variable name="StopMovie" value="StopFilm"/>
+    <cd:variable name="PauseMovie" value="PauseFilm"/>
+    <cd:variable name="ResumeMovie" value="FortsetzenFilm"/>
+    <cd:variable name="StartSound" value="StartSound"/>
+    <cd:variable name="StopSound" value="StopSound"/>
+    <cd:variable name="PauseSound" value="PauseSound"/>
+    <cd:variable name="ResumeSound" value="ResumeSound"/>
+    <cd:variable name="StartRendering" value="StartRendering"/>
+    <cd:variable name="StopRendering" value="StopRendering"/>
+    <cd:variable name="PauseRendering" value="PauseRendering"/>
+    <cd:variable name="ResumeRendering" value="ResumeRendering"/>
+    <cd:variable name="SaveForm" value="SpeicheFormular"/>
+    <cd:variable name="LoadForm" value="LadeFormular"/>
+    <cd:variable name="ResetForm" value="ZuruecksetzenFormular"/>
+    <cd:variable name="SubmitForm" value="VersendeFormular"/>
+    <cd:variable name="HideField" value="VerbergeFeld"/>
+    <cd:variable name="ShowField" value="ZeigeFeld"/>
+    <cd:variable name="FitWidth" value="BreitePassend"/>
+    <cd:variable name="FitHeight" value="HoehePassend"/>
+    <cd:variable name="HideLayer" value="HideLayer"/>
+    <cd:variable name="VideLayer" value="VideLayer"/>
+    <cd:variable name="ToggleLayer" value="ToggleLayer"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="New" value="Neu"/>
+    <cd:variable name="Balloon" value="Ballon"/>
+    <cd:variable name="Addition" value="Zusatz"/>
+    <cd:variable name="Help" value="Hilfe"/>
+    <cd:variable name="Paragraph" value="Absatz"/>
+    <cd:variable name="Key" value="Schluessel"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="bet" value="bet"/>
+    <cd:constant name="dat" value="dat"/>
+    <cd:constant name="ken" value="ken"/>
+    <cd:constant name="ref" value="ref"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="formeel" value="formeel"/>
+    <cd:variable name="informeel" value="informeel"/>
+    <cd:variable name="rekening" value="rekening"/>
+    <cd:variable name="sticker" value="sticker"/>
+    <cd:variable name="sheet" value="sheet"/>
+    <cd:variable name="brief" value="brief"/>
+    <cd:variable name="ls" value="ls"/>
+  </cd:variables>
+
+  <cd:commands>
+    <cd:command name="language" value="sprache"/>
+    <cd:command name="mainlanguage" value="hauptsprache"/>
+    <cd:command name="translate" value="uebersetzten"/>
+    <cd:command name="installlanguage" value="installieresprache"/>
+    <cd:command name="setuplanguage" value="stellespracheein"/>
+    <cd:command name="showmakeup" value="zeigeumbruch"/>
+    <cd:command name="useencoding" value="benutzekodierung"/>
+    <cd:command name="usespecials" value="benutzespezielles"/>
+    <cd:command name="defineoutput" value="defineoutput"/>
+    <cd:command name="setupoutput" value="stelleausgabeein"/>
+    <cd:command name="defineaccent" value="definiereakzent"/>
+    <cd:command name="definecharacter" value="definierezeichen"/>
+    <cd:command name="definecommand" value="definierebefehl"/>
+    <cd:command name="startcoding" value="startkodierung"/>
+    <cd:command name="stopcoding" value="stopkodierung"/>
+    <cd:command name="definebodyfontenvironment" value="definierefliesstextumgebung"/>
+    <cd:command name="setupbodyfontenvironment" value="stellefliesstextumgebungein"/>
+    <cd:command name="definebodyfont" value="definierefliesstext"/>
+    <cd:command name="definefont" value="definiereschrift"/>
+    <cd:command name="definefontsynonym" value="defineschriftsynonym"/>
+    <cd:command name="definestyle" value="definierestil"/>
+    <cd:command name="definefontstyle" value="definiereschriftstil"/>
+    <cd:command name="setupstrut" value="setupstrut"/>
+    <cd:command name="setuptype" value="stelletipein"/>
+    <cd:command name="type" value="tippen"/>
+    <cd:command name="typ" value="tip"/>
+    <cd:command name="arg" value="arg"/>
+    <cd:command name="tex" value="tex"/>
+    <cd:command name="definetyping" value="definieretippen"/>
+    <cd:command name="definetype" value="definetype"/>
+    <cd:command name="setuptyping" value="stelletippenein"/>
+    <cd:command name="typefile" value="tippedatei"/>
+    <cd:command name="setupfootnotes" value="stellefussnotenein"/>
+    <cd:command name="setupfootnotedefinition" value="stellefussnotendefinitionein"/>
+    <cd:command name="note" value="notiz"/>
+    <cd:command name="footnote" value="fussnote"/>
+    <cd:command name="footnotetext" value="footnotetext"/>
+    <cd:command name="startlocalfootnotes" value="startlokalefussnoten"/>
+    <cd:command name="stoplocalfootnotes" value="stoplokalefussnoten"/>
+    <cd:command name="placelocalfootnotes" value="platzierelokalefussnoten"/>
+    <cd:command name="placefootnotes" value="platzierefussnoten"/>
+    <cd:command name="currentdate" value="heutigesdatum"/>
+    <cd:command name="date" value="datum"/>
+    <cd:command name="weekday" value="wochentag"/>
+    <cd:command name="WEEKDAY" value="WOCHENTAG"/>
+    <cd:command name="month" value="monat"/>
+    <cd:command name="MONTH" value="MONAT"/>
+    <cd:command name="Numbers" value="Ziffern"/>
+    <cd:command name="numbers" value="ziffern"/>
+    <cd:command name="romannumerals" value="roemischezahlen"/>
+    <cd:command name="Romannumerals" value="Roemischezahlen"/>
+    <cd:command name="character" value="buchstabe"/>
+    <cd:command name="Character" value="Buchstabe"/>
+    <cd:command name="characters" value="buchstaben"/>
+    <cd:command name="Characters" value="Buchstaben"/>
+    <cd:command name="unknown" value="unbekant"/>
+    <cd:command name="definesymbol" value="definieresymbol"/>
+    <cd:command name="definefiguresymbol" value="definiereabbsymbol"/>
+    <cd:command name="symbol" value="symbol"/>
+    <cd:command name="setupsymbolset" value="stellesymbolsetein"/>
+    <cd:command name="showsymbolset" value="showsymbolset"/>
+    <cd:command name="startsymbolset" value="startsymbolset"/>
+    <cd:command name="usesymbols" value="verwendesymbole"/>
+    <cd:command name="defineconversion" value="definierekonversion"/>
+    <cd:command name="convertnumber" value="konvertierezahl"/>
+    <cd:command name="setupcapitals" value="stelleversalienein"/>
+    <cd:command name="smallcapped" value="kap"/>
+    <cd:command name="notsmallcapped" value="nokap"/>
+    <cd:command name="CAPPED" value="KAP"/>
+    <cd:command name="SmallCapped" value="Kap"/>
+    <cd:command name="SmallCaps" value="Kaps"/>
+    <cd:command name="WORD" value="WORT"/>
+    <cd:command name="WORDS" value="WOERTER"/>
+    <cd:command name="Word" value="Wort"/>
+    <cd:command name="Words" value="Woerter"/>
+    <cd:command name="stretched" value="gestreckt"/>
+    <cd:command name="overstrike" value="durchgestrichen"/>
+    <cd:command name="overstrikes" value="durchstreichen"/>
+    <cd:command name="overbar" value="ueberstrichen"/>
+    <cd:command name="overbars" value="ueberstreichen"/>
+    <cd:command name="underbar" value="unterstrichen"/>
+    <cd:command name="underbars" value="unterstreichen"/>
+    <cd:command name="setupunderbar" value="stelleunterstreichenein"/>
+    <cd:command name="setupbodyfont" value="stellefliesstextein"/>
+    <cd:command name="switchtobodyfont" value="wechselezumfliesstext"/>
+    <cd:command name="showbodyfont" value="zeigefliesstext"/>
+    <cd:command name="showbodyfontenvironment" value="zeigefliesstextumgebung"/>
+    <cd:command name="headtext" value="ueberschrifttext"/>
+    <cd:command name="labeltext" value="labeltext"/>
+    <cd:command name="LABELTEXT" value="LABELTEXT"/>
+    <cd:command name="setupheadtext" value="stelleueberschrifttextein"/>
+    <cd:command name="setuplabeltext" value="stellelabeltextein"/>
+    <cd:command name="marginrule" value="marginallinie"/>
+    <cd:command name="startmarginrule" value="startmarginallinie"/>
+    <cd:command name="stopmarginrule" value="stopmarginallinie"/>
+    <cd:command name="setupmarginrules" value="stellemarginallinieein"/>
+    <cd:command name="blackrule" value="rechteck"/>
+    <cd:command name="blackrules" value="rechtecke"/>
+    <cd:command name="setupblackrules" value="stellerechteckein"/>
+    <cd:command name="setupscreens" value="stellerasterein"/>
+    <cd:command name="framed" value="umrahmt"/>
+    <cd:command name="inframed" value="imumriss"/>
+    <cd:command name="mframed" value="maumrise"/>
+    <cd:command name="inmframed" value="immaumrise"/>
+    <cd:command name="setupframed" value="stelleumrahmtein"/>
+    <cd:command name="setuplinewidth" value="stellelinienbreiteein"/>
+    <cd:command name="setupthinrules" value="stelleduennerumrissein"/>
+    <cd:command name="thinrule" value="duennelinie"/>
+    <cd:command name="thinrules" value="duennerumriss"/>
+    <cd:command name="hairline" value="haarlinie"/>
+    <cd:command name="vl" value="vl"/>
+    <cd:command name="hl" value="hl"/>
+    <cd:command name="defineframed" value="definiereumrahmt"/>
+    <cd:command name="defineframedtext" value="definiereumrahmtertext"/>
+    <cd:command name="setupframedtexts" value="stelleumrahmtetexteein"/>
+    <cd:command name="defineoverlay" value="definiereoverlay"/>
+    <cd:command name="definelayer" value="definelayer"/>
+    <cd:command name="background" value="hintergrund"/>
+    <cd:command name="startbackground" value="starthintergrund"/>
+    <cd:command name="stopbackground" value="stophintergrund"/>
+    <cd:command name="setupbackground" value="stellehintergrundein"/>
+    <cd:command name="fillinrules" value="gefuelltesrechteck"/>
+    <cd:command name="setupfillinrules" value="stellegefuelltesrechteckein"/>
+    <cd:command name="fillintext" value="ausfuelltext"/>
+    <cd:command name="setupfillinlines" value="stellegefuelltezeileein"/>
+    <cd:command name="fillinline" value="gefuelltezeile"/>
+    <cd:command name="setuptextrules" value="stelletextumrissein"/>
+    <cd:command name="textrule" value="textlinie"/>
+    <cd:command name="starttextrule" value="starttextlinie"/>
+    <cd:command name="stoptextrule" value="stoptextlinie"/>
+    <cd:command name="usemodule" value="verwendemodul"/>
+    <cd:command name="usemodules" value="verwendemodule"/>
+    <cd:command name="starttext" value="starttext"/>
+    <cd:command name="stoptext" value="stoptext"/>
+    <cd:command name="margintitle" value="marginaltitel"/>
+    <cd:command name="marginword" value="marginalwort"/>
+    <cd:command name="margintext" value="marginaltext"/>
+    <cd:command name="inleft" value="imlinken"/>
+    <cd:command name="inmargin" value="inmarginalie"/>
+    <cd:command name="inothermargin" value="inanderermarginale"/>
+    <cd:command name="inright" value="imrechten"/>
+    <cd:command name="ininner" value="ininner"/>
+    <cd:command name="inouter" value="inouter"/>
+    <cd:command name="startmarginblock" value="startmarginalblock"/>
+    <cd:command name="stopmarginblock" value="stopmarginalblock"/>
+    <cd:command name="defineinmargin" value="defineinmargin"/>
+    <cd:command name="setupinmargin" value="stelleinmarginalieein"/>
+    <cd:command name="setupmarginblocks" value="stellemarginalblockein"/>
+    <cd:command name="inleftedge" value="imlinkenrand"/>
+    <cd:command name="inleftmargin" value="inlinkermarginale"/>
+    <cd:command name="inrightmargin" value="inrechtermarginale"/>
+    <cd:command name="inrightedge" value="imrechtenrand"/>
+    <cd:command name="atleftmargin" value="atleftmargin"/>
+    <cd:command name="atrightmargin" value="atrightmargin"/>
+    <cd:command name="wordright" value="wortrechts"/>
+    <cd:command name="defineblank" value="definiereblanko"/>
+    <cd:command name="blank" value="blanko"/>
+    <cd:command name="setupblank" value="stelleblankoein"/>
+    <cd:command name="correctwhitespace" value="korrigierezwischenraum"/>
+    <cd:command name="fixedspaces" value="festesspatium"/>
+    <cd:command name="fixedspace" value="festesspatium"/>
+    <cd:command name="nospace" value="keinspatium"/>
+    <cd:command name="space" value="spatium"/>
+    <cd:command name="nowhitespace" value="keinzwischenraum"/>
+    <cd:command name="packed" value="kleinerdurchschuss"/>
+    <cd:command name="startpacked" value="startkleinerdurchschuss"/>
+    <cd:command name="stoppacked" value="stopkleinerdurchschuss"/>
+    <cd:command name="startunpacked" value="startgrosserdurchschuss"/>
+    <cd:command name="stopunpacked" value="stopgrosserdurchschuss"/>
+    <cd:command name="startlinecorrection" value="startzeilenkorrektur"/>
+    <cd:command name="stoplinecorrection" value="stopzeilenkorrektur"/>
+    <cd:command name="godown" value="nachunten"/>
+    <cd:command name="whitespace" value="zwischenraum"/>
+    <cd:command name="noindenting" value="nichteinziehen"/>
+    <cd:command name="indenting" value="einziehen"/>
+    <cd:command name="setupindenting" value="stelleeinziehenein"/>
+    <cd:command name="startalignment" value="startausrichtung"/>
+    <cd:command name="stopalignment" value="stopausrichtung"/>
+    <cd:command name="startlines" value="startzeilen"/>
+    <cd:command name="stoplines" value="stopzeilen"/>
+    <cd:command name="setupparagraphnumbering" value="stelleabsatznummerierungein"/>
+    <cd:command name="setuplinenumbering" value="stellezeilennumerierungein"/>
+    <cd:command name="startlinenumbering" value="startzeilennumerierung"/>
+    <cd:command name="stoplinenumbering" value="stopzeilennumerierung"/>
+    <cd:command name="startline" value="startzeile"/>
+    <cd:command name="stopline" value="stopzeile"/>
+    <cd:command name="someline" value="einezeile"/>
+    <cd:command name="inline" value="inzeile"/>
+    <cd:command name="crlf" value="crlf"/>
+    <cd:command name="emptylines" value="emptylines"/>
+    <cd:command name="setuplines" value="stellezeilenein"/>
+    <cd:command name="startnarrower" value="startenger"/>
+    <cd:command name="stopnarrower" value="stopenger"/>
+    <cd:command name="setupnarrower" value="stelleengerein"/>
+    <cd:command name="definetabulate" value="definieretabulator"/>
+    <cd:command name="setuptabulate" value="stelletabulatorein"/>
+    <cd:command name="starttable" value="starttabelle"/>
+    <cd:command name="stoptable" value="stoptabelle"/>
+    <cd:command name="starttables" value="starttabellen"/>
+    <cd:command name="stoptables" value="stoptabellen"/>
+    <cd:command name="setuptables" value="stelletabellenein"/>
+    <cd:command name="definetabletemplate" value="definieretabellenvorlage"/>
+    <cd:command name="page" value="seite"/>
+    <cd:command name="testcolumn" value="testcolumn"/>
+    <cd:command name="testpage" value="testpage"/>
+    <cd:command name="couplepage" value="doppelseite"/>
+    <cd:command name="pagetype" value="seitentyp"/>
+    <cd:command name="processpage" value="bearbeiteseite"/>
+    <cd:command name="couplepaper" value="doppelseitigespapier"/>
+    <cd:command name="selectpaper" value="waehlepapieraus"/>
+    <cd:command name="screen" value="bildschirm"/>
+    <cd:command name="definesection" value="definiereabschnitt"/>
+    <cd:command name="definesectionblock" value="definiereabschnittsblock"/>
+    <cd:command name="setupsectionblock" value="stelleabschnittsblockein"/>
+    <cd:command name="setupsection" value="stelleabschnittein"/>
+    <cd:command name="notopandbottomlines" value="keinzeilenobenundunten"/>
+    <cd:command name="noheaderandfooterlines" value="keinekopfundfusszeilen"/>
+    <cd:command name="setuptop" value="stellenobenein"/>
+    <cd:command name="setuptoptexts" value="stelletextobenein"/>
+    <cd:command name="setupheader" value="stellekopfzeileein"/>
+    <cd:command name="setupheadertexts" value="stellekopfzeilentextein"/>
+    <cd:command name="setuppagenumbering" value="stelleseitennummeriernungein"/>
+    <cd:command name="getnumber" value="getnumber"/>
+    <cd:command name="incrementnumber" value="nummererhoehen"/>
+    <cd:command name="decrementnumber" value="decrementnumber"/>
+    <cd:command name="resetnumber" value="resetnumber"/>
+    <cd:command name="setnumber" value="setnumber"/>
+    <cd:command name="setupnumber" value="setupnumber"/>
+    <cd:command name="setupbottom" value="stelleuntenein"/>
+    <cd:command name="setupbottomtexts" value="stelletextuntenein"/>
+    <cd:command name="setupfooter" value="stellefusszeileein"/>
+    <cd:command name="setupfootertexts" value="stellefusszeilentextein"/>
+    <cd:command name="setuppagenumber" value="stelleseitennummerein"/>
+    <cd:command name="setupsubpagenumber" value="stelleunterseitennummerein"/>
+    <cd:command name="subpagenumber" value="subpagenumber"/>
+    <cd:command name="setuptext" value="stelletextein"/>
+    <cd:command name="setuptexttexts" value="stelletexttexteein"/>
+    <cd:command name="definetext" value="definieretext"/>
+    <cd:command name="pagenumber" value="seitenummer"/>
+    <cd:command name="completepagenumber" value="completepagenumber"/>
+    <cd:command name="placepagenumber" value="placepagenumber"/>
+    <cd:command name="items" value="posten"/>
+    <cd:command name="setupitems" value="stellepostenein"/>
+    <cd:command name="leftaligned" value="linksbuendig"/>
+    <cd:command name="midaligned" value="zentriert"/>
+    <cd:command name="rightaligned" value="rechtsbuendig"/>
+    <cd:command name="startcolumns" value="startspalten"/>
+    <cd:command name="stopcolumns" value="stopspalten"/>
+    <cd:command name="setupcolumns" value="stellespaltenein"/>
+    <cd:command name="column" value="spalte"/>
+    <cd:command name="head" value="kopf"/>
+    <cd:command name="but" value="but"/>
+    <cd:command name="item" value="pos"/>
+    <cd:command name="nop" value="nop"/>
+    <cd:command name="mar" value="mar"/>
+    <cd:command name="sym" value="sym"/>
+    <cd:command name="its" value="its"/>
+    <cd:command name="ran" value="ran"/>
+    <cd:command name="headsym" value="headsym"/>
+    <cd:command name="defineitemgroup" value="defineitemgroup"/>
+    <cd:command name="setupitemgroup" value="setupitemgroup"/>
+    <cd:command name="setupitemgroups" value="setupitemgroups"/>
+    <cd:command name="definehead" value="definiereueberschrift"/>
+    <cd:command name="setuphead" value="stelleueberschriftein"/>
+    <cd:command name="setupheads" value="stelleueberschriftenein"/>
+    <cd:command name="setupheadnumber" value="stellekopfzahlein"/>
+    <cd:command name="headnumber" value="kopfnummer"/>
+    <cd:command name="currentheadnumber" value="heutigeskopfnummer"/>
+    <cd:command name="determineheadnumber" value="bestimmekopfnummer"/>
+    <cd:command name="resetmarking" value="ruecksetztenbeschriftung"/>
+    <cd:command name="setupmarking" value="stellebeschriftungein"/>
+    <cd:command name="definemarking" value="definierebeschriftung"/>
+    <cd:command name="nomarking" value="keinebeschriftung"/>
+    <cd:command name="marking" value="beschriftung"/>
+    <cd:command name="decouplemarking" value="entknuepfebeschriftung"/>
+    <cd:command name="couplemarking" value="verknuepfebeschriftung"/>
+    <cd:command name="getmarking" value="holebeschriftung"/>
+    <cd:command name="definelayout" value="definelayout"/>
+    <cd:command name="setuplayout" value="stellelayoutein"/>
+    <cd:command name="adaptlayout" value="passelayoutan"/>
+    <cd:command name="placeongrid" value="amgitterausrichten"/>
+    <cd:command name="moveongrid" value="amgitterneuausrichten"/>
+    <cd:command name="showsetups" value="zeigeeinstellungen"/>
+    <cd:command name="showframe" value="zeigerahmen"/>
+    <cd:command name="showgrid" value="zeigegitter"/>
+    <cd:command name="showlayout" value="zeigelayout"/>
+    <cd:command name="showprint" value="zeigedruck"/>
+    <cd:command name="showstruts" value="zeigestruts"/>
+    <cd:command name="definepapersize" value="definierepapierformat"/>
+    <cd:command name="setuppapersize" value="stellepapierformatein"/>
+    <cd:command name="setuppaper" value="setuppaper"/>
+    <cd:command name="setuparranging" value="stelleanordnenein"/>
+    <cd:command name="version" value="version"/>
+    <cd:command name="setupbackgrounds" value="stellehintergruendeein"/>
+    <cd:command name="setupalign" value="stelleausrichtungein"/>
+    <cd:command name="setupwhitespace" value="stellezwischenraumein"/>
+    <cd:command name="setupinteraction" value="stelleinteraktionein"/>
+    <cd:command name="setupinteractionmenu" value="stelleinteraktionsmenueein"/>
+    <cd:command name="defineinteractionmenu" value="definiereinteraktionsmenue"/>
+    <cd:command name="disableinteractionmenu" value="inaktiviereinteraktionsmenue"/>
+    <cd:command name="interactionmenu" value="interaktionsmenue"/>
+    <cd:command name="interactionbuttons" value="interaktionsknopfe"/>
+    <cd:command name="interactionbar" value="interaktionsbalken"/>
+    <cd:command name="setupinteractionbar" value="stelleinteraktionsbalkenein"/>
+    <cd:command name="setupinteractionscreen" value="stelleinteraktionsbildschirmein"/>
+    <cd:command name="placebookmarks" value="platzierebookmarks"/>
+    <cd:command name="bookmark" value="bookmark"/>
+    <cd:command name="definelogo" value="definierelogo"/>
+    <cd:command name="placelogos" value="platzierelogo"/>
+    <cd:command name="definecolor" value="definierefarbe"/>
+    <cd:command name="definecolorgroup" value="definierefarbengruppe"/>
+    <cd:command name="definepalet" value="definierepalette"/>
+    <cd:command name="graycolor" value="graufarbe"/>
+    <cd:command name="color" value="farbe"/>
+    <cd:command name="startcolor" value="startfarbe"/>
+    <cd:command name="stopcolor" value="stopfarbe"/>
+    <cd:command name="setupcolors" value="stellefarbenein"/>
+    <cd:command name="setupcolor" value="stellefarbeein"/>
+    <cd:command name="setuppalet" value="stellepaletteein"/>
+    <cd:command name="showcolor" value="zeigefarbe"/>
+    <cd:command name="showcolorgroup" value="zeigefarbengruppe"/>
+    <cd:command name="showpalet" value="zeigepalette"/>
+    <cd:command name="comparecolorgroup" value="vergleichefarbengruppe"/>
+    <cd:command name="comparepalet" value="vergleichepalette"/>
+    <cd:command name="colorvalue" value="farbewert"/>
+    <cd:command name="greyvalue" value="grauwert"/>
+    <cd:command name="startraster" value="startraster"/>
+    <cd:command name="stopraster" value="stopraster"/>
+    <cd:command name="defineblock" value="definiereblock"/>
+    <cd:command name="setupblock" value="stelleblockein"/>
+    <cd:command name="useblocks" value="verwendebloecke"/>
+    <cd:command name="processblocks" value="bearbeitebloecke"/>
+    <cd:command name="keepblocks" value="behaltebloecke"/>
+    <cd:command name="selectblocks" value="waehlebloeckeaus"/>
+    <cd:command name="hideblocks" value="verbergebloecke"/>
+    <cd:command name="bypassblocks" value="bypassblocks"/>
+    <cd:command name="forceblocks" value="forceblocks"/>
+    <cd:command name="nomoreblocks" value="keinebloeckemehr"/>
+    <cd:command name="definelist" value="definiereliste"/>
+    <cd:command name="definecombinedlist" value="definierezusammengestellteliste"/>
+    <cd:command name="listsymbol" value="listsymbol"/>
+    <cd:command name="placelist" value="platziereliste"/>
+    <cd:command name="plaatsruwelijst" value="placerawlist"/>
+    <cd:command name="placecombinedlist" value="platzierezusammengestellteliste"/>
+    <cd:command name="writetolist" value="schreibezurliste"/>
+    <cd:command name="writebetweenlist" value="schreibezwischenliste"/>
+    <cd:command name="immediatetolist" value="immediatetolist"/>
+    <cd:command name="immediatebetweenlist" value="immediatebetweenlist"/>
+    <cd:command name="setuplist" value="stellelisteein"/>
+    <cd:command name="setupcombinedlist" value="stellezusammengestelltelisteein"/>
+    <cd:command name="determinelistcharacteristics" value="bestimmelistencharakeristika"/>
+    <cd:command name="listlength" value="listenlaenge"/>
+    <cd:command name="listwidth" value="listenbreite"/>
+    <cd:command name="listheight" value="listenhoehe"/>
+    <cd:command name="nolist" value="keineliste"/>
+    <cd:command name="definereferencelist" value="definierereferenzliste"/>
+    <cd:command name="placereferencelist" value="platzierereferenzliste"/>
+    <cd:command name="writetoreferencelist" value="schreibezurreferenzliste"/>
+    <cd:command name="setupreferencelist" value="stellereferenzlisteein"/>
+    <cd:command name="definefloat" value="definieregleitobjekt"/>
+    <cd:command name="setupfloat" value="stellegleitobjektein"/>
+    <cd:command name="setupfloats" value="stellegleitobjekteein"/>
+    <cd:command name="splitfloat" value="teilegleitobjekt"/>
+    <cd:command name="setupfloatsplitting" value="stelleplatziegeteiltegleitobjekt"/>
+    <cd:command name="placefloat" value="placefloat"/>
+    <cd:command name="movesidefloat" value="movesidefloat"/>
+    <cd:command name="defineplacement" value="defineplacement"/>
+    <cd:command name="setupplacement" value="setupplacement"/>
+    <cd:command name="definecombination" value="definecombination"/>
+    <cd:command name="startcombination" value="startkombination"/>
+    <cd:command name="stopcombination" value="stopkombination"/>
+    <cd:command name="placesidebyside" value="platzierenebeneinander"/>
+    <cd:command name="placeontopofeachother" value="platziereuntereinander"/>
+    <cd:command name="setupcaption" value="stellebildunterschriftein"/>
+    <cd:command name="setupcaptions" value="stellebilderunterschriftein"/>
+    <cd:command name="setupcombinations" value="stellekombinationein"/>
+    <cd:command name="startoverlay" value="startoverlay"/>
+    <cd:command name="stopoverlay" value="stopoverlay"/>
+    <cd:command name="defineregister" value="definiereregister"/>
+    <cd:command name="coupleregister" value="verknuepfregister"/>
+    <cd:command name="setupregister" value="stelleregisterein"/>
+    <cd:command name="writetoregister" value="schreibezumregister"/>
+    <cd:command name="completeregister" value="completeregister"/>
+    <cd:command name="placeregister" value="platziereregister"/>
+    <cd:command name="determineregistercharacteristics" value="bestimmeregistercharakteristika"/>
+    <cd:command name="definesorting" value="definieresortieren"/>
+    <cd:command name="definesynonyms" value="definieresynonyme"/>
+    <cd:command name="setupsorting" value="stellesortierenein"/>
+    <cd:command name="setupsynonyms" value="stellesynonymein"/>
+    <cd:command name="startsynchronization" value="startsynchronisation"/>
+    <cd:command name="stopsynchronization" value="stopsynchronisation"/>
+    <cd:command name="setupsynchronizationbar" value="stellesynchronisationsbalkenein"/>
+    <cd:command name="setupsynchronization" value="stellesynchronisationein"/>
+    <cd:command name="synchronizationbar" value="synchronisationsbalken"/>
+    <cd:command name="synchronize" value="synchronisieren"/>
+    <cd:command name="useexternaldocument" value="verwendeexteresdokument"/>
+    <cd:command name="useURL" value="verwendeURL"/>
+    <cd:command name="useurl" value="verwendeurl"/>
+    <cd:command name="setupurl" value="stelleurlein"/>
+    <cd:command name="coupledocument" value="verknuepfedokument"/>
+    <cd:command name="setupprograms" value="stelleprogrammein"/>
+    <cd:command name="defineprogram" value="definiereprogramme"/>
+    <cd:command name="program" value="programm"/>
+    <cd:command name="setuppagetransitions" value="stelleseitenuebergangein"/>
+    <cd:command name="defineprofile" value="definiereprofil"/>
+    <cd:command name="defineversion" value="definiereversion"/>
+    <cd:command name="markversion" value="beschrifteversion"/>
+    <cd:command name="selectversion" value="waehleversionaus"/>
+    <cd:command name="startprofile" value="startprofil"/>
+    <cd:command name="startversion" value="startversion"/>
+    <cd:command name="setupprofiles" value="stelleprofilein"/>
+    <cd:command name="setupversions" value="stelleversionein"/>
+    <cd:command name="stopprofile" value="stopprofil"/>
+    <cd:command name="stopversion" value="stopversion"/>
+    <cd:command name="followprofile" value="folgeprofil"/>
+    <cd:command name="followprofileversion" value="folgeprofilversion"/>
+    <cd:command name="followversion" value="folgeversion"/>
+    <cd:command name="definedescription" value="definierebeschreibung"/>
+    <cd:command name="definelabel" value="definierelabel"/>
+    <cd:command name="defineenumeration" value="definierenummerierung"/>
+    <cd:command name="defineindenting" value="definiereeinzug"/>
+    <cd:command name="setupdescriptions" value="definierebeschreibungen"/>
+    <cd:command name="setupenumerations" value="stellebeschreibungein"/>
+    <cd:command name="setupindentations" value="stelleeinzuegein"/>
+    <cd:command name="setuptab" value="stelletabein"/>
+    <cd:command name="tab" value="tab"/>
+    <cd:command name="setupexternalfigures" value="stelleexterneabbildungenein"/>
+    <cd:command name="showexternalfigures" value="zeigeexterneabbildungen"/>
+    <cd:command name="externalfigure" value="externeabbildung"/>
+    <cd:command name="useexternalfigure" value="verwendeexterneabbildung"/>
+    <cd:command name="startfigure" value="startabbildung"/>
+    <cd:command name="referring" value="referieren"/>
+    <cd:command name="remark" value="bemerkung"/>
+    <cd:command name="colorbar" value="farbbalken"/>
+    <cd:command name="grid" value="gitter"/>
+    <cd:command name="button" value="knopf"/>
+    <cd:command name="menubutton" value="menueknopf"/>
+    <cd:command name="setupbuttons" value="stelleknopfein"/>
+    <cd:command name="usereferences" value="verwendereferenzen"/>
+    <cd:command name="reflijst" value="refliste"/>
+    <cd:command name="stelreferentielijstin" value="stellereferenzlisteein"/>
+    <cd:command name="setupreferencing" value="stellereferenzierenein"/>
+    <cd:command name="textreference" value="textreferenz"/>
+    <cd:command name="pagereference" value="seitenreferenz"/>
+    <cd:command name="reference" value="referenz"/>
+    <cd:command name="definereference" value="definierereferenz"/>
+    <cd:command name="definereferenceformat" value="definierereferenzformat"/>
+    <cd:command name="useJSscripts" value="verwendeJSscript"/>
+    <cd:command name="from" value="von"/>
+    <cd:command name="in" value="in"/>
+    <cd:command name="at" value="bei"/>
+    <cd:command name="about" value="ueber"/>
+    <cd:command name="goto" value="zu"/>
+    <cd:command name="atpage" value="aufseite"/>
+    <cd:command name="somewhere" value="irgendwo"/>
+    <cd:command name="navigating" value="navigating"/>
+    <cd:command name="ref" value="ref"/>
+    <cd:command name="gotobox" value="zurbox"/>
+    <cd:command name="gotopage" value="zurseite"/>
+    <cd:command name="placeformula" value="platziereformel"/>
+    <cd:command name="placesubformula" value="platziereunterformel"/>
+    <cd:command name="moveformula" value="moveformula"/>
+    <cd:command name="setupformulas" value="stelleformelnein"/>
+    <cd:command name="formulanumber" value="formelnummer"/>
+    <cd:command name="subformulanumber" value="unterformelnummer"/>
+    <cd:command name="leg" value="leg"/>
+    <cd:command name="fact" value="geg"/>
+    <cd:command name="mathematics" value="mathematik"/>
+    <cd:command name="dimension" value="dimension"/>
+    <cd:command name="nodimension" value="keindimension"/>
+    <cd:command name="startenvironment" value="startumgebung"/>
+    <cd:command name="stopenvironment" value="stopumgebung"/>
+    <cd:command name="startcomponent" value="startkomponente"/>
+    <cd:command name="stopcomponent" value="stopkomponente"/>
+    <cd:command name="startproduct" value="startprodukt"/>
+    <cd:command name="stopproduct" value="stopprodukt"/>
+    <cd:command name="startproject" value="startprojekt"/>
+    <cd:command name="stopproject" value="stopprojekt"/>
+    <cd:command name="setups" value="einstellungen"/>
+    <cd:command name="project" value="projekt"/>
+    <cd:command name="component" value="komponente"/>
+    <cd:command name="produxt" value="produkt"/>
+    <cd:command name="environment" value="umgebung"/>
+    <cd:command name="nomorefiles" value="keinedateienmehr"/>
+    <cd:command name="getbuffer" value="holepuffer"/>
+    <cd:command name="setupbuffer" value="stellepufferein"/>
+    <cd:command name="typebuffer" value="tippepuffer"/>
+    <cd:command name="definebuffer" value="definierepuffer"/>
+    <cd:command name="unitmeaning" value="bedeutung"/>
+    <cd:command name="infull" value="volleswort"/>
+    <cd:command name="quotation" value="zitat"/>
+    <cd:command name="quote" value="zitieren"/>
+    <cd:command name="startquotation" value="startzitat"/>
+    <cd:command name="stopquotation" value="stopzitat"/>
+    <cd:command name="setupquote" value="stellezitierenein"/>
+    <cd:command name="define" value="definieren"/>
+    <cd:command name="redo" value="wiederholen"/>
+    <cd:command name="usecommands" value="verwendebefehl"/>
+    <cd:command name="definestartstop" value="definierestartstop"/>
+    <cd:command name="setupstartstop" value="setupstartstop"/>
+    <cd:command name="startlocal" value="startlokal"/>
+    <cd:command name="stoplocal" value="stoplokal"/>
+    <cd:command name="startglobal" value="startglobal"/>
+    <cd:command name="stopglobal" value="stopglobal"/>
+    <cd:command name="macroname" value="name"/>
+    <cd:command name="definemakeup" value="definiereumbruch"/>
+    <cd:command name="setupmakeup" value="stelleumbruchein"/>
+    <cd:command name="startmakeup" value="startumbruch"/>
+    <cd:command name="stopmakeup" value="stopumbruch"/>
+    <cd:command name="useexternalsoundtrack" value="verwendeexternestonstueck"/>
+    <cd:command name="useexternalfile" value="verwendeexternedatei"/>
+    <cd:command name="useexternalfiles" value="verwendeexternedateien"/>
+    <cd:command name="referral" value="verweis"/>
+    <cd:command name="referraldate" value="verweisdatum"/>
+    <cd:command name="high" value="hoch"/>
+    <cd:command name="lohi" value="tiho"/>
+    <cd:command name="low" value="tief"/>
+    <cd:command name="fraction" value="bruch"/>
+    <cd:command name="chem" value="chem"/>
+    <cd:command name="startopposite" value="startgegenueber"/>
+    <cd:command name="stopopposite" value="stopgegenueber"/>
+    <cd:command name="setupoppositeplacing" value="stellegegenueberplatzierenein"/>
+    <cd:command name="startpositioning" value="startpositionieren"/>
+    <cd:command name="stoppositioning" value="stoppositionieren"/>
+    <cd:command name="position" value="position"/>
+    <cd:command name="setuppositioning" value="stellepositionierenein"/>
+    <cd:command name="rotate" value="drehen"/>
+    <cd:command name="setuprotate" value="stelledrehenein"/>
+    <cd:command name="mirror" value="spiegeln"/>
+    <cd:command name="scale" value="format"/>
+    <cd:command name="setupnumbering" value="stellenummerierungein"/>
+    <cd:command name="reset" value="ruecksetzten"/>
+    <cd:command name="setuppublications" value="stellepublikationein"/>
+    <cd:command name="publication" value="publikation"/>
+    <cd:command name="definehbox" value="definierehbox"/>
+    <cd:command name="adding" value="zusatz"/>
+    <cd:command name="periods" value="punkt"/>
+    <cd:command name="setuphyphenmark" value="stellebindestrichein"/>
+    <cd:command name="setupinterlinespace" value="stellezeilenabstandein"/>
+    <cd:command name="setupspacing" value="stellespatiumein"/>
+    <cd:command name="setuptolerance" value="stelletoleranzein"/>
+    <cd:command name="setupsystem" value="stellesystemein"/>
+    <cd:command name="usepath" value="benutzeverzeichnis"/>
+    <cd:command name="defineparagraphs" value="definiereabsaetze"/>
+    <cd:command name="setupparagraphs" value="stelleabsaetzeein"/>
+    <cd:command name="donttest" value="keintest"/>
+    <cd:command name="setupcomment" value="stellekommentarein"/>
+    <cd:command name="comment" value="kommentar"/>
+    <cd:command name="definefield" value="definierefeld"/>
+    <cd:command name="definemainfield" value="definierehauptfeld"/>
+    <cd:command name="definesubfield" value="definieresubfeld"/>
+    <cd:command name="clonefield" value="klonierefeld"/>
+    <cd:command name="copyfield" value="kopierefeld"/>
+    <cd:command name="setupfield" value="stellefeldein"/>
+    <cd:command name="setupfields" value="stellefelderin"/>
+    <cd:command name="field" value="feld"/>
+    <cd:command name="fitfield" value="passendfeld"/>
+    <cd:command name="logfields" value="registrierefelder"/>
+    <cd:command name="showfields" value="zeigefelder"/>
+    <cd:command name="tooltip" value="tooltip"/>
+    <cd:command name="fillinfield" value="ausfuellfeld"/>
+    <cd:command name="definefieldstack" value="definierefeldstapel"/>
+    <cd:command name="fieldstack" value="feldstapel"/>
+    <cd:command name="setupforms" value="setupforms"/>
+    <cd:command name="setupclipping" value="stelleausschnittein"/>
+    <cd:command name="clip" value="ausschnitt"/>
+    <cd:command name="placelegend" value="platzierelegende"/>
+    <cd:command name="setuplegend" value="stellelegendeein"/>
+    <cd:command name="setuppagecomment" value="stelleseitenkommentarein"/>
+    <cd:command name="setupstrut" value="setupstrut"/>
+    <cd:command name="definerule" value="definerule"/>
+    <cd:command name="placerule" value="placerule"/>
+    <cd:command name="setuprule" value="setuprule"/>
+    <cd:command name="definetextvariable" value="definetextvariable"/>
+    <cd:command name="setuptextvariable" value="setuptextvariable"/>
+    <cd:command name="settextvariable" value="settextvariable"/>
+    <cd:command name="placetextvariable" value="placetextvariable"/>
+    <cd:command name="textvariable" value="textvariable"/>
+    <cd:command name="definetextposition" value="definetextposition"/>
+    <cd:command name="setuptextposition" value="setuptextposition"/>
+    <cd:command name="positiontext" value="positiontext"/>
+    <cd:command name="definerawfont" value="definerawfont"/>
+    <cd:command name="switchtorawfont" value="switchtorawfont"/>
+    <cd:command name="placeheadtext" value="placeheadtext"/>
+    <cd:command name="placeheadnumber" value="placeheadnumber"/>
+    <cd:command name="definepagebreak" value="definepagebreak"/>
+    <cd:command name="definecolumnbreak" value="definecolumnbreak"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="setupitemgroups" value="stelleaufzaehlungenein"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="topheight" value="hoeheoben"/>
+    <cd:command name="topdistance" value="abstandoben"/>
+    <cd:command name="headerheight" value="kopfzeilenhoehe"/>
+    <cd:command name="headerdistance" value="kopfzeilenabstand"/>
+    <cd:command name="textheight" value="texthoehe"/>
+    <cd:command name="footerdistance" value="fusszeileabstand"/>
+    <cd:command name="footerheight" value="fusszeilenhoehe"/>
+    <cd:command name="bottomdistance" value="abstandunten"/>
+    <cd:command name="bottomheight" value="hoeheunten"/>
+    <cd:command name="marginwidth" value="marginalbreite"/>
+    <cd:command name="leftmarginwidth" value="linkemarginalbreite"/>
+    <cd:command name="rightmarginwidth" value="rechtemarginalbreite"/>
+    <cd:command name="margindistance" value="marginalafstand"/>
+    <cd:command name="leftmargindistance" value="linkemarginalafstand"/>
+    <cd:command name="rightmargindistance" value="rechtemarginalafstand"/>
+    <cd:command name="edgewidth" value="randbreite"/>
+    <cd:command name="leftedgewidth" value="breitelinkerrand"/>
+    <cd:command name="rightedgewidth" value="breiterechterrand"/>
+    <cd:command name="edgedistance" value="randabstand"/>
+    <cd:command name="leftedgedistance" value="abstandlinkerrand"/>
+    <cd:command name="rightedgedistance" value="abstandrechterrand"/>
+    <cd:command name="innermarginwidth" value="innermarginwidth"/>
+    <cd:command name="outermarginwidth" value="outermarginwidth"/>
+    <cd:command name="innermargindistance" value="innermargindistance"/>
+    <cd:command name="outermargindistance" value="outermargindistance"/>
+    <cd:command name="inneredgewidth" value="inneredgewidth"/>
+    <cd:command name="outeredgewidth" value="outeredgewidth"/>
+    <cd:command name="inneredgedistance" value="inneredgedistance"/>
+    <cd:command name="outeredgedistance" value="outeredgedistance"/>
+    <cd:command name="textwidth" value="textbreite"/>
+    <cd:command name="makeupwidth" value="satzbreite"/>
+    <cd:command name="makeupheight" value="satzhoehe"/>
+    <cd:command name="topspace" value="kopfweite"/>
+    <cd:command name="bottomspace" value="bottomspace"/>
+    <cd:command name="backspace" value="rumpfweite"/>
+    <cd:command name="cutspace" value="cutspace"/>
+    <cd:command name="paperwidth" value="papierbreite"/>
+    <cd:command name="paperheight" value="papierhoehe"/>
+    <cd:command name="printpaperwidth" value="printpapierbreite"/>
+    <cd:command name="printpaperheight" value="printpapierhoehe"/>
+    <cd:command name="pageoffset" value="pageoffset"/>
+    <cd:command name="pagedepth" value="pagedepth"/>
+    <cd:command name="headlevel" value="kopfniveau"/>
+    <cd:command name="linewidth" value="liniendicke"/>
+    <cd:command name="totalnumberofpages" value="gesamtseitenanzahl"/>
+    <cd:command name="numberofsubpages" value="numberofsubpages"/>
+    <cd:command name="useXMLfilter" value="useXMLfilter"/>
+    <cd:command name="definecolumnset" value="definecolumnset"/>
+    <cd:command name="setupcolumnset" value="setupcolumnset"/>
+    <cd:command name="startcolumnset" value="startcolumnset"/>
+    <cd:command name="stopcolumnset" value="stopcolumnset"/>
+    <cd:command name="setupcolumnsetlines" value="setupcolumnsetlines"/>
+    <cd:command name="setupcolumnsetstart" value="setupcolumnsetstart"/>
+    <cd:command name="startcolumnmakeup" value="startcolumnmakeup"/>
+    <cd:command name="stopcolumnmakeup" value="stopcolumnmakeup"/>
+    <cd:command name="usetypescript" value="usetypescript"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="startdocument" value="startdokument"/>
+    <cd:command name="stopdocument" value="stopdokument"/>
+    <cd:command name="startoverzicht" value="startueberblick"/>
+    <cd:command name="stopoverzicht" value="stopueberblick"/>
+    <cd:command name="label" value="label"/>
+    <cd:command name="labels" value="labels"/>
+    <cd:command name="domicile" value="wohnort"/>
+  </cd:commands>
+
+</cd:interface>
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
new file mode 100644
index 000000000..9c96ec88d
--- /dev/null
+++ b/tex/context/interface/keys-en.xml
@@ -0,0 +1,1576 @@
+<?xml version="1.0"?>
+
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.11.16">
+
+  <cd:variables>
+    <cd:variable name="one" value="one"/>
+    <cd:variable name="two" value="two"/>
+    <cd:variable name="three" value="three"/>
+    <cd:variable name="four" value="four"/>
+    <cd:variable name="five" value="five"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="sunday" value="sunday"/>
+    <cd:variable name="monday" value="monday"/>
+    <cd:variable name="tuesday" value="tuesday"/>
+    <cd:variable name="wednesday" value="wednesday"/>
+    <cd:variable name="thursday" value="thursday"/>
+    <cd:variable name="friday" value="friday"/>
+    <cd:variable name="saturday" value="saturday"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="january" value="January"/>
+    <cd:variable name="february" value="February"/>
+    <cd:variable name="march" value="March"/>
+    <cd:variable name="april" value="April"/>
+    <cd:variable name="may" value="May"/>
+    <cd:variable name="june" value="June"/>
+    <cd:variable name="july" value="July"/>
+    <cd:variable name="august" value="August"/>
+    <cd:variable name="september" value="September"/>
+    <cd:variable name="october" value="October"/>
+    <cd:variable name="november" value="November"/>
+    <cd:variable name="december" value="December"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="atpage" value="atpage"/>
+    <cd:variable name="hencefore" value="hencefore"/>
+    <cd:variable name="hereafter" value="hereafter"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="sectionlevel" value="section"/>
+    <cd:variable name="part" value="part"/>
+    <cd:variable name="chapter" value="chapter"/>
+    <cd:variable name="subject" value="subject"/>
+    <cd:variable name="section" value="section"/>
+    <cd:variable name="title" value="title"/>
+    <cd:variable name="margintitle" value="margintitle"/>
+    <cd:variable name="content" value="content"/>
+    <cd:variable name="contents" value="contents"/>
+    <cd:variable name="appendix" value="appendix"/>
+    <cd:variable name="appendices" value="appendices"/>
+    <cd:variable name="bodypart" value="bodypart"/>
+    <cd:variable name="bodymatter" value="bodymatter"/>
+    <cd:variable name="frontpart" value="frontpart"/>
+    <cd:variable name="frontmatter" value="frontmatter"/>
+    <cd:variable name="backpart" value="backpart"/>
+    <cd:variable name="backmatter" value="backmatter"/>
+    <cd:variable name="footnote" value="footnote"/>
+    <cd:variable name="system" value="system"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="subsection" value="subsection"/>
+    <cd:variable name="subsubsection" value="subsubsection"/>
+    <cd:variable name="subsubsubsection" value="subsubsubsection"/>
+    <cd:variable name="subsubsubsubsection" value="subsubsubsubsection"/>
+    <cd:variable name="subsubsubsubsubsection" value="subsubsubsubsubsection"/>
+    <cd:variable name="subsubject" value="subsubject"/>
+    <cd:variable name="subsubsubject" value="subsubsubject"/>
+    <cd:variable name="subsubsubsubject" value="subsubsubsubject"/>
+    <cd:variable name="subsubsubsubsubject" value="subsubsubsubsubject"/>
+    <cd:variable name="subsubsubsubsubsubject" value="subsubsubsubsubsubject"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="flushleft" value="flushleft"/>
+    <cd:variable name="flushright" value="flushright"/>
+    <cd:variable name="center" value="center"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="typing" value="typing"/>
+    <cd:variable name="file" value="file"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="formula" value="formula"/>
+    <cd:variable name="formulae" value="formulae"/>
+    <cd:variable name="figure" value="figure"/>
+    <cd:variable name="figures" value="figures"/>
+    <cd:variable name="table" value="table"/>
+    <cd:variable name="tables" value="tables"/>
+    <cd:variable name="graphic" value="graphic"/>
+    <cd:variable name="graphics" value="graphics"/>
+    <cd:variable name="intermezzo" value="intermezzo"/>
+    <cd:variable name="intermezzi" value="intermezzi"/>
+    <cd:variable name="index" value="index"/>
+    <cd:variable name="indices" value="indices"/>
+    <cd:variable name="abbreviation" value="abbreviation"/>
+    <cd:variable name="abbreviations" value="abbreviations"/>
+    <cd:variable name="logo" value="logo"/>
+    <cd:variable name="logos" value="logos"/>
+    <cd:variable name="unit" value="unit"/>
+    <cd:variable name="units" value="units"/>
+    <cd:variable name="line" value="line"/>
+    <cd:variable name="lines" value="lines"/>
+    <cd:variable name="framedtext" value="framedtext"/>
+    <cd:variable name="quotation" value="quotation"/>
+    <cd:variable name="quote" value="quote"/>
+    <cd:variable name="speech" value="speech"/>
+    <cd:variable name="itemize" value="itemize"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="leftquotation" value="leftquotation"/>
+    <cd:constant name="rightquotation" value="rightquotation"/>
+    <cd:constant name="leftquote" value="leftquote"/>
+    <cd:constant name="rightquote" value="rightquote"/>
+    <cd:constant name="midsentence" value="midsentence"/>
+    <cd:constant name="leftsentence" value="leftsentence"/>
+    <cd:constant name="rightsentence" value="rightsentence"/>
+    <cd:constant name="leftsubsentence" value="leftsubsentence"/>
+    <cd:constant name="rightsubsentence" value="rightsubsentence"/>
+    <cd:constant name="leftspeech" value="leftspeech"/>
+    <cd:constant name="middlespeech" value="middlespeech"/>
+    <cd:constant name="rightspeech" value="rightspeech"/>
+    <cd:constant name="limittext" value="limittext"/>
+    <cd:constant name="date" value="date"/>
+    <cd:constant name="spacebefore" value="spacebefore"/>
+    <cd:constant name="spaceinbetween" value="spaceinbetween"/>
+    <cd:constant name="spaceafter" value="spaceafter"/>
+    <cd:constant name="sidespacebefore" value="sidespacebefore"/>
+    <cd:constant name="sidespaceafter" value="sidespaceafter"/>
+    <cd:constant name="to" value="to"/>
+    <cd:constant name="indicator" value="indicator"/>
+    <cd:constant name="background" value="background"/>
+    <cd:constant name="backgrounddepth" value="backgrounddepth"/>
+    <cd:constant name="backgroundcorner" value="backgroundcorner"/>
+    <cd:constant name="splitcolor" value="splitcolor"/>
+    <cd:constant name="backgroundcolor" value="backgroundcolor"/>
+    <cd:constant name="foregroundcolor" value="foregroundcolor"/>
+    <cd:constant name="foregroundstyle" value="foregroundstyle"/>
+    <cd:constant name="clipoffset" value="clipoffset"/>
+    <cd:constant name="backgroundoffset" value="backgroundoffset"/>
+    <cd:constant name="backgroundscreen" value="backgroundscreen"/>
+    <cd:constant name="backgroundradius" value="backgroundradius"/>
+    <cd:constant name="address" value="address"/>
+    <cd:constant name="stopper" value="stopper"/>
+    <cd:constant name="distance" value="distance"/>
+    <cd:constant name="paragraph" value="paragraph"/>
+    <cd:constant name="axis" value="axis"/>
+    <cd:constant name="author" value="author"/>
+    <cd:constant name="auto" value="auto"/>
+    <cd:constant name="autofile" value="autofile"/>
+    <cd:constant name="balance" value="balance"/>
+    <cd:constant name="wfactor" value="wfactor"/>
+    <cd:constant name="inner" value="inner"/>
+    <cd:constant name="blank" value="blank"/>
+    <cd:constant name="obstruction" value="obstruction"/>
+    <cd:constant name="blockway" value="blockway"/>
+    <cd:constant name="bottomspace" value="bottomspace"/>
+    <cd:constant name="top" value="top"/>
+    <cd:constant name="topdistance" value="topdistance"/>
+    <cd:constant name="topframe" value="topframe"/>
+    <cd:constant name="topoffset" value="topoffset"/>
+    <cd:constant name="topstate" value="topstate"/>
+    <cd:constant name="width" value="width"/>
+    <cd:constant name="maxwidth" value="maxwidth"/>
+    <cd:constant name="minwidth" value="minwidth"/>
+    <cd:constant name="source" value="source"/>
+    <cd:constant name="command" value="command"/>
+    <cd:constant name="commands" value="commands"/>
+    <cd:constant name="component" value="component"/>
+    <cd:constant name="contrastcolor" value="contrastcolor"/>
+    <cd:constant name="conversion" value="conversion"/>
+    <cd:constant name="headconversion" value="headconversion"/>
+    <cd:constant name="headlabel" value="headlabel"/>
+    <cd:constant name="criterium" value="criterium"/>
+    <cd:constant name="date" value="date"/>
+    <cd:constant name="default" value="default"/>
+    <cd:constant name="depth" value="depth"/>
+    <cd:constant name="depthcorrection" value="depthcorrection"/>
+    <cd:constant name="continue" value="continue"/>
+    <cd:constant name="doublesided" value="doublesided"/>
+    <cd:constant name="dummy" value="dummy"/>
+    <cd:constant name="unit" value="unit"/>
+    <cd:constant name="ownnumber" value="ownnumber"/>
+    <cd:constant name="evenmargin" value="evenmargin"/>
+    <cd:constant name="expansion" value="expansion"/>
+    <cd:constant name="factor" value="factor"/>
+    <cd:constant name="convertfile" value="convertfile"/>
+    <cd:constant name="file" value="file"/>
+    <cd:constant name="inputfile" value="inputfile"/>
+    <cd:constant name="size" value="size"/>
+    <cd:constant name="autofocus" value="autofocus"/>
+    <cd:constant name="focus" value="focus"/>
+    <cd:constant name="directory" value="directory"/>
+    <cd:constant name="grid" value="grid"/>
+    <cd:constant name="big" value="big"/>
+    <cd:constant name="get" value="get"/>
+    <cd:constant name="hang" value="hang"/>
+    <cd:constant name="repeat" value="repeat"/>
+    <cd:constant name="hfactor" value="hfactor"/>
+    <cd:constant name="corner" value="corner"/>
+    <cd:constant name="hoffset" value="hoffset"/>
+    <cd:constant name="frames" value="frames"/>
+    <cd:constant name="header" value="header"/>
+    <cd:constant name="headerdistance" value="headerdistance"/>
+    <cd:constant name="headerstate" value="headerstate"/>
+    <cd:constant name="height" value="height"/>
+    <cd:constant name="maxheight" value="maxheight"/>
+    <cd:constant name="minheight" value="minheight"/>
+    <cd:constant name="mindepth" value="mindepth"/>
+    <cd:constant name="current" value="current"/>
+    <cd:constant name="in" value="in"/>
+    <cd:constant name="indenting" value="indenting"/>
+    <cd:constant name="interaction" value="interaction"/>
+    <cd:constant name="interlinespace" value="interlinespace"/>
+    <cd:constant name="items" value="items"/>
+    <cd:constant name="frame" value="frame"/>
+    <cd:constant name="framedepth" value="framedepth"/>
+    <cd:constant name="framecorner" value="framecorner"/>
+    <cd:constant name="framecolor" value="framecolor"/>
+    <cd:constant name="frameoffset" value="frameoffset"/>
+    <cd:constant name="frameradius" value="frameradius"/>
+    <cd:constant name="marginedge" value="marginedge"/>
+    <cd:constant name="marginedgetext" value="marginedgetext"/>
+    <cd:constant name="aligncharacter" value="aligncharacter"/>
+    <cd:constant name="alignmentcharacter" value="alignmentcharacter"/>
+    <cd:constant name="small" value="small"/>
+    <cd:constant name="color" value="color"/>
+    <cd:constant name="column" value="column"/>
+    <cd:constant name="columns" value="columns"/>
+    <cd:constant name="columndistance" value="columndistance"/>
+    <cd:constant name="headcommand" value="headcommand"/>
+    <cd:constant name="headcolor" value="headcolor"/>
+    <cd:constant name="headstyle" value="headstyle"/>
+    <cd:constant name="afterhead" value="afterhead"/>
+    <cd:constant name="veroffset" value="veroffset"/>
+    <cd:constant name="coupling" value="coupling"/>
+    <cd:constant name="couplingway" value="couplingway"/>
+    <cd:constant name="beforehead" value="beforehead"/>
+    <cd:constant name="topspace" value="topspace"/>
+    <cd:constant name="bodyfont" value="bodyfont"/>
+    <cd:constant name="label" value="label"/>
+    <cd:constant name="empty" value="empty"/>
+    <cd:constant name="style" value="style"/>
+    <cd:constant name="rule" value="rule"/>
+    <cd:constant name="rulethickness" value="rulethickness"/>
+    <cd:constant name="rulecolor" value="rulecolor"/>
+    <cd:constant name="list" value="list"/>
+    <cd:constant name="leftwidth" value="leftwidth"/>
+    <cd:constant name="leftframe" value="leftframe"/>
+    <cd:constant name="leftcolor" value="leftcolor"/>
+    <cd:constant name="leftstyle" value="leftstyle"/>
+    <cd:constant name="leftmargin" value="leftmargin"/>
+    <cd:constant name="leftmargindistance" value="leftmargindistance"/>
+    <cd:constant name="leftoffset" value="leftoffset"/>
+    <cd:constant name="leftedge" value="leftedge"/>
+    <cd:constant name="leftedgedistance" value="leftedgedistance"/>
+    <cd:constant name="lefttext" value="lefttext"/>
+    <cd:constant name="left" value="left"/>
+    <cd:constant name="nleft" value="nleft"/>
+    <cd:constant name="logo" value="logo"/>
+    <cd:constant name="logos" value="logos"/>
+    <cd:constant name="local" value="local"/>
+    <cd:constant name="margin" value="margin"/>
+    <cd:constant name="margindistance" value="margindistance"/>
+    <cd:constant name="margintext" value="margintext"/>
+    <cd:constant name="marking" value="marking"/>
+    <cd:constant name="marcolor" value="marcolor"/>
+    <cd:constant name="marstyle" value="marstyle"/>
+    <cd:constant name="menu" value="menu"/>
+    <cd:constant name="splitmethod" value="splitmethod"/>
+    <cd:constant name="textmethod" value="textmethod"/>
+    <cd:constant name="sidemethod" value="sidemethod"/>
+    <cd:constant name="method" value="method"/>
+    <cd:constant name="middle" value="middle"/>
+    <cd:constant name="middletext" value="middletext"/>
+    <cd:constant name="max" value="max"/>
+    <cd:constant name="min" value="min"/>
+    <cd:constant name="sample" value="sample"/>
+    <cd:constant name="after" value="after"/>
+    <cd:constant name="name" value="name"/>
+    <cd:constant name="commandafter" value="commandafter"/>
+    <cd:constant name="ntop" value="ntop"/>
+    <cd:constant name="level" value="level"/>
+    <cd:constant name="levels" value="levels"/>
+    <cd:constant name="nbottom" value="nbottom"/>
+    <cd:constant name="norm" value="norm"/>
+    <cd:constant name="nlines" value="nlines"/>
+    <cd:constant name="number" value="number"/>
+    <cd:constant name="numbercommand" value="numbercommand"/>
+    <cd:constant name="numbering" value="numbering"/>
+    <cd:constant name="numbercolor" value="numbercolor"/>
+    <cd:constant name="numberstyle" value="numberstyle"/>
+    <cd:constant name="numberseparator" value="numberseparator"/>
+    <cd:constant name="object" value="object"/>
+    <cd:constant name="offset" value="offset"/>
+    <cd:constant name="bottom" value="bottom"/>
+    <cd:constant name="bottomdistance" value="bottomdistance"/>
+    <cd:constant name="bottomframe" value="bottomframe"/>
+    <cd:constant name="bottomoffset" value="bottomoffset"/>
+    <cd:constant name="bottomstate" value="bottomstate"/>
+    <cd:constant name="oddmargin" value="oddmargin"/>
+    <cd:constant name="at" value="at"/>
+    <cd:constant name="option" value="option"/>
+    <cd:constant name="page" value="page"/>
+    <cd:constant name="pagecommand" value="pagecommand"/>
+    <cd:constant name="pagecolor" value="pagecolor"/>
+    <cd:constant name="pagestyle" value="pagestyle"/>
+    <cd:constant name="pagenumber" value="pagenumber"/>
+    <cd:constant name="pageboundaries" value="pageboundaries"/>
+    <cd:constant name="pagestate" value="pagestate"/>
+    <cd:constant name="palet" value="palet"/>
+    <cd:constant name="paper" value="paper"/>
+    <cd:constant name="location" value="location"/>
+    <cd:constant name="placestopper" value="placestopper"/>
+    <cd:constant name="place" value="place"/>
+    <cd:constant name="placehead" value="placehead"/>
+    <cd:constant name="position" value="position"/>
+    <cd:constant name="prefix" value="prefix"/>
+    <cd:constant name="preset" value="preset"/>
+    <cd:constant name="preview" value="preview"/>
+    <cd:constant name="process" value="process"/>
+    <cd:constant name="spot" value="spot"/>
+    <cd:constant name="dot" value="dot"/>
+    <cd:constant name="arrow" value="arrow"/>
+    <cd:constant name="edge" value="edge"/>
+    <cd:constant name="edgedistance" value="edgedistance"/>
+    <cd:constant name="screen" value="screen"/>
+    <cd:constant name="rightwidth" value="rightwidth"/>
+    <cd:constant name="rightframe" value="rightframe"/>
+    <cd:constant name="rightcolor" value="rightcolor"/>
+    <cd:constant name="rightstyle" value="rightstyle"/>
+    <cd:constant name="rightmargin" value="rightmargin"/>
+    <cd:constant name="rightmargindistance" value="rightmargindistance"/>
+    <cd:constant name="rightoffset" value="rightoffset"/>
+    <cd:constant name="rightedge" value="rightedge"/>
+    <cd:constant name="rightedgedistance" value="rightedgedistance"/>
+    <cd:constant name="righttext" value="righttext"/>
+    <cd:constant name="right" value="right"/>
+    <cd:constant name="nright" value="nright"/>
+    <cd:constant name="reduction" value="reduction"/>
+    <cd:constant name="referencing" value="referencing"/>
+    <cd:constant name="line" value="line"/>
+    <cd:constant name="linecorrection" value="linecorrection"/>
+    <cd:constant name="lines" value="lines"/>
+    <cd:constant name="stretch" value="stretch"/>
+    <cd:constant name="resolution" value="resolution"/>
+    <cd:constant name="rotation" value="rotation"/>
+    <cd:constant name="orientation" value="orientation"/>
+    <cd:constant name="horoffset" value="horoffset"/>
+    <cd:constant name="backspace" value="backspace"/>
+    <cd:constant name="direction" value="direction"/>
+    <cd:constant name="scale" value="scale"/>
+    <cd:constant name="separator" value="separator"/>
+    <cd:constant name="display" value="display"/>
+    <cd:constant name="scope" value="scope"/>
+    <cd:constant name="section" value="section"/>
+    <cd:constant name="sectionnumber" value="sectionnumber"/>
+    <cd:constant name="setups" value="setups"/>
+    <cd:constant name="cutspace" value="cutspace"/>
+    <cd:constant name="family" value="family"/>
+    <cd:constant name="space" value="space"/>
+    <cd:constant name="spacing" value="spacing"/>
+    <cd:constant name="split" value="split"/>
+    <cd:constant name="splitoffset" value="splitoffset"/>
+    <cd:constant name="indentnext" value="indentnext"/>
+    <cd:constant name="step" value="step"/>
+    <cd:constant name="stack" value="stack"/>
+    <cd:constant name="start" value="start"/>
+    <cd:constant name="state" value="state"/>
+    <cd:constant name="stop" value="stop"/>
+    <cd:constant name="radius" value="radius"/>
+    <cd:constant name="dash" value="dash"/>
+    <cd:constant name="sub" value="sub"/>
+    <cd:constant name="subtitle" value="subtitle"/>
+    <cd:constant name="symbol" value="symbol"/>
+    <cd:constant name="symbolset" value="symbolset"/>
+    <cd:constant name="symcolor" value="symcolor"/>
+    <cd:constant name="symstyle" value="symstyle"/>
+    <cd:constant name="synonym" value="synonym"/>
+    <cd:constant name="synonymcolor" value="synonymcolor"/>
+    <cd:constant name="synonymstyle" value="synonymstyle"/>
+    <cd:constant name="tab" value="tab"/>
+    <cd:constant name="sign" value="sign"/>
+    <cd:constant name="text" value="text"/>
+    <cd:constant name="textwidth" value="textwidth"/>
+    <cd:constant name="textcommand" value="textcommand"/>
+    <cd:constant name="textsize" value="textsize"/>
+    <cd:constant name="textcolor" value="textcolor"/>
+    <cd:constant name="textstyle" value="textstyle"/>
+    <cd:constant name="textseparator" value="textseparator"/>
+    <cd:constant name="textstate" value="textstate"/>
+    <cd:constant name="title" value="title"/>
+    <cd:constant name="aligntitle" value="aligntitle"/>
+    <cd:constant name="tolerance" value="tolerance"/>
+    <cd:constant name="inbetween" value="inbetween"/>
+    <cd:constant name="type" value="type"/>
+    <cd:constant name="align" value="align"/>
+    <cd:constant name="urlspace" value="urlspace"/>
+    <cd:constant name="urlalternative" value="urlalternative"/>
+    <cd:constant name="from" value="from"/>
+    <cd:constant name="alternative" value="alternative"/>
+    <cd:constant name="increment" value="increment"/>
+    <cd:constant name="incrementnumber" value="incrementnumber"/>
+    <cd:constant name="resetnumber" value="resetnumber"/>
+    <cd:constant name="reference" value="reference"/>
+    <cd:constant name="unknownreference" value="unknownreference"/>
+    <cd:constant name="footer" value="footer"/>
+    <cd:constant name="footerdistance" value="footerdistance"/>
+    <cd:constant name="footerstate" value="footerstate"/>
+    <cd:constant name="voffset" value="voffset"/>
+    <cd:constant name="next" value="next"/>
+    <cd:constant name="before" value="before"/>
+    <cd:constant name="commandbefore" value="commandbefore"/>
+    <cd:constant name="previous" value="previous"/>
+    <cd:constant name="previousnumber" value="previousnumber"/>
+    <cd:constant name="delay" value="delay"/>
+    <cd:constant name="way" value="way"/>
+    <cd:constant name="random" value="random"/>
+    <cd:constant name="white" value="white"/>
+    <cd:constant name="xfactor" value="xfactor"/>
+    <cd:constant name="xmax" value="xmax"/>
+    <cd:constant name="xoffset" value="xoffset"/>
+    <cd:constant name="xscale" value="xscale"/>
+    <cd:constant name="xstep" value="xstep"/>
+    <cd:constant name="yfactor" value="yfactor"/>
+    <cd:constant name="ymax" value="ymax"/>
+    <cd:constant name="yoffset" value="yoffset"/>
+    <cd:constant name="yscale" value="yscale"/>
+    <cd:constant name="ystep" value="ystep"/>
+    <cd:constant name="samepage" value="samepage"/>
+    <cd:constant name="sidealign" value="sidealign"/>
+    <cd:constant name="side" value="side"/>
+    <cd:constant name="fieldlayer" value="fieldlayer"/>
+    <cd:constant name="textlayer" value="textlayer"/>
+    <cd:constant name="fieldbackgroundcolor" value="fieldbackgroundcolor"/>
+    <cd:constant name="fieldframecolor" value="fieldframecolor"/>
+    <cd:constant name="fieldoffset" value="fieldoffset"/>
+    <cd:constant name="openaction" value="openaction"/>
+    <cd:constant name="closeaction" value="closeaction"/>
+    <cd:constant name="openpageaction" value="openpageaction"/>
+    <cd:constant name="closepageaction" value="closepageaction"/>
+    <cd:constant name="clickin" value="clickin"/>
+    <cd:constant name="clickout" value="clickout"/>
+    <cd:constant name="regionin" value="regionin"/>
+    <cd:constant name="regionout" value="regionout"/>
+    <cd:constant name="focusin" value="focusin"/>
+    <cd:constant name="focusout" value="focusout"/>
+    <cd:constant name="afterkey" value="afterkey"/>
+    <cd:constant name="format" value="format"/>
+    <cd:constant name="validate" value="validate"/>
+    <cd:constant name="calculate" value="calculate"/>
+    <cd:constant name="click" value="click"/>
+    <cd:constant name="vcommand" value="vcommand"/>
+    <cd:constant name="icommand" value="icommand"/>
+    <cd:constant name="ccommand" value="ccommand"/>
+    <cd:constant name="textdistance" value="textdistance"/>
+    <cd:constant name="textmargin" value="textmargin"/>
+    <cd:constant name="keyword" value="keyword"/>
+  </cd:constants>
+
+  <cd:constants>
+    <cd:constant name="extras" value="extras"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="on" value="on"/>
+    <cd:variable name="serried" value="serried"/>
+    <cd:variable name="joinedup" value="joinedup"/>
+    <cd:variable name="absolute" value="absolute"/>
+    <cd:variable name="background" value="background"/>
+    <cd:variable name="backward" value="backward"/>
+    <cd:variable name="subbackward" value="subbackward"/>
+    <cd:variable name="action" value="action"/>
+    <cd:variable name="stopper" value="stopper"/>
+    <cd:variable name="paragraph" value="paragraph"/>
+    <cd:variable name="all" value="all"/>
+    <cd:variable name="always" value="always"/>
+    <cd:variable name="auto" value="auto"/>
+    <cd:variable name="autointro" value="autointro"/>
+    <cd:variable name="both" value="both"/>
+    <cd:variable name="inner" value="inner"/>
+    <cd:variable name="blank" value="blank"/>
+    <cd:variable name="disable" value="disable"/>
+    <cd:variable name="top" value="top"/>
+    <cd:variable name="wide" value="wide"/>
+    <cd:variable name="width" value="width"/>
+    <cd:variable name="outer" value="outer"/>
+    <cd:variable name="numbers" value="numbers"/>
+    <cd:variable name="Numbers" value="Numbers"/>
+    <cd:variable name="command" value="command"/>
+    <cd:variable name="commands" value="commands"/>
+    <cd:variable name="concept" value="concept"/>
+    <cd:variable name="day" value="day"/>
+    <cd:variable name="date" value="date"/>
+    <cd:variable name="default" value="default"/>
+    <cd:variable name="final" value="final"/>
+    <cd:variable name="depth" value="depth"/>
+    <cd:variable name="doublesided" value="doublesided"/>
+    <cd:variable name="first" value="first"/>
+    <cd:variable name="each" value="each"/>
+    <cd:variable name="singlesided" value="singlesided"/>
+    <cd:variable name="somewhere" value="somewhere"/>
+    <cd:variable name="nowhere" value="nowhere"/>
+    <cd:variable name="even" value="even"/>
+    <cd:variable name="external" value="external"/>
+    <cd:variable name="file" value="file"/>
+    <cd:variable name="flexible" value="flexible"/>
+    <cd:variable name="force" value="force"/>
+    <cd:variable name="used" value="used"/>
+    <cd:variable name="none" value="none"/>
+    <cd:variable name="nomarking" value="nomarking"/>
+    <cd:variable name="nonumber" value="nonumber"/>
+    <cd:variable name="nowhite" value="nowhite"/>
+    <cd:variable name="rotated" value="rotated"/>
+    <cd:variable name="mirrored" value="mirrored"/>
+    <cd:variable name="global" value="global"/>
+    <cd:variable name="grid" value="grid"/>
+    <cd:variable name="big" value="big"/>
+    <cd:variable name="bigbodyfont" value="bigbodyfont"/>
+    <cd:variable name="bigpreference" value="bigpreference"/>
+    <cd:variable name="gray" value="gray"/>
+    <cd:variable name="halfline" value="halfline"/>
+    <cd:variable name="keep" value="keep"/>
+    <cd:variable name="hanging" value="hanging"/>
+    <cd:variable name="repeat" value="repeat"/>
+    <cd:variable name="fix" value="fix"/>
+    <cd:variable name="here" value="here"/>
+    <cd:variable name="header" value="header"/>
+    <cd:variable name="high" value="high"/>
+    <cd:variable name="height" value="height"/>
+    <cd:variable name="horizontal" value="horizontal"/>
+    <cd:variable name="current" value="current"/>
+    <cd:variable name="hz" value="hz"/>
+    <cd:variable name="nohz" value="nohz"/>
+    <cd:variable name="italic" value="italic"/>
+    <cd:variable name="inherit" value="inherit"/>
+    <cd:variable name="inleft" value="inleft"/>
+    <cd:variable name="inmargin" value="inmargin"/>
+    <cd:variable name="inright" value="inright"/>
+    <cd:variable name="interaction" value="interaction"/>
+    <cd:variable name="intext" value="intext"/>
+    <cd:variable name="intro" value="intro"/>
+    <cd:variable name="its" value="its"/>
+    <cd:variable name="yes" value="yes"/>
+    <cd:variable name="year" value="year"/>
+    <cd:variable name="frame" value="frame"/>
+    <cd:variable name="marginedge" value="marginedge"/>
+    <cd:variable name="cap" value="cap"/>
+    <cd:variable name="capital" value="capital"/>
+    <cd:variable name="referral" value="referral"/>
+    <cd:variable name="small" value="small"/>
+    <cd:variable name="smallnormal" value="smallnormal"/>
+    <cd:variable name="smallslanted" value="smallslanted"/>
+    <cd:variable name="smallslantedbold" value="smallslantedbold"/>
+    <cd:variable name="smallitalic" value="smallitalic"/>
+    <cd:variable name="smallitalicbold" value="smallitalicbold"/>
+    <cd:variable name="smalltype" value="smalltype"/>
+    <cd:variable name="smallbold" value="smallbold"/>
+    <cd:variable name="smallboldslanted" value="smallboldslanted"/>
+    <cd:variable name="smallbolditalic" value="smallbolditalic"/>
+    <cd:variable name="smallbodyfont" value="smallbodyfont"/>
+    <cd:variable name="color" value="color"/>
+    <cd:variable name="column" value="column"/>
+    <cd:variable name="columns" value="columns"/>
+    <cd:variable name="head" value="head"/>
+    <cd:variable name="low" value="low"/>
+    <cd:variable name="last" value="last"/>
+    <cd:variable name="label" value="label"/>
+    <cd:variable name="lohi" value="lohi"/>
+    <cd:variable name="tall" value="tall"/>
+    <cd:variable name="empty" value="empty"/>
+    <cd:variable name="Character" value="Character"/>
+    <cd:variable name="character" value="character"/>
+    <cd:variable name="Characters" value="Characters"/>
+    <cd:variable name="characters" value="characters"/>
+    <cd:variable name="landscape" value="landscape"/>
+    <cd:variable name="rule" value="rule"/>
+    <cd:variable name="list" value="list"/>
+    <cd:variable name="leftmargin" value="leftmargin"/>
+    <cd:variable name="leftpage" value="leftpage"/>
+    <cd:variable name="leftedge" value="leftedge"/>
+    <cd:variable name="left" value="left"/>
+    <cd:variable name="local" value="local"/>
+    <cd:variable name="new" value="new"/>
+    <cd:variable name="MONTH" value="MONTH"/>
+    <cd:variable name="month" value="month"/>
+    <cd:variable name="mar" value="mar"/>
+    <cd:variable name="margin" value="margin"/>
+    <cd:variable name="max" value="max"/>
+    <cd:variable name="min" value="min"/>
+    <cd:variable name="mediaeval" value="mediaeval"/>
+    <cd:variable name="medium" value="medium"/>
+    <cd:variable name="middle" value="middle"/>
+    <cd:variable name="after" value="after"/>
+    <cd:variable name="name" value="name"/>
+    <cd:variable name="opposite" value="opposite"/>
+    <cd:variable name="no" value="no"/>
+    <cd:variable name="negative" value="negative"/>
+    <cd:variable name="positive" value="positive"/>
+    <cd:variable name="not" value="not"/>
+    <cd:variable name="never" value="never"/>
+    <cd:variable name="normal" value="normal"/>
+    <cd:variable name="number" value="number"/>
+    <cd:variable name="offset" value="offset"/>
+    <cd:variable name="unknown" value="unknown"/>
+    <cd:variable name="bottom" value="bottom"/>
+    <cd:variable name="odd" value="odd"/>
+    <cd:variable name="packed" value="packed"/>
+    <cd:variable name="unpacked" value="unpacked"/>
+    <cd:variable name="makeup" value="makeup"/>
+    <cd:variable name="atmargin" value="atmargin"/>
+    <cd:variable name="overlay" value="overlay"/>
+    <cd:variable name="page" value="page"/>
+    <cd:variable name="pagenumber" value="pagenumber"/>
+    <cd:variable name="paper" value="paper"/>
+    <cd:variable name="display" value="display"/>
+    <cd:variable name="reverse" value="reverse"/>
+    <cd:variable name="fit" value="fit"/>
+    <cd:variable name="postscript" value="postscript"/>
+    <cd:variable name="preview" value="preview"/>
+    <cd:variable name="program" value="program"/>
+    <cd:variable name="process" value="process"/>
+    <cd:variable name="spot" value="spot"/>
+    <cd:variable name="dot" value="dot"/>
+    <cd:variable name="ran" value="ran"/>
+    <cd:variable name="edge" value="edge"/>
+    <cd:variable name="screen" value="screen"/>
+    <cd:variable name="rectangular" value="rectangular"/>
+    <cd:variable name="rightmargin" value="rightmargin"/>
+    <cd:variable name="rightpage" value="rightpage"/>
+    <cd:variable name="rightedge" value="rightedge"/>
+    <cd:variable name="right" value="right"/>
+    <cd:variable name="line" value="line"/>
+    <cd:variable name="register" value="register"/>
+    <cd:variable name="relative" value="relative"/>
+    <cd:variable name="reset" value="reset"/>
+    <cd:variable name="Romannumerals" value="Romannumerals"/>
+    <cd:variable name="romannumerals" value="romannumerals"/>
+    <cd:variable name="greek" value="greek"/>
+    <cd:variable name="Greek" value="Greek"/>
+    <cd:variable name="round" value="round"/>
+    <cd:variable name="rotate" value="rotate"/>
+    <cd:variable name="stretch" value="stretch"/>
+    <cd:variable name="backspace" value="backspace"/>
+    <cd:variable name="broad" value="broad"/>
+    <cd:variable name="row" value="row"/>
+    <cd:variable name="slanted" value="slanted"/>
+    <cd:variable name="slantedbold" value="slantedbold"/>
+    <cd:variable name="synchronize" value="synchronize"/>
+    <cd:variable name="italicbold" value="italicbold"/>
+    <cd:variable name="sectionnumber" value="sectionnumber"/>
+    <cd:variable name="narrow" value="narrow"/>
+    <cd:variable name="cutspace" value="cutspace"/>
+    <cd:variable name="tolerant" value="tolerant"/>
+    <cd:variable name="space" value="space"/>
+    <cd:variable name="standard" value="standard"/>
+    <cd:variable name="start" value="start"/>
+    <cd:variable name="stop" value="stop"/>
+    <cd:variable name="strict" value="strict"/>
+    <cd:variable name="strut" value="strut"/>
+    <cd:variable name="sub" value="sub"/>
+    <cd:variable name="sym" value="sym"/>
+    <cd:variable name="symbol" value="symbol"/>
+    <cd:variable name="text" value="text"/>
+    <cd:variable name="back" value="back"/>
+    <cd:variable name="test" value="test"/>
+    <cd:variable name="inbetween" value="inbetween"/>
+    <cd:variable name="type" value="type"/>
+    <cd:variable name="off" value="off"/>
+    <cd:variable name="url" value="url"/>
+    <cd:variable name="URL" value="URL"/>
+    <cd:variable name="fixed" value="fixed"/>
+    <cd:variable name="loose" value="loose"/>
+    <cd:variable name="continue" value="continue"/>
+    <cd:variable name="vertical" value="vertical"/>
+    <cd:variable name="bold" value="bold"/>
+    <cd:variable name="boldslanted" value="boldslanted"/>
+    <cd:variable name="bolditalic" value="bolditalic"/>
+    <cd:variable name="quadruple" value="quadruple"/>
+    <cd:variable name="footer" value="footer"/>
+    <cd:variable name="next" value="next"/>
+    <cd:variable name="before" value="before"/>
+    <cd:variable name="foreground" value="foreground"/>
+    <cd:variable name="preference" value="preference"/>
+    <cd:variable name="temporary" value="temporary"/>
+    <cd:variable name="forward" value="forward"/>
+    <cd:variable name="subforward" value="subforward"/>
+    <cd:variable name="previous" value="previous"/>
+    <cd:variable name="value" value="value"/>
+    <cd:variable name="week" value="week"/>
+    <cd:variable name="weekday" value="weekday"/>
+    <cd:variable name="WEEKDAY" value="WEEKDAY"/>
+    <cd:variable name="random" value="random"/>
+    <cd:variable name="white" value="white"/>
+    <cd:variable name="very" value="very"/>
+    <cd:variable name="verytolerant" value="verytolerant"/>
+    <cd:variable name="verystrict" value="verystrict"/>
+    <cd:variable name="see" value="see"/>
+    <cd:variable name="smallcaps" value="smallcaps"/>
+    <cd:variable name="WORD" value="WORD"/>
+    <cd:variable name="firstpage" value="firstpage"/>
+    <cd:variable name="firstcolumn" value="firstcolumn"/>
+    <cd:variable name="previouspage" value="previouspage"/>
+    <cd:variable name="nextpage" value="nextpage"/>
+    <cd:variable name="lastpage" value="lastpage"/>
+    <cd:variable name="lastcolumn" value="lastcolumn"/>
+    <cd:variable name="lastpagenumber" value="lastpagenumber"/>
+    <cd:variable name="subpage" value="subpage"/>
+    <cd:variable name="firstsubpage" value="firstsubpage"/>
+    <cd:variable name="previoussubpage" value="previoussubpage"/>
+    <cd:variable name="nextsubpage" value="nextsubpage"/>
+    <cd:variable name="lastsubpage" value="lastsubpage"/>
+    <cd:variable name="nextevenpage" value="nextevenpage"/>
+    <cd:variable name="nextoddpage" value="nextoddpage"/>
+    <cd:variable name="previousevenpage" value="previousevenpage"/>
+    <cd:variable name="previousoddpage" value="previousoddpage"/>
+    <cd:variable name="readonly" value="readonly"/>
+    <cd:variable name="required" value="required"/>
+    <cd:variable name="protected" value="protected"/>
+    <cd:variable name="sorted" value="sorted"/>
+    <cd:variable name="unavailable" value="unavailable"/>
+    <cd:variable name="hidden" value="hidden"/>
+    <cd:variable name="printable" value="printable"/>
+    <cd:variable name="bookmark" value="bookmark"/>
+    <cd:variable name="nocheck" value="nocheck"/>
+    <cd:variable name="innermargin" value="innermargin"/>
+    <cd:variable name="outermargin" value="outermargin"/>
+    <cd:variable name="inneredge" value="inneredge"/>
+    <cd:variable name="outeredge" value="outeredge"/>
+    <cd:variable name="controls" value="controls"/>
+    <cd:variable name="nothanging" value="nothanging"/>
+    <cd:variable name="hyphenated" value="hyphenated"/>
+    <cd:variable name="nothyphenated" value="nothyphenated"/>
+    <cd:variable name="overprint" value="overprint"/>
+    <cd:variable name="knockout" value="knockout"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="controls" value="controls"/>
+    <cd:constant name="global" value="global"/>
+    <cd:constant name="overprint" value="overprint"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="conversion" value="conversion"/>
+    <cd:variable name="by" value="by"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="dx" value="dx"/>
+    <cd:constant name="dy" value="dy"/>
+    <cd:constant name="nx" value="nx"/>
+    <cd:constant name="ny" value="ny"/>
+    <cd:constant name="nr" value="nr"/>
+    <cd:constant name="nl" value="nl"/>
+    <cd:constant name="nc" value="nc"/>
+    <cd:constant name="sx" value="sx"/>
+    <cd:constant name="sy" value="sy"/>
+    <cd:constant name="n" value="n"/>
+    <cd:constant name="vfil" value="vfil"/>
+    <cd:constant name="hfil" value="hfil"/>
+    <cd:constant name="strut" value="strut"/>
+    <cd:constant name="reset" value="reset"/>
+    <cd:constant name="set" value="set"/>
+    <cd:constant name="escape" value="escape"/>
+    <cd:constant name="apa" value="apa"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="calligraphic" value="calligraphic"/>
+    <cd:variable name="handwritten" value="handwritten"/>
+    <cd:variable name="sansserif" value="sansserif"/>
+    <cd:variable name="roman" value="roman"/>
+    <cd:variable name="teletype" value="teletype"/>
+    <cd:variable name="type" value="type"/>
+    <cd:variable name="serif" value="serif"/>
+    <cd:variable name="regular" value="regular"/>
+    <cd:variable name="support" value="support"/>
+    <cd:variable name="sans" value="sans"/>
+    <cd:variable name="mono" value="mono"/>
+  </cd:variables>
+
+  <cd:elements>
+    <cd:element name="begin" value="begin"/>
+    <cd:element name="end" value="end"/>
+    <cd:element name="coupled" value="coupled"/>
+    <cd:element name="get" value="get"/>
+    <cd:element name="currentlocal" value="currentlocal"/>
+    <cd:element name="endsetup" value="endsetup"/>
+    <cd:element name="load" value="load"/>
+    <cd:element name="emptyone" value="empty"/>
+    <cd:element name="emptytwo" value="empty"/>
+    <cd:element name="list" value="list"/>
+    <cd:element name="listof" value="listof"/>
+    <cd:element name="local" value="local"/>
+    <cd:element name="place" value="place"/>
+    <cd:element name="reserve" value="reserve"/>
+    <cd:element name="start" value="start"/>
+    <cd:element name="setup" value="setup"/>
+    <cd:element name="stop" value="stop"/>
+    <cd:element name="increment" value="increment"/>
+    <cd:element name="next" value="next"/>
+    <cd:element name="complete" value="complete"/>
+    <cd:element name="previous" value="previous"/>
+    <cd:element name="previouslocal" value="previouslocal"/>
+    <cd:element name="see" value="see"/>
+    <cd:element name="type" value="type"/>
+    <cd:element name="makeup" value="makeup"/>
+    <cd:element name="text" value="text"/>
+  </cd:elements>
+
+  <cd:variables>
+    <cd:variable name="buffer" value="buffer"/>
+    <cd:variable name="linenote" value="linenote"/>
+    <cd:variable name="comment" value="comment"/>
+    <cd:variable name="interactionmenu" value="interactionmenu"/>
+    <cd:variable name="postponing" value="postponing"/>
+    <cd:variable name="hiding" value="hiding"/>
+    <cd:variable name="tabulate" value="tabulate"/>
+    <cd:variable name="tabulatehead" value="tabulatehead"/>
+    <cd:variable name="tabulatetail" value="tabulatetail"/>
+    <cd:variable name="fact" value="fact"/>
+    <cd:variable name="legend" value="legend"/>
+    <cd:variable name="formula" value="formula"/>
+    <cd:variable name="tablehead" value="tablehead"/>
+    <cd:variable name="tabletail" value="tabletail"/>
+    <cd:variable name="setups" value="setups"/>
+    <cd:variable name="helptext" value="helptext"/>
+    <cd:variable name="localenvironment" value="localenvironment"/>
+    <cd:variable name="sectionblockenvironment" value="sectionblockenvironment"/>
+    <cd:variable name="pagecomment" value="pagecomment"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="FirstPage" value="FirstPage"/>
+    <cd:variable name="PreviousPage" value="PreviousPage"/>
+    <cd:variable name="NextPage" value="NextPage"/>
+    <cd:variable name="LastPage" value="LastPage"/>
+    <cd:variable name="PreviousJump" value="PreviousJump"/>
+    <cd:variable name="NextJump" value="NextJump"/>
+    <cd:variable name="SwapViewer" value="SwapViewer"/>
+    <cd:variable name="ExitViewer" value="ExitViewer"/>
+    <cd:variable name="CloseDocument" value="CloseDocument"/>
+    <cd:variable name="SaveDocument" value="SaveDocument"/>
+    <cd:variable name="SaveNamedDocument" value="SaveNamedDocument"/>
+    <cd:variable name="OpenNamedDocument" value="OpenNamedDocument"/>
+    <cd:variable name="ViewerHelp" value="ViewerHelp"/>
+    <cd:variable name="PrintDocument" value="PrintDocument"/>
+    <cd:variable name="SearchDocument" value="SearchDocument"/>
+    <cd:variable name="SearchAgain" value="SearchAgain"/>
+    <cd:variable name="Query" value="Query"/>
+    <cd:variable name="QueryAgain" value="QueryAgain"/>
+    <cd:variable name="GotoPage" value="GotoPage"/>
+    <cd:variable name="StartMovie" value="StartMovie"/>
+    <cd:variable name="StopMovie" value="StopMovie"/>
+    <cd:variable name="PauseMovie" value="PauseMovie"/>
+    <cd:variable name="ResumeMovie" value="ResumeMovie"/>
+    <cd:variable name="StartSound" value="StartSound"/>
+    <cd:variable name="StopSound" value="StopSound"/>
+    <cd:variable name="PauseSound" value="PauseSound"/>
+    <cd:variable name="ResumeSound" value="ResumeSound"/>
+    <cd:variable name="StartRendering" value="StartRendering"/>
+    <cd:variable name="StopRendering" value="StopRendering"/>
+    <cd:variable name="PauseRendering" value="PauseRendering"/>
+    <cd:variable name="ResumeRendering" value="ResumeRendering"/>
+    <cd:variable name="SaveForm" value="SaveForm"/>
+    <cd:variable name="LoadForm" value="LoadForm"/>
+    <cd:variable name="ResetForm" value="ResetForm"/>
+    <cd:variable name="SubmitForm" value="SubmitForm"/>
+    <cd:variable name="HideField" value="HideField"/>
+    <cd:variable name="ShowField" value="ShowField"/>
+    <cd:variable name="FitWidth" value="FitWidth"/>
+    <cd:variable name="FitHeight" value="FitHeight"/>
+    <cd:variable name="HideLayer" value="HideLayer"/>
+    <cd:variable name="VideLayer" value="VideLayer"/>
+    <cd:variable name="ToggleLayer" value="ToggleLayer"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="New" value="New"/>
+    <cd:variable name="Balloon" value="Balloon"/>
+    <cd:variable name="Addition" value="Addition"/>
+    <cd:variable name="Help" value="Help"/>
+    <cd:variable name="Paragraph" value="Paragraph"/>
+    <cd:variable name="Key" value="Key"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="bet" value="bet"/>
+    <cd:constant name="dat" value="dat"/>
+    <cd:constant name="ken" value="ken"/>
+    <cd:constant name="ref" value="ref"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="formeel" value="formeel"/>
+    <cd:variable name="informeel" value="informeel"/>
+    <cd:variable name="rekening" value="rekening"/>
+    <cd:variable name="sticker" value="sticker"/>
+    <cd:variable name="sheet" value="sheet"/>
+    <cd:variable name="brief" value="brief"/>
+    <cd:variable name="ls" value="ls"/>
+  </cd:variables>
+
+  <cd:commands>
+    <cd:command name="language" value="language"/>
+    <cd:command name="mainlanguage" value="mainlanguage"/>
+    <cd:command name="translate" value="translate"/>
+    <cd:command name="installlanguage" value="installlanguage"/>
+    <cd:command name="setuplanguage" value="setuplanguage"/>
+    <cd:command name="showmakeup" value="showmakeup"/>
+    <cd:command name="useencoding" value="useencoding"/>
+    <cd:command name="usespecials" value="usespecials"/>
+    <cd:command name="defineoutput" value="defineoutput"/>
+    <cd:command name="setupoutput" value="setupoutput"/>
+    <cd:command name="defineaccent" value="defineaccent"/>
+    <cd:command name="definecharacter" value="definecharacter"/>
+    <cd:command name="definecommand" value="definecommand"/>
+    <cd:command name="startcoding" value="startcoding"/>
+    <cd:command name="stopcoding" value="stopcoding"/>
+    <cd:command name="definebodyfontenvironment" value="definebodyfontenvironment"/>
+    <cd:command name="setupbodyfontenvironment" value="setupbodyfontenvironment"/>
+    <cd:command name="definebodyfont" value="definebodyfont"/>
+    <cd:command name="definefont" value="definefont"/>
+    <cd:command name="definefontsynonym" value="definefontsynonym"/>
+    <cd:command name="definestyle" value="definestyle"/>
+    <cd:command name="definefontstyle" value="definefontstyle"/>
+    <cd:command name="setupstrut" value="setupstrut"/>
+    <cd:command name="setuptype" value="setuptype"/>
+    <cd:command name="type" value="type"/>
+    <cd:command name="typ" value="typ"/>
+    <cd:command name="arg" value="arg"/>
+    <cd:command name="tex" value="tex"/>
+    <cd:command name="definetyping" value="definetyping"/>
+    <cd:command name="definetype" value="definetype"/>
+    <cd:command name="setuptyping" value="setuptyping"/>
+    <cd:command name="typefile" value="typefile"/>
+    <cd:command name="setupfootnotes" value="setupfootnotes"/>
+    <cd:command name="setupfootnotedefinition" value="setupfootnotedefinition"/>
+    <cd:command name="note" value="note"/>
+    <cd:command name="footnote" value="footnote"/>
+    <cd:command name="footnotetext" value="footnotetext"/>
+    <cd:command name="startlocalfootnotes" value="startlocalfootnotes"/>
+    <cd:command name="stoplocalfootnotes" value="stoplocalfootnotes"/>
+    <cd:command name="placelocalfootnotes" value="placelocalfootnotes"/>
+    <cd:command name="placefootnotes" value="placefootnotes"/>
+    <cd:command name="currentdate" value="currentdate"/>
+    <cd:command name="date" value="date"/>
+    <cd:command name="weekday" value="weekday"/>
+    <cd:command name="WEEKDAY" value="WEEKDAY"/>
+    <cd:command name="month" value="month"/>
+    <cd:command name="MONTH" value="MONTH"/>
+    <cd:command name="Numbers" value="Numbers"/>
+    <cd:command name="numbers" value="numbers"/>
+    <cd:command name="romannumerals" value="romannumerals"/>
+    <cd:command name="Romannumerals" value="Romannumerals"/>
+    <cd:command name="character" value="character"/>
+    <cd:command name="Character" value="Character"/>
+    <cd:command name="characters" value="characters"/>
+    <cd:command name="Characters" value="Characters"/>
+    <cd:command name="unknown" value="unknown"/>
+    <cd:command name="definesymbol" value="definesymbol"/>
+    <cd:command name="definefiguresymbol" value="definefiguresymbol"/>
+    <cd:command name="symbol" value="symbol"/>
+    <cd:command name="setupsymbolset" value="setupsymbolset"/>
+    <cd:command name="showsymbolset" value="showsymbolset"/>
+    <cd:command name="startsymbolset" value="startsymbolset"/>
+    <cd:command name="usesymbols" value="usesymbols"/>
+    <cd:command name="defineconversion" value="defineconversion"/>
+    <cd:command name="convertnumber" value="convertnumber"/>
+    <cd:command name="setupcapitals" value="setupcapitals"/>
+    <cd:command name="smallcapped" value="cap"/>
+    <cd:command name="notsmallcapped" value="nocap"/>
+    <cd:command name="CAPPED" value="CAP"/>
+    <cd:command name="SmallCapped" value="Cap"/>
+    <cd:command name="SmallCaps" value="Caps"/>
+    <cd:command name="WORD" value="WORD"/>
+    <cd:command name="WORDS" value="WORDS"/>
+    <cd:command name="Word" value="Word"/>
+    <cd:command name="Words" value="Words"/>
+    <cd:command name="stretched" value="stretched"/>
+    <cd:command name="overstrike" value="overstrike"/>
+    <cd:command name="overstrikes" value="overstrikes"/>
+    <cd:command name="overbar" value="overbar"/>
+    <cd:command name="overbars" value="overbars"/>
+    <cd:command name="underbar" value="underbar"/>
+    <cd:command name="underbars" value="underbars"/>
+    <cd:command name="setupunderbar" value="setupunderbar"/>
+    <cd:command name="setupbodyfont" value="setupbodyfont"/>
+    <cd:command name="switchtobodyfont" value="switchtobodyfont"/>
+    <cd:command name="showbodyfont" value="showbodyfont"/>
+    <cd:command name="showbodyfontenvironment" value="showbodyfontenvironment"/>
+    <cd:command name="headtext" value="headtext"/>
+    <cd:command name="labeltext" value="labeltext"/>
+    <cd:command name="LABELTEXT" value="LABELTEXT"/>
+    <cd:command name="setupheadtext" value="setupheadtext"/>
+    <cd:command name="setuplabeltext" value="setuplabeltext"/>
+    <cd:command name="marginrule" value="marginrule"/>
+    <cd:command name="startmarginrule" value="startmarginrule"/>
+    <cd:command name="stopmarginrule" value="stopmarginrule"/>
+    <cd:command name="setupmarginrules" value="setupmarginrules"/>
+    <cd:command name="blackrule" value="blackrule"/>
+    <cd:command name="blackrules" value="blackrules"/>
+    <cd:command name="setupblackrules" value="setupblackrules"/>
+    <cd:command name="setupscreens" value="setupscreens"/>
+    <cd:command name="framed" value="framed"/>
+    <cd:command name="inframed" value="inframed"/>
+    <cd:command name="mframed" value="maframed"/>
+    <cd:command name="inmframed" value="inmaframed"/>
+    <cd:command name="setupframed" value="setupframed"/>
+    <cd:command name="setuplinewidth" value="setuplinewidth"/>
+    <cd:command name="setupthinrules" value="setupthinrules"/>
+    <cd:command name="thinrule" value="thinrule"/>
+    <cd:command name="thinrules" value="thinrules"/>
+    <cd:command name="hairline" value="hairline"/>
+    <cd:command name="vl" value="vl"/>
+    <cd:command name="hl" value="hl"/>
+    <cd:command name="defineframed" value="defineframed"/>
+    <cd:command name="defineframedtext" value="defineframedtext"/>
+    <cd:command name="setupframedtexts" value="setupframedtexts"/>
+    <cd:command name="defineoverlay" value="defineoverlay"/>
+    <cd:command name="definelayer" value="definelayer"/>
+    <cd:command name="background" value="background"/>
+    <cd:command name="startbackground" value="startbackground"/>
+    <cd:command name="stopbackground" value="stopbackground"/>
+    <cd:command name="setupbackground" value="setupbackground"/>
+    <cd:command name="fillinrules" value="fillinrules"/>
+    <cd:command name="setupfillinrules" value="setupfillinrules"/>
+    <cd:command name="fillintext" value="fillintext"/>
+    <cd:command name="setupfillinlines" value="setupfillinlines"/>
+    <cd:command name="fillinline" value="fillinline"/>
+    <cd:command name="setuptextrules" value="setuptextrules"/>
+    <cd:command name="textrule" value="textrule"/>
+    <cd:command name="starttextrule" value="starttextrule"/>
+    <cd:command name="stoptextrule" value="stoptextrule"/>
+    <cd:command name="usemodule" value="usemodule"/>
+    <cd:command name="usemodules" value="usemodules"/>
+    <cd:command name="starttext" value="starttext"/>
+    <cd:command name="stoptext" value="stoptext"/>
+    <cd:command name="margintitle" value="margintitle"/>
+    <cd:command name="marginword" value="marginword"/>
+    <cd:command name="margintext" value="margintext"/>
+    <cd:command name="inleft" value="inleft"/>
+    <cd:command name="inmargin" value="inmargin"/>
+    <cd:command name="inothermargin" value="inothermargin"/>
+    <cd:command name="inright" value="inright"/>
+    <cd:command name="ininner" value="ininner"/>
+    <cd:command name="inouter" value="inouter"/>
+    <cd:command name="startmarginblock" value="startmarginblock"/>
+    <cd:command name="stopmarginblock" value="stopmarginblock"/>
+    <cd:command name="defineinmargin" value="defineinmargin"/>
+    <cd:command name="setupinmargin" value="setupinmargin"/>
+    <cd:command name="setupmarginblocks" value="setupmarginblocks"/>
+    <cd:command name="inleftedge" value="inleftedge"/>
+    <cd:command name="inleftmargin" value="inleftmargin"/>
+    <cd:command name="inrightmargin" value="inrightmargin"/>
+    <cd:command name="inrightedge" value="inrightedge"/>
+    <cd:command name="atleftmargin" value="atleftmargin"/>
+    <cd:command name="atrightmargin" value="atrightmargin"/>
+    <cd:command name="wordright" value="wordright"/>
+    <cd:command name="defineblank" value="defineblank"/>
+    <cd:command name="blank" value="blank"/>
+    <cd:command name="setupblank" value="setupblank"/>
+    <cd:command name="correctwhitespace" value="correctwhitespace"/>
+    <cd:command name="fixedspaces" value="fixedspaces"/>
+    <cd:command name="fixedspace" value="fixedspace"/>
+    <cd:command name="nospace" value="nospace"/>
+    <cd:command name="space" value="space"/>
+    <cd:command name="nowhitespace" value="nowhitespace"/>
+    <cd:command name="packed" value="packed"/>
+    <cd:command name="startpacked" value="startpacked"/>
+    <cd:command name="stoppacked" value="stoppacked"/>
+    <cd:command name="startunpacked" value="startunpacked"/>
+    <cd:command name="stopunpacked" value="stopunpacked"/>
+    <cd:command name="startlinecorrection" value="startlinecorrection"/>
+    <cd:command name="stoplinecorrection" value="stoplinecorrection"/>
+    <cd:command name="godown" value="godown"/>
+    <cd:command name="whitespace" value="whitespace"/>
+    <cd:command name="noindenting" value="noindenting"/>
+    <cd:command name="indenting" value="indenting"/>
+    <cd:command name="setupindenting" value="setupindenting"/>
+    <cd:command name="startalignment" value="startalignment"/>
+    <cd:command name="stopalignment" value="stopalignment"/>
+    <cd:command name="startlines" value="startlines"/>
+    <cd:command name="stoplines" value="stoplines"/>
+    <cd:command name="setupparagraphnumbering" value="setupparagraphnumbering"/>
+    <cd:command name="setuplinenumbering" value="setuplinenumbering"/>
+    <cd:command name="startlinenumbering" value="startlinenumbering"/>
+    <cd:command name="stoplinenumbering" value="stoplinenumbering"/>
+    <cd:command name="startline" value="startline"/>
+    <cd:command name="stopline" value="stopline"/>
+    <cd:command name="someline" value="someline"/>
+    <cd:command name="inline" value="inline"/>
+    <cd:command name="crlf" value="crlf"/>
+    <cd:command name="emptylines" value="emptylines"/>
+    <cd:command name="setuplines" value="setuplines"/>
+    <cd:command name="startnarrower" value="startnarrower"/>
+    <cd:command name="stopnarrower" value="stopnarrower"/>
+    <cd:command name="setupnarrower" value="setupnarrower"/>
+    <cd:command name="definetabulate" value="definetabulate"/>
+    <cd:command name="setuptabulate" value="setuptabulate"/>
+    <cd:command name="starttable" value="starttable"/>
+    <cd:command name="stoptable" value="stoptable"/>
+    <cd:command name="starttables" value="starttables"/>
+    <cd:command name="stoptables" value="stoptables"/>
+    <cd:command name="setuptables" value="setuptables"/>
+    <cd:command name="definetabletemplate" value="definetabletemplate"/>
+    <cd:command name="page" value="page"/>
+    <cd:command name="testcolumn" value="testcolumn"/>
+    <cd:command name="testpage" value="testpage"/>
+    <cd:command name="couplepage" value="couplepage"/>
+    <cd:command name="pagetype" value="pagetype"/>
+    <cd:command name="processpage" value="processpage"/>
+    <cd:command name="couplepaper" value="couplepaper"/>
+    <cd:command name="selectpaper" value="selectpaper"/>
+    <cd:command name="screen" value="screen"/>
+    <cd:command name="definesection" value="definesection"/>
+    <cd:command name="definesectionblock" value="definesectionblock"/>
+    <cd:command name="setupsectionblock" value="setupsectionblock"/>
+    <cd:command name="setupsection" value="setupsection"/>
+    <cd:command name="notopandbottomlines" value="notopandbottomlines"/>
+    <cd:command name="noheaderandfooterlines" value="noheaderandfooterlines"/>
+    <cd:command name="setuptop" value="setuptop"/>
+    <cd:command name="setuptoptexts" value="setuptoptexts"/>
+    <cd:command name="setupheader" value="setupheader"/>
+    <cd:command name="setupheadertexts" value="setupheadertexts"/>
+    <cd:command name="setuppagenumbering" value="setuppagenumbering"/>
+    <cd:command name="getnumber" value="getnumber"/>
+    <cd:command name="incrementnumber" value="incrementnumber"/>
+    <cd:command name="decrementnumber" value="decrementnumber"/>
+    <cd:command name="resetnumber" value="resetnumber"/>
+    <cd:command name="setnumber" value="setnumber"/>
+    <cd:command name="setupnumber" value="setupnumber"/>
+    <cd:command name="setupbottom" value="setupbottom"/>
+    <cd:command name="setupbottomtexts" value="setupbottomtexts"/>
+    <cd:command name="setupfooter" value="setupfooter"/>
+    <cd:command name="setupfootertexts" value="setupfootertexts"/>
+    <cd:command name="setuppagenumber" value="setuppagenumber"/>
+    <cd:command name="setupsubpagenumber" value="setupsubpagenumber"/>
+    <cd:command name="subpagenumber" value="subpagenumber"/>
+    <cd:command name="setuptext" value="setuptext"/>
+    <cd:command name="setuptexttexts" value="setuptexttexts"/>
+    <cd:command name="definetext" value="definetext"/>
+    <cd:command name="pagenumber" value="pagenumber"/>
+    <cd:command name="completepagenumber" value="completepagenumber"/>
+    <cd:command name="placepagenumber" value="placepagenumber"/>
+    <cd:command name="items" value="items"/>
+    <cd:command name="setupitems" value="setupitems"/>
+    <cd:command name="leftaligned" value="leftaligned"/>
+    <cd:command name="midaligned" value="midaligned"/>
+    <cd:command name="rightaligned" value="rightaligned"/>
+    <cd:command name="startcolumns" value="startcolumns"/>
+    <cd:command name="stopcolumns" value="stopcolumns"/>
+    <cd:command name="setupcolumns" value="setupcolumns"/>
+    <cd:command name="column" value="column"/>
+    <cd:command name="head" value="head"/>
+    <cd:command name="but" value="but"/>
+    <cd:command name="item" value="item"/>
+    <cd:command name="nop" value="nop"/>
+    <cd:command name="mar" value="mar"/>
+    <cd:command name="sym" value="sym"/>
+    <cd:command name="its" value="its"/>
+    <cd:command name="ran" value="ran"/>
+    <cd:command name="headsym" value="headsym"/>
+    <cd:command name="defineitemgroup" value="defineitemgroup"/>
+    <cd:command name="setupitemgroup" value="setupitemgroup"/>
+    <cd:command name="setupitemgroups" value="setupitemgroups"/>
+    <cd:command name="definehead" value="definehead"/>
+    <cd:command name="setuphead" value="setuphead"/>
+    <cd:command name="setupheads" value="setupheads"/>
+    <cd:command name="setupheadnumber" value="setupheadnumber"/>
+    <cd:command name="headnumber" value="headnumber"/>
+    <cd:command name="currentheadnumber" value="currentheadnumber"/>
+    <cd:command name="determineheadnumber" value="determineheadnumber"/>
+    <cd:command name="resetmarking" value="resetmarking"/>
+    <cd:command name="setupmarking" value="setupmarking"/>
+    <cd:command name="definemarking" value="definemarking"/>
+    <cd:command name="nomarking" value="nomarking"/>
+    <cd:command name="marking" value="marking"/>
+    <cd:command name="decouplemarking" value="decouplemarking"/>
+    <cd:command name="couplemarking" value="couplemarking"/>
+    <cd:command name="getmarking" value="getmarking"/>
+    <cd:command name="definelayout" value="definelayout"/>
+    <cd:command name="setuplayout" value="setuplayout"/>
+    <cd:command name="adaptlayout" value="adaptlayout"/>
+    <cd:command name="placeongrid" value="placeongrid"/>
+    <cd:command name="moveongrid" value="moveongrid"/>
+    <cd:command name="showsetups" value="showsetups"/>
+    <cd:command name="showframe" value="showframe"/>
+    <cd:command name="showgrid" value="showgrid"/>
+    <cd:command name="showlayout" value="showlayout"/>
+    <cd:command name="showprint" value="showprint"/>
+    <cd:command name="showstruts" value="showstruts"/>
+    <cd:command name="definepapersize" value="definepapersize"/>
+    <cd:command name="setuppapersize" value="setuppapersize"/>
+    <cd:command name="setuppaper" value="setuppaper"/>
+    <cd:command name="setuparranging" value="setuparranging"/>
+    <cd:command name="version" value="version"/>
+    <cd:command name="setupbackgrounds" value="setupbackgrounds"/>
+    <cd:command name="setupalign" value="setupalign"/>
+    <cd:command name="setupwhitespace" value="setupwhitespace"/>
+    <cd:command name="setupinteraction" value="setupinteraction"/>
+    <cd:command name="setupinteractionmenu" value="setupinteractionmenu"/>
+    <cd:command name="defineinteractionmenu" value="defineinteractionmenu"/>
+    <cd:command name="disableinteractionmenu" value="disableinteractionmenu"/>
+    <cd:command name="interactionmenu" value="interactionmenu"/>
+    <cd:command name="interactionbuttons" value="interactionbuttons"/>
+    <cd:command name="interactionbar" value="interactionbar"/>
+    <cd:command name="setupinteractionbar" value="setupinteractionbar"/>
+    <cd:command name="setupinteractionscreen" value="setupinteractionscreen"/>
+    <cd:command name="placebookmarks" value="placebookmarks"/>
+    <cd:command name="bookmark" value="bookmark"/>
+    <cd:command name="definelogo" value="definelogo"/>
+    <cd:command name="placelogos" value="placelogos"/>
+    <cd:command name="definecolor" value="definecolor"/>
+    <cd:command name="definecolorgroup" value="definecolorgroup"/>
+    <cd:command name="definepalet" value="definepalet"/>
+    <cd:command name="graycolor" value="graycolor"/>
+    <cd:command name="color" value="color"/>
+    <cd:command name="startcolor" value="startcolor"/>
+    <cd:command name="stopcolor" value="stopcolor"/>
+    <cd:command name="setupcolors" value="setupcolors"/>
+    <cd:command name="setupcolor" value="setupcolor"/>
+    <cd:command name="setuppalet" value="setuppalet"/>
+    <cd:command name="showcolor" value="showcolor"/>
+    <cd:command name="showcolorgroup" value="showcolorgroup"/>
+    <cd:command name="showpalet" value="showpalet"/>
+    <cd:command name="comparecolorgroup" value="comparecolorgroup"/>
+    <cd:command name="comparepalet" value="comparepalet"/>
+    <cd:command name="colorvalue" value="colorvalue"/>
+    <cd:command name="greyvalue" value="greyvalue"/>
+    <cd:command name="startraster" value="startraster"/>
+    <cd:command name="stopraster" value="stopraster"/>
+    <cd:command name="defineblock" value="defineblock"/>
+    <cd:command name="setupblock" value="setupblock"/>
+    <cd:command name="useblocks" value="useblocks"/>
+    <cd:command name="processblocks" value="processblocks"/>
+    <cd:command name="keepblocks" value="keepblocks"/>
+    <cd:command name="selectblocks" value="selectblocks"/>
+    <cd:command name="hideblocks" value="hideblocks"/>
+    <cd:command name="bypassblocks" value="bypassblocks"/>
+    <cd:command name="forceblocks" value="forceblocks"/>
+    <cd:command name="nomoreblocks" value="nomoreblocks"/>
+    <cd:command name="definelist" value="definelist"/>
+    <cd:command name="definecombinedlist" value="definecombinedlist"/>
+    <cd:command name="listsymbol" value="listsymbol"/>
+    <cd:command name="placelist" value="placelist"/>
+    <cd:command name="plaatsruwelijst" value="placerawlist"/>
+    <cd:command name="placecombinedlist" value="placecombinedlist"/>
+    <cd:command name="writetolist" value="writetolist"/>
+    <cd:command name="writebetweenlist" value="writebetweenlist"/>
+    <cd:command name="immediatetolist" value="immediatetolist"/>
+    <cd:command name="immediatebetweenlist" value="immediatebetweenlist"/>
+    <cd:command name="setuplist" value="setuplist"/>
+    <cd:command name="setupcombinedlist" value="setupcombinedlist"/>
+    <cd:command name="determinelistcharacteristics" value="determinelistcharacteristics"/>
+    <cd:command name="listlength" value="listlength"/>
+    <cd:command name="listwidth" value="listwidth"/>
+    <cd:command name="listheight" value="listheight"/>
+    <cd:command name="nolist" value="nolist"/>
+    <cd:command name="definereferencelist" value="definereferencelist"/>
+    <cd:command name="placereferencelist" value="placereferencelist"/>
+    <cd:command name="writetoreferencelist" value="writetoreferencelist"/>
+    <cd:command name="setupreferencelist" value="setupreferencelist"/>
+    <cd:command name="definefloat" value="definefloat"/>
+    <cd:command name="setupfloat" value="setupfloat"/>
+    <cd:command name="setupfloats" value="setupfloats"/>
+    <cd:command name="splitfloat" value="splitfloat"/>
+    <cd:command name="setupfloatsplitting" value="setupfloatsplitting"/>
+    <cd:command name="placefloat" value="placefloat"/>
+    <cd:command name="movesidefloat" value="movesidefloat"/>
+    <cd:command name="defineplacement" value="defineplacement"/>
+    <cd:command name="setupplacement" value="setupplacement"/>
+    <cd:command name="definecombination" value="definecombination"/>
+    <cd:command name="startcombination" value="startcombination"/>
+    <cd:command name="stopcombination" value="stopcombination"/>
+    <cd:command name="placesidebyside" value="placesidebyside"/>
+    <cd:command name="placeontopofeachother" value="placeontopofeachother"/>
+    <cd:command name="setupcaption" value="setupcaption"/>
+    <cd:command name="setupcaptions" value="setupcaptions"/>
+    <cd:command name="setupcombinations" value="setupcombinations"/>
+    <cd:command name="startoverlay" value="startoverlay"/>
+    <cd:command name="stopoverlay" value="stopoverlay"/>
+    <cd:command name="defineregister" value="defineregister"/>
+    <cd:command name="coupleregister" value="coupleregister"/>
+    <cd:command name="setupregister" value="setupregister"/>
+    <cd:command name="writetoregister" value="writetoregister"/>
+    <cd:command name="completeregister" value="completeregister"/>
+    <cd:command name="placeregister" value="placeregister"/>
+    <cd:command name="determineregistercharacteristics" value="determineregistercharacteristics"/>
+    <cd:command name="definesorting" value="definesorting"/>
+    <cd:command name="definesynonyms" value="definesynonyms"/>
+    <cd:command name="setupsorting" value="setupsorting"/>
+    <cd:command name="setupsynonyms" value="setupsynonyms"/>
+    <cd:command name="startsynchronization" value="startsynchronization"/>
+    <cd:command name="stopsynchronization" value="stopsynchronization"/>
+    <cd:command name="setupsynchronizationbar" value="setupsynchronizationbar"/>
+    <cd:command name="setupsynchronization" value="setupsynchronization"/>
+    <cd:command name="synchronizationbar" value="synchronizationbar"/>
+    <cd:command name="synchronize" value="synchronize"/>
+    <cd:command name="useexternaldocument" value="useexternaldocument"/>
+    <cd:command name="useURL" value="useURL"/>
+    <cd:command name="useurl" value="useurl"/>
+    <cd:command name="setupurl" value="setupurl"/>
+    <cd:command name="coupledocument" value="coupledocument"/>
+    <cd:command name="setupprograms" value="setupprograms"/>
+    <cd:command name="defineprogram" value="defineprogram"/>
+    <cd:command name="program" value="program"/>
+    <cd:command name="setuppagetransitions" value="setuppagetransitions"/>
+    <cd:command name="defineprofile" value="defineprofile"/>
+    <cd:command name="defineversion" value="defineversion"/>
+    <cd:command name="markversion" value="markversion"/>
+    <cd:command name="selectversion" value="selectversion"/>
+    <cd:command name="startprofile" value="startprofile"/>
+    <cd:command name="startversion" value="startversion"/>
+    <cd:command name="setupprofiles" value="setupprofiles"/>
+    <cd:command name="setupversions" value="setupversions"/>
+    <cd:command name="stopprofile" value="stopprofile"/>
+    <cd:command name="stopversion" value="stopversion"/>
+    <cd:command name="followprofile" value="followprofile"/>
+    <cd:command name="followprofileversion" value="followprofileversion"/>
+    <cd:command name="followversion" value="followversion"/>
+    <cd:command name="definedescription" value="definedescription"/>
+    <cd:command name="definelabel" value="definelabel"/>
+    <cd:command name="defineenumeration" value="defineenumeration"/>
+    <cd:command name="defineindenting" value="defineindenting"/>
+    <cd:command name="setupdescriptions" value="setupdescriptions"/>
+    <cd:command name="setupenumerations" value="setupenumerations"/>
+    <cd:command name="setupindentations" value="setupindentations"/>
+    <cd:command name="setuptab" value="setuptab"/>
+    <cd:command name="tab" value="tab"/>
+    <cd:command name="setupexternalfigures" value="setupexternalfigures"/>
+    <cd:command name="showexternalfigures" value="showexternalfigures"/>
+    <cd:command name="externalfigure" value="externalfigure"/>
+    <cd:command name="useexternalfigure" value="useexternalfigure"/>
+    <cd:command name="startfigure" value="startfigure"/>
+    <cd:command name="referring" value="referring"/>
+    <cd:command name="remark" value="remark"/>
+    <cd:command name="colorbar" value="colorbar"/>
+    <cd:command name="grid" value="grid"/>
+    <cd:command name="button" value="button"/>
+    <cd:command name="menubutton" value="menubutton"/>
+    <cd:command name="setupbuttons" value="setupbuttons"/>
+    <cd:command name="usereferences" value="usereferences"/>
+    <cd:command name="reflijst" value="reflist"/>
+    <cd:command name="stelreferentielijstin" value="setupreferencelist"/>
+    <cd:command name="setupreferencing" value="setupreferencing"/>
+    <cd:command name="textreference" value="textreference"/>
+    <cd:command name="pagereference" value="pagereference"/>
+    <cd:command name="reference" value="reference"/>
+    <cd:command name="definereference" value="definereference"/>
+    <cd:command name="definereferenceformat" value="definereferenceformat"/>
+    <cd:command name="useJSscripts" value="useJSscripts"/>
+    <cd:command name="from" value="from"/>
+    <cd:command name="in" value="in"/>
+    <cd:command name="at" value="at"/>
+    <cd:command name="about" value="about"/>
+    <cd:command name="goto" value="goto"/>
+    <cd:command name="atpage" value="atpage"/>
+    <cd:command name="somewhere" value="somewhere"/>
+    <cd:command name="navigating" value="navigating"/>
+    <cd:command name="ref" value="ref"/>
+    <cd:command name="gotobox" value="gotobox"/>
+    <cd:command name="gotopage" value="gotopage"/>
+    <cd:command name="placeformula" value="placeformula"/>
+    <cd:command name="placesubformula" value="placesubformula"/>
+    <cd:command name="moveformula" value="moveformula"/>
+    <cd:command name="setupformulas" value="setupformulae"/>
+    <cd:command name="formulanumber" value="formulanumber"/>
+    <cd:command name="subformulanumber" value="subformulanumber"/>
+    <cd:command name="leg" value="leg"/>
+    <cd:command name="fact" value="fact"/>
+    <cd:command name="mathematics" value="mathematics"/>
+    <cd:command name="dimension" value="dimension"/>
+    <cd:command name="nodimension" value="nodimension"/>
+    <cd:command name="startenvironment" value="startenvironment"/>
+    <cd:command name="stopenvironment" value="stopenvironment"/>
+    <cd:command name="startcomponent" value="startcomponent"/>
+    <cd:command name="stopcomponent" value="stopcomponent"/>
+    <cd:command name="startproduct" value="startproduct"/>
+    <cd:command name="stopproduct" value="stopproduct"/>
+    <cd:command name="startproject" value="startproject"/>
+    <cd:command name="stopproject" value="stopproject"/>
+    <cd:command name="setups" value="setups"/>
+    <cd:command name="project" value="project"/>
+    <cd:command name="component" value="component"/>
+    <cd:command name="produxt" value="product"/>
+    <cd:command name="environment" value="environment"/>
+    <cd:command name="nomorefiles" value="nomorefiles"/>
+    <cd:command name="getbuffer" value="getbuffer"/>
+    <cd:command name="setupbuffer" value="setupbuffer"/>
+    <cd:command name="typebuffer" value="typebuffer"/>
+    <cd:command name="definebuffer" value="definebuffer"/>
+    <cd:command name="unitmeaning" value="unitmeaning"/>
+    <cd:command name="infull" value="infull"/>
+    <cd:command name="quotation" value="quotation"/>
+    <cd:command name="quote" value="quote"/>
+    <cd:command name="startquotation" value="startquotation"/>
+    <cd:command name="stopquotation" value="stopquotation"/>
+    <cd:command name="setupquote" value="setupquote"/>
+    <cd:command name="define" value="define"/>
+    <cd:command name="redo" value="redo"/>
+    <cd:command name="usecommands" value="usecommands"/>
+    <cd:command name="definestartstop" value="definestartstop"/>
+    <cd:command name="setupstartstop" value="setupstartstop"/>
+    <cd:command name="startlocal" value="startlocal"/>
+    <cd:command name="stoplocal" value="stoplocal"/>
+    <cd:command name="startglobal" value="startglobal"/>
+    <cd:command name="stopglobal" value="stopglobal"/>
+    <cd:command name="macroname" value="name"/>
+    <cd:command name="definemakeup" value="definemakeup"/>
+    <cd:command name="setupmakeup" value="setupmakeup"/>
+    <cd:command name="startmakeup" value="startmakeup"/>
+    <cd:command name="stopmakeup" value="stopmakeup"/>
+    <cd:command name="useexternalsoundtrack" value="useexternalsoundtrack"/>
+    <cd:command name="useexternalfile" value="useexternalfile"/>
+    <cd:command name="useexternalfiles" value="useexternalfiles"/>
+    <cd:command name="referral" value="referral"/>
+    <cd:command name="referraldate" value="referraldate"/>
+    <cd:command name="high" value="high"/>
+    <cd:command name="lohi" value="lohi"/>
+    <cd:command name="low" value="low"/>
+    <cd:command name="fraction" value="fraction"/>
+    <cd:command name="chem" value="chem"/>
+    <cd:command name="startopposite" value="startopposite"/>
+    <cd:command name="stopopposite" value="stopopposite"/>
+    <cd:command name="setupoppositeplacing" value="setupoppositeplacing"/>
+    <cd:command name="startpositioning" value="startpositioning"/>
+    <cd:command name="stoppositioning" value="stoppositioning"/>
+    <cd:command name="position" value="position"/>
+    <cd:command name="setuppositioning" value="setuppositioning"/>
+    <cd:command name="rotate" value="rotate"/>
+    <cd:command name="setuprotate" value="setuprotate"/>
+    <cd:command name="mirror" value="mirror"/>
+    <cd:command name="scale" value="scale"/>
+    <cd:command name="setupnumbering" value="setupnumbering"/>
+    <cd:command name="reset" value="reset"/>
+    <cd:command name="setuppublications" value="setuppublications"/>
+    <cd:command name="publication" value="publication"/>
+    <cd:command name="definehbox" value="definehbox"/>
+    <cd:command name="adding" value="adding"/>
+    <cd:command name="periods" value="periods"/>
+    <cd:command name="setuphyphenmark" value="setuphyphenmark"/>
+    <cd:command name="setupinterlinespace" value="setupinterlinespace"/>
+    <cd:command name="setupspacing" value="setupspacing"/>
+    <cd:command name="setuptolerance" value="setuptolerance"/>
+    <cd:command name="setupsystem" value="setupsystem"/>
+    <cd:command name="usepath" value="usedirectory"/>
+    <cd:command name="defineparagraphs" value="defineparagraphs"/>
+    <cd:command name="setupparagraphs" value="setupparagraphs"/>
+    <cd:command name="donttest" value="donttest"/>
+    <cd:command name="setupcomment" value="setupcomment"/>
+    <cd:command name="comment" value="comment"/>
+    <cd:command name="definefield" value="definefield"/>
+    <cd:command name="definemainfield" value="definemainfield"/>
+    <cd:command name="definesubfield" value="definesubfield"/>
+    <cd:command name="clonefield" value="clonefield"/>
+    <cd:command name="copyfield" value="copyfield"/>
+    <cd:command name="setupfield" value="setupfield"/>
+    <cd:command name="setupfields" value="setupfields"/>
+    <cd:command name="field" value="field"/>
+    <cd:command name="fitfield" value="fitfield"/>
+    <cd:command name="logfields" value="logfields"/>
+    <cd:command name="showfields" value="showfields"/>
+    <cd:command name="tooltip" value="tooltip"/>
+    <cd:command name="fillinfield" value="fillinfield"/>
+    <cd:command name="definefieldstack" value="definefieldstack"/>
+    <cd:command name="fieldstack" value="fieldstack"/>
+    <cd:command name="setupforms" value="setupforms"/>
+    <cd:command name="setupclipping" value="setupclipping"/>
+    <cd:command name="clip" value="clip"/>
+    <cd:command name="placelegend" value="placelegend"/>
+    <cd:command name="setuplegend" value="setuplegend"/>
+    <cd:command name="setuppagecomment" value="setuppagecomment"/>
+    <cd:command name="setupstrut" value="setupstrut"/>
+    <cd:command name="definerule" value="definerule"/>
+    <cd:command name="placerule" value="placerule"/>
+    <cd:command name="setuprule" value="setuprule"/>
+    <cd:command name="definetextvariable" value="definetextvariable"/>
+    <cd:command name="setuptextvariable" value="setuptextvariable"/>
+    <cd:command name="settextvariable" value="settextvariable"/>
+    <cd:command name="placetextvariable" value="placetextvariable"/>
+    <cd:command name="textvariable" value="textvariable"/>
+    <cd:command name="definetextposition" value="definetextposition"/>
+    <cd:command name="setuptextposition" value="setuptextposition"/>
+    <cd:command name="positiontext" value="positiontext"/>
+    <cd:command name="definerawfont" value="definerawfont"/>
+    <cd:command name="switchtorawfont" value="switchtorawfont"/>
+    <cd:command name="placeheadtext" value="placeheadtext"/>
+    <cd:command name="placeheadnumber" value="placeheadnumber"/>
+    <cd:command name="definepagebreak" value="definepagebreak"/>
+    <cd:command name="definecolumnbreak" value="definecolumnbreak"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="setupitemgroups" value="setupitemizations"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="topheight" value="topheight"/>
+    <cd:command name="topdistance" value="topdistance"/>
+    <cd:command name="headerheight" value="headerheight"/>
+    <cd:command name="headerdistance" value="headerdistance"/>
+    <cd:command name="textheight" value="textheight"/>
+    <cd:command name="footerdistance" value="footerdistance"/>
+    <cd:command name="footerheight" value="footerheight"/>
+    <cd:command name="bottomdistance" value="bottomdistance"/>
+    <cd:command name="bottomheight" value="bottomheight"/>
+    <cd:command name="marginwidth" value="marginwidth"/>
+    <cd:command name="leftmarginwidth" value="leftmarginwidth"/>
+    <cd:command name="rightmarginwidth" value="rightmarginwidth"/>
+    <cd:command name="margindistance" value="margindistance"/>
+    <cd:command name="leftmargindistance" value="leftmargindistance"/>
+    <cd:command name="rightmargindistance" value="rightmargindistance"/>
+    <cd:command name="edgewidth" value="edgewidth"/>
+    <cd:command name="leftedgewidth" value="leftedgewidth"/>
+    <cd:command name="rightedgewidth" value="rightedgewidth"/>
+    <cd:command name="edgedistance" value="edgedistance"/>
+    <cd:command name="leftedgedistance" value="leftedgedistance"/>
+    <cd:command name="rightedgedistance" value="rightedgedistance"/>
+    <cd:command name="innermarginwidth" value="innermarginwidth"/>
+    <cd:command name="outermarginwidth" value="outermarginwidth"/>
+    <cd:command name="innermargindistance" value="innermargindistance"/>
+    <cd:command name="outermargindistance" value="outermargindistance"/>
+    <cd:command name="inneredgewidth" value="inneredgewidth"/>
+    <cd:command name="outeredgewidth" value="outeredgewidth"/>
+    <cd:command name="inneredgedistance" value="inneredgedistance"/>
+    <cd:command name="outeredgedistance" value="outeredgedistance"/>
+    <cd:command name="textwidth" value="textwidth"/>
+    <cd:command name="makeupwidth" value="makeupwidth"/>
+    <cd:command name="makeupheight" value="makeupheight"/>
+    <cd:command name="topspace" value="topspace"/>
+    <cd:command name="bottomspace" value="bottomspace"/>
+    <cd:command name="backspace" value="backspace"/>
+    <cd:command name="cutspace" value="cutspace"/>
+    <cd:command name="paperwidth" value="paperwidth"/>
+    <cd:command name="paperheight" value="paperheight"/>
+    <cd:command name="printpaperwidth" value="printpaperwidth"/>
+    <cd:command name="printpaperheight" value="printpaperheight"/>
+    <cd:command name="pageoffset" value="pageoffset"/>
+    <cd:command name="pagedepth" value="pagedepth"/>
+    <cd:command name="headlevel" value="headlevel"/>
+    <cd:command name="linewidth" value="linethickness"/>
+    <cd:command name="totalnumberofpages" value="totalnumberofpages"/>
+    <cd:command name="numberofsubpages" value="numberofsubpages"/>
+    <cd:command name="useXMLfilter" value="useXMLfilter"/>
+    <cd:command name="definecolumnset" value="definecolumnset"/>
+    <cd:command name="setupcolumnset" value="setupcolumnset"/>
+    <cd:command name="startcolumnset" value="startcolumnset"/>
+    <cd:command name="stopcolumnset" value="stopcolumnset"/>
+    <cd:command name="setupcolumnsetlines" value="setupcolumnsetlines"/>
+    <cd:command name="setupcolumnsetstart" value="setupcolumnsetstart"/>
+    <cd:command name="startcolumnmakeup" value="startcolumnmakeup"/>
+    <cd:command name="stopcolumnmakeup" value="stopcolumnmakeup"/>
+    <cd:command name="usetypescript" value="usetypescript"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="startdocument" value="startdocument"/>
+    <cd:command name="stopdocument" value="stopdocument"/>
+    <cd:command name="startoverzicht" value="startoverview"/>
+    <cd:command name="stopoverzicht" value="stopoverview"/>
+    <cd:command name="label" value="label"/>
+    <cd:command name="labels" value="labels"/>
+    <cd:command name="domicile" value="domicile"/>
+  </cd:commands>
+
+</cd:interface>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
new file mode 100644
index 000000000..17c7efb39
--- /dev/null
+++ b/tex/context/interface/keys-it.xml
@@ -0,0 +1,1576 @@
+<?xml version="1.0"?>
+
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2004.11.16">
+
+  <cd:variables>
+    <cd:variable name="one" value="uno"/>
+    <cd:variable name="two" value="due"/>
+    <cd:variable name="three" value="tre"/>
+    <cd:variable name="four" value="quattro"/>
+    <cd:variable name="five" value="cinque"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="sunday" value="domenica"/>
+    <cd:variable name="monday" value="lunedi"/>
+    <cd:variable name="tuesday" value="martedi"/>
+    <cd:variable name="wednesday" value="mercoledi"/>
+    <cd:variable name="thursday" value="giovedi"/>
+    <cd:variable name="friday" value="venerdi"/>
+    <cd:variable name="saturday" value="sabato"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="january" value="gennaio"/>
+    <cd:variable name="february" value="febbraio"/>
+    <cd:variable name="march" value="marzo"/>
+    <cd:variable name="april" value="aprile"/>
+    <cd:variable name="may" value="maggio"/>
+    <cd:variable name="june" value="giugno"/>
+    <cd:variable name="july" value="luglio"/>
+    <cd:variable name="august" value="agosto"/>
+    <cd:variable name="september" value="settembre"/>
+    <cd:variable name="october" value="ottobre"/>
+    <cd:variable name="november" value="novembre"/>
+    <cd:variable name="december" value="dicembre"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="atpage" value="apagina"/>
+    <cd:variable name="hencefore" value="precedente"/>
+    <cd:variable name="hereafter" value="seguente"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="sectionlevel" value="paragrafo"/>
+    <cd:variable name="part" value="parte"/>
+    <cd:variable name="chapter" value="capitolo"/>
+    <cd:variable name="subject" value="argomento"/>
+    <cd:variable name="section" value="capoverso"/>
+    <cd:variable name="title" value="titolo"/>
+    <cd:variable name="margintitle" value="titoloinmargine"/>
+    <cd:variable name="content" value="indice"/>
+    <cd:variable name="contents" value="indici"/>
+    <cd:variable name="appendix" value="appendice"/>
+    <cd:variable name="appendices" value="appendici"/>
+    <cd:variable name="bodypart" value="testoprincipale"/>
+    <cd:variable name="bodymatter" value="testiprincipali"/>
+    <cd:variable name="frontpart" value="prefazione"/>
+    <cd:variable name="frontmatter" value="preambolo"/>
+    <cd:variable name="backpart" value="postfazione"/>
+    <cd:variable name="backmatter" value="postambolo"/>
+    <cd:variable name="footnote" value="notapdp"/>
+    <cd:variable name="system" value="sistema"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="subsection" value="sottocapoverso"/>
+    <cd:variable name="subsubsection" value="sottosottocapoverso"/>
+    <cd:variable name="subsubsubsection" value="sottosottosottocapoverso"/>
+    <cd:variable name="subsubsubsubsection" value="sottosottosottosottocapoverso"/>
+    <cd:variable name="subsubsubsubsubsection" value="sottosottosottosottosottocapoverso"/>
+    <cd:variable name="subsubject" value="sottoargomento"/>
+    <cd:variable name="subsubsubject" value="sottosottoargomento"/>
+    <cd:variable name="subsubsubsubject" value="sottosottosottoargomento"/>
+    <cd:variable name="subsubsubsubsubject" value="sottosottosottosottoargomento"/>
+    <cd:variable name="subsubsubsubsubsubject" value="sottosottosottosottosottoargomento"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="flushleft" value="flushleft"/>
+    <cd:variable name="flushright" value="flushright"/>
+    <cd:variable name="center" value="center"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="typing" value="typing"/>
+    <cd:variable name="file" value="file"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="formula" value="formula"/>
+    <cd:variable name="formulae" value="formule"/>
+    <cd:variable name="figure" value="figura"/>
+    <cd:variable name="figures" value="figure"/>
+    <cd:variable name="table" value="tabella"/>
+    <cd:variable name="tables" value="tabelle"/>
+    <cd:variable name="graphic" value="grafico"/>
+    <cd:variable name="graphics" value="grafici"/>
+    <cd:variable name="intermezzo" value="intermezzo"/>
+    <cd:variable name="intermezzi" value="intermezzi"/>
+    <cd:variable name="index" value="indiceanalitico"/>
+    <cd:variable name="indices" value="indicianalitici"/>
+    <cd:variable name="abbreviation" value="abbreviazione"/>
+    <cd:variable name="abbreviations" value="abbreviazioni"/>
+    <cd:variable name="logo" value="logo"/>
+    <cd:variable name="logos" value="loghi"/>
+    <cd:variable name="unit" value="unita"/>
+    <cd:variable name="units" value="unita"/>
+    <cd:variable name="line" value="riga"/>
+    <cd:variable name="lines" value="righe"/>
+    <cd:variable name="framedtext" value="testoincorniciato"/>
+    <cd:variable name="quotation" value="citazione"/>
+    <cd:variable name="quote" value="menzione"/>
+    <cd:variable name="speech" value="speech"/>
+    <cd:variable name="itemize" value="elenco"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="leftquotation" value="citazionesinistra"/>
+    <cd:constant name="rightquotation" value="citazionedestra"/>
+    <cd:constant name="leftquote" value="menzionesinistra"/>
+    <cd:constant name="rightquote" value="menzionedestra"/>
+    <cd:constant name="midsentence" value="midsentence"/>
+    <cd:constant name="leftsentence" value="frasesinistra"/>
+    <cd:constant name="rightsentence" value="frasedestra"/>
+    <cd:constant name="leftsubsentence" value="sottofrasesinistra"/>
+    <cd:constant name="rightsubsentence" value="sottofrasedestra"/>
+    <cd:constant name="leftspeech" value="leftspeech"/>
+    <cd:constant name="middlespeech" value="middlespeech"/>
+    <cd:constant name="rightspeech" value="rightspeech"/>
+    <cd:constant name="limittext" value="limittext"/>
+    <cd:constant name="date" value="data"/>
+    <cd:constant name="spacebefore" value="spazioprima"/>
+    <cd:constant name="spaceinbetween" value="spaceinbetween"/>
+    <cd:constant name="spaceafter" value="spaziodopo"/>
+    <cd:constant name="sidespacebefore" value="spaziolateraleprima"/>
+    <cd:constant name="sidespaceafter" value="spaziolateraledopo"/>
+    <cd:constant name="to" value="verso"/>
+    <cd:constant name="indicator" value="indicatore"/>
+    <cd:constant name="background" value="sfondo"/>
+    <cd:constant name="backgrounddepth" value="profonditasfondo"/>
+    <cd:constant name="backgroundcorner" value="angolosfondo"/>
+    <cd:constant name="splitcolor" value="splitcolor"/>
+    <cd:constant name="backgroundcolor" value="coloresfondo"/>
+    <cd:constant name="foregroundcolor" value="coloreprimopiano"/>
+    <cd:constant name="foregroundstyle" value="foregroundstyle"/>
+    <cd:constant name="clipoffset" value="clipoffset"/>
+    <cd:constant name="backgroundoffset" value="offsetsfondo"/>
+    <cd:constant name="backgroundscreen" value="schermosfondo"/>
+    <cd:constant name="backgroundradius" value="raggiosfondo"/>
+    <cd:constant name="address" value="indirizzo"/>
+    <cd:constant name="stopper" value="stopper"/>
+    <cd:constant name="distance" value="distanza"/>
+    <cd:constant name="paragraph" value="capoverso"/>
+    <cd:constant name="axis" value="asse"/>
+    <cd:constant name="author" value="autore"/>
+    <cd:constant name="auto" value="auto"/>
+    <cd:constant name="autofile" value="autofile"/>
+    <cd:constant name="balance" value="bilanciamento"/>
+    <cd:constant name="wfactor" value="wfactor"/>
+    <cd:constant name="inner" value="interno"/>
+    <cd:constant name="blank" value="rigovuoto"/>
+    <cd:constant name="obstruction" value="ostruzione"/>
+    <cd:constant name="blockway" value="blockway"/>
+    <cd:constant name="bottomspace" value="spaziofondo"/>
+    <cd:constant name="top" value="cima"/>
+    <cd:constant name="topdistance" value="distanzacima"/>
+    <cd:constant name="topframe" value="cornicecima"/>
+    <cd:constant name="topoffset" value="offsetcima"/>
+    <cd:constant name="topstate" value="statocima"/>
+    <cd:constant name="width" value="ampiezza"/>
+    <cd:constant name="maxwidth" value="ampiezzamax"/>
+    <cd:constant name="minwidth" value="ampiezzamin"/>
+    <cd:constant name="source" value="origine"/>
+    <cd:constant name="command" value="comando"/>
+    <cd:constant name="commands" value="comandi"/>
+    <cd:constant name="component" value="component"/>
+    <cd:constant name="contrastcolor" value="colorecontrasto"/>
+    <cd:constant name="conversion" value="conversione"/>
+    <cd:constant name="headconversion" value="conversionetesta"/>
+    <cd:constant name="headlabel" value="etichettatesta"/>
+    <cd:constant name="criterium" value="criterio"/>
+    <cd:constant name="date" value="data"/>
+    <cd:constant name="default" value="implicito"/>
+    <cd:constant name="depth" value="profondita"/>
+    <cd:constant name="depthcorrection" value="correzioneprofondita"/>
+    <cd:constant name="continue" value="continua"/>
+    <cd:constant name="doublesided" value="doppiafaccia"/>
+    <cd:constant name="dummy" value="dummy"/>
+    <cd:constant name="unit" value="unita"/>
+    <cd:constant name="ownnumber" value="numeroproprio"/>
+    <cd:constant name="evenmargin" value="marginepari"/>
+    <cd:constant name="expansion" value="espansione"/>
+    <cd:constant name="factor" value="fattore"/>
+    <cd:constant name="convertfile" value="convertifile"/>
+    <cd:constant name="file" value="file"/>
+    <cd:constant name="inputfile" value="inputfile"/>
+    <cd:constant name="size" value="dimensione"/>
+    <cd:constant name="autofocus" value="autofocus"/>
+    <cd:constant name="focus" value="focus"/>
+    <cd:constant name="directory" value="directory"/>
+    <cd:constant name="grid" value="griglia"/>
+    <cd:constant name="big" value="grande"/>
+    <cd:constant name="get" value="prendi"/>
+    <cd:constant name="hang" value="sospendi"/>
+    <cd:constant name="repeat" value="ripeti"/>
+    <cd:constant name="hfactor" value="hfactor"/>
+    <cd:constant name="corner" value="angolo"/>
+    <cd:constant name="hoffset" value="hoffset"/>
+    <cd:constant name="frames" value="cornici"/>
+    <cd:constant name="header" value="intestazione"/>
+    <cd:constant name="headerdistance" value="distanzaintestazione"/>
+    <cd:constant name="headerstate" value="statointestazione"/>
+    <cd:constant name="height" value="altezza"/>
+    <cd:constant name="maxheight" value="altezzamax"/>
+    <cd:constant name="minheight" value="altezzamin"/>
+    <cd:constant name="mindepth" value="mindeoth"/>
+    <cd:constant name="current" value="corrente"/>
+    <cd:constant name="in" value="in"/>
+    <cd:constant name="indenting" value="rientro"/>
+    <cd:constant name="interaction" value="interazione"/>
+    <cd:constant name="interlinespace" value="interlinea"/>
+    <cd:constant name="items" value="elementi"/>
+    <cd:constant name="frame" value="cornice"/>
+    <cd:constant name="framedepth" value="profonditacornice"/>
+    <cd:constant name="framecorner" value="angolocornice"/>
+    <cd:constant name="framecolor" value="colorecornice"/>
+    <cd:constant name="frameoffset" value="offsetcornice"/>
+    <cd:constant name="frameradius" value="raggiocornice"/>
+    <cd:constant name="marginedge" value="bordomargine"/>
+    <cd:constant name="marginedgetext" value="testobordomargine"/>
+    <cd:constant name="aligncharacter" value="allineacarattere"/>
+    <cd:constant name="alignmentcharacter" value="carattereallineamento"/>
+    <cd:constant name="small" value="piccolo"/>
+    <cd:constant name="color" value="colore"/>
+    <cd:constant name="column" value="colonna"/>
+    <cd:constant name="columns" value="colonne"/>
+    <cd:constant name="columndistance" value="distanzacolonne"/>
+    <cd:constant name="headcommand" value="headcommand"/>
+    <cd:constant name="headcolor" value="coloretesta"/>
+    <cd:constant name="headstyle" value="stiletesta"/>
+    <cd:constant name="afterhead" value="dopotesta"/>
+    <cd:constant name="veroffset" value="veroffset"/>
+    <cd:constant name="coupling" value="accoppiamento"/>
+    <cd:constant name="couplingway" value="modoaccoppiamento"/>
+    <cd:constant name="beforehead" value="primaditesta"/>
+    <cd:constant name="topspace" value="spaziocima"/>
+    <cd:constant name="bodyfont" value="fonttesto"/>
+    <cd:constant name="label" value="etichetta"/>
+    <cd:constant name="empty" value="vuoto"/>
+    <cd:constant name="style" value="stile"/>
+    <cd:constant name="rule" value="linea"/>
+    <cd:constant name="rulethickness" value="spessorelinea"/>
+    <cd:constant name="rulecolor" value="colorelinea"/>
+    <cd:constant name="list" value="elenco"/>
+    <cd:constant name="leftwidth" value="ampiezzasinistra"/>
+    <cd:constant name="leftframe" value="cornicesinistra"/>
+    <cd:constant name="leftcolor" value="coloresinistra"/>
+    <cd:constant name="leftstyle" value="stilesinistra"/>
+    <cd:constant name="leftmargin" value="marginesinistro"/>
+    <cd:constant name="leftmargindistance" value="distanzamarginesinistro"/>
+    <cd:constant name="leftoffset" value="offsetsinistro"/>
+    <cd:constant name="leftedge" value="bordosinistro"/>
+    <cd:constant name="leftedgedistance" value="distanzabordosinistro"/>
+    <cd:constant name="lefttext" value="testosinistro"/>
+    <cd:constant name="left" value="sinistra"/>
+    <cd:constant name="nleft" value="nsinistra"/>
+    <cd:constant name="logo" value="logo"/>
+    <cd:constant name="logos" value="loghi"/>
+    <cd:constant name="local" value="locale"/>
+    <cd:constant name="margin" value="margine"/>
+    <cd:constant name="margindistance" value="distanzamargine"/>
+    <cd:constant name="margintext" value="testomargine"/>
+    <cd:constant name="marking" value="marcatura"/>
+    <cd:constant name="marcolor" value="coloremarcatura"/>
+    <cd:constant name="marstyle" value="stilemarcatura"/>
+    <cd:constant name="menu" value="menu"/>
+    <cd:constant name="splitmethod" value="splitmethod"/>
+    <cd:constant name="textmethod" value="textmethod"/>
+    <cd:constant name="sidemethod" value="sidemethod"/>
+    <cd:constant name="method" value="metodo"/>
+    <cd:constant name="middle" value="centro"/>
+    <cd:constant name="middletext" value="testocentro"/>
+    <cd:constant name="max" value="max"/>
+    <cd:constant name="min" value="min"/>
+    <cd:constant name="sample" value="campione"/>
+    <cd:constant name="after" value="dopo"/>
+    <cd:constant name="name" value="nome"/>
+    <cd:constant name="commandafter" value="comdandodopo"/>
+    <cd:constant name="ntop" value="ncima"/>
+    <cd:constant name="level" value="livello"/>
+    <cd:constant name="levels" value="livelli"/>
+    <cd:constant name="nbottom" value="nfondo"/>
+    <cd:constant name="norm" value="norma"/>
+    <cd:constant name="nlines" value="nrighe"/>
+    <cd:constant name="number" value="numero"/>
+    <cd:constant name="numbercommand" value="comandonumero"/>
+    <cd:constant name="numbering" value="numerazione"/>
+    <cd:constant name="numbercolor" value="colorenumero"/>
+    <cd:constant name="numberstyle" value="stilenumero"/>
+    <cd:constant name="numberseparator" value="separatorenumero"/>
+    <cd:constant name="object" value="oggetto"/>
+    <cd:constant name="offset" value="offset"/>
+    <cd:constant name="bottom" value="fondo"/>
+    <cd:constant name="bottomdistance" value="distanzafondo"/>
+    <cd:constant name="bottomframe" value="cornicefondo"/>
+    <cd:constant name="bottomoffset" value="offsetfondo"/>
+    <cd:constant name="bottomstate" value="statofondo"/>
+    <cd:constant name="oddmargin" value="marginedispari"/>
+    <cd:constant name="at" value="ad"/>
+    <cd:constant name="option" value="opzione"/>
+    <cd:constant name="page" value="pagina"/>
+    <cd:constant name="pagecommand" value="comandopagina"/>
+    <cd:constant name="pagecolor" value="colorepagina"/>
+    <cd:constant name="pagestyle" value="stilepagina"/>
+    <cd:constant name="pagenumber" value="numeropagina"/>
+    <cd:constant name="pageboundaries" value="limitipagina"/>
+    <cd:constant name="pagestate" value="statopagina"/>
+    <cd:constant name="palet" value="tavolozza"/>
+    <cd:constant name="paper" value="carta"/>
+    <cd:constant name="location" value="luogo"/>
+    <cd:constant name="placestopper" value="mettistopper"/>
+    <cd:constant name="place" value="metti"/>
+    <cd:constant name="placehead" value="mettitesta"/>
+    <cd:constant name="position" value="posizione"/>
+    <cd:constant name="prefix" value="prefisso"/>
+    <cd:constant name="preset" value="preimpostato"/>
+    <cd:constant name="preview" value="anteprima"/>
+    <cd:constant name="process" value="process"/>
+    <cd:constant name="spot" value="spot"/>
+    <cd:constant name="dot" value="punto"/>
+    <cd:constant name="arrow" value="freccia"/>
+    <cd:constant name="edge" value="bordo"/>
+    <cd:constant name="edgedistance" value="distanzabordo"/>
+    <cd:constant name="screen" value="schermo"/>
+    <cd:constant name="rightwidth" value="ampiezzadestra"/>
+    <cd:constant name="rightframe" value="cornicedestra"/>
+    <cd:constant name="rightcolor" value="coloredestra"/>
+    <cd:constant name="rightstyle" value="stiledestra"/>
+    <cd:constant name="rightmargin" value="marginedestro"/>
+    <cd:constant name="rightmargindistance" value="distanzamarginedestro"/>
+    <cd:constant name="rightoffset" value="offsetdestro"/>
+    <cd:constant name="rightedge" value="bordodestro"/>
+    <cd:constant name="rightedgedistance" value="distanzabordodestro"/>
+    <cd:constant name="righttext" value="testodestro"/>
+    <cd:constant name="right" value="destra"/>
+    <cd:constant name="nright" value="ndestra"/>
+    <cd:constant name="reduction" value="riduzione"/>
+    <cd:constant name="referencing" value="referencing"/>
+    <cd:constant name="line" value="riga"/>
+    <cd:constant name="linecorrection" value="correzioneriga"/>
+    <cd:constant name="lines" value="righe"/>
+    <cd:constant name="stretch" value="dilata"/>
+    <cd:constant name="resolution" value="risoluzione"/>
+    <cd:constant name="rotation" value="rotazione"/>
+    <cd:constant name="orientation" value="orientation"/>
+    <cd:constant name="horoffset" value="horoffset"/>
+    <cd:constant name="backspace" value="backspace"/>
+    <cd:constant name="direction" value="direzione"/>
+    <cd:constant name="scale" value="scala"/>
+    <cd:constant name="separator" value="separatore"/>
+    <cd:constant name="display" value="display"/>
+    <cd:constant name="scope" value="scope"/>
+    <cd:constant name="section" value="sezione"/>
+    <cd:constant name="sectionnumber" value="numerosezione"/>
+    <cd:constant name="setups" value="setups"/>
+    <cd:constant name="cutspace" value="cutspace"/>
+    <cd:constant name="family" value="famiglia"/>
+    <cd:constant name="space" value="spazio"/>
+    <cd:constant name="spacing" value="spaziatura"/>
+    <cd:constant name="split" value="separa"/>
+    <cd:constant name="splitoffset" value="splitoffset"/>
+    <cd:constant name="indentnext" value="rientrasuccessivo"/>
+    <cd:constant name="step" value="passo"/>
+    <cd:constant name="stack" value="stack"/>
+    <cd:constant name="start" value="inizia"/>
+    <cd:constant name="state" value="stato"/>
+    <cd:constant name="stop" value="termina"/>
+    <cd:constant name="radius" value="raggio"/>
+    <cd:constant name="dash" value="dash"/>
+    <cd:constant name="sub" value="sotto"/>
+    <cd:constant name="subtitle" value="sottotitolo"/>
+    <cd:constant name="symbol" value="simbolo"/>
+    <cd:constant name="symbolset" value="setsimboli"/>
+    <cd:constant name="symcolor" value="coloresimbolo"/>
+    <cd:constant name="symstyle" value="stilesimbolo"/>
+    <cd:constant name="synonym" value="sinonimo"/>
+    <cd:constant name="synonymcolor" value="coloresinonimi"/>
+    <cd:constant name="synonymstyle" value="stilesinonimi"/>
+    <cd:constant name="tab" value="tab"/>
+    <cd:constant name="sign" value="segno"/>
+    <cd:constant name="text" value="testo"/>
+    <cd:constant name="textwidth" value="ampiezzatesto"/>
+    <cd:constant name="textcommand" value="comandotesto"/>
+    <cd:constant name="textsize" value="dimensionetesto"/>
+    <cd:constant name="textcolor" value="coloretesto"/>
+    <cd:constant name="textstyle" value="stiletesto"/>
+    <cd:constant name="textseparator" value="separatoretesto"/>
+    <cd:constant name="textstate" value="statotesto"/>
+    <cd:constant name="title" value="titolo"/>
+    <cd:constant name="aligntitle" value="allineatitolo"/>
+    <cd:constant name="tolerance" value="tolleranza"/>
+    <cd:constant name="inbetween" value="tra"/>
+    <cd:constant name="type" value="type"/>
+    <cd:constant name="align" value="allinea"/>
+    <cd:constant name="urlspace" value="spaziourl"/>
+    <cd:constant name="urlalternative" value="alternativaurl"/>
+    <cd:constant name="from" value="da"/>
+    <cd:constant name="alternative" value="alternativa"/>
+    <cd:constant name="increment" value="incremento"/>
+    <cd:constant name="incrementnumber" value="incrementanumero"/>
+    <cd:constant name="resetnumber" value="resetnumber"/>
+    <cd:constant name="reference" value="riferimento"/>
+    <cd:constant name="unknownreference" value="riferimentoingoto"/>
+    <cd:constant name="footer" value="piedipagina"/>
+    <cd:constant name="footerdistance" value="distanzapdp"/>
+    <cd:constant name="footerstate" value="statopdp"/>
+    <cd:constant name="voffset" value="voffset"/>
+    <cd:constant name="next" value="successivo"/>
+    <cd:constant name="before" value="prima"/>
+    <cd:constant name="commandbefore" value="comandoprima"/>
+    <cd:constant name="previous" value="precedente"/>
+    <cd:constant name="previousnumber" value="numeroprecedente"/>
+    <cd:constant name="delay" value="attesa"/>
+    <cd:constant name="way" value="modo"/>
+    <cd:constant name="random" value="casuale"/>
+    <cd:constant name="white" value="bianco"/>
+    <cd:constant name="xfactor" value="xfactor"/>
+    <cd:constant name="xmax" value="xmax"/>
+    <cd:constant name="xoffset" value="xoffset"/>
+    <cd:constant name="xscale" value="xscale"/>
+    <cd:constant name="xstep" value="xstep"/>
+    <cd:constant name="yfactor" value="yfactor"/>
+    <cd:constant name="ymax" value="ymax"/>
+    <cd:constant name="yoffset" value="yoffset"/>
+    <cd:constant name="yscale" value="yscale"/>
+    <cd:constant name="ystep" value="ystep"/>
+    <cd:constant name="samepage" value="stessapagina"/>
+    <cd:constant name="sidealign" value="sidealign"/>
+    <cd:constant name="side" value="lato"/>
+    <cd:constant name="fieldlayer" value="fieldlayer"/>
+    <cd:constant name="textlayer" value="textlayer"/>
+    <cd:constant name="fieldbackgroundcolor" value="coloresfondocampo"/>
+    <cd:constant name="fieldframecolor" value="colorecornicecampo"/>
+    <cd:constant name="fieldoffset" value="offsetcampo"/>
+    <cd:constant name="openaction" value="azioneapri"/>
+    <cd:constant name="closeaction" value="azionechiudi"/>
+    <cd:constant name="openpageaction" value="azioneapripagina"/>
+    <cd:constant name="closepageaction" value="azionechiudipagina"/>
+    <cd:constant name="clickin" value="clickdentro"/>
+    <cd:constant name="clickout" value="clickfuori"/>
+    <cd:constant name="regionin" value="entraregione"/>
+    <cd:constant name="regionout" value="esciregione"/>
+    <cd:constant name="focusin" value="focusin"/>
+    <cd:constant name="focusout" value="focusout"/>
+    <cd:constant name="afterkey" value="dopotasto"/>
+    <cd:constant name="format" value="format"/>
+    <cd:constant name="validate" value="verifica"/>
+    <cd:constant name="calculate" value="calcola"/>
+    <cd:constant name="click" value="click"/>
+    <cd:constant name="vcommand" value="vcomando"/>
+    <cd:constant name="icommand" value="icomando"/>
+    <cd:constant name="ccommand" value="ccomando"/>
+    <cd:constant name="textdistance" value="distanzatesto"/>
+    <cd:constant name="textmargin" value="textmargin"/>
+    <cd:constant name="keyword" value="parolachiave"/>
+  </cd:constants>
+
+  <cd:constants>
+    <cd:constant name="extras" value="extras"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="on" value="attivo"/>
+    <cd:variable name="serried" value="vicino"/>
+    <cd:variable name="joinedup" value="unito"/>
+    <cd:variable name="absolute" value="assoluto"/>
+    <cd:variable name="background" value="sfondo"/>
+    <cd:variable name="backward" value="indietro"/>
+    <cd:variable name="subbackward" value="sottoindietro"/>
+    <cd:variable name="action" value="azione"/>
+    <cd:variable name="stopper" value="stopper"/>
+    <cd:variable name="paragraph" value="capoverso"/>
+    <cd:variable name="all" value="tutti"/>
+    <cd:variable name="always" value="sempre"/>
+    <cd:variable name="auto" value="auto"/>
+    <cd:variable name="autointro" value="autointro"/>
+    <cd:variable name="both" value="entrambi"/>
+    <cd:variable name="inner" value="interno"/>
+    <cd:variable name="blank" value="rigovuoto"/>
+    <cd:variable name="disable" value="disattiva"/>
+    <cd:variable name="top" value="cima"/>
+    <cd:variable name="wide" value="ampio"/>
+    <cd:variable name="width" value="ampiezza"/>
+    <cd:variable name="outer" value="esterno"/>
+    <cd:variable name="numbers" value="numeri"/>
+    <cd:variable name="Numbers" value="Numeri"/>
+    <cd:variable name="command" value="comando"/>
+    <cd:variable name="commands" value="comandi"/>
+    <cd:variable name="concept" value="concetto"/>
+    <cd:variable name="day" value="giorno"/>
+    <cd:variable name="date" value="data"/>
+    <cd:variable name="default" value="implicito"/>
+    <cd:variable name="final" value="finale"/>
+    <cd:variable name="depth" value="profondita"/>
+    <cd:variable name="doublesided" value="doppiafaccia"/>
+    <cd:variable name="first" value="primo"/>
+    <cd:variable name="each" value="ogni"/>
+    <cd:variable name="singlesided" value="facciasingola"/>
+    <cd:variable name="somewhere" value="daqualcheparte"/>
+    <cd:variable name="nowhere" value="danessunaparte"/>
+    <cd:variable name="even" value="pari"/>
+    <cd:variable name="external" value="esterno"/>
+    <cd:variable name="file" value="file"/>
+    <cd:variable name="flexible" value="flessibile"/>
+    <cd:variable name="force" value="forza"/>
+    <cd:variable name="used" value="usato"/>
+    <cd:variable name="none" value="nessuno"/>
+    <cd:variable name="nomarking" value="nomarcature"/>
+    <cd:variable name="nonumber" value="nonumber"/>
+    <cd:variable name="nowhite" value="nobianco"/>
+    <cd:variable name="rotated" value="ruotato"/>
+    <cd:variable name="mirrored" value="riflesso"/>
+    <cd:variable name="global" value="globale"/>
+    <cd:variable name="grid" value="griglia"/>
+    <cd:variable name="big" value="grande"/>
+    <cd:variable name="bigbodyfont" value="grossofontdeltesto"/>
+    <cd:variable name="bigpreference" value="grandepreferenza"/>
+    <cd:variable name="gray" value="grigio"/>
+    <cd:variable name="halfline" value="mezzariga"/>
+    <cd:variable name="keep" value="mantieni"/>
+    <cd:variable name="hanging" value="sospeso"/>
+    <cd:variable name="repeat" value="ripeti"/>
+    <cd:variable name="fix" value="fisso"/>
+    <cd:variable name="here" value="qui"/>
+    <cd:variable name="header" value="intestazione"/>
+    <cd:variable name="high" value="alto"/>
+    <cd:variable name="height" value="altezza"/>
+    <cd:variable name="horizontal" value="orizzontale"/>
+    <cd:variable name="current" value="corrente"/>
+    <cd:variable name="hz" value="hz"/>
+    <cd:variable name="nohz" value="nohz"/>
+    <cd:variable name="italic" value="corsivo"/>
+    <cd:variable name="inherit" value="inherit"/>
+    <cd:variable name="inleft" value="insinistra"/>
+    <cd:variable name="inmargin" value="inmargine"/>
+    <cd:variable name="inright" value="indestra"/>
+    <cd:variable name="interaction" value="interazione"/>
+    <cd:variable name="intext" value="intesto"/>
+    <cd:variable name="intro" value="intro"/>
+    <cd:variable name="its" value="its"/>
+    <cd:variable name="yes" value="si"/>
+    <cd:variable name="year" value="anno"/>
+    <cd:variable name="frame" value="cornice"/>
+    <cd:variable name="marginedge" value="bordomargine"/>
+    <cd:variable name="cap" value="cap"/>
+    <cd:variable name="capital" value="maiuscolo"/>
+    <cd:variable name="referral" value="referral"/>
+    <cd:variable name="small" value="piccolo"/>
+    <cd:variable name="smallnormal" value="piccolonormale"/>
+    <cd:variable name="smallslanted" value="piccoloinclinato"/>
+    <cd:variable name="smallslantedbold" value="piccoloinclinatograssetto"/>
+    <cd:variable name="smallitalic" value="piccolocorsivo"/>
+    <cd:variable name="smallitalicbold" value="piccolocorsivograssetto"/>
+    <cd:variable name="smalltype" value="piccolotype"/>
+    <cd:variable name="smallbold" value="piccolograssetto"/>
+    <cd:variable name="smallboldslanted" value="piccolograssettoinclinato"/>
+    <cd:variable name="smallbolditalic" value="piccolograssettocorsivo"/>
+    <cd:variable name="smallbodyfont" value="piccolofontdelcorpo"/>
+    <cd:variable name="color" value="colore"/>
+    <cd:variable name="column" value="colonna"/>
+    <cd:variable name="columns" value="colonne"/>
+    <cd:variable name="head" value="testa"/>
+    <cd:variable name="low" value="basso"/>
+    <cd:variable name="last" value="ultimo"/>
+    <cd:variable name="label" value="etichetta"/>
+    <cd:variable name="lohi" value="pedap"/>
+    <cd:variable name="tall" value="alto"/>
+    <cd:variable name="empty" value="vuoto"/>
+    <cd:variable name="Character" value="Lettera"/>
+    <cd:variable name="character" value="lettera"/>
+    <cd:variable name="Characters" value="Lettere"/>
+    <cd:variable name="characters" value="lettere"/>
+    <cd:variable name="landscape" value="orizzontale"/>
+    <cd:variable name="rule" value="linea"/>
+    <cd:variable name="list" value="elenco"/>
+    <cd:variable name="leftmargin" value="marginesinistro"/>
+    <cd:variable name="leftpage" value="paginasinistra"/>
+    <cd:variable name="leftedge" value="bordosinistro"/>
+    <cd:variable name="left" value="sinistra"/>
+    <cd:variable name="local" value="locale"/>
+    <cd:variable name="new" value="nuovo"/>
+    <cd:variable name="MONTH" value="MESE"/>
+    <cd:variable name="month" value="mese"/>
+    <cd:variable name="mar" value="mar"/>
+    <cd:variable name="margin" value="margine"/>
+    <cd:variable name="max" value="max"/>
+    <cd:variable name="min" value="min"/>
+    <cd:variable name="mediaeval" value="medievale"/>
+    <cd:variable name="medium" value="medio"/>
+    <cd:variable name="middle" value="centro"/>
+    <cd:variable name="after" value="dopo"/>
+    <cd:variable name="name" value="nome"/>
+    <cd:variable name="opposite" value="opposto"/>
+    <cd:variable name="no" value="no"/>
+    <cd:variable name="negative" value="negativo"/>
+    <cd:variable name="positive" value="positivo"/>
+    <cd:variable name="not" value="non"/>
+    <cd:variable name="never" value="mai"/>
+    <cd:variable name="normal" value="normale"/>
+    <cd:variable name="number" value="numero"/>
+    <cd:variable name="offset" value="offset"/>
+    <cd:variable name="unknown" value="ignoto"/>
+    <cd:variable name="bottom" value="fondo"/>
+    <cd:variable name="odd" value="dispari"/>
+    <cd:variable name="packed" value="impaccato"/>
+    <cd:variable name="unpacked" value="unpacked"/>
+    <cd:variable name="makeup" value="makeup"/>
+    <cd:variable name="atmargin" value="almargine"/>
+    <cd:variable name="overlay" value="sovrapponi"/>
+    <cd:variable name="page" value="pagina"/>
+    <cd:variable name="pagenumber" value="numeropagina"/>
+    <cd:variable name="paper" value="carta"/>
+    <cd:variable name="display" value="schermo"/>
+    <cd:variable name="reverse" value="invertito"/>
+    <cd:variable name="fit" value="adatta"/>
+    <cd:variable name="postscript" value="postscript"/>
+    <cd:variable name="preview" value="anteprima"/>
+    <cd:variable name="program" value="programma"/>
+    <cd:variable name="process" value="process"/>
+    <cd:variable name="spot" value="spot"/>
+    <cd:variable name="dot" value="punto"/>
+    <cd:variable name="ran" value="corse"/>
+    <cd:variable name="edge" value="bordo"/>
+    <cd:variable name="screen" value="schermo"/>
+    <cd:variable name="rectangular" value="rettangolare"/>
+    <cd:variable name="rightmargin" value="marginedestro"/>
+    <cd:variable name="rightpage" value="paginadestra"/>
+    <cd:variable name="rightedge" value="bordodestro"/>
+    <cd:variable name="right" value="destra"/>
+    <cd:variable name="line" value="riga"/>
+    <cd:variable name="register" value="registro"/>
+    <cd:variable name="relative" value="relativo"/>
+    <cd:variable name="reset" value="reimposta"/>
+    <cd:variable name="Romannumerals" value="Numeriromani"/>
+    <cd:variable name="romannumerals" value="numeriromani"/>
+    <cd:variable name="greek" value="greco"/>
+    <cd:variable name="Greek" value="Greco"/>
+    <cd:variable name="round" value="rotondo"/>
+    <cd:variable name="rotate" value="ruota"/>
+    <cd:variable name="stretch" value="dilata"/>
+    <cd:variable name="backspace" value="backspace"/>
+    <cd:variable name="broad" value="ampio"/>
+    <cd:variable name="row" value="row"/>
+    <cd:variable name="slanted" value="inclinato"/>
+    <cd:variable name="slantedbold" value="inclinatograssetto"/>
+    <cd:variable name="synchronize" value="synchronize"/>
+    <cd:variable name="italicbold" value="corsivograssetto"/>
+    <cd:variable name="sectionnumber" value="numerosezione"/>
+    <cd:variable name="narrow" value="stretto"/>
+    <cd:variable name="cutspace" value="cutspace"/>
+    <cd:variable name="tolerant" value="tollerante"/>
+    <cd:variable name="space" value="spazio"/>
+    <cd:variable name="standard" value="standard"/>
+    <cd:variable name="start" value="inizia"/>
+    <cd:variable name="stop" value="termina"/>
+    <cd:variable name="strict" value="rigido"/>
+    <cd:variable name="strut" value="strut"/>
+    <cd:variable name="sub" value="sotto"/>
+    <cd:variable name="sym" value="sim"/>
+    <cd:variable name="symbol" value="simbolo"/>
+    <cd:variable name="text" value="testo"/>
+    <cd:variable name="back" value="dietro"/>
+    <cd:variable name="test" value="test"/>
+    <cd:variable name="inbetween" value="tra"/>
+    <cd:variable name="type" value="type"/>
+    <cd:variable name="off" value="disattivo"/>
+    <cd:variable name="url" value="url"/>
+    <cd:variable name="URL" value="URL"/>
+    <cd:variable name="fixed" value="fisso"/>
+    <cd:variable name="loose" value="lento"/>
+    <cd:variable name="continue" value="continua"/>
+    <cd:variable name="vertical" value="verticale"/>
+    <cd:variable name="bold" value="grassetto"/>
+    <cd:variable name="boldslanted" value="grassettoinclinato"/>
+    <cd:variable name="bolditalic" value="grassettocorsivo"/>
+    <cd:variable name="quadruple" value="quadruplo"/>
+    <cd:variable name="footer" value="piedipagina"/>
+    <cd:variable name="next" value="successivo"/>
+    <cd:variable name="before" value="prima"/>
+    <cd:variable name="foreground" value="foreground"/>
+    <cd:variable name="preference" value="preferenza"/>
+    <cd:variable name="temporary" value="temporaneo"/>
+    <cd:variable name="forward" value="avanti"/>
+    <cd:variable name="subforward" value="sottoavanti"/>
+    <cd:variable name="previous" value="precedente"/>
+    <cd:variable name="value" value="valore"/>
+    <cd:variable name="week" value="settimana"/>
+    <cd:variable name="weekday" value="giornosettimana"/>
+    <cd:variable name="WEEKDAY" value="GIORNOSETTIMANA"/>
+    <cd:variable name="random" value="casuale"/>
+    <cd:variable name="white" value="bianco"/>
+    <cd:variable name="very" value="molto"/>
+    <cd:variable name="verytolerant" value="moltotollerante"/>
+    <cd:variable name="verystrict" value="moltorigido"/>
+    <cd:variable name="see" value="vedi"/>
+    <cd:variable name="smallcaps" value="maiuscoletto"/>
+    <cd:variable name="WORD" value="PAROLA"/>
+    <cd:variable name="firstpage" value="primapagina"/>
+    <cd:variable name="firstcolumn" value="firstcolumn"/>
+    <cd:variable name="previouspage" value="paginaprecedente"/>
+    <cd:variable name="nextpage" value="paginasuccessiva"/>
+    <cd:variable name="lastpage" value="ultimapagina"/>
+    <cd:variable name="lastcolumn" value="lastcolumn"/>
+    <cd:variable name="lastpagenumber" value="lastpagenumber"/>
+    <cd:variable name="subpage" value="sottopagina"/>
+    <cd:variable name="firstsubpage" value="primasottopagina"/>
+    <cd:variable name="previoussubpage" value="sottopaginaprecedente"/>
+    <cd:variable name="nextsubpage" value="sottopaginasuccessiva"/>
+    <cd:variable name="lastsubpage" value="ultimasottopagina"/>
+    <cd:variable name="nextevenpage" value="paginaparisuccessiva"/>
+    <cd:variable name="nextoddpage" value="paginadisparisuccessiva"/>
+    <cd:variable name="previousevenpage" value="paginapariprecedente"/>
+    <cd:variable name="previousoddpage" value="paginadispariprecedente"/>
+    <cd:variable name="readonly" value="solalettura"/>
+    <cd:variable name="required" value="richiestp"/>
+    <cd:variable name="protected" value="protetto"/>
+    <cd:variable name="sorted" value="ordinato"/>
+    <cd:variable name="unavailable" value="nondisponibile"/>
+    <cd:variable name="hidden" value="nascosto"/>
+    <cd:variable name="printable" value="stampabile"/>
+    <cd:variable name="bookmark" value="segnalibro"/>
+    <cd:variable name="nocheck" value="nocheck"/>
+    <cd:variable name="innermargin" value="margineinterno"/>
+    <cd:variable name="outermargin" value="margineesterno"/>
+    <cd:variable name="inneredge" value="bordointerno"/>
+    <cd:variable name="outeredge" value="bordoesterno"/>
+    <cd:variable name="controls" value="controlli"/>
+    <cd:variable name="nothanging" value="nonsospeso"/>
+    <cd:variable name="hyphenated" value="sillabato"/>
+    <cd:variable name="nothyphenated" value="nonsillabato"/>
+    <cd:variable name="overprint" value="overprint"/>
+    <cd:variable name="knockout" value="knockout"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="controls" value="controlli"/>
+    <cd:constant name="global" value="globale"/>
+    <cd:constant name="overprint" value="overprint"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="conversion" value="coversione"/>
+    <cd:variable name="by" value="da"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="dx" value="dx"/>
+    <cd:constant name="dy" value="dy"/>
+    <cd:constant name="nx" value="nx"/>
+    <cd:constant name="ny" value="ny"/>
+    <cd:constant name="nr" value="nr"/>
+    <cd:constant name="nl" value="nl"/>
+    <cd:constant name="nc" value="nc"/>
+    <cd:constant name="sx" value="sx"/>
+    <cd:constant name="sy" value="sy"/>
+    <cd:constant name="n" value="n"/>
+    <cd:constant name="vfil" value="vfil"/>
+    <cd:constant name="hfil" value="hfil"/>
+    <cd:constant name="strut" value="strut"/>
+    <cd:constant name="reset" value="reset"/>
+    <cd:constant name="set" value="set"/>
+    <cd:constant name="escape" value="escape"/>
+    <cd:constant name="apa" value="apa"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="calligraphic" value="calligrafico"/>
+    <cd:variable name="handwritten" value="grafiamanuale"/>
+    <cd:variable name="sansserif" value="sansserif"/>
+    <cd:variable name="roman" value="roman"/>
+    <cd:variable name="teletype" value="teletype"/>
+    <cd:variable name="type" value="type"/>
+    <cd:variable name="serif" value="serif"/>
+    <cd:variable name="regular" value="regolare"/>
+    <cd:variable name="support" value="supporto"/>
+    <cd:variable name="sans" value="sans"/>
+    <cd:variable name="mono" value="mono"/>
+  </cd:variables>
+
+  <cd:elements>
+    <cd:element name="begin" value="inizio"/>
+    <cd:element name="end" value="fine"/>
+    <cd:element name="coupled" value="accoppiato"/>
+    <cd:element name="get" value="prendi"/>
+    <cd:element name="currentlocal" value="correntelocale"/>
+    <cd:element name="endsetup" value="endsetup"/>
+    <cd:element name="load" value="carica"/>
+    <cd:element name="emptyone" value="prazdne"/>
+    <cd:element name="emptytwo" value="vuoti"/>
+    <cd:element name="list" value="elenco"/>
+    <cd:element name="listof" value="elencodi"/>
+    <cd:element name="local" value="locale"/>
+    <cd:element name="place" value="metti"/>
+    <cd:element name="reserve" value="riserva"/>
+    <cd:element name="start" value="inizia"/>
+    <cd:element name="setup" value="imposta"/>
+    <cd:element name="stop" value="termina"/>
+    <cd:element name="increment" value="incrementa"/>
+    <cd:element name="next" value="successivo"/>
+    <cd:element name="complete" value="completo"/>
+    <cd:element name="previous" value="precedente"/>
+    <cd:element name="previouslocal" value="precedentelocale"/>
+    <cd:element name="see" value="vedi"/>
+    <cd:element name="type" value="type"/>
+    <cd:element name="makeup" value="makeup"/>
+    <cd:element name="text" value="testo"/>
+  </cd:elements>
+
+  <cd:variables>
+    <cd:variable name="buffer" value="buffer"/>
+    <cd:variable name="linenote" value="linenote"/>
+    <cd:variable name="comment" value="commento"/>
+    <cd:variable name="interactionmenu" value="menuinterattivo"/>
+    <cd:variable name="postponing" value="posporre"/>
+    <cd:variable name="hiding" value="nascondere"/>
+    <cd:variable name="tabulate" value="tabulato"/>
+    <cd:variable name="tabulatehead" value="testatabulato"/>
+    <cd:variable name="tabulatetail" value="codatabulato"/>
+    <cd:variable name="fact" value="fatto"/>
+    <cd:variable name="legend" value="legenda"/>
+    <cd:variable name="formula" value="formula"/>
+    <cd:variable name="tablehead" value="testatabella"/>
+    <cd:variable name="tabletail" value="codatabella"/>
+    <cd:variable name="setups" value="nastaveni"/>
+    <cd:variable name="helptext" value="testoaiuto"/>
+    <cd:variable name="localenvironment" value="ambientelocale"/>
+    <cd:variable name="sectionblockenvironment" value="ambientebloccosezione"/>
+    <cd:variable name="pagecomment" value="commentopagina"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="FirstPage" value="PrimaPagina"/>
+    <cd:variable name="PreviousPage" value="PaginaPrecedente"/>
+    <cd:variable name="NextPage" value="PaginaSuccessiva"/>
+    <cd:variable name="LastPage" value="UltimaPagina"/>
+    <cd:variable name="PreviousJump" value="SaltoPrecedente"/>
+    <cd:variable name="NextJump" value="SaltoSuccessivo"/>
+    <cd:variable name="SwapViewer" value="ScambiaVisualizzatore"/>
+    <cd:variable name="ExitViewer" value="EsciVisualizzatore"/>
+    <cd:variable name="CloseDocument" value="ChiudiDocumento"/>
+    <cd:variable name="SaveDocument" value="SalvaDocumento"/>
+    <cd:variable name="SaveNamedDocument" value="SaveNamedDocument"/>
+    <cd:variable name="OpenNamedDocument" value="OpenNamedDocument"/>
+    <cd:variable name="ViewerHelp" value="AiutoVisualizzatore"/>
+    <cd:variable name="PrintDocument" value="StampaDocumento"/>
+    <cd:variable name="SearchDocument" value="CercaDocumento"/>
+    <cd:variable name="SearchAgain" value="CercaAncora"/>
+    <cd:variable name="Query" value="Richiesta"/>
+    <cd:variable name="QueryAgain" value="RinnovaRichiesta"/>
+    <cd:variable name="GotoPage" value="VaiAPagina"/>
+    <cd:variable name="StartMovie" value="IniziaFilm"/>
+    <cd:variable name="StopMovie" value="FermaFilm"/>
+    <cd:variable name="PauseMovie" value="PausaFilm"/>
+    <cd:variable name="ResumeMovie" value="RiprendiFilm"/>
+    <cd:variable name="StartSound" value="IniziaSuono"/>
+    <cd:variable name="StopSound" value="FermaSuono"/>
+    <cd:variable name="PauseSound" value="PausaSuono"/>
+    <cd:variable name="ResumeSound" value="RiprendiSuono"/>
+    <cd:variable name="StartRendering" value="StartRendering"/>
+    <cd:variable name="StopRendering" value="StopRendering"/>
+    <cd:variable name="PauseRendering" value="PauseRendering"/>
+    <cd:variable name="ResumeRendering" value="ResumeRendering"/>
+    <cd:variable name="SaveForm" value="SalvaForm"/>
+    <cd:variable name="LoadForm" value="CaricaForm"/>
+    <cd:variable name="ResetForm" value="ReimpostaForm"/>
+    <cd:variable name="SubmitForm" value="MandaForm"/>
+    <cd:variable name="HideField" value="NascondiCampo"/>
+    <cd:variable name="ShowField" value="MostraCampo"/>
+    <cd:variable name="FitWidth" value="FitWidth"/>
+    <cd:variable name="FitHeight" value="FitHeight"/>
+    <cd:variable name="HideLayer" value="HideLayer"/>
+    <cd:variable name="VideLayer" value="VideLayer"/>
+    <cd:variable name="ToggleLayer" value="ToggleLayer"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="New" value="Nuovo"/>
+    <cd:variable name="Balloon" value="Pallone"/>
+    <cd:variable name="Addition" value="Aggiunta"/>
+    <cd:variable name="Help" value="Aiuto"/>
+    <cd:variable name="Paragraph" value="Capoverso"/>
+    <cd:variable name="Key" value="Tasto"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="bet" value="bet"/>
+    <cd:constant name="dat" value="dat"/>
+    <cd:constant name="ken" value="ken"/>
+    <cd:constant name="ref" value="ref"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="formeel" value="formeel"/>
+    <cd:variable name="informeel" value="informeel"/>
+    <cd:variable name="rekening" value="rekening"/>
+    <cd:variable name="sticker" value="sticker"/>
+    <cd:variable name="sheet" value="sheet"/>
+    <cd:variable name="brief" value="brief"/>
+    <cd:variable name="ls" value="ls"/>
+  </cd:variables>
+
+  <cd:commands>
+    <cd:command name="language" value="lingua"/>
+    <cd:command name="mainlanguage" value="linguaprincipale"/>
+    <cd:command name="translate" value="traduci"/>
+    <cd:command name="installlanguage" value="installalingua"/>
+    <cd:command name="setuplanguage" value="impostalingua"/>
+    <cd:command name="showmakeup" value="mostramakeup"/>
+    <cd:command name="useencoding" value="usacodifica"/>
+    <cd:command name="usespecials" value="usaspecialita"/>
+    <cd:command name="defineoutput" value="definiscioutput"/>
+    <cd:command name="setupoutput" value="impostaoutput"/>
+    <cd:command name="defineaccent" value="definisciaccento"/>
+    <cd:command name="definecharacter" value="definiscicarattere"/>
+    <cd:command name="definecommand" value="definiscicomando"/>
+    <cd:command name="startcoding" value="iniziacodifica"/>
+    <cd:command name="stopcoding" value="terminacodifica"/>
+    <cd:command name="definebodyfontenvironment" value="definisciambientefontdeltesto"/>
+    <cd:command name="setupbodyfontenvironment" value="impostaambientefontdeltesto"/>
+    <cd:command name="definebodyfont" value="definiscifontdeltesto"/>
+    <cd:command name="definefont" value="definiscifont"/>
+    <cd:command name="definefontsynonym" value="definiscisinonimofont"/>
+    <cd:command name="definestyle" value="definiscistile"/>
+    <cd:command name="definefontstyle" value="definiscistilefont"/>
+    <cd:command name="setupstrut" value="impostastrut"/>
+    <cd:command name="setuptype" value="impostatype"/>
+    <cd:command name="type" value="type"/>
+    <cd:command name="typ" value="typ"/>
+    <cd:command name="arg" value="arg"/>
+    <cd:command name="tex" value="tex"/>
+    <cd:command name="definetyping" value="definiscityping"/>
+    <cd:command name="definetype" value="definiscitype"/>
+    <cd:command name="setuptyping" value="impostatyping"/>
+    <cd:command name="typefile" value="typefile"/>
+    <cd:command name="setupfootnotes" value="impostanotepdp"/>
+    <cd:command name="setupfootnotedefinition" value="impostadefinizionenotepdp"/>
+    <cd:command name="note" value="nota"/>
+    <cd:command name="footnote" value="notapdp"/>
+    <cd:command name="footnotetext" value="testonotapdp"/>
+    <cd:command name="startlocalfootnotes" value="inizianotepdplocali"/>
+    <cd:command name="stoplocalfootnotes" value="terminanotepdplocali"/>
+    <cd:command name="placelocalfootnotes" value="mettinotepdplocali"/>
+    <cd:command name="placefootnotes" value="mettinotepdp"/>
+    <cd:command name="currentdate" value="datadioggi"/>
+    <cd:command name="date" value="data"/>
+    <cd:command name="weekday" value="giornosettimana"/>
+    <cd:command name="WEEKDAY" value="GIORNOSETTIMANA"/>
+    <cd:command name="month" value="mese"/>
+    <cd:command name="MONTH" value="MESE"/>
+    <cd:command name="Numbers" value="Numeri"/>
+    <cd:command name="numbers" value="numeri"/>
+    <cd:command name="romannumerals" value="numeriromani"/>
+    <cd:command name="Romannumerals" value="Numeriromani"/>
+    <cd:command name="character" value="lettera"/>
+    <cd:command name="Character" value="Lettera"/>
+    <cd:command name="characters" value="lettere"/>
+    <cd:command name="Characters" value="Lettere"/>
+    <cd:command name="unknown" value="ignoto"/>
+    <cd:command name="definesymbol" value="definiscisimbolo"/>
+    <cd:command name="definefiguresymbol" value="definiscifigurasimbolo"/>
+    <cd:command name="symbol" value="simbolo"/>
+    <cd:command name="setupsymbolset" value="impostasetsimboli"/>
+    <cd:command name="showsymbolset" value="mostrasetsimboli"/>
+    <cd:command name="startsymbolset" value="iniziasetsimboli"/>
+    <cd:command name="usesymbols" value="usasimboli"/>
+    <cd:command name="defineconversion" value="definisciconversione"/>
+    <cd:command name="convertnumber" value="convertinumero"/>
+    <cd:command name="setupcapitals" value="impostamaiuscole"/>
+    <cd:command name="smallcapped" value="cap"/>
+    <cd:command name="notsmallcapped" value="nocap"/>
+    <cd:command name="CAPPED" value="CAP"/>
+    <cd:command name="SmallCapped" value="Cap"/>
+    <cd:command name="SmallCaps" value="Caps"/>
+    <cd:command name="WORD" value="PAROLA"/>
+    <cd:command name="WORDS" value="PAROLE"/>
+    <cd:command name="Word" value="Parola"/>
+    <cd:command name="Words" value="Parole"/>
+    <cd:command name="stretched" value="stirato"/>
+    <cd:command name="overstrike" value="sbarrato"/>
+    <cd:command name="overstrikes" value="sbarrati"/>
+    <cd:command name="overbar" value="sopralinea"/>
+    <cd:command name="overbars" value="sopralinee"/>
+    <cd:command name="underbar" value="sottolinea"/>
+    <cd:command name="underbars" value="sottolinee"/>
+    <cd:command name="setupunderbar" value="impostasottolinea"/>
+    <cd:command name="setupbodyfont" value="impostafontdeltesto"/>
+    <cd:command name="switchtobodyfont" value="cambiaafontdeltesto"/>
+    <cd:command name="showbodyfont" value="mostrafontdeltesto"/>
+    <cd:command name="showbodyfontenvironment" value="mostraambientefontdeltesto"/>
+    <cd:command name="headtext" value="testoinstestazioni"/>
+    <cd:command name="labeltext" value="testoetichetta"/>
+    <cd:command name="LABELTEXT" value="TESTOETICHETTA"/>
+    <cd:command name="setupheadtext" value="impostatestointestazioni"/>
+    <cd:command name="setuplabeltext" value="impostatestoetichette"/>
+    <cd:command name="marginrule" value="lineamargine"/>
+    <cd:command name="startmarginrule" value="inizialineamargine"/>
+    <cd:command name="stopmarginrule" value="terminalineamargine"/>
+    <cd:command name="setupmarginrules" value="impostalineemargine"/>
+    <cd:command name="blackrule" value="lineanera"/>
+    <cd:command name="blackrules" value="lineenere"/>
+    <cd:command name="setupblackrules" value="impostalineenere"/>
+    <cd:command name="setupscreens" value="impostaschermi"/>
+    <cd:command name="framed" value="incorniciato"/>
+    <cd:command name="inframed" value="circondato"/>
+    <cd:command name="mframed" value="maframed"/>
+    <cd:command name="inmframed" value="inmaframed"/>
+    <cd:command name="setupframed" value="impostaincorniciato"/>
+    <cd:command name="setuplinewidth" value="impostaampiezzariga"/>
+    <cd:command name="setupthinrules" value="impostalineesottili"/>
+    <cd:command name="thinrule" value="lineasottile"/>
+    <cd:command name="thinrules" value="lineesottili"/>
+    <cd:command name="hairline" value="capello"/>
+    <cd:command name="vl" value="vl"/>
+    <cd:command name="hl" value="hl"/>
+    <cd:command name="defineframed" value="definisciincorniciato"/>
+    <cd:command name="defineframedtext" value="definiscitestoincorniciato"/>
+    <cd:command name="setupframedtexts" value="impostatestiincorniciati"/>
+    <cd:command name="defineoverlay" value="definiscisovrapposizione"/>
+    <cd:command name="definelayer" value="definelayer"/>
+    <cd:command name="background" value="sfondo"/>
+    <cd:command name="startbackground" value="iniziasfondo"/>
+    <cd:command name="stopbackground" value="terminasfondo"/>
+    <cd:command name="setupbackground" value="impostasfondo"/>
+    <cd:command name="fillinrules" value="lineeriempimento"/>
+    <cd:command name="setupfillinrules" value="impostalineeriempimento"/>
+    <cd:command name="fillintext" value="testoriempimento"/>
+    <cd:command name="setupfillinlines" value="impostarigheriempimento"/>
+    <cd:command name="fillinline" value="rigariempimento"/>
+    <cd:command name="setuptextrules" value="impostalineetesto"/>
+    <cd:command name="textrule" value="lineatesto"/>
+    <cd:command name="starttextrule" value="inizialineatesto"/>
+    <cd:command name="stoptextrule" value="terminalineatesto"/>
+    <cd:command name="usemodule" value="usamodulo"/>
+    <cd:command name="usemodules" value="usamoduli"/>
+    <cd:command name="starttext" value="iniziatesto"/>
+    <cd:command name="stoptext" value="terminatesto"/>
+    <cd:command name="margintitle" value="titoloinmargine"/>
+    <cd:command name="marginword" value="parolainmargine"/>
+    <cd:command name="margintext" value="testoinmargine"/>
+    <cd:command name="inleft" value="insinistra"/>
+    <cd:command name="inmargin" value="inmargine"/>
+    <cd:command name="inothermargin" value="inaltromargine"/>
+    <cd:command name="inright" value="indestra"/>
+    <cd:command name="ininner" value="ininner"/>
+    <cd:command name="inouter" value="inouter"/>
+    <cd:command name="startmarginblock" value="iniziabloccomargine"/>
+    <cd:command name="stopmarginblock" value="terminabloccomargine"/>
+    <cd:command name="defineinmargin" value="defineinmargin"/>
+    <cd:command name="setupinmargin" value="impostainmargine"/>
+    <cd:command name="setupmarginblocks" value="impostablocchimargine"/>
+    <cd:command name="inleftedge" value="inlatosinistro"/>
+    <cd:command name="inleftmargin" value="inmarginesinistro"/>
+    <cd:command name="inrightmargin" value="inmarginedestro"/>
+    <cd:command name="inrightedge" value="inlatodestro"/>
+    <cd:command name="atleftmargin" value="atleftmargin"/>
+    <cd:command name="atrightmargin" value="atrightmargin"/>
+    <cd:command name="wordright" value="paroladestra"/>
+    <cd:command name="defineblank" value="definiscirigovuoto"/>
+    <cd:command name="blank" value="rigovuoto"/>
+    <cd:command name="setupblank" value="impostarigovuoto"/>
+    <cd:command name="correctwhitespace" value="correggispaziobianco"/>
+    <cd:command name="fixedspaces" value="spazifissi"/>
+    <cd:command name="fixedspace" value="spaziofisso"/>
+    <cd:command name="nospace" value="nientespazio"/>
+    <cd:command name="space" value="spazio"/>
+    <cd:command name="nowhitespace" value="nientespaziobianco"/>
+    <cd:command name="packed" value="impaccato"/>
+    <cd:command name="startpacked" value="iniziaimpaccato"/>
+    <cd:command name="stoppacked" value="terminaimpaccato"/>
+    <cd:command name="startunpacked" value="iniziaunpacked"/>
+    <cd:command name="stopunpacked" value="terminaunpacked"/>
+    <cd:command name="startlinecorrection" value="iniziacorrezioneriga"/>
+    <cd:command name="stoplinecorrection" value="terminacorrezioneriga"/>
+    <cd:command name="godown" value="vaigiu"/>
+    <cd:command name="whitespace" value="spaziobianco"/>
+    <cd:command name="noindenting" value="nienterientro"/>
+    <cd:command name="indenting" value="rientro"/>
+    <cd:command name="setupindenting" value="impostarientro"/>
+    <cd:command name="startalignment" value="iniziaallineamento"/>
+    <cd:command name="stopalignment" value="terminaallineamento"/>
+    <cd:command name="startlines" value="iniziarighe"/>
+    <cd:command name="stoplines" value="terminarighe"/>
+    <cd:command name="setupparagraphnumbering" value="impostanumerazionecapoversi"/>
+    <cd:command name="setuplinenumbering" value="impostanumerazionerighe"/>
+    <cd:command name="startlinenumbering" value="inizianumerazionerighe"/>
+    <cd:command name="stoplinenumbering" value="terminanumerazionerighe"/>
+    <cd:command name="startline" value="iniziariga"/>
+    <cd:command name="stopline" value="terminariga"/>
+    <cd:command name="someline" value="qualcheriga"/>
+    <cd:command name="inline" value="inriga"/>
+    <cd:command name="crlf" value="crlf"/>
+    <cd:command name="emptylines" value="emptylines"/>
+    <cd:command name="setuplines" value="impostarighe"/>
+    <cd:command name="startnarrower" value="iniziapiustretto"/>
+    <cd:command name="stopnarrower" value="terminapiustretto"/>
+    <cd:command name="setupnarrower" value="impostapiustretto"/>
+    <cd:command name="definetabulate" value="definiscitabulato"/>
+    <cd:command name="setuptabulate" value="impostatabulato"/>
+    <cd:command name="starttable" value="iniziatabella"/>
+    <cd:command name="stoptable" value="terminatabella"/>
+    <cd:command name="starttables" value="iniziatabelle"/>
+    <cd:command name="stoptables" value="terminatabelle"/>
+    <cd:command name="setuptables" value="impostatabelle"/>
+    <cd:command name="definetabletemplate" value="definiscimodellotabella"/>
+    <cd:command name="page" value="pagina"/>
+    <cd:command name="testcolumn" value="testcolumn"/>
+    <cd:command name="testpage" value="testpage"/>
+    <cd:command name="couplepage" value="accoppiapagina"/>
+    <cd:command name="pagetype" value="tipopagina"/>
+    <cd:command name="processpage" value="elaborapagina"/>
+    <cd:command name="couplepaper" value="accoppiacarta"/>
+    <cd:command name="selectpaper" value="selezionacarta"/>
+    <cd:command name="screen" value="schermo"/>
+    <cd:command name="definesection" value="definiscisezione"/>
+    <cd:command name="definesectionblock" value="definiscibloccosezione"/>
+    <cd:command name="setupsectionblock" value="impostabloccosezione"/>
+    <cd:command name="setupsection" value="impostasezione"/>
+    <cd:command name="notopandbottomlines" value="nientelineecimafondo"/>
+    <cd:command name="noheaderandfooterlines" value="nientelineintestazionepdp"/>
+    <cd:command name="setuptop" value="impostacima"/>
+    <cd:command name="setuptoptexts" value="impostatesticima"/>
+    <cd:command name="setupheader" value="impostainstestazione"/>
+    <cd:command name="setupheadertexts" value="impostatestiintestazioni"/>
+    <cd:command name="setuppagenumbering" value="impostanumerazionepagina"/>
+    <cd:command name="getnumber" value="getnumber"/>
+    <cd:command name="incrementnumber" value="incrementanumero"/>
+    <cd:command name="decrementnumber" value="decrementnumber"/>
+    <cd:command name="resetnumber" value="resetnumber"/>
+    <cd:command name="setnumber" value="setnumber"/>
+    <cd:command name="setupnumber" value="impostanumerazione"/>
+    <cd:command name="setupbottom" value="impostafondo"/>
+    <cd:command name="setupbottomtexts" value="impostatestifondo"/>
+    <cd:command name="setupfooter" value="impostapdp"/>
+    <cd:command name="setupfootertexts" value="impostatestipdp"/>
+    <cd:command name="setuppagenumber" value="impostanumeropagina"/>
+    <cd:command name="setupsubpagenumber" value="impostanumerosottopagina"/>
+    <cd:command name="subpagenumber" value="subpagenumber"/>
+    <cd:command name="setuptext" value="impostatesto"/>
+    <cd:command name="setuptexttexts" value="impostatestotesti"/>
+    <cd:command name="definetext" value="definiscitesto"/>
+    <cd:command name="pagenumber" value="numeropagina"/>
+    <cd:command name="completepagenumber" value="numeropaginacompleto"/>
+    <cd:command name="placepagenumber" value="mettinumeropagina"/>
+    <cd:command name="items" value="elementi"/>
+    <cd:command name="setupitems" value="impostaelementi"/>
+    <cd:command name="leftaligned" value="allineasinistra"/>
+    <cd:command name="midaligned" value="allineacentro"/>
+    <cd:command name="rightaligned" value="allineadestra"/>
+    <cd:command name="startcolumns" value="iniziacolonne"/>
+    <cd:command name="stopcolumns" value="terminacolonne"/>
+    <cd:command name="setupcolumns" value="impostacolonne"/>
+    <cd:command name="column" value="colonna"/>
+    <cd:command name="head" value="testa"/>
+    <cd:command name="but" value="fondo"/>
+    <cd:command name="item" value="elemento"/>
+    <cd:command name="nop" value="nop"/>
+    <cd:command name="mar" value="mar"/>
+    <cd:command name="sym" value="sim"/>
+    <cd:command name="its" value="el"/>
+    <cd:command name="ran" value="ran"/>
+    <cd:command name="headsym" value="headsym"/>
+    <cd:command name="defineitemgroup" value="defineitemgroup"/>
+    <cd:command name="setupitemgroup" value="setupitemgroup"/>
+    <cd:command name="setupitemgroups" value="setupitemgroups"/>
+    <cd:command name="definehead" value="definiscitesta"/>
+    <cd:command name="setuphead" value="impostatesta"/>
+    <cd:command name="setupheads" value="impostateste"/>
+    <cd:command name="setupheadnumber" value="impostanumerotesta"/>
+    <cd:command name="headnumber" value="numerotesta"/>
+    <cd:command name="currentheadnumber" value="numerotestacorrente"/>
+    <cd:command name="determineheadnumber" value="determinanumerotesta"/>
+    <cd:command name="resetmarking" value="reimpostamarcatura"/>
+    <cd:command name="setupmarking" value="impostamarcatura"/>
+    <cd:command name="definemarking" value="definiscimarcatura"/>
+    <cd:command name="nomarking" value="nientemarcatura"/>
+    <cd:command name="marking" value="marcatura"/>
+    <cd:command name="decouplemarking" value="separamarcatura"/>
+    <cd:command name="couplemarking" value="accoppiamarcatura"/>
+    <cd:command name="getmarking" value="prendimarcatura"/>
+    <cd:command name="definelayout" value="definiscilayout"/>
+    <cd:command name="setuplayout" value="impostalayout"/>
+    <cd:command name="adaptlayout" value="adattalayout"/>
+    <cd:command name="placeongrid" value="mettiingriglia"/>
+    <cd:command name="moveongrid" value="spostaagriglia"/>
+    <cd:command name="showsetups" value="mostraimpostazioni"/>
+    <cd:command name="showframe" value="mostracornice"/>
+    <cd:command name="showgrid" value="mostragriglia"/>
+    <cd:command name="showlayout" value="mostralyout"/>
+    <cd:command name="showprint" value="mostrastampa"/>
+    <cd:command name="showstruts" value="mostrastruts"/>
+    <cd:command name="definepapersize" value="definiscidimensionicarta"/>
+    <cd:command name="setuppapersize" value="impostadimensionicarta"/>
+    <cd:command name="setuppaper" value="setuppaper"/>
+    <cd:command name="setuparranging" value="impostaparranging"/>
+    <cd:command name="version" value="versione"/>
+    <cd:command name="setupbackgrounds" value="impostasfondi"/>
+    <cd:command name="setupalign" value="impostaallineamento"/>
+    <cd:command name="setupwhitespace" value="impostaspaziobianco"/>
+    <cd:command name="setupinteraction" value="impostainterazione"/>
+    <cd:command name="setupinteractionmenu" value="impostamenuinterazione"/>
+    <cd:command name="defineinteractionmenu" value="definiscimenuinterazione"/>
+    <cd:command name="disableinteractionmenu" value="disabilitamenuinterazione"/>
+    <cd:command name="interactionmenu" value="menuinterattivo"/>
+    <cd:command name="interactionbuttons" value="pulsantinterazione"/>
+    <cd:command name="interactionbar" value="barrainterazione"/>
+    <cd:command name="setupinteractionbar" value="impostabarrainterazione"/>
+    <cd:command name="setupinteractionscreen" value="impostaschermointerazione"/>
+    <cd:command name="placebookmarks" value="mettisegnalibro"/>
+    <cd:command name="bookmark" value="segnalibro"/>
+    <cd:command name="definelogo" value="definiscilogo"/>
+    <cd:command name="placelogos" value="mettiloghi"/>
+    <cd:command name="definecolor" value="definiscicolore"/>
+    <cd:command name="definecolorgroup" value="definiscigruppocolori"/>
+    <cd:command name="definepalet" value="definiscitavolozza"/>
+    <cd:command name="graycolor" value="coloregrigio"/>
+    <cd:command name="color" value="colore"/>
+    <cd:command name="startcolor" value="iniziacolore"/>
+    <cd:command name="stopcolor" value="terminacolore"/>
+    <cd:command name="setupcolors" value="impostacolori"/>
+    <cd:command name="setupcolor" value="impostacolore"/>
+    <cd:command name="setuppalet" value="impostatavolozza"/>
+    <cd:command name="showcolor" value="mostracolore"/>
+    <cd:command name="showcolorgroup" value="mostragruppocolori"/>
+    <cd:command name="showpalet" value="mostratavolozza"/>
+    <cd:command name="comparecolorgroup" value="confrontagruppocolori"/>
+    <cd:command name="comparepalet" value="confrontatavolozza"/>
+    <cd:command name="colorvalue" value="valorecolore"/>
+    <cd:command name="greyvalue" value="valoregrigio"/>
+    <cd:command name="startraster" value="iniziaraster"/>
+    <cd:command name="stopraster" value="terminaraster"/>
+    <cd:command name="defineblock" value="definisciblocco"/>
+    <cd:command name="setupblock" value="impostablocco"/>
+    <cd:command name="useblocks" value="usablocco"/>
+    <cd:command name="processblocks" value="elaborablocchi"/>
+    <cd:command name="keepblocks" value="tieniblocchi"/>
+    <cd:command name="selectblocks" value="selezionablocchi"/>
+    <cd:command name="hideblocks" value="nascondiblocchi"/>
+    <cd:command name="bypassblocks" value="saltablocchi"/>
+    <cd:command name="forceblocks" value="forzablocchi"/>
+    <cd:command name="nomoreblocks" value="bastablocchi"/>
+    <cd:command name="definelist" value="definiscielenco"/>
+    <cd:command name="definecombinedlist" value="definiscielencocombinato"/>
+    <cd:command name="listsymbol" value="listsymbol"/>
+    <cd:command name="placelist" value="mettielenco"/>
+    <cd:command name="plaatsruwelijst" value="placerawlist"/>
+    <cd:command name="placecombinedlist" value="mettielencocombinato"/>
+    <cd:command name="writetolist" value="scriviinelenco"/>
+    <cd:command name="writebetweenlist" value="scrividentroelenco"/>
+    <cd:command name="immediatetolist" value="immediatetolist"/>
+    <cd:command name="immediatebetweenlist" value="immediatebetweenlist"/>
+    <cd:command name="setuplist" value="impostaelenco"/>
+    <cd:command name="setupcombinedlist" value="impostaelencocombinato"/>
+    <cd:command name="determinelistcharacteristics" value="determinacarattersticheelenco"/>
+    <cd:command name="listlength" value="lunghezzaelenco"/>
+    <cd:command name="listwidth" value="ampiezzaelenco"/>
+    <cd:command name="listheight" value="altezzaelenco"/>
+    <cd:command name="nolist" value="nienteelenco"/>
+    <cd:command name="definereferencelist" value="definiscilistariferimenti"/>
+    <cd:command name="placereferencelist" value="mettilistariferimenti"/>
+    <cd:command name="writetoreferencelist" value="scriviinlistariferimenti"/>
+    <cd:command name="setupreferencelist" value="impostalistariferimenti"/>
+    <cd:command name="definefloat" value="definiscioggettomobile"/>
+    <cd:command name="setupfloat" value="impostaoggettomobile"/>
+    <cd:command name="setupfloats" value="impostaoggettimobili"/>
+    <cd:command name="splitfloat" value="spezzaoggettomobile"/>
+    <cd:command name="setupfloatsplitting" value="impostaspezzamentooggettomobile"/>
+    <cd:command name="placefloat" value="placefloat"/>
+    <cd:command name="movesidefloat" value="movesidefloat"/>
+    <cd:command name="defineplacement" value="defineplacement"/>
+    <cd:command name="setupplacement" value="setupplacement"/>
+    <cd:command name="definecombination" value="definecombination"/>
+    <cd:command name="startcombination" value="iniziacombinazione"/>
+    <cd:command name="stopcombination" value="terminacombinazione"/>
+    <cd:command name="placesidebyside" value="mettifiancoafianco"/>
+    <cd:command name="placeontopofeachother" value="mettiunosullaltro"/>
+    <cd:command name="setupcaption" value="impostacaption"/>
+    <cd:command name="setupcaptions" value="impostacaptions"/>
+    <cd:command name="setupcombinations" value="impostacombinazioni"/>
+    <cd:command name="startoverlay" value="iniziasovrapposizione"/>
+    <cd:command name="stopoverlay" value="terminasovrapposizione"/>
+    <cd:command name="defineregister" value="definisciregistro"/>
+    <cd:command name="coupleregister" value="accoppiaregistro"/>
+    <cd:command name="setupregister" value="impostaregistro"/>
+    <cd:command name="writetoregister" value="scriviinregistro"/>
+    <cd:command name="completeregister" value="completeregister"/>
+    <cd:command name="placeregister" value="mettiregistro"/>
+    <cd:command name="determineregistercharacteristics" value="determinacaratteristicheregistro"/>
+    <cd:command name="definesorting" value="definisciordinamento"/>
+    <cd:command name="definesynonyms" value="definiscisinonimi"/>
+    <cd:command name="setupsorting" value="impostaordinamento"/>
+    <cd:command name="setupsynonyms" value="impostasinonimi"/>
+    <cd:command name="startsynchronization" value="iniziasincronizzazione"/>
+    <cd:command name="stopsynchronization" value="terminasincronizzazione"/>
+    <cd:command name="setupsynchronizationbar" value="impostabarrasincronizzazione"/>
+    <cd:command name="setupsynchronization" value="impostasincronizzazione"/>
+    <cd:command name="synchronizationbar" value="barrasincronizzazione"/>
+    <cd:command name="synchronize" value="sincronizza"/>
+    <cd:command name="useexternaldocument" value="usadocumentoesterno"/>
+    <cd:command name="useURL" value="usaURL"/>
+    <cd:command name="useurl" value="usaurl"/>
+    <cd:command name="setupurl" value="impostaurl"/>
+    <cd:command name="coupledocument" value="accoppiadocumento"/>
+    <cd:command name="setupprograms" value="impostaprogrammi"/>
+    <cd:command name="defineprogram" value="definisciprogramma"/>
+    <cd:command name="program" value="programma"/>
+    <cd:command name="setuppagetransitions" value="impostatransizionepagina"/>
+    <cd:command name="defineprofile" value="definisciprofilo"/>
+    <cd:command name="defineversion" value="definisciversion"/>
+    <cd:command name="markversion" value="marcaversione"/>
+    <cd:command name="selectversion" value="selezionaversione"/>
+    <cd:command name="startprofile" value="iniziaprofilo"/>
+    <cd:command name="startversion" value="iniziaversione"/>
+    <cd:command name="setupprofiles" value="impostaprofili"/>
+    <cd:command name="setupversions" value="impostaversioni"/>
+    <cd:command name="stopprofile" value="terminaprofili"/>
+    <cd:command name="stopversion" value="terminaversioni"/>
+    <cd:command name="followprofile" value="seguiprofilo"/>
+    <cd:command name="followprofileversion" value="seguiversioneprofilo"/>
+    <cd:command name="followversion" value="seguiversione"/>
+    <cd:command name="definedescription" value="definiscidescrizione"/>
+    <cd:command name="definelabel" value="definiscietichetta"/>
+    <cd:command name="defineenumeration" value="definiscienumerazione"/>
+    <cd:command name="defineindenting" value="definiscirientro"/>
+    <cd:command name="setupdescriptions" value="impostadescrizioni"/>
+    <cd:command name="setupenumerations" value="impostaenumerazioni"/>
+    <cd:command name="setupindentations" value="impostarientri"/>
+    <cd:command name="setuptab" value="impostatab"/>
+    <cd:command name="tab" value="tab"/>
+    <cd:command name="setupexternalfigures" value="impostafigureesterne"/>
+    <cd:command name="showexternalfigures" value="mostrafiguresterne"/>
+    <cd:command name="externalfigure" value="figuraesterna"/>
+    <cd:command name="useexternalfigure" value="usafiguraesterna"/>
+    <cd:command name="startfigure" value="iniziafigura"/>
+    <cd:command name="referring" value="referring"/>
+    <cd:command name="remark" value="commento"/>
+    <cd:command name="colorbar" value="barracolori"/>
+    <cd:command name="grid" value="griglia"/>
+    <cd:command name="button" value="pulsante"/>
+    <cd:command name="menubutton" value="pulsantemenu"/>
+    <cd:command name="setupbuttons" value="impostapulsanti"/>
+    <cd:command name="usereferences" value="usariferimenti"/>
+    <cd:command name="reflijst" value="listarif"/>
+    <cd:command name="stelreferentielijstin" value="impostalistariferimenti"/>
+    <cd:command name="setupreferencing" value="impostariferimento"/>
+    <cd:command name="textreference" value="riferimentotesto"/>
+    <cd:command name="pagereference" value="riferimentopagina"/>
+    <cd:command name="reference" value="riferimento"/>
+    <cd:command name="definereference" value="definisciriferimento"/>
+    <cd:command name="definereferenceformat" value="definisciformatoriferimento"/>
+    <cd:command name="useJSscripts" value="usaJSscripts"/>
+    <cd:command name="from" value="da"/>
+    <cd:command name="in" value="in"/>
+    <cd:command name="at" value="al"/>
+    <cd:command name="about" value="intorno"/>
+    <cd:command name="goto" value="vaia"/>
+    <cd:command name="atpage" value="apagina"/>
+    <cd:command name="somewhere" value="daqualcheparte"/>
+    <cd:command name="navigating" value="navigating"/>
+    <cd:command name="ref" value="rif"/>
+    <cd:command name="gotobox" value="vaiabox"/>
+    <cd:command name="gotopage" value="vaiapagina"/>
+    <cd:command name="placeformula" value="mettiformula"/>
+    <cd:command name="placesubformula" value="mettisottoformula"/>
+    <cd:command name="moveformula" value="spostaformula"/>
+    <cd:command name="setupformulas" value="impostaformule"/>
+    <cd:command name="formulanumber" value="numeroformula"/>
+    <cd:command name="subformulanumber" value="numerosottoformula"/>
+    <cd:command name="leg" value="leg"/>
+    <cd:command name="fact" value="fatto"/>
+    <cd:command name="mathematics" value="matematica"/>
+    <cd:command name="dimension" value="dimensione"/>
+    <cd:command name="nodimension" value="nientedimensioni"/>
+    <cd:command name="startenvironment" value="iniziaambiente"/>
+    <cd:command name="stopenvironment" value="terminaambiente"/>
+    <cd:command name="startcomponent" value="iniziacomponente"/>
+    <cd:command name="stopcomponent" value="terminacomponente"/>
+    <cd:command name="startproduct" value="iniziaprodotto"/>
+    <cd:command name="stopproduct" value="terminaprodotto"/>
+    <cd:command name="startproject" value="iniziaprogetto"/>
+    <cd:command name="stopproject" value="terminaprogetto"/>
+    <cd:command name="setups" value="impostazioni"/>
+    <cd:command name="project" value="progetto"/>
+    <cd:command name="component" value="componenet"/>
+    <cd:command name="produxt" value="prodotto"/>
+    <cd:command name="environment" value="ambiente"/>
+    <cd:command name="nomorefiles" value="bastafile"/>
+    <cd:command name="getbuffer" value="prendibuffer"/>
+    <cd:command name="setupbuffer" value="impostabuffer"/>
+    <cd:command name="typebuffer" value="typebuffer"/>
+    <cd:command name="definebuffer" value="definiscibuffer"/>
+    <cd:command name="unitmeaning" value="nomeunita"/>
+    <cd:command name="infull" value="perlungo"/>
+    <cd:command name="quotation" value="citazione"/>
+    <cd:command name="quote" value="menzione"/>
+    <cd:command name="startquotation" value="iniziacitazione"/>
+    <cd:command name="stopquotation" value="terminacitazione"/>
+    <cd:command name="setupquote" value="impostamenzione"/>
+    <cd:command name="define" value="definisci"/>
+    <cd:command name="redo" value="rifai"/>
+    <cd:command name="usecommands" value="usacomandi"/>
+    <cd:command name="definestartstop" value="definisciiniziatermina"/>
+    <cd:command name="setupstartstop" value="impostainiziatermina"/>
+    <cd:command name="startlocal" value="inizialocale"/>
+    <cd:command name="stoplocal" value="terminalocale"/>
+    <cd:command name="startglobal" value="iniziaglobale"/>
+    <cd:command name="stopglobal" value="terminaglobale"/>
+    <cd:command name="macroname" value="nome"/>
+    <cd:command name="definemakeup" value="definiscimakeup"/>
+    <cd:command name="setupmakeup" value="impostamakeup"/>
+    <cd:command name="startmakeup" value="iniziamakeup"/>
+    <cd:command name="stopmakeup" value="terminamakeup"/>
+    <cd:command name="useexternalsoundtrack" value="usacolonnasonoraesterna"/>
+    <cd:command name="useexternalfile" value="usafileesterno"/>
+    <cd:command name="useexternalfiles" value="usafileesterni"/>
+    <cd:command name="referral" value="referral"/>
+    <cd:command name="referraldate" value="datareferral"/>
+    <cd:command name="high" value="ap"/>
+    <cd:command name="lohi" value="pedap"/>
+    <cd:command name="low" value="ped"/>
+    <cd:command name="fraction" value="frazione"/>
+    <cd:command name="chem" value="chim"/>
+    <cd:command name="startopposite" value="iniziaopposto"/>
+    <cd:command name="stopopposite" value="terminaopposto"/>
+    <cd:command name="setupoppositeplacing" value="impostaposizionamentoopposti"/>
+    <cd:command name="startpositioning" value="iniziaposizionamento"/>
+    <cd:command name="stoppositioning" value="terminaposizionamento"/>
+    <cd:command name="position" value="posizione"/>
+    <cd:command name="setuppositioning" value="impostaposizionamento"/>
+    <cd:command name="rotate" value="ruota"/>
+    <cd:command name="setuprotate" value="impostarotazione"/>
+    <cd:command name="mirror" value="riflessione"/>
+    <cd:command name="scale" value="scala"/>
+    <cd:command name="setupnumbering" value="impostanumerazione"/>
+    <cd:command name="reset" value="reimposta"/>
+    <cd:command name="setuppublications" value="impostapubblicazioni"/>
+    <cd:command name="publication" value="pubblicazione"/>
+    <cd:command name="definehbox" value="definiscihbox"/>
+    <cd:command name="adding" value="adding"/>
+    <cd:command name="periods" value="punti"/>
+    <cd:command name="setuphyphenmark" value="impostasegnosillabazione"/>
+    <cd:command name="setupinterlinespace" value="impostainterlinea"/>
+    <cd:command name="setupspacing" value="impostaspaziatura"/>
+    <cd:command name="setuptolerance" value="impostatolleranza"/>
+    <cd:command name="setupsystem" value="impostasistema"/>
+    <cd:command name="usepath" value="usacartella"/>
+    <cd:command name="defineparagraphs" value="definiscicapoversi"/>
+    <cd:command name="setupparagraphs" value="impostacapoversi"/>
+    <cd:command name="donttest" value="notest"/>
+    <cd:command name="setupcomment" value="impostacommento"/>
+    <cd:command name="comment" value="commento"/>
+    <cd:command name="definefield" value="definiscicampo"/>
+    <cd:command name="definemainfield" value="definiscicampoprincipale"/>
+    <cd:command name="definesubfield" value="definiscisottocampo"/>
+    <cd:command name="clonefield" value="clonacampo"/>
+    <cd:command name="copyfield" value="copiacampo"/>
+    <cd:command name="setupfield" value="impostacampo"/>
+    <cd:command name="setupfields" value="impostacampi"/>
+    <cd:command name="field" value="campi"/>
+    <cd:command name="fitfield" value="adattacampo"/>
+    <cd:command name="logfields" value="logcampi"/>
+    <cd:command name="showfields" value="mostracampi"/>
+    <cd:command name="tooltip" value="tooltip"/>
+    <cd:command name="fillinfield" value="camporiempimento"/>
+    <cd:command name="definefieldstack" value="definiscistackcampi"/>
+    <cd:command name="fieldstack" value="stackcampi"/>
+    <cd:command name="setupforms" value="impostaforms"/>
+    <cd:command name="setupclipping" value="impostaclippling"/>
+    <cd:command name="clip" value="clip"/>
+    <cd:command name="placelegend" value="mettilegenda"/>
+    <cd:command name="setuplegend" value="impostalegenda"/>
+    <cd:command name="setuppagecomment" value="impostacommentopagina"/>
+    <cd:command name="setupstrut" value="impostastrut"/>
+    <cd:command name="definerule" value="definiscilinea"/>
+    <cd:command name="placerule" value="mettilinea"/>
+    <cd:command name="setuprule" value="impostalinea"/>
+    <cd:command name="definetextvariable" value="definiscivariabiletesto"/>
+    <cd:command name="setuptextvariable" value="impostavariabiletesto"/>
+    <cd:command name="settextvariable" value="setvariabiletesto"/>
+    <cd:command name="placetextvariable" value="mettivariabiletesto"/>
+    <cd:command name="textvariable" value="variabiletesto"/>
+    <cd:command name="definetextposition" value="definisciposizionetesto"/>
+    <cd:command name="setuptextposition" value="impostaposizionetesto"/>
+    <cd:command name="positiontext" value="posizionatesto"/>
+    <cd:command name="definerawfont" value="definiscifontgrezzo"/>
+    <cd:command name="switchtorawfont" value="passaafontgrezzo"/>
+    <cd:command name="placeheadtext" value="posizionatestotesta"/>
+    <cd:command name="placeheadnumber" value="posizionanumerotesta"/>
+    <cd:command name="definepagebreak" value="definepagebreak"/>
+    <cd:command name="definecolumnbreak" value="definecolumnbreak"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="setupitemgroups" value="impostaelencazioni"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="topheight" value="altezzacima"/>
+    <cd:command name="topdistance" value="distanzacima"/>
+    <cd:command name="headerheight" value="altezzaintestazione"/>
+    <cd:command name="headerdistance" value="distanzaintestazione"/>
+    <cd:command name="textheight" value="altezzatesto"/>
+    <cd:command name="footerdistance" value="distanzapdp"/>
+    <cd:command name="footerheight" value="altezzapdp"/>
+    <cd:command name="bottomdistance" value="distanzafondo"/>
+    <cd:command name="bottomheight" value="altezzafondo"/>
+    <cd:command name="marginwidth" value="ampiezzamargine"/>
+    <cd:command name="leftmarginwidth" value="ampiezzamarginesinistro"/>
+    <cd:command name="rightmarginwidth" value="ampiezzamarginedestro"/>
+    <cd:command name="margindistance" value="distanzamargine"/>
+    <cd:command name="leftmargindistance" value="distanzamarginesinistro"/>
+    <cd:command name="rightmargindistance" value="distanzamarginedestro"/>
+    <cd:command name="edgewidth" value="ampiezzabordo"/>
+    <cd:command name="leftedgewidth" value="ampiezzabordosinistro"/>
+    <cd:command name="rightedgewidth" value="ampiezzabordodestro"/>
+    <cd:command name="edgedistance" value="distanzabordo"/>
+    <cd:command name="leftedgedistance" value="distanzabordosinistro"/>
+    <cd:command name="rightedgedistance" value="distanzabordodestro"/>
+    <cd:command name="innermarginwidth" value="innermarginwidth"/>
+    <cd:command name="outermarginwidth" value="outermarginwidth"/>
+    <cd:command name="innermargindistance" value="innermargindistance"/>
+    <cd:command name="outermargindistance" value="outermargindistance"/>
+    <cd:command name="inneredgewidth" value="inneredgewidth"/>
+    <cd:command name="outeredgewidth" value="outeredgewidth"/>
+    <cd:command name="inneredgedistance" value="inneredgedistance"/>
+    <cd:command name="outeredgedistance" value="outeredgedistance"/>
+    <cd:command name="textwidth" value="ampiezzatesto"/>
+    <cd:command name="makeupwidth" value="ampiezzamakeup"/>
+    <cd:command name="makeupheight" value="altezzamakeup"/>
+    <cd:command name="topspace" value="spaziocima"/>
+    <cd:command name="bottomspace" value="spaziofondo"/>
+    <cd:command name="backspace" value="spaziodietro"/>
+    <cd:command name="cutspace" value="cutspace"/>
+    <cd:command name="paperwidth" value="ampiezzacarta"/>
+    <cd:command name="paperheight" value="altezzacarta"/>
+    <cd:command name="printpaperwidth" value="ampiezzacartastampa"/>
+    <cd:command name="printpaperheight" value="altezzacartastampa"/>
+    <cd:command name="pageoffset" value="pageoffset"/>
+    <cd:command name="pagedepth" value="pagedepth"/>
+    <cd:command name="headlevel" value="livellotesta"/>
+    <cd:command name="linewidth" value="spessoreriga"/>
+    <cd:command name="totalnumberofpages" value="numerototaledipagine"/>
+    <cd:command name="numberofsubpages" value="numberofsubpages"/>
+    <cd:command name="useXMLfilter" value="useXMLfilter"/>
+    <cd:command name="definecolumnset" value="definiscigruppocolonne"/>
+    <cd:command name="setupcolumnset" value="impostagruppocolonne"/>
+    <cd:command name="startcolumnset" value="iniziagruppocolonne"/>
+    <cd:command name="stopcolumnset" value="terminagruppocolonne"/>
+    <cd:command name="setupcolumnsetlines" value="setupcolumnsetlines"/>
+    <cd:command name="setupcolumnsetstart" value="setupcolumnsetstart"/>
+    <cd:command name="startcolumnmakeup" value="startcolumnmakeup"/>
+    <cd:command name="stopcolumnmakeup" value="stopcolumnmakeup"/>
+    <cd:command name="usetypescript" value="usetypescript"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="startdocument" value="iniziadocumento"/>
+    <cd:command name="stopdocument" value="terminadocumento"/>
+    <cd:command name="startoverzicht" value="iniziaoverview"/>
+    <cd:command name="stopoverzicht" value="terminaoverview"/>
+    <cd:command name="label" value="etichetta"/>
+    <cd:command name="labels" value="etichette"/>
+    <cd:command name="domicile" value="domicilio"/>
+  </cd:commands>
+
+</cd:interface>
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
new file mode 100644
index 000000000..a7ffdf695
--- /dev/null
+++ b/tex/context/interface/keys-nl.xml
@@ -0,0 +1,1576 @@
+<?xml version="1.0"?>
+
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2004.11.16">
+
+  <cd:variables>
+    <cd:variable name="one" value="een"/>
+    <cd:variable name="two" value="twee"/>
+    <cd:variable name="three" value="drie"/>
+    <cd:variable name="four" value="vier"/>
+    <cd:variable name="five" value="vijf"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="sunday" value="zondag"/>
+    <cd:variable name="monday" value="maandag"/>
+    <cd:variable name="tuesday" value="dinsdag"/>
+    <cd:variable name="wednesday" value="woensdag"/>
+    <cd:variable name="thursday" value="donderdag"/>
+    <cd:variable name="friday" value="vrijdag"/>
+    <cd:variable name="saturday" value="zaterdag"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="january" value="januari"/>
+    <cd:variable name="february" value="februari"/>
+    <cd:variable name="march" value="maart"/>
+    <cd:variable name="april" value="april"/>
+    <cd:variable name="may" value="mei"/>
+    <cd:variable name="june" value="juni"/>
+    <cd:variable name="july" value="juli"/>
+    <cd:variable name="august" value="augustus"/>
+    <cd:variable name="september" value="september"/>
+    <cd:variable name="october" value="oktober"/>
+    <cd:variable name="november" value="november"/>
+    <cd:variable name="december" value="december"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="atpage" value="oppagina"/>
+    <cd:variable name="hencefore" value="hierboven"/>
+    <cd:variable name="hereafter" value="hieronder"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="sectionlevel" value="sectie"/>
+    <cd:variable name="part" value="deel"/>
+    <cd:variable name="chapter" value="hoofdstuk"/>
+    <cd:variable name="subject" value="onderwerp"/>
+    <cd:variable name="section" value="paragraaf"/>
+    <cd:variable name="title" value="titel"/>
+    <cd:variable name="margintitle" value="margetitel"/>
+    <cd:variable name="content" value="inhoud"/>
+    <cd:variable name="contents" value="inhouden"/>
+    <cd:variable name="appendix" value="bijlage"/>
+    <cd:variable name="appendices" value="bijlagen"/>
+    <cd:variable name="bodypart" value="hoofdtekst"/>
+    <cd:variable name="bodymatter" value="hoofdteksten"/>
+    <cd:variable name="frontpart" value="inleiding"/>
+    <cd:variable name="frontmatter" value="inleidingen"/>
+    <cd:variable name="backpart" value="uitleiding"/>
+    <cd:variable name="backmatter" value="uitleidingen"/>
+    <cd:variable name="footnote" value="voetnoot"/>
+    <cd:variable name="system" value="systeem"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="subsection" value="subparagraaf"/>
+    <cd:variable name="subsubsection" value="subsubparagraaf"/>
+    <cd:variable name="subsubsubsection" value="subsubsubparagraaf"/>
+    <cd:variable name="subsubsubsubsection" value="subsubsubsubparagraaf"/>
+    <cd:variable name="subsubsubsubsubsection" value="subsubsubsubsubparagraaf"/>
+    <cd:variable name="subsubject" value="subonderwerp"/>
+    <cd:variable name="subsubsubject" value="subsubonderwerp"/>
+    <cd:variable name="subsubsubsubject" value="subsubsubonderwerp"/>
+    <cd:variable name="subsubsubsubsubject" value="subsubsubsubonderwerp"/>
+    <cd:variable name="subsubsubsubsubsubject" value="subsubsubsubsubonderwerp"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="flushleft" value="lijnlinks"/>
+    <cd:variable name="flushright" value="lijnrechts"/>
+    <cd:variable name="center" value="centreer"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="typing" value="typen"/>
+    <cd:variable name="file" value="file"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="formula" value="formule"/>
+    <cd:variable name="formulae" value="formules"/>
+    <cd:variable name="figure" value="figuur"/>
+    <cd:variable name="figures" value="figuren"/>
+    <cd:variable name="table" value="tabel"/>
+    <cd:variable name="tables" value="tabellen"/>
+    <cd:variable name="graphic" value="grafiek"/>
+    <cd:variable name="graphics" value="grafieken"/>
+    <cd:variable name="intermezzo" value="intermezzo"/>
+    <cd:variable name="intermezzi" value="intermezzos"/>
+    <cd:variable name="index" value="index"/>
+    <cd:variable name="indices" value="indices"/>
+    <cd:variable name="abbreviation" value="afkorting"/>
+    <cd:variable name="abbreviations" value="afkortingen"/>
+    <cd:variable name="logo" value="logo"/>
+    <cd:variable name="logos" value="logos"/>
+    <cd:variable name="unit" value="eenheid"/>
+    <cd:variable name="units" value="eenheden"/>
+    <cd:variable name="line" value="regel"/>
+    <cd:variable name="lines" value="regels"/>
+    <cd:variable name="framedtext" value="kadertekst"/>
+    <cd:variable name="quotation" value="citaat"/>
+    <cd:variable name="quote" value="citeer"/>
+    <cd:variable name="speech" value="spraak"/>
+    <cd:variable name="itemize" value="opsomming"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="leftquotation" value="linkercitaat"/>
+    <cd:constant name="rightquotation" value="rechtercitaat"/>
+    <cd:constant name="leftquote" value="linkerciteer"/>
+    <cd:constant name="rightquote" value="rechterciteer"/>
+    <cd:constant name="midsentence" value="middenzin"/>
+    <cd:constant name="leftsentence" value="linkerzin"/>
+    <cd:constant name="rightsentence" value="rechterzin"/>
+    <cd:constant name="leftsubsentence" value="linkersubzin"/>
+    <cd:constant name="rightsubsentence" value="rechtersubzin"/>
+    <cd:constant name="leftspeech" value="linkeruitspraak"/>
+    <cd:constant name="middlespeech" value="middenuitspraak"/>
+    <cd:constant name="rightspeech" value="rechteruitspraak"/>
+    <cd:constant name="limittext" value="limiettekst"/>
+    <cd:constant name="date" value="datum"/>
+    <cd:constant name="spacebefore" value="voorwit"/>
+    <cd:constant name="spaceinbetween" value="tussenwit"/>
+    <cd:constant name="spaceafter" value="nawit"/>
+    <cd:constant name="sidespacebefore" value="zijvoorwit"/>
+    <cd:constant name="sidespaceafter" value="zijnawit"/>
+    <cd:constant name="to" value="aan"/>
+    <cd:constant name="indicator" value="aanduiding"/>
+    <cd:constant name="background" value="achtergrond"/>
+    <cd:constant name="backgrounddepth" value="achtergronddiepte"/>
+    <cd:constant name="backgroundcorner" value="achtergrondhoek"/>
+    <cd:constant name="splitcolor" value="splitskleur"/>
+    <cd:constant name="backgroundcolor" value="achtergrondkleur"/>
+    <cd:constant name="foregroundcolor" value="voorgrondkleur"/>
+    <cd:constant name="foregroundstyle" value="voorgrondletter"/>
+    <cd:constant name="clipoffset" value="clipoffset"/>
+    <cd:constant name="backgroundoffset" value="achtergrondoffset"/>
+    <cd:constant name="backgroundscreen" value="achtergrondraster"/>
+    <cd:constant name="backgroundradius" value="achtergrondstraal"/>
+    <cd:constant name="address" value="adres"/>
+    <cd:constant name="stopper" value="afsluiter"/>
+    <cd:constant name="distance" value="afstand"/>
+    <cd:constant name="paragraph" value="alinea"/>
+    <cd:constant name="axis" value="assenstelsel"/>
+    <cd:constant name="author" value="auteur"/>
+    <cd:constant name="auto" value="auto"/>
+    <cd:constant name="autofile" value="autofile"/>
+    <cd:constant name="balance" value="balanceren"/>
+    <cd:constant name="wfactor" value="bfactor"/>
+    <cd:constant name="inner" value="binnen"/>
+    <cd:constant name="blank" value="blanko"/>
+    <cd:constant name="obstruction" value="blokkade"/>
+    <cd:constant name="blockway" value="blokwijze"/>
+    <cd:constant name="bottomspace" value="bodemwit"/>
+    <cd:constant name="top" value="boven"/>
+    <cd:constant name="topdistance" value="bovenafstand"/>
+    <cd:constant name="topframe" value="bovenkader"/>
+    <cd:constant name="topoffset" value="bovenoffset"/>
+    <cd:constant name="topstate" value="bovenstatus"/>
+    <cd:constant name="width" value="breedte"/>
+    <cd:constant name="maxwidth" value="maxbreedte"/>
+    <cd:constant name="minwidth" value="minbreedte"/>
+    <cd:constant name="source" value="bron"/>
+    <cd:constant name="command" value="commando"/>
+    <cd:constant name="commands" value="commandos"/>
+    <cd:constant name="component" value="component"/>
+    <cd:constant name="contrastcolor" value="contrastkleur"/>
+    <cd:constant name="conversion" value="conversie"/>
+    <cd:constant name="headconversion" value="kopconversie"/>
+    <cd:constant name="headlabel" value="koplabel"/>
+    <cd:constant name="criterium" value="criterium"/>
+    <cd:constant name="date" value="datum"/>
+    <cd:constant name="default" value="default"/>
+    <cd:constant name="depth" value="diepte"/>
+    <cd:constant name="depthcorrection" value="dieptecorrectie"/>
+    <cd:constant name="continue" value="doorgaan"/>
+    <cd:constant name="doublesided" value="dubbelzijdig"/>
+    <cd:constant name="dummy" value="dummy"/>
+    <cd:constant name="unit" value="eenheid"/>
+    <cd:constant name="ownnumber" value="eigennummer"/>
+    <cd:constant name="evenmargin" value="evenmarge"/>
+    <cd:constant name="expansion" value="expansie"/>
+    <cd:constant name="factor" value="factor"/>
+    <cd:constant name="convertfile" value="converteerfile"/>
+    <cd:constant name="file" value="file"/>
+    <cd:constant name="inputfile" value="inputfile"/>
+    <cd:constant name="size" value="formaat"/>
+    <cd:constant name="autofocus" value="autofocus"/>
+    <cd:constant name="focus" value="focus"/>
+    <cd:constant name="directory" value="gebied"/>
+    <cd:constant name="grid" value="grid"/>
+    <cd:constant name="big" value="groot"/>
+    <cd:constant name="get" value="haal"/>
+    <cd:constant name="hang" value="hang"/>
+    <cd:constant name="repeat" value="herhaal"/>
+    <cd:constant name="hfactor" value="hfactor"/>
+    <cd:constant name="corner" value="hoek"/>
+    <cd:constant name="hoffset" value="hoffset"/>
+    <cd:constant name="frames" value="hokjes"/>
+    <cd:constant name="header" value="hoofd"/>
+    <cd:constant name="headerdistance" value="hoofdafstand"/>
+    <cd:constant name="headerstate" value="hoofdstatus"/>
+    <cd:constant name="height" value="hoogte"/>
+    <cd:constant name="maxheight" value="maxhoogte"/>
+    <cd:constant name="minheight" value="minhoogte"/>
+    <cd:constant name="mindepth" value="mindiepte"/>
+    <cd:constant name="current" value="huidige"/>
+    <cd:constant name="in" value="in"/>
+    <cd:constant name="indenting" value="inspringen"/>
+    <cd:constant name="interaction" value="interactie"/>
+    <cd:constant name="interlinespace" value="interlinie"/>
+    <cd:constant name="items" value="items"/>
+    <cd:constant name="frame" value="kader"/>
+    <cd:constant name="framedepth" value="kaderdiepte"/>
+    <cd:constant name="framecorner" value="kaderhoek"/>
+    <cd:constant name="framecolor" value="kaderkleur"/>
+    <cd:constant name="frameoffset" value="kaderoffset"/>
+    <cd:constant name="frameradius" value="kaderstraal"/>
+    <cd:constant name="marginedge" value="kantlijn"/>
+    <cd:constant name="marginedgetext" value="kantlijntekst"/>
+    <cd:constant name="aligncharacter" value="karakteruitlijnen"/>
+    <cd:constant name="alignmentcharacter" value="uitlijnkarakter"/>
+    <cd:constant name="small" value="klein"/>
+    <cd:constant name="color" value="kleur"/>
+    <cd:constant name="column" value="kolom"/>
+    <cd:constant name="columns" value="kolommen"/>
+    <cd:constant name="columndistance" value="kolomafstand"/>
+    <cd:constant name="headcommand" value="kopcommando"/>
+    <cd:constant name="headcolor" value="kopkleur"/>
+    <cd:constant name="headstyle" value="kopletter"/>
+    <cd:constant name="afterhead" value="kopna"/>
+    <cd:constant name="veroffset" value="kopoffset"/>
+    <cd:constant name="coupling" value="koppeling"/>
+    <cd:constant name="couplingway" value="koppelwijze"/>
+    <cd:constant name="beforehead" value="kopvoor"/>
+    <cd:constant name="topspace" value="kopwit"/>
+    <cd:constant name="bodyfont" value="korps"/>
+    <cd:constant name="label" value="label"/>
+    <cd:constant name="empty" value="leeg"/>
+    <cd:constant name="style" value="letter"/>
+    <cd:constant name="rule" value="lijn"/>
+    <cd:constant name="rulethickness" value="lijndikte"/>
+    <cd:constant name="rulecolor" value="lijnkleur"/>
+    <cd:constant name="list" value="lijst"/>
+    <cd:constant name="leftwidth" value="linkerbreedte"/>
+    <cd:constant name="leftframe" value="linkerkader"/>
+    <cd:constant name="leftcolor" value="linkerkleur"/>
+    <cd:constant name="leftstyle" value="linkerletter"/>
+    <cd:constant name="leftmargin" value="linkermarge"/>
+    <cd:constant name="leftmargindistance" value="linkermargeafstand"/>
+    <cd:constant name="leftoffset" value="linkeroffset"/>
+    <cd:constant name="leftedge" value="linkerrand"/>
+    <cd:constant name="leftedgedistance" value="linkerrandafstand"/>
+    <cd:constant name="lefttext" value="linkertekst"/>
+    <cd:constant name="left" value="links"/>
+    <cd:constant name="nleft" value="nlinks"/>
+    <cd:constant name="logo" value="logo"/>
+    <cd:constant name="logos" value="logos"/>
+    <cd:constant name="local" value="lokaal"/>
+    <cd:constant name="margin" value="marge"/>
+    <cd:constant name="margindistance" value="margeafstand"/>
+    <cd:constant name="margintext" value="margetekst"/>
+    <cd:constant name="marking" value="markering"/>
+    <cd:constant name="marcolor" value="markleur"/>
+    <cd:constant name="marstyle" value="marletter"/>
+    <cd:constant name="menu" value="menu"/>
+    <cd:constant name="splitmethod" value="splitsmethode"/>
+    <cd:constant name="textmethod" value="tekstmethode"/>
+    <cd:constant name="sidemethod" value="zijmethode"/>
+    <cd:constant name="method" value="methode"/>
+    <cd:constant name="middle" value="midden"/>
+    <cd:constant name="middletext" value="middentekst"/>
+    <cd:constant name="max" value="max"/>
+    <cd:constant name="min" value="min"/>
+    <cd:constant name="sample" value="monster"/>
+    <cd:constant name="after" value="na"/>
+    <cd:constant name="name" value="naam"/>
+    <cd:constant name="commandafter" value="nacommando"/>
+    <cd:constant name="ntop" value="nboven"/>
+    <cd:constant name="level" value="niveau"/>
+    <cd:constant name="levels" value="niveaus"/>
+    <cd:constant name="nbottom" value="nonder"/>
+    <cd:constant name="norm" value="norm"/>
+    <cd:constant name="nlines" value="nregels"/>
+    <cd:constant name="number" value="nummer"/>
+    <cd:constant name="numbercommand" value="nummercommando"/>
+    <cd:constant name="numbering" value="nummeren"/>
+    <cd:constant name="numbercolor" value="nummerkleur"/>
+    <cd:constant name="numberstyle" value="nummerletter"/>
+    <cd:constant name="numberseparator" value="nummerscheider"/>
+    <cd:constant name="object" value="object"/>
+    <cd:constant name="offset" value="offset"/>
+    <cd:constant name="bottom" value="onder"/>
+    <cd:constant name="bottomdistance" value="onderafstand"/>
+    <cd:constant name="bottomframe" value="onderkader"/>
+    <cd:constant name="bottomoffset" value="onderoffset"/>
+    <cd:constant name="bottomstate" value="onderstatus"/>
+    <cd:constant name="oddmargin" value="onevenmarge"/>
+    <cd:constant name="at" value="op"/>
+    <cd:constant name="option" value="optie"/>
+    <cd:constant name="page" value="pagina"/>
+    <cd:constant name="pagecommand" value="paginacommando"/>
+    <cd:constant name="pagecolor" value="paginakleur"/>
+    <cd:constant name="pagestyle" value="paginaletter"/>
+    <cd:constant name="pagenumber" value="paginanummer"/>
+    <cd:constant name="pageboundaries" value="paginaovergangen"/>
+    <cd:constant name="pagestate" value="paginastatus"/>
+    <cd:constant name="palet" value="palet"/>
+    <cd:constant name="paper" value="papier"/>
+    <cd:constant name="location" value="plaats"/>
+    <cd:constant name="placestopper" value="plaatsafsluiter"/>
+    <cd:constant name="place" value="plaatsen"/>
+    <cd:constant name="placehead" value="plaatskop"/>
+    <cd:constant name="position" value="positie"/>
+    <cd:constant name="prefix" value="prefix"/>
+    <cd:constant name="preset" value="preset"/>
+    <cd:constant name="preview" value="preview"/>
+    <cd:constant name="process" value="proces"/>
+    <cd:constant name="spot" value="spot"/>
+    <cd:constant name="dot" value="punt"/>
+    <cd:constant name="arrow" value="pijl"/>
+    <cd:constant name="edge" value="rand"/>
+    <cd:constant name="edgedistance" value="randafstand"/>
+    <cd:constant name="screen" value="raster"/>
+    <cd:constant name="rightwidth" value="rechterbreedte"/>
+    <cd:constant name="rightframe" value="rechterkader"/>
+    <cd:constant name="rightcolor" value="rechterkleur"/>
+    <cd:constant name="rightstyle" value="rechterletter"/>
+    <cd:constant name="rightmargin" value="rechtermarge"/>
+    <cd:constant name="rightmargindistance" value="rechtermargeafstand"/>
+    <cd:constant name="rightoffset" value="rechteroffset"/>
+    <cd:constant name="rightedge" value="rechterrand"/>
+    <cd:constant name="rightedgedistance" value="rechterrandafstand"/>
+    <cd:constant name="righttext" value="rechtertekst"/>
+    <cd:constant name="right" value="rechts"/>
+    <cd:constant name="nright" value="nrechts"/>
+    <cd:constant name="reduction" value="reductie"/>
+    <cd:constant name="referencing" value="refereren"/>
+    <cd:constant name="line" value="regel"/>
+    <cd:constant name="linecorrection" value="regelcorrectie"/>
+    <cd:constant name="lines" value="regels"/>
+    <cd:constant name="stretch" value="rek"/>
+    <cd:constant name="resolution" value="resolutie"/>
+    <cd:constant name="rotation" value="rotatie"/>
+    <cd:constant name="orientation" value="orientatie"/>
+    <cd:constant name="horoffset" value="rugoffset"/>
+    <cd:constant name="backspace" value="rugwit"/>
+    <cd:constant name="direction" value="richting"/>
+    <cd:constant name="scale" value="schaal"/>
+    <cd:constant name="separator" value="scheider"/>
+    <cd:constant name="display" value="scherm"/>
+    <cd:constant name="scope" value="scope"/>
+    <cd:constant name="section" value="sectie"/>
+    <cd:constant name="sectionnumber" value="sectienummer"/>
+    <cd:constant name="setups" value="setups"/>
+    <cd:constant name="cutspace" value="snijwit"/>
+    <cd:constant name="family" value="soort"/>
+    <cd:constant name="space" value="spatie"/>
+    <cd:constant name="spacing" value="spatiering"/>
+    <cd:constant name="split" value="splitsen"/>
+    <cd:constant name="splitoffset" value="splitsoffset"/>
+    <cd:constant name="indentnext" value="springvolgendein"/>
+    <cd:constant name="step" value="stap"/>
+    <cd:constant name="stack" value="stapel"/>
+    <cd:constant name="start" value="start"/>
+    <cd:constant name="state" value="status"/>
+    <cd:constant name="stop" value="stop"/>
+    <cd:constant name="radius" value="straal"/>
+    <cd:constant name="dash" value="streep"/>
+    <cd:constant name="sub" value="sub"/>
+    <cd:constant name="subtitle" value="subtitel"/>
+    <cd:constant name="symbol" value="symbool"/>
+    <cd:constant name="symbolset" value="symboolset"/>
+    <cd:constant name="symcolor" value="symkleur"/>
+    <cd:constant name="symstyle" value="symletter"/>
+    <cd:constant name="synonym" value="synoniem"/>
+    <cd:constant name="synonymcolor" value="synoniemkleur"/>
+    <cd:constant name="synonymstyle" value="synoniemletter"/>
+    <cd:constant name="tab" value="tab"/>
+    <cd:constant name="sign" value="teken"/>
+    <cd:constant name="text" value="tekst"/>
+    <cd:constant name="textwidth" value="tekstbreedte"/>
+    <cd:constant name="textcommand" value="tekstcommando"/>
+    <cd:constant name="textsize" value="tekstformaat"/>
+    <cd:constant name="textcolor" value="tekstkleur"/>
+    <cd:constant name="textstyle" value="tekstletter"/>
+    <cd:constant name="textseparator" value="tekstscheider"/>
+    <cd:constant name="textstate" value="tekststatus"/>
+    <cd:constant name="title" value="titel"/>
+    <cd:constant name="aligntitle" value="titeluitlijnen"/>
+    <cd:constant name="tolerance" value="tolerantie"/>
+    <cd:constant name="inbetween" value="tussen"/>
+    <cd:constant name="type" value="type"/>
+    <cd:constant name="align" value="uitlijnen"/>
+    <cd:constant name="urlspace" value="urlspatie"/>
+    <cd:constant name="urlalternative" value="urlvariant"/>
+    <cd:constant name="from" value="van"/>
+    <cd:constant name="alternative" value="variant"/>
+    <cd:constant name="increment" value="verhoog"/>
+    <cd:constant name="incrementnumber" value="verhoognummer"/>
+    <cd:constant name="resetnumber" value="resetnummer"/>
+    <cd:constant name="reference" value="verwijzing"/>
+    <cd:constant name="unknownreference" value="onbekendeverwijzing"/>
+    <cd:constant name="footer" value="voet"/>
+    <cd:constant name="footerdistance" value="voetafstand"/>
+    <cd:constant name="footerstate" value="voetstatus"/>
+    <cd:constant name="voffset" value="voffset"/>
+    <cd:constant name="next" value="volgende"/>
+    <cd:constant name="before" value="voor"/>
+    <cd:constant name="commandbefore" value="voorcommando"/>
+    <cd:constant name="previous" value="vorige"/>
+    <cd:constant name="previousnumber" value="vorigenummer"/>
+    <cd:constant name="delay" value="wachttijd"/>
+    <cd:constant name="way" value="wijze"/>
+    <cd:constant name="random" value="willekeur"/>
+    <cd:constant name="white" value="wit"/>
+    <cd:constant name="xfactor" value="xfactor"/>
+    <cd:constant name="xmax" value="xmax"/>
+    <cd:constant name="xoffset" value="xoffset"/>
+    <cd:constant name="xscale" value="xschaal"/>
+    <cd:constant name="xstep" value="xstap"/>
+    <cd:constant name="yfactor" value="yfactor"/>
+    <cd:constant name="ymax" value="ymax"/>
+    <cd:constant name="yoffset" value="yoffset"/>
+    <cd:constant name="yscale" value="yschaal"/>
+    <cd:constant name="ystep" value="ystap"/>
+    <cd:constant name="samepage" value="zelfdepagina"/>
+    <cd:constant name="sidealign" value="zijuitlijnen"/>
+    <cd:constant name="side" value="zij"/>
+    <cd:constant name="fieldlayer" value="veldlaag"/>
+    <cd:constant name="textlayer" value="tekstlaag"/>
+    <cd:constant name="fieldbackgroundcolor" value="veldachtergrondkleur"/>
+    <cd:constant name="fieldframecolor" value="veldkaderkleur"/>
+    <cd:constant name="fieldoffset" value="veldoffset"/>
+    <cd:constant name="openaction" value="openactie"/>
+    <cd:constant name="closeaction" value="sluitactie"/>
+    <cd:constant name="openpageaction" value="openpaginaactie"/>
+    <cd:constant name="closepageaction" value="sluitpaginaactie"/>
+    <cd:constant name="clickin" value="klikin"/>
+    <cd:constant name="clickout" value="klikuit"/>
+    <cd:constant name="regionin" value="gebiedin"/>
+    <cd:constant name="regionout" value="gebieduit"/>
+    <cd:constant name="focusin" value="focusin"/>
+    <cd:constant name="focusout" value="focusuit"/>
+    <cd:constant name="afterkey" value="natoets"/>
+    <cd:constant name="format" value="formatteer"/>
+    <cd:constant name="validate" value="valideer"/>
+    <cd:constant name="calculate" value="bereken"/>
+    <cd:constant name="click" value="klik"/>
+    <cd:constant name="vcommand" value="vcommando"/>
+    <cd:constant name="icommand" value="icommando"/>
+    <cd:constant name="ccommand" value="ccommando"/>
+    <cd:constant name="textdistance" value="tekstafstand"/>
+    <cd:constant name="textmargin" value="tekstmarge"/>
+    <cd:constant name="keyword" value="trefwoord"/>
+  </cd:constants>
+
+  <cd:constants>
+    <cd:constant name="extras" value="extras"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="on" value="aan"/>
+    <cd:variable name="serried" value="aanelkaar"/>
+    <cd:variable name="joinedup" value="aansluitend"/>
+    <cd:variable name="absolute" value="absoluut"/>
+    <cd:variable name="background" value="achtergrond"/>
+    <cd:variable name="backward" value="achteruit"/>
+    <cd:variable name="subbackward" value="subachteruit"/>
+    <cd:variable name="action" value="actie"/>
+    <cd:variable name="stopper" value="afsluiter"/>
+    <cd:variable name="paragraph" value="alinea"/>
+    <cd:variable name="all" value="alles"/>
+    <cd:variable name="always" value="altijd"/>
+    <cd:variable name="auto" value="auto"/>
+    <cd:variable name="autointro" value="autointro"/>
+    <cd:variable name="both" value="beide"/>
+    <cd:variable name="inner" value="binnen"/>
+    <cd:variable name="blank" value="blanko"/>
+    <cd:variable name="disable" value="blokkeer"/>
+    <cd:variable name="top" value="boven"/>
+    <cd:variable name="wide" value="breed"/>
+    <cd:variable name="width" value="breedte"/>
+    <cd:variable name="outer" value="buiten"/>
+    <cd:variable name="numbers" value="cijfers"/>
+    <cd:variable name="Numbers" value="Cijfers"/>
+    <cd:variable name="command" value="commando"/>
+    <cd:variable name="commands" value="commandos"/>
+    <cd:variable name="concept" value="concept"/>
+    <cd:variable name="day" value="dag"/>
+    <cd:variable name="date" value="datum"/>
+    <cd:variable name="default" value="default"/>
+    <cd:variable name="final" value="definitief"/>
+    <cd:variable name="depth" value="diepte"/>
+    <cd:variable name="doublesided" value="dubbelzijdig"/>
+    <cd:variable name="first" value="eerste"/>
+    <cd:variable name="each" value="elk"/>
+    <cd:variable name="singlesided" value="enkelzijdig"/>
+    <cd:variable name="somewhere" value="ergens"/>
+    <cd:variable name="nowhere" value="nergens"/>
+    <cd:variable name="even" value="even"/>
+    <cd:variable name="external" value="extern"/>
+    <cd:variable name="file" value="file"/>
+    <cd:variable name="flexible" value="flexibel"/>
+    <cd:variable name="force" value="forceer"/>
+    <cd:variable name="used" value="gebruikt"/>
+    <cd:variable name="none" value="geen"/>
+    <cd:variable name="nomarking" value="geenmarkering"/>
+    <cd:variable name="nonumber" value="geennummer"/>
+    <cd:variable name="nowhite" value="geenwit"/>
+    <cd:variable name="rotated" value="geroteerd"/>
+    <cd:variable name="mirrored" value="gespiegeld"/>
+    <cd:variable name="global" value="globaal"/>
+    <cd:variable name="grid" value="grid"/>
+    <cd:variable name="big" value="groot"/>
+    <cd:variable name="bigbodyfont" value="grootkorps"/>
+    <cd:variable name="bigpreference" value="grotevoorkeur"/>
+    <cd:variable name="gray" value="grijs"/>
+    <cd:variable name="halfline" value="halveregel"/>
+    <cd:variable name="keep" value="handhaaf"/>
+    <cd:variable name="hanging" value="hangend"/>
+    <cd:variable name="repeat" value="herhaal"/>
+    <cd:variable name="fix" value="herstel"/>
+    <cd:variable name="here" value="hier"/>
+    <cd:variable name="header" value="hoofd"/>
+    <cd:variable name="high" value="hoog"/>
+    <cd:variable name="height" value="hoogte"/>
+    <cd:variable name="horizontal" value="horizontaal"/>
+    <cd:variable name="current" value="huidige"/>
+    <cd:variable name="hz" value="hz"/>
+    <cd:variable name="nohz" value="geenhz"/>
+    <cd:variable name="italic" value="italic"/>
+    <cd:variable name="inherit" value="erf"/>
+    <cd:variable name="inleft" value="inlinker"/>
+    <cd:variable name="inmargin" value="inmarge"/>
+    <cd:variable name="inright" value="inrechter"/>
+    <cd:variable name="interaction" value="interactie"/>
+    <cd:variable name="intext" value="intekst"/>
+    <cd:variable name="intro" value="intro"/>
+    <cd:variable name="its" value="its"/>
+    <cd:variable name="yes" value="ja"/>
+    <cd:variable name="year" value="jaar"/>
+    <cd:variable name="frame" value="kader"/>
+    <cd:variable name="marginedge" value="kantlijn"/>
+    <cd:variable name="cap" value="kap"/>
+    <cd:variable name="capital" value="kapitaal"/>
+    <cd:variable name="referral" value="kenmerk"/>
+    <cd:variable name="small" value="klein"/>
+    <cd:variable name="smallnormal" value="kleinnormaal"/>
+    <cd:variable name="smallslanted" value="kleinschuin"/>
+    <cd:variable name="smallslantedbold" value="kleinschuinvet"/>
+    <cd:variable name="smallitalic" value="kleinitalic"/>
+    <cd:variable name="smallitalicbold" value="kleinitalicvet"/>
+    <cd:variable name="smalltype" value="kleintype"/>
+    <cd:variable name="smallbold" value="kleinvet"/>
+    <cd:variable name="smallboldslanted" value="kleinvetschuin"/>
+    <cd:variable name="smallbolditalic" value="kleinvetitalic"/>
+    <cd:variable name="smallbodyfont" value="kleinkorps"/>
+    <cd:variable name="color" value="kleur"/>
+    <cd:variable name="column" value="kolom"/>
+    <cd:variable name="columns" value="kolommen"/>
+    <cd:variable name="head" value="kop"/>
+    <cd:variable name="low" value="laag"/>
+    <cd:variable name="last" value="laatste"/>
+    <cd:variable name="label" value="label"/>
+    <cd:variable name="lohi" value="laho"/>
+    <cd:variable name="tall" value="lang"/>
+    <cd:variable name="empty" value="leeg"/>
+    <cd:variable name="Character" value="Letter"/>
+    <cd:variable name="character" value="letter"/>
+    <cd:variable name="Characters" value="Letters"/>
+    <cd:variable name="characters" value="letters"/>
+    <cd:variable name="landscape" value="liggend"/>
+    <cd:variable name="rule" value="lijn"/>
+    <cd:variable name="list" value="lijst"/>
+    <cd:variable name="leftmargin" value="linkermarge"/>
+    <cd:variable name="leftpage" value="linkerpagina"/>
+    <cd:variable name="leftedge" value="linkerrand"/>
+    <cd:variable name="left" value="links"/>
+    <cd:variable name="local" value="lokaal"/>
+    <cd:variable name="new" value="nieuw"/>
+    <cd:variable name="MONTH" value="MAAND"/>
+    <cd:variable name="month" value="maand"/>
+    <cd:variable name="mar" value="mar"/>
+    <cd:variable name="margin" value="marge"/>
+    <cd:variable name="max" value="max"/>
+    <cd:variable name="min" value="min"/>
+    <cd:variable name="mediaeval" value="mediaeval"/>
+    <cd:variable name="medium" value="middel"/>
+    <cd:variable name="middle" value="midden"/>
+    <cd:variable name="after" value="na"/>
+    <cd:variable name="name" value="naam"/>
+    <cd:variable name="opposite" value="naast"/>
+    <cd:variable name="no" value="nee"/>
+    <cd:variable name="negative" value="negatief"/>
+    <cd:variable name="positive" value="positief"/>
+    <cd:variable name="not" value="niet"/>
+    <cd:variable name="never" value="nooit"/>
+    <cd:variable name="normal" value="normaal"/>
+    <cd:variable name="number" value="nummer"/>
+    <cd:variable name="offset" value="offset"/>
+    <cd:variable name="unknown" value="onbekend"/>
+    <cd:variable name="bottom" value="onder"/>
+    <cd:variable name="odd" value="oneven"/>
+    <cd:variable name="packed" value="opelkaar"/>
+    <cd:variable name="unpacked" value="vanelkaar"/>
+    <cd:variable name="makeup" value="opmaak"/>
+    <cd:variable name="atmargin" value="opmarge"/>
+    <cd:variable name="overlay" value="overlay"/>
+    <cd:variable name="page" value="pagina"/>
+    <cd:variable name="pagenumber" value="paginanummer"/>
+    <cd:variable name="paper" value="papier"/>
+    <cd:variable name="display" value="scherm"/>
+    <cd:variable name="reverse" value="omgekeerd"/>
+    <cd:variable name="fit" value="passend"/>
+    <cd:variable name="postscript" value="postscript"/>
+    <cd:variable name="preview" value="preview"/>
+    <cd:variable name="program" value="programma"/>
+    <cd:variable name="process" value="proces"/>
+    <cd:variable name="spot" value="spot"/>
+    <cd:variable name="dot" value="punt"/>
+    <cd:variable name="ran" value="ran"/>
+    <cd:variable name="edge" value="rand"/>
+    <cd:variable name="screen" value="raster"/>
+    <cd:variable name="rectangular" value="recht"/>
+    <cd:variable name="rightmargin" value="rechtermarge"/>
+    <cd:variable name="rightpage" value="rechterpagina"/>
+    <cd:variable name="rightedge" value="rechterrand"/>
+    <cd:variable name="right" value="rechts"/>
+    <cd:variable name="line" value="regel"/>
+    <cd:variable name="register" value="register"/>
+    <cd:variable name="relative" value="relatief"/>
+    <cd:variable name="reset" value="reset"/>
+    <cd:variable name="Romannumerals" value="Romeins"/>
+    <cd:variable name="romannumerals" value="romeins"/>
+    <cd:variable name="greek" value="grieks"/>
+    <cd:variable name="Greek" value="Grieks"/>
+    <cd:variable name="round" value="rond"/>
+    <cd:variable name="rotate" value="roteer"/>
+    <cd:variable name="stretch" value="rek"/>
+    <cd:variable name="backspace" value="rugwit"/>
+    <cd:variable name="broad" value="ruim"/>
+    <cd:variable name="row" value="rij"/>
+    <cd:variable name="slanted" value="schuin"/>
+    <cd:variable name="slantedbold" value="schuinvet"/>
+    <cd:variable name="synchronize" value="synchroniseer"/>
+    <cd:variable name="italicbold" value="italicvet"/>
+    <cd:variable name="sectionnumber" value="sectienummer"/>
+    <cd:variable name="narrow" value="smal"/>
+    <cd:variable name="cutspace" value="snijwit"/>
+    <cd:variable name="tolerant" value="soepel"/>
+    <cd:variable name="space" value="spatie"/>
+    <cd:variable name="standard" value="standaard"/>
+    <cd:variable name="start" value="start"/>
+    <cd:variable name="stop" value="stop"/>
+    <cd:variable name="strict" value="streng"/>
+    <cd:variable name="strut" value="strut"/>
+    <cd:variable name="sub" value="sub"/>
+    <cd:variable name="sym" value="sym"/>
+    <cd:variable name="symbol" value="symbool"/>
+    <cd:variable name="text" value="tekst"/>
+    <cd:variable name="back" value="terug"/>
+    <cd:variable name="test" value="test"/>
+    <cd:variable name="inbetween" value="tussen"/>
+    <cd:variable name="type" value="type"/>
+    <cd:variable name="off" value="uit"/>
+    <cd:variable name="url" value="url"/>
+    <cd:variable name="URL" value="URL"/>
+    <cd:variable name="fixed" value="vast"/>
+    <cd:variable name="loose" value="los"/>
+    <cd:variable name="continue" value="verder"/>
+    <cd:variable name="vertical" value="vertikaal"/>
+    <cd:variable name="bold" value="vet"/>
+    <cd:variable name="boldslanted" value="vetschuin"/>
+    <cd:variable name="bolditalic" value="vetitalic"/>
+    <cd:variable name="quadruple" value="viertal"/>
+    <cd:variable name="footer" value="voet"/>
+    <cd:variable name="next" value="volgende"/>
+    <cd:variable name="before" value="voor"/>
+    <cd:variable name="foreground" value="voorgrond"/>
+    <cd:variable name="preference" value="voorkeur"/>
+    <cd:variable name="temporary" value="voorlopig"/>
+    <cd:variable name="forward" value="vooruit"/>
+    <cd:variable name="subforward" value="subvooruit"/>
+    <cd:variable name="previous" value="vorige"/>
+    <cd:variable name="value" value="waarde"/>
+    <cd:variable name="week" value="week"/>
+    <cd:variable name="weekday" value="weekdag"/>
+    <cd:variable name="WEEKDAY" value="WEEKDAG"/>
+    <cd:variable name="random" value="willekeurig"/>
+    <cd:variable name="white" value="wit"/>
+    <cd:variable name="very" value="zeer"/>
+    <cd:variable name="verytolerant" value="zeersoepel"/>
+    <cd:variable name="verystrict" value="zeerstreng"/>
+    <cd:variable name="see" value="zie"/>
+    <cd:variable name="smallcaps" value="smallcaps"/>
+    <cd:variable name="WORD" value="WOORD"/>
+    <cd:variable name="firstpage" value="eerstepagina"/>
+    <cd:variable name="firstcolumn" value="eerstekolom"/>
+    <cd:variable name="previouspage" value="vorigepagina"/>
+    <cd:variable name="nextpage" value="volgendepagina"/>
+    <cd:variable name="lastpage" value="laatstepagina"/>
+    <cd:variable name="lastcolumn" value="laatstekolom"/>
+    <cd:variable name="lastpagenumber" value="laatstepaginanummer"/>
+    <cd:variable name="subpage" value="subpagina"/>
+    <cd:variable name="firstsubpage" value="eerstesubpagina"/>
+    <cd:variable name="previoussubpage" value="vorigesubpagina"/>
+    <cd:variable name="nextsubpage" value="volgendesubpagina"/>
+    <cd:variable name="lastsubpage" value="laatstesubpagina"/>
+    <cd:variable name="nextevenpage" value="volgendeevenpagina"/>
+    <cd:variable name="nextoddpage" value="volgendeonevenpagina"/>
+    <cd:variable name="previousevenpage" value="vorigeevenpagina"/>
+    <cd:variable name="previousoddpage" value="vorigeonevenpagina"/>
+    <cd:variable name="readonly" value="alleenleesbaar"/>
+    <cd:variable name="required" value="verplicht"/>
+    <cd:variable name="protected" value="beschermd"/>
+    <cd:variable name="sorted" value="gesorteerd"/>
+    <cd:variable name="unavailable" value="nietbeschikbaar"/>
+    <cd:variable name="hidden" value="verborgen"/>
+    <cd:variable name="printable" value="printbaar"/>
+    <cd:variable name="bookmark" value="bookmark"/>
+    <cd:variable name="nocheck" value="geencontrole"/>
+    <cd:variable name="innermargin" value="binnenmarge"/>
+    <cd:variable name="outermargin" value="buitenmarge"/>
+    <cd:variable name="inneredge" value="binnenrand"/>
+    <cd:variable name="outeredge" value="buitenrand"/>
+    <cd:variable name="controls" value="sturing"/>
+    <cd:variable name="nothanging" value="niethangend"/>
+    <cd:variable name="hyphenated" value="afgebroken"/>
+    <cd:variable name="nothyphenated" value="nietafgebroken"/>
+    <cd:variable name="overprint" value="overprint"/>
+    <cd:variable name="knockout" value="knockout"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="controls" value="sturing"/>
+    <cd:constant name="global" value="globaal"/>
+    <cd:constant name="overprint" value="overprint"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="conversion" value="conversie"/>
+    <cd:variable name="by" value="per"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="dx" value="dx"/>
+    <cd:constant name="dy" value="dy"/>
+    <cd:constant name="nx" value="nx"/>
+    <cd:constant name="ny" value="ny"/>
+    <cd:constant name="nr" value="nr"/>
+    <cd:constant name="nl" value="nl"/>
+    <cd:constant name="nc" value="nc"/>
+    <cd:constant name="sx" value="sx"/>
+    <cd:constant name="sy" value="sy"/>
+    <cd:constant name="n" value="n"/>
+    <cd:constant name="vfil" value="vfil"/>
+    <cd:constant name="hfil" value="hfil"/>
+    <cd:constant name="strut" value="strut"/>
+    <cd:constant name="reset" value="reset"/>
+    <cd:constant name="set" value="set"/>
+    <cd:constant name="escape" value="escape"/>
+    <cd:constant name="apa" value="apa"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="calligraphic" value="calligrafie"/>
+    <cd:variable name="handwritten" value="handschrift"/>
+    <cd:variable name="sansserif" value="schreefloos"/>
+    <cd:variable name="roman" value="romaan"/>
+    <cd:variable name="teletype" value="teletype"/>
+    <cd:variable name="type" value="type"/>
+    <cd:variable name="serif" value="serif"/>
+    <cd:variable name="regular" value="regular"/>
+    <cd:variable name="support" value="support"/>
+    <cd:variable name="sans" value="sans"/>
+    <cd:variable name="mono" value="mono"/>
+  </cd:variables>
+
+  <cd:elements>
+    <cd:element name="begin" value="beginvan"/>
+    <cd:element name="end" value="eindvan"/>
+    <cd:element name="coupled" value="gekoppelde"/>
+    <cd:element name="get" value="haal"/>
+    <cd:element name="currentlocal" value="huidigelokale"/>
+    <cd:element name="endsetup" value="in"/>
+    <cd:element name="load" value="laad"/>
+    <cd:element name="emptyone" value="leeg"/>
+    <cd:element name="emptytwo" value="lege"/>
+    <cd:element name="list" value="lijst"/>
+    <cd:element name="listof" value="lijstmet"/>
+    <cd:element name="local" value="lokale"/>
+    <cd:element name="place" value="plaats"/>
+    <cd:element name="reserve" value="reserveer"/>
+    <cd:element name="start" value="start"/>
+    <cd:element name="setup" value="stel"/>
+    <cd:element name="stop" value="stop"/>
+    <cd:element name="increment" value="verhoog"/>
+    <cd:element name="next" value="volgende"/>
+    <cd:element name="complete" value="volledige"/>
+    <cd:element name="previous" value="vorige"/>
+    <cd:element name="previouslocal" value="vorigelokale"/>
+    <cd:element name="see" value="zie"/>
+    <cd:element name="type" value="type"/>
+    <cd:element name="makeup" value="opmaak"/>
+    <cd:element name="text" value="tekst"/>
+  </cd:elements>
+
+  <cd:variables>
+    <cd:variable name="buffer" value="buffer"/>
+    <cd:variable name="linenote" value="regelnoot"/>
+    <cd:variable name="comment" value="commentaar"/>
+    <cd:variable name="interactionmenu" value="interactiemenu"/>
+    <cd:variable name="postponing" value="uitstellen"/>
+    <cd:variable name="hiding" value="verbergen"/>
+    <cd:variable name="tabulate" value="tabulatie"/>
+    <cd:variable name="tabulatehead" value="tabulatiekop"/>
+    <cd:variable name="tabulatetail" value="tabulatiestaart"/>
+    <cd:variable name="fact" value="gegeven"/>
+    <cd:variable name="legend" value="legenda"/>
+    <cd:variable name="formula" value="formule"/>
+    <cd:variable name="tablehead" value="tabelkop"/>
+    <cd:variable name="tabletail" value="tabelstaart"/>
+    <cd:variable name="setups" value="instellingen"/>
+    <cd:variable name="helptext" value="helptekst"/>
+    <cd:variable name="localenvironment" value="deelomgeving"/>
+    <cd:variable name="sectionblockenvironment" value="sectieblokomgeving"/>
+    <cd:variable name="pagecomment" value="paginacommentaar"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="FirstPage" value="EerstePagina"/>
+    <cd:variable name="PreviousPage" value="VorigePagina"/>
+    <cd:variable name="NextPage" value="VolgendePagina"/>
+    <cd:variable name="LastPage" value="LaatstePagina"/>
+    <cd:variable name="PreviousJump" value="VorigeSprong"/>
+    <cd:variable name="NextJump" value="VolgendeSprong"/>
+    <cd:variable name="SwapViewer" value="WisselViewer"/>
+    <cd:variable name="ExitViewer" value="VerlaatViewer"/>
+    <cd:variable name="CloseDocument" value="SluitDocument"/>
+    <cd:variable name="SaveDocument" value="BewaarDocument"/>
+    <cd:variable name="SaveNamedDocument" value="BewaarDocumentOpNaam"/>
+    <cd:variable name="OpenNamedDocument" value="OpenDocumentOpNaam"/>
+    <cd:variable name="ViewerHelp" value="ViewerHelp"/>
+    <cd:variable name="PrintDocument" value="PrintDocument"/>
+    <cd:variable name="SearchDocument" value="DoorzoekDocument"/>
+    <cd:variable name="SearchAgain" value="HerhaalZoeken"/>
+    <cd:variable name="Query" value="RaadpleegDocument"/>
+    <cd:variable name="QueryAgain" value="HerhaalRaadplegen"/>
+    <cd:variable name="GotoPage" value="GaNaarPagina"/>
+    <cd:variable name="StartMovie" value="StartFilm"/>
+    <cd:variable name="StopMovie" value="StopFilm"/>
+    <cd:variable name="PauseMovie" value="PauzeerFilm"/>
+    <cd:variable name="ResumeMovie" value="HervatFilm"/>
+    <cd:variable name="StartSound" value="StartGeluid"/>
+    <cd:variable name="StopSound" value="StopGeluid"/>
+    <cd:variable name="PauseSound" value="PauzeerGeluid"/>
+    <cd:variable name="ResumeSound" value="HervatGeluid"/>
+    <cd:variable name="StartRendering" value="StartRendering"/>
+    <cd:variable name="StopRendering" value="StopRendering"/>
+    <cd:variable name="PauseRendering" value="PauzeerRendering"/>
+    <cd:variable name="ResumeRendering" value="HervatRendering"/>
+    <cd:variable name="SaveForm" value="BewaarFormulier"/>
+    <cd:variable name="LoadForm" value="LaadFormulier"/>
+    <cd:variable name="ResetForm" value="ResetFormulier"/>
+    <cd:variable name="SubmitForm" value="VerzendFormulier"/>
+    <cd:variable name="HideField" value="VerbergVeld"/>
+    <cd:variable name="ShowField" value="ToonVeld"/>
+    <cd:variable name="FitWidth" value="BreedtePassend"/>
+    <cd:variable name="FitHeight" value="HoogtePassend"/>
+    <cd:variable name="HideLayer" value="VerbergLaag"/>
+    <cd:variable name="VideLayer" value="ToonLaag"/>
+    <cd:variable name="ToggleLayer" value="WisselLaag"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="New" value="Nieuw"/>
+    <cd:variable name="Balloon" value="Ballon"/>
+    <cd:variable name="Addition" value="Toevoeging"/>
+    <cd:variable name="Help" value="Help"/>
+    <cd:variable name="Paragraph" value="Paragraaf"/>
+    <cd:variable name="Key" value="Sleutel"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="bet" value="bet"/>
+    <cd:constant name="dat" value="dat"/>
+    <cd:constant name="ken" value="ken"/>
+    <cd:constant name="ref" value="ref"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="formeel" value="formeel"/>
+    <cd:variable name="informeel" value="informeel"/>
+    <cd:variable name="rekening" value="rekening"/>
+    <cd:variable name="sticker" value="sticker"/>
+    <cd:variable name="sheet" value="sheet"/>
+    <cd:variable name="brief" value="brief"/>
+    <cd:variable name="ls" value="ls"/>
+  </cd:variables>
+
+  <cd:commands>
+    <cd:command name="language" value="taal"/>
+    <cd:command name="mainlanguage" value="hoofdtaal"/>
+    <cd:command name="translate" value="vertaal"/>
+    <cd:command name="installlanguage" value="installeertaal"/>
+    <cd:command name="setuplanguage" value="steltaalin"/>
+    <cd:command name="showmakeup" value="toonopmaak"/>
+    <cd:command name="useencoding" value="usecodering"/>
+    <cd:command name="usespecials" value="gebruikspecials"/>
+    <cd:command name="defineoutput" value="definieeruitvoer"/>
+    <cd:command name="setupoutput" value="steluitvoerin"/>
+    <cd:command name="defineaccent" value="definieeraccent"/>
+    <cd:command name="definecharacter" value="definieerkarakter"/>
+    <cd:command name="definecommand" value="definieercommando"/>
+    <cd:command name="startcoding" value="startcodering"/>
+    <cd:command name="stopcoding" value="stopcodering"/>
+    <cd:command name="definebodyfontenvironment" value="definieerkorpsomgeving"/>
+    <cd:command name="setupbodyfontenvironment" value="stelkorpsomgevingin"/>
+    <cd:command name="definebodyfont" value="definieerkorps"/>
+    <cd:command name="definefont" value="definieerfont"/>
+    <cd:command name="definefontsynonym" value="definieerfontsynoniem"/>
+    <cd:command name="definestyle" value="definieerletter"/>
+    <cd:command name="definefontstyle" value="definieerfontstijl"/>
+    <cd:command name="setupstrut" value="stelstrutin"/>
+    <cd:command name="setuptype" value="steltypein"/>
+    <cd:command name="type" value="type"/>
+    <cd:command name="typ" value="typ"/>
+    <cd:command name="arg" value="arg"/>
+    <cd:command name="tex" value="tex"/>
+    <cd:command name="definetyping" value="definieertypen"/>
+    <cd:command name="definetype" value="definieertype"/>
+    <cd:command name="setuptyping" value="steltypenin"/>
+    <cd:command name="typefile" value="typefile"/>
+    <cd:command name="setupfootnotes" value="stelvoetnotenin"/>
+    <cd:command name="setupfootnotedefinition" value="stelvoetnootdefinitiein"/>
+    <cd:command name="note" value="noot"/>
+    <cd:command name="footnote" value="voetnoot"/>
+    <cd:command name="footnotetext" value="voetnoottekst"/>
+    <cd:command name="startlocalfootnotes" value="startlokalevoetnoten"/>
+    <cd:command name="stoplocalfootnotes" value="stoplokalevoetnoten"/>
+    <cd:command name="placelocalfootnotes" value="plaatslokalevoetnoten"/>
+    <cd:command name="placefootnotes" value="plaatsvoetnoten"/>
+    <cd:command name="currentdate" value="huidigedatum"/>
+    <cd:command name="date" value="datum"/>
+    <cd:command name="weekday" value="weekdag"/>
+    <cd:command name="WEEKDAY" value="WEEKDAG"/>
+    <cd:command name="month" value="maand"/>
+    <cd:command name="MONTH" value="MAAND"/>
+    <cd:command name="Numbers" value="Cijfers"/>
+    <cd:command name="numbers" value="cijfers"/>
+    <cd:command name="romannumerals" value="romeins"/>
+    <cd:command name="Romannumerals" value="Romeins"/>
+    <cd:command name="character" value="letter"/>
+    <cd:command name="Character" value="Letter"/>
+    <cd:command name="characters" value="letters"/>
+    <cd:command name="Characters" value="Letters"/>
+    <cd:command name="unknown" value="onbekend"/>
+    <cd:command name="definesymbol" value="definieersymbool"/>
+    <cd:command name="definefiguresymbol" value="definieerfiguursymbool"/>
+    <cd:command name="symbol" value="symbool"/>
+    <cd:command name="setupsymbolset" value="stelsymboolsetin"/>
+    <cd:command name="showsymbolset" value="toonsymboolset"/>
+    <cd:command name="startsymbolset" value="startsymboolset"/>
+    <cd:command name="usesymbols" value="gebruiksymbolen"/>
+    <cd:command name="defineconversion" value="definieerconversie"/>
+    <cd:command name="convertnumber" value="converteernummer"/>
+    <cd:command name="setupcapitals" value="stelkapitalenin"/>
+    <cd:command name="smallcapped" value="kap"/>
+    <cd:command name="notsmallcapped" value="nokap"/>
+    <cd:command name="CAPPED" value="KAP"/>
+    <cd:command name="SmallCapped" value="Kap"/>
+    <cd:command name="SmallCaps" value="Kaps"/>
+    <cd:command name="WORD" value="WOORD"/>
+    <cd:command name="WORDS" value="WOORDEN"/>
+    <cd:command name="Word" value="Woord"/>
+    <cd:command name="Words" value="Woorden"/>
+    <cd:command name="stretched" value="uitgerekt"/>
+    <cd:command name="overstrike" value="doorstreep"/>
+    <cd:command name="overstrikes" value="doorstrepen"/>
+    <cd:command name="overbar" value="overstreep"/>
+    <cd:command name="overbars" value="overstrepen"/>
+    <cd:command name="underbar" value="onderstreep"/>
+    <cd:command name="underbars" value="onderstrepen"/>
+    <cd:command name="setupunderbar" value="stelonderstrepenin"/>
+    <cd:command name="setupbodyfont" value="stelkorpsin"/>
+    <cd:command name="switchtobodyfont" value="switchnaarkorps"/>
+    <cd:command name="showbodyfont" value="toonkorps"/>
+    <cd:command name="showbodyfontenvironment" value="toonkorpsomgeving"/>
+    <cd:command name="headtext" value="koptekst"/>
+    <cd:command name="labeltext" value="labeltekst"/>
+    <cd:command name="LABELTEXT" value="LABELTEKST"/>
+    <cd:command name="setupheadtext" value="stelkoptekstin"/>
+    <cd:command name="setuplabeltext" value="stellabeltekstin"/>
+    <cd:command name="marginrule" value="kantlijn"/>
+    <cd:command name="startmarginrule" value="startkantlijn"/>
+    <cd:command name="stopmarginrule" value="stopkantlijn"/>
+    <cd:command name="setupmarginrules" value="stelkantlijnin"/>
+    <cd:command name="blackrule" value="blokje"/>
+    <cd:command name="blackrules" value="blokjes"/>
+    <cd:command name="setupblackrules" value="stelblokjesin"/>
+    <cd:command name="setupscreens" value="stelrastersin"/>
+    <cd:command name="framed" value="omlijnd"/>
+    <cd:command name="inframed" value="inlijnd"/>
+    <cd:command name="mframed" value="wilijnd"/>
+    <cd:command name="inmframed" value="inwilijnd"/>
+    <cd:command name="setupframed" value="stelomlijndin"/>
+    <cd:command name="setuplinewidth" value="stellijndiktein"/>
+    <cd:command name="setupthinrules" value="steldunnelijnenin"/>
+    <cd:command name="thinrule" value="dunnelijn"/>
+    <cd:command name="thinrules" value="dunnelijnen"/>
+    <cd:command name="hairline" value="haarlijn"/>
+    <cd:command name="vl" value="vl"/>
+    <cd:command name="hl" value="hl"/>
+    <cd:command name="defineframed" value="definieeromlijnd"/>
+    <cd:command name="defineframedtext" value="definieerkadertekst"/>
+    <cd:command name="setupframedtexts" value="stelkadertekstenin"/>
+    <cd:command name="defineoverlay" value="definieeroverlay"/>
+    <cd:command name="definelayer" value="definieerlayer"/>
+    <cd:command name="background" value="achtergrond"/>
+    <cd:command name="startbackground" value="startachtergrond"/>
+    <cd:command name="stopbackground" value="stopachtergrond"/>
+    <cd:command name="setupbackground" value="stelachtergrondin"/>
+    <cd:command name="fillinrules" value="invullijnen"/>
+    <cd:command name="setupfillinrules" value="stelinvullijnenin"/>
+    <cd:command name="fillintext" value="invultekst"/>
+    <cd:command name="setupfillinlines" value="stelinvulregelsin"/>
+    <cd:command name="fillinline" value="invulregel"/>
+    <cd:command name="setuptextrules" value="steltekstlijnenin"/>
+    <cd:command name="textrule" value="tekstlijn"/>
+    <cd:command name="starttextrule" value="starttekstlijn"/>
+    <cd:command name="stoptextrule" value="stoptekstlijn"/>
+    <cd:command name="usemodule" value="gebruikmodule"/>
+    <cd:command name="usemodules" value="gebruikmodules"/>
+    <cd:command name="starttext" value="starttekst"/>
+    <cd:command name="stoptext" value="stoptekst"/>
+    <cd:command name="margintitle" value="margetitel"/>
+    <cd:command name="marginword" value="margewoord"/>
+    <cd:command name="margintext" value="margetekst"/>
+    <cd:command name="inleft" value="inlinker"/>
+    <cd:command name="inmargin" value="inmarge"/>
+    <cd:command name="inothermargin" value="inanderemarge"/>
+    <cd:command name="inright" value="inrechter"/>
+    <cd:command name="ininner" value="inbinnen"/>
+    <cd:command name="inouter" value="inbuiten"/>
+    <cd:command name="startmarginblock" value="startmargeblok"/>
+    <cd:command name="stopmarginblock" value="stopmargeblok"/>
+    <cd:command name="defineinmargin" value="definieerinmarge"/>
+    <cd:command name="setupinmargin" value="stelinmargein"/>
+    <cd:command name="setupmarginblocks" value="stelmargeblokkenin"/>
+    <cd:command name="inleftedge" value="inlinkerrand"/>
+    <cd:command name="inleftmargin" value="inlinkermarge"/>
+    <cd:command name="inrightmargin" value="inrechtermarge"/>
+    <cd:command name="inrightedge" value="inrechterrand"/>
+    <cd:command name="atleftmargin" value="oplinkermarge"/>
+    <cd:command name="atrightmargin" value="oprechtermarge"/>
+    <cd:command name="wordright" value="woordrechts"/>
+    <cd:command name="defineblank" value="definieerblanko"/>
+    <cd:command name="blank" value="blanko"/>
+    <cd:command name="setupblank" value="stelblankoin"/>
+    <cd:command name="correctwhitespace" value="corrigeerwitruimte"/>
+    <cd:command name="fixedspaces" value="vastespaties"/>
+    <cd:command name="fixedspace" value="vastespatie"/>
+    <cd:command name="nospace" value="geenspatie"/>
+    <cd:command name="space" value="spatie"/>
+    <cd:command name="nowhitespace" value="geenwitruimte"/>
+    <cd:command name="packed" value="opelkaar"/>
+    <cd:command name="startpacked" value="startopelkaar"/>
+    <cd:command name="stoppacked" value="stopopelkaar"/>
+    <cd:command name="startunpacked" value="startvanelkaar"/>
+    <cd:command name="stopunpacked" value="stopvanelkaar"/>
+    <cd:command name="startlinecorrection" value="startregelcorrectie"/>
+    <cd:command name="stoplinecorrection" value="stopregelcorrectie"/>
+    <cd:command name="godown" value="omlaag"/>
+    <cd:command name="whitespace" value="witruimte"/>
+    <cd:command name="noindenting" value="nietinspringen"/>
+    <cd:command name="indenting" value="inspringen"/>
+    <cd:command name="setupindenting" value="stelinspringenin"/>
+    <cd:command name="startalignment" value="startuitlijnen"/>
+    <cd:command name="stopalignment" value="stopuitlijnen"/>
+    <cd:command name="startlines" value="startregels"/>
+    <cd:command name="stoplines" value="stopregels"/>
+    <cd:command name="setupparagraphnumbering" value="stelparagraafnummerenin"/>
+    <cd:command name="setuplinenumbering" value="stelregelnummerenin"/>
+    <cd:command name="startlinenumbering" value="startregelnummeren"/>
+    <cd:command name="stoplinenumbering" value="stopregelnummeren"/>
+    <cd:command name="startline" value="startregel"/>
+    <cd:command name="stopline" value="stopregel"/>
+    <cd:command name="someline" value="eenregel"/>
+    <cd:command name="inline" value="inregel"/>
+    <cd:command name="crlf" value="crlf"/>
+    <cd:command name="emptylines" value="legeregels"/>
+    <cd:command name="setuplines" value="stelregelsin"/>
+    <cd:command name="startnarrower" value="startsmaller"/>
+    <cd:command name="stopnarrower" value="stopsmaller"/>
+    <cd:command name="setupnarrower" value="stelsmallerin"/>
+    <cd:command name="definetabulate" value="definieertabulatie"/>
+    <cd:command name="setuptabulate" value="steltabulatiein"/>
+    <cd:command name="starttable" value="starttabel"/>
+    <cd:command name="stoptable" value="stoptabel"/>
+    <cd:command name="starttables" value="starttabellen"/>
+    <cd:command name="stoptables" value="stoptabellen"/>
+    <cd:command name="setuptables" value="steltabellenin"/>
+    <cd:command name="definetabletemplate" value="definieertabelvorm"/>
+    <cd:command name="page" value="pagina"/>
+    <cd:command name="testcolumn" value="testkolom"/>
+    <cd:command name="testpage" value="testpagina"/>
+    <cd:command name="couplepage" value="koppelpagina"/>
+    <cd:command name="pagetype" value="soortpagina"/>
+    <cd:command name="processpage" value="verwerkpagina"/>
+    <cd:command name="couplepaper" value="koppelpapier"/>
+    <cd:command name="selectpaper" value="selecteerpapier"/>
+    <cd:command name="screen" value="scherm"/>
+    <cd:command name="definesection" value="definieersectie"/>
+    <cd:command name="definesectionblock" value="definieersectieblok"/>
+    <cd:command name="setupsectionblock" value="stelsectieblokin"/>
+    <cd:command name="setupsection" value="stelsectiein"/>
+    <cd:command name="notopandbottomlines" value="geenbovenenonderregels"/>
+    <cd:command name="noheaderandfooterlines" value="geenhoofdenvoetregels"/>
+    <cd:command name="setuptop" value="stelbovenin"/>
+    <cd:command name="setuptoptexts" value="stelboventekstenin"/>
+    <cd:command name="setupheader" value="stelhoofdin"/>
+    <cd:command name="setupheadertexts" value="stelhoofdtekstenin"/>
+    <cd:command name="setuppagenumbering" value="stelpaginanummeringin"/>
+    <cd:command name="getnumber" value="haalnummer"/>
+    <cd:command name="incrementnumber" value="verhoognummer"/>
+    <cd:command name="decrementnumber" value="verlaagnummer"/>
+    <cd:command name="resetnumber" value="resetnummer"/>
+    <cd:command name="setnumber" value="setnummer"/>
+    <cd:command name="setupnumber" value="stelnummerin"/>
+    <cd:command name="setupbottom" value="stelonderin"/>
+    <cd:command name="setupbottomtexts" value="stelondertekstenin"/>
+    <cd:command name="setupfooter" value="stelvoetin"/>
+    <cd:command name="setupfootertexts" value="stelvoettekstenin"/>
+    <cd:command name="setuppagenumber" value="stelpaginanummerin"/>
+    <cd:command name="setupsubpagenumber" value="stelsubpaginanummerin"/>
+    <cd:command name="subpagenumber" value="subpaginanummer"/>
+    <cd:command name="setuptext" value="steltekstin"/>
+    <cd:command name="setuptexttexts" value="stelteksttekstenin"/>
+    <cd:command name="definetext" value="definieertekst"/>
+    <cd:command name="pagenumber" value="paginanummer"/>
+    <cd:command name="completepagenumber" value="volledigepaginanummer"/>
+    <cd:command name="placepagenumber" value="plaatspaginanummer"/>
+    <cd:command name="items" value="items"/>
+    <cd:command name="setupitems" value="stelitemsin"/>
+    <cd:command name="leftaligned" value="regellinks"/>
+    <cd:command name="midaligned" value="regelmidden"/>
+    <cd:command name="rightaligned" value="regelrechts"/>
+    <cd:command name="startcolumns" value="startkolommen"/>
+    <cd:command name="stopcolumns" value="stopkolommen"/>
+    <cd:command name="setupcolumns" value="stelkolommenin"/>
+    <cd:command name="column" value="kolom"/>
+    <cd:command name="head" value="kop"/>
+    <cd:command name="but" value="but"/>
+    <cd:command name="item" value="som"/>
+    <cd:command name="nop" value="nop"/>
+    <cd:command name="mar" value="mar"/>
+    <cd:command name="sym" value="sym"/>
+    <cd:command name="its" value="its"/>
+    <cd:command name="ran" value="ran"/>
+    <cd:command name="headsym" value="kopsym"/>
+    <cd:command name="defineitemgroup" value="definieeritemgroep"/>
+    <cd:command name="setupitemgroup" value="stelitemgroepin"/>
+    <cd:command name="setupitemgroups" value="stelitemgroepenin"/>
+    <cd:command name="definehead" value="definieerkop"/>
+    <cd:command name="setuphead" value="stelkopin"/>
+    <cd:command name="setupheads" value="stelkoppenin"/>
+    <cd:command name="setupheadnumber" value="stelkopnummerin"/>
+    <cd:command name="headnumber" value="kopnummer"/>
+    <cd:command name="currentheadnumber" value="huidigekopnummer"/>
+    <cd:command name="determineheadnumber" value="bepaalkopnummer"/>
+    <cd:command name="resetmarking" value="resetmarkering"/>
+    <cd:command name="setupmarking" value="stelmarkeringin"/>
+    <cd:command name="definemarking" value="definieermarkering"/>
+    <cd:command name="nomarking" value="geenmarkering"/>
+    <cd:command name="marking" value="markeer"/>
+    <cd:command name="decouplemarking" value="ontkoppelmarkering"/>
+    <cd:command name="couplemarking" value="koppelmarkering"/>
+    <cd:command name="getmarking" value="haalmarkering"/>
+    <cd:command name="definelayout" value="definieerlayout"/>
+    <cd:command name="setuplayout" value="stellayoutin"/>
+    <cd:command name="adaptlayout" value="paslayoutaan"/>
+    <cd:command name="placeongrid" value="plaatsopgrid"/>
+    <cd:command name="moveongrid" value="verplaatsopgrid"/>
+    <cd:command name="showsetups" value="tooninstellingen"/>
+    <cd:command name="showframe" value="toonkader"/>
+    <cd:command name="showgrid" value="toongrid"/>
+    <cd:command name="showlayout" value="toonlayout"/>
+    <cd:command name="showprint" value="toonprint"/>
+    <cd:command name="showstruts" value="toonstruts"/>
+    <cd:command name="definepapersize" value="definieerpapierformaat"/>
+    <cd:command name="setuppapersize" value="stelpapierformaatin"/>
+    <cd:command name="setuppaper" value="stelpapierin"/>
+    <cd:command name="setuparranging" value="stelarrangerenin"/>
+    <cd:command name="version" value="versie"/>
+    <cd:command name="setupbackgrounds" value="stelachtergrondenin"/>
+    <cd:command name="setupalign" value="steluitlijnenin"/>
+    <cd:command name="setupwhitespace" value="stelwitruimtein"/>
+    <cd:command name="setupinteraction" value="stelinteractiein"/>
+    <cd:command name="setupinteractionmenu" value="stelinteractiemenuin"/>
+    <cd:command name="defineinteractionmenu" value="definieerinteractiemenu"/>
+    <cd:command name="disableinteractionmenu" value="blokkeerinteractiemenu"/>
+    <cd:command name="interactionmenu" value="interactiemenu"/>
+    <cd:command name="interactionbuttons" value="interactiebuttons"/>
+    <cd:command name="interactionbar" value="interactiebalk"/>
+    <cd:command name="setupinteractionbar" value="stelinteractiebalkin"/>
+    <cd:command name="setupinteractionscreen" value="stelinteractieschermin"/>
+    <cd:command name="placebookmarks" value="plaatsbookmarks"/>
+    <cd:command name="bookmark" value="bookmark"/>
+    <cd:command name="definelogo" value="definieerbeeldmerk"/>
+    <cd:command name="placelogos" value="plaatsbeeldmerken"/>
+    <cd:command name="definecolor" value="definieerkleur"/>
+    <cd:command name="definecolorgroup" value="definieerkleurgroep"/>
+    <cd:command name="definepalet" value="definieerpalet"/>
+    <cd:command name="graycolor" value="grijskleur"/>
+    <cd:command name="color" value="kleur"/>
+    <cd:command name="startcolor" value="startkleur"/>
+    <cd:command name="stopcolor" value="stopkleur"/>
+    <cd:command name="setupcolors" value="stelkleurenin"/>
+    <cd:command name="setupcolor" value="stelkleurin"/>
+    <cd:command name="setuppalet" value="stelpaletin"/>
+    <cd:command name="showcolor" value="toonkleur"/>
+    <cd:command name="showcolorgroup" value="toonkleurgroep"/>
+    <cd:command name="showpalet" value="toonpalet"/>
+    <cd:command name="comparecolorgroup" value="vergelijkkleurgroep"/>
+    <cd:command name="comparepalet" value="vergelijkpalet"/>
+    <cd:command name="colorvalue" value="kleurwaarde"/>
+    <cd:command name="greyvalue" value="grijswaarde"/>
+    <cd:command name="startraster" value="startraster"/>
+    <cd:command name="stopraster" value="stopraster"/>
+    <cd:command name="defineblock" value="definieerblok"/>
+    <cd:command name="setupblock" value="stelblokin"/>
+    <cd:command name="useblocks" value="gebruikblokken"/>
+    <cd:command name="processblocks" value="verwerkblokken"/>
+    <cd:command name="keepblocks" value="handhaafblokken"/>
+    <cd:command name="selectblocks" value="selecteerblokken"/>
+    <cd:command name="hideblocks" value="verbergblokken"/>
+    <cd:command name="bypassblocks" value="passeerblokken"/>
+    <cd:command name="forceblocks" value="forceerblokken"/>
+    <cd:command name="nomoreblocks" value="geenblokkenmeer"/>
+    <cd:command name="definelist" value="definieerlijst"/>
+    <cd:command name="definecombinedlist" value="definieersamengesteldelijst"/>
+    <cd:command name="listsymbol" value="lijstsymbool"/>
+    <cd:command name="placelist" value="plaatslijst"/>
+    <cd:command name="plaatsruwelijst" value="plaatslruweijst"/>
+    <cd:command name="placecombinedlist" value="plaatssamengesteldelijst"/>
+    <cd:command name="writetolist" value="schrijfnaarlijst"/>
+    <cd:command name="writebetweenlist" value="schrijftussenlijst"/>
+    <cd:command name="immediatetolist" value="directnaarlijst"/>
+    <cd:command name="immediatebetweenlist" value="directtussenlijst"/>
+    <cd:command name="setuplist" value="stellijstin"/>
+    <cd:command name="setupcombinedlist" value="stelsamengesteldelijstin"/>
+    <cd:command name="determinelistcharacteristics" value="bepaallijstkenmerken"/>
+    <cd:command name="listlength" value="lijstlengte"/>
+    <cd:command name="listwidth" value="lijstbreedte"/>
+    <cd:command name="listheight" value="lijsthoogte"/>
+    <cd:command name="nolist" value="geenlijst"/>
+    <cd:command name="definereferencelist" value="definieerreferentielijst"/>
+    <cd:command name="placereferencelist" value="plaatsreferentielijst"/>
+    <cd:command name="writetoreferencelist" value="schrijfnaarreferentielijst"/>
+    <cd:command name="setupreferencelist" value="stelreferentielijstin"/>
+    <cd:command name="definefloat" value="definieerplaatsblok"/>
+    <cd:command name="setupfloat" value="stelplaatsblokin"/>
+    <cd:command name="setupfloats" value="stelplaatsblokkenin"/>
+    <cd:command name="splitfloat" value="splitsplaatsblok"/>
+    <cd:command name="setupfloatsplitting" value="stelplaatsbloksplitsenin"/>
+    <cd:command name="placefloat" value="plaatsplaatsblok"/>
+    <cd:command name="movesidefloat" value="verplaatszijblok"/>
+    <cd:command name="defineplacement" value="definieerplaats"/>
+    <cd:command name="setupplacement" value="stelplaatsin"/>
+    <cd:command name="definecombination" value="definieercombinatie"/>
+    <cd:command name="startcombination" value="startcombinatie"/>
+    <cd:command name="stopcombination" value="stopcombinatie"/>
+    <cd:command name="placesidebyside" value="plaatsnaastelkaar"/>
+    <cd:command name="placeontopofeachother" value="plaatsonderelkaar"/>
+    <cd:command name="setupcaption" value="stelblokkopjein"/>
+    <cd:command name="setupcaptions" value="stelblokkopjesin"/>
+    <cd:command name="setupcombinations" value="stelcombinatiesin"/>
+    <cd:command name="startoverlay" value="startoverlay"/>
+    <cd:command name="stopoverlay" value="stopoverlay"/>
+    <cd:command name="defineregister" value="definieerregister"/>
+    <cd:command name="coupleregister" value="koppelregister"/>
+    <cd:command name="setupregister" value="stelregisterin"/>
+    <cd:command name="writetoregister" value="schrijfnaarregister"/>
+    <cd:command name="completeregister" value="volledigregister"/>
+    <cd:command name="placeregister" value="plaatsregister"/>
+    <cd:command name="determineregistercharacteristics" value="bepaalregisterkenmerken"/>
+    <cd:command name="definesorting" value="definieersorteren"/>
+    <cd:command name="definesynonyms" value="definieersynoniemen"/>
+    <cd:command name="setupsorting" value="stelsorterenin"/>
+    <cd:command name="setupsynonyms" value="stelsynoniemenin"/>
+    <cd:command name="startsynchronization" value="startsynchronisatie"/>
+    <cd:command name="stopsynchronization" value="stopsynchronisatie"/>
+    <cd:command name="setupsynchronizationbar" value="stelsynchronisatiebalkin"/>
+    <cd:command name="setupsynchronization" value="stelsynchronisatiein"/>
+    <cd:command name="synchronizationbar" value="synchronisatiebalk"/>
+    <cd:command name="synchronize" value="synchroniseer"/>
+    <cd:command name="useexternaldocument" value="gebruikexterndocument"/>
+    <cd:command name="useURL" value="gebruikURL"/>
+    <cd:command name="useurl" value="gebruikurl"/>
+    <cd:command name="setupurl" value="stelurlin"/>
+    <cd:command name="coupledocument" value="koppeldocument"/>
+    <cd:command name="setupprograms" value="stelprogrammasin"/>
+    <cd:command name="defineprogram" value="definieerprogramma"/>
+    <cd:command name="program" value="programma"/>
+    <cd:command name="setuppagetransitions" value="stelpaginaovergangenin"/>
+    <cd:command name="defineprofile" value="definieerprofiel"/>
+    <cd:command name="defineversion" value="definieerversie"/>
+    <cd:command name="markversion" value="markeerversie"/>
+    <cd:command name="selectversion" value="selecteerversie"/>
+    <cd:command name="startprofile" value="startprofiel"/>
+    <cd:command name="startversion" value="startversie"/>
+    <cd:command name="setupprofiles" value="stelprofielenin"/>
+    <cd:command name="setupversions" value="stelversiesin"/>
+    <cd:command name="stopprofile" value="stopprofiel"/>
+    <cd:command name="stopversion" value="stopversie"/>
+    <cd:command name="followprofile" value="volgprofiel"/>
+    <cd:command name="followprofileversion" value="volgprofielversie"/>
+    <cd:command name="followversion" value="volgversie"/>
+    <cd:command name="definedescription" value="doordefinieren"/>
+    <cd:command name="definelabel" value="doorlabelen"/>
+    <cd:command name="defineenumeration" value="doornummeren"/>
+    <cd:command name="defineindenting" value="doorspringen"/>
+    <cd:command name="setupdescriptions" value="steldoordefinierenin"/>
+    <cd:command name="setupenumerations" value="steldoornummerenin"/>
+    <cd:command name="setupindentations" value="steldoorspringenin"/>
+    <cd:command name="setuptab" value="steltabin"/>
+    <cd:command name="tab" value="tab"/>
+    <cd:command name="setupexternalfigures" value="stelexternefigurenin"/>
+    <cd:command name="showexternalfigures" value="toonexternefiguren"/>
+    <cd:command name="externalfigure" value="externfiguur"/>
+    <cd:command name="useexternalfigure" value="gebruikexternfiguur"/>
+    <cd:command name="startfigure" value="startfiguur"/>
+    <cd:command name="referring" value="refereer"/>
+    <cd:command name="remark" value="toelichting"/>
+    <cd:command name="colorbar" value="kleurenbalk"/>
+    <cd:command name="grid" value="rooster"/>
+    <cd:command name="button" value="button"/>
+    <cd:command name="menubutton" value="menubutton"/>
+    <cd:command name="setupbuttons" value="stelbuttonsin"/>
+    <cd:command name="usereferences" value="gebruikreferenties"/>
+    <cd:command name="reflijst" value="reflijst"/>
+    <cd:command name="stelreferentielijstin" value="stelreferentielijstin"/>
+    <cd:command name="setupreferencing" value="stelrefererenin"/>
+    <cd:command name="textreference" value="tekstreferentie"/>
+    <cd:command name="pagereference" value="paginareferentie"/>
+    <cd:command name="reference" value="referentie"/>
+    <cd:command name="definereference" value="definieerreferentie"/>
+    <cd:command name="definereferenceformat" value="definieerreferentieformaat"/>
+    <cd:command name="useJSscripts" value="gebruikJSscripts"/>
+    <cd:command name="from" value="uit"/>
+    <cd:command name="in" value="in"/>
+    <cd:command name="at" value="op"/>
+    <cd:command name="about" value="about"/>
+    <cd:command name="goto" value="naar"/>
+    <cd:command name="atpage" value="oppagina"/>
+    <cd:command name="somewhere" value="ergens"/>
+    <cd:command name="navigating" value="navigerend"/>
+    <cd:command name="ref" value="ref"/>
+    <cd:command name="gotobox" value="naarbox"/>
+    <cd:command name="gotopage" value="naarpagina"/>
+    <cd:command name="placeformula" value="plaatsformule"/>
+    <cd:command name="placesubformula" value="plaatssubformule"/>
+    <cd:command name="moveformula" value="verplaatsformule"/>
+    <cd:command name="setupformulas" value="stelformulesin"/>
+    <cd:command name="formulanumber" value="formulenummer"/>
+    <cd:command name="subformulanumber" value="subformulenummer"/>
+    <cd:command name="leg" value="leg"/>
+    <cd:command name="fact" value="geg"/>
+    <cd:command name="mathematics" value="wiskunde"/>
+    <cd:command name="dimension" value="dimensie"/>
+    <cd:command name="nodimension" value="geendimensie"/>
+    <cd:command name="startenvironment" value="startomgeving"/>
+    <cd:command name="stopenvironment" value="stopomgeving"/>
+    <cd:command name="startcomponent" value="startonderdeel"/>
+    <cd:command name="stopcomponent" value="stoponderdeel"/>
+    <cd:command name="startproduct" value="startprodukt"/>
+    <cd:command name="stopproduct" value="stopprodukt"/>
+    <cd:command name="startproject" value="startproject"/>
+    <cd:command name="stopproject" value="stopproject"/>
+    <cd:command name="setups" value="instellingen"/>
+    <cd:command name="project" value="project"/>
+    <cd:command name="component" value="onderdeel"/>
+    <cd:command name="produxt" value="produkt"/>
+    <cd:command name="environment" value="omgeving"/>
+    <cd:command name="nomorefiles" value="geenfilesmeer"/>
+    <cd:command name="getbuffer" value="haalbuffer"/>
+    <cd:command name="setupbuffer" value="stelbufferin"/>
+    <cd:command name="typebuffer" value="typebuffer"/>
+    <cd:command name="definebuffer" value="definieerbuffer"/>
+    <cd:command name="unitmeaning" value="betekenis"/>
+    <cd:command name="infull" value="voluit"/>
+    <cd:command name="quotation" value="citaat"/>
+    <cd:command name="quote" value="citeer"/>
+    <cd:command name="startquotation" value="startcitaat"/>
+    <cd:command name="stopquotation" value="stopcitaat"/>
+    <cd:command name="setupquote" value="stelciterenin"/>
+    <cd:command name="define" value="definieer"/>
+    <cd:command name="redo" value="herhaal"/>
+    <cd:command name="usecommands" value="gebruikcommandos"/>
+    <cd:command name="definestartstop" value="definieerstartstop"/>
+    <cd:command name="setupstartstop" value="stelstartstopin"/>
+    <cd:command name="startlocal" value="startlokaal"/>
+    <cd:command name="stoplocal" value="stoplokaal"/>
+    <cd:command name="startglobal" value="startglobaal"/>
+    <cd:command name="stopglobal" value="stopglobaal"/>
+    <cd:command name="macroname" value="naam"/>
+    <cd:command name="definemakeup" value="definieeropmaak"/>
+    <cd:command name="setupmakeup" value="stelopmaakin"/>
+    <cd:command name="startmakeup" value="startopmaak"/>
+    <cd:command name="stopmakeup" value="stopopmaak"/>
+    <cd:command name="useexternalsoundtrack" value="gebruikexterngeluidsfragment"/>
+    <cd:command name="useexternalfile" value="gebruikexternefile"/>
+    <cd:command name="useexternalfiles" value="gebruikexternefiles"/>
+    <cd:command name="referral" value="kenmerk"/>
+    <cd:command name="referraldate" value="kenmerkdatum"/>
+    <cd:command name="high" value="hoog"/>
+    <cd:command name="lohi" value="laho"/>
+    <cd:command name="low" value="laag"/>
+    <cd:command name="fraction" value="breuk"/>
+    <cd:command name="chem" value="chem"/>
+    <cd:command name="startopposite" value="startnaast"/>
+    <cd:command name="stopopposite" value="stopnaast"/>
+    <cd:command name="setupoppositeplacing" value="stelnaastplaatsenin"/>
+    <cd:command name="startpositioning" value="startpositioneren"/>
+    <cd:command name="stoppositioning" value="stoppositioneren"/>
+    <cd:command name="position" value="positioneer"/>
+    <cd:command name="setuppositioning" value="stelpositionerenin"/>
+    <cd:command name="rotate" value="roteer"/>
+    <cd:command name="setuprotate" value="stelroterenin"/>
+    <cd:command name="mirror" value="spiegel"/>
+    <cd:command name="scale" value="schaal"/>
+    <cd:command name="setupnumbering" value="stelnummerenin"/>
+    <cd:command name="reset" value="reset"/>
+    <cd:command name="setuppublications" value="stelpublicatiesin"/>
+    <cd:command name="publication" value="publicatie"/>
+    <cd:command name="definehbox" value="definieerhbox"/>
+    <cd:command name="adding" value="toevoegen"/>
+    <cd:command name="periods" value="punten"/>
+    <cd:command name="setuphyphenmark" value="stelkoppeltekenin"/>
+    <cd:command name="setupinterlinespace" value="stelinterliniein"/>
+    <cd:command name="setupspacing" value="stelspatieringin"/>
+    <cd:command name="setuptolerance" value="steltolerantiein"/>
+    <cd:command name="setupsystem" value="stelsysteemin"/>
+    <cd:command name="usepath" value="gebruikgebied"/>
+    <cd:command name="defineparagraphs" value="definieeralineas"/>
+    <cd:command name="setupparagraphs" value="stelalineasin"/>
+    <cd:command name="donttest" value="geentest"/>
+    <cd:command name="setupcomment" value="stelcommentaarin"/>
+    <cd:command name="comment" value="commentaar"/>
+    <cd:command name="definefield" value="definieerveld"/>
+    <cd:command name="definemainfield" value="definieerhoofdveld"/>
+    <cd:command name="definesubfield" value="definieersubveld"/>
+    <cd:command name="clonefield" value="kloonveld"/>
+    <cd:command name="copyfield" value="copieerveld"/>
+    <cd:command name="setupfield" value="stelveldin"/>
+    <cd:command name="setupfields" value="stelveldenin"/>
+    <cd:command name="field" value="veld"/>
+    <cd:command name="fitfield" value="passendveld"/>
+    <cd:command name="logfields" value="registreervelden"/>
+    <cd:command name="showfields" value="toonvelden"/>
+    <cd:command name="tooltip" value="suggestie"/>
+    <cd:command name="fillinfield" value="invulveld"/>
+    <cd:command name="definefieldstack" value="definieerveldstapel"/>
+    <cd:command name="fieldstack" value="veldstapel"/>
+    <cd:command name="setupforms" value="stelformulierenin"/>
+    <cd:command name="setupclipping" value="stelclipin"/>
+    <cd:command name="clip" value="clip"/>
+    <cd:command name="placelegend" value="plaatslegenda"/>
+    <cd:command name="setuplegend" value="stellegendain"/>
+    <cd:command name="setuppagecomment" value="stelpaginacommentaarin"/>
+    <cd:command name="setupstrut" value="stelstrutin"/>
+    <cd:command name="definerule" value="definieerlijn"/>
+    <cd:command name="placerule" value="plaatslijn"/>
+    <cd:command name="setuprule" value="stellijnin"/>
+    <cd:command name="definetextvariable" value="definieertekstvariabele"/>
+    <cd:command name="setuptextvariable" value="steltekstvariabelein"/>
+    <cd:command name="settextvariable" value="kentekstvariabeletoe"/>
+    <cd:command name="placetextvariable" value="plaatstekstvariabele"/>
+    <cd:command name="textvariable" value="tekstvariabele"/>
+    <cd:command name="definetextposition" value="definieertekstpositie"/>
+    <cd:command name="setuptextposition" value="steltekstpositiein"/>
+    <cd:command name="positiontext" value="positioneertekst"/>
+    <cd:command name="definerawfont" value="definerawfont"/>
+    <cd:command name="switchtorawfont" value="switchtorawfont"/>
+    <cd:command name="placeheadtext" value="plaatskoptekst"/>
+    <cd:command name="placeheadnumber" value="plaatskopnummer"/>
+    <cd:command name="definepagebreak" value="definieerpaginaovergang"/>
+    <cd:command name="definecolumnbreak" value="definieerkolomovergang"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="setupitemgroups" value="stelopsommingenin"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="topheight" value="bovenhoogte"/>
+    <cd:command name="topdistance" value="bovenafstand"/>
+    <cd:command name="headerheight" value="hoofdhoogte"/>
+    <cd:command name="headerdistance" value="hoofdafstand"/>
+    <cd:command name="textheight" value="teksthoogte"/>
+    <cd:command name="footerdistance" value="voetafstand"/>
+    <cd:command name="footerheight" value="voethoogte"/>
+    <cd:command name="bottomdistance" value="onderafstand"/>
+    <cd:command name="bottomheight" value="onderhoogte"/>
+    <cd:command name="marginwidth" value="margebreedte"/>
+    <cd:command name="leftmarginwidth" value="linkermargebreedte"/>
+    <cd:command name="rightmarginwidth" value="rechtermargebreedte"/>
+    <cd:command name="margindistance" value="margeafstand"/>
+    <cd:command name="leftmargindistance" value="linkermargeafstand"/>
+    <cd:command name="rightmargindistance" value="rechtermargeafstand"/>
+    <cd:command name="edgewidth" value="randbreedte"/>
+    <cd:command name="leftedgewidth" value="linkerrandbreedte"/>
+    <cd:command name="rightedgewidth" value="rechterrandbreedte"/>
+    <cd:command name="edgedistance" value="randafstand"/>
+    <cd:command name="leftedgedistance" value="linkerrandafstand"/>
+    <cd:command name="rightedgedistance" value="rechterrandafstand"/>
+    <cd:command name="innermarginwidth" value="binnenmargebreedte"/>
+    <cd:command name="outermarginwidth" value="buitenmargebreedte"/>
+    <cd:command name="innermargindistance" value="binnenmargeafstand"/>
+    <cd:command name="outermargindistance" value="buitenmargeafstand"/>
+    <cd:command name="inneredgewidth" value="binnenrandbreedte"/>
+    <cd:command name="outeredgewidth" value="buitenrandbreedte"/>
+    <cd:command name="inneredgedistance" value="binnenrandafstand"/>
+    <cd:command name="outeredgedistance" value="buitenrandafstand"/>
+    <cd:command name="textwidth" value="tekstbreedte"/>
+    <cd:command name="makeupwidth" value="zetbreedte"/>
+    <cd:command name="makeupheight" value="zethoogte"/>
+    <cd:command name="topspace" value="kopwit"/>
+    <cd:command name="bottomspace" value="bodemwit"/>
+    <cd:command name="backspace" value="rugwit"/>
+    <cd:command name="cutspace" value="snijwit"/>
+    <cd:command name="paperwidth" value="papierbreedte"/>
+    <cd:command name="paperheight" value="papierhoogte"/>
+    <cd:command name="printpaperwidth" value="printpapierbreedte"/>
+    <cd:command name="printpaperheight" value="printpapierhoogte"/>
+    <cd:command name="pageoffset" value="paginaoffset"/>
+    <cd:command name="pagedepth" value="paginadiepte"/>
+    <cd:command name="headlevel" value="kopniveau"/>
+    <cd:command name="linewidth" value="lijndikte"/>
+    <cd:command name="totalnumberofpages" value="totaalaantalpaginas"/>
+    <cd:command name="numberofsubpages" value="aantalsubpaginas"/>
+    <cd:command name="useXMLfilter" value="gebruikXMLfilter"/>
+    <cd:command name="definecolumnset" value="definieerkolomgroep"/>
+    <cd:command name="setupcolumnset" value="stelkolomgroepin"/>
+    <cd:command name="startcolumnset" value="startkolomgroep"/>
+    <cd:command name="stopcolumnset" value="stopkolomgroep"/>
+    <cd:command name="setupcolumnsetlines" value="stelkolomgroepregelsin"/>
+    <cd:command name="setupcolumnsetstart" value="stelkolomgroepstartin"/>
+    <cd:command name="startcolumnmakeup" value="startkolomopmaak"/>
+    <cd:command name="stopcolumnmakeup" value="stopkolomopmaak"/>
+    <cd:command name="usetypescript" value="gebruiktypescript"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="startdocument" value="startdocument"/>
+    <cd:command name="stopdocument" value="stopdocument"/>
+    <cd:command name="startoverzicht" value="startoverzicht"/>
+    <cd:command name="stopoverzicht" value="stopoverzicht"/>
+    <cd:command name="label" value="label"/>
+    <cd:command name="labels" value="labels"/>
+    <cd:command name="domicile" value="woonplaats"/>
+  </cd:commands>
+
+</cd:interface>
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
new file mode 100644
index 000000000..4f16a5ac0
--- /dev/null
+++ b/tex/context/interface/keys-ro.xml
@@ -0,0 +1,1576 @@
+<?xml version="1.0"?>
+
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2004.11.16">
+
+  <cd:variables>
+    <cd:variable name="one" value="unu"/>
+    <cd:variable name="two" value="doi"/>
+    <cd:variable name="three" value="trei"/>
+    <cd:variable name="four" value="patru"/>
+    <cd:variable name="five" value="cinci"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="sunday" value="duminica"/>
+    <cd:variable name="monday" value="luni"/>
+    <cd:variable name="tuesday" value="marti"/>
+    <cd:variable name="wednesday" value="miercuri"/>
+    <cd:variable name="thursday" value="joi"/>
+    <cd:variable name="friday" value="vineri"/>
+    <cd:variable name="saturday" value="sambata"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="january" value="ianuarie"/>
+    <cd:variable name="february" value="februarie"/>
+    <cd:variable name="march" value="martie"/>
+    <cd:variable name="april" value="aprilie"/>
+    <cd:variable name="may" value="mai"/>
+    <cd:variable name="june" value="iunie"/>
+    <cd:variable name="july" value="iulie"/>
+    <cd:variable name="august" value="august"/>
+    <cd:variable name="september" value="septembrie"/>
+    <cd:variable name="october" value="octombrie"/>
+    <cd:variable name="november" value="noiembrie"/>
+    <cd:variable name="december" value="decembrie"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="atpage" value="lapagina"/>
+    <cd:variable name="hencefore" value="precedent"/>
+    <cd:variable name="hereafter" value="urmator"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="sectionlevel" value="sectiune"/>
+    <cd:variable name="part" value="parte"/>
+    <cd:variable name="chapter" value="capitol"/>
+    <cd:variable name="subject" value="subiect"/>
+    <cd:variable name="section" value="sectiune"/>
+    <cd:variable name="title" value="titlu"/>
+    <cd:variable name="margintitle" value="titlumarginal"/>
+    <cd:variable name="content" value="cuprins"/>
+    <cd:variable name="contents" value="cuprinsuri"/>
+    <cd:variable name="appendix" value="apendix"/>
+    <cd:variable name="appendices" value="apendixuri"/>
+    <cd:variable name="bodypart" value="principal"/>
+    <cd:variable name="bodymatter" value="principalul"/>
+    <cd:variable name="frontpart" value="prolog"/>
+    <cd:variable name="frontmatter" value="prologul"/>
+    <cd:variable name="backpart" value="epilog"/>
+    <cd:variable name="backmatter" value="epilogul"/>
+    <cd:variable name="footnote" value="notasubsol"/>
+    <cd:variable name="system" value="sistem"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="subsection" value="subsectiune"/>
+    <cd:variable name="subsubsection" value="subsubsectiune"/>
+    <cd:variable name="subsubsubsection" value="subsubsubsectiune"/>
+    <cd:variable name="subsubsubsubsection" value="subsubsubsubsectiune"/>
+    <cd:variable name="subsubsubsubsubsection" value="subsubsubsubsubsectiune"/>
+    <cd:variable name="subsubject" value="subsubiect"/>
+    <cd:variable name="subsubsubject" value="subsubsubiect"/>
+    <cd:variable name="subsubsubsubject" value="subsubsubsubiect"/>
+    <cd:variable name="subsubsubsubsubject" value="subsubsubsubsubiect"/>
+    <cd:variable name="subsubsubsubsubsubject" value="subsubsubsubsubsubiect"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="flushleft" value="flushleft"/>
+    <cd:variable name="flushright" value="flushright"/>
+    <cd:variable name="center" value="center"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="typing" value="typing"/>
+    <cd:variable name="file" value="fisier"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="formula" value="formula"/>
+    <cd:variable name="formulae" value="formule"/>
+    <cd:variable name="figure" value="figura"/>
+    <cd:variable name="figures" value="figure"/>
+    <cd:variable name="table" value="tabelul"/>
+    <cd:variable name="tables" value="tabelele"/>
+    <cd:variable name="graphic" value="graficul"/>
+    <cd:variable name="graphics" value="graficele"/>
+    <cd:variable name="intermezzo" value="intermezzo"/>
+    <cd:variable name="intermezzi" value="intermezzi"/>
+    <cd:variable name="index" value="index"/>
+    <cd:variable name="indices" value="indexuri"/>
+    <cd:variable name="abbreviation" value="abreviere"/>
+    <cd:variable name="abbreviations" value="abrevieri"/>
+    <cd:variable name="logo" value="logo"/>
+    <cd:variable name="logos" value="logos"/>
+    <cd:variable name="unit" value="unitate"/>
+    <cd:variable name="units" value="unitati"/>
+    <cd:variable name="line" value="linia"/>
+    <cd:variable name="lines" value="linii"/>
+    <cd:variable name="framedtext" value="textinconjurat"/>
+    <cd:variable name="quotation" value="citat"/>
+    <cd:variable name="quote" value="minicitat"/>
+    <cd:variable name="speech" value="speech"/>
+    <cd:variable name="itemize" value="enumerare"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="leftquotation" value="citatstanga"/>
+    <cd:constant name="rightquotation" value="citatdreapta"/>
+    <cd:constant name="leftquote" value="minicitatstanga"/>
+    <cd:constant name="rightquote" value="minicitatdreapta"/>
+    <cd:constant name="midsentence" value="midsentence"/>
+    <cd:constant name="leftsentence" value="propozitiestanga"/>
+    <cd:constant name="rightsentence" value="propozitiedreapta"/>
+    <cd:constant name="leftsubsentence" value="subpropozitiestanga"/>
+    <cd:constant name="rightsubsentence" value="subpropozitiedreapta"/>
+    <cd:constant name="leftspeech" value="leftspeech"/>
+    <cd:constant name="middlespeech" value="middlespeech"/>
+    <cd:constant name="rightspeech" value="rightspeech"/>
+    <cd:constant name="limittext" value="limittext"/>
+    <cd:constant name="date" value="data"/>
+    <cd:constant name="spacebefore" value="spatiuinainte"/>
+    <cd:constant name="spaceinbetween" value="spaceinbetween"/>
+    <cd:constant name="spaceafter" value="spatiudupa"/>
+    <cd:constant name="sidespacebefore" value="spatiulateralinainte"/>
+    <cd:constant name="sidespaceafter" value="spatiulateraldupa"/>
+    <cd:constant name="to" value="catre"/>
+    <cd:constant name="indicator" value="indicator"/>
+    <cd:constant name="background" value="fundal"/>
+    <cd:constant name="backgrounddepth" value="adancimefundal"/>
+    <cd:constant name="backgroundcorner" value="coltfundal"/>
+    <cd:constant name="splitcolor" value="splitcolor"/>
+    <cd:constant name="backgroundcolor" value="culoarefundal"/>
+    <cd:constant name="foregroundcolor" value="foregroundcolor"/>
+    <cd:constant name="foregroundstyle" value="foregroundstyle"/>
+    <cd:constant name="clipoffset" value="clipoffset"/>
+    <cd:constant name="backgroundoffset" value="offsetfundal"/>
+    <cd:constant name="backgroundscreen" value="ecranfundal"/>
+    <cd:constant name="backgroundradius" value="razafundal"/>
+    <cd:constant name="address" value="adresa"/>
+    <cd:constant name="stopper" value="stopper"/>
+    <cd:constant name="distance" value="distanta"/>
+    <cd:constant name="paragraph" value="paragraf"/>
+    <cd:constant name="axis" value="axa"/>
+    <cd:constant name="author" value="autor"/>
+    <cd:constant name="auto" value="auto"/>
+    <cd:constant name="autofile" value="autofile"/>
+    <cd:constant name="balance" value="balanta"/>
+    <cd:constant name="wfactor" value="factorw"/>
+    <cd:constant name="inner" value="intern"/>
+    <cd:constant name="blank" value="blanc"/>
+    <cd:constant name="obstruction" value="obstructie"/>
+    <cd:constant name="blockway" value="blockway"/>
+    <cd:constant name="bottomspace" value="spatiujos"/>
+    <cd:constant name="top" value="sus"/>
+    <cd:constant name="topdistance" value="distantasus"/>
+    <cd:constant name="topframe" value="framesus"/>
+    <cd:constant name="topoffset" value="offsetsus"/>
+    <cd:constant name="topstate" value="staresus"/>
+    <cd:constant name="width" value="latime"/>
+    <cd:constant name="maxwidth" value="latimemaxima"/>
+    <cd:constant name="minwidth" value="latimeminima"/>
+    <cd:constant name="source" value="sursa"/>
+    <cd:constant name="command" value="comanda"/>
+    <cd:constant name="commands" value="comenzi"/>
+    <cd:constant name="component" value="component"/>
+    <cd:constant name="contrastcolor" value="culoarecontrast"/>
+    <cd:constant name="conversion" value="conversie"/>
+    <cd:constant name="headconversion" value="conversietitlu"/>
+    <cd:constant name="headlabel" value="etichetatitlu"/>
+    <cd:constant name="criterium" value="criteriu"/>
+    <cd:constant name="date" value="data"/>
+    <cd:constant name="default" value="implicit"/>
+    <cd:constant name="depth" value="inaltime"/>
+    <cd:constant name="depthcorrection" value="corectieadancime"/>
+    <cd:constant name="continue" value="continua"/>
+    <cd:constant name="doublesided" value="douafete"/>
+    <cd:constant name="dummy" value="dummy"/>
+    <cd:constant name="unit" value="unitate"/>
+    <cd:constant name="ownnumber" value="numarpropriu"/>
+    <cd:constant name="evenmargin" value="marginepara"/>
+    <cd:constant name="expansion" value="expansiune"/>
+    <cd:constant name="factor" value="factor"/>
+    <cd:constant name="convertfile" value="convertestefisier"/>
+    <cd:constant name="file" value="fisier"/>
+    <cd:constant name="inputfile" value="inputfile"/>
+    <cd:constant name="size" value="dimensiune"/>
+    <cd:constant name="autofocus" value="autofocus"/>
+    <cd:constant name="focus" value="focus"/>
+    <cd:constant name="directory" value="director"/>
+    <cd:constant name="grid" value="grid"/>
+    <cd:constant name="big" value="mare"/>
+    <cd:constant name="get" value="adu"/>
+    <cd:constant name="hang" value="suspenda"/>
+    <cd:constant name="repeat" value="repeta"/>
+    <cd:constant name="hfactor" value="hfactor"/>
+    <cd:constant name="corner" value="colt"/>
+    <cd:constant name="hoffset" value="hoffset"/>
+    <cd:constant name="frames" value="frames"/>
+    <cd:constant name="header" value="antet"/>
+    <cd:constant name="headerdistance" value="distantaantet"/>
+    <cd:constant name="headerstate" value="stareantet"/>
+    <cd:constant name="height" value="inaltime"/>
+    <cd:constant name="maxheight" value="inaltimemaxima"/>
+    <cd:constant name="minheight" value="inaltimeminima"/>
+    <cd:constant name="mindepth" value="mindepth"/>
+    <cd:constant name="current" value="curent"/>
+    <cd:constant name="in" value="in"/>
+    <cd:constant name="indenting" value="aliniat"/>
+    <cd:constant name="interaction" value="interactiune"/>
+    <cd:constant name="interlinespace" value="spatiereinterliniara"/>
+    <cd:constant name="items" value="elemente"/>
+    <cd:constant name="frame" value="frame"/>
+    <cd:constant name="framedepth" value="adancimeframe"/>
+    <cd:constant name="framecorner" value="coltframe"/>
+    <cd:constant name="framecolor" value="culoareframe"/>
+    <cd:constant name="frameoffset" value="offsetframe"/>
+    <cd:constant name="frameradius" value="razaframe"/>
+    <cd:constant name="marginedge" value="coltbordura"/>
+    <cd:constant name="marginedgetext" value="textcoltbordura"/>
+    <cd:constant name="aligncharacter" value="aliniazacaracter"/>
+    <cd:constant name="alignmentcharacter" value="alierecaracter"/>
+    <cd:constant name="small" value="mic"/>
+    <cd:constant name="color" value="culoare"/>
+    <cd:constant name="column" value="coloana"/>
+    <cd:constant name="columns" value="coloane"/>
+    <cd:constant name="columndistance" value="distantacoloane"/>
+    <cd:constant name="headcommand" value="headcommand"/>
+    <cd:constant name="headcolor" value="culoaretitlu"/>
+    <cd:constant name="headstyle" value="stiltitlu"/>
+    <cd:constant name="afterhead" value="dupatitlu"/>
+    <cd:constant name="veroffset" value="veroffset"/>
+    <cd:constant name="coupling" value="cuplare"/>
+    <cd:constant name="couplingway" value="modcuplare"/>
+    <cd:constant name="beforehead" value="inaintetitlu"/>
+    <cd:constant name="topspace" value="spatiusus"/>
+    <cd:constant name="bodyfont" value="fonttext"/>
+    <cd:constant name="label" value="eticheta"/>
+    <cd:constant name="empty" value="gol"/>
+    <cd:constant name="style" value="stil"/>
+    <cd:constant name="rule" value="rigla"/>
+    <cd:constant name="rulethickness" value="grosimerigla"/>
+    <cd:constant name="rulecolor" value="culoarerigla"/>
+    <cd:constant name="list" value="lista"/>
+    <cd:constant name="leftwidth" value="latimestanga"/>
+    <cd:constant name="leftframe" value="framestanga"/>
+    <cd:constant name="leftcolor" value="culoarestanga"/>
+    <cd:constant name="leftstyle" value="stilstanga"/>
+    <cd:constant name="leftmargin" value="marginestanga"/>
+    <cd:constant name="leftmargindistance" value="distantamarginestanga"/>
+    <cd:constant name="leftoffset" value="offsetstanga"/>
+    <cd:constant name="leftedge" value="bordurastanga"/>
+    <cd:constant name="leftedgedistance" value="distantabordurastanga"/>
+    <cd:constant name="lefttext" value="textstanga"/>
+    <cd:constant name="left" value="stanga"/>
+    <cd:constant name="nleft" value="nstanga"/>
+    <cd:constant name="logo" value="logo"/>
+    <cd:constant name="logos" value="logos"/>
+    <cd:constant name="local" value="local"/>
+    <cd:constant name="margin" value="margine"/>
+    <cd:constant name="margindistance" value="distantamargine"/>
+    <cd:constant name="margintext" value="textmargine"/>
+    <cd:constant name="marking" value="marcaje"/>
+    <cd:constant name="marcolor" value="culoaremarcaj"/>
+    <cd:constant name="marstyle" value="stilmarcaj"/>
+    <cd:constant name="menu" value="meniu"/>
+    <cd:constant name="splitmethod" value="splitmethod"/>
+    <cd:constant name="textmethod" value="textmethod"/>
+    <cd:constant name="sidemethod" value="sidemethod"/>
+    <cd:constant name="method" value="metoda"/>
+    <cd:constant name="middle" value="mijloc"/>
+    <cd:constant name="middletext" value="textmijloc"/>
+    <cd:constant name="max" value="max"/>
+    <cd:constant name="min" value="min"/>
+    <cd:constant name="sample" value="exemplu"/>
+    <cd:constant name="after" value="dupa"/>
+    <cd:constant name="name" value="nume"/>
+    <cd:constant name="commandafter" value="comandadupa"/>
+    <cd:constant name="ntop" value="nsus"/>
+    <cd:constant name="level" value="nivel"/>
+    <cd:constant name="levels" value="nivele"/>
+    <cd:constant name="nbottom" value="njos"/>
+    <cd:constant name="norm" value="norm"/>
+    <cd:constant name="nlines" value="nlinii"/>
+    <cd:constant name="number" value="numar"/>
+    <cd:constant name="numbercommand" value="comandanumar"/>
+    <cd:constant name="numbering" value="numerotare"/>
+    <cd:constant name="numbercolor" value="culoarenumar"/>
+    <cd:constant name="numberstyle" value="stilnumar"/>
+    <cd:constant name="numberseparator" value="separatornumar"/>
+    <cd:constant name="object" value="obiect"/>
+    <cd:constant name="offset" value="offset"/>
+    <cd:constant name="bottom" value="jos"/>
+    <cd:constant name="bottomdistance" value="distantajos"/>
+    <cd:constant name="bottomframe" value="framejos"/>
+    <cd:constant name="bottomoffset" value="offsetjos"/>
+    <cd:constant name="bottomstate" value="starejos"/>
+    <cd:constant name="oddmargin" value="margineimpara"/>
+    <cd:constant name="at" value="la"/>
+    <cd:constant name="option" value="optiune"/>
+    <cd:constant name="page" value="pagina"/>
+    <cd:constant name="pagecommand" value="comandapagina"/>
+    <cd:constant name="pagecolor" value="culoarepagina"/>
+    <cd:constant name="pagestyle" value="stilpagina"/>
+    <cd:constant name="pagenumber" value="numarpagina"/>
+    <cd:constant name="pageboundaries" value="marginipagina"/>
+    <cd:constant name="pagestate" value="pagestate"/>
+    <cd:constant name="palet" value="paleta"/>
+    <cd:constant name="paper" value="hartie"/>
+    <cd:constant name="location" value="locatie"/>
+    <cd:constant name="placestopper" value="punestopper"/>
+    <cd:constant name="place" value="pune"/>
+    <cd:constant name="placehead" value="punetitlu"/>
+    <cd:constant name="position" value="pozitie"/>
+    <cd:constant name="prefix" value="prefix"/>
+    <cd:constant name="preset" value="preset"/>
+    <cd:constant name="preview" value="previzualizare"/>
+    <cd:constant name="process" value="process"/>
+    <cd:constant name="spot" value="spot"/>
+    <cd:constant name="dot" value="punct"/>
+    <cd:constant name="arrow" value="sageata"/>
+    <cd:constant name="edge" value="bordura"/>
+    <cd:constant name="edgedistance" value="distantabordura"/>
+    <cd:constant name="screen" value="ecran"/>
+    <cd:constant name="rightwidth" value="marginedreapta"/>
+    <cd:constant name="rightframe" value="framedreapta"/>
+    <cd:constant name="rightcolor" value="culoaredreapta"/>
+    <cd:constant name="rightstyle" value="stildreapta"/>
+    <cd:constant name="rightmargin" value="marginedreapta"/>
+    <cd:constant name="rightmargindistance" value="distantamarginedreapta"/>
+    <cd:constant name="rightoffset" value="offsetdreapta"/>
+    <cd:constant name="rightedge" value="borduradreapta"/>
+    <cd:constant name="rightedgedistance" value="distantacoltdreapta"/>
+    <cd:constant name="righttext" value="textdreapta"/>
+    <cd:constant name="right" value="dreapta"/>
+    <cd:constant name="nright" value="ndreapta"/>
+    <cd:constant name="reduction" value="reducere"/>
+    <cd:constant name="referencing" value="referinta"/>
+    <cd:constant name="line" value="linie"/>
+    <cd:constant name="linecorrection" value="corectielinie"/>
+    <cd:constant name="lines" value="linii"/>
+    <cd:constant name="stretch" value="dilatat"/>
+    <cd:constant name="resolution" value="rezolutie"/>
+    <cd:constant name="rotation" value="rotatie"/>
+    <cd:constant name="orientation" value="orientation"/>
+    <cd:constant name="horoffset" value="offsetoriz"/>
+    <cd:constant name="backspace" value="spatiuspate"/>
+    <cd:constant name="direction" value="directie"/>
+    <cd:constant name="scale" value="scala"/>
+    <cd:constant name="separator" value="separator"/>
+    <cd:constant name="display" value="display"/>
+    <cd:constant name="scope" value="scop"/>
+    <cd:constant name="section" value="sectiune"/>
+    <cd:constant name="sectionnumber" value="numarsectiune"/>
+    <cd:constant name="setups" value="setups"/>
+    <cd:constant name="cutspace" value="cutspace"/>
+    <cd:constant name="family" value="familie"/>
+    <cd:constant name="space" value="spatiu"/>
+    <cd:constant name="spacing" value="spatiere"/>
+    <cd:constant name="split" value="split"/>
+    <cd:constant name="splitoffset" value="splitoffset"/>
+    <cd:constant name="indentnext" value="aliniaturmator"/>
+    <cd:constant name="step" value="pas"/>
+    <cd:constant name="stack" value="stack"/>
+    <cd:constant name="start" value="start"/>
+    <cd:constant name="state" value="stare"/>
+    <cd:constant name="stop" value="stop"/>
+    <cd:constant name="radius" value="raza"/>
+    <cd:constant name="dash" value="dash"/>
+    <cd:constant name="sub" value="sub"/>
+    <cd:constant name="subtitle" value="subtitlu"/>
+    <cd:constant name="symbol" value="simbol"/>
+    <cd:constant name="symbolset" value="setsimbol"/>
+    <cd:constant name="symcolor" value="culoaresimbol"/>
+    <cd:constant name="symstyle" value="stilsimbol"/>
+    <cd:constant name="synonym" value="sinonim"/>
+    <cd:constant name="synonymcolor" value="culoaresinonim"/>
+    <cd:constant name="synonymstyle" value="stilsinonim"/>
+    <cd:constant name="tab" value="tab"/>
+    <cd:constant name="sign" value="semn"/>
+    <cd:constant name="text" value="text"/>
+    <cd:constant name="textwidth" value="latimetext"/>
+    <cd:constant name="textcommand" value="comandatext"/>
+    <cd:constant name="textsize" value="dimensiunetext"/>
+    <cd:constant name="textcolor" value="culoaretext"/>
+    <cd:constant name="textstyle" value="stiltext"/>
+    <cd:constant name="textseparator" value="separatortext"/>
+    <cd:constant name="textstate" value="staretext"/>
+    <cd:constant name="title" value="titlu"/>
+    <cd:constant name="aligntitle" value="alinieretitlu"/>
+    <cd:constant name="tolerance" value="toleranta"/>
+    <cd:constant name="inbetween" value="intre"/>
+    <cd:constant name="type" value="type"/>
+    <cd:constant name="align" value="aliniere"/>
+    <cd:constant name="urlspace" value="spatiuurl"/>
+    <cd:constant name="urlalternative" value="urlalternativ"/>
+    <cd:constant name="from" value="dela"/>
+    <cd:constant name="alternative" value="alternativ"/>
+    <cd:constant name="increment" value="increment"/>
+    <cd:constant name="incrementnumber" value="numarincrement"/>
+    <cd:constant name="resetnumber" value="resetnumber"/>
+    <cd:constant name="reference" value="referinta"/>
+    <cd:constant name="unknownreference" value="referintanecunoscuta"/>
+    <cd:constant name="footer" value="subsol"/>
+    <cd:constant name="footerdistance" value="distantasubsol"/>
+    <cd:constant name="footerstate" value="staresubsol"/>
+    <cd:constant name="voffset" value="voffset"/>
+    <cd:constant name="next" value="urmatorul"/>
+    <cd:constant name="before" value="inainte"/>
+    <cd:constant name="commandbefore" value="comandainainte"/>
+    <cd:constant name="previous" value="precendent"/>
+    <cd:constant name="previousnumber" value="numarprecedent"/>
+    <cd:constant name="delay" value="intarziere"/>
+    <cd:constant name="way" value="mod"/>
+    <cd:constant name="random" value="aleator"/>
+    <cd:constant name="white" value="alb"/>
+    <cd:constant name="xfactor" value="xfactor"/>
+    <cd:constant name="xmax" value="xmax"/>
+    <cd:constant name="xoffset" value="xoffset"/>
+    <cd:constant name="xscale" value="xscala"/>
+    <cd:constant name="xstep" value="xstep"/>
+    <cd:constant name="yfactor" value="yfactor"/>
+    <cd:constant name="ymax" value="ymax"/>
+    <cd:constant name="yoffset" value="yoffset"/>
+    <cd:constant name="yscale" value="yscala"/>
+    <cd:constant name="ystep" value="ystep"/>
+    <cd:constant name="samepage" value="aceeasipagina"/>
+    <cd:constant name="sidealign" value="sidealign"/>
+    <cd:constant name="side" value="parte"/>
+    <cd:constant name="fieldlayer" value="fieldlayer"/>
+    <cd:constant name="textlayer" value="textlayer"/>
+    <cd:constant name="fieldbackgroundcolor" value="culoarefundalcamp"/>
+    <cd:constant name="fieldframecolor" value="culoareframecamp"/>
+    <cd:constant name="fieldoffset" value="offsetcamp"/>
+    <cd:constant name="openaction" value="actiunedeschidere"/>
+    <cd:constant name="closeaction" value="actiuneinchidere"/>
+    <cd:constant name="openpageaction" value="actiunedeschiderepagina"/>
+    <cd:constant name="closepageaction" value="actiuneinchiderepagina"/>
+    <cd:constant name="clickin" value="clickintru"/>
+    <cd:constant name="clickout" value="clickies"/>
+    <cd:constant name="regionin" value="regiuneintrare"/>
+    <cd:constant name="regionout" value="regiuneiesire"/>
+    <cd:constant name="focusin" value="focusin"/>
+    <cd:constant name="focusout" value="focusout"/>
+    <cd:constant name="afterkey" value="dupatasta"/>
+    <cd:constant name="format" value="format"/>
+    <cd:constant name="validate" value="verifica"/>
+    <cd:constant name="calculate" value="calculeaza"/>
+    <cd:constant name="click" value="click"/>
+    <cd:constant name="vcommand" value="comandav"/>
+    <cd:constant name="icommand" value="comandai"/>
+    <cd:constant name="ccommand" value="comandac"/>
+    <cd:constant name="textdistance" value="textdistance"/>
+    <cd:constant name="textmargin" value="textmargin"/>
+    <cd:constant name="keyword" value="keyword"/>
+  </cd:constants>
+
+  <cd:constants>
+    <cd:constant name="extras" value="extras"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="on" value="on"/>
+    <cd:variable name="serried" value="serried"/>
+    <cd:variable name="joinedup" value="unit"/>
+    <cd:variable name="absolute" value="absolut"/>
+    <cd:variable name="background" value="fundal"/>
+    <cd:variable name="backward" value="inapoi"/>
+    <cd:variable name="subbackward" value="subinapoi"/>
+    <cd:variable name="action" value="actiune"/>
+    <cd:variable name="stopper" value="stopper"/>
+    <cd:variable name="paragraph" value="paragraf"/>
+    <cd:variable name="all" value="tot"/>
+    <cd:variable name="always" value="totdeauna"/>
+    <cd:variable name="auto" value="auto"/>
+    <cd:variable name="autointro" value="autointro"/>
+    <cd:variable name="both" value="ambele"/>
+    <cd:variable name="inner" value="intern"/>
+    <cd:variable name="blank" value="blank"/>
+    <cd:variable name="disable" value="dezactivat"/>
+    <cd:variable name="top" value="sus"/>
+    <cd:variable name="wide" value="larg"/>
+    <cd:variable name="width" value="latime"/>
+    <cd:variable name="outer" value="extern"/>
+    <cd:variable name="numbers" value="numere"/>
+    <cd:variable name="Numbers" value="Numere"/>
+    <cd:variable name="command" value="comanda"/>
+    <cd:variable name="commands" value="comenzi"/>
+    <cd:variable name="concept" value="concept"/>
+    <cd:variable name="day" value="zi"/>
+    <cd:variable name="date" value="data"/>
+    <cd:variable name="default" value="implicit"/>
+    <cd:variable name="final" value="final"/>
+    <cd:variable name="depth" value="adancime"/>
+    <cd:variable name="doublesided" value="douafete"/>
+    <cd:variable name="first" value="primul"/>
+    <cd:variable name="each" value="fiecare"/>
+    <cd:variable name="singlesided" value="ofata"/>
+    <cd:variable name="somewhere" value="undeva"/>
+    <cd:variable name="nowhere" value="niciunde"/>
+    <cd:variable name="even" value="par"/>
+    <cd:variable name="external" value="extern"/>
+    <cd:variable name="file" value="fisier"/>
+    <cd:variable name="flexible" value="flexibil"/>
+    <cd:variable name="force" value="fortat"/>
+    <cd:variable name="used" value="folosit"/>
+    <cd:variable name="none" value="niciunul"/>
+    <cd:variable name="nomarking" value="faramarcare"/>
+    <cd:variable name="nonumber" value="nonumber"/>
+    <cd:variable name="nowhite" value="faraalb"/>
+    <cd:variable name="rotated" value="rotat"/>
+    <cd:variable name="mirrored" value="oglindit"/>
+    <cd:variable name="global" value="global"/>
+    <cd:variable name="grid" value="grila"/>
+    <cd:variable name="big" value="mare"/>
+    <cd:variable name="bigbodyfont" value="bigbodyfont"/>
+    <cd:variable name="bigpreference" value="preferintamare"/>
+    <cd:variable name="gray" value="gri"/>
+    <cd:variable name="halfline" value="jumatatelinie"/>
+    <cd:variable name="keep" value="mentine"/>
+    <cd:variable name="hanging" value="suspendat"/>
+    <cd:variable name="repeat" value="repetat"/>
+    <cd:variable name="fix" value="fix"/>
+    <cd:variable name="here" value="aici"/>
+    <cd:variable name="header" value="antet"/>
+    <cd:variable name="high" value="inalt"/>
+    <cd:variable name="height" value="inaltime"/>
+    <cd:variable name="horizontal" value="orizontal"/>
+    <cd:variable name="current" value="curent"/>
+    <cd:variable name="hz" value="hz"/>
+    <cd:variable name="nohz" value="nohz"/>
+    <cd:variable name="italic" value="italic"/>
+    <cd:variable name="inherit" value="inherit"/>
+    <cd:variable name="inleft" value="instanga"/>
+    <cd:variable name="inmargin" value="inmargine"/>
+    <cd:variable name="inright" value="indreapta"/>
+    <cd:variable name="interaction" value="interactiune"/>
+    <cd:variable name="intext" value="intext"/>
+    <cd:variable name="intro" value="intro"/>
+    <cd:variable name="its" value="propriu"/>
+    <cd:variable name="yes" value="da"/>
+    <cd:variable name="year" value="an"/>
+    <cd:variable name="frame" value="incadrat"/>
+    <cd:variable name="marginedge" value="marginebordura"/>
+    <cd:variable name="cap" value="cap"/>
+    <cd:variable name="capital" value="majuscula"/>
+    <cd:variable name="referral" value="referinta"/>
+    <cd:variable name="small" value="mic"/>
+    <cd:variable name="smallnormal" value="micnormal"/>
+    <cd:variable name="smallslanted" value="micinclinat"/>
+    <cd:variable name="smallslantedbold" value="micinclinataldin"/>
+    <cd:variable name="smallitalic" value="micitalic"/>
+    <cd:variable name="smallitalicbold" value="micitalicaldin"/>
+    <cd:variable name="smalltype" value="mictype"/>
+    <cd:variable name="smallbold" value="micaldin"/>
+    <cd:variable name="smallboldslanted" value="micaldininclinat"/>
+    <cd:variable name="smallbolditalic" value="micaldininclinat"/>
+    <cd:variable name="smallbodyfont" value="smallbodyfont"/>
+    <cd:variable name="color" value="culoare"/>
+    <cd:variable name="column" value="coloana"/>
+    <cd:variable name="columns" value="coloane"/>
+    <cd:variable name="head" value="antet"/>
+    <cd:variable name="low" value="jos"/>
+    <cd:variable name="last" value="ultim"/>
+    <cd:variable name="label" value="eticheta"/>
+    <cd:variable name="lohi" value="lohi"/>
+    <cd:variable name="tall" value="inalt"/>
+    <cd:variable name="empty" value="gol"/>
+    <cd:variable name="Character" value="Caracter"/>
+    <cd:variable name="character" value="caracter"/>
+    <cd:variable name="Characters" value="Caractere"/>
+    <cd:variable name="characters" value="caractere"/>
+    <cd:variable name="landscape" value="vedere"/>
+    <cd:variable name="rule" value="rigla"/>
+    <cd:variable name="list" value="lista"/>
+    <cd:variable name="leftmargin" value="marginestanga"/>
+    <cd:variable name="leftpage" value="paginastanga"/>
+    <cd:variable name="leftedge" value="bordurastanga"/>
+    <cd:variable name="left" value="stanga"/>
+    <cd:variable name="local" value="local"/>
+    <cd:variable name="new" value="nou"/>
+    <cd:variable name="MONTH" value="LUNA"/>
+    <cd:variable name="month" value="luna"/>
+    <cd:variable name="mar" value="mar"/>
+    <cd:variable name="margin" value="margine"/>
+    <cd:variable name="max" value="max"/>
+    <cd:variable name="min" value="min"/>
+    <cd:variable name="mediaeval" value="medieval"/>
+    <cd:variable name="medium" value="mediu"/>
+    <cd:variable name="middle" value="centru"/>
+    <cd:variable name="after" value="dupa"/>
+    <cd:variable name="name" value="nume"/>
+    <cd:variable name="opposite" value="opus"/>
+    <cd:variable name="no" value="nu"/>
+    <cd:variable name="negative" value="negativ"/>
+    <cd:variable name="positive" value="positiv"/>
+    <cd:variable name="not" value="nu"/>
+    <cd:variable name="never" value="niciodata"/>
+    <cd:variable name="normal" value="normal"/>
+    <cd:variable name="number" value="numar"/>
+    <cd:variable name="offset" value="offset"/>
+    <cd:variable name="unknown" value="necunoscut"/>
+    <cd:variable name="bottom" value="subsol"/>
+    <cd:variable name="odd" value="impar"/>
+    <cd:variable name="packed" value="impachetat"/>
+    <cd:variable name="unpacked" value="despachetat"/>
+    <cd:variable name="makeup" value="marcaj"/>
+    <cd:variable name="atmargin" value="lamargine"/>
+    <cd:variable name="overlay" value="overlay"/>
+    <cd:variable name="page" value="pagina"/>
+    <cd:variable name="pagenumber" value="numarpagina"/>
+    <cd:variable name="paper" value="foaie"/>
+    <cd:variable name="display" value="display"/>
+    <cd:variable name="reverse" value="reverse"/>
+    <cd:variable name="fit" value="ajustat"/>
+    <cd:variable name="postscript" value="postscript"/>
+    <cd:variable name="preview" value="previzualizare"/>
+    <cd:variable name="program" value="program"/>
+    <cd:variable name="process" value="process"/>
+    <cd:variable name="spot" value="spot"/>
+    <cd:variable name="dot" value="punct"/>
+    <cd:variable name="ran" value="rulat"/>
+    <cd:variable name="edge" value="bordura"/>
+    <cd:variable name="screen" value="ecran"/>
+    <cd:variable name="rectangular" value="rectangular"/>
+    <cd:variable name="rightmargin" value="marginedreapta"/>
+    <cd:variable name="rightpage" value="paginadreapta"/>
+    <cd:variable name="rightedge" value="borduradreapta"/>
+    <cd:variable name="right" value="dreapta"/>
+    <cd:variable name="line" value="linie"/>
+    <cd:variable name="register" value="registru"/>
+    <cd:variable name="relative" value="relativ"/>
+    <cd:variable name="reset" value="reset"/>
+    <cd:variable name="Romannumerals" value="Numereromane"/>
+    <cd:variable name="romannumerals" value="numereromane"/>
+    <cd:variable name="greek" value="grec"/>
+    <cd:variable name="Greek" value="Grec"/>
+    <cd:variable name="round" value="rotund"/>
+    <cd:variable name="rotate" value="rotit"/>
+    <cd:variable name="stretch" value="dilatat"/>
+    <cd:variable name="backspace" value="spatiuspate"/>
+    <cd:variable name="broad" value="broad"/>
+    <cd:variable name="row" value="rand"/>
+    <cd:variable name="slanted" value="inclinat"/>
+    <cd:variable name="slantedbold" value="inclinataldin"/>
+    <cd:variable name="synchronize" value="synchronize"/>
+    <cd:variable name="italicbold" value="italicaldin"/>
+    <cd:variable name="sectionnumber" value="numarsetiune"/>
+    <cd:variable name="narrow" value="ingust"/>
+    <cd:variable name="cutspace" value="cutspace"/>
+    <cd:variable name="tolerant" value="tolerant"/>
+    <cd:variable name="space" value="spatiu"/>
+    <cd:variable name="standard" value="standard"/>
+    <cd:variable name="start" value="start"/>
+    <cd:variable name="stop" value="stop"/>
+    <cd:variable name="strict" value="strict"/>
+    <cd:variable name="strut" value="strut"/>
+    <cd:variable name="sub" value="sub"/>
+    <cd:variable name="sym" value="sym"/>
+    <cd:variable name="symbol" value="simbol"/>
+    <cd:variable name="text" value="text"/>
+    <cd:variable name="back" value="inapot"/>
+    <cd:variable name="test" value="text"/>
+    <cd:variable name="inbetween" value="intre"/>
+    <cd:variable name="type" value="type"/>
+    <cd:variable name="off" value="dezactivat"/>
+    <cd:variable name="url" value="url"/>
+    <cd:variable name="URL" value="URL"/>
+    <cd:variable name="fixed" value="fixat"/>
+    <cd:variable name="loose" value="larg"/>
+    <cd:variable name="continue" value="continuu"/>
+    <cd:variable name="vertical" value="vertical"/>
+    <cd:variable name="bold" value="aldin"/>
+    <cd:variable name="boldslanted" value="aldininclinat"/>
+    <cd:variable name="bolditalic" value="aldinitalic"/>
+    <cd:variable name="quadruple" value="cvadrupul"/>
+    <cd:variable name="footer" value="subsol"/>
+    <cd:variable name="next" value="urmatorul"/>
+    <cd:variable name="before" value="inainte"/>
+    <cd:variable name="foreground" value="primplan"/>
+    <cd:variable name="preference" value="preferinta"/>
+    <cd:variable name="temporary" value="temporar"/>
+    <cd:variable name="forward" value="avans"/>
+    <cd:variable name="subforward" value="subavans"/>
+    <cd:variable name="previous" value="precedent"/>
+    <cd:variable name="value" value="valoare"/>
+    <cd:variable name="week" value="saptamana"/>
+    <cd:variable name="weekday" value="zisaptamana"/>
+    <cd:variable name="WEEKDAY" value="ZISAPTAMANA"/>
+    <cd:variable name="random" value="aleator"/>
+    <cd:variable name="white" value="alb"/>
+    <cd:variable name="very" value="foarte"/>
+    <cd:variable name="verytolerant" value="foartetolerant"/>
+    <cd:variable name="verystrict" value="foartestrict"/>
+    <cd:variable name="see" value="vezi"/>
+    <cd:variable name="smallcaps" value="majusculemici"/>
+    <cd:variable name="WORD" value="CUVANT"/>
+    <cd:variable name="firstpage" value="primapagina"/>
+    <cd:variable name="firstcolumn" value="firstcolumn"/>
+    <cd:variable name="previouspage" value="paginaanterioara"/>
+    <cd:variable name="nextpage" value="paginaurmatoare"/>
+    <cd:variable name="lastpage" value="ultimapagina"/>
+    <cd:variable name="lastcolumn" value="lastcolumn"/>
+    <cd:variable name="lastpagenumber" value="lastpagenumber"/>
+    <cd:variable name="subpage" value="subpagina"/>
+    <cd:variable name="firstsubpage" value="primasubpagina"/>
+    <cd:variable name="previoussubpage" value="subpaginaanterioara"/>
+    <cd:variable name="nextsubpage" value="urmatoareasubpagina"/>
+    <cd:variable name="lastsubpage" value="ultimasubpagina"/>
+    <cd:variable name="nextevenpage" value="paginaparaurmatoarea"/>
+    <cd:variable name="nextoddpage" value="paginaimparaurmatoarea"/>
+    <cd:variable name="previousevenpage" value="paginaparaprecedenta"/>
+    <cd:variable name="previousoddpage" value="paginaimparaprecedenta"/>
+    <cd:variable name="readonly" value="readonly"/>
+    <cd:variable name="required" value="obligatoriu"/>
+    <cd:variable name="protected" value="protejat"/>
+    <cd:variable name="sorted" value="sortat"/>
+    <cd:variable name="unavailable" value="nedisponibil"/>
+    <cd:variable name="hidden" value="ascuns"/>
+    <cd:variable name="printable" value="tiparibil"/>
+    <cd:variable name="bookmark" value="semncarte"/>
+    <cd:variable name="nocheck" value="nocheck"/>
+    <cd:variable name="innermargin" value="innermargin"/>
+    <cd:variable name="outermargin" value="outermargin"/>
+    <cd:variable name="inneredge" value="inneredge"/>
+    <cd:variable name="outeredge" value="outeredge"/>
+    <cd:variable name="controls" value="controale"/>
+    <cd:variable name="nothanging" value="nothanging"/>
+    <cd:variable name="hyphenated" value="despsilabe"/>
+    <cd:variable name="nothyphenated" value="nedespsilabe"/>
+    <cd:variable name="overprint" value="overprint"/>
+    <cd:variable name="knockout" value="knockout"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="controls" value="controale"/>
+    <cd:constant name="global" value="global"/>
+    <cd:constant name="overprint" value="overprint"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="conversion" value="conversie"/>
+    <cd:variable name="by" value="de"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="dx" value="dx"/>
+    <cd:constant name="dy" value="dy"/>
+    <cd:constant name="nx" value="nx"/>
+    <cd:constant name="ny" value="ny"/>
+    <cd:constant name="nr" value="nr"/>
+    <cd:constant name="nl" value="nl"/>
+    <cd:constant name="nc" value="nc"/>
+    <cd:constant name="sx" value="sx"/>
+    <cd:constant name="sy" value="sy"/>
+    <cd:constant name="n" value="n"/>
+    <cd:constant name="vfil" value="vfil"/>
+    <cd:constant name="hfil" value="hfil"/>
+    <cd:constant name="strut" value="strut"/>
+    <cd:constant name="reset" value="reset"/>
+    <cd:constant name="set" value="set"/>
+    <cd:constant name="escape" value="escape"/>
+    <cd:constant name="apa" value="apa"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="calligraphic" value="caligrafic"/>
+    <cd:variable name="handwritten" value="scrismanual"/>
+    <cd:variable name="sansserif" value="sansserif"/>
+    <cd:variable name="roman" value="roman"/>
+    <cd:variable name="teletype" value="teletype"/>
+    <cd:variable name="type" value="type"/>
+    <cd:variable name="serif" value="serif"/>
+    <cd:variable name="regular" value="regular"/>
+    <cd:variable name="support" value="suport"/>
+    <cd:variable name="sans" value="sans"/>
+    <cd:variable name="mono" value="mono"/>
+  </cd:variables>
+
+  <cd:elements>
+    <cd:element name="begin" value="inceput"/>
+    <cd:element name="end" value="sfarsit"/>
+    <cd:element name="coupled" value="cuplat"/>
+    <cd:element name="get" value="get"/>
+    <cd:element name="currentlocal" value="localcurent"/>
+    <cd:element name="endsetup" value="endsetup"/>
+    <cd:element name="load" value="incarca"/>
+    <cd:element name="emptyone" value="gol"/>
+    <cd:element name="emptytwo" value="gol"/>
+    <cd:element name="list" value="lista"/>
+    <cd:element name="listof" value="listade"/>
+    <cd:element name="local" value="local"/>
+    <cd:element name="place" value="pune"/>
+    <cd:element name="reserve" value="rezervat"/>
+    <cd:element name="start" value="start"/>
+    <cd:element name="setup" value="setare"/>
+    <cd:element name="stop" value="stop"/>
+    <cd:element name="increment" value="increment"/>
+    <cd:element name="next" value="urmatorul"/>
+    <cd:element name="complete" value="complet"/>
+    <cd:element name="previous" value="precedent"/>
+    <cd:element name="previouslocal" value="precedentlocal"/>
+    <cd:element name="see" value="vezi"/>
+    <cd:element name="type" value="type"/>
+    <cd:element name="makeup" value="makeup"/>
+    <cd:element name="text" value="text"/>
+  </cd:elements>
+
+  <cd:variables>
+    <cd:variable name="buffer" value="buffer"/>
+    <cd:variable name="linenote" value="linenote"/>
+    <cd:variable name="comment" value="comentariu"/>
+    <cd:variable name="interactionmenu" value="meniuinteractiune"/>
+    <cd:variable name="postponing" value="postponing"/>
+    <cd:variable name="hiding" value="ascundere"/>
+    <cd:variable name="tabulate" value="tabulate"/>
+    <cd:variable name="tabulatehead" value="tabulatehead"/>
+    <cd:variable name="tabulatetail" value="tabulatetail"/>
+    <cd:variable name="fact" value="fapt"/>
+    <cd:variable name="legend" value="legenda"/>
+    <cd:variable name="formula" value="formula"/>
+    <cd:variable name="tablehead" value="antettabel"/>
+    <cd:variable name="tabletail" value="subsoltabel"/>
+    <cd:variable name="setups" value="setari"/>
+    <cd:variable name="helptext" value="textajutator"/>
+    <cd:variable name="localenvironment" value="mediulocal"/>
+    <cd:variable name="sectionblockenvironment" value="blocsectiuneambient"/>
+    <cd:variable name="pagecomment" value="comentariupagina"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="FirstPage" value="PrimaPagina"/>
+    <cd:variable name="PreviousPage" value="PaginaPrecedenta"/>
+    <cd:variable name="NextPage" value="PaginaUrmatoare"/>
+    <cd:variable name="LastPage" value="UltimaPagina"/>
+    <cd:variable name="PreviousJump" value="SaltPrecedent"/>
+    <cd:variable name="NextJump" value="SaltUrmator"/>
+    <cd:variable name="SwapViewer" value="SchimbaVizualizator"/>
+    <cd:variable name="ExitViewer" value="IesireVizualizator"/>
+    <cd:variable name="CloseDocument" value="InchideDocument"/>
+    <cd:variable name="SaveDocument" value="SalvareDocument"/>
+    <cd:variable name="SaveNamedDocument" value="SaveNamedDocument"/>
+    <cd:variable name="OpenNamedDocument" value="OpenNamedDocument"/>
+    <cd:variable name="ViewerHelp" value="AjutorVizualizator"/>
+    <cd:variable name="PrintDocument" value="TiparesteDocument"/>
+    <cd:variable name="SearchDocument" value="CautaDocument"/>
+    <cd:variable name="SearchAgain" value="CautaDinNou"/>
+    <cd:variable name="Query" value="Query"/>
+    <cd:variable name="QueryAgain" value="QueryAgain"/>
+    <cd:variable name="GotoPage" value="LaPagina"/>
+    <cd:variable name="StartMovie" value="StartFilm"/>
+    <cd:variable name="StopMovie" value="StopFilm"/>
+    <cd:variable name="PauseMovie" value="PauzaFilm"/>
+    <cd:variable name="ResumeMovie" value="RepornesteFilm"/>
+    <cd:variable name="StartSound" value="StartSunet"/>
+    <cd:variable name="StopSound" value="StopSunet"/>
+    <cd:variable name="PauseSound" value="PauzaSunet"/>
+    <cd:variable name="ResumeSound" value="RepornesteSunet"/>
+    <cd:variable name="StartRendering" value="StartRendering"/>
+    <cd:variable name="StopRendering" value="StopRendering"/>
+    <cd:variable name="PauseRendering" value="PauseRendering"/>
+    <cd:variable name="ResumeRendering" value="ResumeRendering"/>
+    <cd:variable name="SaveForm" value="SalveazaFormular"/>
+    <cd:variable name="LoadForm" value="IncarcaFormular"/>
+    <cd:variable name="ResetForm" value="ResetareFormular"/>
+    <cd:variable name="SubmitForm" value="TrimiteFormular"/>
+    <cd:variable name="HideField" value="AscundeCamp"/>
+    <cd:variable name="ShowField" value="AfiseazaCamp"/>
+    <cd:variable name="FitWidth" value="AjustatLatime"/>
+    <cd:variable name="FitHeight" value="AjustatInaltime"/>
+    <cd:variable name="HideLayer" value="HideLayer"/>
+    <cd:variable name="VideLayer" value="VideLayer"/>
+    <cd:variable name="ToggleLayer" value="ToggleLayer"/>
+  </cd:variables>
+
+  <cd:variables>
+    <cd:variable name="New" value="Nou"/>
+    <cd:variable name="Balloon" value="Balon"/>
+    <cd:variable name="Addition" value="Adaugare"/>
+    <cd:variable name="Help" value="Ajutor"/>
+    <cd:variable name="Paragraph" value="Paragraf"/>
+    <cd:variable name="Key" value="Cheie"/>
+  </cd:variables>
+
+  <cd:constants>
+    <cd:constant name="bet" value="bet"/>
+    <cd:constant name="dat" value="dat"/>
+    <cd:constant name="ken" value="ken"/>
+    <cd:constant name="ref" value="ref"/>
+  </cd:constants>
+
+  <cd:variables>
+    <cd:variable name="formeel" value="formeel"/>
+    <cd:variable name="informeel" value="informeel"/>
+    <cd:variable name="rekening" value="rekening"/>
+    <cd:variable name="sticker" value="sticker"/>
+    <cd:variable name="sheet" value="sheet"/>
+    <cd:variable name="brief" value="brief"/>
+    <cd:variable name="ls" value="ls"/>
+  </cd:variables>
+
+  <cd:commands>
+    <cd:command name="language" value="limba"/>
+    <cd:command name="mainlanguage" value="limbaprincipala"/>
+    <cd:command name="translate" value="traduce"/>
+    <cd:command name="installlanguage" value="instalarelimba"/>
+    <cd:command name="setuplanguage" value="setarelimba"/>
+    <cd:command name="showmakeup" value="afiseazamakeup"/>
+    <cd:command name="useencoding" value="folosestecodificarea"/>
+    <cd:command name="usespecials" value="folosestespeciale"/>
+    <cd:command name="defineoutput" value="definesteoutput"/>
+    <cd:command name="setupoutput" value="setareoutput"/>
+    <cd:command name="defineaccent" value="definesteaccent"/>
+    <cd:command name="definecharacter" value="definestecaracter"/>
+    <cd:command name="definecommand" value="definestecomanda"/>
+    <cd:command name="startcoding" value="startcodificare"/>
+    <cd:command name="stopcoding" value="stopcodificare"/>
+    <cd:command name="definebodyfontenvironment" value="definestemediulfonttext"/>
+    <cd:command name="setupbodyfontenvironment" value="seteazamediulfonttext"/>
+    <cd:command name="definebodyfont" value="definestefonttext"/>
+    <cd:command name="definefont" value="definestefont"/>
+    <cd:command name="definefontsynonym" value="definestesinonimfont"/>
+    <cd:command name="definestyle" value="definestestil"/>
+    <cd:command name="definefontstyle" value="definestestilfont"/>
+    <cd:command name="setupstrut" value="seteazastrut"/>
+    <cd:command name="setuptype" value="seteazatype"/>
+    <cd:command name="type" value="type"/>
+    <cd:command name="typ" value="typ"/>
+    <cd:command name="arg" value="arg"/>
+    <cd:command name="tex" value="tex"/>
+    <cd:command name="definetyping" value="definestetyping"/>
+    <cd:command name="definetype" value="definetype"/>
+    <cd:command name="setuptyping" value="seteazatyping"/>
+    <cd:command name="typefile" value="typefile"/>
+    <cd:command name="setupfootnotes" value="seteazanotasubsol"/>
+    <cd:command name="setupfootnotedefinition" value="seteazadefinireanotasubsol"/>
+    <cd:command name="note" value="nota"/>
+    <cd:command name="footnote" value="notasubsol"/>
+    <cd:command name="footnotetext" value="footnotetext"/>
+    <cd:command name="startlocalfootnotes" value="startnotesubsollocale"/>
+    <cd:command name="stoplocalfootnotes" value="stopnotesubsollocale"/>
+    <cd:command name="placelocalfootnotes" value="punenotesubsollocale"/>
+    <cd:command name="placefootnotes" value="punenotesubsol"/>
+    <cd:command name="currentdate" value="datacurenta"/>
+    <cd:command name="date" value="data"/>
+    <cd:command name="weekday" value="zidinsaptamana"/>
+    <cd:command name="WEEKDAY" value="ZIDINSAPTAMANA"/>
+    <cd:command name="month" value="luna"/>
+    <cd:command name="MONTH" value="LUNA"/>
+    <cd:command name="Numbers" value="Numere"/>
+    <cd:command name="numbers" value="numere"/>
+    <cd:command name="romannumerals" value="numereromane"/>
+    <cd:command name="Romannumerals" value="Numereromane"/>
+    <cd:command name="character" value="litera"/>
+    <cd:command name="Character" value="Litera"/>
+    <cd:command name="characters" value="litere"/>
+    <cd:command name="Characters" value="Litere"/>
+    <cd:command name="unknown" value="necunoscut"/>
+    <cd:command name="definesymbol" value="definestesimbol"/>
+    <cd:command name="definefiguresymbol" value="definestesimbolfigura"/>
+    <cd:command name="symbol" value="simbol"/>
+    <cd:command name="setupsymbolset" value="seteazasimbol"/>
+    <cd:command name="showsymbolset" value="afiseazasetsimboluri"/>
+    <cd:command name="startsymbolset" value="startsetsimboluri"/>
+    <cd:command name="usesymbols" value="folosestesimboluri"/>
+    <cd:command name="defineconversion" value="definesteconversie"/>
+    <cd:command name="convertnumber" value="convertestenumar"/>
+    <cd:command name="setupcapitals" value="seteazamajuscule"/>
+    <cd:command name="smallcapped" value="kap"/>
+    <cd:command name="notsmallcapped" value="nokap"/>
+    <cd:command name="CAPPED" value="KAP"/>
+    <cd:command name="SmallCapped" value="Kap"/>
+    <cd:command name="SmallCaps" value="Kaps"/>
+    <cd:command name="WORD" value="CUVANT"/>
+    <cd:command name="WORDS" value="CUVINTE"/>
+    <cd:command name="Word" value="Cuvant"/>
+    <cd:command name="Words" value="Cuvinte"/>
+    <cd:command name="stretched" value="intins"/>
+    <cd:command name="overstrike" value="liniepeste"/>
+    <cd:command name="overstrikes" value="liniipeste"/>
+    <cd:command name="overbar" value="barasus"/>
+    <cd:command name="overbars" value="supralinie"/>
+    <cd:command name="underbar" value="sublinie"/>
+    <cd:command name="underbars" value="sublinii"/>
+    <cd:command name="setupunderbar" value="seteazasublinie"/>
+    <cd:command name="setupbodyfont" value="seteazafonttext"/>
+    <cd:command name="switchtobodyfont" value="trecilafonttext"/>
+    <cd:command name="showbodyfont" value="afiseazafonttext"/>
+    <cd:command name="showbodyfontenvironment" value="afiseazamediufonttext"/>
+    <cd:command name="headtext" value="texttitlu"/>
+    <cd:command name="labeltext" value="texteticheta"/>
+    <cd:command name="LABELTEXT" value="TEXTETICHETA"/>
+    <cd:command name="setupheadtext" value="seteazatexttitlu"/>
+    <cd:command name="setuplabeltext" value="seteazatexteticheta"/>
+    <cd:command name="marginrule" value="liniemargine"/>
+    <cd:command name="startmarginrule" value="startliniemargine"/>
+    <cd:command name="stopmarginrule" value="stopliniemargine"/>
+    <cd:command name="setupmarginrules" value="seteazaliniimargine"/>
+    <cd:command name="blackrule" value="linieneagra"/>
+    <cd:command name="blackrules" value="liniinegre"/>
+    <cd:command name="setupblackrules" value="seteazaliniinegre"/>
+    <cd:command name="setupscreens" value="seteazaecrane"/>
+    <cd:command name="framed" value="framed"/>
+    <cd:command name="inframed" value="inframed"/>
+    <cd:command name="mframed" value="maframed"/>
+    <cd:command name="inmframed" value="inmaframed"/>
+    <cd:command name="setupframed" value="seteazainconjurat"/>
+    <cd:command name="setuplinewidth" value="seteazagrosimelinie"/>
+    <cd:command name="setupthinrules" value="seteazaliniesubtire"/>
+    <cd:command name="thinrule" value="liniesubtire"/>
+    <cd:command name="thinrules" value="liniisubtiri"/>
+    <cd:command name="hairline" value="firdepar"/>
+    <cd:command name="vl" value="vl"/>
+    <cd:command name="hl" value="hl"/>
+    <cd:command name="defineframed" value="definesteinconjurare"/>
+    <cd:command name="defineframedtext" value="definestetextinconjurat"/>
+    <cd:command name="setupframedtexts" value="definestetexteinconjurate"/>
+    <cd:command name="defineoverlay" value="definesteoverlay"/>
+    <cd:command name="definelayer" value="definelayer"/>
+    <cd:command name="background" value="fundal"/>
+    <cd:command name="startbackground" value="startfundal"/>
+    <cd:command name="stopbackground" value="stopfundal"/>
+    <cd:command name="setupbackground" value="seteazafundal"/>
+    <cd:command name="fillinrules" value="rigleumplere"/>
+    <cd:command name="setupfillinrules" value="seteazarigleumplere"/>
+    <cd:command name="fillintext" value="textumplere"/>
+    <cd:command name="setupfillinlines" value="seteazaliniiumplere"/>
+    <cd:command name="fillinline" value="linieumplere"/>
+    <cd:command name="setuptextrules" value="seteazarigletext"/>
+    <cd:command name="textrule" value="riglatext"/>
+    <cd:command name="starttextrule" value="startriglatext"/>
+    <cd:command name="stoptextrule" value="stopriglatext"/>
+    <cd:command name="usemodule" value="folosestemodul"/>
+    <cd:command name="usemodules" value="folosestemodule"/>
+    <cd:command name="starttext" value="starttext"/>
+    <cd:command name="stoptext" value="stoptext"/>
+    <cd:command name="margintitle" value="titlumarginal"/>
+    <cd:command name="marginword" value="cuvantmarginal"/>
+    <cd:command name="margintext" value="textmarginal"/>
+    <cd:command name="inleft" value="instanga"/>
+    <cd:command name="inmargin" value="marginal"/>
+    <cd:command name="inothermargin" value="inaltamargine"/>
+    <cd:command name="inright" value="indreapta"/>
+    <cd:command name="ininner" value="ininner"/>
+    <cd:command name="inouter" value="inouter"/>
+    <cd:command name="startmarginblock" value="startblocmarginal"/>
+    <cd:command name="stopmarginblock" value="stopblocmarginal"/>
+    <cd:command name="defineinmargin" value="defineinmargin"/>
+    <cd:command name="setupinmargin" value="seteazamarginal"/>
+    <cd:command name="setupmarginblocks" value="seteazablocurimarginale"/>
+    <cd:command name="inleftedge" value="inparteastanga"/>
+    <cd:command name="inleftmargin" value="inmargineastanga"/>
+    <cd:command name="inrightmargin" value="inmargineadreapta"/>
+    <cd:command name="inrightedge" value="inparteadreapta"/>
+    <cd:command name="atleftmargin" value="atleftmargin"/>
+    <cd:command name="atrightmargin" value="atrightmargin"/>
+    <cd:command name="wordright" value="cuvantdreapta"/>
+    <cd:command name="defineblank" value="definesteblanc"/>
+    <cd:command name="blank" value="blanc"/>
+    <cd:command name="setupblank" value="seteazablanc"/>
+    <cd:command name="correctwhitespace" value="corecteazaspatiualb"/>
+    <cd:command name="fixedspaces" value="spatiifixate"/>
+    <cd:command name="fixedspace" value="spatiufixat"/>
+    <cd:command name="nospace" value="faraspatiu"/>
+    <cd:command name="space" value="spatiu"/>
+    <cd:command name="nowhitespace" value="faraspatiualb"/>
+    <cd:command name="packed" value="impachetat"/>
+    <cd:command name="startpacked" value="startimpachetat"/>
+    <cd:command name="stoppacked" value="stopimpachetat"/>
+    <cd:command name="startunpacked" value="startneimpachetat"/>
+    <cd:command name="stopunpacked" value="stopneimpachetat"/>
+    <cd:command name="startlinecorrection" value="startcorectielinie"/>
+    <cd:command name="stoplinecorrection" value="stopcorectielinie"/>
+    <cd:command name="godown" value="injos"/>
+    <cd:command name="whitespace" value="spatiualb"/>
+    <cd:command name="noindenting" value="faraaliniat"/>
+    <cd:command name="indenting" value="aliniat"/>
+    <cd:command name="setupindenting" value="seteazaaliniat"/>
+    <cd:command name="startalignment" value="startaliniere"/>
+    <cd:command name="stopalignment" value="stopaliniere"/>
+    <cd:command name="startlines" value="startlinii"/>
+    <cd:command name="stoplines" value="stoplinii"/>
+    <cd:command name="setupparagraphnumbering" value="seteazanumerotareparagrafe"/>
+    <cd:command name="setuplinenumbering" value="seteazanumerotarelinii"/>
+    <cd:command name="startlinenumbering" value="startnumerotarelinii"/>
+    <cd:command name="stoplinenumbering" value="stopnumerotarelinii"/>
+    <cd:command name="startline" value="startlinie"/>
+    <cd:command name="stopline" value="stoplinie"/>
+    <cd:command name="someline" value="olinie"/>
+    <cd:command name="inline" value="inlinie"/>
+    <cd:command name="crlf" value="crlf"/>
+    <cd:command name="emptylines" value="emptylines"/>
+    <cd:command name="setuplines" value="seteazalinii"/>
+    <cd:command name="startnarrower" value="startingust"/>
+    <cd:command name="stopnarrower" value="stopingust"/>
+    <cd:command name="setupnarrower" value="seteazaingust"/>
+    <cd:command name="definetabulate" value="definestetabulatori"/>
+    <cd:command name="setuptabulate" value="seteazatabulatori"/>
+    <cd:command name="starttable" value="starttabel"/>
+    <cd:command name="stoptable" value="stoptabel"/>
+    <cd:command name="starttables" value="starttabele"/>
+    <cd:command name="stoptables" value="stoptabele"/>
+    <cd:command name="setuptables" value="seteazatabele"/>
+    <cd:command name="definetabletemplate" value="definestesablontabel"/>
+    <cd:command name="page" value="pagina"/>
+    <cd:command name="testcolumn" value="testcolumn"/>
+    <cd:command name="testpage" value="testpage"/>
+    <cd:command name="couplepage" value="paginadubla"/>
+    <cd:command name="pagetype" value="tippagina"/>
+    <cd:command name="processpage" value="proceseazapagina"/>
+    <cd:command name="couplepaper" value="hartiedubla"/>
+    <cd:command name="selectpaper" value="selecteazahartie"/>
+    <cd:command name="screen" value="ecran"/>
+    <cd:command name="definesection" value="definestesectiune"/>
+    <cd:command name="definesectionblock" value="definesteblocsectiune"/>
+    <cd:command name="setupsectionblock" value="seteazablocsectiune"/>
+    <cd:command name="setupsection" value="seteazasectiune"/>
+    <cd:command name="notopandbottomlines" value="faraliniisussijos"/>
+    <cd:command name="noheaderandfooterlines" value="faraliniiantetsisubsol"/>
+    <cd:command name="setuptop" value="seteazasus"/>
+    <cd:command name="setuptoptexts" value="seteazatextesus"/>
+    <cd:command name="setupheader" value="seteazaantet"/>
+    <cd:command name="setupheadertexts" value="seteazatexteantet"/>
+    <cd:command name="setuppagenumbering" value="seteazanumerotarepagina"/>
+    <cd:command name="getnumber" value="getnumber"/>
+    <cd:command name="incrementnumber" value="numarincrement"/>
+    <cd:command name="decrementnumber" value="decrementnumber"/>
+    <cd:command name="resetnumber" value="resetnumber"/>
+    <cd:command name="setnumber" value="setnumber"/>
+    <cd:command name="setupnumber" value="setupnumber"/>
+    <cd:command name="setupbottom" value="seteazajos"/>
+    <cd:command name="setupbottomtexts" value="seteazatextejos"/>
+    <cd:command name="setupfooter" value="seteazasubsol"/>
+    <cd:command name="setupfootertexts" value="seteazatextesubsol"/>
+    <cd:command name="setuppagenumber" value="seteazanumarpagina"/>
+    <cd:command name="setupsubpagenumber" value="seteazanumarsubpagina"/>
+    <cd:command name="subpagenumber" value="subpagenumber"/>
+    <cd:command name="setuptext" value="seteazatext"/>
+    <cd:command name="setuptexttexts" value="seteazatextetext"/>
+    <cd:command name="definetext" value="definestetext"/>
+    <cd:command name="pagenumber" value="numarpagina"/>
+    <cd:command name="completepagenumber" value="completeazanumarpagina"/>
+    <cd:command name="placepagenumber" value="punenumarpagina"/>
+    <cd:command name="items" value="element"/>
+    <cd:command name="setupitems" value="seteazaelemente"/>
+    <cd:command name="leftaligned" value="aliniatstanga"/>
+    <cd:command name="midaligned" value="aliniatcentru"/>
+    <cd:command name="rightaligned" value="aliniatdreapta"/>
+    <cd:command name="startcolumns" value="startcoloane"/>
+    <cd:command name="stopcolumns" value="stopcoloane"/>
+    <cd:command name="setupcolumns" value="seteazacoloane"/>
+    <cd:command name="column" value="coloana"/>
+    <cd:command name="head" value="titlu"/>
+    <cd:command name="but" value="but"/>
+    <cd:command name="item" value="element"/>
+    <cd:command name="nop" value="nop"/>
+    <cd:command name="mar" value="mar"/>
+    <cd:command name="sym" value="sim"/>
+    <cd:command name="its" value="el"/>
+    <cd:command name="ran" value="ran"/>
+    <cd:command name="headsym" value="headsym"/>
+    <cd:command name="defineitemgroup" value="defineitemgroup"/>
+    <cd:command name="setupitemgroup" value="setupitemgroup"/>
+    <cd:command name="setupitemgroups" value="setupitemgroups"/>
+    <cd:command name="definehead" value="definesteantet"/>
+    <cd:command name="setuphead" value="seteazatitlu"/>
+    <cd:command name="setupheads" value="seteazatitluri"/>
+    <cd:command name="setupheadnumber" value="seteazanumartitlu"/>
+    <cd:command name="headnumber" value="numartitlu"/>
+    <cd:command name="currentheadnumber" value="numartitlucurent"/>
+    <cd:command name="determineheadnumber" value="determinanumartitlu"/>
+    <cd:command name="resetmarking" value="reseteazamarcaje"/>
+    <cd:command name="setupmarking" value="seteazamarcaje"/>
+    <cd:command name="definemarking" value="definestemarcaje"/>
+    <cd:command name="nomarking" value="faramarcaje"/>
+    <cd:command name="marking" value="marcaje"/>
+    <cd:command name="decouplemarking" value="decupleazamarcaje"/>
+    <cd:command name="couplemarking" value="cupleazamarcaje"/>
+    <cd:command name="getmarking" value="adumarcaje"/>
+    <cd:command name="definelayout" value="definelayout"/>
+    <cd:command name="setuplayout" value="seteazaaspect"/>
+    <cd:command name="adaptlayout" value="adapteazaaspect"/>
+    <cd:command name="placeongrid" value="plaseazapegrid"/>
+    <cd:command name="moveongrid" value="mutapegrid"/>
+    <cd:command name="showsetups" value="afiseazasetari"/>
+    <cd:command name="showframe" value="afiseazarama"/>
+    <cd:command name="showgrid" value="afiseazagrid"/>
+    <cd:command name="showlayout" value="afiseazaaspect"/>
+    <cd:command name="showprint" value="afiseazatiparire"/>
+    <cd:command name="showstruts" value="afiseazastruts"/>
+    <cd:command name="definepapersize" value="definestedimensiunehartie"/>
+    <cd:command name="setuppapersize" value="seteazadimensiunihartie"/>
+    <cd:command name="setuppaper" value="setuppaper"/>
+    <cd:command name="setuparranging" value="seteazaaranjareapag"/>
+    <cd:command name="version" value="versiune"/>
+    <cd:command name="setupbackgrounds" value="seteazafundaluri"/>
+    <cd:command name="setupalign" value="seteazaalinierea"/>
+    <cd:command name="setupwhitespace" value="seteazaspatiualb"/>
+    <cd:command name="setupinteraction" value="seteazainteractiunea"/>
+    <cd:command name="setupinteractionmenu" value="seteazameniuinteractiune"/>
+    <cd:command name="defineinteractionmenu" value="definestemeniuinteractiune"/>
+    <cd:command name="disableinteractionmenu" value="dezactiveazameniuinteractiune"/>
+    <cd:command name="interactionmenu" value="meniuinteractiune"/>
+    <cd:command name="interactionbuttons" value="butoaneinteractiune"/>
+    <cd:command name="interactionbar" value="barainteractiune"/>
+    <cd:command name="setupinteractionbar" value="seteazabarainteractiune"/>
+    <cd:command name="setupinteractionscreen" value="seteazaecraninteractiune"/>
+    <cd:command name="placebookmarks" value="plaseazasemnecarte"/>
+    <cd:command name="bookmark" value="semncarte"/>
+    <cd:command name="definelogo" value="definestelogo"/>
+    <cd:command name="placelogos" value="punelogouri"/>
+    <cd:command name="definecolor" value="definesteculoare"/>
+    <cd:command name="definecolorgroup" value="definestegrupculori"/>
+    <cd:command name="definepalet" value="definestepaleta"/>
+    <cd:command name="graycolor" value="culoaregri"/>
+    <cd:command name="color" value="culoare"/>
+    <cd:command name="startcolor" value="startculoare"/>
+    <cd:command name="stopcolor" value="stopculoare"/>
+    <cd:command name="setupcolors" value="seteazaculori"/>
+    <cd:command name="setupcolor" value="seteazaculoare"/>
+    <cd:command name="setuppalet" value="seteazapaleta"/>
+    <cd:command name="showcolor" value="afiseazaculoare"/>
+    <cd:command name="showcolorgroup" value="afiseazagrupculoare"/>
+    <cd:command name="showpalet" value="afiseazapaleta"/>
+    <cd:command name="comparecolorgroup" value="comparagrupculoare"/>
+    <cd:command name="comparepalet" value="comparapaleta"/>
+    <cd:command name="colorvalue" value="valoareculoare"/>
+    <cd:command name="greyvalue" value="valoaregri"/>
+    <cd:command name="startraster" value="startraster"/>
+    <cd:command name="stopraster" value="stopraster"/>
+    <cd:command name="defineblock" value="definestebloc"/>
+    <cd:command name="setupblock" value="seteazabloc"/>
+    <cd:command name="useblocks" value="folosestebloc"/>
+    <cd:command name="processblocks" value="proceseazabloc"/>
+    <cd:command name="keepblocks" value="pastreazablocuri"/>
+    <cd:command name="selectblocks" value="selecteazablocuri"/>
+    <cd:command name="hideblocks" value="ascundeblocuri"/>
+    <cd:command name="bypassblocks" value="saripesteblocuri"/>
+    <cd:command name="forceblocks" value="forteazablocuri"/>
+    <cd:command name="nomoreblocks" value="gatablocuri"/>
+    <cd:command name="definelist" value="definestelista"/>
+    <cd:command name="definecombinedlist" value="definestelistacombinata"/>
+    <cd:command name="listsymbol" value="listsymbol"/>
+    <cd:command name="placelist" value="punelista"/>
+    <cd:command name="plaatsruwelijst" value="placerawlist"/>
+    <cd:command name="placecombinedlist" value="punelistacombinata"/>
+    <cd:command name="writetolist" value="scrieinlista"/>
+    <cd:command name="writebetweenlist" value="scrieintreliste"/>
+    <cd:command name="immediatetolist" value="immediatetolist"/>
+    <cd:command name="immediatebetweenlist" value="immediatebetweenlist"/>
+    <cd:command name="setuplist" value="seteazalista"/>
+    <cd:command name="setupcombinedlist" value="seteazalistacombinata"/>
+    <cd:command name="determinelistcharacteristics" value="determinacaracteristicilelistei"/>
+    <cd:command name="listlength" value="lungimelista"/>
+    <cd:command name="listwidth" value="latimelista"/>
+    <cd:command name="listheight" value="inaltimelista"/>
+    <cd:command name="nolist" value="faralista"/>
+    <cd:command name="definereferencelist" value="definestelistareferinte"/>
+    <cd:command name="placereferencelist" value="punelistareferinte"/>
+    <cd:command name="writetoreferencelist" value="scrieinlistareferinte"/>
+    <cd:command name="setupreferencelist" value="seteazalistareferinte"/>
+    <cd:command name="definefloat" value="definestefloat"/>
+    <cd:command name="setupfloat" value="seteazafloat"/>
+    <cd:command name="setupfloats" value="seteazafloats"/>
+    <cd:command name="splitfloat" value="impartefloat"/>
+    <cd:command name="setupfloatsplitting" value="seteazaimpartireafloat"/>
+    <cd:command name="placefloat" value="placefloat"/>
+    <cd:command name="movesidefloat" value="movesidefloat"/>
+    <cd:command name="defineplacement" value="defineplacement"/>
+    <cd:command name="setupplacement" value="setupplacement"/>
+    <cd:command name="definecombination" value="definecombination"/>
+    <cd:command name="startcombination" value="startcombinare"/>
+    <cd:command name="stopcombination" value="stopcombinare"/>
+    <cd:command name="placesidebyside" value="punefatainfata"/>
+    <cd:command name="placeontopofeachother" value="punedeasuprafiecareia"/>
+    <cd:command name="setupcaption" value="seteazalegenda"/>
+    <cd:command name="setupcaptions" value="seteazalegendele"/>
+    <cd:command name="setupcombinations" value="seteazacombinari"/>
+    <cd:command name="startoverlay" value="startoverlay"/>
+    <cd:command name="stopoverlay" value="stopoverlay"/>
+    <cd:command name="defineregister" value="definesteregistru"/>
+    <cd:command name="coupleregister" value="cupleazaregistru"/>
+    <cd:command name="setupregister" value="seteazaregistru"/>
+    <cd:command name="writetoregister" value="scrieinregistru"/>
+    <cd:command name="completeregister" value="completeregister"/>
+    <cd:command name="placeregister" value="puneregistru"/>
+    <cd:command name="determineregistercharacteristics" value="determinacaracteristiciregistru"/>
+    <cd:command name="definesorting" value="definestesortare"/>
+    <cd:command name="definesynonyms" value="definestesinonim"/>
+    <cd:command name="setupsorting" value="seteazasortare"/>
+    <cd:command name="setupsynonyms" value="seteazasinonime"/>
+    <cd:command name="startsynchronization" value="startsincronizare"/>
+    <cd:command name="stopsynchronization" value="stopsincronizare"/>
+    <cd:command name="setupsynchronizationbar" value="setarebarasincronizare"/>
+    <cd:command name="setupsynchronization" value="setaresincronizare"/>
+    <cd:command name="synchronizationbar" value="barasincronizare"/>
+    <cd:command name="synchronize" value="sincronizeaza"/>
+    <cd:command name="useexternaldocument" value="folosestedocumentextern"/>
+    <cd:command name="useURL" value="folosesteURL"/>
+    <cd:command name="useurl" value="folosesteurl"/>
+    <cd:command name="setupurl" value="seteazaurl"/>
+    <cd:command name="coupledocument" value="cupleazadocument"/>
+    <cd:command name="setupprograms" value="seteazaprograme"/>
+    <cd:command name="defineprogram" value="definesteprogram"/>
+    <cd:command name="program" value="program"/>
+    <cd:command name="setuppagetransitions" value="seteazatranzitiepagina"/>
+    <cd:command name="defineprofile" value="definesteprofil"/>
+    <cd:command name="defineversion" value="definesteversiune"/>
+    <cd:command name="markversion" value="marcheazaversiune"/>
+    <cd:command name="selectversion" value="selecteazaversiune"/>
+    <cd:command name="startprofile" value="startprofil"/>
+    <cd:command name="startversion" value="startversiune"/>
+    <cd:command name="setupprofiles" value="seteazaprofile"/>
+    <cd:command name="setupversions" value="seteazaversiuni"/>
+    <cd:command name="stopprofile" value="stopprofil"/>
+    <cd:command name="stopversion" value="stopversiune"/>
+    <cd:command name="followprofile" value="urmeazaprofil"/>
+    <cd:command name="followprofileversion" value="urmeazaversiuneprofil"/>
+    <cd:command name="followversion" value="urmeazaversiune"/>
+    <cd:command name="definedescription" value="definestedescriere"/>
+    <cd:command name="definelabel" value="definesteeticheta"/>
+    <cd:command name="defineenumeration" value="definesteenumerare"/>
+    <cd:command name="defineindenting" value="definestealiat"/>
+    <cd:command name="setupdescriptions" value="seteazadescriere"/>
+    <cd:command name="setupenumerations" value="seteazaenumerare"/>
+    <cd:command name="setupindentations" value="seteazaaliniate"/>
+    <cd:command name="setuptab" value="seteazatab"/>
+    <cd:command name="tab" value="tab"/>
+    <cd:command name="setupexternalfigures" value="seteazafiguriexterne"/>
+    <cd:command name="showexternalfigures" value="afiseazafiguriexterne"/>
+    <cd:command name="externalfigure" value="figuraexterna"/>
+    <cd:command name="useexternalfigure" value="folosestefiguraexterna"/>
+    <cd:command name="startfigure" value="startfigura"/>
+    <cd:command name="referring" value="referring"/>
+    <cd:command name="remark" value="remarca"/>
+    <cd:command name="colorbar" value="baraculoare"/>
+    <cd:command name="grid" value="grid"/>
+    <cd:command name="button" value="buton"/>
+    <cd:command name="menubutton" value="butonmeniu"/>
+    <cd:command name="setupbuttons" value="seteazabutoane"/>
+    <cd:command name="usereferences" value="folosestereferinte"/>
+    <cd:command name="reflijst" value="listaref"/>
+    <cd:command name="stelreferentielijstin" value="seteazalistareferinte"/>
+    <cd:command name="setupreferencing" value="seteazareferinte"/>
+    <cd:command name="textreference" value="referintatext"/>
+    <cd:command name="pagereference" value="referintapagina"/>
+    <cd:command name="reference" value="referinta"/>
+    <cd:command name="definereference" value="definestereferinte"/>
+    <cd:command name="definereferenceformat" value="definesteformatreferinte"/>
+    <cd:command name="useJSscripts" value="folosestescriptJS"/>
+    <cd:command name="from" value="din"/>
+    <cd:command name="in" value="in"/>
+    <cd:command name="at" value="la"/>
+    <cd:command name="about" value="despre"/>
+    <cd:command name="goto" value="dute"/>
+    <cd:command name="atpage" value="lapagina"/>
+    <cd:command name="somewhere" value="undeva"/>
+    <cd:command name="navigating" value="navigating"/>
+    <cd:command name="ref" value="ref"/>
+    <cd:command name="gotobox" value="dutebox"/>
+    <cd:command name="gotopage" value="dutepagina"/>
+    <cd:command name="placeformula" value="puneformula"/>
+    <cd:command name="placesubformula" value="punesubformula"/>
+    <cd:command name="moveformula" value="moveformula"/>
+    <cd:command name="setupformulas" value="seteazaformule"/>
+    <cd:command name="formulanumber" value="numarformula"/>
+    <cd:command name="subformulanumber" value="numarsubformula"/>
+    <cd:command name="leg" value="leg"/>
+    <cd:command name="fact" value="fact"/>
+    <cd:command name="mathematics" value="matematica"/>
+    <cd:command name="dimension" value="dimensiune"/>
+    <cd:command name="nodimension" value="faradimensiune"/>
+    <cd:command name="startenvironment" value="startmediu"/>
+    <cd:command name="stopenvironment" value="stopmediu"/>
+    <cd:command name="startcomponent" value="startcomponenta"/>
+    <cd:command name="stopcomponent" value="stopcomponenta"/>
+    <cd:command name="startproduct" value="startprodus"/>
+    <cd:command name="stopproduct" value="stopprodus"/>
+    <cd:command name="startproject" value="startproiect"/>
+    <cd:command name="stopproject" value="stopproiect"/>
+    <cd:command name="setups" value="setari"/>
+    <cd:command name="project" value="proiect"/>
+    <cd:command name="component" value="componenta"/>
+    <cd:command name="produxt" value="produs"/>
+    <cd:command name="environment" value="mediu"/>
+    <cd:command name="nomorefiles" value="farafisiere"/>
+    <cd:command name="getbuffer" value="adubuffer"/>
+    <cd:command name="setupbuffer" value="seteazabuffer"/>
+    <cd:command name="typebuffer" value="scriebuffer"/>
+    <cd:command name="definebuffer" value="definestebuffer"/>
+    <cd:command name="unitmeaning" value="numeunitate"/>
+    <cd:command name="infull" value="pelung"/>
+    <cd:command name="quotation" value="citat"/>
+    <cd:command name="quote" value="minicitat"/>
+    <cd:command name="startquotation" value="startcitat"/>
+    <cd:command name="stopquotation" value="stopcitat"/>
+    <cd:command name="setupquote" value="seteazaminicitat"/>
+    <cd:command name="define" value="defineste"/>
+    <cd:command name="redo" value="refa"/>
+    <cd:command name="usecommands" value="folosestecomenzi"/>
+    <cd:command name="definestartstop" value="definestestartstop"/>
+    <cd:command name="setupstartstop" value="setupstartstop"/>
+    <cd:command name="startlocal" value="startlocal"/>
+    <cd:command name="stoplocal" value="stoplocal"/>
+    <cd:command name="startglobal" value="startglobal"/>
+    <cd:command name="stopglobal" value="stopblobal"/>
+    <cd:command name="macroname" value="nume"/>
+    <cd:command name="definemakeup" value="definestemakeup"/>
+    <cd:command name="setupmakeup" value="seteazamakeup"/>
+    <cd:command name="startmakeup" value="startmakeup"/>
+    <cd:command name="stopmakeup" value="stopmakeup"/>
+    <cd:command name="useexternalsoundtrack" value="folosestemuzicaexterna"/>
+    <cd:command name="useexternalfile" value="folosestefisierextern"/>
+    <cd:command name="useexternalfiles" value="folosestefisiereexterne"/>
+    <cd:command name="referral" value="referit"/>
+    <cd:command name="referraldate" value="datareferit"/>
+    <cd:command name="high" value="inalt"/>
+    <cd:command name="lohi" value="jossus"/>
+    <cd:command name="low" value="jos"/>
+    <cd:command name="fraction" value="fractie"/>
+    <cd:command name="chem" value="chem"/>
+    <cd:command name="startopposite" value="startopozit"/>
+    <cd:command name="stopopposite" value="stopopozit"/>
+    <cd:command name="setupoppositeplacing" value="seteazaplasareaopozita"/>
+    <cd:command name="startpositioning" value="startpozitionare"/>
+    <cd:command name="stoppositioning" value="stoppozitionare"/>
+    <cd:command name="position" value="pozitie"/>
+    <cd:command name="setuppositioning" value="setarepozitie"/>
+    <cd:command name="rotate" value="roteste"/>
+    <cd:command name="setuprotate" value="seteazarotare"/>
+    <cd:command name="mirror" value="reflexie"/>
+    <cd:command name="scale" value="scala"/>
+    <cd:command name="setupnumbering" value="seteazanumerotare"/>
+    <cd:command name="reset" value="reset"/>
+    <cd:command name="setuppublications" value="seteazapublicatii"/>
+    <cd:command name="publication" value="publicatie"/>
+    <cd:command name="definehbox" value="definestehbox"/>
+    <cd:command name="adding" value="adauga"/>
+    <cd:command name="periods" value="puncte"/>
+    <cd:command name="setuphyphenmark" value="seteazaliniesilabe"/>
+    <cd:command name="setupinterlinespace" value="seteazaspatiuinterliniar"/>
+    <cd:command name="setupspacing" value="seteazaspatiu"/>
+    <cd:command name="setuptolerance" value="seteazatoleranta"/>
+    <cd:command name="setupsystem" value="seteazasistem"/>
+    <cd:command name="usepath" value="folosestedirector"/>
+    <cd:command name="defineparagraphs" value="definesteparagraf"/>
+    <cd:command name="setupparagraphs" value="seteazaparagrafe"/>
+    <cd:command name="donttest" value="nutesta"/>
+    <cd:command name="setupcomment" value="seteazacomentariu"/>
+    <cd:command name="comment" value="comentariu"/>
+    <cd:command name="definefield" value="definestecamp"/>
+    <cd:command name="definemainfield" value="definestecampprincipal"/>
+    <cd:command name="definesubfield" value="definestesubcamp"/>
+    <cd:command name="clonefield" value="cloneazacamp"/>
+    <cd:command name="copyfield" value="copiazacamp"/>
+    <cd:command name="setupfield" value="seteazacamp"/>
+    <cd:command name="setupfields" value="seteazacampuri"/>
+    <cd:command name="field" value="camp"/>
+    <cd:command name="fitfield" value="potrivestecamp"/>
+    <cd:command name="logfields" value="logcampuri"/>
+    <cd:command name="showfields" value="afiseazacampuri"/>
+    <cd:command name="tooltip" value="tooltip"/>
+    <cd:command name="fillinfield" value="campumplere"/>
+    <cd:command name="definefieldstack" value="definestestivacampuri"/>
+    <cd:command name="fieldstack" value="stivacampuri"/>
+    <cd:command name="setupforms" value="seteazaformulare"/>
+    <cd:command name="setupclipping" value="seteazaclipping"/>
+    <cd:command name="clip" value="clip"/>
+    <cd:command name="placelegend" value="punelegenda"/>
+    <cd:command name="setuplegend" value="seteazalegenda"/>
+    <cd:command name="setuppagecomment" value="seteazacomentariupagina"/>
+    <cd:command name="setupstrut" value="seteazastrut"/>
+    <cd:command name="definerule" value="definesterigla"/>
+    <cd:command name="placerule" value="punerigla"/>
+    <cd:command name="setuprule" value="seteazarigla"/>
+    <cd:command name="definetextvariable" value="definestevariabilatext"/>
+    <cd:command name="setuptextvariable" value="seteazavariabilatext"/>
+    <cd:command name="settextvariable" value="setvariabilatext"/>
+    <cd:command name="placetextvariable" value="punevariabilatext"/>
+    <cd:command name="textvariable" value="variabilatext"/>
+    <cd:command name="definetextposition" value="definestepozitietext"/>
+    <cd:command name="setuptextposition" value="seteazapozitietext"/>
+    <cd:command name="positiontext" value="pozitietext"/>
+    <cd:command name="definerawfont" value="definestefontraw"/>
+    <cd:command name="switchtorawfont" value="trecilafontraw"/>
+    <cd:command name="placeheadtext" value="placeheadtext"/>
+    <cd:command name="placeheadnumber" value="placeheadnumber"/>
+    <cd:command name="definepagebreak" value="definepagebreak"/>
+    <cd:command name="definecolumnbreak" value="definecolumnbreak"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="setupitemgroups" value="setareitemization"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="topheight" value="inaltimesus"/>
+    <cd:command name="topdistance" value="distantasus"/>
+    <cd:command name="headerheight" value="inaltimeantet"/>
+    <cd:command name="headerdistance" value="distantaantet"/>
+    <cd:command name="textheight" value="inaltimetext"/>
+    <cd:command name="footerdistance" value="distantasubsol"/>
+    <cd:command name="footerheight" value="inaltimesubsol"/>
+    <cd:command name="bottomdistance" value="distantajos"/>
+    <cd:command name="bottomheight" value="inaltimejos"/>
+    <cd:command name="marginwidth" value="latimemargine"/>
+    <cd:command name="leftmarginwidth" value="latimemarginestanga"/>
+    <cd:command name="rightmarginwidth" value="latimemarginedreapta"/>
+    <cd:command name="margindistance" value="distantamargine"/>
+    <cd:command name="leftmargindistance" value="distantamarginestanga"/>
+    <cd:command name="rightmargindistance" value="distantamarginedreapta"/>
+    <cd:command name="edgewidth" value="latimecolturi"/>
+    <cd:command name="leftedgewidth" value="latimecoltstanga"/>
+    <cd:command name="rightedgewidth" value="latimecoltdreapta"/>
+    <cd:command name="edgedistance" value="distantacolt"/>
+    <cd:command name="leftedgedistance" value="distantacoltstanga"/>
+    <cd:command name="rightedgedistance" value="distantacoltdreapta"/>
+    <cd:command name="innermarginwidth" value="innermarginwidth"/>
+    <cd:command name="outermarginwidth" value="outermarginwidth"/>
+    <cd:command name="innermargindistance" value="innermargindistance"/>
+    <cd:command name="outermargindistance" value="outermargindistance"/>
+    <cd:command name="inneredgewidth" value="inneredgewidth"/>
+    <cd:command name="outeredgewidth" value="outeredgewidth"/>
+    <cd:command name="inneredgedistance" value="inneredgedistance"/>
+    <cd:command name="outeredgedistance" value="outeredgedistance"/>
+    <cd:command name="textwidth" value="latimetext"/>
+    <cd:command name="makeupwidth" value="latimemakeup"/>
+    <cd:command name="makeupheight" value="inaltimemakeup"/>
+    <cd:command name="topspace" value="spatiusus"/>
+    <cd:command name="bottomspace" value="spatiujos"/>
+    <cd:command name="backspace" value="spatiuspate"/>
+    <cd:command name="cutspace" value="cutspace"/>
+    <cd:command name="paperwidth" value="latimehartie"/>
+    <cd:command name="paperheight" value="inaltimehartie"/>
+    <cd:command name="printpaperwidth" value="latimehartieimprimanta"/>
+    <cd:command name="printpaperheight" value="inaltimehartieimprimanta"/>
+    <cd:command name="pageoffset" value="pageoffset"/>
+    <cd:command name="pagedepth" value="pagedepth"/>
+    <cd:command name="headlevel" value="niveltitlu"/>
+    <cd:command name="linewidth" value="grosimelinie"/>
+    <cd:command name="totalnumberofpages" value="numartotalpagini"/>
+    <cd:command name="numberofsubpages" value="numberofsubpages"/>
+    <cd:command name="useXMLfilter" value="useXMLfilter"/>
+    <cd:command name="definecolumnset" value="definecolumnset"/>
+    <cd:command name="setupcolumnset" value="setupcolumnset"/>
+    <cd:command name="startcolumnset" value="startcolumnset"/>
+    <cd:command name="stopcolumnset" value="stopcolumnset"/>
+    <cd:command name="setupcolumnsetlines" value="setupcolumnsetlines"/>
+    <cd:command name="setupcolumnsetstart" value="setupcolumnsetstart"/>
+    <cd:command name="startcolumnmakeup" value="startcolumnmakeup"/>
+    <cd:command name="stopcolumnmakeup" value="stopcolumnmakeup"/>
+    <cd:command name="usetypescript" value="usetypescript"/>
+  </cd:commands>
+
+  <cd:commands>
+    <cd:command name="startdocument" value="startdocument"/>
+    <cd:command name="stopdocument" value="stopdocument"/>
+    <cd:command name="startoverzicht" value="startoverview"/>
+    <cd:command name="stopoverzicht" value="stopoverview"/>
+    <cd:command name="label" value="eticheta"/>
+    <cd:command name="labels" value="etichete"/>
+    <cd:command name="domicile" value="domiciliu"/>
+  </cd:commands>
+
+</cd:interface>