beta 2011.09.12 22:49

46 files changed, 2184 insertions, 640 deletions

diff --git a/context/data/scite/cont-cs-scite.properties b/context/data/scite/cont-cs-scite.properties
deleted file mode 100644
index 5c9cc3354..000000000
--- a/context/data/scite/cont-cs-scite.properties
+++ /dev/null
@@ -1 +0,0 @@
-keywordclass.macros.context.cs=CAP Cap Caps MESIC Rimskecislice SLOVA SLOVO Slova Slovo VSEDNIDEN Znak Znaky aktualnicislonadpisu aktualnidatum appendix barva bilemisto bublinkovanapoveda bypassblocks cap cernalinka cernelinky chapter chem cisla cislonadpisu citace citovat comment completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms completeregister coupledregister crlf datum definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling definetype definetypeface definuj definujbarvu definujblok definujbloksekce definujbuffer definujfont definujformatodkazu definujinterakcnimenu definujinterakcnimenu definujkombinovanyseznam definujkonverzi definujlogo definujnadpis definujobrazeksymbol definujodkaz definujodsazovani definujodstavce definujopis definujoramovani definujoramovanytext definujpaletu definujplvouciobjekt definujpodpole definujpole definujpopis definujpopisek definujprekryv definujpreskok definujprofil definujprogram definujprostredizakladnihofontu definujrejstrik definujsablonutabulky definujsekci definujseznam definujseznamodkazu definujskupinubarev definujstartstop definujsymbol definujsynonumumfontu definujsynonyma definujtabelaci definujtext definujtrideni definujupravu definujvelikostpapiru definujverzi definujvycet definujvystup definujzakladnifont definujzasobnikpoli definujznaceni description dodrzujprofil dodrzujverzi dodrzujverziprofilu dvoustrannypapir emptylines enumeration externiobraz footnotetext forceblocks framedtext hl hlavnijazyk indentation ininner inouter instalacejazyka interakcnilista interakcnitlacitka jazyk jdidolu jdina jdinabox klonujpole konvertujcislo kopirujpole korekcebilehomista labeling listsymbol loadsorts loadsynonyms mapfontsize marginalnilinka marginalnitext matematika mediaeval meritko mesic mezera mrizka nadpis nadruhyokraj name naokraj nastavbarvu nastavbarvy nastavbilamista nastavblok nastavbloksekce nastavbuffer nastavcernelinky nastavcislonadpisu nastavcislostrany nastavcislovani nastavcislovaniodstavcu nastavcislovaniradku nastavcislovanistran nastavcitaci nastavdefinicipoznamekpodcarou nastavdeleniplvoucichobjektu nastavdelitko nastavdolnitexty nastavexterniobrazy nastavhorejsek nastavhornitexty nastavinterakci nastavinterakcnilistu nastavinterakcnimenu nastavinterakcniobrazovku nastavjazyk nastavkapitalky nastavkombinovanyseznam nastavkomentar nastavlegendu nastavmarginalie nastavmarginalniblok nastavmarginalnilinky nastavmeziradkovoumezeru nastavnadpis nastavnadpisy nastavodkazovani nastavodsazeni nastavodsazovani nastavodstavce nastavopis nastavoramovanetexty nastavoramovani nastavorez nastavotoceni nastavpaletu nastavplvouciobjekt nastavplvouciobjekty nastavpodcislostrany nastavpodtrzeni nastavpole nastavpolozky nastavpopisek nastavpopisky nastavpopisy nastavpozadi nastavpozadi nastavpoznamkypodcarou nastavprechodstrany nastavpreskok nastavprofily nastavprogramy nastavprostredizakladnihofontu nastavpublikace nastavradkovani nastavradky nastavrastr nastavrejstrik nastavrovnice nastavsadusymbolu nastavsekci nastavseznam nastavseznamodkazu nastavsirkucary nastavsloupce nastavspodek nastavspojeni nastavsynchronizaci nastavsynchronizacnilistu nastavsynonyma nastavsystem nastavtab nastavtabelaci nastavtabulky nastavtenkelinky nastavtext nastavtexthlavicky nastavtextovelinky nastavtextpopisku nastavtexttexty nastavtextyupati nastavtextyzahlavi nastavtlacitka nastavtoleranci nastavtrideni nastavtype nastavumisteniprotejsku nastavumistovani nastavupati nastavupravu nastavurl nastavusporadani nastavvelikostpapiru nastavverze nastavvsechnapole nastavvycty nastavvyplnovelinky nastavvyplnoveradky nastavvystup nastavvzhled nastavzahlavi nastavzakladnifont nastavzarovnani nastavznaceni nastavzuzeni nastrane nejakyradek nekde nextsection nivy nizky nocap nop obrazovka odkaz odkaz odkaznadatum odkaznastranu odkaznatext odsazovani okr opis opissoubor oramovani oref orez otocit overbar overbars overstrike overstrikes oznacverzi paragraph parovastrana part pis placefloat placelistoffloats placelistofsorts placelistofsynonyms placereferencelist pol pole polozka polozky popisky porovnejpaletu porovnejskupinubarev pozadi pozice poznamka poznamkapodcarou pref prelozit premistinamrizku prepninazakladnifont preskoc prizpusobivepole prizpusobvzhled program propojeneznaceni propojenydokument propojenyrejstrik publikace ran ref register reservefloat reset resettextcontent resetznaceni rimskecislice rozdelplvouciobjekt rozpojeneznaceni roztazene schovejbloky section sedabarva seeregister settextcontent setupfonthandling setupfontsynonym setupforms setupinterlinespace2 setupitemgroup setuplistalternative setuppaper setupstrut sloupec slovovpravo sort spodek stanovcharakteristickuseznamu stanovcislonadpisu startalignment startbarva startbuffer startbuffer startcitace startcolumns startcombination startcomment startdescription startdocument startenumeration startfakt startfigure startfloattext startformula startframedtext starthiding startinteraktivnimenu startitemgroup startkomponenta startlegend startline startlinecorrection startlinenumbering startlines startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginalnilinka startmarginblock startnamemakeup startnarrower startopposite startoverlay startoverview startparagraph startpositioning startpostponing startpozadi startprodukt startprofile startprojekt startprostredi startregister startsymbolset startsynchronization starttable starttables starttabulate starttextovalinka starttyping startunpacked startverze startzhustene stopalignment stopbarva stopbuffer stopbuffer stopcitace stopcolumns stopcombination stopcomment stopdescription stopdocument stopenumeration stopfakt stopfigure stopfloattext stopformula stopframedtext stophiding stopinteraktivnimenu stopitemgroup stopkomponenta stoplegend stopline stoplinecorrection stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginalnilinka stopmarginblock stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stopparagraph stoppositioning stoppostponing stoppozadi stopprodukt stopprofile stopprojekt stopprostredi stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptextovalinka stoptyping stopunpacked stopverze stopzhustene strana sub subject subsection subsubject subsubsection subsubsubject sym symbol synchronizacnilista synchronizovat synonym tab tecky tenkalinka tenkelinky tex texthlavicky textovalinka textpopisku title tlacitko tref tvrdemezery typebuffer typstrany ukazbarvu ukazexterniobrazy ukazmrizku ukaznastaveni ukazpaletu ukazpodpery ukazpole ukazpostredizakladnihofontu ukazramecek ukazsadusymbolu ukazskupinubarev ukazupravu ukazvytisk ukazvzhled ukazzakladnifont umistikombinovanyseznam umistikombinovanyseznam umistilegendu umistiloga umistilokalnipoznamkypodcarou umistinadsebe umistinamrizku umistipodrovnici umistipoznamkypodcarou umistirejstrik umistirejstrik umistirovnici umistiseznam umistivedlesebe umistizalozky underbar underbars usedirectory usetypescript usetypescriptfile uzijURL uzijbloky uzijexternidokument uzijexterniobraz uzijexternisoubor uzijexternisoubory uzijexternizvuk uzijkodovani uzijmodul uzijodkazy uzijprikazy uzijspeciality uzijsymbol verze vl vlasovalinka vlevo vpravo vradku vsedniden vyberbloky vyberpapir vyberverzi vyplnenytext vyplnovelinky vyplnovepole vyplnovyradek vysoky zablokujinterakcnimenu zachovejbloky zadnamezera zadnebilemisto zadnedalsibloky zadnedalsisoubory zadnehorniadolniradky zadneodsazovani zadnezahlaviaupati zadneznaceni zadnyseznam zalozka zapisdorejstriku zapisdoseznamu zapisdoseznamuodkazu zapismeziseznam zaramovani zarovnanonastred zarovnanovlevo zarovnanovpravo zasobnikpoli zaznamovepole zhustene ziskejbuffer ziskejznaceni zlomek znaceni znak znaky zpracujbloky zpracujstranu zrcadlit zref 
\ No newline at end of file
diff --git a/context/data/scite/cont-cz-scite.properties b/context/data/scite/cont-cz-scite.properties
deleted file mode 100644
index 256a4ea3b..000000000
--- a/context/data/scite/cont-cz-scite.properties
+++ /dev/null
@@ -1,76 +0,0 @@
-keywordclass.macros.context.cz=\
-    MESIC Rimskecislice SLOVA SLOVO Slova Slovo \
-    VSEDNIDEN Znak Znaky aktualnicislonadpisu aktualnidatum arg \
-    barva bilemisto bublinkovanapoveda bypassblocks cernalinka cernelinky \
-    chem cisla cislonadpisu citace citovat completeregister \
-    crlf datum definerawfont definerule definetextposition definetextvariable \
-    definetype definuj definujbarvu definujblok definujbloksekce definujbuffer \
-    definujfont definujformatodkazu definujinterakcnimenu definujkombinovanyseznam definujkonverzi definujlogo \
-    definujnadpis definujobrazeksymbol definujodkaz definujodsazovani definujodstavce definujopis \
-    definujoramovani definujoramovanytext definujpaletu definujplvouciobjekt definujpodpole definujpole \
-    definujpopis definujpopisek definujprekryv definujpreskok definujprofil definujprogram \
-    definujprostredizakladnihofontu definujrejstrik definujsablonutabulky definujsekci definujseznam definujseznamodkazu \
-    definujskupinubarev definujstartstop definujsymbol definujsynonyma definujtabelaci definujtext \
-    definujtrideni definujupravu definujvelikostpapiru definujverzi definujvycet definujvystup \
-    definujzakladnifont definujzasobnikpoli definujznaceni dodrzujprofil dodrzujverzi dodrzujverziprofilu \
-    dvoustrannypapir emptylines externiobraz footnotetext forceblocks hl \
-    hlavnijazyk ininner inouter instalacejazyka interakcnilista interakcnitlacitka \
-    jazyk jdidolu jdina jdinabox klonujpole komentar \
-    konvertujcislo kopirujpole korekcebilehomista listsymbol marginalnilinka marginalnitext \
-    matematika meritko mesic mezera mrizka nadpis \
-    nadruhyokraj nadtrzeni nadtrzeno naokraj nastavbarvu nastavbarvy \
-    nastavbilamista nastavblok nastavbloksekce nastavbuffer nastavcernelinky nastavcislonadpisu \
-    nastavcislostrany nastavcislovani nastavcislovaniodstavcu nastavcislovaniradku nastavcislovanistran nastavcitaci \
-    nastavdefinicipoznamekpodcarou nastavdeleniplvoucichobjektu nastavdelitko nastavdolnitexty nastavexterniobrazy nastavhorejsek \
-    nastavhornitexty nastavinterakci nastavinterakcnilistu nastavinterakcniobrazovku nastavjazyk nastavkapitalky \
-    nastavkombinovanyseznam nastavkomentar nastavlegendu nastavmarginalie nastavmarginalniblok nastavmarginalnilinky \
-    nastavmeziradkovoumezeru nastavnadpis nastavnadpisy nastavodkazovani nastavodsazeni nastavodsazovani \
-    nastavodstavce nastavopis nastavoramovanetexty nastavoramovani nastavorez nastavotoceni \
-    nastavpaletu nastavplvouciobjekt nastavplvouciobjekty nastavpodcislostrany nastavpodtrzeni nastavpole \
-    nastavpolozky nastavpopisek nastavpopisky nastavpopisy nastavpozadi nastavpoznamkypodcarou \
-    nastavprechodstrany nastavpreskok nastavprofily nastavprogramy nastavprostredizakladnihofontu nastavpublikace \
-    nastavradkovani nastavradky nastavrastr nastavrejstrik nastavsadusymbolu nastavsekci \
-    nastavseznam nastavseznamodkazu nastavsirkucary nastavsloupce nastavspodek nastavspojeni \
-    nastavsynchronizaci nastavsynchronizacnilistu nastavsynonyma nastavsystem nastavtab nastavtabelaci \
-    nastavtabulky nastavtenkelinky nastavtext nastavtexthlavicky nastavtextovelinky nastavtextpopisku \
-    nastavtexttexty nastavtextyupati nastavtextyzahlavi nastavtlacitka nastavtoleranci nastavtrideni \
-    nastavtype nastavumisteniprotejsku nastavumistovani nastavupati nastavupravu nastavurl \
-    nastavusporadani nastavvelikostpapiru nastavverze nastavvsechnapole nastavvycty nastavvyplnovelinky \
-    nastavvyplnoveradky nastavvystup nastavvzhled nastavzahlavi nastavzakladnifont nastavzarovnani \
-    nastavznaceni nastavzuzeni nastrane nejakyradek nekde nivy \
-    nizky nop obrazovka odkaz odkaznadatum odkaznastranu \
-    odkaznatext odsazovani okr opis opissoubor oramovani \
-    oref orez otocit oznacverzi parovastrana pis \
-    placefloat placereferencelist placerule placetextvariable podtrzeni podtrzeno \
-    pol pole polozka polozky popisky porovnejpaletu \
-    porovnejskupinubarev positiontext pozadi pozice poznamka poznamkapodcarou \
-    pref prelozit premistinamrizku prepninazakladnifont preskoc preskrtnuti \
-    preskrtnuto prizpusobivepole prizpusobvzhled program propojeneznaceni propojenydokument \
-    propojenyrejstrik publikace ran ref reset resetznaceni \
-    rimskecislice rozdelplvouciobjekt rozpojeneznaceni roztazene schovejbloky scitani \
-    sedabarva settextcontent settextvariable setupforms setupitemgroup setuppaper \
-    setuprule setupstrut setuptextposition setuptextvariable sloupec slovovpravo \
-    spodek stanovcharakteristickuseznamu stanovcislonadpisu start startbarva startcitace \
-    startfakt startinteraktivnimenu startkomentar startkomponenta startmarginalnilinka startpozadi \
-    startprodukt startprojekt startprostredi starttextovalinka startverze startzhustene \
-    stop stopbarva stopcitace stopfakt stopinteraktivnimenu stopkomentar \
-    stopkomponenta stopmarginalnilinka stoppozadi stopprodukt stopprojekt stopprostredi \
-    stoptextovalinka stopverze stopzhustene strana switchtorawfont sym \
-    symbol synchronizacnilista synchronizovat tab tecky tenkalinka \
-    tenkelinky tex texthlavicky textovalinka textpopisku textvariable \
-    tlacitko tref tvrdemezery typebuffer typstrany ukazbarvu \
-    ukazexterniobrazy ukazmrizku ukaznastaveni ukazpaletu ukazpodpery ukazpole \
-    ukazpostredizakladnihofontu ukazramecek ukazsadusymbolu ukazskupinubarev ukazupravu ukazvytisk \
-    ukazvzhled ukazzakladnifont umistikombinovanyseznam umistilegendu umistiloga umistilokalnipoznamkypodcarou \
-    umistinadsebe umistinamrizku umistipodrovnici umistipoznamkypodcarou umistirejstrik umistirovnici \
-    umistiseznam umistivedlesebe umistizalozky uzijURL uzijbloky uzijexternidokument \
-    uzijexterniobraz uzijexternisoubor uzijexternisoubory uzijexternizvuk uzijkodovani uzijmodul \
-    uzijodkazy uzijprikazy uzijspeciality uzijsymbol verze vl \
-    vlasovalinka vlevo vpravo vradku vsedniden vyberbloky \
-    vyberpapir vyberverzi vyplnenytext vyplnovelinky vyplnovepole vyplnovyradek \
-    vysoky zablokujinterakcnimenu zachovejbloky zadnamezera zadnebilemisto zadnedalsibloky \
-    zadnedalsisoubory zadnehorniadolniradky zadneodsazovani zadnezahlaviaupati zadneznaceni zadnyseznam \
-    zadnytest zalozka zapisdorejstriku zapisdoseznamu zapisdoseznamuodkazu zapismeziseznam \
-    zaramovani zarovnanonastred zarovnanovlevo zarovnanovpravo zasobnikpoli zaznamovepole \
-    zhustene ziskejbuffer ziskejznaceni zlomek znaceni znak \
-    znaky zpracujbloky zpracujstranu zrcadlit zref 
diff --git a/context/data/scite/cont-de-scite.properties b/context/data/scite/cont-de-scite.properties
deleted file mode 100644
index 249fc6a59..000000000
--- a/context/data/scite/cont-de-scite.properties
+++ /dev/null
@@ -1 +0,0 @@
-keywordclass.macros.context.de=Buchstabe Buchstaben CAP Cap Caps MONAT Roemischezahlen WOCHENTAG WOERTER WORT Woerter Wort amgitterausrichten amgitterneuausrichten appendix aufseite ausfuellfeld ausfuelltext ausschnitt bearbeitebloecke bearbeiteseite behaltebloecke bei benutzekodierung benutzespezielles beschrifteversion beschriftung bestimmekopfnummer bestimmelistencharakeristika bildschirm blanko bookmark bruch buchstabe buchstaben but bypassblocks cap chapter chem comment completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms completeregister coupledregister crlf datum definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling defineoutput defineschriftsynonym definetype definetypeface definiereabbsymbol definiereabsaetze definiereabschnitt definiereabschnittsblock definierebeschreibung definierebeschreibungen definierebeschriftung definiereblanko definiereblock definiereeinzug definierefarbe definierefarbengruppe definierefeld definierefeldstapel definierefliesstext definierefliesstextumgebung definieregleitobjekt definiereinteraktionsmenue definiereinteraktionsmenue definierekonversion definierelabel definiereliste definierelogo definieren definierenummerierung definiereoverlay definierepalette definierepapierformat definiereprofil definiereprogramme definierepuffer definierereferenz definierereferenzformat definierereferenzliste definiereregister definiereschrift definieresortieren definierestartstop definieresubfeld definieresymbol definieresynonyme definieretabellenvorlage definieretabulator definieretext definieretippen definiereueberschrift definiereumbruch definiereumrahmt definiereumrahmtertext definiereversion definierezusammengestellteliste description doppelseite doppelseitigespapier drehen duennelinie duennerumriss einezeile einziehen emptylines entknuepfebeschriftung enumeration externeabbildung farbe feld feldstapel festesspatium folgeprofil folgeprofilversion folgeversion footnotetext forceblocks format framedtext fussnote gefuelltesrechteck gefuelltezeile gestreckt gitter graufarbe haarlinie hauptsprache heutigesdatum heutigeskopfnummer hintergrund hl hoch holebeschriftung holepuffer imlinken imrechten imumriss in inaktiviereinteraktionsmenue inanderermarginale indentation ininner inmarginalie inouter installieresprache interaktionsbalken interaktionsknopfe inzeile irgendwo its keinebeschriftung keinebloeckemehr keinedateienmehr keinekopfundfusszeilen keineliste keinspatium keinzeilenobenundunten keinzwischenraum kleinerdurchschuss klonierefeld knopf konvertierezahl kopf kopfnummer kopierefeld korrigierezwischenraum labeling labels labeltext linksbuendig listsymbol loadsorts loadsynonyms mapfontsize mar marginallinie marginaltext mathematik mediaeval monat nachunten name nextsection nichteinziehen nocap nop notiz overbar overbars overstrike overstrikes paragraph part passelayoutan passendfeld placefloat placelistoffloats placelistofsorts placelistofsynonyms placereferencelist platzierebookmarks platziereformel platzierefussnoten platzierelegende platziereliste platzierelogo platzierelokalefussnoten platzierenebeneinander platziereregister platziereregister platziereuntereinander platziereunterformel platzierezusammengestellteliste platzierezusammengestellteliste pos position posten programm publikation punkt ran rechteck rechtecke rechtsbuendig ref referenz register registrierefelder reservefloat resettextcontent roemischezahlen ruecksetzten ruecksetztenbeschriftung schreibezumregister schreibezurliste schreibezurreferenzliste schreibezwischenliste section seeregister seite seitenreferenz seitentyp settext setupfonthandling setupfontsynonym setupforms setupinterlinespace2 setupitemgroup setuplistalternative setuppaper setupstrut showsymbolset sort spalte spatium spiegeln sprache startalignment startbuffer startbuffer startcolumns startcombination startcomment startdescription startdocument startenumeration startfarbe startfigure startfloattext startformula startframedtext startgeg starthiding starthintergrund startinteraktionsmenue startitemgroup startkleinerdurchschuss startkomponente startlegend startline startlinecorrection startlinenumbering startlines startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginallinie startmarginblock startnamemakeup startnarrower startopposite startoverlay startoverview startparagraph startpositioning startpostponing startprodukt startprofile startprojekt startregister startsymbolset startsynchronization starttable starttables starttabulate starttextlinie starttyping startumgebung startunpacked startversion startzitat stelleabsaetzeein stelleabsatznummerierungein stelleabschnittein stelleabschnittsblockein stelleanordnenein stelleausgabeein stelleausrichtungein stelleausschnittein stellebeschreibungein stellebeschriftungein stellebilderunterschriftein stellebildunterschriftein stellebindestrichein stelleblankoein stelleblockein stelledrehenein stelleduennerumrissein stelleeinziehenein stelleeinzuegein stelleengerein stelleexterneabbildungenein stellefarbeein stellefarbenein stellefeldein stellefelderin stellefliesstextein stellefliesstextumgebungein stelleformelnein stellefussnotendefinitionein stellefussnotenein stellefusszeileein stellefusszeilentextein stellegefuelltesrechteckein stellegefuelltezeileein stellegegenueberplatzierenein stellegleitobjekteein stellegleitobjektein stellehintergruendeein stellehintergrundein stelleinmarginalieein stelleinteraktionein stelleinteraktionsbalkenein stelleinteraktionsbildschirmein stelleinteraktionsmenueein stelleknopfein stellekombinationein stellekommentarein stellekopfzahlein stellekopfzeileein stellekopfzeilentextein stellelabeltextein stellelayoutein stellelegendeein stellelinienbreiteein stellelisteein stellemarginalblockein stellemarginallinieein stellenobenein stellenummerierungein stellepaletteein stellepapierformatein stelleplatziegeteiltegleitobjekt stellepositionierenein stellepostenein stelleprofilein stelleprogrammein stellepublikationein stellepufferein stellerasterein stellerechteckein stellereferenzierenein stellereferenzlisteein stelleregisterein stelleseitennummerein stelleseitennummeriernungein stelleseitenuebergangein stellesortierenein stellespaltenein stellespatiumein stellespracheein stellesymbolsetein stellesynchronisationein stellesynchronisationsbalkenein stellesynonymein stellesystemein stelletabein stelletabellenein stelletabulatorein stelletextein stelletextobenein stelletexttexteein stelletextumrissein stelletextuntenein stelletipein stelletippenein stelletoleranzein stelleueberschriftein stelleueberschriftenein stelleueberschrifttextein stelleumbruchein stelleumrahmtein stelleumrahmtetexteein stelleuntenein stelleunterseitennummerein stelleunterstreichenein stelleurlein stelleversalienein stelleversionein stellezeilenabstandein stellezeilenein stellezeilennumerierungein stellezitierenein stellezusammengestelltelisteein stellezwischenraumein stopalignment stopbuffer stopbuffer stopcolumns stopcombination stopcomment stopdescription stopdocument stopenumeration stopfarbe stopfigure stopfloattext stopformula stopframedtext stopgeg stophiding stophintergrund stopinteraktionsmenue stopitemgroup stopkleinerdurchschuss stopkomponente stoplegend stopline stoplinecorrection stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginallinie stopmarginblock stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stopparagraph stoppositioning stoppostponing stopprodukt stopprofile stopprojekt stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptextlinie stoptyping stopumgebung stopunpacked stopversion stopzitat sub subject subsection subsubject subsubsection subsubsubject sym symbol synchronisationsbalken synchronisieren synonym tab teilegleitobjekt tex textlinie textreferenz tief tiho tip tippedatei tippen tippepuffer title tooltip ueber ueberschrifttext uebersetzten umrahmt underbar underbars usedirectory usetypescript usetypescriptfile verbergebloecke vergleichefarbengruppe vergleichepalette verknuepfebeschriftung verknuepfedokument verknuepfregister version verweis verweisdatum verwendeURL verwendebefehl verwendebloecke verwendeexteresdokument verwendeexterneabbildung verwendeexternedatei verwendeexternedateien verwendeexternestonstueck verwendemodul verwendereferenzen verwendesymbole vl von waehlebloeckeaus waehlepapieraus waehleversionaus wechselezumfliesstext wochentag wortrechts zeigedruck zeigeeinstellungen zeigeexterneabbildungen zeigefarbe zeigefarbengruppe zeigefelder zeigefliesstext zeigefliesstextumgebung zeigegitter zeigelayout zeigepalette zeigerahmen zeigestruts zeigeumbruch zentriert ziffern zitat zitieren zu zurbox zwischenraum 
\ No newline at end of file
diff --git a/context/data/scite/cont-en-scite.properties b/context/data/scite/cont-en-scite.properties
deleted file mode 100644
index a83042bf6..000000000
--- a/context/data/scite/cont-en-scite.properties
+++ /dev/null
@@ -1 +0,0 @@
-keywordclass.macros.context.en=CAP Cap Caps Character Characters MONTH Romannumerals WEEKDAY WORD WORDS Word Words about adaptlayout appendix at atpage background blackrule blackrules blank bookmark but button bypassblocks cap chapter character characters chem clip clonefield color column comment comparecolorgroup comparepalet completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms completeregister convertnumber copyfield correctwhitespace coupledocument coupledregister couplemarking couplepage couplepaper coupleregister crlf currentdate currentheadnumber date decouplemarking define defineblank defineblock definebodyfont definebodyfontDEF definebodyfontREF definebodyfontenvironment definebuffer definecolor definecolorgroup definecombinedlist defineconversion definedescription definedfont defineenumeration definefield definefieldstack definefiguresymbol definefloat definefont definefontfeature definefonthandling definefontsynonym defineframed defineframedtext definehead defineindenting defineinteractionmenu defineinteractionmenu definelabel definelist definelogo definemakeup definemarking defineoutput defineoverlay definepalet definepapersize defineparagraphs defineprofile defineprogram definereference definereferenceformat definereferencelist defineregister definesection definesectionblock definesorting definestartstop definesubfield definesymbol definesynonyms definetabletemplate definetabulate definetext definetype definetypeface definetyping defineversion description determineheadnumber determinelistcharacteristics disableinteractionmenu emptylines enumeration externalfigure field fieldstack fillinfield fillinline fillinrules fillintext fitfield fixedspaces followprofile followprofileversion followversion footnote footnotetext forceblocks fraction framed framedtext from getbuffer getmarking godown goto gotobox graycolor grid hairline head headnumber headtext hideblocks high hl in indentation indenting inframed ininner inleft inline inmargin inothermargin inouter inright installlanguage interactionbar interactionbuttons item items its keepblocks labeling labels labeltext language leftaligned listsymbol loadsorts loadsynonyms logfields lohi low mainlanguage mapfontsize mar marginrule margintext marking markversion mathematics mediaeval midaligned mirror month moveongrid name nextsection nocap noheaderandfooterlines noindenting nolist nomarking nomoreblocks nomorefiles nop nospace note notopandbottomlines nowhitespace numbers overbar overbars overstrike overstrikes packed page pagereference pagetype paragraph part periods placebookmarks placecombinedlist placecombinedlist placefloat placefootnotes placeformula placelegend placelist placelistoffloats placelistofsorts placelistofsynonyms placelocalfootnotes placelogos placeongrid placeontopofeachother placereferencelist placeregister placeregister placesidebyside placesubformula position processblocks processpage program publication quotation quote ran ref reference referral referraldate register reservefloat reset resetmarking resettextcontent rightaligned romannumerals rotate scale screen section seeregister selectblocks selectpaper selectversion settextcontent setupalign setuparranging setupbackground setupbackgrounds setupblackrules setupblank setupblock setupbodyfont setupbodyfontenvironment setupbottom setupbottomtexts setupbuffer setupbuttons setupcapitals setupcaption setupcaptions setupclipping setupcolor setupcolors setupcolumns setupcombinations setupcombinedlist setupcomment setupdescriptions setupenumerations setupexternalfigures setupfield setupfields setupfillinlines setupfillinrules setupfloat setupfloats setupfloatsplitting setupfonthandling setupfontsynonym setupfooter setupfootertexts setupfootnotedefinition setupfootnotes setupforms setupformulae setupframed setupframedtexts setuphead setupheader setupheadertexts setupheadnumber setupheads setupheadtext setuphyphenmark setupindentations setupindenting setupinmargin setupinteraction setupinteractionbar setupinteractionmenu setupinteractionscreen setupinterlinespace setupinterlinespace2 setupitemgroup setupitems setuplabeltext setuplanguage setuplayout setuplegend setuplinenumbering setuplines setuplinewidth setuplist setuplistalternative setupmakeup setupmarginblocks setupmarginrules setupmarking setupnarrower setupnumbering setupoppositeplacing setupoutput setuppagenumber setuppagenumbering setuppagetransitions setuppalet setuppaper setuppapersize setupparagraphnumbering setupparagraphs setuppositioning setupprofiles setupprograms setuppublications setupquote setupreferencelist setupreferencing setupregister setuprotate setupscreens setupsection setupsectionblock setupsorting setupspacing setupstrut setupsubpagenumber setupsymbolset setupsynchronization setupsynchronizationbar setupsynonyms setupsystem setuptab setuptables setuptabulate setuptext setuptextrules setuptexttexts setupthinrules setuptolerance setuptop setuptoptexts setuptype setuptyping setupunderbar setupurl setupversions setupwhitespace showbodyfont showbodyfontenvironment showcolor showcolorgroup showexternalfigures showfields showframe showgrid showlayout showmakeup showpalet showprint showsetups showstruts showsymbolset someline somewhere sort space splitfloat startalignment startbackground startbuffer startbuffer startcolor startcolumns startcombination startcomment startcomponent startdescription startdocument startenumeration startenvironment startfact startfigure startfloattext startformula startframedtext starthiding startinteractionmenu startitemgroup startlegend startline startlinecorrection startlinenumbering startlines startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginblock startmarginrule startnamemakeup startnarrower startopposite startoverlay startoverview startpacked startparagraph startpositioning startpostponing startproduct startprofile startproject startquotation startregister startsymbolset startsynchronization starttable starttables starttabulate starttextrule starttyping startunpacked startversion stopalignment stopbackground stopbuffer stopbuffer stopcolor stopcolumns stopcombination stopcomment stopcomponent stopdescription stopdocument stopenumeration stopenvironment stopfact stopfigure stopfloattext stopformula stopframedtext stophiding stopinteractionmenu stopitemgroup stoplegend stopline stoplinecorrection stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginblock stopmarginrule stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stoppacked stopparagraph stoppositioning stoppostponing stopproduct stopprofile stopproject stopquotation stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptextrule stoptyping stopunpacked stopversion stretched sub subject subsection subsubject subsubsection subsubsubject switchtobodyfont sym symbol synchronizationbar synchronize synonym tab tex textreference textrule thinrule thinrules title tooltip translate typ type typebuffer typefile underbar underbars useURL useblocks usecommands usedirectory useencoding useexternaldocument useexternalfigure useexternalfile useexternalfiles useexternalsoundtrack usemodule usereferences usespecials usesymbols usetypescript usetypescriptfile version vl weekday whitespace wordright writebetweenlist writetolist writetoreferencelist writetoregister 
\ No newline at end of file
diff --git a/context/data/scite/cont-fr-scite.properties b/context/data/scite/cont-fr-scite.properties
deleted file mode 100644
index 5ecccf961..000000000
--- a/context/data/scite/cont-fr-scite.properties
+++ /dev/null
@@ -1 +0,0 @@
-keywordclass.macros.context.fr=CAP Cap Caps Caractere Caracteres Chiffresromains JOURSEMAINE MOIS MOT MOTS Mot Mots a adaptedisposition ajustechamp alaligne alapage aligneadroite aligneagauche aligneaumilieu appendix arriereplan baha barreinteraction barresynchronisation bas bouton boutonsinteraction but cacheblocs cap caractere caracteres champ changepolicecorps chapter chem chiffresromains citation citer clip clonechamp colonne comment comparegroupecouleur comparepalette completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms completeregistre composeenalinea concernant convertitnumero copitchamp corrigeespaceblanc couleur couleurgrise coupledocument coupledregister couplemarquage couplepapier coupleregistre crlf dactylographier dans dansautremarge dansdroite dansgauche dansmarge date datecourante daterecommandation de decouplemarquage definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling defineframed defineframedtext definetypeface definit definitbloc definitblocsection definitbuffer definitchamp definitcompoalinea definitconversion definitcouleur definitdactylo definitdemarrestoppe definitdescription definitenumeration definitenvironnementpolicecorps definitetiquette definitflottant definitformatreference definitgroupecouleur definitliste definitlisteimbriquee definitlistereference definitlogo definitmakeup definitmarquage definitmenuinteraction definitmenuinteraction definitnotepdp definitpalette definitparagraphes definitpilechamp definitpolice definitpolicecorps definitprofil definitprogramme definitreference definitregistre definitrevetement definitsection definitsortie definitsouschamp definitsymbole definitsymbolefigure definitsynonymepolice definitsynonymes definittabulation definittaillepapier definittete definittexte definittrametableau definittri definittype definitversion definitvide definitvide demarreciter deplacesurgrille description determinecaracteristiqueliste determinenumerotete echelle ecran ecritdansliste ecritdanslistereference ecritentreliste ecritregistre el element elements emptylines enumeration espace espaceblanc espacesfixes etiquettes etire fichierdactylo figureexterne forceblocs fraction framed framedtext gardeblocs grille groupe haut hl indentation inframed inhibemenuinteraction ininner inouter installelangue joursemaine labeling labeltexte langue langueprincipale ligneh lignenoire ligneregleetexte lignesnoires listesymbole loadsorts loadsynonyms logchamp mapfontsize mar margereglee marquage marquageversion marquepage mathematique mediaeval mois montrecadre montrechamps montrecouleur montredisposition montreedition montreenvironnementpolicecorps montrefiguresexternes montregrille montregroupecouleur montrejeusymboles montremakeup montrepalette montrepolicecorps montrereglages montrestruts motdroit name nextsection nocap nop note notepdp numeros numerotete numerotetecourant obtientmarquage oriente overbar overbars overstrike overstrikes page pagedouble paragraph part pasplusdeblocs pasplusdefichiers periodes pilechamp placecoteacote placeflottant placeformule placelegende placelesunsaudessusdesautres placeliste placelisteinmbriquee placelisteinmbriquee placelistereference placelistoffloats placelistofsorts placelistofsynonyms placelogos placemarquespages placenotespdp placenotespdplocales placeregistre placeregistre placesousformule placesurgrille position prendbuffer programme publication qqpart ran raz razmarquage recommandation ref reference referencepage referencetexte reflete register reglealignement reglealineas reglearrangement reglearriereplan reglearriereplans reglebarreinteraction reglebarresynchronisation reglebloc regleblocmarge regleblocsection regleboutons reglebuffer reglecapitales reglechamp reglechamps regleclipping reglecolonnes reglecombinaisons reglecommentaire reglecompoetroite reglecomposeenalinea reglecouleur reglecouleurs regledactylo regledansmarge regledescriptions regledisposition regleecraninteraction regleecrans regleelements regleencadre regleentete regleenumerations regleenvironnementpolicecorps regleepaisseurligne regleespaceblanc regleespacement regleespacementinterligne reglefiguresexternes regleflottant regleflottants regleformulaires regleformules regleinf regleinteraction regleintitule regleintitules reglejeusymboles reglelabeltexte reglelangue reglelegende reglelignes reglelignesnoires reglelignesreglestexte regleliste reglelisteimbriquee reglelistereference reglemakeup reglemargereglee reglemarquage reglemarquagehyphenation reglemenuinteraction reglenotepdp reglenumeropage reglenumerotation reglenumerotationligne reglenumerotationpage reglenumerotationparagraphe reglenumerotete regleoriente reglepalette reglepapier regleparagraphes reglepdp regleplacementopposition reglepolicecorps reglepositionnement regleprofils regleprogrammes reglepublications reglereferencage regleregistre regleremplitligne regleremplitlignesreglees reglesection regleseparationflottant reglesortie reglesouslignage reglesousnumeropage reglestrut reglesup reglesynchronisation reglesynonymes reglesysteme regletab regletableaux regletabulation regletaillepapier regletete regletetes regletexte regletextesentete regletextesinf regletextespdp regletextessup regletextestexte regletextetete regletolerance regletraitsfins regletransitionspage regletri regletype regleurl regleversions remplitchamp remplitligne remplitlignesreglees remplittexte reservefloat resettextcontent sansalinea sansespace sansespaceblanc sanslignesenteteetpdp sanslignessupetinf sansliste sansmarquage sauteblocs section seeregister selectionneblocs selectionnepapier selectionneversion separeflottant settext setupfonthandling setupfontsynonym setupframedtexts setupinterlinespace2 setupitemgroup setuplistalternative sort startalignment startarriereplan startbuffer startbuffer startcitation startcolumns startcombination startcomment startcomposant startcouleur startdescription startdocument startenumeration startenvironement startfait startfigure startfloattext startformula startframedtext startgroupe starthiding startitemgroup startlegend startligneregleetexte startline startlinecorrection startlinenumbering startlines startlocal startlocalenvironment startlocalfootnotes startmakeup startmargereglee startmarginblock startmenuinteraction startnamemakeup startnarrower startopposite startoverlay startoverview startparagraph startpositioning startpostponing startproduit startprofile startprojet startregister startsymbolset startsynchronization starttable starttables starttabulate starttyping startunpacked startversion stopalignment stoparriereplan stopbuffer stopbuffer stopcitation stopcolumns stopcombination stopcomment stopcomposant stopcouleur stopdescription stopdocument stopenumeration stopenvironement stopfait stopfigure stopfloattext stopformula stopframedtext stopgroupe stophiding stopitemgroup stoplegend stopligneregleetexte stopline stoplinecorrection stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmargereglee stopmarginblock stopmenuinteraction stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stopparagraph stoppositioning stoppostponing stopproduit stopprofile stopprojet stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptyping stopunpacked stopversion sub subject subsection subsubject subsubsection subsubsubject suggestion suivantprofil suivantversion suivantversionprofil sym symbole synchronise synonym tab tapebuffer tapepage tete tex textemarge textenotepdp textetete title traduire traiteblocs traitepage traitfin traitsfins typ underbar underbars uneligne usedirectory usetypescript usetypescriptfile utiliseURL utiliseblocs utilisecommandes utilisedocumentexterne utiliseencodage utilisefichierexterne utilisefichiersexternes utilisefigureexterne utilisemodule utilisepsiteaudioexterne utilisereferences utilisespecialites utilisesymboles va vaalaboite vaenbas version vide vl 
\ No newline at end of file
diff --git a/context/data/scite/cont-it-scite.properties b/context/data/scite/cont-it-scite.properties
deleted file mode 100644
index 699cd0f1e..000000000
--- a/context/data/scite/cont-it-scite.properties
+++ /dev/null
@@ -1 +0,0 @@
-keywordclass.macros.context.it=CAP Cap Caps GIORNOSETTIMANA Lettera Lettere MESE Numeriromani PAROLA PAROLE Parola Parole accoppiacarta accoppiadocumento accoppiamarcatura accoppiapagina accoppiaregistro adattacampo adattalayout al allineacentro allineadestra allineasinistra ap apagina appendix barrainterazione barrasincronizzazione bastablocchi bastafile cambiaafontdeltesto campi camporiempimento cap capello chapter chim circondato citazione clip clonacampo colonna colore coloregrigio comment completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms completeregister confrontagruppocolori confrontatavolozza convertinumero copiacampo correggispaziobianco coupledregister crlf da daqualcheparte data datadioggi datareferral definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling definetypeface definisci definisciambientefontdeltesto definisciblocco definiscibloccosezione definiscibuffer definiscicampo definiscicapoversi definiscicolore definisciconversione definiscidescrizione definiscidimensionicarta definiscielenco definiscielencocombinato definiscienumerazione definiscietichetta definiscifigurasimbolo definiscifont definiscifontdeltesto definisciformatoriferimento definiscigruppocolori definisciincorniciato definisciiniziatermina definiscilistariferimenti definiscilogo definiscimakeup definiscimarcatura definiscimenuinterazione definiscimenuinterazione definiscimodellotabella definiscioggettomobile definisciordinamento definiscioutput definisciprofilo definisciprogramma definisciregistro definiscirientro definisciriferimento definiscirigovuoto definiscisezione definiscisimbolo definiscisinonimi definiscisinonimofont definiscisottocampo definiscisovrapposizione definiscistackcampi definiscitabulato definiscitavolozza definiscitesta definiscitesto definiscitestoincorniciato definiscitype definiscityping definisciversion description determinacarattersticheelenco determinanumerotesta disabilitamenuinterazione el elaborablocchi elaborapagina elementi elemento emptylines enumeration etichette figuraesterna fondo forzablocchi framedtext frazione giornosettimana griglia hl impaccato impostaallineamento impostaambientefontdeltesto impostaampiezzariga impostabarrainterazione impostabarrasincronizzazione impostablocchimargine impostablocco impostabloccosezione impostabuffer impostacampi impostacampo impostacapoversi impostacaption impostacaptions impostacima impostaclippling impostacolonne impostacolore impostacolori impostacombinazioni impostacommento impostadefinizionenotepdp impostadescrizioni impostadimensionicarta impostaelementi impostaelenco impostaelencocombinato impostaenumerazioni impostafigureesterne impostafondo impostafontdeltesto impostaforms impostaformule impostaincorniciato impostainmargine impostainstestazione impostainterazione impostainterlinea impostalayout impostalegenda impostalineemargine impostalineenere impostalineeriempimento impostalineesottili impostalineetesto impostalingua impostalistariferimenti impostamaiuscole impostamakeup impostamarcatura impostamenuinterazione impostamenzione impostanotepdp impostanumerazione impostanumerazionecapoversi impostanumerazionepagina impostanumerazionerighe impostanumeropagina impostanumerosottopagina impostanumerotesta impostaoggettimobili impostaoggettomobile impostaordinamento impostaoutput impostaparranging impostapdp impostapiustretto impostaposizionamento impostaposizionamentoopposti impostaprofili impostaprogrammi impostapubblicazioni impostapulsanti impostaregistro impostarientri impostarientro impostariferimento impostarighe impostarigheriempimento impostarigovuoto impostarotazione impostaschermi impostaschermointerazione impostasegnosillabazione impostasetsimboli impostasezione impostasfondi impostasfondo impostasincronizzazione impostasinonimi impostasistema impostasottolinea impostaspaziatura impostaspaziobianco impostaspezzamentooggettomobile impostastrut impostatab impostatabelle impostatabulato impostatavolozza impostatesta impostateste impostatesticima impostatestifondo impostatestiincorniciati impostatestiintestazioni impostatestipdp impostatesto impostatestoetichette impostatestointestazioni impostatestotesti impostatolleranza impostatransizionepagina impostatype impostatyping impostaurl impostaversioni in inaltromargine incorniciato indentation indestra ininner inmargine inouter inriga insinistra installalingua intorno labeling lettera lettere lineamargine lineanera lineasottile lineatesto lineenere lineeriempimento lineesottili lingua linguaprincipale listsymbol loadsorts loadsynonyms logcampi mapfontsize mar marcatura marcaversione matematica mediaeval menzione mese mettielenco mettielencocombinato mettielencocombinato mettifiancoafianco mettiformula mettiingriglia mettilegenda mettiloghi mettinotepdp mettinotepdplocali mettiregistro mettiregistro mettisegnalibro mettisottoformula mettiunosullaltro mostraambientefontdeltesto mostracampi mostracolore mostracornice mostrafiguresterne mostrafontdeltesto mostragriglia mostragruppocolori mostraimpostazioni mostralyout mostramakeup mostrasetsimboli mostrastampa mostrastruts mostratavolozza name nascondiblocchi nextsection nienteelenco nientelineecimafondo nientelineintestazionepdp nientemarcatura nienterientro nientespazio nientespaziobianco nocap nop nota notapdp numeri numeriromani numerotesta numerotestacorrente overbar overbars overstrike overstrikes pagina paragraph paroladestra part ped pedap placefloat placelistoffloats placelistofsorts placelistofsynonyms placereferencelist posizione prendibuffer prendimarcatura programma pubblicazione pulsante pulsantinterazione punti qualcheriga ran referral register reimposta reimpostamarcatura reservefloat resettextcontent rientro rif riferimento riferimentopagina riferimentotesto riflessione rigariempimento rigovuoto ruota saltablocchi scala schermo scrividentroelenco scriviinelenco scriviinlistariferimenti scriviinregistro section seeregister segnalibro seguiprofilo seguiversione seguiversioneprofilo selezionablocchi selezionacarta selezionaversione separamarcatura settext setupfonthandling setupfontsynonym setupinterlinespace2 setupitemgroup setuplistalternative setuppaper sfondo sim simbolo sincronizza sort spazifissi spazio spaziobianco spezzaoggettomobile spostaagriglia stackcampi startalignment startambiente startbuffer startbuffer startcitazione startcolore startcolumns startcombination startcomment startcomponenet startdescription startdocument startenumeration startfatto startfigure startfloattext startformula startframedtext starthiding startimpaccato startitemgroup startlegend startline startlineamargine startlineatesto startlinecorrection startlinenumbering startlines startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginblock startmenuinterattivo startnamemakeup startnarrower startopposite startoverlay startoverview startparagraph startpositioning startpostponing startprodotto startprofile startprogetto startregister startsfondo startsymbolset startsynchronization starttable starttables starttabulate starttyping startunpacked startversione stirato stopalignment stopambiente stopbuffer stopbuffer stopcitazione stopcolore stopcolumns stopcombination stopcomment stopcomponenet stopdescription stopdocument stopenumeration stopfatto stopfigure stopfloattext stopformula stopframedtext stophiding stopimpaccato stopitemgroup stoplegend stopline stoplineamargine stoplineatesto stoplinecorrection stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginblock stopmenuinterattivo stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stopparagraph stoppositioning stoppostponing stopprodotto stopprofile stopprogetto stopsfondo stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptyping stopunpacked stopversione sub subject subsection subsubject subsubsection subsubsubject synonym tab testa testoetichetta testoinmargine testoinstestazioni testonotapdp testoriempimento tex tieniblocchi tipopagina title tooltip traduci typ type typebuffer typefile underbar underbars usaURL usablocco usacodifica usacolonnasonoraesterna usacomandi usadocumentoesterno usafiguraesterna usafileesterni usafileesterno usamodulo usariferimenti usasimboli usaspecialita usedirectory usetypescript usetypescriptfile vaia vaiabox vaigiu versione vl 
\ No newline at end of file
diff --git a/context/data/scite/cont-nl-scite.properties b/context/data/scite/cont-nl-scite.properties
deleted file mode 100644
index a36e8f475..000000000
--- a/context/data/scite/cont-nl-scite.properties
+++ /dev/null
@@ -1 +0,0 @@
-keywordclass.macros.context.nl=CAP Cap Caps Letter Letters MAAND Romeins WEEKDAG WOORD WOORDEN Woord Woorden about achtergrond appendix bepaalkopnummer bepaallijstkenmerken blanko blokje blokjes blokkeerinteractiemenu bookmark breuk but button cap chapter chem cijfers citaat citeer clip comment completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms converteernummer copieerveld corrigeerwitruimte coupledregister crlf datum definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling definetypeface definieer definieeralineas definieerbeeldmerk definieerblanko definieerblok definieerbuffer definieerconversie definieerfiguursymbool definieerfont definieerfontsynoniem definieerinteractiemenu definieerinteractiemenu definieerkadertekst definieerkleur definieerkleurgroep definieerkop definieerkorps definieerkorpsomgeving definieerlijst definieermarkering definieeromlijnd definieeropmaak definieeroverlay definieerpalet definieerpapierformaat definieerplaatsblok definieerprofiel definieerprogramma definieerreferentie definieerreferentieformaat definieerreferentielijst definieerregister definieersamengesteldelijst definieersectie definieersectieblok definieersorteren definieerstartstop definieersubveld definieersymbool definieersynoniemen definieertabelvorm definieertabulatie definieertekst definieertype definieertypen definieeruitvoer definieerveld definieerveldstapel definieerversie description doordefinieren doorlabelen doornummeren doorspringen dunnelijn dunnelijnen eenregel enumeration ergens externfiguur forceerblokken framedtext gebruikURL gebruikblokken gebruikcommandos gebruikexterndocument gebruikexternefile gebruikexternefiles gebruikexternfiguur gebruikexterngeluidsfragment gebruikmodule gebruikreferenties gebruikspecials gebruiksymbolen gebruiktypescript gebruiktypescriptfile geenblokkenmeer geenbovenenonderregels geenfilesmeer geenhoofdenvoetregels geenlijst geenmarkering geenspatie geenwitruimte grijskleur haalbuffer haalmarkering haarlijn handhaafblokken hl hoofdtaal hoog huidigedatum huidigekopnummer in inanderemarge inbinnen inbuiten indentation inlijnd inlinker inmarge inrechter inregel inspringen installeertaal interactiebalk interactiebuttons invullijnen invulregel invultekst invulveld items its kantlijn kenmerk kenmerkdatum kleur kloonveld kolom kop kopnummer koppeldocument koppelmarkering koppelpagina koppelpapier koppelregister koptekst laag labeling labels labeltekst laho legeregels letter letters lijstsymbool loadsorts loadsynonyms maand mapfontsize mar margetekst markeer markeerversie mediaeval naar naarbox name nextsection nietinspringen nocap noot nop omlaag omlijnd ontkoppelmarkering op opelkaar oppagina overbar overbars overstrike overstrikes pagina paginareferentie paragraph part paslayoutaan passeerblokken passendveld plaatsbeeldmerken plaatsbookmarks plaatsformule plaatslegenda plaatslijst plaatslokalevoetnoten plaatsnaastelkaar plaatsonderelkaar plaatsopgrid plaatsplaatsblok plaatsreferentielijst plaatsregister plaatsregister plaatssamengesteldelijst plaatssamengesteldelijst plaatssubformule plaatsvoetnoten placelistoffloats placelistofsorts placelistofsynonyms positioneer programma publicatie punten ran ref referentie regellinks regelmidden regelrechts register registreervelden reservefloat reset resetmarkering resettextcontent romeins rooster roteer schaal scherm schrijfnaarlijst schrijfnaarreferentielijst schrijfnaarregister schrijftussenlijst section seeregister selecteerblokken selecteerpapier selecteerversie setupfonthandling setupfontsynonym setupinterlinespace2 setuplistalternative som soortpagina sort spatie spiegel splitsplaatsblok startachtergrond startalignment startbuffer startbuffer startcitaat startcolumns startcombination startcomment startdescription startdocument startenumeration startfigure startfloattext startformula startframedtext startgeg starthiding startinteractiemenu startitemgroup startkantlijn startkleur startlegend startline startlinecorrection startlinenumbering startlines startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginblock startnamemakeup startnarrower startomgeving startonderdeel startopelkaar startopposite startoverlay startoverview startparagraph startpositioning startpostponing startprodukt startprofile startprojekt startregister startsymbolset startsynchronization starttable starttables starttabulate starttekstlijn starttyping startunpacked startversie stelachtergrondenin stelachtergrondin stelalineasin stelarrangerenin stelblankoin stelblokin stelblokjesin stelblokkopjein stelblokkopjesin stelbovenin stelboventekstenin stelbufferin stelbuttonsin stelciterenin stelclipin stelcombinatiesin stelcommentaarin steldoordefinierenin steldoornummerenin steldoorspringenin steldunnelijnenin stelexternefigurenin stelformulesin stelformulierenin stelhoofdin stelhoofdtekstenin stelinmargein stelinspringenin stelinteractiebalkin stelinteractiein stelinteractiemenuin stelinteractieschermin stelinterliniein stelinvullijnenin stelinvulregelsin stelitemgroepin stelitemsin stelkadertekstenin stelkantlijnin stelkapitalenin stelkleurenin stelkleurin stelkolommenin stelkopin stelkopnummerin stelkoppeltekenin stelkoppenin stelkoptekstin stelkorpsin stelkorpsomgevingin stellabeltekstin stellayoutin stellegendain stellijndiktein stellijstin stelmargeblokkenin stelmarkeringin stelnaastplaatsenin stelnummerenin stelomlijndin stelonderin stelonderstrepenin stelondertekstenin stelopmaakin stelpaginanummerin stelpaginanummeringin stelpaginaovergangenin stelpaletin stelpapierformaatin stelpapierin stelparagraafnummerenin stelplaatsblokin stelplaatsblokkenin stelplaatsbloksplitsenin stelpositionerenin stelprofielenin stelprogrammasin stelpublicatiesin stelrastersin stelreferentielijstin stelrefererenin stelregelnummerenin stelregelsin stelregisterin stelroterenin stelsamengesteldelijstin stelsectieblokin stelsectiein stelsmallerin stelsorterenin stelspatieringin stelstrutin stelsubpaginanummerin stelsymboolsetin stelsynchronisatiebalkin stelsynchronisatiein stelsynoniemenin stelsysteemin steltaalin steltabellenin steltabin steltabulatiein steltekstin steltekstinhoudin steltekstlijnenin stelteksttekstenin steltolerantiein steltypein steltypenin steluitlijnenin steluitvoerin stelurlin stelveldenin stelveldin stelversiesin stelvoetin stelvoetnootdefinitiein stelvoetnotenin stelvoettekstenin stelwitruimtein stopachtergrond stopalignment stopbuffer stopbuffer stopcitaat stopcolumns stopcombination stopcomment stopdescription stopdocument stopenumeration stopfigure stopfloattext stopformula stopframedtext stopgeg stophiding stopinteractiemenu stopitemgroup stopkantlijn stopkleur stoplegend stopline stoplinecorrection stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginblock stopnamemakeup stopnarrower stopomgeving stoponderdeel stopopelkaar stopopposite stopoverlay stopoverview stopparagraph stoppositioning stoppostponing stopprodukt stopprofile stopprojekt stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptekstlijn stoptyping stopunpacked stopversie sub subject subsection subsubject subsubsection subsubsubject suggestie switchnaarkorps sym symbool synchronisatiebalk synchroniseer synonym taal tab tekstlijn tekstreferentie tex title toonexternefiguren toongrid tooninstellingen toonkader toonkleur toonkleurgroep toonkorps toonkorpsomgeving toonlayout toonopmaak toonpalet toonprint toonstruts toonsymboolset toonvelden typ type typebuffer typefile uit uitgerekt underbar underbars usecodering usedirectory vastespaties veld veldstapel verbergblokken vergelijkkleurgroep vergelijkpalet verplaatsopgrid versie vertaal verwerkblokken verwerkpagina vl voetnoot voetnoottekst volgprofiel volgprofielversie volgversie volledigregister weekdag wiskunde witruimte woordrechts 
\ No newline at end of file
diff --git a/context/data/scite/cont-pe-scite.properties b/context/data/scite/cont-pe-scite.properties
deleted file mode 100644
index c89f52b8f..000000000
--- a/context/data/scite/cont-pe-scite.properties
+++ /dev/null
@@ -1 +0,0 @@
-keywordclass.macros.context.pe=CAP Cap Caps Character Characters MONTH Romannumerals WEEKDAY WORD WORDS Word Words appendix cap chapter chem comment completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms coupledregister crlf definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling definetypeface description enumeration framedtext indentation its labeling loadsorts loadsynonyms mapfontsize mediaeval name nextsection nocap overbar overbars overstrike overstrikes paragraph part placelistoffloats placelistofsorts placelistofsynonyms ran register reservefloat resettextcontent section seeregister setupcapitals setupfonthandling setupfontsynonym setupinterlinespace2 setuplistalternative setupurl sort startalignment startbuffer startbuffer startcolumns startcombination startcomment startdescription startdocument startenumeration startfigure startfloattext startformula startframedtext starthiding startitemgroup startlegend startline startlinecorrection startlinenumbering startlines startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginblock startnamemakeup startnarrower startopposite startoverlay startoverview startparagraph startpositioning startpostponing startprofile startregister startsymbolset startsynchronization starttable starttables starttabulate starttyping startunpacked startتولید startحقیقت startخط‌حاشیه startخط‌متن startرنگ startفشرده startمحیط startمنوی‌پانل startمولفه startنسخه startنقل‌قول startپروژه startپس‌زمینه stopalignment stopbuffer stopbuffer stopcolumns stopcombination stopcomment stopdescription stopdocument stopenumeration stopfigure stopfloattext stopformula stopframedtext stophiding stopitemgroup stoplegend stopline stoplinecorrection stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginblock stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stopparagraph stoppositioning stoppostponing stopprofile stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptyping stopunpacked stopتولید stopحقیقت stopخط‌حاشیه stopخط‌متن stopرنگ stopفشرده stopمحیط stopمنوی‌پانل stopمولفه stopنسخه stopنقل‌قول stopپروژه stopپس‌زمینه sub subject subsection subsubject subsubsection subsubsubject synonym title tooltip typ underbar underbars useURL usedirectory آیتم آیتمها آینه اجباربلوکها از ازکارانداختن‌منوی‌پانل استفاده‌بلوکها استفاده‌دستخط‌تایپ استفاده‌رمزینه استفاده‌شکل‌خارجی استفاده‌فرمانها استفاده‌قطعه‌موزیک‌خارجی استفاده‌مدول استفاده‌مرجعها استفاده‌نمادها استفاده‌نوشتارخارجی استفاده‌ویژگیها استفاده‌پرونده‌خارجی استفاده‌پرونده‌دستخط‌تایپ استفاده‌پرونده‌های‌خارجی اعدادلاتین اما انتخاب‌برگ انتخاب‌بلوکها انتخاب‌نسخه انتقال‌به‌توری بارگذاری‌آرایش بارگذاری‌آیتمها بارگذاری‌ارجاع بارگذاری‌اندازه‌برگ بارگذاری‌باریکتر بارگذاری‌بافر بارگذاری‌بالا بارگذاری‌بخش بارگذاری‌بردباری بارگذاری‌برنامه‌ها بارگذاری‌برگ بارگذاری‌بست بارگذاری‌بلوک بارگذاری‌بلوکهای‌حاشیه بارگذاری‌بلوک‌بخش بارگذاری‌تایپ بارگذاری‌تایپ‌کردن بارگذاری‌تب بارگذاری‌ترتیب بارگذاری‌ترتیب بارگذاری‌ترکیب‌ها بارگذاری‌تطابق بارگذاری‌تعریف‌پانوشت بارگذاری‌تنظیم بارگذاری‌ته‌برگ بارگذاری‌تورفتگی بارگذاری‌تورفتگیها بارگذاری‌توضیح بارگذاری‌ثبت بارگذاری‌جدولها بارگذاری‌جدول‌بندی بارگذاری‌خالی بارگذاری‌خروجی بارگذاری‌خطها بارگذاری‌خطهای‌حاشیه بارگذاری‌خطهای‌سیاه بارگذاری‌خطهای‌متن بارگذاری‌خطها‌ی‌نازک بارگذاری‌درج‌درخطها بارگذاری‌درج‌مخالف بارگذاری‌درون‌حاشیه بارگذاری‌دوران بارگذاری‌دکمه‌ها بارگذاری‌راهنما بارگذاری‌رنگ بارگذاری‌رنگها بارگذاری‌زبان بارگذاری‌ستونها بارگذاری‌سر بارگذاری‌سربرگ بارگذاری‌سرها بارگذاری‌سیستم بارگذاری‌شرح بارگذاری‌شرح بارگذاری‌شرحها بارگذاری‌شماره‌زیرصفحه بارگذاری‌شماره‌سر بارگذاری‌شماره‌صفحه بارگذاری‌شماره‌گذاری بارگذاری‌شماره‌گذاریها بارگذاری‌شماره‌گذاری‌صفحه بارگذاری‌شماره‌گذاری‌پاراگراف بارگذاری‌شماره‌‌گذاری‌خط بارگذاری‌شناور بارگذاری‌شناورها بارگذاری‌شکافتن‌شناورها بارگذاری‌شکلهای‌خارجی بارگذاری‌طرح بارگذاری‌طرح‌بندی بارگذاری‌عرض‌خط بارگذاری‌فاصله‌بین‌خط بارگذاری‌فرمولها بارگذاری‌فضای‌سفید بارگذاری‌فضا‌گذاری بارگذاری‌قالبی بارگذاری‌قلم‌متن بارگذاری‌لوح بارگذاری‌لیست بارگذاری‌لیست‌ترکیبی بارگذاری‌لیست‌مرجع بارگذاری‌مترادفها بارگذاری‌متن بارگذاری‌متنهای‌بالا بارگذاری‌متن‌سر بارگذاری‌متن‌سربرگ بارگذاری‌متن‌قالبی بارگذاری‌متن‌متنها بارگذاری‌متن‌پانوشت بارگذاری‌متن‌پایین بارگذاری‌مجموعه‌نماد بارگذاری‌محیط‌قلم‌متن بارگذاری‌منوی‌پانل بارگذاری‌مکان‌گذاری بارگذاری‌میدان بارگذاری‌میدانها بارگذاری‌میله‌تطابق بارگذاری‌میله‌زیر بارگذاری‌میله‌پانل بارگذاری‌نسخه‌ها بارگذاری‌نشانه‌شکستن بارگذاری‌نشانه‌گذاری بارگذاری‌نشرها بارگذاری‌نقل بارگذاری‌پاراگرافها بارگذاری‌پانل بارگذاری‌پانوشتها بارگذاری‌پایین بارگذاری‌پرده‌ها بارگذاری‌پرده‌پانل بارگذاری‌پروفایلها بارگذاری‌پرکردن‌خطها بارگذاری‌پس‌زمینه بارگذاری‌پس‌زمینه‌ها بارگذاری‌چیدن بارگذاری‌گذارصفحه بارگذاری‌گروه‌آیتم بازنشانی بازنشانی‌نشانه‌گذاری باگذاری‌متن‌برچسب بدون‌بلوکهای‌بیشتر بدون‌تورفتگی بدون‌خط‌بالاوپایین بدون‌خط‌سروته‌برگ بدون‌فایلهای‌بیشتر بدون‌فضا بدون‌فضای‌سفید بدون‌لیست بدون‌نشانه‌گذاری برنامه بروبه بروبه‌جعبه بروپایین برچسبها بلند بلوکهای‌پردازش بلوکها‌پنهان بنویس‌بین‌لیست بنویس‌درثبت بنویس‌درلیست‌مرجع بنویس‌در‌لیست تاریخ تاریخ‌جاری تاریخ‌رجوع تایپ تایپ‌بافر تایپ‌پرونده تب ترجمه تطابق تعریف تعریف‌آرایش تعریف‌آرم تعریف‌الگوی‌جدول تعریف‌اندازه‌برگ تعریف‌بافر تعریف‌بخش تعریف‌برنامه تعریف‌برچسب تعریف‌بلوک تعریف‌بلوک‌بخش تعریف‌تایپ تعریف‌تایپ‌کردن تعریف‌تبدیل تعریف‌ترتیب تعریف‌توده‌میدان تعریف‌تورفتگی تعریف‌ثبت تعریف‌جدول‌بندی تعریف‌خالی تعریف‌خروجی تعریف‌رنگ تعریف‌زیرمیدان تعریف‌سر تعریف‌شرح تعریف‌شروع‌پایان تعریف‌شماره‌بندی تعریف‌شمایل‌مرجع تعریف‌شناور تعریف‌قالبی تعریف‌قلم تعریف‌قلم‌متن تعریف‌لوح تعریف‌لیست تعریف‌لیست‌ترکیبی تعریف‌لیست‌مرجع تعریف‌مترادفها تعریف‌مترادف‌قلم تعریف‌متن تعریف‌متن‌قالبی تعریف‌محیط‌قلم‌بدنه تعریف‌مرجع تعریف‌منوی‌پانل تعریف‌منوی‌پانل تعریف‌میدان تعریف‌نسخه تعریف‌نشانه‌گذاری تعریف‌نماد تعریف‌نمادشکل تعریف‌پاراگرافها تعریف‌پروفایل تعریف‌پوشش تعریف‌گروه‌رنگ تعیین‌شماره‌سر تعیین‌محتوای‌متن تعیین‌مشخصات‌لیست تغییربه‌قلم‌بدنه تنظیم‌راست تنظیم‌طرح‌بندی تنظیم‌وسط تورفتگی توری تک ثبت‌زوج ثبت‌کامل جداسازی‌نشانه‌گذاری حاش حرف حرفها حفظ‌بلوکها خالی خطهای‌سیاه خطهای‌نازک خطها‌خالی خط‌حاشیه خط‌سیاه خط‌متن خط‌مو خط‌نازک خ‌ا خ‌ع در درج‌آرمها درج‌ثبت درج‌ثبت درج‌درخط درج‌درخطها درج‌درمتن درج‌درمیدان درج‌در‌بالای‌یکدیگر درج‌در‌توری درج‌راهنما درج‌زیرفرمول درج‌شناور درج‌فرمول درج‌لیست درج‌لیست‌مختلط درج‌لیست‌مختلط درج‌لیست‌مرجع درج‌پانوشتها درج‌پانوشتهای‌موضعی درج‌چوب‌خط درج‌کنار‌به‌کنار درحاشیه درحاشیه‌دیگر درخارجی درخط درداخلی درراست درصفحه درقالبی درمورد درون درچپ دریافت‌بافر دریافت‌نشانه دوران دکمه دکمه‌پانل رج رجوع رنگ رنگ‌خاکستری روزهفته ریاضی زبان زبان‌اصلی ستون سر شماره‌سر شماره‌سرجاری شماره‌مبدل شماره‌ها شکافتن‌شناور شکل‌خارجی صفحه صفحه‌زوج صفحه‌پردازش عبوربلوکها فشرده فضا فضاهای‌ثابت فضای‌سفید فضای‌سفیدصحیح قالبی لوح‌مقایسه ماه متن‌برچسب متن‌حاشیه متن‌سر متن‌پانوشت مرجع مرجع‌صفحه مرجع‌متن مقایسه‌گروه‌رنگ مقیاس منفی مکان میدان میدانهای‌گزارش میدان‌شبیه‌سازی میدان‌پشته میدان‌کپی میله‌تطابق میله‌پانل نسخه نسخه‌نشانه نشانه‌گذاری نشانه‌گذاری‌زوج نشر نصب‌زبان نقطه‌ها نقل نقل‌قول نم نماد نمادلیست نمایش‌آرایش نمایش‌بارگذاریها نمایش‌بستها نمایش‌توری نمایش‌رنگ نمایش‌شکلهای‌خارجی نمایش‌طرح‌بندی نمایش‌قالب نمایش‌قلم‌بدنه نمایش‌لوح نمایش‌مجموعه‌علامت نمایش‌محیط‌قلم‌بدنه نمایش‌میدانها نمایش‌چاپ نمایش‌گروه‌رنگ نوشتارزوج نوع‌صفحه پابا پانوشت پایین پرده پرکردن‌میدان پس‌زمینه پیروی‌نسخه پیروی‌نسخه‌پروفایل پیروی‌پروفایل چوبخط چپ‌چین کاغذزوج کسر کشیده کلمه‌راست گیره یادداشت یک‌جا یک‌خط 
\ No newline at end of file
diff --git a/context/data/scite/cont-ro-scite.properties b/context/data/scite/cont-ro-scite.properties
deleted file mode 100644
index 3f9cc57e1..000000000
--- a/context/data/scite/cont-ro-scite.properties
+++ /dev/null
@@ -1 +0,0 @@
-keywordclass.macros.context.ro=CAP CUVANT CUVINTE Cap Caps Cuvant Cuvinte LUNA Litera Litere Numereromane ZIDINSAPTAMANA adapteazaaspect adubuffer adumarcaje afiseazaaspect afiseazacampuri afiseazaculoare afiseazafiguriexterne afiseazafonttext afiseazagrid afiseazagrupculoare afiseazamakeup afiseazamediufonttext afiseazapaleta afiseazarama afiseazasetari afiseazasetsimboluri afiseazastruts afiseazatiparire aliniat aliniatcentru aliniatdreapta aliniatstanga appendix ascundeblocuri barainteractiune barasincronizare blanc but butoaneinteractiune buton camp campumplere cap chapter chem citat clip cloneazacamp coloana comment comparagrupculoare comparapaleta completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms completeregister convertestenumar copiazacamp corecteazaspatiualb coupledregister crlf culoare culoaregri cupleazadocument cupleazamarcaje cupleazaregistru cuvantdreapta data datacurenta datareferit decupleazamarcaje definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling defineste definestealiat definesteantet definesteblanc definestebloc definesteblocsectiune definestebuffer definestecamp definesteconversie definesteculoare definestedescriere definestedimensiunehartie definesteenumerare definesteeticheta definestefloat definestefont definestefonttext definesteformatreferinte definestegrupculori definesteinconjurare definestelista definestelistacombinata definestelistareferinte definestelogo definestemakeup definestemarcaje definestemediulfonttext definestemeniuinteractiune definestemeniuinteractiune definesteoutput definesteoverlay definestepaleta definesteparagraf definesteprofil definesteprogram definestereferinte definesteregistru definestesablontabel definestesectiune definestesimbol definestesimbolfigura definestesinonim definestesinonimfont definestesortare definestestartstop definestestivacampuri definestesubcamp definestetabulatori definestetext definestetexteinconjurate definestetextinconjurat definestetyping definesteversiune definetype definetypeface description despre determinacaracteristicilelistei determinanumartitlu dezactiveazameniuinteractiune din dute dutebox ecran el element element emptylines enumeration etichete faraaliniat farafisiere faraliniiantetsisubsol faraliniisussijos faralista faramarcaje faraspatiu faraspatiualb figuraexterna firdepar folosesteURL folosestebloc folosestecodificarea folosestecomenzi folosestedocumentextern folosestefiguraexterna folosestefisiereexterne folosestefisierextern folosestemodul folosestemuzicaexterna folosestereferinte folosestesimboluri folosestespeciale footnotetext forteazablocuri fractie framed framedtext fundal gatablocuri grid hartiedubla hl impachetat impartefloat in inalt inaltamargine indentation indreapta inframed ininner injos inlinie inouter instalarelimba instanga intins jos jossus la labeling lapagina limba limbaprincipala liniemargine linieneagra liniesubtire linieumplere liniinegre liniisubtiri listsymbol litera litere loadsorts loadsynonyms logcampuri luna mapfontsize mar marcaje marcheazaversiune marginal matematica mediaeval minicitat mutapegrid name nextsection nocap nop nota notasubsol numartitlu numartitlucurent numere numereromane olinie overbar overbars overstrike overstrikes pagina paginadubla paragraph part pastreazablocuri placefloat placelistoffloats placelistofsorts placelistofsynonyms placereferencelist plaseazapegrid plaseazasemnecarte potrivestecamp pozitie proceseazabloc proceseazapagina program publicatie puncte punedeasuprafiecareia punefatainfata puneformula punelegenda punelista punelistacombinata punelistacombinata punelogouri punenotesubsol punenotesubsollocale puneregistru puneregistru punesubformula ran ref referinta referintapagina referintatext referit reflexie register reservefloat reset reseteazamarcaje resettextcontent riglatext rigleumplere roteste saripesteblocuri scala scriebuffer scrieinlista scrieinlistareferinte scrieinregistru scrieintreliste section seeregister selecteazablocuri selecteazahartie selecteazaversiune semncarte setarebarasincronizare setarelimba setareoutput setarepozitie setaresincronizare seteazaaliniat seteazaaliniate seteazaalinierea seteazaantet seteazaaranjareapag seteazaaspect seteazabarainteractiune seteazablanc seteazabloc seteazablocsectiune seteazablocurimarginale seteazabuffer seteazabutoane seteazacamp seteazacampuri seteazaclipping seteazacoloane seteazacombinari seteazacomentariu seteazaculoare seteazaculori seteazadefinireanotasubsol seteazadescriere seteazadimensiunihartie seteazaecrane seteazaecraninteractiune seteazaelemente seteazaenumerare seteazafiguriexterne seteazafloat seteazafloats seteazafonttext seteazaformulare seteazaformule seteazafundal seteazafundaluri seteazagrosimelinie seteazaimpartireafloat seteazainconjurat seteazaingust seteazainteractiunea seteazajos seteazalegenda seteazalegenda seteazalegendele seteazaliniesilabe seteazaliniesubtire seteazalinii seteazaliniimargine seteazaliniinegre seteazaliniiumplere seteazalista seteazalistacombinata seteazalistareferinte seteazamajuscule seteazamakeup seteazamarcaje seteazamarginal seteazamediulfonttext seteazameniuinteractiune seteazaminicitat seteazanotasubsol seteazanumarpagina seteazanumarsubpagina seteazanumartitlu seteazanumerotare seteazanumerotarelinii seteazanumerotarepagina seteazanumerotareparagrafe seteazapaleta seteazaparagrafe seteazaplasareaopozita seteazaprofile seteazaprograme seteazapublicatii seteazareferinte seteazaregistru seteazarigletext seteazarigleumplere seteazarotare seteazasectiune seteazasimbol seteazasinonime seteazasistem seteazasortare seteazaspatiu seteazaspatiualb seteazaspatiuinterliniar seteazastrut seteazasublinie seteazasubsol seteazasus seteazatab seteazatabele seteazatabulatori seteazatext seteazatexteantet seteazatextejos seteazatextesubsol seteazatextesus seteazatextetext seteazatexteticheta seteazatexttitlu seteazatitlu seteazatitluri seteazatoleranta seteazatranzitiepagina seteazatype seteazatyping seteazaurl seteazaversiuni settextcontent setupfonthandling setupfontsynonym setupinterlinespace2 setupitemgroup setuplistalternative setuppaper sim simbol sincronizeaza sort spatiifixate spatiu spatiualb startalignment startbuffer startbuffer startcitat startcolumns startcombination startcomment startcomponenta startculoare startdescription startdocument startenumeration startfact startfigure startfloattext startformula startframedtext startfundal starthiding startimpachetat startitemgroup startlegend startline startlinecorrection startlinenumbering startlines startliniemargine startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginblock startmediu startmeniuinteractiune startnamemakeup startnarrower startopposite startoverlay startoverview startparagraph startpositioning startpostponing startprodus startprofile startproiect startregister startriglatext startsymbolset startsynchronization starttable starttables starttabulate starttyping startunpacked startversiune stivacampuri stopalignment stopbuffer stopbuffer stopcitat stopcolumns stopcombination stopcomment stopcomponenta stopculoare stopdescription stopdocument stopenumeration stopfact stopfigure stopfloattext stopformula stopframedtext stopfundal stophiding stopimpachetat stopitemgroup stoplegend stopline stoplinecorrection stoplinenumbering stoplines stopliniemargine stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginblock stopmediu stopmeniuinteractiune stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stopparagraph stoppositioning stoppostponing stopprodus stopprofile stopproiect stopriglatext stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptyping stopunpacked stopversiune sub subject subsection subsubject subsubsection subsubsubject synonym tab tex texteticheta textmarginal texttitlu textumplere tippagina title titlu tooltip traduce trecilafonttext typ type typefile underbar underbars undeva urmeazaprofil urmeazaversiune urmeazaversiuneprofil usedirectory usetypescript usetypescriptfile versiune vl zidinsaptamana 
\ No newline at end of file
diff --git a/context/data/scite/cont-xx-scite.properties b/context/data/scite/cont-xx-scite.properties
deleted file mode 100644
index 395062b7a..000000000
--- a/context/data/scite/cont-xx-scite.properties
+++ /dev/null
@@ -1,178 +0,0 @@
-# low level (visible) support macros, english only
-
-keywordclass.macros.context.undocumented.support=\
-    doif doifelse doifnot \
-    doifnothing doifsomething doifelsenothing \
-    doifvalue doifnotvalue doifelsevalue \
-    doifdefined doifundefined doifundefinedelse doifdefinedelse \
-    doifinset doifinsetelse doifnotinsetelse \
-    doifcommon doifnotcommon doifcommonelse \
-    doifnextcharelse \
-    doiffieldelse \
-    ifdefined ifundefined ifconditional \
-    setstrut setfontstrut strut begstrut endstrut strutdepth strutheight showstruts verticalstrut \
-    newcounter increment decrement doglobal \
-    expanded protect unprotect unprotected unexpanded \
-    digits \
-    snaptogrid \
-    hpos vpos \
-    readfile \
-    donothing \
-    doiftextelse doiftext \
-    forgetall setlocalhsize localhsize \
-    dogotopar dowithnextbox dowithnextboxcontent nextbox \
-    tbox bbox sbox struttedbox \
-    definemeasure definehspace hspace dontleavehmode \
-    convertargument convertcommand \
-    appendtoks prependtoks to at and \
-    scratchcounter scratchbox scratchdimen scratchskip \
-    zeropoint zerocount zerodimen \
-    empty emptytoks plusone plustwo \
-    setvalue setxvalue setevalue setgvalue letvalue letgvalue globalletvalue getvalue \
-    beforesplitstring aftersplitstring splitstring \
-    processcommalist processcommacommand commalistelement \
-    processaction processallactionsinset processfirstactioninset \
-    iftrialtypesetting \
-    startbaselinecorrection stopbaselinecorrection \
-    startnointerference stopnointerference \
-    dorecurse dostepwiserecurse doloop exitloop \
-    doifnotflagged doifflagged setflag
-
-# xml specific commands, english only
-
-keywordclass.macros.context.undocumented.xml=\
-    defineXMLsave defineXMLgsave defineXMLenvironment defineXMLargument \
-    defineXMLignore defineXMLcommand defineXMLgrouped defineXMLpickup defineXMLnested \
-    defineXMLstore defineXMLenvironmentsave defineXMLprocess defineXMLsingular \
-    saveXMLelement defineXMLgstore saveXMLasdata gsaveXMLasdata defineXMLsavecontent \
-    doifXMLdataelse doifXMLdata saveXMLdata processXMLelement startXMLdata stopXMLdata \
-    XMLflush flushXMLelement XMLerase \
-    XMLpar XMLop doifXMLparelse doifXMLop \
-    defXMLstring \
-    processXMLbuffer useXMLfilter \
-    countXMLchildren \
-    startXMLignore stopXMLignore startXMLmapping stopXMLmapping \
-    processXMLfile processXMLfilegrouped
-
-# metafun specific commands, english only
-
-keywordclass.macros.context.undocumented.metafun=\
-    startMPgraphic stopMPgraphic includeMPgraphic useMPlibrary setupMPvariables \
-    startMPenvironment stopMPenvironment startMPinclusions stopMPinclusions \
-    MPcolor MPvar MPx MPy MPw MPh MPd MPp \
-    starttypescript stoptypescript usetypescript loadmapfile \
-    startMPdrawing stopMPdrawing MPdrawingdonetrue getMPdrawing resetMPdrawing \
-    startuseMPgraphic stopuseMPgraphic startusableMPgraphic stopusableMPgraphic useMPgraphic \
-    startuniqueMPpagegraphic stopuniqueMPpagegraphic uniqueMPpagegraphic \
-    startreusableMPgraphic stopreusableMPgraphic reuseMPgraphic \
-    startuniqueMPgraphic stopuniqueMPgraphic uniqueMPgraphic
-
-# modules
-
-keywordclass.macros.context.undocumented.modules=\
-    setupFLOWcharts setupFLOWshapes setupFLOWlines \
-    startFLOWchart stopFLOWchart FLOWchart includeFLOWchart startFLOWcell stopFLOWcell
-
-# english only commands
-
-keywordclass.macros.context.undocumented.common=\
-    start stop \
-    ConTeXt \
-    environment component product project \
-    starttextdata stoptextdata \
-    definedfont definefontsynonym setupfontsynonym \
-    vfilll hfilll \
-    startmode startnotmode stopmode stopnotmode doifmode doifnotmode doifmodeelse enablemode disablemode \
-    resetlayer definelayer placelayer flushlayer tightlayer setuplayer setlayer setlayerframed \
-    definelayerpreset \
-    overlayfigure overlaybutton \
-    startsetups stopsetups startlocalsetups stoplocalsetups setups \
-    setvariables setevariables setgvariables setxvariables getvariable \
-    loadmapfile definetypeface usetypescript usetypescriptfile \
-    useJSscripts startJSscripts stopJSscripts startJSpreamble stopJSpreamble startJScode stopJScode \
-    showfont showaccents showcharacters \
-    showlayoutcomponents showgridsnapping showgridboxes \
-    startTEXpage stopTEXpage startMPpage stopMPpage \
-    bTABLE eTABLE bTR eTR bTD eTD bTH eTH setupTABLE \
-    bTABLEhead eTABLEhead bTABLEnext eTABLEnext bTABLEfoot eTABLEfoot bTABLEbody eTABLEbody \
-    NC NR VL HL AR SR FR MR LR EQ
-
-# dutch commands (nl)
-
-keywordclass.macros.context.undocumented.main.nl=\
-    starttekst stoptekst startstandaardopmaak stopstandaardopmaak \
-    definieerlayout \
-    definieerplaats \
-    omgeving onderdeel projekt produkt \
-    startopsomming stopopsomming stelopsommingin definieeritemgroep \
-    stelnummeringin
-
-# english commands (en)
-
-keywordclass.macros.context.undocumented.main.en=\
-    starttext stoptext startstandardmakeup stopstandardmakeup \
-    placefigure definelayout setupencoding \
-    defineframedcontent startframedcontent stopframedcontent \
-    getfiguredimensionsonly defineexternalfigure \
-    definemainfield \
-    includemenu \
-    starthanging stophanging \
-    setupattachments \
-    definepagebreak \
-    startitemize stopitemize \
-    startfrontmatter stopfrontmatter startbackmatter stopbackmatter \
-    startbodymatter stopbodymatter startappendices stopappendices \
-    definetextbackground setuptextbackground starttextbackground stoptextbackground \
-    definepushbutton definepushsymbol \
-    setcollector definecollector flushcollector
-
-# german commands (de)
-
-keywordclass.macros.context.undocumented.main.de=\
-
-# czech commands (cz)
-
-keywordclass.macros.context.undocumented.main.cz=\
-
-# italian commands (it)
-
-keywordclass.macros.context.undocumented.main.it=\
-
-# romanian commands (ro)
-
-keywordclass.macros.context.undocumented.main.ro=\
-
-# common undocumented macros
-
-keywordclass.macros.context.undocumented.base=\
-    $(keywordclass.macros.context.undocumented.support) \
-    $(keywordclass.macros.context.undocumented.xml) \
-    $(keywordclass.macros.context.undocumented.metafun) \
-    $(keywordclass.macros.context.undocumented.modules) \
-    $(keywordclass.macros.context.undocumented.common)
-
-# language specific undocumented macros
-
-keywordclass.macros.context.undocumented.nl=\
-    $(keywordclass.macros.context.undocumented.base) \
-    $(keywordclass.macros.context.undocumented.main.nl)
-
-keywordclass.macros.context.undocumented.en=\
-    $(keywordclass.macros.context.undocumented.base) \
-    $(keywordclass.macros.context.undocumented.main.en)
-
-keywordclass.macros.context.undocumented.de=\
-    $(keywordclass.macros.context.undocumented.base) \
-    $(keywordclass.macros.context.undocumented.main.de)
-
-keywordclass.macros.context.undocumented.cz=\
-    $(keywordclass.macros.context.undocumented.base) \
-    $(keywordclass.macros.context.undocumented.main.cz)
-
-keywordclass.macros.context.undocumented.it=\
-    $(keywordclass.macros.context.undocumented.base) \
-    $(keywordclass.macros.context.undocumented.main.it)
-
-keywordclass.macros.context.undocumented.ro=\
-    $(keywordclass.macros.context.undocumented.base) \
-    $(keywordclass.macros.context.undocumented.main.ro)
\ No newline at end of file
diff --git a/context/data/scite/cscite.rme b/context/data/scite/cscite.rme
deleted file mode 100644
index f084100c9..000000000
--- a/context/data/scite/cscite.rme
+++ /dev/null
@@ -1,50 +0,0 @@
-Files:
-
-cont-nl-scite.properties : keywords for the dutch user interface
-cont-en-scite.properties : keywords for the english user interface
-cont-de-scite.properties : keywords for the german user interface
-cont-cz-scite.properties : keywords for the czech user interface
-cont-it-scite.properties : keywords for the italian user interface
-cont-ro-scite.properties : keywords for the romanian user interface
-cont-xx-scite.properties : additional keywords
-metafun-scite.properties : keywords for the metafun collection
-
-context.properties       : a configuration suitable for context
-
-
-Method 1:
-
-Copy the property files to the path where your local "SciTEUser.properties"
-file lives. Add the following entries to "SciTEUser.properties":
-
-import cont-nl-scite
-import cont-en-scite
-import cont-de-scite
-import cont-cz-scite
-import cont-it-scite
-import cont-ro-scite
-import cont-xx-scite
-import metafun-scite
-
-import context
-
-If you want latex syntax higlighting as well, you should also import the file
-"latex-scite.properties" (no suffix needed).
-
-
-Method 2:
-
-Copy the property files to the path where your local "SciTEGlobal.properties"
-file lives.
-
-Copy the files "context.properties to the path where "SciTEUser.properties"
-lives. Add the following entries to "SciTEUser.properties":
-
-import context
-
-
-Info:
-
-Hans Hagen
-PRAGMA ADE, Hasselt NL
-http://www.pragma-ade.com
\ No newline at end of file
diff --git a/context/data/scite/latex-scite.properties b/context/data/scite/latex-scite.properties
deleted file mode 100644
index 15e3579a7..000000000
--- a/context/data/scite/latex-scite.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-keywordclass.macros.latex.all=\
-  begin end documentstyle documentclass
\ No newline at end of file
diff --git a/context/data/scite/lexers/themes/scite-context-theme.lua b/context/data/scite/lexers/themes/scite-context-theme.lua
new file mode 100644
index 000000000..9dc859c34
--- /dev/null
+++ b/context/data/scite/lexers/themes/scite-context-theme.lua
@@ -0,0 +1,134 @@
+local info = {
+    version   = 1.002,
+    comment   = "theme for scintilla lpeg lexer for context/metafun",
+    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
+    copyright = "PRAGMA ADE / ConTeXt Development Team",
+    license   = "see context related readme files",
+}
+
+-- we need a proper pipe:
+--
+-- -- context_path = string.split(os.resultof("mtxrun --find-file context.mkiv"))[1] or ""
+
+local context_path = "t:/sources" -- c:/data/tex-context/tex/texmf-context/tex/base
+local font_name    = 'Dejavu Sans Mono'
+local font_size    = 14
+
+-- The following files are needed: mult-def.lua, mult-prm.lua and mult-def.lua. They can be
+-- put in the _LEXERHOME/context path of needed. Currently we have:
+--
+--  _LEXERHOME/themes/scite-context-theme.lua
+--  _LEXERHOME/scite-context-lexer.lua
+--  _LEXERHOME/context/mult-def.lua
+--  _LEXERHOME/context/mult-prm.lua
+--  _LEXERHOME/context/mult-mps.lua
+--  _LEXERHOME/context.lua
+--  _LEXERHOME/metafun.lua
+--
+-- However, when you set the context_path variable and omit the files in the
+-- _LEXERHOME/context path then the files will be picked up from the context
+-- distribution which keeps them up to date automatically.
+--
+-- This (plus a bit more) is what goes in context.properties:
+--
+-- lexer.lpeg.home=$(SciteDefaultHome)/lexers
+-- lexer.lpeg.script=$(lexer.lpeg.home)/scite-context-lexer.lua
+-- lexer.lpeg.color.theme=$(lexer.lpeg.home)/themes/scite-context-theme.lua
+--
+-- fold.by.indentation=0
+--
+-- if PLAT_WIN
+--     lexerpath.*.lpeg=$(lexer.lpeg.home)/LexLPeg.dll
+--
+-- if PLAT_GTK
+--     lexerpath.*.lpeg=$(lexer.lpeg.home)/liblexlpeg.so
+--
+-- lexer.*.lpeg=lpeg
+--
+-- lexer.$(file.patterns.metapost)=lpeg_metafun
+-- lexer.$(file.patterns.metafun)=lpeg_metafun
+-- lexer.$(file.patterns.context)=lpeg_context
+-- lexer.$(file.patterns.tex)=lpeg_context
+-- lexer.$(file.patterns.lua)=lpeg_lua
+-- lexer.$(file.patterns.xml)=lpeg_xml
+--
+-- comment.block.lpeg_context=%
+-- comment.block.at.line.start.lpeg_context=1
+--
+-- comment.block.lpeg_metafun=%
+-- comment.block.at.line.start.lpeg_metafun=1
+--
+-- comment.block.lpeg_lua=--
+-- comment.block.at.line.start.lpeg_lua=1
+--
+-- comment.block.lpeg_props=#
+-- comment.block.at.line.start.lpeg_props=1
+
+dofile(_LEXERHOME .. '/themes/scite.lua') -- starting point so we miss nothing
+
+module('lexer', package.seeall)
+
+lexer.context      = lexer.context or { }
+lexer.context.path = context_path
+
+lexer.colors = {
+    red       = color('7F', '00', '00'),
+    green     = color('00', '7F', '00'),
+    blue      = color('00', '00', '7F'),
+    cyan      = color('00', '7F', '7F'),
+    magenta   = color('7F', '00', '7F'),
+    yellow    = color('7F', '7F', '00'),
+    --
+    teal      = color('00', '7F', '7F'), -- cyan
+    purple    = color('7F', '00', '7F'), -- magenta
+    orange    = color('B0', '7F', '00'),
+    --
+    white     = color('FF', 'FF', 'FF'),
+    grey      = color('80', '80', '80'),
+    black     = color('00', '00', '00'),
+    --
+    selection = color('F7', 'F7', 'F7'),
+    logpanel  = color('E7', 'E7', 'E7'),
+    textpanel = color('CF', 'CF', 'CF'),
+    linepanel = color('A7', 'A7', 'A7'),
+    tippanel  = color('44', '44', '44'),
+    --
+    right     = color('00', '00', 'FF'),
+    wrong     = color('FF', '00', '00'),
+
+}
+
+style_default = style {
+    font = font_name,
+    size = font_size,
+    fore = colors.black,
+    back = colors.textpanel,
+}
+
+style_nothing = style {
+    -- empty
+}
+
+style_char        = style { fore = colors.purple              }
+style_class       = style { fore = colors.black,  bold = true }
+style_comment     = style { fore = colors.green               }
+style_constant    = style { fore = colors.cyan,   bold = true }
+style_definition  = style { fore = colors.black,  bold = true }
+style_error       = style { fore = colors.red                 }
+style_function    = style { fore = colors.black,  bold = true }
+style_keyword     = style { fore = colors.blue,   bold = true }
+style_number      = style { fore = colors.cyan                }
+style_operator    = style { fore = colors.black,  bold = true }
+style_string      = style { fore = colors.magenta             }
+style_preproc     = style { fore = colors.yellow              }
+style_tag         = style { fore = colors.cyan                }
+style_type        = style { fore = colors.blue                }
+style_variable    = style { fore = colors.black               }
+style_identifier  = style_nothing
+
+style_line_number = style { back = colors.linepanel }
+style_bracelight  = style { fore = colors.right, bold = true }
+style_bracebad    = style { fore = colors.wrong, bold = true }
+style_controlchar = style_nothing
+style_indentguide = style { fore = colors.linepanel, back = colors.white }
+style_calltip     = style { fore = colors.white,     back = colors.tippanel }
diff --git a/context/data/scite/metafun-scite.properties b/context/data/scite/metafun-scite.properties
deleted file mode 100644
index 55b7ae607..000000000
--- a/context/data/scite/metafun-scite.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-keywordclass.metafun.all=\
-    unitcircle fulldiamond unitdiamond \
-    halfcircle quartercircle \
-    llcircle lrcircle urcircle ulcircle \
-    tcircle bcircle lcircle rcircle \
-    lltriangle lrtriangle urtriangle ultriangle \
-    smoothed cornered superellipsed randomized squeezed \
-    punked curved unspiked simplified blownup stretched \
-    enlarged leftenlarged topenlarged rightenlarged bottomenlarged \
-    llenlarged lrenlarged urenlarged ulenlarged \
-    llmoved lrmoved urmoved ulmoved \
-    boundingbox innerboundingbox outerboundingbox \
-    bottomboundary leftboundary topboundary rightboundary \
-    xsized ysized xysized \
-    cmyk transparent withshade spotcolor \
-    drawfill undrawfill \
-    inverted uncolored softened grayed \
-    textext graphictext \
-    loadfigure externalfigure
\ No newline at end of file
diff --git a/context/data/scite/pragma.example-properties b/context/data/scite/pragma.example-properties
deleted file mode 100644
index e596b131c..000000000
--- a/context/data/scite/pragma.example-properties
+++ /dev/null
@@ -1,87 +0,0 @@
-# file    : pragma.properties
-# version : 18 august 2003
-# author  : Hans Hagen / PRAGMA ADE / www.pragma-ade.com
-
-# save.backup.first=1
-# save.backup.once=1
-# save.backup.suffix=.bak
-
-# TeX: experimental features
-
-keywordclass.primitives.pdftex.experimental=\
-    pdfavoidoverfull \
-    pdflastdemerits \
-    pdflastvbreakpenalty \
-    pdflinesnapx pdflinesnapy \
-    pdfmaxpenalty pdfminpenalty pdfmovechars \
-    pdfsnaprefpoint pdfsnapx pdfsnapy \
-    pdfstartthread
-
-# Editor: screen
-
-position.left=25
-position.top=25
-position.width=1550
-position.height=1100
-output.horizontal.size=250
-output.vertical.size=100
-
-# Editor: filters
-
-open.filter=\
-All Files (*.*)|*.*|\
-$(filter.context)\
-$(filter.metafun)\
-$(filter.example)\
-$(filter.lua)\
-$(filter.ruby)\
-$(filter.perl)\
-$(filter.text)
-
-# Editor: menus
-
-menu.language=\
-TeX|tex||\
-Metapost|metapost||\
-XML|xml||\
-Lua|lua||\
-Ruby|ruby||\
-Perl|perl||\
-Text|txt||
-
-# Abbreviations : demo
-
-# ext=\\externalfigure[|][width=,height=]
-# for=\n\\startformula\n|\n\\stopformula\n
-# itm=\\startitemize\n\\item |\n\\item \n\\stopitemize
-# tab=\\starttable[||c||c||]\n\\NC | \\NC  \\NC \\AR\n\\NC  \\NC  \\NC \\AR\n\\stoptable\n
-# TAB=\\bTABLE\n\\bTR \\bTD | \\eTD \\bTD  \\eTD \\eTR\n\\bTR \\bTD  \\eTD \\bTD  \\eTD \\eTR\n\\eTABLE\n
-# tbl=\\starttabulate\n\\NC | \\NC  \\NC \\AR\n\\NC  \\NC  \\NC \\NR\n\\stoptabulate\n
-# tpg=\\starttyping\n|\n\\stoptyping\n
-# txt=\\starttext\n\n|\n\n\\stoptext
-#
-# pfg=\\placefigure\n  {}\n  {|}
-# ptb=\\placetable\n  {}\n  {|}
-# pfr=\\placeformula[]\n\\startformula\n|\n\\stopformula\n
-#
-# c=\\chapter{|}\n\n
-# e=\\emph{|}
-# i=\\item |
-# k=\\cap{|}
-# m=\\mathematics{|}
-# s=\\section{|}\n\n
-# t=\\type{|}
-#
-# mu=\\startusableMPgraphic{|}\n\n\\stopusableMPgraphic\n
-# mr=\\startreusableMPgraphic{|}\n\n\\stopreusableMPgraphic\n
-# mq=\\startuniqueMPgraphic{|}\n\n\\stopuniqueMPgraphic\n
-#
-# um=\useMPgraphic{|}
-# rm=\reuseMPgraphic{|}
-# qm=\uniqueMPgraphic{|}
-
-keywords2.$(file.patterns.lua)=$(keywordclass2.lua)$(keywordclass2.lua5)
-keywords3.$(file.patterns.lua)=$(keywordclass3.lua5)
-keywords4.$(file.patterns.lua)=$(keywordclass4.lua5)
-
-#~ keywords4.$(file.patterns.lua)=$(keywordclass4.lua4)
diff --git a/context/data/scite/scite-context-readme.tex b/context/data/scite/scite-context-readme.tex
new file mode 100644
index 000000000..58c15da20
--- /dev/null
+++ b/context/data/scite/scite-context-readme.tex
@@ -0,0 +1,78 @@
+\starttext
+
+The following files are needed for the lpeg based lexer:
+
+\starttyping
+scite-ctx.lua
+scite-context.properties
+scite-pragma.properties
+scite-ctx-context.properties
+scite-ctx-example.properties
+lezers/context.lua
+lezers/metafun.lua
+lezers/scite-context-lexer.lua
+lexers/context/mult-def.lua
+lexers/context/mult-prm.lua
+lexers/context/mult-mps.lua
+lexers/themes/scite-context-theme.lua
+\stoptyping
+
+On windows you can copy al files including the subpaths to the path where
+the scite binary lives.
+
+If the \type {mult-*.lua} files are not in the archive but you can copy them
+from the \CONTEXT\ distribution, where they live in:
+
+\starttyping
+<contextroot>/tex/texmf-context/tex/context/base
+\stoptyping
+
+Because property files can only be loaded from the same path you need to copy
+the following files:
+
+\starttyping
+scite-context.properties
+scite-pragma.properties
+scite-ctx-context.properties
+scite-ctx-example.properties
+\stoptyping
+
+to (on windows):
+
+\starttyping
+c:/Users/YourName
+\stoptyping
+
+Next you need to add this to:
+
+\starttyping
+import scite-context
+import scite-pragma
+\stoptyping
+
+to the file:
+
+\starttyping
+SciTEUser.properties
+\stoptyping
+
+If you want to have spellchecking, you need have files with correct words on each
+line. The first line of a file determines the language:
+
+\starttyping
+% language=uk
+\stoptyping
+
+In this case the following file is needed:
+
+\starttyping
+spell-uk.txt
+\stoptyping
+
+This file is searched on the the path determined by the environment variable:
+
+\starttyping
+CTXSPELLPATH
+\stoptyping
+
+\stoptext
diff --git a/context/data/scite/context.properties b/context/data/scite/scite-context.properties
index d9db457b9..4c7565a51 100644
--- a/context/data/scite/context.properties
+++ b/context/data/scite/scite-context.properties
@@ -517,3 +517,111 @@ style.errorlist.16=$(color.fore.red)
 #  Text|txt||
 
 # Context: end of file
