summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--context/data/context-jedit-base.xml656
-rw-r--r--context/data/context-jedit-cz.xml455
-rw-r--r--context/data/context-jedit-de.xml458
-rw-r--r--context/data/context-jedit-en.xml458
-rw-r--r--context/data/context-jedit-it.xml458
-rw-r--r--context/data/context-jedit-nl.xml458
-rw-r--r--context/data/context-jedit-ro.xml456
-rw-r--r--context/data/context-jedit.xml134
-rw-r--r--scripts/context/ruby/texmfstart.rb47
-rw-r--r--tex/context/base/cont-new.tex7
-rw-r--r--tex/context/base/context.tex2
-rw-r--r--tex/context/base/core-fld.tex2
-rw-r--r--tex/context/base/core-fnt.tex36
-rw-r--r--tex/context/base/core-ini.tex1
-rw-r--r--tex/context/base/core-lst.tex1
-rw-r--r--tex/context/base/core-ltb.tex29
-rw-r--r--tex/context/base/core-mis.tex9
-rw-r--r--tex/context/base/core-not.tex19
-rw-r--r--tex/context/base/core-sec.tex4
-rw-r--r--tex/context/base/core-var.tex1
-rw-r--r--tex/context/base/core-ver.tex137
-rw-r--r--tex/context/base/font-bfm.tex7
-rw-r--r--tex/context/base/font-ini.tex71
-rw-r--r--tex/context/base/font-run.tex3
-rw-r--r--tex/context/base/java-exa.tex3
-rw-r--r--tex/context/base/math-ams.tex21
-rw-r--r--tex/context/base/math-eul.tex232
-rw-r--r--tex/context/base/math-ini.tex31
-rw-r--r--tex/context/base/math-lbr.tex314
-rw-r--r--tex/context/base/math-run.tex30
-rw-r--r--tex/context/base/math-tex.tex13
-rw-r--r--tex/context/base/page-flt.tex6
-rw-r--r--tex/context/base/page-mak.tex8
-rw-r--r--tex/context/base/spec-dpm.tex7
-rw-r--r--tex/context/base/spec-dpx.tex14
-rw-r--r--tex/context/base/spec-fdf.tex44
-rw-r--r--tex/context/base/spec-pdf.tex5
-rw-r--r--tex/context/base/spec-tpd.tex82
-rw-r--r--tex/context/base/supp-pdf.tex417
-rw-r--r--tex/context/base/type-buy.tex9
-rw-r--r--tex/context/base/type-enc.tex2
-rw-r--r--tex/context/base/type-exa.tex4
-rw-r--r--tex/context/base/type-pre.tex5
-rw-r--r--tex/context/base/type-siz.tex48
-rw-r--r--tex/context/base/type-spe.tex3
-rw-r--r--tex/context/base/type-syn.tex48
-rw-r--r--tex/context/base/xtag-ext.tex3
-rw-r--r--tex/context/base/xtag-ini.tex16
-rw-r--r--tex/context/interface/keys-cz.xml2
-rw-r--r--tex/context/interface/keys-de.xml2
-rw-r--r--tex/context/interface/keys-en.xml2
-rw-r--r--tex/context/interface/keys-it.xml2
-rw-r--r--tex/context/interface/keys-nl.xml2
-rw-r--r--tex/context/interface/keys-ro.xml2
54 files changed, 4701 insertions, 585 deletions
diff --git a/context/data/context-jedit-base.xml b/context/data/context-jedit-base.xml
new file mode 100644
index 000000000..91e750410
--- /dev/null
+++ b/context/data/context-jedit-base.xml
@@ -0,0 +1,656 @@
+<?xml version='1.0'?>
+
+<!DOCTYPE MODE SYSTEM 'xmode.dtd'>
+
+<MODE>
+
+ <RULES/>
+
+ <RULES SET='primitives.tex'>
+ <KEYWORDS>
+ <KEYWORD2>\above</KEYWORD2>
+ <KEYWORD2>\abovedisplayshortskip</KEYWORD2>
+ <KEYWORD2>\abovedisplayskip</KEYWORD2>
+ <KEYWORD2>\abovewithdelims</KEYWORD2>
+ <KEYWORD2>\accent</KEYWORD2>
+ <KEYWORD2>\adjdemerits</KEYWORD2>
+ <KEYWORD2>\advance</KEYWORD2>
+ <KEYWORD2>\afterassignment</KEYWORD2>
+ <KEYWORD2>\aftergroup</KEYWORD2>
+ <KEYWORD2>\atop</KEYWORD2>
+ <KEYWORD2>\atopwithdelims</KEYWORD2>
+ <KEYWORD2>\badness</KEYWORD2>
+ <KEYWORD2>\baselineskip</KEYWORD2>
+ <KEYWORD2>\batchmode</KEYWORD2>
+ <KEYWORD2>\begingroup</KEYWORD2>
+ <KEYWORD2>\belowdisplayshortskip</KEYWORD2>
+ <KEYWORD2>\belowdisplayskip</KEYWORD2>
+ <KEYWORD2>\binoppenalty</KEYWORD2>
+ <KEYWORD2>\botmark</KEYWORD2>
+ <KEYWORD2>\box</KEYWORD2>
+ <KEYWORD2>\boxmaxdepth</KEYWORD2>
+ <KEYWORD2>\brokenpenalty</KEYWORD2>
+ <KEYWORD2>\catcode</KEYWORD2>
+ <KEYWORD2>\char</KEYWORD2>
+ <KEYWORD2>\chardef</KEYWORD2>
+ <KEYWORD2>\cleaders</KEYWORD2>
+ <KEYWORD2>\closein</KEYWORD2>
+ <KEYWORD2>\closeout</KEYWORD2>
+ <KEYWORD2>\clubpenalty</KEYWORD2>
+ <KEYWORD2>\copy</KEYWORD2>
+ <KEYWORD2>\count</KEYWORD2>
+ <KEYWORD2>\countdef</KEYWORD2>
+ <KEYWORD2>\cr</KEYWORD2>
+ <KEYWORD2>\crcr</KEYWORD2>
+ <KEYWORD2>\csname</KEYWORD2>
+ <KEYWORD2>\day</KEYWORD2>
+ <KEYWORD2>\deadcycles</KEYWORD2>
+ <KEYWORD2>\def</KEYWORD2>
+ <KEYWORD2>\defaulthyphenchar</KEYWORD2>
+ <KEYWORD2>\defaultskewchar</KEYWORD2>
+ <KEYWORD2>\delcode delimiter</KEYWORD2>
+ <KEYWORD2>\delimiterfactor</KEYWORD2>
+ <KEYWORD2>\delimeters</KEYWORD2>
+ <KEYWORD2>\delimitershortfall</KEYWORD2>
+ <KEYWORD2>\delimeters</KEYWORD2>
+ <KEYWORD2>\dimen</KEYWORD2>
+ <KEYWORD2>\dimendef</KEYWORD2>
+ <KEYWORD2>\discretionary</KEYWORD2>
+ <KEYWORD2>\displayindent</KEYWORD2>
+ <KEYWORD2>\displaylimits</KEYWORD2>
+ <KEYWORD2>\displaystyle</KEYWORD2>
+ <KEYWORD2>\displaywidowpenalty</KEYWORD2>
+ <KEYWORD2>\displaywidth</KEYWORD2>
+ <KEYWORD2>\divide</KEYWORD2>
+ <KEYWORD2>\doublehyphendemerits</KEYWORD2>
+ <KEYWORD2>\dp</KEYWORD2>
+ <KEYWORD2>\dump</KEYWORD2>
+ <KEYWORD2>\edef</KEYWORD2>
+ <KEYWORD2>\else</KEYWORD2>
+ <KEYWORD2>\emergencystretch</KEYWORD2>
+ <KEYWORD2>\end</KEYWORD2>
+ <KEYWORD2>\endcsname</KEYWORD2>
+ <KEYWORD2>\endgroup</KEYWORD2>
+ <KEYWORD2>\endinput</KEYWORD2>
+ <KEYWORD2>\endlinechar</KEYWORD2>
+ <KEYWORD2>\eqno</KEYWORD2>
+ <KEYWORD2>\errhelp</KEYWORD2>
+ <KEYWORD2>\errmessage</KEYWORD2>
+ <KEYWORD2>\errorcontextlines</KEYWORD2>
+ <KEYWORD2>\errorstopmode</KEYWORD2>
+ <KEYWORD2>\escapechar</KEYWORD2>
+ <KEYWORD2>\everycr</KEYWORD2>
+ <KEYWORD2>\everydisplay</KEYWORD2>
+ <KEYWORD2>\everyhbox</KEYWORD2>
+ <KEYWORD2>\everyjob</KEYWORD2>
+ <KEYWORD2>\everymath</KEYWORD2>
+ <KEYWORD2>\everypar</KEYWORD2>
+ <KEYWORD2>\everyvbox</KEYWORD2>
+ <KEYWORD2>\exhyphenpenalty</KEYWORD2>
+ <KEYWORD2>\expandafter</KEYWORD2>
+ <KEYWORD2>\fam</KEYWORD2>
+ <KEYWORD2>\fi</KEYWORD2>
+ <KEYWORD2>\finalhyphendemerits</KEYWORD2>
+ <KEYWORD2>\firstmark</KEYWORD2>
+ <KEYWORD2>\floatingpenalty</KEYWORD2>
+ <KEYWORD2>\font</KEYWORD2>
+ <KEYWORD2>\fontdimen</KEYWORD2>
+ <KEYWORD2>\fontname</KEYWORD2>
+ <KEYWORD2>\futurelet</KEYWORD2>
+ <KEYWORD2>\gdef</KEYWORD2>
+ <KEYWORD2>\global</KEYWORD2>
+ <KEYWORD2>\group</KEYWORD2>
+ <KEYWORD2>\globaldefs</KEYWORD2>
+ <KEYWORD2>\halign</KEYWORD2>
+ <KEYWORD2>\hangafter</KEYWORD2>
+ <KEYWORD2>\hangindent</KEYWORD2>
+ <KEYWORD2>\hbadness</KEYWORD2>
+ <KEYWORD2>\hbox</KEYWORD2>
+ <KEYWORD2>\hfil</KEYWORD2>
+ <KEYWORD2>\horizontal</KEYWORD2>
+ <KEYWORD2>\hfill</KEYWORD2>
+ <KEYWORD2>\horizontal</KEYWORD2>
+ <KEYWORD2>\hfilneg</KEYWORD2>
+ <KEYWORD2>\hfuzz</KEYWORD2>
+ <KEYWORD2>\hoffset</KEYWORD2>
+ <KEYWORD2>\holdinginserts</KEYWORD2>
+ <KEYWORD2>\hrule</KEYWORD2>
+ <KEYWORD2>\hsize</KEYWORD2>
+ <KEYWORD2>\hskip</KEYWORD2>
+ <KEYWORD2>\hss</KEYWORD2>
+ <KEYWORD2>\horizontal</KEYWORD2>
+ <KEYWORD2>\ht</KEYWORD2>
+ <KEYWORD2>\hyphenation</KEYWORD2>
+ <KEYWORD2>\hyphenchar</KEYWORD2>
+ <KEYWORD2>\hyphenpenalty</KEYWORD2>
+ <KEYWORD2>\hyphen</KEYWORD2>
+ <KEYWORD2>\if</KEYWORD2>
+ <KEYWORD2>\ifcase</KEYWORD2>
+ <KEYWORD2>\ifcat</KEYWORD2>
+ <KEYWORD2>\ifdim</KEYWORD2>
+ <KEYWORD2>\ifeof</KEYWORD2>
+ <KEYWORD2>\iffalse</KEYWORD2>
+ <KEYWORD2>\ifhbox</KEYWORD2>
+ <KEYWORD2>\ifhmode</KEYWORD2>
+ <KEYWORD2>\ifinner</KEYWORD2>
+ <KEYWORD2>\ifmmode</KEYWORD2>
+ <KEYWORD2>\ifnum</KEYWORD2>
+ <KEYWORD2>\ifodd</KEYWORD2>
+ <KEYWORD2>\iftrue</KEYWORD2>
+ <KEYWORD2>\ifvbox</KEYWORD2>
+ <KEYWORD2>\ifvmode</KEYWORD2>
+ <KEYWORD2>\ifvoid</KEYWORD2>
+ <KEYWORD2>\ifx</KEYWORD2>
+ <KEYWORD2>\ignorespaces</KEYWORD2>
+ <KEYWORD2>\immediate</KEYWORD2>
+ <KEYWORD2>\indent</KEYWORD2>
+ <KEYWORD2>\input</KEYWORD2>
+ <KEYWORD2>\inputlineno</KEYWORD2>
+ <KEYWORD2>\input</KEYWORD2>
+ <KEYWORD2>\insert</KEYWORD2>
+ <KEYWORD2>\insertpenalties</KEYWORD2>
+ <KEYWORD2>\interlinepenalty</KEYWORD2>
+ <KEYWORD2>\jobname</KEYWORD2>
+ <KEYWORD2>\kern</KEYWORD2>
+ <KEYWORD2>\language</KEYWORD2>
+ <KEYWORD2>\lastbox</KEYWORD2>
+ <KEYWORD2>\lastkern</KEYWORD2>
+ <KEYWORD2>\lastpenalty</KEYWORD2>
+ <KEYWORD2>\lastskip</KEYWORD2>
+ <KEYWORD2>\lccode</KEYWORD2>
+ <KEYWORD2>\leaders</KEYWORD2>
+ <KEYWORD2>\left</KEYWORD2>
+ <KEYWORD2>\lefthyphenmin</KEYWORD2>
+ <KEYWORD2>\leftskip</KEYWORD2>
+ <KEYWORD2>\leqno</KEYWORD2>
+ <KEYWORD2>\let</KEYWORD2>
+ <KEYWORD2>\limits</KEYWORD2>
+ <KEYWORD2>\linepenalty</KEYWORD2>
+ <KEYWORD2>\line lineskip</KEYWORD2>
+ <KEYWORD2>\lineskiplimit</KEYWORD2>
+ <KEYWORD2>\long</KEYWORD2>
+ <KEYWORD2>\looseness</KEYWORD2>
+ <KEYWORD2>\lower</KEYWORD2>
+ <KEYWORD2>\lowercase</KEYWORD2>
+ <KEYWORD2>\mag</KEYWORD2>
+ <KEYWORD2>\mark</KEYWORD2>
+ <KEYWORD2>\mathaccent</KEYWORD2>
+ <KEYWORD2>\mathbin</KEYWORD2>
+ <KEYWORD2>\mathchar</KEYWORD2>
+ <KEYWORD2>\mathchardef</KEYWORD2>
+ <KEYWORD2>\mathchoice</KEYWORD2>
+ <KEYWORD2>\mathclose</KEYWORD2>
+ <KEYWORD2>\mathcode</KEYWORD2>
+ <KEYWORD2>\mathinner</KEYWORD2>
+ <KEYWORD2>\mathop</KEYWORD2>
+ <KEYWORD2>\mathopen</KEYWORD2>
+ <KEYWORD2>\mathord</KEYWORD2>
+ <KEYWORD2>\mathpunct</KEYWORD2>
+ <KEYWORD2>\mathrel</KEYWORD2>
+ <KEYWORD2>\mathsurround</KEYWORD2>
+ <KEYWORD2>\maxdeadcycles</KEYWORD2>
+ <KEYWORD2>\maxdepth</KEYWORD2>
+ <KEYWORD2>\meaning</KEYWORD2>
+ <KEYWORD2>\medmuskip</KEYWORD2>
+ <KEYWORD2>\message</KEYWORD2>
+ <KEYWORD2>\mkern</KEYWORD2>
+ <KEYWORD2>\month</KEYWORD2>
+ <KEYWORD2>\moveleft</KEYWORD2>
+ <KEYWORD2>\moveright</KEYWORD2>
+ <KEYWORD2>\mskip</KEYWORD2>
+ <KEYWORD2>\multiply</KEYWORD2>
+ <KEYWORD2>\muskip</KEYWORD2>
+ <KEYWORD2>\muskipdef</KEYWORD2>
+ <KEYWORD2>\newlinechar</KEYWORD2>
+ <KEYWORD2>\noalign</KEYWORD2>
+ <KEYWORD2>\noboundary</KEYWORD2>
+ <KEYWORD2>\noexpand</KEYWORD2>
+ <KEYWORD2>\noindent</KEYWORD2>
+ <KEYWORD2>\nolimits</KEYWORD2>
+ <KEYWORD2>\nonscript</KEYWORD2>
+ <KEYWORD2>\scriptscript </KEYWORD2>
+ <KEYWORD2>\nonstopmode</KEYWORD2>
+ <KEYWORD2>\nulldelimiterspace</KEYWORD2>
+ <KEYWORD2>\nullfont</KEYWORD2>
+ <KEYWORD2>\number</KEYWORD2>
+ <KEYWORD2>\omit</KEYWORD2>
+ <KEYWORD2>\openin</KEYWORD2>
+ <KEYWORD2>\openout</KEYWORD2>
+ <KEYWORD2>\or</KEYWORD2>
+ <KEYWORD2>\outer</KEYWORD2>
+ <KEYWORD2>\output</KEYWORD2>
+ <KEYWORD2>\outputpenalty</KEYWORD2>
+ <KEYWORD2>\over</KEYWORD2>
+ <KEYWORD2>\overfullrule</KEYWORD2>
+ <KEYWORD2>\overline</KEYWORD2>
+ <KEYWORD2>\overwithdelims</KEYWORD2>
+ <KEYWORD2>\pagedepth</KEYWORD2>
+ <KEYWORD2>\pagefilllstretch</KEYWORD2>
+ <KEYWORD2>\pagefillstretch</KEYWORD2>
+ <KEYWORD2>\pagefilstretch</KEYWORD2>
+ <KEYWORD2>\pagegoal</KEYWORD2>
+ <KEYWORD2>\pageshrink</KEYWORD2>
+ <KEYWORD2>\pagestretch</KEYWORD2>
+ <KEYWORD2>\pagetotal</KEYWORD2>
+ <KEYWORD2>\par</KEYWORD2>
+ <KEYWORD2>\parfillskip</KEYWORD2>
+ <KEYWORD2>\parindent</KEYWORD2>
+ <KEYWORD2>\parshape</KEYWORD2>
+ <KEYWORD2>\parskip</KEYWORD2>
+ <KEYWORD2>\patterns</KEYWORD2>
+ <KEYWORD2>\pausing</KEYWORD2>
+ <KEYWORD2>\penalty</KEYWORD2>
+ <KEYWORD2>\postdisplaypenalty</KEYWORD2>
+ <KEYWORD2>\predisplaypenalty</KEYWORD2>
+ <KEYWORD2>\predisplaysize</KEYWORD2>
+ <KEYWORD2>\pretolerance</KEYWORD2>
+ <KEYWORD2>\prevdepth</KEYWORD2>
+ <KEYWORD2>\prevgraf</KEYWORD2>
+ <KEYWORD2>\radical</KEYWORD2>
+ <KEYWORD2>\raise</KEYWORD2>
+ <KEYWORD2>\read</KEYWORD2>
+ <KEYWORD2>\relax</KEYWORD2>
+ <KEYWORD2>\relpenalty</KEYWORD2>
+ <KEYWORD2>\right</KEYWORD2>
+ <KEYWORD2>\righthyphenmin</KEYWORD2>
+ <KEYWORD2>\rightskip</KEYWORD2>
+ <KEYWORD2>\romannumeral</KEYWORD2>
+ <KEYWORD2>\scriptfont</KEYWORD2>
+ <KEYWORD2>\scriptscriptfont</KEYWORD2>
+ <KEYWORD2>\scriptscriptstyle</KEYWORD2>
+ <KEYWORD2>\scriptspace</KEYWORD2>
+ <KEYWORD2>\scriptstyle</KEYWORD2>
+ <KEYWORD2>\scrollmode</KEYWORD2>
+ <KEYWORD2>\setbox</KEYWORD2>
+ <KEYWORD2>\setlanguage</KEYWORD2>
+ <KEYWORD2>\sfcode</KEYWORD2>
+ <KEYWORD2>\shipout</KEYWORD2>
+ <KEYWORD2>\show</KEYWORD2>
+ <KEYWORD2>\showbox</KEYWORD2>
+ <KEYWORD2>\showboxbreadth</KEYWORD2>
+ <KEYWORD2>\showboxdepth</KEYWORD2>
+ <KEYWORD2>\showlists</KEYWORD2>
+ <KEYWORD2>\showthe</KEYWORD2>
+ <KEYWORD2>\skewchar</KEYWORD2>
+ <KEYWORD2>\skip</KEYWORD2>
+ <KEYWORD2>\skipdef</KEYWORD2>
+ <KEYWORD2>\spacefactor</KEYWORD2>
+ <KEYWORD2>\spaceskip</KEYWORD2>
+ <KEYWORD2>\span</KEYWORD2>
+ <KEYWORD2>\special</KEYWORD2>
+ <KEYWORD2>\splitbotmark</KEYWORD2>
+ <KEYWORD2>\splitfirstmark</KEYWORD2>
+ <KEYWORD2>\splitmaxdepth</KEYWORD2>
+ <KEYWORD2>\splittopskip</KEYWORD2>
+ <KEYWORD2>\string</KEYWORD2>
+ <KEYWORD2>\tabskip</KEYWORD2>
+ <KEYWORD2>\textfont</KEYWORD2>
+ <KEYWORD2>\textstyle </KEYWORD2>
+ <KEYWORD2>\the</KEYWORD2>
+ <KEYWORD2>\thickmuskip</KEYWORD2>
+ <KEYWORD2>\thinmuskip</KEYWORD2>
+ <KEYWORD2>\time</KEYWORD2>
+ <KEYWORD2>\toks</KEYWORD2>
+ <KEYWORD2>\toksdef</KEYWORD2>
+ <KEYWORD2>\tolerance</KEYWORD2>
+ <KEYWORD2>\topmark</KEYWORD2>
+ <KEYWORD2>\topskip</KEYWORD2>
+ <KEYWORD2>\tracingcommands</KEYWORD2>
+ <KEYWORD2>\tracinglostchars</KEYWORD2>
+ <KEYWORD2>\tracingmacros</KEYWORD2>
+ <KEYWORD2>\tracingonline</KEYWORD2>
+ <KEYWORD2>\tracingoutput</KEYWORD2>
+ <KEYWORD2>\tracingpages</KEYWORD2>
+ <KEYWORD2>\tracingparagraphs</KEYWORD2>
+ <KEYWORD2>\tracingrestores</KEYWORD2>
+ <KEYWORD2>\tracingstats </KEYWORD2>
+ <KEYWORD2>\uccode</KEYWORD2>
+ <KEYWORD2>\uchyph</KEYWORD2>
+ <KEYWORD2>\underline</KEYWORD2>
+ <KEYWORD2>\unhbox</KEYWORD2>
+ <KEYWORD2>\unhcopy</KEYWORD2>
+ <KEYWORD2>\unkern</KEYWORD2>
+ <KEYWORD2>\unpenalty</KEYWORD2>
+ <KEYWORD2>\unskip</KEYWORD2>
+ <KEYWORD2>\unvbox</KEYWORD2>
+ <KEYWORD2>\unvcopy</KEYWORD2>
+ <KEYWORD2>\uppercase </KEYWORD2>
+ <KEYWORD2>\vadjust</KEYWORD2>
+ <KEYWORD2>\valign</KEYWORD2>
+ <KEYWORD2>\vbadness</KEYWORD2>
+ <KEYWORD2>\vbox</KEYWORD2>
+ <KEYWORD2>\vcenter</KEYWORD2>
+ <KEYWORD2>\vfil</KEYWORD2>
+ <KEYWORD2>\vfill</KEYWORD2>
+ <KEYWORD2>\vfilneg</KEYWORD2>
+ <KEYWORD2>\vfuzz</KEYWORD2>
+ <KEYWORD2>\voffset</KEYWORD2>
+ <KEYWORD2>\vrule</KEYWORD2>
+ <KEYWORD2>\vsize</KEYWORD2>
+ <KEYWORD2>\vskip</KEYWORD2>
+ <KEYWORD2>\vsplit</KEYWORD2>
+ <KEYWORD2>\vss</KEYWORD2>
+ <KEYWORD2>\vtop</KEYWORD2>
+ <KEYWORD2>\wd</KEYWORD2>
+ <KEYWORD2>\widowpenalty</KEYWORD2>
+ <KEYWORD2>\write</KEYWORD2>
+ <KEYWORD2>\xdef</KEYWORD2>
+ <KEYWORD2>\xleaders</KEYWORD2>
+ <KEYWORD2>\xspaceskip</KEYWORD2>
+ <KEYWORD2>\year</KEYWORD2>
+ </KEYWORDS>
+ </RULES>
+
+ <RULES SET='primitives.etex'>
+ <KEYWORDS>
+ <KEYWORD2>\beginL</KEYWORD2>
+ <KEYWORD2>\beginR</KEYWORD2>
+ <KEYWORD2>\botmarks</KEYWORD2>
+ <KEYWORD2>\clubpenalties</KEYWORD2>
+ <KEYWORD2>\currentgrouplevel</KEYWORD2>
+ <KEYWORD2>\currentgrouptype</KEYWORD2>
+ <KEYWORD2>\currentifbranch</KEYWORD2>
+ <KEYWORD2>\currentiflevel</KEYWORD2>
+ <KEYWORD2>\currentiftype</KEYWORD2>
+ <KEYWORD2>\detokenize</KEYWORD2>
+ <KEYWORD2>\dimexpr</KEYWORD2>
+ <KEYWORD2>\displaywidowpenalties</KEYWORD2>
+ <KEYWORD2>\endL</KEYWORD2>
+ <KEYWORD2>\endR</KEYWORD2>
+ <KEYWORD2>\eTeXrevision</KEYWORD2>
+ <KEYWORD2>\eTeXversion</KEYWORD2>
+ <KEYWORD2>\everyeof</KEYWORD2>
+ <KEYWORD2>\firstmarks</KEYWORD2>
+ <KEYWORD2>\fontchardp</KEYWORD2>
+ <KEYWORD2>\fontcharht</KEYWORD2>
+ <KEYWORD2>\fontcharic</KEYWORD2>
+ <KEYWORD2>\fontcharwd</KEYWORD2>
+ <KEYWORD2>\glueexpr</KEYWORD2>
+ <KEYWORD2>\glueshrink</KEYWORD2>
+ <KEYWORD2>\glueshrinkorder</KEYWORD2>
+ <KEYWORD2>\gluestretch</KEYWORD2>
+ <KEYWORD2>\gluestretchorder</KEYWORD2>
+ <KEYWORD2>\gluetomu</KEYWORD2>
+ <KEYWORD2>\ifcsname </KEYWORD2>
+ <KEYWORD2>\ifdefined</KEYWORD2>
+ <KEYWORD2>\iffontchar</KEYWORD2>
+ <KEYWORD2>\interactionmode</KEYWORD2>
+ <KEYWORD2>\interactionmode</KEYWORD2>
+ <KEYWORD2>\interlinepenalties</KEYWORD2>
+ <KEYWORD2>\lastlinefit</KEYWORD2>
+ <KEYWORD2>\lastnodetype</KEYWORD2>
+ <KEYWORD2>\marks</KEYWORD2>
+ <KEYWORD2>\topmarks</KEYWORD2>
+ <KEYWORD2>\</KEYWORD2>
+ <KEYWORD2>\muexpr</KEYWORD2>
+ <KEYWORD2>\mutoglue</KEYWORD2>
+ <KEYWORD2>\numexpr</KEYWORD2>
+ <KEYWORD2>\pagediscards</KEYWORD2>
+ <KEYWORD2>\parshapedimen</KEYWORD2>
+ <KEYWORD2>\parshapeindent</KEYWORD2>
+ <KEYWORD2>\parshapelength</KEYWORD2>
+ <KEYWORD2>\predisplaydirection</KEYWORD2>
+ <KEYWORD2>\savinghyphcodes</KEYWORD2>
+ <KEYWORD2>\savingvdiscards</KEYWORD2>
+ <KEYWORD2>\scantokens</KEYWORD2>
+ <KEYWORD2>\showgroups</KEYWORD2>
+ <KEYWORD2>\showifs</KEYWORD2>
+ <KEYWORD2>\showtokens</KEYWORD2>
+ <KEYWORD2>\splitdiscards</KEYWORD2>
+ <KEYWORD2>\splitfirstmarks</KEYWORD2>
+ <KEYWORD2>\TeXXeTstate</KEYWORD2>
+ <KEYWORD2>\tracingassigns</KEYWORD2>
+ <KEYWORD2>\tracinggroups</KEYWORD2>
+ <KEYWORD2>\tracingifs</KEYWORD2>
+ <KEYWORD2>\tracingnesting</KEYWORD2>
+ <KEYWORD2>\tracingscantokens</KEYWORD2>
+ <KEYWORD2>\unexpanded</KEYWORD2>
+ <KEYWORD2>\unless</KEYWORD2>
+ <KEYWORD2>\widowpenalties</KEYWORD2>
+ </KEYWORDS>
+ </RULES>
+
+ <RULES SET='primitives.pdftex'>
+ <KEYWORDS>
+ <KEYWORD2>\pdfadjustspacing</KEYWORD2>
+ <KEYWORD2>\pdfannot</KEYWORD2>
+ <KEYWORD2>\pdfavoidoverfull</KEYWORD2>
+ <KEYWORD2>\pdfcatalog</KEYWORD2>
+ <KEYWORD2>\pdfcompresslevel</KEYWORD2>
+ <KEYWORD2>\pdfdecimaldigits</KEYWORD2>
+ <KEYWORD2>\pdfdest pdfdestmargin</KEYWORD2>
+ <KEYWORD2>\pdfendlink</KEYWORD2>
+ <KEYWORD2>\pdfendthread</KEYWORD2>
+ <KEYWORD2>\pdffontattr</KEYWORD2>
+ <KEYWORD2>\pdffontexpand</KEYWORD2>
+ <KEYWORD2>\pdffontname</KEYWORD2>
+ <KEYWORD2>\pdffontobjnum</KEYWORD2>
+ <KEYWORD2>\pdffontsize</KEYWORD2>
+ <KEYWORD2>\pdfhorigin</KEYWORD2>
+ <KEYWORD2>\pdfimageresolution</KEYWORD2>
+ <KEYWORD2>\pdfincludechars</KEYWORD2>
+ <KEYWORD2>\pdfinfo</KEYWORD2>
+ <KEYWORD2>\pdflastannot</KEYWORD2>
+ <KEYWORD2>\pdflastdemerits</KEYWORD2>
+ <KEYWORD2>\pdflastobj</KEYWORD2>
+ <KEYWORD2>\pdflastvbreakpenalty</KEYWORD2>
+ <KEYWORD2>\pdflastxform</KEYWORD2>
+ <KEYWORD2>\pdflastximage</KEYWORD2>
+ <KEYWORD2>\pdflastximagepages</KEYWORD2>
+ <KEYWORD2>\pdflastxpos</KEYWORD2>
+ <KEYWORD2>\pdflastypos</KEYWORD2>
+ <KEYWORD2>\pdflinesnapx</KEYWORD2>
+ <KEYWORD2>\pdflinesnapy</KEYWORD2>
+ <KEYWORD2>\pdflinkmargin</KEYWORD2>
+ <KEYWORD2>\pdfliteral</KEYWORD2>
+ <KEYWORD2>\pdfmapfile</KEYWORD2>
+ <KEYWORD2>\pdfmaxpenalty</KEYWORD2>
+ <KEYWORD2>\pdfminpenalty</KEYWORD2>
+ <KEYWORD2>\pdfmovechars</KEYWORD2>
+ <KEYWORD2>\pdfnames</KEYWORD2>
+ <KEYWORD2>\pdfobj</KEYWORD2>
+ <KEYWORD2>\pdfoptionpdfminorversion</KEYWORD2>
+ <KEYWORD2>\pdfoutline</KEYWORD2>
+ <KEYWORD2>\pdfoutput</KEYWORD2>
+ <KEYWORD2>\pdfpageattr</KEYWORD2>
+ <KEYWORD2>\pdfpageheight</KEYWORD2>
+ <KEYWORD2>\pdfpageresources</KEYWORD2>
+ <KEYWORD2>\pdfpagesattr</KEYWORD2>
+ <KEYWORD2>\pdfpagewidth</KEYWORD2>
+ <KEYWORD2>\pdfpkresolution</KEYWORD2>
+ <KEYWORD2>\pdfprotrudechars</KEYWORD2>
+ <KEYWORD2>\pdfrefobj</KEYWORD2>
+ <KEYWORD2>\pdfrefxform</KEYWORD2>
+ <KEYWORD2>\pdfrefximage</KEYWORD2>
+ <KEYWORD2>\pdfsavepos</KEYWORD2>
+ <KEYWORD2>\pdfsnaprefpoint</KEYWORD2>
+ <KEYWORD2>\pdfsnapx</KEYWORD2>
+ <KEYWORD2>\pdfsnapy</KEYWORD2>
+ <KEYWORD2>\pdfstartlink</KEYWORD2>
+ <KEYWORD2>\pdfstartthread</KEYWORD2>
+ <KEYWORD2>\pdftexrevision</KEYWORD2>
+ <KEYWORD2>\pdftexversion</KEYWORD2>
+ <KEYWORD2>\pdfthread</KEYWORD2>
+ <KEYWORD2>\pdfthreadmargin</KEYWORD2>
+ <KEYWORD2>\pdfuniqueresname</KEYWORD2>
+ <KEYWORD2>\pdfvorigin</KEYWORD2>
+ <KEYWORD2>\pdfxform</KEYWORD2>
+ <KEYWORD2>\pdfximage</KEYWORD2>
+ </KEYWORDS>
+ </RULES>
+
+ <RULES SET='primitives.omega'>
+ <KEYWORDS>
+ <KEYWORD2>\odelimiter</KEYWORD2>
+ <KEYWORD2>\omathaccent</KEYWORD2>
+ <KEYWORD2>\omathchar</KEYWORD2>
+ <KEYWORD2>\oradical</KEYWORD2>
+ <KEYWORD2>\omathchardef</KEYWORD2>
+ <KEYWORD2>\omathcode</KEYWORD2>
+ <KEYWORD2>\odelcode</KEYWORD2>
+ <KEYWORD2>\leftghost</KEYWORD2>
+ <KEYWORD2>\rightghost</KEYWORD2>
+ <KEYWORD2>\charwd</KEYWORD2>
+ <KEYWORD2>\charht</KEYWORD2>
+ <KEYWORD2>\chardp</KEYWORD2>
+ <KEYWORD2>\charit</KEYWORD2>
+ <KEYWORD2>\localleftbox</KEYWORD2>
+ <KEYWORD2>\localrightbox</KEYWORD2>
+ <KEYWORD2>\localinterlinepenalty</KEYWORD2>
+ <KEYWORD2>\localbrokenpenalty</KEYWORD2>
+ <KEYWORD2>\pagedir</KEYWORD2>
+ <KEYWORD2>\bodydir</KEYWORD2>
+ <KEYWORD2>\pardir</KEYWORD2>
+ <KEYWORD2>\textdir</KEYWORD2>
+ <KEYWORD2>\mathdir</KEYWORD2>
+ <KEYWORD2>\boxdir</KEYWORD2>
+ <KEYWORD2>\nextfakemath</KEYWORD2>
+ <KEYWORD2>\pagewidth</KEYWORD2>
+ <KEYWORD2>\pageheight</KEYWORD2>
+ <KEYWORD2>\pagerightoffset</KEYWORD2>
+ <KEYWORD2>\pagebottomoffset</KEYWORD2>
+ <KEYWORD2>\nullocp</KEYWORD2>
+ <KEYWORD2>\nullocplist</KEYWORD2>
+ <KEYWORD2>\ocp</KEYWORD2>
+ <KEYWORD2>\externalocp</KEYWORD2>
+ <KEYWORD2>\ocplist</KEYWORD2>
+ <KEYWORD2>\pushocplist</KEYWORD2>
+ <KEYWORD2>\popocplist</KEYWORD2>
+ <KEYWORD2>\vclearocplists</KEYWORD2>
+ <KEYWORD2>\ocptracelevel</KEYWORD2>
+ <KEYWORD2>\addbeforeocplist</KEYWORD2>
+ <KEYWORD2>\addafterocplist</KEYWORD2>
+ <KEYWORD2>\removebeforeocplist</KEYWORD2>
+ <KEYWORD2>\removeafterocplist</KEYWORD2>
+ <KEYWORD2>\OmegaVersion</KEYWORD2>
+ <KEYWORD2>\InputTranslation</KEYWORD2>
+ <KEYWORD2>\OutputTranslation</KEYWORD2>
+ <KEYWORD2>\DefaultInputTranslation</KEYWORD2>
+ <KEYWORD2>\DefaultOutputTranslation</KEYWORD2>
+ <KEYWORD2>\noInputTranslation</KEYWORD2>
+ <KEYWORD2>\noOutputTranslation</KEYWORD2>
+ <KEYWORD2>\InputMode</KEYWORD2>
+ <KEYWORD2>\OutputMode</KEYWORD2>
+ <KEYWORD2>\DefaultInputMode</KEYWORD2>
+ <KEYWORD2>\DefaultOutputMode</KEYWORD2>
+ <KEYWORD2>\noInputMode</KEYWORD2>
+ <KEYWORD2>\noOutputMode</KEYWORD2>
+ <KEYWORD2>\noDefaultInputMode</KEYWORD2>
+ <KEYWORD2>\noDefaultOutputMode</KEYWORD2>
+ </KEYWORDS>
+ </RULES>
+
+ <RULES SET='macros.plain.partial'>
+ <KEYWORDS>
+ <KEYWORD2>\TeX</KEYWORD2>
+ <KEYWORD2>\bgroup</KEYWORD2>
+ <KEYWORD2>\egroup</KEYWORD2>
+ <KEYWORD2>\endgraf</KEYWORD2>
+ <KEYWORD2>\space</KEYWORD2>
+ <KEYWORD2>\empty</KEYWORD2>
+ <KEYWORD2>\null</KEYWORD2>
+ <KEYWORD2>\newcount</KEYWORD2>
+ <KEYWORD2>\newdimen</KEYWORD2>
+ <KEYWORD2>\newskip </KEYWORD2>
+ <KEYWORD2>\newmuskip</KEYWORD2>
+ <KEYWORD2>\newbox</KEYWORD2>
+ <KEYWORD2>\newtoks</KEYWORD2>
+ <KEYWORD2>\newhelp</KEYWORD2>
+ <KEYWORD2>\newread</KEYWORD2>
+ <KEYWORD2>\newwrite</KEYWORD2>
+ <KEYWORD2>\newfam</KEYWORD2>
+ <KEYWORD2>\newlanguage</KEYWORD2>
+ <KEYWORD2>\newinsert</KEYWORD2>
+ <KEYWORD2>\newif</KEYWORD2>
+ <KEYWORD2>\maxdimen</KEYWORD2>
+ <KEYWORD2>\magstephalf</KEYWORD2>
+ <KEYWORD2>\magstep</KEYWORD2>
+ <KEYWORD2>\frenchspacing</KEYWORD2>
+ <KEYWORD2>\nonfrenchspacing</KEYWORD2>
+ <KEYWORD2>\normalbaselines</KEYWORD2>
+ <KEYWORD2>\obeylines</KEYWORD2>
+ <KEYWORD2>\obeyspaces</KEYWORD2>
+ <KEYWORD2>\raggedright</KEYWORD2>
+ <KEYWORD2>\ttraggedright</KEYWORD2>
+ <KEYWORD2>\thinspace</KEYWORD2>
+ <KEYWORD2>\negthinspace</KEYWORD2>
+ <KEYWORD2>\enspace</KEYWORD2>
+ <KEYWORD2>\enskip</KEYWORD2>
+ <KEYWORD2>\quad</KEYWORD2>
+ <KEYWORD2>\qquad</KEYWORD2>
+ <KEYWORD2>\smallskip</KEYWORD2>
+ <KEYWORD2>\medskip</KEYWORD2>
+ <KEYWORD2>\bigskip</KEYWORD2>
+ <KEYWORD2>\removelastskip</KEYWORD2>
+ <KEYWORD2>\topglue</KEYWORD2>
+ <KEYWORD2>\vglue</KEYWORD2>
+ <KEYWORD2>\hglue</KEYWORD2>
+ <KEYWORD2>\break</KEYWORD2>
+ <KEYWORD2>\nobreak</KEYWORD2>
+ <KEYWORD2>\allowbreak</KEYWORD2>
+ <KEYWORD2>\filbreak</KEYWORD2>
+ <KEYWORD2>\goodbreak</KEYWORD2>
+ <KEYWORD2>\smallbreak</KEYWORD2>
+ <KEYWORD2>\medbreak</KEYWORD2>
+ <KEYWORD2>\bigbreak</KEYWORD2>
+ <KEYWORD2>\line</KEYWORD2>
+ <KEYWORD2>\leftline</KEYWORD2>
+ <KEYWORD2>\rightline</KEYWORD2>
+ <KEYWORD2>\centerline</KEYWORD2>
+ <KEYWORD2>\rlap</KEYWORD2>
+ <KEYWORD2>\llap</KEYWORD2>
+ <KEYWORD2>\underbar</KEYWORD2>
+ <KEYWORD2>\strutbox</KEYWORD2>
+ <KEYWORD2>\strut</KEYWORD2>
+ <KEYWORD2>\cases</KEYWORD2>
+ <KEYWORD2>\matrix</KEYWORD2>
+ <KEYWORD2>\pmatrix</KEYWORD2>
+ <KEYWORD2>\bordermatrix</KEYWORD2>
+ <KEYWORD2>\eqalign</KEYWORD2>
+ <KEYWORD2>\displaylines</KEYWORD2>
+ <KEYWORD2>\eqalignno</KEYWORD2>
+ <KEYWORD2>\leqalignno</KEYWORD2>
+ <KEYWORD2>\pageno</KEYWORD2>
+ <KEYWORD2>\folio</KEYWORD2>
+ <KEYWORD2>\tracingall</KEYWORD2>
+ <KEYWORD2>\showhyphens</KEYWORD2>
+ <KEYWORD2>\fmtname</KEYWORD2>
+ <KEYWORD2>\fmtversion</KEYWORD2>
+ <KEYWORD2>\hphantom</KEYWORD2>
+ <KEYWORD2>\vphantom</KEYWORD2>
+ <KEYWORD2>\phantom</KEYWORD2>
+ <KEYWORD2>\smash</KEYWORD2>
+ </KEYWORDS>
+ </RULES>
+
+ <RULES SET='macros.eplain.partial'>
+ <KEYWORDS>
+ <KEYWORD2>\eTeX</KEYWORD2>
+ <KEYWORD2>\newmarks</KEYWORD2>
+ <KEYWORD2>\grouptype</KEYWORD2>
+ <KEYWORD2>\interactionmode</KEYWORD2>
+ <KEYWORD2>\nodetype</KEYWORD2>
+ <KEYWORD2>\iftype</KEYWORD2>
+ <KEYWORD2>\tracingall</KEYWORD2>
+ <KEYWORD2>\loggingall</KEYWORD2>
+ <KEYWORD2>\tracingnone</KEYWORD2>
+ </KEYWORDS>
+ </RULES>
+
+ <RULES SET='primitives.all'>
+ <IMPORT DELEGATE="primitives.tex"/>
+ <IMPORT DELEGATE="primitives.etex"/>
+ <IMPORT DELEGATE="primitives.pdftex"/>
+ <IMPORT DELEGATE="primitives.omega"/>
+ </RULES>
+
+ <RULES SET='context.base'>
+ <IMPORT DELEGATE="primitives.tex"/>
+ <IMPORT DELEGATE="primitives.etex"/>
+ <IMPORT DELEGATE="primitives.pdftex"/>
+ <IMPORT DELEGATE="primitives.omega"/>
+ <IMPORT DELEGATE="macros.plain.partial"/>
+ <IMPORT DELEGATE="macros.eplain.partial"/>
+ </RULES>
+
+</MODE>
diff --git a/context/data/context-jedit-cz.xml b/context/data/context-jedit-cz.xml
new file mode 100644
index 000000000..56b4b7140
--- /dev/null
+++ b/context/data/context-jedit-cz.xml
@@ -0,0 +1,455 @@
+<?xml version='1.0'?>
+
+<!DOCTYPE MODE SYSTEM 'xmode.dtd'>
+
+<MODE>
+ <RULES>
+ <KEYWORDS>
+ <KEYWORD2>\MESIC</KEYWORD2>
+ <KEYWORD2>\Rimskecislice</KEYWORD2>
+ <KEYWORD2>\SLOVA</KEYWORD2>
+ <KEYWORD2>\SLOVO</KEYWORD2>
+ <KEYWORD2>\Slova</KEYWORD2>
+ <KEYWORD2>\Slovo</KEYWORD2>
+ <KEYWORD2>\VSEDNIDEN</KEYWORD2>
+ <KEYWORD2>\Znak</KEYWORD2>
+ <KEYWORD2>\Znaky</KEYWORD2>
+ <KEYWORD2>\aktualnicislonadpisu</KEYWORD2>
+ <KEYWORD2>\aktualnidatum</KEYWORD2>
+ <KEYWORD2>\arg</KEYWORD2>
+ <KEYWORD2>\barva</KEYWORD2>
+ <KEYWORD2>\bilemisto</KEYWORD2>
+ <KEYWORD2>\bublinkovanapoveda</KEYWORD2>
+ <KEYWORD2>\bypassblocks</KEYWORD2>
+ <KEYWORD2>\cernalinka</KEYWORD2>
+ <KEYWORD2>\cernelinky</KEYWORD2>
+ <KEYWORD2>\chem</KEYWORD2>
+ <KEYWORD2>\cisla</KEYWORD2>
+ <KEYWORD2>\cislonadpisu</KEYWORD2>
+ <KEYWORD2>\citace</KEYWORD2>
+ <KEYWORD2>\citovat</KEYWORD2>
+ <KEYWORD2>\completeregister</KEYWORD2>
+ <KEYWORD2>\crlf</KEYWORD2>
+ <KEYWORD2>\datum</KEYWORD2>
+ <KEYWORD2>\definerawfont</KEYWORD2>
+ <KEYWORD2>\definerule</KEYWORD2>
+ <KEYWORD2>\definetextposition</KEYWORD2>
+ <KEYWORD2>\definetextvariable</KEYWORD2>
+ <KEYWORD2>\definetype</KEYWORD2>
+ <KEYWORD2>\definuj</KEYWORD2>
+ <KEYWORD2>\definujbarvu</KEYWORD2>
+ <KEYWORD2>\definujblok</KEYWORD2>
+ <KEYWORD2>\definujbloksekce</KEYWORD2>
+ <KEYWORD2>\definujbuffer</KEYWORD2>
+ <KEYWORD2>\definujfont</KEYWORD2>
+ <KEYWORD2>\definujformatodkazu</KEYWORD2>
+ <KEYWORD2>\definujinterakcnimenu</KEYWORD2>
+ <KEYWORD2>\definujkombinovanyseznam</KEYWORD2>
+ <KEYWORD2>\definujkonverzi</KEYWORD2>
+ <KEYWORD2>\definujlogo</KEYWORD2>
+ <KEYWORD2>\definujnadpis</KEYWORD2>
+ <KEYWORD2>\definujobrazeksymbol</KEYWORD2>
+ <KEYWORD2>\definujodkaz</KEYWORD2>
+ <KEYWORD2>\definujodsazovani</KEYWORD2>
+ <KEYWORD2>\definujodstavce</KEYWORD2>
+ <KEYWORD2>\definujopis</KEYWORD2>
+ <KEYWORD2>\definujoramovani</KEYWORD2>
+ <KEYWORD2>\definujoramovanytext</KEYWORD2>
+ <KEYWORD2>\definujpaletu</KEYWORD2>
+ <KEYWORD2>\definujplvouciobjekt</KEYWORD2>
+ <KEYWORD2>\definujpodpole</KEYWORD2>
+ <KEYWORD2>\definujpole</KEYWORD2>
+ <KEYWORD2>\definujpopis</KEYWORD2>
+ <KEYWORD2>\definujpopisek</KEYWORD2>
+ <KEYWORD2>\definujprekryv</KEYWORD2>
+ <KEYWORD2>\definujpreskok</KEYWORD2>
+ <KEYWORD2>\definujprofil</KEYWORD2>
+ <KEYWORD2>\definujprogram</KEYWORD2>
+ <KEYWORD2>\definujprostredizakladnihofontu</KEYWORD2>
+ <KEYWORD2>\definujrejstrik</KEYWORD2>
+ <KEYWORD2>\definujsablonutabulky</KEYWORD2>
+ <KEYWORD2>\definujsekci</KEYWORD2>
+ <KEYWORD2>\definujseznam</KEYWORD2>
+ <KEYWORD2>\definujseznamodkazu</KEYWORD2>
+ <KEYWORD2>\definujskupinubarev</KEYWORD2>
+ <KEYWORD2>\definujstartstop</KEYWORD2>
+ <KEYWORD2>\definujsymbol</KEYWORD2>
+ <KEYWORD2>\definujsynonyma</KEYWORD2>
+ <KEYWORD2>\definujtabelaci</KEYWORD2>
+ <KEYWORD2>\definujtext</KEYWORD2>
+ <KEYWORD2>\definujtrideni</KEYWORD2>
+ <KEYWORD2>\definujupravu</KEYWORD2>
+ <KEYWORD2>\definujvelikostpapiru</KEYWORD2>
+ <KEYWORD2>\definujverzi</KEYWORD2>
+ <KEYWORD2>\definujvycet</KEYWORD2>
+ <KEYWORD2>\definujvystup</KEYWORD2>
+ <KEYWORD2>\definujzakladnifont</KEYWORD2>
+ <KEYWORD2>\definujzasobnikpoli</KEYWORD2>
+ <KEYWORD2>\definujznaceni</KEYWORD2>
+ <KEYWORD2>\dodrzujprofil</KEYWORD2>
+ <KEYWORD2>\dodrzujverzi</KEYWORD2>
+ <KEYWORD2>\dodrzujverziprofilu</KEYWORD2>
+ <KEYWORD2>\dvoustrannypapir</KEYWORD2>
+ <KEYWORD2>\emptylines</KEYWORD2>
+ <KEYWORD2>\externiobraz</KEYWORD2>
+ <KEYWORD2>\footnotetext</KEYWORD2>
+ <KEYWORD2>\forceblocks</KEYWORD2>
+ <KEYWORD2>\hl</KEYWORD2>
+ <KEYWORD2>\hlavnijazyk</KEYWORD2>
+ <KEYWORD2>\ininner</KEYWORD2>
+ <KEYWORD2>\inouter</KEYWORD2>
+ <KEYWORD2>\instalacejazyka</KEYWORD2>
+ <KEYWORD2>\interakcnilista</KEYWORD2>
+ <KEYWORD2>\interakcnitlacitka</KEYWORD2>
+ <KEYWORD2>\jazyk</KEYWORD2>
+ <KEYWORD2>\jdidolu</KEYWORD2>
+ <KEYWORD2>\jdina</KEYWORD2>
+ <KEYWORD2>\jdinabox</KEYWORD2>
+ <KEYWORD2>\klonujpole</KEYWORD2>
+ <KEYWORD2>\komentar</KEYWORD2>
+ <KEYWORD2>\konvertujcislo</KEYWORD2>
+ <KEYWORD2>\kopirujpole</KEYWORD2>
+ <KEYWORD2>\korekcebilehomista</KEYWORD2>
+ <KEYWORD2>\listsymbol</KEYWORD2>
+ <KEYWORD2>\marginalnilinka</KEYWORD2>
+ <KEYWORD2>\marginalnitext</KEYWORD2>
+ <KEYWORD2>\matematika</KEYWORD2>
+ <KEYWORD2>\meritko</KEYWORD2>
+ <KEYWORD2>\mesic</KEYWORD2>
+ <KEYWORD2>\mezera</KEYWORD2>
+ <KEYWORD2>\mrizka</KEYWORD2>
+ <KEYWORD2>\nadpis</KEYWORD2>
+ <KEYWORD2>\nadruhyokraj</KEYWORD2>
+ <KEYWORD2>\nadtrzeni</KEYWORD2>
+ <KEYWORD2>\nadtrzeno</KEYWORD2>
+ <KEYWORD2>\naokraj</KEYWORD2>
+ <KEYWORD2>\nastavbarvu</KEYWORD2>
+ <KEYWORD2>\nastavbarvy</KEYWORD2>
+ <KEYWORD2>\nastavbilamista</KEYWORD2>
+ <KEYWORD2>\nastavblok</KEYWORD2>
+ <KEYWORD2>\nastavbloksekce</KEYWORD2>
+ <KEYWORD2>\nastavbuffer</KEYWORD2>
+ <KEYWORD2>\nastavcernelinky</KEYWORD2>
+ <KEYWORD2>\nastavcislonadpisu</KEYWORD2>
+ <KEYWORD2>\nastavcislostrany</KEYWORD2>
+ <KEYWORD2>\nastavcislovani</KEYWORD2>
+ <KEYWORD2>\nastavcislovaniodstavcu</KEYWORD2>
+ <KEYWORD2>\nastavcislovaniradku</KEYWORD2>
+ <KEYWORD2>\nastavcislovanistran</KEYWORD2>
+ <KEYWORD2>\nastavcitaci</KEYWORD2>
+ <KEYWORD2>\nastavdefinicipoznamekpodcarou</KEYWORD2>
+ <KEYWORD2>\nastavdeleniplvoucichobjektu</KEYWORD2>
+ <KEYWORD2>\nastavdelitko</KEYWORD2>
+ <KEYWORD2>\nastavdolnitexty</KEYWORD2>
+ <KEYWORD2>\nastavexterniobrazy</KEYWORD2>
+ <KEYWORD2>\nastavhorejsek</KEYWORD2>
+ <KEYWORD2>\nastavhornitexty</KEYWORD2>
+ <KEYWORD2>\nastavinterakci</KEYWORD2>
+ <KEYWORD2>\nastavinterakcnilistu</KEYWORD2>
+ <KEYWORD2>\nastavinterakcniobrazovku</KEYWORD2>
+ <KEYWORD2>\nastavjazyk</KEYWORD2>
+ <KEYWORD2>\nastavkapitalky</KEYWORD2>
+ <KEYWORD2>\nastavkombinovanyseznam</KEYWORD2>
+ <KEYWORD2>\nastavkomentar</KEYWORD2>
+ <KEYWORD2>\nastavlegendu</KEYWORD2>
+ <KEYWORD2>\nastavmarginalie</KEYWORD2>
+ <KEYWORD2>\nastavmarginalniblok</KEYWORD2>
+ <KEYWORD2>\nastavmarginalnilinky</KEYWORD2>
+ <KEYWORD2>\nastavmeziradkovoumezeru</KEYWORD2>
+ <KEYWORD2>\nastavnadpis</KEYWORD2>
+ <KEYWORD2>\nastavnadpisy</KEYWORD2>
+ <KEYWORD2>\nastavodkazovani</KEYWORD2>
+ <KEYWORD2>\nastavodsazovani</KEYWORD2>
+ <KEYWORD2>\nastavodstavce</KEYWORD2>
+ <KEYWORD2>\nastavopis</KEYWORD2>
+ <KEYWORD2>\nastavoramovanetexty</KEYWORD2>
+ <KEYWORD2>\nastavoramovani</KEYWORD2>
+ <KEYWORD2>\nastavorez</KEYWORD2>
+ <KEYWORD2>\nastavotoceni</KEYWORD2>
+ <KEYWORD2>\nastavpaletu</KEYWORD2>
+ <KEYWORD2>\nastavplvouciobjekt</KEYWORD2>
+ <KEYWORD2>\nastavplvouciobjekty</KEYWORD2>
+ <KEYWORD2>\nastavpodcislostrany</KEYWORD2>
+ <KEYWORD2>\nastavpodtrzeni</KEYWORD2>
+ <KEYWORD2>\nastavpole</KEYWORD2>
+ <KEYWORD2>\nastavpolozky</KEYWORD2>
+ <KEYWORD2>\nastavpopisek</KEYWORD2>
+ <KEYWORD2>\nastavpopisky</KEYWORD2>
+ <KEYWORD2>\nastavpopisy</KEYWORD2>
+ <KEYWORD2>\nastavpozadi</KEYWORD2>
+ <KEYWORD2>\nastavpoznamkypodcarou</KEYWORD2>
+ <KEYWORD2>\nastavprechodstrany</KEYWORD2>
+ <KEYWORD2>\nastavpreskok</KEYWORD2>
+ <KEYWORD2>\nastavprofily</KEYWORD2>
+ <KEYWORD2>\nastavprogramy</KEYWORD2>
+ <KEYWORD2>\nastavprostredizakladnihofontu</KEYWORD2>
+ <KEYWORD2>\nastavpublikace</KEYWORD2>
+ <KEYWORD2>\nastavradkovani</KEYWORD2>
+ <KEYWORD2>\nastavradky</KEYWORD2>
+ <KEYWORD2>\nastavrastr</KEYWORD2>
+ <KEYWORD2>\nastavrejstrik</KEYWORD2>
+ <KEYWORD2>\nastavsadusymbolu</KEYWORD2>
+ <KEYWORD2>\nastavsekci</KEYWORD2>
+ <KEYWORD2>\nastavseznam</KEYWORD2>
+ <KEYWORD2>\nastavseznamodkazu</KEYWORD2>
+ <KEYWORD2>\nastavsirkucary</KEYWORD2>
+ <KEYWORD2>\nastavsloupce</KEYWORD2>
+ <KEYWORD2>\nastavspodek</KEYWORD2>
+ <KEYWORD2>\nastavspojeni</KEYWORD2>
+ <KEYWORD2>\nastavsynchronizaci</KEYWORD2>
+ <KEYWORD2>\nastavsynchronizacnilistu</KEYWORD2>
+ <KEYWORD2>\nastavsynonyma</KEYWORD2>
+ <KEYWORD2>\nastavsystem</KEYWORD2>
+ <KEYWORD2>\nastavtab</KEYWORD2>
+ <KEYWORD2>\nastavtabelaci</KEYWORD2>
+ <KEYWORD2>\nastavtabulky</KEYWORD2>
+ <KEYWORD2>\nastavtenkelinky</KEYWORD2>
+ <KEYWORD2>\nastavtext</KEYWORD2>
+ <KEYWORD2>\nastavtexthlavicky</KEYWORD2>
+ <KEYWORD2>\nastavtextovelinky</KEYWORD2>
+ <KEYWORD2>\nastavtextpopisku</KEYWORD2>
+ <KEYWORD2>\nastavtexttexty</KEYWORD2>
+ <KEYWORD2>\nastavtextyupati</KEYWORD2>
+ <KEYWORD2>\nastavtextyzahlavi</KEYWORD2>
+ <KEYWORD2>\nastavtlacitka</KEYWORD2>
+ <KEYWORD2>\nastavtoleranci</KEYWORD2>
+ <KEYWORD2>\nastavtrideni</KEYWORD2>
+ <KEYWORD2>\nastavtype</KEYWORD2>
+ <KEYWORD2>\nastavumisteniprotejsku</KEYWORD2>
+ <KEYWORD2>\nastavumistovani</KEYWORD2>
+ <KEYWORD2>\nastavupati</KEYWORD2>
+ <KEYWORD2>\nastavupravu</KEYWORD2>
+ <KEYWORD2>\nastavurl</KEYWORD2>
+ <KEYWORD2>\nastavusporadani</KEYWORD2>
+ <KEYWORD2>\nastavvelikostpapiru</KEYWORD2>
+ <KEYWORD2>\nastavverze</KEYWORD2>
+ <KEYWORD2>\nastavvsechnapole</KEYWORD2>
+ <KEYWORD2>\nastavvycty</KEYWORD2>
+ <KEYWORD2>\nastavvyplnovelinky</KEYWORD2>
+ <KEYWORD2>\nastavvyplnoveradky</KEYWORD2>
+ <KEYWORD2>\nastavvystup</KEYWORD2>
+ <KEYWORD2>\nastavvzhled</KEYWORD2>
+ <KEYWORD2>\nastavzahlavi</KEYWORD2>
+ <KEYWORD2>\nastavzakladnifont</KEYWORD2>
+ <KEYWORD2>\nastavzarovnani</KEYWORD2>
+ <KEYWORD2>\nastavznaceni</KEYWORD2>
+ <KEYWORD2>\nastavzuzeni</KEYWORD2>
+ <KEYWORD2>\nastrane</KEYWORD2>
+ <KEYWORD2>\nejakyradek</KEYWORD2>
+ <KEYWORD2>\nekde</KEYWORD2>
+ <KEYWORD2>\nivy</KEYWORD2>
+ <KEYWORD2>\nizky</KEYWORD2>
+ <KEYWORD2>\nop</KEYWORD2>
+ <KEYWORD2>\obrazovka</KEYWORD2>
+ <KEYWORD2>\odkaz</KEYWORD2>
+ <KEYWORD2>\odkaznadatum</KEYWORD2>
+ <KEYWORD2>\odkaznastranu</KEYWORD2>
+ <KEYWORD2>\odkaznatext</KEYWORD2>
+ <KEYWORD2>\odsazovani</KEYWORD2>
+ <KEYWORD2>\okr</KEYWORD2>
+ <KEYWORD2>\opis</KEYWORD2>
+ <KEYWORD2>\opissoubor</KEYWORD2>
+ <KEYWORD2>\oramovani</KEYWORD2>
+ <KEYWORD2>\oref</KEYWORD2>
+ <KEYWORD2>\orez</KEYWORD2>
+ <KEYWORD2>\otocit</KEYWORD2>
+ <KEYWORD2>\oznacverzi</KEYWORD2>
+ <KEYWORD2>\parovastrana</KEYWORD2>
+ <KEYWORD2>\pis</KEYWORD2>
+ <KEYWORD2>\placefloat</KEYWORD2>
+ <KEYWORD2>\placerule</KEYWORD2>
+ <KEYWORD2>\placetextvariable</KEYWORD2>
+ <KEYWORD2>\podtrzeni</KEYWORD2>
+ <KEYWORD2>\podtrzeno</KEYWORD2>
+ <KEYWORD2>\pol</KEYWORD2>
+ <KEYWORD2>\pole</KEYWORD2>
+ <KEYWORD2>\polozka</KEYWORD2>
+ <KEYWORD2>\polozky</KEYWORD2>
+ <KEYWORD2>\popisky</KEYWORD2>
+ <KEYWORD2>\porovnejpaletu</KEYWORD2>
+ <KEYWORD2>\porovnejskupinubarev</KEYWORD2>
+ <KEYWORD2>\positiontext</KEYWORD2>
+ <KEYWORD2>\pozadi</KEYWORD2>
+ <KEYWORD2>\pozice</KEYWORD2>
+ <KEYWORD2>\poznamka</KEYWORD2>
+ <KEYWORD2>\poznamkapodcarou</KEYWORD2>
+ <KEYWORD2>\pref</KEYWORD2>
+ <KEYWORD2>\prelozit</KEYWORD2>
+ <KEYWORD2>\premistinamrizku</KEYWORD2>
+ <KEYWORD2>\prepninazakladnifont</KEYWORD2>
+ <KEYWORD2>\preskoc</KEYWORD2>
+ <KEYWORD2>\preskrtnuti</KEYWORD2>
+ <KEYWORD2>\preskrtnuto</KEYWORD2>
+ <KEYWORD2>\prizpusobivepole</KEYWORD2>
+ <KEYWORD2>\prizpusobvzhled</KEYWORD2>
+ <KEYWORD2>\program</KEYWORD2>
+ <KEYWORD2>\propojeneznaceni</KEYWORD2>
+ <KEYWORD2>\propojenydokument</KEYWORD2>
+ <KEYWORD2>\propojenyrejstrik</KEYWORD2>
+ <KEYWORD2>\publikace</KEYWORD2>
+ <KEYWORD2>\ran</KEYWORD2>
+ <KEYWORD2>\ref</KEYWORD2>
+ <KEYWORD2>\reset</KEYWORD2>
+ <KEYWORD2>\resetznaceni</KEYWORD2>
+ <KEYWORD2>\rimskecislice</KEYWORD2>
+ <KEYWORD2>\rozdelplvouciobjekt</KEYWORD2>
+ <KEYWORD2>\rozpojeneznaceni</KEYWORD2>
+ <KEYWORD2>\roztazene</KEYWORD2>
+ <KEYWORD2>\schovejbloky</KEYWORD2>
+ <KEYWORD2>\scitani</KEYWORD2>
+ <KEYWORD2>\sedabarva</KEYWORD2>
+ <KEYWORD2>\settextvariable</KEYWORD2>
+ <KEYWORD2>\setupforms</KEYWORD2>
+ <KEYWORD2>\setupitemgroup</KEYWORD2>
+ <KEYWORD2>\setuppaper</KEYWORD2>
+ <KEYWORD2>\setuprule</KEYWORD2>
+ <KEYWORD2>\setupstrut</KEYWORD2>
+ <KEYWORD2>\setuptextposition</KEYWORD2>
+ <KEYWORD2>\setuptextvariable</KEYWORD2>
+ <KEYWORD2>\sloupec</KEYWORD2>
+ <KEYWORD2>\slovovpravo</KEYWORD2>
+ <KEYWORD2>\spodek</KEYWORD2>
+ <KEYWORD2>\stanovcharakteristickuseznamu</KEYWORD2>
+ <KEYWORD2>\stanovcislonadpisu</KEYWORD2>
+ <KEYWORD2>\start</KEYWORD2>
+ <KEYWORD2>\startbarva</KEYWORD2>
+ <KEYWORD2>\startcitace</KEYWORD2>
+ <KEYWORD2>\startfakt</KEYWORD2>
+ <KEYWORD2>\startinteraktivnimenu</KEYWORD2>
+ <KEYWORD2>\startkomentar</KEYWORD2>
+ <KEYWORD2>\startkomponenta</KEYWORD2>
+ <KEYWORD2>\startmarginalnilinka</KEYWORD2>
+ <KEYWORD2>\startpozadi</KEYWORD2>
+ <KEYWORD2>\startprojekt</KEYWORD2>
+ <KEYWORD2>\startprostredi</KEYWORD2>
+ <KEYWORD2>\starttextovalinka</KEYWORD2>
+ <KEYWORD2>\startverze</KEYWORD2>
+ <KEYWORD2>\startzhustene</KEYWORD2>
+ <KEYWORD2>\stop</KEYWORD2>
+ <KEYWORD2>\stopbarva</KEYWORD2>
+ <KEYWORD2>\stopcitace</KEYWORD2>
+ <KEYWORD2>\stopfakt</KEYWORD2>
+ <KEYWORD2>\stopinteraktivnimenu</KEYWORD2>
+ <KEYWORD2>\stopkomentar</KEYWORD2>
+ <KEYWORD2>\stopkomponenta</KEYWORD2>
+ <KEYWORD2>\stopmarginalnilinka</KEYWORD2>
+ <KEYWORD2>\stoppozadi</KEYWORD2>
+ <KEYWORD2>\stopprojekt</KEYWORD2>
+ <KEYWORD2>\stopprostredi</KEYWORD2>
+ <KEYWORD2>\stoptextovalinka</KEYWORD2>
+ <KEYWORD2>\stopverze</KEYWORD2>
+ <KEYWORD2>\stopzhustene</KEYWORD2>
+ <KEYWORD2>\strana</KEYWORD2>
+ <KEYWORD2>\switchtorawfont</KEYWORD2>
+ <KEYWORD2>\sym</KEYWORD2>
+ <KEYWORD2>\symbol</KEYWORD2>
+ <KEYWORD2>\synchronizacnilista</KEYWORD2>
+ <KEYWORD2>\synchronizovat</KEYWORD2>
+ <KEYWORD2>\tab</KEYWORD2>
+ <KEYWORD2>\tecky</KEYWORD2>
+ <KEYWORD2>\tenkalinka</KEYWORD2>
+ <KEYWORD2>\tenkelinky</KEYWORD2>
+ <KEYWORD2>\tex</KEYWORD2>
+ <KEYWORD2>\texthlavicky</KEYWORD2>
+ <KEYWORD2>\textovalinka</KEYWORD2>
+ <KEYWORD2>\textpopisku</KEYWORD2>
+ <KEYWORD2>\textvariable</KEYWORD2>
+ <KEYWORD2>\tlacitko</KEYWORD2>
+ <KEYWORD2>\tref</KEYWORD2>
+ <KEYWORD2>\tvrdemezery</KEYWORD2>
+ <KEYWORD2>\typebuffer</KEYWORD2>
+ <KEYWORD2>\typstrany</KEYWORD2>
+ <KEYWORD2>\ukazbarvu</KEYWORD2>
+ <KEYWORD2>\ukazexterniobrazy</KEYWORD2>
+ <KEYWORD2>\ukazmrizku</KEYWORD2>
+ <KEYWORD2>\ukaznastaveni</KEYWORD2>
+ <KEYWORD2>\ukazpaletu</KEYWORD2>
+ <KEYWORD2>\ukazpodpery</KEYWORD2>
+ <KEYWORD2>\ukazpole</KEYWORD2>
+ <KEYWORD2>\ukazpostredizakladnihofontu</KEYWORD2>
+ <KEYWORD2>\ukazramecek</KEYWORD2>
+ <KEYWORD2>\ukazsadusymbolu</KEYWORD2>
+ <KEYWORD2>\ukazskupinubarev</KEYWORD2>
+ <KEYWORD2>\ukazupravu</KEYWORD2>
+ <KEYWORD2>\ukazvytisk</KEYWORD2>
+ <KEYWORD2>\ukazvzhled</KEYWORD2>
+ <KEYWORD2>\ukazzakladnifont</KEYWORD2>
+ <KEYWORD2>\umistikombinovanyseznam</KEYWORD2>
+ <KEYWORD2>\umistilegendu</KEYWORD2>
+ <KEYWORD2>\umistiloga</KEYWORD2>
+ <KEYWORD2>\umistilokalnipoznamkypodcarou</KEYWORD2>
+ <KEYWORD2>\umistinadsebe</KEYWORD2>
+ <KEYWORD2>\umistinamrizku</KEYWORD2>
+ <KEYWORD2>\umistipodrovnici</KEYWORD2>
+ <KEYWORD2>\umistipoznamkypodcarou</KEYWORD2>
+ <KEYWORD2>\umistirejstrik</KEYWORD2>
+ <KEYWORD2>\umistirovnici</KEYWORD2>
+ <KEYWORD2>\umistiseznam</KEYWORD2>
+ <KEYWORD2>\umistiseznamodkazu</KEYWORD2>
+ <KEYWORD2>\umistivedlesebe</KEYWORD2>
+ <KEYWORD2>\umistizalozky</KEYWORD2>
+ <KEYWORD2>\uzijURL</KEYWORD2>
+ <KEYWORD2>\uzijbloky</KEYWORD2>
+ <KEYWORD2>\uzijexternidokument</KEYWORD2>
+ <KEYWORD2>\uzijexterniobraz</KEYWORD2>
+ <KEYWORD2>\uzijexternisoubor</KEYWORD2>
+ <KEYWORD2>\uzijexternisoubory</KEYWORD2>
+ <KEYWORD2>\uzijexternizvuk</KEYWORD2>
+ <KEYWORD2>\uzijkodovani</KEYWORD2>
+ <KEYWORD2>\uzijmodul</KEYWORD2>
+ <KEYWORD2>\uzijodkazy</KEYWORD2>
+ <KEYWORD2>\uzijprikazy</KEYWORD2>
+ <KEYWORD2>\uzijspeciality</KEYWORD2>
+ <KEYWORD2>\uzijsymbol</KEYWORD2>
+ <KEYWORD2>\verze</KEYWORD2>
+ <KEYWORD2>\vl</KEYWORD2>
+ <KEYWORD2>\vlasovalinka</KEYWORD2>
+ <KEYWORD2>\vlevo</KEYWORD2>
+ <KEYWORD2>\vpravo</KEYWORD2>
+ <KEYWORD2>\vradku</KEYWORD2>
+ <KEYWORD2>\vsedniden</KEYWORD2>
+ <KEYWORD2>\vyberbloky</KEYWORD2>
+ <KEYWORD2>\vyberpapir</KEYWORD2>
+ <KEYWORD2>\vyberverzi</KEYWORD2>
+ <KEYWORD2>\vyplnenytext</KEYWORD2>
+ <KEYWORD2>\vyplnovelinky</KEYWORD2>
+ <KEYWORD2>\vyplnovepole</KEYWORD2>
+ <KEYWORD2>\vyplnovyradek</KEYWORD2>
+ <KEYWORD2>\vysoky</KEYWORD2>
+ <KEYWORD2>\zablokujinterakcnimenu</KEYWORD2>
+ <KEYWORD2>\zachovejbloky</KEYWORD2>
+ <KEYWORD2>\zadnamezera</KEYWORD2>
+ <KEYWORD2>\zadnebilemisto</KEYWORD2>
+ <KEYWORD2>\zadnedalsibloky</KEYWORD2>
+ <KEYWORD2>\zadnedalsisoubory</KEYWORD2>
+ <KEYWORD2>\zadnehorniadolniradky</KEYWORD2>
+ <KEYWORD2>\zadneodsazovani</KEYWORD2>
+ <KEYWORD2>\zadnezahlaviaupati</KEYWORD2>
+ <KEYWORD2>\zadneznaceni</KEYWORD2>
+ <KEYWORD2>\zadnyseznam</KEYWORD2>
+ <KEYWORD2>\zadnytest</KEYWORD2>
+ <KEYWORD2>\zalozka</KEYWORD2>
+ <KEYWORD2>\zapisdorejstriku</KEYWORD2>
+ <KEYWORD2>\zapisdoseznamu</KEYWORD2>
+ <KEYWORD2>\zapisdoseznamuodkazu</KEYWORD2>
+ <KEYWORD2>\zapismeziseznam</KEYWORD2>
+ <KEYWORD2>\zaramovani</KEYWORD2>
+ <KEYWORD2>\zarovnanonastred</KEYWORD2>
+ <KEYWORD2>\zarovnanovlevo</KEYWORD2>
+ <KEYWORD2>\zarovnanovpravo</KEYWORD2>
+ <KEYWORD2>\zasobnikpoli</KEYWORD2>
+ <KEYWORD2>\zaznamovepole</KEYWORD2>
+ <KEYWORD2>\zhustene</KEYWORD2>
+ <KEYWORD2>\ziskejbuffer</KEYWORD2>
+ <KEYWORD2>\ziskejznaceni</KEYWORD2>
+ <KEYWORD2>\zlomek</KEYWORD2>
+ <KEYWORD2>\znaceni</KEYWORD2>
+ <KEYWORD2>\znak</KEYWORD2>
+ <KEYWORD2>\znaky</KEYWORD2>
+ <KEYWORD2>\zpracujbloky</KEYWORD2>
+ <KEYWORD2>\zpracujstranu</KEYWORD2>
+ <KEYWORD2>\zrcadlit</KEYWORD2>
+ <KEYWORD2>\zref</KEYWORD2>
+ </KEYWORDS>
+ </RULES>
+</MODE>
diff --git a/context/data/context-jedit-de.xml b/context/data/context-jedit-de.xml
new file mode 100644
index 000000000..140f93c19
--- /dev/null
+++ b/context/data/context-jedit-de.xml
@@ -0,0 +1,458 @@
+<?xml version='1.0'?>
+
+<!DOCTYPE MODE SYSTEM 'xmode.dtd'>
+
+<MODE>
+ <RULES>
+ <KEYWORDS>
+ <KEYWORD2>\Buchstabe</KEYWORD2>
+ <KEYWORD2>\Buchstaben</KEYWORD2>
+ <KEYWORD2>\MONAT</KEYWORD2>
+ <KEYWORD2>\Roemischezahlen</KEYWORD2>
+ <KEYWORD2>\WOCHENTAG</KEYWORD2>
+ <KEYWORD2>\WOERTER</KEYWORD2>
+ <KEYWORD2>\WORT</KEYWORD2>
+ <KEYWORD2>\Woerter</KEYWORD2>
+ <KEYWORD2>\Wort</KEYWORD2>
+ <KEYWORD2>\amgitterausrichten</KEYWORD2>
+ <KEYWORD2>\amgitterneuausrichten</KEYWORD2>
+ <KEYWORD2>\arg</KEYWORD2>
+ <KEYWORD2>\aufseite</KEYWORD2>
+ <KEYWORD2>\ausfuellfeld</KEYWORD2>
+ <KEYWORD2>\ausfuelltext</KEYWORD2>
+ <KEYWORD2>\ausschnitt</KEYWORD2>
+ <KEYWORD2>\bearbeitebloecke</KEYWORD2>
+ <KEYWORD2>\bearbeiteseite</KEYWORD2>
+ <KEYWORD2>\behaltebloecke</KEYWORD2>
+ <KEYWORD2>\bei</KEYWORD2>
+ <KEYWORD2>\benutzekodierung</KEYWORD2>
+ <KEYWORD2>\benutzespezielles</KEYWORD2>
+ <KEYWORD2>\beschrifteversion</KEYWORD2>
+ <KEYWORD2>\beschriftung</KEYWORD2>
+ <KEYWORD2>\bestimmekopfnummer</KEYWORD2>
+ <KEYWORD2>\bestimmelistencharakeristika</KEYWORD2>
+ <KEYWORD2>\bildschirm</KEYWORD2>
+ <KEYWORD2>\blanko</KEYWORD2>
+ <KEYWORD2>\bookmark</KEYWORD2>
+ <KEYWORD2>\bruch</KEYWORD2>
+ <KEYWORD2>\buchstabe</KEYWORD2>
+ <KEYWORD2>\buchstaben</KEYWORD2>
+ <KEYWORD2>\but</KEYWORD2>
+ <KEYWORD2>\bypassblocks</KEYWORD2>
+ <KEYWORD2>\chem</KEYWORD2>
+ <KEYWORD2>\completeregister</KEYWORD2>
+ <KEYWORD2>\crlf</KEYWORD2>
+ <KEYWORD2>\datum</KEYWORD2>
+ <KEYWORD2>\defineoutput</KEYWORD2>
+ <KEYWORD2>\definerawfont</KEYWORD2>
+ <KEYWORD2>\definerule</KEYWORD2>
+ <KEYWORD2>\definetextposition</KEYWORD2>
+ <KEYWORD2>\definetextvariable</KEYWORD2>
+ <KEYWORD2>\definetype</KEYWORD2>
+ <KEYWORD2>\definiereabbsymbol</KEYWORD2>
+ <KEYWORD2>\definiereabsaetze</KEYWORD2>
+ <KEYWORD2>\definiereabschnitt</KEYWORD2>
+ <KEYWORD2>\definiereabschnittsblock</KEYWORD2>
+ <KEYWORD2>\definierebeschreibung</KEYWORD2>
+ <KEYWORD2>\definierebeschreibungen</KEYWORD2>
+ <KEYWORD2>\definierebeschriftung</KEYWORD2>
+ <KEYWORD2>\definiereblanko</KEYWORD2>
+ <KEYWORD2>\definiereblock</KEYWORD2>
+ <KEYWORD2>\definiereeinzug</KEYWORD2>
+ <KEYWORD2>\definierefarbe</KEYWORD2>
+ <KEYWORD2>\definierefarbengruppe</KEYWORD2>
+ <KEYWORD2>\definierefeld</KEYWORD2>
+ <KEYWORD2>\definierefeldstapel</KEYWORD2>
+ <KEYWORD2>\definierefliesstext</KEYWORD2>
+ <KEYWORD2>\definierefliesstextumgebung</KEYWORD2>
+ <KEYWORD2>\definieregleitobjekt</KEYWORD2>
+ <KEYWORD2>\definiereinteraktionsmenue</KEYWORD2>
+ <KEYWORD2>\definierekonversion</KEYWORD2>
+ <KEYWORD2>\definierelabel</KEYWORD2>
+ <KEYWORD2>\definiereliste</KEYWORD2>
+ <KEYWORD2>\definierelogo</KEYWORD2>
+ <KEYWORD2>\definieren</KEYWORD2>
+ <KEYWORD2>\definierenummerierung</KEYWORD2>
+ <KEYWORD2>\definiereoverlay</KEYWORD2>
+ <KEYWORD2>\definierepalette</KEYWORD2>
+ <KEYWORD2>\definierepapierformat</KEYWORD2>
+ <KEYWORD2>\definiereprofil</KEYWORD2>
+ <KEYWORD2>\definiereprogramme</KEYWORD2>
+ <KEYWORD2>\definierepuffer</KEYWORD2>
+ <KEYWORD2>\definierereferenz</KEYWORD2>
+ <KEYWORD2>\definierereferenzformat</KEYWORD2>
+ <KEYWORD2>\definierereferenzliste</KEYWORD2>
+ <KEYWORD2>\definiereregister</KEYWORD2>
+ <KEYWORD2>\definiereschrift</KEYWORD2>
+ <KEYWORD2>\definieresortieren</KEYWORD2>
+ <KEYWORD2>\definierestartstop</KEYWORD2>
+ <KEYWORD2>\definieresubfeld</KEYWORD2>
+ <KEYWORD2>\definieresymbol</KEYWORD2>
+ <KEYWORD2>\definieresynonyme</KEYWORD2>
+ <KEYWORD2>\definieretabellenvorlage</KEYWORD2>
+ <KEYWORD2>\definieretabulator</KEYWORD2>
+ <KEYWORD2>\definieretext</KEYWORD2>
+ <KEYWORD2>\definieretippen</KEYWORD2>
+ <KEYWORD2>\definiereueberschrift</KEYWORD2>
+ <KEYWORD2>\definiereumbruch</KEYWORD2>
+ <KEYWORD2>\definiereumrahmt</KEYWORD2>
+ <KEYWORD2>\definiereumrahmtertext</KEYWORD2>
+ <KEYWORD2>\definiereversion</KEYWORD2>
+ <KEYWORD2>\definierezusammengestellteliste</KEYWORD2>
+ <KEYWORD2>\doppelseite</KEYWORD2>
+ <KEYWORD2>\doppelseitigespapier</KEYWORD2>
+ <KEYWORD2>\drehen</KEYWORD2>
+ <KEYWORD2>\duennelinie</KEYWORD2>
+ <KEYWORD2>\duennerumriss</KEYWORD2>
+ <KEYWORD2>\durchgestrichen</KEYWORD2>
+ <KEYWORD2>\durchstreichen</KEYWORD2>
+ <KEYWORD2>\einezeile</KEYWORD2>
+ <KEYWORD2>\einziehen</KEYWORD2>
+ <KEYWORD2>\emptylines</KEYWORD2>
+ <KEYWORD2>\entknuepfebeschriftung</KEYWORD2>
+ <KEYWORD2>\externeabbildung</KEYWORD2>
+ <KEYWORD2>\farbe</KEYWORD2>
+ <KEYWORD2>\feld</KEYWORD2>
+ <KEYWORD2>\feldstapel</KEYWORD2>
+ <KEYWORD2>\festesspatium</KEYWORD2>
+ <KEYWORD2>\folgeprofil</KEYWORD2>
+ <KEYWORD2>\folgeprofilversion</KEYWORD2>
+ <KEYWORD2>\folgeversion</KEYWORD2>
+ <KEYWORD2>\footnotetext</KEYWORD2>
+ <KEYWORD2>\forceblocks</KEYWORD2>
+ <KEYWORD2>\format</KEYWORD2>
+ <KEYWORD2>\fussnote</KEYWORD2>
+ <KEYWORD2>\gefuelltesrechteck</KEYWORD2>
+ <KEYWORD2>\gefuelltezeile</KEYWORD2>
+ <KEYWORD2>\gestreckt</KEYWORD2>
+ <KEYWORD2>\gitter</KEYWORD2>
+ <KEYWORD2>\graufarbe</KEYWORD2>
+ <KEYWORD2>\haarlinie</KEYWORD2>
+ <KEYWORD2>\hauptsprache</KEYWORD2>
+ <KEYWORD2>\heutigesdatum</KEYWORD2>
+ <KEYWORD2>\heutigeskopfnummer</KEYWORD2>
+ <KEYWORD2>\hintergrund</KEYWORD2>
+ <KEYWORD2>\hl</KEYWORD2>
+ <KEYWORD2>\hoch</KEYWORD2>
+ <KEYWORD2>\holebeschriftung</KEYWORD2>
+ <KEYWORD2>\holepuffer</KEYWORD2>
+ <KEYWORD2>\imlinken</KEYWORD2>
+ <KEYWORD2>\imrechten</KEYWORD2>
+ <KEYWORD2>\imumriss</KEYWORD2>
+ <KEYWORD2>\in</KEYWORD2>
+ <KEYWORD2>\inaktiviereinteraktionsmenue</KEYWORD2>
+ <KEYWORD2>\inanderermarginale</KEYWORD2>
+ <KEYWORD2>\ininner</KEYWORD2>
+ <KEYWORD2>\inmarginalie</KEYWORD2>
+ <KEYWORD2>\inouter</KEYWORD2>
+ <KEYWORD2>\installieresprache</KEYWORD2>
+ <KEYWORD2>\interaktionsbalken</KEYWORD2>
+ <KEYWORD2>\interaktionsknopfe</KEYWORD2>
+ <KEYWORD2>\inzeile</KEYWORD2>
+ <KEYWORD2>\irgendwo</KEYWORD2>
+ <KEYWORD2>\its</KEYWORD2>
+ <KEYWORD2>\keinebeschriftung</KEYWORD2>
+ <KEYWORD2>\keinebloeckemehr</KEYWORD2>
+ <KEYWORD2>\keinedateienmehr</KEYWORD2>
+ <KEYWORD2>\keinekopfundfusszeilen</KEYWORD2>
+ <KEYWORD2>\keineliste</KEYWORD2>
+ <KEYWORD2>\keinspatium</KEYWORD2>
+ <KEYWORD2>\keintest</KEYWORD2>
+ <KEYWORD2>\keinzeilenobenundunten</KEYWORD2>
+ <KEYWORD2>\keinzwischenraum</KEYWORD2>
+ <KEYWORD2>\kleinerdurchschuss</KEYWORD2>
+ <KEYWORD2>\klonierefeld</KEYWORD2>
+ <KEYWORD2>\knopf</KEYWORD2>
+ <KEYWORD2>\kommentar</KEYWORD2>
+ <KEYWORD2>\konvertierezahl</KEYWORD2>
+ <KEYWORD2>\kopf</KEYWORD2>
+ <KEYWORD2>\kopfnummer</KEYWORD2>
+ <KEYWORD2>\kopierefeld</KEYWORD2>
+ <KEYWORD2>\korrigierezwischenraum</KEYWORD2>
+ <KEYWORD2>\labels</KEYWORD2>
+ <KEYWORD2>\labeltext</KEYWORD2>
+ <KEYWORD2>\linksbuendig</KEYWORD2>
+ <KEYWORD2>\listsymbol</KEYWORD2>
+ <KEYWORD2>\mar</KEYWORD2>
+ <KEYWORD2>\marginallinie</KEYWORD2>
+ <KEYWORD2>\marginaltext</KEYWORD2>
+ <KEYWORD2>\mathematik</KEYWORD2>
+ <KEYWORD2>\monat</KEYWORD2>
+ <KEYWORD2>\nachunten</KEYWORD2>
+ <KEYWORD2>\nichteinziehen</KEYWORD2>
+ <KEYWORD2>\nop</KEYWORD2>
+ <KEYWORD2>\notiz</KEYWORD2>
+ <KEYWORD2>\passelayoutan</KEYWORD2>
+ <KEYWORD2>\passendfeld</KEYWORD2>
+ <KEYWORD2>\placefloat</KEYWORD2>
+ <KEYWORD2>\placerule</KEYWORD2>
+ <KEYWORD2>\placetextvariable</KEYWORD2>
+ <KEYWORD2>\platzierebookmarks</KEYWORD2>
+ <KEYWORD2>\platziereformel</KEYWORD2>
+ <KEYWORD2>\platzierefussnoten</KEYWORD2>
+ <KEYWORD2>\platzierelegende</KEYWORD2>
+ <KEYWORD2>\platziereliste</KEYWORD2>
+ <KEYWORD2>\platzierelogo</KEYWORD2>
+ <KEYWORD2>\platzierelokalefussnoten</KEYWORD2>
+ <KEYWORD2>\platzierenebeneinander</KEYWORD2>
+ <KEYWORD2>\platzierereferenzliste</KEYWORD2>
+ <KEYWORD2>\platziereregister</KEYWORD2>
+ <KEYWORD2>\platziereuntereinander</KEYWORD2>
+ <KEYWORD2>\platziereunterformel</KEYWORD2>
+ <KEYWORD2>\platzierezusammengestellteliste</KEYWORD2>
+ <KEYWORD2>\pos</KEYWORD2>
+ <KEYWORD2>\position</KEYWORD2>
+ <KEYWORD2>\positiontext</KEYWORD2>
+ <KEYWORD2>\posten</KEYWORD2>
+ <KEYWORD2>\programm</KEYWORD2>
+ <KEYWORD2>\publikation</KEYWORD2>
+ <KEYWORD2>\punkt</KEYWORD2>
+ <KEYWORD2>\ran</KEYWORD2>
+ <KEYWORD2>\rechteck</KEYWORD2>
+ <KEYWORD2>\rechtecke</KEYWORD2>
+ <KEYWORD2>\rechtsbuendig</KEYWORD2>
+ <KEYWORD2>\ref</KEYWORD2>
+ <KEYWORD2>\referenz</KEYWORD2>
+ <KEYWORD2>\registrierefelder</KEYWORD2>
+ <KEYWORD2>\roemischezahlen</KEYWORD2>
+ <KEYWORD2>\ruecksetzten</KEYWORD2>
+ <KEYWORD2>\ruecksetztenbeschriftung</KEYWORD2>
+ <KEYWORD2>\schreibezumregister</KEYWORD2>
+ <KEYWORD2>\schreibezurliste</KEYWORD2>
+ <KEYWORD2>\schreibezurreferenzliste</KEYWORD2>
+ <KEYWORD2>\schreibezwischenliste</KEYWORD2>
+ <KEYWORD2>\seite</KEYWORD2>
+ <KEYWORD2>\seitenreferenz</KEYWORD2>
+ <KEYWORD2>\seitentyp</KEYWORD2>
+ <KEYWORD2>\settextvariable</KEYWORD2>
+ <KEYWORD2>\setupforms</KEYWORD2>
+ <KEYWORD2>\setupitemgroup</KEYWORD2>
+ <KEYWORD2>\setuppaper</KEYWORD2>
+ <KEYWORD2>\setuprule</KEYWORD2>
+ <KEYWORD2>\setupstrut</KEYWORD2>
+ <KEYWORD2>\setuptextposition</KEYWORD2>
+ <KEYWORD2>\setuptextvariable</KEYWORD2>
+ <KEYWORD2>\showsymbolset</KEYWORD2>
+ <KEYWORD2>\spalte</KEYWORD2>
+ <KEYWORD2>\spatium</KEYWORD2>
+ <KEYWORD2>\spiegeln</KEYWORD2>
+ <KEYWORD2>\sprache</KEYWORD2>
+ <KEYWORD2>\start</KEYWORD2>
+ <KEYWORD2>\startfarbe</KEYWORD2>
+ <KEYWORD2>\startgeg</KEYWORD2>
+ <KEYWORD2>\starthintergrund</KEYWORD2>
+ <KEYWORD2>\startinteraktionsmenue</KEYWORD2>
+ <KEYWORD2>\startkleinerdurchschuss</KEYWORD2>
+ <KEYWORD2>\startkommentar</KEYWORD2>
+ <KEYWORD2>\startkomponente</KEYWORD2>
+ <KEYWORD2>\startmarginallinie</KEYWORD2>
+ <KEYWORD2>\startprojekt</KEYWORD2>
+ <KEYWORD2>\starttextlinie</KEYWORD2>
+ <KEYWORD2>\startumgebung</KEYWORD2>
+ <KEYWORD2>\startversion</KEYWORD2>
+ <KEYWORD2>\startzitat</KEYWORD2>
+ <KEYWORD2>\stelleabsaetzeein</KEYWORD2>
+ <KEYWORD2>\stelleabsatznummerierungein</KEYWORD2>
+ <KEYWORD2>\stelleabschnittein</KEYWORD2>
+ <KEYWORD2>\stelleabschnittsblockein</KEYWORD2>
+ <KEYWORD2>\stelleanordnenein</KEYWORD2>
+ <KEYWORD2>\stelleausgabeein</KEYWORD2>
+ <KEYWORD2>\stelleausrichtungein</KEYWORD2>
+ <KEYWORD2>\stelleausschnittein</KEYWORD2>
+ <KEYWORD2>\stellebeschreibungein</KEYWORD2>
+ <KEYWORD2>\stellebeschriftungein</KEYWORD2>
+ <KEYWORD2>\stellebilderunterschriftein</KEYWORD2>
+ <KEYWORD2>\stellebildunterschriftein</KEYWORD2>
+ <KEYWORD2>\stellebindestrichein</KEYWORD2>
+ <KEYWORD2>\stelleblankoein</KEYWORD2>
+ <KEYWORD2>\stelleblockein</KEYWORD2>
+ <KEYWORD2>\stelledrehenein</KEYWORD2>
+ <KEYWORD2>\stelleduennerumrissein</KEYWORD2>
+ <KEYWORD2>\stelleeinziehenein</KEYWORD2>
+ <KEYWORD2>\stelleeinzuegein</KEYWORD2>
+ <KEYWORD2>\stelleengerein</KEYWORD2>
+ <KEYWORD2>\stelleexterneabbildungenein</KEYWORD2>
+ <KEYWORD2>\stellefarbeein</KEYWORD2>
+ <KEYWORD2>\stellefarbenein</KEYWORD2>
+ <KEYWORD2>\stellefeldein</KEYWORD2>
+ <KEYWORD2>\stellefelderin</KEYWORD2>
+ <KEYWORD2>\stellefliesstextein</KEYWORD2>
+ <KEYWORD2>\stellefliesstextumgebungein</KEYWORD2>
+ <KEYWORD2>\stellefussnotendefinitionein</KEYWORD2>
+ <KEYWORD2>\stellefussnotenein</KEYWORD2>
+ <KEYWORD2>\stellefusszeileein</KEYWORD2>
+ <KEYWORD2>\stellefusszeilentextein</KEYWORD2>
+ <KEYWORD2>\stellegefuelltesrechteckein</KEYWORD2>
+ <KEYWORD2>\stellegefuelltezeileein</KEYWORD2>
+ <KEYWORD2>\stellegegenueberplatzierenein</KEYWORD2>
+ <KEYWORD2>\stellegleitobjekteein</KEYWORD2>
+ <KEYWORD2>\stellegleitobjektein</KEYWORD2>
+ <KEYWORD2>\stellehintergruendeein</KEYWORD2>
+ <KEYWORD2>\stellehintergrundein</KEYWORD2>
+ <KEYWORD2>\stelleinmarginalieein</KEYWORD2>
+ <KEYWORD2>\stelleinteraktionein</KEYWORD2>
+ <KEYWORD2>\stelleinteraktionsbalkenein</KEYWORD2>
+ <KEYWORD2>\stelleinteraktionsbildschirmein</KEYWORD2>
+ <KEYWORD2>\stelleknopfein</KEYWORD2>
+ <KEYWORD2>\stellekombinationein</KEYWORD2>
+ <KEYWORD2>\stellekommentarein</KEYWORD2>
+ <KEYWORD2>\stellekopfzahlein</KEYWORD2>
+ <KEYWORD2>\stellekopfzeileein</KEYWORD2>
+ <KEYWORD2>\stellekopfzeilentextein</KEYWORD2>
+ <KEYWORD2>\stellelabeltextein</KEYWORD2>
+ <KEYWORD2>\stellelayoutein</KEYWORD2>
+ <KEYWORD2>\stellelegendeein</KEYWORD2>
+ <KEYWORD2>\stellelinienbreiteein</KEYWORD2>
+ <KEYWORD2>\stellelisteein</KEYWORD2>
+ <KEYWORD2>\stellemarginalblockein</KEYWORD2>
+ <KEYWORD2>\stellemarginallinieein</KEYWORD2>
+ <KEYWORD2>\stellenobenein</KEYWORD2>
+ <KEYWORD2>\stellenummerierungein</KEYWORD2>
+ <KEYWORD2>\stellepaletteein</KEYWORD2>
+ <KEYWORD2>\stellepapierformatein</KEYWORD2>
+ <KEYWORD2>\stelleplatziegeteiltegleitobjekt</KEYWORD2>
+ <KEYWORD2>\stellepositionierenein</KEYWORD2>
+ <KEYWORD2>\stellepostenein</KEYWORD2>
+ <KEYWORD2>\stelleprofilein</KEYWORD2>
+ <KEYWORD2>\stelleprogrammein</KEYWORD2>
+ <KEYWORD2>\stellepublikationein</KEYWORD2>
+ <KEYWORD2>\stellepufferein</KEYWORD2>
+ <KEYWORD2>\stellerasterein</KEYWORD2>
+ <KEYWORD2>\stellerechteckein</KEYWORD2>
+ <KEYWORD2>\stellereferenzierenein</KEYWORD2>
+ <KEYWORD2>\stellereferenzlisteein</KEYWORD2>
+ <KEYWORD2>\stelleregisterein</KEYWORD2>
+ <KEYWORD2>\stelleseitennummerein</KEYWORD2>
+ <KEYWORD2>\stelleseitennummeriernungein</KEYWORD2>
+ <KEYWORD2>\stelleseitenuebergangein</KEYWORD2>
+ <KEYWORD2>\stellesortierenein</KEYWORD2>
+ <KEYWORD2>\stellespaltenein</KEYWORD2>
+ <KEYWORD2>\stellespatiumein</KEYWORD2>
+ <KEYWORD2>\stellespracheein</KEYWORD2>
+ <KEYWORD2>\stellesymbolsetein</KEYWORD2>
+ <KEYWORD2>\stellesynchronisationein</KEYWORD2>
+ <KEYWORD2>\stellesynchronisationsbalkenein</KEYWORD2>
+ <KEYWORD2>\stellesynonymein</KEYWORD2>
+ <KEYWORD2>\stellesystemein</KEYWORD2>
+ <KEYWORD2>\stelletabein</KEYWORD2>
+ <KEYWORD2>\stelletabellenein</KEYWORD2>
+ <KEYWORD2>\stelletabulatorein</KEYWORD2>
+ <KEYWORD2>\stelletextein</KEYWORD2>
+ <KEYWORD2>\stelletextobenein</KEYWORD2>
+ <KEYWORD2>\stelletexttexteein</KEYWORD2>
+ <KEYWORD2>\stelletextumrissein</KEYWORD2>
+ <KEYWORD2>\stelletextuntenein</KEYWORD2>
+ <KEYWORD2>\stelletipein</KEYWORD2>
+ <KEYWORD2>\stelletippenein</KEYWORD2>
+ <KEYWORD2>\stelletoleranzein</KEYWORD2>
+ <KEYWORD2>\stelleueberschriftein</KEYWORD2>
+ <KEYWORD2>\stelleueberschriftenein</KEYWORD2>
+ <KEYWORD2>\stelleueberschrifttextein</KEYWORD2>
+ <KEYWORD2>\stelleumbruchein</KEYWORD2>
+ <KEYWORD2>\stelleumrahmtein</KEYWORD2>
+ <KEYWORD2>\stelleumrahmtetexteein</KEYWORD2>
+ <KEYWORD2>\stelleuntenein</KEYWORD2>
+ <KEYWORD2>\stelleunterseitennummerein</KEYWORD2>
+ <KEYWORD2>\stelleunterstreichenein</KEYWORD2>
+ <KEYWORD2>\stelleurlein</KEYWORD2>
+ <KEYWORD2>\stelleversalienein</KEYWORD2>
+ <KEYWORD2>\stelleversionein</KEYWORD2>
+ <KEYWORD2>\stellezeilenabstandein</KEYWORD2>
+ <KEYWORD2>\stellezeilenein</KEYWORD2>
+ <KEYWORD2>\stellezeilennumerierungein</KEYWORD2>
+ <KEYWORD2>\stellezitierenein</KEYWORD2>
+ <KEYWORD2>\stellezusammengestelltelisteein</KEYWORD2>
+ <KEYWORD2>\stellezwischenraumein</KEYWORD2>
+ <KEYWORD2>\stop</KEYWORD2>
+ <KEYWORD2>\stopfarbe</KEYWORD2>
+ <KEYWORD2>\stopgeg</KEYWORD2>
+ <KEYWORD2>\stophintergrund</KEYWORD2>
+ <KEYWORD2>\stopinteraktionsmenue</KEYWORD2>
+ <KEYWORD2>\stopkleinerdurchschuss</KEYWORD2>
+ <KEYWORD2>\stopkommentar</KEYWORD2>
+ <KEYWORD2>\stopkomponente</KEYWORD2>
+ <KEYWORD2>\stopmarginallinie</KEYWORD2>
+ <KEYWORD2>\stopprojekt</KEYWORD2>
+ <KEYWORD2>\stoptextlinie</KEYWORD2>
+ <KEYWORD2>\stopumgebung</KEYWORD2>
+ <KEYWORD2>\stopversion</KEYWORD2>
+ <KEYWORD2>\stopzitat</KEYWORD2>
+ <KEYWORD2>\switchtorawfont</KEYWORD2>
+ <KEYWORD2>\sym</KEYWORD2>
+ <KEYWORD2>\symbol</KEYWORD2>
+ <KEYWORD2>\synchronisationsbalken</KEYWORD2>
+ <KEYWORD2>\synchronisieren</KEYWORD2>
+ <KEYWORD2>\tab</KEYWORD2>
+ <KEYWORD2>\teilegleitobjekt</KEYWORD2>
+ <KEYWORD2>\tex</KEYWORD2>
+ <KEYWORD2>\textlinie</KEYWORD2>
+ <KEYWORD2>\textreferenz</KEYWORD2>
+ <KEYWORD2>\textvariable</KEYWORD2>
+ <KEYWORD2>\tief</KEYWORD2>
+ <KEYWORD2>\tiho</KEYWORD2>
+ <KEYWORD2>\tip</KEYWORD2>
+ <KEYWORD2>\tippedatei</KEYWORD2>
+ <KEYWORD2>\tippen</KEYWORD2>
+ <KEYWORD2>\tippepuffer</KEYWORD2>
+ <KEYWORD2>\tooltip</KEYWORD2>
+ <KEYWORD2>\ueber</KEYWORD2>
+ <KEYWORD2>\ueberschrifttext</KEYWORD2>
+ <KEYWORD2>\uebersetzten</KEYWORD2>
+ <KEYWORD2>\ueberstreichen</KEYWORD2>
+ <KEYWORD2>\ueberstrichen</KEYWORD2>
+ <KEYWORD2>\umrahmt</KEYWORD2>
+ <KEYWORD2>\unterstreichen</KEYWORD2>
+ <KEYWORD2>\unterstrichen</KEYWORD2>
+ <KEYWORD2>\verbergebloecke</KEYWORD2>
+ <KEYWORD2>\vergleichefarbengruppe</KEYWORD2>
+ <KEYWORD2>\vergleichepalette</KEYWORD2>
+ <KEYWORD2>\verknuepfebeschriftung</KEYWORD2>
+ <KEYWORD2>\verknuepfedokument</KEYWORD2>
+ <KEYWORD2>\verknuepfregister</KEYWORD2>
+ <KEYWORD2>\version</KEYWORD2>
+ <KEYWORD2>\verweis</KEYWORD2>
+ <KEYWORD2>\verweisdatum</KEYWORD2>
+ <KEYWORD2>\verwendeURL</KEYWORD2>
+ <KEYWORD2>\verwendebefehl</KEYWORD2>
+ <KEYWORD2>\verwendebloecke</KEYWORD2>
+ <KEYWORD2>\verwendeexteresdokument</KEYWORD2>
+ <KEYWORD2>\verwendeexterneabbildung</KEYWORD2>
+ <KEYWORD2>\verwendeexternedatei</KEYWORD2>
+ <KEYWORD2>\verwendeexternedateien</KEYWORD2>
+ <KEYWORD2>\verwendeexternestonstueck</KEYWORD2>
+ <KEYWORD2>\verwendemodul</KEYWORD2>
+ <KEYWORD2>\verwendereferenzen</KEYWORD2>
+ <KEYWORD2>\verwendesymbole</KEYWORD2>
+ <KEYWORD2>\vl</KEYWORD2>
+ <KEYWORD2>\von</KEYWORD2>
+ <KEYWORD2>\waehlebloeckeaus</KEYWORD2>
+ <KEYWORD2>\waehlepapieraus</KEYWORD2>
+ <KEYWORD2>\waehleversionaus</KEYWORD2>
+ <KEYWORD2>\wechselezumfliesstext</KEYWORD2>
+ <KEYWORD2>\wochentag</KEYWORD2>
+ <KEYWORD2>\wortrechts</KEYWORD2>
+ <KEYWORD2>\zeigedruck</KEYWORD2>
+ <KEYWORD2>\zeigeeinstellungen</KEYWORD2>
+ <KEYWORD2>\zeigeexterneabbildungen</KEYWORD2>
+ <KEYWORD2>\zeigefarbe</KEYWORD2>
+ <KEYWORD2>\zeigefarbengruppe</KEYWORD2>
+ <KEYWORD2>\zeigefelder</KEYWORD2>
+ <KEYWORD2>\zeigefliesstext</KEYWORD2>
+ <KEYWORD2>\zeigefliesstextumgebung</KEYWORD2>
+ <KEYWORD2>\zeigegitter</KEYWORD2>
+ <KEYWORD2>\zeigelayout</KEYWORD2>
+ <KEYWORD2>\zeigepalette</KEYWORD2>
+ <KEYWORD2>\zeigerahmen</KEYWORD2>
+ <KEYWORD2>\zeigestruts</KEYWORD2>
+ <KEYWORD2>\zeigeumbruch</KEYWORD2>
+ <KEYWORD2>\zentriert</KEYWORD2>
+ <KEYWORD2>\ziffern</KEYWORD2>
+ <KEYWORD2>\zitat</KEYWORD2>
+ <KEYWORD2>\zitieren</KEYWORD2>
+ <KEYWORD2>\zu</KEYWORD2>
+ <KEYWORD2>\zurbox</KEYWORD2>
+ <KEYWORD2>\zusatz</KEYWORD2>
+ <KEYWORD2>\zwischenraum</KEYWORD2>
+ </KEYWORDS>
+ </RULES>
+</MODE>
diff --git a/context/data/context-jedit-en.xml b/context/data/context-jedit-en.xml
new file mode 100644
index 000000000..0593b7644
--- /dev/null
+++ b/context/data/context-jedit-en.xml
@@ -0,0 +1,458 @@
+<?xml version='1.0'?>
+
+<!DOCTYPE MODE SYSTEM 'xmode.dtd'>
+
+<MODE>
+ <RULES>
+ <KEYWORDS>
+ <KEYWORD2>\Character</KEYWORD2>
+ <KEYWORD2>\Characters</KEYWORD2>
+ <KEYWORD2>\MONTH</KEYWORD2>
+ <KEYWORD2>\Romannumerals</KEYWORD2>
+ <KEYWORD2>\WEEKDAY</KEYWORD2>
+ <KEYWORD2>\WORD</KEYWORD2>
+ <KEYWORD2>\WORDS</KEYWORD2>
+ <KEYWORD2>\Word</KEYWORD2>
+ <KEYWORD2>\Words</KEYWORD2>
+ <KEYWORD2>\about</KEYWORD2>
+ <KEYWORD2>\adaptlayout</KEYWORD2>
+ <KEYWORD2>\adding</KEYWORD2>
+ <KEYWORD2>\arg</KEYWORD2>
+ <KEYWORD2>\at</KEYWORD2>
+ <KEYWORD2>\atpage</KEYWORD2>
+ <KEYWORD2>\background</KEYWORD2>
+ <KEYWORD2>\blackrule</KEYWORD2>
+ <KEYWORD2>\blackrules</KEYWORD2>
+ <KEYWORD2>\blank</KEYWORD2>
+ <KEYWORD2>\bookmark</KEYWORD2>
+ <KEYWORD2>\but</KEYWORD2>
+ <KEYWORD2>\button</KEYWORD2>
+ <KEYWORD2>\bypassblocks</KEYWORD2>
+ <KEYWORD2>\character</KEYWORD2>
+ <KEYWORD2>\characters</KEYWORD2>
+ <KEYWORD2>\chem</KEYWORD2>
+ <KEYWORD2>\clip</KEYWORD2>
+ <KEYWORD2>\clonefield</KEYWORD2>
+ <KEYWORD2>\color</KEYWORD2>
+ <KEYWORD2>\column</KEYWORD2>
+ <KEYWORD2>\comment</KEYWORD2>
+ <KEYWORD2>\comparecolorgroup</KEYWORD2>
+ <KEYWORD2>\comparepalet</KEYWORD2>
+ <KEYWORD2>\completeregister</KEYWORD2>
+ <KEYWORD2>\convertnumber</KEYWORD2>
+ <KEYWORD2>\copyfield</KEYWORD2>
+ <KEYWORD2>\correctwhitespace</KEYWORD2>
+ <KEYWORD2>\coupledocument</KEYWORD2>
+ <KEYWORD2>\couplemarking</KEYWORD2>
+ <KEYWORD2>\couplepage</KEYWORD2>
+ <KEYWORD2>\couplepaper</KEYWORD2>
+ <KEYWORD2>\coupleregister</KEYWORD2>
+ <KEYWORD2>\crlf</KEYWORD2>
+ <KEYWORD2>\currentdate</KEYWORD2>
+ <KEYWORD2>\currentheadnumber</KEYWORD2>
+ <KEYWORD2>\date</KEYWORD2>
+ <KEYWORD2>\decouplemarking</KEYWORD2>
+ <KEYWORD2>\define</KEYWORD2>
+ <KEYWORD2>\defineblank</KEYWORD2>
+ <KEYWORD2>\defineblock</KEYWORD2>
+ <KEYWORD2>\definebodyfont</KEYWORD2>
+ <KEYWORD2>\definebodyfontenvironment</KEYWORD2>
+ <KEYWORD2>\definebuffer</KEYWORD2>
+ <KEYWORD2>\definecolor</KEYWORD2>
+ <KEYWORD2>\definecolorgroup</KEYWORD2>
+ <KEYWORD2>\definecombinedlist</KEYWORD2>
+ <KEYWORD2>\defineconversion</KEYWORD2>
+ <KEYWORD2>\definedescription</KEYWORD2>
+ <KEYWORD2>\defineenumeration</KEYWORD2>
+ <KEYWORD2>\definefield</KEYWORD2>
+ <KEYWORD2>\definefieldstack</KEYWORD2>
+ <KEYWORD2>\definefiguresymbol</KEYWORD2>
+ <KEYWORD2>\definefloat</KEYWORD2>
+ <KEYWORD2>\definefont</KEYWORD2>
+ <KEYWORD2>\defineframed</KEYWORD2>
+ <KEYWORD2>\defineframedtext</KEYWORD2>
+ <KEYWORD2>\definehead</KEYWORD2>
+ <KEYWORD2>\defineindenting</KEYWORD2>
+ <KEYWORD2>\defineinteractionmenu</KEYWORD2>
+ <KEYWORD2>\definelabel</KEYWORD2>
+ <KEYWORD2>\definelist</KEYWORD2>
+ <KEYWORD2>\definelogo</KEYWORD2>
+ <KEYWORD2>\definemakeup</KEYWORD2>
+ <KEYWORD2>\definemarking</KEYWORD2>
+ <KEYWORD2>\defineoutput</KEYWORD2>
+ <KEYWORD2>\defineoverlay</KEYWORD2>
+ <KEYWORD2>\definepalet</KEYWORD2>
+ <KEYWORD2>\definepapersize</KEYWORD2>
+ <KEYWORD2>\defineparagraphs</KEYWORD2>
+ <KEYWORD2>\defineprofile</KEYWORD2>
+ <KEYWORD2>\defineprogram</KEYWORD2>
+ <KEYWORD2>\definerawfont</KEYWORD2>
+ <KEYWORD2>\definereference</KEYWORD2>
+ <KEYWORD2>\definereferenceformat</KEYWORD2>
+ <KEYWORD2>\definereferencelist</KEYWORD2>
+ <KEYWORD2>\defineregister</KEYWORD2>
+ <KEYWORD2>\definerule</KEYWORD2>
+ <KEYWORD2>\definesection</KEYWORD2>
+ <KEYWORD2>\definesectionblock</KEYWORD2>
+ <KEYWORD2>\definesorting</KEYWORD2>
+ <KEYWORD2>\definestartstop</KEYWORD2>
+ <KEYWORD2>\definesubfield</KEYWORD2>
+ <KEYWORD2>\definesymbol</KEYWORD2>
+ <KEYWORD2>\definesynonyms</KEYWORD2>
+ <KEYWORD2>\definetabletemplate</KEYWORD2>
+ <KEYWORD2>\definetabulate</KEYWORD2>
+ <KEYWORD2>\definetext</KEYWORD2>
+ <KEYWORD2>\definetextposition</KEYWORD2>
+ <KEYWORD2>\definetextvariable</KEYWORD2>
+ <KEYWORD2>\definetype</KEYWORD2>
+ <KEYWORD2>\definetyping</KEYWORD2>
+ <KEYWORD2>\defineversion</KEYWORD2>
+ <KEYWORD2>\determineheadnumber</KEYWORD2>
+ <KEYWORD2>\determinelistcharacteristics</KEYWORD2>
+ <KEYWORD2>\disableinteractionmenu</KEYWORD2>
+ <KEYWORD2>\donttest</KEYWORD2>
+ <KEYWORD2>\emptylines</KEYWORD2>
+ <KEYWORD2>\externalfigure</KEYWORD2>
+ <KEYWORD2>\field</KEYWORD2>
+ <KEYWORD2>\fieldstack</KEYWORD2>
+ <KEYWORD2>\fillinfield</KEYWORD2>
+ <KEYWORD2>\fillinline</KEYWORD2>
+ <KEYWORD2>\fillinrules</KEYWORD2>
+ <KEYWORD2>\fillintext</KEYWORD2>
+ <KEYWORD2>\fitfield</KEYWORD2>
+ <KEYWORD2>\fixedspaces</KEYWORD2>
+ <KEYWORD2>\followprofile</KEYWORD2>
+ <KEYWORD2>\followprofileversion</KEYWORD2>
+ <KEYWORD2>\followversion</KEYWORD2>
+ <KEYWORD2>\footnote</KEYWORD2>
+ <KEYWORD2>\footnotetext</KEYWORD2>
+ <KEYWORD2>\forceblocks</KEYWORD2>
+ <KEYWORD2>\fraction</KEYWORD2>
+ <KEYWORD2>\framed</KEYWORD2>
+ <KEYWORD2>\from</KEYWORD2>
+ <KEYWORD2>\getbuffer</KEYWORD2>
+ <KEYWORD2>\getmarking</KEYWORD2>
+ <KEYWORD2>\godown</KEYWORD2>
+ <KEYWORD2>\goto</KEYWORD2>
+ <KEYWORD2>\gotobox</KEYWORD2>
+ <KEYWORD2>\graycolor</KEYWORD2>
+ <KEYWORD2>\grid</KEYWORD2>
+ <KEYWORD2>\hairline</KEYWORD2>
+ <KEYWORD2>\head</KEYWORD2>
+ <KEYWORD2>\headnumber</KEYWORD2>
+ <KEYWORD2>\headtext</KEYWORD2>
+ <KEYWORD2>\hideblocks</KEYWORD2>
+ <KEYWORD2>\high</KEYWORD2>
+ <KEYWORD2>\hl</KEYWORD2>
+ <KEYWORD2>\in</KEYWORD2>
+ <KEYWORD2>\indenting</KEYWORD2>
+ <KEYWORD2>\inframed</KEYWORD2>
+ <KEYWORD2>\ininner</KEYWORD2>
+ <KEYWORD2>\inleft</KEYWORD2>
+ <KEYWORD2>\inline</KEYWORD2>
+ <KEYWORD2>\inmargin</KEYWORD2>
+ <KEYWORD2>\inothermargin</KEYWORD2>
+ <KEYWORD2>\inouter</KEYWORD2>
+ <KEYWORD2>\inright</KEYWORD2>
+ <KEYWORD2>\installlanguage</KEYWORD2>
+ <KEYWORD2>\interactionbar</KEYWORD2>
+ <KEYWORD2>\interactionbuttons</KEYWORD2>
+ <KEYWORD2>\item</KEYWORD2>
+ <KEYWORD2>\items</KEYWORD2>
+ <KEYWORD2>\its</KEYWORD2>
+ <KEYWORD2>\keepblocks</KEYWORD2>
+ <KEYWORD2>\labels</KEYWORD2>
+ <KEYWORD2>\labeltext</KEYWORD2>
+ <KEYWORD2>\language</KEYWORD2>
+ <KEYWORD2>\leftaligned</KEYWORD2>
+ <KEYWORD2>\listsymbol</KEYWORD2>
+ <KEYWORD2>\logfields</KEYWORD2>
+ <KEYWORD2>\lohi</KEYWORD2>
+ <KEYWORD2>\low</KEYWORD2>
+ <KEYWORD2>\mainlanguage</KEYWORD2>
+ <KEYWORD2>\mar</KEYWORD2>
+ <KEYWORD2>\marginrule</KEYWORD2>
+ <KEYWORD2>\margintext</KEYWORD2>
+ <KEYWORD2>\marking</KEYWORD2>
+ <KEYWORD2>\markversion</KEYWORD2>
+ <KEYWORD2>\mathematics</KEYWORD2>
+ <KEYWORD2>\midaligned</KEYWORD2>
+ <KEYWORD2>\mirror</KEYWORD2>
+ <KEYWORD2>\month</KEYWORD2>
+ <KEYWORD2>\moveongrid</KEYWORD2>
+ <KEYWORD2>\noheaderandfooterlines</KEYWORD2>
+ <KEYWORD2>\noindenting</KEYWORD2>
+ <KEYWORD2>\nolist</KEYWORD2>
+ <KEYWORD2>\nomarking</KEYWORD2>
+ <KEYWORD2>\nomoreblocks</KEYWORD2>
+ <KEYWORD2>\nomorefiles</KEYWORD2>
+ <KEYWORD2>\nop</KEYWORD2>
+ <KEYWORD2>\nospace</KEYWORD2>
+ <KEYWORD2>\note</KEYWORD2>
+ <KEYWORD2>\notopandbottomlines</KEYWORD2>
+ <KEYWORD2>\nowhitespace</KEYWORD2>
+ <KEYWORD2>\numbers</KEYWORD2>
+ <KEYWORD2>\overbar</KEYWORD2>
+ <KEYWORD2>\overbars</KEYWORD2>
+ <KEYWORD2>\overstrike</KEYWORD2>
+ <KEYWORD2>\overstrikes</KEYWORD2>
+ <KEYWORD2>\packed</KEYWORD2>
+ <KEYWORD2>\page</KEYWORD2>
+ <KEYWORD2>\pagereference</KEYWORD2>
+ <KEYWORD2>\pagetype</KEYWORD2>
+ <KEYWORD2>\periods</KEYWORD2>
+ <KEYWORD2>\placebookmarks</KEYWORD2>
+ <KEYWORD2>\placecombinedlist</KEYWORD2>
+ <KEYWORD2>\placefloat</KEYWORD2>
+ <KEYWORD2>\placefootnotes</KEYWORD2>
+ <KEYWORD2>\placeformula</KEYWORD2>
+ <KEYWORD2>\placelegend</KEYWORD2>
+ <KEYWORD2>\placelist</KEYWORD2>
+ <KEYWORD2>\placelocalfootnotes</KEYWORD2>
+ <KEYWORD2>\placelogos</KEYWORD2>
+ <KEYWORD2>\placeongrid</KEYWORD2>
+ <KEYWORD2>\placeontopofeachother</KEYWORD2>
+ <KEYWORD2>\placereferencelist</KEYWORD2>
+ <KEYWORD2>\placeregister</KEYWORD2>
+ <KEYWORD2>\placerule</KEYWORD2>
+ <KEYWORD2>\placesidebyside</KEYWORD2>
+ <KEYWORD2>\placesubformula</KEYWORD2>
+ <KEYWORD2>\placetextvariable</KEYWORD2>
+ <KEYWORD2>\position</KEYWORD2>
+ <KEYWORD2>\positiontext</KEYWORD2>
+ <KEYWORD2>\processblocks</KEYWORD2>
+ <KEYWORD2>\processpage</KEYWORD2>
+ <KEYWORD2>\program</KEYWORD2>
+ <KEYWORD2>\publication</KEYWORD2>
+ <KEYWORD2>\quotation</KEYWORD2>
+ <KEYWORD2>\quote</KEYWORD2>
+ <KEYWORD2>\ran</KEYWORD2>
+ <KEYWORD2>\ref</KEYWORD2>
+ <KEYWORD2>\reference</KEYWORD2>
+ <KEYWORD2>\referral</KEYWORD2>
+ <KEYWORD2>\referraldate</KEYWORD2>
+ <KEYWORD2>\reset</KEYWORD2>
+ <KEYWORD2>\resetmarking</KEYWORD2>
+ <KEYWORD2>\rightaligned</KEYWORD2>
+ <KEYWORD2>\romannumerals</KEYWORD2>
+ <KEYWORD2>\rotate</KEYWORD2>
+ <KEYWORD2>\scale</KEYWORD2>
+ <KEYWORD2>\screen</KEYWORD2>
+ <KEYWORD2>\selectblocks</KEYWORD2>
+ <KEYWORD2>\selectpaper</KEYWORD2>
+ <KEYWORD2>\selectversion</KEYWORD2>
+ <KEYWORD2>\settextvariable</KEYWORD2>
+ <KEYWORD2>\setupalign</KEYWORD2>
+ <KEYWORD2>\setuparranging</KEYWORD2>
+ <KEYWORD2>\setupbackground</KEYWORD2>
+ <KEYWORD2>\setupbackgrounds</KEYWORD2>
+ <KEYWORD2>\setupblackrules</KEYWORD2>
+ <KEYWORD2>\setupblank</KEYWORD2>
+ <KEYWORD2>\setupblock</KEYWORD2>
+ <KEYWORD2>\setupbodyfont</KEYWORD2>
+ <KEYWORD2>\setupbodyfontenvironment</KEYWORD2>
+ <KEYWORD2>\setupbottom</KEYWORD2>
+ <KEYWORD2>\setupbottomtexts</KEYWORD2>
+ <KEYWORD2>\setupbuffer</KEYWORD2>
+ <KEYWORD2>\setupbuttons</KEYWORD2>
+ <KEYWORD2>\setupcapitals</KEYWORD2>
+ <KEYWORD2>\setupcaption</KEYWORD2>
+ <KEYWORD2>\setupcaptions</KEYWORD2>
+ <KEYWORD2>\setupclipping</KEYWORD2>
+ <KEYWORD2>\setupcolor</KEYWORD2>
+ <KEYWORD2>\setupcolors</KEYWORD2>
+ <KEYWORD2>\setupcolumns</KEYWORD2>
+ <KEYWORD2>\setupcombinations</KEYWORD2>
+ <KEYWORD2>\setupcombinedlist</KEYWORD2>
+ <KEYWORD2>\setupcomment</KEYWORD2>
+ <KEYWORD2>\setupdescriptions</KEYWORD2>
+ <KEYWORD2>\setupenumerations</KEYWORD2>
+ <KEYWORD2>\setupexternalfigures</KEYWORD2>
+ <KEYWORD2>\setupfield</KEYWORD2>
+ <KEYWORD2>\setupfields</KEYWORD2>
+ <KEYWORD2>\setupfillinlines</KEYWORD2>
+ <KEYWORD2>\setupfillinrules</KEYWORD2>
+ <KEYWORD2>\setupfloat</KEYWORD2>
+ <KEYWORD2>\setupfloats</KEYWORD2>
+ <KEYWORD2>\setupfloatsplitting</KEYWORD2>
+ <KEYWORD2>\setupfooter</KEYWORD2>
+ <KEYWORD2>\setupfootertexts</KEYWORD2>
+ <KEYWORD2>\setupfootnotedefinition</KEYWORD2>
+ <KEYWORD2>\setupfootnotes</KEYWORD2>
+ <KEYWORD2>\setupforms</KEYWORD2>
+ <KEYWORD2>\setupframed</KEYWORD2>
+ <KEYWORD2>\setupframedtexts</KEYWORD2>
+ <KEYWORD2>\setuphead</KEYWORD2>
+ <KEYWORD2>\setupheader</KEYWORD2>
+ <KEYWORD2>\setupheadertexts</KEYWORD2>
+ <KEYWORD2>\setupheadnumber</KEYWORD2>
+ <KEYWORD2>\setupheads</KEYWORD2>
+ <KEYWORD2>\setupheadtext</KEYWORD2>
+ <KEYWORD2>\setuphyphenmark</KEYWORD2>
+ <KEYWORD2>\setupindentations</KEYWORD2>
+ <KEYWORD2>\setupindenting</KEYWORD2>
+ <KEYWORD2>\setupinmargin</KEYWORD2>
+ <KEYWORD2>\setupinteraction</KEYWORD2>
+ <KEYWORD2>\setupinteractionbar</KEYWORD2>
+ <KEYWORD2>\setupinteractionscreen</KEYWORD2>
+ <KEYWORD2>\setupinterlinespace</KEYWORD2>
+ <KEYWORD2>\setupitemgroup</KEYWORD2>
+ <KEYWORD2>\setupitems</KEYWORD2>
+ <KEYWORD2>\setuplabeltext</KEYWORD2>
+ <KEYWORD2>\setuplanguage</KEYWORD2>
+ <KEYWORD2>\setuplayout</KEYWORD2>
+ <KEYWORD2>\setuplegend</KEYWORD2>
+ <KEYWORD2>\setuplinenumbering</KEYWORD2>
+ <KEYWORD2>\setuplines</KEYWORD2>
+ <KEYWORD2>\setuplinewidth</KEYWORD2>
+ <KEYWORD2>\setuplist</KEYWORD2>
+ <KEYWORD2>\setupmakeup</KEYWORD2>
+ <KEYWORD2>\setupmarginblocks</KEYWORD2>
+ <KEYWORD2>\setupmarginrules</KEYWORD2>
+ <KEYWORD2>\setupmarking</KEYWORD2>
+ <KEYWORD2>\setupnarrower</KEYWORD2>
+ <KEYWORD2>\setupnumbering</KEYWORD2>
+ <KEYWORD2>\setupoppositeplacing</KEYWORD2>
+ <KEYWORD2>\setupoutput</KEYWORD2>
+ <KEYWORD2>\setuppagenumber</KEYWORD2>
+ <KEYWORD2>\setuppagenumbering</KEYWORD2>
+ <KEYWORD2>\setuppagetransitions</KEYWORD2>
+ <KEYWORD2>\setuppalet</KEYWORD2>
+ <KEYWORD2>\setuppaper</KEYWORD2>
+ <KEYWORD2>\setuppapersize</KEYWORD2>
+ <KEYWORD2>\setupparagraphnumbering</KEYWORD2>
+ <KEYWORD2>\setupparagraphs</KEYWORD2>
+ <KEYWORD2>\setuppositioning</KEYWORD2>
+ <KEYWORD2>\setupprofiles</KEYWORD2>
+ <KEYWORD2>\setupprograms</KEYWORD2>
+ <KEYWORD2>\setuppublications</KEYWORD2>
+ <KEYWORD2>\setupquote</KEYWORD2>
+ <KEYWORD2>\setupreferencelist</KEYWORD2>
+ <KEYWORD2>\setupreferencing</KEYWORD2>
+ <KEYWORD2>\setupregister</KEYWORD2>
+ <KEYWORD2>\setuprotate</KEYWORD2>
+ <KEYWORD2>\setuprule</KEYWORD2>
+ <KEYWORD2>\setupscreens</KEYWORD2>
+ <KEYWORD2>\setupsection</KEYWORD2>
+ <KEYWORD2>\setupsectionblock</KEYWORD2>
+ <KEYWORD2>\setupsorting</KEYWORD2>
+ <KEYWORD2>\setupspacing</KEYWORD2>
+ <KEYWORD2>\setupstrut</KEYWORD2>
+ <KEYWORD2>\setupsubpagenumber</KEYWORD2>
+ <KEYWORD2>\setupsymbolset</KEYWORD2>
+ <KEYWORD2>\setupsynchronization</KEYWORD2>
+ <KEYWORD2>\setupsynchronizationbar</KEYWORD2>
+ <KEYWORD2>\setupsynonyms</KEYWORD2>
+ <KEYWORD2>\setupsystem</KEYWORD2>
+ <KEYWORD2>\setuptab</KEYWORD2>
+ <KEYWORD2>\setuptables</KEYWORD2>
+ <KEYWORD2>\setuptabulate</KEYWORD2>
+ <KEYWORD2>\setuptext</KEYWORD2>
+ <KEYWORD2>\setuptextposition</KEYWORD2>
+ <KEYWORD2>\setuptextrules</KEYWORD2>
+ <KEYWORD2>\setuptexttexts</KEYWORD2>
+ <KEYWORD2>\setuptextvariable</KEYWORD2>
+ <KEYWORD2>\setupthinrules</KEYWORD2>
+ <KEYWORD2>\setuptolerance</KEYWORD2>
+ <KEYWORD2>\setuptop</KEYWORD2>
+ <KEYWORD2>\setuptoptexts</KEYWORD2>
+ <KEYWORD2>\setuptype</KEYWORD2>
+ <KEYWORD2>\setuptyping</KEYWORD2>
+ <KEYWORD2>\setupunderbar</KEYWORD2>
+ <KEYWORD2>\setupurl</KEYWORD2>
+ <KEYWORD2>\setupversions</KEYWORD2>
+ <KEYWORD2>\setupwhitespace</KEYWORD2>
+ <KEYWORD2>\showbodyfont</KEYWORD2>
+ <KEYWORD2>\showbodyfontenvironment</KEYWORD2>
+ <KEYWORD2>\showcolor</KEYWORD2>
+ <KEYWORD2>\showcolorgroup</KEYWORD2>
+ <KEYWORD2>\showexternalfigures</KEYWORD2>
+ <KEYWORD2>\showfields</KEYWORD2>
+ <KEYWORD2>\showframe</KEYWORD2>
+ <KEYWORD2>\showgrid</KEYWORD2>
+ <KEYWORD2>\showlayout</KEYWORD2>
+ <KEYWORD2>\showmakeup</KEYWORD2>
+ <KEYWORD2>\showpalet</KEYWORD2>
+ <KEYWORD2>\showprint</KEYWORD2>
+ <KEYWORD2>\showsetups</KEYWORD2>
+ <KEYWORD2>\showstruts</KEYWORD2>
+ <KEYWORD2>\showsymbolset</KEYWORD2>
+ <KEYWORD2>\someline</KEYWORD2>
+ <KEYWORD2>\somewhere</KEYWORD2>
+ <KEYWORD2>\space</KEYWORD2>
+ <KEYWORD2>\splitfloat</KEYWORD2>
+ <KEYWORD2>\start</KEYWORD2>
+ <KEYWORD2>\startbackground</KEYWORD2>
+ <KEYWORD2>\startcolor</KEYWORD2>
+ <KEYWORD2>\startcomment</KEYWORD2>
+ <KEYWORD2>\startcomponent</KEYWORD2>
+ <KEYWORD2>\startenvironment</KEYWORD2>
+ <KEYWORD2>\startfact</KEYWORD2>
+ <KEYWORD2>\startinteractionmenu</KEYWORD2>
+ <KEYWORD2>\startmarginrule</KEYWORD2>
+ <KEYWORD2>\startpacked</KEYWORD2>
+ <KEYWORD2>\startproject</KEYWORD2>
+ <KEYWORD2>\startquotation</KEYWORD2>
+ <KEYWORD2>\starttextrule</KEYWORD2>
+ <KEYWORD2>\startversion</KEYWORD2>
+ <KEYWORD2>\stop</KEYWORD2>
+ <KEYWORD2>\stopbackground</KEYWORD2>
+ <KEYWORD2>\stopcolor</KEYWORD2>
+ <KEYWORD2>\stopcomment</KEYWORD2>
+ <KEYWORD2>\stopcomponent</KEYWORD2>
+ <KEYWORD2>\stopenvironment</KEYWORD2>
+ <KEYWORD2>\stopfact</KEYWORD2>
+ <KEYWORD2>\stopinteractionmenu</KEYWORD2>
+ <KEYWORD2>\stopmarginrule</KEYWORD2>
+ <KEYWORD2>\stoppacked</KEYWORD2>
+ <KEYWORD2>\stopproject</KEYWORD2>
+ <KEYWORD2>\stopquotation</KEYWORD2>
+ <KEYWORD2>\stoptextrule</KEYWORD2>
+ <KEYWORD2>\stopversion</KEYWORD2>
+ <KEYWORD2>\stretched</KEYWORD2>
+ <KEYWORD2>\switchtobodyfont</KEYWORD2>
+ <KEYWORD2>\switchtorawfont</KEYWORD2>
+ <KEYWORD2>\sym</KEYWORD2>
+ <KEYWORD2>\symbol</KEYWORD2>
+ <KEYWORD2>\synchronizationbar</KEYWORD2>
+ <KEYWORD2>\synchronize</KEYWORD2>
+ <KEYWORD2>\tab</KEYWORD2>
+ <KEYWORD2>\tex</KEYWORD2>
+ <KEYWORD2>\textreference</KEYWORD2>
+ <KEYWORD2>\textrule</KEYWORD2>
+ <KEYWORD2>\textvariable</KEYWORD2>
+ <KEYWORD2>\thinrule</KEYWORD2>
+ <KEYWORD2>\thinrules</KEYWORD2>
+ <KEYWORD2>\tooltip</KEYWORD2>
+ <KEYWORD2>\translate</KEYWORD2>
+ <KEYWORD2>\typ</KEYWORD2>
+ <KEYWORD2>\type</KEYWORD2>
+ <KEYWORD2>\typebuffer</KEYWORD2>
+ <KEYWORD2>\typefile</KEYWORD2>
+ <KEYWORD2>\underbar</KEYWORD2>
+ <KEYWORD2>\underbars</KEYWORD2>
+ <KEYWORD2>\useURL</KEYWORD2>
+ <KEYWORD2>\useblocks</KEYWORD2>
+ <KEYWORD2>\usecommands</KEYWORD2>
+ <KEYWORD2>\useencoding</KEYWORD2>
+ <KEYWORD2>\useexternaldocument</KEYWORD2>
+ <KEYWORD2>\useexternalfigure</KEYWORD2>
+ <KEYWORD2>\useexternalfile</KEYWORD2>
+ <KEYWORD2>\useexternalfiles</KEYWORD2>
+ <KEYWORD2>\useexternalsoundtrack</KEYWORD2>
+ <KEYWORD2>\usemodule</KEYWORD2>
+ <KEYWORD2>\usereferences</KEYWORD2>
+ <KEYWORD2>\usespecials</KEYWORD2>
+ <KEYWORD2>\usesymbols</KEYWORD2>
+ <KEYWORD2>\version</KEYWORD2>
+ <KEYWORD2>\vl</KEYWORD2>
+ <KEYWORD2>\weekday</KEYWORD2>
+ <KEYWORD2>\whitespace</KEYWORD2>
+ <KEYWORD2>\wordright</KEYWORD2>
+ <KEYWORD2>\writebetweenlist</KEYWORD2>
+ <KEYWORD2>\writetolist</KEYWORD2>
+ <KEYWORD2>\writetoreferencelist</KEYWORD2>
+ <KEYWORD2>\writetoregister</KEYWORD2>
+ </KEYWORDS>
+ </RULES>
+</MODE>
diff --git a/context/data/context-jedit-it.xml b/context/data/context-jedit-it.xml
new file mode 100644
index 000000000..d66a4b35e
--- /dev/null
+++ b/context/data/context-jedit-it.xml
@@ -0,0 +1,458 @@
+<?xml version='1.0'?>
+
+<!DOCTYPE MODE SYSTEM 'xmode.dtd'>
+
+<MODE>
+ <RULES>
+ <KEYWORDS>
+ <KEYWORD2>\GIORNOSETTIMANA</KEYWORD2>
+ <KEYWORD2>\Lettera</KEYWORD2>
+ <KEYWORD2>\Lettere</KEYWORD2>
+ <KEYWORD2>\MESE</KEYWORD2>
+ <KEYWORD2>\Numeriromani</KEYWORD2>
+ <KEYWORD2>\PAROLA</KEYWORD2>
+ <KEYWORD2>\PAROLE</KEYWORD2>
+ <KEYWORD2>\Parola</KEYWORD2>
+ <KEYWORD2>\Parole</KEYWORD2>
+ <KEYWORD2>\accoppiacarta</KEYWORD2>
+ <KEYWORD2>\accoppiadocumento</KEYWORD2>
+ <KEYWORD2>\accoppiamarcatura</KEYWORD2>
+ <KEYWORD2>\accoppiapagina</KEYWORD2>
+ <KEYWORD2>\accoppiaregistro</KEYWORD2>
+ <KEYWORD2>\adattacampo</KEYWORD2>
+ <KEYWORD2>\adattalayout</KEYWORD2>
+ <KEYWORD2>\adding</KEYWORD2>
+ <KEYWORD2>\al</KEYWORD2>
+ <KEYWORD2>\allineacentro</KEYWORD2>
+ <KEYWORD2>\allineadestra</KEYWORD2>
+ <KEYWORD2>\allineasinistra</KEYWORD2>
+ <KEYWORD2>\ap</KEYWORD2>
+ <KEYWORD2>\apagina</KEYWORD2>
+ <KEYWORD2>\arg</KEYWORD2>
+ <KEYWORD2>\barrainterazione</KEYWORD2>
+ <KEYWORD2>\barrasincronizzazione</KEYWORD2>
+ <KEYWORD2>\bastablocchi</KEYWORD2>
+ <KEYWORD2>\bastafile</KEYWORD2>
+ <KEYWORD2>\cambiaafontdeltesto</KEYWORD2>
+ <KEYWORD2>\campi</KEYWORD2>
+ <KEYWORD2>\camporiempimento</KEYWORD2>
+ <KEYWORD2>\capello</KEYWORD2>
+ <KEYWORD2>\chim</KEYWORD2>
+ <KEYWORD2>\circondato</KEYWORD2>
+ <KEYWORD2>\citazione</KEYWORD2>
+ <KEYWORD2>\clip</KEYWORD2>
+ <KEYWORD2>\clonacampo</KEYWORD2>
+ <KEYWORD2>\colonna</KEYWORD2>
+ <KEYWORD2>\colore</KEYWORD2>
+ <KEYWORD2>\coloregrigio</KEYWORD2>
+ <KEYWORD2>\commento</KEYWORD2>
+ <KEYWORD2>\completeregister</KEYWORD2>
+ <KEYWORD2>\confrontagruppocolori</KEYWORD2>
+ <KEYWORD2>\confrontatavolozza</KEYWORD2>
+ <KEYWORD2>\convertinumero</KEYWORD2>
+ <KEYWORD2>\copiacampo</KEYWORD2>
+ <KEYWORD2>\correggispaziobianco</KEYWORD2>
+ <KEYWORD2>\crlf</KEYWORD2>
+ <KEYWORD2>\da</KEYWORD2>
+ <KEYWORD2>\daqualcheparte</KEYWORD2>
+ <KEYWORD2>\data</KEYWORD2>
+ <KEYWORD2>\datadioggi</KEYWORD2>
+ <KEYWORD2>\datareferral</KEYWORD2>
+ <KEYWORD2>\definisci</KEYWORD2>
+ <KEYWORD2>\definisciambientefontdeltesto</KEYWORD2>
+ <KEYWORD2>\definisciblocco</KEYWORD2>
+ <KEYWORD2>\definiscibloccosezione</KEYWORD2>
+ <KEYWORD2>\definiscibuffer</KEYWORD2>
+ <KEYWORD2>\definiscicampo</KEYWORD2>
+ <KEYWORD2>\definiscicapoversi</KEYWORD2>
+ <KEYWORD2>\definiscicolore</KEYWORD2>
+ <KEYWORD2>\definisciconversione</KEYWORD2>
+ <KEYWORD2>\definiscidescrizione</KEYWORD2>
+ <KEYWORD2>\definiscidimensionicarta</KEYWORD2>
+ <KEYWORD2>\definiscielenco</KEYWORD2>
+ <KEYWORD2>\definiscielencocombinato</KEYWORD2>
+ <KEYWORD2>\definiscienumerazione</KEYWORD2>
+ <KEYWORD2>\definiscietichetta</KEYWORD2>
+ <KEYWORD2>\definiscifigurasimbolo</KEYWORD2>
+ <KEYWORD2>\definiscifont</KEYWORD2>
+ <KEYWORD2>\definiscifontdeltesto</KEYWORD2>
+ <KEYWORD2>\definiscifontgrezzo</KEYWORD2>
+ <KEYWORD2>\definisciformatoriferimento</KEYWORD2>
+ <KEYWORD2>\definiscigruppocolori</KEYWORD2>
+ <KEYWORD2>\definisciincorniciato</KEYWORD2>
+ <KEYWORD2>\definisciiniziatermina</KEYWORD2>
+ <KEYWORD2>\definiscilinea</KEYWORD2>
+ <KEYWORD2>\definiscilistariferimenti</KEYWORD2>
+ <KEYWORD2>\definiscilogo</KEYWORD2>
+ <KEYWORD2>\definiscimakeup</KEYWORD2>
+ <KEYWORD2>\definiscimarcatura</KEYWORD2>
+ <KEYWORD2>\definiscimenuinterazione</KEYWORD2>
+ <KEYWORD2>\definiscimodellotabella</KEYWORD2>
+ <KEYWORD2>\definiscioggettomobile</KEYWORD2>
+ <KEYWORD2>\definisciordinamento</KEYWORD2>
+ <KEYWORD2>\definiscioutput</KEYWORD2>
+ <KEYWORD2>\definisciposizionetesto</KEYWORD2>
+ <KEYWORD2>\definisciprofilo</KEYWORD2>
+ <KEYWORD2>\definisciprogramma</KEYWORD2>
+ <KEYWORD2>\definisciregistro</KEYWORD2>
+ <KEYWORD2>\definiscirientro</KEYWORD2>
+ <KEYWORD2>\definisciriferimento</KEYWORD2>
+ <KEYWORD2>\definiscirigovuoto</KEYWORD2>
+ <KEYWORD2>\definiscisezione</KEYWORD2>
+ <KEYWORD2>\definiscisimbolo</KEYWORD2>
+ <KEYWORD2>\definiscisinonimi</KEYWORD2>
+ <KEYWORD2>\definiscisottocampo</KEYWORD2>
+ <KEYWORD2>\definiscisovrapposizione</KEYWORD2>
+ <KEYWORD2>\definiscistackcampi</KEYWORD2>
+ <KEYWORD2>\definiscitabulato</KEYWORD2>
+ <KEYWORD2>\definiscitavolozza</KEYWORD2>
+ <KEYWORD2>\definiscitesta</KEYWORD2>
+ <KEYWORD2>\definiscitesto</KEYWORD2>
+ <KEYWORD2>\definiscitestoincorniciato</KEYWORD2>
+ <KEYWORD2>\definiscitype</KEYWORD2>
+ <KEYWORD2>\definiscityping</KEYWORD2>
+ <KEYWORD2>\definiscivariabiletesto</KEYWORD2>
+ <KEYWORD2>\definisciversion</KEYWORD2>
+ <KEYWORD2>\determinacarattersticheelenco</KEYWORD2>
+ <KEYWORD2>\determinanumerotesta</KEYWORD2>
+ <KEYWORD2>\disabilitamenuinterazione</KEYWORD2>
+ <KEYWORD2>\el</KEYWORD2>
+ <KEYWORD2>\elaborablocchi</KEYWORD2>
+ <KEYWORD2>\elaborapagina</KEYWORD2>
+ <KEYWORD2>\elementi</KEYWORD2>
+ <KEYWORD2>\elemento</KEYWORD2>
+ <KEYWORD2>\emptylines</KEYWORD2>
+ <KEYWORD2>\etichette</KEYWORD2>
+ <KEYWORD2>\figuraesterna</KEYWORD2>
+ <KEYWORD2>\fondo</KEYWORD2>
+ <KEYWORD2>\forzablocchi</KEYWORD2>
+ <KEYWORD2>\frazione</KEYWORD2>
+ <KEYWORD2>\giornosettimana</KEYWORD2>
+ <KEYWORD2>\griglia</KEYWORD2>
+ <KEYWORD2>\hl</KEYWORD2>
+ <KEYWORD2>\impaccato</KEYWORD2>
+ <KEYWORD2>\impostaallineamento</KEYWORD2>
+ <KEYWORD2>\impostaambientefontdeltesto</KEYWORD2>
+ <KEYWORD2>\impostaampiezzariga</KEYWORD2>
+ <KEYWORD2>\impostabarrainterazione</KEYWORD2>
+ <KEYWORD2>\impostabarrasincronizzazione</KEYWORD2>
+ <KEYWORD2>\impostablocchimargine</KEYWORD2>
+ <KEYWORD2>\impostablocco</KEYWORD2>
+ <KEYWORD2>\impostabloccosezione</KEYWORD2>
+ <KEYWORD2>\impostabuffer</KEYWORD2>
+ <KEYWORD2>\impostacampi</KEYWORD2>
+ <KEYWORD2>\impostacampo</KEYWORD2>
+ <KEYWORD2>\impostacapoversi</KEYWORD2>
+ <KEYWORD2>\impostacaption</KEYWORD2>
+ <KEYWORD2>\impostacaptions</KEYWORD2>
+ <KEYWORD2>\impostacima</KEYWORD2>
+ <KEYWORD2>\impostaclippling</KEYWORD2>
+ <KEYWORD2>\impostacolonne</KEYWORD2>
+ <KEYWORD2>\impostacolore</KEYWORD2>
+ <KEYWORD2>\impostacolori</KEYWORD2>
+ <KEYWORD2>\impostacombinazioni</KEYWORD2>
+ <KEYWORD2>\impostacommento</KEYWORD2>
+ <KEYWORD2>\impostadefinizionenotepdp</KEYWORD2>
+ <KEYWORD2>\impostadescrizioni</KEYWORD2>
+ <KEYWORD2>\impostadimensionicarta</KEYWORD2>
+ <KEYWORD2>\impostaelementi</KEYWORD2>
+ <KEYWORD2>\impostaelenco</KEYWORD2>
+ <KEYWORD2>\impostaelencocombinato</KEYWORD2>
+ <KEYWORD2>\impostaenumerazioni</KEYWORD2>
+ <KEYWORD2>\impostafigureesterne</KEYWORD2>
+ <KEYWORD2>\impostafondo</KEYWORD2>
+ <KEYWORD2>\impostafontdeltesto</KEYWORD2>
+ <KEYWORD2>\impostaforms</KEYWORD2>
+ <KEYWORD2>\impostaincorniciato</KEYWORD2>
+ <KEYWORD2>\impostainmargine</KEYWORD2>
+ <KEYWORD2>\impostainstestazione</KEYWORD2>
+ <KEYWORD2>\impostainterazione</KEYWORD2>
+ <KEYWORD2>\impostainterlinea</KEYWORD2>
+ <KEYWORD2>\impostalayout</KEYWORD2>
+ <KEYWORD2>\impostalegenda</KEYWORD2>
+ <KEYWORD2>\impostalinea</KEYWORD2>
+ <KEYWORD2>\impostalineemargine</KEYWORD2>
+ <KEYWORD2>\impostalineenere</KEYWORD2>
+ <KEYWORD2>\impostalineeriempimento</KEYWORD2>
+ <KEYWORD2>\impostalineesottili</KEYWORD2>
+ <KEYWORD2>\impostalineetesto</KEYWORD2>
+ <KEYWORD2>\impostalingua</KEYWORD2>
+ <KEYWORD2>\impostalistariferimenti</KEYWORD2>
+ <KEYWORD2>\impostamaiuscole</KEYWORD2>
+ <KEYWORD2>\impostamakeup</KEYWORD2>
+ <KEYWORD2>\impostamarcatura</KEYWORD2>
+ <KEYWORD2>\impostamenzione</KEYWORD2>
+ <KEYWORD2>\impostanotepdp</KEYWORD2>
+ <KEYWORD2>\impostanumerazione</KEYWORD2>
+ <KEYWORD2>\impostanumerazionecapoversi</KEYWORD2>
+ <KEYWORD2>\impostanumerazionepagina</KEYWORD2>
+ <KEYWORD2>\impostanumerazionerighe</KEYWORD2>
+ <KEYWORD2>\impostanumeropagina</KEYWORD2>
+ <KEYWORD2>\impostanumerosottopagina</KEYWORD2>
+ <KEYWORD2>\impostanumerotesta</KEYWORD2>
+ <KEYWORD2>\impostaoggettimobili</KEYWORD2>
+ <KEYWORD2>\impostaoggettomobile</KEYWORD2>
+ <KEYWORD2>\impostaordinamento</KEYWORD2>
+ <KEYWORD2>\impostaoutput</KEYWORD2>
+ <KEYWORD2>\impostaparranging</KEYWORD2>
+ <KEYWORD2>\impostapdp</KEYWORD2>
+ <KEYWORD2>\impostapiustretto</KEYWORD2>
+ <KEYWORD2>\impostaposizionamento</KEYWORD2>
+ <KEYWORD2>\impostaposizionamentoopposti</KEYWORD2>
+ <KEYWORD2>\impostaposizionetesto</KEYWORD2>
+ <KEYWORD2>\impostaprofili</KEYWORD2>
+ <KEYWORD2>\impostaprogrammi</KEYWORD2>
+ <KEYWORD2>\impostapubblicazioni</KEYWORD2>
+ <KEYWORD2>\impostapulsanti</KEYWORD2>
+ <KEYWORD2>\impostaregistro</KEYWORD2>
+ <KEYWORD2>\impostarientri</KEYWORD2>
+ <KEYWORD2>\impostarientro</KEYWORD2>
+ <KEYWORD2>\impostariferimento</KEYWORD2>
+ <KEYWORD2>\impostarighe</KEYWORD2>
+ <KEYWORD2>\impostarigheriempimento</KEYWORD2>
+ <KEYWORD2>\impostarigovuoto</KEYWORD2>
+ <KEYWORD2>\impostarotazione</KEYWORD2>
+ <KEYWORD2>\impostaschermi</KEYWORD2>
+ <KEYWORD2>\impostaschermointerazione</KEYWORD2>
+ <KEYWORD2>\impostasegnosillabazione</KEYWORD2>
+ <KEYWORD2>\impostasetsimboli</KEYWORD2>
+ <KEYWORD2>\impostasezione</KEYWORD2>
+ <KEYWORD2>\impostasfondi</KEYWORD2>
+ <KEYWORD2>\impostasfondo</KEYWORD2>
+ <KEYWORD2>\impostasincronizzazione</KEYWORD2>
+ <KEYWORD2>\impostasinonimi</KEYWORD2>
+ <KEYWORD2>\impostasistema</KEYWORD2>
+ <KEYWORD2>\impostasottolinea</KEYWORD2>
+ <KEYWORD2>\impostaspaziatura</KEYWORD2>
+ <KEYWORD2>\impostaspaziobianco</KEYWORD2>
+ <KEYWORD2>\impostaspezzamentooggettomobile</KEYWORD2>
+ <KEYWORD2>\impostastrut</KEYWORD2>
+ <KEYWORD2>\impostatab</KEYWORD2>
+ <KEYWORD2>\impostatabelle</KEYWORD2>
+ <KEYWORD2>\impostatabulato</KEYWORD2>
+ <KEYWORD2>\impostatavolozza</KEYWORD2>
+ <KEYWORD2>\impostatesta</KEYWORD2>
+ <KEYWORD2>\impostateste</KEYWORD2>
+ <KEYWORD2>\impostatesticima</KEYWORD2>
+ <KEYWORD2>\impostatestifondo</KEYWORD2>
+ <KEYWORD2>\impostatestiincorniciati</KEYWORD2>
+ <KEYWORD2>\impostatestiintestazioni</KEYWORD2>
+ <KEYWORD2>\impostatestipdp</KEYWORD2>
+ <KEYWORD2>\impostatesto</KEYWORD2>
+ <KEYWORD2>\impostatestoetichette</KEYWORD2>
+ <KEYWORD2>\impostatestointestazioni</KEYWORD2>
+ <KEYWORD2>\impostatestotesti</KEYWORD2>
+ <KEYWORD2>\impostatolleranza</KEYWORD2>
+ <KEYWORD2>\impostatransizionepagina</KEYWORD2>
+ <KEYWORD2>\impostatype</KEYWORD2>
+ <KEYWORD2>\impostatyping</KEYWORD2>
+ <KEYWORD2>\impostaurl</KEYWORD2>
+ <KEYWORD2>\impostavariabiletesto</KEYWORD2>
+ <KEYWORD2>\impostaversioni</KEYWORD2>
+ <KEYWORD2>\in</KEYWORD2>
+ <KEYWORD2>\inaltromargine</KEYWORD2>
+ <KEYWORD2>\incorniciato</KEYWORD2>
+ <KEYWORD2>\indestra</KEYWORD2>
+ <KEYWORD2>\ininner</KEYWORD2>
+ <KEYWORD2>\inmargine</KEYWORD2>
+ <KEYWORD2>\inouter</KEYWORD2>
+ <KEYWORD2>\inriga</KEYWORD2>
+ <KEYWORD2>\insinistra</KEYWORD2>
+ <KEYWORD2>\installalingua</KEYWORD2>
+ <KEYWORD2>\intorno</KEYWORD2>
+ <KEYWORD2>\lettera</KEYWORD2>
+ <KEYWORD2>\lettere</KEYWORD2>
+ <KEYWORD2>\lineamargine</KEYWORD2>
+ <KEYWORD2>\lineanera</KEYWORD2>
+ <KEYWORD2>\lineasottile</KEYWORD2>
+ <KEYWORD2>\lineatesto</KEYWORD2>
+ <KEYWORD2>\lineenere</KEYWORD2>
+ <KEYWORD2>\lineeriempimento</KEYWORD2>
+ <KEYWORD2>\lineesottili</KEYWORD2>
+ <KEYWORD2>\lingua</KEYWORD2>
+ <KEYWORD2>\linguaprincipale</KEYWORD2>
+ <KEYWORD2>\listsymbol</KEYWORD2>
+ <KEYWORD2>\logcampi</KEYWORD2>
+ <KEYWORD2>\mar</KEYWORD2>
+ <KEYWORD2>\marcatura</KEYWORD2>
+ <KEYWORD2>\marcaversione</KEYWORD2>
+ <KEYWORD2>\matematica</KEYWORD2>
+ <KEYWORD2>\menzione</KEYWORD2>
+ <KEYWORD2>\mese</KEYWORD2>
+ <KEYWORD2>\mettielenco</KEYWORD2>
+ <KEYWORD2>\mettielencocombinato</KEYWORD2>
+ <KEYWORD2>\mettifiancoafianco</KEYWORD2>
+ <KEYWORD2>\mettiformula</KEYWORD2>
+ <KEYWORD2>\mettiingriglia</KEYWORD2>
+ <KEYWORD2>\mettilegenda</KEYWORD2>
+ <KEYWORD2>\mettilinea</KEYWORD2>
+ <KEYWORD2>\mettilistariferimenti</KEYWORD2>
+ <KEYWORD2>\mettiloghi</KEYWORD2>
+ <KEYWORD2>\mettinotepdp</KEYWORD2>
+ <KEYWORD2>\mettinotepdplocali</KEYWORD2>
+ <KEYWORD2>\mettiregistro</KEYWORD2>
+ <KEYWORD2>\mettisegnalibro</KEYWORD2>
+ <KEYWORD2>\mettisottoformula</KEYWORD2>
+ <KEYWORD2>\mettiunosullaltro</KEYWORD2>
+ <KEYWORD2>\mettivariabiletesto</KEYWORD2>
+ <KEYWORD2>\mostraambientefontdeltesto</KEYWORD2>
+ <KEYWORD2>\mostracampi</KEYWORD2>
+ <KEYWORD2>\mostracolore</KEYWORD2>
+ <KEYWORD2>\mostracornice</KEYWORD2>
+ <KEYWORD2>\mostrafiguresterne</KEYWORD2>
+ <KEYWORD2>\mostrafontdeltesto</KEYWORD2>
+ <KEYWORD2>\mostragriglia</KEYWORD2>
+ <KEYWORD2>\mostragruppocolori</KEYWORD2>
+ <KEYWORD2>\mostraimpostazioni</KEYWORD2>
+ <KEYWORD2>\mostralyout</KEYWORD2>
+ <KEYWORD2>\mostramakeup</KEYWORD2>
+ <KEYWORD2>\mostrasetsimboli</KEYWORD2>
+ <KEYWORD2>\mostrastampa</KEYWORD2>
+ <KEYWORD2>\mostrastruts</KEYWORD2>
+ <KEYWORD2>\mostratavolozza</KEYWORD2>
+ <KEYWORD2>\nascondiblocchi</KEYWORD2>
+ <KEYWORD2>\nienteelenco</KEYWORD2>
+ <KEYWORD2>\nientelineecimafondo</KEYWORD2>
+ <KEYWORD2>\nientelineintestazionepdp</KEYWORD2>
+ <KEYWORD2>\nientemarcatura</KEYWORD2>
+ <KEYWORD2>\nienterientro</KEYWORD2>
+ <KEYWORD2>\nientespazio</KEYWORD2>
+ <KEYWORD2>\nientespaziobianco</KEYWORD2>
+ <KEYWORD2>\nop</KEYWORD2>
+ <KEYWORD2>\nota</KEYWORD2>
+ <KEYWORD2>\notapdp</KEYWORD2>
+ <KEYWORD2>\notest</KEYWORD2>
+ <KEYWORD2>\numeri</KEYWORD2>
+ <KEYWORD2>\numeriromani</KEYWORD2>
+ <KEYWORD2>\numerotesta</KEYWORD2>
+ <KEYWORD2>\numerotestacorrente</KEYWORD2>
+ <KEYWORD2>\pagina</KEYWORD2>
+ <KEYWORD2>\paroladestra</KEYWORD2>
+ <KEYWORD2>\passaafontgrezzo</KEYWORD2>
+ <KEYWORD2>\ped</KEYWORD2>
+ <KEYWORD2>\pedap</KEYWORD2>
+ <KEYWORD2>\placefloat</KEYWORD2>
+ <KEYWORD2>\posizionatesto</KEYWORD2>
+ <KEYWORD2>\posizione</KEYWORD2>
+ <KEYWORD2>\prendibuffer</KEYWORD2>
+ <KEYWORD2>\prendimarcatura</KEYWORD2>
+ <KEYWORD2>\programma</KEYWORD2>
+ <KEYWORD2>\pubblicazione</KEYWORD2>
+ <KEYWORD2>\pulsante</KEYWORD2>
+ <KEYWORD2>\pulsantinterazione</KEYWORD2>
+ <KEYWORD2>\punti</KEYWORD2>
+ <KEYWORD2>\qualcheriga</KEYWORD2>
+ <KEYWORD2>\ran</KEYWORD2>
+ <KEYWORD2>\referral</KEYWORD2>
+ <KEYWORD2>\reimposta</KEYWORD2>
+ <KEYWORD2>\reimpostamarcatura</KEYWORD2>
+ <KEYWORD2>\rientro</KEYWORD2>
+ <KEYWORD2>\rif</KEYWORD2>
+ <KEYWORD2>\riferimento</KEYWORD2>
+ <KEYWORD2>\riferimentopagina</KEYWORD2>
+ <KEYWORD2>\riferimentotesto</KEYWORD2>
+ <KEYWORD2>\riflessione</KEYWORD2>
+ <KEYWORD2>\rigariempimento</KEYWORD2>
+ <KEYWORD2>\rigovuoto</KEYWORD2>
+ <KEYWORD2>\ruota</KEYWORD2>
+ <KEYWORD2>\saltablocchi</KEYWORD2>
+ <KEYWORD2>\sbarrati</KEYWORD2>
+ <KEYWORD2>\sbarrato</KEYWORD2>
+ <KEYWORD2>\scala</KEYWORD2>
+ <KEYWORD2>\schermo</KEYWORD2>
+ <KEYWORD2>\scrividentroelenco</KEYWORD2>
+ <KEYWORD2>\scriviinelenco</KEYWORD2>
+ <KEYWORD2>\scriviinlistariferimenti</KEYWORD2>
+ <KEYWORD2>\scriviinregistro</KEYWORD2>
+ <KEYWORD2>\segnalibro</KEYWORD2>
+ <KEYWORD2>\seguiprofilo</KEYWORD2>
+ <KEYWORD2>\seguiversione</KEYWORD2>
+ <KEYWORD2>\seguiversioneprofilo</KEYWORD2>
+ <KEYWORD2>\selezionablocchi</KEYWORD2>
+ <KEYWORD2>\selezionacarta</KEYWORD2>
+ <KEYWORD2>\selezionaversione</KEYWORD2>
+ <KEYWORD2>\separamarcatura</KEYWORD2>
+ <KEYWORD2>\setupitemgroup</KEYWORD2>
+ <KEYWORD2>\setuppaper</KEYWORD2>
+ <KEYWORD2>\setvariabiletesto</KEYWORD2>
+ <KEYWORD2>\sfondo</KEYWORD2>
+ <KEYWORD2>\sim</KEYWORD2>
+ <KEYWORD2>\simbolo</KEYWORD2>
+ <KEYWORD2>\sincronizza</KEYWORD2>
+ <KEYWORD2>\sopralinea</KEYWORD2>
+ <KEYWORD2>\sopralinee</KEYWORD2>
+ <KEYWORD2>\sottolinea</KEYWORD2>
+ <KEYWORD2>\sottolinee</KEYWORD2>
+ <KEYWORD2>\spazifissi</KEYWORD2>
+ <KEYWORD2>\spazio</KEYWORD2>
+ <KEYWORD2>\spaziobianco</KEYWORD2>
+ <KEYWORD2>\spezzaoggettomobile</KEYWORD2>
+ <KEYWORD2>\spostaagriglia</KEYWORD2>
+ <KEYWORD2>\stackcampi</KEYWORD2>
+ <KEYWORD2>\start</KEYWORD2>
+ <KEYWORD2>\startambiente</KEYWORD2>
+ <KEYWORD2>\startcitazione</KEYWORD2>
+ <KEYWORD2>\startcolore</KEYWORD2>
+ <KEYWORD2>\startcommento</KEYWORD2>
+ <KEYWORD2>\startcomponenet</KEYWORD2>
+ <KEYWORD2>\startfatto</KEYWORD2>
+ <KEYWORD2>\startimpaccato</KEYWORD2>
+ <KEYWORD2>\startlineamargine</KEYWORD2>
+ <KEYWORD2>\startlineatesto</KEYWORD2>
+ <KEYWORD2>\startmenuinterattivo</KEYWORD2>
+ <KEYWORD2>\startprogetto</KEYWORD2>
+ <KEYWORD2>\startsfondo</KEYWORD2>
+ <KEYWORD2>\startversione</KEYWORD2>
+ <KEYWORD2>\stirato</KEYWORD2>
+ <KEYWORD2>\stop</KEYWORD2>
+ <KEYWORD2>\stopambiente</KEYWORD2>
+ <KEYWORD2>\stopcitazione</KEYWORD2>
+ <KEYWORD2>\stopcolore</KEYWORD2>
+ <KEYWORD2>\stopcommento</KEYWORD2>
+ <KEYWORD2>\stopcomponenet</KEYWORD2>
+ <KEYWORD2>\stopfatto</KEYWORD2>
+ <KEYWORD2>\stopimpaccato</KEYWORD2>
+ <KEYWORD2>\stoplineamargine</KEYWORD2>
+ <KEYWORD2>\stoplineatesto</KEYWORD2>
+ <KEYWORD2>\stopmenuinterattivo</KEYWORD2>
+ <KEYWORD2>\stopprogetto</KEYWORD2>
+ <KEYWORD2>\stopsfondo</KEYWORD2>
+ <KEYWORD2>\stopversione</KEYWORD2>
+ <KEYWORD2>\tab</KEYWORD2>
+ <KEYWORD2>\testa</KEYWORD2>
+ <KEYWORD2>\testoetichetta</KEYWORD2>
+ <KEYWORD2>\testoinmargine</KEYWORD2>
+ <KEYWORD2>\testoinstestazioni</KEYWORD2>
+ <KEYWORD2>\testonotapdp</KEYWORD2>
+ <KEYWORD2>\testoriempimento</KEYWORD2>
+ <KEYWORD2>\tex</KEYWORD2>
+ <KEYWORD2>\tieniblocchi</KEYWORD2>
+ <KEYWORD2>\tipopagina</KEYWORD2>
+ <KEYWORD2>\tooltip</KEYWORD2>
+ <KEYWORD2>\traduci</KEYWORD2>
+ <KEYWORD2>\typ</KEYWORD2>
+ <KEYWORD2>\type</KEYWORD2>
+ <KEYWORD2>\typebuffer</KEYWORD2>
+ <KEYWORD2>\typefile</KEYWORD2>
+ <KEYWORD2>\usaURL</KEYWORD2>
+ <KEYWORD2>\usablocco</KEYWORD2>
+ <KEYWORD2>\usacodifica</KEYWORD2>
+ <KEYWORD2>\usacolonnasonoraesterna</KEYWORD2>
+ <KEYWORD2>\usacomandi</KEYWORD2>
+ <KEYWORD2>\usadocumentoesterno</KEYWORD2>
+ <KEYWORD2>\usafiguraesterna</KEYWORD2>
+ <KEYWORD2>\usafileesterni</KEYWORD2>
+ <KEYWORD2>\usafileesterno</KEYWORD2>
+ <KEYWORD2>\usamodulo</KEYWORD2>
+ <KEYWORD2>\usariferimenti</KEYWORD2>
+ <KEYWORD2>\usasimboli</KEYWORD2>
+ <KEYWORD2>\usaspecialita</KEYWORD2>
+ <KEYWORD2>\vaia</KEYWORD2>
+ <KEYWORD2>\vaiabox</KEYWORD2>
+ <KEYWORD2>\vaigiu</KEYWORD2>
+ <KEYWORD2>\variabiletesto</KEYWORD2>
+ <KEYWORD2>\versione</KEYWORD2>
+ <KEYWORD2>\vl</KEYWORD2>
+ </KEYWORDS>
+ </RULES>
+</MODE>
diff --git a/context/data/context-jedit-nl.xml b/context/data/context-jedit-nl.xml
new file mode 100644
index 000000000..9f3548ef7
--- /dev/null
+++ b/context/data/context-jedit-nl.xml
@@ -0,0 +1,458 @@
+<?xml version='1.0'?>
+
+<!DOCTYPE MODE SYSTEM 'xmode.dtd'>
+
+<MODE>
+ <RULES>
+ <KEYWORDS>
+ <KEYWORD2>\Letter</KEYWORD2>
+ <KEYWORD2>\Letters</KEYWORD2>
+ <KEYWORD2>\MAAND</KEYWORD2>
+ <KEYWORD2>\Romeins</KEYWORD2>
+ <KEYWORD2>\WEEKDAG</KEYWORD2>
+ <KEYWORD2>\WOORD</KEYWORD2>
+ <KEYWORD2>\WOORDEN</KEYWORD2>
+ <KEYWORD2>\Woord</KEYWORD2>
+ <KEYWORD2>\Woorden</KEYWORD2>
+ <KEYWORD2>\about</KEYWORD2>
+ <KEYWORD2>\achtergrond</KEYWORD2>
+ <KEYWORD2>\arg</KEYWORD2>
+ <KEYWORD2>\bepaalkopnummer</KEYWORD2>
+ <KEYWORD2>\bepaallijstkenmerken</KEYWORD2>
+ <KEYWORD2>\blanko</KEYWORD2>
+ <KEYWORD2>\blokje</KEYWORD2>
+ <KEYWORD2>\blokjes</KEYWORD2>
+ <KEYWORD2>\blokkeerinteractiemenu</KEYWORD2>
+ <KEYWORD2>\bookmark</KEYWORD2>
+ <KEYWORD2>\breuk</KEYWORD2>
+ <KEYWORD2>\but</KEYWORD2>
+ <KEYWORD2>\button</KEYWORD2>
+ <KEYWORD2>\chem</KEYWORD2>
+ <KEYWORD2>\cijfers</KEYWORD2>
+ <KEYWORD2>\citaat</KEYWORD2>
+ <KEYWORD2>\citeer</KEYWORD2>
+ <KEYWORD2>\clip</KEYWORD2>
+ <KEYWORD2>\commentaar</KEYWORD2>
+ <KEYWORD2>\converteernummer</KEYWORD2>
+ <KEYWORD2>\copieerveld</KEYWORD2>
+ <KEYWORD2>\corrigeerwitruimte</KEYWORD2>
+ <KEYWORD2>\crlf</KEYWORD2>
+ <KEYWORD2>\datum</KEYWORD2>
+ <KEYWORD2>\definerawfont</KEYWORD2>
+ <KEYWORD2>\definieer</KEYWORD2>
+ <KEYWORD2>\definieeralineas</KEYWORD2>
+ <KEYWORD2>\definieerbeeldmerk</KEYWORD2>
+ <KEYWORD2>\definieerblanko</KEYWORD2>
+ <KEYWORD2>\definieerblok</KEYWORD2>
+ <KEYWORD2>\definieerbuffer</KEYWORD2>
+ <KEYWORD2>\definieerconversie</KEYWORD2>
+ <KEYWORD2>\definieerfiguursymbool</KEYWORD2>
+ <KEYWORD2>\definieerfont</KEYWORD2>
+ <KEYWORD2>\definieerinteractiemenu</KEYWORD2>
+ <KEYWORD2>\definieerkadertekst</KEYWORD2>
+ <KEYWORD2>\definieerkleur</KEYWORD2>
+ <KEYWORD2>\definieerkleurgroep</KEYWORD2>
+ <KEYWORD2>\definieerkop</KEYWORD2>
+ <KEYWORD2>\definieerkorps</KEYWORD2>
+ <KEYWORD2>\definieerkorpsomgeving</KEYWORD2>
+ <KEYWORD2>\definieerlijn</KEYWORD2>
+ <KEYWORD2>\definieerlijst</KEYWORD2>
+ <KEYWORD2>\definieermarkering</KEYWORD2>
+ <KEYWORD2>\definieeromlijnd</KEYWORD2>
+ <KEYWORD2>\definieeropmaak</KEYWORD2>
+ <KEYWORD2>\definieeroverlay</KEYWORD2>
+ <KEYWORD2>\definieerpalet</KEYWORD2>
+ <KEYWORD2>\definieerpapierformaat</KEYWORD2>
+ <KEYWORD2>\definieerplaatsblok</KEYWORD2>
+ <KEYWORD2>\definieerprofiel</KEYWORD2>
+ <KEYWORD2>\definieerprogramma</KEYWORD2>
+ <KEYWORD2>\definieerreferentie</KEYWORD2>
+ <KEYWORD2>\definieerreferentieformaat</KEYWORD2>
+ <KEYWORD2>\definieerreferentielijst</KEYWORD2>
+ <KEYWORD2>\definieerregister</KEYWORD2>
+ <KEYWORD2>\definieersamengesteldelijst</KEYWORD2>
+ <KEYWORD2>\definieersectie</KEYWORD2>
+ <KEYWORD2>\definieersectieblok</KEYWORD2>
+ <KEYWORD2>\definieersorteren</KEYWORD2>
+ <KEYWORD2>\definieerstartstop</KEYWORD2>
+ <KEYWORD2>\definieersubveld</KEYWORD2>
+ <KEYWORD2>\definieersymbool</KEYWORD2>
+ <KEYWORD2>\definieersynoniemen</KEYWORD2>
+ <KEYWORD2>\definieertabelvorm</KEYWORD2>
+ <KEYWORD2>\definieertabulatie</KEYWORD2>
+ <KEYWORD2>\definieertekst</KEYWORD2>
+ <KEYWORD2>\definieertekstpositie</KEYWORD2>
+ <KEYWORD2>\definieertekstvariabele</KEYWORD2>
+ <KEYWORD2>\definieertype</KEYWORD2>
+ <KEYWORD2>\definieertypen</KEYWORD2>
+ <KEYWORD2>\definieeruitvoer</KEYWORD2>
+ <KEYWORD2>\definieerveld</KEYWORD2>
+ <KEYWORD2>\definieerveldstapel</KEYWORD2>
+ <KEYWORD2>\definieerversie</KEYWORD2>
+ <KEYWORD2>\doordefinieren</KEYWORD2>
+ <KEYWORD2>\doorlabelen</KEYWORD2>
+ <KEYWORD2>\doornummeren</KEYWORD2>
+ <KEYWORD2>\doorspringen</KEYWORD2>
+ <KEYWORD2>\doorstreep</KEYWORD2>
+ <KEYWORD2>\doorstrepen</KEYWORD2>
+ <KEYWORD2>\dunnelijn</KEYWORD2>
+ <KEYWORD2>\dunnelijnen</KEYWORD2>
+ <KEYWORD2>\eenregel</KEYWORD2>
+ <KEYWORD2>\ergens</KEYWORD2>
+ <KEYWORD2>\externfiguur</KEYWORD2>
+ <KEYWORD2>\forceerblokken</KEYWORD2>
+ <KEYWORD2>\gebruikURL</KEYWORD2>
+ <KEYWORD2>\gebruikblokken</KEYWORD2>
+ <KEYWORD2>\gebruikcommandos</KEYWORD2>
+ <KEYWORD2>\gebruikexterndocument</KEYWORD2>
+ <KEYWORD2>\gebruikexternefile</KEYWORD2>
+ <KEYWORD2>\gebruikexternefiles</KEYWORD2>
+ <KEYWORD2>\gebruikexternfiguur</KEYWORD2>
+ <KEYWORD2>\gebruikexterngeluidsfragment</KEYWORD2>
+ <KEYWORD2>\gebruikmodule</KEYWORD2>
+ <KEYWORD2>\gebruikreferenties</KEYWORD2>
+ <KEYWORD2>\gebruikspecials</KEYWORD2>
+ <KEYWORD2>\gebruiksymbolen</KEYWORD2>
+ <KEYWORD2>\geenblokkenmeer</KEYWORD2>
+ <KEYWORD2>\geenbovenenonderregels</KEYWORD2>
+ <KEYWORD2>\geenfilesmeer</KEYWORD2>
+ <KEYWORD2>\geenhoofdenvoetregels</KEYWORD2>
+ <KEYWORD2>\geenlijst</KEYWORD2>
+ <KEYWORD2>\geenmarkering</KEYWORD2>
+ <KEYWORD2>\geenspatie</KEYWORD2>
+ <KEYWORD2>\geentest</KEYWORD2>
+ <KEYWORD2>\geenwitruimte</KEYWORD2>
+ <KEYWORD2>\grijskleur</KEYWORD2>
+ <KEYWORD2>\haalbuffer</KEYWORD2>
+ <KEYWORD2>\haalmarkering</KEYWORD2>
+ <KEYWORD2>\haarlijn</KEYWORD2>
+ <KEYWORD2>\handhaafblokken</KEYWORD2>
+ <KEYWORD2>\hl</KEYWORD2>
+ <KEYWORD2>\hoofdtaal</KEYWORD2>
+ <KEYWORD2>\hoog</KEYWORD2>
+ <KEYWORD2>\huidigedatum</KEYWORD2>
+ <KEYWORD2>\huidigekopnummer</KEYWORD2>
+ <KEYWORD2>\in</KEYWORD2>
+ <KEYWORD2>\inanderemarge</KEYWORD2>
+ <KEYWORD2>\inbinnen</KEYWORD2>
+ <KEYWORD2>\inbuiten</KEYWORD2>
+ <KEYWORD2>\inlijnd</KEYWORD2>
+ <KEYWORD2>\inlinker</KEYWORD2>
+ <KEYWORD2>\inmarge</KEYWORD2>
+ <KEYWORD2>\inrechter</KEYWORD2>
+ <KEYWORD2>\inregel</KEYWORD2>
+ <KEYWORD2>\inspringen</KEYWORD2>
+ <KEYWORD2>\installeertaal</KEYWORD2>
+ <KEYWORD2>\interactiebalk</KEYWORD2>
+ <KEYWORD2>\interactiebuttons</KEYWORD2>
+ <KEYWORD2>\invullijnen</KEYWORD2>
+ <KEYWORD2>\invulregel</KEYWORD2>
+ <KEYWORD2>\invultekst</KEYWORD2>
+ <KEYWORD2>\invulveld</KEYWORD2>
+ <KEYWORD2>\items</KEYWORD2>
+ <KEYWORD2>\its</KEYWORD2>
+ <KEYWORD2>\kantlijn</KEYWORD2>
+ <KEYWORD2>\kenmerk</KEYWORD2>
+ <KEYWORD2>\kenmerkdatum</KEYWORD2>
+ <KEYWORD2>\kentekstvariabeletoe</KEYWORD2>
+ <KEYWORD2>\kleur</KEYWORD2>
+ <KEYWORD2>\kloonveld</KEYWORD2>
+ <KEYWORD2>\kolom</KEYWORD2>
+ <KEYWORD2>\kop</KEYWORD2>
+ <KEYWORD2>\kopnummer</KEYWORD2>
+ <KEYWORD2>\koppeldocument</KEYWORD2>
+ <KEYWORD2>\koppelmarkering</KEYWORD2>
+ <KEYWORD2>\koppelpagina</KEYWORD2>
+ <KEYWORD2>\koppelpapier</KEYWORD2>
+ <KEYWORD2>\koppelregister</KEYWORD2>
+ <KEYWORD2>\koptekst</KEYWORD2>
+ <KEYWORD2>\laag</KEYWORD2>
+ <KEYWORD2>\labels</KEYWORD2>
+ <KEYWORD2>\labeltekst</KEYWORD2>
+ <KEYWORD2>\laho</KEYWORD2>
+ <KEYWORD2>\legeregels</KEYWORD2>
+ <KEYWORD2>\letter</KEYWORD2>
+ <KEYWORD2>\letters</KEYWORD2>
+ <KEYWORD2>\lijstsymbool</KEYWORD2>
+ <KEYWORD2>\maand</KEYWORD2>
+ <KEYWORD2>\mar</KEYWORD2>
+ <KEYWORD2>\margetekst</KEYWORD2>
+ <KEYWORD2>\markeer</KEYWORD2>
+ <KEYWORD2>\markeerversie</KEYWORD2>
+ <KEYWORD2>\naar</KEYWORD2>
+ <KEYWORD2>\naarbox</KEYWORD2>
+ <KEYWORD2>\nietinspringen</KEYWORD2>
+ <KEYWORD2>\noot</KEYWORD2>
+ <KEYWORD2>\nop</KEYWORD2>
+ <KEYWORD2>\omlaag</KEYWORD2>
+ <KEYWORD2>\omlijnd</KEYWORD2>
+ <KEYWORD2>\onderstreep</KEYWORD2>
+ <KEYWORD2>\onderstrepen</KEYWORD2>
+ <KEYWORD2>\ontkoppelmarkering</KEYWORD2>
+ <KEYWORD2>\op</KEYWORD2>
+ <KEYWORD2>\opelkaar</KEYWORD2>
+ <KEYWORD2>\oppagina</KEYWORD2>
+ <KEYWORD2>\overstreep</KEYWORD2>
+ <KEYWORD2>\overstrepen</KEYWORD2>
+ <KEYWORD2>\pagina</KEYWORD2>
+ <KEYWORD2>\paginareferentie</KEYWORD2>
+ <KEYWORD2>\paslayoutaan</KEYWORD2>
+ <KEYWORD2>\passeerblokken</KEYWORD2>
+ <KEYWORD2>\passendveld</KEYWORD2>
+ <KEYWORD2>\plaatsbeeldmerken</KEYWORD2>
+ <KEYWORD2>\plaatsbookmarks</KEYWORD2>
+ <KEYWORD2>\plaatsformule</KEYWORD2>
+ <KEYWORD2>\plaatslegenda</KEYWORD2>
+ <KEYWORD2>\plaatslijn</KEYWORD2>
+ <KEYWORD2>\plaatslijst</KEYWORD2>
+ <KEYWORD2>\plaatslokalevoetnoten</KEYWORD2>
+ <KEYWORD2>\plaatsnaastelkaar</KEYWORD2>
+ <KEYWORD2>\plaatsonderelkaar</KEYWORD2>
+ <KEYWORD2>\plaatsopgrid</KEYWORD2>
+ <KEYWORD2>\plaatsplaatsblok</KEYWORD2>
+ <KEYWORD2>\plaatsreferentielijst</KEYWORD2>
+ <KEYWORD2>\plaatsregister</KEYWORD2>
+ <KEYWORD2>\plaatssamengesteldelijst</KEYWORD2>
+ <KEYWORD2>\plaatssubformule</KEYWORD2>
+ <KEYWORD2>\plaatstekstvariabele</KEYWORD2>
+ <KEYWORD2>\plaatsvoetnoten</KEYWORD2>
+ <KEYWORD2>\positioneer</KEYWORD2>
+ <KEYWORD2>\positioneertekst</KEYWORD2>
+ <KEYWORD2>\programma</KEYWORD2>
+ <KEYWORD2>\publicatie</KEYWORD2>
+ <KEYWORD2>\punten</KEYWORD2>
+ <KEYWORD2>\ran</KEYWORD2>
+ <KEYWORD2>\ref</KEYWORD2>
+ <KEYWORD2>\referentie</KEYWORD2>
+ <KEYWORD2>\regellinks</KEYWORD2>
+ <KEYWORD2>\regelmidden</KEYWORD2>
+ <KEYWORD2>\regelrechts</KEYWORD2>
+ <KEYWORD2>\registreervelden</KEYWORD2>
+ <KEYWORD2>\reset</KEYWORD2>
+ <KEYWORD2>\resetmarkering</KEYWORD2>
+ <KEYWORD2>\romeins</KEYWORD2>
+ <KEYWORD2>\rooster</KEYWORD2>
+ <KEYWORD2>\roteer</KEYWORD2>
+ <KEYWORD2>\schaal</KEYWORD2>
+ <KEYWORD2>\scherm</KEYWORD2>
+ <KEYWORD2>\schrijfnaarlijst</KEYWORD2>
+ <KEYWORD2>\schrijfnaarreferentielijst</KEYWORD2>
+ <KEYWORD2>\schrijfnaarregister</KEYWORD2>
+ <KEYWORD2>\schrijftussenlijst</KEYWORD2>
+ <KEYWORD2>\selecteerblokken</KEYWORD2>
+ <KEYWORD2>\selecteerpapier</KEYWORD2>
+ <KEYWORD2>\selecteerversie</KEYWORD2>
+ <KEYWORD2>\som</KEYWORD2>
+ <KEYWORD2>\soortpagina</KEYWORD2>
+ <KEYWORD2>\spatie</KEYWORD2>
+ <KEYWORD2>\spiegel</KEYWORD2>
+ <KEYWORD2>\splitsplaatsblok</KEYWORD2>
+ <KEYWORD2>\start</KEYWORD2>
+ <KEYWORD2>\startachtergrond</KEYWORD2>
+ <KEYWORD2>\startcitaat</KEYWORD2>
+ <KEYWORD2>\startcommentaar</KEYWORD2>
+ <KEYWORD2>\startgeg</KEYWORD2>
+ <KEYWORD2>\startinteractiemenu</KEYWORD2>
+ <KEYWORD2>\startkantlijn</KEYWORD2>
+ <KEYWORD2>\startkleur</KEYWORD2>
+ <KEYWORD2>\startomgeving</KEYWORD2>
+ <KEYWORD2>\startonderdeel</KEYWORD2>
+ <KEYWORD2>\startopelkaar</KEYWORD2>
+ <KEYWORD2>\startproject</KEYWORD2>
+ <KEYWORD2>\starttekstlijn</KEYWORD2>
+ <KEYWORD2>\startversie</KEYWORD2>
+ <KEYWORD2>\stelachtergrondenin</KEYWORD2>
+ <KEYWORD2>\stelachtergrondin</KEYWORD2>
+ <KEYWORD2>\stelalineasin</KEYWORD2>
+ <KEYWORD2>\stelarrangerenin</KEYWORD2>
+ <KEYWORD2>\stelblankoin</KEYWORD2>
+ <KEYWORD2>\stelblokin</KEYWORD2>
+ <KEYWORD2>\stelblokjesin</KEYWORD2>
+ <KEYWORD2>\stelblokkopjein</KEYWORD2>
+ <KEYWORD2>\stelblokkopjesin</KEYWORD2>
+ <KEYWORD2>\stelbovenin</KEYWORD2>
+ <KEYWORD2>\stelboventekstenin</KEYWORD2>
+ <KEYWORD2>\stelbufferin</KEYWORD2>
+ <KEYWORD2>\stelbuttonsin</KEYWORD2>
+ <KEYWORD2>\stelciterenin</KEYWORD2>
+ <KEYWORD2>\stelclipin</KEYWORD2>
+ <KEYWORD2>\stelcombinatiesin</KEYWORD2>
+ <KEYWORD2>\stelcommentaarin</KEYWORD2>
+ <KEYWORD2>\steldoordefinierenin</KEYWORD2>
+ <KEYWORD2>\steldoornummerenin</KEYWORD2>
+ <KEYWORD2>\steldoorspringenin</KEYWORD2>
+ <KEYWORD2>\steldunnelijnenin</KEYWORD2>
+ <KEYWORD2>\stelexternefigurenin</KEYWORD2>
+ <KEYWORD2>\stelformulierenin</KEYWORD2>
+ <KEYWORD2>\stelhoofdin</KEYWORD2>
+ <KEYWORD2>\stelhoofdtekstenin</KEYWORD2>
+ <KEYWORD2>\stelinmargein</KEYWORD2>
+ <KEYWORD2>\stelinspringenin</KEYWORD2>
+ <KEYWORD2>\stelinteractiebalkin</KEYWORD2>
+ <KEYWORD2>\stelinteractiein</KEYWORD2>
+ <KEYWORD2>\stelinteractieschermin</KEYWORD2>
+ <KEYWORD2>\stelinterliniein</KEYWORD2>
+ <KEYWORD2>\stelinvullijnenin</KEYWORD2>
+ <KEYWORD2>\stelinvulregelsin</KEYWORD2>
+ <KEYWORD2>\stelitemgroepin</KEYWORD2>
+ <KEYWORD2>\stelitemsin</KEYWORD2>
+ <KEYWORD2>\stelkadertekstenin</KEYWORD2>
+ <KEYWORD2>\stelkantlijnin</KEYWORD2>
+ <KEYWORD2>\stelkapitalenin</KEYWORD2>
+ <KEYWORD2>\stelkleurenin</KEYWORD2>
+ <KEYWORD2>\stelkleurin</KEYWORD2>
+ <KEYWORD2>\stelkolommenin</KEYWORD2>
+ <KEYWORD2>\stelkopin</KEYWORD2>
+ <KEYWORD2>\stelkopnummerin</KEYWORD2>
+ <KEYWORD2>\stelkoppeltekenin</KEYWORD2>
+ <KEYWORD2>\stelkoppenin</KEYWORD2>
+ <KEYWORD2>\stelkoptekstin</KEYWORD2>
+ <KEYWORD2>\stelkorpsin</KEYWORD2>
+ <KEYWORD2>\stelkorpsomgevingin</KEYWORD2>
+ <KEYWORD2>\stellabeltekstin</KEYWORD2>
+ <KEYWORD2>\stellayoutin</KEYWORD2>
+ <KEYWORD2>\stellegendain</KEYWORD2>
+ <KEYWORD2>\stellijndiktein</KEYWORD2>
+ <KEYWORD2>\stellijnin</KEYWORD2>
+ <KEYWORD2>\stellijstin</KEYWORD2>
+ <KEYWORD2>\stelmargeblokkenin</KEYWORD2>
+ <KEYWORD2>\stelmarkeringin</KEYWORD2>
+ <KEYWORD2>\stelnaastplaatsenin</KEYWORD2>
+ <KEYWORD2>\stelnummerenin</KEYWORD2>
+ <KEYWORD2>\stelomlijndin</KEYWORD2>
+ <KEYWORD2>\stelonderin</KEYWORD2>
+ <KEYWORD2>\stelonderstrepenin</KEYWORD2>
+ <KEYWORD2>\stelondertekstenin</KEYWORD2>
+ <KEYWORD2>\stelopmaakin</KEYWORD2>
+ <KEYWORD2>\stelpaginanummerin</KEYWORD2>
+ <KEYWORD2>\stelpaginanummeringin</KEYWORD2>
+ <KEYWORD2>\stelpaginaovergangenin</KEYWORD2>
+ <KEYWORD2>\stelpaletin</KEYWORD2>
+ <KEYWORD2>\stelpapierformaatin</KEYWORD2>
+ <KEYWORD2>\stelpapierin</KEYWORD2>
+ <KEYWORD2>\stelparagraafnummerenin</KEYWORD2>
+ <KEYWORD2>\stelplaatsblokin</KEYWORD2>
+ <KEYWORD2>\stelplaatsblokkenin</KEYWORD2>
+ <KEYWORD2>\stelplaatsbloksplitsenin</KEYWORD2>
+ <KEYWORD2>\stelpositionerenin</KEYWORD2>
+ <KEYWORD2>\stelprofielenin</KEYWORD2>
+ <KEYWORD2>\stelprogrammasin</KEYWORD2>
+ <KEYWORD2>\stelpublicatiesin</KEYWORD2>
+ <KEYWORD2>\stelrastersin</KEYWORD2>
+ <KEYWORD2>\stelreferentielijstin</KEYWORD2>
+ <KEYWORD2>\stelrefererenin</KEYWORD2>
+ <KEYWORD2>\stelregelnummerenin</KEYWORD2>
+ <KEYWORD2>\stelregelsin</KEYWORD2>
+ <KEYWORD2>\stelregisterin</KEYWORD2>
+ <KEYWORD2>\stelroterenin</KEYWORD2>
+ <KEYWORD2>\stelsamengesteldelijstin</KEYWORD2>
+ <KEYWORD2>\stelsectieblokin</KEYWORD2>
+ <KEYWORD2>\stelsectiein</KEYWORD2>
+ <KEYWORD2>\stelsmallerin</KEYWORD2>
+ <KEYWORD2>\stelsorterenin</KEYWORD2>
+ <KEYWORD2>\stelspatieringin</KEYWORD2>
+ <KEYWORD2>\stelstrutin</KEYWORD2>
+ <KEYWORD2>\stelsubpaginanummerin</KEYWORD2>
+ <KEYWORD2>\stelsymboolsetin</KEYWORD2>
+ <KEYWORD2>\stelsynchronisatiebalkin</KEYWORD2>
+ <KEYWORD2>\stelsynchronisatiein</KEYWORD2>
+ <KEYWORD2>\stelsynoniemenin</KEYWORD2>
+ <KEYWORD2>\stelsysteemin</KEYWORD2>
+ <KEYWORD2>\steltaalin</KEYWORD2>
+ <KEYWORD2>\steltabellenin</KEYWORD2>
+ <KEYWORD2>\steltabin</KEYWORD2>
+ <KEYWORD2>\steltabulatiein</KEYWORD2>
+ <KEYWORD2>\steltekstin</KEYWORD2>
+ <KEYWORD2>\steltekstlijnenin</KEYWORD2>
+ <KEYWORD2>\steltekstpositiein</KEYWORD2>
+ <KEYWORD2>\stelteksttekstenin</KEYWORD2>
+ <KEYWORD2>\steltekstvariabelein</KEYWORD2>
+ <KEYWORD2>\steltolerantiein</KEYWORD2>
+ <KEYWORD2>\steltypein</KEYWORD2>
+ <KEYWORD2>\steltypenin</KEYWORD2>
+ <KEYWORD2>\steluitlijnenin</KEYWORD2>
+ <KEYWORD2>\steluitvoerin</KEYWORD2>
+ <KEYWORD2>\stelurlin</KEYWORD2>
+ <KEYWORD2>\stelveldenin</KEYWORD2>
+ <KEYWORD2>\stelveldin</KEYWORD2>
+ <KEYWORD2>\stelversiesin</KEYWORD2>
+ <KEYWORD2>\stelvoetin</KEYWORD2>
+ <KEYWORD2>\stelvoetnootdefinitiein</KEYWORD2>
+ <KEYWORD2>\stelvoetnotenin</KEYWORD2>
+ <KEYWORD2>\stelvoettekstenin</KEYWORD2>
+ <KEYWORD2>\stelwitruimtein</KEYWORD2>
+ <KEYWORD2>\stop</KEYWORD2>
+ <KEYWORD2>\stopachtergrond</KEYWORD2>
+ <KEYWORD2>\stopcitaat</KEYWORD2>
+ <KEYWORD2>\stopcommentaar</KEYWORD2>
+ <KEYWORD2>\stopgeg</KEYWORD2>
+ <KEYWORD2>\stopinteractiemenu</KEYWORD2>
+ <KEYWORD2>\stopkantlijn</KEYWORD2>
+ <KEYWORD2>\stopkleur</KEYWORD2>
+ <KEYWORD2>\stopomgeving</KEYWORD2>
+ <KEYWORD2>\stoponderdeel</KEYWORD2>
+ <KEYWORD2>\stopopelkaar</KEYWORD2>
+ <KEYWORD2>\stopproject</KEYWORD2>
+ <KEYWORD2>\stoptekstlijn</KEYWORD2>
+ <KEYWORD2>\stopversie</KEYWORD2>
+ <KEYWORD2>\suggestie</KEYWORD2>
+ <KEYWORD2>\switchnaarkorps</KEYWORD2>
+ <KEYWORD2>\switchtorawfont</KEYWORD2>
+ <KEYWORD2>\sym</KEYWORD2>
+ <KEYWORD2>\symbool</KEYWORD2>
+ <KEYWORD2>\synchronisatiebalk</KEYWORD2>
+ <KEYWORD2>\synchroniseer</KEYWORD2>
+ <KEYWORD2>\taal</KEYWORD2>
+ <KEYWORD2>\tab</KEYWORD2>
+ <KEYWORD2>\tekstlijn</KEYWORD2>
+ <KEYWORD2>\tekstreferentie</KEYWORD2>
+ <KEYWORD2>\tekstvariabele</KEYWORD2>
+ <KEYWORD2>\tex</KEYWORD2>
+ <KEYWORD2>\toevoegen</KEYWORD2>
+ <KEYWORD2>\toonexternefiguren</KEYWORD2>
+ <KEYWORD2>\toongrid</KEYWORD2>
+ <KEYWORD2>\tooninstellingen</KEYWORD2>
+ <KEYWORD2>\toonkader</KEYWORD2>
+ <KEYWORD2>\toonkleur</KEYWORD2>
+ <KEYWORD2>\toonkleurgroep</KEYWORD2>
+ <KEYWORD2>\toonkorps</KEYWORD2>
+ <KEYWORD2>\toonkorpsomgeving</KEYWORD2>
+ <KEYWORD2>\toonlayout</KEYWORD2>
+ <KEYWORD2>\toonopmaak</KEYWORD2>
+ <KEYWORD2>\toonpalet</KEYWORD2>
+ <KEYWORD2>\toonprint</KEYWORD2>
+ <KEYWORD2>\toonstruts</KEYWORD2>
+ <KEYWORD2>\toonsymboolset</KEYWORD2>
+ <KEYWORD2>\toonvelden</KEYWORD2>
+ <KEYWORD2>\typ</KEYWORD2>
+ <KEYWORD2>\type</KEYWORD2>
+ <KEYWORD2>\typebuffer</KEYWORD2>
+ <KEYWORD2>\typefile</KEYWORD2>
+ <KEYWORD2>\uit</KEYWORD2>
+ <KEYWORD2>\uitgerekt</KEYWORD2>
+ <KEYWORD2>\usecodering</KEYWORD2>
+ <KEYWORD2>\vastespaties</KEYWORD2>
+ <KEYWORD2>\veld</KEYWORD2>
+ <KEYWORD2>\veldstapel</KEYWORD2>
+ <KEYWORD2>\verbergblokken</KEYWORD2>
+ <KEYWORD2>\vergelijkkleurgroep</KEYWORD2>
+ <KEYWORD2>\vergelijkpalet</KEYWORD2>
+ <KEYWORD2>\verplaatsopgrid</KEYWORD2>
+ <KEYWORD2>\versie</KEYWORD2>
+ <KEYWORD2>\vertaal</KEYWORD2>
+ <KEYWORD2>\verwerkblokken</KEYWORD2>
+ <KEYWORD2>\verwerkpagina</KEYWORD2>
+ <KEYWORD2>\vl</KEYWORD2>
+ <KEYWORD2>\voetnoot</KEYWORD2>
+ <KEYWORD2>\voetnoottekst</KEYWORD2>
+ <KEYWORD2>\volgprofiel</KEYWORD2>
+ <KEYWORD2>\volgprofielversie</KEYWORD2>
+ <KEYWORD2>\volgversie</KEYWORD2>
+ <KEYWORD2>\volledigregister</KEYWORD2>
+ <KEYWORD2>\weekdag</KEYWORD2>
+ <KEYWORD2>\wiskunde</KEYWORD2>
+ <KEYWORD2>\witruimte</KEYWORD2>
+ <KEYWORD2>\woordrechts</KEYWORD2>
+ </KEYWORDS>
+ </RULES>
+</MODE>
diff --git a/context/data/context-jedit-ro.xml b/context/data/context-jedit-ro.xml
new file mode 100644
index 000000000..bb261922c
--- /dev/null
+++ b/context/data/context-jedit-ro.xml
@@ -0,0 +1,456 @@
+<?xml version='1.0'?>
+
+<!DOCTYPE MODE SYSTEM 'xmode.dtd'>
+
+<MODE>
+ <RULES>
+ <KEYWORDS>
+ <KEYWORD2>\CUVANT</KEYWORD2>
+ <KEYWORD2>\CUVINTE</KEYWORD2>
+ <KEYWORD2>\Cuvant</KEYWORD2>
+ <KEYWORD2>\Cuvinte</KEYWORD2>
+ <KEYWORD2>\LUNA</KEYWORD2>
+ <KEYWORD2>\Litera</KEYWORD2>
+ <KEYWORD2>\Litere</KEYWORD2>
+ <KEYWORD2>\Numereromane</KEYWORD2>
+ <KEYWORD2>\ZIDINSAPTAMANA</KEYWORD2>
+ <KEYWORD2>\adapteazaaspect</KEYWORD2>
+ <KEYWORD2>\adauga</KEYWORD2>
+ <KEYWORD2>\adubuffer</KEYWORD2>
+ <KEYWORD2>\adumarcaje</KEYWORD2>
+ <KEYWORD2>\afiseazaaspect</KEYWORD2>
+ <KEYWORD2>\afiseazacampuri</KEYWORD2>
+ <KEYWORD2>\afiseazaculoare</KEYWORD2>
+ <KEYWORD2>\afiseazafiguriexterne</KEYWORD2>
+ <KEYWORD2>\afiseazafonttext</KEYWORD2>
+ <KEYWORD2>\afiseazagrid</KEYWORD2>
+ <KEYWORD2>\afiseazagrupculoare</KEYWORD2>
+ <KEYWORD2>\afiseazamakeup</KEYWORD2>
+ <KEYWORD2>\afiseazamediufonttext</KEYWORD2>
+ <KEYWORD2>\afiseazapaleta</KEYWORD2>
+ <KEYWORD2>\afiseazarama</KEYWORD2>
+ <KEYWORD2>\afiseazasetari</KEYWORD2>
+ <KEYWORD2>\afiseazasetsimboluri</KEYWORD2>
+ <KEYWORD2>\afiseazastruts</KEYWORD2>
+ <KEYWORD2>\afiseazatiparire</KEYWORD2>
+ <KEYWORD2>\aliniat</KEYWORD2>
+ <KEYWORD2>\aliniatcentru</KEYWORD2>
+ <KEYWORD2>\aliniatdreapta</KEYWORD2>
+ <KEYWORD2>\aliniatstanga</KEYWORD2>
+ <KEYWORD2>\arg</KEYWORD2>
+ <KEYWORD2>\ascundeblocuri</KEYWORD2>
+ <KEYWORD2>\barainteractiune</KEYWORD2>
+ <KEYWORD2>\barasincronizare</KEYWORD2>
+ <KEYWORD2>\barasus</KEYWORD2>
+ <KEYWORD2>\blanc</KEYWORD2>
+ <KEYWORD2>\but</KEYWORD2>
+ <KEYWORD2>\butoaneinteractiune</KEYWORD2>
+ <KEYWORD2>\buton</KEYWORD2>
+ <KEYWORD2>\camp</KEYWORD2>
+ <KEYWORD2>\campumplere</KEYWORD2>
+ <KEYWORD2>\chem</KEYWORD2>
+ <KEYWORD2>\citat</KEYWORD2>
+ <KEYWORD2>\clip</KEYWORD2>
+ <KEYWORD2>\cloneazacamp</KEYWORD2>
+ <KEYWORD2>\coloana</KEYWORD2>
+ <KEYWORD2>\comentariu</KEYWORD2>
+ <KEYWORD2>\comparagrupculoare</KEYWORD2>
+ <KEYWORD2>\comparapaleta</KEYWORD2>
+ <KEYWORD2>\completeregister</KEYWORD2>
+ <KEYWORD2>\convertestenumar</KEYWORD2>
+ <KEYWORD2>\copiazacamp</KEYWORD2>
+ <KEYWORD2>\corecteazaspatiualb</KEYWORD2>
+ <KEYWORD2>\crlf</KEYWORD2>
+ <KEYWORD2>\culoare</KEYWORD2>
+ <KEYWORD2>\culoaregri</KEYWORD2>
+ <KEYWORD2>\cupleazadocument</KEYWORD2>
+ <KEYWORD2>\cupleazamarcaje</KEYWORD2>
+ <KEYWORD2>\cupleazaregistru</KEYWORD2>
+ <KEYWORD2>\cuvantdreapta</KEYWORD2>
+ <KEYWORD2>\data</KEYWORD2>
+ <KEYWORD2>\datacurenta</KEYWORD2>
+ <KEYWORD2>\datareferit</KEYWORD2>
+ <KEYWORD2>\decupleazamarcaje</KEYWORD2>
+ <KEYWORD2>\defineste</KEYWORD2>
+ <KEYWORD2>\definestealiat</KEYWORD2>
+ <KEYWORD2>\definesteantet</KEYWORD2>
+ <KEYWORD2>\definesteblanc</KEYWORD2>
+ <KEYWORD2>\definestebloc</KEYWORD2>
+ <KEYWORD2>\definesteblocsectiune</KEYWORD2>
+ <KEYWORD2>\definestebuffer</KEYWORD2>
+ <KEYWORD2>\definestecamp</KEYWORD2>
+ <KEYWORD2>\definesteconversie</KEYWORD2>
+ <KEYWORD2>\definesteculoare</KEYWORD2>
+ <KEYWORD2>\definestedescriere</KEYWORD2>
+ <KEYWORD2>\definestedimensiunehartie</KEYWORD2>
+ <KEYWORD2>\definesteenumerare</KEYWORD2>
+ <KEYWORD2>\definesteeticheta</KEYWORD2>
+ <KEYWORD2>\definestefloat</KEYWORD2>
+ <KEYWORD2>\definestefont</KEYWORD2>
+ <KEYWORD2>\definestefontraw</KEYWORD2>
+ <KEYWORD2>\definestefonttext</KEYWORD2>
+ <KEYWORD2>\definesteformatreferinte</KEYWORD2>
+ <KEYWORD2>\definestegrupculori</KEYWORD2>
+ <KEYWORD2>\definesteinconjurare</KEYWORD2>
+ <KEYWORD2>\definestelista</KEYWORD2>
+ <KEYWORD2>\definestelistacombinata</KEYWORD2>
+ <KEYWORD2>\definestelistareferinte</KEYWORD2>
+ <KEYWORD2>\definestelogo</KEYWORD2>
+ <KEYWORD2>\definestemakeup</KEYWORD2>
+ <KEYWORD2>\definestemarcaje</KEYWORD2>
+ <KEYWORD2>\definestemediulfonttext</KEYWORD2>
+ <KEYWORD2>\definestemeniuinteractiune</KEYWORD2>
+ <KEYWORD2>\definesteoutput</KEYWORD2>
+ <KEYWORD2>\definesteoverlay</KEYWORD2>
+ <KEYWORD2>\definestepaleta</KEYWORD2>
+ <KEYWORD2>\definesteparagraf</KEYWORD2>
+ <KEYWORD2>\definestepozitietext</KEYWORD2>
+ <KEYWORD2>\definesteprofil</KEYWORD2>
+ <KEYWORD2>\definesteprogram</KEYWORD2>
+ <KEYWORD2>\definestereferinte</KEYWORD2>
+ <KEYWORD2>\definesteregistru</KEYWORD2>
+ <KEYWORD2>\definesterigla</KEYWORD2>
+ <KEYWORD2>\definestesablontabel</KEYWORD2>
+ <KEYWORD2>\definestesectiune</KEYWORD2>
+ <KEYWORD2>\definestesimbol</KEYWORD2>
+ <KEYWORD2>\definestesimbolfigura</KEYWORD2>
+ <KEYWORD2>\definestesinonim</KEYWORD2>
+ <KEYWORD2>\definestesortare</KEYWORD2>
+ <KEYWORD2>\definestestartstop</KEYWORD2>
+ <KEYWORD2>\definestestivacampuri</KEYWORD2>
+ <KEYWORD2>\definestesubcamp</KEYWORD2>
+ <KEYWORD2>\definestetabulatori</KEYWORD2>
+ <KEYWORD2>\definestetext</KEYWORD2>
+ <KEYWORD2>\definestetexteinconjurate</KEYWORD2>
+ <KEYWORD2>\definestetextinconjurat</KEYWORD2>
+ <KEYWORD2>\definestetyping</KEYWORD2>
+ <KEYWORD2>\definestevariabilatext</KEYWORD2>
+ <KEYWORD2>\definesteversiune</KEYWORD2>
+ <KEYWORD2>\definetype</KEYWORD2>
+ <KEYWORD2>\despre</KEYWORD2>
+ <KEYWORD2>\determinacaracteristicilelistei</KEYWORD2>
+ <KEYWORD2>\determinanumartitlu</KEYWORD2>
+ <KEYWORD2>\dezactiveazameniuinteractiune</KEYWORD2>
+ <KEYWORD2>\din</KEYWORD2>
+ <KEYWORD2>\dute</KEYWORD2>
+ <KEYWORD2>\dutebox</KEYWORD2>
+ <KEYWORD2>\ecran</KEYWORD2>
+ <KEYWORD2>\el</KEYWORD2>
+ <KEYWORD2>\element</KEYWORD2>
+ <KEYWORD2>\emptylines</KEYWORD2>
+ <KEYWORD2>\etichete</KEYWORD2>
+ <KEYWORD2>\faraaliniat</KEYWORD2>
+ <KEYWORD2>\farafisiere</KEYWORD2>
+ <KEYWORD2>\faraliniiantetsisubsol</KEYWORD2>
+ <KEYWORD2>\faraliniisussijos</KEYWORD2>
+ <KEYWORD2>\faralista</KEYWORD2>
+ <KEYWORD2>\faramarcaje</KEYWORD2>
+ <KEYWORD2>\faraspatiu</KEYWORD2>
+ <KEYWORD2>\faraspatiualb</KEYWORD2>
+ <KEYWORD2>\figuraexterna</KEYWORD2>
+ <KEYWORD2>\firdepar</KEYWORD2>
+ <KEYWORD2>\folosesteURL</KEYWORD2>
+ <KEYWORD2>\folosestebloc</KEYWORD2>
+ <KEYWORD2>\folosestecodificarea</KEYWORD2>
+ <KEYWORD2>\folosestecomenzi</KEYWORD2>
+ <KEYWORD2>\folosestedocumentextern</KEYWORD2>
+ <KEYWORD2>\folosestefiguraexterna</KEYWORD2>
+ <KEYWORD2>\folosestefisiereexterne</KEYWORD2>
+ <KEYWORD2>\folosestefisierextern</KEYWORD2>
+ <KEYWORD2>\folosestemodul</KEYWORD2>
+ <KEYWORD2>\folosestemuzicaexterna</KEYWORD2>
+ <KEYWORD2>\folosestereferinte</KEYWORD2>
+ <KEYWORD2>\folosestesimboluri</KEYWORD2>
+ <KEYWORD2>\folosestespeciale</KEYWORD2>
+ <KEYWORD2>\footnotetext</KEYWORD2>
+ <KEYWORD2>\forteazablocuri</KEYWORD2>
+ <KEYWORD2>\fractie</KEYWORD2>
+ <KEYWORD2>\framed</KEYWORD2>
+ <KEYWORD2>\fundal</KEYWORD2>
+ <KEYWORD2>\gatablocuri</KEYWORD2>
+ <KEYWORD2>\grid</KEYWORD2>
+ <KEYWORD2>\hartiedubla</KEYWORD2>
+ <KEYWORD2>\hl</KEYWORD2>
+ <KEYWORD2>\impachetat</KEYWORD2>
+ <KEYWORD2>\impartefloat</KEYWORD2>
+ <KEYWORD2>\in</KEYWORD2>
+ <KEYWORD2>\inalt</KEYWORD2>
+ <KEYWORD2>\inaltamargine</KEYWORD2>
+ <KEYWORD2>\indreapta</KEYWORD2>
+ <KEYWORD2>\inframed</KEYWORD2>
+ <KEYWORD2>\ininner</KEYWORD2>
+ <KEYWORD2>\injos</KEYWORD2>
+ <KEYWORD2>\inlinie</KEYWORD2>
+ <KEYWORD2>\inouter</KEYWORD2>
+ <KEYWORD2>\instalarelimba</KEYWORD2>
+ <KEYWORD2>\instanga</KEYWORD2>
+ <KEYWORD2>\intins</KEYWORD2>
+ <KEYWORD2>\jos</KEYWORD2>
+ <KEYWORD2>\jossus</KEYWORD2>
+ <KEYWORD2>\la</KEYWORD2>
+ <KEYWORD2>\lapagina</KEYWORD2>
+ <KEYWORD2>\limba</KEYWORD2>
+ <KEYWORD2>\limbaprincipala</KEYWORD2>
+ <KEYWORD2>\liniemargine</KEYWORD2>
+ <KEYWORD2>\linieneagra</KEYWORD2>
+ <KEYWORD2>\liniepeste</KEYWORD2>
+ <KEYWORD2>\liniesubtire</KEYWORD2>
+ <KEYWORD2>\linieumplere</KEYWORD2>
+ <KEYWORD2>\liniinegre</KEYWORD2>
+ <KEYWORD2>\liniipeste</KEYWORD2>
+ <KEYWORD2>\liniisubtiri</KEYWORD2>
+ <KEYWORD2>\listsymbol</KEYWORD2>
+ <KEYWORD2>\litera</KEYWORD2>
+ <KEYWORD2>\litere</KEYWORD2>
+ <KEYWORD2>\logcampuri</KEYWORD2>
+ <KEYWORD2>\luna</KEYWORD2>
+ <KEYWORD2>\mar</KEYWORD2>
+ <KEYWORD2>\marcaje</KEYWORD2>
+ <KEYWORD2>\marcheazaversiune</KEYWORD2>
+ <KEYWORD2>\marginal</KEYWORD2>
+ <KEYWORD2>\matematica</KEYWORD2>
+ <KEYWORD2>\minicitat</KEYWORD2>
+ <KEYWORD2>\mutapegrid</KEYWORD2>
+ <KEYWORD2>\nop</KEYWORD2>
+ <KEYWORD2>\nota</KEYWORD2>
+ <KEYWORD2>\notasubsol</KEYWORD2>
+ <KEYWORD2>\numartitlu</KEYWORD2>
+ <KEYWORD2>\numartitlucurent</KEYWORD2>
+ <KEYWORD2>\numere</KEYWORD2>
+ <KEYWORD2>\numereromane</KEYWORD2>
+ <KEYWORD2>\nutesta</KEYWORD2>
+ <KEYWORD2>\olinie</KEYWORD2>
+ <KEYWORD2>\pagina</KEYWORD2>
+ <KEYWORD2>\paginadubla</KEYWORD2>
+ <KEYWORD2>\pastreazablocuri</KEYWORD2>
+ <KEYWORD2>\placefloat</KEYWORD2>
+ <KEYWORD2>\plaseazapegrid</KEYWORD2>
+ <KEYWORD2>\plaseazasemnecarte</KEYWORD2>
+ <KEYWORD2>\potrivestecamp</KEYWORD2>
+ <KEYWORD2>\pozitie</KEYWORD2>
+ <KEYWORD2>\pozitietext</KEYWORD2>
+ <KEYWORD2>\proceseazabloc</KEYWORD2>
+ <KEYWORD2>\proceseazapagina</KEYWORD2>
+ <KEYWORD2>\program</KEYWORD2>
+ <KEYWORD2>\publicatie</KEYWORD2>
+ <KEYWORD2>\puncte</KEYWORD2>
+ <KEYWORD2>\punedeasuprafiecareia</KEYWORD2>
+ <KEYWORD2>\punefatainfata</KEYWORD2>
+ <KEYWORD2>\puneformula</KEYWORD2>
+ <KEYWORD2>\punelegenda</KEYWORD2>
+ <KEYWORD2>\punelista</KEYWORD2>
+ <KEYWORD2>\punelistacombinata</KEYWORD2>
+ <KEYWORD2>\punelistareferinte</KEYWORD2>
+ <KEYWORD2>\punelogouri</KEYWORD2>
+ <KEYWORD2>\punenotesubsol</KEYWORD2>
+ <KEYWORD2>\punenotesubsollocale</KEYWORD2>
+ <KEYWORD2>\puneregistru</KEYWORD2>
+ <KEYWORD2>\punerigla</KEYWORD2>
+ <KEYWORD2>\punesubformula</KEYWORD2>
+ <KEYWORD2>\punevariabilatext</KEYWORD2>
+ <KEYWORD2>\ran</KEYWORD2>
+ <KEYWORD2>\ref</KEYWORD2>
+ <KEYWORD2>\referinta</KEYWORD2>
+ <KEYWORD2>\referintapagina</KEYWORD2>
+ <KEYWORD2>\referintatext</KEYWORD2>
+ <KEYWORD2>\referit</KEYWORD2>
+ <KEYWORD2>\reflexie</KEYWORD2>
+ <KEYWORD2>\reset</KEYWORD2>
+ <KEYWORD2>\reseteazamarcaje</KEYWORD2>
+ <KEYWORD2>\riglatext</KEYWORD2>
+ <KEYWORD2>\rigleumplere</KEYWORD2>
+ <KEYWORD2>\roteste</KEYWORD2>
+ <KEYWORD2>\saripesteblocuri</KEYWORD2>
+ <KEYWORD2>\scala</KEYWORD2>
+ <KEYWORD2>\scriebuffer</KEYWORD2>
+ <KEYWORD2>\scrieinlista</KEYWORD2>
+ <KEYWORD2>\scrieinlistareferinte</KEYWORD2>
+ <KEYWORD2>\scrieinregistru</KEYWORD2>
+ <KEYWORD2>\scrieintreliste</KEYWORD2>
+ <KEYWORD2>\selecteazablocuri</KEYWORD2>
+ <KEYWORD2>\selecteazahartie</KEYWORD2>
+ <KEYWORD2>\selecteazaversiune</KEYWORD2>
+ <KEYWORD2>\semncarte</KEYWORD2>
+ <KEYWORD2>\setarebarasincronizare</KEYWORD2>
+ <KEYWORD2>\setarelimba</KEYWORD2>
+ <KEYWORD2>\setareoutput</KEYWORD2>
+ <KEYWORD2>\setarepozitie</KEYWORD2>
+ <KEYWORD2>\setaresincronizare</KEYWORD2>
+ <KEYWORD2>\seteazaaliniat</KEYWORD2>
+ <KEYWORD2>\seteazaaliniate</KEYWORD2>
+ <KEYWORD2>\seteazaalinierea</KEYWORD2>
+ <KEYWORD2>\seteazaantet</KEYWORD2>
+ <KEYWORD2>\seteazaaranjareapag</KEYWORD2>
+ <KEYWORD2>\seteazaaspect</KEYWORD2>
+ <KEYWORD2>\seteazabarainteractiune</KEYWORD2>
+ <KEYWORD2>\seteazablanc</KEYWORD2>
+ <KEYWORD2>\seteazabloc</KEYWORD2>
+ <KEYWORD2>\seteazablocsectiune</KEYWORD2>
+ <KEYWORD2>\seteazablocurimarginale</KEYWORD2>
+ <KEYWORD2>\seteazabuffer</KEYWORD2>
+ <KEYWORD2>\seteazabutoane</KEYWORD2>
+ <KEYWORD2>\seteazacamp</KEYWORD2>
+ <KEYWORD2>\seteazacampuri</KEYWORD2>
+ <KEYWORD2>\seteazaclipping</KEYWORD2>
+ <KEYWORD2>\seteazacoloane</KEYWORD2>
+ <KEYWORD2>\seteazacombinari</KEYWORD2>
+ <KEYWORD2>\seteazacomentariu</KEYWORD2>
+ <KEYWORD2>\seteazaculoare</KEYWORD2>
+ <KEYWORD2>\seteazaculori</KEYWORD2>
+ <KEYWORD2>\seteazadefinireanotasubsol</KEYWORD2>
+ <KEYWORD2>\seteazadescriere</KEYWORD2>
+ <KEYWORD2>\seteazadimensiunihartie</KEYWORD2>
+ <KEYWORD2>\seteazaecrane</KEYWORD2>
+ <KEYWORD2>\seteazaecraninteractiune</KEYWORD2>
+ <KEYWORD2>\seteazaelemente</KEYWORD2>
+ <KEYWORD2>\seteazaenumerare</KEYWORD2>
+ <KEYWORD2>\seteazafiguriexterne</KEYWORD2>
+ <KEYWORD2>\seteazafloat</KEYWORD2>
+ <KEYWORD2>\seteazafloats</KEYWORD2>
+ <KEYWORD2>\seteazafonttext</KEYWORD2>
+ <KEYWORD2>\seteazaformulare</KEYWORD2>
+ <KEYWORD2>\seteazafundal</KEYWORD2>
+ <KEYWORD2>\seteazafundaluri</KEYWORD2>
+ <KEYWORD2>\seteazagrosimelinie</KEYWORD2>
+ <KEYWORD2>\seteazaimpartireafloat</KEYWORD2>
+ <KEYWORD2>\seteazainconjurat</KEYWORD2>
+ <KEYWORD2>\seteazaingust</KEYWORD2>
+ <KEYWORD2>\seteazainteractiunea</KEYWORD2>
+ <KEYWORD2>\seteazajos</KEYWORD2>
+ <KEYWORD2>\seteazalegenda</KEYWORD2>
+ <KEYWORD2>\seteazalegendele</KEYWORD2>
+ <KEYWORD2>\seteazaliniesilabe</KEYWORD2>
+ <KEYWORD2>\seteazaliniesubtire</KEYWORD2>
+ <KEYWORD2>\seteazalinii</KEYWORD2>
+ <KEYWORD2>\seteazaliniimargine</KEYWORD2>
+ <KEYWORD2>\seteazaliniinegre</KEYWORD2>
+ <KEYWORD2>\seteazaliniiumplere</KEYWORD2>
+ <KEYWORD2>\seteazalista</KEYWORD2>
+ <KEYWORD2>\seteazalistacombinata</KEYWORD2>
+ <KEYWORD2>\seteazalistareferinte</KEYWORD2>
+ <KEYWORD2>\seteazamajuscule</KEYWORD2>
+ <KEYWORD2>\seteazamakeup</KEYWORD2>
+ <KEYWORD2>\seteazamarcaje</KEYWORD2>
+ <KEYWORD2>\seteazamarginal</KEYWORD2>
+ <KEYWORD2>\seteazamediulfonttext</KEYWORD2>
+ <KEYWORD2>\seteazaminicitat</KEYWORD2>
+ <KEYWORD2>\seteazanotasubsol</KEYWORD2>
+ <KEYWORD2>\seteazanumarpagina</KEYWORD2>
+ <KEYWORD2>\seteazanumarsubpagina</KEYWORD2>
+ <KEYWORD2>\seteazanumartitlu</KEYWORD2>
+ <KEYWORD2>\seteazanumerotare</KEYWORD2>
+ <KEYWORD2>\seteazanumerotarelinii</KEYWORD2>
+ <KEYWORD2>\seteazanumerotarepagina</KEYWORD2>
+ <KEYWORD2>\seteazanumerotareparagrafe</KEYWORD2>
+ <KEYWORD2>\seteazapaleta</KEYWORD2>
+ <KEYWORD2>\seteazaparagrafe</KEYWORD2>
+ <KEYWORD2>\seteazaplasareaopozita</KEYWORD2>
+ <KEYWORD2>\seteazapozitietext</KEYWORD2>
+ <KEYWORD2>\seteazaprofile</KEYWORD2>
+ <KEYWORD2>\seteazaprograme</KEYWORD2>
+ <KEYWORD2>\seteazapublicatii</KEYWORD2>
+ <KEYWORD2>\seteazareferinte</KEYWORD2>
+ <KEYWORD2>\seteazaregistru</KEYWORD2>
+ <KEYWORD2>\seteazarigla</KEYWORD2>
+ <KEYWORD2>\seteazarigletext</KEYWORD2>
+ <KEYWORD2>\seteazarigleumplere</KEYWORD2>
+ <KEYWORD2>\seteazarotare</KEYWORD2>
+ <KEYWORD2>\seteazasectiune</KEYWORD2>
+ <KEYWORD2>\seteazasimbol</KEYWORD2>
+ <KEYWORD2>\seteazasinonime</KEYWORD2>
+ <KEYWORD2>\seteazasistem</KEYWORD2>
+ <KEYWORD2>\seteazasortare</KEYWORD2>
+ <KEYWORD2>\seteazaspatiu</KEYWORD2>
+ <KEYWORD2>\seteazaspatiualb</KEYWORD2>
+ <KEYWORD2>\seteazaspatiuinterliniar</KEYWORD2>
+ <KEYWORD2>\seteazastrut</KEYWORD2>
+ <KEYWORD2>\seteazasublinie</KEYWORD2>
+ <KEYWORD2>\seteazasubsol</KEYWORD2>
+ <KEYWORD2>\seteazasus</KEYWORD2>
+ <KEYWORD2>\seteazatab</KEYWORD2>
+ <KEYWORD2>\seteazatabele</KEYWORD2>
+ <KEYWORD2>\seteazatabulatori</KEYWORD2>
+ <KEYWORD2>\seteazatext</KEYWORD2>
+ <KEYWORD2>\seteazatexteantet</KEYWORD2>
+ <KEYWORD2>\seteazatextejos</KEYWORD2>
+ <KEYWORD2>\seteazatextesubsol</KEYWORD2>
+ <KEYWORD2>\seteazatextesus</KEYWORD2>
+ <KEYWORD2>\seteazatextetext</KEYWORD2>
+ <KEYWORD2>\seteazatexteticheta</KEYWORD2>
+ <KEYWORD2>\seteazatexttitlu</KEYWORD2>
+ <KEYWORD2>\seteazatitlu</KEYWORD2>
+ <KEYWORD2>\seteazatitluri</KEYWORD2>
+ <KEYWORD2>\seteazatoleranta</KEYWORD2>
+ <KEYWORD2>\seteazatranzitiepagina</KEYWORD2>
+ <KEYWORD2>\seteazatype</KEYWORD2>
+ <KEYWORD2>\seteazatyping</KEYWORD2>
+ <KEYWORD2>\seteazaurl</KEYWORD2>
+ <KEYWORD2>\seteazavariabilatext</KEYWORD2>
+ <KEYWORD2>\seteazaversiuni</KEYWORD2>
+ <KEYWORD2>\setupitemgroup</KEYWORD2>
+ <KEYWORD2>\setuppaper</KEYWORD2>
+ <KEYWORD2>\setvariabilatext</KEYWORD2>
+ <KEYWORD2>\sim</KEYWORD2>
+ <KEYWORD2>\simbol</KEYWORD2>
+ <KEYWORD2>\sincronizeaza</KEYWORD2>
+ <KEYWORD2>\spatiifixate</KEYWORD2>
+ <KEYWORD2>\spatiu</KEYWORD2>
+ <KEYWORD2>\spatiualb</KEYWORD2>
+ <KEYWORD2>\start</KEYWORD2>
+ <KEYWORD2>\startcitat</KEYWORD2>
+ <KEYWORD2>\startcomentariu</KEYWORD2>
+ <KEYWORD2>\startcomponenta</KEYWORD2>
+ <KEYWORD2>\startculoare</KEYWORD2>
+ <KEYWORD2>\startfact</KEYWORD2>
+ <KEYWORD2>\startfundal</KEYWORD2>
+ <KEYWORD2>\startimpachetat</KEYWORD2>
+ <KEYWORD2>\startliniemargine</KEYWORD2>
+ <KEYWORD2>\startmediu</KEYWORD2>
+ <KEYWORD2>\startmeniuinteractiune</KEYWORD2>
+ <KEYWORD2>\startproiect</KEYWORD2>
+ <KEYWORD2>\startriglatext</KEYWORD2>
+ <KEYWORD2>\startversiune</KEYWORD2>
+ <KEYWORD2>\stivacampuri</KEYWORD2>
+ <KEYWORD2>\stop</KEYWORD2>
+ <KEYWORD2>\stopcitat</KEYWORD2>
+ <KEYWORD2>\stopcomentariu</KEYWORD2>
+ <KEYWORD2>\stopcomponenta</KEYWORD2>
+ <KEYWORD2>\stopculoare</KEYWORD2>
+ <KEYWORD2>\stopfact</KEYWORD2>
+ <KEYWORD2>\stopfundal</KEYWORD2>
+ <KEYWORD2>\stopimpachetat</KEYWORD2>
+ <KEYWORD2>\stopliniemargine</KEYWORD2>
+ <KEYWORD2>\stopmediu</KEYWORD2>
+ <KEYWORD2>\stopmeniuinteractiune</KEYWORD2>
+ <KEYWORD2>\stopproiect</KEYWORD2>
+ <KEYWORD2>\stopriglatext</KEYWORD2>
+ <KEYWORD2>\stopversiune</KEYWORD2>
+ <KEYWORD2>\sublinie</KEYWORD2>
+ <KEYWORD2>\sublinii</KEYWORD2>
+ <KEYWORD2>\supralinie</KEYWORD2>
+ <KEYWORD2>\tab</KEYWORD2>
+ <KEYWORD2>\tex</KEYWORD2>
+ <KEYWORD2>\texteticheta</KEYWORD2>
+ <KEYWORD2>\textmarginal</KEYWORD2>
+ <KEYWORD2>\texttitlu</KEYWORD2>
+ <KEYWORD2>\textumplere</KEYWORD2>
+ <KEYWORD2>\tippagina</KEYWORD2>
+ <KEYWORD2>\titlu</KEYWORD2>
+ <KEYWORD2>\tooltip</KEYWORD2>
+ <KEYWORD2>\traduce</KEYWORD2>
+ <KEYWORD2>\trecilafontraw</KEYWORD2>
+ <KEYWORD2>\trecilafonttext</KEYWORD2>
+ <KEYWORD2>\typ</KEYWORD2>
+ <KEYWORD2>\type</KEYWORD2>
+ <KEYWORD2>\typefile</KEYWORD2>
+ <KEYWORD2>\undeva</KEYWORD2>
+ <KEYWORD2>\urmeazaprofil</KEYWORD2>
+ <KEYWORD2>\urmeazaversiune</KEYWORD2>
+ <KEYWORD2>\urmeazaversiuneprofil</KEYWORD2>
+ <KEYWORD2>\variabilatext</KEYWORD2>
+ <KEYWORD2>\versiune</KEYWORD2>
+ <KEYWORD2>\vl</KEYWORD2>
+ <KEYWORD2>\zidinsaptamana</KEYWORD2>
+ </KEYWORDS>
+ </RULES>
+</MODE>
diff --git a/context/data/context-jedit.xml b/context/data/context-jedit.xml
new file mode 100644
index 000000000..8e91f75e5
--- /dev/null
+++ b/context/data/context-jedit.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE MODE SYSTEM "xmode.dtd">
+
+<MODE>
+
+ <!-- complex regexps are way too slow and freeze jedit on large files -->
+
+
+ <RULES>
+ <SEQ_REGEXP HASH_CHAR='%' DELEGATE='nl'>^%.*interface=(dutch|nl).*</SEQ_REGEXP>
+ <SEQ_REGEXP HASH_CHAR='%' DELEGATE='en'>^%.*interface=(english|en).*</SEQ_REGEXP>
+ <SEQ_REGEXP HASH_CHAR='%' DELEGATE='de'>^%.*interface=(german|de).*</SEQ_REGEXP>
+ <SEQ_REGEXP HASH_CHAR='%' DELEGATE='cz'>^%.*interface=(czech|cz).*</SEQ_REGEXP>
+ <SEQ_REGEXP HASH_CHAR='%' DELEGATE='it'>^%.*interface=(italian|it).*</SEQ_REGEXP>
+ <SEQ_REGEXP HASH_CHAR='%' DELEGATE='ro'>^%.*interface=(romanian|ro).*</SEQ_REGEXP>
+
+ <IMPORT DELEGATE="common"/>
+
+ </RULES>
+
+ <RULES SET='common'>
+
+ <SEQ_REGEXP TYPE='COMMENT2' HASH_CHAR='%'>^%[A-Z](\s|$)</SEQ_REGEXP>
+
+ <SEQ_REGEXP TYPE='KEYWORD2' HASH_CHAR='\'>\\[@?!]([^@?!a-zA-Z]|$)</SEQ_REGEXP>
+
+ <SEQ TYPE="KEYWORD2">\\</SEQ>
+
+ <SEQ TYPE="KEYWORD2">\$</SEQ>
+ <SEQ TYPE="KEYWORD2">\{</SEQ>
+ <SEQ TYPE="KEYWORD2">\}</SEQ>
+
+ <SEQ TYPE="KEYWORD2">\#</SEQ>
+ <SEQ TYPE="KEYWORD2">\(</SEQ>
+ <SEQ TYPE="KEYWORD2">\)</SEQ>
+ <SEQ TYPE="KEYWORD2">\[</SEQ>
+ <SEQ TYPE="KEYWORD2">\]</SEQ>
+ <SEQ TYPE="KEYWORD2">\&lt;</SEQ>
+ <SEQ TYPE="KEYWORD2">\&gt;</SEQ>
+ <SEQ TYPE="KEYWORD2">\=</SEQ>
+
+ <SEQ TYPE="KEYWORD2">\~</SEQ>
+ <SEQ TYPE="KEYWORD2">\%</SEQ>
+ <SEQ TYPE="KEYWORD2">\^</SEQ>
+ <SEQ TYPE="KEYWORD2">\&amp;</SEQ>
+ <SEQ TYPE="KEYWORD2">\-</SEQ>
+ <SEQ TYPE="KEYWORD2">\+</SEQ>
+ <SEQ TYPE="KEYWORD2">\/</SEQ>
+ <SEQ TYPE="KEYWORD2">\|</SEQ>
+
+ <SEQ TYPE="KEYWORD2">\`</SEQ>
+ <SEQ TYPE="KEYWORD2">\*</SEQ>
+ <SEQ TYPE="KEYWORD2">\_</SEQ>
+ <SEQ TYPE="KEYWORD2">\:</SEQ>
+ <SEQ TYPE="KEYWORD2">\;</SEQ>
+ <SEQ TYPE="KEYWORD2">\"</SEQ>
+ <SEQ TYPE="KEYWORD2">\'</SEQ>
+ <SEQ TYPE="KEYWORD2">\.</SEQ>
+ <SEQ TYPE="KEYWORD2">\,</SEQ>
+
+ <SEQ TYPE="KEYWORD2">\1</SEQ>
+ <SEQ TYPE="KEYWORD2">\2</SEQ>
+ <SEQ TYPE="KEYWORD2">\3</SEQ>
+ <SEQ TYPE="KEYWORD2">\4</SEQ>
+ <SEQ TYPE="KEYWORD2">\5</SEQ>
+ <SEQ TYPE="KEYWORD2">\6</SEQ>
+ <SEQ TYPE="KEYWORD2">\7</SEQ>
+ <SEQ TYPE="KEYWORD2">\8</SEQ>
+ <SEQ TYPE="KEYWORD2">\9</SEQ>
+ <SEQ TYPE="KEYWORD2">\0</SEQ>
+
+ <SEQ TYPE="COMMENT1">$</SEQ>
+ <SEQ TYPE="COMMENT1">{</SEQ>
+ <SEQ TYPE="COMMENT1">}</SEQ>
+
+ <SEQ TYPE="KEYWORD1">#</SEQ>
+ <SEQ TYPE="KEYWORD1">(</SEQ>
+ <SEQ TYPE="KEYWORD1">)</SEQ>
+ <SEQ TYPE="KEYWORD1">[</SEQ>
+ <SEQ TYPE="KEYWORD1">]</SEQ>
+ <SEQ TYPE="KEYWORD1">&lt;</SEQ>
+ <SEQ TYPE="KEYWORD1">&gt;</SEQ>
+ <SEQ TYPE="KEYWORD1">=</SEQ>
+ <SEQ TYPE="KEYWORD4">"</SEQ>
+
+ <SEQ TYPE="COMMENT2">~</SEQ>
+ <SEQ TYPE="COMMENT2">%</SEQ>
+ <SEQ TYPE="COMMENT2">^</SEQ>
+ <SEQ TYPE="COMMENT2">&amp;</SEQ>
+ <SEQ TYPE="COMMENT2">-</SEQ>
+ <SEQ TYPE="COMMENT2">+</SEQ>
+ <SEQ TYPE="COMMENT2">/</SEQ>
+ <SEQ TYPE="COMMENT2">|</SEQ>
+
+ <SEQ TYPE="KEYWORD4">`</SEQ>
+ <SEQ TYPE="KEYWORD4">*</SEQ>
+ <SEQ TYPE="KEYWORD4">_</SEQ>
+ <SEQ TYPE="KEYWORD4">'</SEQ>
+
+ </RULES>
+
+ <RULES SET='en'>
+ <IMPORT DELEGATE="context-base::context.base"/>
+ <IMPORT DELEGATE="cont-en::MAIN"/>
+ <IMPORT DELEGATE="common"/>
+ </RULES>
+ <RULES SET='nl'>
+ <IMPORT DELEGATE="context-base::context.base"/>
+ <IMPORT DELEGATE="cont-nl::MAIN"/>
+ <IMPORT DELEGATE="common"/>
+ </RULES>
+ <RULES SET='de'>
+ <IMPORT DELEGATE="context-base::context.base"/>
+ <IMPORT DELEGATE="cont-de::MAIN"/>
+ <IMPORT DELEGATE="common"/>
+ </RULES>
+ <RULES SET='cz'>
+ <IMPORT DELEGATE="context-base::context.base"/>
+ <IMPORT DELEGATE="cont-cz::MAIN"/>
+ <IMPORT DELEGATE="common"/>
+ </RULES>
+ <RULES SET='it'>
+ <IMPORT DELEGATE="context-base::context.base"/>
+ <IMPORT DELEGATE="cont-it::MAIN"/>
+ <IMPORT DELEGATE="common"/>
+ </RULES>
+ <RULES SET='ro'>
+ <IMPORT DELEGATE="context-base::context.base"/>
+ <IMPORT DELEGATE="cont-ro::MAIN"/>
+ <IMPORT DELEGATE="common"/>
+ </RULES>
+
+</MODE>
diff --git a/scripts/context/ruby/texmfstart.rb b/scripts/context/ruby/texmfstart.rb
index 74d9e3d24..bfa50eb37 100644
--- a/scripts/context/ruby/texmfstart.rb
+++ b/scripts/context/ruby/texmfstart.rb
@@ -28,7 +28,7 @@ require "rbconfig"
$mswindows = Config::CONFIG['host_os'] =~ /mswin/
$separator = File::PATH_SEPARATOR
-$version = "1.05"
+$version = "1.5.2"
if $mswindows then
@@ -88,7 +88,6 @@ else
end
-
class File
def File.needsupdate(oldname,newname)
@@ -102,7 +101,7 @@ class File
def File.syncmtimes(oldname,newname)
begin
t = File.mtime(oldname) # i'm not sure if the time is frozen, so we do it here
- File.utime(0,t,newname)
+ File.utime(0,t,oldname,newname)
rescue
end
end
@@ -172,14 +171,28 @@ def launch(filename)
end
end
-def expanded(arg)
+def expanded(arg) # no "other text files", too restricted
arg.gsub(/kpse\:(\S+)/o) do
original, resolved = $1, ''
+ if $program && ! $program.empty? then
+ pstr = "-progname=#{$program}"
+ else
+ pstr = ''
+ end
+ # auto suffix with texinputs as fall back
begin
- resolved = `kpsewhich -progname=#{program} -format=\"other text files\" #{file}`.chomp
+ resolved = `kpsewhich #{pstr} #{original}`.chomp
rescue
resolved = ''
end
+ # elsewhere in the tree
+ if resolved.empty? then
+ begin
+ resolved = `kpsewhich #{pstr} -format="other text files" #{original}`.chomp
+ rescue
+ resolved = ''
+ end
+ end
if resolved.empty? then
report("#{original} is not resolved") unless $report
original
@@ -194,9 +207,10 @@ def runcommand(command)
if $locate then
print(command)
elsif $execute then
- report("using 'exec' instead of 'system' call") if $verbose
+ report("using 'exec' instead of 'system' call: #{command}") if $verbose
exec(command)
else
+ report("using 'system' call: #{command}") if $verbose
system(command)
end
end
@@ -260,6 +274,7 @@ def usage
print(" texmfstart --program=yourtex yourscript.pl arg-1 arg-2\n")
print(" texmfstart --direct xsltproc kpse:somefile.xsl somefile.xml\n")
print(" texmfstart bin:xsltproc kpse:somefile.xsl somefile.xml\n")
+ print(" texmfstart --iftouched=normal,lowres downsample.rb normal lowres\n")
end
# somehow registration does not work out (at least not under windows)
@@ -538,12 +553,32 @@ $indirect = $directives['indirect'] || false
$iftouched = $directives['iftouched'] || false
+$openoffice = $directives['oo'] || false
+
$applications['unknown'] = ''
$applications['perl'] = $applications['pl'] = 'perl'
$applications['ruby'] = $applications['rb'] = 'ruby'
$applications['python'] = $applications['py'] = 'python'
$applications['java'] = $applications['jar'] = 'java'
+if $openoffice then
+ if ENV['OOPATH'] then
+ if FileTest.directory?(ENV['OOPATH']) then
+ report("using open office python") if $verbose
+ if $mswindows then
+ $applications['python'] = $applications['py'] = "\"#{File.join(ENV['OOPATH'],'program','python.bat')}\""
+ else
+ $applications['python'] = $applications['py'] = File.join(ENV['OOPATH'],'python')
+ end
+ report("python path #{$applications['python']}") if $verbose
+ else
+ report("environment variable 'OOPATH' does not exist") if $verbose
+ end
+ else
+ report("environment variable 'OOPATH' is not set") if $verbose
+ end
+end
+
if $mswindows then
$applications['pdf'] = ['',"pdfopen --page #{$page} --file",'acroread']
$applications['html'] = ['','netscape','mozilla','opera','iexplore']
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 42faa8da3..8b21feee7 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -23,6 +23,13 @@
\ifx\normalcompound\undefined \let\normalcompound=| \fi
+\def\defXMLattributestring#1#2#3#4%
+ {\ifcsname\@@XMLvariable:#2:#3\endcsname
+ \@EA\convertcommand\csname\@@XMLvariable:#2:#3\endcsname\to#1%
+ \else
+ \convertargument#4\to#1%
+ \fi}
+
\bgroup \catcode`\<=\active
% usage: \expanded{\rescanXMLatttributes{fo:table-cell}}
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index f5b5b81f5..05033cb1b 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -31,7 +31,7 @@
%D 2004.8.30 the low level interface is english. Watch out and adapt
%D your styles an modules.
-\def\contextversion{2004.12.06}
+\def\contextversion{2004.12.17}
%D Welcome to the main module. When this module is ran through
%D \type{initex} or \type {tex -i} or \type {whatevertex} using
diff --git a/tex/context/base/core-fld.tex b/tex/context/base/core-fld.tex
index 8f8c5f263..b926b8a7a 100644
--- a/tex/context/base/core-fld.tex
+++ b/tex/context/base/core-fld.tex
@@ -486,7 +486,7 @@
{\def\@@DriverFieldValues{yes,no}}
{\def\@@DriverFieldValues{#4}}%
\doifelsenothing{#5}
- {\dogetcommacommandelement2\from\@@DriverFieldValues\to\@@DriverFieldDefault
+ {\dogetcommacommandelement2\from\@@DriverFieldValues \to\@@DriverFieldDefault
\dogetcommacommandelement1\from\@@DriverFieldDefault\to\@@DriverFieldDefault}
{\def\@@DriverFieldDefault{#5}}%
\setfield{#1}{#2}{}{}{\@@DriverFieldKids}{#3}{\@@DriverFieldMode\@@DriverFieldFree\@@DriverFieldAuto}{\@@DriverFieldValues}{\@@DriverFieldDefault}}
diff --git a/tex/context/base/core-fnt.tex b/tex/context/base/core-fnt.tex
index 5315f4d88..47c08451b 100644
--- a/tex/context/base/core-fnt.tex
+++ b/tex/context/base/core-fnt.tex
@@ -143,14 +143,11 @@
%D Some precautions for a \PLAIN\ \TEX\ definition.
-\let\normalcap\cap
+\unexpanded\def\normalcap{\dohandlemathtoken{cap}}
+\unexpanded\def\normalCap{\dohandlemathtoken{Cap}}
-\def\cap
- {\ifmmode
- \expandafter\normalcap
- \else
- \expandafter\smallcapped
- \fi}
+\def\cap{\mathortext\normalcap\smallcapped}
+\def\Cap{\mathortext\normalCap\SmallCapped}
%D \macros
%D {setupcapitals}
@@ -501,17 +498,26 @@
\def\betweenunderbarspaces
{\hskip\currentspaceskip}
-\unexpanded\def\dounderbar#1#2%
+% \unexpanded\def\dounderbar#1#2%
+% {\let\betweenisolatedwords#1%
+% \processisolatedwords{#2}\dodounderbar
+% \egroup}
+
+% \unexpanded\def\underbar
+% {\bgroup
+% \increment\underbarlevel
+% \donetrue
+% \dounderbar\betweenunderbarwords}
+
+\unexpanded\def\dounderbar#1%
{\let\betweenisolatedwords#1%
+ \dosingleempty\redounderbar}
+
+\unexpanded\def\redounderbar[#1]#2%
+ {\iffirstargument\setupunderbar[#1]\fi
\processisolatedwords{#2}\dodounderbar
\egroup}
-\unexpanded\def\underbar
- {\bgroup
- \increment\underbarlevel
- \donetrue
- \dounderbar\betweenunderbarwords}
-
\unexpanded\def\underbars
{\bgroup
\increment\underbarlevel
@@ -557,6 +563,8 @@
\processisolatedwords{#1}\dooverstrike
\egroup}
+\def\underbarparameter#1{\csname\??on#1\csname}
+
\def\setupunderbar
{\dodoubleargument\getparameters[\??on]}
diff --git a/tex/context/base/core-ini.tex b/tex/context/base/core-ini.tex
index 3dde16abc..a63b0c74e 100644
--- a/tex/context/base/core-ini.tex
+++ b/tex/context/base/core-ini.tex
@@ -40,6 +40,7 @@
\appendtoks \insertparagraphintro \to \everypar
\appendtoks \flushpostponedbookmark \to \neverypar
+\appendtoks \flushpostponedbookmark \to \everylistentry
\appendtoks \flushnotes \to \everydisplay
\appendtoks \adjustsidefloatdisplaylines \to \everydisplay
diff --git a/tex/context/base/core-lst.tex b/tex/context/base/core-lst.tex
index b3283bb65..9f7fec285 100644
--- a/tex/context/base/core-lst.tex
+++ b/tex/context/base/core-lst.tex
@@ -39,6 +39,7 @@
\def\dodowritetolist#1#2#3#4%
{\begingroup
+ \expanded{\everylistentry\emptytoks\the\everylistentry}% \emptytoks, else loop
\def\currentlist{#1}%
\convertexpanded{\??li\currentlist}{#3}\asciilistentry
\makesectionformat
diff --git a/tex/context/base/core-ltb.tex b/tex/context/base/core-ltb.tex
index ba0ba862d..ee00501a1 100644
--- a/tex/context/base/core-ltb.tex
+++ b/tex/context/base/core-ltb.tex
@@ -482,8 +482,8 @@
{\setuplinetable[\c!maxwidth=\zeropoint]}%
\processaction
[\linetableparameter\c!stretch]
- [\v!no=>{\setuplinetable[\c!stretch=\maxdimen]},% no stretch
- \v!yes=>{\setuplinetable[\c!stretch=\zeropoint]}]% max stretch
+ [ \v!no=>{\setuplinetable[\c!stretch=\maxdimen]},% no stretch
+ \v!yes=>{\setuplinetable[\c!stretch=\zeropoint]}]% max stretch
\chardef\linetablerepeat\linetableparameter\c!nleft
\chardef\linetablesplitstate % =
\ifdim\linetableparameter\c!maxwidth>\zeropoint
@@ -754,14 +754,12 @@
\doifnotmode{demo}{\endinput}
-% to be documented, see stan's ledger styles for an example
+\setuplinetable[n=6,m={2,2,2},lines=25] % m ?
-\setuplinetable[n=6,m={2,2,2},regels=25]
-
-\setuplinetable[c][1][width=2cm,background=color,backgroundcolor=red]
-\setuplinetable[c][4][width=3cm,background=color,backgroundcolor=yellow]
-\setuplinetable[c][6][width=3cm,background=color,backgroundcolor=magenta]
-\setuplinetable[r][odd][background=color,backgroundcolor=gray]
+\setuplinetable[c][1] [width=2cm,background=color,backgroundcolor=red]
+\setuplinetable[c][4] [width=3cm,background=color,backgroundcolor=yellow]
+\setuplinetable[c][6] [width=3cm,background=color,backgroundcolor=magenta]
+\setuplinetable[r][odd] [background=color,backgroundcolor=gray]
\setuplinetable[r][even][background=color,backgroundcolor=green]
\starttext
@@ -774,15 +772,20 @@
\startlinetable
\NC aaa\crlf aaa \NC bb \NC c \NC ddddd \NC eeee \NC ff \NC \NR
-\dorecurse{100}
- {\NC aaa \NC bb \NC c \NC ddddd \NC eeee \NC ff \NC \NR}
+\dorecurse{100}{\NC aaa \NC bb \NC c \NC ddddd \NC eeee \NC ff \NC \NR}
\stoplinetable
\startlinetable
\NC[style=slanted,color=green,background=color,backgroundcolor=darkred,nx=2,uitlijnen=middle] xxx
\NC yy \NC ddddd \NC eeee \NC ff \NC \NR
-\dorecurse{100}
- {\NC aaa \NC bb \NC c \NC ddddd \NC eeee \NC ff \NC \NR}
+\dorecurse{100}{\NC aaa \NC bb \NC c \NC ddddd \NC eeee \NC ff \NC \NR}
\stoplinetable
+% \startbuffer[lt]
+% \NC aaa\crlf aaa \NC bb \NC c \NC ddddd \NC ee \NC ff \NC \NR
+% \NC aaa\crlf aaa \NC b \NC cc \NC ddd \NC eeee \NC f \NC \NR
+% \stopbuffer
+%
+% \processlinetablebuffer[lt]
+
\stoptext
diff --git a/tex/context/base/core-mis.tex b/tex/context/base/core-mis.tex
index c86df8716..701da14f6 100644
--- a/tex/context/base/core-mis.tex
+++ b/tex/context/base/core-mis.tex
@@ -778,6 +778,9 @@
\c!before=\startnarrower,
\c!after=\stopnarrower]
+\appendtoks\def\quotation#1{"#1"}\to\simplifiedcommands
+\appendtoks\def\quote #1{'#1'}\to\simplifiedcommands
+
%D The next features was so desperately needed by Giuseppe
%D Bilotta that he made a module for it. Since this is a
%D typical example of core functionality, I decided to extend
@@ -2358,9 +2361,9 @@
{\getparameters[\??ro][#1]%
\processaction
[\@@rolocation]
- [\v!depth=>\!!counta\plusthree\donefalse,% depth fit - raw box
- \v!fit=>\!!counta\plustwo \donefalse,% depth tight - raw box
- \v!broad=>\!!counta\plusone \donefalse,% nodepth fit - raw box
+ [ \v!depth=>\!!counta\plusthree\donefalse,% depth fit - raw box
+ \v!fit=>\!!counta\plustwo \donefalse,% depth tight - raw box
+ \v!broad=>\!!counta\plusone \donefalse,% nodepth fit - raw box
\v!high=>\!!counta\plusone \donetrue,% nodepth fit - framed
\s!default=>\!!counta\plusthree\donetrue,% depth fit - framed
\s!unknown=>\!!counta\plusthree\donetrue]% depth fit - framed
diff --git a/tex/context/base/core-not.tex b/tex/context/base/core-not.tex
index 9d06c0567..93122ec99 100644
--- a/tex/context/base/core-not.tex
+++ b/tex/context/base/core-not.tex
@@ -635,25 +635,6 @@
\egroup
\kern\notesignal\relax} % \relax is needed to honor spaces
-% \def\dolastnotesymbol
-% {\unskip\unskip
-% \ifdim\lastkern=\notesignal
-% \high{\kern\noteparameter\c!afstand}% gets the font right, hack !
-% \fi
-% \nobreak
-% \iflocation
-% \naarbox
-% {\high{\tx\lastnotenumber\domovednote\v!vorigepagina\v!volgendepagina}}%
-% [\s!fnt:t:\internalfootreference]%
-% \rawreference\s!fnt{\s!fnt:f:\internalfootreference}{}%
-% \else
-% \high{\tx\lastnotenumber\domovednote\v!vorigepagina\v!volgendepagina}%
-% \ifconditional\pagewisenotes
-% \rawreference\s!fnt{\s!fnt:f:\internalfootreference}{}%
-% \fi
-% \fi
-% \globallet\lastnotesymbol\relax}
-
\def\dolastnotesymbol
{\unskip\unskip
\ifdim\lastkern=\notesignal
diff --git a/tex/context/base/core-sec.tex b/tex/context/base/core-sec.tex
index caf59baa0..9b07ba067 100644
--- a/tex/context/base/core-sec.tex
+++ b/tex/context/base/core-sec.tex
@@ -1580,7 +1580,7 @@
{\setglobalsystemreference\rt!list
{\e!previous#1}{\getvalue{\e!previouslocal#1}}}%
%
-% {\definereference[\e!vorige#1][\getvalue{\e!vorigelokale#1}]%
+% {\definereference[\e!previous#1][\getvalue{\e!previouslocal#1}]%
%
\def\stoplistreferences{\dostoplistreferences}}
@@ -1594,7 +1594,7 @@
{\setglobalsystemreference\rt!list
{\e!previous####1}{\getvalue{\e!currentlocal####1}}}%
%
-% {\definereference[\e!vorige####1][\getvalue{\e!huidigelokale####1}]%
+% {\definereference[\e!previous####1][\getvalue{\e!currentlocal####1}]%
%
\processcommacommand[\updatedlistreferences]\docommando
\globallet\updatelistreferences\relax
diff --git a/tex/context/base/core-var.tex b/tex/context/base/core-var.tex
index 7e67be23a..b181067fc 100644
--- a/tex/context/base/core-var.tex
+++ b/tex/context/base/core-var.tex
@@ -43,6 +43,7 @@
\newevery \everyendoftextbody \relax
\newevery \everybeginofpar \relax
\newevery \everyendofpar \relax
+\newevery \everylistentry \relax
%D For shared \type {\everymath} and \type {\everydisplay}:
diff --git a/tex/context/base/core-ver.tex b/tex/context/base/core-ver.tex
index f5b477849..cc6816a4b 100644
--- a/tex/context/base/core-ver.tex
+++ b/tex/context/base/core-ver.tex
@@ -61,7 +61,7 @@
\def\prettyidentifier {TEX}
\def\prettypalet {}
-\def\installprettytype%
+\def\installprettytype
{\dodoubleargument\doinstallprettytype}
\def\doinstallprettytype[#1][#2]% map #1 onto #2
@@ -213,11 +213,15 @@
%D set the catcodes of \type{<} and \type{>} and then we start
%D looking ahead.
-%\unexpanded\def\type%
-% {\bgroup
-% \catcode`\<=\@@other
-% \catcode`\>=\@@other
-% \futurelet\next\dotype}
+% \starttyping
+% normal: \par \type{xx<<..xx..<<xx <<xx>> >>..>>xx} \par \type<<....>> \par \type<<..<<xx>>..>> \par
+% normal: \par \type{xx<..xx..<xx <slanted> >..>xx} \par \type{<....>} \par \type{<..<xx>..>}
+% \setuptype[option=slanted]
+% slanted: \par \type{xx<<..sl..<<xx <<sl>> xx>>..sl..>>xx} \par \type<<..xx..>> \par \type<<..<<sl>>..>> \par
+% slanted: \par \type{xx<<..sl..<xx <sl> xx>..sl..>>xx} \par \type<<..xx..>> \par \type<<..<sl>..>> \par
+% \setuptype[option=none]
+% none: \par \type{xx<<..xx..<<xx <<xx>> >>..>>xx} \par \type<<....>> \par \type<<..<<xx>>..>> \par
+% \stoptyping
\unexpanded\def\type
{\dotype\empty}
@@ -233,63 +237,6 @@
%D Next we distinguish between the three alternatives and call
%D for the appropriate macros.
-% \def\dotype%
-% {\ifx\next\bgroup
-% \initializetype
-% \initializetypegrouping
-% \def\next%
-% {\afterassignment\protectfirsttype\let\next=}%
-% \else\if\next<%
-% \doifelse{\@@tyoptie}{\v!geen}
-% {\initializetype
-% \setupnotypegrouping
-% \def\next%
-% {\let\next=}}
-% {\def\next<##1%
-% {\initializetype
-% \if##1<%
-% \else
-% \setupalternativetypegrouping
-% ##1%
-% \fi}}%
-% \else
-% \def\next##1%
-% {\initializetype
-% \catcode`##1=\@@endgroup}%
-% \fi\fi
-% \verbatimcolor
-% \next}
-%
-% \def\dodotype%
-% {\ifx\next\bgroup
-% \initializetype
-% \verbatimcolor
-% \initializetypegrouping
-% \def\next%
-% {\afterassignment\protectfirsttype\let\next=}%
-% \else\if\next<%
-% \doifelsevalue{\??ty\@@currenttype\c!optie}{\v!geen}
-% {\initializetype
-% \verbatimcolor
-% \setupnotypegrouping
-% \def\next%
-% {\let\next=}}
-% {\def\next<##1%
-% {\initializetype
-% \verbatimcolor
-% \if##1<%
-% \else
-% \setupalternativetypegrouping
-% ##1%
-% \fi}}%
-% \else
-% \def\next##1%
-% {\initializetype
-% \verbatimcolor
-% \catcode`##1=\@@endgroup}%
-% \fi\fi
-% \next}
-
\def\dodotypeA
{\initializetype
\initializetypegrouping
@@ -305,8 +252,10 @@
\def\dodotypeC<#1%
{\initializetype
\verbatimcolor
- \if#1<\else
- \setupalternativetypegrouping#1%
+ \if#1<%
+ \@EA\setupalternativetypegrouping
+ \else
+ \@EA#1%
\fi}
\def\dodotypeD#1%
@@ -349,8 +298,26 @@
\gdef\setupalternativetypegrouping
{\catcode`\<=\@@active
\catcode`\>=\@@active
- \def<{\bgroup\switchslantedtype}%
- \def>{\egroup}}
+ \def\doless
+ {\ifx<\next
+ \def\next
+ {\bgroup\switchslantedtype
+ \let\next=}%
+ \else
+ \let\next\lesscharacter
+ \fi
+ \next}%
+ \def\domore
+ {\ifx>\next
+ \def\next
+ {\egroup
+ \let\next=}%
+ \else
+ \let\next\morecharacter
+ \fi
+ \next}%
+ \def<{\futurelet\next\doless}%
+ \def>{\futurelet\next\domore}}
\egroup
\def\setupnotypegrouping
@@ -376,7 +343,7 @@
%D {\ifx\next<%
%D \def\next{\bgroup\switchslantedtype\let\next=}%
%D \else
-%D \let\next=\lesscharacter
+%D \let\next\lesscharacter
%D \fi
%D \next}%
%D \futurelet\next\do}%
@@ -385,7 +352,7 @@
%D {\ifx\next>%
%D \def\next{\egroup\let\next=}%
%D \else
-%D \let\next=\morecharacter
+%D \let\next\morecharacter
%D \fi
%D \next}%
%D \futurelet\next\do}}
@@ -394,12 +361,12 @@
%D
%D The final implementation looks a bit further and treats the
%D lone \type{<<} and \type{>>} a bit different. The \type
-%D {\hbox{}} prevents ligatures, which unfortunately turn up
+%D {\null} prevents ligatures, which unfortunately turn up
%D in Lucida fonts.
\def\doenterdoublelesstype
{\ifx\next\egroup
- \lesscharacter\hbox{}\lesscharacter
+ \lesscharacter\null\lesscharacter
\else
\bgroup\switchslantedtype
\let\doenterdoublemoretype\egroup
@@ -408,7 +375,7 @@
\def\doenterdoublemoretype
{\def\doenterdoubletype
{\ifx\next\egroup
- \morecharacter\hbox{}\morecharacter
+ \morecharacter\null\morecharacter
\fi}}
\bgroup
@@ -420,19 +387,17 @@
\def\doless
{\ifx<\next
\def\next
- {\def\enterdoubletype
- {\futurelet\next\doenterdoublelesstype}%
+ {\def\enterdoubletype{\futurelet\next\doenterdoublelesstype}%
\afterassignment\enterdoubletype
\let\next=}%
\else
- \let\next=\lesscharacter
+ \let\next\lesscharacter
\fi
\next}%
\def\domore
{\ifx>\next
\def\next
- {\def\enterdoubletype
- {\futurelet\next\doenterdoublemoretype}%
+ {\def\enterdoubletype{\futurelet\next\doenterdoublemoretype}%
\afterassignment\enterdoubletype
\let\next=}%
\else
@@ -455,11 +420,6 @@
\fi
\fi}
-%\def\setupcommandsintype#1%
-% {\setupgroupedtype
-% \edef\!!stringa{\getvalue{#1\c!escape}}%
-% \@EA\catcode\@EA`\!!stringa=\@@escape}
-
\def\setupcommandsintype#1% can also be \string\
{\setupgroupedtype
\edef\\{\getvalue{#1\c!escape}}%
@@ -515,11 +475,6 @@
%D \type{\initializetype} which in return calls for the support
%D macro \type{\setupinlineverbatim}.
-%\def\initializetype%
-% {\let\obeylines=\ignorelines
-% \setupcommonverbatim\??ty
-% \setupinlineverbatim}
-
\let\@@currenttype\empty
\def\initializetype
@@ -548,13 +503,13 @@
%D The setups for inline verbatim default to:
\setuptype
- [\c!space=\v!off,
+ [ \c!space=\v!off,
\c!color=,
- \c!style=\tt\tf, % \tttf gives problems with {\tx \type...}
- \c!page=\v!no,
+ \c!style=\tt\tf, % \tttf gives problems with {\tx \type...}
+ \c!page=\v!no,
\c!tab=\v!no,
\c!palet=colorpretty,
- \c!option=\v!normal]
+ \c!option=\v!normal]
%D \macros
%D {typ,obeyhyphens,obeybreakpoints}
diff --git a/tex/context/base/font-bfm.tex b/tex/context/base/font-bfm.tex
index e7f510aad..a7bf398ef 100644
--- a/tex/context/base/font-bfm.tex
+++ b/tex/context/base/font-bfm.tex
@@ -111,9 +111,7 @@
\appendtoks
\dosetmathfamily\mrbffam\textface\scriptface\scriptscriptface\c!mrbf\mrfallback
\dosetmathfamily\mibffam\textface\scriptface\scriptscriptface\c!mibf\empty
- \dosetskewchar\defaultskewcharmi
\dosetmathfamily\sybffam\textface\scriptface\scriptscriptface\c!sybf\empty
- \dosetskewchar\defaultskewcharsy
\dosetmathfamily\exbffam\textface\textface \textface \c!exbf\empty
\dosetmathfamily\mabffam\textface\scriptface\scriptscriptface\c!mabf\empty
\dosetmathfamily\mbbffam\textface\scriptface\scriptscriptface\c!mbbf\empty
@@ -121,6 +119,11 @@
\to \boldmathstrategies
\appendtoks
+ \dosetskewchar\mifam\defaultskewcharmi
+ \dosetskewchar\syfam\defaultskewcharsy
+\to \boldmathstrategies
+
+\appendtoks
\dosetsymbfamily\mrbffam\textface\scriptface\scriptscriptface\c!mrbf
\dosetsymbfamily\mibffam\textface\scriptface\scriptscriptface\c!mibf
\dosetsymbfamily\sybffam\textface\scriptface\scriptscriptface\c!sybf
diff --git a/tex/context/base/font-ini.tex b/tex/context/base/font-ini.tex
index 7805654ff..fc07a4d52 100644
--- a/tex/context/base/font-ini.tex
+++ b/tex/context/base/font-ini.tex
@@ -3106,8 +3106,8 @@
{\edef\fontstyle{#1}%
\setcurrentfontstyle\normalizedbodyfontsize}
-\chardef\defaultskewcharmi='177
-\chardef\defaultskewcharsy='60
+\chardef\defaultskewcharmi=127 % '177
+\chardef\defaultskewcharsy= 48 % '60
% \def\dosetskewchar#1%
% {\skewchar\font\ifx\@@fontskewchar\empty#1\else\@@fontskewchar\fi}
@@ -3345,27 +3345,32 @@
\the\everybodyfont} % needed ?
%D \macros
-%D {os}
+%D {os,frak, goth, cal}
%D
%D Old style numerals can be typeset with \type{\os} and look
%D like {\os 1234567890} instead of the more common looking
%D 1234567890.
-
-\definefont[os][OldStyle sa *] % \currentfontscale]
-
-\definefontsynonym[OldStyle][Serif]
-
-%D \macros
-%D {frak, goth, cal}
%D
%D On behalf of {\frac Tobias Burnus}, we define some more of
%D these. Later we will link these names to real file names.
-\definefont [frak] [Fraktur sa *]
-\definefont [goth] [Gothic sa *]
-\definefont [cal] [Calligraphic sa *]
-\definefont [bbd] [Blackboard sa *]
+% older
+%
+% \definefont [os] [OldStyle sa *]
+% \definefont [frak] [Fraktur sa *]
+% \definefont [goth] [Gothic sa *]
+% \definefont [cal] [Calligraphic sa *]
+% \definefont [bbd] [Blackboard sa *]
+%
+% newer
+
+\def\os {\mathortext{\fam\purefamily {oldstyle}}{\symbolicfont {OldStyle}}}
+\def\frak{\mathortext{\fam\purefamily {fraktur}}{\symbolicfont {Fraktur}}}
+\def\goth{\mathortext{\fam\purefamily {gothic}}{\symbolicfont {Gothic}}}
+\def\cal {\mathortext{\fam\purefamily{calligraphic}}{\symbolicfont{Calligraphic}}}
+\def\bbd {\mathortext{\fam\purefamily {blackboard}}{\symbolicfont {Blackboard}}}
+\definefontsynonym [OldStyle] [Serif]
\definefontsynonym [Fraktur] [Serif]
\definefontsynonym [Gothic] [Serif]
\definefontsynonym [Calligraphic] [Serif]
@@ -3377,17 +3382,37 @@
%D These macros assume that we use text fonts, and not math
%D families.
-% \def\fraktur #1{\mathematics{\frak#1}}
-% \def\gothic #1{\mathematics{\goth#1}}
-% \def\calligraphic#1{\mathematics{\cal #1}}
-% \def\blackboard #1{\mathematics{\bbd #1}}
-
\ifx\mathtext\undefined \let\mathtext\hbox \fi
-\def\fraktur #1{\mathortext\mathtext\donothing{\frak#1}}
-\def\gothic #1{\mathortext\mathtext\donothing{\goth#1}}
-\def\calligraphic#1{\mathortext\mathtext\donothing{\cal #1}}
-\def\blackboard #1{\mathortext\mathtext\donothing{\bbd #1}}
+\def\fraktur #1{\mathortext\domathtext\donothing{\frak#1}}
+\def\gothic #1{\mathortext\domathtext\donothing{\goth#1}}
+\def\calligraphic#1{\mathortext\domathtext\donothing{\cal #1}}
+\def\blackboard #1{\mathortext\domathtext\donothing{\bbd#1}}
+
+%D Torture test:
+%D
+%D \starttyping
+%D \usetypescript[modern] [texnansi]
+%D \usetypescript[lucida] [texnansi]
+%D \usetypescript[palatino][texnansi]
+%D \usetypescript[times] [texnansi]
+%D \usetypescript[fourier] [ec]
+%D
+%D \startbuffer
+%D \section{\blackboard{T\high{\blackboard{T}}} \blackboard{E}\high{\blackboard{E}} \blackboard{X}\high{\blackboard{X}}}
+%D
+%D {\fontclass: 123 \os123 \cal TEX $\os 123$}
+%D
+%D $\blackboard{T}^{\blackboard{T}} \blackboard{E}^{\blackboard{E}} \blackboard{X}^{\blackboard{X}}$
+%D \blackboard{T}\high{\blackboard{T}} \blackboard{E}\high{\blackboard{E}} \blackboard{X}\high{\blackboard{X}}
+%D \stopbuffer
+%D
+%D {\setupbodyfont[lucida] \getbuffer}
+%D {\setupbodyfont[modern] \getbuffer}
+%D {\setupbodyfont[palatino] \getbuffer}
+%D {\setupbodyfont[times] \getbuffer}
+%D {\setupbodyfont[fourier] \getbuffer}
+%D \stoptyping
%D \macros
%D {definebodyfontswitch}
diff --git a/tex/context/base/font-run.tex b/tex/context/base/font-run.tex
index a30776cb8..0cb5ecdd5 100644
--- a/tex/context/base/font-run.tex
+++ b/tex/context/base/font-run.tex
@@ -22,7 +22,7 @@
\parindent\zeropoint
\setlocalhsize
\doifelsenothing{#1}
- {\def\title{[\the\korpsgrootte]}}
+ {\def\title{[\the\bodyfontsize]}}
{\switchtobodyfont[#1]\def\title{[#1]}}
\doifsomething\fontclass
{\doifnot{[\fontclass]}\title
@@ -111,6 +111,7 @@
\gdef\doshowfont[#1]%
{\bgroup
+ \boxrulewidth=.1pt
\setupcolors[\c!state=\v!local]%
\iffirstargument
\definefont[\s!dummy][#1]\dummy
diff --git a/tex/context/base/java-exa.tex b/tex/context/base/java-exa.tex
index 21b366174..0617f5e56 100644
--- a/tex/context/base/java-exa.tex
+++ b/tex/context/base/java-exa.tex
@@ -209,7 +209,8 @@
}
% exa_filename = exa_filename.replace(/\\\\/g,'/') ;
% exa_filelist = exa_filelist.replace(/\\\\/g,'/') ;
- str = "<exa:request><exa:application>" ;
+ str = "<?xml version='1.0' ?>\\n" ;
+ str = str+"<exa:request xmlns:exa='http://www.pragma-ade.com/schemas/example.rng'><exa:application>" ;
if (exa_filelist == "") {
exa_filelist = exa_registered ;
} else { if (exa_registered != "") {
diff --git a/tex/context/base/math-ams.tex b/tex/context/base/math-ams.tex
index 866228324..3df63ff48 100644
--- a/tex/context/base/math-ams.tex
+++ b/tex/context/base/math-ams.tex
@@ -15,9 +15,9 @@
% maybe we should just include these into the default tex one
-%definefamilysynonym [ams] [blackboard] [mb]
+\definefamilysynonym [default] [blackboard] [mb]
-\startmathcollection [default] % [ams]
+\startmathcollection [default]
\definemathsymbol [varGamma] [ord] [letters] ["00]
\definemathsymbol [varDelta] [ord] [letters] ["01]
@@ -33,13 +33,13 @@
\stopmathcollection
-\startmathcollection[default] % [ams]
+\startmathcollection[default]
\definemathsymbol [internalAnd] [rel] [operators] ["26]
\stopmathcollection
-\startmathcollection [default] % [ams]
+\startmathcollection [default]
\definemathsymbol [boxdot] [bin] [ma] ["00]
\definemathsymbol [boxplus] [bin] [ma] ["01]
@@ -180,7 +180,7 @@
\stopmathcollection
-\startmathcollection [default] % [ams]
+\startmathcollection [default]
\definemathcommand [integers] {\blackboard{Z}}
\definemathcommand [reals] {\blackboard{R}}
@@ -191,7 +191,7 @@
\stopmathcollection
-\startmathcollection [default] % [ams]
+\startmathcollection [default]
\definemathsymbol [lvertneqq] [rel] [mb] ["00]
\definemathsymbol [gvertneqq] [rel] [mb] ["01]
@@ -289,12 +289,17 @@
\stopmathcollection
-\startmathcollection [default] % [ams]
+\startmathcollection [default]
\definemathcommand [yen] [nothing] {\mathhexbox{\hexmafam}55}
\definemathcommand [checkmark] [nothing] {\mathhexbox{\hexmafam}58}
\definemathcommand [circledR] [nothing] {\mathhexbox{\hexmafam}72}
\definemathcommand [maltese] [nothing] {\mathhexbox{\hexmafam}7A}
+
+\stopmathcollection
+
+\startmathcollection [default]
+
\definemathcommand [dashrightarrow] [rel] {\dabar@\dabar@ \mathchar"0C4B}%
\definemathcommand [dashleftarrow] [rel] {\mathchar"0C4C\dabar@ \dabar@}%
\definemathcommand [dasharrow] [rel] {\dabar@\dabar@ \mathchar"0C4B}%
@@ -321,7 +326,7 @@
\mathaccent"0\purefamilyhex{ex}65{#1}%
\fi}
-\startmathcollection [default] % [ams]
+\startmathcollection [default]
\definemathcommand [widehat] {\AMSwidehat}
\definemathcommand [widetilde] {\AMSwidetilde}
diff --git a/tex/context/base/math-eul.tex b/tex/context/base/math-eul.tex
index 75dec7156..b3f4535dd 100644
--- a/tex/context/base/math-eul.tex
+++ b/tex/context/base/math-eul.tex
@@ -1,6 +1,6 @@
%D \module
%D [ file=math-eul,
-%D version=2003.02.03,
+%D version=2003.02.03,
%D title=\CONTEXT\ Math Macros,
%D subtitle=Virtual Euler Specials,
%D author={Hans Hagen \& Taco Hoekwater \& Adam Lindsay},
@@ -11,93 +11,237 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details. Further modified by Adam Lindsay.
-\unprotect
+\unprotect
%D We follow the following mappings from type-eul:
+%D
%D mr [MathRoman] [Euler-Roman] [zeurm10]
-%D mi [MathItalic] [Euler-Italic] [zeurm10]
+
+%D mi [MathItalic] [Euler-Italic] [eufm10]
+
%D ex [MathExtension] [Euler-Extension] [zeuex10]
%D sy [MathSymbol] [Euler-Symbol] [zeusm10]
-%D mb [MathBeta] [Charter-Roman] [bchr8r]
-%D mc [MathGamma] [Euler-Fraktur] [eufm10]
+
+%D mb [MathBeta] [Charter-Roman] [bchr8r] XXX
+%D mc [MathGamma] [Euler-Fraktur] [eufm10] XXX
%D
%D The inclusion of Bitstream Charter was originally for the text accents.
%D Obviously, it's not a proper ``MathBeta'' font.
-
-%D The varrho and varsigma characters don't exist in eulervm,
+%D The varrho and varsigma characters don't exist in eulervm,
%D so we point at the normal types.
+
+\definefamilysynonym [eul] [calligraphic] [sy]
+\definefamilysynonym [eul] [oldstyle] [mi]
+\definefamilysynonym [eul] [gothic] [mi]
+\definefamilysynonym [eul] [fraktur] [mi]
+
+\definefamilysynonym [eul] [lcgreek] [mr]
+\definefamilysynonym [eul] [ucgreek] [mr]
+\definefamilysynonym [eul] [vargreek] [mr]
+
+%% Well, you don't know until you try!
+%\definefamilysynonym [eul] [accents] [Serif]
+
+\startmathcollection [eul]
+
+\definemathsymbol [varrho] [nothing] [vargreek] ["1A]
+\definemathsymbol [varsigma] [nothing] [vargreek] ["1B]
+
+%D Changes necessitated by collapsing mr \& mi into one:
+\definemathsymbol [imath] [nothing] [mr] ["7B]
+\definemathsymbol [jmath] [nothing] [mr] ["7C]
+\definemathsymbol [ell] [nothing] [mr] ["60]
+\definemathsymbol [wp] [nothing] [mr] ["7D]
+\definemathsymbol [partial] [nothing] [mr] ["40]
+
+\definemathsymbol [flat] [ord] [mr] ["5B]
+\definemathsymbol [natural] [ord] [mr] ["5C]
+\definemathsymbol [sharp] [ord] [mr] ["5D]
+
+\definemathsymbol [triangleleft] [bin] [mr] ["2F]
+\definemathsymbol [triangleright][bin] [mr] ["2E]
+
+\definemathsymbol [star] [bin] [mr] ["3F]
+
+\definemathsymbol [smile] [rel] [mr] ["5E]
+\definemathsymbol [frown] [rel] [mr] ["5F]
+\definemathsymbol [leftharpoonup] [rel] [mr] ["28]
+\definemathsymbol [leftharpoondown] [rel] [mr] ["29]
+\definemathsymbol [rightharpoonup] [rel] [mr] ["2A]
+\definemathsymbol [rightharpoondown] [rel] [mr] ["2B]
+\definemathsymbol [lhook] [rel] [mr] ["2C]
+\definemathsymbol [rhook] [rel] [mr] ["2D]
+
+\definemathsymbol [mathperiod] [ord] [mr] ["3A]
+\definemathsymbol [textperiod] [punct] [mr] ["3A]
+
+\definemathsymbol [mathcomma] [ord] [mr] ["3B]
+\definemathsymbol [textcomma] [punct] [mr] ["3B]
+
+\definemathsymbol [ldotp] [punct] [mr] ["3A]
+
+% extras from AMS:
+\definemathsymbol [hslash] [ord] [mr] ["80] %beauty over truth
+
+\stopmathcollection
+
\startmathcollection [eul]
-\definemathsymbol [varrho] [nothing] [vargreek] ["1A]
-\definemathsymbol [varsigma] [nothing] [vargreek] ["1B]
+% Ugh. no way around this to keep it compact in the font defs.
+
+\definemathcharacter [a] [nothing] [mr] ["61]
+\definemathcharacter [b] [nothing] [mr] ["62]
+\definemathcharacter [c] [nothing] [mr] ["63]
+\definemathcharacter [d] [nothing] [mr] ["65]
+\definemathcharacter [e] [nothing] [mr] ["65]
+\definemathcharacter [f] [nothing] [mr] ["66]
+\definemathcharacter [g] [nothing] [mr] ["67]
+\definemathcharacter [h] [nothing] [mr] ["68]
+\definemathcharacter [i] [nothing] [mr] ["69]
+\definemathcharacter [j] [nothing] [mr] ["6A]
+\definemathcharacter [k] [nothing] [mr] ["6B]
+\definemathcharacter [l] [nothing] [mr] ["6C]
+\definemathcharacter [m] [nothing] [mr] ["6D]
+\definemathcharacter [n] [nothing] [mr] ["6E]
+\definemathcharacter [o] [nothing] [mr] ["6F]
+\definemathcharacter [p] [nothing] [mr] ["70]
+\definemathcharacter [q] [nothing] [mr] ["71]
+\definemathcharacter [r] [nothing] [mr] ["72]
+\definemathcharacter [s] [nothing] [mr] ["73]
+\definemathcharacter [t] [nothing] [mr] ["74]
+\definemathcharacter [u] [nothing] [mr] ["75]
+\definemathcharacter [v] [nothing] [mr] ["76]
+\definemathcharacter [w] [nothing] [mr] ["77]
+\definemathcharacter [x] [nothing] [mr] ["78]
+\definemathcharacter [y] [nothing] [mr] ["79]
+\definemathcharacter [z] [nothing] [mr] ["7A]
+
+\definemathcharacter [A] [nothing] [mr] ["41]
+\definemathcharacter [B] [nothing] [mr] ["42]
+\definemathcharacter [C] [nothing] [mr] ["43]
+\definemathcharacter [D] [nothing] [mr] ["45]
+\definemathcharacter [E] [nothing] [mr] ["45]
+\definemathcharacter [F] [nothing] [mr] ["46]
+\definemathcharacter [G] [nothing] [mr] ["47]
+\definemathcharacter [H] [nothing] [mr] ["48]
+\definemathcharacter [I] [nothing] [mr] ["49]
+\definemathcharacter [J] [nothing] [mr] ["4A]
+\definemathcharacter [K] [nothing] [mr] ["4B]
+\definemathcharacter [L] [nothing] [mr] ["4C]
+\definemathcharacter [M] [nothing] [mr] ["4D]
+\definemathcharacter [N] [nothing] [mr] ["4E]
+\definemathcharacter [O] [nothing] [mr] ["4F]
+\definemathcharacter [P] [nothing] [mr] ["50]
+\definemathcharacter [Q] [nothing] [mr] ["51]
+\definemathcharacter [R] [nothing] [mr] ["52]
+\definemathcharacter [S] [nothing] [mr] ["53]
+\definemathcharacter [T] [nothing] [mr] ["54]
+\definemathcharacter [U] [nothing] [mr] ["55]
+\definemathcharacter [V] [nothing] [mr] ["56]
+\definemathcharacter [W] [nothing] [mr] ["57]
+\definemathcharacter [X] [nothing] [mr] ["58]
+\definemathcharacter [Y] [nothing] [mr] ["59]
+\definemathcharacter [Z] [nothing] [mr] ["5A]
+
\stopmathcollection
\startmathcollection [eul]
-\definemathcharacter [!] [close] [mc] ["21]
-\definemathcharacter [(] [open] [mc] ["28]
-\definemathcharacter [)] [close] [mc] ["29]
-\definemathcharacter [+] [bin] [mc] ["2B]
+
+\definemathcharacter [!] [close] [sy] ["A1]
+\definemathcharacter [(] [open] [sy] ["A8]
+\definemathcharacter [)] [close] [sy] ["A9]
+\definemathcharacter [+] [bin] [sy] ["AB]
\definemathcharacter [:] [rel] [sy] ["BA]
\definemathcharacter [;] [punct] [sy] ["BB]
-\definemathcharacter [=] [rel] [mi] ["82]
+\definemathcharacter [=] [rel] [sy] ["BD]
\definemathcharacter [?] [close] [sy] ["BF]
\definemathcharacter [91] [open] [sy] ["DB] % [
\definemathcharacter [93] [close] [sy] ["DD] % ]
+
+\definemathcharacter [,] [punct] [mr] ["3B]
+\definemathcharacter [.] [ord] [mr] ["3A]
+\definemathcharacter [/] [ord] [mr] ["3D]
+\definemathcharacter [<] [rel] [mr] ["3C]
+\definemathcharacter [>] [rel] [mr] ["3E]
+
\stopmathcollection
\startmathcollection [eul]
+
\definemathcharacter [(] [nothing] [sy] ["A8] [ex] ["00]
\definemathcharacter [)] [nothing] [sy] ["A9] [ex] ["01]
\definemathcharacter [91] [nothing] [sy] ["DB] [ex] ["02] % [
\definemathcharacter [93] [nothing] [sy] ["DD] [ex] ["03] % ]
-\definemathcharacter [/] [nothing] [mi] ["3D] [ex] ["0E]
+\definemathcharacter [/] [nothing] [mr] ["3D] [ex] ["0E]
+
\stopmathcollection
\startmathcollection [eul]
-\definemathsymbol [hbar] [nothing] [mi] ["80]
+
+\definemathsymbol [hbar] [nothing] [mr] ["80]
+
\stopmathcollection
-%D I used my discretion in substituting Charter here for the CM glyphs
-%D brought in by the eulervm virtual font
\startmathcollection [eul]
-\definemathsymbol [ddagger] [bin] [mb] ["87]
-\definemathsymbol [dagger] [bin] [mb] ["86]
+
+\definemathsymbol [ddagger] [bin] [sy] ["7A]
+\definemathsymbol [dagger] [bin] [sy] ["79]
+
\stopmathcollection
\startmathcollection [eul]
+
\definemathsymbol [colon] [punct] [sy] ["BA]
+
\stopmathcollection
-%D This is very hackish; it brings in text accents from the
-%D well-matched Bitstream Charter.
+%D This used to be very hackish; it brought in text
+%D accents from the well-matched Bitstream Charter.
+
+%D But now, these characters don't exist. I would prefer to pull
+%D them from the text font, but I don't know how.
+%D Instead, I'm just pointing to null characters!
+
\startmathcollection [eul]
-\definemathsymbol [acute] [accent] [mb] ["B4]
-\definemathsymbol [grave] [accent] [mb] ["1E]
-\definemathsymbol [ddot] [accent] [mb] ["A8]
-\definemathsymbol [tilde] [accent] [mb] ["98]
-\definemathsymbol [bar] [accent] [mb] ["AF]
-\definemathsymbol [breve] [accent] [mb] ["0B]
-\definemathsymbol [check] [accent] [mb] ["10]
-%\definemathsymbol [hat] [accent] [mc] ["5E]
-\definemathsymbol [hat] [accent] [mb] ["88]
-\definemathsymbol [dot] [accent] [mb] ["01]
+
+\definemathsymbol [acute] [accent] [mr] ["90]
+\definemathsymbol [grave] [accent] [mr] ["91]
+\definemathsymbol [ddot] [accent] [mr] ["92]
+\definemathsymbol [tilde] [accent] [mr] ["93]
+\definemathsymbol [bar] [accent] [mr] ["94]
+\definemathsymbol [breve] [accent] [mr] ["95]
+\definemathsymbol [check] [accent] [mr] ["96]
+\definemathsymbol [hat] [accent] [mr] ["97]
+\definemathsymbol [dot] [accent] [mr] ["98]
+%\definemathsymbol [acute] [accent] [accents] ["B4]
+%\definemathsymbol [grave] [accent] [accents] ["1E]
+%\definemathsymbol [ddot] [accent] [accents] ["A8]
+%\definemathsymbol [tilde] [accent] [accents] ["98]
+%\definemathsymbol [bar] [accent] [accents] ["AF]
+%\definemathsymbol [breve] [accent] [accents] ["0B]
+%\definemathsymbol [check] [accent] [accents] ["10]
+%\definemathsymbol [hat] [accent] [accents] ["5E]
+%\definemathsymbol [dot] [accent] [accents] ["01]
+
+\definemathsymbol [vec] [accent] [mr] ["7E] % [ord]
+\definemathsymbol [hat] [accent] [sy] ["DE]
+
\stopmathcollection
\startmathcollection [eul]
-\definemathsymbol [lgroup] [open] [sy] ["A8] [ex] ["3A] % ?
-\definemathsymbol [rgroup] [close] [sy] ["A9] [ex] ["3B] % ?
+
+\definemathsymbol [lgroup] [open] [sy] ["A8] [ex] ["3A] % ?
+\definemathsymbol [rgroup] [close] [sy] ["A9] [ex] ["3B] % ?
+
\stopmathcollection
\startmathcollection [eul]
-\definemathsymbol [dag] [box] [mb] ["86]
-\definemathsymbol [ddag] [box] [mb] ["87]
-\definemathsymbol [S] [box] [mb] ["A7]
-\definemathsymbol [P] [box] [mb] ["B6]
-%%% originals before substituting Charter characters
-%\definemathsymbol [dag] [box] [sy] ["79]
-%\definemathsymbol [ddag] [box] [sy] ["7A]
-%\definemathsymbol [S] [box] [sy] ["78]
-%\definemathsymbol [P] [box] [sy] ["7B]
+
+\definemathsymbol [dag] [box] [sy] ["79]
+\definemathsymbol [ddag] [box] [sy] ["7A]
+\definemathsymbol [S] [box] [sy] ["78]
+\definemathsymbol [P] [box] [sy] ["7B]
+
\stopmathcollection
-\protect \endinput
+\protect \endinput
diff --git a/tex/context/base/math-ini.tex b/tex/context/base/math-ini.tex
index 8f3960f16..375fce3aa 100644
--- a/tex/context/base/math-ini.tex
+++ b/tex/context/base/math-ini.tex
@@ -300,9 +300,7 @@
\def\tracemathcommand#1%
{\iftracemathcollection
- \endgraf
- \hbox{\tex{#1}~:~{\mathematics{\getvalue{#1}{}}}}
- \endgraf
+ \endgraf\hbox{\tex{#1}~:~{\mathematics{\getvalue{#1}{}}}}\endgraf
\fi}
\def\startmathcollection[#1]%
@@ -345,12 +343,17 @@
\def\usemathcollection[#1]%
{\doinputonce{\truefilename{\f!mathprefix#1}}%
- \setvalue{\@mc@\fontclass\@mc@}{#1}}
+ \doifsomething\fontclass{\setvalue{\@mc@\fontclass\@mc@}{#1}}}
+
+\letvalue{\@mc@\@mc@}\nomathcollection
+
+% \def\autoenablemathcollection
+% {\doifdefinedelse{\@mc@\fontclass\@mc@}
+% {\enablemathcollection[\getvalue{\@mc@\fontclass\@mc@}]}
+% {\enablemathcollection[\s!default]}} % ? ? ?
\def\autoenablemathcollection
- {\doifdefinedelse{\@mc@\fontclass\@mc@}
- {\enablemathcollection[\getvalue{\@mc@\fontclass\@mc@}]}
- {\enablemathcollection[\s!default]}} % ? ? ?
+ {\expanded{\enablemathcollection[\executeifdefined{\@mc@\fontclass\@mc@}\nomathcollection]}}
\appendtoks\autoenablemathcollection\to\mathstrategies
@@ -426,7 +429,10 @@
\definefamilysynonym [default] [3] [ex]
\enablemathcollection[default]
-\usemathcollection[default]
+
+\usemathcollection[tex] % actually this is 'default'
+\usemathcollection[ams] % actually this is 'default'
+
\enablemathcollection[default]
%D Some goodies:
@@ -459,11 +465,10 @@
\protect \endinput
\tracemathcollectiontrue
-
- \input math-tex \page
-\setupbodyfont[ams] \enablemathcollection[ams] \input math-ams \page
-\setupbodyfont[lbr] \enablemathcollection[lbr] \input math-lbr \page
-\setupbodyfont[eul] \enablemathcollection[eul] \input math-eul \stoptext
+ \input math-tex \page
+\setupbodyfont[ams] \enablemathcollection[default] \input math-ams \page
+\setupbodyfont[lbr] \enablemathcollection[lbr] \input math-lbr \page
+\setupbodyfont[eul] \enablemathcollection[eul] \input math-eul \stoptext
% to be checked, overloads supp-lan !
diff --git a/tex/context/base/math-lbr.tex b/tex/context/base/math-lbr.tex
index c3c463254..3df4a36d0 100644
--- a/tex/context/base/math-lbr.tex
+++ b/tex/context/base/math-lbr.tex
@@ -1,6 +1,6 @@
%D \module
%D [ file=math-lbr,
-%D version=2001.04.12,
+%D version=2001.04.12,
%D title=\CONTEXT\ Math Macros,
%D subtitle=Lucida Specials,
%D author={Hans Hagen \& Taco Hoekwater},
@@ -11,26 +11,280 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\unprotect
+\unprotect
+
+\definefamilysynonym [lbr] [calligrapahy] [sy]
+\definefamilysynonym [lbr] [oldstyle] [mi]
+
+\definefamilysynonym [lbr] [blackboard] [ma]
+\definefamilysynonym [lbr] [ucgreek] [mb]
+\definefamilysynonym [lbr] [vargreek] [mi]
\startmathcollection[lbr]
-\definemathsymbol [blacktriangleright] [rel] [mi] ["F0]
-\definemathsymbol [blacktriangleleft] [rel] [mi] ["F1]
-\definemathsymbol [boxplus] [bin] [sy] ["EA]
-\definemathsymbol [boxminus] [bin] [sy] ["EB]
-\definemathsymbol [boxtimes] [bin] [sy] ["EC]
+\definemathsymbol [boxdot] [bin] [sy] ["ED]
+\definemathsymbol [boxplus] [bin] [sy] ["EA]
+\definemathsymbol [boxtimes] [bin] [sy] ["EC]
+\definemathsymbol [square] [ord] [ma] ["02]
+\definemathsymbol [Box] [ord] [ma] ["02] % square
+\definemathsymbol [blacksquare] [ord] [ma] ["03]
+\definemathsymbol [centerdot] [bin] [ma] ["E1] % [sy] ["01]
+\definemathsymbol [Diamond] [ord] [sy] ["05]
+\definemathsymbol [lozenge] [ord] [sy] ["05] % Diamond
+\definemathsymbol [blacklozenge] [ord] [ma] ["09]
+\definemathsymbol [circlearrowright] [rel] [ma] ["8C]
+\definemathsymbol [circlearrowleft] [rel] [ma] ["8B]
+\definemathsymbol [rightleftharpoons] [rel] [sy] ["8E]
+\definemathsymbol [leftrightharpoons] [rel] [sy] ["8D]
+\definemathsymbol [boxminus] [bin] [sy] ["EB]
+\definemathsymbol [Vdash] [rel] [sy] ["F0]
+\definemathsymbol [Vvdash] [rel] [mb] ["D3]
+\definemathsymbol [vDash] [rel] [mb] ["D6]
+\definemathsymbol [twoheadrightarrow] [rel] [ma] ["25]
+\definemathsymbol [twoheadleftarrow] [rel] [ma] ["23]
+\definemathsymbol [leftleftarrows] [rel] [ma] ["71]
+\definemathsymbol [rightrightarrows] [rel] [ma] ["73]
+\definemathsymbol [upuparrows] [rel] [ma] ["72]
+\definemathsymbol [downdownarrows] [rel] [ma] ["74]
+\definemathsymbol [upharpoonright] [rel] [ma] ["75]
+\definemathsymbol [restriction] [rel] [ma] ["77]
+\definemathsymbol [downharpoonright] [rel] [ma] ["77]
+\definemathsymbol [upharpoonleft] [rel] [ma] ["76]
+\definemathsymbol [downharpoonleft] [rel] [ma] ["78]
+\definemathsymbol [rightarrowtail] [rel] [ma] ["29]
+\definemathsymbol [leftarrowtail] [rel] [ma] ["28]
+\definemathsymbol [leftrightarrows] [rel] [ma] ["6E]
+\definemathsymbol [rightleftarrows] [rel] [ma] ["6D]
+\definemathsymbol [Lsh] [rel] [ma] ["7B]
+\definemathsymbol [Rsh] [rel] [ma] ["7D]
+\definemathsymbol [rightsquigarrow] [rel] [ma] ["8E]
+\definemathsymbol [leadsto] [rel] [ma] ["8E] % rightsquigarrow
+\definemathsymbol [leftrightsquigarrow] [rel] [ma] ["91]
+\definemathsymbol [looparrowleft] [rel] [ma] ["3F]
+\definemathsymbol [looparrowright] [rel] [ma] ["40]
+\definemathsymbol [circeq] [rel] [sy] ["D0]
+\definemathsymbol [succsim] [rel] [sy] ["E1]
+\definemathsymbol [gtrsim] [rel] [sy] ["DD]
+\definemathsymbol [gtrapprox] [rel] [mb] ["DB]
+\definemathsymbol [multimap] [rel] [mb] ["C7]
+\definemathsymbol [therefore] [rel] [sy] ["90]
+\definemathsymbol [because] [rel] [sy] ["91]
+\definemathsymbol [doteqdot] [rel] [sy] ["CA]
+\definemathsymbol [Doteq] [rel] [sy] ["CA] % doteqdot
+\definemathsymbol [triangleq] [rel] [sy] ["D5]
+\definemathsymbol [precsim] [rel] [sy] ["E0]
+\definemathsymbol [lesssim] [rel] [sy] ["DC]
+\definemathsymbol [lessapprox] [rel] [mb] ["DA]
+\definemathsymbol [eqslantless] [rel] [mb] ["E2]
+\definemathsymbol [eqslantgtr] [rel] [mb] ["E3]
+\definemathsymbol [curlyeqprec] [rel] [mb] ["E6]
+\definemathsymbol [curlyeqsucc] [rel] [mb] ["E7]
+\definemathsymbol [preccurlyeq] [rel] [mb] ["E4]
+\definemathsymbol [leqq] [rel] [sy] ["DA]
+\definemathsymbol [leqslant] [rel] [mb] ["E0]
+\definemathsymbol [lessgtr] [rel] [sy] ["DE]
+\definemathsymbol [backprime] [ord] [mb] ["C8]
+\definemathsymbol [dabar@] [ord] [ma] ["03] % !! @
+\definemathsymbol [risingdotseq] [rel] [sy] ["CC]
+\definemathsymbol [fallingdotseq] [rel] [sy] ["CB]
+\definemathsymbol [succcurlyeq] [rel] [mb] ["E5]
+\definemathsymbol [geqq] [rel] [sy] ["DB]
+\definemathsymbol [geqslant] [rel] [mb] ["E1]
+\definemathsymbol [gtrless] [rel] [sy] ["DF]
+\definemathsymbol [sqsubset] [rel] [sy] ["E4]
+\definemathsymbol [sqsupset] [rel] [sy] ["E5]
+\definemathsymbol [vartriangleright] [rel] [mb] ["2E]
+\definemathsymbol [rhd] [bin] [mb] ["2E]
+\definemathsymbol [lhd] [bin] [mb] ["2F]
+\definemathsymbol [vartriangleleft] [rel] [mb] ["2F]
+\definemathsymbol [trianglerighteq] [rel] [sy] ["F5]
+\definemathsymbol [unrhd] [bin] [sy] ["F5] % trianglerighteq
+\definemathsymbol [trianglelefteq] [rel] [sy] ["F4]
+\definemathsymbol [unlhd] [bin] [sy] ["F4] % trianglelefteq
+\definemathsymbol [bigstar] [ord] [ma] ["AB]
+\definemathsymbol [between] [rel] [mb] ["F2]
+\definemathsymbol [blacktriangledown] [ord] [ma] ["07]
+\definemathsymbol [blacktriangleright] [rel] [mb] ["F1]
+\definemathsymbol [blacktriangleleft] [rel] [mb] ["F0]
+\definemathsymbol [vartriangle] [rel] [ma] ["04]
+\definemathsymbol [triangleup] [ord] [ma] ["04] % vartriangle
+\definemathsymbol [blacktriangle] [ord] [ma] ["05]
+\definemathsymbol [triangledown] [ord] [ma] ["06]
+\definemathsymbol [eqcirc] [rel] [sy] ["CF]
+\definemathsymbol [lesseqgtr] [rel] [mb] ["E8]
+\definemathsymbol [gtreqless] [rel] [mb] ["E9]
+\definemathsymbol [lesseqqgtr] [rel] [mb] ["EA]
+\definemathsymbol [gtreqqless] [rel] [mb] ["EB]
+\definemathsymbol [Rrightarrow] [rel] [ma] ["6C]
+\definemathsymbol [Lleftarrow] [rel] [ma] ["6A]
+\definemathsymbol [veebar] [bin] [mb] ["D2]
+\definemathsymbol [barwedge] [bin] [sy] ["F6]
+\definemathsymbol [doublebarwedge] [bin] [sy] ["D4]
+\definemathsymbol [angle] [ord] [sy] ["8B]
+\definemathsymbol [measuredangle] [ord] [sy] ["8C]
+\definemathsymbol [sphericalangle] [ord] [sy] ["8D]
+\definemathsymbol [varpropto] [rel] [sy] ["2F]
+\definemathsymbol [smallsmile] [rel] [mb] ["5E]
+\definemathsymbol [smallfrown] [rel] [mb] ["5F]
+\definemathsymbol [Subset] [rel] [sy] ["F8]
+\definemathsymbol [Supset] [rel] [sy] ["F9]
+\definemathsymbol [Cup] [bin] [sy] ["FA]
+\definemathsymbol [doublecup] [bin] [sy] ["FA] % Cup
+\definemathsymbol [Cap] [bin] [sy] ["FB]
+\definemathsymbol [doublecap] [bin] [sy] ["FB]
+\definemathsymbol [curlywedge] [bin] [sy] ["84]
+\definemathsymbol [curlyvee] [bin] [sy] ["85]
+\definemathsymbol [leftthreetimes] [bin] [mb] ["D0]
+\definemathsymbol [rightthreetimes] [bin] [mb] ["D1]
+\definemathsymbol [subseteqq] [rel] [mb] ["EE]
+\definemathsymbol [supseteqq] [rel] [mb] ["EF]
+\definemathsymbol [bumpeq] [rel] [sy] ["C8]
+\definemathsymbol [Bumpeq] [rel] [sy] ["C7]
+\definemathsymbol [llless] [rel] [mb] ["DE]
+\definemathsymbol [lll] [rel] [mb] ["DE] % llless
+\definemathsymbol [gggtr] [rel] [mb] ["DF]
+\definemathsymbol [ggg] [rel] [mb] ["DF] % gggtr
+\definemathsymbol [ulcorner] [open] [ma] ["5B] [ma] ["5B]
+\definemathsymbol [urcorner] [close] [ma] ["5C] [ma] ["5C]
+\definemathsymbol [circledS] [ord] [mb] ["CA]
+\definemathsymbol [pitchfork] [rel] [ma] ["F3]
+\definemathsymbol [dotplus] [bin] [sy] ["89]
+\definemathsymbol [backsim] [rel] [sy] ["24]
+\definemathsymbol [backsimeq] [rel] [sy] ["27]
+\definemathsymbol [llcorner] [open] [ma] ["5D] [ma] ["5D]
+\definemathsymbol [lrcorner] [close] [ma] ["5E] [ma] ["5E]
+\definemathsymbol [complement] [ord] [mb] ["94]
+\definemathsymbol [intercal] [bin] [ma] ["03] % !!
+\definemathsymbol [circledcirc] [bin] [sy] ["E6]
+\definemathsymbol [circledast] [bin] [sy] ["E7]
+\definemathsymbol [circleddash] [bin] [mb] ["CC]
+
+\stopmathcollection
+
+\startmathcollection [lbr]
+
+\definemathsymbol [lvertneqq] [rel] [ma] ["DE]
+\definemathsymbol [gvertneqq] [rel] [ma] ["DE]
+\definemathsymbol [nleq] [rel] [ma] ["9C]
+\definemathsymbol [ngeq] [rel] [ma] ["9D]
+\definemathsymbol [nless] [rel] [ma] ["9A]
+\definemathsymbol [ngtr] [rel] [ma] ["9B]
+\definemathsymbol [nprec] [rel] [ma] ["E5]
+\definemathsymbol [nsucc] [rel] [ma] ["E6]
+\definemathsymbol [lneqq] [rel] [ma] ["DC]
+\definemathsymbol [gneqq] [rel] [ma] ["DE]
+\definemathsymbol [nleqslant] [rel] [ma] ["D6]
+\definemathsymbol [ngeqslant] [rel] [ma] ["D7]
+\definemathsymbol [lneq] [rel] [ma] ["DA]
+\definemathsymbol [gneq] [rel] [ma] ["DB]
+\definemathsymbol [npreceq] [rel] [ma] ["E7]
+\definemathsymbol [nsucceq] [rel] [ma] ["E8]
+\definemathsymbol [precnsim] [rel] [ma] ["EB]
+\definemathsymbol [succnsim] [rel] [ma] ["EC]
+\definemathsymbol [lnsim] [rel] [ma] ["E0]
+\definemathsymbol [gnsim] [rel] [ma] ["E2]
+\definemathsymbol [nleqq] [rel] [ma] ["D8]
+\definemathsymbol [ngeqq] [rel] [ma] ["D9]
+\definemathsymbol [precneqq] [rel] [ma] ["E9]
+\definemathsymbol [succneqq] [rel] [ma] ["EA]
+\definemathsymbol [precnapprox] [rel] [ma] ["ED]
+\definemathsymbol [succnapprox] [rel] [ma] ["EE]
+\definemathsymbol [lnapprox] [rel] [ma] ["E4]
+\definemathsymbol [gnapprox] [rel] [ma] ["E3]
+\definemathsymbol [nsim] [rel] [ma] ["96]
+\definemathsymbol [ncong] [rel] [ma] ["99]
+\definemathsymbol [diagup] [ord] [mb] ["CD]
+\definemathsymbol [diagdown] [ord] [mb] ["D8]
+\definemathsymbol [varsubsetneq] [rel] [ma] ["D0]
+\definemathsymbol [varsupsetneq] [rel] [ma] ["D1]
+\definemathsymbol [nsubseteqq] [rel] [ma] ["CA]
+\definemathsymbol [nsupseteqq] [rel] [ma] ["CB]
+\definemathsymbol [subsetneqq] [rel] [ma] ["CE]
+\definemathsymbol [supsetneqq] [rel] [ma] ["CF]
+\definemathsymbol [varsubsetneqq] [rel] [ma] ["D2]
+\definemathsymbol [varsupsetneqq] [rel] [ma] ["D3]
+\definemathsymbol [subsetneq] [rel] [ma] ["CC]
+\definemathsymbol [supsetneq] [rel] [ma] ["CD]
+\definemathsymbol [nsubseteq] [rel] [ma] ["C8]
+\definemathsymbol [nsupseteq] [rel] [ma] ["C9]
+\definemathsymbol [nparallel] [rel] [ma] ["F7]
+\definemathsymbol [nmid] [rel] [ma] ["F6]
+\definemathsymbol [nshortmid] [rel] [ma] ["F4]
+\definemathsymbol [nshortparallel] [rel] [ma] ["F5]
+\definemathsymbol [nvdash] [rel] [ma] ["F8]
+\definemathsymbol [nVdash] [rel] [ma] ["F9]
+\definemathsymbol [nvDash] [rel] [ma] ["FA]
+\definemathsymbol [nVDash] [rel] [ma] ["FB]
+\definemathsymbol [ntrianglerighteq] [rel] [ma] ["F2]
+\definemathsymbol [ntrianglelefteq] [rel] [ma] ["F1]
+\definemathsymbol [ntriangleleft] [rel] [ma] ["EF]
+\definemathsymbol [ntriangleright] [rel] [ma] ["F0]
+\definemathsymbol [nleftarrow] [rel] [ma] ["32]
+\definemathsymbol [nrightarrow] [rel] [ma] ["33]
+\definemathsymbol [nLeftarrow] [rel] [ma] ["66]
+\definemathsymbol [nRightarrow] [rel] [ma] ["68]
+\definemathsymbol [nLeftrightarrow] [rel] [ma] ["67]
+\definemathsymbol [nleftrightarrow] [rel] [ma] ["34]
+\definemathsymbol [divideontimes] [bin] [mb] ["F7]
+\definemathsymbol [varnothing] [ord] [sy] ["53]
+\definemathsymbol [nexists] [ord] [ma] ["20]
+\definemathsymbol [Finv] [ord] [mb] ["90]
+\definemathsymbol [Game] [ord] [mb] ["91]
+\definemathsymbol [mho] [ord] [mb] ["92]
+\definemathsymbol [eth] [ord] [ma] ["03] % !!
+\definemathsymbol [eqsim] [rel] [sy] ["99]
+\definemathsymbol [beth] [ord] [mb] ["95]
+\definemathsymbol [gimel] [ord] [mb] ["96]
+\definemathsymbol [daleth] [ord] [mb] ["97]
+\definemathsymbol [lessdot] [bin] [mb] ["DC]
+\definemathsymbol [gtrdot] [bin] [mb] ["DD]
+\definemathsymbol [ltimes] [bin] [mb] ["CF]
+\definemathsymbol [rtimes] [bin] [mb] ["CE]
+\definemathsymbol [shortmid] [rel] [mb] ["F4]
+\definemathsymbol [shortparallel] [rel] [mb] ["F5]
+\definemathsymbol [smallsetminus] [bin] [mb] ["D8]
+\definemathsymbol [thicksim] [rel] [sy] ["18] % not that thick
+\definemathsymbol [thickapprox] [rel] [sy] ["19] % not that thick
+\definemathsymbol [approxeq] [rel] [sy] ["9D]
+\definemathsymbol [succapprox] [rel] [mb] ["ED]
+\definemathsymbol [precapprox] [rel] [mb] ["EC]
+\definemathsymbol [curvearrowleft] [rel] [ma] ["87]
+\definemathsymbol [curvearrowright] [rel] [ma] ["88]
+\definemathsymbol [digamma] [ord] [ma] ["03] % !!
+\definemathsymbol [varkappa] [ord] [mb] ["9B]
+\definemathsymbol [Bbbk] [ord] [ma] ["6B]
+\definemathsymbol [hslash] [ord] [mb] ["9D]
+\definemathsymbol [hbar] [ord] [ma] ["1B]
+\definemathsymbol [backepsilon] [rel] [ma] ["03] % !!
+
+\stopmathcollection
+
+\startmathcollection [lbr]
+
+\definemathsymbol [yen] [nothing] [ma] ["03] % !!
+\definemathsymbol [checkmark] [nothing] [ma] ["AC]
+\definemathsymbol [circledR] [nothing] [mb] ["C9]
+\definemathsymbol [maltese] [nothing] [mb] ["CB]
+
+\stopmathcollection
+
+\startmathcollection [lbr]
+
+\definemathsymbol [dashrightarrow] [rel] [ma] ["3A]
+\definemathsymbol [dashleftarrow] [rel] [ma] ["38]
+\definemathcommand [dasharrow] [rel] {\dashleftarrow\mkern-15.8mu\dashrightarrow}
+%definemathcommand [Join] [rel] {\mathchar"0D6F\mkern-15.8mu\mathchar"0D6E} % !!
\stopmathcollection
\startmathcollection[lbr]
-\definemathcharacter [91] [open] [mi] ["86]
-\definemathcharacter [93] [close] [mi] ["87]
-\definemathcharacter [(] [open] [mi] ["84]
-\definemathcharacter [)] [close] [mi] ["85]
-\definemathcharacter [/] [nothing] [mi] ["3D]
-\definemathcharacter [=] [rel] [sy] ["83]
+\definemathcharacter [91] [open] [mi] ["86]
+\definemathcharacter [93] [close] [mi] ["87]
+\definemathcharacter [(] [open] [mi] ["84]
+\definemathcharacter [)] [close] [mi] ["85]
+\definemathcharacter [/] [nothing] [mi] ["3D]
+\definemathcharacter [=] [rel] [sy] ["83]
\definemathcharacter [+] [bin] [sy] ["82]
\definemathcharacter [91] [nothing] [mi] ["86] [ex] ["02]
@@ -42,19 +296,19 @@
\stopmathcollection
% \startmathcollection[lbr]
-%
+%
% \definemathcharacter [:] [punct] [tf] ["3A] % unbelievable
% \definemathcharacter [;] [punct] [tf] ["3B] % unbelievable
-%
+%
% \stopmathcollection
\startmathcollection[lbr]
\definemathsymbol [ldbrack] [open] [mi] ["82] [ex] ["82]
\definemathsymbol [rdbrack] [close] [mi] ["83] [ex] ["83]
-\definemathsymbol [surfintop] [op] [ex] ["90]
-\definemathsymbol [midintop] [op] [ex] ["92]
-\definemathsymbol [midointop] [op] [ex] ["93]
+\definemathsymbol [surfintop] [op] [ex] ["90]
+\definemathsymbol [midintop] [op] [ex] ["92]
+\definemathsymbol [midointop] [op] [ex] ["93]
\definemathsymbol [midsurfintop] [op] [ex] ["94]
\definemathsymbol [largeint] [op] [ex] ["5A] [ex] ["95]
@@ -63,9 +317,9 @@
% \definemathcommand [midoint] [nolop] {\midointop}
% \definemathcommand [midsurfint] [nolop] {\midsurfintop}
-\definemathsymbol [surfint] [nolop] [ex] ["90]
-\definemathsymbol [midint] [nolop] [ex] ["92]
-\definemathsymbol [midoint] [nolop] [ex] ["93]
+\definemathsymbol [surfint] [nolop] [ex] ["90]
+\definemathsymbol [midint] [nolop] [ex] ["92]
+\definemathsymbol [midoint] [nolop] [ex] ["93]
\definemathsymbol [midsurfint] [nolop] [ex] ["94]
\definemathsymbol [dblint] [ord] [mi] ["88]
@@ -80,7 +334,6 @@
\definemathsymbol [models] [rel] [sy] ["EE]
\definemathsymbol [doteq] [rel] [sy] ["C9]
\definemathsymbol [cong] [rel] [sy] ["9B]
-\definemathsymbol [angle] [ord] [sy] ["8B]
\definemathsymbol [hbar] [ord] [mi] ["9D]
\definemathsymbol [neq] [rel] [ma] ["94]
\definemathsymbol [rightleftharpoons] [rel] [ma] ["7A]
@@ -93,23 +346,8 @@
\stopmathcollection
-\definefamilysynonym [lbr] [ucgreek] [mb]
-\definefamilysynonym [lbr] [vargreek] [mi]
-
\startmathcollection[lbr]
-%\definemathsymbol [Gamma] [alpha] [ucgreek] ["D0]
-%\definemathsymbol [Delta] [alpha] [ucgreek] ["D1]
-%\definemathsymbol [Theta] [alpha] [ucgreek] ["D2]
-%\definemathsymbol [Lambda] [alpha] [ucgreek] ["D3]
-%\definemathsymbol [Xi] [alpha] [ucgreek] ["D4]
-%\definemathsymbol [Pi] [alpha] [ucgreek] ["D5]
-%\definemathsymbol [Sigma] [alpha] [ucgreek] ["D6]
-%\definemathsymbol [Upsilon] [alpha] [ucgreek] ["D7]
-%\definemathsymbol [Phi] [alpha] [ucgreek] ["D8]
-%\definemathsymbol [Psi] [alpha] [ucgreek] ["D9]
-%\definemathsymbol [Omega] [alpha] [ucgreek] ["DA]
-
\definemathsymbol [Gamma] [alpha] [ucgreek] ["00]
\definemathsymbol [Delta] [alpha] [ucgreek] ["01]
\definemathsymbol [Theta] [alpha] [ucgreek] ["02]
@@ -202,4 +440,4 @@
\stoprawmathcollection
-\protect \endinput
+\protect \endinput
diff --git a/tex/context/base/math-run.tex b/tex/context/base/math-run.tex
index c2a5852a0..b41ea3c64 100644
--- a/tex/context/base/math-run.tex
+++ b/tex/context/base/math-run.tex
@@ -13,18 +13,21 @@
\unprotect
+\ifx\showmathmodern\undefined \global\chardef\showmathmodern\zerocount \fi
+
\gdef\showmathcharacters% nearly \showcharacters
{\par
\bgroup
+ \ifcase\showmathmodern\or\ifx\modern\undefined\chardef\showmathmodern\zerocount\fi\fi
\setuptextrules[\c!bodyfont=,\c!style=]
- \starttextrule{math characters}
+ \starttextrule{math characters -- \currentmathcollection}
\whitespace
\dontcomplain
\forgetall
\def\startmathcollection[##1]{}
\let\stopmathcollection\relax
- \dimen0=\!!zeropoint
- \dimen2=\!!zeropoint
+ \dimen0\zeropoint
+ \dimen2\zeropoint
\def\definemathsymbol {\dosixtupleempty\dodefinemathsymbol}
\def\definemathcharacter{\dosixtupleempty\dodefinemathcharacter}
\def\definemathcommand {\dotripleempty \dodefinemathcommand}
@@ -33,19 +36,19 @@
{%\doifcolorelse{math \purefamilyhex{##3}}{}
% {\increment\mathcolor
% \definecolor[math \purefamilyhex{##3}][\mathcolor]}%
- \setbox0=\hbox spread 1em
- {$\getvalue{##1}{}$}%
+ \setbox0\hbox spread 1em{\mathematics{\getvalue{##1}{}{}{}}}%
\ifdim\wd0>\dimen0 \dimen0=\wd0 \fi
- \setbox2=\hbox spread 1em
- {\hbox to 1em{\tttf\purefamilyhex{##3}\hss}\box0 ##1}
+ \setbox2\hbox spread 1em{\hbox to 1em{\tttf\purefamilyhex{##3}\hss}\box0 ##1}%
\ifdim\wd2>\dimen2 \dimen2=\wd2 \fi}
\def\dodefinemathcharacter[##1][##2][##3][##4][##5][##6]{}
- \def\dodefinemathcommand[##1][##2][##3]##4{}
- \readsysfile{\f!mathprefix tex}{}{}
+ \def\dodefinemathcommand [##1][##2][##3]##4{}
+ \readsysfile{\f!mathprefix tex}\donothing\donothing
+ \readsysfile{\f!mathprefix ams}\donothing\donothing
\edef\encwidth{\the\dimen0}
\dimen0=\hsize
\advance\dimen0 2em
\advance\dimen2 2em
+ \ifcase\showmathmodern\or\advance\dimen2 2em\fi
\divide \dimen0 by \dimen2 \advance\dimen0 1sp
\edef\enccols{\number\dimen0}
\startcolumns[\c!n=\enccols,\c!distance=2em]
@@ -54,10 +57,13 @@
%\color
% [math \purefamilyhex{##3}]
{\hbox
- {\hbox to \encwidth{$\getvalue{##1}{}$\hss}%
+ {\ifcase\showmathmodern\or
+ \hbox to \encwidth{\modern\let\mathcollection\nomathcollection\mathematics{\getvalue{##1}{}{}{}}\hss}%
+ \fi
+ \hbox to \encwidth{\mathematics{\getvalue{##1}{}{}{}}\hss}%
\hbox to 1em{\tttf\purefamilyhex{##3}\hss}##1}\par}}
- \readsysfile{\f!mathprefix tex}{}{}
-% \readsysfile{\f!mathprefix ams}{}{}
+ \readsysfile{\f!mathprefix tex}\donothing\donothing
+ \readsysfile{\f!mathprefix ams}\donothing\donothing
\stopcolumns
\stoptextrule
\egroup}
diff --git a/tex/context/base/math-tex.tex b/tex/context/base/math-tex.tex
index 0e474a892..4db3a2058 100644
--- a/tex/context/base/math-tex.tex
+++ b/tex/context/base/math-tex.tex
@@ -15,10 +15,15 @@
\mathcode`\ ="8000 \mathcode`\_="8000 \mathcode`\'="8000
-\definefamilysynonym [default] [lcgreek] [mi]
-\definefamilysynonym [default] [ucgreek] [mr]
-\definefamilysynonym [default] [vargreek] [mi]
-%definefamilysynonym [default] [blackboard] [mb] % extra font
+\definefamilysynonym [default] [calligraphic] [sy]
+\definefamilysynonym [default] [oldstyle] [mi]
+\definefamilysynonym [default] [blackboard] [mr]
+\definefamilysynonym [default] [gothic] [mr]
+\definefamilysynonym [default] [fraktur] [mr]
+
+\definefamilysynonym [default] [lcgreek] [mi]
+\definefamilysynonym [default] [ucgreek] [mr]
+\definefamilysynonym [default] [vargreek] [mi]
\startmathcollection [default]
diff --git a/tex/context/base/page-flt.tex b/tex/context/base/page-flt.tex
index 94fd2e0e5..3fa99850f 100644
--- a/tex/context/base/page-flt.tex
+++ b/tex/context/base/page-flt.tex
@@ -1953,7 +1953,7 @@
\getparameters[\??si][#1]%
\resetnumber[\??si]%
\def\floatcaptionsuffix{\convertednumber[\??si]}%
- \TABLEcaptionheight=\@@silines\lineheight % brrr
+ \TABLEcaptionheight\@@silines\lineheight % brrr
\simplifypagebreak % \page becomes \goodbreak
\dowithnextbox
{\forgetall
@@ -1963,7 +1963,7 @@
\setbox2\vbox{\unvbox2}
\ifdim\ht2>\lineheight
\incrementnumber[\??si]%
- \ifnum\rawnumber[\??si]=1 \ifdim\nextboxht=\zeropoint
+ \ifcase\rawnumber[\??si]\or \ifdim\nextboxht=\zeropoint
\let\floatcaptionsuffix\empty
\fi \fi
\bgroup
@@ -1981,7 +1981,7 @@
\vbox
\fi}
-\def\splitfloat%
+\def\splitfloat
{\dosingleempty\dosplitfloat}
\def\dooutput{\sidefloatoutput} % redefinition of \dooutput
diff --git a/tex/context/base/page-mak.tex b/tex/context/base/page-mak.tex
index 87d8be7c2..fe3bfe40d 100644
--- a/tex/context/base/page-mak.tex
+++ b/tex/context/base/page-mak.tex
@@ -176,13 +176,13 @@
\processaction
[\makeupparameter\c!doublesided]
[ \v!yes=>\null
- \page,
- % \verlaagpaginanummer, % new
+ \page,
+ % \verlaagpaginanummer, % new
\v!empty=>{\setupmakeuplayout
\page[\v!blank]%
\null
\page}]%
- % \verlaagpaginanummer]% % new
+ % \verlaagpaginanummer]% % new
\fi \fi
% \verlaagpaginanummer % new
\globalpopmacro\@@pnstate} % new
@@ -192,7 +192,7 @@
%D connection between them is made by the following macro
\def\setupmakeuplayout
- {\setupfooter[\c!state=\makeupparameter\c!footerstate ]%
+ {\setupfooter[\c!state=\makeupparameter\c!footerstate]%
\setupheader[\c!state=\makeupparameter\c!headerstate]%
\setuptext [\c!state=\makeupparameter\c!textstate]%
\setupbottom[\c!state=\makeupparameter\c!bottomstate]%
diff --git a/tex/context/base/spec-dpm.tex b/tex/context/base/spec-dpm.tex
index 0aceee9ca..74fb16963 100644
--- a/tex/context/base/spec-dpm.tex
+++ b/tex/context/base/spec-dpm.tex
@@ -409,9 +409,10 @@
\def\doPDFbookmark level #1 n #2 text #3 page #4 open #5%
{\ifcase#2\else
- \special
- {pdf: out \ifcase#5-\fi#2
- <</Page #4\space /View [/Fit] /Title (#3)>>}%
+ \scratchcounter#4\advance\scratchcounter\minusone
+ \special{pdf: out \ifcase#5-\fi#2
+ % <</Page \the\scratchcounter\space /View [/Fit] /Title (#3)>>}%
+ <</Title (#3) /A <</S /GoTo /D [@page\number#4\space\PDFpageviewwrd]>> >>}%
\fi}
%D \macros
diff --git a/tex/context/base/spec-dpx.tex b/tex/context/base/spec-dpx.tex
index 95d5a3021..1641e0daa 100644
--- a/tex/context/base/spec-dpx.tex
+++ b/tex/context/base/spec-dpx.tex
@@ -223,7 +223,7 @@
\def\assignPDFtransparency#1#2%
{\def\PDFtransparencyidentifier{/Tr#1}%
- %\def\PDFtransparencyreference{#2 0 R}}
+ %\def\PDFtransparencyreference{\PDFobjref{#2}}}
\def\PDFtransparencyreference{@TR:#2}}
\def\presetPDFtransparency#1#2%
@@ -237,7 +237,7 @@
\doPDFreserveDPXobject{TR:\the\PDFcurrenttransparency}{<< >>}%
\special{pdf: \doPDFcheckedDPXobject{TR:\the\PDFcurrenttransparency}\PDFtransparancydictionary{#1}{#2}{}}%
\edef\PDFtransparencyidentifier{/Tr\the\PDFcurrenttransparency}%
- %\edef\PDFtransparencyreference {\the\pdflastobj\space 0 R}%
+ %\edef\PDFtransparencyreference {\PDFobjref\pdflastobj}%
\edef\PDFtransparencyreference {@TR:\the\PDFcurrenttransparency}%
\setxvalue{\@@PDT#1:#2}%
{\noexpand\assignPDFtransparency{\the\PDFcurrenttransparency}{\the\PDFcurrenttransparency}}%
@@ -251,7 +251,7 @@
{\doPDFreserveDPXobject{TR:0}{<< >>}%
\special{pdf: \doPDFcheckedDPXobject{TR:0}\PDFtransparancydictionary{1}{1}{/AIS false}}%
\xdef\PDFtransparencyresetidentifier{/Tr0}%
- %\xdef\PDFtransparencyresetreference{\the\pdflastobj\space 0 R}%
+ %\xdef\PDFtransparencyresetreference{\PDFobjref\pdflastobj}%
\xdef\PDFtransparencyresetreference{@TR:0}%
\setxvalue{\@@PDT0:0}%
%{\noexpand\assignPDFtransparency{0}{\the\pdflastobj}}%
@@ -555,8 +555,8 @@
\def\doPDFpageresource#1%
{\special{pdf: put @resources <<#1>>}}
-\let\doPDFresetpageresources =\relax
-\let\doPDFresetpageattributes=\relax
+\let\doPDFresetpageresources \relax
+\let\doPDFresetpageattributes\relax
%D \type{\doPDFbookmark} in \type{spec-dpm} had a bug.
%D The openbookmark option \#5 is not supported yet.
@@ -566,8 +566,10 @@
\def\doPDFbookmark level #1 n #2 text #3 page #4 open #5%
{\ifcase#1\else
+ \scratchcounter#4\advance\scratchcounter\minusone
\special{pdf: outline #1 %\ifcase\the#5-\fi#1
- <</Title (#3) /A <</S /GoTo /D (page:#4)>>>>}%
+ % <</Title (#3) /A <</S /GoTo /D (page:\the\scratchcounter)>>>>}%
+ <</Title (#3) /A <</S /GoTo /D [@page\number#4\space\PDFpageviewwrd]>> >>}%
\fi}
%D \macros
diff --git a/tex/context/base/spec-fdf.tex b/tex/context/base/spec-fdf.tex
index 94bc756e4..7d5a73b4d 100644
--- a/tex/context/base/spec-fdf.tex
+++ b/tex/context/base/spec-fdf.tex
@@ -33,6 +33,16 @@
\unprotect
%D \macros
+%D {\PDFobjref}
+%D
+%D Just a shortcut.
+
+% Watch out, \def\PDFobjref#1{\purenumber#1 0 R} also works, but not when
+% #1 == \the\whatever
+
+\def\PDFobjref#1{\purenumber{#1} 0 R}
+
+%D \macros
%D {setPDFdestination}
%D
%D \PDF\ destinations should obey the specifications laid down
@@ -629,7 +639,7 @@
% ==>
%
% \advance\scratchcounter 1
-% \edef\PDFdestination{[\pdfpageref \scratchcounter\space 0 R\space\PDFpageviewwrd]}%
+% \edef\PDFdestination{[\pdfpageref \PDFobjref\scratchcounter\PDFpageviewwrd]}%
%
% \doPDFgetpagedestination#1#2% pagenumber macro % % fuzzy hack
@@ -1007,27 +1017,6 @@
\def\doPDFgetfilestreamreference#1#2%
{0 0 R}
-% \def\doPDFattachfile#1#2#3#4#5#6#7#8%
-% {\bgroup % title width height color symbol file
-% \edef\PDFfile{#8}\convertcommand\PDFfile\to\PDFfile
-% % beware: the symbol may (indirectly) use the file
-% % reference when typesetting the object number;
-% \presetPDFsymbolappearance{#5}{#6}{#2}{#3}{#4}% sets width/height
-% \startPDFsymbolappearance
-% \doifnotflagged{a:\PDFfile}%
-% {\doPDFfilestreamobject
-% class PDFEF name {\PDFfile} file {#7} source {#8}%
-% \doglobal\setflag{a:\PDFfile}}%
-% \doPDFgetobjectreference{PDFEF}\PDFfile\PDFobjectreference
-% \doPDFannotation width {\width} height {\totalheight} data
-% {/Subtype /FileAttachment
-% /FS \PDFobjectreference\space
-% /Contents (#1)
-% \PDFsymbol
-% \PDFattributes}%
-% \stopPDFsymbolappearance
-% \egroup}
-
\def\doPDFattachfile#1#2#3#4#5#6#7#8%
{\bgroup % title width height color symbol file
\edef\PDFfile{#8}\convertcommand\PDFfile\to\PDFfile
@@ -1264,11 +1253,8 @@
% todo, unicode
\sanitizePDFdocencoding#3\to\bookmarktext % uses scratchcounter
\stripstring\bookmarktext
- \scratchcounter#4%
- \advance\scratchcounter \minusone
%\sanitizePDFstring#3\to\bookmarktext
- \doPDFbookmark level #1 n #2 text {\bookmarktext}
- page {\the\scratchcounter} open #5
+ \doPDFbookmark level #1 n #2 text {\bookmarktext} page {#4} open #5
\egroup}
%D The next section of this module is dedicated to form
@@ -2553,7 +2539,7 @@
{/Subtype /Text
\ifcase#5 \else/Open true\fi
% pdftex (efficient)
- % \ifdone /Popup \the\pdflastannot\space 0 R\fi
+ % \ifdone /Popup \PDFobjref\pdflastannot\fi
% generic (less efficient)
\ifdone /Popup \PDFobjectreference\fi
/Contents \ifPDFunicode <\PDFdata> \else(\PDFdata) \fi
@@ -2777,7 +2763,7 @@
% we cannot use /DeviceN since GS <=7.21 breaks on it
% and Jaws does not handle it at all {[/DeviceN [/All|/None]
-% /Device#2 \the\pdflastobj\space0 R]} so we use separation
+% /Device#2 \PDFobjref\pdflastobj]} so we use separation
% colors that work and print ok
\def\doPDFregistersomespotcolor#1#2#3#4% implemented in the driver
@@ -3087,7 +3073,7 @@
\prependtoksonce \flushPDFpagelayers \to \everyshipout
\prependtoksonce \flushPDFtextlayers \to \everylastshipout
-\def\PDFlayeractionlist{null} % \PDFlayeractionlist{5 0 R}
+\def\PDFlayeractionlist{null}
\def\PDFexecutehidelayer {/SetOCGState /State [/OFF \PDFlayeractionlist]}
\def\PDFexecutevidelayer {/SetOCGState /State [/ON \PDFlayeractionlist]}
diff --git a/tex/context/base/spec-pdf.tex b/tex/context/base/spec-pdf.tex
index 58a8876a2..ae3f582c7 100644
--- a/tex/context/base/spec-pdf.tex
+++ b/tex/context/base/spec-pdf.tex
@@ -448,9 +448,10 @@
%D This is how we force bookmarks entries in the file.
\def\doPDFbookmark level #1 n #2 text #3 page #4 open #5%
- {\special
+ {\scratchcounter#4\advance\scratchcounter\minusone
+ \special
{\@@insertpostscriptretain
- [ /Page #4\space
+ [ /Page \the\scratchcounter\space
\ifcase#2 \else/Count \ifcase#5-\fi#2 \fi
\PDFpageview
/Title (#3)
diff --git a/tex/context/base/spec-tpd.tex b/tex/context/base/spec-tpd.tex
index 51720d6a7..e6ea95fbd 100644
--- a/tex/context/base/spec-tpd.tex
+++ b/tex/context/base/spec-tpd.tex
@@ -11,8 +11,17 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-% todo: nagaan of we met reserveobjnum en useobjnum kunnen werken;
-% driver referenced etc
+% once we can be sure that the latest versions of pdftex are
+% available we can use:
+%
+% \pdfobj reserveobjnum \edef\one{\the\pdflastobj}
+% \pdfobj reserveobjnum \edef\two{\the\pdflastobj}
+%
+% \pdfobj useobjnum \one {x}
+% \pdfobj useobjnum \two {x}
+%
+% we then can rewrite part of spec-fdf because the other drivers
+% already support symbolic references
% layers and links don't work while the spec says they should
@@ -219,7 +228,6 @@
\fi
-
%D nasty but needed
\appendtoksonce \loadallfontmapfiles \to \everyPDFximage
@@ -256,7 +264,7 @@
\definespecial\dogetnofinsertpages#1%
{\xdef\nofinsertpages{1}% global
\doifvalidpdfimagefileelse{#1}%
- {\pdfximage {#1}\xdef\nofinsertpages{\the\pdflastximagepages}}
+ {\pdfximage{#1}\xdef\nofinsertpages{\the\pdflastximagepages}}
{}}
%D Currently we support \type{pdf} for \PDF\ files, \type{mps}
@@ -400,10 +408,10 @@
\global\let\pdfimageattributes\empty
\else
\immediate\pdfobj
- {[ << /Image \PDFfigurereference\space0 R
+ {[ << /Image \PDFobjref\PDFfigurereference
/DefaultForPrinting true >> ]}%
\xdef\pdfimageattributes
- {attr {/Alternates \the\pdflastobj\space0 R}}%
+ {attr {/Alternates \PDFobjref\pdflastobj}}%
\fi}
\global\let\PDFimagecolorreference\empty
@@ -560,15 +568,6 @@
\definespecial\dostartnonecolormode{\doPDFstartnonecolormode}
\definespecial\doregisternonecolor {\doPDFregisternonecolor}
-% \def\doPDFregistersomespotcolor#1#2#3#4%
-% {\immediate \pdfobj stream attr
-% {/FunctionType 4 /Domain [0.0 1.0] /Range #3}{#4}%
-% \immediate \pdfobj
-% {[/Separation /#1 /Device#2 \the\pdflastobj\space0 R]}%
-% \dosetobjectreference{PDFCS}{#1}{\the\pdflastobj}%
-% \appendtoPDFdocumentcolorspaces
-% {/#1 \the\pdflastobj\space0 R}}
-
\def\doPDFregisterspotcolorname#1#2%
{\bgroup
\let\ascii\empty
@@ -605,9 +604,9 @@
\immediate \pdfobj stream attr
{/FunctionType 4 /Domain [\PDFspotcolordomain] /Range [#6]}{{\spotpops#7}}%
\immediate \pdfobj
- {[\PDFspotcolornames\space /Device#5 \the\pdflastobj\space0 R]}%
+ {[\PDFspotcolornames\space /Device#5 \PDFobjref\pdflastobj]}%
\dosetobjectreference{PDFCS}{#1}{\the\pdflastobj}%
- \appendtoPDFdocumentcolorspaces{/#1 \the\pdflastobj\space0 R}%
+ \appendtoPDFdocumentcolorspaces{/#1 \PDFobjref\pdflastobj}%
\egroup}
%D New and very experimental.
@@ -636,10 +635,10 @@
{/FunctionType 4 /Domain [\PDFspotcolordomain] /Range [#6]}{{\spotpops#7}}%
\immediate \pdfobj
{[/Indexed
- [/DeviceN [\PDFspotcolornames] /Device#5 \the\pdflastobj\space0 R] %
+ [/DeviceN [\PDFspotcolornames] /Device#5 \PDFobjref\pdflastobj] %
255 <\PDFcolorindexvector>]}%
\dosetobjectreference{PDFIX}{#1}{\the\pdflastobj}%
- \appendtoPDFdocumentcolorspaces{/#1_INDEXED \the\pdflastobj\space0 R}%
+ \appendtoPDFdocumentcolorspaces{/#1_INDEXED \PDFobjref\pdflastobj}%
\egroup}
%D \macros
@@ -660,8 +659,8 @@
\fi
\def\assignPDFtransparency#1#2%
- {\def\PDFtransparencyidentifier{/Tr#1}%
- \def\PDFtransparencyreference{#2 0 R}}
+ {\edef\PDFtransparencyidentifier{/Tr#1}%
+ \edef\PDFtransparencyreference{\PDFobjref{#2}}}
\def\presetPDFtransparency#1#2%
{\initializePDFtransparency
@@ -671,7 +670,7 @@
{\global\advance\PDFcurrenttransparency \plusone
\immediate\pdfobj{\PDFtransparancydictionary{#1}{#2}{}}%
\edef\PDFtransparencyidentifier{/Tr\the\PDFcurrenttransparency}%
- \edef\PDFtransparencyreference {\the\pdflastobj\space 0 R}%
+ \edef\PDFtransparencyreference {\PDFobjref\pdflastobj}%
\setxvalue{\@@PDT#1:#2}%
{\noexpand\assignPDFtransparency{\the\PDFcurrenttransparency}{\the\pdflastobj}}%
\appendtoPDFdocumentextgstates
@@ -681,7 +680,7 @@
\def\initializePDFtransparency
{\immediate\pdfobj{\PDFtransparancydictionary{1}{1}{/AIS false}}%
\xdef\PDFtransparencyresetidentifier{/Tr0}%
- \xdef\PDFtransparencyresetreference{\the\pdflastobj\space 0 R}%
+ \xdef\PDFtransparencyresetreference{\PDFobjref\pdflastobj}%
\setxvalue{\@@PDT0:0}%
{\noexpand\assignPDFtransparency{0}{\the\pdflastobj}}%
\appendtoPDFdocumentextgstates
@@ -758,10 +757,10 @@
\@EA\doPSsanitizeJScode\sanitizedJScode\to\sanitizedJScode
\immediate\pdfobj {<< /S /JavaScript /JS (\sanitizedJScode) >>}%
\edef\compositeJScode
- {\compositeJScode\space (##1) \the\pdflastobj\space 0 R}}%
+ {\compositeJScode\space (##1) \PDFobjref\pdflastobj}}%
\processcommalist[#1]\docommando
\immediate\pdfobj{<< /Names [ \compositeJScode ] >>}%
- \pdfnames{/JavaScript \the\pdflastobj\space 0 R}%
+ \pdfnames{/JavaScript \PDFobjref\pdflastobj}%
\egroup}
%D \macros
@@ -1099,7 +1098,7 @@
\xdef\lastPDFaction{<<#3>>}%
\or
\immediate\pdfobj{<<#3>>}%
- \xdef\lastPDFaction{\the\pdflastobj\space0 R}%
+ \xdef\lastPDFaction{\PDFobjref\pdflastobj}%
\else
% leave \lastPDFaction untouched
\fi
@@ -1126,7 +1125,7 @@
\xdef\lastPDFaction{<<\lastPDFcontent>>}%
\or
\immediate\pdfobj{<<\lastPDFcontent>>}%
- \xdef\lastPDFaction{\the\pdflastobj\space0 R}%
+ \xdef\lastPDFaction{\PDFobjref\pdflastobj}%
\else
% leave \lastPDFaction untouched
\fi
@@ -1152,7 +1151,7 @@
\xdef\lastPDFaction{<<#3>>}%
\or
\immediate\pdfobj{<<#3>>}%
- \xdef\lastPDFaction{\the\pdflastobj\space0 R}%
+ \xdef\lastPDFaction{\PDFobjref\pdflastobj}%
\else
% leave \lastPDFaction untouched
\fi
@@ -1248,9 +1247,16 @@
% \ifcase#2 \else count \ifcase#5-\fi#2 \fi
% {#3}}
+% \def\doPDFbookmark level #1 n #2 text #3 page #4 open #5%
+% {\pdfoutline
+% user {<</S /GoTo /D [#4\space\PDFpageviewwrd]>>}%
+% \ifcase#2 \else count \ifcase#5-\fi#2 \fi
+% {#3}}
+
\def\doPDFbookmark level #1 n #2 text #3 page #4 open #5%
- {\pdfoutline
- user {<</S /GoTo /D [#4\space\PDFpageviewwrd]>>}%
+ {\doPDFgetpagereference{#4}\PDFobjectreference
+ \pdfoutline
+ user {<</S /GoTo /D [\PDFobjectreference\space\PDFpageviewwrd]>>}%
\ifcase#2 \else count \ifcase#5-\fi#2 \fi
{#3}}
@@ -1282,7 +1288,7 @@
\def\doPDFgetobjectreference#1#2#3%
{\dogetobjectreference{#1}{#2}#3%
- \edef#3{\ifx#3\empty null\else#3\space0 R\fi}}
+ \edef#3{\ifx#3\empty null\else\PDFobjref{#3}\fi}}
% \def\doPDFgetobjectpage #1#2#3{..}
% \def\doPDFgetobjectpagereference#1#2#3{..}
@@ -1297,7 +1303,7 @@
\else
\def\doPDFgetpagereference#1#2% number macro
- {\edef#2{\pdfpageref#1\space\space0 R}}
+ {\edef#2{\ifnum#1>\zerocount\PDFobjref{\pdfpageref#1}\else null\fi}}
\fi
@@ -1311,18 +1317,18 @@
\def\initializePDFnegative
{\immediate\pdfobj stream attr {/FunctionType 4 /Range [0 1] /Domain [0 1]} {{1 exch sub}}%
- \immediate\pdfobj{<</Type /ExtGState /TR \the\pdflastobj\space0 R>>}%
- \appendtoPDFdocumentextgstates{/GSnegative \the\pdflastobj\space0 R}%
+ \immediate\pdfobj{<</Type /ExtGState /TR \PDFobjref\pdflastobj>>}%
+ \appendtoPDFdocumentextgstates{/GSnegative \PDFobjref\pdflastobj}%
\immediate\pdfobj{<</Type /ExtGState /TR /Identity>>}%
- \appendtoPDFdocumentextgstates{/GSpositive \the\pdflastobj\space0 R}%
+ \appendtoPDFdocumentextgstates{/GSpositive \PDFobjref\pdflastobj}%
\global\let\initializePDFnegative\relax}
\def\initializePDFoverprint
{\immediate\pdfobj{<</Type /ExtGState /OP false /OPM 0>>}% /op defaults to /OP
- \appendtoPDFdocumentextgstates{/GSknockout \the\pdflastobj\space0 R}%
+ \appendtoPDFdocumentextgstates{/GSknockout \PDFobjref\pdflastobj}%
\immediate\pdfobj{<</Type /ExtGState /OP true /OPM 1>>}% /op defaults to /OP
\edef\PDFobjectreferenceB{\the\pdflastobj}%
- \appendtoPDFdocumentextgstates{/GSoverprint \the\pdflastobj\space0 R}%
+ \appendtoPDFdocumentextgstates{/GSoverprint \PDFobjref\pdflastobj}%
\global\let\initializePDFoverprint\relax}
%D File embedding. Storing the stream identifier is needed
@@ -1338,7 +1344,7 @@
\edef\PDFlaststreamobject{\the\pdflastobj}%
\dosetobjectreference{PDFFS}{#2}{\PDFlaststreamobject}%
\doPDFdictionaryobject class {#1} name {#2} data
- {/Type /Filespec /F (#3) /EF <</F \PDFlaststreamobject\space0 R>>}}
+ {/Type /Filespec /F (#3) /EF <</F \PDFobjref\PDFlaststreamobject>>}}
\def\doPDFgetfilestreamreference#1#2%
{\doPDFgetobjectreference{PDFFS}{#1}#2}
diff --git a/tex/context/base/supp-pdf.tex b/tex/context/base/supp-pdf.tex
index 3e0e99568..184cfb815 100644
--- a/tex/context/base/supp-pdf.tex
+++ b/tex/context/base/supp-pdf.tex
@@ -1,29 +1,16 @@
%D \module
%D [ file=supp-pdf,
-%D version=2004.10.26,
+%D version=2004.12.16,
%D title=\CONTEXT\ Support Macros,
%D subtitle=\METAPOST\ to \PDF\ conversion,
-%D author=Hans Hagen,
+%D author=Hans Hagen \& others (see text),
%D date=\currentdate,
-%D copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%D copyright=\PRAGMA]
%C
%C This module is part of the \CONTEXT\ macro||package and is
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-% This method is not that accurate with small files that use
-% penshapes. I tried several methods but so far I could not
-% come up with a better alternative. \TEX's real calculation
-% options are simply to simple. Using \ETEX's expression
-% mechanism does not lead to better results.
-
-% beware, we cannot use \zeropoint here since it may be
-% defined in the range \dimen 0 - 20 which we happen to use
-% as scratch registers ; inside context we may consider
-% using dedicated registers
-
-% fails: ( ) vect10 9.96265 fshow % \040\040\040\040
-
%D These macros are written as generic as possible. Some
%D general support macro's are loaded from a small module
%D especially made for non \CONTEXT\ use. In this module I
@@ -32,7 +19,19 @@
%D Ratz I was able to complete this module within reasonable
%D time. This module has support for \METAPOST\ extensions
%D built in.
+%D
+%D Daniel H. Luecking came up with a better (more precise)
+%D transformation method. You can recognize his comment by
+%D his initials. (We keep the old code around because it's a
+%D nice illustration on how a module like this evolves.)
+% Beware, we cannot use \zeropoint here since it may be
+% defined in the range \dimen 0 - 20 which we happen to use
+% as scratch registers; inside context we may consider
+% using dedicated registers.
+
+% fails: ( ) vect10 9.96265 fshow % \040\040\040\040
+%
% some optimizations are possible, but we need to be generic
%D First we take care of non||\CONTEXT\ use (newlines needed,
@@ -50,7 +49,7 @@
%D default engine for \TEX\ distributions, we need a more complex
%D test.
-\writestatus{loading}{Context Support Macros / PDF (2004.10.26)}
+\writestatus{loading}{Context Support Macros / PDF (2004.03.26)}
\unprotect
@@ -1069,7 +1068,7 @@
%D
%D The last case outputs a \type{gsave fill grestore} before
%D \type{stroke}. Handling the path outside the main loops
-%D saves about 40\% run time.\footnote{We can save some more by
+%D saves about 40\% run time.\footnoot{We can save some more by
%D following the \METAPOST\ output routine, but for the moment
%D we keep things simple.} Switching between the main loop and
%D the path loop is done by means of the recursely called
@@ -1088,8 +1087,7 @@
%D split up the routine in two.
\def\flushnormalMPsegment
-% {\expandafter\ifcase\getMPkeyword\relax % {\the\nofMPsegments}\relax
- {\ifcase\getMPkeyword\relax % {\the\nofMPsegments}\relax
+ {\ifcase\getMPkeyword\relax
\PDFcode{\!MPgMPs1 \!MPgMPs2 l}%
\or
\PDFcode{\!MPgMPs1 \!MPgMPs2 \!MPgMPs3 \!MPgMPs4 \!MPgMPs5 \!MPgMPs6 c}%
@@ -1102,8 +1100,7 @@
\fi}
\def\flushconcatMPsegment
-% {\expandafter\ifcase\getMPkeyword\relax % {\the\nofMPsegments}\relax
- {\ifcase\getMPkeyword\relax % {\the\nofMPsegments}\relax
+ {\ifcase\getMPkeyword\relax
\doMPconcat{\gMPs1}\a{\gMPs2}\b%
\PDFcode{\!MP\a\space\!MP\b\space l}%
\or
@@ -1159,7 +1156,14 @@
\doflushsomeMPpath}
\def\flushnormalMPpath{\let\dodoflushsomeMPpath\flushnormalMPsegment\flushsomeMPpath}
-\def\flushconcatMPpath{\let\dodoflushsomeMPpath\flushconcatMPsegment\flushsomeMPpath}
+
+%OLD \def\flushconcatMPpath{\let\dodoflushsomeMPpath\flushconcatMPsegment\flushsomeMPpath}
+
+%NEW pre-calculate 1/D so it needn't be repeated for each control point.
+
+\def\flushconcatMPpath
+ {\MPreciprocaldeterminant
+ \let\dodoflushsomeMPpath\flushconcatMPsegment\flushsomeMPpath}
%D The transformation of the coordinates is handled by one of
%D the macros Tanmoy posted to the \PDFTEX\ mailing list.
@@ -1182,45 +1186,141 @@
%D we converted them to pure points, simply because those can
%D be converted back.
-\mathchardef\MPconcatfactor=256 % beware don't remove spaces before it
+%OLD \mathchardef\MPconcatfactor=256 % beware don't remove spaces before it
+
+%OLD \def\doMPreducedimen#1
+%OLD {\count0\MPconcatfactor
+%OLD \advance\dimen#1 \ifdim\dimen#1>\zeropoint .5\else -.5\fi\count0
+%OLD \divide\dimen#1 \count0\relax}
+
+%OLD % too inaccurate (see old pragma logo)
+%OLD
+%OLD \def\doMPreducedimen#1
+%OLD {\count0=\MPconcatfactor
+%OLD \divide\dimen#1 \count0\relax}
+
+%OLD \def\doMPreducedimen#1
+%OLD {\advance\dimen#1 \ifdim\dimen#1>\zeropoint .5\else -.5\fi\MPconcatfactor
+%OLD \divide\dimen#1 \MPconcatfactor}
+
+%D The transformation code is rewritten by Daniel H. Luecking who
+%D describes his patch as follows:
+%D
+%D We would like to divide 1 by $X4, but all divisions are integer so
+%D for accuracy we want to convert to large integers and make sure the
+%D integer quotient has as many significant digits as possible. Thus we
+%D need to replace $1/X$ with $M/N$ where $N$ is as large as possible
+%D and $M/N$ is as large as possible. Also for simplicity $M$ should be
+%D a power of 2. So we make $M = 2^{30}$ \footnote{$2^{31} - 1$ is the
+%D largest legal integer. Using it (and simply ignoring the inaccuracy
+%D caused by $-1$) turns out to be at least as accurate in all cases,
+%D and more accurate in some.} (largest legal power of 2) and adjust
+%D $X4 downward (if necessary) to the the range $1-2^{16}$. This gives
+%D at least 15 significant binary digits, (almost as accurate as
+%D \METAPOST\ for numbers near 1) or almost 5 significant figures
+%D (decimal).
+
+\newcount\MPscratchCnt
+\newdimen\MPscratchDim % will be assigned global
+
+\def\MPadjustdimen % sets \MPscratchDim and \MPscratchCnt
+ {\MPscratchCnt\zerocount
+ \doMPadjustdimen}
+
+\def\doMPadjustdimen
+ {\ifdim\MPscratchDim>\onepoint
+ \divide\MPscratchDim 2
+ \advance\MPscratchCnt \plusone
+ \expandafter\doMPadjustdimen
+ \fi}
-% \def\doMPreducedimen#1
-% {\count0\MPconcatfactor
-% \advance\dimen#1 \ifdim\dimen#1>\zeropoint .5\else -.5\fi\count0
-% \divide\dimen#1 \count0\relax}
+%OLD \def\doMPexpanddimen#1
+%OLD {\multiply\dimen#1 \MPconcatfactor\relax}
+
+%D DHL: When viewed as an integer, $1 \hbox{pt}=2^{16}$ so $2^{32}/X$
+%D is the right way to do $(1 \hbox{pt})/(X \hbox{pt})$ and get the
+%D answer in points. But we are limited to $2^{30}/X$. However, we
+%D actually do $[ 2^{30} / (X/2^K) ]*2^{2-K}$ where $K$ is the number
+%D of halvings it takes to bring $X4 below $1 \hbox{pt}$. If $K$ is 0
+%D or 1 we readjust by multiplying by 4 or 2, otherwise by halving
+%D $(K-2)$ times \type {\MPscratchCnt} holds the value of $K$ from
+%D \type {\MPadjustdimen}.
+
+\def\MPreadjustdimen % acts on \MPscratchDim and MPscratchCnt
+ {\ifcase\MPscratchCnt
+ \multiply\MPscratchDim 4
+ \or
+ \multiply\MPscratchDim 2
+ \else
+ \expandafter\doMPreadjustdimen
+ \fi}
-\def\doMPreducedimen#1
- {\advance\dimen#1 \ifdim\dimen#1>\zeropoint .5\else -.5\fi\MPconcatfactor
- \divide\dimen#1 \MPconcatfactor}
+\def\doMPreadjustdimen
+ {\ifnum\MPscratchCnt > 2
+ \divide\MPscratchDim 2
+ \advance\MPscratchCnt \minusone
+ \expandafter\doMPreadjustdimen
+ \fi}
-% too inaccurate (see old pragma logo)
-%
-% \def\doMPreducedimen#1
-% {\count0=\MPconcatfactor
-% \divide\dimen#1 \count0\relax}
+\def\MPreciprocaldeterminant
+ {\MPscratchDim\withoutpt\the\dimen0 \dimen6 % s_x*s_y
+ \advance\MPscratchDim - \withoutpt\the\dimen2 \dimen4 % s_x*s_y - r_x*r_y
+ \ifdim\MPscratchDim<\zeropoint % we need a positive dimension
+ \MPscratchDim-\MPscratchDim % for \MPadjustdimen
+ \doMPreciprocal
+ \MPscratchDim-\MPscratchDim
+ \else
+ \doMPreciprocal
+ \fi}
-\def\doMPexpanddimen#1
- {\multiply\dimen#1 \MPconcatfactor\relax}
+\newcount\MPnumerator \MPnumerator = 1073741824 % 2^{30}
+
+% todo: dimexpr
+
+\def\doMPreciprocal % replace \MPscratchDim with its reciprocal
+ {\ifdim\MPscratchDim=\onepoint \else
+ \MPadjustdimen
+ \scratchcounter\MPnumerator
+ \divide\scratchcounter\MPscratchDim
+ \MPscratchDim1\scratchcounter % 1 needed !
+ \MPreadjustdimen
+ \fi}
+
+%OLD \def\presetMPconcat
+%OLD {\dimen 0=\gMPs1\onepoint \doMPreducedimen 0 % r_x
+%OLD \dimen 2=\gMPs2\onepoint \doMPreducedimen 2 % s_x
+%OLD \dimen 4=\gMPs3\onepoint \doMPreducedimen 4 % s_y
+%OLD \dimen 6=\gMPs4\onepoint \doMPreducedimen 6 % r_y
+%OLD \dimen 8=\gMPs5\onepoint \doMPreducedimen 8 % t_x
+%OLD \dimen10=\gMPs6\onepoint \doMPreducedimen10 } % t_y
+%OLD
+%OLD \def\presetMPscale
+%OLD {\dimen 0=\gMPs1\onepoint \doMPreducedimen 0
+%OLD \dimen 2 \zeropoint
+%OLD \dimen 4 \zeropoint
+%OLD \dimen 6=\gMPs2\onepoint \doMPreducedimen 6
+%OLD \dimen 8 \zeropoint
+%OLD \dimen10 \zeropoint}
\def\presetMPconcat
- {\dimen 0=\gMPs1 \onepoint \doMPreducedimen 0 % r_x
- \dimen 2=\gMPs2 \onepoint \doMPreducedimen 2 % s_x
- \dimen 4=\gMPs3 \onepoint \doMPreducedimen 4 % s_y
- \dimen 6=\gMPs4 \onepoint \doMPreducedimen 6 % r_y
- \dimen 8=\gMPs5 \onepoint \doMPreducedimen 8 % t_x
- \dimen10=\gMPs6 \onepoint \doMPreducedimen10 } % t_y
+ {\dimen 0=\gMPs1\onepoint % s_x
+ \dimen 2=\gMPs2\onepoint % r_x
+ \dimen 4=\gMPs3\onepoint % r_y
+ \dimen 6=\gMPs4\onepoint % s_y
+ \dimen 8=\gMPs5\onepoint % t_x
+ \dimen10=\gMPs6\onepoint} % t_y
\def\presetMPscale
- {\dimen 0=\gMPs1 \onepoint \doMPreducedimen 0
- \dimen 2=\zeropoint
- \dimen 4=\zeropoint
- \dimen 6=\gMPs2 \onepoint \doMPreducedimen 6
- \dimen 8=\zeropoint
- \dimen10=\zeropoint}
+ {\dimen 0=\gMPs1\onepoint
+ \dimen 2 \zeropoint
+ \dimen 4 \zeropoint
+ \dimen 6=\gMPs2\onepoint
+ \dimen 8 \zeropoint
+ \dimen10 \zeropoint}
\def\noMPtranslate % use this one grouped
- {\dimen 8=\zeropoint % t_x
- \dimen10=\zeropoint} % t_y
+ {\dimen 8 \zeropoint % t_x
+ \dimen10 \zeropoint} % t_y
%D \starttyping
%D \def\doMPconcat#1#2#3#4%
@@ -1378,96 +1478,133 @@
%D We cannot use \type {\beginETEX} here since in plain we
%D get \type {\outer} problems, sigh.
-% \beginTEX
-
-\def\MPcriteriumA {512pt} % scale
-\def\MPcriteriumB {2pt} % scale
-
-% \endTEX
-%
-
-% \ifx\MPcriteriumA\undefined
-%
-% \newdimen\MPcriteriumA \MPcriteriumA=512pt
-% \newdimen\MPcriteriumB \MPcriteriumB= 2pt
-%
-% \fi
-
-% one day i'll rewrite this to etex's \dimexpr (internally double precission)
+%OLD \beginTEX
+%OLD
+%OLD \def\MPcriteriumA {512pt} % scale
+%OLD \def\MPcriteriumB {2pt} % scale
+%OLD
+%OLD \endTEX
+%OLD
+%OLD \ifx\MPcriteriumA\undefined
+%OLD
+%OLD \newdimen\MPcriteriumA \MPcriteriumA=512pt
+%OLD \newdimen\MPcriteriumB \MPcriteriumB= 2pt
+%OLD
+%OLD \fi
+
+%OLD \def\doMPconcat#1#2#3#4%
+%OLD {\dimen12=#1pt % p_x
+%OLD \dimen14=#3pt % p_y
+%OLD %
+%OLD \chardef\MPfactor\zerocount
+%OLD \ifdim\dimen4<\MPcriteriumB\ifdim\dimen4>-\MPcriteriumB
+%OLD \ifdim\dimen6<\MPcriteriumB\ifdim\dimen6>-\MPcriteriumB
+%OLD \ifdim\dimen8<\MPcriteriumB\ifdim\dimen8>-\MPcriteriumB
+%OLD \ifdim\dimen10<\MPcriteriumB\ifdim\dimen10>-\MPcriteriumB
+%OLD \chardef\MPfactor\plusone
+%OLD \fi\fi
+%OLD \fi\fi
+%OLD \fi\fi
+%OLD \fi\fi
+%OLD \ifcase\MPfactor % spurious 0 removed
+%OLD \chardef\MPfactor\plusone
+%OLD \ifdim\dimen12<\MPcriteriumA\ifdim\dimen12>-\MPcriteriumA
+%OLD \ifdim\dimen14<\MPcriteriumA\ifdim\dimen14>-\MPcriteriumA
+%OLD \chardef\MPfactor16
+%OLD \fi\fi
+%OLD \fi\fi
+%OLD \fi
+%OLD %
+%OLD \multiply\dimen12 \MPfactor
+%OLD \multiply\dimen14 \MPfactor
+%OLD %
+%OLD \doMPreducedimen12
+%OLD \doMPreducedimen14
+%OLD %
+%OLD \dimen16 \dimen 0
+%OLD \multiply \dimen16 \dimen 6
+%OLD \dimen20 \dimen 2
+%OLD \multiply \dimen20 \dimen 4
+%OLD \advance \dimen16 -\dimen20
+%OLD %
+%OLD \dimen18 \dimen12
+%OLD \multiply \dimen18 \dimen 6
+%OLD \dimen20 \dimen14
+%OLD \multiply \dimen20 \dimen 4
+%OLD \advance \dimen18 -\dimen20
+%OLD \dimen20 \dimen 4
+%OLD \multiply \dimen20 \dimen10
+%OLD \advance \dimen18 \dimen20
+%OLD \dimen20 \dimen 6
+%OLD \multiply \dimen20 \dimen 8
+%OLD \advance \dimen18 -\dimen20
+%OLD %
+%OLD \multiply \dimen12 -\dimen 2
+%OLD \multiply \dimen14 \dimen 0
+%OLD \advance \dimen12 \dimen14
+%OLD \dimen20 \dimen 2
+%OLD \multiply \dimen20 \dimen 8
+%OLD \advance \dimen12 \dimen20
+%OLD \dimen20 \dimen 0
+%OLD \multiply \dimen20 \dimen10
+%OLD \advance \dimen12 -\dimen20
+%OLD %
+%OLD \ifdim\dimen16=\onepoint \else
+%OLD \ifdim\dimen16>\MPconcatfactor \onepoint \relax
+%OLD \doMPreducedimen16
+%OLD \divide \dimen18 \dimen16 \doMPexpanddimen18
+%OLD \divide \dimen12 \dimen16 \doMPexpanddimen12
+%OLD \else
+%OLD \divide \dimen18 \dimen16 \doMPexpanddimen18 \doMPexpanddimen18
+%OLD \divide \dimen12 \dimen16 \doMPexpanddimen12 \doMPexpanddimen12
+%OLD \fi
+%OLD \fi
+%OLD %
+%OLD \divide\dimen18 \MPfactor
+%OLD \divide\dimen12 \MPfactor
+%OLD %
+%OLD \edef#2{\withoutpt\the\dimen18}% % p_x^\prime
+%OLD \edef#4{\withoutpt\the\dimen12}} % p_y^\prime
+
+%D DHL: Ideally, $r_x$, $r_y$, $s_x4, $s_y$ should be in macros, not
+%D dimensions (they are scalar quantities after all, not lengths). I
+%D suppose the authors decided to do calculations with integer
+%D arithmetic instead of using real factors because it's faster.
+%D However, the actual macros test slower, possibly because I've
+%D omitted three nested loops. In my test files, my approach is more
+%D accurate. It is also far simpler and overflow does not seem to be a
+%D significant concern. The scale factors written by Metapost are (?)
+%D always $<=1$ (it scales coordinates internally) and coordinates are
+%D always likely to be less than \type {\maxdimen}.
+%D
+%D If this should ever cause problems, the scale factors can be reduced.
\def\doMPconcat#1#2#3#4%
- {\dimen12=#1pt % p_x
- \dimen14=#3pt % p_y
- %
- \chardef\MPfactor\zerocount
- \ifdim\dimen4<\MPcriteriumB\ifdim\dimen4>-\MPcriteriumB
- \ifdim\dimen6<\MPcriteriumB\ifdim\dimen6>-\MPcriteriumB
- \ifdim\dimen8<\MPcriteriumB\ifdim\dimen8>-\MPcriteriumB
- \ifdim\dimen10<\MPcriteriumB\ifdim\dimen10>-\MPcriteriumB
- \chardef\MPfactor\plusone
- \fi\fi
- \fi\fi
- \fi\fi
- \fi\fi
- \ifcase\MPfactor % spurious 0 removed
- \chardef\MPfactor\plusone
- \ifdim\dimen12<\MPcriteriumA\ifdim\dimen12>-\MPcriteriumA
- \ifdim\dimen14<\MPcriteriumA\ifdim\dimen14>-\MPcriteriumA
- \chardef\MPfactor16
- \fi\fi
- \fi\fi
- \fi
- %
- \multiply\dimen12 \MPfactor
- \multiply\dimen14 \MPfactor
- %
- \doMPreducedimen12
- \doMPreducedimen14
- %
- \dimen16 \dimen 0
- \multiply \dimen16 \dimen 6
- \dimen20 \dimen 2
- \multiply \dimen20 \dimen 4
- \advance \dimen16 -\dimen20
- %
- \dimen18 \dimen12
- \multiply \dimen18 \dimen 6
- \dimen20 \dimen14
- \multiply \dimen20 \dimen 4
- \advance \dimen18 -\dimen20
- \dimen20 \dimen 4
- \multiply \dimen20 \dimen10
- \advance \dimen18 \dimen20
- \dimen20 \dimen 6
- \multiply \dimen20 \dimen 8
- \advance \dimen18 -\dimen20
- %
- \multiply \dimen12 -\dimen 2
- \multiply \dimen14 \dimen 0
- \advance \dimen12 \dimen14
- \dimen20 \dimen 2
- \multiply \dimen20 \dimen 8
- \advance \dimen12 \dimen20
- \dimen20 \dimen 0
- \multiply \dimen20 \dimen10
- \advance \dimen12 -\dimen20
- %
- \ifdim\dimen16=\onepoint \else
- \ifdim\dimen16>\MPconcatfactor \onepoint \relax
- \doMPreducedimen16
- \divide \dimen18 \dimen16 \doMPexpanddimen18
- \divide \dimen12 \dimen16 \doMPexpanddimen12
- \else
- \divide \dimen18 \dimen16 \doMPexpanddimen18 \doMPexpanddimen18
- \divide \dimen12 \dimen16 \doMPexpanddimen12 \doMPexpanddimen12
- \fi
- \fi
- %
- \divide\dimen18 \MPfactor
- \divide\dimen12 \MPfactor
- %
+ {\dimen12=#1pt % p_x % #1\onepoint
+ \dimen14=#3pt % p_y % #3\onepoint
+ \advance\dimen12 -\dimen8 % p_x - t_x
+ \advance\dimen14 -\dimen10 % p_y - t_y
+ \dimen18=\withoutpt\the\dimen6 \dimen12 % s_y(p_x - t_x)
+ \advance\dimen18 -\withoutpt\the\dimen4 \dimen14 % - r_y(p_y-t_y)
+ \dimen14=\withoutpt\the\dimen0 \dimen14 % s_x(p_y-t_y)
+ \advance\dimen14 -\withoutpt\the\dimen2 \dimen12 % - r_x(p_x-t_x)
+ % \MPscratchDim contains precomputed 1/D:
+ \dimen18=\withoutpt\the\MPscratchDim \dimen18
+ \dimen14=\withoutpt\the\MPscratchDim \dimen14
\edef#2{\withoutpt\the\dimen18}% % p_x^\prime
- \edef#4{\withoutpt\the\dimen12}} % p_y^\prime
+ \edef#4{\withoutpt\the\dimen14}} % p_y^\prime
+
+%D One reason for Daniel to write this patch was that at small sizes
+%D the accuracy was less than optimal. Here is a test that demonstrates
+%D that his alternative is pretty good:
+%D
+%D \startlinecorrection
+%D \startMPcode
+%D for i = 5cm,1cm,5mm,1mm,.5mm,.1mm,.01mm :
+%D draw fullcircle scaled i withpen pencircle xscaled (i/10) yscaled (i/20) rotated 45 ;
+%D endfor ;
+%D \stopMPcode
+%D \stoplinecorrection
%D The following explanation of the conversion process was
%D posted to the \PDFTEX\ mailing list by Tanmoy. The original
@@ -1856,7 +1993,7 @@
\forgetall
\offinterlineskip
\startMPresources
- \doprocessMPtoPDFfile} % {#1}{#2}{#3}} % {#1}{0#2}{0#3} would be saver
+ \doprocessMPtoPDFfile} %
%D The next one is kind of private and probably will become obsolete):
diff --git a/tex/context/base/type-buy.tex b/tex/context/base/type-buy.tex
index 632793146..2c4c3fc1e 100644
--- a/tex/context/base/type-buy.tex
+++ b/tex/context/base/type-buy.tex
@@ -62,7 +62,6 @@
\definefontsynonym [SerifBoldItalic] [LucidaBright-DemiItalic]
\definefontsynonym [SerifBoldSlanted] [LucidaBright-DemiItalic]
\definefontsynonym [SerifCaps] [LucidaBrightSmallcaps]
- \definefontsynonym [OldStyle] [MathItalic]
\stoptypescript
\starttypescript [sans] [lucida] [name]
@@ -94,6 +93,14 @@
\definefontsynonym [MathBeta] [LucidaNewMath-Roman]
\stoptypescript
+\starttypescript [math] [lucida] [name]
+ \definefontsynonym [OldStyle] [MathItalic]
+ \definefontsynonym [Fraktur] [eufm10]
+ \definefontsynonym [Blackboard] [MathAlpha]
+ \definefontsynonym [Gothic] [eufm10]
+ \definefontsynonym [Calligraphic] [MathSymbol] % math caligraphic !
+\stoptypescript
+
\starttypescript [boldmath] [lucida] [name]
\definefontsynonym [MathRoman] [LucidaBright-Demi]
\definefontsynonym [MathExtension] [LucidaNewMath-Extension]
diff --git a/tex/context/base/type-enc.tex b/tex/context/base/type-enc.tex
index 47eba37fb..3a6c6a32f 100644
--- a/tex/context/base/type-enc.tex
+++ b/tex/context/base/type-enc.tex
@@ -850,7 +850,6 @@
\definefontsynonym [Euler-Extension] [zeuex10]
\definefontsynonym [Euler-Symbol] [zeusm10]
\definefontsynonym [Euler-Fraktur] [eufm10]
- \definefontsynonym [CharterRomanMath] [bchr8r] [encoding=8r]
\stoptypescript
\starttypescript [boldmath,bfmath] [euler] [default]
@@ -858,7 +857,6 @@
\definefontsynonym [Euler-Extension] [zeuex10]
\definefontsynonym [Euler-Symbol-Bold] [zeusb10]
\definefontsynonym [Euler-Fraktur-Bold] [eufb10]
- \definefontsynonym [CharterRomanBoldMath] [bchb8r] [encoding=8r]
\stoptypescript
% AMS (AMS)
diff --git a/tex/context/base/type-exa.tex b/tex/context/base/type-exa.tex
index 749b2f390..c1da0d969 100644
--- a/tex/context/base/type-exa.tex
+++ b/tex/context/base/type-exa.tex
@@ -43,8 +43,8 @@
\starttypescript [times] [texnansi,ec,8r,t5,uc]
\definetypeface [times] [rm] [serif] [times] [default] [encoding=\typescripttwo]
- \definetypeface [times] [ss] [sans] [helvetica] [default] [rscale=.9,encoding=\typescripttwo]
- \definetypeface [times] [tt] [mono] [modern] [default] [encoding=\typescripttwo,rscale=1.1]
+ \definetypeface [times] [ss] [sans] [helvetica] [default] [encoding=\typescripttwo,rscale=0.9]
+ \definetypeface [times] [tt] [mono] [modern] [default] [encoding=\typescripttwo,rscale=1.05]
\definetypeface [times] [mm] [math] [times] [default] [encoding=\typescripttwo]
% \usemathcollection[default]
diff --git a/tex/context/base/type-pre.tex b/tex/context/base/type-pre.tex
index 10413eae8..e884ba47b 100644
--- a/tex/context/base/type-pre.tex
+++ b/tex/context/base/type-pre.tex
@@ -126,7 +126,7 @@
\usetypescript [math] [ams] [all]
- \usemathcollection[ams]
+ \usemathcollection[default]
\stoptypescript
@@ -254,8 +254,7 @@
\usetypescript [serif] [palatino] [name,\defaultencoding]
\usetypescript [serif] [default] [size]
-
- \usetypescript [all] [palatino] [\defaultencoding]
+ \usetypescript [all] [palatino] [\defaultencoding]
\stoptypescript
diff --git a/tex/context/base/type-siz.tex b/tex/context/base/type-siz.tex
index 465c63c46..d01d49e6d 100644
--- a/tex/context/base/type-siz.tex
+++ b/tex/context/base/type-siz.tex
@@ -620,25 +620,19 @@
\definebodyfont [9pt,10pt,11pt,12pt,14.4pt,17.3pt,20.7pt] [mm]
[mr=zeurm10 sa 1,
ex=zeuex10 sa 1,
- mi=zeurm10 sa 1,
sy=zeusm10 sa 1,
- mb=bchr8r sa 1,
- mc=eufm10 sa 1]
+ mi=eufm10 sa 1]
\definebodyfont [6pt,7pt,8pt] [mm]
- [mi=zeurm7 sa 1,
- mr=zeurm7 sa 1,
+ [mr=zeurm7 sa 1,
sy=zeusm7 sa 1,
- mc=eufm7 sa 1,
- mb=bchr8r sa 1,
+ mi=eufm7 sa 1,
ex=zeuex10 sa 1]
\definebodyfont [5pt] [mm]
- [mi=zeurm5,
- mr=zeurm5,
+ [mr=zeurm5,
sy=zeusm5,
- mc=eufm5,
- mb=bchr8r at 5pt,
+ mi=eufm5,
ex=zeuex10 at 5pt]
\stoptypescript
@@ -648,25 +642,19 @@
\definebodyfont [9pt,10pt,11pt,12pt,14.4pt,17.3pt,20.7pt] [mm]
[mrbf=zeurb10 sa 1,
exbf=zeuex10 sa 1,
- mibf=zeurb10 sa 1,
sybf=zeusb10 sa 1,
- mbbf=bchb8r sa 1,
- mcbf=eufb10 sa 1]
+ mibf=eufb10 sa 1]
\definebodyfont [6pt,7pt,8pt] [mm]
- [mibf=zeurb7 sa 1,
- mrbf=zeurb7 sa 1,
+ [mrbf=zeurb7 sa 1,
sybf=zeusb7 sa 1,
- mcbf=eufb7 sa 1,
- mbbf=bchb8r sa 1,
+ mibf=eufb7 sa 1,
exbf=zeuex10 sa 1]
\definebodyfont [5pt] [mm]
- [mibf=zeurb5,
- mrbf=zeurb5,
+ [mrbf=zeurb5,
sybf=zeusb5,
- mcbf=eufb5,
- mbbf=bchb8r at 5pt,
+ mibf=eufb5,
exbf=zeuex10 at 5pt]
\stoptypescript
@@ -675,25 +663,19 @@
\definebodyfont [9pt,10pt,11pt,12pt,14.4pt,17.3pt,20.7pt] [mm]
[mr=zeurb10 sa 1,
ex=zeuex10 sa 1,
- mi=zeurb10 sa 1,
sy=zeusb10 sa 1,
- mb=bchb8r sa 1,
- mc=eufb10 sa 1]
+ mi=eufb10 sa 1]
\definebodyfont [6pt,7pt,8pt] [mm]
- [mi=zeurb7 sa 1,
- mr=zeurb7 sa 1,
+ [mr=zeurb7 sa 1,
sy=zeusb7 sa 1,
- mc=eufb7 sa 1,
- mb=bchb8r sa 1,
+ mi=eufb7 sa 1,
ex=zeuex10 sa 1]
\definebodyfont [5pt] [mm]
- [mi=zeurb5,
- mr=zeurb5,
+ [mr=zeurb5,
sy=zeusb5,
- mc=eufb5,
- mb=bchb8r at 5pt,
+ mi=eufb5,
ex=zeuex10 at 5pt]
\stoptypescript
diff --git a/tex/context/base/type-spe.tex b/tex/context/base/type-spe.tex
index 70990d4b0..6bc020f7a 100644
--- a/tex/context/base/type-spe.tex
+++ b/tex/context/base/type-spe.tex
@@ -11,6 +11,9 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
+% \controlspace -> enco files
+% no special, always
+
\starttypescript [mono] [courier,lucida] [special]
\def\controlspace{\getglyph{ComputerModernMono}{\char32}}
\stoptypescript
diff --git a/tex/context/base/type-syn.tex b/tex/context/base/type-syn.tex
index d0a3b52fc..09e8dff45 100644
--- a/tex/context/base/type-syn.tex
+++ b/tex/context/base/type-syn.tex
@@ -108,42 +108,36 @@
\starttypescript [math] [euler] [name]
\definefontsynonym [MathRoman] [Euler-Roman] % mr
- \definefontsynonym [MathItalic] [Euler-Roman] % mi
+ \definefontsynonym [MathItalic] [Euler-Fraktur] % mi
\definefontsynonym [MathExtension] [Euler-Extension] % ex
\definefontsynonym [MathSymbol] [Euler-Symbol] % sy
- \definefontsynonym [MathBeta] [CharterRomanMath]
- \definefontsynonym [MathGamma] [Euler-Fraktur] % mc ?
\stoptypescript
\starttypescript [boldmath] [euler] [name]
\definefontsynonym [MathRoman] [Euler-Roman-Bold] % mr
- \definefontsynonym [MathItalic] [Euler-Roman-Bold] % mi
+ \definefontsynonym [MathItalic] [Euler-Fraktur-Bold] % mi
\definefontsynonym [MathExtension] [Euler-Extension] % ex
\definefontsynonym [MathSymbol] [Euler-Symbol-Bold] % sy
- \definefontsynonym [MathBeta] [CharterRomanBoldMath]
- \definefontsynonym [MathGamma] [Euler-Fraktur-Bold] % mc ?
\stoptypescript
\starttypescript [bfmath] [euler] [name]
\definefontsynonym [MathRomanBold] [Euler-Roman-Bold] % mr
- \definefontsynonym [MathItalicBold] [Euler-Roman-Bold] % mi
+ \definefontsynonym [MathItalicBold] [Euler-Fraktur-Bold] % mi
\definefontsynonym [MathExtension] [Euler-Extension] % ex
\definefontsynonym [MathSymbolBold] [Euler-Symbol-Bold] % sy
- \definefontsynonym [MathBetaBold] [CharterRomanBoldMath]
- \definefontsynonym [MathGammaBold] [Euler-Fraktur-Bold] % mc ?
\stoptypescript
\starttypescript [math] [euler] [name]
- \definefontsynonym [OldStyle] [MathGamma]
- \definefontsynonym [Fraktur] [MathGamma]
- \definefontsynonym [Gothic] [MathGamma]
+ \definefontsynonym [OldStyle] [MathItalic]
+ \definefontsynonym [Fraktur] [MathItalic]
+ \definefontsynonym [Gothic] [MathItalic]
\definefontsynonym [Calligraphic] [MathSymbol]
\stoptypescript
\starttypescript [boldmath] [euler] [name]
- \definefontsynonym [OldStyle] [MathGammaBold]
- \definefontsynonym [Fraktur] [MathGammaBold]
- \definefontsynonym [Gothic] [MathGammaBold]
+ \definefontsynonym [OldStyle] [MathItalicBold]
+ \definefontsynonym [Fraktur] [MathItalicBold]
+ \definefontsynonym [Gothic] [MathItalicBold]
\definefontsynonym [Calligraphic] [MathSymbolBold]
\stoptypescript
@@ -289,6 +283,14 @@
\definefontsynonym [MathExtension] [Fourier-Math-Extension]
\stoptypescript
+\starttypescript [math] [fourier] [name] % todo
+ \definefontsynonym [OldStyle] [Serif-OldStyle] % strange, no oldstyles
+ \definefontsynonym [Fraktur] [eufm10]
+ \definefontsynonym [Blackboard] [msbm10]
+ \definefontsynonym [Gothic] [eufm10]
+ \definefontsynonym [Calligraphic] [eusm10]
+\stoptypescript
+
% Charter :
\starttypescript [serif] [charter] [name]
@@ -329,6 +331,14 @@
\definefontsynonym [MathBeta] [Times-Math-SymbolsB]
\stoptypescript
+\starttypescript [math] [times] [name]
+ \definefontsynonym [OldStyle] [MathItalic]
+ \definefontsynonym [Fraktur] [eufm10]
+ \definefontsynonym [Blackboard] [MathBeta]
+ \definefontsynonym [Gothic] [eufm10]
+ \definefontsynonym [Calligraphic] [eusm10]
+\stoptypescript
+
% Helvetica :
\starttypescript [sans] [helvetica] [name]
@@ -381,6 +391,14 @@
\definefontsynonym [MathBeta] [Palatino-Math-SymbolsB]
\stoptypescript
+\starttypescript [math] [palatino] [name]
+ \definefontsynonym [OldStyle] [MathItalic]
+ \definefontsynonym [Fraktur] [eufm10]
+ \definefontsynonym [Blackboard] [MathBeta]
+ \definefontsynonym [Gothic] [eufm10]
+ \definefontsynonym [Calligraphic] [eusm10]
+\stoptypescript
+
% bonus definitions
\starttypescript [serif] [palatino] [name]
diff --git a/tex/context/base/xtag-ext.tex b/tex/context/base/xtag-ext.tex
index 3427efb30..5ee40a77c 100644
--- a/tex/context/base/xtag-ext.tex
+++ b/tex/context/base/xtag-ext.tex
@@ -241,7 +241,8 @@
\gdef\texXMLelement#1%
{\begingroup
- \setnormalcatcodes
+% \setnormalcatcodes
+ \disableXML
\scantokens\@EA\@EA\@EA{\csname\@@XMLsave:#1\endcsname}%
\endgroup}
diff --git a/tex/context/base/xtag-ini.tex b/tex/context/base/xtag-ini.tex
index c064deca8..21377d22d 100644
--- a/tex/context/base/xtag-ini.tex
+++ b/tex/context/base/xtag-ini.tex
@@ -2128,7 +2128,19 @@
\def\XMLflush#1% one level
{\csname\ifcsname\@@XMLdata:#1\endcsname\@@XMLdata:#1\else\s!empty\fi\endcsname}
-\let\XMLflushdata\XMLflush
+%D \starttyping
+%D \defineXMLenvironmentsave[formula]{}{$\XMLtex{formula}$}
+%D
+%D \startXMLdata
+%D <formula>t+3+x+t\neq m\alpha\frac\theta\hbar</formula>
+%D \stopXMLdata
+%D \stoptyping
+
+\def\XMLtex#1%
+ {\begingroup
+ \disableXML
+ \scantokens\@EA\@EA\@EA{\csname\@@XMLdata:#1\endcsname}%
+ \endgroup}
\def\XMLflushdata#1% see m-steps for usage
{\@EA\ifx\csname\@@XMLdata:#1\endcsname\longempty\else
@@ -2165,6 +2177,7 @@
\simplifyXMLelements
\let\getXMLentity\firstofoneargument
\XMLrawentitiestrue
+ \chardef\utfunicodetracer7% new
\xdef\@@XML@@string{\csname\@@XMLdata:#2\endcsname}%
\egroup
\convertcommand\@@XML@@string\to#1}
@@ -2174,6 +2187,7 @@
\enableXMLexpansion
\simplifyXMLelements
\simplifyXMLentities
+ \chardef\utfunicodetracer7% new
\let\getXMLentity\expandedXMLentity % should this go in \simplify ?
\xdef\@@XML@@string{\csname\@@XMLdata:#2\endcsname}%
\egroup
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index 290a7d44e..22c293997 100644
--- a/tex/context/interface/keys-cz.xml
+++ b/tex/context/interface/keys-cz.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2004.12.06">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2004.12.17">
<cd:variables>
<cd:variable name="one" value="jedna"/>
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
index 4e2d03bd1..9b9f92fc1 100644
--- a/tex/context/interface/keys-de.xml
+++ b/tex/context/interface/keys-de.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2004.12.06">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2004.12.17">
<cd:variables>
<cd:variable name="one" value="eins"/>
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
index 6ae70c2dd..9871f1ba7 100644
--- a/tex/context/interface/keys-en.xml
+++ b/tex/context/interface/keys-en.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.12.06">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.12.17">
<cd:variables>
<cd:variable name="one" value="one"/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index 2caba051e..bf5ad3355 100644
--- a/tex/context/interface/keys-it.xml
+++ b/tex/context/interface/keys-it.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2004.12.06">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2004.12.17">
<cd:variables>
<cd:variable name="one" value="uno"/>
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
index ffa076af4..b92e77274 100644
--- a/tex/context/interface/keys-nl.xml
+++ b/tex/context/interface/keys-nl.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2004.12.06">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2004.12.17">
<cd:variables>
<cd:variable name="one" value="een"/>
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
index ebafd1281..23516086b 100644
--- a/tex/context/interface/keys-ro.xml
+++ b/tex/context/interface/keys-ro.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2004.12.06">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2004.12.17">
<cd:variables>
<cd:variable name="one" value="unu"/>