+
+# Metapost: patterns
+
+file.patterns.metapost=
+file.patterns.metafun=
+
+file.patterns.metapost=*.mp;*.mpx;
+file.patterns.metafun=*.mp;*.mpx;*.mpy;*.mpii;*.mpiv
+
+filter.metapost=MetaPost|$(file.patterns.metapost)|
+filter.metafun=MetaFun|$(file.patterns.metafun)|
+
+lexer.$(file.patterns.metapost)=metapost
+lexer.$(file.patterns.metafun)=metapost
+
+# Metapost: commands (check process view)
+
+command.compile.$(file.patterns.metapost)=
+command.build.$(file.patterns.metapost)=mpost $(FileNameExt)
+command.go.$(file.patterns.metapost)=gv $(FileName).1
+
+command.compile.$(file.patterns.metafun)=
+command.build.$(file.patterns.metafun)=texexec --mptex $(FileNameExt)
+command.go.$(file.patterns.metafun)=gv $(FileName).1
+
+command.0.$(file.patterns.metapost)=
+command.1.$(file.patterns.metapost)=
+command.2.$(file.patterns.metapost)=
+command.3.$(file.patterns.metapost)=
+command.4.$(file.patterns.metapost)=
+command.5.$(file.patterns.metapost)=
+command.6.$(file.patterns.metapost)=
+command.7.$(file.patterns.metapost)=
+command.8.$(file.patterns.metapost)=
+command.9.$(file.patterns.metapost)=
+
+command.0.$(file.patterns.metafun)=
+command.1.$(file.patterns.metafun)=
+command.2.$(file.patterns.metafun)=
+command.3.$(file.patterns.metafun)=
+command.4.$(file.patterns.metafun)=
+command.5.$(file.patterns.metafun)=
+command.6.$(file.patterns.metafun)=
+command.7.$(file.patterns.metafun)=
+command.8.$(file.patterns.metafun)=
+command.9.$(file.patterns.metafun)=
+
+# Metapost: highlighting
+
+# Default
+style.metapost.0=fore:#3F3F3F
+# Special
+style.metapost.1=fore:#007F7F
+# Group
+style.metapost.2=fore:#7F0000
+# Symbol
+style.metapost.3=fore:#7F7F00
+# Command
+style.metapost.4=fore:#007F00
+# Text
+style.metapost.5=fore:#000000
+# Extra
+style.metapost.6=fore:#007F00,italics
+
+style.metapost.34=fore:#00007F
+style.metapost.35=fore:#7F007F
+
+# Metapost: comments
+
+comment.block.metapost=%
+comment.block.at.line.start.metapost=1
+
+# lpeg lexers
+
+import $(SciteDefaultHome)/lexers/lpeg
+
+lexer.lpeg.home=$(SciteDefaultHome)/lexers
+lexer.lpeg.script=$(lexer.lpeg.home)/scite-context-lexer.lua
+lexer.lpeg.color.theme=$(lexer.lpeg.home)/themes/scite-context-theme.lua
+
+fold.by.indentation=0
+
+if PLAT_WIN
+	lexerpath.*.lpeg=$(lexer.lpeg.home)/LexLPeg.dll
+
+if PLAT_GTK
+	lexerpath.*.lpeg=$(lexer.lpeg.home)/liblexlpeg.so
+
+lexer.*.lpeg=lpeg
+
+lexer.$(file.patterns.metapost)=lpeg_metafun
+lexer.$(file.patterns.metafun)=lpeg_metafun
+lexer.$(file.patterns.context)=lpeg_context
+lexer.$(file.patterns.tex)=lpeg_context
+lexer.$(file.patterns.lua)=lpeg_lua
+lexer.$(file.patterns.xml)=lpeg_xml
+
+comment.block.lpeg_context=%
+comment.block.at.line.start.lpeg_context=1
+
+comment.block.lpeg_metafun=%
+comment.block.at.line.start.lpeg_metafun=1
+
+comment.block.lpeg_lua=--
+comment.block.at.line.start.lpeg_lua=1
+
+comment.block.lpeg_props=#
+comment.block.at.line.start.lpeg_props=1
diff --git a/context/data/scite/scite-ctx-context.properties b/context/data/scite/scite-ctx-context.properties
new file mode 100644
index 000000000..a1d5800e6
--- /dev/null
+++ b/context/data/scite/scite-ctx-context.properties
@@ -0,0 +1,49 @@
+command.name.25.$(file.patterns.context)=Whatever
+command.25.$(file.patterns.context)=insert_template $(ctx.template.list.context)
+
+ctx.template.list.context=\
+    itemize=structure.itemize.context|\
+    tabulate=structure.tabulate.context|\
+    natural TABLE=structure.TABLE.context|\
+    use MP graphic=graphics.usemp.context|\
+    reuse MP graphic=graphics.reusemp.context|\
+    typeface definition=fonts.typeface.context
+
+ctx.template.structure.itemize.context=\
+\startitemize\n\
+\item ?\n\
+\item ?\n\
+\item ?\n\
+\stopitemize\n
+
+ctx.template.structure.tabulate.context=\
+\starttabulate[|l|p|]\n\
+\NC ? \NC  \NC  \NR\n\
+\NC ? \NC  \NC  \NR\n\
+\NC ? \NC  \NC  \NR\n\
+\stoptabulate\n
+
+ctx.template.structure.TABLE.context=\
+\bTABLE\n\
+\bTR \bTD ? \eTD  \bTD  \eTD  \eTR\n\
+\bTR \bTD ? \eTD  \bTD  \eTD  \eTR\n\
+\bTR \bTD ? \eTD  \bTD  \eTD  \eTR\n\
+\eTABLE\n
+
+ctx.template.graphics.usemp.context=\
+\defineoverlay[?][\useMPgraphic{}]\n\n\
+\startuseMPgraphic{}\n\n\
+\stopuseMPgraphic\n
+
+ctx.template.graphics.reusemp.context=\
+\defineoverlay[?][\reuseMPgraphic{}]\n\n\
+\startreusableMPgraphic{}\n\n\
+\stopreusableMPgraphic\n
+
+ctx.template.fonts.typeface.context=\
+\definetypeface[mainface][rm][serif][?][default][encoding=\defaultencoding]\n\
+\definetypeface[mainface][ss][sans] [?][default][encoding=\defaultencoding]\n\
+\definetypeface[mainface][tt][mono] [?][default][encoding=\defaultencoding]\n\
+\definetypeface[mainface][mm][math] [?][default][encoding=\defaultencoding]\n\
+\n\
+\setupbodyfont[mainface,10pt]\n
diff --git a/context/data/scite/scite-ctx-example.properties b/context/data/scite/scite-ctx-example.properties
new file mode 100644
index 000000000..78b2f2859
--- /dev/null
+++ b/context/data/scite/scite-ctx-example.properties
@@ -0,0 +1,23 @@
+command.25.$(file.patterns.example)=insert_template $(ctx.template.list.example)
+
+ctx.template.list.example=\
+    bold=font.bold.example|\
+    emphasized=font.emphasized.example|\
+    |\
+    inline math=math.inline.example|\
+    display math=math.display.example|\
+    |\
+    itemize=structure.itemize.example
+
+ctx.template.font.bold.example=<b>?</b>
+ctx.template.font.emphasized.example=<em>?</em>
+
+ctx.template.math.inline.example=<m>?</m>
+ctx.template.math.display.example=<math>?</math>
+
+ctx.template.structure.itemize.example=\
+<itemize>\n\
+<item>?</item>\n\
+<item>?</item>\n\
+<item>?</item>\n\
+</itemize>\n
diff --git a/context/data/scite/scite-ctx.lua b/context/data/scite/scite-ctx.lua
index 8e6b6ebab..fb10ce87d 100644
--- a/context/data/scite/scite-ctx.lua
+++ b/context/data/scite/scite-ctx.lua
@@ -68,7 +68,7 @@
 
 -- generic functions
 
-props = props or { } -- setmetatable(props,{ __index = function(k,v) props[k] = "unknown" return "unknown" end } )
+props = props or { } setmetatable(props,{ __index = function(k,v) props[k] = "unknown" return "unknown" end } )
 
 local byte, lower, upper, gsub, sub, find, rep, match, gmatch = string.byte, string.lower, string.upper, string.gsub, string.sub, string.find, string.rep, string.match, string.gmatch
 local sort, concat = table.sort, table.concat
diff --git a/context/data/scite/scite-ctx.properties b/context/data/scite/scite-ctx.properties
deleted file mode 100644
index f23508aca..000000000
--- a/context/data/scite/scite-ctx.properties
+++ /dev/null
@@ -1,155 +0,0 @@
-# author
-#
-#   Hans Hagen - PRAGMA ADE - www.pragma-ade.com
-#
-# environment variable
-#
-#   CTXSPELLPATH=t:/spell
-#
-# auto language detection
-#
-#   % version =1.0 language=uk
-#   <?xml version='1.0' language='uk' ?>
-
-ext.lua.auto.reload=1
-#~ ext.lua.startup.script=$(SciteDefaultHome)/scite-ctx.lua
-ext.lua.startup.script=$(SciteUserHome)/scite-ctx.lua
-
-#~ extension.$(file.patterns.context)=scite-ctx.lua
-#~ extension.$(file.patterns.example)=scite-ctx.lua
-
-#~ ext.lua.reset=1
-#~ ext.lua.auto.reload=1
-#~ ext.lua.startup.script=t:/lua/scite-ctx.lua
-
-ctx.menulist.default=\
-    wrap=wrap_text|\
-    unwrap=unwrap_text|\
-    sort=sort_text|\
-    check=check_text|\
-    reset=reset_text
-
-ctx.menulist.context=\
-    wrap=wrap_text|\
-    unwrap=unwrap_text|\
-    sort=sort_text|\
-    document=document_text|\
-    quote=quote_text|\
-    compound=compound_text|\
-    check=check_text|\
-    reset=reset_text
-
-ctx.menulist.example=\
-    wrap=wrap_text|\
-    unwrap=unwrap_text|\
-    sort=sort_text|\
-    uncomment=uncomment_xml|\
-    document=document_text|\
-    quote=quote_text|\
-    compound=compound_text|\
-    check=check_text|\
-    reset=reset_text
-
-ctx.wraptext.length=65
-
-ctx.spellcheck.language=auto
-ctx.spellcheck.wordsize=4
-ctx.spellcheck.wordpath=ENV(CTXSPELLPATH)
-
-ctx.spellcheck.wordfile.all=spell-uk.txt,spell-nl.txt
-
-ctx.spellcheck.wordfile.uk=spell-uk.txt
-ctx.spellcheck.wordfile.nl=spell-nl.txt
-ctx.spellcheck.wordsize.uk=4
-ctx.spellcheck.wordsize.nl=4
-
-ctx.helpinfo=\
-    Shift + F11   pop up menu with ctx options|\
-    |\
-    Ctrl  + B     check spelling|\
-    Ctrl  + M     wrap text (auto indent)|\
-    Ctrl  + R     reset spelling results|\
-    Ctrl  + I     insert template|\
-    Ctrl  + E     open log file
-
-command.name.21.$(file.patterns.context)=CTX Action List
-command.subsystem.21.$(file.patterns.context)=3
-command.21.$(file.patterns.context)=show_menu $(ctx.menulist.context)
-command.groupundo.21.$(file.patterns.context)=yes
-command.save.before.21.$(file.patterns.context)=2
-command.shortcut.21.$(file.patterns.context)=Shift+F11
-
-command.name.21.$(file.patterns.example)=CTX Action List
-command.subsystem.21.$(file.patterns.example)=3
-command.21.$(file.patterns.example)=show_menu $(ctx.menulist.example)
-command.groupundo.21.$(file.patterns.example)=yes
-command.save.before.21.$(file.patterns.example)=2
-command.shortcut.21.$(file.patterns.example)=Shift+F11
-
-#~ command.name.21.*=CTX Action List
-#~ command.subsystem.21.*=3
-#~ command.21.*=show_menu $(ctx.menulist.default)
-#~ command.groupundo.21.*=yes
-#~ command.save.before.21.*=2
-#~ command.shortcut.21.*=Shift+F11
-
-command.name.22.*=CTX Check Text
-command.subsystem.22.*=3
-command.22.*=check_text
-command.groupundo.22.*=yes
-command.save.before.22.*=2
-command.shortcut.22.*=Ctrl+B
-
-command.name.23.*=CTX Wrap Text
-command.subsystem.23.*=3
-command.23.*=wrap_text
-command.groupundo.23.*=yes
-command.save.before.23.*=2
-command.shortcut.23.*=Ctrl+M
-
-command.name.24.*=CTX Reset Text
-command.subsystem.24.*=3
-command.24.*=reset_text
-command.groupundo.24.*=yes
-command.save.before.24.*=2
-command.shortcut.24.*=Ctrl+R
-
-command.name.25.*=CTX Template
-command.subsystem.25.*=3
-command.save.before.25.*=2
-command.groupundo.25.*=yes
-command.shortcut.25.*=Ctrl+I
-
-# command.25.$(file.patterns.context)=insert_template $(ctx.template.list.context)
-# command.25.$(file.patterns.example)=insert_template $(ctx.template.list.example)
-#
-# ctx.template.list.example=\
-# foo=mathadore.foo|\
-# bar=mathadore.bar
-#
-# ctx.template.mathadore.foo.file=./ctx-templates/foo.xml
-# ctx.template.mathadore.bar.data=bar bar bar
-#
-# paths: ./ctx-templates, ../ctx-templates, ../../ctx-templates
-
-command.name.26.*=Open Logfile
-command.subsystem.26.*=3
-command.26.*=open_log
-command.save.before.26.*=2
-command.groupundo.26.*=yes
-command.shortcut.26.*=Ctrl+E
-
-import scite-ctx-context
-import scite-ctx-example
-
-ctx.template.scan=yes
-ctx.template.rescan=no
-
-ctx.template.suffix.tex=tex
-ctx.template.suffix.xml=xml
-
-command.name.27.*=XML Uncomment
-command.subsystem.27.*=3
-command.27.*=uncomment_xml
-command.save.before.27.*=2
-command.groupundo.27.*=yes
diff --git a/context/data/scite/scite-ctx.readme b/context/data/scite/scite-ctx.readme
deleted file mode 100644
index c5f5977a6..000000000
--- a/context/data/scite/scite-ctx.readme
+++ /dev/null
@@ -1,19 +0,0 @@
-installation:
-
--- download scite and install it (take the normal scite, not one that ships with ruby)
--- copy the texmf-context\context\data\scite\*.properties to c:\users\<youraccount>
--- copy the texmf-context\context\data\scite\*.lua to the place where scite has its own support files (wscite)
--- add the line "import context" to your user properties file (entry under menu Options)
-
-running context:
-
--- add texmf-mswin\bin to your path
-
-or
-
--- start scite from a cmd that also calls setuptex
-
-spellchecking:
-
--- create a path for spell files and put spell files there (these are files with just words)
--- set the environment variable CTXSPELLPATH to this path
diff --git a/context/data/scite/scite-pragma.properties b/context/data/scite/scite-pragma.properties
new file mode 100644
index 000000000..abc149f12
--- /dev/null
+++ b/context/data/scite/scite-pragma.properties
@@ -0,0 +1,35 @@
+# file    : pragma.properties
+# version : 18 august 2003
+# author  : Hans Hagen / PRAGMA ADE / www.pragma-ade.com
+
+# save.backup.first=1
+# save.backup.once=1
+# save.backup.suffix=.bak
+
+# Editor: screen
+
+position.left=25
+position.top=25
+position.width=1550
+position.height=1100
+output.horizontal.size=250
+output.vertical.size=100
+
+# Editor: filters
+
+open.filter=\
+All Files (*.*)|*.*|\
+$(filter.context)\
+$(filter.metafun)\
+$(filter.example)\
+$(filter.lua)\
+$(filter.text)
+
+# Editor: menus
+
+menu.language=\
+TeX|tex||\
+Metapost|metapost||\
+XML|xml||\
+Lua|lua||\
+Text|txt||
diff --git a/context/data/scite/sciteuser.example-properties b/context/data/scite/sciteuser.example-properties
deleted file mode 100644
index c96c67f07..000000000
--- a/context/data/scite/sciteuser.example-properties
+++ /dev/null
@@ -1,2 +0,0 @@
-import context
-import pragma
diff --git a/metapost/context/base/metafun.mpii b/metapost/context/base/metafun.mpii
index 4d8dc2537..705900a18 100644
--- a/metapost/context/base/metafun.mpii
+++ b/metapost/context/base/metafun.mpii
@@ -28,7 +28,7 @@
 %D end even may use a patched version, we prefer to use a
 %D copy.
 
-input mp-base.mp ;
+input mp-base.mpii ;
 input mp-tool.mp ;
 input mp-spec.mpii ;
 input mp-core.mpii ;
diff --git a/metapost/context/base/metafun.mpiv b/metapost/context/base/metafun.mpiv
index 59ca2c4bd..89a7c3935 100644
--- a/metapost/context/base/metafun.mpiv
+++ b/metapost/context/base/metafun.mpiv
@@ -16,7 +16,7 @@
 %D end even may use a patched version, we prefer to use a
 %D copy.
 
-input mp-base.mp ;
+input mp-base.mpiv ;
 input mp-tool.mp ;
 input mp-core.mpiv ;
 input mp-page.mp ;
diff --git a/metapost/context/base/mp-base.mp b/metapost/context/base/mp-base.mpii
index 93cb5e90c..93cb5e90c 100644
--- a/metapost/context/base/mp-base.mp
+++ b/metapost/context/base/mp-base.mpii
diff --git a/metapost/context/base/mp-base.mpiv b/metapost/context/base/mp-base.mpiv
new file mode 100644
index 000000000..cd0c79728
--- /dev/null
+++ b/metapost/context/base/mp-base.mpiv
@@ -0,0 +1,860 @@
+% This is a reformatted copy of the plain.mp file. We use a copy
+% because (1) we want to make sure that there are no unresolved
+% dependencies, and (2) we may patch this file eventually.
+
+% This file gives the macros for plain MetaPost It contains all the
+% features of plain METAFONT except those specific to font-making.
+% There are also a number of macros for labeling figures, etc.
+
+string base_name, base_version ;
+
+base_name    := "plain" ;
+base_version := "0.63"  ;
+
+message "Preloading the plain mem file, version " & base_version ;
+
+delimiters () ; % this makes parentheses behave like parentheses
+
+def upto =
+    step 1 until
+enddef ;
+
+def downto =
+    step -1 until
+enddef ;
+
+def exitunless expr c =
+    exitif not c
+enddef ;
+
+let relax = \ ; % ignore the word `relax', as in TeX
+let \\    = \ ; % double relaxation is like single
+
+def ]] = % right brackets should be loners
+    ] ]
+enddef ;
+
+def -- =
+    {curl 1}..{curl 1}
+enddef ;
+
+def --- =
+    .. tension infinity ..
+enddef ;
+
+def ... =
+    .. tension atleast 1 ..
+enddef ;
+
+def gobble primary g =
+enddef ;
+
+primarydef g gobbled gg =
+enddef ;
+
+def hide(text t) =
+    exitif numeric begingroup t ; endgroup ;
+enddef ;
+
+def ??? =
+    hide (
+        interim showstopping : =1 ;
+        showdependencies
+    )
+enddef ;
+
+def stop expr s =
+    message s ;
+    gobble readstring
+enddef ;
+
+warningcheck     :=1 ;
+tracinglostchars :=1 ;
+
+def interact = % sets up to make "show" commands stop
+    hide (
+        showstopping  := 1 ;
+        tracingonline := 1 ;
+    )
+enddef ;
+
+def loggingall = % puts tracing info into the log
+    tracingcommands  := 3 ;
+    tracingtitles    := 1 ;
+    tracingequations := 1 ;
+    tracingcapsules  := 1 ;
+    tracingspecs     := 2 ;
+    tracingchoices   := 1 ;
+    tracinglostchars := 1 ;
+    tracingstats     := 1 ;
+    tracingoutput    := 1 ;
+    tracingmacros    := 1 ;
+    tracingrestores  := 1 ;
+enddef ;
+
+def tracingall = % turns on every form of tracing
+    tracingonline := 1 ;
+    showstopping  := 1 ;
+    loggingall
+enddef ;
+
+def tracingnone = % turns off every form of tracing
+    tracingcommands  := 0 ;
+    tracingtitles    := 0 ;
+    tracingequations := 0 ;
+    tracingcapsules  := 0 ;
+    tracingspecs     := 0 ;
+    tracingchoices   := 0 ;
+    tracinglostchars := 0 ;
+    tracingstats     := 0 ;
+    tracingoutput    := 0 ;
+    tracingmacros    := 0 ;
+    tracingrestores  := 0 ;
+enddef ;
+
+%% dash patterns
+
+vardef dashpattern(text t) =
+    save on, off, w ;
+    let on = _on_ ;
+    let off = _off_ ;
+    w = 0 ;
+    nullpicture t
+enddef ;
+
+tertiarydef p _on_ d =
+    begingroup save pic ;
+        picture pic;
+        pic = p ;
+        addto pic doublepath (w,w) .. (w+d,w) ;
+        w := w + d ;
+        pic shifted (0,d)
+    endgroup
+enddef;
+
+tertiarydef p _off_ d =
+    begingroup w:=w+d;
+        p shifted (0,d)
+    endgroup
+enddef;
+
+%% basic constants and mathematical macros
+
+% numeric constants
+
+newinternal eps, epsilon,infinity, _ ;
+
+eps      := .00049 ;      % this is a pretty small positive number
+epsilon  := 1/256/256 ;   % but this is the smallest
+infinity := 4095.99998 ;  % and this is the largest
+_        := -1 ;          % internal constant to make macros unreadable but shorter
+
+% linejoin and linecap types
+
+newinternal mitered, rounded, beveled, butt, squared ;
+
+mitered := 0 ; rounded := 1 ; beveled := 2 ;
+butt    := 0 ; rounded := 1 ; squared := 2 ;
+
+% pair constants
+
+pair right, left, up, down, origin;
+
+origin = (0,0) ;
+up     = -down = (0,1) ;
+right  = -left = (1,0) ;
+
+% path constants
+
+path quartercircle, halfcircle, fullcircle, unitsquare ;
+
+fullcircle    = makepath pencircle ;
+halfcircle    = subpath (0,4) of fullcircle ;
+quartercircle = subpath (0,2) of fullcircle ;
+unitsquare    = (0,0) -- (1,0) -- (1,1) -- (0,1) -- cycle ;
+
+% transform constants
+
+transform identity ;
+
+for z=origin,right,up :
+    z transformed identity = z ;
+endfor
+
+% color constants
+
+color black, white, red, green, blue, background;
+
+black      = (0,0,0) ;
+white      = (1,1,1) ;
+red        = (1,0,0) ;
+green      = (0,1,0) ;
+blue       = (0,0,1) ;
+background = white ;
+
+% picture constants
+
+picture blankpicture, evenly, withdots ;
+
+blankpicture = nullpicture ;                       % display blankpicture...
+evenly       = dashpattern(on 3 off 3) ;           % dashed evenly
+withdots     = dashpattern(off 2.5 on 0 off 2.5) ; % dashed withdots
+
+% string constants
+
+string ditto, EOF ;
+
+ditto = char 34 ; % ASCII double-quote mark
+EOF   = char  0 ; % end-of-file for readfrom and write..to
+
+% pen constants
+
+pen pensquare, penrazor, penspeck ;
+
+pensquare = makepen(unitsquare shifted -(.5,.5)) ;
+penrazor  = makepen((-.5,0)--(.5,0)--cycle) ;
+penspeck  = pensquare scaled eps ;
+
+% nullary operators
+
+vardef whatever =
+    save ? ;
+    ?
+enddef ;
+
+% unary operators
+
+let abs = length ;
+
+vardef round primary u =
+    if numeric u :
+        floor(u+.5)
+    elseif pair u :
+        (round xpart u, round ypart u)
+    else :
+        u
+    fi
+enddef ;
+
+vardef ceiling primary x =
+    -floor(-x)
+enddef ;
+
+vardef byte primary s =
+    if string s :
+        ASCII
+    fi s
+enddef ;
+
+vardef dir primary d =
+    right rotated d
+enddef ;
+
+vardef unitvector primary z =
+    z/abs z
+enddef ;
+
+vardef inverse primary T =
+    transform T_ ;
+    T_ transformed T = identity ;
+    T_
+enddef ;
+
+vardef counterclockwise primary c =
+    if turningnumber c <= 0 :
+        reverse
+    fi c
+enddef ;
+
+vardef tensepath expr r =
+    for k=0 upto length r - 1 :
+        point k of r ---
+    endfor
+    if cycle r :
+        cycle
+    else :
+        point infinity of r
+    fi
+enddef ;
+
+vardef center primary p =
+    .5[llcorner p, urcorner p]
+enddef ;
+
+% binary operators
+
+primarydef x mod y =
+    (x-y*floor(x/y))
+enddef ;
+
+primarydef x div y =
+    floor(x/y)
+enddef ;
+
+primarydef w dotprod z =
+    (xpart w * xpart z + ypart w * ypart z)
+enddef ;
+
+primarydef x**y =
+    if y=2 :
+        x*x
+    else :
+        takepower y of x
+    fi
+enddef ;
+
+def takepower expr y of x =
+    if x>0 :
+        mexp(y*mlog x)
+    elseif (x=0) and (y>0) :
+        0
+    else :
+        1
+        if y = floor y :
+            if y >= 0 :
+                for n=1 upto y :
+                    *x
+                endfor
+            else :
+                for n=-1 downto y :
+                    /x
+                endfor
+            fi
+        else :
+            hide(errmessage "Undefined power: " & decimal x&"**"&decimal y)
+        fi
+    fi
+enddef ;
+
+vardef direction expr t of p =
+    postcontrol t of p - precontrol t of p
+enddef ;
+
+vardef directionpoint expr z of p =
+    a_ := directiontime z of p ;
+    if a_<0 :
+        errmessage("The direction doesn't occur") ;
+    fi
+    point a_ of p
+enddef ;
+
+secondarydef p intersectionpoint q =
+    begingroup
+    save x_, y_ ;
+    (x_,y_) = p intersectiontimes q ;
+    if x_<0 :
+        errmessage("The paths don't intersect") ;
+        origin
+    else :
+        .5[point x_ of p, point y_ of q]
+    fi
+    endgroup
+enddef;
+
+tertiarydef p softjoin q =
+    begingroup
+    c_ := fullcircle scaled 2join_radius shifted point 0 of q ;
+    a_ := ypart(c_ intersectiontimes p) ;
+    b_ := ypart(c_ intersectiontimes q) ;
+    if a_<0 :
+        point 0 of p{direction 0 of p}
+    else :
+        subpath(0,a_) of p
+    fi
+    ...
+    if b_<0 :
+        {direction infinity of q} point infinity of q
+    else :
+        subpath(b_,infinity) of q
+    fi
+    endgroup
+enddef ;
+
+newinternal join_radius, a_, b_ ; path c_ ;
+
+
+path cuttings ; % what got cut off
+
+tertiarydef a cutbefore b =  % tries to cut as little as possible
+    begingroup
+    save t ;
+    (t, whatever) = a intersectiontimes b ;
+    if t<0 :
+        cuttings := point 0 of a ;
+        a
+    else :
+        cuttings := subpath (0,t) of a ;
+        subpath (t,length a) of a
+    fi
+    endgroup
+enddef ;
+
+tertiarydef a cutafter b =
+    reverse (reverse a  cutbefore  b)
+    hide(cuttings := reverse cuttings)
+enddef;
+
+% special operators
+
+vardef incr suffix $ = $:=$+1; $ enddef ;
+vardef decr suffix $ = $:=$-1; $ enddef ;
+
+def reflectedabout(expr w,z) = % reflects about the line w..z
+    transformed
+        begingroup
+        transform T_ ;
+        w transformed T_ = w ;
+        z transformed T_ = z ;
+        xxpart T_ = -yypart T_ ;
+        xypart T_ =  yxpart T_ ; % T_ is a reflection
+        T_
+        endgroup
+enddef ;
+
+def rotatedaround(expr z, d) = % rotates d degrees around z
+    shifted -z rotated d shifted z
+enddef ;
+
+let rotatedabout = rotatedaround ; % for roundabout people
+
+vardef min(expr u)(text t) = % t is a list of numerics, pairs, or strings
+    save u_ ;
+    setu_ u ;
+    for uu = t :
+        if uu<u_ :
+            u_ := uu ;
+        fi
+    endfor
+    u_
+enddef ;
+
+vardef max(expr u)(text t) = % t is a list of numerics, pairs, or strings
+    save u_ ;
+    setu_ u ;
+    for uu = t :
+        if uu>u_ :
+            u_ := uu ;
+        fi
+    endfor
+    u_
+enddef ;
+
+def setu_ primary u =
+    if pair u :
+        pair u_
+    elseif string u :
+        string u_
+    fi ;
+    u_=u
+enddef ;
+
+def flex(text t) = % t is a list of pairs
+    hide (
+        n_ := 0 ;
+        for z=t :
+            z_[incr n_] := z ;
+        endfor
+        dz_ := z_[n_]-z_1
+    )
+    z_1 for k=2 upto n_-1 :
+        ... z_[k]{dz_}
+    endfor ... z_[n_]
+enddef ;
+
+newinternal n_; pair z_[],dz_;
+
+def superellipse(expr r,t,l,b,s) =
+    r{up}    ... (s[xpart t,xpart r],s[ypart r,ypart t]){t-r} ...
+    t{left}  ... (s[xpart t,xpart l],s[ypart l,ypart t]){l-t} ...
+    l{down}  ... (s[xpart b,xpart l],s[ypart l,ypart b]){b-l} ...
+    b{right} ... (s[xpart b,xpart r],s[ypart r,ypart b]){r-b} ... cycle enddef ;
+
+vardef interpath(expr a,p,q) =
+    for t=0 upto length p-1 :
+        a[point t of p, point t of q] .. controls a[postcontrol t of p, postcontrol t of q] and a[precontrol t+1 of p, precontrol t+1 of q] ..
+    endfor
+    if cycle p :
+        cycle
+    else :
+        a[point infinity of p, point infinity of q]
+    fi
+enddef ;
+
+vardef solve@#(expr true_x,false_x)= % @#(true_x)=true, @#(false_x)=false
+    tx_:=true_x; fx_:=false_x;
+    forever :
+        x_ := .5[tx_,fx_] ;
+        exitif abs(tx_-fx_) <= tolerance ;
+        if @#(x_) :
+            tx_
+        else :
+            fx_
+        fi := x_ ;
+    endfor
+    x_  % now x_ is near where @# changes from true to false
+enddef ;
+
+newinternal tolerance, tx_, fx_, x_ ;
+
+tolerance := .01 ;
+
+vardef buildcycle(text ll) =
+    save ta_, tb_, k_, i_, pp_ ; path pp_[] ;
+    k_ = 0 ;
+    for q=ll :
+        pp_[incr k_] = q ;
+    endfor
+    i_ = k_ ;
+    for i=1 upto k_ :
+        (ta_[i], length pp_[i_]-tb_[i_]) = pp_[i] intersectiontimes reverse pp_[i_] ;
+        if ta_[i]<0 :
+          errmessage("Paths "& decimal i &" and "& decimal i_ &" don't intersect") ;
+        fi
+        i_ := i;
+    endfor
+    for i=1 upto k_ :
+        subpath (ta_[i],tb_[i]) of pp_[i] ..
+    endfor
+    cycle
+enddef ;
+
+%% units of measure
+
+mm :=  2.83464 ;
+pt :=  0.99626 ;
+dd :=  1.06601 ;
+bp :=  1 ;
+cm := 28.34645 ;
+pc := 11.95517 ;
+cc := 12.79213 ;
+in := 72 ;
+
+vardef magstep primary m =
+    mexp(46.67432m)
+enddef ;
+
+%% macros for drawing and filling
+
+def drawoptions(text t) =
+    def _op_ = t enddef
+enddef ;
+
+% parameters that effect drawing
+
+linejoin   := rounded ;
+linecap    := rounded ;
+miterlimit := 10 ;
+
+drawoptions() ;
+
+pen currentpen ;
+picture currentpicture ;
+
+def fill expr c =
+    addto currentpicture contour c _op_
+enddef ;
+
+def draw expr p =
+    addto currentpicture
+    if picture p :
+        also p
+    else :
+        doublepath p withpen currentpen
+    fi
+    _op_
+enddef ;
+
+def filldraw expr c =
+    addto currentpicture contour c withpen currentpen _op_
+enddef ;
+
+def drawdot expr z =
+    addto currentpicture contour makepath currentpen shifted z _op_
+enddef ;
+
+def unfill     expr c = fill     c withcolor background enddef ;
+def undraw     expr p = draw     p withcolor background enddef ;
+def unfilldraw expr c = filldraw c withcolor background enddef ;
+def undrawdot  expr z = drawdot  z withcolor background enddef ;
+
+def erase text t =
+    def _e_ =
+        withcolor background hide(def _e_ = enddef ;)
+    enddef ;
+    t _e_
+enddef;
+
+def _e_ = enddef ;
+
+def cutdraw text t =
+    begingroup
+        interim linecap := butt ;
+        draw t _e_ ;
+    endgroup
+enddef ;
+
+vardef image(text t) =
+    save currentpicture ;
+    picture currentpicture ;
+    currentpicture := nullpicture ;
+    t ;
+    currentpicture
+enddef;
+
+def pickup secondary q =
+    if numeric q :
+        numeric_pickup_
+    else :
+        pen_pickup_
+    fi q
+enddef ;
+
+def numeric_pickup_ primary q =
+    if unknown pen_[q] :
+        errmessage "Unknown pen" ;
+        clearpen
+    else :
+        currentpen := pen_ [q] ;
+        pen_lft := pen_lft_[q] ;
+        pen_rt  := pen_rt_ [q] ;
+        pen_top := pen_top_[q] ;
+        pen_bot := pen_bot_[q] ;
+        currentpen_path := pen_path_[q]
+    fi ;
+enddef ;
+
+def pen_pickup_ primary q =
+    currentpen := q ;
+    pen_lft :=xpart penoffset down  of currentpen ;
+    pen_rt  :=xpart penoffset up    of currentpen ;
+    pen_top :=ypart penoffset left  of currentpen ;
+    pen_bot :=ypart penoffset right of currentpen ;
+    path currentpen_path ;
+enddef;
+
+newinternal pen_lft, pen_rt, pen_top, pen_bot, pen_count_ ;
+
+vardef savepen =
+    pen_[incr pen_count_] = currentpen ;
+    pen_lft_ [pen_count_] = pen_lft ;
+    pen_rt_  [pen_count_] = pen_rt ;
+    pen_top_ [pen_count_] = pen_top ;
+    pen_bot_ [pen_count_] = pen_bot ;
+    pen_path_[pen_count_] = currentpen_path ;
+    pen_count_
+enddef;
+
+def clearpen = currentpen:=nullpen;
+    pen_lft := pen_rt := pen_top := pen_bot := 0 ;
+    path currentpen_path ;
+enddef ;
+
+def clear_pen_memory =
+    pen_count_ := 0 ;
+    numeric pen_lft_[], pen_rt_[], pen_top_[], pen_bot_[] ;
+    pen currentpen, pen_[];
+    path currentpen_path, pen_path_[] ;
+enddef ;
+
+vardef lft primary x = x + if pair x: (pen_lft,0) else: pen_lft fi enddef ;
+vardef rt  primary x = x + if pair x: (pen_rt,0)  else: pen_rt  fi enddef ;
+vardef top primary y = y + if pair y: (0,pen_top) else: pen_top fi enddef ;
+vardef bot primary y = y + if pair y: (0,pen_bot) else: pen_bot fi enddef ;
+
+vardef penpos@#(expr b,d) =
+    (x@#r-x@#l,y@#r-y@#l) = (b,0) rotated d ;
+    x@# = .5(x@#l+x@#r) ;
+    y@# = .5(y@#l+y@#r)
+enddef ;
+
+path path_.l, path_.r ;
+
+def penstroke text t =
+    forsuffixes e = l, r :
+        path_.e := t ;
+    endfor
+    fill path_.l -- reverse path_.r -- cycle
+enddef ;
+
+%% High level drawing commands
+
+newinternal ahlength, ahangle ;
+
+ahlength :=  4 ; % default arrowhead length 4bp
+ahangle  := 45 ; % default head angle 45 degrees
+
+vardef arrowhead expr p =
+    save q, e ; path q ; pair e ;
+    e = point length p of p ;
+    q = gobble(p shifted -e cutafter makepath(pencircle scaled 2ahlength)) cuttings ;
+    (q rotated .5ahangle & reverse q rotated -.5ahangle -- cycle) shifted e
+enddef;
+
+path _apth ;
+
+def drawarrow    expr p = _apth := p ; _finarr  enddef ;
+def drawdblarrow expr p = _apth := p ; _findarr enddef ;
+
+def _finarr text t =
+    draw _apth t ;
+    filldraw arrowhead _apth t
+enddef;
+
+def _findarr text t =
+    draw _apth t ;
+    fill arrowhead         _apth withpen currentpen t ;
+    fill arrowhead reverse _apth withpen currentpen t ; % ; added HH
+enddef ;
+
+%% macros for labels
+
+newinternal bboxmargin ;
+
+bboxmargin := 2bp ; % this can bite you
+
+vardef bbox primary p =
+    llcorner p-( bboxmargin, bboxmargin)
+ -- lrcorner p+( bboxmargin,-bboxmargin)
+ -- urcorner p+( bboxmargin, bboxmargin)
+ -- ulcorner p+(-bboxmargin, bboxmargin)
+ -- cycle
+enddef ;
+
+string defaultfont ; newinternal defaultscale, labeloffset ;
+
+defaultfont  := "cmr10" ;
+defaultscale := 1 ;
+labeloffset  := 3bp ;
+
+vardef thelabel@#(expr s,z) = % Position s near z
+    save p ; picture p ;
+    if picture s :
+        p = s
+    else :
+        p = s infont defaultfont scaled defaultscale
+    fi ;
+    p shifted (z + labeloffset*laboff@# - ( labxf@#*lrcorner p + labyf@#*ulcorner p + (1-labxf@#-labyf@#)*llcorner p) )
+enddef;
+
+def label =
+    draw thelabel
+enddef ;
+
+newinternal dotlabeldiam ;
+
+dotlabeldiam := 3bp ;
+
+vardef dotlabel@#(expr s,z) text t_ =
+    label@#(s,z) t_ ;
+  % label@#(s,z) ;
+    interim linecap:=rounded ;
+    draw z withpen pencircle scaled dotlabeldiam t_ ;
+enddef ;
+
+def makelabel =
+    dotlabel
+enddef ;
+
+pair laboff, laboff.lft, laboff.rt, laboff.top, laboff.bot ;
+pair laboff.ulft, laboff.llft, laboff.urt, laboff.lrt ;
+
+laboff      = (0,0)    ; labxf      = .5 ; labyf      = .5 ;
+laboff.lft  = (-1,0)   ; labxf.lft  = 1  ; labyf.lft  = .5 ;
+laboff.rt   = (1,0)    ; labxf.rt   = 0  ; labyf.rt   = .5 ;
+laboff.bot  = (0,-1)   ; labxf.bot  = .5 ; labyf.bot  = 1  ;
+laboff.top  = (0,1)    ; labxf.top  = .5 ; labyf.top  = 0  ;
+laboff.ulft = (-.7,.7) ; labxf.ulft = 1  ; labyf.ulft = 0  ;
+laboff.urt  = (.7,.7)  ; labxf.urt  = 0  ; labyf.urt  = 0  ;
+laboff.llft = -(.7,.7) ; labxf.llft = 1  ; labyf.llft = 1  ;
+laboff.lrt  = (.7,-.7) ; labxf.lrt  = 0  ; labyf.lrt  = 1  ;
+
+vardef labels@#(text t) =
+    forsuffixes $=t :
+        label@#(str$,z$) ;
+    endfor
+enddef ;
+
+vardef dotlabels@#(text t) =
+    forsuffixes $=t:
+        dotlabel@#(str$,z$) ;
+    endfor
+enddef ;
+
+vardef penlabels@#(text t) =
+    forsuffixes $$=l,,r :
+        forsuffixes $=t :
+            makelabel@#(str$.$$,z$.$$) ;
+        endfor
+    endfor
+enddef ;
+
+def range expr x =
+    numtok[x]
+enddef ;
+
+def numtok suffix x =
+    x
+enddef ;
+
+tertiarydef m thru n =
+    m for x=m+1 step 1 until n :
+        , numtok[x]
+    endfor
+enddef ;
+
+%% Overall adminstration
+
+string extra_beginfig, extra_endfig ;
+
+extra_beginfig := "" ;
+extra_endfig   := "" ;
+
+def beginfig(expr c) =
+    begingroup
+    charcode := c ;
+    clearxy ;
+    clearit ;
+    clearpen ;
+    pickup defaultpen ;
+    drawoptions() ;
+    scantokens extra_beginfig ;
+enddef;
+
+def endfig =
+    ; % added by HH
+    scantokens extra_endfig ;
+    shipit ;
+    endgroup
+enddef;
+
+%% last-minute items
+
+vardef z@# =
+    (x@#,y@#)
+enddef ;
+
+def clearxy =
+    save x, y
+enddef ;
+
+def clearit =
+    currentpicture := nullpicture
+enddef ;
+
+def shipit =
+    shipout currentpicture
+enddef ;
+
+let bye = end ;
+outer end, bye ;
+
+clear_pen_memory ; % initialize the savepen mechanism
+clearit ;
+
+% set default line width
+
+newinternal defaultpen ;
+
+pickup pencircle scaled .5bp ;
+
+defaultpen := savepen ;
diff --git a/tex/context/base/char-def.lua b/tex/context/base/char-def.lua
index adf0b75ed..7d16f193e 100644
--- a/tex/context/base/char-def.lua
+++ b/tex/context/base/char-def.lua
@@ -68165,6 +68165,8 @@ characters.data={
   category="so",
   cjkwd="a",
   description="BLACK SQUARE",
+  mathclass="ord",
+  mathname="blacksquare",
   direction="on",
   linebreak="ai",
   unicodeslot=0x25A0,
@@ -68194,7 +68196,6 @@ characters.data={
   direction="on",
   linebreak="al",
   mathclass="ord",
-  mathname="blacksquare",
   unicodeslot=0x25A2,
  },
  [0x25A3]={
@@ -186693,4 +186694,4 @@ characters.data={
   linebreak="cm",
   unicodeslot=0xE01EF,
  },
-}
\ No newline at end of file
+}
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index bf374e592..ba26b7226 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2011.09.10 12:55}
+\newcontextversion{2011.09.12 22:49}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 6a883f4c0..1c31ebf94 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2011.09.10 12:55}
+\newcontextversion{2011.09.12 22:49}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 514586c2a..ef175af2a 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 8f5ad569d..1c047a3b6 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index ad97a7b07..a0ada15e9 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.09.10 12:55}
+\edef\contextversion{2011.09.12 22:49}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index a01cb24c4..88217fc54 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.09.10 12:55}
+\edef\contextversion{2011.09.12 22:49}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/lang-txt.lua b/tex/context/base/lang-txt.lua
index fc3a55170..f28cb18f1 100644
--- a/tex/context/base/lang-txt.lua
+++ b/tex/context/base/lang-txt.lua
@@ -312,7 +312,7 @@ data.labels={
     nb="",
     nl="en",
     nn="",
-    pl="",
+    pl="i",
     pt="",
     ro="",
     ru="",
@@ -422,7 +422,7 @@ data.labels={
     nb="april",
     nl="",
     nn="april",
-    pl="",
+    pl="kwi.",
     pt="",
     ro="",
     ru="",
@@ -456,7 +456,7 @@ data.labels={
     nb="på side ",
     nl="op pagina ",
     nn="på side ",
-    pl="",
+    pl="na stronie ",
     pt="",
     ro="",
     ru="на странице ",
@@ -529,7 +529,7 @@ data.labels={
     nb="aug.",
     nl="",
     nn="aug.",
-    pl="",
+    pl="sier.",
     pt="",
     ro="",
     ru="",
@@ -672,7 +672,7 @@ data.labels={
     nb="des.",
     nl="",
     nn="des.",
-    pl="",
+    pl="gru.",
     pt="",
     ro="",
     ru="",
@@ -744,7 +744,7 @@ data.labels={
     nb="feb.",
     nl="",
     nn="feb.",
-    pl="",
+    pl="lut.",
     pt="",
     ro="",
     ru="",
@@ -889,7 +889,7 @@ data.labels={
     nb="som vist over",
     nl="hierboven",
     nn="som vist over",
-    pl="",
+    pl="jak pokazano wyżej",
     pt="",
     ro="",
     ru="см. выше",
@@ -923,7 +923,7 @@ data.labels={
     nb="som vist under",
     nl="hieronder",
     nn="som vist under",
-    pl="",
+    pl="jak pokazano niżej",
     pt="",
     ro="",
     ru="см. ниже",
@@ -1032,7 +1032,7 @@ data.labels={
     nb="jan.",
     nl="",
     nn="jan.",
-    pl="",
+    pl="sty.",
     pt="",
     ro="",
     ru="",
@@ -1105,7 +1105,7 @@ data.labels={
     nb="juli",
     nl="",
     nn="juli",
-    pl="",
+    pl="lip.",
     pt="",
     ro="",
     ru="",
@@ -1177,7 +1177,7 @@ data.labels={
     nb="juni",
     nl="",
     nn="juni",
-    pl="",
+    pl="czerw.",
     pt="",
     ro="",
     ru="",
@@ -1322,7 +1322,7 @@ data.labels={
     nb="mars",
     nl="",
     nn="mars",
-    pl="",
+    pl="mar.",
     pt="",
     ro="",
     ru="",
@@ -1395,7 +1395,7 @@ data.labels={
     nb="mai",
     nl="",
     nn="mai",
-    pl="",
+    pl="maja",
     pt="",
     ro="",
     ru="",
@@ -1504,7 +1504,7 @@ data.labels={
     nb="nov.",
     nl="",
     nn="nov.",
-    pl="",
+    pl="lis.",
     pt="",
     ro="",
     ru="",
@@ -1575,7 +1575,7 @@ data.labels={
     nb="okt.",
     nl="",
     nn="okt.",
-    pl="",
+    pl="paź.",
     pt="",
     ro="",
     ru="",
@@ -1610,7 +1610,7 @@ data.labels={
     nb="side ",
     nl="pagina ",
     nn="side ",
-    pl="",
+    pl="strona ",
     pt="",
     ro="",
     ru="страница ",
@@ -1647,7 +1647,7 @@ data.labels={
     nb="Del",
     nl="Deel ",
     nn="Del",
-    pl="Ustęp ",
+    pl="Część ",	
     pt="Parte ",
     ro="Partea ",
     ru="Часть ",
@@ -1757,7 +1757,7 @@ data.labels={
     nb="se ",
     nl="zie ",
     nn="sjå ",
-    pl="",
+    pl="patrz ",
     pt="",
     ro="",
     ru="см. ",
@@ -1829,7 +1829,7 @@ data.labels={
     nb="sep.",
     nl="",
     nn="sep.",
-    pl="",
+    pl="wrz.",
     pt="",
     ro="",
     ru="",
@@ -1866,7 +1866,7 @@ data.labels={
     nb="",
     nl="",
     nn="",
-    pl="",
+    pl="Podpodrozdział ",
     pt="",
     ro="",
     ru="",
@@ -1940,7 +1940,7 @@ data.labels={
     nb="",
     nl="",
     nn="",
-    pl="",
+    pl="", -- not used in Polish
     pt="",
     ro="",
     ru="",
@@ -2164,7 +2164,7 @@ data.labels={
     nb="Forkortelser",
     nl="Afkortingen",
     nn="Forkortingar",
-    pl="Skrócenie",
+    pl="Wykaz skrótów",
     pt="Abreviaturas",
     ro="Abrevieri",
     ru="Список сокращений",
@@ -2275,7 +2275,7 @@ data.labels={
     nb="Bilde",
     nl="Grafieken",
     nn="Bilete",
-    pl="Grafika",
+    pl="Grafiki",
     pt="Gráficos",
     ro="Grafice",
     ru="Список графиков",
@@ -2419,7 +2419,7 @@ data.labels={
     nb="",
     nl="Literatuur",
     nn="",
-    pl="",
+    pl="Bibliografia",
     pt="",
     ro="",
     ru="",
diff --git a/tex/context/base/m-zint.mkiv b/tex/context/base/m-zint.mkiv
index c439476c2..95b265c57 100644
--- a/tex/context/base/m-zint.mkiv
+++ b/tex/context/base/m-zint.mkiv
@@ -47,6 +47,9 @@ local function numberofcode(code)
     if not reverse then
         local types = os.resultof(format("%s --types",zint)) or ""
         local formats = lpeg.match(pattern,types)
+        if not formats or not next(formats) then
+            return code
+        end
         reverse = table.swapped(formats) or { }
     end
     code = cleancode(code)
@@ -65,7 +68,8 @@ function moduledata.zint.generate(code,data,suffix,options)
         local code = numberofcode(code)
         logs.simple("using 'zint' to generate '%s'",base)
         io.savedata(temp,data)
-        os.execute(format('%s --barcode=%s --output="%s" --input="%s"',zint,code,name,temp,options or ""))
+        os.execute(format('%s --barcode=%s --output="%s" --input="%s" %s',zint,code,name,temp,options or ""))
+        os.remove(temp)
     end
     return name
 end
diff --git a/tex/context/base/math-map.lua b/tex/context/base/math-map.lua
index 3f3ef2a31..b21bbc027 100644
--- a/tex/context/base/math-map.lua
+++ b/tex/context/base/math-map.lua
@@ -23,9 +23,10 @@ local type, next = type, next
 local floor, div = math.floor, math.div
 local merged = table.merged
 
-local allocate = utilities.storage.allocate
-
-local texattribute = tex.attribute
+local allocate            = utilities.storage.allocate
+local texattribute        = tex.attribute
+local otffeatures         = fonts.constructors.newfeatures("otf")
+local registerotffeature  = otffeatures.register
 
 local trace_greek  = false  trackers.register("math.greek",  function(v) trace_greek = v end)
 
@@ -36,7 +37,9 @@ local mathematics = mathematics
 
 -- Unfortunately some alphabets have gaps (thereby troubling all applications that
 -- need to deal with math). Somewhat strange considering all those weird symbols that
--- were added afterwards.
+-- were added afterwards. The following trickery (and data) is only to be used for
+-- diagnostics and quick and dirty alphabet tracing (s-mat-10.mkiv) as we deal with
+-- it otherwise.
 
 mathematics.gaps = {
     [0x1D455] = 0x0210E, -- H
@@ -65,6 +68,28 @@ mathematics.gaps = {
     [0x1D551] = 0x02124, -- bb Z
 }
 
+local function fillinmathgaps(tfmdata,key,value)
+    local mathgaps     = mathematics.gaps
+    local characters   = tfmdata.characters
+    local descriptions = tfmdata.descriptions
+    for gap, original in next, mathgaps do
+        if characters[original] and not characters[gap] then
+            characters  [gap] = characters  [original]
+            descriptions[gap] = descriptions[original]
+        end
+    end
+end
+
+registerotffeature {
+    name         = "mathgaps",
+    description  = "plug gaps in math alphabets",
+    comment      = "regular document sources should not depend on this",
+    manipulators = {
+        base = fillinmathgaps,
+        node = fillinmathgaps,
+    }
+}
+
 -- we could use one level less and have tf etc be tables directly but the
 -- following approach permits easier remapping of a-a, A-Z and 0-9 to
 -- fallbacks; symbols is currently mostly greek
diff --git a/tex/context/base/math-vfu.lua b/tex/context/base/math-vfu.lua
index b01af31bb..9aa2f400a 100644
--- a/tex/context/base/math-vfu.lua
+++ b/tex/context/base/math-vfu.lua
@@ -1246,8 +1246,8 @@ mathencodings["tex-ma"] = {
     [0x025AA] = 0x05, -- squaresmallsolid      \centerdot
     [0x022C4] = 0x06, -- diamond               \Diamond \lozenge
     [0x02666] = 0x07, -- diamondsolid          \blacklozenge
-    [0x021BA] = 0x08, -- clockwise             \circlearrowright
-    [0x021BB] = 0x09, -- anticlockwise         \circlearrowleft
+    [0x021BB] = 0x08, -- clockwise             \circlearrowright
+    [0x021BA] = 0x09, -- anticlockwise         \circlearrowleft
     [0x021CC] = 0x0A, -- harpoonleftright      \rightleftharpoons
     [0x021CB] = 0x0B, -- harpoonrightleft      \leftrightharpoons
     [0x0229F] = 0x0C, -- squareminus           \boxminus
@@ -1464,8 +1464,8 @@ mathencodings["tex-mb"] = {
     [0x1D54F] = 0x58, -- X
     [0x1D550] = 0x59, -- Y
     [0x02124] = 0x5A, -- Z                     (blackboard Z)
-    [0x02132] = 0x60, -- hatwide               \Finv
-    [0x02141] = 0x61, -- hatwider              \Game
+    [0x02132] = 0x60, -- finv                  \Finv
+    [0x02141] = 0x61, -- fmir                  \Game
     --  [0x0] = 0x62,    tildewide
     --  [0x0] = 0x63,    tildewider
     --  [0x0] = 0x64,    Finv
diff --git a/tex/context/base/mult-mps.lua b/tex/context/base/mult-mps.lua
new file mode 100644
index 000000000..c56fe2eac
--- /dev/null
+++ b/tex/context/base/mult-mps.lua
@@ -0,0 +1,88 @@
+return {
+    primitives = { -- to be checked
+        "charcode", "day", "linecap", "linejoin", "miterlimit", "month", "pausing",
+        "prologues", "showstopping", "time", "tracingcapsules", "tracingchoices", "mpprocset",
+        "tracingcommands", "tracingequations", "tracinglostchars",
+        "tracingmacros", "tracingonline", "tracingoutput", "tracingrestores",
+        "tracingspecs", "tracingstats", "tracingtitles", "truecorners",
+        "warningcheck", "year",
+        "false", "nullpicture", "pencircle", "true",
+        "and", "angle", "arclength", "arctime", "ASCII", "bluepart", "boolean", "bot",
+        "char", "color", "cosd", "cycle", "decimal", "directiontime", "floor", "fontsize",
+        "greenpart", "hex", "infont", "intersectiontimes", "known", "length", "llcorner",
+        "lrcorner", "makepath", "makepen", "mexp", "mlog", "normaldeviate", "not",
+        "numeric", "oct", "odd", "or", "path", "pair", "pen", "penoffset", "picture", "point",
+        "postcontrol", "precontrol", "redpart", "reverse", "rotated", "scaled",
+        "shifted", "sind", "slanted", "sqrt", "str", "string", "subpath", "substring",
+        "transform", "transformed", "ulcorner", "uniformdeviate", "unknown",
+        "urcorner", "xpart", "xscaled", "xxpart", "xypart", "ypart", "yscaled", "yxpart",
+        "yypart", "zscaled",
+        "addto", "clip", "input", "interim", "let", "newinternal", "save", "setbounds",
+        "shipout", "show", "showdependencies", "showtoken", "showvariable",
+        "special",
+        "begingroup", "endgroup", "of", "curl", "tension", "and", "controls",
+        "reflectedabout", "rotatedaround", "interpath", "on", "off", "beginfig",
+        "endfig", "def", "vardef", "enddef", "epxr", "suffix", "text", "primary", "secondary",
+        "tertiary", "primarydef", "secondarydef", "tertiarydef", "top", "bottom",
+        "ulft", "urt", "llft", "lrt", "randomseed", "also", "contour", "doublepath",
+        "withcolor", "withpen", "dashed", "if", "else", "elseif", "fi", "for", "endfor", "forever", "exitif",
+        "forsuffixes", "downto", "upto", "step", "until",
+        "charlist", "extensible", "fontdimen", "headerbyte", "kern", "ligtable",
+        "boundarychar", "chardp", "charext", "charht", "charic", "charwd", "designsize",
+        "fontmaking", "charexists",
+        "cullit", "currenttransform", "gfcorners", "grayfont", "hround",
+        "imagerules", "lowres_fix", "nodisplays", "notransforms", "openit",
+        "displaying", "currentwindow", "screen_rows", "screen_cols",
+        "pixels_per_inch", "cull", "display", "openwindow", "numspecial",
+        "totalweight", "autorounding", "fillin", "proofing", "tracingpens",
+        "xoffset", "chardx", "granularity", "smoothing", "turningcheck", "yoffset",
+        "chardy", "hppp", "tracingedges", "vppp",
+        "extra_beginfig", "extra_endfig", "mpxbreak",
+    },
+    plain = {
+        "ahangle", "ahlength", "bboxmargin", "defaultpen", "defaultscale",
+        "labeloffset", "background", "currentpen", "currentpicture", "cuttings",
+        "defaultfont", "extra_beginfig", "extra_endfig",
+        "beveled", "black", "blue", "bp", "butt", "cc", "cm", "dd", "ditto", "down", "epsilon",
+        "evenly", "fullcircle", "green", "halfcircle", "identity", "in", "infinity", "left",
+        "mitered", "mm", "origin", "pensquare", "pt", "quartercircle", "red", "right",
+        "rounded", "squared", "unitsquare", "up", "white", "withdots",
+        "abs", "bbox", "ceiling", "center", "cutafter", "cutbefore", "dir",
+        "directionpoint", "div", "dotprod", "intersectionpoint", "inverse", "mod", "lft",
+        "round", "rt", "unitvector", "whatever",
+        "cutdraw", "draw", "drawarrow", "drawdblarrow", "fill", "filldraw", "drawdot",
+        "loggingall", "pickup", "tracingall", "tracingnone", "undraw", "unfill",
+        "unfilldraw",
+        "buildcycle", "dashpattern", "decr", "dotlabel", "dotlabels", "drawoptions",
+        "incr", "label", "labels", "max", "min", "thelabel", "z",
+        "beginchar", "blacker", "capsule_end", "change_width",
+        "define_blacker_pixels", "define_corrected_pixels",
+        "define_good_x_pixels", "define_good_y_pixels",
+        "define_horizontal_corrected_pixels", "define_pixels",
+        "define_whole_blacker_pixels", "define_whole_pixels",
+        "define_whole_vertical_blacker_pixels",
+        "define_whole_vertical_pixels", "endchar", "extra_beginchar",
+        "extra_endchar", "extra_setup", "font_coding_scheme",
+        "font_extra_space",
+    },
+    metafun = {
+        "unitcircle", "fulldiamond", "unitdiamond",
+        "halfcircle", "quartercircle",
+        "llcircle", "lrcircle", "urcircle", "ulcircle",
+        "tcircle", "bcircle", "lcircle", "rcircle",
+        "lltriangle", "lrtriangle", "urtriangle", "ultriangle",
+        "smoothed", "cornered", "superellipsed", "randomized", "squeezed",
+        "punked", "curved", "unspiked", "simplified", "blownup", "stretched",
+        "enlarged", "leftenlarged", "topenlarged", "rightenlarged", "bottomenlarged",
+        "llenlarged", "lrenlarged", "urenlarged", "ulenlarged",
+        "llmoved", "lrmoved", "urmoved", "ulmoved",
+        "boundingbox", "innerboundingbox", "outerboundingbox",
+        "bottomboundary", "leftboundary", "topboundary", "rightboundary",
+        "xsized", "ysized", "xysized",
+        "cmyk", "transparent", "withshade", "spotcolor",
+        "drawfill", "undrawfill",
+        "inverted", "uncolored", "softened", "grayed",
+        "textext", "graphictext",
+        "loadfigure", "externalfigure",
+    },
+}
diff --git a/tex/context/base/mult-prm.lua b/tex/context/base/mult-prm.lua
new file mode 100644
index 000000000..0c84563fc
--- /dev/null
+++ b/tex/context/base/mult-prm.lua
@@ -0,0 +1,717 @@
+return {
+ ["primitives"]={
+  "Alephminorversion",
+  "Alephversion",
+  "OmegaVersion",
+  "Omegaminorversion",
+  "Omegarevision",
+  "Udelcode",
+  "Udelcode",
+  "Udelcodenum",
+  "Udelimiter",
+  "Udelimiterover",
+  "Udelimiterunder",
+  "Umathaccent",
+  "Umathaccent",
+  "Umathaccents",
+  "Umathaccents",
+  "Umathaxis",
+  "Umathbinbinspacing",
+  "Umathbinbinspacing",
+  "Umathbinclosespacing",
+  "Umathbininnerspacing",
+  "Umathbinopenspacing",
+  "Umathbinopspacing",
+  "Umathbinopspacing",
+  "Umathbinordspacing",
+  "Umathbinordspacing",
+  "Umathbinpunctspacing",
+  "Umathbinpunctspacing",
+  "Umathbinrelspacing",
+  "Umathbotaccent",
+  "Umathbotaccent",
+  "Umathchar",
+  "Umathchardef",
+  "Umathchardef",
+  "Umathcharnum",
+  "Umathclosebinspacing",
+  "Umathclosebinspacing",
+  "Umathcloseclosespacing",
+  "Umathcloseclosespacing",
+  "Umathcloseinnerspacing",
+  "Umathcloseopenspacing",
+  "Umathcloseopenspacing",
+  "Umathcloseopspacing",
+  "Umathcloseordspacing",
+  "Umathclosepunctspacing",
+  "Umathcloserelspacing",
+  "Umathcode",
+  "Umathcode",
+  "Umathcodenum",
+  "Umathcodenum",
+  "Umathconnectoroverlapmin",
+  "Umathconnectoroverlapmin",
+  "Umathfractiondelsize",
+  "Umathfractiondenomdown",
+  "Umathfractiondenomdown",
+  "Umathfractiondenomvgap",
+  "Umathfractiondenomvgap",
+  "Umathfractionnumup",
+  "Umathfractionnumvgap",
+  "Umathfractionnumvgap",
+  "Umathfractionrule",
+  "Umathinnerbinspacing",
+  "Umathinnerbinspacing",
+  "Umathinnerclosespacing",
+  "Umathinnerclosespacing",
+  "Umathinnerinnerspacing",
+  "Umathinnerinnerspacing",
+  "Umathinneropenspacing",
+  "Umathinneropenspacing",
+  "Umathinneropspacing",
+  "Umathinneropspacing",
+  "Umathinnerordspacing",
+  "Umathinnerpunctspacing",
+  "Umathinnerrelspacing",
+  "Umathinnerrelspacing",
+  "Umathlimitabovebgap",
+  "Umathlimitabovekern",
+  "Umathlimitabovekern",
+  "Umathlimitabovevgap",
+  "Umathlimitabovevgap",
+  "Umathlimitbelowbgap",
+  "Umathlimitbelowkern",
+  "Umathlimitbelowvgap",
+  "Umathlimitbelowvgap",
+  "Umathopbinspacing",
+  "Umathopbinspacing",
+  "Umathopclosespacing",
+  "Umathopclosespacing",
+  "Umathopenbinspacing",
+  "Umathopenbinspacing",
+  "Umathopenclosespacing",
+  "Umathopenclosespacing",
+  "Umathopeninnerspacing",
+  "Umathopenopenspacing",
+  "Umathopenopspacing",
+  "Umathopenordspacing",
+  "Umathopenordspacing",
+  "Umathopenrelspacing",
+  "Umathoperatorsize",
+  "Umathoperatorsize",
+  "Umathopinnerspacing",
+  "Umathopinnerspacing",
+  "Umathopopenspacing",
+  "Umathopopenspacing",
+  "Umathopopspacing",
+  "Umathopordspacing",
+  "Umathoppunctspacing",
+  "Umathoppunctspacing",
+  "Umathoprelspacing",
+  "Umathoprelspacing",
+  "Umathordbinspacing",
+  "Umathordclosespacing",
+  "Umathordinnerspacing",
+  "Umathordopenspacing",
+  "Umathordopspacing",
+  "Umathordopspacing",
+  "Umathordordspacing",
+  "Umathordpunctspacing",
+  "Umathordrelspacing",
+  "Umathordrelspacing",
+  "Umathoverbarkern",
+  "Umathoverbarrule",
+  "Umathoverbarrule",
+  "Umathoverbarvgap",
+  "Umathoverdelimiterbgap",
+  "Umathoverdelimiterbgap",
+  "Umathoverdelimitervgap",
+  "Umathpunctbinspacing",
+  "Umathpunctbinspacing",
+  "Umathpunctclosespacing",
+  "Umathpunctinnerspacing",
+  "Umathpunctopenspacing",
+  "Umathpunctopenspacing",
+  "Umathpunctopspacing",
+  "Umathpunctopspacing",
+  "Umathpunctordspacing",
+  "Umathpunctordspacing",
+  "Umathpunctpunctspacing",
+  "Umathpunctrelspacing",
+  "Umathpunctrelspacing",
+  "Umathquad",
+  "Umathquad",
+  "Umathradicaldegreeafter",
+  "Umathradicaldegreeafter",
+  "Umathradicaldegreebefore",
+  "Umathradicaldegreeraise",
+  "Umathradicaldegreeraise",
+  "Umathradicalkern",
+  "Umathradicalkern",
+  "Umathradicalrule",
+  "Umathradicalrule",
+  "Umathradicalvgap",
+  "Umathradicalvgap",
+  "Umathrelbinspacing",
+  "Umathrelbinspacing",
+  "Umathrelclosespacing",
+  "Umathrelclosespacing",
+  "Umathrelinnerspacing",
+  "Umathrelinnerspacing",
+  "Umathrelopenspacing",
+  "Umathrelopenspacing",
+  "Umathrelopspacing",
+  "Umathrelopspacing",
+  "Umathrelpunctspacing",
+  "Umathrelrelspacing",
+  "Umathspaceafterscript",
+  "Umathspaceafterscript",
+  "Umathstackdenomdown",
+  "Umathstacknumup",
+  "Umathstacknumup",
+  "Umathstackvgap",
+  "Umathstackvgap",
+  "Umathsubshiftdown",
+  "Umathsubshiftdown",
+  "Umathsubshiftdrop",
+  "Umathsubshiftdrop",
+  "Umathsubsupshiftdown",
+  "Umathsubsupvgap",
+  "Umathsubsupvgap",
+  "Umathsubtopmax",
+  "Umathsubtopmax",
+  "Umathsupbottommin",
+  "Umathsupshiftdrop",
+  "Umathsupshiftup",
+  "Umathsupshiftup",
+  "Umathsupsubbottommax",
+  "Umathunderbarkern",
+  "Umathunderbarkern",
+  "Umathunderbarrule",
+  "Umathunderbarrule",
+  "Umathunderbarvgap",
+  "Umathunderbarvgap",
+  "Umathunderdelimiterbgap",
+  "Umathunderdelimiterbgap",
+  "Umathunderdelimitervgap",
+  "Umathunderdelimitervgap",
+  "Uoverdelimiter",
+  "Uradical",
+  "Uradical",
+  "Uroot",
+  "Uroot",
+  "Ustack",
+  "Ustack",
+  "Ustartdisplaymath",
+  "Ustartmath",
+  "Ustartmath",
+  "Ustopdisplaymath",
+  "Ustopmath",
+  "Usubscript",
+  "Usubscript",
+  "Usuperscript",
+  "Usuperscript",
+  "Uunderdelimiter",
+  "Uunderdelimiter",
+  "abovedisplayshortskip",
+  "abovedisplayskip",
+  "abovewithdelims",
+  "accent",
+  "adjdemerits",
+  "advance",
+  "afterassignment",
+  "aftergroup",
+  "alignmark",
+  "aligntab",
+  "aligntab",
+  "atop",
+  "atopwithdelims",
+  "attribute",
+  "attribute",
+  "attributedef",
+  "attributedef",
+  "badness",
+  "baselineskip",
+  "batchmode",
+  "bodydir",
+  "botmark",
+  "botmarks",
+  "box",
+  "boxdir",
+  "boxmaxdepth",
+  "brokenpenalty",
+  "catcodetable",
+  "catcodetable",
+  "char",
+  "chardp",
+  "chardp",
+  "charht",
+  "charit",
+  "charit",
+  "charwd",
+  "charwd",
+  "cleaders",
+  "clearmarks",
+  "closein",
+  "closeout",
+  "clubpenalties",
+  "clubpenalty",
+  "count",
+  "countdef",
+  "cr",
+  "crampeddisplaystyle",
+  "crampeddisplaystyle",
+  "crampedscriptscriptstyle",
+  "crampedscriptstyle",
+  "crampedtextstyle",
+  "crampedtextstyle",
+  "crcr",
+  "csname",
+  "currentgrouplevel",
+  "currentgrouptype",
+  "currentifbranch",
+  "currentiflevel",
+  "day",
+  "deadcycles",
+  "defaultskewchar",
+  "delcode",
+  "delimiterfactor",
+  "delimitershortfall",
+  "detokenize",
+  "dimen",
+  "dimendef",
+  "dimexpr",
+  "directlua",
+  "discretionary",
+  "displaylimits",
+  "displaystyle",
+  "displaywidowpenalty",
+  "doublehyphendemerits",
+  "dp",
+  "eTeXVersion",
+  "eTeXminorversion",
+  "eTeXrevision",
+  "eTeXversion",
+  "edef",
+  "efcode",
+  "else",
+  "emergencystretch",
+  "endcsname",
+  "endgroup",
+  "endinput",
+  "endlinechar",
+  "eqno",
+  "errmessage",
+  "errorcontextlines",
+  "errorstopmode",
+  "escapechar",
+  "everyeof",
+  "everyjob",
+  "everymath",
+  "everyvbox",
+  "exhyphenchar",
+  "exhyphenpenalty",
+  "expandafter",
+  "fi",
+  "firstmarks",
+  "floatingpenalty",
+  "font",
+  "fontcharic",
+  "fontcharwd",
+  "fontid",
+  "fontid",
+  "fontname",
+  "formatname",
+  "gdef",
+  "gleaders",
+  "global",
+  "globaldefs",
+  "glueshrink",
+  "glueshrinkorder",
+  "gluestretch",
+  "gluestretchorder",
+  "gluetomu",
+  "halign",
+  "hangafter",
+  "hangindent",
+  "hbadness",
+  "hbox",
+  "hfil",
+  "hfill",
+  "hfilneg",
+  "holdinginserts",
+  "hrule",
+  "hsize",
+  "hskip",
+  "hss",
+  "ht",
+  "hyphenchar",
+  "hyphenpenalty",
+  "if",
+  "ifabsdim",
+  "ifabsdim",
+  "ifabsnum",
+  "ifabsnum",
+  "ifcase",
+  "ifcat",
+  "ifcsname",
+  "ifdefined",
+  "ifeof",
+  "ifhbox",
+  "ifhmode",
+  "ifincsname",
+  "ifmmode",
+  "ifnum",
+  "ifodd",
+  "ifpdfabsdim",
+  "ifpdfprimitive",
+  "ifprimitive",
+  "ifprimitive",
+  "iftrue",
+  "ifvbox",
+  "ifvmode",
+  "ifvoid",
+  "ifx",
+  "ignorespaces",
+  "immediate",
+  "indent",
+  "initcatcodetable",
+  "initcatcodetable",
+  "input",
+  "insert",
+  "insertpenalties",
+  "interactionmode",
+  "interlinepenalty",
+  "language",
+  "lastbox",
+  "lastkern",
+  "lastlinefit",
+  "lastnodetype",
+  "lastpenalty",
+  "latelua",
+  "latelua",
+  "lccode",
+  "leaders",
+  "leftghost",
+  "leftghost",
+  "lefthyphenmin",
+  "leftmarginkern",
+  "leftskip",
+  "leqno",
+  "let",
+  "letterspacefont",
+  "linepenalty",
+  "lineskip",
+  "lineskiplimit",
+  "localbrokenpenalty",
+  "localbrokenpenalty",
+  "localinterlinepenalty",
+  "localinterlinepenalty",
+  "localleftbox",
+  "localrightbox",
+  "localrightbox",
+  "long",
+  "lowercase",
+  "lpcode",
+  "luaescapestring",
+  "luatexdatestamp",
+  "luatexrevision",
+  "luatexrevision",
+  "luatexversion",
+  "mark",
+  "marks",
+  "mathaccent",
+  "mathbin",
+  "mathchar",
+  "mathchardef",
+  "mathchoice",
+  "mathcode",
+  "mathdir",
+  "mathinner",
+  "mathop",
+  "mathopen",
+  "mathord",
+  "mathstyle",
+  "mathsurround",
+  "maxdeadcycles",
+  "maxdepth",
+  "meaning",
+  "message",
+  "middle",
+  "month",
+  "moveleft",
+  "moveright",
+  "muexpr",
+  "muskip",
+  "muskipdef",
+  "mutoglue",
+  "newlinechar",
+  "noalign",
+  "noexpand",
+  "noindent",
+  "nokerns",
+  "nokerns",
+  "noligs",
+  "noligs",
+  "nolimits",
+  "nolocaldirs",
+  "nolocalwhatsits",
+  "nonscript",
+  "nullfont",
+  "number",
+  "odelcode",
+  "odelcode",
+  "odelimiter",
+  "odelimiter",
+  "omathaccent",
+  "omathaccent",
+  "omathchar",
+  "omathchar",
+  "omathchardef",
+  "omathchardef",
+  "omathcode",
+  "omathcode",
+  "omit",
+  "openin",
+  "openout",
+  "or",
+  "oradical",
+  "oradical",
+  "outer",
+  "output",
+  "outputbox",
+  "outputbox",
+  "outputpenalty",
+  "over",
+  "overfullrule",
+  "overline",
+  "overwithdelims",
+  "pagebottomoffset",
+  "pagedepth",
+  "pagedir",
+  "pagediscards",
+  "pagefilllstretch",
+  "pagefillstretch",
+  "pagefilstretch",
+  "pagegoal",
+  "pageheight",
+  "pageheight",
+  "pageleftoffset",
+  "pageleftoffset",
+  "pageshrink",
+  "pagestretch",
+  "pagetopoffset",
+  "pagetopoffset",
+  "pagetotal",
+  "pagewidth",
+  "pagewidth",
+  "par",
+  "pardir",
+  "pardir",
+  "parfillskip",
+  "parshapedimen",
+  "parshapeindent",
+  "parshapelength",
+  "parskip",
+  "patterns",
+  "pausing",
+  "pdfadjustspacing",
+  "pdfcatalog",
+  "pdfcolorstack",
+  "pdfcolorstackinit",
+  "pdfcompresslevel",
+  "pdfdecimaldigits",
+  "pdfdest",
+  "pdfdestmargin",
+  "pdfdraftmode",
+  "pdfeachlinedepth",
+  "pdfeachlineheight",
+  "pdfendthread",
+  "pdffirstlineheight",
+  "pdffontexpand",
+  "pdffontobjnum",
+  "pdffontsize",
+  "pdfgamma",
+  "pdfgentounicode",
+  "pdfglyphtounicode",
+  "pdfhorigin",
+  "pdfignoreddimen",
+  "pdfimagehicolor",
+  "pdfimageresolution",
+  "pdfinclusioncopyfonts",
+  "pdfinclusionerrorlevel",
+  "pdfinfo",
+  "pdfinsertht",
+  "pdflastannot",
+  "pdflastlinedepth",
+  "pdflastlink",
+  "pdflastobj",
+  "pdflastxform",
+  "pdflastxpos",
+  "pdflastypos",
+  "pdflinkmargin",
+  "pdfmapline",
+  "pdfminorversion",
+  "pdfnormaldeviate",
+  "pdfobj",
+  "pdfoptionpdfminorversion",
+  "pdfoutput",
+  "pdfpagebox",
+  "pdfpageheight",
+  "pdfpageref",
+  "pdfpagesattr",
+  "pdfpagewidth",
+  "pdfpkmode",
+  "pdfpkresolution",
+  "pdfprimitive",
+  "pdfprotrudechars",
+  "pdfrandomseed",
+  "pdfrefobj",
+  "pdfrefxform",
+  "pdfrefximage",
+  "pdfreplacefont",
+  "pdfrestore",
+  "pdfretval",
+  "pdfsave",
+  "pdfsavepos",
+  "pdfsetrandomseed",
+  "pdfstartthread",
+  "pdftexbanner",
+  "pdftexrevision",
+  "pdftexversion",
+  "pdftracingfonts",
+  "pdftrailer",
+  "pdfuniqueresname",
+  "pdfvorigin",
+  "pdfxform",
+  "pdfxformattr",
+  "pdfxformname",
+  "pdfxformresources",
+  "pdfximage",
+  "pdfximagebbox",
+  "penalty",
+  "postdisplaypenalty",
+  "postexhyphenchar",
+  "posthyphenchar",
+  "posthyphenchar",
+  "predisplaydirection",
+  "predisplaysize",
+  "preexhyphenchar",
+  "preexhyphenchar",
+  "prehyphenchar",
+  "prehyphenchar",
+  "pretolerance",
+  "prevdepth",
+  "prevgraf",
+  "primitive",
+  "primitive",
+  "protected",
+  "quitvmode",
+  "raise",
+  "read",
+  "readline",
+  "relax",
+  "relpenalty",
+  "right",
+  "rightghost",
+  "rightmarginkern",
+  "rightskip",
+  "rpcode",
+  "savecatcodetable",
+  "savecatcodetable",
+  "savinghyphcodes",
+  "scantextokens",
+  "scriptfont",
+  "scriptscriptfont",
+  "scriptscriptstyle",
+  "scriptspace",
+  "scriptstyle",
+  "scrollmode",
+  "setbox",
+  "setlanguage",
+  "sfcode",
+  "shipout",
+  "showbox",
+  "showboxbreadth",
+  "showgroups",
+  "showifs",
+  "showlists",
+  "showthe",
+  "showtokens",
+  "skewchar",
+  "skip",
+  "spacefactor",
+  "spaceskip",
+  "span",
+  "special",
+  "splitbotmark",
+  "splitdiscards",
+  "splitfirstmark",
+  "splitmaxdepth",
+  "splittopskip",
+  "string",
+  "suppressfontnotfounderror",
+  "suppressfontnotfounderror",
+  "suppressifcsnameerror",
+  "suppressifcsnameerror",
+  "suppresslongerror",
+  "suppressoutererror",
+  "suppressoutererror",
+  "synctex",
+  "tabskip",
+  "tagcode",
+  "textdir",
+  "textfont",
+  "the",
+  "thickmuskip",
+  "time",
+  "toks",
+  "toksdef",
+  "tolerance",
+  "topmarks",
+  "topskip",
+  "tracingassigns",
+  "tracingcommands",
+  "tracinggroups",
+  "tracingifs",
+  "tracinglostchars",
+  "tracingmacros",
+  "tracingnesting",
+  "tracingonline",
+  "tracingoutput",
+  "tracingpages",
+  "tracingparagraphs",
+  "tracingrestores",
+  "tracingstats",
+  "uccode",
+  "uchyph",
+  "unexpanded",
+  "unhbox",
+  "unhcopy",
+  "unkern",
+  "unless",
+  "unskip",
+  "unvbox",
+  "unvcopy",
+  "uppercase",
+  "valign",
+  "vbadness",
+  "vbox",
+  "vcenter",
+  "vfil",
+  "vfill",
+  "vfilneg",
+  "vfuzz",
+  "vrule",
+  "vsize",
+  "vss",
+  "vtop",
+  "wd",
+  "widowpenalties",
+  "widowpenalty",
+  "xdef",
+  "xleaders",
+  "xspaceskip",
+  "year",
+ },
+}
\ No newline at end of file
diff --git a/tex/context/base/mult-prm.mkiv b/tex/context/base/mult-prm.mkiv
new file mode 100644
index 000000000..4fda18463
--- /dev/null
+++ b/tex/context/base/mult-prm.mkiv
@@ -0,0 +1,18 @@
+\starttext
+
+\startluacode
+    local primitives = { }
+    table.merge(primitives,table.fromhash(tex.primitives()))
+    table.merge(primitives,tex.extraprimitives('etex'))
+    table.merge(primitives,tex.extraprimitives('pdftex'))
+    table.merge(primitives,tex.extraprimitives('luatex'))
+    table.merge(primitives,tex.extraprimitives('aleph'))
+    table.merge(primitives,tex.extraprimitives('omega'))
+    table.sort(primitives)
+    while string.find(primitives[1],"[^A-Za-z]") do
+        table.remove(primitives,1)
+    end
+    io.savedata("mult-prm.lua",table.serialize({ primitives = primitives },true,{ reduce = true, inline = false }))
+\stopluacode
+
+\stoptext
diff --git a/tex/context/base/scrn-fld.mkvi b/tex/context/base/scrn-fld.mkvi
index 4a8ece692..02cf5afca 100644
--- a/tex/context/base/scrn-fld.mkvi
+++ b/tex/context/base/scrn-fld.mkvi
@@ -751,7 +751,7 @@
 \def\scrn_fieldstack_add#tag#settings#symbol%
   {\advance\scratchcounter\plusone
    \edef\currentfieldstackname{#tag:\number\scratchcounter}%
-   \ifnum\scratchcounter=\ifnum\scratchcounter=\fieldcategoryparameter\c!start\relax
+   \ifnum\scratchcounter=\fieldcategoryparameter\c!start\relax
      \definefieldbody[\currentfieldstackname][\c!type=check,\c!values={#symbol,\empty},\c!default={#symbol}]%
    \else
      \definefieldbody[\currentfieldstackname][\c!type=check,\c!values={#symbol,\empty},\c!default=]%
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 47cd9f065..1e72db3fc 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 7c0fee211..48e8df334 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 0b7d332cd..48733addb 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 09/10/11 12:55:30
+-- merge date  : 09/12/11 22:49:51
 
 do -- begin closure to overcome local limits and interference